feat: use object in filter definition

packages/api-aco/__tests__/filter.hooks.test.ts

@@ -8,7 +8,7 @@ const name = "Filter Lifecycle Events";
 const namespace = "demo-lifecycle-events";
 const operation = Operation.AND;
 const groups = [
-    JSON.stringify({
+    {
         operation: Operation.OR,
         filters: [
             {
@@ -17,7 +17,7 @@ const groups = [
                 value: "any-value"
             }
         ]
-    })
+    }
 ];
 
 describe("Filter Lifecycle Events", () => {

packages/api-aco/__tests__/filter.so.test.ts

@@ -252,7 +252,7 @@ describe("`filter` CRUD", () => {
             data: {
                 ...filterMocks.filterA,
                 groups: [
-                    JSON.stringify({
+                    {
                         operation: "",
                         filters: [
                             {
@@ -261,7 +261,7 @@ describe("`filter` CRUD", () => {
                                 value: "any"
                             }
                         ]
-                    })
+                    }
                 ]
             }
         });
@@ -292,10 +292,10 @@ describe("`filter` CRUD", () => {
             data: {
                 ...filterMocks.filterA,
                 groups: [
-                    JSON.stringify({
+                    {
                         operation: Operation.AND,
                         filters: []
-                    })
+                    }
                 ]
             }
         });
@@ -326,7 +326,7 @@ describe("`filter` CRUD", () => {
             data: {
                 ...filterMocks.filterA,
                 groups: [
-                    JSON.stringify({
+                    {
                         operation: Operation.AND,
                         filters: [
                             {
@@ -335,7 +335,7 @@ describe("`filter` CRUD", () => {
                                 value: ""
                             }
                         ]
-                    })
+                    }
                 ]
             }
         });

packages/api-aco/__tests__/graphql/filter.gql.ts

@@ -5,7 +5,14 @@ const DATA_FIELD = /* GraphQL */ `
         description
         namespace
         operation
-        groups
+        groups {
+            operation
+            filters {
+                field
+                condition
+                value
+            }
+        }
         createdBy {
             id
             displayName

packages/api-aco/__tests__/mocks/filter.mock.ts

@@ -8,7 +8,7 @@ export const filterMocks = {
         namespace: "demo-1",
         operation: Operation.AND,
         groups: [
-            JSON.stringify({
+            {
                 operation: Operation.AND,
                 filters: [
                     {
@@ -22,7 +22,7 @@ export const filterMocks = {
                         value: "value 2"
                     }
                 ]
-            })
+            }
         ]
     },
     filterB: {
@@ -32,7 +32,7 @@ export const filterMocks = {
         namespace: "demo-1",
         operation: Operation.OR,
         groups: [
-            JSON.stringify({
+            {
                 operation: Operation.OR,
                 filters: [
                     {
@@ -46,7 +46,7 @@ export const filterMocks = {
                         value: "value 2"
                     }
                 ]
-            })
+            }
         ]
     },
     filterC: {
@@ -56,7 +56,7 @@ export const filterMocks = {
         namespace: "demo-2",
         operation: Operation.AND,
         groups: [
-            JSON.stringify({
+            {
                 operation: Operation.OR,
                 filters: [
                     {
@@ -70,7 +70,7 @@ export const filterMocks = {
                         value: "value 2"
                     }
                 ]
-            })
+            }
         ]
     }
 };

packages/api-aco/package.json

@@ -35,8 +35,7 @@
     "@webiny/pubsub": "0.0.0",
     "@webiny/utils": "0.0.0",
     "@webiny/validation": "0.0.0",
-    "lodash": "^4.4.2",
-    "zod": "^3.21.4"
+    "lodash": "^4.4.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.22.6",

packages/api-aco/src/filter/filter.gql.ts

@@ -1,7 +1,7 @@
 import { ErrorResponse, ListResponse } from "@webiny/handler-graphql/responses";
 import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins/GraphQLSchemaPlugin";
 
-import { checkPermissions } from "~/utils/checkPermissions";
+import { ensureAuthentication } from "~/utils/ensureAuthentication";
 import { resolve } from "~/utils/resolve";
 
 import { AcoContext } from "~/types";
@@ -13,33 +13,55 @@ export const filterSchema = new GraphQLSchemaPlugin<AcoContext>({
             OR
         }
 
+        type GroupFilter {
+            field: String!
+            condition: String!
+            value: String!
+        }
+
+        type Group {
+            operation: OperationEnum!
+            filters: [GroupFilter]!
+        }
+
         type Filter {
             id: ID!
             name: String!
             description: String
             namespace: String!
             operation: OperationEnum!
-            groups: [JSON]!
+            groups: [Group]!
             savedOn: DateTime
             createdOn: DateTime
             createdBy: AcoUser
         }
 
+        input GroupFilterInput {
+            field: String!
+            condition: String!
+            value: String!
+        }
+
+        input GroupInput {
+            operation: OperationEnum!
+            filters: [GroupFilterInput]!
+        }
+
         input FilterCreateInput {
             id: ID!
             name: String!
             description: String
             namespace: String!
             operation: OperationEnum!
-            groups: [JSON]!
+            groups: [GroupInput]!
         }
 
         input FilterUpdateInput {
             name: String
             description: String
             namespace: String
             operation: OperationEnum
-            groups: [JSON]
+            groups: [GroupInput]
         }
 
         input FiltersListWhereInput {
@@ -76,13 +98,13 @@ export const filterSchema = new GraphQLSchemaPlugin<AcoContext>({
         AcoQuery: {
             getFilter: async (_, { id }, context) => {
                 return resolve(() => {
-                    checkPermissions(context);
+                    ensureAuthentication(context);
                     return context.aco.filter.get(id);
                 });
             },
             listFilters: async (_, args: any, context) => {
                 try {
-                    checkPermissions(context);
+                    ensureAuthentication(context);
                     const [entries, meta] = await context.aco.filter.list(args);
                     return new ListResponse(entries, meta);
                 } catch (e) {
@@ -93,19 +115,19 @@ export const filterSchema = new GraphQLSchemaPlugin<AcoContext>({
         AcoMutation: {
             createFilter: async (_, { data }, context) => {
                 return resolve(() => {
-                    checkPermissions(context);
+                    ensureAuthentication(context);
                     return context.aco.filter.create(data);
                 });
             },
             updateFilter: async (_, { id, data }, context) => {
                 return resolve(() => {
-                    checkPermissions(context);
+                    ensureAuthentication(context);
                     return context.aco.filter.update(id, data);
                 });
             },
             deleteFilter: async (_, { id }, context) => {
                 return resolve(() => {
-                    checkPermissions(context);
+                    ensureAuthentication(context);
                     return context.aco.filter.delete(id);
                 });
             }

packages/api-aco/src/filter/filter.model.ts

@@ -1,5 +1,6 @@
 import { createModelField } from "~/utils/createModelField";
 import { CmsPrivateModelFull } from "@webiny/api-headless-cms";
+import { CmsModelField } from "@webiny/api-headless-cms/types";
 
 export type FilterModelDefinition = Omit<CmsPrivateModelFull, "noValidate" | "group">;
 
@@ -63,23 +64,87 @@ const operation = () =>
         ]
     });
 
-const groups = () =>
+const groups = (fields: CmsModelField[]) =>
     createModelField({
         label: "Groups",
         fieldId: "groups",
-        type: "wby-aco-json",
+        type: "object",
         multipleValues: true,
+        settings: {
+            fields,
+            layout: fields.map(field => [field.storageId])
+        },
+        listValidation: [
+            {
+                name: "minLength",
+                message: "At least one group is required.",
+                settings: {
+                    value: "1"
+                }
+            }
+        ]
+    });
+
+const filters = (fields: CmsModelField[]) =>
+    createModelField({
+        label: "Filters",
+        fieldId: "filters",
+        type: "object",
+        multipleValues: true,
+        settings: {
+            fields,
+            layout: fields.map(field => [field.storageId])
+        },
         listValidation: [
             {
                 name: "minLength",
-                message: "Value is too short.",
+                message: "At least one filter is required.",
                 settings: {
                     value: "1"
                 }
             }
         ]
     });
 
+const field = () =>
+    createModelField({
+        label: "Field",
+        fieldId: "field",
+        type: "text",
+        validation: [
+            {
+                name: "required",
+                message: "Value is required."
+            }
+        ]
+    });
+
+const condition = () =>
+    createModelField({
+        label: "Condition",
+        fieldId: "condition",
+        type: "text",
+        validation: [
+            {
+                name: "required",
+                message: "Value is required."
+            }
+        ]
+    });
+
+const value = () =>
+    createModelField({
+        label: "Value",
+        fieldId: "value",
+        type: "text",
+        validation: [
+            {
+                name: "required",
+                message: "Value is required."
+            }
+        ]
+    });
+
 export const FILTER_MODEL_ID = "acoFilter";
 
 export const createFilterModelDefinition = (): FilterModelDefinition => {
@@ -88,7 +153,13 @@ export const createFilterModelDefinition = (): FilterModelDefinition => {
         modelId: FILTER_MODEL_ID,
         titleFieldId: "name",
         layout: [["name"], ["description"], ["namespace"], ["operation"], ["groups"]],
-        fields: [name(), description(), namespace(), operation(), groups()],
+        fields: [
+            name(),
+            description(),
+            namespace(),
+            operation(),
+            groups([operation(), filters([field(), condition(), value()])])
+        ],
         description: "ACO - Filter content model",
         isPrivate: true
     };