@webiny/api-aco 0.0.0-unstable.d7f521b032 → 0.0.0-unstable.da99e0b846

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/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

@@ -26,7 +26,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");
@@ -62,6 +61,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","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"],"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    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"],"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;EAEA,MAAMC,MAAM,GAAGP,OAAO,CAACM,IAAI,CAACE,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,EAAE5B,OAAO,CAACK,OAAO,CAACwB,gBAAgB,EAAE,CAAChB,EAAE;MAC7CN,MAAM,EAAEA,MAAM,CAACuB,IAAI;MACnBN;IACJ,CAAC,CAAC;EACN,CAAC,CAAC;;EAEF;AACJ;AACA;EACIxB,OAAO,CAAC+B,OAAO,CAACC,QAAQ,CAAC,CAACrB,cAAc,EAAEW,eAAe,CAAC,CAAC;AAC/D,CAAC;AAAC"}

package/folder/folder.gql.js

@@ -54,7 +54,7 @@ const folderSchema = new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
                 where: FoldersListWhereInput!
                 limit: Int
                 after: String
-                sort: [AcoListSort]
+                sort: AcoSort
             ): FoldersListResponse
         }
 

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","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: 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(() => 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"}

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.getFieldValues)(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.getFieldValues)(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.getFieldValues)(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.getFieldValues)(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;
+      });
     }
   };
 };

package/folder/folder.so.js.map

