Make taxonomy tag configuable. Fixed unit test.

usnistgov · Jul 18, 2024 · ff292e1 · ff292e1
1 parent e18fe4c
commit ff292e1
Show file tree

Hide file tree

Showing 18 changed files with 524 additions and 749 deletions.
diff --git a/angular/src/app/_helpers/fakeBackendInterceptor.ts b/angular/src/app/_helpers/fakeBackendInterceptor.ts
@@ -15,7 +15,9 @@ export class FakeBackendInterceptor implements HttpInterceptor {
     // const sampleData: any = require('../../assets/science-theme/BiometricsScienceTheme.json');
     // const sampleData: any = require('../../assets/sample-data/semiconductorRecord.json');
     const sampleData: any = require('../../assets/sample-data/semi-conductors.json');
-    const sampleCollection: any = require('../../assets/sample-data/semiconductors-collection.json');
+    // const sampleCollection: any = require('../../assets/sample-data/semiconductors-collection.json');
+    const sampleCollection: any = require('../../assets/sample-data/semiconductor-realdata.json');
+
     const fields: any = require('../../assets/sample-data/fields.json');
     // const sampleRecord: any = require('../../assets/science-theme/DNAScienceTheme.json');
 

diff --git a/angular/src/app/landing/filters/filters.component.ts b/angular/src/app/landing/filters/filters.component.ts
diff --git a/angular/src/app/landing/landingbody.component.spec.ts b/angular/src/app/landing/landingbody.component.spec.ts
@@ -48,6 +48,7 @@ describe('LandingBodyComponent', () => {
         component.md["@type"][0] = "nrdp:PublicDataResource";
         component.metricsData = new MetricsData();
         component.editEnabled = false;
+        component.collection = "Semiconductors";
         fixture.detectChanges();
     }));
 

diff --git a/angular/src/app/landing/resultlist/resultlist.component.ts b/angular/src/app/landing/resultlist/resultlist.component.ts
@@ -102,7 +102,7 @@ export class ResultlistComponent implements OnInit {
             );
         }
 
-        this.allCollections = this.collectionService.loadCollections(this.collection);
+        this.allCollections = this.collectionService.loadAllCollections();
 
         // Set colors
         this.setColor();

diff --git a/angular/src/app/landing/searchresult/searchresult.component.ts b/angular/src/app/landing/searchresult/searchresult.component.ts
@@ -34,6 +34,7 @@ export class SearchresultComponent implements OnInit {
     prevMouseX: number = 0;
     prevFilterWidth: number = 0;
     taxonomyURI: any = {};
+    allCollections: any = {};
 
     @ViewChild('parentDiv')
     topLevelDiv: ElementRef;
@@ -49,9 +50,10 @@ export class SearchresultComponent implements OnInit {
     }
 
     ngOnInit(): void {
-        this.taxonomyURI[Collections.DEFAULT] = this.collectionService.loadCollections(Collections.DEFAULT)[Collections.DEFAULT].taxonomyURI;
-        this.taxonomyURI[Collections.FORENSICS] = this.collectionService.loadCollections(Collections.FORENSICS)[Collections.FORENSICS].taxonomyURI;
-        this.taxonomyURI[Collections.SEMICONDUCTORS] = this.collectionService.loadCollections(Collections.SEMICONDUCTORS)[Collections.SEMICONDUCTORS].taxonomyURI;
+        this.allCollections = this.collectionService.loadAllCollections();
+        this.taxonomyURI[Collections.DEFAULT] = this.allCollections[Collections.DEFAULT].taxonomyURI;
+        this.taxonomyURI[Collections.FORENSICS] = this.allCollections[Collections.FORENSICS].taxonomyURI;
+        this.taxonomyURI[Collections.SEMICONDUCTORS] = this.allCollections[Collections.SEMICONDUCTORS].taxonomyURI;
     }
 
     ngAfterViewInit(): void {

diff --git a/angular/src/app/landing/sections/resourcedescription.component.spec.ts b/angular/src/app/landing/sections/resourcedescription.component.spec.ts
@@ -43,6 +43,7 @@ describe('ResourceDescriptionComponent', () => {
     beforeEach(waitForAsync(() => {
         makeComp();
         component.inBrowser = true;
+        component.collection = "Semiconductors";
         fixture.detectChanges();
     }));
 

diff --git a/angular/src/app/landing/tools/menu.component.ts b/angular/src/app/landing/tools/menu.component.ts
@@ -76,7 +76,7 @@ export class MenuComponent implements OnInit {
         }
 
     ngOnInit(): void {
-        this.allCollections = this.collectionService.loadCollections(this.collection);
+        this.allCollections = this.collectionService.loadAllCollections();
 
         this.setColor();
 

diff --git a/angular/src/app/landing/tools/toolmenu.component.css b/angular/src/app/landing/tools/toolmenu.component.css
diff --git a/angular/src/app/landing/tools/toolmenu.component.spec.ts b/angular/src/app/landing/tools/toolmenu.component.spec.ts