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

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/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,6 @@
 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";
+export declare type FolderModelDefinition = Pick<CmsModel, "name" | "modelId" | "layout" | "titleFieldId" | "description" | "fields" | "isPrivate"> & {
+    isPrivate: true;
+};
+export declare const FOLDER_MODEL_ID = "acoFolder";
 export declare const createFolderModelDefinition: () => FolderModelDefinition;

package/folder/folder.model.js

@@ -63,7 +63,7 @@ const parentIdField = () => (0, _createModelField.createModelField)({
   type: "text",
   parent: "folder"
 });
-const FOLDER_MODEL_ID = "acoFolderModelDefinition";
+const FOLDER_MODEL_ID = "acoFolder";
 exports.FOLDER_MODEL_ID = FOLDER_MODEL_ID;
 const createFolderModelDefinition = () => {
   return {

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","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> & { isPrivate: true };\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 = \"acoFolder\";\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,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,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"}

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":";;;;;;;;AACA;AAEA;AACA;AACA;AAiBO,MAAMA,sBAAsB,GAC/BC,MAAwC,IACX;EAC7B,MAAM;IAAEC,GAAG;IAAEC;EAAS,CAAC,GAAGF,MAAM;EAChC,MAAMG,cAAc,GAAG,YAAY;IAC/BD,QAAQ,CAACE,oBAAoB,EAAE;IAC/B,MAAMC,KAAK,GAAG,MAAMJ,GAAG,CAACK,QAAQ,CAACC,uBAAe,CAAC;IACjDL,QAAQ,CAACM,mBAAmB,EAAE;IAC9B,IAAI,CAACH,KAAK,EAAE;MACR,MAAM,IAAII,cAAW,CAChB,mBAAkBF,uBAAgB,UAAS,EAC5C,uBAAuB,CAC1B;IACL;IACA,OAAOF,KAAK;EAChB,CAAC;EAED,MAAMK,SAAkD,GAAG,OAAO;IAC9DC,EAAE;IACFC,IAAI;IACJC,IAAI;IACJC;EACJ,CAAC,KAAK;IACF,MAAMT,KAAK,GAAG,MAAMF,cAAc,EAAE;IACpCD,QAAQ,CAACE,oBAAoB,EAAE;IAE/B,IAAIW,KAAK;IAET,IAAIJ,EAAE,EAAE;MACJI,KAAK,GAAG,MAAMd,GAAG,CAACe,YAAY,CAACX,KAAK,EAAEM,EAAE,CAAC;IAC7C,CAAC,MAAM,IAAIC,IAAI,IAAIC,IAAI,EAAE;MACrBE,KAAK,GAAG,MAAMd,GAAG,CAACgB,QAAQ,CAACZ,KAAK,EAAE;QAAEa,KAAK,EAAE;UAAEN,IAAI;UAAEC,IAAI;UAAEC,QAAQ;UAAEK,MAAM,EAAE;QAAK;MAAE,CAAC,CAAC;IACxF;IAEA,IAAI,CAACJ,KAAK,EAAE;MACR,MAAM,IAAIN,cAAW,CAAC,wBAAwB,EAAE,kBAAkB,EAAE;QAChEE,EAAE;QACFC,IAAI;QACJC,IAAI;QACJC;MACJ,CAAC,CAAC;IACN;IAEAZ,QAAQ,CAACM,mBAAmB,EAAE;IAC9B,OAAO,IAAAY,8BAAc,EAACL,KAAK,EAAEM,sCAAU,CAAC;EAC5C,CAAC;EAED,MAAMC,mBAAmB,GAAG,OAAO;IAAEX,EAAE;IAAEX;EAAqC,CAAC,KAAK;IAChF,MAAMK,KAAK,GAAG,MAAMF,cAAc,EAAE;IACpCD,QAAQ,CAACE,oBAAoB,EAAE;IAE/B,MAAM;MAAES,IAAI;MAAED,IAAI;MAAEE;IAAS,CAAC,GAAGd,MAAM;IAEvC,MAAM,CAACuB,SAAS,CAAC,GAAG,MAAMtB,GAAG,CAACuB,iBAAiB,CAACnB,KAAK,EAAE;MACnDa,KAAK,EAAE;QACHL,IAAI;QACJD,IAAI;QACJE,QAAQ;QACRW,MAAM,EAAEd;MACZ,CAAC;MACDe,KAAK,EAAE;IACX,CAAC,CAAC;IAEF,IAAIH,SAAS,CAACI,MAAM,GAAG,CAAC,EAAE;MACtB,MAAM,IAAIlB,cAAW,CAChB,qBAAoBG,IAAK,iCAAgC,EAC1D,uBAAuB,EACvB;QACID,EAAE;QACFX;MACJ,CAAC,CACJ;IACL;IAEAE,QAAQ,CAACM,mBAAmB,EAAE;IAC9B;EACJ,CAAC;EAED,OAAO;IACHL,cAAc;IACdO,SAAS;IACT,MAAMkB,WAAW,CAAC5B,MAAM,EAAE;MACtB,MAAMK,KAAK,GAAG,MAAMF,cAAc,EAAE;MACpCD,QAAQ,CAACE,oBAAoB,EAAE;MAE/B,MAAM,CAACyB,OAAO,EAAEC,IAAI,CAAC,GAAG,MAAM7B,GAAG,CAACuB,iBAAiB,CAACnB,KAAK,8DAClDL,MAAM;QACTkB,KAAK,kCACGlB,MAAM,CAACkB,KAAK,IAAI,CAAC,CAAC;MACzB,GACH;MAEFhB,QAAQ,CAACM,mBAAmB,EAAE;MAC9B,OAAO,CAACqB,OAAO,CAACE,GAAG,CAAChB,KAAK,IAAI,IAAAK,8BAAc,EAACL,KAAK,EAAEM,sCAAU,CAAC,CAAC,EAAES,IAAI,CAAC;IAC1E,CAAC;IACD,MAAME,YAAY,CAAC;MAAEC;IAAK,CAAC,EAAE;MACzB,MAAM5B,KAAK,GAAG,MAAMF,cAAc,EAAE;MACpCD,QAAQ,CAACE,oBAAoB,EAAE;MAE/B,MAAMkB,mBAAmB,CAAC;QACtBtB,MAAM,EAAE;UACJa,IAAI,EAAEoB,IAAI,CAACpB,IAAI;UACfD,IAAI,EAAEqB,IAAI,CAACrB,IAAI;UACfE,QAAQ,EAAEmB,IAAI,CAACnB;QACnB;MACJ,CAAC,CAAC;MAEF,MAAMC,KAAK,GAAG,MAAMd,GAAG,CAACiC,WAAW,CAAC7B,KAAK,8DAClC4B,IAAI;QACPnB,QAAQ,EAAEmB,IAAI,CAACnB,QAAQ,IAAI;MAAI,GACjC;MAEFZ,QAAQ,CAACM,mBAAmB,EAAE;MAC9B,OAAO,IAAAY,8BAAc,EAACL,KAAK,EAAEM,sCAAU,CAAC;IAC5C,CAAC;IACD,MAAMc,YAAY,CAAC;MAAExB,EAAE;MAAEsB;IAAK,CAAC,EAAE;MAC7B,MAAM;QAAErB,IAAI;QAAEE;MAAS,CAAC,GAAGmB,IAAI;MAC/B,MAAM5B,KAAK,GAAG,MAAMF,cAAc,EAAE;MACpCD,QAAQ,CAACE,oBAAoB,EAAE;MAE/B,MAAMgC,QAAQ,GAAG,MAAM1B,SAAS,CAAC;QAAEC;MAAG,CAAC,CAAC;MAExC,MAAMW,mBAAmB,CAAC;QACtBX,EAAE;QACFX,MAAM,EAAE;UACJa,IAAI,EAAEuB,QAAQ,CAACvB,IAAI;UACnBD,IAAI,EAAEA,IAAI,IAAIwB,QAAQ,CAACxB,IAAI;UAC3BE,QAAQ,EAAEA,QAAQ,KAAKuB,SAAS,GAAGvB,QAAQ,GAAGsB,QAAQ,CAACtB,QAAQ,CAAC;QACpE;MACJ,CAAC,CAAC;;MAEF,MAAMwB,KAAK,+DACJF,QAAQ,GACRH,IAAI,CACV;MAED,MAAMlB,KAAK,GAAG,MAAMd,GAAG,CAACsC,WAAW,CAAClC,KAAK,EAAEM,EAAE,EAAE2B,KAAK,CAAC;MACrDpC,QAAQ,CAACM,mBAAmB,EAAE;MAC9B,OAAO,IAAAY,8BAAc,EAACL,KAAK,EAAEM,sCAAU,CAAC;IAC5C,CAAC;IACD,MAAMmB,YAAY,CAAC;MAAE7B;IAAG,CAAC,EAAE;MACvB,MAAMN,KAAK,GAAG,MAAMF,cAAc,EAAE;MACpCD,QAAQ,CAACE,oBAAoB,EAAE;MAE/B,MAAMH,GAAG,CAACwC,WAAW,CAACpC,KAAK,EAAEM,EAAE,CAAC;MAEhCT,QAAQ,CAACM,mBAAmB,EAAE;MAC9B,OAAO,IAAI;IACf;EACJ,CAAC;AACL,CAAC;AAAC"}
+{"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":"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"}

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;

package/folder/onFolderBeforeDelete.hook.js.map

@@ -1 +1 @@
-{"version":3,"names":["onFolderBeforeDeleteHook","aco","folder","onFolderBeforeDelete","subscribe","id","type","children","list","where","parentId","limit","records","search","location","folderId","length","WebinyError","error","from","message","code"],"sources":["onFolderBeforeDelete.hook.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { AcoContext } from \"~/types\";\n\nexport const onFolderBeforeDeleteHook = ({ aco }: AcoContext) => {\n    try {\n        aco.folder.onFolderBeforeDelete.subscribe(async ({ folder }) => {\n            const { id, type } = folder;\n\n            // Fetching all child folders\n            const [children] = await aco.folder.list({\n                where: { type, parentId: id },\n                limit: 1\n            });\n\n            // Fetching all records inside the folder\n            const [records] = await aco.search.list({\n                where: { type, location: { folderId: id } },\n                limit: 1\n            });\n\n            if (children.length > 0 || records.length > 0) {\n                throw new WebinyError(\n                    \"Error: delete all child folders and entries before proceeding.\",\n                    \"DELETE_FOLDER_WITH_CHILDREN\",\n                    {\n                        folder\n                    }\n                );\n            }\n        });\n    } catch (error) {\n        throw WebinyError.from(error, {\n            message: \"Error while executing onFolderBeforeDelete hook\",\n            code: \"ACO_BEFORE_FOLDER_DELETE_HOOK\"\n        });\n    }\n};\n"],"mappings":";;;;;;;AAAA;AAGO,MAAMA,wBAAwB,GAAG,CAAC;EAAEC;AAAgB,CAAC,KAAK;EAC7D,IAAI;IACAA,GAAG,CAACC,MAAM,CAACC,oBAAoB,CAACC,SAAS,CAAC,OAAO;MAAEF;IAAO,CAAC,KAAK;MAC5D,MAAM;QAAEG,EAAE;QAAEC;MAAK,CAAC,GAAGJ,MAAM;;MAE3B;MACA,MAAM,CAACK,QAAQ,CAAC,GAAG,MAAMN,GAAG,CAACC,MAAM,CAACM,IAAI,CAAC;QACrCC,KAAK,EAAE;UAAEH,IAAI;UAAEI,QAAQ,EAAEL;QAAG,CAAC;QAC7BM,KAAK,EAAE;MACX,CAAC,CAAC;;MAEF;MACA,MAAM,CAACC,OAAO,CAAC,GAAG,MAAMX,GAAG,CAACY,MAAM,CAACL,IAAI,CAAC;QACpCC,KAAK,EAAE;UAAEH,IAAI;UAAEQ,QAAQ,EAAE;YAAEC,QAAQ,EAAEV;UAAG;QAAE,CAAC;QAC3CM,KAAK,EAAE;MACX,CAAC,CAAC;MAEF,IAAIJ,QAAQ,CAACS,MAAM,GAAG,CAAC,IAAIJ,OAAO,CAACI,MAAM,GAAG,CAAC,EAAE;QAC3C,MAAM,IAAIC,cAAW,CACjB,gEAAgE,EAChE,6BAA6B,EAC7B;UACIf;QACJ,CAAC,CACJ;MACL;IACJ,CAAC,CAAC;EACN,CAAC,CAAC,OAAOgB,KAAK,EAAE;IACZ,MAAMD,cAAW,CAACE,IAAI,CAACD,KAAK,EAAE;MAC1BE,OAAO,EAAE,iDAAiD;MAC1DC,IAAI,EAAE;IACV,CAAC,CAAC;EACN;AACJ,CAAC;AAAC"}
+{"version":3,"names":["onFolderBeforeDeleteHook","aco","folder","onFolderBeforeDelete","subscribe","id","type","children","list","where","parentId","limit","records","search","location","folderId","length","WebinyError","error","from","message","code"],"sources":["onFolderBeforeDelete.hook.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { AcoContext } from \"~/types\";\n\nexport const onFolderBeforeDeleteHook = ({ aco }: AcoContext) => {\n    aco.folder.onFolderBeforeDelete.subscribe(async ({ folder }) => {\n        try {\n            const { id, type } = folder;\n\n            // Fetching all child folders\n            const [children] = await aco.folder.list({\n                where: { type, parentId: id },\n                limit: 1\n            });\n\n            // Fetching all records inside the folder\n            const [records] = await aco.search.list({\n                where: { type, location: { folderId: id } },\n                limit: 1\n            });\n\n            if (children.length > 0 || records.length > 0) {\n                throw new WebinyError(\n                    \"Error: delete all child folders and entries before proceeding.\",\n                    \"DELETE_FOLDER_WITH_CHILDREN\",\n                    {\n                        folder\n                    }\n                );\n            }\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while executing onFolderBeforeDelete hook\",\n                code: \"ACO_BEFORE_FOLDER_DELETE_HOOK\"\n            });\n        }\n    });\n};\n"],"mappings":";;;;;;;AAAA;AAGO,MAAMA,wBAAwB,GAAG,CAAC;EAAEC;AAAgB,CAAC,KAAK;EAC7DA,GAAG,CAACC,MAAM,CAACC,oBAAoB,CAACC,SAAS,CAAC,OAAO;IAAEF;EAAO,CAAC,KAAK;IAC5D,IAAI;MACA,MAAM;QAAEG,EAAE;QAAEC;MAAK,CAAC,GAAGJ,MAAM;;MAE3B;MACA,MAAM,CAACK,QAAQ,CAAC,GAAG,MAAMN,GAAG,CAACC,MAAM,CAACM,IAAI,CAAC;QACrCC,KAAK,EAAE;UAAEH,IAAI;UAAEI,QAAQ,EAAEL;QAAG,CAAC;QAC7BM,KAAK,EAAE;MACX,CAAC,CAAC;;MAEF;MACA,MAAM,CAACC,OAAO,CAAC,GAAG,MAAMX,GAAG,CAACY,MAAM,CAACL,IAAI,CAAC;QACpCC,KAAK,EAAE;UAAEH,IAAI;UAAEQ,QAAQ,EAAE;YAAEC,QAAQ,EAAEV;UAAG;QAAE,CAAC;QAC3CM,KAAK,EAAE;MACX,CAAC,CAAC;MAEF,IAAIJ,QAAQ,CAACS,MAAM,GAAG,CAAC,IAAIJ,OAAO,CAACI,MAAM,GAAG,CAAC,EAAE;QAC3C,MAAM,IAAIC,cAAW,CACjB,gEAAgE,EAChE,6BAA6B,EAC7B;UACIf;QACJ,CAAC,CACJ;MACL;IACJ,CAAC,CAAC,OAAOgB,KAAK,EAAE;MACZ,MAAMD,cAAW,CAACE,IAAI,CAACD,KAAK,EAAE;QAC1BE,OAAO,EAAE,iDAAiD;QAC1DC,IAAI,EAAE;MACV,CAAC,CAAC;IACN;EACJ,CAAC,CAAC;AACN,CAAC;AAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-aco",
-	"version": "0.0.0-unstable.d7f521b032",
+	"version": "0.0.0-unstable.df6d94b531",
 	"main": "index.js",
 	"keywords": [
 		"aco:base"
@@ -27,31 +27,32 @@
 		"@babel/preset-env": "^7.19.4",
 		"@babel/preset-typescript": "^7.18.6",
 		"@babel/runtime": "^7.19.0",
-		"@webiny/api-headless-cms-ddb": "^0.0.0-unstable.d7f521b032",
-		"@webiny/api-i18n-ddb": "^0.0.0-unstable.d7f521b032",
-		"@webiny/api-security-so-ddb": "^0.0.0-unstable.d7f521b032",
-		"@webiny/api-tenancy-so-ddb": "^0.0.0-unstable.d7f521b032",
-		"@webiny/api-wcp": "^0.0.0-unstable.d7f521b032",
-		"@webiny/cli": "^0.0.0-unstable.d7f521b032",
-		"@webiny/handler-aws": "^0.0.0-unstable.d7f521b032",
-		"@webiny/plugins": "^0.0.0-unstable.d7f521b032",
-		"@webiny/project-utils": "^0.0.0-unstable.d7f521b032",
+		"@webiny/api-headless-cms-ddb": "^0.0.0-unstable.df6d94b531",
+		"@webiny/api-i18n-ddb": "^0.0.0-unstable.df6d94b531",
+		"@webiny/api-security-so-ddb": "^0.0.0-unstable.df6d94b531",
+		"@webiny/api-tenancy-so-ddb": "^0.0.0-unstable.df6d94b531",
+		"@webiny/api-wcp": "^0.0.0-unstable.df6d94b531",
+		"@webiny/cli": "^0.0.0-unstable.df6d94b531",
+		"@webiny/handler-aws": "^0.0.0-unstable.df6d94b531",
+		"@webiny/plugins": "^0.0.0-unstable.df6d94b531",
+		"@webiny/project-utils": "^0.0.0-unstable.df6d94b531",
 		"rimraf": "^3.0.2",
 		"ttypescript": "^1.5.13",
 		"typescript": "^4.7.4"
 	},
 	"dependencies": {
-		"@webiny/api": "0.0.0-unstable.d7f521b032",
-		"@webiny/api-admin-settings": "0.0.0-unstable.d7f521b032",
-		"@webiny/api-headless-cms": "0.0.0-unstable.d7f521b032",
-		"@webiny/api-i18n": "0.0.0-unstable.d7f521b032",
-		"@webiny/api-security": "0.0.0-unstable.d7f521b032",
-		"@webiny/api-tenancy": "0.0.0-unstable.d7f521b032",
-		"@webiny/error": "0.0.0-unstable.d7f521b032",
-		"@webiny/handler": "0.0.0-unstable.d7f521b032",
-		"@webiny/handler-graphql": "0.0.0-unstable.d7f521b032",
-		"@webiny/pubsub": "0.0.0-unstable.d7f521b032",
+		"@webiny/api": "0.0.0-unstable.df6d94b531",
+		"@webiny/api-admin-settings": "0.0.0-unstable.df6d94b531",
+		"@webiny/api-headless-cms": "0.0.0-unstable.df6d94b531",
+		"@webiny/api-i18n": "0.0.0-unstable.df6d94b531",
+		"@webiny/api-security": "0.0.0-unstable.df6d94b531",
+		"@webiny/api-tenancy": "0.0.0-unstable.df6d94b531",
+		"@webiny/error": "0.0.0-unstable.df6d94b531",
+		"@webiny/handler": "0.0.0-unstable.df6d94b531",
+		"@webiny/handler-graphql": "0.0.0-unstable.df6d94b531",
+		"@webiny/pubsub": "0.0.0-unstable.df6d94b531",
+		"@webiny/utils": "0.0.0-unstable.df6d94b531",
 		"lodash": "4.17.21"
 	},
-	"gitHead": "d7f521b0325964664dbeb6d2d07e2b6518e53841"
+	"gitHead": "df6d94b531ed0453caef22c785d42be580c9df96"
 }

package/record/record.gql.js

@@ -11,7 +11,6 @@ const searchRecordSchema = new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
   typeDefs: /* GraphQL */`
         type SearchRecord {
             id: ID!
-            originalId: ID!
             type: String!
             location: SearchLocationType!
             title: String!
@@ -31,7 +30,7 @@ const searchRecordSchema = new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
         }
 
         input SearchRecordCreateInput {
-            originalId: String!
+            id: String!
             type: String!
             title: String!
             content: String
@@ -69,7 +68,7 @@ const searchRecordSchema = new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
                 search: String
                 limit: Int
                 after: String
-                sort: [AcoListSort]
+                sort: AcoSort
             ): SearchRecordListResponse
         }
 

package/record/record.gql.js.map

@@ -1 +1 @@
-{"version":3,"names":["searchRecordSchema","GraphQLSchemaPlugin","typeDefs","resolvers","SearchQuery","getRecord","_","id","context","resolve","aco","search","get","listRecords","args","entries","meta","list","ListResponse","e","ErrorResponse","SearchMutation","createRecord","data","create","updateRecord","update","deleteRecord","delete"],"sources":["record.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 searchRecordSchema = new GraphQLSchemaPlugin<AcoContext>({\n    typeDefs: /* GraphQL */ `\n        type SearchRecord {\n            id: ID!\n            originalId: ID!\n            type: String!\n            location: SearchLocationType!\n            title: String!\n            content: String\n            data: JSON\n            savedOn: DateTime\n            createdOn: DateTime\n            createdBy: AcoUser\n        }\n\n        type SearchLocationType {\n            folderId: ID!\n        }\n\n        input SearchLocationInput {\n            folderId: ID!\n        }\n\n        input SearchRecordCreateInput {\n            originalId: String!\n            type: String!\n            title: String!\n            content: String\n            location: SearchLocationInput!\n            data: JSON\n        }\n\n        input SearchRecordUpdateInput {\n            title: String\n            content: String\n            location: SearchLocationInput\n            data: JSON\n        }\n\n        input SearchRecordListWhereInput {\n            type: String!\n            location: SearchLocationInput\n        }\n\n        type SearchRecordResponse {\n            data: SearchRecord\n            error: AcoError\n        }\n\n        type SearchRecordListResponse {\n            data: [SearchRecord]\n            error: AcoError\n            meta: AcoMeta\n        }\n\n        extend type SearchQuery {\n            getRecord(id: ID!): SearchRecordResponse\n            listRecords(\n                where: SearchRecordListWhereInput\n                search: String\n                limit: Int\n                after: String\n                sort: [AcoListSort]\n            ): SearchRecordListResponse\n        }\n\n        extend type SearchMutation {\n            createRecord(data: SearchRecordCreateInput!): SearchRecordResponse\n            updateRecord(id: ID!, data: SearchRecordUpdateInput!): SearchRecordResponse\n            deleteRecord(id: ID!): AcoBooleanResponse\n        }\n    `,\n    resolvers: {\n        SearchQuery: {\n            getRecord: async (_, { id }, context) => {\n                return resolve(() => context.aco.search.get(id));\n            },\n            listRecords: async (_, args: any, context) => {\n                try {\n                    const [entries, meta] = await context.aco.search.list(args);\n                    return new ListResponse(entries, meta);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            }\n        },\n        SearchMutation: {\n            createRecord: async (_, { data }, context) => {\n                return resolve(() => context.aco.search.create(data));\n            },\n            updateRecord: async (_, { id, data }, context) => {\n                return resolve(() => context.aco.search.update(id, data));\n            },\n            deleteRecord: async (_, { id }, context) => {\n                return resolve(() => context.aco.search.delete(id));\n            }\n        }\n    }\n});\n"],"mappings":";;;;;;AAAA;AACA;AAEA;AAIO,MAAMA,kBAAkB,GAAG,IAAIC,wCAAmB,CAAa;EAClEC,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;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;EACDC,SAAS,EAAE;IACPC,WAAW,EAAE;MACTC,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,cAAc,EAAE;MACZC,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":["searchRecordSchema","GraphQLSchemaPlugin","typeDefs","resolvers","SearchQuery","getRecord","_","id","context","resolve","aco","search","get","listRecords","args","entries","meta","list","ListResponse","e","ErrorResponse","SearchMutation","createRecord","data","create","updateRecord","update","deleteRecord","delete"],"sources":["record.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 searchRecordSchema = new GraphQLSchemaPlugin<AcoContext>({\n    typeDefs: /* GraphQL */ `\n        type SearchRecord {\n            id: ID!\n            type: String!\n            location: SearchLocationType!\n            title: String!\n            content: String\n            data: JSON\n            savedOn: DateTime\n            createdOn: DateTime\n            createdBy: AcoUser\n        }\n\n        type SearchLocationType {\n            folderId: ID!\n        }\n\n        input SearchLocationInput {\n            folderId: ID!\n        }\n\n        input SearchRecordCreateInput {\n            id: String!\n            type: String!\n            title: String!\n            content: String\n            location: SearchLocationInput!\n            data: JSON\n        }\n\n        input SearchRecordUpdateInput {\n            title: String\n            content: String\n            location: SearchLocationInput\n            data: JSON\n        }\n\n        input SearchRecordListWhereInput {\n            type: String!\n            location: SearchLocationInput\n        }\n\n        type SearchRecordResponse {\n            data: SearchRecord\n            error: AcoError\n        }\n\n        type SearchRecordListResponse {\n            data: [SearchRecord]\n            error: AcoError\n            meta: AcoMeta\n        }\n\n        extend type SearchQuery {\n            getRecord(id: ID!): SearchRecordResponse\n            listRecords(\n                where: SearchRecordListWhereInput\n                search: String\n                limit: Int\n                after: String\n                sort: AcoSort\n            ): SearchRecordListResponse\n        }\n\n        extend type SearchMutation {\n            createRecord(data: SearchRecordCreateInput!): SearchRecordResponse\n            updateRecord(id: ID!, data: SearchRecordUpdateInput!): SearchRecordResponse\n            deleteRecord(id: ID!): AcoBooleanResponse\n        }\n    `,\n    resolvers: {\n        SearchQuery: {\n            getRecord: async (_, { id }, context) => {\n                return resolve(() => context.aco.search.get(id));\n            },\n            listRecords: async (_, args: any, context) => {\n                try {\n                    const [entries, meta] = await context.aco.search.list(args);\n                    return new ListResponse(entries, meta);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            }\n        },\n        SearchMutation: {\n            createRecord: async (_, { data }, context) => {\n                return resolve(() => context.aco.search.create(data));\n            },\n            updateRecord: async (_, { id, data }, context) => {\n                return resolve(() => context.aco.search.update(id, data));\n            },\n            deleteRecord: async (_, { id }, context) => {\n                return resolve(() => context.aco.search.delete(id));\n            }\n        }\n    }\n});\n"],"mappings":";;;;;;AAAA;AACA;AAEA;AAIO,MAAMA,kBAAkB,GAAG,IAAIC,wCAAmB,CAAa;EAClEC,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;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;EACDC,SAAS,EAAE;IACPC,WAAW,EAAE;MACTC,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,cAAc,EAAE;MACZC,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/record/record.model.d.ts

@@ -1,4 +1,6 @@
 import { CmsModel } from "@webiny/api-headless-cms/types";
-export declare type SearchRecordModelDefinition = Pick<CmsModel, "name" | "modelId" | "layout" | "titleFieldId" | "description" | "fields" | "isPrivate">;
-export declare const SEARCH_RECORD_MODEL_ID = "acoSearchRecordModelDefinition";
+export declare type SearchRecordModelDefinition = Pick<CmsModel, "name" | "modelId" | "layout" | "titleFieldId" | "description" | "fields" | "isPrivate"> & {
+    isPrivate: true;
+};
+export declare const SEARCH_RECORD_MODEL_ID = "acoSearchRecord";
 export declare const createSearchModelDefinition: () => SearchRecordModelDefinition;

package/record/record.model.js

@@ -5,18 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createSearchModelDefinition = exports.SEARCH_RECORD_MODEL_ID = void 0;
 var _createModelField = require("../utils/createModelField");
-const originalIdField = () => (0, _createModelField.createModelField)({
-  label: "Original Id",
-  type: "text",
-  parent: "searchRecord",
-  validation: [{
-    name: "required",
-    message: "Value is required."
-  }, {
-    name: "unique",
-    message: "Value must be unique."
-  }]
-});
 const typeField = () => (0, _createModelField.createModelField)({
   label: "Type",
   type: "text",
@@ -59,15 +47,15 @@ const dataField = () => (0, _createModelField.createModelField)({
   type: "wby-aco-json",
   parent: "searchRecord"
 });
-const SEARCH_RECORD_MODEL_ID = "acoSearchRecordModelDefinition";
+const SEARCH_RECORD_MODEL_ID = "acoSearchRecord";
 exports.SEARCH_RECORD_MODEL_ID = SEARCH_RECORD_MODEL_ID;
 const createSearchModelDefinition = () => {
   return {
     name: "ACO - Search Record",
     modelId: SEARCH_RECORD_MODEL_ID,
-    titleFieldId: "originalId",
-    layout: [["searchRecord_originalId"], ["searchRecord_type"], ["searchRecord_title"], ["searchRecord_content"], ["searchRecord_location"], ["searchRecord_data"]],
-    fields: [originalIdField(), typeField(), titleField(), contentField(), locationField([locationFolderIdField()]), dataField()],
+    titleFieldId: "title",
+    layout: [["searchRecord_type"], ["searchRecord_title"], ["searchRecord_content"], ["searchRecord_location"], ["searchRecord_data"]],
+    fields: [typeField(), titleField(), contentField(), locationField([locationFolderIdField()]), dataField()],
     description: "ACO - Search record model",
     isPrivate: true
   };

package/record/record.model.js.map

@@ -1 +1 @@
-{"version":3,"names":["originalIdField","createModelField","label","type","parent","validation","name","message","typeField","titleField","contentField","locationField","fields","multipleValues","settings","locationFolderIdField","dataField","SEARCH_RECORD_MODEL_ID","createSearchModelDefinition","modelId","titleFieldId","layout","description","isPrivate"],"sources":["record.model.ts"],"sourcesContent":["import { CmsModel, CmsModelField } from \"@webiny/api-headless-cms/types\";\n\nimport { createModelField } from \"~/utils/createModelField\";\n\nexport type SearchRecordModelDefinition = Pick<\n    CmsModel,\n    \"name\" | \"modelId\" | \"layout\" | \"titleFieldId\" | \"description\" | \"fields\" | \"isPrivate\"\n>;\n\nconst originalIdField = () =>\n    createModelField({\n        label: \"Original Id\",\n        type: \"text\",\n        parent: \"searchRecord\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            },\n            {\n                name: \"unique\",\n                message: \"Value must be unique.\"\n            }\n        ]\n    });\n\nconst typeField = () =>\n    createModelField({\n        label: \"Type\",\n        type: \"text\",\n        parent: \"searchRecord\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst titleField = () =>\n    createModelField({\n        label: \"Title\",\n        type: \"text\",\n        parent: \"searchRecord\"\n    });\n\nconst contentField = () =>\n    createModelField({\n        label: \"Content\",\n        type: \"text\",\n        parent: \"searchRecord\"\n    });\n\nconst locationField = (fields: CmsModelField[]) =>\n    createModelField({\n        label: \"Location\",\n        type: \"object\",\n        parent: \"searchRecord\",\n        multipleValues: false,\n        settings: { fields }\n    });\n\nconst locationFolderIdField = () =>\n    createModelField({\n        label: \"Folder Id\",\n        type: \"text\",\n        parent: \"searchRecord Location\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst dataField = () =>\n    createModelField({\n        label: \"Data\",\n        type: \"wby-aco-json\",\n        parent: \"searchRecord\"\n    });\n\nexport const SEARCH_RECORD_MODEL_ID = \"acoSearchRecordModelDefinition\";\n\nexport const createSearchModelDefinition = (): SearchRecordModelDefinition => {\n    return {\n        name: \"ACO - Search Record\",\n        modelId: SEARCH_RECORD_MODEL_ID,\n        titleFieldId: \"originalId\",\n        layout: [\n            [\"searchRecord_originalId\"],\n            [\"searchRecord_type\"],\n            [\"searchRecord_title\"],\n            [\"searchRecord_content\"],\n            [\"searchRecord_location\"],\n            [\"searchRecord_data\"]\n        ],\n        fields: [\n            originalIdField(),\n            typeField(),\n            titleField(),\n            contentField(),\n            locationField([locationFolderIdField()]),\n            dataField()\n        ],\n        description: \"ACO - Search record model\",\n        isPrivate: true\n    };\n};\n"],"mappings":";;;;;;AAEA;AAOA,MAAMA,eAAe,GAAG,MACpB,IAAAC,kCAAgB,EAAC;EACbC,KAAK,EAAE,aAAa;EACpBC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE,cAAc;EACtBC,UAAU,EAAE,CACR;IACIC,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE;EACb,CAAC,EACD;IACID,IAAI,EAAE,QAAQ;IACdC,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMC,SAAS,GAAG,MACd,IAAAP,kCAAgB,EAAC;EACbC,KAAK,EAAE,MAAM;EACbC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE,cAAc;EACtBC,UAAU,EAAE,CACR;IACIC,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAME,UAAU,GAAG,MACf,IAAAR,kCAAgB,EAAC;EACbC,KAAK,EAAE,OAAO;EACdC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE;AACZ,CAAC,CAAC;AAEN,MAAMM,YAAY,GAAG,MACjB,IAAAT,kCAAgB,EAAC;EACbC,KAAK,EAAE,SAAS;EAChBC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE;AACZ,CAAC,CAAC;AAEN,MAAMO,aAAa,GAAIC,MAAuB,IAC1C,IAAAX,kCAAgB,EAAC;EACbC,KAAK,EAAE,UAAU;EACjBC,IAAI,EAAE,QAAQ;EACdC,MAAM,EAAE,cAAc;EACtBS,cAAc,EAAE,KAAK;EACrBC,QAAQ,EAAE;IAAEF;EAAO;AACvB,CAAC,CAAC;AAEN,MAAMG,qBAAqB,GAAG,MAC1B,IAAAd,kCAAgB,EAAC;EACbC,KAAK,EAAE,WAAW;EAClBC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE,uBAAuB;EAC/BC,UAAU,EAAE,CACR;IACIC,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMS,SAAS,GAAG,MACd,IAAAf,kCAAgB,EAAC;EACbC,KAAK,EAAE,MAAM;EACbC,IAAI,EAAE,cAAc;EACpBC,MAAM,EAAE;AACZ,CAAC,CAAC;AAEC,MAAMa,sBAAsB,GAAG,gCAAgC;AAAC;AAEhE,MAAMC,2BAA2B,GAAG,MAAmC;EAC1E,OAAO;IACHZ,IAAI,EAAE,qBAAqB;IAC3Ba,OAAO,EAAEF,sBAAsB;IAC/BG,YAAY,EAAE,YAAY;IAC1BC,MAAM,EAAE,CACJ,CAAC,yBAAyB,CAAC,EAC3B,CAAC,mBAAmB,CAAC,EACrB,CAAC,oBAAoB,CAAC,EACtB,CAAC,sBAAsB,CAAC,EACxB,CAAC,uBAAuB,CAAC,EACzB,CAAC,mBAAmB,CAAC,CACxB;IACDT,MAAM,EAAE,CACJZ,eAAe,EAAE,EACjBQ,SAAS,EAAE,EACXC,UAAU,EAAE,EACZC,YAAY,EAAE,EACdC,aAAa,CAAC,CAACI,qBAAqB,EAAE,CAAC,CAAC,EACxCC,SAAS,EAAE,CACd;IACDM,WAAW,EAAE,2BAA2B;IACxCC,SAAS,EAAE;EACf,CAAC;AACL,CAAC;AAAC"}
+{"version":3,"names":["typeField","createModelField","label","type","parent","validation","name","message","titleField","contentField","locationField","fields","multipleValues","settings","locationFolderIdField","dataField","SEARCH_RECORD_MODEL_ID","createSearchModelDefinition","modelId","titleFieldId","layout","description","isPrivate"],"sources":["record.model.ts"],"sourcesContent":["import { CmsModel, CmsModelField } from \"@webiny/api-headless-cms/types\";\n\nimport { createModelField } from \"~/utils/createModelField\";\n\nexport type SearchRecordModelDefinition = Pick<\n    CmsModel,\n    \"name\" | \"modelId\" | \"layout\" | \"titleFieldId\" | \"description\" | \"fields\" | \"isPrivate\"\n> & { isPrivate: true };\n\nconst typeField = () =>\n    createModelField({\n        label: \"Type\",\n        type: \"text\",\n        parent: \"searchRecord\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst titleField = () =>\n    createModelField({\n        label: \"Title\",\n        type: \"text\",\n        parent: \"searchRecord\"\n    });\n\nconst contentField = () =>\n    createModelField({\n        label: \"Content\",\n        type: \"text\",\n        parent: \"searchRecord\"\n    });\n\nconst locationField = (fields: CmsModelField[]) =>\n    createModelField({\n        label: \"Location\",\n        type: \"object\",\n        parent: \"searchRecord\",\n        multipleValues: false,\n        settings: { fields }\n    });\n\nconst locationFolderIdField = () =>\n    createModelField({\n        label: \"Folder Id\",\n        type: \"text\",\n        parent: \"searchRecord Location\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst dataField = () =>\n    createModelField({\n        label: \"Data\",\n        type: \"wby-aco-json\",\n        parent: \"searchRecord\"\n    });\n\nexport const SEARCH_RECORD_MODEL_ID = \"acoSearchRecord\";\n\nexport const createSearchModelDefinition = (): SearchRecordModelDefinition => {\n    return {\n        name: \"ACO - Search Record\",\n        modelId: SEARCH_RECORD_MODEL_ID,\n        titleFieldId: \"title\",\n        layout: [\n            [\"searchRecord_type\"],\n            [\"searchRecord_title\"],\n            [\"searchRecord_content\"],\n            [\"searchRecord_location\"],\n            [\"searchRecord_data\"]\n        ],\n        fields: [\n            typeField(),\n            titleField(),\n            contentField(),\n            locationField([locationFolderIdField()]),\n            dataField()\n        ],\n        description: \"ACO - Search record model\",\n        isPrivate: true\n    };\n};\n"],"mappings":";;;;;;AAEA;AAOA,MAAMA,SAAS,GAAG,MACd,IAAAC,kCAAgB,EAAC;EACbC,KAAK,EAAE,MAAM;EACbC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE,cAAc;EACtBC,UAAU,EAAE,CACR;IACIC,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMC,UAAU,GAAG,MACf,IAAAP,kCAAgB,EAAC;EACbC,KAAK,EAAE,OAAO;EACdC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE;AACZ,CAAC,CAAC;AAEN,MAAMK,YAAY,GAAG,MACjB,IAAAR,kCAAgB,EAAC;EACbC,KAAK,EAAE,SAAS;EAChBC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE;AACZ,CAAC,CAAC;AAEN,MAAMM,aAAa,GAAIC,MAAuB,IAC1C,IAAAV,kCAAgB,EAAC;EACbC,KAAK,EAAE,UAAU;EACjBC,IAAI,EAAE,QAAQ;EACdC,MAAM,EAAE,cAAc;EACtBQ,cAAc,EAAE,KAAK;EACrBC,QAAQ,EAAE;IAAEF;EAAO;AACvB,CAAC,CAAC;AAEN,MAAMG,qBAAqB,GAAG,MAC1B,IAAAb,kCAAgB,EAAC;EACbC,KAAK,EAAE,WAAW;EAClBC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE,uBAAuB;EAC/BC,UAAU,EAAE,CACR;IACIC,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMQ,SAAS,GAAG,MACd,IAAAd,kCAAgB,EAAC;EACbC,KAAK,EAAE,MAAM;EACbC,IAAI,EAAE,cAAc;EACpBC,MAAM,EAAE;AACZ,CAAC,CAAC;AAEC,MAAMY,sBAAsB,GAAG,iBAAiB;AAAC;AAEjD,MAAMC,2BAA2B,GAAG,MAAmC;EAC1E,OAAO;IACHX,IAAI,EAAE,qBAAqB;IAC3BY,OAAO,EAAEF,sBAAsB;IAC/BG,YAAY,EAAE,OAAO;IACrBC,MAAM,EAAE,CACJ,CAAC,mBAAmB,CAAC,EACrB,CAAC,oBAAoB,CAAC,EACtB,CAAC,sBAAsB,CAAC,EACxB,CAAC,uBAAuB,CAAC,EACzB,CAAC,mBAAmB,CAAC,CACxB;IACDT,MAAM,EAAE,CACJX,SAAS,EAAE,EACXQ,UAAU,EAAE,EACZC,YAAY,EAAE,EACdC,aAAa,CAAC,CAACI,qBAAqB,EAAE,CAAC,CAAC,EACxCC,SAAS,EAAE,CACd;IACDM,WAAW,EAAE,2BAA2B;IACxCC,SAAS,EAAE;EACf,CAAC;AACL,CAAC;AAAC"}

package/record/record.so.d.ts

@@ -1,8 +1,3 @@
-import { CmsModel } from "@webiny/api-headless-cms/types";
 import { CreateAcoStorageOperationsParams } from "../createAcoStorageOperations";
-import { AcoSearchRecordStorageOperations as BaseAcoSearchRecordStorageOperations } from "./record.types";
-interface AcoSearchRecordStorageOperations extends BaseAcoSearchRecordStorageOperations {
-    getRecordModel(): Promise<CmsModel>;
-}
+import { AcoSearchRecordStorageOperations } from "./record.types";
 export declare const createSearchRecordOperations: (params: CreateAcoStorageOperationsParams) => AcoSearchRecordStorageOperations;
-export {};

package/record/record.so.js

@@ -6,94 +6,92 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createSearchRecordOperations = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _valueKeyStorageConverter = require("@webiny/api-headless-cms/utils/converters/valueKeyStorageConverter");
 var _error = _interopRequireDefault(require("@webiny/error"));
 var _record = require("./record.model");
 var _createAcoStorageOperations = require("../createAcoStorageOperations");
+var _createListSort = require("../utils/createListSort");
+var _createOperationsWrapper = require("../utils/createOperationsWrapper");
 var _getFieldValues = require("../utils/getFieldValues");
 const createSearchRecordOperations = params => {
   const {
     cms,
-    security
+    getCmsContext
   } = params;
-  const getRecordModel = async () => {
-    security.disableAuthorization();
-    const model = await cms.getModel(_record.SEARCH_RECORD_MODEL_ID);
-    security.enableAuthorization();
-    if (!model) {
-      throw new _error.default(`Could not find "${_record.SEARCH_RECORD_MODEL_ID}" model.`, "MODEL_NOT_FOUND_ERROR");
-    }
-    return model;
-  };
-  const getRecord = async ({
-    id
-  }) => {
-    const model = await getRecordModel();
-    security.disableAuthorization();
+  const {
+    withModel
+  } = (0, _createOperationsWrapper.createOperationsWrapper)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+    modelName: _record.SEARCH_RECORD_MODEL_ID
+  }));
+  const getRecord = async (initialModel, id) => {
+    const context = getCmsContext();
+    const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+      model: initialModel,
+      plugins: context.plugins
+    });
 
     /**
-     * The record "id" is generated on creation.
-     * Still, we need to get/update/delete records by the original entry id.
+     * The record "id" has been passed by the original entry.
+     * We need to retrieve it via `cms.storageOperations.entries.getLatestByIds()` method and return the first one.
      */
-    const entry = await cms.getEntry(model, {
-      where: {
-        originalId: id,
-        latest: true
-      }
+    const revisions = await cms.storageOperations.entries.getLatestByIds(model, {
+      ids: [id]
     });
-    if (!entry) {
-      throw new _error.default("Could not load record.", "GET_ENTRY_ERROR", {
+    if (revisions.length === 0) {
+      throw new _error.default("Record not found.", "NOT_FOUND", {
         id
       });
     }
-    security.enableAuthorization();
-    return (0, _getFieldValues.getFieldValues)(entry, _createAcoStorageOperations.baseFields);
+    return revisions[0];
   };
   return {
-    getRecordModel,
-    getRecord,
-    async listRecords(params) {
-      const model = await getRecordModel();
-      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];
+    async getRecord({
+      id
+    }) {
+      return withModel(async model => {
+        const record = await getRecord(model, id);
+        return (0, _getFieldValues.getFieldValues)(record, _createAcoStorageOperations.baseFields, true);
+      });
+    },
+    listRecords(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, true)), meta];
+      });
     },
-    async createRecord({
+    createRecord({
       data
     }) {
-      const model = await getRecordModel();
-      security.disableAuthorization();
-      const entry = await cms.createEntry(model, data);
-      security.enableAuthorization();
-      return (0, _getFieldValues.getFieldValues)(entry, _createAcoStorageOperations.baseFields);
+      return withModel(async model => {
+        const entry = await cms.createEntry(model, data);
+        return (0, _getFieldValues.getFieldValues)(entry, _createAcoStorageOperations.baseFields, true);
+      });
     },
-    async updateRecord({
+    updateRecord({
       id,
       data
     }) {
-      const model = await getRecordModel();
-      security.disableAuthorization();
-      const original = await getRecord({
-        id
+      return withModel(async model => {
+        const original = await getRecord(model, id);
+        const input = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, original), data);
+        const entry = await cms.updateEntry(model, original.id, input);
+        return (0, _getFieldValues.getFieldValues)(entry, _createAcoStorageOperations.baseFields, true);
       });
-      const input = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, original), data);
-      const entry = await cms.updateEntry(model, original.id, input);
-      security.enableAuthorization();
-      return (0, _getFieldValues.getFieldValues)(entry, _createAcoStorageOperations.baseFields);
     },
-    async deleteRecord({
+    deleteRecord({
       id
     }) {
-      const model = await getRecordModel();
-      security.disableAuthorization();
-      const entry = await getRecord({
-        id
+      return withModel(async model => {
+        await cms.deleteEntry(model, id);
+        return true;
       });
-      await cms.deleteEntry(model, entry.id);
-      security.enableAuthorization();
-      return true;
     }
   };
 };

package/record/record.so.js.map

@@ -1 +1 @@
-{"version":3,"names":["createSearchRecordOperations","params","cms","security","getRecordModel","disableAuthorization","model","getModel","SEARCH_RECORD_MODEL_ID","enableAuthorization","WebinyError","getRecord","id","entry","getEntry","where","originalId","latest","getFieldValues","baseFields","listRecords","entries","meta","listLatestEntries","map","createRecord","data","createEntry","updateRecord","original","input","updateEntry","deleteRecord","deleteEntry"],"sources":["record.so.ts"],"sourcesContent":["import { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport WebinyError from \"@webiny/error\";\n\nimport { SEARCH_RECORD_MODEL_ID } from \"./record.model\";\nimport { baseFields, CreateAcoStorageOperationsParams } from \"~/createAcoStorageOperations\";\nimport { getFieldValues } from \"~/utils/getFieldValues\";\n\nimport { AcoSearchRecordStorageOperations as BaseAcoSearchRecordStorageOperations } from \"./record.types\";\n\ninterface AcoSearchRecordStorageOperations extends BaseAcoSearchRecordStorageOperations {\n    getRecordModel(): Promise<CmsModel>;\n}\n\nexport const createSearchRecordOperations = (\n    params: CreateAcoStorageOperationsParams\n): AcoSearchRecordStorageOperations => {\n    const { cms, security } = params;\n    const getRecordModel = async () => {\n        security.disableAuthorization();\n        const model = await cms.getModel(SEARCH_RECORD_MODEL_ID);\n        security.enableAuthorization();\n        if (!model) {\n            throw new WebinyError(\n                `Could not find \"${SEARCH_RECORD_MODEL_ID}\" model.`,\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n\n    const getRecord: AcoSearchRecordStorageOperations[\"getRecord\"] = async ({ id }) => {\n        const model = await getRecordModel();\n        security.disableAuthorization();\n\n        /**\n         * The record \"id\" is generated on creation.\n         * Still, we need to get/update/delete records by the original entry id.\n         */\n        const entry = await cms.getEntry(model, { where: { originalId: id, latest: true } });\n\n        if (!entry) {\n            throw new WebinyError(\"Could not load record.\", \"GET_ENTRY_ERROR\", {\n                id\n            });\n        }\n\n        security.enableAuthorization();\n        return getFieldValues(entry, baseFields);\n    };\n\n    return {\n        getRecordModel,\n        getRecord,\n        async listRecords(params) {\n            const model = await getRecordModel();\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 createRecord({ data }) {\n            const model = await getRecordModel();\n            security.disableAuthorization();\n\n            const entry = await cms.createEntry(model, data);\n\n            security.enableAuthorization();\n            return getFieldValues(entry, baseFields);\n        },\n        async updateRecord({ id, data }) {\n            const model = await getRecordModel();\n            security.disableAuthorization();\n\n            const original = await getRecord({ id });\n\n            const input = {\n                ...original,\n                ...data\n            };\n\n            const entry = await cms.updateEntry(model, original.id, input);\n            security.enableAuthorization();\n            return getFieldValues(entry, baseFields);\n        },\n        async deleteRecord({ id }) {\n            const model = await getRecordModel();\n            security.disableAuthorization();\n\n            const entry = await getRecord({ id });\n\n            await cms.deleteEntry(model, entry.id);\n\n            security.enableAuthorization();\n            return true;\n        }\n    };\n};\n"],"mappings":";;;;;;;;AACA;AAEA;AACA;AACA;AAQO,MAAMA,4BAA4B,GACrCC,MAAwC,IACL;EACnC,MAAM;IAAEC,GAAG;IAAEC;EAAS,CAAC,GAAGF,MAAM;EAChC,MAAMG,cAAc,GAAG,YAAY;IAC/BD,QAAQ,CAACE,oBAAoB,EAAE;IAC/B,MAAMC,KAAK,GAAG,MAAMJ,GAAG,CAACK,QAAQ,CAACC,8BAAsB,CAAC;IACxDL,QAAQ,CAACM,mBAAmB,EAAE;IAC9B,IAAI,CAACH,KAAK,EAAE;MACR,MAAM,IAAII,cAAW,CAChB,mBAAkBF,8BAAuB,UAAS,EACnD,uBAAuB,CAC1B;IACL;IACA,OAAOF,KAAK;EAChB,CAAC;EAED,MAAMK,SAAwD,GAAG,OAAO;IAAEC;EAAG,CAAC,KAAK;IAC/E,MAAMN,KAAK,GAAG,MAAMF,cAAc,EAAE;IACpCD,QAAQ,CAACE,oBAAoB,EAAE;;IAE/B;AACR;AACA;AACA;IACQ,MAAMQ,KAAK,GAAG,MAAMX,GAAG,CAACY,QAAQ,CAACR,KAAK,EAAE;MAAES,KAAK,EAAE;QAAEC,UAAU,EAAEJ,EAAE;QAAEK,MAAM,EAAE;MAAK;IAAE,CAAC,CAAC;IAEpF,IAAI,CAACJ,KAAK,EAAE;MACR,MAAM,IAAIH,cAAW,CAAC,wBAAwB,EAAE,iBAAiB,EAAE;QAC/DE;MACJ,CAAC,CAAC;IACN;IAEAT,QAAQ,CAACM,mBAAmB,EAAE;IAC9B,OAAO,IAAAS,8BAAc,EAACL,KAAK,EAAEM,sCAAU,CAAC;EAC5C,CAAC;EAED,OAAO;IACHf,cAAc;IACdO,SAAS;IACT,MAAMS,WAAW,CAACnB,MAAM,EAAE;MACtB,MAAMK,KAAK,GAAG,MAAMF,cAAc,EAAE;MACpCD,QAAQ,CAACE,oBAAoB,EAAE;MAE/B,MAAM,CAACgB,OAAO,EAAEC,IAAI,CAAC,GAAG,MAAMpB,GAAG,CAACqB,iBAAiB,CAACjB,KAAK,8DAClDL,MAAM;QACTc,KAAK,kCACGd,MAAM,CAACc,KAAK,IAAI,CAAC,CAAC;MACzB,GACH;MAEFZ,QAAQ,CAACM,mBAAmB,EAAE;MAC9B,OAAO,CAACY,OAAO,CAACG,GAAG,CAACX,KAAK,IAAI,IAAAK,8BAAc,EAACL,KAAK,EAAEM,sCAAU,CAAC,CAAC,EAAEG,IAAI,CAAC;IAC1E,CAAC;IACD,MAAMG,YAAY,CAAC;MAAEC;IAAK,CAAC,EAAE;MACzB,MAAMpB,KAAK,GAAG,MAAMF,cAAc,EAAE;MACpCD,QAAQ,CAACE,oBAAoB,EAAE;MAE/B,MAAMQ,KAAK,GAAG,MAAMX,GAAG,CAACyB,WAAW,CAACrB,KAAK,EAAEoB,IAAI,CAAC;MAEhDvB,QAAQ,CAACM,mBAAmB,EAAE;MAC9B,OAAO,IAAAS,8BAAc,EAACL,KAAK,EAAEM,sCAAU,CAAC;IAC5C,CAAC;IACD,MAAMS,YAAY,CAAC;MAAEhB,EAAE;MAAEc;IAAK,CAAC,EAAE;MAC7B,MAAMpB,KAAK,GAAG,MAAMF,cAAc,EAAE;MACpCD,QAAQ,CAACE,oBAAoB,EAAE;MAE/B,MAAMwB,QAAQ,GAAG,MAAMlB,SAAS,CAAC;QAAEC;MAAG,CAAC,CAAC;MAExC,MAAMkB,KAAK,+DACJD,QAAQ,GACRH,IAAI,CACV;MAED,MAAMb,KAAK,GAAG,MAAMX,GAAG,CAAC6B,WAAW,CAACzB,KAAK,EAAEuB,QAAQ,CAACjB,EAAE,EAAEkB,KAAK,CAAC;MAC9D3B,QAAQ,CAACM,mBAAmB,EAAE;MAC9B,OAAO,IAAAS,8BAAc,EAACL,KAAK,EAAEM,sCAAU,CAAC;IAC5C,CAAC;IACD,MAAMa,YAAY,CAAC;MAAEpB;IAAG,CAAC,EAAE;MACvB,MAAMN,KAAK,GAAG,MAAMF,cAAc,EAAE;MACpCD,QAAQ,CAACE,oBAAoB,EAAE;MAE/B,MAAMQ,KAAK,GAAG,MAAMF,SAAS,CAAC;QAAEC;MAAG,CAAC,CAAC;MAErC,MAAMV,GAAG,CAAC+B,WAAW,CAAC3B,KAAK,EAAEO,KAAK,CAACD,EAAE,CAAC;MAEtCT,QAAQ,CAACM,mBAAmB,EAAE;MAC9B,OAAO,IAAI;IACf;EACJ,CAAC;AACL,CAAC;AAAC"}
+{"version":3,"names":["createSearchRecordOperations","params","cms","getCmsContext","withModel","createOperationsWrapper","modelName","SEARCH_RECORD_MODEL_ID","getRecord","initialModel","id","context","model","attachCmsModelFieldConverters","plugins","revisions","storageOperations","entries","getLatestByIds","ids","length","WebinyError","record","getFieldValues","baseFields","listRecords","sort","where","meta","listLatestEntries","createListSort","map","entry","createRecord","data","createEntry","updateRecord","original","input","updateEntry","deleteRecord","deleteEntry"],"sources":["record.so.ts"],"sourcesContent":["import { attachCmsModelFieldConverters } from \"@webiny/api-headless-cms/utils/converters/valueKeyStorageConverter\";\n\nimport WebinyError from \"@webiny/error\";\n\nimport { SEARCH_RECORD_MODEL_ID } from \"./record.model\";\nimport { baseFields, CreateAcoStorageOperationsParams } from \"~/createAcoStorageOperations\";\nimport { createListSort } from \"~/utils/createListSort\";\nimport { createOperationsWrapper } from \"~/utils/createOperationsWrapper\";\nimport { getFieldValues } from \"~/utils/getFieldValues\";\n\nimport { AcoSearchRecordStorageOperations } from \"./record.types\";\nimport { CmsModel } from \"@webiny/api-headless-cms/types\";\n\nexport const createSearchRecordOperations = (\n    params: CreateAcoStorageOperationsParams\n): AcoSearchRecordStorageOperations => {\n    const { cms, getCmsContext } = params;\n\n    const { withModel } = createOperationsWrapper({\n        ...params,\n        modelName: SEARCH_RECORD_MODEL_ID\n    });\n\n    const getRecord = async (initialModel: CmsModel, id: string) => {\n        const context = getCmsContext();\n\n        const model = attachCmsModelFieldConverters({\n            model: initialModel,\n            plugins: context.plugins\n        });\n\n        /**\n         * The record \"id\" has been passed by the original entry.\n         * We need to retrieve it via `cms.storageOperations.entries.getLatestByIds()` method and return the first one.\n         */\n        const revisions = await cms.storageOperations.entries.getLatestByIds(model, {\n            ids: [id]\n        });\n\n        if (revisions.length === 0) {\n            throw new WebinyError(\"Record not found.\", \"NOT_FOUND\", {\n                id\n            });\n        }\n\n        return revisions[0];\n    };\n\n    return {\n        async getRecord({ id }) {\n            return withModel(async model => {\n                const record = await getRecord(model, id);\n                return getFieldValues(record, baseFields, true);\n            });\n        },\n        listRecords(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, true)), meta];\n            });\n        },\n        createRecord({ data }) {\n            return withModel(async model => {\n                const entry = await cms.createEntry(model, data);\n\n                return getFieldValues(entry, baseFields, true);\n            });\n        },\n        updateRecord({ id, data }) {\n            return withModel(async model => {\n                const original = await getRecord(model, id);\n\n                const input = {\n                    ...original,\n                    ...data\n                };\n\n                const entry = await cms.updateEntry(model, original.id, input);\n\n                return getFieldValues(entry, baseFields, true);\n            });\n        },\n        deleteRecord({ id }) {\n            return withModel(async model => {\n                await cms.deleteEntry(model, id);\n                return true;\n            });\n        }\n    };\n};\n"],"mappings":"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"}

