Merge pull request #474 from ncats/hotfix31

download structure search link removed, console cleanup
ncats · Jan 19, 2024 · 6c58523 · 6c58523
2 parents 1642ac5 + dfd557f
commit 6c58523
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 12 deletions.
diff --git a/src/app/core/admin/admin.service.ts b/src/app/core/admin/admin.service.ts
@@ -114,7 +114,6 @@ export class AdminService extends BaseHttpService {
         }
 
         public loadData(form: any) {
-          console.log(form);
           const url = `${(this.configService.configData && this.configService.configData.apiBaseUrl) || '/' }api/v1/admin/load`;
           return this.http.post< any >(url, form);
         }
@@ -149,7 +148,6 @@ export class AdminService extends BaseHttpService {
         }*/
 
         public previewAdapter(id: string, file: any, adapter?: any, limit?: any): Observable< any > {
-          console.log(file);
           let url = `${(this.configService.configData && this.configService.configData.apiBaseUrl) || '/' }api/v1/substances/import/${id}/@preview`;
          if (limit) {
            if(limit === 'all') {

diff --git a/src/app/core/admin/import-management/import-dialog/import-dialog.component.ts b/src/app/core/admin/import-management/import-dialog/import-dialog.component.ts
@@ -49,7 +49,6 @@ export class ImportDialogComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    console.log(this.fieldList);
   }
 
   switchAction(action?: any) {

diff --git a/src/app/core/auth/user-downloads/download-monitor/download-monitor.component.ts b/src/app/core/auth/user-downloads/download-monitor/download-monitor.component.ts
@@ -94,6 +94,8 @@ export class DownloadMonitorComponent implements OnInit, OnDestroy {
       } else if
       ((url.indexOf('v1/adverseeventpt') > 0) || (url.indexOf('v1/adverseeventdme') > 0) || (url.indexOf('v1/adverseeventcvm') > 0)) {
         this.type = 'adverseevent';
+      } else if ((url.indexOf('structure') > 0)) {
+        this.type = 'structure'; // set to not browse since links are not valid
       } else {
         this.type = 'browse';
       }

diff --git a/src/app/core/facets-manager/facets-manager.component.ts b/src/app/core/facets-manager/facets-manager.component.ts
@@ -391,7 +391,6 @@ export class FacetsManagerComponent implements OnInit, OnDestroy, AfterViewInit
             newFacets.unshift(newFacets.splice(position, 1)[0]);
           }
         });
-        console.log(newFacets);
         this.facets = newFacets;
         this.setShowAdvancedFacetStates();
         this.facetsLoaded.emit(this.facets.length);
@@ -743,7 +742,6 @@ export class FacetsManagerComponent implements OnInit, OnDestroy, AfterViewInit
       data.view = 'single';
       data['activeName'] = list.split(':')[1];
     }
-    console.log(data);
     const dialogRef = this.dialog.open(UserQueryListDialogComponent, {
       width: '850px',
       autoFocus: false,

diff --git a/src/app/core/substance-form/structure/substance-form-structure-card.component.ts b/src/app/core/substance-form/structure/substance-form-structure-card.component.ts
@@ -58,7 +58,6 @@ export class SubstanceFormStructureCardComponent extends SubstanceFormBase imple
       if (this.substanceType === 'polymer') {
         this.menuLabelUpdate.emit('Idealized Structure');
         const idealStructSubscription = this.substanceFormStructureService.substanceIdealizedStructure.subscribe(structure => {
-          console.log(structure);
           if (structure) {
             this.structure = structure;
           } else {
@@ -75,7 +74,6 @@ export class SubstanceFormStructureCardComponent extends SubstanceFormBase imple
       } else {
         this.menuLabelUpdate.emit('Structure');
         const structSubscription = this.substanceFormStructureService.substanceStructure.subscribe(structure => {
-          console.log(structure);
 
           this.structure = structure;
           this.loadStructure();

diff --git a/src/app/core/substances-browse/substance-summary-card/substance-summary-card.component.html b/src/app/core/substances-browse/substance-summary-card/substance-summary-card.component.html
@@ -11,7 +11,7 @@
         <div style = "font-size:16px; margin-top: -15px; margin-right: -15px;">
             <mat-form-field *ngIf = 'userLists' class = "select-list">
               <mat-label>Add to List</mat-label>
-              <mat-select [(ngModel)]="selectedList" name="Add to List" (selectionChange)="console.log('changed')" >
+              <mat-select [(ngModel)]="selectedList" name="Add to List" >
                 <mat-option *ngFor="let list of userLists" [value]="list">
                   {{list}}
                 </mat-option>
@@ -21,8 +21,8 @@
               <button class = "mat-button" *ngIf = "selectedList" (click) = "addToList()" color = "primary">Add</button>
 
             </span>
-            <span style = "margin-right:50px;">
-                <button class = "mat-button" (click) = "createList()" color = "primary">New List</button>
+            <span style = "margin-right:50px;" >
+                <button class = "mat-button" *ngIf = "canCreate || isAdmin" (click) = "createList()" color = "primary">New List</button>
 
               </span>
 

diff --git a/src/app/core/substances-browse/substance-summary-card/substance-summary-card.component.ts b/src/app/core/substances-browse/substance-summary-card/substance-summary-card.component.ts
@@ -80,7 +80,6 @@ export class SubstanceSummaryCardComponent implements OnInit {
 
   ngOnInit() {
     this.overlayContainer = this.overlayContainerService.getContainerElement();
-    console.log(this.userLists);
 
     this.authService.hasAnyRolesAsync('Updater', 'SuperUpdater', 'Approver', 'admin').pipe(take(1)).subscribe(response => {
       if (response) {

diff --git a/src/app/core/substances-browse/substances-browse.component.ts b/src/app/core/substances-browse/substances-browse.component.ts
@@ -253,7 +253,6 @@ export class SubstancesBrowseComponent implements OnInit, AfterViewInit, OnDestr
       if (auth) {
         this.isLoggedIn = true;
     this.bulkSearchService.getBulkSearchLists().subscribe( result => {
-      console.log(result);
       this.userLists = result.lists;
 
         }, error => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,7 +49,6 @@ export class ImportDialogComponent implements OnInit { @@
       }
       ngOnInit(): void {
-        console.log(this.fieldList);
       }
       switchAction(action?: any) {
@@ Expand Down @@