hostsharing/hs.hsadmin.ng
1
0
Fork 0
Code Activity

#135 [intUI/Filter] filtering non-/empty values possible with '--'/'++'

Browse Source
This commit is contained in:
Michael Hoennig
2019-05-03 12:22:10 +02:00
parent 1a8fb9276e
commit ab88505144
2 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/webapp/app/shared/util/tablefilter.ts
View File

@@ -38,6 +38,11 @@ export class TableFilter<T extends {}> {
let queryCriteria: any = {} as any; let queryCriteria: any = {} as any;
Object.keys(this.criteria).forEach(name => { Object.keys(this.criteria).forEach(name => {
const value = this.criteria[name]; const value = this.criteria[name];
if (value === '--') {
queryCriteria[name + '.specified'] = false;
} else if (value === '++') {
queryCriteria[name + '.specified'] = true;
} else {
const queryDef = this.query[name]; const queryDef = this.query[name];
if (typeof queryDef !== 'function') { if (typeof queryDef !== 'function') {
queryCriteria[queryDef] = value; queryCriteria[queryDef] = value;
@@ -45,6 +50,7 @@ export class TableFilter<T extends {}> {
const additionalQueryCriteria = queryDef(name, value); const additionalQueryCriteria = queryDef(name, value);
queryCriteria = { ...queryCriteria, ...additionalQueryCriteria }; queryCriteria = { ...queryCriteria, ...additionalQueryCriteria };
} }
}
}); });
return queryCriteria; return queryCriteria;
} }

22
src/test/javascript/spec/app/shared/util/tablefilter.spec.ts
View File

@@ -73,6 +73,28 @@ describe('TableFilter Tests', () => {
expect(filter.buildQueryCriteria()).toEqual({ 'name.contains': 'test value' }); expect(filter.buildQueryCriteria()).toEqual({ 'name.contains': 'test value' });
}); });
it('when filter "name" is set to "--", buildQueryCriteria() returns a name.specified=false query', () => {
// given
filter.criteria.name = '--';
// when
const actual = filter.buildQueryCriteria();
// then
expect(filter.buildQueryCriteria()).toEqual({ 'name.specified': false });
});
it('when filter "name" is set to "++", buildQueryCriteria() returns a name.specified=true query', () => {
// given
filter.criteria.name = '++';
// when
const actual = filter.buildQueryCriteria();
// then
expect(filter.buildQueryCriteria()).toEqual({ 'name.specified': true });
});
it('when filter "number" is set, buildQueryCriteria() returns a number.equals query', () => { it('when filter "number" is set, buildQueryCriteria() returns a number.equals query', () => {
// given // given
filter.criteria.number = '-42'; filter.criteria.number = '-42';