package/record/record.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 declare type GenericSearchData = {
     [key: string]: any;
@@ -7,7 +7,6 @@ export interface Location {
     folderId: string;
 }
 export interface SearchRecord<TData extends GenericSearchData = GenericSearchData> extends AcoBaseFields {
-    originalId: string;
     type: string;
     title?: string;
     content?: string;
@@ -23,11 +22,11 @@ export interface ListSearchRecordsWhere {
 export interface ListSearchRecordsParams {
     where?: ListSearchRecordsWhere;
     search?: string;
-    sort?: string[];
+    sort?: ListSort;
     limit?: number;
     after?: string | null;
 }
-export declare type CreateSearchRecordParams<TData> = Pick<SearchRecord<TData>, "originalId" | "title" | "content" | "type" | "location" | "data">;
+export declare type CreateSearchRecordParams<TData> = Pick<SearchRecord<TData>, "id" | "title" | "content" | "type" | "location" | "data">;
 export interface UpdateSearchRecordParams<TData extends GenericSearchData> {
     title?: string;
     content?: string;

package/record/record.types.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["record.types.ts"],"sourcesContent":["import { AcoBaseFields, ListMeta } from \"~/types\";\nimport { Topic } from \"@webiny/pubsub/types\";\n\nexport type GenericSearchData = {\n    [key: string]: any;\n};\n\nexport interface Location {\n    folderId: string;\n}\n\nexport interface SearchRecord<TData extends GenericSearchData = GenericSearchData>\n    extends AcoBaseFields {\n    originalId: string;\n    type: string;\n    title?: string;\n    content?: string;\n    location?: Location;\n    data?: TData;\n}\n\nexport interface ListSearchRecordsWhere {\n    type: string;\n    location?: {\n        folderId: string;\n    };\n}\n\nexport interface ListSearchRecordsParams {\n    where?: ListSearchRecordsWhere;\n    search?: string;\n    sort?: string[];\n    limit?: number;\n    after?: string | null;\n}\n\nexport type CreateSearchRecordParams<TData> = Pick<\n    SearchRecord<TData>,\n    \"originalId\" | \"title\" | \"content\" | \"type\" | \"location\" | \"data\"\n>;\n\nexport interface UpdateSearchRecordParams<TData extends GenericSearchData> {\n    title?: string;\n    content?: string;\n    location?: Location;\n    data?: TData;\n}\n\nexport interface DeleteSearchRecordParams {\n    id: string;\n}\n\nexport interface StorageOperationsGetSearchRecordParams {\n    id: string;\n}\n\nexport type StorageOperationsListSearchRecordsParams = ListSearchRecordsParams;\n\nexport interface StorageOperationsCreateSearchRecordParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    data: CreateSearchRecordParams<TData>;\n}\nexport interface StorageOperationsUpdateSearchRecordParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    id: string;\n    data: UpdateSearchRecordParams<TData>;\n}\nexport type StorageOperationsDeleteSearchRecordParams = DeleteSearchRecordParams;\n\nexport interface OnSearchRecordBeforeCreateTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    input: CreateSearchRecordParams<TData>;\n}\n\nexport interface OnSearchRecordAfterCreateTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    record: SearchRecord<TData>;\n}\n\nexport interface OnSearchRecordBeforeUpdateTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    original: SearchRecord<TData>;\n    input: Record<string, any>;\n}\n\nexport interface OnSearchRecordAfterUpdateTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    original: SearchRecord<TData>;\n    record: SearchRecord<TData>;\n    input: Record<string, any>;\n}\n\nexport interface OnSearchRecordBeforeDeleteTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    record: SearchRecord<TData>;\n}\n\nexport interface OnSearchRecordAfterDeleteTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    record: SearchRecord<TData>;\n}\n\nexport interface AcoSearchRecordCrud {\n    get<TData>(id: string): Promise<SearchRecord<TData>>;\n    list<TData>(params: ListSearchRecordsParams): Promise<[SearchRecord<TData>[], ListMeta]>;\n    create<TData>(data: CreateSearchRecordParams<TData>): Promise<SearchRecord<TData>>;\n    update<TData>(id: string, data: UpdateSearchRecordParams<TData>): Promise<SearchRecord<TData>>;\n    delete(id: string): Promise<Boolean>;\n    onSearchRecordBeforeCreate: Topic<OnSearchRecordBeforeCreateTopicParams>;\n    onSearchRecordAfterCreate: Topic<OnSearchRecordAfterCreateTopicParams>;\n    onSearchRecordBeforeUpdate: Topic<OnSearchRecordBeforeUpdateTopicParams>;\n    onSearchRecordAfterUpdate: Topic<OnSearchRecordAfterUpdateTopicParams>;\n    onSearchRecordBeforeDelete: Topic<OnSearchRecordBeforeDeleteTopicParams>;\n    onSearchRecordAfterDelete: Topic<OnSearchRecordAfterDeleteTopicParams>;\n}\nexport interface AcoSearchRecordStorageOperations {\n    getRecord<TData extends GenericSearchData = GenericSearchData>(\n        params: StorageOperationsGetSearchRecordParams\n    ): Promise<SearchRecord<TData>>;\n    listRecords<TData extends GenericSearchData = GenericSearchData>(\n        params: StorageOperationsListSearchRecordsParams\n    ): Promise<[SearchRecord<TData>[], ListMeta]>;\n    createRecord<TData extends GenericSearchData = GenericSearchData>(\n        params: StorageOperationsCreateSearchRecordParams<TData>\n    ): Promise<SearchRecord<TData>>;\n    updateRecord<TData extends GenericSearchData = GenericSearchData>(\n        params: StorageOperationsUpdateSearchRecordParams<TData>\n    ): Promise<SearchRecord<TData>>;\n    deleteRecord(params: StorageOperationsDeleteSearchRecordParams): Promise<boolean>;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["record.types.ts"],"sourcesContent":["import { AcoBaseFields, ListMeta, ListSort } from \"~/types\";\nimport { Topic } from \"@webiny/pubsub/types\";\n\nexport type GenericSearchData = {\n    [key: string]: any;\n};\n\nexport interface Location {\n    folderId: string;\n}\n\nexport interface SearchRecord<TData extends GenericSearchData = GenericSearchData>\n    extends AcoBaseFields {\n    type: string;\n    title?: string;\n    content?: string;\n    location?: Location;\n    data?: TData;\n}\n\nexport interface ListSearchRecordsWhere {\n    type: string;\n    location?: {\n        folderId: string;\n    };\n}\n\nexport interface ListSearchRecordsParams {\n    where?: ListSearchRecordsWhere;\n    search?: string;\n    sort?: ListSort;\n    limit?: number;\n    after?: string | null;\n}\n\nexport type CreateSearchRecordParams<TData> = Pick<\n    SearchRecord<TData>,\n    \"id\" | \"title\" | \"content\" | \"type\" | \"location\" | \"data\"\n>;\n\nexport interface UpdateSearchRecordParams<TData extends GenericSearchData> {\n    title?: string;\n    content?: string;\n    location?: Location;\n    data?: TData;\n}\n\nexport interface DeleteSearchRecordParams {\n    id: string;\n}\n\nexport interface StorageOperationsGetSearchRecordParams {\n    id: string;\n}\n\nexport type StorageOperationsListSearchRecordsParams = ListSearchRecordsParams;\n\nexport interface StorageOperationsCreateSearchRecordParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    data: CreateSearchRecordParams<TData>;\n}\nexport interface StorageOperationsUpdateSearchRecordParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    id: string;\n    data: UpdateSearchRecordParams<TData>;\n}\nexport type StorageOperationsDeleteSearchRecordParams = DeleteSearchRecordParams;\n\nexport interface OnSearchRecordBeforeCreateTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    input: CreateSearchRecordParams<TData>;\n}\n\nexport interface OnSearchRecordAfterCreateTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    record: SearchRecord<TData>;\n}\n\nexport interface OnSearchRecordBeforeUpdateTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    original: SearchRecord<TData>;\n    input: Record<string, any>;\n}\n\nexport interface OnSearchRecordAfterUpdateTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    original: SearchRecord<TData>;\n    record: SearchRecord<TData>;\n    input: Record<string, any>;\n}\n\nexport interface OnSearchRecordBeforeDeleteTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    record: SearchRecord<TData>;\n}\n\nexport interface OnSearchRecordAfterDeleteTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    record: SearchRecord<TData>;\n}\n\nexport interface AcoSearchRecordCrud {\n    get<TData>(id: string): Promise<SearchRecord<TData>>;\n    list<TData>(params: ListSearchRecordsParams): Promise<[SearchRecord<TData>[], ListMeta]>;\n    create<TData>(data: CreateSearchRecordParams<TData>): Promise<SearchRecord<TData>>;\n    update<TData>(id: string, data: UpdateSearchRecordParams<TData>): Promise<SearchRecord<TData>>;\n    delete(id: string): Promise<Boolean>;\n    onSearchRecordBeforeCreate: Topic<OnSearchRecordBeforeCreateTopicParams>;\n    onSearchRecordAfterCreate: Topic<OnSearchRecordAfterCreateTopicParams>;\n    onSearchRecordBeforeUpdate: Topic<OnSearchRecordBeforeUpdateTopicParams>;\n    onSearchRecordAfterUpdate: Topic<OnSearchRecordAfterUpdateTopicParams>;\n    onSearchRecordBeforeDelete: Topic<OnSearchRecordBeforeDeleteTopicParams>;\n    onSearchRecordAfterDelete: Topic<OnSearchRecordAfterDeleteTopicParams>;\n}\nexport interface AcoSearchRecordStorageOperations {\n    getRecord<TData extends GenericSearchData = GenericSearchData>(\n        params: StorageOperationsGetSearchRecordParams\n    ): Promise<SearchRecord<TData>>;\n    listRecords<TData extends GenericSearchData = GenericSearchData>(\n        params: StorageOperationsListSearchRecordsParams\n    ): Promise<[SearchRecord<TData>[], ListMeta]>;\n    createRecord<TData extends GenericSearchData = GenericSearchData>(\n        params: StorageOperationsCreateSearchRecordParams<TData>\n    ): Promise<SearchRecord<TData>>;\n    updateRecord<TData extends GenericSearchData = GenericSearchData>(\n        params: StorageOperationsUpdateSearchRecordParams<TData>\n    ): Promise<SearchRecord<TData>>;\n    deleteRecord(params: StorageOperationsDeleteSearchRecordParams): Promise<boolean>;\n}\n"],"mappings":""}

package/types.d.ts

@@ -15,6 +15,11 @@ export interface ListMeta {
     totalCount: number;
     hasMoreItems: boolean;
 }
+export declare enum ListSortDirection {
+    ASC = 0,
+    DESC = 1
+}
+export declare type ListSort = Record<string, ListSortDirection>;
 export interface AcoBaseFields {
     id: string;
     entryId: string;

package/types.js

@@ -2,4 +2,11 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
+});
+exports.ListSortDirection = void 0;
+let ListSortDirection;
+exports.ListSortDirection = ListSortDirection;
+(function (ListSortDirection) {
+  ListSortDirection[ListSortDirection["ASC"] = 0] = "ASC";
+  ListSortDirection[ListSortDirection["DESC"] = 1] = "DESC";
+})(ListSortDirection || (exports.ListSortDirection = ListSortDirection = {}));

package/types.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import { Tenant, TenancyContext } from \"@webiny/api-tenancy/types\";\nimport { Context as BaseContext } from \"@webiny/handler/types\";\nimport { I18NContext, I18NLocale } from \"@webiny/api-i18n/types\";\nimport { SecurityContext, SecurityIdentity } from \"@webiny/api-security/types\";\nimport { CmsContext } from \"@webiny/api-headless-cms/types\";\nimport { AcoSearchRecordCrud, AcoSearchRecordStorageOperations } from \"~/record/record.types\";\nimport { AcoFolderCrud, AcoFolderStorageOperations } from \"~/folder/folder.types\";\n\nexport interface User {\n    id: string;\n    type: string;\n    displayName: string | null;\n}\n\nexport interface ListMeta {\n    cursor: string | null;\n    totalCount: number;\n    hasMoreItems: boolean;\n}\n\nexport interface AcoBaseFields {\n    id: string;\n    entryId: string;\n    createdOn: string;\n    createdBy: User;\n    savedOn: string;\n}\n\nexport interface AdvancedContentOrganisation {\n    folder: AcoFolderCrud;\n    search: AcoSearchRecordCrud;\n}\n\nexport interface CreateAcoParams {\n    getIdentity: () => SecurityIdentity;\n    getLocale: () => I18NLocale;\n    getTenant: () => Tenant;\n    storageOperations: AcoStorageOperations;\n}\n\nexport type AcoStorageOperations = AcoFolderStorageOperations & AcoSearchRecordStorageOperations;\n\nexport interface AcoContext\n    extends BaseContext,\n        I18NContext,\n        TenancyContext,\n        SecurityContext,\n        CmsContext {\n    aco: AdvancedContentOrganisation;\n}\n"],"mappings":""}
+{"version":3,"names":["ListSortDirection"],"sources":["types.ts"],"sourcesContent":["import { Tenant, TenancyContext } from \"@webiny/api-tenancy/types\";\nimport { Context as BaseContext } from \"@webiny/handler/types\";\nimport { I18NContext, I18NLocale } from \"@webiny/api-i18n/types\";\nimport { SecurityContext, SecurityIdentity } from \"@webiny/api-security/types\";\nimport { CmsContext } from \"@webiny/api-headless-cms/types\";\nimport { AcoSearchRecordCrud, AcoSearchRecordStorageOperations } from \"~/record/record.types\";\nimport { AcoFolderCrud, AcoFolderStorageOperations } from \"~/folder/folder.types\";\n\nexport interface User {\n    id: string;\n    type: string;\n    displayName: string | null;\n}\n\nexport interface ListMeta {\n    cursor: string | null;\n    totalCount: number;\n    hasMoreItems: boolean;\n}\n\nexport enum ListSortDirection {\n    ASC,\n    DESC\n}\n\nexport type ListSort = Record<string, ListSortDirection>;\n\nexport interface AcoBaseFields {\n    id: string;\n    entryId: string;\n    createdOn: string;\n    createdBy: User;\n    savedOn: string;\n}\n\nexport interface AdvancedContentOrganisation {\n    folder: AcoFolderCrud;\n    search: AcoSearchRecordCrud;\n}\n\nexport interface CreateAcoParams {\n    getIdentity: () => SecurityIdentity;\n    getLocale: () => I18NLocale;\n    getTenant: () => Tenant;\n    storageOperations: AcoStorageOperations;\n}\n\nexport type AcoStorageOperations = AcoFolderStorageOperations & AcoSearchRecordStorageOperations;\n\nexport interface AcoContext\n    extends BaseContext,\n        I18NContext,\n        TenancyContext,\n        SecurityContext,\n        CmsContext {\n    aco: AdvancedContentOrganisation;\n}\n"],"mappings":";;;;;;IAoBYA,iBAAiB;AAAA;AAAA,WAAjBA,iBAAiB;EAAjBA,iBAAiB,CAAjBA,iBAAiB;EAAjBA,iBAAiB,CAAjBA,iBAAiB;AAAA,GAAjBA,iBAAiB,iCAAjBA,iBAAiB"}

