Merge pull request #238 from usnistgov/fix/ODD890-advanced-search

Fix/odd890 advanced search

Author: deoyani

angular/src/app/adv-search/adv-search.component.ts

@@ -11,6 +11,7 @@ import { SearchEntity } from '../shared/search-query/search.entity';
 import { FormCanDeactivate } from '../form-can-deactivate/form-can-deactivate';
 import { timer } from 'rxjs/observable/timer';
 import { GoogleAnalyticsService } from '../shared/ga-service/google-analytics.service';
+import { AdvSearchService } from './adv-search.service';
 
 import * as _ from 'lodash';
 
@@ -67,6 +68,7 @@ export class AdvSearchComponent extends FormCanDeactivate implements OnInit {
   queryString: string;
   caretDown = 'faa faa-angle-down';
   placeholder: string;
+  startup: boolean = true;
   placeHolderText: string[] = ['Kinetics database', 'Gallium', '"SRD 101"', 'XPDB', 'Interatomic Potentials'];
 
   @ViewChild('input1') inputEl: ElementRef;
@@ -79,13 +81,14 @@ export class AdvSearchComponent extends FormCanDeactivate implements OnInit {
    * Constructor
    */
   constructor(@Inject(SEARCH_SERVICE) private searchService: SearchService,
-    ngZone: NgZone,
+    public ngZone: NgZone,
     public taxonomyListService: TaxonomyListService,
     public searchFieldsListService: SearchfieldsListService,
     public gaService: GoogleAnalyticsService,
     // public searchService: SearchService,
     private router: Router,
     public searchQueryService: SearchQueryService,
+    public advSearchService: AdvSearchService,
     private confirmationService: ConfirmationService,
     private renderer: Renderer2) {
 
@@ -107,6 +110,16 @@ export class AdvSearchComponent extends FormCanDeactivate implements OnInit {
         this.mobHeight = window.innerHeight;
       });
     };
+
+    // Watch search request from other module
+    this.advSearchService._watchRemoteSearch().subscribe((queryValue) => {
+        // we don't want to execute the query at startup. So always skip the first check 
+        if (!this.startup && queryValue) {
+            this.executeQuery(queryValue);
+        }
+
+        this.startup = false;
+    });
   }
 
 
@@ -267,8 +280,17 @@ export class AdvSearchComponent extends FormCanDeactivate implements OnInit {
    * Advanced Search builder string
    */
   saveSearch() {
+    this.constructSearchString();
+    this.dataChanged = true;
+  }
+
+  /**
+   * Construct the search string
+   */
+  constructSearchString(){
     this.searchValue = '';
     this.queryAdvSearch = 'yes';
+
     for (let i = 0; i < this.rows.length; i++) {
       if (typeof this.rows[i].column1 === 'undefined') {
         this.rows[i].column1 = 'AND';
@@ -292,7 +314,6 @@ export class AdvSearchComponent extends FormCanDeactivate implements OnInit {
         }
       }
     }
-    this.dataChanged = true;
   }
 
   /**
@@ -407,7 +428,7 @@ export class AdvSearchComponent extends FormCanDeactivate implements OnInit {
     this.searchTaxonomyKey = searchTaxonomyKey;
     let params: NavigationExtras = {
       queryParams: {
-        'q': this.searchValue, 'key': this.searchTaxonomyKey ? this.searchTaxonomyKey : '',
+        'q': searchValue, 'key': this.searchTaxonomyKey ? this.searchTaxonomyKey : '',
         'queryAdvSearch': this.queryAdvSearch
       }
     };
@@ -647,7 +668,7 @@ export class AdvSearchComponent extends FormCanDeactivate implements OnInit {
   * Execute query
   */
   executeQuery(queryValue: string) {
-    this.queryString = "/#/search?q=" + queryValue + "&key=&queryAdvSearch=";
-    window.open(this.queryString, '_self');
+    this.searchValue = queryValue;
+    this.search(queryValue, this.searchTaxonomyKey, 'yes');
   }
 }

