Merge pull request #455 from ncats/momentCheck

staging select page bug fix
ncats · Sep 15, 2023 · 5ea63ad · 5ea63ad
2 parents f6fa6bc + 71c67a0
commit 5ea63ad
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/src/app/core/admin/import-browse/import-browse.component.ts b/src/app/core/admin/import-browse/import-browse.component.ts
@@ -268,7 +268,12 @@ export class ImportBrowseComponent implements OnInit, AfterViewInit, OnDestroy {
       this.substances.forEach(record => {
           if (record.id && this.bulkList[record.id]) {
             this.bulkList[record.id].checked = true;
-          } else {
+          } else if (record._metadata.recordId && this.bulkList[record._metadata.recordId]) {
+            this.bulkList[record._metadata.recordId].checked = true;
+          } else if (record._metadata.recordId) {
+            this.bulkList[record._metadata.recordId] = {"checked": true, "name": record._name, "id": record._metadata.recordId};
+          }
+          else {
             this.bulkList[record.id] = {"checked": true, "name": record.name, "id": record.id};
           }
 

diff --git a/src/app/core/admin/import-browse/import-summary/import-summary.component.ts b/src/app/core/admin/import-browse/import-summary/import-summary.component.ts
@@ -296,8 +296,11 @@ export class ImportSummaryComponent implements OnInit {
 
   deleteRecord() {
     this.adminService.deleteStagedRecord([this.privateSubstance._metadata.recordId]).subscribe(response => {
-      this.message = "Successfully deleted staging area record data";
+      this.message = "Successfully deleted staging area record data. Closing dialog.";
       this.deleted = true;
+      setTimeout(() => {
+        this.dialogRef.close();
+      }, 1500);
     }, error => {
       this.message = "There was a problem deleting staging area record data";
 

diff --git a/src/app/core/facets-manager/facets-manager.component.ts b/src/app/core/facets-manager/facets-manager.component.ts
@@ -282,9 +282,8 @@ export class FacetsManagerComponent implements OnInit, OnDestroy, AfterViewInit
         const newFacets = [];
         this.showAudit = this.authService.hasRoles('admin');
         let facetKeys = Object.keys(this.facetsConfig) || [];
-
         if (this._facetDisplayType) {
-          if (this._facetDisplayType === 'default' || 'staging') {
+          if (this._facetDisplayType === 'default' || this._facetDisplayType === 'staging') {
             facetKeys.forEach(facetKey => {
               if (this.facetsConfig[facetKey].length
                 && (facetKey === 'default' || this.authService.hasRoles(facetKey) || (facetKey === 'staging' && this.calledFrom === 'staging'))) {
@@ -331,7 +330,6 @@ export class FacetsManagerComponent implements OnInit, OnDestroy, AfterViewInit
               }
             });
           } else if (this._facetDisplayType === 'facetView' && this._facetViewCategorySelected !== 'All') {
-            console.log('type is facetview');
             if (this._configName && this._configName === 'substances') {
               this.facetsConfig['facetView'].forEach(categoryRow => {
                 const category = categoryRow['category'];

diff --git a/src/app/core/substance-details/substance-overview/substance-overview.component.html b/src/app/core/substance-details/substance-overview/substance-overview.component.html
@@ -207,7 +207,7 @@
         </div>
       </div>
       <div class="name-value" *ngIf="substance.structurallyDiverse && substance.structurallyDiverse.hybridSpeciesMaternalOrganism">
-        <div class="name">Hybrid Paternal Organism</div>
+        <div class="name">Hybrid Maternal Organism</div>
         <div class="thumb-col">
           <img class="image-thumb" appSubstanceImage [entityId]="substance.structurallyDiverse.hybridSpeciesMaternalOrganism.refuuid"
             size="400">

diff --git a/src/app/core/substances-browse/substances-browse.component.ts b/src/app/core/substances-browse/substances-browse.component.ts
@@ -194,6 +194,8 @@ export class SubstancesBrowseComponent implements OnInit, AfterViewInit, OnDestr
   fetchBulkLists() {
     this.bulkSearchService.getBulkSearchLists().subscribe(result => {
       console.log(result);
+    }, error => {
+      console.log(error);
     });
 
   }
@@ -254,6 +256,9 @@ export class SubstancesBrowseComponent implements OnInit, AfterViewInit, OnDestr
       console.log(result);
       this.userLists = result.lists;
 
+        }, error => {
+          console.log(error);
+          this.userLists = null;
         })
       } else {
         this.showDeprecated = false;

diff --git a/src/app/fda/config/config.json b/src/app/fda/config/config.json
@@ -18,6 +18,9 @@
     "apiKey": null,
     "apiToken": null
   },
+  "stagingArea": {
+    "mergeAction": false
+  },
 "userRegistration": {
     "configurations": {
       "emailForm": {