Fixes-20537 SBOM tab should not exist when the artifact is helm pack…

…age (#20539) Fixes-20537 SBOM tab should not exist when the artifact is helm package #20538 Signed-off-by: xuelichao <xuel@vmware.com>
goharbor · Jun 3, 2024 · 81fcc0a · 81fcc0a
1 parent 2b27170
commit 81fcc0a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...c/app/base/project/repository/artifact/artifact-additions/artifact-additions.component.ts b/...c/app/base/project/repository/artifact/artifact-additions/artifact-additions.component.ts
@@ -59,7 +59,10 @@ export class ArtifactAdditionsComponent implements AfterViewChecked, OnInit {
     }
 
     hasScannerSupportSBOM(): boolean {
-        return this.artifactListPageService.hasScannerSupportSBOM();
+        if (this.additionLinks && this.additionLinks[ADDITIONS.SBOMS]) {
+            return true;
+        }
+        return false;
     }
 
     getVulnerability(): AdditionLink {

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
@@ -179,8 +179,8 @@ describe('ResultSbomComponent (inline template)', () => {
         component.artifactDigest = mockedSbomDigest;
         component.sbomDigest = mockedSbomDigest;
         component.accessories = mockedAccessories;
+        fixture.detectChanges();
         fixture.whenStable().then(() => {
-            fixture.detectChanges();
             const el: HTMLElement =
                 fixture.nativeElement.querySelector('.tip-block');
             expect(el).not.toBeNull();