@webiny/api-aco 0.0.0-unstable.06b2ede40f → 0.0.0-unstable.0d717d18dd

package/filter/filter.gql.js

@@ -1,15 +1,9 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.filterSchema = void 0;
-var _responses = require("@webiny/handler-graphql/responses");
-var _GraphQLSchemaPlugin = require("@webiny/handler-graphql/plugins/GraphQLSchemaPlugin");
-var _ensureAuthentication = require("../utils/ensureAuthentication");
-var _resolve = require("../utils/resolve");
-const filterSchema = exports.filterSchema = new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
-  typeDefs: /* GraphQL */`
+import { ErrorResponse, ListResponse } from "@webiny/api-graphql/responses.js";
+import { ensureAuthentication } from "../utils/ensureAuthentication.js";
+import { resolve } from "../utils/resolve.js";
+import { AcoFilterCrud } from "../features/folder/shared/abstractions.js";
+const addFilterSchema = (builder)=>{
+    builder.addTypeDefs(`
         enum OperationEnum {
             AND
             OR
@@ -98,55 +92,73 @@ const filterSchema = exports.filterSchema = new _GraphQLSchemaPlugin.GraphQLSche
             updateFilter(id: ID!, data: FilterUpdateInput!): FilterResponse
             deleteFilter(id: ID!): AcoBooleanResponse
         }
-    `,
-  resolvers: {
-    AcoQuery: {
-      getFilter: async (_, {
-        id
-      }, context) => {
-        return (0, _resolve.resolve)(() => {
-          (0, _ensureAuthentication.ensureAuthentication)(context);
-          return context.aco.filter.get(id);
-        });
-      },
-      listFilters: async (_, args, context) => {
-        try {
-          (0, _ensureAuthentication.ensureAuthentication)(context);
-          const [entries, meta] = await context.aco.filter.list(args);
-          return new _responses.ListResponse(entries, meta);
-        } catch (e) {
-          return new _responses.ErrorResponse(e);
-        }
-      }
-    },
-    AcoMutation: {
-      createFilter: async (_, {
-        data
-      }, context) => {
-        return (0, _resolve.resolve)(() => {
-          (0, _ensureAuthentication.ensureAuthentication)(context);
-          return context.aco.filter.create(data);
-        });
-      },
-      updateFilter: async (_, {
-        id,
-        data
-      }, context) => {
-        return (0, _resolve.resolve)(() => {
-          (0, _ensureAuthentication.ensureAuthentication)(context);
-          return context.aco.filter.update(id, data);
-        });
-      },
-      deleteFilter: async (_, {
-        id
-      }, context) => {
-        return (0, _resolve.resolve)(() => {
-          (0, _ensureAuthentication.ensureAuthentication)(context);
-          return context.aco.filter.delete(id);
-        });
-      }
-    }
-  }
-});
+    `);
+    builder.addResolver({
+        path: "AcoQuery.getFilter",
+        dependencies: [
+            AcoFilterCrud
+        ],
+        resolver (filterCrud) {
+            return ({ args, context })=>resolve(()=>{
+                    ensureAuthentication(context);
+                    return filterCrud.get(args.id);
+                });
+        }
+    });
+    builder.addResolver({
+        path: "AcoQuery.listFilters",
+        dependencies: [
+            AcoFilterCrud
+        ],
+        resolver (filterCrud) {
+            return async ({ args, context })=>{
+                try {
+                    ensureAuthentication(context);
+                    const [entries, meta] = await filterCrud.list(args);
+                    return new ListResponse(entries, meta);
+                } catch (e) {
+                    return new ErrorResponse(e);
+                }
+            };
+        }
+    });
+    builder.addResolver({
+        path: "AcoMutation.createFilter",
+        dependencies: [
+            AcoFilterCrud
+        ],
+        resolver (filterCrud) {
+            return ({ args, context })=>resolve(()=>{
+                    ensureAuthentication(context);
+                    return filterCrud.create(args.data);
+                });
+        }
+    });
+    builder.addResolver({
+        path: "AcoMutation.updateFilter",
+        dependencies: [
+            AcoFilterCrud
+        ],
+        resolver (filterCrud) {
+            return ({ args, context })=>resolve(()=>{
+                    ensureAuthentication(context);
+                    return filterCrud.update(args.id, args.data);
+                });
+        }
+    });
+    builder.addResolver({
+        path: "AcoMutation.deleteFilter",
+        dependencies: [
+            AcoFilterCrud
+        ],
+        resolver (filterCrud) {
+            return ({ args, context })=>resolve(()=>{
+                    ensureAuthentication(context);
+                    return filterCrud.delete(args.id);
+                });
+        }
+    });
+};
+export { addFilterSchema };
 
 //# sourceMappingURL=filter.gql.js.map

package/filter/filter.gql.js.map

