@webiny/api-aco 6.4.5 → 6.6.0-alpha.0

package/features/folder/EnsureHcmsFolderIsEmptyOnDelete/ModelFolderBeforeDeleteHandler.js

@@ -26,6 +26,10 @@ class ModelFolderBeforeDeleteHandlerImpl {
                 },
                 limit: 1
             });
+            if (result.isFail()) {
+                console.error(result.error.message);
+                return true;
+            }
             const { entries } = result.value;
             return entries.length > 0;
         });

package/features/folder/EnsureHcmsFolderIsEmptyOnDelete/ModelFolderBeforeDeleteHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/folder/EnsureHcmsFolderIsEmptyOnDelete/ModelFolderBeforeDeleteHandler.js","sources":["../../../../src/features/folder/EnsureHcmsFolderIsEmptyOnDelete/ModelFolderBeforeDeleteHandler.ts"],"sourcesContent":["import { WebinyError } from \"@webiny/error\";\nimport { FolderBeforeDeleteEventHandler } from \"~/features/folder/DeleteFolder/abstractions.js\";\nimport type { FolderBeforeDeleteEvent } from \"~/features/folder/DeleteFolder/events.js\";\nimport { EnsureFolderIsEmpty } from \"~/features/folder/EnsureFolderIsEmpty/abstractions.js\";\nimport { GetModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport { ListEntriesUseCase } from \"@webiny/api-headless-cms/features/contentEntry/ListEntries/abstractions.js\";\n\nclass ModelFolderBeforeDeleteHandlerImpl implements FolderBeforeDeleteEventHandler.Interface {\n    constructor(\n        private ensureFolderIsEmpty: EnsureFolderIsEmpty.Interface,\n        private getModel: GetModelUseCase.Interface,\n        private listEntries: ListEntriesUseCase.Interface\n    ) {}\n\n    async handle(event: FolderBeforeDeleteEvent): Promise<void> {\n        const { folder } = event.payload;\n\n        const { id, type } = folder;\n\n        const modelId = type.split(\":\")[1];\n        if (!modelId) {\n            return;\n        }\n\n        const modelResult = await this.getModel.execute(modelId);\n        if (modelResult.isFail()) {\n            return;\n        }\n\n        const result = await this.ensureFolderIsEmpty.execute(type, id, async () => {\n            const result = await this.listEntries.execute(modelResult.value, {\n                where: {\n                    latest: true,\n                    wbyAco_location: {\n                        folderId: id\n                    }\n                },\n                limit: 1\n            });\n\n            const { entries } = result.value;\n\n            return entries.length > 0;\n        });\n\n        if (result.isFail()) {\n            throw WebinyError.from(result.error, {\n                message: \"Error while ensuring HCMS folder is empty before delete.\",\n                code: \"ACO_BEFORE_FOLDER_DELETE_HCMS_HANDLER\"\n            });\n        }\n    }\n}\n\nexport const ModelFolderBeforeDeleteHandler = FolderBeforeDeleteEventHandler.createImplementation({\n    implementation: ModelFolderBeforeDeleteHandlerImpl,\n    dependencies: [EnsureFolderIsEmpty, GetModelUseCase, ListEntriesUseCase]\n});\n"],"names":["ModelFolderBeforeDeleteHandlerImpl","ensureFolderIsEmpty","getModel","listEntries","event","folder","id","type","modelId","modelResult","result","entries","WebinyError","ModelFolderBeforeDeleteHandler","FolderBeforeDeleteEventHandler","EnsureFolderIsEmpty","GetModelUseCase","ListEntriesUseCase"],"mappings":";;;;;AAOA,MAAMA;IACF,YACYC,mBAAkD,EAClDC,QAAmC,EACnCC,WAAyC,CACnD;aAHUF,mBAAmB,GAAnBA;aACAC,QAAQ,GAARA;aACAC,WAAW,GAAXA;IACT;IAEH,MAAM,OAAOC,KAA8B,EAAiB;QACxD,MAAM,EAAEC,MAAM,EAAE,GAAGD,MAAM,OAAO;QAEhC,MAAM,EAAEE,EAAE,EAAEC,IAAI,EAAE,GAAGF;QAErB,MAAMG,UAAUD,KAAK,KAAK,CAAC,IAAI,CAAC,EAAE;QAClC,IAAI,CAACC,SACD;QAGJ,MAAMC,cAAc,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAACD;QAChD,IAAIC,YAAY,MAAM,IAClB;QAGJ,MAAMC,SAAS,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAACH,MAAMD,IAAI;YAC5D,MAAMI,SAAS,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAACD,YAAY,KAAK,EAAE;gBAC7D,OAAO;oBACH,QAAQ;oBACR,iBAAiB;wBACb,UAAUH;oBACd;gBACJ;gBACA,OAAO;YACX;YAEA,MAAM,EAAEK,OAAO,EAAE,GAAGD,OAAO,KAAK;YAEhC,OAAOC,QAAQ,MAAM,GAAG;QAC5B;QAEA,IAAID,OAAO,MAAM,IACb,MAAME,YAAY,IAAI,CAACF,OAAO,KAAK,EAAE;YACjC,SAAS;YACT,MAAM;QACV;IAER;AACJ;AAEO,MAAMG,iCAAiCC,+BAA+B,oBAAoB,CAAC;IAC9F,gBAAgBd;IAChB,cAAc;QAACe;QAAqBC;QAAiBC;KAAmB;AAC5E"}
+{"version":3,"file":"features/folder/EnsureHcmsFolderIsEmptyOnDelete/ModelFolderBeforeDeleteHandler.js","sources":["../../../../src/features/folder/EnsureHcmsFolderIsEmptyOnDelete/ModelFolderBeforeDeleteHandler.ts"],"sourcesContent":["import { WebinyError } from \"@webiny/error\";\nimport { FolderBeforeDeleteEventHandler } from \"~/features/folder/DeleteFolder/abstractions.js\";\nimport type { FolderBeforeDeleteEvent } from \"~/features/folder/DeleteFolder/events.js\";\nimport { EnsureFolderIsEmpty } from \"~/features/folder/EnsureFolderIsEmpty/abstractions.js\";\nimport { GetModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport { ListEntriesUseCase } from \"@webiny/api-headless-cms/features/contentEntry/ListEntries/abstractions.js\";\n\nclass ModelFolderBeforeDeleteHandlerImpl implements FolderBeforeDeleteEventHandler.Interface {\n    constructor(\n        private ensureFolderIsEmpty: EnsureFolderIsEmpty.Interface,\n        private getModel: GetModelUseCase.Interface,\n        private listEntries: ListEntriesUseCase.Interface\n    ) {}\n\n    async handle(event: FolderBeforeDeleteEvent): Promise<void> {\n        const { folder } = event.payload;\n\n        const { id, type } = folder;\n\n        const modelId = type.split(\":\")[1];\n        if (!modelId) {\n            return;\n        }\n\n        const modelResult = await this.getModel.execute(modelId);\n        if (modelResult.isFail()) {\n            return;\n        }\n\n        const result = await this.ensureFolderIsEmpty.execute(type, id, async () => {\n            const result = await this.listEntries.execute(modelResult.value, {\n                where: {\n                    latest: true,\n                    wbyAco_location: {\n                        folderId: id\n                    }\n                },\n                limit: 1\n            });\n            if (result.isFail()) {\n                console.error(result.error.message);\n                return true;\n            }\n\n            const { entries } = result.value;\n\n            return entries.length > 0;\n        });\n\n        if (result.isFail()) {\n            throw WebinyError.from(result.error, {\n                message: \"Error while ensuring HCMS folder is empty before delete.\",\n                code: \"ACO_BEFORE_FOLDER_DELETE_HCMS_HANDLER\"\n            });\n        }\n    }\n}\n\nexport const ModelFolderBeforeDeleteHandler = FolderBeforeDeleteEventHandler.createImplementation({\n    implementation: ModelFolderBeforeDeleteHandlerImpl,\n    dependencies: [EnsureFolderIsEmpty, GetModelUseCase, ListEntriesUseCase]\n});\n"],"names":["ModelFolderBeforeDeleteHandlerImpl","ensureFolderIsEmpty","getModel","listEntries","event","folder","id","type","modelId","modelResult","result","console","entries","WebinyError","ModelFolderBeforeDeleteHandler","FolderBeforeDeleteEventHandler","EnsureFolderIsEmpty","GetModelUseCase","ListEntriesUseCase"],"mappings":";;;;;AAOA,MAAMA;IACF,YACYC,mBAAkD,EAClDC,QAAmC,EACnCC,WAAyC,CACnD;aAHUF,mBAAmB,GAAnBA;aACAC,QAAQ,GAARA;aACAC,WAAW,GAAXA;IACT;IAEH,MAAM,OAAOC,KAA8B,EAAiB;QACxD,MAAM,EAAEC,MAAM,EAAE,GAAGD,MAAM,OAAO;QAEhC,MAAM,EAAEE,EAAE,EAAEC,IAAI,EAAE,GAAGF;QAErB,MAAMG,UAAUD,KAAK,KAAK,CAAC,IAAI,CAAC,EAAE;QAClC,IAAI,CAACC,SACD;QAGJ,MAAMC,cAAc,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAACD;QAChD,IAAIC,YAAY,MAAM,IAClB;QAGJ,MAAMC,SAAS,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAACH,MAAMD,IAAI;YAC5D,MAAMI,SAAS,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAACD,YAAY,KAAK,EAAE;gBAC7D,OAAO;oBACH,QAAQ;oBACR,iBAAiB;wBACb,UAAUH;oBACd;gBACJ;gBACA,OAAO;YACX;YACA,IAAII,OAAO,MAAM,IAAI;gBACjBC,QAAQ,KAAK,CAACD,OAAO,KAAK,CAAC,OAAO;gBAClC,OAAO;YACX;YAEA,MAAM,EAAEE,OAAO,EAAE,GAAGF,OAAO,KAAK;YAEhC,OAAOE,QAAQ,MAAM,GAAG;QAC5B;QAEA,IAAIF,OAAO,MAAM,IACb,MAAMG,YAAY,IAAI,CAACH,OAAO,KAAK,EAAE;YACjC,SAAS;YACT,MAAM;QACV;IAER;AACJ;AAEO,MAAMI,iCAAiCC,+BAA+B,oBAAoB,CAAC;IAC9F,gBAAgBf;IAChB,cAAc;QAACgB;QAAqBC;QAAiBC;KAAmB;AAC5E"}