@@ -1 +1 @@
-{"version":3,"names":["createFolderOperations","params","cms","security","getFolderModel","disableAuthorization","model","getModel","FOLDER_MODEL_ID","enableAuthorization","WebinyError","getFolder","id","slug","type","parentId","entry","getEntryById","getEntry","where","latest","getFieldValues","baseFields","checkExistingFolder","existings","listLatestEntries","id_not","limit","length","listFolders","entries","meta","map","createFolder","data","createEntry","updateFolder","original","undefined","input","updateEntry","deleteFolder","deleteEntry"],"sources":["folder.so.ts"],"sourcesContent":["import { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport WebinyError from \"@webiny/error\";\n\nimport { FOLDER_MODEL_ID } from \"./folder.model\";\nimport { baseFields, CreateAcoStorageOperationsParams } from \"~/createAcoStorageOperations\";\nimport { getFieldValues } from \"~/utils/getFieldValues\";\n\nimport { AcoFolderStorageOperations as BaseAcoFolderStorageOperations } from \"./folder.types\";\n\ninterface AcoFolderStorageOperations extends BaseAcoFolderStorageOperations {\n    getFolderModel(): Promise<CmsModel>;\n}\n\ninterface AcoCheckExistingFolderParams {\n    params: {\n        type: string;\n        slug: string;\n        parentId?: string | null;\n    };\n    id?: string;\n}\n\nexport const createFolderOperations = (\n    params: CreateAcoStorageOperationsParams\n): AcoFolderStorageOperations => {\n    const { cms, security } = params;\n    const getFolderModel = async () => {\n        security.disableAuthorization();\n        const model = await cms.getModel(FOLDER_MODEL_ID);\n        security.enableAuthorization();\n        if (!model) {\n            throw new WebinyError(\n                `Could not find \"${FOLDER_MODEL_ID}\" model.`,\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n\n    const getFolder: AcoFolderStorageOperations[\"getFolder\"] = async ({\n        id,\n        slug,\n        type,\n        parentId\n    }) => {\n        const model = await getFolderModel();\n        security.disableAuthorization();\n\n        let entry;\n\n        if (id) {\n            entry = await cms.getEntryById(model, id);\n        } else if (slug && type) {\n            entry = await cms.getEntry(model, { where: { slug, type, parentId, latest: true } });\n        }\n\n        if (!entry) {\n            throw new WebinyError(\"Could not load folder.\", \"GET_FOLDER_ERROR\", {\n                id,\n                slug,\n                type,\n                parentId\n            });\n        }\n\n        security.enableAuthorization();\n        return getFieldValues(entry, baseFields);\n    };\n\n    const checkExistingFolder = async ({ id, params }: AcoCheckExistingFolderParams) => {\n        const model = await getFolderModel();\n        security.disableAuthorization();\n\n        const { type, slug, parentId } = params;\n\n        const [existings] = await cms.listLatestEntries(model, {\n            where: {\n                type,\n                slug,\n                parentId,\n                id_not: id\n            },\n            limit: 1\n        });\n\n        if (existings.length > 0) {\n            throw new WebinyError(\n                `Folder with slug \"${slug}\" already exists at this level.`,\n                \"FOLDER_ALREADY_EXISTS\",\n                {\n                    id,\n                    params\n                }\n            );\n        }\n\n        security.enableAuthorization();\n        return;\n    };\n\n    return {\n        getFolderModel,\n        getFolder,\n        async listFolders(params) {\n            const model = await getFolderModel();\n            security.disableAuthorization();\n\n            const [entries, meta] = await cms.listLatestEntries(model, {\n                ...params,\n                where: {\n                    ...(params.where || {})\n                }\n            });\n\n            security.enableAuthorization();\n            return [entries.map(entry => getFieldValues(entry, baseFields)), meta];\n        },\n        async createFolder({ data }) {\n            const model = await getFolderModel();\n            security.disableAuthorization();\n\n            await checkExistingFolder({\n                params: {\n                    type: data.type,\n                    slug: data.slug,\n                    parentId: data.parentId\n                }\n            });\n\n            const entry = await cms.createEntry(model, {\n                ...data,\n                parentId: data.parentId || null\n            });\n\n            security.enableAuthorization();\n            return getFieldValues(entry, baseFields);\n        },\n        async updateFolder({ id, data }) {\n            const { slug, parentId } = data;\n            const model = await getFolderModel();\n            security.disableAuthorization();\n\n            const original = await getFolder({ id });\n\n            await checkExistingFolder({\n                id,\n                params: {\n                    type: original.type,\n                    slug: slug || original.slug,\n                    parentId: parentId !== undefined ? parentId : original.parentId // parentId can be `null`\n                }\n            });\n\n            const input = {\n                ...original,\n                ...data\n            };\n\n            const entry = await cms.updateEntry(model, id, input);\n            security.enableAuthorization();\n            return getFieldValues(entry, baseFields);\n        },\n        async deleteFolder({ id }) {\n            const model = await getFolderModel();\n            security.disableAuthorization();\n\n            await cms.deleteEntry(model, id);\n\n            security.enableAuthorization();\n            return true;\n        }\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["createFolderOperations","params","cms","withModel","createOperationsWrapper","modelName","FOLDER_MODEL_ID","getFolder","id","slug","type","parentId","model","entry","getEntryById","getEntry","where","latest","WebinyError","getFieldValues","baseFields","checkExistingFolder","existings","listLatestEntries","id_not","limit","length","listFolders","sort","entries","meta","createListSort","map","createFolder","data","createEntry","updateFolder","original","undefined","input","updateEntry","deleteFolder","deleteEntry"],"sources":["folder.so.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\n\nimport { FOLDER_MODEL_ID } from \"./folder.model\";\nimport { baseFields, CreateAcoStorageOperationsParams } from \"~/createAcoStorageOperations\";\nimport { createListSort } from \"~/utils/createListSort\";\nimport { createOperationsWrapper } from \"~/utils/createOperationsWrapper\";\nimport { getFieldValues } from \"~/utils/getFieldValues\";\n\nimport { AcoFolderStorageOperations } from \"./folder.types\";\n\ninterface AcoCheckExistingFolderParams {\n    params: {\n        type: string;\n        slug: string;\n        parentId?: string | null;\n    };\n    id?: string;\n}\n\nexport const createFolderOperations = (\n    params: CreateAcoStorageOperationsParams\n): AcoFolderStorageOperations => {\n    const { cms } = params;\n\n    const { withModel } = createOperationsWrapper({\n        ...params,\n        modelName: FOLDER_MODEL_ID\n    });\n\n    const getFolder: AcoFolderStorageOperations[\"getFolder\"] = ({ id, slug, type, parentId }) => {\n        return withModel(async model => {\n            let entry;\n\n            if (id) {\n                entry = await cms.getEntryById(model, id);\n            } else if (slug && type) {\n                entry = await cms.getEntry(model, {\n                    where: { slug, type, parentId, latest: true }\n                });\n            }\n\n            if (!entry) {\n                throw new WebinyError(\"Could not load folder.\", \"GET_FOLDER_ERROR\", {\n                    id,\n                    slug,\n                    type,\n                    parentId\n                });\n            }\n\n            return getFieldValues(entry, baseFields);\n        });\n    };\n\n    const checkExistingFolder = ({ id, params }: AcoCheckExistingFolderParams) => {\n        return withModel(async model => {\n            const { type, slug, parentId } = params;\n\n            const [existings] = await cms.listLatestEntries(model, {\n                where: {\n                    type,\n                    slug,\n                    parentId,\n                    id_not: id\n                },\n                limit: 1\n            });\n\n            if (existings.length > 0) {\n                throw new WebinyError(\n                    `Folder with slug \"${slug}\" already exists at this level.`,\n                    \"FOLDER_ALREADY_EXISTS\",\n                    {\n                        id,\n                        params\n                    }\n                );\n            }\n\n            return;\n        });\n    };\n\n    return {\n        getFolder,\n        listFolders(params) {\n            return withModel(async model => {\n                const { sort, where } = params;\n\n                const [entries, meta] = await cms.listLatestEntries(model, {\n                    ...params,\n                    sort: createListSort(sort),\n                    where: {\n                        ...(where || {})\n                    }\n                });\n\n                return [entries.map(entry => getFieldValues(entry, baseFields)), meta];\n            });\n        },\n        createFolder({ data }) {\n            return withModel(async model => {\n                await checkExistingFolder({\n                    params: {\n                        type: data.type,\n                        slug: data.slug,\n                        parentId: data.parentId\n                    }\n                });\n\n                const entry = await cms.createEntry(model, {\n                    ...data,\n                    parentId: data.parentId || null\n                });\n\n                return getFieldValues(entry, baseFields);\n            });\n        },\n        updateFolder({ id, data }) {\n            return withModel(async model => {\n                const { slug, parentId } = data;\n\n                const original = await getFolder({ id });\n\n                await checkExistingFolder({\n                    id,\n                    params: {\n                        type: original.type,\n                        slug: slug || original.slug,\n                        parentId: parentId !== undefined ? parentId : original.parentId // parentId can be `null`\n                    }\n                });\n\n                const input = {\n                    ...original,\n                    ...data\n                };\n\n                const entry = await cms.updateEntry(model, id, input);\n                return getFieldValues(entry, baseFields);\n            });\n        },\n        deleteFolder({ id }) {\n            return withModel(async model => {\n                await cms.deleteEntry(model, id);\n                return true;\n            });\n        }\n    };\n};\n"],"mappings":";;;;;;;;AAAA;AAEA;AACA;AACA;AACA;AACA;AAaO,MAAMA,sBAAsB,GAC/BC,MAAwC,IACX;EAC7B,MAAM;IAAEC;EAAI,CAAC,GAAGD,MAAM;EAEtB,MAAM;IAAEE;EAAU,CAAC,GAAG,IAAAC,gDAAuB,8DACtCH,MAAM;IACTI,SAAS,EAAEC;EAAe,GAC5B;EAEF,MAAMC,SAAkD,GAAG,CAAC;IAAEC,EAAE;IAAEC,IAAI;IAAEC,IAAI;IAAEC;EAAS,CAAC,KAAK;IACzF,OAAOR,SAAS,CAAC,MAAMS,KAAK,IAAI;MAC5B,IAAIC,KAAK;MAET,IAAIL,EAAE,EAAE;QACJK,KAAK,GAAG,MAAMX,GAAG,CAACY,YAAY,CAACF,KAAK,EAAEJ,EAAE,CAAC;MAC7C,CAAC,MAAM,IAAIC,IAAI,IAAIC,IAAI,EAAE;QACrBG,KAAK,GAAG,MAAMX,GAAG,CAACa,QAAQ,CAACH,KAAK,EAAE;UAC9BI,KAAK,EAAE;YAAEP,IAAI;YAAEC,IAAI;YAAEC,QAAQ;YAAEM,MAAM,EAAE;UAAK;QAChD,CAAC,CAAC;MACN;MAEA,IAAI,CAACJ,KAAK,EAAE;QACR,MAAM,IAAIK,cAAW,CAAC,wBAAwB,EAAE,kBAAkB,EAAE;UAChEV,EAAE;UACFC,IAAI;UACJC,IAAI;UACJC;QACJ,CAAC,CAAC;MACN;MAEA,OAAO,IAAAQ,8BAAc,EAACN,KAAK,EAAEO,sCAAU,CAAC;IAC5C,CAAC,CAAC;EACN,CAAC;EAED,MAAMC,mBAAmB,GAAG,CAAC;IAAEb,EAAE;IAAEP;EAAqC,CAAC,KAAK;IAC1E,OAAOE,SAAS,CAAC,MAAMS,KAAK,IAAI;MAC5B,MAAM;QAAEF,IAAI;QAAED,IAAI;QAAEE;MAAS,CAAC,GAAGV,MAAM;MAEvC,MAAM,CAACqB,SAAS,CAAC,GAAG,MAAMpB,GAAG,CAACqB,iBAAiB,CAACX,KAAK,EAAE;QACnDI,KAAK,EAAE;UACHN,IAAI;UACJD,IAAI;UACJE,QAAQ;UACRa,MAAM,EAAEhB;QACZ,CAAC;QACDiB,KAAK,EAAE;MACX,CAAC,CAAC;MAEF,IAAIH,SAAS,CAACI,MAAM,GAAG,CAAC,EAAE;QACtB,MAAM,IAAIR,cAAW,CAChB,qBAAoBT,IAAK,iCAAgC,EAC1D,uBAAuB,EACvB;UACID,EAAE;UACFP;QACJ,CAAC,CACJ;MACL;MAEA;IACJ,CAAC,CAAC;EACN,CAAC;EAED,OAAO;IACHM,SAAS;IACToB,WAAW,CAAC1B,MAAM,EAAE;MAChB,OAAOE,SAAS,CAAC,MAAMS,KAAK,IAAI;QAC5B,MAAM;UAAEgB,IAAI;UAAEZ;QAAM,CAAC,GAAGf,MAAM;QAE9B,MAAM,CAAC4B,OAAO,EAAEC,IAAI,CAAC,GAAG,MAAM5B,GAAG,CAACqB,iBAAiB,CAACX,KAAK,8DAClDX,MAAM;UACT2B,IAAI,EAAE,IAAAG,8BAAc,EAACH,IAAI,CAAC;UAC1BZ,KAAK,kCACGA,KAAK,IAAI,CAAC,CAAC;QAClB,GACH;QAEF,OAAO,CAACa,OAAO,CAACG,GAAG,CAACnB,KAAK,IAAI,IAAAM,8BAAc,EAACN,KAAK,EAAEO,sCAAU,CAAC,CAAC,EAAEU,IAAI,CAAC;MAC1E,CAAC,CAAC;IACN,CAAC;IACDG,YAAY,CAAC;MAAEC;IAAK,CAAC,EAAE;MACnB,OAAO/B,SAAS,CAAC,MAAMS,KAAK,IAAI;QAC5B,MAAMS,mBAAmB,CAAC;UACtBpB,MAAM,EAAE;YACJS,IAAI,EAAEwB,IAAI,CAACxB,IAAI;YACfD,IAAI,EAAEyB,IAAI,CAACzB,IAAI;YACfE,QAAQ,EAAEuB,IAAI,CAACvB;UACnB;QACJ,CAAC,CAAC;QAEF,MAAME,KAAK,GAAG,MAAMX,GAAG,CAACiC,WAAW,CAACvB,KAAK,8DAClCsB,IAAI;UACPvB,QAAQ,EAAEuB,IAAI,CAACvB,QAAQ,IAAI;QAAI,GACjC;QAEF,OAAO,IAAAQ,8BAAc,EAACN,KAAK,EAAEO,sCAAU,CAAC;MAC5C,CAAC,CAAC;IACN,CAAC;IACDgB,YAAY,CAAC;MAAE5B,EAAE;MAAE0B;IAAK,CAAC,EAAE;MACvB,OAAO/B,SAAS,CAAC,MAAMS,KAAK,IAAI;QAC5B,MAAM;UAAEH,IAAI;UAAEE;QAAS,CAAC,GAAGuB,IAAI;QAE/B,MAAMG,QAAQ,GAAG,MAAM9B,SAAS,CAAC;UAAEC;QAAG,CAAC,CAAC;QAExC,MAAMa,mBAAmB,CAAC;UACtBb,EAAE;UACFP,MAAM,EAAE;YACJS,IAAI,EAAE2B,QAAQ,CAAC3B,IAAI;YACnBD,IAAI,EAAEA,IAAI,IAAI4B,QAAQ,CAAC5B,IAAI;YAC3BE,QAAQ,EAAEA,QAAQ,KAAK2B,SAAS,GAAG3B,QAAQ,GAAG0B,QAAQ,CAAC1B,QAAQ,CAAC;UACpE;QACJ,CAAC,CAAC;;QAEF,MAAM4B,KAAK,+DACJF,QAAQ,GACRH,IAAI,CACV;QAED,MAAMrB,KAAK,GAAG,MAAMX,GAAG,CAACsC,WAAW,CAAC5B,KAAK,EAAEJ,EAAE,EAAE+B,KAAK,CAAC;QACrD,OAAO,IAAApB,8BAAc,EAACN,KAAK,EAAEO,sCAAU,CAAC;MAC5C,CAAC,CAAC;IACN,CAAC;IACDqB,YAAY,CAAC;MAAEjC;IAAG,CAAC,EAAE;MACjB,OAAOL,SAAS,CAAC,MAAMS,KAAK,IAAI;QAC5B,MAAMV,GAAG,CAACwC,WAAW,CAAC9B,KAAK,EAAEJ,EAAE,CAAC;QAChC,OAAO,IAAI;MACf,CAAC,CAAC;IACN;EACJ,CAAC;AACL,CAAC;AAAC"}

