Skip to content

Commit dbbb10f

Browse files
authored
Issue 48298: Align API Filter Operators (#157)
1 parent feceb81 commit dbbb10f

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

src/labkey/filter/Types.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,6 @@ export const Types: Record<string, IFilterType> = {
281281

282282
MEMBER_OF: registerFilterType('Member Of', null, 'memberof', true, undefined, 'Member Of'),
283283

284-
EXP_CHILD_OF: registerFilterType('Is Child Of', null, 'exp:childof', true, undefined, ' is child of'),
285-
EXP_PARENT_OF: registerFilterType('Is Parent Of', null, 'exp:parentof', true, undefined, ' is parent of'),
286-
EXP_LINEAGE_OF: registerFilterType('In The Lineage Of', null, 'exp:lineageof', true, ',', ' in the lineage of'),
287-
288284
//
289285
// These are the 'no data value' operators
290286
//
@@ -348,6 +344,7 @@ export const Types: Record<string, IFilterType> = {
348344
//
349345
// Table/Query-wise operators
350346
//
347+
351348
Q: registerFilterType(
352349
'Search',
353350
null,
@@ -359,11 +356,21 @@ export const Types: Record<string, IFilterType> = {
359356
undefined,
360357
true
361358
),
359+
362360
//
363361
// Ontology operators
364362
//
363+
365364
ONTOLOGY_IN_SUBTREE: registerFilterType('Is In Subtree', null, 'concept:insubtree', true),
366365
ONTOLOGY_NOT_IN_SUBTREE: registerFilterType('Is Not In Subtree', null, 'concept:notinsubtree', true),
366+
367+
//
368+
// Lineage operators
369+
//
370+
371+
EXP_CHILD_OF: registerFilterType('Is Child Of', null, 'exp:childof', true, undefined, ' is child of'),
372+
EXP_PARENT_OF: registerFilterType('Is Parent Of', null, 'exp:parentof', true, undefined, ' is parent of'),
373+
EXP_LINEAGE_OF: registerFilterType('In The Lineage Of', null, 'exp:lineageof', true, ',', ' in the lineage of'),
367374
};
368375

369376
export type JsonType = 'boolean' | 'date' | 'float' | 'int' | 'string';

0 commit comments

Comments
 (0)