@webiny/api-aco 0.0.0-unstable.a4f3e4ea8b → 0.0.0-unstable.a85ef555b2

package/features/folder/NotifyFolderChange/feature.js

@@ -0,0 +1,13 @@
+import { createFeature } from "@webiny/feature/api";
+import { NotifyFolderChangeUseCase } from "./NotifyFolderChangeUseCase.js";
+import { NotifyOnFolderDeletedHandler } from "./NotifyOnFolderDeletedHandler.js";
+const NotifyFolderChangeFeature = createFeature({
+    name: "NotifyFolderChange",
+    register (container) {
+        container.register(NotifyFolderChangeUseCase);
+        container.register(NotifyOnFolderDeletedHandler);
+    }
+});
+export { NotifyFolderChangeFeature };
+
+//# sourceMappingURL=feature.js.map

package/features/folder/NotifyFolderChange/feature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/folder/NotifyFolderChange/feature.js","sources":["../../../../src/features/folder/NotifyFolderChange/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { NotifyFolderChangeUseCase } from \"./NotifyFolderChangeUseCase.js\";\nimport { NotifyOnFolderDeletedHandler } from \"./NotifyOnFolderDeletedHandler.js\";\n\n/**\n * Tells the user's open admin tabs when a folder is created, updated or deleted. The FLP tasks send\n * created and updated (see `CreateFlpOnFolderCreated` and `UpdateFlpOnFolderUpdated`); deleted goes\n * out from here.\n */\nexport const NotifyFolderChangeFeature = createFeature({\n    name: \"NotifyFolderChange\",\n    register(container) {\n        container.register(NotifyFolderChangeUseCase);\n        container.register(NotifyOnFolderDeletedHandler);\n    }\n});\n"],"names":["NotifyFolderChangeFeature","createFeature","container","NotifyFolderChangeUseCase","NotifyOnFolderDeletedHandler"],"mappings":";;;AASO,MAAMA,4BAA4BC,cAAc;IACnD,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;QACnBD,UAAU,QAAQ,CAACE;IACvB;AACJ"}

package/features/folder/NotifyFolderChange/index.d.ts

@@ -0,0 +1,2 @@
+export { NotifyFolderChangeFeature } from "./feature.js";
+export { NotifyFolderChangeUseCase, FOLDER_CREATED_WEBSOCKET_ACTION, FOLDER_UPDATED_WEBSOCKET_ACTION, FOLDER_DELETED_WEBSOCKET_ACTION } from "./abstractions.js";

package/features/folder/NotifyFolderChange/index.js

@@ -0,0 +1,2 @@
+export { NotifyFolderChangeFeature } from "./feature.js";
+export { FOLDER_CREATED_WEBSOCKET_ACTION, FOLDER_DELETED_WEBSOCKET_ACTION, FOLDER_UPDATED_WEBSOCKET_ACTION, NotifyFolderChangeUseCase } from "./abstractions.js";

package/features/folder/UpdateFolder/UpdateFolderRepository.d.ts

