Merge pull request #1480 from appknox/PD-1558-fix-sbom-deprecations

fix sbom deprecations
appknox · Oct 25, 2024 · 87fc4bb · 87fc4bb
2 parents 2abe30b + d688aae
commit 87fc4bb
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 7 deletions.
diff --git a/app/components/sbom/app-list/filter-selected-item/index.ts b/app/components/sbom/app-list/filter-selected-item/index.ts
@@ -25,5 +25,6 @@ export default class SbomAppListFilterSelectedItemComponent extends Component<Sb
 declare module '@glint/environment-ember-loose/registry' {
   export default interface Registry {
     'Sbom::AppList::FilterSelectedItem': typeof SbomAppListFilterSelectedItemComponent;
+    'sbom/app-list/filter-selected-item': typeof SbomAppListFilterSelectedItemComponent;
   }
 }
diff --git a/app/components/sbom/app-list/header/index.hbs b/app/components/sbom/app-list/header/index.hbs
@@ -60,7 +60,7 @@
         showLabel=true
         iconName='filter-list'
       }}
-      @selectedItemComponent='sbom/app-list/filter-selected-item'
+      @selectedItemComponent={{component 'sbom/app-list/filter-selected-item'}}
       {{style width='auto'}}
       class='select-platform-class'
       data-test-select-platform-container

diff --git a/app/components/sbom/app-list/index.ts b/app/components/sbom/app-list/index.ts
@@ -71,7 +71,7 @@ export default class SbomAppListComponent extends Component<SbomAppListSignature
   }
 
   get sbomProjectList() {
-    return this.sbomProjectQueryResponse?.toArray() || [];
+    return this.sbomProjectQueryResponse?.slice() || [];
   }
 
   get totalSbomProjectCount() {

diff --git a/app/components/sbom/app-scan/list/index.ts b/app/components/sbom/app-scan/list/index.ts
@@ -73,7 +73,7 @@ export default class SbomAppScanListComponent extends Component<SbomAppScanListS
   }
 
   get sbomFileList() {
-    return this.sbomFileQueryResponse?.toArray() || [];
+    return this.sbomFileQueryResponse?.slice() || [];
   }
 
   get totalSbomScanCount() {

diff --git a/app/components/sbom/component-details/vulnerabilities/index.ts b/app/components/sbom/component-details/vulnerabilities/index.ts
@@ -53,7 +53,7 @@ export default class SbomComponentDetailsVulnerabilitiesComponent extends Compon
   }
 
   get sbomVulnerabilityList() {
-    return this.componentVulnerabilityQueryResponse?.toArray() || [];
+    return this.componentVulnerabilityQueryResponse?.slice() || [];
   }
 
   get totalSbomVulnerabilityCount() {

diff --git a/app/components/sbom/scan-details/component-list/index.ts b/app/components/sbom/scan-details/component-list/index.ts
@@ -74,7 +74,7 @@ export default class SbomScanDetailsComponentListComponent extends Component<Sbo
   }
 
   get sbomComponentList() {
-    return this.componentQueryResponse?.toArray() || [];
+    return this.componentQueryResponse?.slice() || [];
   }
 
   get totalSbomComponentCount() {

diff --git a/app/models/sbom-component.ts b/app/models/sbom-component.ts
@@ -7,7 +7,7 @@ export interface SbomComponentProperty {
 }
 
 export default class SbomComponentModel extends Model {
-  @belongsTo('sbom-file')
+  @belongsTo('sbom-file', { async: true, inverse: null })
   declare sbFile: AsyncBelongsTo<SbomFileModel>;
 
   @attr('string')

diff --git a/app/models/sbom-vulnerability-audit.ts b/app/models/sbom-vulnerability-audit.ts
@@ -20,7 +20,7 @@ type ParsedVersion = {
 };
 
 export default class SbomVulnerabilityAuditModel extends Model {
-  @belongsTo('sbom-vulnerability', { async: false })
+  @belongsTo('sbom-vulnerability', { async: false, inverse: null })
   declare sbVulnerability: SbomVulnerabilityModel;
 
   @attr()