From 4a543a3e521830f4fb2f4b5c4f02fd261cca2afa Mon Sep 17 00:00:00 2001
From: Steven Zou <szou@vmware.com>
Date: Mon, 14 Aug 2017 15:56:55 +0800
Subject: [PATCH] add CVE link

---
 src/ui_ng/lib/README.md                                        | 2 ++
 .../vulnerability/vulnerability-config.component.template.ts   | 3 ++-
 .../src/config/vulnerability/vulnerability-config.component.ts | 1 +
 src/ui_ng/lib/src/service/interface.ts                         | 1 +
 src/ui_ng/lib/src/tag/tag-detail.component.spec.ts             | 1 +
 .../src/vulnerability-scanning/result-grid.component.spec.ts   | 1 +
 src/ui_ng/lib/src/vulnerability-scanning/scanning.html.ts      | 2 +-
 src/ui_ng/package.json                                         | 2 +-
 8 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/ui_ng/lib/README.md b/src/ui_ng/lib/README.md
index 00adee80b8..55ca7dcebb 100644
--- a/src/ui_ng/lib/README.md
+++ b/src/ui_ng/lib/README.md
@@ -1,4 +1,6 @@
 # Harbor UI library
+**NOTES: Odd version is development version and may be not stable. Even version is release version which should be stable.**
+
 Wrap the following Harbor UI components into a sharable library and published as npm package for other third-party applications to import and reuse.
 
 * Repository and tag management view
diff --git a/src/ui_ng/lib/src/config/vulnerability/vulnerability-config.component.template.ts b/src/ui_ng/lib/src/config/vulnerability/vulnerability-config.component.template.ts
index 00423b32d1..69e4c7b853 100644
--- a/src/ui_ng/lib/src/config/vulnerability/vulnerability-config.component.template.ts
+++ b/src/ui_ng/lib/src/config/vulnerability/vulnerability-config.component.template.ts
@@ -10,7 +10,7 @@ export const VULNERABILITY_CONFIG_HTML: string = `
                 <span>{{'CONFIG.SCANNING.DB_NOT_READY' | translate }}</span>
               </clr-tooltip-content>
             </clr-tooltip>
-            <clr-dropdown *ngIf="isClairDBFullyReady" [clrMenuPosition]="'bottom-right'" style="margin-top:-8px;" class="clr-dropdown-override">
+            <clr-dropdown *ngIf="isClairDBFullyReady && showScanningNamespaces" [clrMenuPosition]="'bottom-right'" style="margin-top:-8px;" class="clr-dropdown-override">
                 <button class="btn btn-link btn-font" clrDropdownToggle>
                   {{ updatedTimestamp | date:'MM/dd/y HH:mm:ss' }}
                   <clr-icon shape="caret down"></clr-icon>
@@ -22,6 +22,7 @@ export const VULNERABILITY_CONFIG_HTML: string = `
                     </div>
                 </div>
             </clr-dropdown>
+            <span class="label label-blue" *ngIf="isClairDBFullyReady && !showScanningNamespaces">{{ updatedTimestamp | date:'MM/dd/y HH:mm:ss' }}</span>
         </div>
         <div class="form-group">
             <label for="scanAllPolicy">{{ 'CONFIG.SCANNING.SCAN_ALL' | translate }}</label>
diff --git a/src/ui_ng/lib/src/config/vulnerability/vulnerability-config.component.ts b/src/ui_ng/lib/src/config/vulnerability/vulnerability-config.component.ts
index 6a724670f8..fbe2b1a209 100644
--- a/src/ui_ng/lib/src/config/vulnerability/vulnerability-config.component.ts
+++ b/src/ui_ng/lib/src/config/vulnerability/vulnerability-config.component.ts
@@ -51,6 +51,7 @@ export class VulnerabilityConfigComponent implements OnInit {
     }
 
     @Input() showSubTitle: boolean = false;
