@webiny/api-aco 0.0.0-unstable.bca7b3e350 → 0.0.0-unstable.c59b9cc5b9

package/README.md

@@ -18,16 +18,16 @@ yarn add @webiny/api-aco
 ```
 ## Testing
 
-To run tests api-apw tests with targeted storage operations loaded use:
+To run tests api-aco tests with targeted storage operations loaded use:
 
 ### DynamoDB
 
 ```
-yarn test packages/api-aco --keyword=cms:ddb --keyword=aco:base
+yarn test packages/api-aco/* --keyword=cms:ddb --keyword=aco:base
 ```
 
-#### Note
+### DynamoDB + ElasticSearch
 
-> All the tests in `@webiny/api-aco` package are being tested against ddb-only storage operations because
-current jest setup doesn't allow usage of more than one storage operations at a time with the help of --keyword flag.
-We should revisit these tests once we have the ability to load multiple storage operations in the jest setup.
+```
+yarn test packages/api-aco/* --keyword=cms:ddb-es --keyword=aco:base
+```

package/createAcoFields.js

@@ -9,8 +9,8 @@ const jsonField = {
   name: "cms-model-field-to-graphql-json",
   type: "cms-model-field-to-graphql",
   fieldType: "wby-aco-json",
-  isSortable: false,
-  isSearchable: false,
+  isSortable: true,
+  isSearchable: true,
   read: {
     createTypeField({
       field

package/createAcoFields.js.map

@@ -1 +1 @@
-{"version":3,"names":["jsonField","name","type","fieldType","isSortable","isSearchable","read","createTypeField","field","fieldId","createGetFilters","manage","createInputField","createAcoFields"],"sources":["createAcoFields.ts"],"sourcesContent":["import { CmsModelFieldToGraphQLPlugin } from \"@webiny/api-headless-cms/types\";\n\n// Creating an internal JSON field, we are using it inside the `record` type\nconst jsonField: CmsModelFieldToGraphQLPlugin = {\n    name: \"cms-model-field-to-graphql-json\",\n    type: \"cms-model-field-to-graphql\",\n    fieldType: \"wby-aco-json\",\n    isSortable: false,\n    isSearchable: false,\n    read: {\n        createTypeField({ field }) {\n            return `${field.fieldId}: JSON`;\n        },\n        createGetFilters({ field }) {\n            return `${field.fieldId}: JSON`;\n        }\n    },\n    manage: {\n        createTypeField({ field }) {\n            return `${field.fieldId}: JSON`;\n        },\n        createInputField({ field }) {\n            return field.fieldId + \": JSON\";\n        }\n    }\n};\n\nexport const createAcoFields = (): CmsModelFieldToGraphQLPlugin[] => [jsonField];\n"],"mappings":";;;;;;AAEA;AACA,MAAMA,SAAuC,GAAG;EAC5CC,IAAI,EAAE,iCAAiC;EACvCC,IAAI,EAAE,4BAA4B;EAClCC,SAAS,EAAE,cAAc;EACzBC,UAAU,EAAE,KAAK;EACjBC,YAAY,EAAE,KAAK;EACnBC,IAAI,EAAE;IACFC,eAAe,CAAC;MAAEC;IAAM,CAAC,EAAE;MACvB,OAAQ,GAAEA,KAAK,CAACC,OAAQ,QAAO;IACnC,CAAC;IACDC,gBAAgB,CAAC;MAAEF;IAAM,CAAC,EAAE;MACxB,OAAQ,GAAEA,KAAK,CAACC,OAAQ,QAAO;IACnC;EACJ,CAAC;EACDE,MAAM,EAAE;IACJJ,eAAe,CAAC;MAAEC;IAAM,CAAC,EAAE;MACvB,OAAQ,GAAEA,KAAK,CAACC,OAAQ,QAAO;IACnC,CAAC;IACDG,gBAAgB,CAAC;MAAEJ;IAAM,CAAC,EAAE;MACxB,OAAOA,KAAK,CAACC,OAAO,GAAG,QAAQ;IACnC;EACJ;AACJ,CAAC;AAEM,MAAMI,eAAe,GAAG,MAAsC,CAACb,SAAS,CAAC;AAAC"}
+{"version":3,"names":["jsonField","name","type","fieldType","isSortable","isSearchable","read","createTypeField","field","fieldId","createGetFilters","manage","createInputField","createAcoFields"],"sources":["createAcoFields.ts"],"sourcesContent":["import { CmsModelFieldToGraphQLPlugin } from \"@webiny/api-headless-cms/types\";\n\n// Creating an internal JSON field, we are using it inside the `record` type\nconst jsonField: CmsModelFieldToGraphQLPlugin = {\n    name: \"cms-model-field-to-graphql-json\",\n    type: \"cms-model-field-to-graphql\",\n    fieldType: \"wby-aco-json\",\n    isSortable: true,\n    isSearchable: true,\n    read: {\n        createTypeField({ field }) {\n            return `${field.fieldId}: JSON`;\n        },\n        createGetFilters({ field }) {\n            return `${field.fieldId}: JSON`;\n        }\n    },\n    manage: {\n        createTypeField({ field }) {\n            return `${field.fieldId}: JSON`;\n        },\n        createInputField({ field }) {\n            return field.fieldId + \": JSON\";\n        }\n    }\n};\n\nexport const createAcoFields = (): CmsModelFieldToGraphQLPlugin[] => [jsonField];\n"],"mappings":";;;;;;AAEA;AACA,MAAMA,SAAuC,GAAG;EAC5CC,IAAI,EAAE,iCAAiC;EACvCC,IAAI,EAAE,4BAA4B;EAClCC,SAAS,EAAE,cAAc;EACzBC,UAAU,EAAE,IAAI;EAChBC,YAAY,EAAE,IAAI;EAClBC,IAAI,EAAE;IACFC,eAAe,CAAC;MAAEC;IAAM,CAAC,EAAE;MACvB,OAAQ,GAAEA,KAAK,CAACC,OAAQ,QAAO;IACnC,CAAC;IACDC,gBAAgB,CAAC;MAAEF;IAAM,CAAC,EAAE;MACxB,OAAQ,GAAEA,KAAK,CAACC,OAAQ,QAAO;IACnC;EACJ,CAAC;EACDE,MAAM,EAAE;IACJJ,eAAe,CAAC;MAAEC;IAAM,CAAC,EAAE;MACvB,OAAQ,GAAEA,KAAK,CAACC,OAAQ,QAAO;IACnC,CAAC;IACDG,gBAAgB,CAAC;MAAEJ;IAAM,CAAC,EAAE;MACxB,OAAOA,KAAK,CAACC,OAAO,GAAG,QAAQ;IACnC;EACJ;AACJ,CAAC;AAEM,MAAMI,eAAe,GAAG,MAAsC,CAACb,SAAS,CAAC;AAAC"}

package/createAcoGraphQL.js

@@ -51,15 +51,16 @@ const baseSchema = new _handlerGraphql.GraphQLSchemaPlugin({
             error: AcoError
         }
 
-        enum AcoListSort {
-            id_ASC
-            id_DESC
-            savedOn_ASC
-            savedOn_DESC
-            createdOn_ASC
-            createdOn_DESC
-            title_ASC
-            title_DESC
+        enum AcoSortDirection {
+            ASC
+            DESC
+        }
+
+        input AcoSort {
+            id: AcoSortDirection
+            createdOn: AcoSortDirection
+            savedOn: AcoSortDirection
+            title: AcoSortDirection
         }
 
         extend type Query {

package/createAcoGraphQL.js.map

@@ -1 +1 @@
-{"version":3,"names":["emptyResolver","baseSchema","GraphQLSchemaPlugin","typeDefs","resolvers","Query","aco","search","Mutation","createAcoGraphQL","ContextPlugin","context","plugins","register","folderSchema","searchRecordSchema"],"sources":["createAcoGraphQL.ts"],"sourcesContent":["import { ContextPlugin } from \"@webiny/api\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\n\nimport { folderSchema } from \"~/folder/folder.gql\";\nimport { searchRecordSchema } from \"~/record/record.gql\";\n\nimport { AcoContext } from \"~/types\";\n\nconst emptyResolver = () => ({});\n\nconst baseSchema = new GraphQLSchemaPlugin({\n    typeDefs: /* GraphQL */ `\n        type AcoQuery {\n            _empty: String\n        }\n\n        type AcoMutation {\n            _empty: String\n        }\n\n        type SearchQuery {\n            _empty: String\n        }\n\n        type SearchMutation {\n            _empty: String\n        }\n\n        type AcoMeta {\n            hasMoreItems: Boolean\n            totalCount: Int\n            cursor: String\n        }\n\n        type AcoUser {\n            id: ID\n            displayName: String\n            type: String\n        }\n\n        type AcoError {\n            code: String\n            message: String\n            data: JSON\n            stack: String\n        }\n\n        type AcoBooleanResponse {\n            data: Boolean\n            error: AcoError\n        }\n\n        enum AcoListSort {\n            id_ASC\n            id_DESC\n            savedOn_ASC\n            savedOn_DESC\n            createdOn_ASC\n            createdOn_DESC\n            title_ASC\n            title_DESC\n        }\n\n        extend type Query {\n            aco: AcoQuery\n            search: SearchQuery\n        }\n\n        extend type Mutation {\n            aco: AcoMutation\n            search: SearchMutation\n        }\n    `,\n    resolvers: {\n        Query: {\n            aco: emptyResolver,\n            search: emptyResolver\n        },\n        Mutation: {\n            aco: emptyResolver,\n            search: emptyResolver\n        }\n    }\n});\n\nexport const createAcoGraphQL = () => {\n    return new ContextPlugin<AcoContext>(context => {\n        context.plugins.register([baseSchema, folderSchema, searchRecordSchema]);\n    });\n};\n"],"mappings":";;;;;;AAAA;AACA;AAEA;AACA;AAIA,MAAMA,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC;AAEhC,MAAMC,UAAU,GAAG,IAAIC,mCAAmB,CAAC;EACvCC,QAAQ,EAAE,aAAe;AAC7B;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,KAAK,EAAE;MACHC,GAAG,EAAEN,aAAa;MAClBO,MAAM,EAAEP;IACZ,CAAC;IACDQ,QAAQ,EAAE;MACNF,GAAG,EAAEN,aAAa;MAClBO,MAAM,EAAEP;IACZ;EACJ;AACJ,CAAC,CAAC;AAEK,MAAMS,gBAAgB,GAAG,MAAM;EAClC,OAAO,IAAIC,kBAAa,CAAaC,OAAO,IAAI;IAC5CA,OAAO,CAACC,OAAO,CAACC,QAAQ,CAAC,CAACZ,UAAU,EAAEa,oBAAY,EAAEC,0BAAkB,CAAC,CAAC;EAC5E,CAAC,CAAC;AACN,CAAC;AAAC"}
+{"version":3,"names":["emptyResolver","baseSchema","GraphQLSchemaPlugin","typeDefs","resolvers","Query","aco","search","Mutation","createAcoGraphQL","ContextPlugin","context","plugins","register","folderSchema","searchRecordSchema"],"sources":["createAcoGraphQL.ts"],"sourcesContent":["import { ContextPlugin } from \"@webiny/api\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\n\nimport { folderSchema } from \"~/folder/folder.gql\";\nimport { searchRecordSchema } from \"~/record/record.gql\";\n\nimport { AcoContext } from \"~/types\";\n\nconst emptyResolver = () => ({});\n\nconst baseSchema = new GraphQLSchemaPlugin({\n    typeDefs: /* GraphQL */ `\n        type AcoQuery {\n            _empty: String\n        }\n\n        type AcoMutation {\n            _empty: String\n        }\n\n        type SearchQuery {\n            _empty: String\n        }\n\n        type SearchMutation {\n            _empty: String\n        }\n\n        type AcoMeta {\n            hasMoreItems: Boolean\n            totalCount: Int\n            cursor: String\n        }\n\n        type AcoUser {\n            id: ID\n            displayName: String\n            type: String\n        }\n\n        type AcoError {\n            code: String\n            message: String\n            data: JSON\n            stack: String\n        }\n\n        type AcoBooleanResponse {\n            data: Boolean\n            error: AcoError\n        }\n\n        enum AcoSortDirection {\n            ASC\n            DESC\n        }\n\n        input AcoSort {\n            id: AcoSortDirection\n            createdOn: AcoSortDirection\n            savedOn: AcoSortDirection\n            title: AcoSortDirection\n        }\n\n        extend type Query {\n            aco: AcoQuery\n            search: SearchQuery\n        }\n\n        extend type Mutation {\n            aco: AcoMutation\n            search: SearchMutation\n        }\n    `,\n    resolvers: {\n        Query: {\n            aco: emptyResolver,\n            search: emptyResolver\n        },\n        Mutation: {\n            aco: emptyResolver,\n            search: emptyResolver\n        }\n    }\n});\n\nexport const createAcoGraphQL = () => {\n    return new ContextPlugin<AcoContext>(context => {\n        context.plugins.register([baseSchema, folderSchema, searchRecordSchema]);\n    });\n};\n"],"mappings":";;;;;;AAAA;AACA;AAEA;AACA;AAIA,MAAMA,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC;AAEhC,MAAMC,UAAU,GAAG,IAAIC,mCAAmB,CAAC;EACvCC,QAAQ,EAAE,aAAe;AAC7B;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,KAAK,EAAE;MACHC,GAAG,EAAEN,aAAa;MAClBO,MAAM,EAAEP;IACZ,CAAC;IACDQ,QAAQ,EAAE;MACNF,GAAG,EAAEN,aAAa;MAClBO,MAAM,EAAEP;IACZ;EACJ;AACJ,CAAC,CAAC;AAEK,MAAMS,gBAAgB,GAAG,MAAM;EAClC,OAAO,IAAIC,kBAAa,CAAaC,OAAO,IAAI;IAC5CA,OAAO,CAACC,OAAO,CAACC,QAAQ,CAAC,CAACZ,UAAU,EAAEa,oBAAY,EAAEC,0BAAkB,CAAC,CAAC;EAC5E,CAAC,CAAC;AACN,CAAC;AAAC"}