@@ -1 +1 @@
-{"version":3,"names":["_responses","require","_GraphQLSchemaPlugin","_ensureAuthentication","_resolve","filterSchema","exports","GraphQLSchemaPlugin","typeDefs","resolvers","AcoQuery","getFilter","_","id","context","resolve","ensureAuthentication","aco","filter","get","listFilters","args","entries","meta","list","ListResponse","e","ErrorResponse","AcoMutation","createFilter","data","create","updateFilter","update","deleteFilter","delete"],"sources":["filter.gql.ts"],"sourcesContent":["import { ErrorResponse, ListResponse } from \"@webiny/handler-graphql/responses\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins/GraphQLSchemaPlugin\";\n\nimport { ensureAuthentication } from \"~/utils/ensureAuthentication\";\nimport { resolve } from \"~/utils/resolve\";\n\nimport type { AcoContext } from \"~/types\";\n\nexport const filterSchema = new GraphQLSchemaPlugin<AcoContext>({\n    typeDefs: /* GraphQL */ `\n        enum OperationEnum {\n            AND\n            OR\n        }\n\n        type GroupFilter {\n            field: String!\n            condition: String!\n            value: String!\n        }\n\n        type Group {\n            operation: OperationEnum!\n            filters: [GroupFilter]!\n        }\n\n        type Filter {\n            id: ID!\n            name: String!\n            description: String\n            namespace: String!\n            operation: OperationEnum!\n            groups: [Group]!\n            createdOn: DateTime\n            modifiedOn: DateTime\n            savedOn: DateTime\n            createdBy: AcoUser\n            modifiedBy: AcoUser\n            savedBy: AcoUser\n        }\n\n        input GroupFilterInput {\n            field: String!\n            condition: String!\n            value: String!\n        }\n\n        input GroupInput {\n            operation: OperationEnum!\n            filters: [GroupFilterInput]!\n        }\n\n        input FilterCreateInput {\n            id: ID!\n            name: String!\n            description: String\n            namespace: String!\n            operation: OperationEnum!\n            groups: [GroupInput]!\n        }\n\n        input FilterUpdateInput {\n            name: String\n            description: String\n            namespace: String\n            operation: OperationEnum\n            groups: [GroupInput]\n        }\n\n        input FiltersListWhereInput {\n            namespace: String\n        }\n\n        type FilterResponse {\n            data: Filter\n            error: AcoError\n        }\n\n        type FilterListResponse {\n            data: [Filter]\n            error: AcoError\n        }\n\n        extend type AcoQuery {\n            getFilter(id: ID!): FilterResponse\n            listFilters(\n                where: FiltersListWhereInput!\n                limit: Int\n                after: String\n                sort: AcoSort\n            ): FilterListResponse\n        }\n\n        extend type AcoMutation {\n            createFilter(data: FilterCreateInput!): FilterResponse\n            updateFilter(id: ID!, data: FilterUpdateInput!): FilterResponse\n            deleteFilter(id: ID!): AcoBooleanResponse\n        }\n    `,\n    resolvers: {\n        AcoQuery: {\n            getFilter: async (_, { id }, context) => {\n                return resolve(() => {\n                    ensureAuthentication(context);\n                    return context.aco.filter.get(id);\n                });\n            },\n            listFilters: async (_, args: any, context) => {\n                try {\n                    ensureAuthentication(context);\n                    const [entries, meta] = await context.aco.filter.list(args);\n                    return new ListResponse(entries, meta);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            }\n        },\n        AcoMutation: {\n            createFilter: async (_, { data }, context) => {\n                return resolve(() => {\n                    ensureAuthentication(context);\n                    return context.aco.filter.create(data);\n                });\n            },\n            updateFilter: async (_, { id, data }, context) => {\n                return resolve(() => {\n                    ensureAuthentication(context);\n                    return context.aco.filter.update(id, data);\n                });\n            },\n            deleteFilter: async (_, { id }, context) => {\n                return resolve(() => {\n                    ensureAuthentication(context);\n                    return context.aco.filter.delete(id);\n                });\n            }\n        }\n    }\n});\n"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,oBAAA,GAAAD,OAAA;AAEA,IAAAE,qBAAA,GAAAF,OAAA;AACA,IAAAG,QAAA,GAAAH,OAAA;AAIO,MAAMI,YAAY,GAAAC,OAAA,CAAAD,YAAA,GAAG,IAAIE,wCAAmB,CAAa;EAC5DC,QAAQ,EAAE,aAAc;AAC5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;EACDC,SAAS,EAAE;IACPC,QAAQ,EAAE;MACNC,SAAS,EAAE,MAAAA,CAAOC,CAAC,EAAE;QAAEC;MAAG,CAAC,EAAEC,OAAO,KAAK;QACrC,OAAO,IAAAC,gBAAO,EAAC,MAAM;UACjB,IAAAC,0CAAoB,EAACF,OAAO,CAAC;UAC7B,OAAOA,OAAO,CAACG,GAAG,CAACC,MAAM,CAACC,GAAG,CAACN,EAAE,CAAC;QACrC,CAAC,CAAC;MACN,CAAC;MACDO,WAAW,EAAE,MAAAA,CAAOR,CAAC,EAAES,IAAS,EAAEP,OAAO,KAAK;QAC1C,IAAI;UACA,IAAAE,0CAAoB,EAACF,OAAO,CAAC;UAC7B,MAAM,CAACQ,OAAO,EAAEC,IAAI,CAAC,GAAG,MAAMT,OAAO,CAACG,GAAG,CAACC,MAAM,CAACM,IAAI,CAACH,IAAI,CAAC;UAC3D,OAAO,IAAII,uBAAY,CAACH,OAAO,EAAEC,IAAI,CAAC;QAC1C,CAAC,CAAC,OAAOG,CAAC,EAAE;UACR,OAAO,IAAIC,wBAAa,CAACD,CAAC,CAAC;QAC/B;MACJ;IACJ,CAAC;IACDE,WAAW,EAAE;MACTC,YAAY,EAAE,MAAAA,CAAOjB,CAAC,EAAE;QAAEkB;MAAK,CAAC,EAAEhB,OAAO,KAAK;QAC1C,OAAO,IAAAC,gBAAO,EAAC,MAAM;UACjB,IAAAC,0CAAoB,EAACF,OAAO,CAAC;UAC7B,OAAOA,OAAO,CAACG,GAAG,CAACC,MAAM,CAACa,MAAM,CAACD,IAAI,CAAC;QAC1C,CAAC,CAAC;MACN,CAAC;MACDE,YAAY,EAAE,MAAAA,CAAOpB,CAAC,EAAE;QAAEC,EAAE;QAAEiB;MAAK,CAAC,EAAEhB,OAAO,KAAK;QAC9C,OAAO,IAAAC,gBAAO,EAAC,MAAM;UACjB,IAAAC,0CAAoB,EAACF,OAAO,CAAC;UAC7B,OAAOA,OAAO,CAACG,GAAG,CAACC,MAAM,CAACe,MAAM,CAACpB,EAAE,EAAEiB,IAAI,CAAC;QAC9C,CAAC,CAAC;MACN,CAAC;MACDI,YAAY,EAAE,MAAAA,CAAOtB,CAAC,EAAE;QAAEC;MAAG,CAAC,EAAEC,OAAO,KAAK;QACxC,OAAO,IAAAC,gBAAO,EAAC,MAAM;UACjB,IAAAC,0CAAoB,EAACF,OAAO,CAAC;UAC7B,OAAOA,OAAO,CAACG,GAAG,CAACC,MAAM,CAACiB,MAAM,CAACtB,EAAE,CAAC;QACxC,CAAC,CAAC;MACN;IACJ;EACJ;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"filter/filter.gql.js","sources":["../../src/filter/filter.gql.ts"],"sourcesContent":["import { ErrorResponse, ListResponse } from \"@webiny/api-graphql/responses.js\";\nimport type { IGraphQLSchemaBuilder } from \"@webiny/api-graphql/features/GraphQLSchemaBuilder/abstractions.js\";\nimport { ensureAuthentication } from \"~/utils/ensureAuthentication.js\";\nimport { resolve } from \"~/utils/resolve.js\";\nimport { AcoFilterCrud } from \"~/features/folder/shared/abstractions.js\";\n\nexport const addFilterSchema = (builder: IGraphQLSchemaBuilder): void => {\n    builder.addTypeDefs(/* GraphQL */ `\n        enum OperationEnum {\n            AND\n            OR\n        }\n\n        type GroupFilter {\n            field: String!\n            condition: String!\n            value: String!\n        }\n\n        type Group {\n            operation: OperationEnum!\n            filters: [GroupFilter]!\n        }\n\n        type Filter {\n            id: ID!\n            name: String!\n            description: String\n            namespace: String!\n            operation: OperationEnum!\n            groups: [Group]!\n            createdOn: DateTime\n            modifiedOn: DateTime\n            savedOn: DateTime\n            createdBy: AcoUser\n            modifiedBy: AcoUser\n            savedBy: AcoUser\n        }\n\n        input GroupFilterInput {\n            field: String!\n            condition: String!\n            value: String!\n        }\n\n        input GroupInput {\n            operation: OperationEnum!\n            filters: [GroupFilterInput]!\n        }\n\n        input FilterCreateInput {\n            id: ID!\n            name: String!\n            description: String\n            namespace: String!\n            operation: OperationEnum!\n            groups: [GroupInput]!\n        }\n\n        input FilterUpdateInput {\n            name: String\n            description: String\n            namespace: String\n            operation: OperationEnum\n            groups: [GroupInput]\n        }\n\n        input FiltersListWhereInput {\n            namespace: String\n        }\n\n        type FilterResponse {\n            data: Filter\n            error: AcoError\n        }\n\n        type FilterListResponse {\n            data: [Filter]\n            error: AcoError\n        }\n\n        extend type AcoQuery {\n            getFilter(id: ID!): FilterResponse\n            listFilters(\n                where: FiltersListWhereInput!\n                limit: Int\n                after: String\n                sort: AcoSort\n            ): FilterListResponse\n        }\n\n        extend type AcoMutation {\n            createFilter(data: FilterCreateInput!): FilterResponse\n            updateFilter(id: ID!, data: FilterUpdateInput!): FilterResponse\n            deleteFilter(id: ID!): AcoBooleanResponse\n        }\n    `);\n\n    builder.addResolver({\n        path: \"AcoQuery.getFilter\",\n        dependencies: [AcoFilterCrud],\n        resolver(filterCrud) {\n            return ({ args, context }) =>\n                resolve(() => {\n                    ensureAuthentication(context);\n                    return filterCrud.get(args.id);\n                });\n        }\n    });\n\n    builder.addResolver({\n        path: \"AcoQuery.listFilters\",\n        dependencies: [AcoFilterCrud],\n        resolver(filterCrud) {\n            return async ({ args, context }) => {\n                try {\n                    ensureAuthentication(context);\n                    const [entries, meta] = await filterCrud.list(args);\n                    return new ListResponse(entries, meta);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            };\n        }\n    });\n\n    builder.addResolver({\n        path: \"AcoMutation.createFilter\",\n        dependencies: [AcoFilterCrud],\n        resolver(filterCrud) {\n            return ({ args, context }) =>\n                resolve(() => {\n                    ensureAuthentication(context);\n                    return filterCrud.create(args.data);\n                });\n        }\n    });\n\n    builder.addResolver({\n        path: \"AcoMutation.updateFilter\",\n        dependencies: [AcoFilterCrud],\n        resolver(filterCrud) {\n            return ({ args, context }) =>\n                resolve(() => {\n                    ensureAuthentication(context);\n                    return filterCrud.update(args.id, args.data);\n                });\n        }\n    });\n\n    builder.addResolver({\n        path: \"AcoMutation.deleteFilter\",\n        dependencies: [AcoFilterCrud],\n        resolver(filterCrud) {\n            return ({ args, context }) =>\n                resolve(() => {\n                    ensureAuthentication(context);\n                    return filterCrud.delete(args.id);\n                });\n        }\n    });\n};\n"],"names":["addFilterSchema","builder","AcoFilterCrud","filterCrud","args","context","resolve","ensureAuthentication","entries","meta","ListResponse","e","ErrorResponse"],"mappings":";;;;AAMO,MAAMA,kBAAkB,CAACC;IAC5BA,QAAQ,WAAW,CAAe,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAyFnC,CAAC;IAEDA,QAAQ,WAAW,CAAC;QAChB,MAAM;QACN,cAAc;YAACC;SAAc;QAC7B,UAASC,UAAU;YACf,OAAO,CAAC,EAAEC,IAAI,EAAEC,OAAO,EAAE,GACrBC,QAAQ;oBACJC,qBAAqBF;oBACrB,OAAOF,WAAW,GAAG,CAACC,KAAK,EAAE;gBACjC;QACR;IACJ;IAEAH,QAAQ,WAAW,CAAC;QAChB,MAAM;QACN,cAAc;YAACC;SAAc;QAC7B,UAASC,UAAU;YACf,OAAO,OAAO,EAAEC,IAAI,EAAEC,OAAO,EAAE;gBAC3B,IAAI;oBACAE,qBAAqBF;oBACrB,MAAM,CAACG,SAASC,KAAK,GAAG,MAAMN,WAAW,IAAI,CAACC;oBAC9C,OAAO,IAAIM,aAAaF,SAASC;gBACrC,EAAE,OAAOE,GAAG;oBACR,OAAO,IAAIC,cAAcD;gBAC7B;YACJ;QACJ;IACJ;IAEAV,QAAQ,WAAW,CAAC;QAChB,MAAM;QACN,cAAc;YAACC;SAAc;QAC7B,UAASC,UAAU;YACf,OAAO,CAAC,EAAEC,IAAI,EAAEC,OAAO,EAAE,GACrBC,QAAQ;oBACJC,qBAAqBF;oBACrB,OAAOF,WAAW,MAAM,CAACC,KAAK,IAAI;gBACtC;QACR;IACJ;IAEAH,QAAQ,WAAW,CAAC;QAChB,MAAM;QACN,cAAc;YAACC;SAAc;QAC7B,UAASC,UAAU;YACf,OAAO,CAAC,EAAEC,IAAI,EAAEC,OAAO,EAAE,GACrBC,QAAQ;oBACJC,qBAAqBF;oBACrB,OAAOF,WAAW,MAAM,CAACC,KAAK,EAAE,EAAEA,KAAK,IAAI;gBAC/C;QACR;IACJ;IAEAH,QAAQ,WAAW,CAAC;QAChB,MAAM;QACN,cAAc;YAACC;SAAc;QAC7B,UAASC,UAAU;YACf,OAAO,CAAC,EAAEC,IAAI,EAAEC,OAAO,EAAE,GACrBC,QAAQ;oBACJC,qBAAqBF;oBACrB,OAAOF,WAAW,MAAM,CAACC,KAAK,EAAE;gBACpC;QACR;IACJ;AACJ"}

package/filter/filter.model.d.ts

@@ -1,2 +1,9 @@
-export declare const FILTER_MODEL_ID = "acoFilter";
-export declare const createFilterModel: () => import("@webiny/api-headless-cms").CmsPrivateModelFull;
+import { ModelFactory } from "@webiny/api-headless-cms/features/modelBuilder/index.js";
+export declare const FILTER_MODEL_ID: string;
+declare class FilterPrivateModelImpl implements ModelFactory.Interface {
+    execute(builder: ModelFactory.Builder): Promise<import("@webiny/api-headless-cms/features/modelBuilder/index.js").PrivateModelBuilder[]>;
+}
+export declare const FilterPrivateModel: typeof FilterPrivateModelImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-headless-cms/features/modelBuilder/abstractions").IModelFactory>;
+};
+export {};

