Revert "Revert "change filter processor to be more verbose and have c…

…ompModelType in scope"" This reverts commit be37bee.
formio · Jul 8, 2024 · d5314ae · d5314ae
1 parent df060ba
commit d5314ae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/process/filter/__tests__/filter.test.ts b/src/process/filter/__tests__/filter.test.ts
@@ -23,7 +23,7 @@ it('Should not filter empty array value for dataGrid component', async () => {
     };
     const context: any = generateProcessorContext(dataGridComp, data);
     filterProcessSync(context);
-    expect(context.scope.filter).to.deep.equal({'dataGrid': true});
+    expect(context.scope.filter).to.deep.equal({'dataGrid': {'compModelType': 'array', 'include': true}});
 });
 
 it('Should not filter empty array value for editGrid component', async () => {
@@ -46,7 +46,7 @@ it('Should not filter empty array value for editGrid component', async () => {
     };
     const context: any = generateProcessorContext(editGridComp, data);
     filterProcessSync(context);
-    expect(context.scope.filter).to.deep.equal({'editGrid': true});
+    expect(context.scope.filter).to.deep.equal({'editGrid': {'compModelType': 'array', 'include': true}});
 });
 
 it('Should not filter empty array value for datTable component', async () => {
@@ -69,5 +69,5 @@ it('Should not filter empty array value for datTable component', async () => {
     };
     const context: any = generateProcessorContext(dataTableComp, data);
     filterProcessSync(context);
-    expect(context.scope.filter).to.deep.equal({'dataTable': true});
+    expect(context.scope.filter).to.deep.equal({'dataTable': {'compModelType': 'array', 'include': true}});
 });
diff --git a/src/types/process/filter/FilterScope.ts b/src/types/process/filter/FilterScope.ts
@@ -1,4 +1,8 @@
 import { ProcessorScope } from "..";
 export type FilterScope = {
-    filter: Record<string, any>;
-} & ProcessorScope;
+    filter: Record<string, {
+        compModelType: string;
+        include: boolean;
+        value?: any;
+    }>;
+} & ProcessorScope;