package/utils/createListSort.d.ts

@@ -0,0 +1,2 @@
+import { ListSort } from "../types";
+export declare const createListSort: (sort?: ListSort) => string[] | undefined;

package/utils/createListSort.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createListSort = void 0;
+const createListSort = sort => {
+  if (!sort) {
+    return;
+  }
+  return Object.keys(sort).map(key => `${key}_${sort[key]}`);
+};
+exports.createListSort = createListSort;

package/utils/createListSort.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createListSort","sort","Object","keys","map","key"],"sources":["createListSort.ts"],"sourcesContent":["import { ListSort } from \"~/types\";\n\nexport const createListSort = (sort?: ListSort): string[] | undefined => {\n    if (!sort) {\n        return;\n    }\n\n    return Object.keys(sort).map(key => `${key}_${sort[key]}`);\n};\n"],"mappings":";;;;;;AAEO,MAAMA,cAAc,GAAIC,IAAe,IAA2B;EACrE,IAAI,CAACA,IAAI,EAAE;IACP;EACJ;EAEA,OAAOC,MAAM,CAACC,IAAI,CAACF,IAAI,CAAC,CAACG,GAAG,CAACC,GAAG,IAAK,GAAEA,GAAI,IAAGJ,IAAI,CAACI,GAAG,CAAE,EAAC,CAAC;AAC9D,CAAC;AAAC"}

