@webiny/api-aco 6.4.11 → 6.6.0-alpha.1

package/features/flp/FolderLevelPermissions/NoopFolderLevelPermissions.js

@@ -0,0 +1,48 @@
+import { FolderLevelPermissions } from "./abstractions.js";
+class NoopFolderLevelPermissionsImpl {
+    canUseFolderLevelPermissions() {
+        return false;
+    }
+    canUseTeams() {
+        return false;
+    }
+    canCreateFolderInRoot() {
+        return true;
+    }
+    permissionsIncludeNonInheritedPermissions() {
+        return false;
+    }
+    async canAccessFolder() {
+        return true;
+    }
+    async canAccessFolderContent() {
+        return true;
+    }
+    async ensureCanAccessFolder() {}
+    async ensureCanAccessFolderContent() {}
+    async canManageFolderContent() {
+        return true;
+    }
+    async canManageFolderStructure() {
+        return true;
+    }
+    async canManageFolderPermissions() {
+        return true;
+    }
+    async getDefaultPermissions(permissions) {
+        return permissions;
+    }
+    async listFolderLevelPermissions() {
+        return [];
+    }
+    async getFolderLevelPermissions() {
+        return [];
+    }
+}
+const NoopFolderLevelPermissions = FolderLevelPermissions.createImplementation({
+    implementation: NoopFolderLevelPermissionsImpl,
+    dependencies: []
+});
+export { NoopFolderLevelPermissions };
+
+//# sourceMappingURL=NoopFolderLevelPermissions.js.map

package/features/flp/FolderLevelPermissions/NoopFolderLevelPermissions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/flp/FolderLevelPermissions/NoopFolderLevelPermissions.js","sources":["../../../../src/features/flp/FolderLevelPermissions/NoopFolderLevelPermissions.ts"],"sourcesContent":["import { FolderLevelPermissions, type IFolderLevelPermissions } from \"./abstractions.js\";\nimport type { FolderPermission } from \"~/types.js\";\n\nclass NoopFolderLevelPermissionsImpl implements IFolderLevelPermissions {\n    canUseFolderLevelPermissions(): boolean {\n        return false;\n    }\n\n    canUseTeams(): boolean {\n        return false;\n    }\n\n    canCreateFolderInRoot(): boolean {\n        return true;\n    }\n\n    permissionsIncludeNonInheritedPermissions(): boolean {\n        return false;\n    }\n\n    async canAccessFolder(): Promise<boolean> {\n        return true;\n    }\n\n    async canAccessFolderContent(): Promise<boolean> {\n        return true;\n    }\n\n    async ensureCanAccessFolder(): Promise<void> {\n        return;\n    }\n\n    async ensureCanAccessFolderContent(): Promise<void> {\n        return;\n    }\n\n    async canManageFolderContent(): Promise<boolean> {\n        return true;\n    }\n\n    async canManageFolderStructure(): Promise<boolean> {\n        return true;\n    }\n\n    async canManageFolderPermissions(): Promise<boolean> {\n        return true;\n    }\n\n    async getDefaultPermissions(permissions: FolderPermission[]): Promise<FolderPermission[]> {\n        return permissions;\n    }\n\n    async listFolderLevelPermissions(): Promise<\n        Array<{ id: string; permissions: FolderPermission[] }>\n    > {\n        return [];\n    }\n\n    async getFolderLevelPermissions(): Promise<FolderPermission[]> {\n        return [];\n    }\n}\n\nexport const NoopFolderLevelPermissions = FolderLevelPermissions.createImplementation({\n    implementation: NoopFolderLevelPermissionsImpl,\n    dependencies: []\n});\n"],"names":["NoopFolderLevelPermissionsImpl","permissions","NoopFolderLevelPermissions","FolderLevelPermissions"],"mappings":";AAGA,MAAMA;IACF,+BAAwC;QACpC,OAAO;IACX;IAEA,cAAuB;QACnB,OAAO;IACX;IAEA,wBAAiC;QAC7B,OAAO;IACX;IAEA,4CAAqD;QACjD,OAAO;IACX;IAEA,MAAM,kBAAoC;QACtC,OAAO;IACX;IAEA,MAAM,yBAA2C;QAC7C,OAAO;IACX;IAEA,MAAM,wBAAuC,CAE7C;IAEA,MAAM,+BAA8C,CAEpD;IAEA,MAAM,yBAA2C;QAC7C,OAAO;IACX;IAEA,MAAM,2BAA6C;QAC/C,OAAO;IACX;IAEA,MAAM,6BAA+C;QACjD,OAAO;IACX;IAEA,MAAM,sBAAsBC,WAA+B,EAA+B;QACtF,OAAOA;IACX;IAEA,MAAM,6BAEJ;QACE,OAAO,EAAE;IACb;IAEA,MAAM,4BAAyD;QAC3D,OAAO,EAAE;IACb;AACJ;AAEO,MAAMC,6BAA6BC,uBAAuB,oBAAoB,CAAC;IAClF,gBAAgBH;IAChB,cAAc,EAAE;AACpB"}

package/features/flp/FolderLevelPermissions/index.d.ts

@@ -1,2 +1,3 @@
 export { FolderLevelPermissionsFeature } from "./feature.js";
 export { FolderLevelPermissions } from "./abstractions.js";
+export { NoopFolderLevelPermissions } from "./NoopFolderLevelPermissions.js";

package/features/flp/FolderLevelPermissions/index.js

@@ -1,2 +1,3 @@
 export { FolderLevelPermissionsFeature } from "./feature.js";
 export { FolderLevelPermissions } from "./abstractions.js";
+export { NoopFolderLevelPermissions } from "./NoopFolderLevelPermissions.js";

package/features/flp/GetFlp/feature.d.ts

@@ -1,4 +1,4 @@
 export declare const GetFlpFeature: {
     name: string;
-    register(container: import("@webiny/di").Container, context: import("~/types.js").AcoFolderLevelPermissionsCrud): void;
+    register(container: import("@webiny/di").Container): void;
 };

package/features/flp/GetFlp/feature.js

@@ -1,10 +1,11 @@
 import { createFeature } from "@webiny/feature/api";
 import { GetFlpUseCase } from "./GetFlpUseCase.js";
 import { GetFlpUseCase as external_abstractions_js_GetFlpUseCase } from "./abstractions.js";
+import { AcoFlpCrud } from "../../folder/shared/abstractions.js";
 const GetFlpFeature = createFeature({
     name: "GetFlpFeature",
-    register (container, context) {
-        container.registerFactory(external_abstractions_js_GetFlpUseCase, ()=>new GetFlpUseCase(context.get));
+    register (container) {
+        container.registerFactory(external_abstractions_js_GetFlpUseCase, ()=>new GetFlpUseCase(container.resolve(AcoFlpCrud).get));
     }
 });
 export { GetFlpFeature };

package/features/flp/GetFlp/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/flp/GetFlp/feature.js","sources":["../../../../src/features/flp/GetFlp/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { GetFlpUseCase } from \"./GetFlpUseCase.js\";\nimport { GetFlpUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport type { AcoContext } from \"~/types.js\";\n\nexport const GetFlpFeature = createFeature<AcoContext[\"aco\"][\"flp\"]>({\n    name: \"GetFlpFeature\",\n    register(container, context) {\n        container.registerFactory(UseCaseAbstraction, () => {\n            return new GetFlpUseCase(context.get);\n        });\n    }\n});\n"],"names":["GetFlpFeature","createFeature","container","context","UseCaseAbstraction","GetFlpUseCase"],"mappings":";;;AAKO,MAAMA,gBAAgBC,cAAwC;IACjE,MAAM;IACN,UAASC,SAAS,EAAEC,OAAO;QACvBD,UAAU,eAAe,CAACE,wCAAoB,IACnC,IAAIC,cAAcF,QAAQ,GAAG;IAE5C;AACJ"}
+{"version":3,"file":"features/flp/GetFlp/feature.js","sources":["../../../../src/features/flp/GetFlp/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { GetFlpUseCase } from \"./GetFlpUseCase.js\";\nimport { GetFlpUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { AcoFlpCrud } from \"~/features/folder/shared/abstractions.js\";\n\nexport const GetFlpFeature = createFeature({\n    name: \"GetFlpFeature\",\n    register(container) {\n        container.registerFactory(UseCaseAbstraction, () => {\n            return new GetFlpUseCase(container.resolve(AcoFlpCrud).get);\n        });\n    }\n});\n"],"names":["GetFlpFeature","createFeature","container","UseCaseAbstraction","GetFlpUseCase","AcoFlpCrud"],"mappings":";;;;AAKO,MAAMA,gBAAgBC,cAAc;IACvC,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,eAAe,CAACC,wCAAoB,IACnC,IAAIC,cAAcF,UAAU,OAAO,CAACG,YAAY,GAAG;IAElE;AACJ"}

