mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-08 10:34:15 +00:00
85451: Fixed filter syntax
This commit is contained in:
@@ -34,7 +34,8 @@ describe('SearchExportCsvComponent', () => {
|
|||||||
query: 'test-query',
|
query: 'test-query',
|
||||||
filters: [
|
filters: [
|
||||||
new SearchFilter('f.filter1', ['filter1value1,equals', 'filter1value2,equals']),
|
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: '-q', value: searchConfig.query},
|
||||||
{name: '-s', value: searchConfig.scope},
|
{name: '-s', value: searchConfig.scope},
|
||||||
{name: '-c', value: searchConfig.configuration},
|
{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: 'filter2,contains=filter2value1'},
|
||||||
|
{name: '-f', value: 'filter3,equals=[2000 TO 2001]'},
|
||||||
], []);
|
], []);
|
||||||
|
|
||||||
component.searchConfig = null;
|
component.searchConfig = null;
|
||||||
|
@@ -3,7 +3,7 @@ import { PaginatedSearchOptions } from '../paginated-search-options.model';
|
|||||||
import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
|
import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
|
||||||
import { ScriptDataService } from '../../../core/data/processes/script-data.service';
|
import { ScriptDataService } from '../../../core/data/processes/script-data.service';
|
||||||
import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
|
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 { FeatureID } from '../../../core/data/feature-authorization/feature-id';
|
||||||
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
|
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
|
||||||
import { hasValue, isNotEmpty } from '../../empty.util';
|
import { hasValue, isNotEmpty } from '../../empty.util';
|
||||||
@@ -56,7 +56,6 @@ export class SearchExportCsvComponent implements OnInit {
|
|||||||
const isAuthorized$ = this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf);
|
const isAuthorized$ = this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf);
|
||||||
|
|
||||||
this.shouldShowButton$ = observableCombineLatest([scriptExists$, isAuthorized$]).pipe(
|
this.shouldShowButton$ = observableCombineLatest([scriptExists$, isAuthorized$]).pipe(
|
||||||
tap((v) => console.log('showbutton', v)),
|
|
||||||
map(([scriptExists, isAuthorized]: [boolean, boolean]) => scriptExists && isAuthorized)
|
map(([scriptExists, isAuthorized]: [boolean, boolean]) => scriptExists && isAuthorized)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -78,12 +77,21 @@ export class SearchExportCsvComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
if (isNotEmpty(this.searchConfig.filters)) {
|
if (isNotEmpty(this.searchConfig.filters)) {
|
||||||
this.searchConfig.filters.forEach((filter) => {
|
this.searchConfig.filters.forEach((filter) => {
|
||||||
let operator = 'equals';
|
|
||||||
if (hasValue(filter.values)) {
|
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});
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user