angular/src/app/adv-search/adv-search.service.spec.ts

@@ -0,0 +1,15 @@
+import { TestBed, inject } from '@angular/core/testing';
+
+import { AdvSearchService } from './adv-search.service';
+
+describe('AdvSearchService', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [AdvSearchService]
+    });
+  });
+
+  it('should be created', inject([AdvSearchService], (service: AdvSearchService) => {
+    expect(service).toBeTruthy();
+  }));
+});

angular/src/app/adv-search/adv-search.service.ts

@@ -0,0 +1,29 @@
+import { Injectable, OnInit } from '@angular/core';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class AdvSearchService implements OnInit {
+
+    constructor() { }
+
+    ngOnInit() {
+    }
+
+    /**
+     * Behavior subject to remotely start the search function. This is used when user clicks on a query
+     * at top right query list.
+     */
+    private _remoteSearch : BehaviorSubject<string> = new BehaviorSubject<string>('');
+    _watchRemoteSearch() {
+        return this._remoteSearch;
+    }
+
+    /**
+     * Trigger the search function
+     */
+    public remoteStartSearch(queryValue) : void {
+        this._remoteSearch.next(queryValue);
+    }
+}

angular/src/app/app.module.ts

@@ -28,6 +28,7 @@ import { RealModule } from '../app/real.module';
 import {enableProdMode} from '@angular/core';
 import {GoogleAnalyticsService} from "./shared/ga-service/google-analytics.service";
 import {GoogleAnalyticsServiceMock} from "./shared/ga-service/google-analytics.service.mock";
+import { AdvSearchService } from './adv-search/adv-search.service';
 
 /**
  * Initialize the configs for backend services
@@ -75,6 +76,7 @@ enableProdMode();
   ],
   providers: [
     HttpClientModule,
+    AdvSearchService,
     GoogleAnalyticsService,
     GoogleAnalyticsServiceMock,
     {

angular/src/app/app.searchtopbar.component.ts

@@ -4,7 +4,7 @@ import { SearchQueryService } from './shared/search-query/search-query.service';
 import { SearchEntity } from './shared/search-query/search.entity';
 import * as _ from 'lodash';
 import { AppConfig, Config } from './shared/config-service/config-service.service';
-
+import { AdvSearchService } from './adv-search/adv-search.service';
 
 @Component({
     selector: 'app-searchtopbar',
@@ -29,8 +29,9 @@ import { AppConfig, Config } from './shared/config-service/config-service.servic
     <p-overlayPanel #op [dismissable]="true" [showCloseIcon]="true">
       <ul class="line-separated" style="list-style-type: none;margin-right:20px">
       <li *ngFor="let entities of searchEntities| slice:0:5;let i = index">
-        <div>
-          <a href="/#/search?q={{entities.data.queryValue}}&key=&queryAdvSearch=" (click) = "op.hide($event)" target="_parent">{{entities.data.id}}</a>
+        <div (click)="op.hide($event); startSearch(entities.data.queryValue)" style="cursor: pointer">
+          <!-- <a href="/#/search?q={{entities.data.queryValue}}&key=&queryAdvSearch=" (click) = "op.hide($event)" target="_parent">{{entities.data.id}}</a> -->
+          {{entities.data.id}}
         </div>
       </li>
       </ul>
@@ -51,6 +52,7 @@ export class SearchTopBarComponent {
   constructor(
     public app: AppComponent, 
     public searchQueryService: SearchQueryService,
+    public advSearchService: AdvSearchService,
     private appConfig: AppConfig) {
 
     this.searchQueryService.watchStorage().subscribe(value => {
@@ -77,4 +79,11 @@ export class SearchTopBarComponent {
     this.app.getSearchQueryList();
   }
 
+  /**
+   * Remote start the search function in advance search page
+   * @param queryValue 
+   */
+  startSearch(queryValue: string) {
+      this.advSearchService.remoteStartSearch(queryValue);
+  }
 }