package/features/folder/GetFolder/decorators/GetFolderWithFolderLevelPermissions.d.ts

@@ -6,8 +6,13 @@ declare class GetFolderWithFolderLevelPermissionsImpl implements GetFolderUseCas
     private folderLevelPermissions;
     private readonly decoretee;
     constructor(folderLevelPermissions: FolderLevelPermissions.Interface, decoretee: GetFolderUseCase.Interface);
-    execute(id: string): Promise<Result<never, import("~/domain/folder/errors.js").FolderNotFoundError | FolderNotAuthorizedError | import("~/domain/folder/errors.js").FolderPersistenceError> | Result<{
-        permissions: import("@webiny/shared-aco/flp/flp.types.js").FolderPermission[];
+    execute(id: string): Promise<Result<never, FolderNotAuthorizedError | import("~/domain/folder/errors.js").FolderNotFoundError | import("~/domain/folder/errors.js").FolderPersistenceError> | Result<{
+        title: string;
+        slug: string;
+        type: string;
+        parentId?: string | null;
+        path: string;
+        extensions?: Record<string, any>;
         id: string;
         createdOn: string;
         modifiedOn: string | null;
@@ -15,12 +20,7 @@ declare class GetFolderWithFolderLevelPermissionsImpl implements GetFolderUseCas
         createdBy: import("../../../../types.js").User;
         modifiedBy: import("../../../../types.js").User | null;
         savedBy: import("../../../../types.js").User;
-        title: string;
-        slug: string;
-        type: string;
-        parentId?: string | null;
-        path: string;
-        extensions?: Record<string, any>;
+        permissions: import("@webiny/shared-aco/flp/flp.types.js").FolderPermission[];
     }, never>>;
 }
 export declare const GetFolderWithFolderLevelPermissions: typeof GetFolderWithFolderLevelPermissionsImpl & {

package/features/folder/shared/abstractions.d.ts

@@ -1,6 +1,20 @@
 import type { AcoStorageOperations as IAcoStorageOperations } from "../../../types.js";
+import type { AcoFilterCrud as IAcoFilterCrud } from "../../../filter/filter.types.js";
+import type { AcoFolderLevelPermissionsCrud } from "../../../flp/flp.types.js";
 /** Storage operations for folder filtering. */
 export declare const FilterStorageOperations: import("@webiny/di").Abstraction<import("~/types.js").AcoFilterStorageOperations>;
 export declare namespace FilterStorageOperations {
     type Interface = IAcoStorageOperations["filter"];
 }
+export declare const FlpStorageOperations: import("@webiny/di").Abstraction<import("~/types.js").AcoFolderLevelPermissionsStorageOperations>;
+export declare namespace FlpStorageOperations {
+    type Interface = IAcoStorageOperations["flp"];
+}
+export declare const AcoFlpCrud: import("@webiny/di").Abstraction<AcoFolderLevelPermissionsCrud>;
+export declare namespace AcoFlpCrud {
+    type Interface = AcoFolderLevelPermissionsCrud;
+}
+export declare const AcoFilterCrud: import("@webiny/di").Abstraction<IAcoFilterCrud>;
+export declare namespace AcoFilterCrud {
+    type Interface = IAcoFilterCrud;
+}

package/features/folder/shared/abstractions.js

@@ -1,5 +1,8 @@
 import { createAbstraction } from "@webiny/feature/api";
 const FilterStorageOperations = createAbstraction("FilterStorageOperations");
-export { FilterStorageOperations };
+const FlpStorageOperations = createAbstraction("FlpStorageOperations");
+const AcoFlpCrud = createAbstraction("AcoFlpCrud");
+const AcoFilterCrud = createAbstraction("AcoFilterCrud");
+export { AcoFilterCrud, AcoFlpCrud, FilterStorageOperations, FlpStorageOperations };
 
 //# sourceMappingURL=abstractions.js.map

package/features/folder/shared/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/folder/shared/abstractions.js","sources":["../../../../src/features/folder/shared/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { AcoStorageOperations as IAcoStorageOperations } from \"~/types.js\";\n\n/** Storage operations for folder filtering. */\nexport const FilterStorageOperations =\n    createAbstraction<IAcoStorageOperations[\"filter\"]>(\"FilterStorageOperations\");\n\nexport namespace FilterStorageOperations {\n    export type Interface = IAcoStorageOperations[\"filter\"];\n}\n"],"names":["FilterStorageOperations","createAbstraction"],"mappings":";AAIO,MAAMA,0BACTC,kBAAmD"}
+{"version":3,"file":"features/folder/shared/abstractions.js","sources":["../../../../src/features/folder/shared/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { AcoStorageOperations as IAcoStorageOperations } from \"~/types.js\";\nimport type { AcoFilterCrud as IAcoFilterCrud } from \"~/filter/filter.types.js\";\nimport type { AcoFolderLevelPermissionsCrud } from \"~/flp/flp.types.js\";\n\n/** Storage operations for folder filtering. */\nexport const FilterStorageOperations =\n    createAbstraction<IAcoStorageOperations[\"filter\"]>(\"FilterStorageOperations\");\n\nexport namespace FilterStorageOperations {\n    export type Interface = IAcoStorageOperations[\"filter\"];\n}\n\nexport const FlpStorageOperations =\n    createAbstraction<IAcoStorageOperations[\"flp\"]>(\"FlpStorageOperations\");\n\nexport namespace FlpStorageOperations {\n    export type Interface = IAcoStorageOperations[\"flp\"];\n}\n\nexport const AcoFlpCrud = createAbstraction<AcoFolderLevelPermissionsCrud>(\"AcoFlpCrud\");\n\nexport namespace AcoFlpCrud {\n    export type Interface = AcoFolderLevelPermissionsCrud;\n}\n\nexport const AcoFilterCrud = createAbstraction<IAcoFilterCrud>(\"AcoFilterCrud\");\n\nexport namespace AcoFilterCrud {\n    export type Interface = IAcoFilterCrud;\n}\n"],"names":["FilterStorageOperations","createAbstraction","FlpStorageOperations","AcoFlpCrud","AcoFilterCrud"],"mappings":";AAMO,MAAMA,0BACTC,kBAAmD;AAMhD,MAAMC,uBACTD,kBAAgD;AAM7C,MAAME,aAAaF,kBAAiD;AAMpE,MAAMG,gBAAgBH,kBAAkC"}

package/filter/filter.gql.d.ts

@@ -1,3 +1,2 @@
-import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins/GraphQLSchemaPlugin.js";
-import type { AcoContext } from "../types.js";
-export declare const filterSchema: GraphQLSchemaPlugin<AcoContext>;
+import type { IGraphQLSchemaBuilder } from "@webiny/api-graphql/features/GraphQLSchemaBuilder/abstractions.js";
+export declare const addFilterSchema: (builder: IGraphQLSchemaBuilder) => void;

package/filter/filter.gql.js

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

