From 4979c4a49ca65cd3d1803532ac851327450f0c93 Mon Sep 17 00:00:00 2001
From: AllForNothing <sshijun@vmware.com>
Date: Thu, 18 Jul 2019 16:17:43 +0800
Subject: [PATCH] The item in CVE whiltelist should be a click-able link

Signed-off-by: AllForNothing <sshijun@vmware.com>
---
 .../lib/src/config/system/system-settings.component.html | 3 ++-
 .../lib/src/config/system/system-settings.component.scss | 5 +++++
 .../lib/src/config/system/system-settings.component.ts   | 6 ++++++
 .../project-policy-config.component.html                 | 7 +++++--
 .../project-policy-config.component.scss                 | 9 +++++++++
 .../project-policy-config.component.ts                   | 5 +++++
 6 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/portal/lib/src/config/system/system-settings.component.html b/src/portal/lib/src/config/system/system-settings.component.html
index ee21db66b..1fcb25051 100644
--- a/src/portal/lib/src/config/system/system-settings.component.html
+++ b/src/portal/lib/src/config/system/system-settings.component.html
@@ -115,7 +115,8 @@
                         <ul class="whitelist-window">
                             <li *ngIf="systemWhitelist?.items?.length<1"
                                 class="none">{{'CVE_WHITELIST.NONE'|translate}}</li>
-                            <li *ngFor="let item of systemWhitelist?.items;let i = index;">{{item.cve_id}}
+                            <li *ngFor="let item of systemWhitelist?.items;let i = index;">
+                                <span class="hand" (click)="goToDetail(item.cve_id)">{{item.cve_id}}</span>
                                 <clr-icon (click)="deleteItem(i)" class="float-lg-right margin-top-4"
                                           shape="times-circle"></clr-icon>
                             </li>
diff --git a/src/portal/lib/src/config/system/system-settings.component.scss b/src/portal/lib/src/config/system/system-settings.component.scss
index 4abcb77ab..18a577cc3 100644
--- a/src/portal/lib/src/config/system/system-settings.component.scss
+++ b/src/portal/lib/src/config/system/system-settings.component.scss
@@ -31,6 +31,7 @@
 
   li {
     height: 24px;
+    line-height: 24px;
     list-style-type: none;
   }
 }
@@ -72,4 +73,8 @@
   button {
     float: right;
   }
+}
+.hand{
+  cursor: pointer;
+  margin: 0;
 }
\ No newline at end of file
diff --git a/src/portal/lib/src/config/system/system-settings.component.ts b/src/portal/lib/src/config/system/system-settings.component.ts
index 8611ca007..b7a2f2614 100644
--- a/src/portal/lib/src/config/system/system-settings.component.ts
+++ b/src/portal/lib/src/config/system/system-settings.component.ts
@@ -28,6 +28,8 @@ const fakePass = 'aWpLOSYkIzJTTU4wMDkx';
 const ONE_HOUR_MINUTES: number = 60;
 const ONE_DAY_MINUTES: number = 24 * ONE_HOUR_MINUTES;
 const ONE_THOUSAND: number = 1000;
+const CVE_DETAIL_PRE_URL = `https://nvd.nist.gov/vuln/detail/`;
+const TARGET_BLANK = "_blank";
 
 @Component({
     selector: 'system-settings',
@@ -380,4 +382,8 @@ export class SystemSettingsComponent implements OnChanges, OnInit {
         }
         return false;
     }
+
+    goToDetail(cveId) {
+        window.open(CVE_DETAIL_PRE_URL + `${cveId}`, TARGET_BLANK);
+    }
 }
diff --git a/src/portal/lib/src/project-policy-config/project-policy-config.component.html b/src/portal/lib/src/project-policy-config/project-policy-config.component.html
index b6e6729b4..9dcd87aa1 100644
--- a/src/portal/lib/src/project-policy-config/project-policy-config.component.html
+++ b/src/portal/lib/src/project-policy-config/project-policy-config.component.html
@@ -124,12 +124,15 @@
                         <ul class="whitelist-window" *ngIf="isUseSystemWhitelist()">
                             <li *ngIf="systemWhitelist?.items?.length<1"
                                 class="none">{{'CVE_WHITELIST.NONE'|translate}}</li>
-                            <li *ngFor="let item of systemWhitelist?.items">{{item.cve_id}}</li>
+                            <li *ngFor="let item of systemWhitelist?.items">
+                                <span class="hand" (click)="goToDetail(item.cve_id)">{{item.cve_id}}</span>
+                            </li>
                         </ul>
                         <ul class="whitelist-window" *ngIf="!isUseSystemWhitelist()">
                             <li class="none"
                                 *ngIf="projectWhitelist?.items?.length<1">{{'CVE_WHITELIST.NONE'|translate}}</li>
-                            <li *ngFor="let item of projectWhitelist?.items;let i = index;">{{item.cve_id}}
+                            <li *ngFor="let item of projectWhitelist?.items;let i = index;">
+                                <span class="hand" (click)="goToDetail(item.cve_id)">{{item.cve_id}}</span>
                                 <clr-icon (click)="deleteItem(i)" class="float-lg-right margin-top-4"
                                           shape="times-circle"></clr-icon>
                             </li>
diff --git a/src/portal/lib/src/project-policy-config/project-policy-config.component.scss b/src/portal/lib/src/project-policy-config/project-policy-config.component.scss
index 474a7fbad..4b7cab641 100644
--- a/src/portal/lib/src/project-policy-config/project-policy-config.component.scss
+++ b/src/portal/lib/src/project-policy-config/project-policy-config.component.scss
@@ -5,6 +5,9 @@
 .select {
   width: 120px;
 }
+.margin-top-4 {
+  margin-top: 4px;
+}
 
 .whitelist-window {
   border: 1px solid #ccc;
@@ -18,6 +21,7 @@
 
   li {
     height: 24px;
+    line-height: 24px;
     list-style-type: none;
   }
 }
@@ -61,3 +65,8 @@
   }
 }
 
+.hand{
+  cursor: pointer;
+  margin: 0;
+}
+
diff --git a/src/portal/lib/src/project-policy-config/project-policy-config.component.ts b/src/portal/lib/src/project-policy-config/project-policy-config.component.ts
index 8af7184d0..82b150fec 100644
--- a/src/portal/lib/src/project-policy-config/project-policy-config.component.ts
+++ b/src/portal/lib/src/project-policy-config/project-policy-config.component.ts
@@ -19,6 +19,8 @@ import {USERSTATICPERMISSION} from '../service/permission-static';
 
 const ONE_THOUSAND: number = 1000;
 const LOW: string = 'low';
+const CVE_DETAIL_PRE_URL = `https://nvd.nist.gov/vuln/detail/`;
+const TARGET_BLANK = "_blank";
 
 export class ProjectPolicy {
     Public: boolean;
@@ -367,4 +369,7 @@ export class ProjectPolicyConfigComponent implements OnInit {
         }
         return false;
     }
+    goToDetail(cveId) {
+        window.open(CVE_DETAIL_PRE_URL + `${cveId}`, TARGET_BLANK);
+    }
 }