Fix - 20469 sbom status and download issue (goharbor#20475)

Signed-off-by: xuelichao <[email protected]>
stonezdj · May 23, 2024 · a763d6b · a763d6b
1 parent 88fad92
commit a763d6b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...e/project/repository/artifact/artifact-additions/artifact-sbom/artifact-sbom.component.ts b/...e/project/repository/artifact/artifact-additions/artifact-sbom/artifact-sbom.component.ts
@@ -198,7 +198,9 @@ export class ArtifactSbomComponent implements OnInit, OnDestroy {
         this.downloadSbomBtnState = ClrLoadingState.LOADING;
         if (
             this.artifact?.sbom_overview?.scan_status ===
-            SBOM_SCAN_STATUS.SUCCESS
+                SBOM_SCAN_STATUS.SUCCESS ||
+            !!this.sbomDigest ||
+            (this.artifactSbom.sbomJsonRaw && this.artifactSbom.sbomName)
         ) {
             downloadJson(
                 this.artifactSbom.sbomJsonRaw,

diff --git a/...portal/src/app/base/project/repository/artifact/sbom-scanning/sbom-scan.component.spec.ts b/...portal/src/app/base/project/repository/artifact/sbom-scanning/sbom-scan.component.spec.ts
@@ -213,7 +213,7 @@ describe('ResultSbomComponent (inline template)', () => {
         component.sbomOverview = mockedSbomOverview;
         fixture.detectChanges();
         expect(component.status).toBe(SBOM_SCAN_STATUS.ERROR);
-        expect(component.completed).toBeFalsy();
+        expect(component.completed).toBeTruthy();
         expect(component.queued).toBeFalsy();
         expect(component.generating).toBeFalsy();
         expect(component.stopped).toBeFalsy();

diff --git a/src/portal/src/app/base/project/repository/artifact/sbom-scanning/sbom-scan.component.ts b/src/portal/src/app/base/project/repository/artifact/sbom-scanning/sbom-scan.component.ts
@@ -129,7 +129,7 @@ export class ResultSbomComponent implements OnInit, OnDestroy {
     }
 
     public get completed(): boolean {
-        return this.status === SBOM_SCAN_STATUS.SUCCESS;
+        return this.status === SBOM_SCAN_STATUS.SUCCESS || !!this.sbomDigest;
     }
 
     public get error(): boolean {