Merge pull request #695 from center-for-threat-informed-defense/fix/fetching-parent-data-sources

Fix fetching parent data source & subtype table sorting

Author: clemiller

src/app/components/stix/subtype-property/subtype-view/subtype-view.component.ts

@@ -20,13 +20,18 @@ export class SubtypeViewComponent implements OnInit {
   public get fieldLabels(): string[] {
     return this.config.subtypeFields.map(f => (f.label ? f.label : f.name));
   }
-
   public get valueCopy() {
     return JSON.parse(JSON.stringify(this.config.object[this.config.field])); //deep copy
   }
+  public get keyField(): string {
+    return this.config.subtypeFields.find(subtype => subtype.key)?.name;
+  }
 
   ngOnInit(): void {
     this.detailTable = this.valueCopy;
+    if (this.keyField) {
+      this.sortTableByKey();
+    }
     this.buildTable();
   }
 
@@ -65,6 +70,17 @@ export class SubtypeViewComponent implements OnInit {
     return '';
   }
 
+  private sortTableByKey(): void {
+    const key = this.keyField;
+    this.detailTable.sort((a, b) => {
+      const aValue = a[key] ?? '';
+      const bValue = b[key] ?? '';
+      return String(aValue).localeCompare(String(bValue), undefined, {
+        sensitivity: 'base',
+      });
+    });
+  }
+
   // Build table of values including any inline citations
   public buildTable(): void {
     // get subtype field that supports references

src/app/services/connectors/rest-api/rest-api-connector.service.ts

@@ -903,8 +903,12 @@ export class RestApiConnectorService extends ApiConnector {
         switchMap(result => {
           // fetch parent data source of data component
           const x = result as any[];
-          if (x[0].attackType != 'data-component') return of(result);
+          if (!x[0] || x[0].attackType != 'data-component') return of(result);
+
           const d = x[0] as DataComponent;
+          // if no data source ref, just return the data component
+          if (!d.dataSourceRef) return of([d]);
+          // otherwise, fetch the parent data source
           return this.getDataSource(d.dataSourceRef).pipe(
             // fetch data source from REST API
             map(data_source => {