From a8f773e678fb012cb2af155892d5b0dcb8078ed1 Mon Sep 17 00:00:00 2001
From: AllForNothing <sshijun@vmware.com>
Date: Fri, 16 Aug 2019 14:40:27 +0800
Subject: [PATCH] fix cve-whitelist bugs

Signed-off-by: AllForNothing <sshijun@vmware.com>
---
 .../system/system-settings.component.scss      |  2 --
 .../project-policy-config.component.html       | 18 +++++++++---------
 .../project-policy-config.component.scss       |  2 --
 .../project-policy-config.component.ts         |  3 +++
 4 files changed, 12 insertions(+), 13 deletions(-)

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 18a577cc3..5b708737f 100644
--- a/src/portal/lib/src/config/system/system-settings.component.scss
+++ b/src/portal/lib/src/config/system/system-settings.component.scss
@@ -27,8 +27,6 @@
   width: 222px;
   color: #0079bb;
   overflow-y: auto;
-  white-space: nowrap;
-
   li {
     height: 24px;
     line-height: 24px;
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 31912edc3..01df1bbba 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
@@ -89,12 +89,12 @@
                 </div>
                 <clr-radio-container clrInline>
                     <clr-radio-wrapper>
-                        <input type="radio" clrRadio name="systemWhitelistOrProjectWhitelist" required value="true"
+                        <input [disabled]="!hasChangeConfigRole" type="radio" clrRadio name="systemWhitelistOrProjectWhitelist" required value="true"
                                [(ngModel)]="systemWhitelistOrProjectWhitelist"/>
                         <label>{{'CVE_WHITELIST.SYS_WHITELIST'|translate}}</label>
                     </clr-radio-wrapper>
                     <clr-radio-wrapper>
-                        <input type="radio" clrRadio name="systemWhitelistOrProjectWhitelist" required value="false"
+                        <input [disabled]="!hasChangeConfigRole" type="radio" clrRadio name="systemWhitelistOrProjectWhitelist" required value="false"
                                [(ngModel)]="systemWhitelistOrProjectWhitelist"/>
                         <label>{{'CVE_WHITELIST.PRO_WHITELIST'|translate}}</label>
                     </clr-radio-wrapper>
@@ -102,10 +102,10 @@
                 <div class="clr-row width-70per">
                     <div class="clr-col position-relative">
                         <div>
-                            <button [disabled]="isUseSystemWhitelist()"
+                            <button [disabled]="isUseSystemWhitelist() || !hasChangeConfigRole"
                                     (click)="showAddModal=!showAddModal"
                                     class="btn btn-link">{{'CVE_WHITELIST.ADD'|translate}}</button>
-                            <button [disabled]="isUseSystemWhitelist()" (click)="addSystem()"
+                            <button [disabled]="isUseSystemWhitelist() || !hasChangeConfigRole" (click)="addSystem()"
                                     class="btn btn-link ml-1">{{'CVE_WHITELIST.ADD_SYSTEM'|translate}}</button>
                         </div>
                         <div class="add-modal" *ngIf="showAddModal && !isUseSystemWhitelist()">
@@ -144,17 +144,17 @@
                             <label for="expires">{{'CVE_WHITELIST.EXPIRES_AT'|translate}}</label>
                             <div class="underline">
                                 <input #dateSystemInput readonly type="date" [(clrDate)]="systemExpiresDate">
-                                <input *ngIf="!isUseSystemWhitelist()" #dateInput
+                                <input [disabled]="!hasChangeConfigRole" *ngIf="!isUseSystemWhitelist()" #dateInput
                                        placeholder="{{'CVE_WHITELIST.NEVER_EXPIRES'|translate}}" readonly type="date"
                                        [(clrDate)]="expiresDate" newFormLayout="true">
-                                <input *ngIf="isUseSystemWhitelist()"
+                                <input [disabled]="!hasChangeConfigRole"  *ngIf="isUseSystemWhitelist()"
                                        placeholder="{{'CVE_WHITELIST.NEVER_EXPIRES'|translate}}" readonly type="text"
                                        value="{{systemExpiresDateString}}">
                             </div>
                         </div>
                         <div class="form-group padding-left-80">
                             <clr-checkbox-wrapper>
-                                <input [disabled]="isUseSystemWhitelist()" [checked]="neverExpires"
+                                <input [disabled]="isUseSystemWhitelist() || !hasChangeConfigRole" [checked]="neverExpires"
                                        [(ngModel)]="neverExpires" type="checkbox" clrCheckbox name="neverExpires"
                                        id="neverExpires"/>
                                 <label>
@@ -168,10 +168,10 @@
             </div>
         </div>
         <button type="button" class="btn btn-primary" (click)="save()"
-                [disabled]="(!isValid() || !hasChanges() || !hasChangeConfigRole) && !hasWhitelistChanged">{{'BUTTON.SAVE'
+                [disabled]="((!isValid() || !hasChanges()) && !hasWhitelistChanged) || !hasChangeConfigRole">{{'BUTTON.SAVE'
             | translate}}</button>
         <button type="button" class="btn btn-outline" (click)="cancel()"
-                [disabled]="(!isValid() || !hasChanges() || !hasChangeConfigRole) && !hasWhitelistChanged">{{'BUTTON.CANCEL'
+                [disabled]="((!isValid() || !hasChanges()) && !hasWhitelistChanged) || !hasChangeConfigRole">{{'BUTTON.CANCEL'
             | translate}}</button>
         <confirmation-dialog #cfgConfirmationDialog (confirmAction)="confirmCancel($event)"></confirmation-dialog>
     </section>
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 4b7cab641..05d4bc5d1 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
@@ -17,8 +17,6 @@
   width: 222px;
   color: #0079bb;
   overflow-y: auto;
-  white-space: nowrap;
-
   li {
     height: 24px;
     line-height: 24px;
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 58a68227e..a6ab59495 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
@@ -170,6 +170,9 @@ export class ProjectPolicyConfigComponent implements OnInit {
                     if (!response.cve_whitelist['expires_at']) {
                         response.cve_whitelist['expires_at'] = null;
                     }
+                    if (!response.metadata.reuse_sys_cve_whitelist) {
+                        response.metadata.reuse_sys_cve_whitelist = "true";
+                    }
                     if (response && response.cve_whitelist) {
                         this.projectWhitelist = clone(response.cve_whitelist);
                         this.projectWhitelistOrigin = clone(response.cve_whitelist);