package/createAcoModels.js

@@ -1,16 +1,14 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createAcoModels = void 0;
 var _apiHeadlessCms = require("@webiny/api-headless-cms");
-var _error = _interopRequireDefault(require("@webiny/error"));
 var _folder = require("./folder/folder.model");
 var _record = require("./record/record.model");
-var _modelFactory = require("./utils/modelFactory");
 var _isInstallationPending = require("./utils/isInstallationPending");
+var _modelFactory = require("./utils/modelFactory");
 const createAcoModels = context => {
   /**
    * This should never happen in the actual project.
@@ -26,11 +24,6 @@ const createAcoModels = context => {
   })) {
     return;
   }
-  context.security.disableAuthorization();
-  const locale = context.i18n.getContentLocale();
-  if (!locale) {
-    throw new _error.default("Missing content locale in api-aco/storageOperations/index.ts", "LOCALE_ERROR");
-  }
   const groupId = "contentModelGroup_aco";
 
   /**
@@ -52,8 +45,6 @@ const createAcoModels = context => {
   const cmsModelPlugins = modelDefinitions.map(modelDefinition => {
     return (0, _modelFactory.modelFactory)({
       group: cmsGroupPlugin.contentModelGroup,
-      tenant: context.tenancy.getCurrentTenant().id,
-      locale: locale.code,
       modelDefinition
     });
   });
@@ -62,6 +53,5 @@ const createAcoModels = context => {
    *  Register them so that they are accessible in cms context
    */
   context.plugins.register([cmsGroupPlugin, cmsModelPlugins]);
-  context.security.enableAuthorization();
 };
 exports.createAcoModels = createAcoModels;

