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

85451: Fixed filter syntax

Browse Source
This commit is contained in:
Yana De Pauw
2021-12-09 15:09:46 +01:00
parent fffc43f443
commit d8ec0fe9f7
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
View File

@@ -34,7 +34,8 @@ describe('SearchExportCsvComponent', () => {
query: 'test-query',
filters: [
new SearchFilter('f.filter1', ['filter1value1,equals', 'filter1value2,equals']),
new SearchFilter('f.filter2', ['filter2value1,contains'])
new SearchFilter('f.filter2', ['filter2value1,contains']),
new SearchFilter('f.filter3', ['[2000 TO 2001]'], 'equals')
]
});
@@ -134,8 +135,10 @@ describe('SearchExportCsvComponent', () => {
{name: '-q', value: searchConfig.query},
{name: '-s', value: searchConfig.scope},
{name: '-c', value: searchConfig.configuration},
{name: '-f', value: 'filter1,equals=filter1value1,filter1value2'},
{name: '-f', value: 'filter1,equals=filter1value1'},
{name: '-f', value: 'filter1,equals=filter1value2'},
{name: '-f', value: 'filter2,contains=filter2value1'},
{name: '-f', value: 'filter3,equals=[2000 TO 2001]'},
], []);
component.searchConfig = null;

20
src/app/shared/search/search-export-csv/search-export-csv.component.ts
View File

@@ -3,7 +3,7 @@ import { PaginatedSearchOptions } from '../paginated-search-options.model';
import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
import { ScriptDataService } from '../../../core/data/processes/script-data.service';
import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
import { map, tap } from 'rxjs/operators';
import { map } from 'rxjs/operators';
import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
import { hasValue, isNotEmpty } from '../../empty.util';
@@ -56,7 +56,6 @@ export class SearchExportCsvComponent implements OnInit {
const isAuthorized$ = this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf);
this.shouldShowButton$ = observableCombineLatest([scriptExists$, isAuthorized$]).pipe(
tap((v) => console.log('showbutton', v)),
map(([scriptExists, isAuthorized]: [boolean, boolean]) => scriptExists && isAuthorized)
);
}
@@ -78,12 +77,21 @@ export class SearchExportCsvComponent implements OnInit {
}
if (isNotEmpty(this.searchConfig.filters)) {
this.searchConfig.filters.forEach((filter) => {
let operator = 'equals';
if (hasValue(filter.values)) {
operator = filter.values[0].substring(filter.values[0].indexOf(',') + 1);
filter.values.forEach((value) => {
let operator;
let filterValue;
if (hasValue(filter.operator)) {
operator = filter.operator;
filterValue = value;
} else {
operator = value.substring(value.indexOf(',') + 1);
filterValue = value.substring(0, value.indexOf(','));
}
const valueToAdd = `${filter.key.substring(2)},${operator}=${filterValue}`;
parameters.push({name: '-f', value: valueToAdd});
});
}
const filterValue = `${filter.key.substring(2)},${operator}=${filter.values.map((v) => v.substring(0, v.indexOf(','))).join()}`;
parameters.push({name: '-f', value: filterValue});
});
}
}