feat(Recursive Criteria): Enabling nested search criteria

bullhorn · Jun 17, 2024 · 54d39ab · 54d39ab
1 parent 61fa6f8
commit 54d39ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...s/novo-elements/src/elements/query-builder/criteria-builder/criteria-builder.component.ts b/...s/novo-elements/src/elements/query-builder/criteria-builder/criteria-builder.component.ts
@@ -138,7 +138,7 @@ export class CriteriaBuilderComponent implements OnInit, OnDestroy, AfterContent
     const controls = Object.entries(data).reduce((obj, [key, val]) => {
       return {
         ...obj,
-        [key]: this.formBuilder.array(val.map((it) => this.newCondition(it))),
+        [key]: this.formBuilder.array(val.map((it: Condition) => this.newCondition(it))),
       };
     }, {});
     return this.formBuilder.group(controls);

diff --git a/projects/novo-elements/src/elements/query-builder/query-builder.types.ts b/projects/novo-elements/src/elements/query-builder/query-builder.types.ts
@@ -7,9 +7,11 @@ export enum Conjunction {
 }
 
 export type ConditionGroup = {
-  [K in Conjunction as `$${K}`]?: Condition[]
+  [K in Conjunction as `$${K}`]?: ConditionOrConjunctionGroup[];
 };
 
+export type ConditionOrConjunctionGroup = Condition | ConditionGroup;
+
 export enum Operator {
   after = 'after',
   before = 'before',