Merge pull request #526 from ncats/searchFromEdit

open structure search from edit page
ncats · Jul 23, 2024 · e7adf9f · e7adf9f
2 parents 9769a85 + e01c9f9
commit e7adf9f
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 6 deletions.
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
@@ -1,7 +1,7 @@
 import { Injectable, PLATFORM_ID, Inject } from '@angular/core';
 import { ConfigService } from '../config/config.service';
 import { Auth, Role, UserGroup } from './auth.model';
-import { Observable, Subject } from 'rxjs';
+import { Observable, Subject, of } from 'rxjs';
 import { map, take, catchError } from 'rxjs/operators';
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { isPlatformBrowser } from '@angular/common';
@@ -57,7 +57,11 @@ export class AuthService {
 
   public checkAuth(): Observable<Auth> {
     const url = `${(this.configService.configData && this.configService.configData.apiBaseUrl) || '/'}api/v1/`;
-    return this.http.get<any>(`${url}whoami`);
+    if (this.configService.configData && this.configService.configData.dummyWhoami) {
+      return of(this.configService.configData.dummyWhoami);
+    } else {
+      return this.http.get<any>(`${url}whoami`);
+    }
   }
 
   login(username: string, password: string): Observable<Auth> {
@@ -70,7 +74,12 @@ export class AuthService {
     };
 
     const url = `${(this.configService.configData && this.configService.configData.apiBaseUrl) || '/'}api/v1/`;
-    return this.http.get<Auth>(`${url}whoami`, options).pipe(
+
+    let obs = this.http.get<Auth>(`${url}whoami`, options);
+    if (this.configService.configData && this.configService.configData.dummyWhoami) {
+      obs = of(this.configService.configData.dummyWhoami);
+    }
+    return obs.pipe(
       map(auth => {
         if (auth && auth.computedToken) {
           this._auth = auth;
@@ -295,6 +304,9 @@ export class AuthService {
     return new Observable(observer => {
       this.configService.afterLoad().then(cd => {
         const url = `${(this.configService.configData && this.configService.configData.apiBaseUrl) || '/'}api/v1/`;
+        if (this.configService.configData && this.configService.configData.dummyWhoami) {
+          observer.next(this.configService.configData.dummyWhoami);
+        } else {
         this.http.get<Auth>(`${url}whoami`)
           .subscribe(
             auth => {
@@ -309,6 +321,7 @@ export class AuthService {
             },
             () => observer.complete()
           );
+        }
       });
     });
   }

diff --git a/src/app/core/config/config.model.ts b/src/app/core/config/config.model.ts
@@ -1,3 +1,5 @@
+import { Auth } from "@gsrs-core/auth";
+
 export interface Config {
     apiBaseUrl?: string;
     gsrsHomeBaseUrl?: string;
@@ -78,6 +80,7 @@ export interface Config {
     jsdrawLicense?: boolean;
     disableKetcher?: boolean;
     useApprovalAPI?: boolean;
+    dummyWhoami?: Auth;
 }
 
 export interface StagingAreaSettings {

diff --git a/src/app/core/substance-form/structure/substance-form-structure-card.component.html b/src/app/core/substance-form/structure/substance-form-structure-card.component.html
@@ -32,7 +32,14 @@
         <mat-icon svgIcon="search"></mat-icon>
         Check for duplicates
       </button>
+      <button (click)="structureSearch()" matTooltip="open structure search in new tab" mat-button
+        color="primary" class="dupe-check">
+        <mat-icon svgIcon="search"></mat-icon>
+        Structure Search
+        <mat-icon svgIcon="open_in_new" class = "superscript-icon"></mat-icon>
+      </button>
     </span>
+
     <span class="middle-fill"></span>
     <span class="right-buttons">
       <button mat-button color="primary" matTooltip="Import options" [matMenuTriggerFor]="importMenu">

diff --git a/src/app/core/substance-form/structure/substance-form-structure-card.component.scss b/src/app/core/substance-form/structure/substance-form-structure-card.component.scss
@@ -37,6 +37,9 @@
 
       align-content: flex-start;
       display: flex;
+      button {
+        margin-right:20px;
+      }
     }
   }
 
@@ -104,3 +107,9 @@
 .z-index {
   z-index: 9999 !important;
 }
+
+.superscript-icon {
+  height: 18px;
+  width: 18px;
+  vertical-align: top;
+}
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
@@ -16,7 +16,7 @@ import { Subscription } from 'rxjs';
 import { SubstanceService } from '@gsrs-core/substance/substance.service';
 import { SubstanceFormStructuralUnitsService } from '../structural-units/substance-form-structural-units.service';
 import { SubstanceFormStructureService } from './substance-form-structure.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { StructureEditorComponent } from '@gsrs-core/structure-editor';
 
 @Component({
@@ -48,7 +48,8 @@ export class SubstanceFormStructureCardComponent extends SubstanceFormBase imple
     private gaService: GoogleAnalyticsService,
     private substanceService: SubstanceService,
     private substanceFormStructuralUnitsService: SubstanceFormStructuralUnitsService,
-    private activatedRoute: ActivatedRoute
+    private activatedRoute: ActivatedRoute,
+    private router: Router
   ) {
     super();
   }
@@ -292,6 +293,31 @@ export class SubstanceFormStructureCardComponent extends SubstanceFormBase imple
     });
   }
 
+  structureSearch() {
+    this.loadingService.setLoading(true);
+
+    this.structureService.interpretStructure(this.structure.molfile).subscribe(response => {
+
+      const navigationExtras: NavigationExtras = {
+        queryParams: {
+          structure: response.structure.id
+        }
+      };
+
+     const url = this.router.serializeUrl(
+        this.router.createUrlTree(['/structure-search/'], {
+          queryParams: navigationExtras.queryParams})
+      );
+
+    this.loadingService.setLoading(false);
+    window.open(url, '_blank');
+
+
+    }, error => {
+      this.loadingService.setLoading(false);
+    });
+  }
+
   dismissErrorMessage(index: number) {
     this.structureErrorsArray.splice(index, 1);
   }

diff --git a/src/app/core/substance-form/substance-form.service.ts b/src/app/core/substance-form/substance-form.service.ts
@@ -1442,7 +1442,10 @@ export class SubstanceFormService implements OnDestroy {
       substanceString = JSON.stringify(substanceCopy);
 
       deletedUuids.forEach(uuid => {
-        substanceString = substanceString.replace(new RegExp(`"${uuid}"`, 'g'), '');
+        const pattern = /^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
+        if(pattern.test(uuid)) {
+          substanceString = substanceString.replace(new RegExp(`"${uuid}"`, 'g'), '');
+        }
       });
       substanceString = substanceString.replace(/,[,]+/g, ',');
       substanceString = substanceString.replace(/\[,/g, '[');