hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

90768: Already selected filters were still displayed in the clickable suggestions

Browse Source
This commit is contained in:
Alexandre Vryghem
2022-04-14 10:28:18 +02:00
parent e3172fd6e8
commit 8e5bfc023e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
View File

@@ -162,7 +162,7 @@ describe('SearchFacetSelectedOptionComponent', () => {
comp.removeQueryParams = {}; comp.removeQueryParams = {};
(comp as any).updateRemoveParams(selectedValues); (comp as any).updateRemoveParams(selectedValues);
expect(comp.removeQueryParams).toEqual({ expect(comp.removeQueryParams).toEqual({
[mockFilterConfig.paramName]: [value1], [mockFilterConfig.paramName]: [`${value1},equals`],
['page-id.page']: 1 ['page-id.page']: 1
}); });
}); });

2
src/app/shared/search/search.utils.spec.ts
View File

@@ -37,7 +37,7 @@ describe('Search Utils', () => {
}); });
it('should retrieve the correct value from the search href', () => { it('should retrieve the correct value from the search href', () => {
expect(getFacetValueForType(facetValueWithSearchHref, searchFilterConfig)).toEqual('Value with search href,operator'); expect(getFacetValueForType(facetValueWithSearchHref, searchFilterConfig)).toEqual('Value with search href,equals');
}); });
it('should retrieve the correct value from the Facet', () => { it('should retrieve the correct value from the Facet', () => {

4
src/app/shared/search/search.utils.ts
View File

@@ -9,11 +9,11 @@ import { isNotEmpty } from '../empty.util';
* @param searchFilterConfig * @param searchFilterConfig
*/ */
export function getFacetValueForType(facetValue: FacetValue, searchFilterConfig: SearchFilterConfig): string { export function getFacetValueForType(facetValue: FacetValue, searchFilterConfig: SearchFilterConfig): string {
const regex = new RegExp(`[?|&]${escapeRegExp(searchFilterConfig.paramName)}=(${escapeRegExp(facetValue.value)}[^&]*)`, 'g'); const regex = new RegExp(`[?|&]${escapeRegExp(encodeURIComponent(searchFilterConfig.paramName))}=(${escapeRegExp(encodeURIComponent(facetValue.value))}[^&]*)`, 'g');
if (isNotEmpty(facetValue._links)) { if (isNotEmpty(facetValue._links)) {
const values = regex.exec(facetValue._links.search.href); const values = regex.exec(facetValue._links.search.href);
if (isNotEmpty(values)) { if (isNotEmpty(values)) {
return values[1]; return decodeURIComponent(values[1]);
} }
} }
if (facetValue.authorityKey) { if (facetValue.authorityKey) {