package/utils/createOperationsWrapper.d.ts

@@ -0,0 +1,9 @@
+import { CreateAcoStorageOperationsParams } from "../createAcoStorageOperations";
+import { CmsModel } from "@webiny/api-headless-cms/types";
+interface CreateOperationsWrapperParams extends CreateAcoStorageOperationsParams {
+    modelName: string;
+}
+export declare const createOperationsWrapper: (params: CreateOperationsWrapperParams) => {
+    withModel: <TResult>(cb: (model: CmsModel) => Promise<TResult>) => Promise<TResult>;
+};
+export {};

package/utils/createOperationsWrapper.js

@@ -0,0 +1,29 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createOperationsWrapper = void 0;
+var _error = _interopRequireDefault(require("@webiny/error"));
+const createOperationsWrapper = params => {
+  const {
+    cms,
+    security,
+    modelName
+  } = params;
+  const withModel = async cb => {
+    security.disableAuthorization();
+    const model = await cms.getModel(modelName);
+    if (!model) {
+      throw new _error.default(`Could not find "${modelName}" model.`, "MODEL_NOT_FOUND_ERROR");
+    }
+    const result = await cb(model);
+    security.enableAuthorization();
+    return result;
+  };
+  return {
+    withModel
+  };
+};
+exports.createOperationsWrapper = createOperationsWrapper;