package/filter/filter.gql.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter/filter.gql.js","sources":["../../src/filter/filter.gql.ts"],"sourcesContent":["import { ErrorResponse, ListResponse } from \"@webiny/handler-graphql/responses.js\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins/GraphQLSchemaPlugin.js\";\n\nimport { ensureAuthentication } from \"~/utils/ensureAuthentication.js\";\nimport { resolve } from \"~/utils/resolve.js\";\n\nimport type { AcoContext } from \"~/types.js\";\n\nexport const filterSchema = new GraphQLSchemaPlugin<AcoContext>({\n    typeDefs: /* GraphQL */ `\n        enum OperationEnum {\n            AND\n            OR\n        }\n\n        type GroupFilter {\n            field: String!\n            condition: String!\n            value: String!\n        }\n\n        type Group {\n            operation: OperationEnum!\n            filters: [GroupFilter]!\n        }\n\n        type Filter {\n            id: ID!\n            name: String!\n            description: String\n            namespace: String!\n            operation: OperationEnum!\n            groups: [Group]!\n            createdOn: DateTime\n            modifiedOn: DateTime\n            savedOn: DateTime\n            createdBy: AcoUser\n            modifiedBy: AcoUser\n            savedBy: AcoUser\n        }\n\n        input GroupFilterInput {\n            field: String!\n            condition: String!\n            value: String!\n        }\n\n        input GroupInput {\n            operation: OperationEnum!\n            filters: [GroupFilterInput]!\n        }\n\n        input FilterCreateInput {\n            id: ID!\n            name: String!\n            description: String\n            namespace: String!\n            operation: OperationEnum!\n            groups: [GroupInput]!\n        }\n\n        input FilterUpdateInput {\n            name: String\n            description: String\n            namespace: String\n            operation: OperationEnum\n            groups: [GroupInput]\n        }\n\n        input FiltersListWhereInput {\n            namespace: String\n        }\n\n        type FilterResponse {\n            data: Filter\n            error: AcoError\n        }\n\n        type FilterListResponse {\n            data: [Filter]\n            error: AcoError\n        }\n\n        extend type AcoQuery {\n            getFilter(id: ID!): FilterResponse\n            listFilters(\n                where: FiltersListWhereInput!\n                limit: Int\n                after: String\n                sort: AcoSort\n            ): FilterListResponse\n        }\n\n        extend type AcoMutation {\n            createFilter(data: FilterCreateInput!): FilterResponse\n            updateFilter(id: ID!, data: FilterUpdateInput!): FilterResponse\n            deleteFilter(id: ID!): AcoBooleanResponse\n        }\n    `,\n    resolvers: {\n        AcoQuery: {\n            getFilter: async (_, { id }, context) => {\n                return resolve(() => {\n                    ensureAuthentication(context);\n                    return context.aco.filter.get(id);\n                });\n            },\n            listFilters: async (_, args: any, context) => {\n                try {\n                    ensureAuthentication(context);\n                    const [entries, meta] = await context.aco.filter.list(args);\n                    return new ListResponse(entries, meta);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            }\n        },\n        AcoMutation: {\n            createFilter: async (_, { data }, context) => {\n                return resolve(() => {\n                    ensureAuthentication(context);\n                    return context.aco.filter.create(data);\n                });\n            },\n            updateFilter: async (_, { id, data }, context) => {\n                return resolve(() => {\n                    ensureAuthentication(context);\n                    return context.aco.filter.update(id, data);\n                });\n            },\n            deleteFilter: async (_, { id }, context) => {\n                return resolve(() => {\n                    ensureAuthentication(context);\n                    return context.aco.filter.delete(id);\n                });\n            }\n        }\n    }\n});\n"],"names":["filterSchema","GraphQLSchemaPlugin","_","id","context","resolve","ensureAuthentication","args","entries","meta","ListResponse","e","ErrorResponse","data"],"mappings":";;;;AAQO,MAAMA,eAAe,IAAIC,oBAAgC;IAC5D,UAAwB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAyFzB,CAAC;IACD,WAAW;QACP,UAAU;YACN,WAAW,OAAOC,GAAG,EAAEC,EAAE,EAAE,EAAEC,UAClBC,QAAQ;oBACXC,qBAAqBF;oBACrB,OAAOA,QAAQ,GAAG,CAAC,MAAM,CAAC,GAAG,CAACD;gBAClC;YAEJ,aAAa,OAAOD,GAAGK,MAAWH;gBAC9B,IAAI;oBACAE,qBAAqBF;oBACrB,MAAM,CAACI,SAASC,KAAK,GAAG,MAAML,QAAQ,GAAG,CAAC,MAAM,CAAC,IAAI,CAACG;oBACtD,OAAO,IAAIG,aAAaF,SAASC;gBACrC,EAAE,OAAOE,GAAG;oBACR,OAAO,IAAIC,cAAcD;gBAC7B;YACJ;QACJ;QACA,aAAa;YACT,cAAc,OAAOT,GAAG,EAAEW,IAAI,EAAE,EAAET,UACvBC,QAAQ;oBACXC,qBAAqBF;oBACrB,OAAOA,QAAQ,GAAG,CAAC,MAAM,CAAC,MAAM,CAACS;gBACrC;YAEJ,cAAc,OAAOX,GAAG,EAAEC,EAAE,EAAEU,IAAI,EAAE,EAAET,UAC3BC,QAAQ;oBACXC,qBAAqBF;oBACrB,OAAOA,QAAQ,GAAG,CAAC,MAAM,CAAC,MAAM,CAACD,IAAIU;gBACzC;YAEJ,cAAc,OAAOX,GAAG,EAAEC,EAAE,EAAE,EAAEC,UACrBC,QAAQ;oBACXC,qBAAqBF;oBACrB,OAAOA,QAAQ,GAAG,CAAC,MAAM,CAAC,MAAM,CAACD;gBACrC;QAER;IACJ;AACJ"}
+{"version":3,"file":"filter/filter.gql.js","sources":["../../src/filter/filter.gql.ts"],"sourcesContent":["import { ErrorResponse, ListResponse } from \"@webiny/api-graphql/responses.js\";\nimport type { IGraphQLSchemaBuilder } from \"@webiny/api-graphql/features/GraphQLSchemaBuilder/abstractions.js\";\nimport { ensureAuthentication } from \"~/utils/ensureAuthentication.js\";\nimport { resolve } from \"~/utils/resolve.js\";\nimport { AcoFilterCrud } from \"~/features/folder/shared/abstractions.js\";\n\nexport const addFilterSchema = (builder: IGraphQLSchemaBuilder): void => {\n    builder.addTypeDefs(/* GraphQL */ `\n        enum OperationEnum {\n            AND\n            OR\n        }\n\n        type GroupFilter {\n            field: String!\n            condition: String!\n            value: String!\n        }\n\n        type Group {\n            operation: OperationEnum!\n            filters: [GroupFilter]!\n        }\n\n        type Filter {\n            id: ID!\n            name: String!\n            description: String\n            namespace: String!\n            operation: OperationEnum!\n            groups: [Group]!\n            createdOn: DateTime\n            modifiedOn: DateTime\n            savedOn: DateTime\n            createdBy: AcoUser\n            modifiedBy: AcoUser\n            savedBy: AcoUser\n        }\n\n        input GroupFilterInput {\n            field: String!\n            condition: String!\n            value: String!\n        }\n\n        input GroupInput {\n            operation: OperationEnum!\n            filters: [GroupFilterInput]!\n        }\n\n        input FilterCreateInput {\n            id: ID!\n            name: String!\n            description: String\n            namespace: String!\n            operation: OperationEnum!\n            groups: [GroupInput]!\n        }\n\n        input FilterUpdateInput {\n            name: String\n            description: String\n            namespace: String\n            operation: OperationEnum\n            groups: [GroupInput]\n        }\n\n        input FiltersListWhereInput {\n            namespace: String\n        }\n\n        type FilterResponse {\n            data: Filter\n            error: AcoError\n        }\n\n        type FilterListResponse {\n            data: [Filter]\n            error: AcoError\n        }\n\n        extend type AcoQuery {\n            getFilter(id: ID!): FilterResponse\n            listFilters(\n                where: FiltersListWhereInput!\n                limit: Int\n                after: String\n                sort: AcoSort\n            ): FilterListResponse\n        }\n\n        extend type AcoMutation {\n            createFilter(data: FilterCreateInput!): FilterResponse\n            updateFilter(id: ID!, data: FilterUpdateInput!): FilterResponse\n            deleteFilter(id: ID!): AcoBooleanResponse\n        }\n    `);\n\n    builder.addResolver({\n        path: \"AcoQuery.getFilter\",\n        dependencies: [AcoFilterCrud],\n        resolver(filterCrud) {\n            return ({ args, context }) =>\n                resolve(() => {\n                    ensureAuthentication(context);\n                    return filterCrud.get(args.id);\n                });\n        }\n    });\n\n    builder.addResolver({\n        path: \"AcoQuery.listFilters\",\n        dependencies: [AcoFilterCrud],\n        resolver(filterCrud) {\n            return async ({ args, context }) => {\n                try {\n                    ensureAuthentication(context);\n                    const [entries, meta] = await filterCrud.list(args);\n                    return new ListResponse(entries, meta);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            };\n        }\n    });\n\n    builder.addResolver({\n        path: \"AcoMutation.createFilter\",\n        dependencies: [AcoFilterCrud],\n        resolver(filterCrud) {\n            return ({ args, context }) =>\n                resolve(() => {\n                    ensureAuthentication(context);\n                    return filterCrud.create(args.data);\n                });\n        }\n    });\n\n    builder.addResolver({\n        path: \"AcoMutation.updateFilter\",\n        dependencies: [AcoFilterCrud],\n        resolver(filterCrud) {\n            return ({ args, context }) =>\n                resolve(() => {\n                    ensureAuthentication(context);\n                    return filterCrud.update(args.id, args.data);\n                });\n        }\n    });\n\n    builder.addResolver({\n        path: \"AcoMutation.deleteFilter\",\n        dependencies: [AcoFilterCrud],\n        resolver(filterCrud) {\n            return ({ args, context }) =>\n                resolve(() => {\n                    ensureAuthentication(context);\n                    return filterCrud.delete(args.id);\n                });\n        }\n    });\n};\n"],"names":["addFilterSchema","builder","AcoFilterCrud","filterCrud","args","context","resolve","ensureAuthentication","entries","meta","ListResponse","e","ErrorResponse"],"mappings":";;;;AAMO,MAAMA,kBAAkB,CAACC;IAC5BA,QAAQ,WAAW,CAAe,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAyFnC,CAAC;IAEDA,QAAQ,WAAW,CAAC;QAChB,MAAM;QACN,cAAc;YAACC;SAAc;QAC7B,UAASC,UAAU;YACf,OAAO,CAAC,EAAEC,IAAI,EAAEC,OAAO,EAAE,GACrBC,QAAQ;oBACJC,qBAAqBF;oBACrB,OAAOF,WAAW,GAAG,CAACC,KAAK,EAAE;gBACjC;QACR;IACJ;IAEAH,QAAQ,WAAW,CAAC;QAChB,MAAM;QACN,cAAc;YAACC;SAAc;QAC7B,UAASC,UAAU;YACf,OAAO,OAAO,EAAEC,IAAI,EAAEC,OAAO,EAAE;gBAC3B,IAAI;oBACAE,qBAAqBF;oBACrB,MAAM,CAACG,SAASC,KAAK,GAAG,MAAMN,WAAW,IAAI,CAACC;oBAC9C,OAAO,IAAIM,aAAaF,SAASC;gBACrC,EAAE,OAAOE,GAAG;oBACR,OAAO,IAAIC,cAAcD;gBAC7B;YACJ;QACJ;IACJ;IAEAV,QAAQ,WAAW,CAAC;QAChB,MAAM;QACN,cAAc;YAACC;SAAc;QAC7B,UAASC,UAAU;YACf,OAAO,CAAC,EAAEC,IAAI,EAAEC,OAAO,EAAE,GACrBC,QAAQ;oBACJC,qBAAqBF;oBACrB,OAAOF,WAAW,MAAM,CAACC,KAAK,IAAI;gBACtC;QACR;IACJ;IAEAH,QAAQ,WAAW,CAAC;QAChB,MAAM;QACN,cAAc;YAACC;SAAc;QAC7B,UAASC,UAAU;YACf,OAAO,CAAC,EAAEC,IAAI,EAAEC,OAAO,EAAE,GACrBC,QAAQ;oBACJC,qBAAqBF;oBACrB,OAAOF,WAAW,MAAM,CAACC,KAAK,EAAE,EAAEA,KAAK,IAAI;gBAC/C;QACR;IACJ;IAEAH,QAAQ,WAAW,CAAC;QAChB,MAAM;QACN,cAAc;YAACC;SAAc;QAC7B,UAASC,UAAU;YACf,OAAO,CAAC,EAAEC,IAAI,EAAEC,OAAO,EAAE,GACrBC,QAAQ;oBACJC,qBAAqBF;oBACrB,OAAOF,WAAW,MAAM,CAACC,KAAK,EAAE;gBACpC;QACR;IACJ;AACJ"}

