From 143f2a13b7d947705af03ece432814cf1837e8c1 Mon Sep 17 00:00:00 2001
From: Yogi_Wang <yawang@vmware.com>
Date: Tue, 5 Nov 2019 14:05:24 +0800
Subject: [PATCH] Fix the quoestion of cannot soft by pull time Signed-off-by:
 Yogi_Wang <yawang@vmware.com>

---
 src/portal/lib/src/tag/tag.component.html |  2 +-
 src/portal/lib/src/tag/tag.component.ts   | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/portal/lib/src/tag/tag.component.html b/src/portal/lib/src/tag/tag.component.html
index 3faf21792..6aacb3127 100644
--- a/src/portal/lib/src/tag/tag.component.html
+++ b/src/portal/lib/src/tag/tag.component.html
@@ -154,7 +154,7 @@
                     <div class="cell">{{t.push_time | date: 'short'}}</div>
                 </clr-dg-cell>
                 <clr-dg-cell>
-                    <div class="cell">{{t.pull_time | date: 'short'}}</div>
+                    <div class="cell">{{t.pull_time === availableTime ? "" : (t.pull_time| date: 'short')}}</div>
                 </clr-dg-cell>
             </clr-dg-row>
             <clr-dg-footer>
diff --git a/src/portal/lib/src/tag/tag.component.ts b/src/portal/lib/src/tag/tag.component.ts
index ec25d045c..6b161914f 100644
--- a/src/portal/lib/src/tag/tag.component.ts
+++ b/src/portal/lib/src/tag/tag.component.ts
@@ -91,7 +91,7 @@ export class TagComponent implements OnInit, AfterViewInit {
 
 
   tags: Tag[];
-
+  availableTime = AVAILABLE_TIME;
   showTagManifestOpened: boolean;
   retagDialogOpened: boolean;
   manifestInfoTitle: string;
@@ -133,14 +133,14 @@ export class TagComponent implements OnInit, AfterViewInit {
   };
   filterOneLabel: Label = this.initFilter;
 
-  @ViewChild("confirmationDialog", {static: false})
+  @ViewChild("confirmationDialog", { static: false })
   confirmationDialog: ConfirmationDialogComponent;
 
-  @ViewChild("imageNameInput", {static: false})
+  @ViewChild("imageNameInput", { static: false })
   imageNameInput: ImageNameInputComponent;
 
-  @ViewChild("digestTarget", {static: false}) textInput: ElementRef;
-  @ViewChild("copyInput", {static: false}) copyInput: CopyInputComponent;
+  @ViewChild("digestTarget", { static: false }) textInput: ElementRef;
+  @ViewChild("copyInput", { static: false }) copyInput: CopyInputComponent;
 
   pageSize: number = DEFAULT_PAGE_SIZE;
   currentPage = 1;
@@ -273,10 +273,6 @@ export class TagComponent implements OnInit, AfterViewInit {
         // Do filtering and sorting
         this.tags = doFiltering<Tag>(tags, state);
         this.tags = doSorting<Tag>(this.tags, state);
-        this.tags = this.tags.map(tag => {
-          tag.pull_time = tag.pull_time === AVAILABLE_TIME ? '' : tag.pull_time;
-          return tag;
-        });
         this.loading = false;
       }, error => {
         this.loading = false;
@@ -533,10 +529,7 @@ export class TagComponent implements OnInit, AfterViewInit {
             signatures.push(t.name);
           }
         });
-        this.tags = items.map(tag => {
-          tag.pull_time = tag.pull_time === AVAILABLE_TIME ? '' : tag.pull_time;
-          return tag;
-        });
+        this.tags = items;
         let signedName: { [key: string]: string[] } = {};
         signedName[this.repoName] = signatures;
         this.signatureOutput.emit(signedName);