From 45d9ece105321ada37cbd2678b9e86ec3dc9d1cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E4=B8=96=E5=86=9B?=
 <30999793+AllForNothing@users.noreply.github.com>
Date: Fri, 28 Jan 2022 11:46:28 +0800
Subject: [PATCH] Modify CVSS3 column for cve datagrid (#16298)

Signed-off-by: AllForNothing <sshijun@vmware.com>
---
 .../artifact-vulnerabilities.component.html                 | 6 +++++-
 src/portal/src/app/shared/services/interface.ts             | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.html b/src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.html
index 21e8bafc92..c2fa17da1d 100644
--- a/src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.html
+++ b/src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.html
@@ -65,7 +65,11 @@
                     <span *ngSwitchCase="'None'" class="label label-none no-border">{{severityText(res.severity) | translate}}</span>
                     <span *ngSwitchDefault>{{severityText(res.severity) | translate}}</span>
                 </clr-dg-cell>
-                <clr-dg-cell>{{res.preferred_cvss?.score_v3}}</clr-dg-cell>
+                <clr-dg-cell>
+                    <div class="clr-row mr-1" *ngFor="let item of res?.vendor_attributes?.CVSS | keyvalue">
+                        <div class="clr-col">{{item?.key}}:</div><div class="clr-col">{{item?.value?.V3Score}}</div>
+                    </div>
+                </clr-dg-cell>
                 <clr-dg-cell>{{res.package}}</clr-dg-cell>
                 <clr-dg-cell>{{res.version}}</clr-dg-cell>
                 <clr-dg-cell>
diff --git a/src/portal/src/app/shared/services/interface.ts b/src/portal/src/app/shared/services/interface.ts
index cfa110b69d..2ab0f02292 100644
--- a/src/portal/src/app/shared/services/interface.ts
+++ b/src/portal/src/app/shared/services/interface.ts
@@ -250,6 +250,9 @@ export interface VulnerabilityItem extends VulnerabilityBase {
   layer?: string;
   description?: string;
   preferred_cvss?: {[key: string]: string | number};
+  vendor_attributes?: {
+    CVSS?: {[key: string]: any};
+  };
 }
 
 export interface VulnerabilitySummary {