package/utils/createOperationsWrapper.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createOperationsWrapper","params","cms","security","modelName","withModel","cb","disableAuthorization","model","getModel","WebinyError","result","enableAuthorization"],"sources":["createOperationsWrapper.ts"],"sourcesContent":["import { CreateAcoStorageOperationsParams } from \"~/createAcoStorageOperations\";\nimport { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport WebinyError from \"@webiny/error\";\n\ninterface CreateOperationsWrapperParams extends CreateAcoStorageOperationsParams {\n    modelName: string;\n}\n\nexport const createOperationsWrapper = (params: CreateOperationsWrapperParams) => {\n    const { cms, security, modelName } = params;\n\n    const withModel = async <TResult>(\n        cb: (model: CmsModel) => Promise<TResult>\n    ): Promise<TResult> => {\n        security.disableAuthorization();\n        const model = await cms.getModel(modelName);\n\n        if (!model) {\n            throw new WebinyError(`Could not find \"${modelName}\" model.`, \"MODEL_NOT_FOUND_ERROR\");\n        }\n\n        const result = await cb(model);\n\n        security.enableAuthorization();\n\n        return result;\n    };\n\n    return {\n        withModel\n    };\n};\n"],"mappings":";;;;;;;AAEA;AAMO,MAAMA,uBAAuB,GAAIC,MAAqC,IAAK;EAC9E,MAAM;IAAEC,GAAG;IAAEC,QAAQ;IAAEC;EAAU,CAAC,GAAGH,MAAM;EAE3C,MAAMI,SAAS,GAAG,MACdC,EAAyC,IACtB;IACnBH,QAAQ,CAACI,oBAAoB,EAAE;IAC/B,MAAMC,KAAK,GAAG,MAAMN,GAAG,CAACO,QAAQ,CAACL,SAAS,CAAC;IAE3C,IAAI,CAACI,KAAK,EAAE;MACR,MAAM,IAAIE,cAAW,CAAE,mBAAkBN,SAAU,UAAS,EAAE,uBAAuB,CAAC;IAC1F;IAEA,MAAMO,MAAM,GAAG,MAAML,EAAE,CAACE,KAAK,CAAC;IAE9BL,QAAQ,CAACS,mBAAmB,EAAE;IAE9B,OAAOD,MAAM;EACjB,CAAC;EAED,OAAO;IACHN;EACJ,CAAC;AACL,CAAC;AAAC"}