package/filter/filter.so.d.ts

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

package/filter/filter.so.js

@@ -7,7 +7,7 @@ import { pickEntryFieldValues } from "../utils/pickEntryFieldValues.js";
 import { ENTRY_META_FIELDS } from "@webiny/api-headless-cms/constants.js";
 import { CmsSortMapper, CmsWhereMapper } from "@webiny/api-headless-cms";
 const createFilterOperations = (params)=>{
-    const { cms, security, container } = params;
+    const { cms, identityContext, container } = params;
     const { withModel } = createOperationsWrapper({
         ...params,
         modelName: FILTER_MODEL_ID
@@ -27,7 +27,7 @@ const createFilterOperations = (params)=>{
         listFilters (params) {
             return withModel(async (model)=>{
                 const { sort, where } = params;
-                const createdBy = security.getIdentity().id;
+                const createdBy = identityContext.getIdentity().id;
                 const [entries, meta] = await cms.listLatestEntries(model, {
                     ...params,
                     sort: cmsSortMapper.map({

package/filter/filter.so.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter/filter.so.js","sources":["../../src/filter/filter.so.ts"],"sourcesContent":["import omit from \"lodash/omit.js\";\nimport WebinyError from \"@webiny/error\";\nimport { FILTER_MODEL_ID } from \"./filter.model.js\";\nimport type { CreateAcoStorageOperationsParams } from \"~/createAcoStorageOperations.js\";\nimport { createListSort } from \"~/utils/createListSort.js\";\nimport { createOperationsWrapper } from \"~/utils/createOperationsWrapper.js\";\nimport { pickEntryFieldValues } from \"~/utils/pickEntryFieldValues.js\";\nimport type { AcoFilterStorageOperations, Filter } from \"./filter.types.js\";\nimport { ENTRY_META_FIELDS } from \"@webiny/api-headless-cms/constants.js\";\nimport { CmsSortMapper, CmsWhereMapper } from \"@webiny/api-headless-cms\";\n\nexport const createFilterOperations = (\n    params: CreateAcoStorageOperationsParams\n): AcoFilterStorageOperations => {\n    const { cms, security, container } = params;\n\n    const { withModel } = createOperationsWrapper({\n        ...params,\n        modelName: FILTER_MODEL_ID\n    });\n\n    const cmsWhereMapper = container.resolve(CmsWhereMapper);\n    const cmsSortMapper = container.resolve(CmsSortMapper);\n\n    return {\n        getFilter({ id }) {\n            return withModel(async model => {\n                const entry = await cms.getEntryById(model, id);\n\n                if (!entry) {\n                    throw new WebinyError(\"Could not load filter.\", \"GET_FILTER_ERROR\", {\n                        id\n                    });\n                }\n\n                return pickEntryFieldValues(entry);\n            });\n        },\n        listFilters(params) {\n            return withModel(async model => {\n                const { sort, where } = params;\n                const createdBy = security.getIdentity().id;\n\n                const [entries, meta] = await cms.listLatestEntries(model, {\n                    ...params,\n                    sort: cmsSortMapper.map({\n                        input: createListSort(sort),\n                        fields: model.fields\n                    }),\n                    where: cmsWhereMapper.map({\n                        input: {\n                            ...where,\n                            createdBy\n                        },\n                        fields: model.fields\n                    })\n                });\n\n                return [entries.map(pickEntryFieldValues<Filter>), meta];\n            });\n        },\n        createFilter({ data }) {\n            return withModel(async model => {\n                const entry = await cms.createEntry(model, {\n                    id: data.id,\n                    values: data\n                });\n                return pickEntryFieldValues(entry);\n            });\n        },\n        updateFilter({ id, data }) {\n            return withModel(async model => {\n                const original = await cms.getEntryById(model, id);\n\n                const input = {\n                    /**\n                     *  We are omitting the standard entry meta fields:\n                     *  we don't want to override them with the ones coming from the `original` entry.\n                     */\n                    ...omit(original, ENTRY_META_FIELDS),\n                    values: {\n                        ...original.values,\n                        ...data\n                    }\n                };\n\n                const entry = await cms.updateEntry(model, original.id, input);\n                return pickEntryFieldValues(entry);\n            });\n        },\n        deleteFilter({ id }) {\n            return withModel(async model => {\n                await cms.deleteEntry(model, id);\n                return true;\n            });\n        }\n    };\n};\n"],"names":["createFilterOperations","params","cms","security","container","withModel","createOperationsWrapper","FILTER_MODEL_ID","cmsWhereMapper","CmsWhereMapper","cmsSortMapper","CmsSortMapper","id","model","entry","WebinyError","pickEntryFieldValues","sort","where","createdBy","entries","meta","createListSort","data","original","input","omit","ENTRY_META_FIELDS"],"mappings":";;;;;;;;AAWO,MAAMA,yBAAyB,CAClCC;IAEA,MAAM,EAAEC,GAAG,EAAEC,QAAQ,EAAEC,SAAS,EAAE,GAAGH;IAErC,MAAM,EAAEI,SAAS,EAAE,GAAGC,wBAAwB;QAC1C,GAAGL,MAAM;QACT,WAAWM;IACf;IAEA,MAAMC,iBAAiBJ,UAAU,OAAO,CAACK;IACzC,MAAMC,gBAAgBN,UAAU,OAAO,CAACO;IAExC,OAAO;QACH,WAAU,EAAEC,EAAE,EAAE;YACZ,OAAOP,UAAU,OAAMQ;gBACnB,MAAMC,QAAQ,MAAMZ,IAAI,YAAY,CAACW,OAAOD;gBAE5C,IAAI,CAACE,OACD,MAAM,IAAIC,MAAY,0BAA0B,oBAAoB;oBAChEH;gBACJ;gBAGJ,OAAOI,qBAAqBF;YAChC;QACJ;QACA,aAAYb,MAAM;YACd,OAAOI,UAAU,OAAMQ;gBACnB,MAAM,EAAEI,IAAI,EAAEC,KAAK,EAAE,GAAGjB;gBACxB,MAAMkB,YAAYhB,SAAS,WAAW,GAAG,EAAE;gBAE3C,MAAM,CAACiB,SAASC,KAAK,GAAG,MAAMnB,IAAI,iBAAiB,CAACW,OAAO;oBACvD,GAAGZ,MAAM;oBACT,MAAMS,cAAc,GAAG,CAAC;wBACpB,OAAOY,eAAeL;wBACtB,QAAQJ,MAAM,MAAM;oBACxB;oBACA,OAAOL,eAAe,GAAG,CAAC;wBACtB,OAAO;4BACH,GAAGU,KAAK;4BACRC;wBACJ;wBACA,QAAQN,MAAM,MAAM;oBACxB;gBACJ;gBAEA,OAAO;oBAACO,QAAQ,GAAG,CAACJ;oBAA+BK;iBAAK;YAC5D;QACJ;QACA,cAAa,EAAEE,IAAI,EAAE;YACjB,OAAOlB,UAAU,OAAMQ;gBACnB,MAAMC,QAAQ,MAAMZ,IAAI,WAAW,CAACW,OAAO;oBACvC,IAAIU,KAAK,EAAE;oBACX,QAAQA;gBACZ;gBACA,OAAOP,qBAAqBF;YAChC;QACJ;QACA,cAAa,EAAEF,EAAE,EAAEW,IAAI,EAAE;YACrB,OAAOlB,UAAU,OAAMQ;gBACnB,MAAMW,WAAW,MAAMtB,IAAI,YAAY,CAACW,OAAOD;gBAE/C,MAAMa,QAAQ;oBAKV,GAAGC,KAAKF,UAAUG,kBAAkB;oBACpC,QAAQ;wBACJ,GAAGH,SAAS,MAAM;wBAClB,GAAGD,IAAI;oBACX;gBACJ;gBAEA,MAAMT,QAAQ,MAAMZ,IAAI,WAAW,CAACW,OAAOW,SAAS,EAAE,EAAEC;gBACxD,OAAOT,qBAAqBF;YAChC;QACJ;QACA,cAAa,EAAEF,EAAE,EAAE;YACf,OAAOP,UAAU,OAAMQ;gBACnB,MAAMX,IAAI,WAAW,CAACW,OAAOD;gBAC7B,OAAO;YACX;QACJ;IACJ;AACJ"}
+{"version":3,"file":"filter/filter.so.js","sources":["../../src/filter/filter.so.ts"],"sourcesContent":["import omit from \"lodash/omit.js\";\nimport WebinyError from \"@webiny/error\";\nimport { FILTER_MODEL_ID } from \"./filter.model.js\";\nimport type { HeadlessCms } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/abstractions.js\";\nimport type { Container } from \"@webiny/di\";\n\ninterface CreateFilterOperationsParams {\n    cms: HeadlessCms;\n    identityContext: IdentityContext.Interface;\n    container: Container;\n}\nimport { createListSort } from \"~/utils/createListSort.js\";\nimport { createOperationsWrapper } from \"~/utils/createOperationsWrapper.js\";\nimport { pickEntryFieldValues } from \"~/utils/pickEntryFieldValues.js\";\nimport type { AcoFilterStorageOperations, Filter } from \"./filter.types.js\";\nimport { ENTRY_META_FIELDS } from \"@webiny/api-headless-cms/constants.js\";\nimport { CmsSortMapper, CmsWhereMapper } from \"@webiny/api-headless-cms\";\n\nexport const createFilterOperations = (\n    params: CreateFilterOperationsParams\n): AcoFilterStorageOperations => {\n    const { cms, identityContext, container } = params;\n\n    const { withModel } = createOperationsWrapper({\n        ...params,\n        modelName: FILTER_MODEL_ID\n    });\n\n    const cmsWhereMapper = container.resolve(CmsWhereMapper);\n    const cmsSortMapper = container.resolve(CmsSortMapper);\n\n    return {\n        getFilter({ id }) {\n            return withModel(async model => {\n                const entry = await cms.getEntryById(model, id);\n\n                if (!entry) {\n                    throw new WebinyError(\"Could not load filter.\", \"GET_FILTER_ERROR\", {\n                        id\n                    });\n                }\n\n                return pickEntryFieldValues(entry);\n            });\n        },\n        listFilters(params) {\n            return withModel(async model => {\n                const { sort, where } = params;\n                const createdBy = identityContext.getIdentity().id;\n\n                const [entries, meta] = await cms.listLatestEntries(model, {\n                    ...params,\n                    sort: cmsSortMapper.map({\n                        input: createListSort(sort),\n                        fields: model.fields\n                    }),\n                    where: cmsWhereMapper.map({\n                        input: {\n                            ...where,\n                            createdBy\n                        },\n                        fields: model.fields\n                    })\n                });\n\n                return [entries.map(pickEntryFieldValues<Filter>), meta];\n            });\n        },\n        createFilter({ data }) {\n            return withModel(async model => {\n                const entry = await cms.createEntry(model, {\n                    id: data.id,\n                    values: data\n                });\n                return pickEntryFieldValues(entry);\n            });\n        },\n        updateFilter({ id, data }) {\n            return withModel(async model => {\n                const original = await cms.getEntryById(model, id);\n\n                const input = {\n                    /**\n                     *  We are omitting the standard entry meta fields:\n                     *  we don't want to override them with the ones coming from the `original` entry.\n                     */\n                    ...omit(original, ENTRY_META_FIELDS),\n                    values: {\n                        ...original.values,\n                        ...data\n                    }\n                };\n\n                const entry = await cms.updateEntry(model, original.id, input);\n                return pickEntryFieldValues(entry);\n            });\n        },\n        deleteFilter({ id }) {\n            return withModel(async model => {\n                await cms.deleteEntry(model, id);\n                return true;\n            });\n        }\n    };\n};\n"],"names":["createFilterOperations","params","cms","identityContext","container","withModel","createOperationsWrapper","FILTER_MODEL_ID","cmsWhereMapper","CmsWhereMapper","cmsSortMapper","CmsSortMapper","id","model","entry","WebinyError","pickEntryFieldValues","sort","where","createdBy","entries","meta","createListSort","data","original","input","omit","ENTRY_META_FIELDS"],"mappings":";;;;;;;;AAmBO,MAAMA,yBAAyB,CAClCC;IAEA,MAAM,EAAEC,GAAG,EAAEC,eAAe,EAAEC,SAAS,EAAE,GAAGH;IAE5C,MAAM,EAAEI,SAAS,EAAE,GAAGC,wBAAwB;QAC1C,GAAGL,MAAM;QACT,WAAWM;IACf;IAEA,MAAMC,iBAAiBJ,UAAU,OAAO,CAACK;IACzC,MAAMC,gBAAgBN,UAAU,OAAO,CAACO;IAExC,OAAO;QACH,WAAU,EAAEC,EAAE,EAAE;YACZ,OAAOP,UAAU,OAAMQ;gBACnB,MAAMC,QAAQ,MAAMZ,IAAI,YAAY,CAACW,OAAOD;gBAE5C,IAAI,CAACE,OACD,MAAM,IAAIC,MAAY,0BAA0B,oBAAoB;oBAChEH;gBACJ;gBAGJ,OAAOI,qBAAqBF;YAChC;QACJ;QACA,aAAYb,MAAM;YACd,OAAOI,UAAU,OAAMQ;gBACnB,MAAM,EAAEI,IAAI,EAAEC,KAAK,EAAE,GAAGjB;gBACxB,MAAMkB,YAAYhB,gBAAgB,WAAW,GAAG,EAAE;gBAElD,MAAM,CAACiB,SAASC,KAAK,GAAG,MAAMnB,IAAI,iBAAiB,CAACW,OAAO;oBACvD,GAAGZ,MAAM;oBACT,MAAMS,cAAc,GAAG,CAAC;wBACpB,OAAOY,eAAeL;wBACtB,QAAQJ,MAAM,MAAM;oBACxB;oBACA,OAAOL,eAAe,GAAG,CAAC;wBACtB,OAAO;4BACH,GAAGU,KAAK;4BACRC;wBACJ;wBACA,QAAQN,MAAM,MAAM;oBACxB;gBACJ;gBAEA,OAAO;oBAACO,QAAQ,GAAG,CAACJ;oBAA+BK;iBAAK;YAC5D;QACJ;QACA,cAAa,EAAEE,IAAI,EAAE;YACjB,OAAOlB,UAAU,OAAMQ;gBACnB,MAAMC,QAAQ,MAAMZ,IAAI,WAAW,CAACW,OAAO;oBACvC,IAAIU,KAAK,EAAE;oBACX,QAAQA;gBACZ;gBACA,OAAOP,qBAAqBF;YAChC;QACJ;QACA,cAAa,EAAEF,EAAE,EAAEW,IAAI,EAAE;YACrB,OAAOlB,UAAU,OAAMQ;gBACnB,MAAMW,WAAW,MAAMtB,IAAI,YAAY,CAACW,OAAOD;gBAE/C,MAAMa,QAAQ;oBAKV,GAAGC,KAAKF,UAAUG,kBAAkB;oBACpC,QAAQ;wBACJ,GAAGH,SAAS,MAAM;wBAClB,GAAGD,IAAI;oBACX;gBACJ;gBAEA,MAAMT,QAAQ,MAAMZ,IAAI,WAAW,CAACW,OAAOW,SAAS,EAAE,EAAEC;gBACxD,OAAOT,qBAAqBF;YAChC;QACJ;QACA,cAAa,EAAEF,EAAE,EAAE;YACf,OAAOP,UAAU,OAAMQ;gBACnB,MAAMX,IAAI,WAAW,CAACW,OAAOD;gBAC7B,OAAO;YACX;QACJ;IACJ;AACJ"}

package/flp/index.d.ts

@@ -1,3 +1,2 @@
 export * from "./flp.crud.js";
-export * from "./flp.so.js";
 export * from "./tasks/index.js";

package/flp/index.js

@@ -1,3 +1,2 @@
 export * from "./flp.crud.js";
-export * from "./flp.so.js";
 export * from "./tasks/index.js";

package/flp/tasks/createFlp.task.d.ts

@@ -8,9 +8,9 @@ declare class CreateFlpTaskImpl implements TaskDefinition.Interface<ICreateFlpTa
     readonly description = "Synchronizes the FLP catalog by creating the FLP record based on the provided folder.";
     readonly databaseLogs = false;
     readonly isPrivate = true;
-    readonly selfCleanup: ("onSuccess" | "onAbort")[];
+    readonly selfCleanup: ("onAbort" | "onSuccess")[];
     constructor(createFlp: CreateFlpUseCase.Interface);
-    run({ input, controller }: TaskDefinition.RunParams<ICreateFlpTaskInput>): Promise<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResultError | import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResultAborted | TaskDefinition.ResultContinue<ICreateFlpTaskInput> | TaskDefinition.ResultDone<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>>;
+    run({ input, controller }: TaskDefinition.RunParams<ICreateFlpTaskInput>): Promise<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResultAborted | import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResultError | TaskDefinition.ResultContinue<ICreateFlpTaskInput> | TaskDefinition.ResultDone<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>>;
 }
 export declare const CreateFlpTask: typeof CreateFlpTaskImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskDefinition<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskInput, import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>>;

package/flp/tasks/deleteFlp.task.d.ts

@@ -8,9 +8,9 @@ declare class DeleteFlpTaskImpl implements TaskDefinition.Interface<IDeleteFlpTa
     readonly description = "Synchronizes the FLP catalog by deleting the FLP record based on the provided folder.";
     readonly databaseLogs = false;
     readonly isPrivate = true;
-    readonly selfCleanup: ("onSuccess" | "onAbort")[];
+    readonly selfCleanup: ("onAbort" | "onSuccess")[];
     constructor(deleteFlp: DeleteFlpUseCase.Interface);
-    run({ input, controller }: TaskDefinition.RunParams<IDeleteFlpTaskInput>): Promise<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResultError | import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResultAborted | TaskDefinition.ResultDone<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput> | TaskDefinition.ResultContinue<IDeleteFlpTaskInput>>;
+    run({ input, controller }: TaskDefinition.RunParams<IDeleteFlpTaskInput>): Promise<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResultAborted | import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResultError | TaskDefinition.ResultContinue<IDeleteFlpTaskInput> | TaskDefinition.ResultDone<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>>;
 }
 export declare const DeleteFlpTask: typeof DeleteFlpTaskImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskDefinition<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskInput, import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>>;

package/flp/tasks/index.d.ts

@@ -2,4 +2,3 @@ export declare const CREATE_FLP_TASK_ID = "acoCreateFlp";
 export declare const DELETE_FLP_TASK_ID = "acoDeleteFlp";
 export declare const UPDATE_FLP_TASK_ID = "acoUpdateFlp";
 export declare const SYNC_FLP_TASK_ID = "acoSyncFlp";
-export declare const flpTasks: () => import("@webiny/api").ContextPlugin<import("@webiny/api/types.js").Context>[];

package/flp/tasks/index.js

@@ -1,20 +1,7 @@
-import { CreateFlpTask } from "./createFlp.task.js";
-import { UpdateFlpTask } from "./updateFlp.task.js";
-import { DeleteFlpTask } from "./deleteFlp.task.js";
-import { SyncFlpTask } from "./syncFlp.task.js";
-import { createContextPlugin } from "@webiny/api";
 const CREATE_FLP_TASK_ID = "acoCreateFlp";
 const DELETE_FLP_TASK_ID = "acoDeleteFlp";
 const UPDATE_FLP_TASK_ID = "acoUpdateFlp";
 const SYNC_FLP_TASK_ID = "acoSyncFlp";
-const flpTasks = ()=>[
-        createContextPlugin((context)=>{
-            context.container.register(CreateFlpTask);
-            context.container.register(UpdateFlpTask);
-            context.container.register(DeleteFlpTask);
-            context.container.register(SyncFlpTask);
-        })
-    ];
-export { CREATE_FLP_TASK_ID, DELETE_FLP_TASK_ID, SYNC_FLP_TASK_ID, UPDATE_FLP_TASK_ID, flpTasks };
+export { CREATE_FLP_TASK_ID, DELETE_FLP_TASK_ID, SYNC_FLP_TASK_ID, UPDATE_FLP_TASK_ID };
 
 //# sourceMappingURL=index.js.map

package/flp/tasks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"flp/tasks/index.js","sources":["../../../src/flp/tasks/index.ts"],"sourcesContent":["import { CreateFlpTask } from \"./createFlp.task.js\";\nimport { UpdateFlpTask } from \"./updateFlp.task.js\";\nimport { DeleteFlpTask } from \"./deleteFlp.task.js\";\nimport { SyncFlpTask } from \"./syncFlp.task.js\";\nimport { createContextPlugin } from \"@webiny/api\";\n\nexport const CREATE_FLP_TASK_ID = \"acoCreateFlp\";\nexport const DELETE_FLP_TASK_ID = \"acoDeleteFlp\";\nexport const UPDATE_FLP_TASK_ID = \"acoUpdateFlp\";\nexport const SYNC_FLP_TASK_ID = \"acoSyncFlp\";\n\nexport const flpTasks = () => {\n    return [\n        createContextPlugin(context => {\n            context.container.register(CreateFlpTask);\n            context.container.register(UpdateFlpTask);\n            context.container.register(DeleteFlpTask);\n            context.container.register(SyncFlpTask);\n        })\n    ];\n};\n"],"names":["CREATE_FLP_TASK_ID","DELETE_FLP_TASK_ID","UPDATE_FLP_TASK_ID","SYNC_FLP_TASK_ID","flpTasks","createContextPlugin","context","CreateFlpTask","UpdateFlpTask","DeleteFlpTask","SyncFlpTask"],"mappings":";;;;;AAMO,MAAMA,qBAAqB;AAC3B,MAAMC,qBAAqB;AAC3B,MAAMC,qBAAqB;AAC3B,MAAMC,mBAAmB;AAEzB,MAAMC,WAAW,IACb;QACHC,oBAAoBC,CAAAA;YAChBA,QAAQ,SAAS,CAAC,QAAQ,CAACC;YAC3BD,QAAQ,SAAS,CAAC,QAAQ,CAACE;YAC3BF,QAAQ,SAAS,CAAC,QAAQ,CAACG;YAC3BH,QAAQ,SAAS,CAAC,QAAQ,CAACI;QAC/B;KACH"}
+{"version":3,"file":"flp/tasks/index.js","sources":["../../../src/flp/tasks/index.ts"],"sourcesContent":["export const CREATE_FLP_TASK_ID = \"acoCreateFlp\";\nexport const DELETE_FLP_TASK_ID = \"acoDeleteFlp\";\nexport const UPDATE_FLP_TASK_ID = \"acoUpdateFlp\";\nexport const SYNC_FLP_TASK_ID = \"acoSyncFlp\";\n"],"names":["CREATE_FLP_TASK_ID","DELETE_FLP_TASK_ID","UPDATE_FLP_TASK_ID","SYNC_FLP_TASK_ID"],"mappings":"AAAO,MAAMA,qBAAqB;AAC3B,MAAMC,qBAAqB;AAC3B,MAAMC,qBAAqB;AAC3B,MAAMC,mBAAmB"}

package/flp/tasks/syncFlp.task.d.ts

@@ -12,9 +12,9 @@ declare class SyncFlpTaskImpl implements TaskDefinition.Interface<ISyncFlpTaskIn
     readonly description = "Synchronizes the FLP catalog by updating the FLP record and its descendants.";
     readonly databaseLogs = false;
     readonly isPrivate = true;
-    readonly selfCleanup: ("onSuccess" | "onAbort")[];
+    readonly selfCleanup: ("onAbort" | "onSuccess")[];
     constructor(getFolder: GetFolderUseCase.Interface, listFolders: ListFoldersUseCase.Interface, listModels: ListModelsUseCase.Interface);
-    run({ input, controller }: TaskDefinition.RunParams<ISyncFlpTaskInput>): Promise<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResultError | import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResultAborted | TaskDefinition.ResultDone<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>>;
+    run({ input, controller }: TaskDefinition.RunParams<ISyncFlpTaskInput>): Promise<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResultAborted | import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResultError | TaskDefinition.ResultDone<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>>;
 }
 export declare const SyncFlpTask: typeof SyncFlpTaskImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskDefinition<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskInput, import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>>;

package/flp/tasks/syncFlp.task.js

@@ -24,6 +24,7 @@ class SyncFlpTaskImpl {
             if (controller.runtime.isAborted()) return controller.response.aborted();
             if (input.folderId) {
                 const result = await this.getFolder.execute(input.folderId);
+                if (result.isFail()) return controller.response.error(result.error);
                 const folder = result.value;
                 await controller.task.trigger({
                     definition: UPDATE_FLP_TASK_ID,
@@ -49,6 +50,16 @@ class SyncFlpTaskImpl {
                             parentId: null
                         }
                     });
+                    if (result.isFail()) {
+                        await controller.logger.error({
+                            message: `Failed to list root folders for type ${folderType}`,
+                            data: {
+                                type: folderType,
+                                error: result.error
+                            }
+                        });
+                        continue;
+                    }
                     const { folders } = result.value;
                     for (const folder of folders)await controller.task.trigger({
                         definition: UPDATE_FLP_TASK_ID,
@@ -72,6 +83,7 @@ class SyncFlpTaskImpl {
                         parentId: null
                     }
                 });
+                if (result.isFail()) return controller.response.error(result.error);
                 const { folders } = result.value;
                 for (const folder of folders)await controller.task.trigger({
                     definition: UPDATE_FLP_TASK_ID,

package/flp/tasks/syncFlp.task.js.map

@@ -1 +1 @@
-{"version":3,"file":"flp/tasks/syncFlp.task.js","sources":["../../../src/flp/tasks/syncFlp.task.ts"],"sourcesContent":["import { TaskDefinition } from \"@webiny/api-core/features/task/TaskDefinition/index.js\";\nimport { ListModelsUseCase } from \"@webiny/api-headless-cms/features/contentModel/ListModels/index.js\";\nimport { SYNC_FLP_TASK_ID, UPDATE_FLP_TASK_ID } from \"~/flp/tasks/index.js\";\nimport { type ISyncFlpTaskInput, type IUpdateFlpTaskInput } from \"~/types.js\";\nimport { FM_FILE_TYPE } from \"~/constants.js\";\nimport { GetFolderUseCase } from \"~/features/folder/GetFolder/index.js\";\nimport { ListFoldersUseCase } from \"~/features/folder/ListFolders/index.js\";\n\nclass SyncFlpTaskImpl implements TaskDefinition.Interface<ISyncFlpTaskInput> {\n    public readonly id = SYNC_FLP_TASK_ID;\n    public readonly title = \"ACO - Sync FLP record\";\n    public readonly description =\n        \"Synchronizes the FLP catalog by updating the FLP record and its descendants.\";\n    public readonly databaseLogs = false;\n    public readonly isPrivate = true;\n    public readonly selfCleanup = [\"onSuccess\" as const, \"onAbort\" as const];\n\n    public constructor(\n        private getFolder: GetFolderUseCase.Interface,\n        private listFolders: ListFoldersUseCase.Interface,\n        private listModels: ListModelsUseCase.Interface\n    ) {}\n\n    async run({ input, controller }: TaskDefinition.RunParams<ISyncFlpTaskInput>) {\n        try {\n            if (controller.runtime.isAborted()) {\n                return controller.response.aborted();\n            }\n\n            /**\n             * `folderId` provided in the task input. We need to:\n             *\n             * - update the FLP records for the found folder and all its descendants.\n             */\n            if (input.folderId) {\n                const result = await this.getFolder.execute(input.folderId!);\n                const folder = result.value;\n\n                await controller.task.trigger<IUpdateFlpTaskInput>({\n                    definition: UPDATE_FLP_TASK_ID,\n                    input: {\n                        folder\n                    }\n                });\n\n                return controller.response.done(\n                    `Task completed successfully: all FLP records for folderId \"${input.folderId}\" and its children have been queued to be synchronized.`\n                );\n            }\n\n            /**\n             *  Full update required. We need to:\n             *\n             *  - list cms models to collect their types, together with the default ones [FM_FILE_TYPE]\n             *  - list all root folders\n             *  - update the FLP records for the found folders and all its descendants.\n             */\n            if (input.type && input.type === \"*\") {\n                // Some folder types are fixed: pages and files.\n                const folderTypes = [FM_FILE_TYPE];\n\n                // List all non-private models\n                const modelsResult = await this.listModels.execute();\n                if (modelsResult.isOk()) {\n                    const models = modelsResult.value;\n                    for (const model of models) {\n                        folderTypes.push(`cms:${model.modelId}`);\n                    }\n                }\n\n                for (const folderType of folderTypes) {\n                    const result = await this.listFolders.execute({\n                        where: {\n                            type: folderType,\n                            parentId: null\n                        }\n                    });\n\n                    const { folders } = result.value;\n\n                    for (const folder of folders) {\n                        await controller.task.trigger<IUpdateFlpTaskInput>({\n                            definition: UPDATE_FLP_TASK_ID,\n                            input: {\n                                folder\n                            }\n                        });\n                    }\n\n                    await controller.logger.info({\n                        message: `FLP Update task triggered for type ${folderType}`,\n                        data: {\n                            type: folderType\n                        }\n                    });\n                }\n\n                return controller.response.done(\n                    `Task completed successfully: all FLP records have been queued to be synchronized.`\n                );\n            }\n\n            /**\n             * `type` provided in the task input. We need to:\n             *\n             * - list all root folders for the provided type\n             * - update the FLP records for the found folders and all its descendants.\n             */\n            if (input.type) {\n                const result = await this.listFolders.execute({\n                    where: {\n                        type: input.type!,\n                        parentId: null\n                    }\n                });\n\n                const { folders } = result.value;\n\n                for (const folder of folders) {\n                    await controller.task.trigger<IUpdateFlpTaskInput>({\n                        definition: UPDATE_FLP_TASK_ID,\n                        input: {\n                            folder\n                        }\n                    });\n                }\n\n                return controller.response.done(\n                    `Task completed successfully: all FLP records for type \"${input.type}\" have been queued to be synchronized.`\n                );\n            }\n\n            return controller.response.error(\n                \"Invalid input: please provide either `type` or `folderId`.\"\n            );\n        } catch (error) {\n            return controller.response.error(error);\n        }\n    }\n}\n\nexport const SyncFlpTask = TaskDefinition.createImplementation({\n    implementation: SyncFlpTaskImpl,\n    dependencies: [GetFolderUseCase, ListFoldersUseCase, ListModelsUseCase]\n});\n"],"names":["SyncFlpTaskImpl","getFolder","listFolders","listModels","SYNC_FLP_TASK_ID","input","controller","result","folder","UPDATE_FLP_TASK_ID","folderTypes","FM_FILE_TYPE","modelsResult","models","model","folderType","folders","error","SyncFlpTask","TaskDefinition","GetFolderUseCase","ListFoldersUseCase","ListModelsUseCase"],"mappings":";;;;;;AAQA,MAAMA;IASF,YACYC,SAAqC,EACrCC,WAAyC,EACzCC,UAAuC,CACjD;aAHUF,SAAS,GAATA;aACAC,WAAW,GAAXA;aACAC,UAAU,GAAVA;aAXI,EAAE,GAAGC;aACL,KAAK,GAAG;aACR,WAAW,GACvB;aACY,YAAY,GAAG;aACf,SAAS,GAAG;aACZ,WAAW,GAAG;YAAC;YAAsB;SAAmB;IAMrE;IAEH,MAAM,IAAI,EAAEC,KAAK,EAAEC,UAAU,EAA+C,EAAE;QAC1E,IAAI;YACA,IAAIA,WAAW,OAAO,CAAC,SAAS,IAC5B,OAAOA,WAAW,QAAQ,CAAC,OAAO;YAQtC,IAAID,MAAM,QAAQ,EAAE;gBAChB,MAAME,SAAS,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAACF,MAAM,QAAQ;gBAC1D,MAAMG,SAASD,OAAO,KAAK;gBAE3B,MAAMD,WAAW,IAAI,CAAC,OAAO,CAAsB;oBAC/C,YAAYG;oBACZ,OAAO;wBACHD;oBACJ;gBACJ;gBAEA,OAAOF,WAAW,QAAQ,CAAC,IAAI,CAC3B,CAAC,2DAA2D,EAAED,MAAM,QAAQ,CAAC,uDAAuD,CAAC;YAE7I;YASA,IAAIA,MAAM,IAAI,IAAIA,AAAe,QAAfA,MAAM,IAAI,EAAU;gBAElC,MAAMK,cAAc;oBAACC;iBAAa;gBAGlC,MAAMC,eAAe,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO;gBAClD,IAAIA,aAAa,IAAI,IAAI;oBACrB,MAAMC,SAASD,aAAa,KAAK;oBACjC,KAAK,MAAME,SAASD,OAChBH,YAAY,IAAI,CAAC,CAAC,IAAI,EAAEI,MAAM,OAAO,EAAE;gBAE/C;gBAEA,KAAK,MAAMC,cAAcL,YAAa;oBAClC,MAAMH,SAAS,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;wBAC1C,OAAO;4BACH,MAAMQ;4BACN,UAAU;wBACd;oBACJ;oBAEA,MAAM,EAAEC,OAAO,EAAE,GAAGT,OAAO,KAAK;oBAEhC,KAAK,MAAMC,UAAUQ,QACjB,MAAMV,WAAW,IAAI,CAAC,OAAO,CAAsB;wBAC/C,YAAYG;wBACZ,OAAO;4BACHD;wBACJ;oBACJ;oBAGJ,MAAMF,WAAW,MAAM,CAAC,IAAI,CAAC;wBACzB,SAAS,CAAC,mCAAmC,EAAES,YAAY;wBAC3D,MAAM;4BACF,MAAMA;wBACV;oBACJ;gBACJ;gBAEA,OAAOT,WAAW,QAAQ,CAAC,IAAI,CAC3B;YAER;YAQA,IAAID,MAAM,IAAI,EAAE;gBACZ,MAAME,SAAS,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;oBAC1C,OAAO;wBACH,MAAMF,MAAM,IAAI;wBAChB,UAAU;oBACd;gBACJ;gBAEA,MAAM,EAAEW,OAAO,EAAE,GAAGT,OAAO,KAAK;gBAEhC,KAAK,MAAMC,UAAUQ,QACjB,MAAMV,WAAW,IAAI,CAAC,OAAO,CAAsB;oBAC/C,YAAYG;oBACZ,OAAO;wBACHD;oBACJ;gBACJ;gBAGJ,OAAOF,WAAW,QAAQ,CAAC,IAAI,CAC3B,CAAC,uDAAuD,EAAED,MAAM,IAAI,CAAC,sCAAsC,CAAC;YAEpH;YAEA,OAAOC,WAAW,QAAQ,CAAC,KAAK,CAC5B;QAER,EAAE,OAAOW,OAAO;YACZ,OAAOX,WAAW,QAAQ,CAAC,KAAK,CAACW;QACrC;IACJ;AACJ;AAEO,MAAMC,cAAcC,eAAe,oBAAoB,CAAC;IAC3D,gBAAgBnB;IAChB,cAAc;QAACoB;QAAkBC;QAAoBC;KAAkB;AAC3E"}
+{"version":3,"file":"flp/tasks/syncFlp.task.js","sources":["../../../src/flp/tasks/syncFlp.task.ts"],"sourcesContent":["import { TaskDefinition } from \"@webiny/api-core/features/task/TaskDefinition/index.js\";\nimport { ListModelsUseCase } from \"@webiny/api-headless-cms/features/contentModel/ListModels/index.js\";\nimport { SYNC_FLP_TASK_ID, UPDATE_FLP_TASK_ID } from \"~/flp/tasks/index.js\";\nimport { type ISyncFlpTaskInput, type IUpdateFlpTaskInput } from \"~/types.js\";\nimport { FM_FILE_TYPE } from \"~/constants.js\";\nimport { GetFolderUseCase } from \"~/features/folder/GetFolder/index.js\";\nimport { ListFoldersUseCase } from \"~/features/folder/ListFolders/index.js\";\n\nclass SyncFlpTaskImpl implements TaskDefinition.Interface<ISyncFlpTaskInput> {\n    public readonly id = SYNC_FLP_TASK_ID;\n    public readonly title = \"ACO - Sync FLP record\";\n    public readonly description =\n        \"Synchronizes the FLP catalog by updating the FLP record and its descendants.\";\n    public readonly databaseLogs = false;\n    public readonly isPrivate = true;\n    public readonly selfCleanup = [\"onSuccess\" as const, \"onAbort\" as const];\n\n    public constructor(\n        private getFolder: GetFolderUseCase.Interface,\n        private listFolders: ListFoldersUseCase.Interface,\n        private listModels: ListModelsUseCase.Interface\n    ) {}\n\n    async run({ input, controller }: TaskDefinition.RunParams<ISyncFlpTaskInput>) {\n        try {\n            if (controller.runtime.isAborted()) {\n                return controller.response.aborted();\n            }\n\n            /**\n             * `folderId` provided in the task input. We need to:\n             *\n             * - update the FLP records for the found folder and all its descendants.\n             */\n            if (input.folderId) {\n                const result = await this.getFolder.execute(input.folderId);\n                if (result.isFail()) {\n                    return controller.response.error(result.error);\n                }\n                const folder = result.value;\n\n                await controller.task.trigger<IUpdateFlpTaskInput>({\n                    definition: UPDATE_FLP_TASK_ID,\n                    input: {\n                        folder\n                    }\n                });\n\n                return controller.response.done(\n                    `Task completed successfully: all FLP records for folderId \"${input.folderId}\" and its children have been queued to be synchronized.`\n                );\n            }\n\n            /**\n             *  Full update required. We need to:\n             *\n             *  - list cms models to collect their types, together with the default ones [FM_FILE_TYPE]\n             *  - list all root folders\n             *  - update the FLP records for the found folders and all its descendants.\n             */\n            if (input.type && input.type === \"*\") {\n                // Some folder types are fixed: pages and files.\n                const folderTypes = [FM_FILE_TYPE];\n\n                // List all non-private models\n                const modelsResult = await this.listModels.execute();\n                if (modelsResult.isOk()) {\n                    const models = modelsResult.value;\n                    for (const model of models) {\n                        folderTypes.push(`cms:${model.modelId}`);\n                    }\n                }\n\n                for (const folderType of folderTypes) {\n                    const result = await this.listFolders.execute({\n                        where: {\n                            type: folderType,\n                            parentId: null\n                        }\n                    });\n                    if (result.isFail()) {\n                        await controller.logger.error({\n                            message: `Failed to list root folders for type ${folderType}`,\n                            data: {\n                                type: folderType,\n                                error: result.error\n                            }\n                        });\n                        continue;\n                    }\n\n                    const { folders } = result.value;\n\n                    for (const folder of folders) {\n                        await controller.task.trigger<IUpdateFlpTaskInput>({\n                            definition: UPDATE_FLP_TASK_ID,\n                            input: {\n                                folder\n                            }\n                        });\n                    }\n\n                    await controller.logger.info({\n                        message: `FLP Update task triggered for type ${folderType}`,\n                        data: {\n                            type: folderType\n                        }\n                    });\n                }\n\n                return controller.response.done(\n                    `Task completed successfully: all FLP records have been queued to be synchronized.`\n                );\n            }\n\n            /**\n             * `type` provided in the task input. We need to:\n             *\n             * - list all root folders for the provided type\n             * - update the FLP records for the found folders and all its descendants.\n             */\n            if (input.type) {\n                const result = await this.listFolders.execute({\n                    where: {\n                        type: input.type!,\n                        parentId: null\n                    }\n                });\n                if (result.isFail()) {\n                    return controller.response.error(result.error);\n                }\n\n                const { folders } = result.value;\n\n                for (const folder of folders) {\n                    await controller.task.trigger<IUpdateFlpTaskInput>({\n                        definition: UPDATE_FLP_TASK_ID,\n                        input: {\n                            folder\n                        }\n                    });\n                }\n\n                return controller.response.done(\n                    `Task completed successfully: all FLP records for type \"${input.type}\" have been queued to be synchronized.`\n                );\n            }\n\n            return controller.response.error(\n                \"Invalid input: please provide either `type` or `folderId`.\"\n            );\n        } catch (error) {\n            return controller.response.error(error);\n        }\n    }\n}\n\nexport const SyncFlpTask = TaskDefinition.createImplementation({\n    implementation: SyncFlpTaskImpl,\n    dependencies: [GetFolderUseCase, ListFoldersUseCase, ListModelsUseCase]\n});\n"],"names":["SyncFlpTaskImpl","getFolder","listFolders","listModels","SYNC_FLP_TASK_ID","input","controller","result","folder","UPDATE_FLP_TASK_ID","folderTypes","FM_FILE_TYPE","modelsResult","models","model","folderType","folders","error","SyncFlpTask","TaskDefinition","GetFolderUseCase","ListFoldersUseCase","ListModelsUseCase"],"mappings":";;;;;;AAQA,MAAMA;IASF,YACYC,SAAqC,EACrCC,WAAyC,EACzCC,UAAuC,CACjD;aAHUF,SAAS,GAATA;aACAC,WAAW,GAAXA;aACAC,UAAU,GAAVA;aAXI,EAAE,GAAGC;aACL,KAAK,GAAG;aACR,WAAW,GACvB;aACY,YAAY,GAAG;aACf,SAAS,GAAG;aACZ,WAAW,GAAG;YAAC;YAAsB;SAAmB;IAMrE;IAEH,MAAM,IAAI,EAAEC,KAAK,EAAEC,UAAU,EAA+C,EAAE;QAC1E,IAAI;YACA,IAAIA,WAAW,OAAO,CAAC,SAAS,IAC5B,OAAOA,WAAW,QAAQ,CAAC,OAAO;YAQtC,IAAID,MAAM,QAAQ,EAAE;gBAChB,MAAME,SAAS,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAACF,MAAM,QAAQ;gBAC1D,IAAIE,OAAO,MAAM,IACb,OAAOD,WAAW,QAAQ,CAAC,KAAK,CAACC,OAAO,KAAK;gBAEjD,MAAMC,SAASD,OAAO,KAAK;gBAE3B,MAAMD,WAAW,IAAI,CAAC,OAAO,CAAsB;oBAC/C,YAAYG;oBACZ,OAAO;wBACHD;oBACJ;gBACJ;gBAEA,OAAOF,WAAW,QAAQ,CAAC,IAAI,CAC3B,CAAC,2DAA2D,EAAED,MAAM,QAAQ,CAAC,uDAAuD,CAAC;YAE7I;YASA,IAAIA,MAAM,IAAI,IAAIA,AAAe,QAAfA,MAAM,IAAI,EAAU;gBAElC,MAAMK,cAAc;oBAACC;iBAAa;gBAGlC,MAAMC,eAAe,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO;gBAClD,IAAIA,aAAa,IAAI,IAAI;oBACrB,MAAMC,SAASD,aAAa,KAAK;oBACjC,KAAK,MAAME,SAASD,OAChBH,YAAY,IAAI,CAAC,CAAC,IAAI,EAAEI,MAAM,OAAO,EAAE;gBAE/C;gBAEA,KAAK,MAAMC,cAAcL,YAAa;oBAClC,MAAMH,SAAS,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;wBAC1C,OAAO;4BACH,MAAMQ;4BACN,UAAU;wBACd;oBACJ;oBACA,IAAIR,OAAO,MAAM,IAAI;wBACjB,MAAMD,WAAW,MAAM,CAAC,KAAK,CAAC;4BAC1B,SAAS,CAAC,qCAAqC,EAAES,YAAY;4BAC7D,MAAM;gCACF,MAAMA;gCACN,OAAOR,OAAO,KAAK;4BACvB;wBACJ;wBACA;oBACJ;oBAEA,MAAM,EAAES,OAAO,EAAE,GAAGT,OAAO,KAAK;oBAEhC,KAAK,MAAMC,UAAUQ,QACjB,MAAMV,WAAW,IAAI,CAAC,OAAO,CAAsB;wBAC/C,YAAYG;wBACZ,OAAO;4BACHD;wBACJ;oBACJ;oBAGJ,MAAMF,WAAW,MAAM,CAAC,IAAI,CAAC;wBACzB,SAAS,CAAC,mCAAmC,EAAES,YAAY;wBAC3D,MAAM;4BACF,MAAMA;wBACV;oBACJ;gBACJ;gBAEA,OAAOT,WAAW,QAAQ,CAAC,IAAI,CAC3B;YAER;YAQA,IAAID,MAAM,IAAI,EAAE;gBACZ,MAAME,SAAS,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;oBAC1C,OAAO;wBACH,MAAMF,MAAM,IAAI;wBAChB,UAAU;oBACd;gBACJ;gBACA,IAAIE,OAAO,MAAM,IACb,OAAOD,WAAW,QAAQ,CAAC,KAAK,CAACC,OAAO,KAAK;gBAGjD,MAAM,EAAES,OAAO,EAAE,GAAGT,OAAO,KAAK;gBAEhC,KAAK,MAAMC,UAAUQ,QACjB,MAAMV,WAAW,IAAI,CAAC,OAAO,CAAsB;oBAC/C,YAAYG;oBACZ,OAAO;wBACHD;oBACJ;gBACJ;gBAGJ,OAAOF,WAAW,QAAQ,CAAC,IAAI,CAC3B,CAAC,uDAAuD,EAAED,MAAM,IAAI,CAAC,sCAAsC,CAAC;YAEpH;YAEA,OAAOC,WAAW,QAAQ,CAAC,KAAK,CAC5B;QAER,EAAE,OAAOW,OAAO;YACZ,OAAOX,WAAW,QAAQ,CAAC,KAAK,CAACW;QACrC;IACJ;AACJ;AAEO,MAAMC,cAAcC,eAAe,oBAAoB,CAAC;IAC3D,gBAAgBnB;IAChB,cAAc;QAACoB;QAAkBC;QAAoBC;KAAkB;AAC3E"}

package/flp/tasks/updateFlp.task.d.ts

@@ -8,9 +8,9 @@ declare class UpdateFlpTaskImpl implements TaskDefinition.Interface<IUpdateFlpTa
     readonly description = "Synchronizes the FLP catalog by updating the FLP record and its descendants based on the provided folder.";
     readonly databaseLogs = false;
     readonly isPrivate = true;
-    readonly selfCleanup: ("onSuccess" | "onAbort")[];
+    readonly selfCleanup: ("onAbort" | "onSuccess")[];
     constructor(updateFlp: UpdateFlpUseCase.Interface);
-    run({ input, controller }: TaskDefinition.RunParams<IUpdateFlpTaskInput>): Promise<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResultError | import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResultAborted | TaskDefinition.ResultDone<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>>;
+    run({ input, controller }: TaskDefinition.RunParams<IUpdateFlpTaskInput>): Promise<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResultAborted | import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResultError | TaskDefinition.ResultDone<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>>;
 }
 export declare const UpdateFlpTask: typeof UpdateFlpTaskImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskDefinition<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskInput, import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>>;

package/folder/folder.gql.d.ts

@@ -1,4 +1,4 @@
-import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins/GraphQLSchemaPlugin.js";
+import { GraphQLSchemaPlugin } from "@webiny/api-graphql/plugins/GraphQLSchemaPlugin.js";
 import type { CreateFolderTypeDefsParams } from "./createFolderTypeDefs.js";
 import type { AcoContext } from "../types.js";
 export declare const createFoldersSchema: (params: CreateFolderTypeDefsParams) => GraphQLSchemaPlugin<AcoContext>;

package/folder/folder.gql.js

@@ -1,5 +1,5 @@
-import { ErrorResponse, ListResponse } from "@webiny/handler-graphql/responses.js";
-import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins/GraphQLSchemaPlugin.js";
+import { ErrorResponse, ListResponse } from "@webiny/api-graphql/responses.js";
+import { GraphQLSchemaPlugin } from "@webiny/api-graphql/plugins/GraphQLSchemaPlugin.js";
 import { createFolderTypeDefs } from "./createFolderTypeDefs.js";
 import { ensureAuthentication } from "../utils/ensureAuthentication.js";
 import { resolve } from "../utils/resolve.js";
@@ -12,6 +12,7 @@ import { DeleteFolderUseCase } from "../features/folder/DeleteFolder/abstraction
 import { GetFolderHierarchyUseCase } from "../features/folder/GetFolderHierarchy/abstractions.js";
 import { ListFolderLevelPermissionsTargetsUseCase } from "../features/folder/ListFolderLevelPermissionsTargets/abstractions.js";
 import { FolderModel } from "../domain/folder/abstractions.js";
+import { ValuesSelectionGenerator } from "@webiny/api-headless-cms/features/contentModel/ValuesSelectionGenerator/abstractions.js";
 const createFoldersSchema = (params)=>{
     const folderGraphQL = new GraphQLSchemaPlugin({
         typeDefs: createFolderTypeDefs(params),
@@ -38,7 +39,12 @@ const createFoldersSchema = (params)=>{
                 getFolderModel (_, __, context) {
                     return resolve(async ()=>{
                         ensureAuthentication(context);
-                        return context.container.resolve(FolderModel);
+                        const model = context.container.resolve(FolderModel);
+                        const generator = context.container.resolve(ValuesSelectionGenerator);
+                        return {
+                            ...model,
+                            valuesSelection: generator.generate(model)
+                        };
                     });
                 },
                 getFolder: async (_, { id }, context)=>resolve(async ()=>{