package/filter/filter.model.js

@@ -1,124 +1,50 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createFilterModel = exports.FILTER_MODEL_ID = void 0;
-var _createModelField = require("../utils/createModelField");
-var _apiHeadlessCms = require("@webiny/api-headless-cms");
-const name = () => (0, _createModelField.createModelField)({
-  label: "Name",
-  fieldId: "name",
-  type: "text",
-  validation: [{
-    name: "required",
-    message: "Value is required."
-  }]
-});
-const description = () => (0, _createModelField.createModelField)({
-  label: "Description",
-  fieldId: "description",
-  type: "text"
-});
-const namespace = () => (0, _createModelField.createModelField)({
-  label: "Model Id",
-  fieldId: "namespace",
-  type: "text",
-  validation: [{
-    name: "required",
-    message: "Value is required."
-  }]
-});
-const operation = () => (0, _createModelField.createModelField)({
-  label: "Operation",
-  fieldId: "operation",
-  type: "text",
-  predefinedValues: {
-    enabled: true,
-    values: [{
-      label: "AND",
-      value: "AND"
-    }, {
-      label: "OR",
-      value: "OR"
-    }]
-  },
-  multipleValues: false,
-  validation: [{
-    name: "required",
-    message: "Value is required."
-  }]
-});
-const groups = fields => (0, _createModelField.createModelField)({
-  label: "Groups",
-  fieldId: "groups",
-  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"
+import { ModelFactory } from "@webiny/api-headless-cms/features/modelBuilder/index.js";
+const FILTER_MODEL_ID = process.env.WEBINY_API_LEGACY_MODELS ? "acoFilter" : "wbyAcoFilter";
+class FilterPrivateModelImpl {
+    async execute(builder) {
+        return [
+            builder.private({
+                modelId: FILTER_MODEL_ID,
+                name: "ACO - Filter"
+            }).fields((fields)=>({
+                    name: fields.text().label("Name").required(),
+                    description: fields.text().label("Description"),
+                    namespace: fields.text().label("Model Id").required(),
+                    operation: fields.text().label("Operation").required().predefinedValues([
+                        {
+                            label: "AND",
+                            value: "AND"
+                        },
+                        {
+                            label: "OR",
+                            value: "OR"
+                        }
+                    ]),
+                    groups: fields.object().label("Groups").list().listMinLength(1, "At least one group is required.").fields((fields)=>({
+                            operation: fields.text().label("Operation").required().predefinedValues([
+                                {
+                                    label: "AND",
+                                    value: "AND"
+                                },
+                                {
+                                    label: "OR",
+                                    value: "OR"
+                                }
+                            ]),
+                            filters: fields.object().label("Filters").list().listMinLength(1, "At least one filter is required.").fields((filterFields)=>({
+                                    field: filterFields.text().label("Field").required(),
+                                    condition: filterFields.text().label("Condition").required(),
+                                    value: filterFields.text().label("Value").required()
+                                }))
+                        }))
+                }))
+        ];
     }
-  }]
-});
-const filters = fields => (0, _createModelField.createModelField)({
-  label: "Filters",
-  fieldId: "filters",
-  type: "object",
-  multipleValues: true,
-  settings: {
-    fields,
-    layout: fields.map(field => [field.storageId])
-  },
-  listValidation: [{
-    name: "minLength",
-    message: "At least one filter is required.",
-    settings: {
-      value: "1"
-    }
-  }]
-});
-const field = () => (0, _createModelField.createModelField)({
-  label: "Field",
-  fieldId: "field",
-  type: "text",
-  validation: [{
-    name: "required",
-    message: "Value is required."
-  }]
-});
-const condition = () => (0, _createModelField.createModelField)({
-  label: "Condition",
-  fieldId: "condition",
-  type: "text",
-  validation: [{
-    name: "required",
-    message: "Value is required."
-  }]
-});
-const value = () => (0, _createModelField.createModelField)({
-  label: "Value",
-  fieldId: "value",
-  type: "text",
-  validation: [{
-    name: "required",
-    message: "Value is required."
-  }]
+}
+const FilterPrivateModel = ModelFactory.createImplementation({
+    implementation: FilterPrivateModelImpl,
+    dependencies: []
 });
-const FILTER_MODEL_ID = exports.FILTER_MODEL_ID = "acoFilter";
-const createFilterModel = () => {
-  return (0, _apiHeadlessCms.createPrivateModel)({
-    name: "ACO - Filter",
-    modelId: FILTER_MODEL_ID,
-    titleFieldId: "name",
-    fields: [name(), description(), namespace(), operation(), groups([operation(), filters([field(), condition(), value()])])]
-  });
-};
-exports.createFilterModel = createFilterModel;
+export { FILTER_MODEL_ID, FilterPrivateModel };
 
 //# sourceMappingURL=filter.model.js.map

package/filter/filter.model.js.map

@@ -1 +1 @@
-{"version":3,"names":["_createModelField","require","_apiHeadlessCms","name","createModelField","label","fieldId","type","validation","message","description","namespace","operation","predefinedValues","enabled","values","value","multipleValues","groups","fields","settings","layout","map","field","storageId","listValidation","filters","condition","FILTER_MODEL_ID","exports","createFilterModel","createPrivateModel","modelId","titleFieldId"],"sources":["filter.model.ts"],"sourcesContent":["import { createModelField } from \"~/utils/createModelField\";\nimport { createPrivateModel } from \"@webiny/api-headless-cms\";\nimport type { CmsModelField } from \"@webiny/api-headless-cms/types\";\n\nconst name = () =>\n    createModelField({\n        label: \"Name\",\n        fieldId: \"name\",\n        type: \"text\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst description = () =>\n    createModelField({\n        label: \"Description\",\n        fieldId: \"description\",\n        type: \"text\"\n    });\n\nconst namespace = () =>\n    createModelField({\n        label: \"Model Id\",\n        fieldId: \"namespace\",\n        type: \"text\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst operation = () =>\n    createModelField({\n        label: \"Operation\",\n        fieldId: \"operation\",\n        type: \"text\",\n        predefinedValues: {\n            enabled: true,\n            values: [\n                {\n                    label: \"AND\",\n                    value: \"AND\"\n                },\n                {\n                    label: \"OR\",\n                    value: \"OR\"\n                }\n            ]\n        },\n        multipleValues: false,\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst groups = (fields: CmsModelField[]) =>\n    createModelField({\n        label: \"Groups\",\n        fieldId: \"groups\",\n        type: \"object\",\n        multipleValues: true,\n        settings: {\n            fields,\n            layout: fields.map(field => [field.storageId])\n        },\n        listValidation: [\n            {\n                name: \"minLength\",\n                message: \"At least one group is required.\",\n                settings: {\n                    value: \"1\"\n                }\n            }\n        ]\n    });\n\nconst filters = (fields: CmsModelField[]) =>\n    createModelField({\n        label: \"Filters\",\n        fieldId: \"filters\",\n        type: \"object\",\n        multipleValues: true,\n        settings: {\n            fields,\n            layout: fields.map(field => [field.storageId])\n        },\n        listValidation: [\n            {\n                name: \"minLength\",\n                message: \"At least one filter is required.\",\n                settings: {\n                    value: \"1\"\n                }\n            }\n        ]\n    });\n\nconst field = () =>\n    createModelField({\n        label: \"Field\",\n        fieldId: \"field\",\n        type: \"text\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst condition = () =>\n    createModelField({\n        label: \"Condition\",\n        fieldId: \"condition\",\n        type: \"text\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst value = () =>\n    createModelField({\n        label: \"Value\",\n        fieldId: \"value\",\n        type: \"text\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nexport const FILTER_MODEL_ID = \"acoFilter\";\n\nexport const createFilterModel = () => {\n    return createPrivateModel({\n        name: \"ACO - Filter\",\n        modelId: FILTER_MODEL_ID,\n        titleFieldId: \"name\",\n        fields: [\n            name(),\n            description(),\n            namespace(),\n            operation(),\n            groups([operation(), filters([field(), condition(), value()])])\n        ]\n    });\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"filter/filter.model.js","sources":["../../src/filter/filter.model.ts"],"sourcesContent":["import { ModelFactory } from \"@webiny/api-headless-cms/features/modelBuilder/index.js\";\n\nexport const FILTER_MODEL_ID = process.env.WEBINY_API_LEGACY_MODELS ? \"acoFilter\" : \"wbyAcoFilter\";\n\nclass FilterPrivateModelImpl implements ModelFactory.Interface {\n    public async execute(builder: ModelFactory.Builder) {\n        return [\n            builder\n                .private({\n                    modelId: FILTER_MODEL_ID,\n                    name: \"ACO - Filter\"\n                })\n                .fields(fields => ({\n                    name: fields.text().label(\"Name\").required(),\n                    description: fields.text().label(\"Description\"),\n                    namespace: fields.text().label(\"Model Id\").required(),\n                    operation: fields\n                        .text()\n                        .label(\"Operation\")\n                        .required()\n                        .predefinedValues([\n                            {\n                                label: \"AND\",\n                                value: \"AND\"\n                            },\n                            {\n                                label: \"OR\",\n                                value: \"OR\"\n                            }\n                        ]),\n                    groups: fields\n                        .object()\n                        .label(\"Groups\")\n                        .list()\n                        .listMinLength(1, \"At least one group is required.\")\n                        .fields(fields => ({\n                            operation: fields\n                                .text()\n                                .label(\"Operation\")\n                                .required()\n                                .predefinedValues([\n                                    {\n                                        label: \"AND\",\n                                        value: \"AND\"\n                                    },\n                                    {\n                                        label: \"OR\",\n                                        value: \"OR\"\n                                    }\n                                ]),\n                            filters: fields\n                                .object()\n                                .label(\"Filters\")\n                                .list()\n                                .listMinLength(1, \"At least one filter is required.\")\n                                .fields(filterFields => ({\n                                    field: filterFields.text().label(\"Field\").required(),\n                                    condition: filterFields.text().label(\"Condition\").required(),\n                                    value: filterFields.text().label(\"Value\").required()\n                                }))\n                        }))\n                }))\n        ];\n    }\n}\n\nexport const FilterPrivateModel = ModelFactory.createImplementation({\n    implementation: FilterPrivateModelImpl,\n    dependencies: []\n});\n"],"names":["FILTER_MODEL_ID","process","FilterPrivateModelImpl","builder","fields","filterFields","FilterPrivateModel","ModelFactory"],"mappings":";AAEO,MAAMA,kBAAkBC,QAAQ,GAAG,CAAC,wBAAwB,GAAG,cAAc;AAEpF,MAAMC;IACF,MAAa,QAAQC,OAA6B,EAAE;QAChD,OAAO;YACHA,QACK,OAAO,CAAC;gBACL,SAASH;gBACT,MAAM;YACV,GACC,MAAM,CAACI,CAAAA,SAAW;oBACf,MAAMA,OAAO,IAAI,GAAG,KAAK,CAAC,QAAQ,QAAQ;oBAC1C,aAAaA,OAAO,IAAI,GAAG,KAAK,CAAC;oBACjC,WAAWA,OAAO,IAAI,GAAG,KAAK,CAAC,YAAY,QAAQ;oBACnD,WAAWA,OACN,IAAI,GACJ,KAAK,CAAC,aACN,QAAQ,GACR,gBAAgB,CAAC;wBACd;4BACI,OAAO;4BACP,OAAO;wBACX;wBACA;4BACI,OAAO;4BACP,OAAO;wBACX;qBACH;oBACL,QAAQA,OACH,MAAM,GACN,KAAK,CAAC,UACN,IAAI,GACJ,aAAa,CAAC,GAAG,mCACjB,MAAM,CAACA,CAAAA,SAAW;4BACf,WAAWA,OACN,IAAI,GACJ,KAAK,CAAC,aACN,QAAQ,GACR,gBAAgB,CAAC;gCACd;oCACI,OAAO;oCACP,OAAO;gCACX;gCACA;oCACI,OAAO;oCACP,OAAO;gCACX;6BACH;4BACL,SAASA,OACJ,MAAM,GACN,KAAK,CAAC,WACN,IAAI,GACJ,aAAa,CAAC,GAAG,oCACjB,MAAM,CAACC,CAAAA,eAAiB;oCACrB,OAAOA,aAAa,IAAI,GAAG,KAAK,CAAC,SAAS,QAAQ;oCAClD,WAAWA,aAAa,IAAI,GAAG,KAAK,CAAC,aAAa,QAAQ;oCAC1D,OAAOA,aAAa,IAAI,GAAG,KAAK,CAAC,SAAS,QAAQ;gCACtD;wBACR;gBACR;SACP;IACL;AACJ;AAEO,MAAMC,qBAAqBC,aAAa,oBAAoB,CAAC;IAChE,gBAAgBL;IAChB,cAAc,EAAE;AACpB"}

package/filter/filter.so.d.ts

@@ -1,3 +1,11 @@
-import type { CreateAcoStorageOperationsParams } from "../createAcoStorageOperations";
-import type { AcoFilterStorageOperations } from "./filter.types";
-export declare const createFilterOperations: (params: CreateAcoStorageOperationsParams) => AcoFilterStorageOperations;
+import type { HeadlessCms } from "@webiny/api-headless-cms/types/index.js";
+import type { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/abstractions.js";
+import type { Container } from "@webiny/di";
+interface CreateFilterOperationsParams {
+    cms: HeadlessCms;
+    identityContext: IdentityContext.Interface;
+    container: Container;
+}
+import type { AcoFilterStorageOperations } from "./filter.types.js";
+export declare const createFilterOperations: (params: CreateFilterOperationsParams) => AcoFilterStorageOperations;
+export {};

package/filter/filter.so.js

@@ -1,98 +1,84 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createFilterOperations = void 0;
-var _omit = _interopRequireDefault(require("lodash/omit"));
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _filter = require("./filter.model");
-var _createListSort = require("../utils/createListSort");
-var _createOperationsWrapper = require("../utils/createOperationsWrapper");
-var _pickEntryFieldValues = require("../utils/pickEntryFieldValues");
-var _constants = require("@webiny/api-headless-cms/constants");
-const createFilterOperations = params => {
-  const {
-    cms,
-    security
-  } = params;
-  const {
-    withModel
-  } = (0, _createOperationsWrapper.createOperationsWrapper)({
-    ...params,
-    modelName: _filter.FILTER_MODEL_ID
-  });
-  return {
-    getFilter({
-      id
-    }) {
-      return withModel(async model => {
-        const entry = await cms.getEntryById(model, id);
-        if (!entry) {
-          throw new _error.default("Could not load filter.", "GET_FILTER_ERROR", {
-            id
-          });
+import omit from "lodash/omit.js";
+import error from "@webiny/error";
+import { FILTER_MODEL_ID } from "./filter.model.js";
+import { createListSort } from "../utils/createListSort.js";
+import { createOperationsWrapper } from "../utils/createOperationsWrapper.js";
+import { pickEntryFieldValues } from "../utils/pickEntryFieldValues.js";
+import { ENTRY_META_FIELDS } from "@webiny/api-headless-cms/constants.js";
+import { CmsSortMapper, CmsWhereMapper } from "@webiny/api-headless-cms";
+const createFilterOperations = (params)=>{
+    const { cms, identityContext, container } = params;
+    const { withModel } = createOperationsWrapper({
+        ...params,
+        modelName: FILTER_MODEL_ID
+    });
+    const cmsWhereMapper = container.resolve(CmsWhereMapper);
+    const cmsSortMapper = container.resolve(CmsSortMapper);
+    return {
+        getFilter ({ id }) {
+            return withModel(async (model)=>{
+                const entry = await cms.getEntryById(model, id);
+                if (!entry) throw new error("Could not load filter.", "GET_FILTER_ERROR", {
+                    id
+                });
+                return pickEntryFieldValues(entry);
+            });
+        },
+        listFilters (params) {
+            return withModel(async (model)=>{
+                const { sort, where } = params;
+                const createdBy = identityContext.getIdentity().id;
+                const [entries, meta] = await cms.listLatestEntries(model, {
+                    ...params,
+                    sort: cmsSortMapper.map({
+                        input: createListSort(sort),
+                        fields: model.fields
+                    }),
+                    where: cmsWhereMapper.map({
+                        input: {
+                            ...where,
+                            createdBy
+                        },
+                        fields: model.fields
+                    })
+                });
+                return [
+                    entries.map(pickEntryFieldValues),
+                    meta
+                ];
+            });
+        },
+        createFilter ({ data }) {
+            return withModel(async (model)=>{
+                const entry = await cms.createEntry(model, {
+                    id: data.id,
+                    values: data
+                });
+                return pickEntryFieldValues(entry);
+            });
+        },
+        updateFilter ({ id, data }) {
+            return withModel(async (model)=>{
+                const original = await cms.getEntryById(model, id);
+                const input = {
+                    ...omit(original, ENTRY_META_FIELDS),
+                    values: {
+                        ...original.values,
+                        ...data
+                    }
+                };
+                const entry = await cms.updateEntry(model, original.id, input);
+                return pickEntryFieldValues(entry);
+            });
+        },
+        deleteFilter ({ id }) {
+            return withModel(async (model)=>{
+                await cms.deleteEntry(model, id);
+                return true;
+            });
         }
-        return (0, _pickEntryFieldValues.pickEntryFieldValues)(entry);
-      });
-    },
-    listFilters(params) {
-      return withModel(async model => {
-        const {
-          sort,
-          where
-        } = params;
-        const createdBy = security.getIdentity().id;
-        const [entries, meta] = await cms.listLatestEntries(model, {
-          ...params,
-          sort: (0, _createListSort.createListSort)(sort),
-          where: {
-            ...({
-              ...where,
-              createdBy
-            } || {})
-          }
-        });
-        return [entries.map(_pickEntryFieldValues.pickEntryFieldValues), meta];
-      });
-    },
-    createFilter({
-      data
-    }) {
-      return withModel(async model => {
-        const entry = await cms.createEntry(model, data);
-        return (0, _pickEntryFieldValues.pickEntryFieldValues)(entry);
-      });
-    },
-    updateFilter({
-      id,
-      data
-    }) {
-      return withModel(async model => {
-        const original = await cms.getEntryById(model, id);
-        const input = {
-          /**
-           *  We are omitting the standard entry meta fields:
-           *  we don't want to override them with the ones coming from the `original` entry.
-           */
-          ...(0, _omit.default)(original, _constants.ENTRY_META_FIELDS),
-          ...data
-        };
-        const entry = await cms.updateEntry(model, original.id, input);
-        return (0, _pickEntryFieldValues.pickEntryFieldValues)(entry);
-      });
-    },
-    deleteFilter({
-      id
-    }) {
-      return withModel(async model => {
-        await cms.deleteEntry(model, id);
-        return true;
-      });
-    }
-  };
+    };
 };
-exports.createFilterOperations = createFilterOperations;
+export { createFilterOperations };
 
 //# sourceMappingURL=filter.so.js.map