@@ -3,14 +3,14 @@ import { type IUpdateFolderRepository, UpdateFolderRepository as RepositoryAbstr
 import { UpdateEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/UpdateEntry";
 import { GetEntryByIdUseCase } from "@webiny/api-headless-cms/features/contentEntry/GetEntryById";
 import { ListLatestEntriesUseCase } from "@webiny/api-headless-cms/features/contentEntry/ListEntries";
-import { FolderModel } from "../../../domain/folder/abstractions.js";
+import { FolderModelProvider } from "../../../domain/folder/abstractions.js";
 import type { Folder, UpdateFolderParams } from "../../../folder/folder.types.js";
 declare class UpdateFolderRepositoryImpl implements IUpdateFolderRepository {
     private updateEntry;
     private getEntryById;
     private listLatestEntries;
-    private folderModel;
-    constructor(updateEntry: UpdateEntryUseCase.Interface, getEntryById: GetEntryByIdUseCase.Interface, listLatestEntries: ListLatestEntriesUseCase.Interface, folderModel: FolderModel.Interface);
+    private folderModelProvider;
+    constructor(updateEntry: UpdateEntryUseCase.Interface, getEntryById: GetEntryByIdUseCase.Interface, listLatestEntries: ListLatestEntriesUseCase.Interface, folderModelProvider: FolderModelProvider.Interface);
     execute(id: string, data: UpdateFolderParams): Promise<Result<Folder, RepositoryAbstraction.Error>>;
     private checkExistingFolder;
     private createFolderPath;

package/features/folder/UpdateFolder/UpdateFolderRepository.js

@@ -3,21 +3,22 @@ import { UpdateFolderRepository } from "./abstractions.js";
 import { UpdateEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/UpdateEntry";
 import { GetEntryByIdUseCase } from "@webiny/api-headless-cms/features/contentEntry/GetEntryById";
 import { ListLatestEntriesUseCase } from "@webiny/api-headless-cms/features/contentEntry/ListEntries";
-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 UpdateFolderRepositoryImpl {
-    constructor(updateEntry, getEntryById, listLatestEntries, folderModel){
+    constructor(updateEntry, getEntryById, listLatestEntries, folderModelProvider){
         this.updateEntry = updateEntry;
         this.getEntryById = getEntryById;
         this.listLatestEntries = listLatestEntries;
-        this.folderModel = folderModel;
+        this.folderModelProvider = folderModelProvider;
     }
     async execute(id, data) {
+        const folderModel = await this.folderModelProvider.get();
         const entryId = EntryId.from(id);
-        const originalResult = await this.getEntryById.execute(this.folderModel, entryId.toString());
+        const originalResult = await this.getEntryById.execute(folderModel, entryId.toString());
         if (originalResult.isFail()) return Result.fail(new FolderPersistenceError(originalResult.error));
         const original = EntryToFolderMapper.toFolder(originalResult.value);
         const checkResult = await this.checkExistingFolder({
@@ -32,7 +33,7 @@ class UpdateFolderRepositoryImpl {
             parentId: void 0 !== data.parentId ? data.parentId : original.parentId
         });
         if (pathResult.isFail()) return Result.fail(pathResult.error);
-        const result = await this.updateEntry.execute(this.folderModel, entryId.toString(), {
+        const result = await this.updateEntry.execute(folderModel, entryId.toString(), {
             values: {
                 ...data,
                 path: pathResult.value
@@ -43,8 +44,9 @@ class UpdateFolderRepositoryImpl {
         return Result.ok(updatedFolder);
     }
     async checkExistingFolder(params) {
+        const folderModel = await this.folderModelProvider.get();
         const { id, type, slug, parentId } = params;
-        const result = await this.listLatestEntries.execute(this.folderModel, {
+        const result = await this.listLatestEntries.execute(folderModel, {
             where: {
                 latest: true,
                 entryId_not: id,
@@ -62,9 +64,10 @@ class UpdateFolderRepositoryImpl {
         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));
@@ -76,7 +79,7 @@ const UpdateFolderRepository_UpdateFolderRepository = UpdateFolderRepository.cre
         UpdateEntryUseCase,
         GetEntryByIdUseCase,
         ListLatestEntriesUseCase,
-        FolderModel
+        FolderModelProvider
     ]
 });
 export { UpdateFolderRepository_UpdateFolderRepository as UpdateFolderRepository };

package/features/folder/UpdateFolder/UpdateFolderRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/folder/UpdateFolder/UpdateFolderRepository.js","sources":["../../../../src/features/folder/UpdateFolder/UpdateFolderRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport {\n    type IUpdateFolderRepository,\n    UpdateFolderRepository as RepositoryAbstraction\n} from \"./abstractions.js\";\nimport { UpdateEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/UpdateEntry\";\nimport { GetEntryByIdUseCase } from \"@webiny/api-headless-cms/features/contentEntry/GetEntryById\";\nimport { ListLatestEntriesUseCase } from \"@webiny/api-headless-cms/features/contentEntry/ListEntries\";\nimport { FolderModel } from \"~/domain/folder/abstractions.js\";\nimport type { CmsEntryFolder, Folder, UpdateFolderParams } 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 UpdateFolderRepositoryImpl implements IUpdateFolderRepository {\n    constructor(\n        private updateEntry: UpdateEntryUseCase.Interface,\n        private getEntryById: GetEntryByIdUseCase.Interface,\n        private listLatestEntries: ListLatestEntriesUseCase.Interface,\n        private folderModel: FolderModel.Interface\n    ) {}\n\n    async execute(\n        id: string,\n        data: UpdateFolderParams\n    ): Promise<Result<Folder, RepositoryAbstraction.Error>> {\n        const entryId = EntryId.from(id);\n\n        // Get the original folder\n        const originalResult = await this.getEntryById.execute<CmsEntryFolder>(\n            this.folderModel,\n            entryId.toString()\n        );\n\n        if (originalResult.isFail()) {\n            return Result.fail(new FolderPersistenceError(originalResult.error));\n        }\n\n        const original = EntryToFolderMapper.toFolder(originalResult.value);\n\n        // Check if folder with new slug already exists\n        const checkResult = await this.checkExistingFolder({\n            id,\n            type: original.type,\n            slug: data.slug || original.slug,\n            parentId: data.parentId !== undefined ? data.parentId : original.parentId\n        });\n\n        if (checkResult.isFail()) {\n            return Result.fail(checkResult.error);\n        }\n\n        // Create new path if slug or parentId changed\n        const pathResult = await this.createFolderPath({\n            slug: data.slug || original.slug,\n            parentId: data.parentId !== undefined ? data.parentId : original.parentId\n        });\n\n        if (pathResult.isFail()) {\n            return Result.fail(pathResult.error);\n        }\n\n        const result = await this.updateEntry.execute<CmsEntryFolder>(\n            this.folderModel,\n            entryId.toString(),\n            {\n                values: {\n                    ...data,\n                    path: pathResult.value\n                }\n            }\n        );\n\n        if (result.isFail()) {\n            return Result.fail(new FolderPersistenceError(result.error));\n        }\n\n        const updatedFolder = EntryToFolderMapper.toFolder(result.value);\n        return Result.ok(updatedFolder);\n    }\n\n    private async checkExistingFolder(params: {\n        id: string;\n        type: string;\n        slug: string;\n        parentId?: string | null;\n    }): Promise<Result<void, RepositoryAbstraction.Error>> {\n        const { id, type, slug, parentId } = params;\n\n        const result = await this.listLatestEntries.execute<CmsEntryFolder>(this.folderModel, {\n            where: {\n                latest: true,\n                entryId_not: id,\n                values: {\n                    type,\n                    slug,\n                    parentId\n                }\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 UpdateFolderRepository = RepositoryAbstraction.createImplementation({\n    implementation: UpdateFolderRepositoryImpl,\n    dependencies: [UpdateEntryUseCase, GetEntryByIdUseCase, ListLatestEntriesUseCase, FolderModel]\n});\n"],"names":["UpdateFolderRepositoryImpl","updateEntry","getEntryById","listLatestEntries","folderModel","id","data","entryId","EntryId","originalResult","Result","FolderPersistenceError","original","EntryToFolderMapper","checkResult","undefined","pathResult","result","updatedFolder","params","type","slug","parentId","entries","FolderValidationError","Path","parentResult","Error","parentFolder","UpdateFolderRepository","RepositoryAbstraction","UpdateEntryUseCase","GetEntryByIdUseCase","ListLatestEntriesUseCase","FolderModel"],"mappings":"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"}
+{"version":3,"file":"features/folder/UpdateFolder/UpdateFolderRepository.js","sources":["../../../../src/features/folder/UpdateFolder/UpdateFolderRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport {\n    type IUpdateFolderRepository,\n    UpdateFolderRepository as RepositoryAbstraction\n} from \"./abstractions.js\";\nimport { UpdateEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/UpdateEntry\";\nimport { GetEntryByIdUseCase } from \"@webiny/api-headless-cms/features/contentEntry/GetEntryById\";\nimport { ListLatestEntriesUseCase } from \"@webiny/api-headless-cms/features/contentEntry/ListEntries\";\nimport { FolderModelProvider } from \"~/domain/folder/abstractions.js\";\nimport type { CmsEntryFolder, Folder, UpdateFolderParams } 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 UpdateFolderRepositoryImpl implements IUpdateFolderRepository {\n    constructor(\n        private updateEntry: UpdateEntryUseCase.Interface,\n        private getEntryById: GetEntryByIdUseCase.Interface,\n        private listLatestEntries: ListLatestEntriesUseCase.Interface,\n        private folderModelProvider: FolderModelProvider.Interface\n    ) {}\n\n    async execute(\n        id: string,\n        data: UpdateFolderParams\n    ): Promise<Result<Folder, RepositoryAbstraction.Error>> {\n        const folderModel = await this.folderModelProvider.get();\n        const entryId = EntryId.from(id);\n\n        // Get the original folder\n        const originalResult = await this.getEntryById.execute<CmsEntryFolder>(\n            folderModel,\n            entryId.toString()\n        );\n\n        if (originalResult.isFail()) {\n            return Result.fail(new FolderPersistenceError(originalResult.error));\n        }\n\n        const original = EntryToFolderMapper.toFolder(originalResult.value);\n\n        // Check if folder with new slug already exists\n        const checkResult = await this.checkExistingFolder({\n            id,\n            type: original.type,\n            slug: data.slug || original.slug,\n            parentId: data.parentId !== undefined ? data.parentId : original.parentId\n        });\n\n        if (checkResult.isFail()) {\n            return Result.fail(checkResult.error);\n        }\n\n        // Create new path if slug or parentId changed\n        const pathResult = await this.createFolderPath({\n            slug: data.slug || original.slug,\n            parentId: data.parentId !== undefined ? data.parentId : original.parentId\n        });\n\n        if (pathResult.isFail()) {\n            return Result.fail(pathResult.error);\n        }\n\n        const result = await this.updateEntry.execute<CmsEntryFolder>(\n            folderModel,\n            entryId.toString(),\n            {\n                values: {\n                    ...data,\n                    path: pathResult.value\n                }\n            }\n        );\n\n        if (result.isFail()) {\n            return Result.fail(new FolderPersistenceError(result.error));\n        }\n\n        const updatedFolder = EntryToFolderMapper.toFolder(result.value);\n        return Result.ok(updatedFolder);\n    }\n\n    private async checkExistingFolder(params: {\n        id: string;\n        type: string;\n        slug: string;\n        parentId?: string | null;\n    }): Promise<Result<void, RepositoryAbstraction.Error>> {\n        const folderModel = await this.folderModelProvider.get();\n        const { id, type, slug, parentId } = params;\n\n        const result = await this.listLatestEntries.execute<CmsEntryFolder>(folderModel, {\n            where: {\n                latest: true,\n                entryId_not: id,\n                values: {\n                    type,\n                    slug,\n                    parentId\n                }\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 UpdateFolderRepository = RepositoryAbstraction.createImplementation({\n    implementation: UpdateFolderRepositoryImpl,\n    dependencies: [\n        UpdateEntryUseCase,\n        GetEntryByIdUseCase,\n        ListLatestEntriesUseCase,\n        FolderModelProvider\n    ]\n});\n"],"names":["UpdateFolderRepositoryImpl","updateEntry","getEntryById","listLatestEntries","folderModelProvider","id","data","folderModel","entryId","EntryId","originalResult","Result","FolderPersistenceError","original","EntryToFolderMapper","checkResult","undefined","pathResult","result","updatedFolder","params","type","slug","parentId","entries","FolderValidationError","Path","parentResult","Error","parentFolder","UpdateFolderRepository","RepositoryAbstraction","UpdateEntryUseCase","GetEntryByIdUseCase","ListLatestEntriesUseCase","FolderModelProvider"],"mappings":"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"}

package/features/folder/UpdateFolder/decorators/UpdateFolderWithFolderLevelPermissions.d.ts

@@ -2,12 +2,25 @@ import type { UpdateFolderParams } from "../../../../folder/folder.types.js";
 import { FolderLevelPermissions } from "../../../../features/flp/FolderLevelPermissions/index.js";
 import { UpdateFolderUseCase } from "../abstractions.js";
 import { GetFolderUseCase } from "../../../../features/folder/GetFolder/index.js";
+import { CodeFlpsProvider } from "../../../../features/flp/shared/index.js";
 declare class UpdateFolderWithFolderLevelPermissionsImpl implements UpdateFolderUseCase.Interface {
     private getFolder;
     private folderLevelPermissions;
     private readonly decoretee;
-    constructor(getFolder: GetFolderUseCase.Interface, folderLevelPermissions: FolderLevelPermissions.Interface, decoretee: UpdateFolderUseCase.Interface);
+    private readonly codeFlpsProvider?;
+    constructor(getFolder: GetFolderUseCase.Interface, folderLevelPermissions: FolderLevelPermissions.Interface, codeFlpsProvider: CodeFlpsProvider.Interface | undefined, decoretee: UpdateFolderUseCase.Interface);
     execute(id: string, params: UpdateFolderParams): UpdateFolderUseCase.Return;
+    /**
+     * The type and path the folder will have after this update, computed the same way
+     * `UpdateFolderRepository` computes them: the submitted slug and parent, falling back to the
+     * current ones.
+     */
+    private getTargetFolder;
+    /**
+     * Code-defined permissions are resolved from the folder's own type and path rather than the FLP
+     * catalog, so they apply even when the stored record is missing or not yet written.
+     */
+    private withCodePermissions;
 }
 export declare const UpdateFolderWithFolderLevelPermissions: typeof UpdateFolderWithFolderLevelPermissionsImpl;
 export {};

package/features/folder/UpdateFolder/decorators/UpdateFolderWithFolderLevelPermissions.js

@@ -3,10 +3,13 @@ import { FolderLevelPermissions } from "../../../flp/FolderLevelPermissions/inde
 import { UpdateFolderUseCase } from "../abstractions.js";
 import { GetFolderUseCase } from "../../GetFolder/index.js";
 import { FolderCannotMoveToNewParent, FolderValidationError } from "../../../../domain/folder/errors.js";
+import { CodeFlpMerger, CodeFlpsProvider } from "../../../flp/shared/index.js";
+import { Path } from "../../../../utils/Path.js";
 class UpdateFolderWithFolderLevelPermissionsImpl {
-    constructor(getFolder, folderLevelPermissions, decoretee){
+    constructor(getFolder, folderLevelPermissions, codeFlpsProvider, decoretee){
         this.getFolder = getFolder;
         this.folderLevelPermissions = folderLevelPermissions;
+        this.codeFlpsProvider = codeFlpsProvider;
         this.decoretee = decoretee;
     }
     async execute(id, params) {
@@ -18,7 +21,9 @@ class UpdateFolderWithFolderLevelPermissionsImpl {
             permissions: originalPermissions,
             rwd: "w"
         });
-        const permissions = await this.folderLevelPermissions.getDefaultPermissions(params.permissions ?? []);
+        const targetFolder = await this.getTargetFolder(original, params);
+        const submittedPermissions = await this.withCodePermissions(targetFolder, params.permissions ?? []);
+        const permissions = await this.folderLevelPermissions.getDefaultPermissions(submittedPermissions);
         const stillHasAccess = await this.folderLevelPermissions.canAccessFolder({
             permissions,
             rwd: "w"
@@ -28,6 +33,7 @@ class UpdateFolderWithFolderLevelPermissionsImpl {
             const targetIsValid = permission.target.startsWith("admin:") || permission.target.startsWith("team:");
             if (!targetIsValid) return Result.fail(new FolderValidationError(`Permission target "${permission.target}" is not valid.`));
             if (permission.inheritedFrom) return Result.fail(new FolderValidationError('Permission "inheritedFrom" cannot be set manually.'));
+            if (permission.plugin) return Result.fail(new FolderValidationError('Permission "plugin" cannot be set manually. Code-defined permissions are managed via an "FlpFactory".'));
         }
         if (params.parentId && params.parentId !== original.parentId) {
             const parentPermissions = await this.folderLevelPermissions.getFolderLevelPermissions(params.parentId);
@@ -39,18 +45,60 @@ class UpdateFolderWithFolderLevelPermissionsImpl {
         }
         const result = await this.decoretee.execute(id, params);
         if (result.isFail()) return Result.fail(result.error);
+        const updatedPermissions = await this.withCodePermissions(result.value, params.permissions ?? []);
+        const updatedPermissionsWithDefaults = await this.folderLevelPermissions.getDefaultPermissions(updatedPermissions);
         return Result.ok({
             ...result.value,
-            permissions
+            permissions: updatedPermissionsWithDefaults
         });
     }
+    async getTargetFolder(original, params) {
+        const slug = params.slug || original.slug;
+        const parentId = void 0 !== params.parentId ? params.parentId : original.parentId;
+        if (parentId === original.parentId) {
+            const parentPath = original.path.slice(0, -(original.slug.length + 1));
+            const path = Path.create(slug, parentPath);
+            return {
+                type: original.type,
+                path
+            };
+        }
+        if (!parentId) {
+            const path = Path.create(slug);
+            return {
+                type: original.type,
+                path
+            };
+        }
+        const parentResult = await this.getFolder.execute(parentId);
+        if (parentResult.isFail()) return original;
+        const path = Path.create(slug, parentResult.value.path);
+        return {
+            type: original.type,
+            path
+        };
+    }
+    async withCodePermissions(folder, permissions) {
+        if (!this.codeFlpsProvider) return permissions;
+        const codePermissions = await this.codeFlpsProvider.getPermissions({
+            type: folder.type,
+            path: folder.path
+        });
+        return CodeFlpMerger.mergePermissions(permissions, codePermissions);
+    }
 }
 const UpdateFolderWithFolderLevelPermissions = createDecorator({
     abstraction: UpdateFolderUseCase,
     decorator: UpdateFolderWithFolderLevelPermissionsImpl,
     dependencies: [
         GetFolderUseCase,
-        FolderLevelPermissions
+        FolderLevelPermissions,
+        [
+            CodeFlpsProvider,
+            {
+                optional: true
+            }
+        ]
     ]
 });
 export { UpdateFolderWithFolderLevelPermissions };

package/features/folder/UpdateFolder/decorators/UpdateFolderWithFolderLevelPermissions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/folder/UpdateFolder/decorators/UpdateFolderWithFolderLevelPermissions.js","sources":["../../../../../src/features/folder/UpdateFolder/decorators/UpdateFolderWithFolderLevelPermissions.ts"],"sourcesContent":["import { createDecorator, Result } from \"@webiny/feature/api\";\nimport type { UpdateFolderParams } from \"~/folder/folder.types.js\";\nimport { FolderLevelPermissions } from \"~/features/flp/FolderLevelPermissions/index.js\";\nimport { UpdateFolderUseCase } from \"../abstractions.js\";\nimport { GetFolderUseCase } from \"~/features/folder/GetFolder/index.js\";\nimport { FolderCannotMoveToNewParent, FolderValidationError } from \"~/domain/folder/errors.js\";\n\nclass UpdateFolderWithFolderLevelPermissionsImpl implements UpdateFolderUseCase.Interface {\n    private folderLevelPermissions: FolderLevelPermissions.Interface;\n    private readonly decoretee: UpdateFolderUseCase.Interface;\n\n    constructor(\n        private getFolder: GetFolderUseCase.Interface,\n        folderLevelPermissions: FolderLevelPermissions.Interface,\n        decoretee: UpdateFolderUseCase.Interface\n    ) {\n        this.folderLevelPermissions = folderLevelPermissions;\n        this.decoretee = decoretee;\n    }\n\n    async execute(id: string, params: UpdateFolderParams): UpdateFolderUseCase.Return {\n        const originalResult = await this.getFolder.execute(id);\n\n        if (originalResult.isFail()) {\n            return Result.fail(originalResult.error);\n        }\n\n        const original = originalResult.value;\n\n        const originalPermissions = await this.folderLevelPermissions.getFolderLevelPermissions(id);\n\n        // Let's ensure current identity's permission allows the update operation.\n        await this.folderLevelPermissions.ensureCanAccessFolder({\n            permissions: originalPermissions,\n            rwd: \"w\"\n        });\n\n        const permissions = await this.folderLevelPermissions.getDefaultPermissions(\n            params.permissions ?? []\n        );\n\n        // Check if the user still has access to the folder with the provided permissions.\n        const stillHasAccess = await this.folderLevelPermissions.canAccessFolder({\n            permissions,\n            rwd: \"w\"\n        });\n\n        if (!stillHasAccess) {\n            return Result.fail(\n                new FolderValidationError(\n                    `Cannot continue because you would loose access to this folder.`\n                )\n            );\n        }\n\n        // Validate data.\n        if (Array.isArray(params.permissions)) {\n            for (const permission of params.permissions) {\n                const targetIsValid =\n                    permission.target.startsWith(\"admin:\") || permission.target.startsWith(\"team:\");\n                if (!targetIsValid) {\n                    return Result.fail(\n                        new FolderValidationError(\n                            `Permission target \"${permission.target}\" is not valid.`\n                        )\n                    );\n                }\n\n                if (permission.inheritedFrom) {\n                    return Result.fail(\n                        new FolderValidationError(\n                            `Permission \"inheritedFrom\" cannot be set manually.`\n                        )\n                    );\n                }\n            }\n        }\n\n        // Parent change is not allowed if the user doesn't have access to the new parent.\n        if (params.parentId && params.parentId !== original.parentId) {\n            // Getting the parent folder permissions will throw an error if the user doesn't have access.\n            const parentPermissions = await this.folderLevelPermissions.getFolderLevelPermissions(\n                params.parentId\n            );\n\n            const canAccessFolder = await this.folderLevelPermissions.canAccessFolder({\n                permissions: parentPermissions,\n                rwd: \"w\"\n            });\n\n            if (!canAccessFolder) {\n                return Result.fail(new FolderCannotMoveToNewParent());\n            }\n        }\n\n        const result = await this.decoretee.execute(id, params);\n\n        if (result.isFail()) {\n            return Result.fail(result.error);\n        }\n\n        return Result.ok({\n            ...result.value,\n            permissions\n        });\n    }\n}\n\nexport const UpdateFolderWithFolderLevelPermissions = createDecorator({\n    abstraction: UpdateFolderUseCase,\n    decorator: UpdateFolderWithFolderLevelPermissionsImpl,\n    dependencies: [GetFolderUseCase, FolderLevelPermissions]\n});\n"],"names":["UpdateFolderWithFolderLevelPermissionsImpl","getFolder","folderLevelPermissions","decoretee","id","params","originalResult","Result","original","originalPermissions","permissions","stillHasAccess","FolderValidationError","Array","permission","targetIsValid","parentPermissions","canAccessFolder","FolderCannotMoveToNewParent","result","UpdateFolderWithFolderLevelPermissions","createDecorator","UpdateFolderUseCase","GetFolderUseCase","FolderLevelPermissions"],"mappings":";;;;;AAOA,MAAMA;IAIF,YACYC,SAAqC,EAC7CC,sBAAwD,EACxDC,SAAwC,CAC1C;aAHUF,SAAS,GAATA;QAIR,IAAI,CAAC,sBAAsB,GAAGC;QAC9B,IAAI,CAAC,SAAS,GAAGC;IACrB;IAEA,MAAM,QAAQC,EAAU,EAAEC,MAA0B,EAA8B;QAC9E,MAAMC,iBAAiB,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAACF;QAEpD,IAAIE,eAAe,MAAM,IACrB,OAAOC,OAAO,IAAI,CAACD,eAAe,KAAK;QAG3C,MAAME,WAAWF,eAAe,KAAK;QAErC,MAAMG,sBAAsB,MAAM,IAAI,CAAC,sBAAsB,CAAC,yBAAyB,CAACL;QAGxF,MAAM,IAAI,CAAC,sBAAsB,CAAC,qBAAqB,CAAC;YACpD,aAAaK;YACb,KAAK;QACT;QAEA,MAAMC,cAAc,MAAM,IAAI,CAAC,sBAAsB,CAAC,qBAAqB,CACvEL,OAAO,WAAW,IAAI,EAAE;QAI5B,MAAMM,iBAAiB,MAAM,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAAC;YACrED;YACA,KAAK;QACT;QAEA,IAAI,CAACC,gBACD,OAAOJ,OAAO,IAAI,CACd,IAAIK,sBACA;QAMZ,IAAIC,MAAM,OAAO,CAACR,OAAO,WAAW,GAChC,KAAK,MAAMS,cAAcT,OAAO,WAAW,CAAE;YACzC,MAAMU,gBACFD,WAAW,MAAM,CAAC,UAAU,CAAC,aAAaA,WAAW,MAAM,CAAC,UAAU,CAAC;YAC3E,IAAI,CAACC,eACD,OAAOR,OAAO,IAAI,CACd,IAAIK,sBACA,CAAC,mBAAmB,EAAEE,WAAW,MAAM,CAAC,eAAe,CAAC;YAKpE,IAAIA,WAAW,aAAa,EACxB,OAAOP,OAAO,IAAI,CACd,IAAIK,sBACA;QAIhB;QAIJ,IAAIP,OAAO,QAAQ,IAAIA,OAAO,QAAQ,KAAKG,SAAS,QAAQ,EAAE;YAE1D,MAAMQ,oBAAoB,MAAM,IAAI,CAAC,sBAAsB,CAAC,yBAAyB,CACjFX,OAAO,QAAQ;YAGnB,MAAMY,kBAAkB,MAAM,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAAC;gBACtE,aAAaD;gBACb,KAAK;YACT;YAEA,IAAI,CAACC,iBACD,OAAOV,OAAO,IAAI,CAAC,IAAIW;QAE/B;QAEA,MAAMC,SAAS,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAACf,IAAIC;QAEhD,IAAIc,OAAO,MAAM,IACb,OAAOZ,OAAO,IAAI,CAACY,OAAO,KAAK;QAGnC,OAAOZ,OAAO,EAAE,CAAC;YACb,GAAGY,OAAO,KAAK;YACfT;QACJ;IACJ;AACJ;AAEO,MAAMU,yCAAyCC,gBAAgB;IAClE,aAAaC;IACb,WAAWtB;IACX,cAAc;QAACuB;QAAkBC;KAAuB;AAC5D"}
+{"version":3,"file":"features/folder/UpdateFolder/decorators/UpdateFolderWithFolderLevelPermissions.js","sources":["../../../../../src/features/folder/UpdateFolder/decorators/UpdateFolderWithFolderLevelPermissions.ts"],"sourcesContent":["import { createDecorator, Result } from \"@webiny/feature/api\";\nimport type { Folder } from \"~/folder/folder.types.js\";\nimport type { UpdateFolderParams } from \"~/folder/folder.types.js\";\nimport type { FolderPermission } from \"~/flp/flp.types.js\";\nimport { FolderLevelPermissions } from \"~/features/flp/FolderLevelPermissions/index.js\";\nimport { UpdateFolderUseCase } from \"../abstractions.js\";\nimport { GetFolderUseCase } from \"~/features/folder/GetFolder/index.js\";\nimport { FolderCannotMoveToNewParent, FolderValidationError } from \"~/domain/folder/errors.js\";\nimport { CodeFlpMerger } from \"~/features/flp/shared/index.js\";\nimport { CodeFlpsProvider } from \"~/features/flp/shared/index.js\";\nimport { Path } from \"~/utils/Path.js\";\n\nclass UpdateFolderWithFolderLevelPermissionsImpl implements UpdateFolderUseCase.Interface {\n    private folderLevelPermissions: FolderLevelPermissions.Interface;\n    private readonly decoretee: UpdateFolderUseCase.Interface;\n    private readonly codeFlpsProvider?: CodeFlpsProvider.Interface;\n\n    constructor(\n        private getFolder: GetFolderUseCase.Interface,\n        folderLevelPermissions: FolderLevelPermissions.Interface,\n        codeFlpsProvider: CodeFlpsProvider.Interface | undefined,\n        decoretee: UpdateFolderUseCase.Interface\n    ) {\n        this.folderLevelPermissions = folderLevelPermissions;\n        this.codeFlpsProvider = codeFlpsProvider;\n        this.decoretee = decoretee;\n    }\n\n    async execute(id: string, params: UpdateFolderParams): UpdateFolderUseCase.Return {\n        const originalResult = await this.getFolder.execute(id);\n\n        if (originalResult.isFail()) {\n            return Result.fail(originalResult.error);\n        }\n\n        const original = originalResult.value;\n\n        const originalPermissions = await this.folderLevelPermissions.getFolderLevelPermissions(id);\n\n        // Let's ensure current identity's permission allows the update operation.\n        await this.folderLevelPermissions.ensureCanAccessFolder({\n            permissions: originalPermissions,\n            rwd: \"w\"\n        });\n\n        // The guard below asks whether the user keeps access once the update is saved. A new slug or\n        // a new parent changes the path, and code-defined rules match on the path, so resolve them\n        // against where the folder is going rather than where it is now.\n        const targetFolder = await this.getTargetFolder(original, params);\n\n        const submittedPermissions = await this.withCodePermissions(\n            targetFolder,\n            params.permissions ?? []\n        );\n\n        const permissions =\n            await this.folderLevelPermissions.getDefaultPermissions(submittedPermissions);\n\n        // Check if the user still has access to the folder with the provided permissions.\n        const stillHasAccess = await this.folderLevelPermissions.canAccessFolder({\n            permissions,\n            rwd: \"w\"\n        });\n\n        if (!stillHasAccess) {\n            return Result.fail(\n                new FolderValidationError(\n                    `Cannot continue because you would loose access to this folder.`\n                )\n            );\n        }\n\n        // Validate data.\n        if (Array.isArray(params.permissions)) {\n            for (const permission of params.permissions) {\n                const targetIsValid =\n                    permission.target.startsWith(\"admin:\") || permission.target.startsWith(\"team:\");\n                if (!targetIsValid) {\n                    return Result.fail(\n                        new FolderValidationError(\n                            `Permission target \"${permission.target}\" is not valid.`\n                        )\n                    );\n                }\n\n                if (permission.inheritedFrom) {\n                    return Result.fail(\n                        new FolderValidationError(\n                            `Permission \"inheritedFrom\" cannot be set manually.`\n                        )\n                    );\n                }\n\n                if (permission.plugin) {\n                    return Result.fail(\n                        new FolderValidationError(\n                            `Permission \"plugin\" cannot be set manually. Code-defined permissions are managed via an \"FlpFactory\".`\n                        )\n                    );\n                }\n            }\n        }\n\n        // Parent change is not allowed if the user doesn't have access to the new parent.\n        if (params.parentId && params.parentId !== original.parentId) {\n            // Getting the parent folder permissions will throw an error if the user doesn't have access.\n            const parentPermissions = await this.folderLevelPermissions.getFolderLevelPermissions(\n                params.parentId\n            );\n\n            const canAccessFolder = await this.folderLevelPermissions.canAccessFolder({\n                permissions: parentPermissions,\n                rwd: \"w\"\n            });\n\n            if (!canAccessFolder) {\n                return Result.fail(new FolderCannotMoveToNewParent());\n            }\n        }\n\n        const result = await this.decoretee.execute(id, params);\n\n        if (result.isFail()) {\n            return Result.fail(result.error);\n        }\n\n        // Resolved again against the updated folder: a rename or a move changes the path, and with\n        // it which code-defined rules apply.\n        const updatedPermissions = await this.withCodePermissions(\n            result.value,\n            params.permissions ?? []\n        );\n\n        const updatedPermissionsWithDefaults =\n            await this.folderLevelPermissions.getDefaultPermissions(updatedPermissions);\n\n        return Result.ok({\n            ...result.value,\n            permissions: updatedPermissionsWithDefaults\n        });\n    }\n\n    /**\n     * The type and path the folder will have after this update, computed the same way\n     * `UpdateFolderRepository` computes them: the submitted slug and parent, falling back to the\n     * current ones.\n     */\n    private async getTargetFolder(\n        original: Folder,\n        params: UpdateFolderParams\n    ): Promise<Pick<Folder, \"type\" | \"path\">> {\n        const slug = params.slug || original.slug;\n        const parentId = params.parentId !== undefined ? params.parentId : original.parentId;\n\n        // Same parent: only the last segment of the path can change, so it is derived from the\n        // current path. This avoids reading the parent, which the user may not have access to.\n        if (parentId === original.parentId) {\n            const parentPath = original.path.slice(0, -(original.slug.length + 1));\n            const path = Path.create(slug, parentPath);\n\n            return { type: original.type, path };\n        }\n\n        if (!parentId) {\n            const path = Path.create(slug);\n\n            return { type: original.type, path };\n        }\n\n        // A move. If the destination cannot be read, keep the current path: the parent check further\n        // down rejects the move with its own error.\n        const parentResult = await this.getFolder.execute(parentId);\n        if (parentResult.isFail()) {\n            return original;\n        }\n\n        const path = Path.create(slug, parentResult.value.path);\n\n        return { type: original.type, path };\n    }\n\n    /**\n     * Code-defined permissions are resolved from the folder's own type and path rather than the FLP\n     * catalog, so they apply even when the stored record is missing or not yet written.\n     */\n    private async withCodePermissions(\n        folder: Pick<Folder, \"type\" | \"path\">,\n        permissions: FolderPermission[]\n    ): Promise<FolderPermission[]> {\n        if (!this.codeFlpsProvider) {\n            return permissions;\n        }\n\n        const codePermissions = await this.codeFlpsProvider.getPermissions({\n            type: folder.type,\n            path: folder.path\n        });\n\n        return CodeFlpMerger.mergePermissions(permissions, codePermissions);\n    }\n}\n\nexport const UpdateFolderWithFolderLevelPermissions = createDecorator({\n    abstraction: UpdateFolderUseCase,\n    decorator: UpdateFolderWithFolderLevelPermissionsImpl,\n    // `CodeFlpsProvider` is optional: `CodeFlpsFeature` does not register it unless the project has\n    // the folder-level permissions entitlement.\n    dependencies: [GetFolderUseCase, FolderLevelPermissions, [CodeFlpsProvider, { optional: true }]]\n});\n"],"names":["UpdateFolderWithFolderLevelPermissionsImpl","getFolder","folderLevelPermissions","codeFlpsProvider","decoretee","id","params","originalResult","Result","original","originalPermissions","targetFolder","submittedPermissions","permissions","stillHasAccess","FolderValidationError","Array","permission","targetIsValid","parentPermissions","canAccessFolder","FolderCannotMoveToNewParent","result","updatedPermissions","updatedPermissionsWithDefaults","slug","parentId","undefined","parentPath","path","Path","parentResult","folder","codePermissions","CodeFlpMerger","UpdateFolderWithFolderLevelPermissions","createDecorator","UpdateFolderUseCase","GetFolderUseCase","FolderLevelPermissions","CodeFlpsProvider"],"mappings":"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"}

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

@@ -1,4 +1,6 @@
 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 {
@@ -8,3 +10,11 @@ export declare const FlpStorageOperations: import("@webiny/di").Abstraction<impo
 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,6 +1,8 @@
 import { createAbstraction } from "@webiny/feature/api";
 const FilterStorageOperations = createAbstraction("FilterStorageOperations");
 const FlpStorageOperations = createAbstraction("FlpStorageOperations");
-export { FilterStorageOperations, 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\nexport const FlpStorageOperations =\n    createAbstraction<IAcoStorageOperations[\"flp\"]>(\"FlpStorageOperations\");\n\nexport namespace FlpStorageOperations {\n    export type Interface = IAcoStorageOperations[\"flp\"];\n}\n"],"names":["FilterStorageOperations","createAbstraction","FlpStorageOperations"],"mappings":";AAIO,MAAMA,0BACTC,kBAAmD;AAMhD,MAAMC,uBACTD,kBAAgD"}
+{"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.model.js

@@ -5,7 +5,8 @@ class FilterPrivateModelImpl {
         return [
             builder.private({
                 modelId: FILTER_MODEL_ID,
-                name: "ACO - Filter"
+                name: "ACO - Filter",
+                lifecycleEvents: false
             }).fields((fields)=>({
                     name: fields.text().label("Name").required(),
                     description: fields.text().label("Description"),

package/filter/filter.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter/filter.model.js","sources":["../../src/filter/filter.model.ts"],"sourcesContent":["import { ModelFactory } from \"@webiny/api-headless-cms/features/modelBuilder/index.js\";\n\nexport const FILTER_MODEL_ID = process.env.WEBINY_API_LEGACY_MODELS ? \"acoFilter\" : \"wbyAcoFilter\";\n\nclass FilterPrivateModelImpl implements ModelFactory.Interface {\n    public async execute(builder: ModelFactory.Builder) {\n        return [\n            builder\n                .private({\n                    modelId: FILTER_MODEL_ID,\n                    name: \"ACO - Filter\"\n                })\n                .fields(fields => ({\n                    name: fields.text().label(\"Name\").required(),\n                    description: fields.text().label(\"Description\"),\n                    namespace: fields.text().label(\"Model Id\").required(),\n                    operation: fields\n                        .text()\n                        .label(\"Operation\")\n                        .required()\n                        .predefinedValues([\n                            {\n                                label: \"AND\",\n                                value: \"AND\"\n                            },\n                            {\n                                label: \"OR\",\n                                value: \"OR\"\n                            }\n                        ]),\n                    groups: fields\n                        .object()\n                        .label(\"Groups\")\n                        .list()\n                        .listMinLength(1, \"At least one group is required.\")\n                        .fields(fields => ({\n                            operation: fields\n                                .text()\n                                .label(\"Operation\")\n                                .required()\n                                .predefinedValues([\n                                    {\n                                        label: \"AND\",\n                                        value: \"AND\"\n                                    },\n                                    {\n                                        label: \"OR\",\n                                        value: \"OR\"\n                                    }\n                                ]),\n                            filters: fields\n                                .object()\n                                .label(\"Filters\")\n                                .list()\n                                .listMinLength(1, \"At least one filter is required.\")\n                                .fields(filterFields => ({\n                                    field: filterFields.text().label(\"Field\").required(),\n                                    condition: filterFields.text().label(\"Condition\").required(),\n                                    value: filterFields.text().label(\"Value\").required()\n                                }))\n                        }))\n                }))\n        ];\n    }\n}\n\nexport const FilterPrivateModel = ModelFactory.createImplementation({\n    implementation: FilterPrivateModelImpl,\n    dependencies: []\n});\n"],"names":["FILTER_MODEL_ID","process","FilterPrivateModelImpl","builder","fields","filterFields","FilterPrivateModel","ModelFactory"],"mappings":";AAEO,MAAMA,kBAAkBC,QAAQ,GAAG,CAAC,wBAAwB,GAAG,cAAc;AAEpF,MAAMC;IACF,MAAa,QAAQC,OAA6B,EAAE;QAChD,OAAO;YACHA,QACK,OAAO,CAAC;gBACL,SAASH;gBACT,MAAM;YACV,GACC,MAAM,CAACI,CAAAA,SAAW;oBACf,MAAMA,OAAO,IAAI,GAAG,KAAK,CAAC,QAAQ,QAAQ;oBAC1C,aAAaA,OAAO,IAAI,GAAG,KAAK,CAAC;oBACjC,WAAWA,OAAO,IAAI,GAAG,KAAK,CAAC,YAAY,QAAQ;oBACnD,WAAWA,OACN,IAAI,GACJ,KAAK,CAAC,aACN,QAAQ,GACR,gBAAgB,CAAC;wBACd;4BACI,OAAO;4BACP,OAAO;wBACX;wBACA;4BACI,OAAO;4BACP,OAAO;wBACX;qBACH;oBACL,QAAQA,OACH,MAAM,GACN,KAAK,CAAC,UACN,IAAI,GACJ,aAAa,CAAC,GAAG,mCACjB,MAAM,CAACA,CAAAA,SAAW;4BACf,WAAWA,OACN,IAAI,GACJ,KAAK,CAAC,aACN,QAAQ,GACR,gBAAgB,CAAC;gCACd;oCACI,OAAO;oCACP,OAAO;gCACX;gCACA;oCACI,OAAO;oCACP,OAAO;gCACX;6BACH;4BACL,SAASA,OACJ,MAAM,GACN,KAAK,CAAC,WACN,IAAI,GACJ,aAAa,CAAC,GAAG,oCACjB,MAAM,CAACC,CAAAA,eAAiB;oCACrB,OAAOA,aAAa,IAAI,GAAG,KAAK,CAAC,SAAS,QAAQ;oCAClD,WAAWA,aAAa,IAAI,GAAG,KAAK,CAAC,aAAa,QAAQ;oCAC1D,OAAOA,aAAa,IAAI,GAAG,KAAK,CAAC,SAAS,QAAQ;gCACtD;wBACR;gBACR;SACP;IACL;AACJ;AAEO,MAAMC,qBAAqBC,aAAa,oBAAoB,CAAC;IAChE,gBAAgBL;IAChB,cAAc,EAAE;AACpB"}
+{"version":3,"file":"filter/filter.model.js","sources":["../../src/filter/filter.model.ts"],"sourcesContent":["import { ModelFactory } from \"@webiny/api-headless-cms/features/modelBuilder/index.js\";\n\nexport const FILTER_MODEL_ID = process.env.WEBINY_API_LEGACY_MODELS ? \"acoFilter\" : \"wbyAcoFilter\";\n\nclass FilterPrivateModelImpl implements ModelFactory.Interface {\n    public async execute(builder: ModelFactory.Builder) {\n        return [\n            builder\n                .private({\n                    modelId: FILTER_MODEL_ID,\n                    name: \"ACO - Filter\",\n                    lifecycleEvents: false\n                })\n                .fields(fields => ({\n                    name: fields.text().label(\"Name\").required(),\n                    description: fields.text().label(\"Description\"),\n                    namespace: fields.text().label(\"Model Id\").required(),\n                    operation: fields\n                        .text()\n                        .label(\"Operation\")\n                        .required()\n                        .predefinedValues([\n                            {\n                                label: \"AND\",\n                                value: \"AND\"\n                            },\n                            {\n                                label: \"OR\",\n                                value: \"OR\"\n                            }\n                        ]),\n                    groups: fields\n                        .object()\n                        .label(\"Groups\")\n                        .list()\n                        .listMinLength(1, \"At least one group is required.\")\n                        .fields(fields => ({\n                            operation: fields\n                                .text()\n                                .label(\"Operation\")\n                                .required()\n                                .predefinedValues([\n                                    {\n                                        label: \"AND\",\n                                        value: \"AND\"\n                                    },\n                                    {\n                                        label: \"OR\",\n                                        value: \"OR\"\n                                    }\n                                ]),\n                            filters: fields\n                                .object()\n                                .label(\"Filters\")\n                                .list()\n                                .listMinLength(1, \"At least one filter is required.\")\n                                .fields(filterFields => ({\n                                    field: filterFields.text().label(\"Field\").required(),\n                                    condition: filterFields.text().label(\"Condition\").required(),\n                                    value: filterFields.text().label(\"Value\").required()\n                                }))\n                        }))\n                }))\n        ];\n    }\n}\n\nexport const FilterPrivateModel = ModelFactory.createImplementation({\n    implementation: FilterPrivateModelImpl,\n    dependencies: []\n});\n"],"names":["FILTER_MODEL_ID","process","FilterPrivateModelImpl","builder","fields","filterFields","FilterPrivateModel","ModelFactory"],"mappings":";AAEO,MAAMA,kBAAkBC,QAAQ,GAAG,CAAC,wBAAwB,GAAG,cAAc;AAEpF,MAAMC;IACF,MAAa,QAAQC,OAA6B,EAAE;QAChD,OAAO;YACHA,QACK,OAAO,CAAC;gBACL,SAASH;gBACT,MAAM;gBACN,iBAAiB;YACrB,GACC,MAAM,CAACI,CAAAA,SAAW;oBACf,MAAMA,OAAO,IAAI,GAAG,KAAK,CAAC,QAAQ,QAAQ;oBAC1C,aAAaA,OAAO,IAAI,GAAG,KAAK,CAAC;oBACjC,WAAWA,OAAO,IAAI,GAAG,KAAK,CAAC,YAAY,QAAQ;oBACnD,WAAWA,OACN,IAAI,GACJ,KAAK,CAAC,aACN,QAAQ,GACR,gBAAgB,CAAC;wBACd;4BACI,OAAO;4BACP,OAAO;wBACX;wBACA;4BACI,OAAO;4BACP,OAAO;wBACX;qBACH;oBACL,QAAQA,OACH,MAAM,GACN,KAAK,CAAC,UACN,IAAI,GACJ,aAAa,CAAC,GAAG,mCACjB,MAAM,CAACA,CAAAA,SAAW;4BACf,WAAWA,OACN,IAAI,GACJ,KAAK,CAAC,aACN,QAAQ,GACR,gBAAgB,CAAC;gCACd;oCACI,OAAO;oCACP,OAAO;gCACX;gCACA;oCACI,OAAO;oCACP,OAAO;gCACX;6BACH;4BACL,SAASA,OACJ,MAAM,GACN,KAAK,CAAC,WACN,IAAI,GACJ,aAAa,CAAC,GAAG,oCACjB,MAAM,CAACC,CAAAA,eAAiB;oCACrB,OAAOA,aAAa,IAAI,GAAG,KAAK,CAAC,SAAS,QAAQ;oCAClD,WAAWA,aAAa,IAAI,GAAG,KAAK,CAAC,aAAa,QAAQ;oCAC1D,OAAOA,aAAa,IAAI,GAAG,KAAK,CAAC,SAAS,QAAQ;gCACtD;wBACR;gBACR;SACP;IACL;AACJ;AAEO,MAAMC,qBAAqBC,aAAa,oBAAoB,CAAC;IAChE,gBAAgBL;IAChB,cAAc,EAAE;AACpB"}

package/filter/filter.so.d.ts

@@ -1,9 +1,7 @@
-import type { HeadlessCms } from "@webiny/api-headless-cms/types/index.js";
-import type { Security } from "@webiny/api-core/types/security.js";
+import type { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/abstractions.js";
 import type { Container } from "@webiny/di";
 interface CreateFilterOperationsParams {
-    cms: HeadlessCms;
-    security: Security;
+    identityContext: IdentityContext.Interface;
     container: Container;
 }
 import type { AcoFilterStorageOperations } from "./filter.types.js";