Merge branch 'development_3.0' into precision_new

# Conflicts: # src/app/core/substances-browse/substance-summary-card/substance-summary-card.component.html
ncats · Feb 14, 2024 · b732815 · b732815
2 parents 6ae2c03 + 6c58523
commit b732815
Show file tree

Hide file tree

Showing 36 changed files with 2,382 additions and 1,648 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) {
-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 @@