Add next scheduled time for tag retention (goharbor#18223)

1. Add next scheduled time UI 2. Update font style Signed-off-by: AllForNothing <sshijun@vmware.com>
YangJiao0817 · Feb 22, 2023 · a79c0ad · a79c0ad
1 parent c5640ac
commit a79c0ad
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/...l/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.html b/...l/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.html
@@ -1,6 +1,6 @@
 <div class="clr-row pt-1 fw8">
     <div class="clr-col">
-        <label class="label-left font-size-54">{{
+        <label class="label-left font-style">{{
             'IMMUTABLE_TAG.IMMUTABLE_RULES' | translate
         }}</label
         ><span class="badge badge-3 ml-5"

diff --git a/src/portal/src/app/base/project/tag-feature-integration/tag-retention/retention.ts b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/retention.ts
@@ -30,6 +30,7 @@ export class Retention extends BaseRetention {
         references: object;
         settings: {
             cron: string;
+            next_scheduled_time?: string;
         };
     };
     constructor() {

diff --git a/...l/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.html b/...l/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.html
@@ -1,6 +1,6 @@
 <div class="clr-row pt-1 fw8">
     <div class="clr-col">
-        <label class="label-left font-size-54">{{
+        <label class="label-left font-style">{{
             'TAG_RETENTION.RETENTION_RULES' | translate
         }}</label
         ><span class="badge badge-3 ml-5"
@@ -168,18 +168,25 @@
 </div>
 <div class="cron-selection">
     <cron-selection
-        class="w-100"
         [labelWidth]="'150px'"
         [disabled]="!(retention?.rules?.length > 0)"
         #cronScheduleComponent
         [labelCurrent]="label"
         [labelEdit]="label"
         [originCron]="originCron()"
         (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 class="clr-row pt-1">
     <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
         }}</label>
     </div>

diff --git a/...tal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.ts b/...tal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.ts
@@ -143,6 +143,10 @@ export class TagRetentionComponent implements OnInit, OnDestroy {
     updateCron(cron: string) {
         let retention: RetentionPolicy = clone(this.retention);
         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) {
             this.retentionService
                 .createRetention({