+    @Input() showScanningNamespaces: boolean = false;
     systemInfo: SystemInfo;
 
     get scanAvailable(): boolean {
diff --git a/src/ui_ng/lib/src/service/interface.ts b/src/ui_ng/lib/src/service/interface.ts
index b4697d2332..efe104cc46 100644
--- a/src/ui_ng/lib/src/service/interface.ts
+++ b/src/ui_ng/lib/src/service/interface.ts
@@ -211,6 +211,7 @@ export interface VulnerabilityBase {
 }
 
 export interface VulnerabilityItem extends VulnerabilityBase {
+    link: string;
     fixedVersion: string;
     layer?: string;
     description: string;
diff --git a/src/ui_ng/lib/src/tag/tag-detail.component.spec.ts b/src/ui_ng/lib/src/tag/tag-detail.component.spec.ts
index 653aaedcbc..2073c2164a 100644
--- a/src/ui_ng/lib/src/tag/tag-detail.component.spec.ts
+++ b/src/ui_ng/lib/src/tag/tag-detail.component.spec.ts
@@ -91,6 +91,7 @@ describe('TagDetailComponent (inline template)', () => {
         id: "CVE-2016-" + (8859 + i),
         severity: i % 2 === 0 ? VulnerabilitySeverity.HIGH : VulnerabilitySeverity.MEDIUM,
         package: "package_" + i,
+        link: "https://security-tracker.debian.org/tracker/CVE-2016-4484",
         layer: "layer_" + i,
         version: '4.' + i + ".0",
         fixedVersion: '4.' + i + '.11',
diff --git a/src/ui_ng/lib/src/vulnerability-scanning/result-grid.component.spec.ts b/src/ui_ng/lib/src/vulnerability-scanning/result-grid.component.spec.ts
index 1ef98afa2f..b33561597f 100644
--- a/src/ui_ng/lib/src/vulnerability-scanning/result-grid.component.spec.ts
+++ b/src/ui_ng/lib/src/vulnerability-scanning/result-grid.component.spec.ts
@@ -50,6 +50,7 @@ describe('ResultGridComponent (inline template)', () => {
         id: "CVE-2016-" + (8859 + i),
         severity: i % 2 === 0 ? VulnerabilitySeverity.HIGH : VulnerabilitySeverity.MEDIUM,
         package: "package_" + i,
+        link: "https://security-tracker.debian.org/tracker/CVE-2016-4484",
         layer: "layer_" + i,
         version: '4.' + i + ".0",
         fixedVersion: '4.' + i + '.11',
diff --git a/src/ui_ng/lib/src/vulnerability-scanning/scanning.html.ts b/src/ui_ng/lib/src/vulnerability-scanning/scanning.html.ts
index 4d53ffe69f..c1c14821f1 100644
--- a/src/ui_ng/lib/src/vulnerability-scanning/scanning.html.ts
+++ b/src/ui_ng/lib/src/vulnerability-scanning/scanning.html.ts
@@ -84,7 +84,7 @@ export const GRID_COMPONENT_HTML: string = `
 
         <clr-dg-placeholder>{{'VULNERABILITY.GRID.PLACEHOLDER' | translate}}</clr-dg-placeholder>
         <clr-dg-row *clrDgItems="let res of scanningResults">
-            <clr-dg-cell>{{res.id}}</clr-dg-cell>
+            <clr-dg-cell><a href="{{res.link}}" target="_blank">{{res.id}}</a></clr-dg-cell>
             <clr-dg-cell [ngSwitch]="res.severity">
               <span *ngSwitchCase="5" class="label label-danger">{{severityText(res.severity) | translate}}</span>
               <span *ngSwitchCase="4" class="label label-medium">{{severityText(res.severity) | translate}}</span>
diff --git a/src/ui_ng/package.json b/src/ui_ng/package.json
index 00023b4d0e..ab6a9d4950 100644
--- a/src/ui_ng/package.json
+++ b/src/ui_ng/package.json
@@ -31,7 +31,7 @@
         "clarity-icons": "^0.9.8",
         "clarity-ui": "^0.9.8",
         "core-js": "^2.4.1",
-        "harbor-ui": "0.4.6",
+        "harbor-ui": "0.4.26",
         "intl": "^1.2.5",
         "mutationobserver-shim": "^0.3.2",
         "ngx-cookie": "^1.0.0",