package/utils/getFieldValues.d.ts

@@ -1,2 +1,2 @@
 import { CmsEntry } from "@webiny/api-headless-cms/types";
-export declare function getFieldValues(entry: CmsEntry, fields: string[]): any;
+export declare function getFieldValues(entry: CmsEntry, fields: string[], useEntryId?: boolean): any;

package/utils/getFieldValues.js

@@ -7,6 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.getFieldValues = getFieldValues;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _pick = _interopRequireDefault(require("lodash/pick"));
-function getFieldValues(entry, fields) {
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _pick.default)(entry, fields)), entry.values);
+var _utils = require("@webiny/utils");
+function getFieldValues(entry, fields, useEntryId) {
+  // We return the `id` without version in case of `useEntryId` flag is passed.
+  const {
+    id
+  } = (0, _utils.parseIdentifier)(entry.id);
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _pick.default)(entry, fields)), entry.values), useEntryId && {
+    id
+  });
 }

package/utils/getFieldValues.js.map

@@ -1 +1 @@
-{"version":3,"names":["getFieldValues","entry","fields","pick","values"],"sources":["getFieldValues.ts"],"sourcesContent":["import pick from \"lodash/pick\";\n\nimport { CmsEntry } from \"@webiny/api-headless-cms/types\";\n\nexport function getFieldValues(entry: CmsEntry, fields: string[]): any {\n    return { ...pick(entry, fields), ...entry.values };\n}\n"],"mappings":";;;;;;;;AAAA;AAIO,SAASA,cAAc,CAACC,KAAe,EAAEC,MAAgB,EAAO;EACnE,mEAAY,IAAAC,aAAI,EAACF,KAAK,EAAEC,MAAM,CAAC,GAAKD,KAAK,CAACG,MAAM;AACpD"}
+{"version":3,"names":["getFieldValues","entry","fields","useEntryId","id","parseIdentifier","pick","values"],"sources":["getFieldValues.ts"],"sourcesContent":["import pick from \"lodash/pick\";\n\nimport { CmsEntry } from \"@webiny/api-headless-cms/types\";\nimport { parseIdentifier } from \"@webiny/utils\";\n\nexport function getFieldValues(entry: CmsEntry, fields: string[], useEntryId?: boolean): any {\n    // We return the `id` without version in case of `useEntryId` flag is passed.\n    const { id } = parseIdentifier(entry.id);\n    return { ...pick(entry, fields), ...entry.values, ...(useEntryId && { id }) };\n}\n"],"mappings":";;;;;;;;AAAA;AAGA;AAEO,SAASA,cAAc,CAACC,KAAe,EAAEC,MAAgB,EAAEC,UAAoB,EAAO;EACzF;EACA,MAAM;IAAEC;EAAG,CAAC,GAAG,IAAAC,sBAAe,EAACJ,KAAK,CAACG,EAAE,CAAC;EACxC,+FAAY,IAAAE,aAAI,EAACL,KAAK,EAAEC,MAAM,CAAC,GAAKD,KAAK,CAACM,MAAM,GAAMJ,UAAU,IAAI;IAAEC;EAAG,CAAC;AAC9E"}