package/createAcoModels.js.map

@@ -1 +1 @@
-{"version":3,"names":["createAcoModels","context","cms","console","warn","isInstallationPending","tenancy","i18n","security","disableAuthorization","locale","getContentLocale","WebinyError","groupId","cmsGroupPlugin","CmsGroupPlugin","id","slug","name","description","icon","isPrivate","modelDefinitions","createFolderModelDefinition","createSearchModelDefinition","cmsModelPlugins","map","modelDefinition","modelFactory","group","contentModelGroup","tenant","getCurrentTenant","code","plugins","register","enableAuthorization"],"sources":["createAcoModels.ts"],"sourcesContent":["import { CmsGroupPlugin } from \"@webiny/api-headless-cms\";\nimport { CmsContext } from \"@webiny/api-headless-cms/types\";\nimport WebinyError from \"@webiny/error\";\n\nimport { createFolderModelDefinition } from \"~/folder/folder.model\";\nimport { createSearchModelDefinition } from \"~/record/record.model\";\nimport { modelFactory } from \"~/utils/modelFactory\";\nimport { isInstallationPending } from \"~/utils/isInstallationPending\";\n\nexport const createAcoModels = (context: CmsContext) => {\n    /**\n     * This should never happen in the actual project.\n     * It is to make sure that we load setup context before the CRUD init in our internal code.\n     */\n    if (!context.cms) {\n        console.warn(\"Creating model before cms init.\");\n        return;\n    }\n\n    if (isInstallationPending({ tenancy: context.tenancy, i18n: context.i18n })) {\n        return;\n    }\n\n    context.security.disableAuthorization();\n\n    const locale = context.i18n.getContentLocale();\n    if (!locale) {\n        throw new WebinyError(\n            \"Missing content locale in api-aco/storageOperations/index.ts\",\n            \"LOCALE_ERROR\"\n        );\n    }\n\n    const groupId = \"contentModelGroup_aco\";\n\n    /**\n     * Create a CmsGroup.\n     */\n    const cmsGroupPlugin = new CmsGroupPlugin({\n        id: groupId,\n        slug: \"aco\",\n        name: \"ACO\",\n        description: \"Group for Advanced Content Organisation and Search\",\n        icon: \"fas/folder\",\n        isPrivate: true\n    });\n\n    /**\n     * Create  CmsModel plugins.\n     */\n    const modelDefinitions = [createFolderModelDefinition(), createSearchModelDefinition()];\n    const cmsModelPlugins = modelDefinitions.map(modelDefinition => {\n        return modelFactory({\n            group: cmsGroupPlugin.contentModelGroup,\n            tenant: context.tenancy.getCurrentTenant().id,\n            locale: locale.code,\n            modelDefinition\n        });\n    });\n\n    /**\n     *  Register them so that they are accessible in cms context\n     */\n    context.plugins.register([cmsGroupPlugin, cmsModelPlugins]);\n\n    context.security.enableAuthorization();\n};\n"],"mappings":";;;;;;;AAAA;AAEA;AAEA;AACA;AACA;AACA;AAEO,MAAMA,eAAe,GAAIC,OAAmB,IAAK;EACpD;AACJ;AACA;AACA;EACI,IAAI,CAACA,OAAO,CAACC,GAAG,EAAE;IACdC,OAAO,CAACC,IAAI,CAAC,iCAAiC,CAAC;IAC/C;EACJ;EAEA,IAAI,IAAAC,4CAAqB,EAAC;IAAEC,OAAO,EAAEL,OAAO,CAACK,OAAO;IAAEC,IAAI,EAAEN,OAAO,CAACM;EAAK,CAAC,CAAC,EAAE;IACzE;EACJ;EAEAN,OAAO,CAACO,QAAQ,CAACC,oBAAoB,EAAE;EAEvC,MAAMC,MAAM,GAAGT,OAAO,CAACM,IAAI,CAACI,gBAAgB,EAAE;EAC9C,IAAI,CAACD,MAAM,EAAE;IACT,MAAM,IAAIE,cAAW,CACjB,8DAA8D,EAC9D,cAAc,CACjB;EACL;EAEA,MAAMC,OAAO,GAAG,uBAAuB;;EAEvC;AACJ;AACA;EACI,MAAMC,cAAc,GAAG,IAAIC,8BAAc,CAAC;IACtCC,EAAE,EAAEH,OAAO;IACXI,IAAI,EAAE,KAAK;IACXC,IAAI,EAAE,KAAK;IACXC,WAAW,EAAE,oDAAoD;IACjEC,IAAI,EAAE,YAAY;IAClBC,SAAS,EAAE;EACf,CAAC,CAAC;;EAEF;AACJ;AACA;EACI,MAAMC,gBAAgB,GAAG,CAAC,IAAAC,mCAA2B,GAAE,EAAE,IAAAC,mCAA2B,GAAE,CAAC;EACvF,MAAMC,eAAe,GAAGH,gBAAgB,CAACI,GAAG,CAACC,eAAe,IAAI;IAC5D,OAAO,IAAAC,0BAAY,EAAC;MAChBC,KAAK,EAAEf,cAAc,CAACgB,iBAAiB;MACvCC,MAAM,EAAE9B,OAAO,CAACK,OAAO,CAAC0B,gBAAgB,EAAE,CAAChB,EAAE;MAC7CN,MAAM,EAAEA,MAAM,CAACuB,IAAI;MACnBN;IACJ,CAAC,CAAC;EACN,CAAC,CAAC;;EAEF;AACJ;AACA;EACI1B,OAAO,CAACiC,OAAO,CAACC,QAAQ,CAAC,CAACrB,cAAc,EAAEW,eAAe,CAAC,CAAC;EAE3DxB,OAAO,CAACO,QAAQ,CAAC4B,mBAAmB,EAAE;AAC1C,CAAC;AAAC"}
+{"version":3,"names":["createAcoModels","context","cms","console","warn","isInstallationPending","tenancy","i18n","groupId","cmsGroupPlugin","CmsGroupPlugin","id","slug","name","description","icon","isPrivate","modelDefinitions","createFolderModelDefinition","createSearchModelDefinition","cmsModelPlugins","map","modelDefinition","modelFactory","group","contentModelGroup","plugins","register"],"sources":["createAcoModels.ts"],"sourcesContent":["import { CmsGroupPlugin } from \"@webiny/api-headless-cms\";\nimport { CmsContext } from \"@webiny/api-headless-cms/types\";\nimport { createFolderModelDefinition } from \"~/folder/folder.model\";\nimport { createSearchModelDefinition } from \"~/record/record.model\";\nimport { isInstallationPending } from \"~/utils/isInstallationPending\";\nimport { modelFactory } from \"~/utils/modelFactory\";\n\nexport const createAcoModels = (context: CmsContext) => {\n    /**\n     * This should never happen in the actual project.\n     * It is to make sure that we load setup context before the CRUD init in our internal code.\n     */\n    if (!context.cms) {\n        console.warn(\"Creating model before cms init.\");\n        return;\n    }\n\n    if (isInstallationPending({ tenancy: context.tenancy, i18n: context.i18n })) {\n        return;\n    }\n\n    const groupId = \"contentModelGroup_aco\";\n\n    /**\n     * Create a CmsGroup.\n     */\n    const cmsGroupPlugin = new CmsGroupPlugin({\n        id: groupId,\n        slug: \"aco\",\n        name: \"ACO\",\n        description: \"Group for Advanced Content Organisation and Search\",\n        icon: \"fas/folder\",\n        isPrivate: true\n    });\n\n    /**\n     * Create  CmsModel plugins.\n     */\n    const modelDefinitions = [createFolderModelDefinition(), createSearchModelDefinition()];\n    const cmsModelPlugins = modelDefinitions.map(modelDefinition => {\n        return modelFactory({\n            group: cmsGroupPlugin.contentModelGroup,\n            modelDefinition\n        });\n    });\n\n    /**\n     *  Register them so that they are accessible in cms context\n     */\n    context.plugins.register([cmsGroupPlugin, cmsModelPlugins]);\n};\n"],"mappings":";;;;;;AAAA;AAEA;AACA;AACA;AACA;AAEO,MAAMA,eAAe,GAAIC,OAAmB,IAAK;EACpD;AACJ;AACA;AACA;EACI,IAAI,CAACA,OAAO,CAACC,GAAG,EAAE;IACdC,OAAO,CAACC,IAAI,CAAC,iCAAiC,CAAC;IAC/C;EACJ;EAEA,IAAI,IAAAC,4CAAqB,EAAC;IAAEC,OAAO,EAAEL,OAAO,CAACK,OAAO;IAAEC,IAAI,EAAEN,OAAO,CAACM;EAAK,CAAC,CAAC,EAAE;IACzE;EACJ;EAEA,MAAMC,OAAO,GAAG,uBAAuB;;EAEvC;AACJ;AACA;EACI,MAAMC,cAAc,GAAG,IAAIC,8BAAc,CAAC;IACtCC,EAAE,EAAEH,OAAO;IACXI,IAAI,EAAE,KAAK;IACXC,IAAI,EAAE,KAAK;IACXC,WAAW,EAAE,oDAAoD;IACjEC,IAAI,EAAE,YAAY;IAClBC,SAAS,EAAE;EACf,CAAC,CAAC;;EAEF;AACJ;AACA;EACI,MAAMC,gBAAgB,GAAG,CAAC,IAAAC,mCAA2B,GAAE,EAAE,IAAAC,mCAA2B,GAAE,CAAC;EACvF,MAAMC,eAAe,GAAGH,gBAAgB,CAACI,GAAG,CAACC,eAAe,IAAI;IAC5D,OAAO,IAAAC,0BAAY,EAAC;MAChBC,KAAK,EAAEf,cAAc,CAACgB,iBAAiB;MACvCH;IACJ,CAAC,CAAC;EACN,CAAC,CAAC;;EAEF;AACJ;AACA;EACIrB,OAAO,CAACyB,OAAO,CAACC,QAAQ,CAAC,CAAClB,cAAc,EAAEW,eAAe,CAAC,CAAC;AAC/D,CAAC;AAAC"}

