From 148f8cd8a030fd7d3837765dc4ec688343be44b1 Mon Sep 17 00:00:00 2001
From: AllForNothing <sshijun@vmware.com>
Date: Tue, 14 Feb 2023 18:53:14 +0800
Subject: [PATCH] Add next scheduled time for tag retention    1. Add next
 scheduled time UI    2. Update font style

Signed-off-by: AllForNothing <sshijun@vmware.com>
---
 .../immutable-tag/immutable-tag.component.html      |  2 +-
 .../tag-retention/retention.ts                      |  1 +
 .../tag-retention/tag-retention.component.html      | 13 ++++++++++---
 .../tag-retention/tag-retention.component.ts        |  4 ++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.html b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.html
index e73c50eba40c..66ff54ff36eb 100644
--- a/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.html
+++ b/src/portal/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
index 7246d57b65db..bb38f95f16b3 100644
--- 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/src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.html b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.html
index c4e56dc0d0d8..756ab9219c2c 100644
--- a/src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.html
+++ b/src/portal/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,7 +168,6 @@
 </div>
 <div class="cron-selection">
     <cron-selection
-        class="w-100"
         [labelWidth]="'150px'"
         [disabled]="!(retention?.rules?.length > 0)"
         #cronScheduleComponent
@@ -176,10 +175,18 @@
         [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/src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.ts b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.ts
index 8c510f9c4b3f..079a2aaf5286 100644
--- a/src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.ts
+++ b/src/portal/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({