Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-27 02:58:05 +01:00
Code Issues Projects Releases Wiki Activity

Add next scheduled time for tag retention (#18223)

Browse Source 
1. Add next scheduled time UI
   2. Update font style

Signed-off-by: AllForNothing <sshijun@vmware.com>
This commit is contained in:
Shijun Sun 2023-02-22 12:26:58 +08:00 committed by GitHub
parent c5640acd7b
commit a79c0ad496
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.html
View File

@ -1,6 +1,6 @@
<div class="clr-row pt-1 fw8"> <div class="clr-row pt-1 fw8">
<div class="clr-col"> <div class="clr-col">
<label class="label-left font-size-54">{{ <label class="label-left font-style">{{
'IMMUTABLE_TAG.IMMUTABLE_RULES' | translate 'IMMUTABLE_TAG.IMMUTABLE_RULES' | translate
}}</label }}</label
><span class="badge badge-3 ml-5" ><span class="badge badge-3 ml-5"

1
src/portal/src/app/base/project/tag-feature-integration/tag-retention/retention.ts
View File

@ -30,6 +30,7 @@ export class Retention extends BaseRetention {
references: object; references: object;
settings: { settings: {
cron: string; cron: string;
next_scheduled_time?: string;
}; };
}; };
constructor() { constructor() {

13
src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.html
View File

@ -1,6 +1,6 @@
<div class="clr-row pt-1 fw8"> <div class="clr-row pt-1 fw8">
<div class="clr-col"> <div class="clr-col">
<label class="label-left font-size-54">{{ <label class="label-left font-style">{{
'TAG_RETENTION.RETENTION_RULES' | translate 'TAG_RETENTION.RETENTION_RULES' | translate
}}</label }}</label
><span class="badge badge-3 ml-5" ><span class="badge badge-3 ml-5"
@ -168,7 +168,6 @@
</div> </div>
<div class="cron-selection"> <div class="cron-selection">
<cron-selection <cron-selection
class="w-100"
[labelWidth]="'150px'" [labelWidth]="'150px'"
[disabled]="!(retention?.rules?.length > 0)" [disabled]="!(retention?.rules?.length > 0)"
#cronScheduleComponent #cronScheduleComponent
@ -176,10 +175,18 @@
[labelEdit]="label" [labelEdit]="label"
[originCron]="originCron()" [originCron]="originCron()"
(inputvalue)="openConfirm($event)"></cron-selection> (inputvalue)="openConfirm($event)"></cron-selection>
<ng-container *ngIf="retention?.trigger?.settings?.next_scheduled_time">
<span class="ml-1 mr-1 font-style">{{
'CLEARANCES.NEXT_SCHEDULED_TIME' | translate
}}</span>
<span>{{
retention?.trigger?.settings?.next_scheduled_time | harborDatetime
}}</span>
</ng-container>
</div> </div>
<div class="clr-row pt-1"> <div class="clr-row pt-1">
<div class="clr-col-2 pt-2 flex-150"> <div class="clr-col-2 pt-2 flex-150">
<label class="label-left font-size-54">{{ <label class="label-left font-style">{{
'TAG_RETENTION.RETENTION_RUNS' | translate 'TAG_RETENTION.RETENTION_RUNS' | translate
}}</label> }}</label>
</div> </div>

4
src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.ts
View File

@ -143,6 +143,10 @@ export class TagRetentionComponent implements OnInit, OnDestroy {
updateCron(cron: string) { updateCron(cron: string) {
let retention: RetentionPolicy = clone(this.retention); let retention: RetentionPolicy = clone(this.retention);
retention.trigger.settings['cron'] = cron; retention.trigger.settings['cron'] = cron;
if (retention?.trigger?.settings['next_scheduled_time']) {
// should not have next_scheduled_time for updating
delete retention?.trigger?.settings['next_scheduled_time'];
}
if (!this.retentionId) { if (!this.retentionId) {
this.retentionService this.retentionService
.createRetention({ .createRetention({