From 0f513a06dd0f47f116b6e39b25683af8d5d3459a Mon Sep 17 00:00:00 2001 From: chuanlin2018 Date: Thu, 16 May 2024 17:23:03 -0400 Subject: [PATCH] Fixed search issue - always return all records --- .../app/adv-search/adv-search.component.ts | 30 ++++++++++++++++++- .../search-panel/search-panel.component.html | 2 +- .../search-panel/search-panel.component.ts | 6 ++-- .../app/search/filters/filters.component.ts | 1 - .../app/search/results/results.component.ts | 13 +++++--- .../config-service/config.service.spec.ts | 8 ++--- .../search-service.service.real.ts | 4 ++- .../searchfields-list.service.ts | 30 +------------------ angular/src/assets/environment.json | 4 +-- 9 files changed, 51 insertions(+), 47 deletions(-) diff --git a/angular/src/app/adv-search/adv-search.component.ts b/angular/src/app/adv-search/adv-search.component.ts index 2e1dd833c..948e67843 100644 --- a/angular/src/app/adv-search/adv-search.component.ts +++ b/angular/src/app/adv-search/adv-search.component.ts @@ -95,7 +95,7 @@ export class AdvSearchComponent extends FormCanDeactivate implements OnInit, Aft this.searchFieldsListService.watchFields( (fields) =>{ - this.fields = (fields as SelectItem[]); + this.fields = this.toFieldItems(fields); } ); } @@ -579,4 +579,32 @@ export class AdvSearchComponent extends FormCanDeactivate implements OnInit, Aft this.searchQueryService.saveQueries(this.queries); op.hide(); } + + /** + * Advanced Search fields dropdown + */ + toFieldItems(fields: any[]): SelectItem[] { + // let items: SelectItem[] = []; + // items.push({ label: this.ALL, value: 'searchphrase' }); + let fieldItems: SelectItem[] = []; + for (let field of fields) { + if (_.includes(field.tags, 'searchable')) { + let dup = false; + //For some reason, the filter function does not work for fields. Have to use this loop... + for(let item of fieldItems){ + if(item.label == field.label && item.value == field.name.replace('component.', 'components.')){ + dup = true; + break; + } + } + + if(!dup){ + fieldItems.push({ label: field.label, value: field.name.replace('component.', 'components.') }); + } + } + }; + fieldItems = _.sortBy(fieldItems, ['label', 'value']); + + return fieldItems; + } } diff --git a/angular/src/app/search-panel/search-panel.component.html b/angular/src/app/search-panel/search-panel.component.html index 58946f3ab..993773f58 100644 --- a/angular/src/app/search-panel/search-panel.component.html +++ b/angular/src/app/search-panel/search-panel.component.html @@ -18,7 +18,7 @@

{{title}}

- document.getElementById('searchinput')); - if (!Boolean(this._searchValue.trim())) { - field.value = ' '; - } + field.select(); } /** diff --git a/angular/src/app/search/filters/filters.component.ts b/angular/src/app/search/filters/filters.component.ts index 93efffdd9..5866fe0f1 100644 --- a/angular/src/app/search/filters/filters.component.ts +++ b/angular/src/app/search/filters/filters.component.ts @@ -138,7 +138,6 @@ export class FiltersComponent implements OnInit, AfterViewInit { (fields) => { if(fields.length > 0){ this.toSortItems(fields); - this.queryAndSearch(); } } ) diff --git a/angular/src/app/search/results/results.component.ts b/angular/src/app/search/results/results.component.ts index de8842ff2..c2889ab3b 100644 --- a/angular/src/app/search/results/results.component.ts +++ b/angular/src/app/search/results/results.component.ts @@ -71,10 +71,9 @@ export class ResultsComponent implements OnInit { this.searchFieldsListService.watchFields( (fields) => { - this.filterableFields = this.toSortItems(fields); - - //Convert to a query then search - this.searchSubscription = this.search(null, 1, this.itemsPerPage); + if(fields && fields.length > 0) { + this.filterableFields = this.toSortItems(fields); + } } ) } @@ -106,9 +105,15 @@ export class ResultsComponent implements OnInit { this.searchSubscription = this.search(null, null, this.itemsPerPage); })); + this.searchSubscription = this.search(null, 1, this.itemsPerPage); + this.inited = true; } + ngAfterViewInit(): void { + // this.searchSubscription = this.search(null, 1, this.itemsPerPage); + } + /** * On destroy, unsubscribe all subscriptions */ diff --git a/angular/src/app/shared/config-service/config.service.spec.ts b/angular/src/app/shared/config-service/config.service.spec.ts index 034b63366..8618bd99c 100644 --- a/angular/src/app/shared/config-service/config.service.spec.ts +++ b/angular/src/app/shared/config-service/config.service.spec.ts @@ -41,8 +41,8 @@ describe('AppConfig', () => { service.getRemoteConfig().subscribe( (conf) => { - expect(conf["SERVERBASE"]).toEqual("http://data.nist.gov"); - expect(conf["RMMAPI"]).toEqual("http://data.nist.gov/rmm/"); + expect(conf["SERVERBASE"]).toEqual("https://data.nist.gov"); + expect(conf["RMMAPI"]).toEqual("https://data.nist.gov/rmm/"); expect(conf["SDPAPI"]).toEqual("http://localhost:5555/"); expect(conf.GACODE).toEqual("not-set"); expect(conf.APPVERSION).toEqual("1.3.0"); @@ -59,8 +59,8 @@ describe('AppConfig', () => { service.loadRemoteConfig(); service.getConfig().subscribe( (conf) => { - expect(conf["SERVERBASE"]).toEqual("http://data.nist.gov"); - expect(conf["RMMAPI"]).toEqual("http://data.nist.gov/rmm/"); + expect(conf["SERVERBASE"]).toEqual("https://data.nist.gov"); + expect(conf["RMMAPI"]).toEqual("https://data.nist.gov/rmm/"); expect(conf["SDPAPI"]).toEqual("http://localhost:5555/"); expect(conf.GACODE).toEqual("not-set"); expect(conf.APPVERSION).toEqual("1.3.0"); diff --git a/angular/src/app/shared/search-service/search-service.service.real.ts b/angular/src/app/shared/search-service/search-service.service.real.ts index 6e7ebb236..889e9c2e9 100644 --- a/angular/src/app/shared/search-service/search-service.service.real.ts +++ b/angular/src/app/shared/search-service/search-service.service.real.ts @@ -131,7 +131,8 @@ export class RealSearchService implements SearchService{ url = 'records?'; if(searchPhraseValue) - url += "&" + searchPhraseValue.trim(); + url += searchPhraseValue.trim(); + // url += "&" + searchPhraseValue.trim(); if(sortOrder){ url += '&sort.asc=' + sortOrder; @@ -160,6 +161,7 @@ export class RealSearchService implements SearchService{ url += '&include=ediid,description,title,keyword,topic.tag,contactPoint,components,@type,doi,landingPage&exclude=_id'; } + console.log("Calling back end==============:", url); return this.appConfig.getConfig().pipe( rxjsop.mergeMap((conf) => { return this.http.get(conf.RMMAPI + url); diff --git a/angular/src/app/shared/searchfields-list/searchfields-list.service.ts b/angular/src/app/shared/searchfields-list/searchfields-list.service.ts index c6c2fd3cf..48263c17e 100644 --- a/angular/src/app/shared/searchfields-list/searchfields-list.service.ts +++ b/angular/src/app/shared/searchfields-list/searchfields-list.service.ts @@ -69,7 +69,7 @@ export class SearchfieldsListService { next: (conf) => { this.get(conf.RMMAPI + 'records/fields').subscribe({ next: (res) => { - this.setFields(this.toFieldItems(res)); + this.setFields(res); }, error: (err) => { console.error(err); @@ -83,32 +83,4 @@ export class SearchfieldsListService { } }) } - - /** - * Advanced Search fields dropdown - */ - toFieldItems(fields: any[]): SelectItem[] { - // let items: SelectItem[] = []; - // items.push({ label: this.ALL, value: 'searchphrase' }); - let fieldItems: SelectItem[] = []; - for (let field of fields) { - if (_.includes(field.tags, 'searchable')) { - let dup = false; - //For some reason, the filter function does not work for fields. Have to use this loop... - for(let item of fieldItems){ - if(item.label == field.label && item.value == field.name.replace('component.', 'components.')){ - dup = true; - break; - } - } - - if(!dup){ - fieldItems.push({ label: field.label, value: field.name.replace('component.', 'components.') }); - } - } - }; - fieldItems = _.sortBy(fieldItems, ['label', 'value']); - - return fieldItems; - } } diff --git a/angular/src/assets/environment.json b/angular/src/assets/environment.json index 4765e4580..6a56560ad 100644 --- a/angular/src/assets/environment.json +++ b/angular/src/assets/environment.json @@ -1,6 +1,6 @@ { - "SERVERBASE": "http://data.nist.gov/", - "RMMAPI": "http://data.nist.gov/rmm/", + "SERVERBASE": "https://data.nist.gov/", + "RMMAPI": "https://data.nist.gov/rmm/", "SDPAPI": "http://localhost:5555/", "PDRAPI": "http://localhost:4200/od/id/", "DISTAPI": "http://data.nist.gov/od/ds/",