package/features/flp/ListFlps/feature.d.ts

@@ -1,4 +1,4 @@
 export declare const ListFlpsFeature: {
     name: string;
-    register(container: import("@webiny/di").Container, context: import("~/types.js").AcoFolderLevelPermissionsCrud): void;
+    register(container: import("@webiny/di").Container): void;
 };

package/features/flp/ListFlps/feature.js

@@ -1,10 +1,11 @@
 import { createFeature } from "@webiny/feature/api";
 import { ListFlpsUseCase } from "./ListFlpsUseCase.js";
 import { ListFlpsUseCase as external_abstractions_js_ListFlpsUseCase } from "./abstractions.js";
+import { AcoFlpCrud } from "../../folder/shared/abstractions.js";
 const ListFlpsFeature = createFeature({
     name: "ListFlpsFeature",
-    register (container, context) {
-        container.registerFactory(external_abstractions_js_ListFlpsUseCase, ()=>new ListFlpsUseCase(context.list));
+    register (container) {
+        container.registerFactory(external_abstractions_js_ListFlpsUseCase, ()=>new ListFlpsUseCase(container.resolve(AcoFlpCrud).list));
     }
 });
 export { ListFlpsFeature };

package/features/flp/ListFlps/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/flp/ListFlps/feature.js","sources":["../../../../src/features/flp/ListFlps/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { ListFlpsUseCase } from \"./ListFlpsUseCase.js\";\nimport { ListFlpsUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport type { AcoContext } from \"~/types.js\";\n\nexport const ListFlpsFeature = createFeature<AcoContext[\"aco\"][\"flp\"]>({\n    name: \"ListFlpsFeature\",\n    register(container, context) {\n        container.registerFactory(UseCaseAbstraction, () => {\n            return new ListFlpsUseCase(context.list);\n        });\n    }\n});\n"],"names":["ListFlpsFeature","createFeature","container","context","UseCaseAbstraction","ListFlpsUseCase"],"mappings":";;;AAKO,MAAMA,kBAAkBC,cAAwC;IACnE,MAAM;IACN,UAASC,SAAS,EAAEC,OAAO;QACvBD,UAAU,eAAe,CAACE,0CAAoB,IACnC,IAAIC,gBAAgBF,QAAQ,IAAI;IAE/C;AACJ"}
+{"version":3,"file":"features/flp/ListFlps/feature.js","sources":["../../../../src/features/flp/ListFlps/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { ListFlpsUseCase } from \"./ListFlpsUseCase.js\";\nimport { ListFlpsUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { AcoFlpCrud } from \"~/features/folder/shared/abstractions.js\";\n\nexport const ListFlpsFeature = createFeature({\n    name: \"ListFlpsFeature\",\n    register(container) {\n        container.registerFactory(UseCaseAbstraction, () => {\n            return new ListFlpsUseCase(container.resolve(AcoFlpCrud).list);\n        });\n    }\n});\n"],"names":["ListFlpsFeature","createFeature","container","UseCaseAbstraction","ListFlpsUseCase","AcoFlpCrud"],"mappings":";;;;AAKO,MAAMA,kBAAkBC,cAAc;IACzC,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,eAAe,CAACC,0CAAoB,IACnC,IAAIC,gBAAgBF,UAAU,OAAO,CAACG,YAAY,IAAI;IAErE;AACJ"}

package/features/flp/UpdateFlp/UpdateFlpUseCase.d.ts

@@ -1,12 +1,20 @@
 import type { UpdateFlpParams, UpdateFlpUseCase as UseCaseAbstraction } from "./abstractions.js";
