Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-01-14 11:41:31 +01:00
Code Issues Projects Releases Wiki Activity

Fix nightly case by add to scan button (#13937)

Browse Source 
Signed-off-by: AllForNothing <sshijun@vmware.com>
This commit is contained in:
Will Sun 2021-01-08 15:01:26 +08:00 committed by GitHub
parent 3e09eeb62b
commit f566748c77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html
View File

@ -90,7 +90,7 @@
<clr-datagrid [clrDgLoading]="loading" (clrDgRefresh)="clrDgRefresh($event)" class="datagrid-top" [class.embeded-datagrid]="isEmbedded" <clr-datagrid [clrDgLoading]="loading" (clrDgRefresh)="clrDgRefresh($event)" class="datagrid-top" [class.embeded-datagrid]="isEmbedded"
[(clrDgSelected)]="selectedRow"> [(clrDgSelected)]="selectedRow">
<clr-dg-action-bar> <clr-dg-action-bar>
<button [clrLoading]="scanBtnState" type="button" class="btn btn-secondary scan-btn" <button id="scan-btn" [clrLoading]="scanBtnState" type="button" class="btn btn-secondary scan-btn"
[disabled]="!(canScanNow() && selectedRowHasVul() && hasEnabledScanner && hasScanImagePermission )" (click)="scanNow()"> [disabled]="!(canScanNow() && selectedRowHasVul() && hasEnabledScanner && hasScanImagePermission )" (click)="scanNow()">
<clr-icon shape="shield-check" size="16"></clr-icon>&nbsp; <clr-icon shape="shield-check" size="16"></clr-icon>&nbsp;
<span *ngIf="projectScanner">{{'VULNERABILITY.SCAN_BY' | translate: {scanner: getScannerInfo()} }}</span> <span *ngIf="projectScanner">{{'VULNERABILITY.SCAN_BY' | translate: {scanner: getScannerInfo()} }}</span>

2
src/portal/src/app/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.html
View File

@ -11,7 +11,7 @@
<clr-dg-action-bar> <clr-dg-action-bar>
<div class="clr-row center"> <div class="clr-row center">
<div class="ml-05"> <div class="ml-05">
<button (click)="scanNow()" type="button" class="btn btn-secondary text-transform-none" [clrLoading]="scanBtnState" [disabled]="!(hasEnabledScanner && hasScanningPermission && !onSendingScanCommand)"> <button id="scan-btn" (click)="scanNow()" type="button" class="btn btn-secondary text-transform-none" [clrLoading]="scanBtnState" [disabled]="!(hasEnabledScanner && hasScanningPermission && !onSendingScanCommand)">
<clr-icon shape="shield-check" size="16"></clr-icon>&nbsp; <clr-icon shape="shield-check" size="16"></clr-icon>&nbsp;
<span *ngIf="projectScanner">{{'VULNERABILITY.SCAN_BY' | translate: {scanner: getScannerInfo(projectScanner)} }}</span> <span *ngIf="projectScanner">{{'VULNERABILITY.SCAN_BY' | translate: {scanner: getScannerInfo(projectScanner)} }}</span>
<span *ngIf="!projectScanner">{{'VULNERABILITY.NO_SCANNER' | translate}}</span> <span *ngIf="!projectScanner">{{'VULNERABILITY.NO_SCANNER' | translate}}</span>

4
tests/resources/Harbor-Pages/Vulnerability.robot
View File

@ -43,7 +43,7 @@ Set Vulnerabilty Serverity
Retry Element Click ${project_config_save_btn} Retry Element Click ${project_config_save_btn}
Scan Is Disabled Scan Is Disabled
Retry Wait Until Page Contains Element //button[contains(.,'Scan') and @disabled=''] Retry Wait Until Page Contains Element //button[@id='scan-btn' and @disabled='']
Move To Summary Chart Move To Summary Chart
Sleep 2 Sleep 2
@ -56,7 +56,7 @@ Scan Repo
[Arguments] ${tagname} ${status} [Arguments] ${tagname} ${status}
#select one tag #select one tag
Retry Element Click //clr-dg-row[contains(.,'${tagname}')]//label Retry Element Click //clr-dg-row[contains(.,'${tagname}')]//label
Retry Element Click //button[contains(.,'Scan')] Retry Element Click //button[@id='scan-btn']
Run Keyword If '${status}' == 'Succeed' Wait Until Element Is Visible //hbr-vulnerability-bar//hbr-result-tip-histogram 300 Run Keyword If '${status}' == 'Succeed' Wait Until Element Is Visible //hbr-vulnerability-bar//hbr-result-tip-histogram 300
Run Keyword If '${status}' == 'Fail' Wait Until Element Is Visible //hbr-vulnerability-bar//a 300 Run Keyword If '${status}' == 'Fail' Wait Until Element Is Visible //hbr-vulnerability-bar//a 300