upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-20 11:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: disable the scan related button when installation without scanner or scanner deactived (#20652)

Browse Source 
Signed-off-by: chlins <chlins.zhang@gmail.com>
This commit is contained in:
Chlins Zhang 2024-06-25 14:24:38 +08:00 committed by GitHub
parent 04b0cc0b08
commit 35d1032ff7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list-page.service.ts
View File

@ -127,6 +127,12 @@ export class ArtifactListPageService {
ClrLoadingState.ERROR ClrLoadingState.ERROR
); );
} }
} else {
this.updateStates(
false,
ClrLoadingState.ERROR,
ClrLoadingState.ERROR
);
} }
}, },
error => { error => {

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

@ -15,7 +15,6 @@
<clr-dg-action-bar class="action-bar"> <clr-dg-action-bar class="action-bar">
<div> <div>
<button <button
*ngIf="hasEnabledScanner"
id="scan-btn" id="scan-btn"
[clrLoading]="scanBtnState" [clrLoading]="scanBtnState"
type="button" type="button"
@ -35,7 +34,6 @@
<span>{{ 'VULNERABILITY.SCAN_NOW' | translate }}</span> <span>{{ 'VULNERABILITY.SCAN_NOW' | translate }}</span>
</button> </button>
<button <button
*ngIf="hasEnabledSbom()"
id="generate-sbom-btn" id="generate-sbom-btn"
[clrLoading]="generateSbomBtnState" [clrLoading]="generateSbomBtnState"
type="button" type="button"
@ -69,7 +67,6 @@
<button <button
clrDropdownItem clrDropdownItem
id="stop-scan" id="stop-scan"
*ngIf="hasEnabledScanner"
[clrLoading]="stopBtnState" [clrLoading]="stopBtnState"
type="button" type="button"
class="btn btn-secondary scan-btn action-dropdown-item" class="btn btn-secondary scan-btn action-dropdown-item"
@ -84,7 +81,6 @@
<button <button
clrDropdownItem clrDropdownItem
id="stop-sbom-btn" id="stop-sbom-btn"
*ngIf="hasEnabledSbom()"
[clrLoading]="stopBtnState" [clrLoading]="stopBtnState"
type="button" type="button"
class="btn btn-secondary scan-btn action-dropdown-item" class="btn btn-secondary scan-btn action-dropdown-item"
@ -99,7 +95,6 @@
<span>{{ 'SBOM.STOP' | translate }}</span> <span>{{ 'SBOM.STOP' | translate }}</span>
</button> </button>
<div <div
*ngIf="hasEnabledScanner || hasEnabledSbom()"
class="dropdown-divider" class="dropdown-divider"
role="separator" role="separator"
aria-hidden="true"></div> aria-hidden="true"></div>