From 20314d462009dba9a852be10ab59e3fdab5a7708 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 21 Jun 2022 13:37:42 +0200 Subject: [PATCH] [CST-6056] Fix issue with authority suggestion by adding the filter query in the input suggestion object --- .../filter-input-suggestions.component.html | 2 +- .../filter-input-suggestions.component.spec.ts | 2 +- .../filter-input-suggestions.component.ts | 4 ++-- .../input-suggestions/input-suggestions.model.ts | 8 ++++++++ .../search-authority-filter.component.ts | 10 ---------- .../search-facet-filter.component.ts | 11 ++++++----- 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html index 3b150a46c9..726dc9ca0e 100644 --- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html +++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html @@ -27,7 +27,7 @@
- +
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts index 3c55715b06..6a0324d2ac 100644 --- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts +++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts @@ -51,7 +51,7 @@ describe('FilterInputSuggestionsComponent', () => { fixture.detectChanges(); }); it('should call onClickSuggestion() with the suggestion as a parameter', () => { - expect(comp.onClickSuggestion).toHaveBeenCalledWith(suggestions[clickedIndex].value); + expect(comp.onClickSuggestion).toHaveBeenCalledWith(suggestions[clickedIndex]); }); }); }); diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts index ed1a074cd1..ee47dc80c9 100644 --- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts +++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts @@ -32,8 +32,8 @@ export class FilterInputSuggestionsComponent extends InputSuggestionsComponent { this.submitSuggestion.emit(data); } - onClickSuggestion(data) { - this.value = data; + onClickSuggestion(data: InputSuggestion) { + this.value = data.value; this.clickSuggestion.emit(data); this.close(); this.blockReopen = true; diff --git a/src/app/shared/input-suggestions/input-suggestions.model.ts b/src/app/shared/input-suggestions/input-suggestions.model.ts index 840b9af8a0..018d01c7d7 100644 --- a/src/app/shared/input-suggestions/input-suggestions.model.ts +++ b/src/app/shared/input-suggestions/input-suggestions.model.ts @@ -7,6 +7,14 @@ export interface InputSuggestion { */ displayValue: string; + /** + * The search query that can be used with filter suggestion. + * It contains the value within the operator : + * - value,equals + * - value,authority + */ + query?: string; + /** * The actual value of the suggestion */ diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts index fc76f62d95..6dcb47ce9f 100644 --- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts @@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core'; import { FilterType } from '../../../models/filter-type.model'; import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component'; import { renderFacetFor } from '../search-filter-type-decorator'; -import { addOperatorToFilterValue } from '../../../search.utils'; @Component({ selector: 'ds-search-authority-filter', @@ -16,13 +15,4 @@ import { addOperatorToFilterValue } from '../../../search.utils'; */ @renderFacetFor(FilterType.authority) export class SearchAuthorityFilterComponent extends SearchFacetFilterComponent implements OnInit { - - /** - * Submits a selected filter value to the filter - * Adds the "authority" operator to the received data before passing it on - * @param data The string selected from input suggestions - */ - onClick(data: any) { - this.applyFilterValue(addOperatorToFilterValue(data, 'authority')); - } } diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts index c754d80a79..ada1bccd63 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts @@ -29,7 +29,7 @@ import { InputSuggestion } from '../../../../input-suggestions/input-suggestions import { SearchOptions } from '../../../models/search-options.model'; import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; import { currentPath } from '../../../../utils/route.utils'; -import { addOperatorToFilterValue, getFacetValueForType, stripOperatorFromFilterValue } from '../../../search.utils'; +import { getFacetValueForType, stripOperatorFromFilterValue } from '../../../search.utils'; import { createPendingRemoteDataObject } from '../../../../remote-data.utils'; @Component({ @@ -239,11 +239,11 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy { /** * Submits a selected filter value to the filter - * Adds the "equals" operator to the received data before passing it on - * @param data The string selected from input suggestions + * Take the query from the InputSuggestion object + * @param data The input suggestion selected */ - onClick(data: any) { - this.applyFilterValue(addOperatorToFilterValue(data, 'equals')); + onClick(data: InputSuggestion) { + this.applyFilterValue(data.query); } /** @@ -279,6 +279,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy { return rd.payload.page.map((facet) => { return { displayValue: this.getDisplayValue(facet, data), + query: this.getFacetValue(facet), value: stripOperatorFromFilterValue(this.getFacetValue(facet)) }; });