-import type { AcoContext } from "../../../types.js";
+import type { AcoFlpCrud } from "../../../features/folder/shared/abstractions.js";
+import type { ListFoldersUseCase } from "../../../features/folder/ListFolders/index.js";
+import type { FolderModelProvider } from "../../../domain/folder/abstractions.js";
+import type { UpdateEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/UpdateEntry/index.js";
+import type { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/abstractions.js";
 export declare class UpdateFlpUseCase implements UseCaseAbstraction.Interface {
-    private context;
+    private flpCrud;
+    private listFoldersUseCase;
+    private folderModelProvider;
+    private updateEntryUseCase;
+    private identityContext;
     private isCloseToTimeout?;
     private handleTimeout?;
     private readonly queued;
     private readonly flpsToUpdate;
-    constructor(context: AcoContext);
+    constructor(flpCrud: AcoFlpCrud.Interface, listFoldersUseCase: ListFoldersUseCase.Interface, folderModelProvider: FolderModelProvider.Interface, updateEntryUseCase: UpdateEntryUseCase.Interface, identityContext: IdentityContext.Interface);
     execute(params: UpdateFlpParams): Promise<void>;
     private collectBranchForUpdate;
     private executeBatchUpdate;

package/features/flp/UpdateFlp/UpdateFlpUseCase.js

@@ -1,14 +1,16 @@
 import { WebinyError } from "@webiny/error";
 import { Path } from "../../../utils/Path.js";
 import { Permissions, ROOT_FOLDER } from "@webiny/shared-aco";
-import { ListFoldersUseCase } from "../../folder/ListFolders/index.js";
-import { FolderModel } from "../../../domain/folder/abstractions.js";
 import { EntryId } from "@webiny/api-headless-cms/exports/api/cms/entry.js";
 class UpdateFlpUseCase {
-    constructor(context){
+    constructor(flpCrud, listFoldersUseCase, folderModelProvider, updateEntryUseCase, identityContext){
+        this.flpCrud = flpCrud;
+        this.listFoldersUseCase = listFoldersUseCase;
+        this.folderModelProvider = folderModelProvider;
+        this.updateEntryUseCase = updateEntryUseCase;
+        this.identityContext = identityContext;
         this.queued = new Set();
         this.flpsToUpdate = new Map();
-        this.context = context;
     }
     async execute(params) {
         this.isCloseToTimeout = params.isCloseToTimeout;
@@ -20,7 +22,7 @@ class UpdateFlpUseCase {
                 folder
             });
             const flp = await this.getFlp(folder);
-            const parentFlp = folder.parentId ? await this.context.aco.flp.get(folder.parentId) : null;
+            const parentFlp = folder.parentId ? await this.flpCrud.get(folder.parentId) : null;
             this.flpsToUpdate.set(folder.id, {
                 slug: folder.slug,
                 parentId: folder.parentId ?? ROOT_FOLDER,
@@ -74,6 +76,7 @@ class UpdateFlpUseCase {
         }
     }
     async executeBatchUpdate() {
+        const folderModel = await this.folderModelProvider.get();
         try {
             const items = Array.from(this.flpsToUpdate.entries()).map(([id, { slug, parentId, path, permissions }])=>({
                     id,
@@ -84,16 +87,16 @@ class UpdateFlpUseCase {
                         permissions
                     }
                 }));
-            await this.context.aco.flp.batchUpdate(items);
-            const folderModel = this.context.container.resolve(FolderModel);
+            await this.flpCrud.batchUpdate(items);
             for (const item of items){
                 const { id, data } = item;
                 const entryId = EntryId.from(id);
-                await this.context.cms.updateEntry(folderModel, entryId.toString(), {
+                const updateResult = await this.updateEntryUseCase.execute(folderModel, entryId.toString(), {
                     values: {
                         path: data.path
                     }
                 });
+                if (updateResult.isFail()) throw updateResult.error;
             }
         } catch (error) {
             throw WebinyError.from(error, {
@@ -121,8 +124,7 @@ class UpdateFlpUseCase {
         this.queued.clear();
     }
     async listDirectChildren(flp) {
-        const listFolders = this.context.container.resolve(ListFoldersUseCase);
-        const result = await this.context.security.withoutAuthorization(()=>listFolders.execute({
+        const result = await this.identityContext.withoutAuthorization(()=>this.listFoldersUseCase.execute({
                 where: {
                     type: flp.type,
                     parentId: flp.id
@@ -132,10 +134,10 @@ class UpdateFlpUseCase {
         return await Promise.all(result.value.folders.map((folder)=>this.getFlp(folder)));
     }
     async getFlp({ id, type, parentId, slug, permissions }) {
-        const flp = await this.context.aco.flp.get(id);
+        const flp = await this.flpCrud.get(id);
         if (!flp) {
-            const parentFlp = parentId ? await this.context.aco.flp.get(parentId) : null;
-            return await this.context.aco.flp.create({
+            const parentFlp = parentId ? await this.flpCrud.get(parentId) : null;
+            return await this.flpCrud.create({
                 id,
                 type,
                 slug,

package/features/flp/UpdateFlp/UpdateFlpUseCase.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/flp/UpdateFlp/UpdateFlpUseCase.js","sources":["../../../../src/features/flp/UpdateFlp/UpdateFlpUseCase.ts"],"sourcesContent":["import { WebinyError } from \"@webiny/error\";\nimport { Path } from \"~/utils/Path.js\";\nimport { Permissions, ROOT_FOLDER } from \"@webiny/shared-aco\";\nimport type { UpdateFlpParams, UpdateFlpUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport type { AcoContext, Folder, FolderLevelPermission, FolderPermission } from \"~/types.js\";\nimport { ListFoldersUseCase } from \"~/features/folder/ListFolders/index.js\";\nimport { FolderModel } from \"~/domain/folder/abstractions.js\";\nimport { EntryId } from \"@webiny/api-headless-cms/exports/api/cms/entry.js\";\n\ninterface FlpUpdateData {\n    parentId: string;\n    slug: string;\n    path: string;\n    permissions: FolderPermission[];\n}\n\nexport class UpdateFlpUseCase implements UseCaseAbstraction.Interface {\n    private context: AcoContext;\n    private isCloseToTimeout?: () => boolean;\n    private handleTimeout?: (updated: string[]) => void;\n\n    private readonly queued: Set<string> = new Set();\n    private readonly flpsToUpdate: Map<string, FlpUpdateData> = new Map();\n\n    constructor(context: AcoContext) {\n        this.context = context;\n    }\n\n    async execute(params: UpdateFlpParams): Promise<void> {\n        this.isCloseToTimeout = params.isCloseToTimeout;\n        this.handleTimeout = params.handleTimeout;\n\n        if (params.queued) {\n            params.queued.forEach(id => this.queued.add(id));\n        }\n\n        try {\n            const { folder } = params;\n\n            if (!folder) {\n                throw new WebinyError(\n                    \"Missing `folder`, I can't update the FLP record.\",\n                    \"ERROR_UPDATING_FLP_USE_CASE_FOLDER_NOT_PROVIDED\",\n                    { folder }\n                );\n            }\n\n            const flp = await this.getFlp(folder);\n            const parentFlp = folder.parentId\n                ? await this.context.aco.flp.get(folder.parentId)\n                : null;\n\n            // Add the root folder to the update collection\n            this.flpsToUpdate.set(folder.id, {\n                slug: folder.slug,\n                parentId: folder.parentId ?? ROOT_FOLDER,\n                path: Path.create(folder.slug, parentFlp?.path),\n                permissions: Permissions.create(folder.permissions, parentFlp)\n            });\n\n            // Let's set the FLP as in queue\n            this.setQueued(flp.id);\n\n            // Get direct children and process each branch completely\n            const directChildren = await this.listDirectChildren(flp);\n\n            for (const child of directChildren) {\n                if (this.isCloseToTimeout?.()) {\n                    await this.executeBatchUpdate();\n                    this.handleTimeout?.(this.getQueuedList());\n                    return;\n                }\n                await this.collectBranchForUpdate(child, flp);\n            }\n\n            // Execute batch update\n            await this.executeBatchUpdate();\n        } catch (error) {\n            // Clear the update collection in case of error\n            this.flpsToUpdate.clear();\n            this.queued.clear();\n            throw WebinyError.from(error, {\n                message: \"Error while updating FLP\",\n                code: \"ERROR_UPDATING_FLP_USE_CASE\"\n            });\n        }\n    }\n\n    private async collectBranchForUpdate(\n        flp: FolderLevelPermission,\n        parentFlp: FolderLevelPermission\n    ): Promise<void> {\n        if (this.isQueued(flp.id)) {\n            return;\n        }\n\n        // Get the parent's permissions from the update collection if available\n        const parentFlpData = this.flpsToUpdate.get(parentFlp.id);\n        const currentParentFlp = {\n            ...parentFlp,\n            ...(parentFlpData && { ...parentFlpData })\n        };\n\n        // Add the FLP to the update collection with inherited permissions\n        this.flpsToUpdate.set(flp.id, {\n            slug: flp.slug,\n            parentId: flp.parentId,\n            path: Path.create(flp.slug, currentParentFlp.path),\n            permissions: Permissions.create(flp.permissions, currentParentFlp)\n        });\n\n        // Add the FLP to the queue list so we don't fetch it again\n        this.setQueued(flp.id);\n\n        // Process all children of this folder before moving to siblings\n        const children = await this.listDirectChildren(flp);\n\n        for (const child of children) {\n            if (this.isCloseToTimeout?.()) {\n                await this.executeBatchUpdate();\n                this.handleTimeout?.(this.getQueuedList());\n                return;\n            }\n            // Pass the current FLP as the parent for the child\n            await this.collectBranchForUpdate(child, flp);\n        }\n    }\n\n    private async executeBatchUpdate(): Promise<void> {\n        try {\n            const items = Array.from(this.flpsToUpdate.entries()).map(\n                ([id, { slug, parentId, path, permissions }]) => {\n                    return {\n                        id,\n                        data: {\n                            slug,\n                            parentId,\n                            path,\n                            permissions\n                        }\n                    };\n                }\n            );\n\n            await this.context.aco.flp.batchUpdate(items);\n\n            // Update all folders with the new path\n            const folderModel = this.context.container.resolve(FolderModel);\n            for (const item of items) {\n                const { id, data } = item;\n                // Directly update the folder in CMS storage to bypass any folder update event triggers.\n                const entryId = EntryId.from(id);\n                await this.context.cms.updateEntry(folderModel, entryId.toString(), {\n                    values: {\n                        path: data.path\n                    }\n                });\n            }\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while executing batch update of FLPs\",\n                code: \"BATCH_UPDATE_FLP_ERROR\",\n                data: {\n                    items: Array.from(this.flpsToUpdate.keys())\n                }\n            });\n        } finally {\n            // Clear the update collection after the batch update\n            this.flpsToUpdate.clear();\n\n            //Let's remove all the updated FLPs ids from the queue cache\n            this.clearQueuedList();\n        }\n    }\n\n    private getQueuedList(): string[] {\n        return Array.from(this.queued);\n    }\n\n    private setQueued(id: string): void {\n        this.queued.add(id);\n    }\n\n    private isQueued(id: string): boolean {\n        return this.queued.has(id);\n    }\n\n    private clearQueuedList(): void {\n        this.queued.clear();\n    }\n\n    private async listDirectChildren(flp: FolderLevelPermission): Promise<FolderLevelPermission[]> {\n        const listFolders = this.context.container.resolve(ListFoldersUseCase);\n\n        const result = await this.context.security.withoutAuthorization(() => {\n            return listFolders.execute({\n                where: {\n                    type: flp.type,\n                    parentId: flp.id\n                }\n            });\n        });\n\n        if (result.isFail()) {\n            throw result.error;\n        }\n\n        return await Promise.all(result.value.folders.map(folder => this.getFlp(folder)));\n    }\n\n    private async getFlp({\n        id,\n        type,\n        parentId,\n        slug,\n        permissions\n    }: Folder): Promise<FolderLevelPermission> {\n        const flp = await this.context.aco.flp.get(id);\n\n        if (!flp) {\n            const parentFlp = parentId ? await this.context.aco.flp.get(parentId) : null;\n\n            return await this.context.aco.flp.create({\n                id,\n                type,\n                slug,\n                parentId: parentId ?? ROOT_FOLDER,\n                path: Path.create(slug, parentFlp?.path),\n                permissions: Permissions.create(permissions, parentFlp)\n            });\n        }\n\n        return flp;\n    }\n}\n"],"names":["UpdateFlpUseCase","context","Set","Map","params","id","folder","WebinyError","flp","parentFlp","ROOT_FOLDER","Path","Permissions","directChildren","child","error","parentFlpData","currentParentFlp","children","items","Array","slug","parentId","path","permissions","folderModel","FolderModel","item","data","entryId","EntryId","listFolders","ListFoldersUseCase","result","Promise","type"],"mappings":"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"}
+{"version":3,"file":"features/flp/UpdateFlp/UpdateFlpUseCase.js","sources":["../../../../src/features/flp/UpdateFlp/UpdateFlpUseCase.ts"],"sourcesContent":["import { WebinyError } from \"@webiny/error\";\nimport { Path } from \"~/utils/Path.js\";\nimport { Permissions, ROOT_FOLDER } from \"@webiny/shared-aco\";\nimport type { UpdateFlpParams, UpdateFlpUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport type { Folder, FolderLevelPermission, FolderPermission } from \"~/types.js\";\nimport type { AcoFlpCrud } from \"~/features/folder/shared/abstractions.js\";\nimport type { ListFoldersUseCase } from \"~/features/folder/ListFolders/index.js\";\nimport type { FolderModelProvider } from \"~/domain/folder/abstractions.js\";\nimport { EntryId } from \"@webiny/api-headless-cms/exports/api/cms/entry.js\";\nimport type { UpdateEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/UpdateEntry/index.js\";\nimport type { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/abstractions.js\";\n\ninterface FlpUpdateData {\n    parentId: string;\n    slug: string;\n    path: string;\n    permissions: FolderPermission[];\n}\n\nexport class UpdateFlpUseCase implements UseCaseAbstraction.Interface {\n    private isCloseToTimeout?: () => boolean;\n    private handleTimeout?: (updated: string[]) => void;\n\n    private readonly queued: Set<string> = new Set();\n    private readonly flpsToUpdate: Map<string, FlpUpdateData> = new Map();\n\n    constructor(\n        private flpCrud: AcoFlpCrud.Interface,\n        private listFoldersUseCase: ListFoldersUseCase.Interface,\n        private folderModelProvider: FolderModelProvider.Interface,\n        private updateEntryUseCase: UpdateEntryUseCase.Interface,\n        private identityContext: IdentityContext.Interface\n    ) {}\n\n    async execute(params: UpdateFlpParams): Promise<void> {\n        this.isCloseToTimeout = params.isCloseToTimeout;\n        this.handleTimeout = params.handleTimeout;\n\n        if (params.queued) {\n            params.queued.forEach(id => this.queued.add(id));\n        }\n\n        try {\n            const { folder } = params;\n\n            if (!folder) {\n                throw new WebinyError(\n                    \"Missing `folder`, I can't update the FLP record.\",\n                    \"ERROR_UPDATING_FLP_USE_CASE_FOLDER_NOT_PROVIDED\",\n                    { folder }\n                );\n            }\n\n            const flp = await this.getFlp(folder);\n            const parentFlp = folder.parentId ? await this.flpCrud.get(folder.parentId) : null;\n\n            // Add the root folder to the update collection\n            this.flpsToUpdate.set(folder.id, {\n                slug: folder.slug,\n                parentId: folder.parentId ?? ROOT_FOLDER,\n                path: Path.create(folder.slug, parentFlp?.path),\n                permissions: Permissions.create(folder.permissions, parentFlp)\n            });\n\n            // Let's set the FLP as in queue\n            this.setQueued(flp.id);\n\n            // Get direct children and process each branch completely\n            const directChildren = await this.listDirectChildren(flp);\n\n            for (const child of directChildren) {\n                if (this.isCloseToTimeout?.()) {\n                    await this.executeBatchUpdate();\n                    this.handleTimeout?.(this.getQueuedList());\n                    return;\n                }\n                await this.collectBranchForUpdate(child, flp);\n            }\n\n            // Execute batch update\n            await this.executeBatchUpdate();\n        } catch (error) {\n            // Clear the update collection in case of error\n            this.flpsToUpdate.clear();\n            this.queued.clear();\n            throw WebinyError.from(error, {\n                message: \"Error while updating FLP\",\n                code: \"ERROR_UPDATING_FLP_USE_CASE\"\n            });\n        }\n    }\n\n    private async collectBranchForUpdate(\n        flp: FolderLevelPermission,\n        parentFlp: FolderLevelPermission\n    ): Promise<void> {\n        if (this.isQueued(flp.id)) {\n            return;\n        }\n\n        // Get the parent's permissions from the update collection if available\n        const parentFlpData = this.flpsToUpdate.get(parentFlp.id);\n        const currentParentFlp = {\n            ...parentFlp,\n            ...(parentFlpData && { ...parentFlpData })\n        };\n\n        // Add the FLP to the update collection with inherited permissions\n        this.flpsToUpdate.set(flp.id, {\n            slug: flp.slug,\n            parentId: flp.parentId,\n            path: Path.create(flp.slug, currentParentFlp.path),\n            permissions: Permissions.create(flp.permissions, currentParentFlp)\n        });\n\n        // Add the FLP to the queue list so we don't fetch it again\n        this.setQueued(flp.id);\n\n        // Process all children of this folder before moving to siblings\n        const children = await this.listDirectChildren(flp);\n\n        for (const child of children) {\n            if (this.isCloseToTimeout?.()) {\n                await this.executeBatchUpdate();\n                this.handleTimeout?.(this.getQueuedList());\n                return;\n            }\n            // Pass the current FLP as the parent for the child\n            await this.collectBranchForUpdate(child, flp);\n        }\n    }\n\n    private async executeBatchUpdate(): Promise<void> {\n        const folderModel = await this.folderModelProvider.get();\n        try {\n            const items = Array.from(this.flpsToUpdate.entries()).map(\n                ([id, { slug, parentId, path, permissions }]) => {\n                    return {\n                        id,\n                        data: {\n                            slug,\n                            parentId,\n                            path,\n                            permissions\n                        }\n                    };\n                }\n            );\n\n            await this.flpCrud.batchUpdate(items);\n\n            // Update all folders with the new path\n            for (const item of items) {\n                const { id, data } = item;\n                // Directly update the folder in CMS storage to bypass any folder update event triggers.\n                const entryId = EntryId.from(id);\n                const updateResult = await this.updateEntryUseCase.execute(\n                    folderModel,\n                    entryId.toString(),\n                    { values: { path: data.path } }\n                );\n                if (updateResult.isFail()) {\n                    throw updateResult.error;\n                }\n            }\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while executing batch update of FLPs\",\n                code: \"BATCH_UPDATE_FLP_ERROR\",\n                data: {\n                    items: Array.from(this.flpsToUpdate.keys())\n                }\n            });\n        } finally {\n            // Clear the update collection after the batch update\n            this.flpsToUpdate.clear();\n\n            //Let's remove all the updated FLPs ids from the queue cache\n            this.clearQueuedList();\n        }\n    }\n\n    private getQueuedList(): string[] {\n        return Array.from(this.queued);\n    }\n\n    private setQueued(id: string): void {\n        this.queued.add(id);\n    }\n\n    private isQueued(id: string): boolean {\n        return this.queued.has(id);\n    }\n\n    private clearQueuedList(): void {\n        this.queued.clear();\n    }\n\n    private async listDirectChildren(flp: FolderLevelPermission): Promise<FolderLevelPermission[]> {\n        const result = await this.identityContext.withoutAuthorization(() => {\n            return this.listFoldersUseCase.execute({\n                where: {\n                    type: flp.type,\n                    parentId: flp.id\n                }\n            });\n        });\n\n        if (result.isFail()) {\n            throw result.error;\n        }\n\n        return await Promise.all(result.value.folders.map(folder => this.getFlp(folder)));\n    }\n\n    private async getFlp({\n        id,\n        type,\n        parentId,\n        slug,\n        permissions\n    }: Folder): Promise<FolderLevelPermission> {\n        const flp = await this.flpCrud.get(id);\n\n        if (!flp) {\n            const parentFlp = parentId ? await this.flpCrud.get(parentId) : null;\n\n            return await this.flpCrud.create({\n                id,\n                type,\n                slug,\n                parentId: parentId ?? ROOT_FOLDER,\n                path: Path.create(slug, parentFlp?.path),\n                permissions: Permissions.create(permissions, parentFlp)\n            });\n        }\n\n        return flp;\n    }\n}\n"],"names":["UpdateFlpUseCase","flpCrud","listFoldersUseCase","folderModelProvider","updateEntryUseCase","identityContext","Set","Map","params","id","folder","WebinyError","flp","parentFlp","ROOT_FOLDER","Path","Permissions","directChildren","child","error","parentFlpData","currentParentFlp","children","folderModel","items","Array","slug","parentId","path","permissions","item","data","entryId","EntryId","updateResult","result","Promise","type"],"mappings":"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"}

package/features/flp/UpdateFlp/feature.d.ts

@@ -1,10 +1,5 @@
 import type { Container } from "@webiny/di";
-import type { AcoContext } from "../../../types.js";
-interface LegacyDeps {
-    context: AcoContext;
-}
 export declare const UpdateFlpFeature: {
     name: string;
-    register(container: Container, context: LegacyDeps): void;
+    register(container: Container): void;
 };
-export {};

package/features/flp/UpdateFlp/feature.js

@@ -1,10 +1,15 @@
 import { createFeature } from "@webiny/feature/api";
 import { UpdateFlpUseCase } from "./UpdateFlpUseCase.js";
 import { UpdateFlpUseCase as external_abstractions_js_UpdateFlpUseCase } from "./abstractions.js";
+import { AcoFlpCrud } from "../../folder/shared/abstractions.js";
+import { ListFoldersUseCase } from "../../folder/ListFolders/index.js";
+import { FolderModelProvider } from "../../../domain/folder/abstractions.js";
+import { UpdateEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/UpdateEntry/index.js";
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/abstractions.js";
 const UpdateFlpFeature = createFeature({
     name: "UpdateFlp",
-    register (container, deps) {
-        container.registerFactory(external_abstractions_js_UpdateFlpUseCase, ()=>new UpdateFlpUseCase(deps.context));
+    register (container) {
+        container.registerFactory(external_abstractions_js_UpdateFlpUseCase, ()=>new UpdateFlpUseCase(container.resolve(AcoFlpCrud), container.resolve(ListFoldersUseCase), container.resolve(FolderModelProvider), container.resolve(UpdateEntryUseCase), container.resolve(IdentityContext)));
     }
 });
 export { UpdateFlpFeature };

package/features/flp/UpdateFlp/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/flp/UpdateFlp/feature.js","sources":["../../../../src/features/flp/UpdateFlp/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport type { Container } from \"@webiny/di\";\nimport { UpdateFlpUseCase } from \"./UpdateFlpUseCase.js\";\nimport { UpdateFlpUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport type { AcoContext } from \"~/types.js\";\n\ninterface LegacyDeps {\n    context: AcoContext;\n}\n\nexport const UpdateFlpFeature = createFeature({\n    name: \"UpdateFlp\",\n    register(container: Container, deps: LegacyDeps) {\n        container.registerFactory(UseCaseAbstraction, () => {\n            return new UpdateFlpUseCase(deps.context);\n        });\n    }\n});\n"],"names":["UpdateFlpFeature","createFeature","container","deps","UseCaseAbstraction","UpdateFlpUseCase"],"mappings":";;;AAUO,MAAMA,mBAAmBC,cAAc;IAC1C,MAAM;IACN,UAASC,SAAoB,EAAEC,IAAgB;QAC3CD,UAAU,eAAe,CAACE,2CAAoB,IACnC,IAAIC,iBAAiBF,KAAK,OAAO;IAEhD;AACJ"}
+{"version":3,"file":"features/flp/UpdateFlp/feature.js","sources":["../../../../src/features/flp/UpdateFlp/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport type { Container } from \"@webiny/di\";\nimport { UpdateFlpUseCase } from \"./UpdateFlpUseCase.js\";\nimport { UpdateFlpUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { AcoFlpCrud } from \"~/features/folder/shared/abstractions.js\";\nimport { ListFoldersUseCase } from \"~/features/folder/ListFolders/index.js\";\nimport { FolderModelProvider } from \"~/domain/folder/abstractions.js\";\nimport { UpdateEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/UpdateEntry/index.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/abstractions.js\";\n\nexport const UpdateFlpFeature = createFeature({\n    name: \"UpdateFlp\",\n    register(container: Container) {\n        container.registerFactory(UseCaseAbstraction, () => {\n            return new UpdateFlpUseCase(\n                container.resolve(AcoFlpCrud),\n                container.resolve(ListFoldersUseCase),\n                container.resolve(FolderModelProvider),\n                container.resolve(UpdateEntryUseCase),\n                container.resolve(IdentityContext)\n            );\n        });\n    }\n});\n"],"names":["UpdateFlpFeature","createFeature","container","UseCaseAbstraction","UpdateFlpUseCase","AcoFlpCrud","ListFoldersUseCase","FolderModelProvider","UpdateEntryUseCase","IdentityContext"],"mappings":";;;;;;;;AAUO,MAAMA,mBAAmBC,cAAc;IAC1C,MAAM;IACN,UAASC,SAAoB;QACzBA,UAAU,eAAe,CAACC,2CAAoB,IACnC,IAAIC,iBACPF,UAAU,OAAO,CAACG,aAClBH,UAAU,OAAO,CAACI,qBAClBJ,UAAU,OAAO,CAACK,sBAClBL,UAAU,OAAO,CAACM,qBAClBN,UAAU,OAAO,CAACO;IAG9B;AACJ"}

package/features/folder/CreateFolder/CreateFolderRepository.d.ts

@@ -3,14 +3,14 @@ import { CreateFolderRepository as RepositoryAbstraction, type ICreateFolderRepo
 import { CreateEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/CreateEntry";
 import { ListLatestEntriesUseCase } from "@webiny/api-headless-cms/features/contentEntry/ListEntries";
 import { GetEntryByIdUseCase } from "@webiny/api-headless-cms/features/contentEntry/GetEntryById";
-import { FolderModel } from "../../../domain/folder/abstractions.js";
+import { FolderModelProvider } from "../../../domain/folder/abstractions.js";
 import type { CreateFolderParams, Folder } from "../../../folder/folder.types.js";
 declare class CreateFolderRepositoryImpl implements ICreateFolderRepository {
     private createEntry;
     private listLatestEntries;
     private getEntryById;
-    private folderModel;
-    constructor(createEntry: CreateEntryUseCase.Interface, listLatestEntries: ListLatestEntriesUseCase.Interface, getEntryById: GetEntryByIdUseCase.Interface, folderModel: FolderModel.Interface);
+    private folderModelProvider;
+    constructor(createEntry: CreateEntryUseCase.Interface, listLatestEntries: ListLatestEntriesUseCase.Interface, getEntryById: GetEntryByIdUseCase.Interface, folderModelProvider: FolderModelProvider.Interface);
     execute(data: CreateFolderParams): Promise<Result<Folder, RepositoryAbstraction.Error>>;
     private checkExistingFolder;
     private createFolderPath;

package/features/folder/CreateFolder/CreateFolderRepository.js

@@ -3,19 +3,20 @@ import { CreateFolderRepository } from "./abstractions.js";
 import { CreateEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/CreateEntry";
 import { ListLatestEntriesUseCase } from "@webiny/api-headless-cms/features/contentEntry/ListEntries";
 import { GetEntryByIdUseCase } from "@webiny/api-headless-cms/features/contentEntry/GetEntryById";
-import { FolderModel } from "../../../domain/folder/abstractions.js";
+import { FolderModelProvider } from "../../../domain/folder/abstractions.js";
 import { EntryToFolderMapper } from "../shared/EntryToFolderMapper.js";
 import { FolderPersistenceError, FolderValidationError } from "../../../domain/folder/errors.js";
 import { Path } from "../../../utils/Path.js";
 import { EntryId } from "@webiny/api-headless-cms/exports/api/cms/entry.js";
 class CreateFolderRepositoryImpl {
-    constructor(createEntry, listLatestEntries, getEntryById, folderModel){
+    constructor(createEntry, listLatestEntries, getEntryById, folderModelProvider){
         this.createEntry = createEntry;
         this.listLatestEntries = listLatestEntries;
         this.getEntryById = getEntryById;
-        this.folderModel = folderModel;
+        this.folderModelProvider = folderModelProvider;
     }
     async execute(data) {
+        const folderModel = await this.folderModelProvider.get();
         const checkResult = await this.checkExistingFolder({
             type: data.type,
             slug: data.slug,
@@ -27,7 +28,7 @@ class CreateFolderRepositoryImpl {
             parentId: data.parentId
         });
         if (pathResult.isFail()) return Result.fail(pathResult.error);
-        const result = await this.createEntry.execute(this.folderModel, {
+        const result = await this.createEntry.execute(folderModel, {
             values: {
                 ...data,
                 parentId: data.parentId || null,
@@ -42,8 +43,9 @@ class CreateFolderRepositoryImpl {
         return Result.ok(folder);
     }
     async checkExistingFolder(params) {
+        const folderModel = await this.folderModelProvider.get();
         const { type, slug, parentId, excludeId } = params;
-        const result = await this.listLatestEntries.execute(this.folderModel, {
+        const result = await this.listLatestEntries.execute(folderModel, {
             where: {
                 latest: true,
                 values: {
@@ -63,9 +65,10 @@ class CreateFolderRepositoryImpl {
         return Result.ok();
     }
     async createFolderPath(params) {
+        const folderModel = await this.folderModelProvider.get();
         const { slug, parentId } = params;
         if (!parentId) return Result.ok(Path.create(slug));
-        const parentResult = await this.getEntryById.execute(this.folderModel, EntryId.from(parentId).toString());
+        const parentResult = await this.getEntryById.execute(folderModel, EntryId.from(parentId).toString());
         if (parentResult.isFail()) return Result.fail(new FolderPersistenceError(new Error("Parent folder not found. Unable to create the folder path")));
         const parentFolder = EntryToFolderMapper.toFolder(parentResult.value);
         return Result.ok(Path.create(slug, parentFolder.path));
@@ -77,7 +80,7 @@ const CreateFolderRepository_CreateFolderRepository = CreateFolderRepository.cre
         CreateEntryUseCase,
         ListLatestEntriesUseCase,
         GetEntryByIdUseCase,
-        FolderModel
+        FolderModelProvider
     ]
 });
 export { CreateFolderRepository_CreateFolderRepository as CreateFolderRepository };

package/features/folder/CreateFolder/CreateFolderRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/folder/CreateFolder/CreateFolderRepository.js","sources":["../../../../src/features/folder/CreateFolder/CreateFolderRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport {\n    CreateFolderRepository as RepositoryAbstraction,\n    type ICreateFolderRepository\n} from \"./abstractions.js\";\nimport { CreateEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/CreateEntry\";\nimport { ListLatestEntriesUseCase } from \"@webiny/api-headless-cms/features/contentEntry/ListEntries\";\nimport { GetEntryByIdUseCase } from \"@webiny/api-headless-cms/features/contentEntry/GetEntryById\";\nimport { FolderModel } from \"~/domain/folder/abstractions.js\";\nimport type { CmsEntryFolder, CreateFolderParams, Folder } from \"~/folder/folder.types.js\";\nimport { EntryToFolderMapper } from \"../shared/EntryToFolderMapper.js\";\nimport { FolderPersistenceError, FolderValidationError } from \"~/domain/folder/errors.js\";\nimport { Path } from \"~/utils/Path.js\";\nimport { EntryId } from \"@webiny/api-headless-cms/exports/api/cms/entry.js\";\n\nclass CreateFolderRepositoryImpl implements ICreateFolderRepository {\n    constructor(\n        private createEntry: CreateEntryUseCase.Interface,\n        private listLatestEntries: ListLatestEntriesUseCase.Interface,\n        private getEntryById: GetEntryByIdUseCase.Interface,\n        private folderModel: FolderModel.Interface\n    ) {}\n\n    async execute(data: CreateFolderParams): Promise<Result<Folder, RepositoryAbstraction.Error>> {\n        // Check if folder already exists\n        const checkResult = await this.checkExistingFolder({\n            type: data.type,\n            slug: data.slug,\n            parentId: data.parentId\n        });\n\n        if (checkResult.isFail()) {\n            return Result.fail(checkResult.error);\n        }\n\n        // Create folder path\n        const pathResult = await this.createFolderPath({\n            slug: data.slug,\n            parentId: data.parentId\n        });\n\n        if (pathResult.isFail()) {\n            return Result.fail(pathResult.error);\n        }\n\n        // Create the entry\n        const result = await this.createEntry.execute<CmsEntryFolder>(this.folderModel, {\n            values: {\n                ...data,\n                parentId: data.parentId || null,\n                path: pathResult.value\n            }\n        });\n\n        if (result.isFail()) {\n            if (result.error.code === \"Cms/Entry/ValidationError\") {\n                return Result.fail(new FolderValidationError(result.error.message));\n            }\n            return Result.fail(new FolderPersistenceError(result.error));\n        }\n\n        const folder = EntryToFolderMapper.toFolder(result.value);\n        return Result.ok(folder);\n    }\n\n    private async checkExistingFolder(params: {\n        type: string;\n        slug: string;\n        parentId?: string | null;\n        excludeId?: string;\n    }): Promise<Result<void, RepositoryAbstraction.Error>> {\n        const { type, slug, parentId, excludeId } = params;\n\n        const result = await this.listLatestEntries.execute<CmsEntryFolder>(this.folderModel, {\n            where: {\n                latest: true,\n                values: {\n                    type,\n                    slug,\n                    parentId\n                },\n                ...(excludeId ? { entryId_not: excludeId } : {})\n            },\n            limit: 1\n        });\n\n        if (result.isFail()) {\n            return Result.fail(new FolderPersistenceError(result.error));\n        }\n\n        const { entries } = result.value;\n\n        if (entries.length > 0) {\n            return Result.fail(\n                new FolderValidationError(\n                    `Folder with slug \"${slug}\" already exists at this level.`\n                )\n            );\n        }\n\n        return Result.ok();\n    }\n\n    private async createFolderPath(params: {\n        slug: string;\n        parentId?: string | null;\n    }): Promise<Result<string, RepositoryAbstraction.Error>> {\n        const { slug, parentId } = params;\n\n        if (!parentId) {\n            return Result.ok(Path.create(slug));\n        }\n\n        const parentResult = await this.getEntryById.execute<CmsEntryFolder>(\n            this.folderModel,\n            EntryId.from(parentId).toString()\n        );\n\n        if (parentResult.isFail()) {\n            return Result.fail(\n                new FolderPersistenceError(\n                    new Error(\"Parent folder not found. Unable to create the folder path\")\n                )\n            );\n        }\n\n        const parentFolder = EntryToFolderMapper.toFolder(parentResult.value);\n        return Result.ok(Path.create(slug, parentFolder.path));\n    }\n}\n\nexport const CreateFolderRepository = RepositoryAbstraction.createImplementation({\n    implementation: CreateFolderRepositoryImpl,\n    dependencies: [CreateEntryUseCase, ListLatestEntriesUseCase, GetEntryByIdUseCase, FolderModel]\n});\n"],"names":["CreateFolderRepositoryImpl","createEntry","listLatestEntries","getEntryById","folderModel","data","checkResult","Result","pathResult","result","FolderValidationError","FolderPersistenceError","folder","EntryToFolderMapper","params","type","slug","parentId","excludeId","entries","Path","parentResult","EntryId","Error","parentFolder","CreateFolderRepository","RepositoryAbstraction","CreateEntryUseCase","ListLatestEntriesUseCase","GetEntryByIdUseCase","FolderModel"],"mappings":"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"}
+{"version":3,"file":"features/folder/CreateFolder/CreateFolderRepository.js","sources":["../../../../src/features/folder/CreateFolder/CreateFolderRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport {\n    CreateFolderRepository as RepositoryAbstraction,\n    type ICreateFolderRepository\n} from \"./abstractions.js\";\nimport { CreateEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/CreateEntry\";\nimport { ListLatestEntriesUseCase } from \"@webiny/api-headless-cms/features/contentEntry/ListEntries\";\nimport { GetEntryByIdUseCase } from \"@webiny/api-headless-cms/features/contentEntry/GetEntryById\";\nimport { FolderModelProvider } from \"~/domain/folder/abstractions.js\";\nimport type { CmsEntryFolder, CreateFolderParams, Folder } from \"~/folder/folder.types.js\";\nimport { EntryToFolderMapper } from \"../shared/EntryToFolderMapper.js\";\nimport { FolderPersistenceError, FolderValidationError } from \"~/domain/folder/errors.js\";\nimport { Path } from \"~/utils/Path.js\";\nimport { EntryId } from \"@webiny/api-headless-cms/exports/api/cms/entry.js\";\n\nclass CreateFolderRepositoryImpl implements ICreateFolderRepository {\n    constructor(\n        private createEntry: CreateEntryUseCase.Interface,\n        private listLatestEntries: ListLatestEntriesUseCase.Interface,\n        private getEntryById: GetEntryByIdUseCase.Interface,\n        private folderModelProvider: FolderModelProvider.Interface\n    ) {}\n\n    async execute(data: CreateFolderParams): Promise<Result<Folder, RepositoryAbstraction.Error>> {\n        const folderModel = await this.folderModelProvider.get();\n        // Check if folder already exists\n        const checkResult = await this.checkExistingFolder({\n            type: data.type,\n            slug: data.slug,\n            parentId: data.parentId\n        });\n\n        if (checkResult.isFail()) {\n            return Result.fail(checkResult.error);\n        }\n\n        // Create folder path\n        const pathResult = await this.createFolderPath({\n            slug: data.slug,\n            parentId: data.parentId\n        });\n\n        if (pathResult.isFail()) {\n            return Result.fail(pathResult.error);\n        }\n\n        // Create the entry\n        const result = await this.createEntry.execute<CmsEntryFolder>(folderModel, {\n            values: {\n                ...data,\n                parentId: data.parentId || null,\n                path: pathResult.value\n            }\n        });\n\n        if (result.isFail()) {\n            if (result.error.code === \"Cms/Entry/ValidationError\") {\n                return Result.fail(new FolderValidationError(result.error.message));\n            }\n            return Result.fail(new FolderPersistenceError(result.error));\n        }\n\n        const folder = EntryToFolderMapper.toFolder(result.value);\n        return Result.ok(folder);\n    }\n\n    private async checkExistingFolder(params: {\n        type: string;\n        slug: string;\n        parentId?: string | null;\n        excludeId?: string;\n    }): Promise<Result<void, RepositoryAbstraction.Error>> {\n        const folderModel = await this.folderModelProvider.get();\n        const { type, slug, parentId, excludeId } = params;\n\n        const result = await this.listLatestEntries.execute<CmsEntryFolder>(folderModel, {\n            where: {\n                latest: true,\n                values: {\n                    type,\n                    slug,\n                    parentId\n                },\n                ...(excludeId ? { entryId_not: excludeId } : {})\n            },\n            limit: 1\n        });\n\n        if (result.isFail()) {\n            return Result.fail(new FolderPersistenceError(result.error));\n        }\n\n        const { entries } = result.value;\n\n        if (entries.length > 0) {\n            return Result.fail(\n                new FolderValidationError(\n                    `Folder with slug \"${slug}\" already exists at this level.`\n                )\n            );\n        }\n\n        return Result.ok();\n    }\n\n    private async createFolderPath(params: {\n        slug: string;\n        parentId?: string | null;\n    }): Promise<Result<string, RepositoryAbstraction.Error>> {\n        const folderModel = await this.folderModelProvider.get();\n        const { slug, parentId } = params;\n\n        if (!parentId) {\n            return Result.ok(Path.create(slug));\n        }\n\n        const parentResult = await this.getEntryById.execute<CmsEntryFolder>(\n            folderModel,\n            EntryId.from(parentId).toString()\n        );\n\n        if (parentResult.isFail()) {\n            return Result.fail(\n                new FolderPersistenceError(\n                    new Error(\"Parent folder not found. Unable to create the folder path\")\n                )\n            );\n        }\n\n        const parentFolder = EntryToFolderMapper.toFolder(parentResult.value);\n        return Result.ok(Path.create(slug, parentFolder.path));\n    }\n}\n\nexport const CreateFolderRepository = RepositoryAbstraction.createImplementation({\n    implementation: CreateFolderRepositoryImpl,\n    dependencies: [\n        CreateEntryUseCase,\n        ListLatestEntriesUseCase,\n        GetEntryByIdUseCase,\n        FolderModelProvider\n    ]\n});\n"],"names":["CreateFolderRepositoryImpl","createEntry","listLatestEntries","getEntryById","folderModelProvider","data","folderModel","checkResult","Result","pathResult","result","FolderValidationError","FolderPersistenceError","folder","EntryToFolderMapper","params","type","slug","parentId","excludeId","entries","Path","parentResult","EntryId","Error","parentFolder","CreateFolderRepository","RepositoryAbstraction","CreateEntryUseCase","ListLatestEntriesUseCase","GetEntryByIdUseCase","FolderModelProvider"],"mappings":"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"}

package/features/folder/DeleteFolder/DeleteFolderRepository.d.ts

@@ -1,12 +1,12 @@
 import { Result } from "@webiny/feature/api";
 import { DeleteFolderRepository as RepositoryAbstraction, type IDeleteFolderRepository } from "./abstractions.js";
 import { DeleteEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/DeleteEntry";
-import { FolderModel } from "../../../domain/folder/abstractions.js";
+import { FolderModelProvider } from "../../../domain/folder/abstractions.js";
 import type { Folder } from "../../../folder/folder.types.js";
 declare class DeleteFolderRepositoryImpl implements IDeleteFolderRepository {
     private deleteEntry;
-    private folderModel;
-    constructor(deleteEntry: DeleteEntryUseCase.Interface, folderModel: FolderModel.Interface);
+    private folderModelProvider;
+    constructor(deleteEntry: DeleteEntryUseCase.Interface, folderModelProvider: FolderModelProvider.Interface);
     execute(folder: Folder): Promise<Result<void, RepositoryAbstraction.Error>>;
 }
 export declare const DeleteFolderRepository: typeof DeleteFolderRepositoryImpl & {

package/features/folder/DeleteFolder/DeleteFolderRepository.js

@@ -1,15 +1,16 @@
 import { Result } from "@webiny/feature/api";
 import { DeleteFolderRepository } from "./abstractions.js";
 import { DeleteEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/DeleteEntry";
-import { FolderModel } from "../../../domain/folder/abstractions.js";
+import { FolderModelProvider } from "../../../domain/folder/abstractions.js";
 import { FolderNotAuthorizedError, FolderPersistenceError } from "../../../domain/folder/errors.js";
 class DeleteFolderRepositoryImpl {
-    constructor(deleteEntry, folderModel){
+    constructor(deleteEntry, folderModelProvider){
         this.deleteEntry = deleteEntry;
-        this.folderModel = folderModel;
+        this.folderModelProvider = folderModelProvider;
     }
     async execute(folder) {
-        const result = await this.deleteEntry.execute(this.folderModel, folder.id, {
+        const folderModel = await this.folderModelProvider.get();
+        const result = await this.deleteEntry.execute(folderModel, folder.id, {
             permanently: true,
             force: true
         });
@@ -24,7 +25,7 @@ const DeleteFolderRepository_DeleteFolderRepository = DeleteFolderRepository.cre
     implementation: DeleteFolderRepositoryImpl,
     dependencies: [
         DeleteEntryUseCase,
-        FolderModel
+        FolderModelProvider
     ]
 });
 export { DeleteFolderRepository_DeleteFolderRepository as DeleteFolderRepository };

package/features/folder/DeleteFolder/DeleteFolderRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/folder/DeleteFolder/DeleteFolderRepository.js","sources":["../../../../src/features/folder/DeleteFolder/DeleteFolderRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport {\n    DeleteFolderRepository as RepositoryAbstraction,\n    type IDeleteFolderRepository\n} from \"./abstractions.js\";\nimport { DeleteEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/DeleteEntry\";\nimport { FolderModel } from \"~/domain/folder/abstractions.js\";\nimport type { Folder } from \"~/folder/folder.types.js\";\nimport { FolderNotAuthorizedError, FolderPersistenceError } from \"~/domain/folder/errors.js\";\n\nclass DeleteFolderRepositoryImpl implements IDeleteFolderRepository {\n    constructor(\n        private deleteEntry: DeleteEntryUseCase.Interface,\n        private folderModel: FolderModel.Interface\n    ) {}\n\n    async execute(folder: Folder): Promise<Result<void, RepositoryAbstraction.Error>> {\n        const result = await this.deleteEntry.execute(this.folderModel, folder.id, {\n            permanently: true,\n            force: true\n        });\n\n        if (result.isFail()) {\n            if (result.error.code === \"Cms/Entry/NotAuthorized\") {\n                return Result.fail(new FolderNotAuthorizedError());\n            }\n            return Result.fail(new FolderPersistenceError(result.error));\n        }\n\n        return Result.ok();\n    }\n}\n\nexport const DeleteFolderRepository = RepositoryAbstraction.createImplementation({\n    implementation: DeleteFolderRepositoryImpl,\n    dependencies: [DeleteEntryUseCase, FolderModel]\n});\n"],"names":["DeleteFolderRepositoryImpl","deleteEntry","folderModel","folder","result","Result","FolderNotAuthorizedError","FolderPersistenceError","DeleteFolderRepository","RepositoryAbstraction","DeleteEntryUseCase","FolderModel"],"mappings":";;;;;AAUA,MAAMA;IACF,YACYC,WAAyC,EACzCC,WAAkC,CAC5C;aAFUD,WAAW,GAAXA;aACAC,WAAW,GAAXA;IACT;IAEH,MAAM,QAAQC,MAAc,EAAsD;QAC9E,MAAMC,SAAS,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAED,OAAO,EAAE,EAAE;YACvE,aAAa;YACb,OAAO;QACX;QAEA,IAAIC,OAAO,MAAM,IAAI;YACjB,IAAIA,AAAsB,8BAAtBA,OAAO,KAAK,CAAC,IAAI,EACjB,OAAOC,OAAO,IAAI,CAAC,IAAIC;YAE3B,OAAOD,OAAO,IAAI,CAAC,IAAIE,uBAAuBH,OAAO,KAAK;QAC9D;QAEA,OAAOC,OAAO,EAAE;IACpB;AACJ;AAEO,MAAMG,gDAAyBC,uBAAAA,oBAA0C,CAAC;IAC7E,gBAAgBT;IAChB,cAAc;QAACU;QAAoBC;KAAY;AACnD"}
+{"version":3,"file":"features/folder/DeleteFolder/DeleteFolderRepository.js","sources":["../../../../src/features/folder/DeleteFolder/DeleteFolderRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport {\n    DeleteFolderRepository as RepositoryAbstraction,\n    type IDeleteFolderRepository\n} from \"./abstractions.js\";\nimport { DeleteEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/DeleteEntry\";\nimport { FolderModelProvider } from \"~/domain/folder/abstractions.js\";\nimport type { Folder } from \"~/folder/folder.types.js\";\nimport { FolderNotAuthorizedError, FolderPersistenceError } from \"~/domain/folder/errors.js\";\n\nclass DeleteFolderRepositoryImpl implements IDeleteFolderRepository {\n    constructor(\n        private deleteEntry: DeleteEntryUseCase.Interface,\n        private folderModelProvider: FolderModelProvider.Interface\n    ) {}\n\n    async execute(folder: Folder): Promise<Result<void, RepositoryAbstraction.Error>> {\n        const folderModel = await this.folderModelProvider.get();\n        const result = await this.deleteEntry.execute(folderModel, folder.id, {\n            permanently: true,\n            force: true\n        });\n\n        if (result.isFail()) {\n            if (result.error.code === \"Cms/Entry/NotAuthorized\") {\n                return Result.fail(new FolderNotAuthorizedError());\n            }\n            return Result.fail(new FolderPersistenceError(result.error));\n        }\n\n        return Result.ok();\n    }\n}\n\nexport const DeleteFolderRepository = RepositoryAbstraction.createImplementation({\n    implementation: DeleteFolderRepositoryImpl,\n    dependencies: [DeleteEntryUseCase, FolderModelProvider]\n});\n"],"names":["DeleteFolderRepositoryImpl","deleteEntry","folderModelProvider","folder","folderModel","result","Result","FolderNotAuthorizedError","FolderPersistenceError","DeleteFolderRepository","RepositoryAbstraction","DeleteEntryUseCase","FolderModelProvider"],"mappings":";;;;;AAUA,MAAMA;IACF,YACYC,WAAyC,EACzCC,mBAAkD,CAC5D;aAFUD,WAAW,GAAXA;aACAC,mBAAmB,GAAnBA;IACT;IAEH,MAAM,QAAQC,MAAc,EAAsD;QAC9E,MAAMC,cAAc,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG;QACtD,MAAMC,SAAS,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAACD,aAAaD,OAAO,EAAE,EAAE;YAClE,aAAa;YACb,OAAO;QACX;QAEA,IAAIE,OAAO,MAAM,IAAI;YACjB,IAAIA,AAAsB,8BAAtBA,OAAO,KAAK,CAAC,IAAI,EACjB,OAAOC,OAAO,IAAI,CAAC,IAAIC;YAE3B,OAAOD,OAAO,IAAI,CAAC,IAAIE,uBAAuBH,OAAO,KAAK;QAC9D;QAEA,OAAOC,OAAO,EAAE;IACpB;AACJ;AAEO,MAAMG,gDAAyBC,uBAAAA,oBAA0C,CAAC;IAC7E,gBAAgBV;IAChB,cAAc;QAACW;QAAoBC;KAAoB;AAC3D"}

package/features/folder/DeleteFolder/decorators/DeleteFolderWithFolderLevelPermissions.d.ts

@@ -5,7 +5,7 @@ declare class DeleteFolderWithFolderLevelPermissionsImpl implements DeleteFolder
     private folderLevelPermissions;
     private readonly decoretee;
     constructor(folderLevelPermissions: FolderLevelPermissions.Interface, decoretee: DeleteFolderUseCase.Interface);
-    execute(id: string): Promise<Result<void, never> | Result<never, import("../../../../domain/folder/errors.js").FolderNotFoundError | import("../../../../domain/folder/errors.js").FolderNotAuthorizedError | import("../../../../domain/folder/errors.js").FolderPersistenceError | import("../../../../domain/folder/errors.js").FolderNotEmptyError>>;
+    execute(id: string): Promise<Result<void, never> | Result<never, import("../../../../domain/folder/errors.js").FolderNotAuthorizedError | import("../../../../domain/folder/errors.js").FolderNotEmptyError | import("../../../../domain/folder/errors.js").FolderNotFoundError | import("../../../../domain/folder/errors.js").FolderPersistenceError>>;
 }
 export declare const DeleteFolderWithFolderLevelPermissions: typeof DeleteFolderWithFolderLevelPermissionsImpl;
 export {};

package/features/folder/EnsureFolderIsEmpty/EnsureFolderIsEmpty.d.ts

@@ -1,14 +1,12 @@
 import { FolderLevelPermissions } from "../../../features/flp/FolderLevelPermissions/index.js";
 import { ListFoldersUseCase } from "../../../features/folder/ListFolders/index.js";
 import { EnsureFolderIsEmpty as Abstraction } from "../../../features/folder/EnsureFolderIsEmpty/abstractions.js";
-import { Logger } from "@webiny/api-core/exports/api/logger.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 declare class EnsureFolderIsEmptyImpl implements Abstraction.Interface {
     private identityContext;
     private folderLevelPermissions;
     private listFoldersUseCase;
-    private logger;
-    constructor(identityContext: IdentityContext.Interface, folderLevelPermissions: FolderLevelPermissions.Interface, listFoldersUseCase: ListFoldersUseCase.Interface, logger: Logger.Interface);
+    constructor(identityContext: IdentityContext.Interface, folderLevelPermissions: FolderLevelPermissions.Interface, listFoldersUseCase: ListFoldersUseCase.Interface);
     execute(type: string, id: string, hasContentCallback: Abstraction.HasContentCallback): Abstraction.Return;
 }
 export declare const EnsureFolderIsEmpty: typeof EnsureFolderIsEmptyImpl & {

package/features/folder/EnsureFolderIsEmpty/EnsureFolderIsEmpty.js

@@ -1,16 +1,14 @@
 import { FolderLevelPermissions } from "../../flp/FolderLevelPermissions/index.js";
 import { ListFoldersUseCase } from "../ListFolders/index.js";
 import { EnsureFolderIsEmpty } from "./abstractions.js";
-import { Logger } from "@webiny/api-core/exports/api/logger.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import { FolderNotAuthorizedError, FolderNotEmptyError } from "../../../domain/folder/errors.js";
 import { Result } from "@webiny/feature/api";
 class EnsureFolderIsEmptyImpl {
-    constructor(identityContext, folderLevelPermissions, listFoldersUseCase, logger){
+    constructor(identityContext, folderLevelPermissions, listFoldersUseCase){
         this.identityContext = identityContext;
         this.folderLevelPermissions = folderLevelPermissions;
         this.listFoldersUseCase = listFoldersUseCase;
-        this.logger = logger;
     }
     async execute(type, id, hasContentCallback) {
         const hasFoldersCallback = async ()=>{
@@ -22,8 +20,8 @@ class EnsureFolderIsEmptyImpl {
                 limit: 1
             });
             if (result.isFail()) {
-                this.logger.error(result.error);
-                return false;
+                console.error(result.error.message);
+                return true;
             }
             const { folders } = result.value;
             return folders.length > 0;
@@ -53,8 +51,7 @@ const EnsureFolderIsEmpty_EnsureFolderIsEmpty = EnsureFolderIsEmpty.createImplem
     dependencies: [
         IdentityContext,
         FolderLevelPermissions,
-        ListFoldersUseCase,
-        Logger
+        ListFoldersUseCase
     ]
 });
 export { EnsureFolderIsEmpty_EnsureFolderIsEmpty as EnsureFolderIsEmpty };