package/folder/folder.gql.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.folderSchema = void 0;
 var _responses = require("@webiny/handler-graphql/responses");
 var _GraphQLSchemaPlugin = require("@webiny/handler-graphql/plugins/GraphQLSchemaPlugin");
+var _checkPermissions = require("../utils/checkPermissions");
 var _resolve = require("../utils/resolve");
 const folderSchema = new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
   typeDefs: /* GraphQL */`
@@ -36,6 +37,7 @@ const folderSchema = new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
         input FoldersListWhereInput {
             type: String!
             parentId: String
+            createdBy: ID
         }
 
         type FolderResponse {
@@ -54,7 +56,7 @@ const folderSchema = new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
                 where: FoldersListWhereInput!
                 limit: Int
                 after: String
-                sort: [AcoListSort]
+                sort: AcoSort
             ): FoldersListResponse
         }
 
@@ -69,10 +71,14 @@ const folderSchema = new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
       getFolder: async (_, {
         id
       }, context) => {
-        return (0, _resolve.resolve)(() => context.aco.folder.get(id));
+        return (0, _resolve.resolve)(() => {
+          (0, _checkPermissions.checkPermissions)(context);
+          return context.aco.folder.get(id);
+        });
       },
       listFolders: async (_, args, context) => {
         try {
+          await (0, _checkPermissions.checkPermissions)(context);
           const [entries, meta] = await context.aco.folder.list(args);
           return new _responses.ListResponse(entries, meta);
         } catch (e) {
@@ -84,18 +90,27 @@ const folderSchema = new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
       createFolder: async (_, {
         data
       }, context) => {
-        return (0, _resolve.resolve)(() => context.aco.folder.create(data));
+        return (0, _resolve.resolve)(() => {
+          (0, _checkPermissions.checkPermissions)(context);
+          return context.aco.folder.create(data);
+        });
       },
       updateFolder: async (_, {
         id,
         data
       }, context) => {
-        return (0, _resolve.resolve)(() => context.aco.folder.update(id, data));
+        return (0, _resolve.resolve)(() => {
+          (0, _checkPermissions.checkPermissions)(context);
+          return context.aco.folder.update(id, data);
+        });
       },
       deleteFolder: async (_, {
         id
       }, context) => {
-        return (0, _resolve.resolve)(() => context.aco.folder.delete(id));
+        return (0, _resolve.resolve)(() => {
+          (0, _checkPermissions.checkPermissions)(context);
+          return context.aco.folder.delete(id);
+        });
       }
     }
   }

package/folder/folder.gql.js.map

@@ -1 +1 @@
-{"version":3,"names":["folderSchema","GraphQLSchemaPlugin","typeDefs","resolvers","AcoQuery","getFolder","_","id","context","resolve","aco","folder","get","listFolders","args","entries","meta","list","ListResponse","e","ErrorResponse","AcoMutation","createFolder","data","create","updateFolder","update","deleteFolder","delete"],"sources":["folder.gql.ts"],"sourcesContent":["import { ErrorResponse, ListResponse } from \"@webiny/handler-graphql/responses\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins/GraphQLSchemaPlugin\";\n\nimport { resolve } from \"~/utils/resolve\";\n\nimport { AcoContext } from \"~/types\";\n\nexport const folderSchema = new GraphQLSchemaPlugin<AcoContext>({\n    typeDefs: /* GraphQL */ `\n        type Folder {\n            id: ID!\n            title: String!\n            slug: String!\n            type: String!\n            parentId: ID\n            savedOn: DateTime\n            createdOn: DateTime\n            createdBy: AcoUser\n        }\n\n        input FolderCreateInput {\n            title: String!\n            slug: String!\n            type: String!\n            parentId: ID\n        }\n\n        input FolderUpdateInput {\n            title: String\n            slug: String\n            parentId: ID\n        }\n\n        input FoldersListWhereInput {\n            type: String!\n            parentId: String\n        }\n\n        type FolderResponse {\n            data: Folder\n            error: AcoError\n        }\n\n        type FoldersListResponse {\n            data: [Folder]\n            error: AcoError\n        }\n\n        extend type AcoQuery {\n            getFolder(id: ID!): FolderResponse\n            listFolders(\n                where: FoldersListWhereInput!\n                limit: Int\n                after: String\n                sort: [AcoListSort]\n            ): FoldersListResponse\n        }\n\n        extend type AcoMutation {\n            createFolder(data: FolderCreateInput!): FolderResponse\n            updateFolder(id: ID!, data: FolderUpdateInput!): FolderResponse\n            deleteFolder(id: ID!): AcoBooleanResponse\n        }\n    `,\n    resolvers: {\n        AcoQuery: {\n            getFolder: async (_, { id }, context) => {\n                return resolve(() => context.aco.folder.get(id));\n            },\n            listFolders: async (_, args: any, context) => {\n                try {\n                    const [entries, meta] = await context.aco.folder.list(args);\n                    return new ListResponse(entries, meta);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            }\n        },\n        AcoMutation: {\n            createFolder: async (_, { data }, context) => {\n                return resolve(() => context.aco.folder.create(data));\n            },\n            updateFolder: async (_, { id, data }, context) => {\n                return resolve(() => context.aco.folder.update(id, data));\n            },\n            deleteFolder: async (_, { id }, context) => {\n                return resolve(() => context.aco.folder.delete(id));\n            }\n        }\n    }\n});\n"],"mappings":";;;;;;AAAA;AACA;AAEA;AAIO,MAAMA,YAAY,GAAG,IAAIC,wCAAmB,CAAa;EAC5DC,QAAQ,EAAE,aAAe;AAC7B;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,OAAOC,CAAC,EAAE;QAAEC;MAAG,CAAC,EAAEC,OAAO,KAAK;QACrC,OAAO,IAAAC,gBAAO,EAAC,MAAMD,OAAO,CAACE,GAAG,CAACC,MAAM,CAACC,GAAG,CAACL,EAAE,CAAC,CAAC;MACpD,CAAC;MACDM,WAAW,EAAE,OAAOP,CAAC,EAAEQ,IAAS,EAAEN,OAAO,KAAK;QAC1C,IAAI;UACA,MAAM,CAACO,OAAO,EAAEC,IAAI,CAAC,GAAG,MAAMR,OAAO,CAACE,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,OAAOhB,CAAC,EAAE;QAAEiB;MAAK,CAAC,EAAEf,OAAO,KAAK;QAC1C,OAAO,IAAAC,gBAAO,EAAC,MAAMD,OAAO,CAACE,GAAG,CAACC,MAAM,CAACa,MAAM,CAACD,IAAI,CAAC,CAAC;MACzD,CAAC;MACDE,YAAY,EAAE,OAAOnB,CAAC,EAAE;QAAEC,EAAE;QAAEgB;MAAK,CAAC,EAAEf,OAAO,KAAK;QAC9C,OAAO,IAAAC,gBAAO,EAAC,MAAMD,OAAO,CAACE,GAAG,CAACC,MAAM,CAACe,MAAM,CAACnB,EAAE,EAAEgB,IAAI,CAAC,CAAC;MAC7D,CAAC;MACDI,YAAY,EAAE,OAAOrB,CAAC,EAAE;QAAEC;MAAG,CAAC,EAAEC,OAAO,KAAK;QACxC,OAAO,IAAAC,gBAAO,EAAC,MAAMD,OAAO,CAACE,GAAG,CAACC,MAAM,CAACiB,MAAM,CAACrB,EAAE,CAAC,CAAC;MACvD;IACJ;EACJ;AACJ,CAAC,CAAC;AAAC"}
+{"version":3,"names":["folderSchema","GraphQLSchemaPlugin","typeDefs","resolvers","AcoQuery","getFolder","_","id","context","resolve","checkPermissions","aco","folder","get","listFolders","args","entries","meta","list","ListResponse","e","ErrorResponse","AcoMutation","createFolder","data","create","updateFolder","update","deleteFolder","delete"],"sources":["folder.gql.ts"],"sourcesContent":["import { ErrorResponse, ListResponse } from \"@webiny/handler-graphql/responses\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins/GraphQLSchemaPlugin\";\n\nimport { checkPermissions } from \"~/utils/checkPermissions\";\nimport { resolve } from \"~/utils/resolve\";\n\nimport { AcoContext } from \"~/types\";\n\nexport const folderSchema = new GraphQLSchemaPlugin<AcoContext>({\n    typeDefs: /* GraphQL */ `\n        type Folder {\n            id: ID!\n            title: String!\n            slug: String!\n            type: String!\n            parentId: ID\n            savedOn: DateTime\n            createdOn: DateTime\n            createdBy: AcoUser\n        }\n\n        input FolderCreateInput {\n            title: String!\n            slug: String!\n            type: String!\n            parentId: ID\n        }\n\n        input FolderUpdateInput {\n            title: String\n            slug: String\n            parentId: ID\n        }\n\n        input FoldersListWhereInput {\n            type: String!\n            parentId: String\n            createdBy: ID\n        }\n\n        type FolderResponse {\n            data: Folder\n            error: AcoError\n        }\n\n        type FoldersListResponse {\n            data: [Folder]\n            error: AcoError\n        }\n\n        extend type AcoQuery {\n            getFolder(id: ID!): FolderResponse\n            listFolders(\n                where: FoldersListWhereInput!\n                limit: Int\n                after: String\n                sort: AcoSort\n            ): FoldersListResponse\n        }\n\n        extend type AcoMutation {\n            createFolder(data: FolderCreateInput!): FolderResponse\n            updateFolder(id: ID!, data: FolderUpdateInput!): FolderResponse\n            deleteFolder(id: ID!): AcoBooleanResponse\n        }\n    `,\n    resolvers: {\n        AcoQuery: {\n            getFolder: async (_, { id }, context) => {\n                return resolve(() => {\n                    checkPermissions(context);\n                    return context.aco.folder.get(id);\n                });\n            },\n            listFolders: async (_, args: any, context) => {\n                try {\n                    await checkPermissions(context);\n                    const [entries, meta] = await context.aco.folder.list(args);\n                    return new ListResponse(entries, meta);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            }\n        },\n        AcoMutation: {\n            createFolder: async (_, { data }, context) => {\n                return resolve(() => {\n                    checkPermissions(context);\n                    return context.aco.folder.create(data);\n                });\n            },\n            updateFolder: async (_, { id, data }, context) => {\n                return resolve(() => {\n                    checkPermissions(context);\n                    return context.aco.folder.update(id, data);\n                });\n            },\n            deleteFolder: async (_, { id }, context) => {\n                return resolve(() => {\n                    checkPermissions(context);\n                    return context.aco.folder.delete(id);\n                });\n            }\n        }\n    }\n});\n"],"mappings":";;;;;;AAAA;AACA;AAEA;AACA;AAIO,MAAMA,YAAY,GAAG,IAAIC,wCAAmB,CAAa;EAC5DC,QAAQ,EAAE,aAAe;AAC7B;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,OAAOC,CAAC,EAAE;QAAEC;MAAG,CAAC,EAAEC,OAAO,KAAK;QACrC,OAAO,IAAAC,gBAAO,EAAC,MAAM;UACjB,IAAAC,kCAAgB,EAACF,OAAO,CAAC;UACzB,OAAOA,OAAO,CAACG,GAAG,CAACC,MAAM,CAACC,GAAG,CAACN,EAAE,CAAC;QACrC,CAAC,CAAC;MACN,CAAC;MACDO,WAAW,EAAE,OAAOR,CAAC,EAAES,IAAS,EAAEP,OAAO,KAAK;QAC1C,IAAI;UACA,MAAM,IAAAE,kCAAgB,EAACF,OAAO,CAAC;UAC/B,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,OAAOjB,CAAC,EAAE;QAAEkB;MAAK,CAAC,EAAEhB,OAAO,KAAK;QAC1C,OAAO,IAAAC,gBAAO,EAAC,MAAM;UACjB,IAAAC,kCAAgB,EAACF,OAAO,CAAC;UACzB,OAAOA,OAAO,CAACG,GAAG,CAACC,MAAM,CAACa,MAAM,CAACD,IAAI,CAAC;QAC1C,CAAC,CAAC;MACN,CAAC;MACDE,YAAY,EAAE,OAAOpB,CAAC,EAAE;QAAEC,EAAE;QAAEiB;MAAK,CAAC,EAAEhB,OAAO,KAAK;QAC9C,OAAO,IAAAC,gBAAO,EAAC,MAAM;UACjB,IAAAC,kCAAgB,EAACF,OAAO,CAAC;UACzB,OAAOA,OAAO,CAACG,GAAG,CAACC,MAAM,CAACe,MAAM,CAACpB,EAAE,EAAEiB,IAAI,CAAC;QAC9C,CAAC,CAAC;MACN,CAAC;MACDI,YAAY,EAAE,OAAOtB,CAAC,EAAE;QAAEC;MAAG,CAAC,EAAEC,OAAO,KAAK;QACxC,OAAO,IAAAC,gBAAO,EAAC,MAAM;UACjB,IAAAC,kCAAgB,EAACF,OAAO,CAAC;UACzB,OAAOA,OAAO,CAACG,GAAG,CAACC,MAAM,CAACiB,MAAM,CAACtB,EAAE,CAAC;QACxC,CAAC,CAAC;MACN;IACJ;EACJ;AACJ,CAAC,CAAC;AAAC"}

package/folder/folder.model.d.ts

@@ -1,4 +1,4 @@
-import { CmsModel } from "@webiny/api-headless-cms/types";
-export declare type FolderModelDefinition = Pick<CmsModel, "name" | "modelId" | "layout" | "titleFieldId" | "description" | "fields" | "isPrivate">;
-export declare const FOLDER_MODEL_ID = "acoFolderModelDefinition";
+import { CmsPrivateModelFull } from "@webiny/api-headless-cms";
+export declare type FolderModelDefinition = Omit<CmsPrivateModelFull, "noValidate" | "group">;
+export declare const FOLDER_MODEL_ID = "acoFolder";
 export declare const createFolderModelDefinition: () => FolderModelDefinition;

package/folder/folder.model.js

@@ -8,7 +8,6 @@ var _createModelField = require("../utils/createModelField");
 const titleField = () => (0, _createModelField.createModelField)({
   label: "Title",
   type: "text",
-  parent: "folder",
   validation: [{
     name: "required",
     message: "Value is required."
@@ -23,7 +22,6 @@ const titleField = () => (0, _createModelField.createModelField)({
 const slugField = () => (0, _createModelField.createModelField)({
   label: "Slug",
   type: "text",
-  parent: "folder",
   validation: [{
     name: "required",
     message: "Value is required."
@@ -52,7 +50,6 @@ const slugField = () => (0, _createModelField.createModelField)({
 const typeField = () => (0, _createModelField.createModelField)({
   label: "Type",
   type: "text",
-  parent: "folder",
   validation: [{
     name: "required",
     message: "Value is required."
@@ -60,17 +57,16 @@ const typeField = () => (0, _createModelField.createModelField)({
 });
 const parentIdField = () => (0, _createModelField.createModelField)({
   label: "Parent Id",
-  type: "text",
-  parent: "folder"
+  type: "text"
 });
-const FOLDER_MODEL_ID = "acoFolderModelDefinition";
+const FOLDER_MODEL_ID = "acoFolder";
 exports.FOLDER_MODEL_ID = FOLDER_MODEL_ID;
 const createFolderModelDefinition = () => {
   return {
     name: "ACO - Folder",
     modelId: FOLDER_MODEL_ID,
     titleFieldId: "title",
-    layout: [["folder_title"], ["folder_slug"], ["folder_type"], ["folder_parentId"]],
+    layout: [["title"], ["slug"], ["type"], ["parentId"]],
     fields: [titleField(), slugField(), typeField(), parentIdField()],
     description: "ACO - Folder content model",
     isPrivate: true

package/folder/folder.model.js.map

@@ -1 +1 @@
-{"version":3,"names":["titleField","createModelField","label","type","parent","validation","name","message","settings","value","slugField","preset","regex","flags","typeField","parentIdField","FOLDER_MODEL_ID","createFolderModelDefinition","modelId","titleFieldId","layout","fields","description","isPrivate"],"sources":["folder.model.ts"],"sourcesContent":["import { CmsModel } from \"@webiny/api-headless-cms/types\";\n\nimport { createModelField } from \"~/utils/createModelField\";\n\nexport type FolderModelDefinition = Pick<\n    CmsModel,\n    \"name\" | \"modelId\" | \"layout\" | \"titleFieldId\" | \"description\" | \"fields\" | \"isPrivate\"\n>;\n\nconst titleField = () =>\n    createModelField({\n        label: \"Title\",\n        type: \"text\",\n        parent: \"folder\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            },\n            {\n                name: \"minLength\",\n                settings: {\n                    value: \"3\"\n                },\n                message: \"Value is too short.\"\n            }\n        ]\n    });\n\nconst slugField = () =>\n    createModelField({\n        label: \"Slug\",\n        type: \"text\",\n        parent: \"folder\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            },\n            {\n                name: \"minLength\",\n                settings: {\n                    value: \"3\"\n                },\n                message: \"Value is too short.\"\n            },\n            {\n                name: \"maxLength\",\n                settings: {\n                    value: \"100\"\n                },\n                message: \"Value is too long.\"\n            },\n            {\n                name: \"pattern\",\n                settings: {\n                    preset: \"custom\",\n                    regex: \"^[a-z0-9]+(-[a-z0-9]+)*$\",\n                    flags: \"g\"\n                },\n                message: \"Value must consist of only 'a-z', '0-9' and '-'.\"\n            }\n        ]\n    });\n\nconst typeField = () =>\n    createModelField({\n        label: \"Type\",\n        type: \"text\",\n        parent: \"folder\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst parentIdField = () =>\n    createModelField({\n        label: \"Parent Id\",\n        type: \"text\",\n        parent: \"folder\"\n    });\n\nexport const FOLDER_MODEL_ID = \"acoFolderModelDefinition\";\n\nexport const createFolderModelDefinition = (): FolderModelDefinition => {\n    return {\n        name: \"ACO - Folder\",\n        modelId: FOLDER_MODEL_ID,\n        titleFieldId: \"title\",\n        layout: [[\"folder_title\"], [\"folder_slug\"], [\"folder_type\"], [\"folder_parentId\"]],\n        fields: [titleField(), slugField(), typeField(), parentIdField()],\n        description: \"ACO - Folder content model\",\n        isPrivate: true\n    };\n};\n"],"mappings":";;;;;;AAEA;AAOA,MAAMA,UAAU,GAAG,MACf,IAAAC,kCAAgB,EAAC;EACbC,KAAK,EAAE,OAAO;EACdC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE,QAAQ;EAChBC,UAAU,EAAE,CACR;IACIC,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE;EACb,CAAC,EACD;IACID,IAAI,EAAE,WAAW;IACjBE,QAAQ,EAAE;MACNC,KAAK,EAAE;IACX,CAAC;IACDF,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMG,SAAS,GAAG,MACd,IAAAT,kCAAgB,EAAC;EACbC,KAAK,EAAE,MAAM;EACbC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE,QAAQ;EAChBC,UAAU,EAAE,CACR;IACIC,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE;EACb,CAAC,EACD;IACID,IAAI,EAAE,WAAW;IACjBE,QAAQ,EAAE;MACNC,KAAK,EAAE;IACX,CAAC;IACDF,OAAO,EAAE;EACb,CAAC,EACD;IACID,IAAI,EAAE,WAAW;IACjBE,QAAQ,EAAE;MACNC,KAAK,EAAE;IACX,CAAC;IACDF,OAAO,EAAE;EACb,CAAC,EACD;IACID,IAAI,EAAE,SAAS;IACfE,QAAQ,EAAE;MACNG,MAAM,EAAE,QAAQ;MAChBC,KAAK,EAAE,0BAA0B;MACjCC,KAAK,EAAE;IACX,CAAC;IACDN,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMO,SAAS,GAAG,MACd,IAAAb,kCAAgB,EAAC;EACbC,KAAK,EAAE,MAAM;EACbC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE,QAAQ;EAChBC,UAAU,EAAE,CACR;IACIC,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMQ,aAAa,GAAG,MAClB,IAAAd,kCAAgB,EAAC;EACbC,KAAK,EAAE,WAAW;EAClBC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE;AACZ,CAAC,CAAC;AAEC,MAAMY,eAAe,GAAG,0BAA0B;AAAC;AAEnD,MAAMC,2BAA2B,GAAG,MAA6B;EACpE,OAAO;IACHX,IAAI,EAAE,cAAc;IACpBY,OAAO,EAAEF,eAAe;IACxBG,YAAY,EAAE,OAAO;IACrBC,MAAM,EAAE,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC;IACjFC,MAAM,EAAE,CAACrB,UAAU,EAAE,EAAEU,SAAS,EAAE,EAAEI,SAAS,EAAE,EAAEC,aAAa,EAAE,CAAC;IACjEO,WAAW,EAAE,4BAA4B;IACzCC,SAAS,EAAE;EACf,CAAC;AACL,CAAC;AAAC"}
+{"version":3,"names":["titleField","createModelField","label","type","validation","name","message","settings","value","slugField","preset","regex","flags","typeField","parentIdField","FOLDER_MODEL_ID","createFolderModelDefinition","modelId","titleFieldId","layout","fields","description","isPrivate"],"sources":["folder.model.ts"],"sourcesContent":["import { createModelField } from \"~/utils/createModelField\";\nimport { CmsPrivateModelFull } from \"@webiny/api-headless-cms\";\n\nexport type FolderModelDefinition = Omit<CmsPrivateModelFull, \"noValidate\" | \"group\">;\n\nconst titleField = () =>\n    createModelField({\n        label: \"Title\",\n        type: \"text\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            },\n            {\n                name: \"minLength\",\n                settings: {\n                    value: \"3\"\n                },\n                message: \"Value is too short.\"\n            }\n        ]\n    });\n\nconst slugField = () =>\n    createModelField({\n        label: \"Slug\",\n        type: \"text\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            },\n            {\n                name: \"minLength\",\n                settings: {\n                    value: \"3\"\n                },\n                message: \"Value is too short.\"\n            },\n            {\n                name: \"maxLength\",\n                settings: {\n                    value: \"100\"\n                },\n                message: \"Value is too long.\"\n            },\n            {\n                name: \"pattern\",\n                settings: {\n                    preset: \"custom\",\n                    regex: \"^[a-z0-9]+(-[a-z0-9]+)*$\",\n                    flags: \"g\"\n                },\n                message: \"Value must consist of only 'a-z', '0-9' and '-'.\"\n            }\n        ]\n    });\n\nconst typeField = () =>\n    createModelField({\n        label: \"Type\",\n        type: \"text\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst parentIdField = () =>\n    createModelField({\n        label: \"Parent Id\",\n        type: \"text\"\n    });\n\nexport const FOLDER_MODEL_ID = \"acoFolder\";\n\nexport const createFolderModelDefinition = (): FolderModelDefinition => {\n    return {\n        name: \"ACO - Folder\",\n        modelId: FOLDER_MODEL_ID,\n        titleFieldId: \"title\",\n        layout: [[\"title\"], [\"slug\"], [\"type\"], [\"parentId\"]],\n        fields: [titleField(), slugField(), typeField(), parentIdField()],\n        description: \"ACO - Folder content model\",\n        isPrivate: true\n    };\n};\n"],"mappings":";;;;;;AAAA;AAKA,MAAMA,UAAU,GAAG,MACf,IAAAC,kCAAgB,EAAC;EACbC,KAAK,EAAE,OAAO;EACdC,IAAI,EAAE,MAAM;EACZC,UAAU,EAAE,CACR;IACIC,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE;EACb,CAAC,EACD;IACID,IAAI,EAAE,WAAW;IACjBE,QAAQ,EAAE;MACNC,KAAK,EAAE;IACX,CAAC;IACDF,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMG,SAAS,GAAG,MACd,IAAAR,kCAAgB,EAAC;EACbC,KAAK,EAAE,MAAM;EACbC,IAAI,EAAE,MAAM;EACZC,UAAU,EAAE,CACR;IACIC,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE;EACb,CAAC,EACD;IACID,IAAI,EAAE,WAAW;IACjBE,QAAQ,EAAE;MACNC,KAAK,EAAE;IACX,CAAC;IACDF,OAAO,EAAE;EACb,CAAC,EACD;IACID,IAAI,EAAE,WAAW;IACjBE,QAAQ,EAAE;MACNC,KAAK,EAAE;IACX,CAAC;IACDF,OAAO,EAAE;EACb,CAAC,EACD;IACID,IAAI,EAAE,SAAS;IACfE,QAAQ,EAAE;MACNG,MAAM,EAAE,QAAQ;MAChBC,KAAK,EAAE,0BAA0B;MACjCC,KAAK,EAAE;IACX,CAAC;IACDN,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMO,SAAS,GAAG,MACd,IAAAZ,kCAAgB,EAAC;EACbC,KAAK,EAAE,MAAM;EACbC,IAAI,EAAE,MAAM;EACZC,UAAU,EAAE,CACR;IACIC,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMQ,aAAa,GAAG,MAClB,IAAAb,kCAAgB,EAAC;EACbC,KAAK,EAAE,WAAW;EAClBC,IAAI,EAAE;AACV,CAAC,CAAC;AAEC,MAAMY,eAAe,GAAG,WAAW;AAAC;AAEpC,MAAMC,2BAA2B,GAAG,MAA6B;EACpE,OAAO;IACHX,IAAI,EAAE,cAAc;IACpBY,OAAO,EAAEF,eAAe;IACxBG,YAAY,EAAE,OAAO;IACrBC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;IACrDC,MAAM,EAAE,CAACpB,UAAU,EAAE,EAAES,SAAS,EAAE,EAAEI,SAAS,EAAE,EAAEC,aAAa,EAAE,CAAC;IACjEO,WAAW,EAAE,4BAA4B;IACzCC,SAAS,EAAE;EACf,CAAC;AACL,CAAC;AAAC"}

package/folder/folder.so.d.ts

@@ -1,8 +1,3 @@
-import { CmsModel } from "@webiny/api-headless-cms/types";
 import { CreateAcoStorageOperationsParams } from "../createAcoStorageOperations";
-import { AcoFolderStorageOperations as BaseAcoFolderStorageOperations } from "./folder.types";
-interface AcoFolderStorageOperations extends BaseAcoFolderStorageOperations {
-    getFolderModel(): Promise<CmsModel>;
-}
+import { AcoFolderStorageOperations } from "./folder.types";
 export declare const createFolderOperations: (params: CreateAcoStorageOperationsParams) => AcoFolderStorageOperations;
-export {};

package/folder/folder.so.js

@@ -9,147 +9,142 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _error = _interopRequireDefault(require("@webiny/error"));
 var _folder = require("./folder.model");
 var _createAcoStorageOperations = require("../createAcoStorageOperations");
+var _createListSort = require("../utils/createListSort");
+var _createOperationsWrapper = require("../utils/createOperationsWrapper");
 var _getFieldValues = require("../utils/getFieldValues");
 const createFolderOperations = params => {
   const {
-    cms,
-    security
+    cms
   } = params;
-  const getFolderModel = async () => {
-    security.disableAuthorization();
-    const model = await cms.getModel(_folder.FOLDER_MODEL_ID);
-    security.enableAuthorization();
-    if (!model) {
-      throw new _error.default(`Could not find "${_folder.FOLDER_MODEL_ID}" model.`, "MODEL_NOT_FOUND_ERROR");
-    }
-    return model;
-  };
-  const getFolder = async ({
+  const {
+    withModel
+  } = (0, _createOperationsWrapper.createOperationsWrapper)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+    modelName: _folder.FOLDER_MODEL_ID
+  }));
+  const getFolder = ({
     id,
     slug,
     type,
     parentId
   }) => {
-    const model = await getFolderModel();
-    security.disableAuthorization();
-    let entry;
-    if (id) {
-      entry = await cms.getEntryById(model, id);
-    } else if (slug && type) {
-      entry = await cms.getEntry(model, {
-        where: {
+    return withModel(async model => {
+      let entry;
+      if (id) {
+        entry = await cms.getEntryById(model, id);
+      } else if (slug && type) {
+        entry = await cms.getEntry(model, {
+          where: {
+            slug,
+            type,
+            parentId,
+            latest: true
+          }
+        });
+      }
+      if (!entry) {
+        throw new _error.default("Could not load folder.", "GET_FOLDER_ERROR", {
+          id,
           slug,
           type,
-          parentId,
-          latest: true
-        }
-      });
-    }
-    if (!entry) {
-      throw new _error.default("Could not load folder.", "GET_FOLDER_ERROR", {
-        id,
-        slug,
-        type,
-        parentId
-      });
-    }
-    security.enableAuthorization();
-    return (0, _getFieldValues.getFieldValues)(entry, _createAcoStorageOperations.baseFields);
+          parentId
+        });
+      }
+      return (0, _getFieldValues.getFolderFieldValues)(entry, _createAcoStorageOperations.baseFields);
+    });
   };
-  const checkExistingFolder = async ({
+  const checkExistingFolder = ({
     id,
     params
   }) => {
-    const model = await getFolderModel();
-    security.disableAuthorization();
-    const {
-      type,
-      slug,
-      parentId
-    } = params;
-    const [existings] = await cms.listLatestEntries(model, {
-      where: {
+    return withModel(async model => {
+      const {
         type,
         slug,
-        parentId,
-        id_not: id
-      },
-      limit: 1
-    });
-    if (existings.length > 0) {
-      throw new _error.default(`Folder with slug "${slug}" already exists at this level.`, "FOLDER_ALREADY_EXISTS", {
-        id,
-        params
+        parentId
+      } = params;
+      const [existings] = await cms.listLatestEntries(model, {
+        where: {
+          type,
+          slug,
+          parentId,
+          id_not: id
+        },
+        limit: 1
       });
-    }
-    security.enableAuthorization();
-    return;
+      if (existings.length > 0) {
+        throw new _error.default(`Folder with slug "${slug}" already exists at this level.`, "FOLDER_ALREADY_EXISTS", {
+          id,
+          params
+        });
+      }
+      return;
+    });
   };
   return {
-    getFolderModel,
     getFolder,
-    async listFolders(params) {
-      const model = await getFolderModel();
-      security.disableAuthorization();
-      const [entries, meta] = await cms.listLatestEntries(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
-        where: (0, _objectSpread2.default)({}, params.where || {})
-      }));
-      security.enableAuthorization();
-      return [entries.map(entry => (0, _getFieldValues.getFieldValues)(entry, _createAcoStorageOperations.baseFields)), meta];
+    listFolders(params) {
+      return withModel(async model => {
+        const {
+          sort,
+          where
+        } = params;
+        const [entries, meta] = await cms.listLatestEntries(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+          sort: (0, _createListSort.createListSort)(sort),
+          where: (0, _objectSpread2.default)({}, where || {})
+        }));
+        return [entries.map(entry => (0, _getFieldValues.getFolderFieldValues)(entry, _createAcoStorageOperations.baseFields)), meta];
+      });
     },
-    async createFolder({
+    createFolder({
       data
     }) {
-      const model = await getFolderModel();
-      security.disableAuthorization();
-      await checkExistingFolder({
-        params: {
-          type: data.type,
-          slug: data.slug,
-          parentId: data.parentId
-        }
+      return withModel(async model => {
+        await checkExistingFolder({
+          params: {
+            type: data.type,
+            slug: data.slug,
+            parentId: data.parentId
+          }
+        });
+        const entry = await cms.createEntry(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, data), {}, {
+          parentId: data.parentId || null
+        }));
+        return (0, _getFieldValues.getFolderFieldValues)(entry, _createAcoStorageOperations.baseFields);
       });
-      const entry = await cms.createEntry(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, data), {}, {
-        parentId: data.parentId || null
-      }));
-      security.enableAuthorization();
-      return (0, _getFieldValues.getFieldValues)(entry, _createAcoStorageOperations.baseFields);
     },
-    async updateFolder({
+    updateFolder({
       id,
       data
     }) {
-      const {
-        slug,
-        parentId
-      } = data;
-      const model = await getFolderModel();
-      security.disableAuthorization();
-      const original = await getFolder({
-        id
-      });
-      await checkExistingFolder({
-        id,
-        params: {
-          type: original.type,
-          slug: slug || original.slug,
-          parentId: parentId !== undefined ? parentId : original.parentId // parentId can be `null`
-        }
-      });
+      return withModel(async model => {
+        const {
+          slug,
+          parentId
+        } = data;
+        const original = await getFolder({
+          id
+        });
+        await checkExistingFolder({
+          id,
+          params: {
+            type: original.type,
+            slug: slug || original.slug,
+            parentId: parentId !== undefined ? parentId : original.parentId // parentId can be `null`
+          }
+        });
 
-      const input = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, original), data);
-      const entry = await cms.updateEntry(model, id, input);
-      security.enableAuthorization();
-      return (0, _getFieldValues.getFieldValues)(entry, _createAcoStorageOperations.baseFields);
+        const input = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, original), data);
+        const entry = await cms.updateEntry(model, id, input);
+        return (0, _getFieldValues.getFolderFieldValues)(entry, _createAcoStorageOperations.baseFields);
+      });
     },
-    async deleteFolder({
+    deleteFolder({
       id
     }) {
-      const model = await getFolderModel();
-      security.disableAuthorization();
-      await cms.deleteEntry(model, id);
-      security.enableAuthorization();
-      return true;
+      return withModel(async model => {
+        await cms.deleteEntry(model, id);
+        return true;
+      });
     }
   };
 };