package/folder/folder.types.d.ts

@@ -1,4 +1,4 @@
-import { AcoBaseFields, ListMeta } from "../types";
+import { AcoBaseFields, ListMeta, ListSort } from "../types";
 import { Topic } from "@webiny/pubsub/types";
 export interface Folder extends AcoBaseFields {
     title: string;
@@ -12,7 +12,7 @@ export interface ListFoldersWhere {
 }
 export interface ListFoldersParams {
     where: ListFoldersWhere;
-    sort?: string[];
+    sort?: ListSort;
     limit?: number;
     after?: string | null;
 }

package/folder/folder.types.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["folder.types.ts"],"sourcesContent":["import { AcoBaseFields, ListMeta } from \"~/types\";\nimport { Topic } from \"@webiny/pubsub/types\";\n\nexport interface Folder extends AcoBaseFields {\n    title: string;\n    slug: string;\n    type: string;\n    parentId?: string | null;\n}\n\nexport interface ListFoldersWhere {\n    type: string;\n    parentId?: string | null;\n}\n\nexport interface ListFoldersParams {\n    where: ListFoldersWhere;\n    sort?: string[];\n    limit?: number;\n    after?: string | null;\n}\n\nexport type CreateFolderParams = Pick<Folder, \"title\" | \"slug\" | \"type\" | \"parentId\">;\n\nexport interface UpdateFolderParams {\n    title?: string;\n    slug?: string;\n    parentId?: string;\n}\n\nexport interface DeleteFolderParams {\n    id: string;\n}\n\nexport interface StorageOperationsGetFolderParams {\n    id?: string;\n    slug?: string;\n    type?: string;\n    parentId?: string | null;\n}\n\nexport type StorageOperationsListFoldersParams = ListFoldersParams;\n\nexport interface StorageOperationsCreateFolderParams {\n    data: CreateFolderParams;\n}\n\nexport interface StorageOperationsUpdateFolderParams {\n    id: string;\n    data: UpdateFolderParams;\n}\n\nexport type StorageOperationsDeleteFolderParams = DeleteFolderParams;\n\nexport interface OnFolderBeforeCreateTopicParams {\n    input: CreateFolderParams;\n}\n\nexport interface OnFolderAfterCreateTopicParams {\n    folder: Folder;\n}\n\nexport interface OnFolderBeforeUpdateTopicParams {\n    original: Folder;\n    input: Record<string, any>;\n}\n\nexport interface OnFolderAfterUpdateTopicParams {\n    original: Folder;\n    folder: Folder;\n    input: Record<string, any>;\n}\n\nexport interface OnFolderBeforeDeleteTopicParams {\n    folder: Folder;\n}\n\nexport interface OnFolderAfterDeleteTopicParams {\n    folder: Folder;\n}\n\nexport interface AcoFolderCrud {\n    get(id: string): Promise<Folder>;\n    list(params: ListFoldersParams): Promise<[Folder[], ListMeta]>;\n    create(data: CreateFolderParams): Promise<Folder>;\n    update(id: string, data: UpdateFolderParams): Promise<Folder>;\n    delete(id: string): Promise<Boolean>;\n    onFolderBeforeCreate: Topic<OnFolderBeforeCreateTopicParams>;\n    onFolderAfterCreate: Topic<OnFolderAfterCreateTopicParams>;\n    onFolderBeforeUpdate: Topic<OnFolderBeforeUpdateTopicParams>;\n    onFolderAfterUpdate: Topic<OnFolderAfterUpdateTopicParams>;\n    onFolderBeforeDelete: Topic<OnFolderBeforeDeleteTopicParams>;\n    onFolderAfterDelete: Topic<OnFolderAfterDeleteTopicParams>;\n}\n\nexport interface AcoFolderStorageOperations {\n    getFolder(params: StorageOperationsGetFolderParams): Promise<Folder>;\n    listFolders(params: StorageOperationsListFoldersParams): Promise<[Folder[], ListMeta]>;\n    createFolder(params: StorageOperationsCreateFolderParams): Promise<Folder>;\n    updateFolder(params: StorageOperationsUpdateFolderParams): Promise<Folder>;\n    deleteFolder(params: StorageOperationsDeleteFolderParams): Promise<boolean>;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["folder.types.ts"],"sourcesContent":["import { AcoBaseFields, ListMeta, ListSort } from \"~/types\";\nimport { Topic } from \"@webiny/pubsub/types\";\n\nexport interface Folder extends AcoBaseFields {\n    title: string;\n    slug: string;\n    type: string;\n    parentId?: string | null;\n}\n\nexport interface ListFoldersWhere {\n    type: string;\n    parentId?: string | null;\n}\n\nexport interface ListFoldersParams {\n    where: ListFoldersWhere;\n    sort?: ListSort;\n    limit?: number;\n    after?: string | null;\n}\n\nexport type CreateFolderParams = Pick<Folder, \"title\" | \"slug\" | \"type\" | \"parentId\">;\n\nexport interface UpdateFolderParams {\n    title?: string;\n    slug?: string;\n    parentId?: string;\n}\n\nexport interface DeleteFolderParams {\n    id: string;\n}\n\nexport interface StorageOperationsGetFolderParams {\n    id?: string;\n    slug?: string;\n    type?: string;\n    parentId?: string | null;\n}\n\nexport type StorageOperationsListFoldersParams = ListFoldersParams;\n\nexport interface StorageOperationsCreateFolderParams {\n    data: CreateFolderParams;\n}\n\nexport interface StorageOperationsUpdateFolderParams {\n    id: string;\n    data: UpdateFolderParams;\n}\n\nexport type StorageOperationsDeleteFolderParams = DeleteFolderParams;\n\nexport interface OnFolderBeforeCreateTopicParams {\n    input: CreateFolderParams;\n}\n\nexport interface OnFolderAfterCreateTopicParams {\n    folder: Folder;\n}\n\nexport interface OnFolderBeforeUpdateTopicParams {\n    original: Folder;\n    input: Record<string, any>;\n}\n\nexport interface OnFolderAfterUpdateTopicParams {\n    original: Folder;\n    folder: Folder;\n    input: Record<string, any>;\n}\n\nexport interface OnFolderBeforeDeleteTopicParams {\n    folder: Folder;\n}\n\nexport interface OnFolderAfterDeleteTopicParams {\n    folder: Folder;\n}\n\nexport interface AcoFolderCrud {\n    get(id: string): Promise<Folder>;\n    list(params: ListFoldersParams): Promise<[Folder[], ListMeta]>;\n    create(data: CreateFolderParams): Promise<Folder>;\n    update(id: string, data: UpdateFolderParams): Promise<Folder>;\n    delete(id: string): Promise<Boolean>;\n    onFolderBeforeCreate: Topic<OnFolderBeforeCreateTopicParams>;\n    onFolderAfterCreate: Topic<OnFolderAfterCreateTopicParams>;\n    onFolderBeforeUpdate: Topic<OnFolderBeforeUpdateTopicParams>;\n    onFolderAfterUpdate: Topic<OnFolderAfterUpdateTopicParams>;\n    onFolderBeforeDelete: Topic<OnFolderBeforeDeleteTopicParams>;\n    onFolderAfterDelete: Topic<OnFolderAfterDeleteTopicParams>;\n}\n\nexport interface AcoFolderStorageOperations {\n    getFolder(params: StorageOperationsGetFolderParams): Promise<Folder>;\n    listFolders(params: StorageOperationsListFoldersParams): Promise<[Folder[], ListMeta]>;\n    createFolder(params: StorageOperationsCreateFolderParams): Promise<Folder>;\n    updateFolder(params: StorageOperationsUpdateFolderParams): Promise<Folder>;\n    deleteFolder(params: StorageOperationsDeleteFolderParams): Promise<boolean>;\n}\n"],"mappings":""}

package/folder/onFolderBeforeDelete.hook.js

@@ -9,10 +9,10 @@ var _error = _interopRequireDefault(require("@webiny/error"));
 const onFolderBeforeDeleteHook = ({
   aco
 }) => {
-  try {
-    aco.folder.onFolderBeforeDelete.subscribe(async ({
-      folder
-    }) => {
+  aco.folder.onFolderBeforeDelete.subscribe(async ({
+    folder
+  }) => {
+    try {
       const {
         id,
         type
@@ -42,12 +42,12 @@ const onFolderBeforeDeleteHook = ({
           folder
         });
       }
-    });
-  } catch (error) {
-    throw _error.default.from(error, {
-      message: "Error while executing onFolderBeforeDelete hook",
-      code: "ACO_BEFORE_FOLDER_DELETE_HOOK"
-    });
-  }
+    } catch (error) {
+      throw _error.default.from(error, {
+        message: "Error while executing onFolderBeforeDelete hook",
+        code: "ACO_BEFORE_FOLDER_DELETE_HOOK"
+      });
+    }
+  });
 };
 exports.onFolderBeforeDeleteHook = onFolderBeforeDeleteHook;