package/utils/modelFactory.d.ts

@@ -9,7 +9,9 @@ interface Params {
      */
     locale?: string;
     tenant?: string;
-    modelDefinition: Omit<CmsModel, "locale" | "tenant" | "webinyVersion" | "group">;
+    modelDefinition: Omit<CmsModel, "locale" | "tenant" | "webinyVersion" | "group" | "singularApiName" | "pluralApiName"> & {
+        isPrivate: true;
+    };
 }
 export declare const modelFactory: (params: Params) => CmsModelPlugin;
 export {};

package/utils/modelFactory.js.map

@@ -1 +1 @@
-{"version":3,"names":["modelFactory","params","group","locale","tenant","modelDefinition","createCmsModel"],"sources":["modelFactory.ts"],"sourcesContent":["import { CmsModelPlugin, createCmsModel } from \"@webiny/api-headless-cms\";\nimport { CmsModel, CmsGroup } from \"@webiny/api-headless-cms/types\";\n\ninterface Params {\n    group: Pick<CmsGroup, \"id\" | \"name\">;\n    /**\n     * Locale and tenant do not need to be defined.\n     * In that case model is not bound to any locale or tenant.\n     * You can bind it to locale, tenant, both or none.\n     */\n    locale?: string;\n    tenant?: string;\n    modelDefinition: Omit<CmsModel, \"locale\" | \"tenant\" | \"webinyVersion\" | \"group\">;\n}\n\nexport const modelFactory = (params: Params): CmsModelPlugin => {\n    const { group, locale, tenant, modelDefinition } = params;\n\n    return createCmsModel({\n        group,\n        locale,\n        tenant,\n        ...modelDefinition\n    });\n};\n"],"mappings":";;;;;;;;AAAA;AAeO,MAAMA,YAAY,GAAIC,MAAc,IAAqB;EAC5D,MAAM;IAAEC,KAAK;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAgB,CAAC,GAAGJ,MAAM;EAEzD,OAAO,IAAAK,8BAAc;IACjBJ,KAAK;IACLC,MAAM;IACNC;EAAM,GACHC,eAAe,EACpB;AACN,CAAC;AAAC"}
+{"version":3,"names":["modelFactory","params","group","locale","tenant","modelDefinition","createCmsModel"],"sources":["modelFactory.ts"],"sourcesContent":["import { CmsModelPlugin, createCmsModel } from \"@webiny/api-headless-cms\";\nimport { CmsModel, CmsGroup } from \"@webiny/api-headless-cms/types\";\n\ninterface Params {\n    group: Pick<CmsGroup, \"id\" | \"name\">;\n    /**\n     * Locale and tenant do not need to be defined.\n     * In that case model is not bound to any locale or tenant.\n     * You can bind it to locale, tenant, both or none.\n     */\n    locale?: string;\n    tenant?: string;\n    modelDefinition: Omit<\n        CmsModel,\n        \"locale\" | \"tenant\" | \"webinyVersion\" | \"group\" | \"singularApiName\" | \"pluralApiName\"\n    > & { isPrivate: true };\n}\n\nexport const modelFactory = (params: Params): CmsModelPlugin => {\n    const { group, locale, tenant, modelDefinition } = params;\n\n    return createCmsModel({\n        group,\n        locale,\n        tenant,\n        ...modelDefinition\n    });\n};\n"],"mappings":";;;;;;;;AAAA;AAkBO,MAAMA,YAAY,GAAIC,MAAc,IAAqB;EAC5D,MAAM;IAAEC,KAAK;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAgB,CAAC,GAAGJ,MAAM;EAEzD,OAAO,IAAAK,8BAAc;IACjBJ,KAAK;IACLC,MAAM;IACNC;EAAM,GACHC,eAAe,EACpB;AACN,CAAC;AAAC"}