@webiny/api-headless-cms 0.0.0-unstable.9f53ea597d → 0.0.0-unstable.a4f3e4ea8b

package/features/contentModelGroup/CreateGroup/CreateGroupRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModelGroup/CreateGroup/CreateGroupRepository.js","sources":["../../../../src/features/contentModelGroup/CreateGroup/CreateGroupRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { CreateGroupRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { GroupCache } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { PluginGroupsProvider } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { GroupSlugTakenError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupPersistenceError } from \"~/domain/contentModelGroup/errors.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { toSlug } from \"~/utils/toSlug.js\";\nimport { generateAlphaNumericId } from \"@webiny/utils\";\nimport type { CmsGroup } from \"~/types/index.js\";\n\n/**\n * CreateGroupRepository - Validates and persists a new group.\n *\n * Responsibilities:\n * - Validate ID uniqueness (if provided)\n * - Validate slug uniqueness (or generate unique slug)\n * - Check for plugin group conflicts\n * - Persist to storage\n * - Clear GroupCache after successful create\n */\nclass CreateGroupRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private groupCache: GroupCache.Interface,\n        private pluginGroupsProvider: PluginGroupsProvider.Interface,\n        private storageOperations: StorageOperations.Interface,\n        private tenantContext: TenantContext.Interface\n    ) {}\n\n    async execute(group: CmsGroup): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // 1. Validate ID uniqueness (if provided)\n            if (group.id) {\n                const existingById = await this.storageOperations.groups.list({\n                    where: {\n                        tenant: tenant.id,\n                        id: group.id\n                    }\n                });\n\n                if (existingById.length > 0) {\n                    return Result.fail(new GroupSlugTakenError(group.slug));\n                }\n            }\n\n            // 2. Generate or validate slug\n            const slugTaken = await this.isSlugTaken(group, tenant.id);\n            if (slugTaken) {\n                return Result.fail(new GroupSlugTakenError(group.slug));\n            }\n\n            // 3. Check for plugin group conflicts\n            const pluginGroups = await this.pluginGroupsProvider.getGroups();\n            const pluginGroupConflict = pluginGroups.find(pg => pg.slug === group.slug);\n            if (pluginGroupConflict) {\n                return Result.fail(new GroupSlugTakenError(group.slug));\n            }\n\n            // 4. Persist to storage\n            await this.storageOperations.groups.create({ group });\n\n            // 5. Clear cache\n            this.groupCache.clear();\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new GroupPersistenceError(error as Error));\n        }\n    }\n\n    private async isSlugTaken(group: CmsGroup, tenant: string): Promise<boolean> {\n        // If slug is provided and not empty, validate it\n        if (group.slug && group.slug.trim()) {\n            const existingBySlug = await this.storageOperations.groups.list({\n                where: {\n                    tenant,\n                    slug: group.slug\n                }\n            });\n\n            return existingBySlug.length > 0;\n        }\n\n        // Generate slug from name\n        const baseSlug = toSlug(group.name);\n        const existingBySlug = await this.storageOperations.groups.list({\n            where: {\n                tenant,\n                slug: baseSlug\n            }\n        });\n\n        if (existingBySlug.length === 0) {\n            // No conflict, use base slug\n            group.slug = baseSlug;\n        } else {\n            // Conflict, append random suffix\n            group.slug = `${baseSlug}-${generateAlphaNumericId(8)}`;\n        }\n\n        return false;\n    }\n}\n\nexport const CreateGroupRepository = createImplementation({\n    abstraction: RepositoryAbstraction,\n    implementation: CreateGroupRepositoryImpl,\n    dependencies: [GroupCache, PluginGroupsProvider, StorageOperations, TenantContext]\n});\n"],"names":["CreateGroupRepositoryImpl","groupCache","pluginGroupsProvider","storageOperations","tenantContext","group","tenant","existingById","Result","GroupSlugTakenError","slugTaken","pluginGroups","pluginGroupConflict","pg","error","GroupPersistenceError","existingBySlug","baseSlug","toSlug","generateAlphaNumericId","CreateGroupRepository","createImplementation","RepositoryAbstraction","GroupCache","PluginGroupsProvider","StorageOperations","TenantContext"],"mappings":";;;;;;;;AAuBA,MAAMA;IACF,YACYC,UAAgC,EAChCC,oBAAoD,EACpDC,iBAA8C,EAC9CC,aAAsC,CAChD;aAJUH,UAAU,GAAVA;aACAC,oBAAoB,GAApBA;aACAC,iBAAiB,GAAjBA;aACAC,aAAa,GAAbA;IACT;IAEH,MAAM,QAAQC,KAAe,EAAsD;QAC/E,IAAI;YACA,MAAMC,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;YAG3C,IAAID,MAAM,EAAE,EAAE;gBACV,MAAME,eAAe,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;oBAC1D,OAAO;wBACH,QAAQD,OAAO,EAAE;wBACjB,IAAID,MAAM,EAAE;oBAChB;gBACJ;gBAEA,IAAIE,aAAa,MAAM,GAAG,GACtB,OAAOC,OAAO,IAAI,CAAC,IAAIC,oBAAoBJ,MAAM,IAAI;YAE7D;YAGA,MAAMK,YAAY,MAAM,IAAI,CAAC,WAAW,CAACL,OAAOC,OAAO,EAAE;YACzD,IAAII,WACA,OAAOF,OAAO,IAAI,CAAC,IAAIC,oBAAoBJ,MAAM,IAAI;YAIzD,MAAMM,eAAe,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS;YAC9D,MAAMC,sBAAsBD,aAAa,IAAI,CAACE,CAAAA,KAAMA,GAAG,IAAI,KAAKR,MAAM,IAAI;YAC1E,IAAIO,qBACA,OAAOJ,OAAO,IAAI,CAAC,IAAIC,oBAAoBJ,MAAM,IAAI;YAIzD,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC;gBAAEA;YAAM;YAGnD,IAAI,CAAC,UAAU,CAAC,KAAK;YAErB,OAAOG,OAAO,EAAE;QACpB,EAAE,OAAOM,OAAO;YACZ,OAAON,OAAO,IAAI,CAAC,IAAIO,sBAAsBD;QACjD;IACJ;IAEA,MAAc,YAAYT,KAAe,EAAEC,MAAc,EAAoB;QAEzE,IAAID,MAAM,IAAI,IAAIA,MAAM,IAAI,CAAC,IAAI,IAAI;YACjC,MAAMW,iBAAiB,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;gBAC5D,OAAO;oBACHV;oBACA,MAAMD,MAAM,IAAI;gBACpB;YACJ;YAEA,OAAOW,eAAe,MAAM,GAAG;QACnC;QAGA,MAAMC,WAAWC,OAAOb,MAAM,IAAI;QAClC,MAAMW,iBAAiB,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;YAC5D,OAAO;gBACHV;gBACA,MAAMW;YACV;QACJ;QAEA,IAAID,AAA0B,MAA1BA,eAAe,MAAM,EAErBX,MAAM,IAAI,GAAGY;aAGbZ,MAAM,IAAI,GAAG,GAAGY,SAAS,CAAC,EAAEE,uBAAuB,IAAI;QAG3D,OAAO;IACX;AACJ;AAEO,MAAMC,8CAAwBC,qBAAqB;IACtD,aAAaC;IACb,gBAAgBtB;IAChB,cAAc;QAACuB;QAAYC;QAAsBC;QAAmBC;KAAc;AACtF"}
+{"version":3,"file":"features/contentModelGroup/CreateGroup/CreateGroupRepository.js","sources":["../../../../src/features/contentModelGroup/CreateGroup/CreateGroupRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { CreateGroupRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { GroupCache } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { PluginGroupsProvider } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { GroupSlugTakenError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupPersistenceError } from \"~/domain/contentModelGroup/errors.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { toSlug } from \"~/utils/toSlug.js\";\nimport { generateAlphaNumericId } from \"@webiny/utils\";\nimport type { CmsGroup } from \"~/types/index.js\";\nimport { RuntimeTenant } from \"~/features/runtimeTenant/abstractions.js\";\n\n/**\n * CreateGroupRepository - Validates and persists a new group.\n *\n * Responsibilities:\n * - Validate ID uniqueness (if provided)\n * - Validate slug uniqueness (or generate unique slug)\n * - Check for plugin group conflicts\n * - Persist to storage\n * - Clear GroupCache after successful create\n */\nclass CreateGroupRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private groupCache: GroupCache.Interface,\n        private pluginGroupsProvider: PluginGroupsProvider.Interface,\n        private storageOperations: StorageOperations.Interface,\n        private tenantContext: TenantContext.Interface,\n        private runtimeTenant: RuntimeTenant.Interface\n    ) {}\n\n    async execute(initialGroup: CmsGroup): Promise<Result<CmsGroup, RepositoryAbstraction.Error>> {\n        const group = this.runtimeTenant.assign(initialGroup);\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // 1. Validate ID uniqueness (if provided)\n            if (group.id) {\n                const existingById = await this.storageOperations.groups.list({\n                    where: {\n                        tenant: tenant.id,\n                        id: group.id\n                    }\n                });\n\n                if (existingById.length > 0) {\n                    return Result.fail(new GroupSlugTakenError(group.slug));\n                }\n            }\n\n            // 2. Generate or validate slug\n            const slugTaken = await this.isSlugTaken(group, tenant.id);\n            if (slugTaken) {\n                return Result.fail(new GroupSlugTakenError(group.slug));\n            }\n\n            // 3. Check for plugin group conflicts\n            const pluginGroups = await this.pluginGroupsProvider.getGroups();\n            const pluginGroupConflict = pluginGroups.find(pg => pg.slug === group.slug);\n            if (pluginGroupConflict) {\n                return Result.fail(new GroupSlugTakenError(group.slug));\n            }\n\n            // 4. Persist to storage\n            await this.storageOperations.groups.create({ group });\n\n            // 5. Clear cache\n            this.groupCache.clear();\n\n            return Result.ok(group);\n        } catch (error) {\n            return Result.fail(new GroupPersistenceError(error as Error));\n        }\n    }\n\n    private async isSlugTaken(group: CmsGroup, tenant: string): Promise<boolean> {\n        // If slug is provided and not empty, validate it\n        if (group.slug && group.slug.trim()) {\n            const existingBySlug = await this.storageOperations.groups.list({\n                where: {\n                    tenant,\n                    slug: group.slug\n                }\n            });\n\n            return existingBySlug.length > 0;\n        }\n\n        // Generate slug from name\n        const baseSlug = toSlug(group.name);\n        const existingBySlug = await this.storageOperations.groups.list({\n            where: {\n                tenant,\n                slug: baseSlug\n            }\n        });\n\n        if (existingBySlug.length === 0) {\n            // No conflict, use base slug\n            group.slug = baseSlug;\n        } else {\n            // Conflict, append random suffix\n            group.slug = `${baseSlug}-${generateAlphaNumericId(8)}`;\n        }\n\n        return false;\n    }\n}\n\nexport const CreateGroupRepository = createImplementation({\n    abstraction: RepositoryAbstraction,\n    implementation: CreateGroupRepositoryImpl,\n    dependencies: [\n        GroupCache,\n        PluginGroupsProvider,\n        StorageOperations,\n        TenantContext,\n        RuntimeTenant\n    ]\n});\n"],"names":["CreateGroupRepositoryImpl","groupCache","pluginGroupsProvider","storageOperations","tenantContext","runtimeTenant","initialGroup","group","tenant","existingById","Result","GroupSlugTakenError","slugTaken","pluginGroups","pluginGroupConflict","pg","error","GroupPersistenceError","existingBySlug","baseSlug","toSlug","generateAlphaNumericId","CreateGroupRepository","createImplementation","RepositoryAbstraction","GroupCache","PluginGroupsProvider","StorageOperations","TenantContext","RuntimeTenant"],"mappings":";;;;;;;;;AAwBA,MAAMA;IACF,YACYC,UAAgC,EAChCC,oBAAoD,EACpDC,iBAA8C,EAC9CC,aAAsC,EACtCC,aAAsC,CAChD;aALUJ,UAAU,GAAVA;aACAC,oBAAoB,GAApBA;aACAC,iBAAiB,GAAjBA;aACAC,aAAa,GAAbA;aACAC,aAAa,GAAbA;IACT;IAEH,MAAM,QAAQC,YAAsB,EAA0D;QAC1F,MAAMC,QAAQ,IAAI,CAAC,aAAa,CAAC,MAAM,CAACD;QACxC,IAAI;YACA,MAAME,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;YAG3C,IAAID,MAAM,EAAE,EAAE;gBACV,MAAME,eAAe,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;oBAC1D,OAAO;wBACH,QAAQD,OAAO,EAAE;wBACjB,IAAID,MAAM,EAAE;oBAChB;gBACJ;gBAEA,IAAIE,aAAa,MAAM,GAAG,GACtB,OAAOC,OAAO,IAAI,CAAC,IAAIC,oBAAoBJ,MAAM,IAAI;YAE7D;YAGA,MAAMK,YAAY,MAAM,IAAI,CAAC,WAAW,CAACL,OAAOC,OAAO,EAAE;YACzD,IAAII,WACA,OAAOF,OAAO,IAAI,CAAC,IAAIC,oBAAoBJ,MAAM,IAAI;YAIzD,MAAMM,eAAe,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS;YAC9D,MAAMC,sBAAsBD,aAAa,IAAI,CAACE,CAAAA,KAAMA,GAAG,IAAI,KAAKR,MAAM,IAAI;YAC1E,IAAIO,qBACA,OAAOJ,OAAO,IAAI,CAAC,IAAIC,oBAAoBJ,MAAM,IAAI;YAIzD,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC;gBAAEA;YAAM;YAGnD,IAAI,CAAC,UAAU,CAAC,KAAK;YAErB,OAAOG,OAAO,EAAE,CAACH;QACrB,EAAE,OAAOS,OAAO;YACZ,OAAON,OAAO,IAAI,CAAC,IAAIO,sBAAsBD;QACjD;IACJ;IAEA,MAAc,YAAYT,KAAe,EAAEC,MAAc,EAAoB;QAEzE,IAAID,MAAM,IAAI,IAAIA,MAAM,IAAI,CAAC,IAAI,IAAI;YACjC,MAAMW,iBAAiB,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;gBAC5D,OAAO;oBACHV;oBACA,MAAMD,MAAM,IAAI;gBACpB;YACJ;YAEA,OAAOW,eAAe,MAAM,GAAG;QACnC;QAGA,MAAMC,WAAWC,OAAOb,MAAM,IAAI;QAClC,MAAMW,iBAAiB,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;YAC5D,OAAO;gBACHV;gBACA,MAAMW;YACV;QACJ;QAEA,IAAID,AAA0B,MAA1BA,eAAe,MAAM,EAErBX,MAAM,IAAI,GAAGY;aAGbZ,MAAM,IAAI,GAAG,GAAGY,SAAS,CAAC,EAAEE,uBAAuB,IAAI;QAG3D,OAAO;IACX;AACJ;AAEO,MAAMC,8CAAwBC,qBAAqB;IACtD,aAAaC;IACb,gBAAgBxB;IAChB,cAAc;QACVyB;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

package/features/contentModelGroup/CreateGroup/CreateGroupUseCase.d.ts

@@ -5,7 +5,6 @@ import { EventPublisher } from "@webiny/api-core/features/eventPublisher/index.j
 import { AccessControl } from "../../../features/shared/abstractions.js";
 import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
-import { CmsContext } from "../../../features/shared/abstractions.js";
 import type { CmsGroup } from "../../../types/index.js";
 import type { CmsGroupCreateInput } from "../../../types/index.js";
 /**
@@ -25,8 +24,7 @@ declare class CreateGroupUseCaseImpl implements UseCaseAbstraction.Interface {
     private accessControl;
     private tenantContext;
     private identityContext;
-    private cmsContext;
-    constructor(eventPublisher: EventPublisher.Interface, repository: CreateGroupRepository.Interface, accessControl: AccessControl.Interface, tenantContext: TenantContext.Interface, identityContext: IdentityContext.Interface, cmsContext: CmsContext.Interface);
+    constructor(eventPublisher: EventPublisher.Interface, repository: CreateGroupRepository.Interface, accessControl: AccessControl.Interface, tenantContext: TenantContext.Interface, identityContext: IdentityContext.Interface);
     execute(input: CmsGroupCreateInput): Promise<Result<CmsGroup, UseCaseAbstraction.Error>>;
 }
 export declare const CreateGroupUseCase: import("@webiny/di").Implementation<typeof CreateGroupUseCaseImpl>;

package/features/contentModelGroup/CreateGroup/CreateGroupUseCase.js

@@ -2,20 +2,19 @@ import { Result, createImplementation } from "@webiny/feature/api";
 import { CreateGroupRepository, CreateGroupUseCase } from "./abstractions.js";
 import { EventPublisher } from "@webiny/api-core/features/eventPublisher/index.js";
 import { GroupAfterCreateEvent, GroupBeforeCreateEventEvent, GroupCreateErrorEvent } from "./events.js";
-import { AccessControl, CmsContext } from "../../shared/abstractions.js";
+import { AccessControl } from "../../shared/abstractions.js";
 import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import { GroupNotAuthorizedError, GroupValidationError } from "../../../domain/contentModelGroup/errors.js";
 import { createZodError, mdbid } from "@webiny/utils";
 import { createGroupCreateValidation } from "../../../domain/contentModelGroup/validation.js";
 class CreateGroupUseCaseImpl {
-    constructor(eventPublisher, repository, accessControl, tenantContext, identityContext, cmsContext){
+    constructor(eventPublisher, repository, accessControl, tenantContext, identityContext){
         this.eventPublisher = eventPublisher;
         this.repository = repository;
         this.accessControl = accessControl;
         this.tenantContext = tenantContext;
         this.identityContext = identityContext;
-        this.cmsContext = cmsContext;
     }
     async execute(input) {
         const canAccess = await this.accessControl.canAccessGroup({
@@ -62,9 +61,9 @@ class CreateGroupUseCaseImpl {
                 return Result.fail(result.error);
             }
             await this.eventPublisher.publish(new GroupAfterCreateEvent({
-                group
+                group: result.value
             }));
-            return Result.ok(group);
+            return Result.ok(result.value);
         } catch (error) {
             await this.eventPublisher.publish(new GroupCreateErrorEvent({
                 input,
@@ -83,8 +82,7 @@ const CreateGroupUseCase_CreateGroupUseCase = createImplementation({
         CreateGroupRepository,
         AccessControl,
         TenantContext,
-        IdentityContext,
-        CmsContext
+        IdentityContext
     ]
 });
 export { CreateGroupUseCase_CreateGroupUseCase as CreateGroupUseCase };

package/features/contentModelGroup/CreateGroup/CreateGroupUseCase.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModelGroup/CreateGroup/CreateGroupUseCase.js","sources":["../../../../src/features/contentModelGroup/CreateGroup/CreateGroupUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { CreateGroupUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { CreateGroupRepository } from \"./abstractions.js\";\nimport { EventPublisher } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport { GroupBeforeCreateEventEvent } from \"./events.js\";\nimport { GroupAfterCreateEvent } from \"./events.js\";\nimport { GroupCreateErrorEvent } from \"./events.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport {\n    GroupNotAuthorizedError,\n    GroupValidationError\n} from \"~/domain/contentModelGroup/errors.js\";\nimport { createZodError } from \"@webiny/utils\";\nimport { mdbid } from \"@webiny/utils\";\nimport { createGroupCreateValidation } from \"~/domain/contentModelGroup/validation.js\";\nimport type { CmsGroup } from \"~/types/index.js\";\nimport type { CmsGroupCreateInput } from \"~/types/index.js\";\n\n/**\n * CreateGroupUseCase - Orchestrates group creation.\n *\n * Responsibilities:\n * - Validate input (Zod)\n * - Create domain group object\n * - Access control checks\n * - Publish before event\n * - Delegate to repository\n * - Publish after event or error event\n */\nclass CreateGroupUseCaseImpl implements UseCaseAbstraction.Interface {\n    public constructor(\n        private eventPublisher: EventPublisher.Interface,\n        private repository: CreateGroupRepository.Interface,\n        private accessControl: AccessControl.Interface,\n        private tenantContext: TenantContext.Interface,\n        private identityContext: IdentityContext.Interface,\n        private cmsContext: CmsContext.Interface\n    ) {}\n\n    async execute(input: CmsGroupCreateInput): Promise<Result<CmsGroup, UseCaseAbstraction.Error>> {\n        // Initial access control check\n        const canAccess = await this.accessControl.canAccessGroup({ rwd: \"w\" });\n        if (!canAccess) {\n            return Result.fail(new GroupNotAuthorizedError());\n        }\n\n        // Validate input\n        const validationResult = await createGroupCreateValidation().safeParseAsync(input);\n        if (!validationResult.success) {\n            const zodError = createZodError(validationResult.error);\n            return Result.fail(\n                new GroupValidationError(zodError.message, zodError.data!.invalidFields)\n            );\n        }\n        const data = validationResult.data;\n\n        // Create domain group object\n        const identity = this.identityContext.getIdentity();\n        const tenant = this.tenantContext.getTenant();\n\n        const id = data.id || mdbid();\n        const group: CmsGroup = {\n            ...data,\n            id,\n            tenant: tenant.id,\n            createdOn: new Date().toISOString(),\n            savedOn: new Date().toISOString(),\n            createdBy: {\n                id: identity.id,\n                displayName: identity.displayName,\n                type: identity.type\n            }\n        };\n\n        // Access control check on created group\n        const canAccessGroup = await this.accessControl.canAccessGroup({ group, rwd: \"w\" });\n        if (!canAccessGroup) {\n            return Result.fail(new GroupNotAuthorizedError());\n        }\n\n        try {\n            // Publish before event\n            await this.eventPublisher.publish(new GroupBeforeCreateEventEvent({ group }));\n\n            // Persist via repository\n            const result = await this.repository.execute(group);\n            if (result.isFail()) {\n                // Publish error event\n                await this.eventPublisher.publish(\n                    new GroupCreateErrorEvent({\n                        input,\n                        group,\n                        error: result.error\n                    })\n                );\n                return Result.fail(result.error);\n            }\n\n            // Publish after event\n            await this.eventPublisher.publish(new GroupAfterCreateEvent({ group }));\n\n            return Result.ok(group);\n        } catch (error) {\n            // Publish error event for unexpected errors\n            await this.eventPublisher.publish(\n                new GroupCreateErrorEvent({\n                    input,\n                    group,\n                    error: error as Error\n                })\n            );\n            return Result.fail(error as UseCaseAbstraction.Error);\n        }\n    }\n}\n\nexport const CreateGroupUseCase = createImplementation({\n    abstraction: UseCaseAbstraction,\n    implementation: CreateGroupUseCaseImpl,\n    dependencies: [\n        EventPublisher,\n        CreateGroupRepository,\n        AccessControl,\n        TenantContext,\n        IdentityContext,\n        CmsContext\n    ]\n});\n"],"names":["CreateGroupUseCaseImpl","eventPublisher","repository","accessControl","tenantContext","identityContext","cmsContext","input","canAccess","Result","GroupNotAuthorizedError","validationResult","createGroupCreateValidation","zodError","createZodError","GroupValidationError","data","identity","tenant","id","mdbid","group","Date","canAccessGroup","GroupBeforeCreateEventEvent","result","GroupCreateErrorEvent","GroupAfterCreateEvent","error","CreateGroupUseCase","createImplementation","UseCaseAbstraction","EventPublisher","CreateGroupRepository","AccessControl","TenantContext","IdentityContext","CmsContext"],"mappings":";;;;;;;;;;AAiCA,MAAMA;IACF,YACYC,cAAwC,EACxCC,UAA2C,EAC3CC,aAAsC,EACtCC,aAAsC,EACtCC,eAA0C,EAC1CC,UAAgC,CAC1C;aANUL,cAAc,GAAdA;aACAC,UAAU,GAAVA;aACAC,aAAa,GAAbA;aACAC,aAAa,GAAbA;aACAC,eAAe,GAAfA;aACAC,UAAU,GAAVA;IACT;IAEH,MAAM,QAAQC,KAA0B,EAAuD;QAE3F,MAAMC,YAAY,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAE,KAAK;QAAI;QACrE,IAAI,CAACA,WACD,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAI3B,MAAMC,mBAAmB,MAAMC,8BAA8B,cAAc,CAACL;QAC5E,IAAI,CAACI,iBAAiB,OAAO,EAAE;YAC3B,MAAME,WAAWC,eAAeH,iBAAiB,KAAK;YACtD,OAAOF,OAAO,IAAI,CACd,IAAIM,qBAAqBF,SAAS,OAAO,EAAEA,SAAS,IAAI,CAAE,aAAa;QAE/E;QACA,MAAMG,OAAOL,iBAAiB,IAAI;QAGlC,MAAMM,WAAW,IAAI,CAAC,eAAe,CAAC,WAAW;QACjD,MAAMC,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;QAE3C,MAAMC,KAAKH,KAAK,EAAE,IAAII;QACtB,MAAMC,QAAkB;YACpB,GAAGL,IAAI;YACPG;YACA,QAAQD,OAAO,EAAE;YACjB,WAAW,IAAII,OAAO,WAAW;YACjC,SAAS,IAAIA,OAAO,WAAW;YAC/B,WAAW;gBACP,IAAIL,SAAS,EAAE;gBACf,aAAaA,SAAS,WAAW;gBACjC,MAAMA,SAAS,IAAI;YACvB;QACJ;QAGA,MAAMM,iBAAiB,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAEF;YAAO,KAAK;QAAI;QACjF,IAAI,CAACE,gBACD,OAAOd,OAAO,IAAI,CAAC,IAAIC;QAG3B,IAAI;YAEA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAIc,4BAA4B;gBAAEH;YAAM;YAG1E,MAAMI,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACJ;YAC7C,IAAII,OAAO,MAAM,IAAI;gBAEjB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIC,sBAAsB;oBACtBnB;oBACAc;oBACA,OAAOI,OAAO,KAAK;gBACvB;gBAEJ,OAAOhB,OAAO,IAAI,CAACgB,OAAO,KAAK;YACnC;YAGA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAIE,sBAAsB;gBAAEN;YAAM;YAEpE,OAAOZ,OAAO,EAAE,CAACY;QACrB,EAAE,OAAOO,OAAO;YAEZ,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIF,sBAAsB;gBACtBnB;gBACAc;gBACA,OAAOO;YACX;YAEJ,OAAOnB,OAAO,IAAI,CAACmB;QACvB;IACJ;AACJ;AAEO,MAAMC,wCAAqBC,qBAAqB;IACnD,aAAaC;IACb,gBAAgB/B;IAChB,cAAc;QACVgC;QACAC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}
+{"version":3,"file":"features/contentModelGroup/CreateGroup/CreateGroupUseCase.js","sources":["../../../../src/features/contentModelGroup/CreateGroup/CreateGroupUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { CreateGroupUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { CreateGroupRepository } from \"./abstractions.js\";\nimport { EventPublisher } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport { GroupBeforeCreateEventEvent } from \"./events.js\";\nimport { GroupAfterCreateEvent } from \"./events.js\";\nimport { GroupCreateErrorEvent } from \"./events.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport {\n    GroupNotAuthorizedError,\n    GroupValidationError\n} from \"~/domain/contentModelGroup/errors.js\";\nimport { createZodError } from \"@webiny/utils\";\nimport { mdbid } from \"@webiny/utils\";\nimport { createGroupCreateValidation } from \"~/domain/contentModelGroup/validation.js\";\nimport type { CmsGroup } from \"~/types/index.js\";\nimport type { CmsGroupCreateInput } from \"~/types/index.js\";\n\n/**\n * CreateGroupUseCase - Orchestrates group creation.\n *\n * Responsibilities:\n * - Validate input (Zod)\n * - Create domain group object\n * - Access control checks\n * - Publish before event\n * - Delegate to repository\n * - Publish after event or error event\n */\nclass CreateGroupUseCaseImpl implements UseCaseAbstraction.Interface {\n    public constructor(\n        private eventPublisher: EventPublisher.Interface,\n        private repository: CreateGroupRepository.Interface,\n        private accessControl: AccessControl.Interface,\n        private tenantContext: TenantContext.Interface,\n        private identityContext: IdentityContext.Interface\n    ) {}\n\n    async execute(input: CmsGroupCreateInput): Promise<Result<CmsGroup, UseCaseAbstraction.Error>> {\n        // Initial access control check\n        const canAccess = await this.accessControl.canAccessGroup({ rwd: \"w\" });\n        if (!canAccess) {\n            return Result.fail(new GroupNotAuthorizedError());\n        }\n\n        // Validate input\n        const validationResult = await createGroupCreateValidation().safeParseAsync(input);\n        if (!validationResult.success) {\n            const zodError = createZodError(validationResult.error);\n            return Result.fail(\n                new GroupValidationError(zodError.message, zodError.data!.invalidFields)\n            );\n        }\n        const data = validationResult.data;\n\n        // Create domain group object\n        const identity = this.identityContext.getIdentity();\n        const tenant = this.tenantContext.getTenant();\n\n        const id = data.id || mdbid();\n        const group: CmsGroup = {\n            ...data,\n            id,\n            tenant: tenant.id,\n            createdOn: new Date().toISOString(),\n            savedOn: new Date().toISOString(),\n            createdBy: {\n                id: identity.id,\n                displayName: identity.displayName,\n                type: identity.type\n            }\n        };\n\n        // Access control check on created group\n        const canAccessGroup = await this.accessControl.canAccessGroup({ group, rwd: \"w\" });\n        if (!canAccessGroup) {\n            return Result.fail(new GroupNotAuthorizedError());\n        }\n\n        try {\n            // Publish before event\n            await this.eventPublisher.publish(new GroupBeforeCreateEventEvent({ group }));\n\n            // Persist via repository\n            const result = await this.repository.execute(group);\n            if (result.isFail()) {\n                // Publish error event\n                await this.eventPublisher.publish(\n                    new GroupCreateErrorEvent({\n                        input,\n                        group,\n                        error: result.error\n                    })\n                );\n                return Result.fail(result.error);\n            }\n\n            // Publish after event\n            await this.eventPublisher.publish(\n                new GroupAfterCreateEvent({\n                    group: result.value\n                })\n            );\n\n            return Result.ok(result.value);\n        } catch (error) {\n            // Publish error event for unexpected errors\n            await this.eventPublisher.publish(\n                new GroupCreateErrorEvent({\n                    input,\n                    group,\n                    error: error as Error\n                })\n            );\n            return Result.fail(error as UseCaseAbstraction.Error);\n        }\n    }\n}\n\nexport const CreateGroupUseCase = createImplementation({\n    abstraction: UseCaseAbstraction,\n    implementation: CreateGroupUseCaseImpl,\n    dependencies: [\n        EventPublisher,\n        CreateGroupRepository,\n        AccessControl,\n        TenantContext,\n        IdentityContext\n    ]\n});\n"],"names":["CreateGroupUseCaseImpl","eventPublisher","repository","accessControl","tenantContext","identityContext","input","canAccess","Result","GroupNotAuthorizedError","validationResult","createGroupCreateValidation","zodError","createZodError","GroupValidationError","data","identity","tenant","id","mdbid","group","Date","canAccessGroup","GroupBeforeCreateEventEvent","result","GroupCreateErrorEvent","GroupAfterCreateEvent","error","CreateGroupUseCase","createImplementation","UseCaseAbstraction","EventPublisher","CreateGroupRepository","AccessControl","TenantContext","IdentityContext"],"mappings":";;;;;;;;;;AAgCA,MAAMA;IACF,YACYC,cAAwC,EACxCC,UAA2C,EAC3CC,aAAsC,EACtCC,aAAsC,EACtCC,eAA0C,CACpD;aALUJ,cAAc,GAAdA;aACAC,UAAU,GAAVA;aACAC,aAAa,GAAbA;aACAC,aAAa,GAAbA;aACAC,eAAe,GAAfA;IACT;IAEH,MAAM,QAAQC,KAA0B,EAAuD;QAE3F,MAAMC,YAAY,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAE,KAAK;QAAI;QACrE,IAAI,CAACA,WACD,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAI3B,MAAMC,mBAAmB,MAAMC,8BAA8B,cAAc,CAACL;QAC5E,IAAI,CAACI,iBAAiB,OAAO,EAAE;YAC3B,MAAME,WAAWC,eAAeH,iBAAiB,KAAK;YACtD,OAAOF,OAAO,IAAI,CACd,IAAIM,qBAAqBF,SAAS,OAAO,EAAEA,SAAS,IAAI,CAAE,aAAa;QAE/E;QACA,MAAMG,OAAOL,iBAAiB,IAAI;QAGlC,MAAMM,WAAW,IAAI,CAAC,eAAe,CAAC,WAAW;QACjD,MAAMC,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;QAE3C,MAAMC,KAAKH,KAAK,EAAE,IAAII;QACtB,MAAMC,QAAkB;YACpB,GAAGL,IAAI;YACPG;YACA,QAAQD,OAAO,EAAE;YACjB,WAAW,IAAII,OAAO,WAAW;YACjC,SAAS,IAAIA,OAAO,WAAW;YAC/B,WAAW;gBACP,IAAIL,SAAS,EAAE;gBACf,aAAaA,SAAS,WAAW;gBACjC,MAAMA,SAAS,IAAI;YACvB;QACJ;QAGA,MAAMM,iBAAiB,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAEF;YAAO,KAAK;QAAI;QACjF,IAAI,CAACE,gBACD,OAAOd,OAAO,IAAI,CAAC,IAAIC;QAG3B,IAAI;YAEA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAIc,4BAA4B;gBAAEH;YAAM;YAG1E,MAAMI,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACJ;YAC7C,IAAII,OAAO,MAAM,IAAI;gBAEjB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIC,sBAAsB;oBACtBnB;oBACAc;oBACA,OAAOI,OAAO,KAAK;gBACvB;gBAEJ,OAAOhB,OAAO,IAAI,CAACgB,OAAO,KAAK;YACnC;YAGA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIE,sBAAsB;gBACtB,OAAOF,OAAO,KAAK;YACvB;YAGJ,OAAOhB,OAAO,EAAE,CAACgB,OAAO,KAAK;QACjC,EAAE,OAAOG,OAAO;YAEZ,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIF,sBAAsB;gBACtBnB;gBACAc;gBACA,OAAOO;YACX;YAEJ,OAAOnB,OAAO,IAAI,CAACmB;QACvB;IACJ;AACJ;AAEO,MAAMC,wCAAqBC,qBAAqB;IACnD,aAAaC;IACb,gBAAgB9B;IAChB,cAAc;QACV+B;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

package/features/contentModelGroup/CreateGroup/abstractions.d.ts

@@ -26,7 +26,7 @@ export declare namespace CreateGroupUseCase {
  * CreateGroupRepository - Persists a new group to storage.
  */
 export interface ICreateGroupRepository {
-    execute(group: CmsGroup): Promise<Result<void, RepositoryError>>;
+    execute(group: CmsGroup): Promise<Result<CmsGroup, RepositoryError>>;
 }
 export interface ICreateGroupRepositoryErrors {
     alreadyExists: GroupSlugTakenError;

package/features/contentModelGroup/CreateGroup/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModelGroup/CreateGroup/abstractions.js","sources":["../../../../src/features/contentModelGroup/CreateGroup/abstractions.ts"],"sourcesContent":["import { createAbstraction, Result } from \"@webiny/feature/api\";\nimport type { CmsGroup, CmsGroupCreateInput } from \"~/types/index.js\";\nimport type {\n    GroupPersistenceError,\n    GroupValidationError\n} from \"~/domain/contentModelGroup/errors.js\";\nimport {\n    GroupNotAuthorizedError,\n    type GroupSlugTakenError\n} from \"~/domain/contentModelGroup/errors.js\";\n\n/**\n * CreateGroup Use Case\n */\nexport interface ICreateGroupUseCase {\n    execute(input: CmsGroupCreateInput): Promise<Result<CmsGroup, UseCaseError>>;\n}\n\nexport interface ICreateGroupUseCaseErrors {\n    notAuthorized: GroupNotAuthorizedError;\n    validation: GroupValidationError;\n    repository: RepositoryError;\n}\n\ntype UseCaseError = ICreateGroupUseCaseErrors[keyof ICreateGroupUseCaseErrors];\n\n/** Create a new content model group. */\nexport const CreateGroupUseCase = createAbstraction<ICreateGroupUseCase>(\"CreateGroupUseCase\");\n\nexport namespace CreateGroupUseCase {\n    export type Interface = ICreateGroupUseCase;\n    export type Input = CmsGroupCreateInput;\n\n    export type Error = UseCaseError;\n    export type Return = Promise<Result<CmsGroup, UseCaseError>>;\n}\n\n/**\n * CreateGroupRepository - Persists a new group to storage.\n */\nexport interface ICreateGroupRepository {\n    execute(group: CmsGroup): Promise<Result<void, RepositoryError>>;\n}\n\nexport interface ICreateGroupRepositoryErrors {\n    alreadyExists: GroupSlugTakenError;\n    storage: GroupPersistenceError;\n}\n\ntype RepositoryError = ICreateGroupRepositoryErrors[keyof ICreateGroupRepositoryErrors];\n\nexport const CreateGroupRepository =\n    createAbstraction<ICreateGroupRepository>(\"CreateGroupRepository\");\n\nexport namespace CreateGroupRepository {\n    export type Interface = ICreateGroupRepository;\n    export type Error = RepositoryError;\n}\n"],"names":["CreateGroupUseCase","createAbstraction","CreateGroupRepository"],"mappings":";AA2BO,MAAMA,qBAAqBC,kBAAuC;AAwBlE,MAAMC,wBACTD,kBAA0C"}
+{"version":3,"file":"features/contentModelGroup/CreateGroup/abstractions.js","sources":["../../../../src/features/contentModelGroup/CreateGroup/abstractions.ts"],"sourcesContent":["import { createAbstraction, Result } from \"@webiny/feature/api\";\nimport type { CmsGroup, CmsGroupCreateInput } from \"~/types/index.js\";\nimport type {\n    GroupPersistenceError,\n    GroupValidationError\n} from \"~/domain/contentModelGroup/errors.js\";\nimport {\n    GroupNotAuthorizedError,\n    type GroupSlugTakenError\n} from \"~/domain/contentModelGroup/errors.js\";\n\n/**\n * CreateGroup Use Case\n */\nexport interface ICreateGroupUseCase {\n    execute(input: CmsGroupCreateInput): Promise<Result<CmsGroup, UseCaseError>>;\n}\n\nexport interface ICreateGroupUseCaseErrors {\n    notAuthorized: GroupNotAuthorizedError;\n    validation: GroupValidationError;\n    repository: RepositoryError;\n}\n\ntype UseCaseError = ICreateGroupUseCaseErrors[keyof ICreateGroupUseCaseErrors];\n\n/** Create a new content model group. */\nexport const CreateGroupUseCase = createAbstraction<ICreateGroupUseCase>(\"CreateGroupUseCase\");\n\nexport namespace CreateGroupUseCase {\n    export type Interface = ICreateGroupUseCase;\n    export type Input = CmsGroupCreateInput;\n\n    export type Error = UseCaseError;\n    export type Return = Promise<Result<CmsGroup, UseCaseError>>;\n}\n\n/**\n * CreateGroupRepository - Persists a new group to storage.\n */\nexport interface ICreateGroupRepository {\n    execute(group: CmsGroup): Promise<Result<CmsGroup, RepositoryError>>;\n}\n\nexport interface ICreateGroupRepositoryErrors {\n    alreadyExists: GroupSlugTakenError;\n    storage: GroupPersistenceError;\n}\n\ntype RepositoryError = ICreateGroupRepositoryErrors[keyof ICreateGroupRepositoryErrors];\n\nexport const CreateGroupRepository =\n    createAbstraction<ICreateGroupRepository>(\"CreateGroupRepository\");\n\nexport namespace CreateGroupRepository {\n    export type Interface = ICreateGroupRepository;\n    export type Error = RepositoryError;\n}\n"],"names":["CreateGroupUseCase","createAbstraction","CreateGroupRepository"],"mappings":";AA2BO,MAAMA,qBAAqBC,kBAAuC;AAwBlE,MAAMC,wBACTD,kBAA0C"}

package/features/contentModelGroup/DeleteGroup/DeleteGroupRepository.d.ts

@@ -4,6 +4,7 @@ import { GroupCache } from "../../../features/contentModelGroup/shared/abstracti
 import { PluginGroupsProvider } from "../../../features/contentModelGroup/shared/abstractions.js";
 import { StorageOperations } from "../../../features/shared/abstractions.js";
 import type { CmsGroup } from "../../../types/index.js";
+import { RuntimeTenant } from "../../../features/runtimeTenant/abstractions.js";
 /**
  * DeleteGroupRepository - Validates and performs group deletion.
  *
@@ -17,8 +18,9 @@ declare class DeleteGroupRepositoryImpl implements RepositoryAbstraction.Interfa
     private groupCache;
     private pluginGroupsProvider;
     private storageOperations;
-    constructor(groupCache: GroupCache.Interface, pluginGroupsProvider: PluginGroupsProvider.Interface, storageOperations: StorageOperations.Interface);
-    execute(group: CmsGroup): Promise<Result<void, RepositoryAbstraction.Error>>;
+    private runtimeTenant;
+    constructor(groupCache: GroupCache.Interface, pluginGroupsProvider: PluginGroupsProvider.Interface, storageOperations: StorageOperations.Interface, runtimeTenant: RuntimeTenant.Interface);
+    execute(initialGroup: CmsGroup): Promise<Result<void, RepositoryAbstraction.Error>>;
 }
 export declare const DeleteGroupRepository: import("@webiny/di").Implementation<typeof DeleteGroupRepositoryImpl>;
 export {};

package/features/contentModelGroup/DeleteGroup/DeleteGroupRepository.js

@@ -3,13 +3,16 @@ import { DeleteGroupRepository } from "./abstractions.js";
 import { GroupCache, PluginGroupsProvider } from "../shared/abstractions.js";
 import { GroupCannotDeleteCodeDefinedError, GroupHasModelsError, GroupPersistenceError } from "../../../domain/contentModelGroup/errors.js";
 import { StorageOperations } from "../../shared/abstractions.js";
+import { RuntimeTenant } from "../../runtimeTenant/abstractions.js";
 class DeleteGroupRepositoryImpl {
-    constructor(groupCache, pluginGroupsProvider, storageOperations){
+    constructor(groupCache, pluginGroupsProvider, storageOperations, runtimeTenant){
         this.groupCache = groupCache;
         this.pluginGroupsProvider = pluginGroupsProvider;
         this.storageOperations = storageOperations;
+        this.runtimeTenant = runtimeTenant;
     }
-    async execute(group) {
+    async execute(initialGroup) {
+        const group = this.runtimeTenant.assign(initialGroup);
         try {
             const pluginGroups = await this.pluginGroupsProvider.getGroups();
             const isPluginGroup = pluginGroups.some((pg)=>pg.slug === group.slug);
@@ -37,7 +40,8 @@ const DeleteGroupRepository_DeleteGroupRepository = createImplementation({
     dependencies: [
         GroupCache,
         PluginGroupsProvider,
-        StorageOperations
+        StorageOperations,
+        RuntimeTenant
     ]
 });
 export { DeleteGroupRepository_DeleteGroupRepository as DeleteGroupRepository };

package/features/contentModelGroup/DeleteGroup/DeleteGroupRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModelGroup/DeleteGroup/DeleteGroupRepository.js","sources":["../../../../src/features/contentModelGroup/DeleteGroup/DeleteGroupRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { DeleteGroupRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { GroupCache } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { PluginGroupsProvider } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { GroupCannotDeleteCodeDefinedError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupHasModelsError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupPersistenceError } from \"~/domain/contentModelGroup/errors.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport type { CmsGroup } from \"~/types/index.js\";\n\n/**\n * DeleteGroupRepository - Validates and performs group deletion.\n *\n * Responsibilities:\n * - Check if group is plugin-based (cannot delete)\n * - Check if models reference this group (cannot delete)\n * - Persist deletion to storage\n * - Clear GroupCache after successful deletion\n */\nclass DeleteGroupRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private groupCache: GroupCache.Interface,\n        private pluginGroupsProvider: PluginGroupsProvider.Interface,\n        private storageOperations: StorageOperations.Interface\n    ) {}\n\n    async execute(group: CmsGroup): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            // Check if this is a plugin-based group (cannot be deleted)\n            const pluginGroups = await this.pluginGroupsProvider.getGroups();\n            const isPluginGroup = pluginGroups.some(pg => pg.slug === group.slug);\n\n            if (isPluginGroup) {\n                return Result.fail(new GroupCannotDeleteCodeDefinedError(group.id));\n            }\n\n            // Check if any models reference this group\n            const models = await this.storageOperations.models.list({\n                where: {\n                    tenant: group.tenant\n                }\n            });\n\n            const items = models.filter(model => model.group === group.slug);\n            if (items.length > 0) {\n                return Result.fail(new GroupHasModelsError());\n            }\n\n            // Perform deletion\n            await this.storageOperations.groups.delete({ group });\n\n            // Clear cache\n            this.groupCache.clear();\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new GroupPersistenceError(error as Error));\n        }\n    }\n}\n\nexport const DeleteGroupRepository = createImplementation({\n    abstraction: RepositoryAbstraction,\n    implementation: DeleteGroupRepositoryImpl,\n    dependencies: [GroupCache, PluginGroupsProvider, StorageOperations]\n});\n"],"names":["DeleteGroupRepositoryImpl","groupCache","pluginGroupsProvider","storageOperations","group","pluginGroups","isPluginGroup","pg","Result","GroupCannotDeleteCodeDefinedError","models","items","model","GroupHasModelsError","error","GroupPersistenceError","DeleteGroupRepository","createImplementation","RepositoryAbstraction","GroupCache","PluginGroupsProvider","StorageOperations"],"mappings":";;;;;AAoBA,MAAMA;IACF,YACYC,UAAgC,EAChCC,oBAAoD,EACpDC,iBAA8C,CACxD;aAHUF,UAAU,GAAVA;aACAC,oBAAoB,GAApBA;aACAC,iBAAiB,GAAjBA;IACT;IAEH,MAAM,QAAQC,KAAe,EAAsD;QAC/E,IAAI;YAEA,MAAMC,eAAe,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS;YAC9D,MAAMC,gBAAgBD,aAAa,IAAI,CAACE,CAAAA,KAAMA,GAAG,IAAI,KAAKH,MAAM,IAAI;YAEpE,IAAIE,eACA,OAAOE,OAAO,IAAI,CAAC,IAAIC,kCAAkCL,MAAM,EAAE;YAIrE,MAAMM,SAAS,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;gBACpD,OAAO;oBACH,QAAQN,MAAM,MAAM;gBACxB;YACJ;YAEA,MAAMO,QAAQD,OAAO,MAAM,CAACE,CAAAA,QAASA,MAAM,KAAK,KAAKR,MAAM,IAAI;YAC/D,IAAIO,MAAM,MAAM,GAAG,GACf,OAAOH,OAAO,IAAI,CAAC,IAAIK;YAI3B,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC;gBAAET;YAAM;YAGnD,IAAI,CAAC,UAAU,CAAC,KAAK;YAErB,OAAOI,OAAO,EAAE;QACpB,EAAE,OAAOM,OAAO;YACZ,OAAON,OAAO,IAAI,CAAC,IAAIO,sBAAsBD;QACjD;IACJ;AACJ;AAEO,MAAME,8CAAwBC,qBAAqB;IACtD,aAAaC;IACb,gBAAgBlB;IAChB,cAAc;QAACmB;QAAYC;QAAsBC;KAAkB;AACvE"}
+{"version":3,"file":"features/contentModelGroup/DeleteGroup/DeleteGroupRepository.js","sources":["../../../../src/features/contentModelGroup/DeleteGroup/DeleteGroupRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { DeleteGroupRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { GroupCache } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { PluginGroupsProvider } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { GroupCannotDeleteCodeDefinedError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupHasModelsError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupPersistenceError } from \"~/domain/contentModelGroup/errors.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport type { CmsGroup } from \"~/types/index.js\";\nimport { RuntimeTenant } from \"~/features/runtimeTenant/abstractions.js\";\n\n/**\n * DeleteGroupRepository - Validates and performs group deletion.\n *\n * Responsibilities:\n * - Check if group is plugin-based (cannot delete)\n * - Check if models reference this group (cannot delete)\n * - Persist deletion to storage\n * - Clear GroupCache after successful deletion\n */\nclass DeleteGroupRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private groupCache: GroupCache.Interface,\n        private pluginGroupsProvider: PluginGroupsProvider.Interface,\n        private storageOperations: StorageOperations.Interface,\n        private runtimeTenant: RuntimeTenant.Interface\n    ) {}\n\n    async execute(initialGroup: CmsGroup): Promise<Result<void, RepositoryAbstraction.Error>> {\n        const group = this.runtimeTenant.assign(initialGroup);\n        try {\n            // Check if this is a plugin-based group (cannot be deleted)\n            const pluginGroups = await this.pluginGroupsProvider.getGroups();\n            const isPluginGroup = pluginGroups.some(pg => pg.slug === group.slug);\n\n            if (isPluginGroup) {\n                return Result.fail(new GroupCannotDeleteCodeDefinedError(group.id));\n            }\n\n            // Check if any models reference this group\n            const models = await this.storageOperations.models.list({\n                where: {\n                    tenant: group.tenant\n                }\n            });\n\n            const items = models.filter(model => model.group === group.slug);\n            if (items.length > 0) {\n                return Result.fail(new GroupHasModelsError());\n            }\n\n            // Perform deletion\n            await this.storageOperations.groups.delete({ group });\n\n            // Clear cache\n            this.groupCache.clear();\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new GroupPersistenceError(error as Error));\n        }\n    }\n}\n\nexport const DeleteGroupRepository = createImplementation({\n    abstraction: RepositoryAbstraction,\n    implementation: DeleteGroupRepositoryImpl,\n    dependencies: [GroupCache, PluginGroupsProvider, StorageOperations, RuntimeTenant]\n});\n"],"names":["DeleteGroupRepositoryImpl","groupCache","pluginGroupsProvider","storageOperations","runtimeTenant","initialGroup","group","pluginGroups","isPluginGroup","pg","Result","GroupCannotDeleteCodeDefinedError","models","items","model","GroupHasModelsError","error","GroupPersistenceError","DeleteGroupRepository","createImplementation","RepositoryAbstraction","GroupCache","PluginGroupsProvider","StorageOperations","RuntimeTenant"],"mappings":";;;;;;AAqBA,MAAMA;IACF,YACYC,UAAgC,EAChCC,oBAAoD,EACpDC,iBAA8C,EAC9CC,aAAsC,CAChD;aAJUH,UAAU,GAAVA;aACAC,oBAAoB,GAApBA;aACAC,iBAAiB,GAAjBA;aACAC,aAAa,GAAbA;IACT;IAEH,MAAM,QAAQC,YAAsB,EAAsD;QACtF,MAAMC,QAAQ,IAAI,CAAC,aAAa,CAAC,MAAM,CAACD;QACxC,IAAI;YAEA,MAAME,eAAe,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS;YAC9D,MAAMC,gBAAgBD,aAAa,IAAI,CAACE,CAAAA,KAAMA,GAAG,IAAI,KAAKH,MAAM,IAAI;YAEpE,IAAIE,eACA,OAAOE,OAAO,IAAI,CAAC,IAAIC,kCAAkCL,MAAM,EAAE;YAIrE,MAAMM,SAAS,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;gBACpD,OAAO;oBACH,QAAQN,MAAM,MAAM;gBACxB;YACJ;YAEA,MAAMO,QAAQD,OAAO,MAAM,CAACE,CAAAA,QAASA,MAAM,KAAK,KAAKR,MAAM,IAAI;YAC/D,IAAIO,MAAM,MAAM,GAAG,GACf,OAAOH,OAAO,IAAI,CAAC,IAAIK;YAI3B,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC;gBAAET;YAAM;YAGnD,IAAI,CAAC,UAAU,CAAC,KAAK;YAErB,OAAOI,OAAO,EAAE;QACpB,EAAE,OAAOM,OAAO;YACZ,OAAON,OAAO,IAAI,CAAC,IAAIO,sBAAsBD;QACjD;IACJ;AACJ;AAEO,MAAME,8CAAwBC,qBAAqB;IACtD,aAAaC;IACb,gBAAgBpB;IAChB,cAAc;QAACqB;QAAYC;QAAsBC;QAAmBC;KAAc;AACtF"}

package/features/contentModelGroup/UpdateGroup/UpdateGroupRepository.d.ts

@@ -4,6 +4,7 @@ import { GroupCache } from "../../../features/contentModelGroup/shared/abstracti
 import { PluginGroupsProvider } from "../../../features/contentModelGroup/shared/abstractions.js";
 import { StorageOperations } from "../../../features/shared/abstractions.js";
 import type { CmsGroup } from "../../../types/index.js";
+import { RuntimeTenant } from "../../../features/runtimeTenant/abstractions.js";
 /**
  * UpdateGroupRepository - Validates and persists group updates.
  *
@@ -16,8 +17,9 @@ declare class UpdateGroupRepositoryImpl implements RepositoryAbstraction.Interfa
     private groupCache;
     private pluginGroupsProvider;
     private storageOperations;
-    constructor(groupCache: GroupCache.Interface, pluginGroupsProvider: PluginGroupsProvider.Interface, storageOperations: StorageOperations.Interface);
-    execute(group: CmsGroup): Promise<Result<void, RepositoryAbstraction.Error>>;
+    private runtimeTenant;
+    constructor(groupCache: GroupCache.Interface, pluginGroupsProvider: PluginGroupsProvider.Interface, storageOperations: StorageOperations.Interface, runtimeTenant: RuntimeTenant.Interface);
+    execute(initialGroup: CmsGroup): Promise<Result<CmsGroup, RepositoryAbstraction.Error>>;
 }
 export declare const UpdateGroupRepository: import("@webiny/di").Implementation<typeof UpdateGroupRepositoryImpl>;
 export {};

package/features/contentModelGroup/UpdateGroup/UpdateGroupRepository.js

@@ -3,13 +3,16 @@ import { UpdateGroupRepository } from "./abstractions.js";
 import { GroupCache, PluginGroupsProvider } from "../shared/abstractions.js";
 import { GroupCannotUpdateCodeDefinedError, GroupPersistenceError } from "../../../domain/contentModelGroup/errors.js";
 import { StorageOperations } from "../../shared/abstractions.js";
+import { RuntimeTenant } from "../../runtimeTenant/abstractions.js";
 class UpdateGroupRepositoryImpl {
-    constructor(groupCache, pluginGroupsProvider, storageOperations){
+    constructor(groupCache, pluginGroupsProvider, storageOperations, runtimeTenant){
         this.groupCache = groupCache;
         this.pluginGroupsProvider = pluginGroupsProvider;
         this.storageOperations = storageOperations;
+        this.runtimeTenant = runtimeTenant;
     }
-    async execute(group) {
+    async execute(initialGroup) {
+        const group = this.runtimeTenant.assign(initialGroup);
         try {
             const pluginGroups = await this.pluginGroupsProvider.getGroups();
             const isPluginGroup = pluginGroups.some((pg)=>pg.slug === group.slug);
@@ -18,7 +21,7 @@ class UpdateGroupRepositoryImpl {
                 group
             });
             this.groupCache.clear();
-            return Result.ok();
+            return Result.ok(group);
         } catch (error) {
             return Result.fail(new GroupPersistenceError(error));
         }
@@ -30,7 +33,8 @@ const UpdateGroupRepository_UpdateGroupRepository = createImplementation({
     dependencies: [
         GroupCache,
         PluginGroupsProvider,
-        StorageOperations
+        StorageOperations,
+        RuntimeTenant
     ]
 });
 export { UpdateGroupRepository_UpdateGroupRepository as UpdateGroupRepository };

package/features/contentModelGroup/UpdateGroup/UpdateGroupRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModelGroup/UpdateGroup/UpdateGroupRepository.js","sources":["../../../../src/features/contentModelGroup/UpdateGroup/UpdateGroupRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { UpdateGroupRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { GroupCache } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { PluginGroupsProvider } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { GroupCannotUpdateCodeDefinedError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupPersistenceError } from \"~/domain/contentModelGroup/errors.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport type { CmsGroup } from \"~/types/index.js\";\n\n/**\n * UpdateGroupRepository - Validates and persists group updates.\n *\n * Responsibilities:\n * - Check if group is plugin-based (cannot update)\n * - Persist updates to storage\n * - Clear GroupCache after successful update\n */\nclass UpdateGroupRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private groupCache: GroupCache.Interface,\n        private pluginGroupsProvider: PluginGroupsProvider.Interface,\n        private storageOperations: StorageOperations.Interface\n    ) {}\n\n    async execute(group: CmsGroup): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            // Check if this is a plugin-based group (cannot be updated)\n            const pluginGroups = await this.pluginGroupsProvider.getGroups();\n            const isPluginGroup = pluginGroups.some(pg => pg.slug === group.slug);\n\n            if (isPluginGroup) {\n                return Result.fail(new GroupCannotUpdateCodeDefinedError(group.id));\n            }\n\n            // Persist updates\n            await this.storageOperations.groups.update({ group });\n\n            // Clear cache\n            this.groupCache.clear();\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new GroupPersistenceError(error as Error));\n        }\n    }\n}\n\nexport const UpdateGroupRepository = createImplementation({\n    abstraction: RepositoryAbstraction,\n    implementation: UpdateGroupRepositoryImpl,\n    dependencies: [GroupCache, PluginGroupsProvider, StorageOperations]\n});\n"],"names":["UpdateGroupRepositoryImpl","groupCache","pluginGroupsProvider","storageOperations","group","pluginGroups","isPluginGroup","pg","Result","GroupCannotUpdateCodeDefinedError","error","GroupPersistenceError","UpdateGroupRepository","createImplementation","RepositoryAbstraction","GroupCache","PluginGroupsProvider","StorageOperations"],"mappings":";;;;;AAkBA,MAAMA;IACF,YACYC,UAAgC,EAChCC,oBAAoD,EACpDC,iBAA8C,CACxD;aAHUF,UAAU,GAAVA;aACAC,oBAAoB,GAApBA;aACAC,iBAAiB,GAAjBA;IACT;IAEH,MAAM,QAAQC,KAAe,EAAsD;QAC/E,IAAI;YAEA,MAAMC,eAAe,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS;YAC9D,MAAMC,gBAAgBD,aAAa,IAAI,CAACE,CAAAA,KAAMA,GAAG,IAAI,KAAKH,MAAM,IAAI;YAEpE,IAAIE,eACA,OAAOE,OAAO,IAAI,CAAC,IAAIC,kCAAkCL,MAAM,EAAE;YAIrE,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC;gBAAEA;YAAM;YAGnD,IAAI,CAAC,UAAU,CAAC,KAAK;YAErB,OAAOI,OAAO,EAAE;QACpB,EAAE,OAAOE,OAAO;YACZ,OAAOF,OAAO,IAAI,CAAC,IAAIG,sBAAsBD;QACjD;IACJ;AACJ;AAEO,MAAME,8CAAwBC,qBAAqB;IACtD,aAAaC;IACb,gBAAgBd;IAChB,cAAc;QAACe;QAAYC;QAAsBC;KAAkB;AACvE"}
+{"version":3,"file":"features/contentModelGroup/UpdateGroup/UpdateGroupRepository.js","sources":["../../../../src/features/contentModelGroup/UpdateGroup/UpdateGroupRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { UpdateGroupRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { GroupCache } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { PluginGroupsProvider } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { GroupCannotUpdateCodeDefinedError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupPersistenceError } from \"~/domain/contentModelGroup/errors.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport type { CmsGroup } from \"~/types/index.js\";\nimport { RuntimeTenant } from \"~/features/runtimeTenant/abstractions.js\";\n\n/**\n * UpdateGroupRepository - Validates and persists group updates.\n *\n * Responsibilities:\n * - Check if group is plugin-based (cannot update)\n * - Persist updates to storage\n * - Clear GroupCache after successful update\n */\nclass UpdateGroupRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private groupCache: GroupCache.Interface,\n        private pluginGroupsProvider: PluginGroupsProvider.Interface,\n        private storageOperations: StorageOperations.Interface,\n        private runtimeTenant: RuntimeTenant.Interface\n    ) {}\n\n    async execute(initialGroup: CmsGroup): Promise<Result<CmsGroup, RepositoryAbstraction.Error>> {\n        const group = this.runtimeTenant.assign(initialGroup);\n        try {\n            // Check if this is a plugin-based group (cannot be updated)\n            const pluginGroups = await this.pluginGroupsProvider.getGroups();\n            const isPluginGroup = pluginGroups.some(pg => pg.slug === group.slug);\n\n            if (isPluginGroup) {\n                return Result.fail(new GroupCannotUpdateCodeDefinedError(group.id));\n            }\n\n            // Persist updates\n            await this.storageOperations.groups.update({ group });\n\n            // Clear cache\n            this.groupCache.clear();\n\n            return Result.ok(group);\n        } catch (error) {\n            return Result.fail(new GroupPersistenceError(error as Error));\n        }\n    }\n}\n\nexport const UpdateGroupRepository = createImplementation({\n    abstraction: RepositoryAbstraction,\n    implementation: UpdateGroupRepositoryImpl,\n    dependencies: [GroupCache, PluginGroupsProvider, StorageOperations, RuntimeTenant]\n});\n"],"names":["UpdateGroupRepositoryImpl","groupCache","pluginGroupsProvider","storageOperations","runtimeTenant","initialGroup","group","pluginGroups","isPluginGroup","pg","Result","GroupCannotUpdateCodeDefinedError","error","GroupPersistenceError","UpdateGroupRepository","createImplementation","RepositoryAbstraction","GroupCache","PluginGroupsProvider","StorageOperations","RuntimeTenant"],"mappings":";;;;;;AAmBA,MAAMA;IACF,YACYC,UAAgC,EAChCC,oBAAoD,EACpDC,iBAA8C,EAC9CC,aAAsC,CAChD;aAJUH,UAAU,GAAVA;aACAC,oBAAoB,GAApBA;aACAC,iBAAiB,GAAjBA;aACAC,aAAa,GAAbA;IACT;IAEH,MAAM,QAAQC,YAAsB,EAA0D;QAC1F,MAAMC,QAAQ,IAAI,CAAC,aAAa,CAAC,MAAM,CAACD;QACxC,IAAI;YAEA,MAAME,eAAe,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS;YAC9D,MAAMC,gBAAgBD,aAAa,IAAI,CAACE,CAAAA,KAAMA,GAAG,IAAI,KAAKH,MAAM,IAAI;YAEpE,IAAIE,eACA,OAAOE,OAAO,IAAI,CAAC,IAAIC,kCAAkCL,MAAM,EAAE;YAIrE,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC;gBAAEA;YAAM;YAGnD,IAAI,CAAC,UAAU,CAAC,KAAK;YAErB,OAAOI,OAAO,EAAE,CAACJ;QACrB,EAAE,OAAOM,OAAO;YACZ,OAAOF,OAAO,IAAI,CAAC,IAAIG,sBAAsBD;QACjD;IACJ;AACJ;AAEO,MAAME,8CAAwBC,qBAAqB;IACtD,aAAaC;IACb,gBAAgBhB;IAChB,cAAc;QAACiB;QAAYC;QAAsBC;QAAmBC;KAAc;AACtF"}

package/features/contentModelGroup/UpdateGroup/UpdateGroupUseCase.js

@@ -59,9 +59,9 @@ class UpdateGroupUseCaseImpl {
             }
             await this.eventPublisher.publish(new GroupAfterUpdateEvent({
                 original,
-                group
+                group: result.value
             }));
-            return Result.ok(group);
+            return Result.ok(result.value);
         } catch (error) {
             await this.eventPublisher.publish(new GroupUpdateErrorEvent({
                 input,

package/features/contentModelGroup/UpdateGroup/UpdateGroupUseCase.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModelGroup/UpdateGroup/UpdateGroupUseCase.js","sources":["../../../../src/features/contentModelGroup/UpdateGroup/UpdateGroupUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { UpdateGroupUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { UpdateGroupRepository } from \"./abstractions.js\";\nimport { GetGroupUseCase } from \"~/features/contentModelGroup/GetGroup/abstractions.js\";\nimport { EventPublisher } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport { GroupBeforeUpdateEvent } from \"./events.js\";\nimport { GroupAfterUpdateEvent } from \"./events.js\";\nimport { GroupUpdateErrorEvent } from \"./events.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport {\n    GroupNotAuthorizedError,\n    GroupValidationError\n} from \"~/domain/contentModelGroup/errors.js\";\nimport { createZodError } from \"@webiny/utils\";\nimport { createGroupUpdateValidation } from \"~/domain/contentModelGroup/validation.js\";\nimport type { CmsGroup } from \"~/types/index.js\";\nimport type { CmsGroupUpdateInput } from \"~/types/index.js\";\n\n/**\n * UpdateGroupUseCase - Orchestrates group updates.\n *\n * Responsibilities:\n * - Fetch original group\n * - Access control checks\n * - Validate input (Zod)\n * - Skip if no changes\n * - Merge changes\n * - Publish before event\n * - Delegate to repository\n * - Publish after event or error event\n */\nclass UpdateGroupUseCaseImpl implements UseCaseAbstraction.Interface {\n    public constructor(\n        private eventPublisher: EventPublisher.Interface,\n        private repository: UpdateGroupRepository.Interface,\n        private getGroupUseCase: GetGroupUseCase.Interface,\n        private accessControl: AccessControl.Interface,\n        private tenantContext: TenantContext.Interface\n    ) {}\n\n    async execute(\n        groupId: string,\n        input: CmsGroupUpdateInput\n    ): Promise<Result<CmsGroup, UseCaseAbstraction.Error>> {\n        // Initial access control check\n        const canAccess = await this.accessControl.canAccessGroup({ rwd: \"w\" });\n        if (!canAccess) {\n            return Result.fail(new GroupNotAuthorizedError());\n        }\n\n        // Fetch original group\n        const getResult = await this.getGroupUseCase.execute(groupId);\n        if (getResult.isFail()) {\n            return Result.fail(getResult.error);\n        }\n        const original = getResult.value;\n\n        // Access control check on original group\n        const canAccessGroup = await this.accessControl.canAccessGroup({ group: original });\n        if (!canAccessGroup) {\n            return Result.fail(new GroupNotAuthorizedError());\n        }\n\n        // Validate input\n        const validationResult = await createGroupUpdateValidation().safeParseAsync(input);\n        if (!validationResult.success) {\n            const zodError = createZodError(validationResult.error);\n            return Result.fail(\n                new GroupValidationError(zodError.message, zodError.data!.invalidFields)\n            );\n        }\n        const data = validationResult.data;\n\n        // Skip if no changes\n        if (Object.keys(data).length === 0) {\n            return Result.ok(original);\n        }\n\n        // Merge changes\n        const tenant = this.tenantContext.getTenant();\n        const group: CmsGroup = {\n            ...original,\n            ...data,\n            tenant: tenant.id,\n            savedOn: new Date().toISOString()\n        };\n\n        try {\n            // Publish before event\n            await this.eventPublisher.publish(\n                new GroupBeforeUpdateEvent({\n                    original,\n                    group\n                })\n            );\n\n            // Persist via repository\n            const result = await this.repository.execute(group);\n            if (result.isFail()) {\n                // Publish error event\n                await this.eventPublisher.publish(\n                    new GroupUpdateErrorEvent({\n                        input,\n                        original,\n                        group,\n                        error: result.error\n                    })\n                );\n                return Result.fail(result.error);\n            }\n\n            // Publish after event\n            await this.eventPublisher.publish(\n                new GroupAfterUpdateEvent({\n                    original,\n                    group\n                })\n            );\n\n            return Result.ok(group);\n        } catch (error) {\n            // Publish error event for unexpected errors\n            await this.eventPublisher.publish(\n                new GroupUpdateErrorEvent({\n                    input,\n                    original,\n                    group,\n                    error: error as Error\n                })\n            );\n            return Result.fail(error as UseCaseAbstraction.Error);\n        }\n    }\n}\n\nexport const UpdateGroupUseCase = createImplementation({\n    abstraction: UseCaseAbstraction,\n    implementation: UpdateGroupUseCaseImpl,\n    dependencies: [\n        EventPublisher,\n        UpdateGroupRepository,\n        GetGroupUseCase,\n        AccessControl,\n        TenantContext\n    ]\n});\n"],"names":["UpdateGroupUseCaseImpl","eventPublisher","repository","getGroupUseCase","accessControl","tenantContext","groupId","input","canAccess","Result","GroupNotAuthorizedError","getResult","original","canAccessGroup","validationResult","createGroupUpdateValidation","zodError","createZodError","GroupValidationError","data","Object","tenant","group","Date","GroupBeforeUpdateEvent","result","GroupUpdateErrorEvent","GroupAfterUpdateEvent","error","UpdateGroupUseCase","createImplementation","UseCaseAbstraction","EventPublisher","UpdateGroupRepository","GetGroupUseCase","AccessControl","TenantContext"],"mappings":";;;;;;;;;;AAiCA,MAAMA;IACF,YACYC,cAAwC,EACxCC,UAA2C,EAC3CC,eAA0C,EAC1CC,aAAsC,EACtCC,aAAsC,CAChD;aALUJ,cAAc,GAAdA;aACAC,UAAU,GAAVA;aACAC,eAAe,GAAfA;aACAC,aAAa,GAAbA;aACAC,aAAa,GAAbA;IACT;IAEH,MAAM,QACFC,OAAe,EACfC,KAA0B,EACyB;QAEnD,MAAMC,YAAY,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAE,KAAK;QAAI;QACrE,IAAI,CAACA,WACD,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAI3B,MAAMC,YAAY,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAACL;QACrD,IAAIK,UAAU,MAAM,IAChB,OAAOF,OAAO,IAAI,CAACE,UAAU,KAAK;QAEtC,MAAMC,WAAWD,UAAU,KAAK;QAGhC,MAAME,iBAAiB,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAE,OAAOD;QAAS;QACjF,IAAI,CAACC,gBACD,OAAOJ,OAAO,IAAI,CAAC,IAAIC;QAI3B,MAAMI,mBAAmB,MAAMC,8BAA8B,cAAc,CAACR;QAC5E,IAAI,CAACO,iBAAiB,OAAO,EAAE;YAC3B,MAAME,WAAWC,eAAeH,iBAAiB,KAAK;YACtD,OAAOL,OAAO,IAAI,CACd,IAAIS,qBAAqBF,SAAS,OAAO,EAAEA,SAAS,IAAI,CAAE,aAAa;QAE/E;QACA,MAAMG,OAAOL,iBAAiB,IAAI;QAGlC,IAAIM,AAA6B,MAA7BA,OAAO,IAAI,CAACD,MAAM,MAAM,EACxB,OAAOV,OAAO,EAAE,CAACG;QAIrB,MAAMS,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;QAC3C,MAAMC,QAAkB;YACpB,GAAGV,QAAQ;YACX,GAAGO,IAAI;YACP,QAAQE,OAAO,EAAE;YACjB,SAAS,IAAIE,OAAO,WAAW;QACnC;QAEA,IAAI;YAEA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIC,uBAAuB;gBACvBZ;gBACAU;YACJ;YAIJ,MAAMG,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACH;YAC7C,IAAIG,OAAO,MAAM,IAAI;gBAEjB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIC,sBAAsB;oBACtBnB;oBACAK;oBACAU;oBACA,OAAOG,OAAO,KAAK;gBACvB;gBAEJ,OAAOhB,OAAO,IAAI,CAACgB,OAAO,KAAK;YACnC;YAGA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIE,sBAAsB;gBACtBf;gBACAU;YACJ;YAGJ,OAAOb,OAAO,EAAE,CAACa;QACrB,EAAE,OAAOM,OAAO;YAEZ,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIF,sBAAsB;gBACtBnB;gBACAK;gBACAU;gBACA,OAAOM;YACX;YAEJ,OAAOnB,OAAO,IAAI,CAACmB;QACvB;IACJ;AACJ;AAEO,MAAMC,wCAAqBC,qBAAqB;IACnD,aAAaC;IACb,gBAAgB/B;IAChB,cAAc;QACVgC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}
+{"version":3,"file":"features/contentModelGroup/UpdateGroup/UpdateGroupUseCase.js","sources":["../../../../src/features/contentModelGroup/UpdateGroup/UpdateGroupUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { UpdateGroupUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { UpdateGroupRepository } from \"./abstractions.js\";\nimport { GetGroupUseCase } from \"~/features/contentModelGroup/GetGroup/abstractions.js\";\nimport { EventPublisher } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport { GroupBeforeUpdateEvent } from \"./events.js\";\nimport { GroupAfterUpdateEvent } from \"./events.js\";\nimport { GroupUpdateErrorEvent } from \"./events.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport {\n    GroupNotAuthorizedError,\n    GroupValidationError\n} from \"~/domain/contentModelGroup/errors.js\";\nimport { createZodError } from \"@webiny/utils\";\nimport { createGroupUpdateValidation } from \"~/domain/contentModelGroup/validation.js\";\nimport type { CmsGroup } from \"~/types/index.js\";\nimport type { CmsGroupUpdateInput } from \"~/types/index.js\";\n\n/**\n * UpdateGroupUseCase - Orchestrates group updates.\n *\n * Responsibilities:\n * - Fetch original group\n * - Access control checks\n * - Validate input (Zod)\n * - Skip if no changes\n * - Merge changes\n * - Publish before event\n * - Delegate to repository\n * - Publish after event or error event\n */\nclass UpdateGroupUseCaseImpl implements UseCaseAbstraction.Interface {\n    public constructor(\n        private eventPublisher: EventPublisher.Interface,\n        private repository: UpdateGroupRepository.Interface,\n        private getGroupUseCase: GetGroupUseCase.Interface,\n        private accessControl: AccessControl.Interface,\n        private tenantContext: TenantContext.Interface\n    ) {}\n\n    async execute(\n        groupId: string,\n        input: CmsGroupUpdateInput\n    ): Promise<Result<CmsGroup, UseCaseAbstraction.Error>> {\n        // Initial access control check\n        const canAccess = await this.accessControl.canAccessGroup({ rwd: \"w\" });\n        if (!canAccess) {\n            return Result.fail(new GroupNotAuthorizedError());\n        }\n\n        // Fetch original group\n        const getResult = await this.getGroupUseCase.execute(groupId);\n        if (getResult.isFail()) {\n            return Result.fail(getResult.error);\n        }\n        const original = getResult.value;\n\n        // Access control check on original group\n        const canAccessGroup = await this.accessControl.canAccessGroup({ group: original });\n        if (!canAccessGroup) {\n            return Result.fail(new GroupNotAuthorizedError());\n        }\n\n        // Validate input\n        const validationResult = await createGroupUpdateValidation().safeParseAsync(input);\n        if (!validationResult.success) {\n            const zodError = createZodError(validationResult.error);\n            return Result.fail(\n                new GroupValidationError(zodError.message, zodError.data!.invalidFields)\n            );\n        }\n        const data = validationResult.data;\n\n        // Skip if no changes\n        if (Object.keys(data).length === 0) {\n            return Result.ok(original);\n        }\n\n        // Merge changes\n        const tenant = this.tenantContext.getTenant();\n        const group: CmsGroup = {\n            ...original,\n            ...data,\n            tenant: tenant.id,\n            savedOn: new Date().toISOString()\n        };\n\n        try {\n            // Publish before event\n            await this.eventPublisher.publish(\n                new GroupBeforeUpdateEvent({\n                    original,\n                    group\n                })\n            );\n\n            // Persist via repository\n            const result = await this.repository.execute(group);\n            if (result.isFail()) {\n                // Publish error event\n                await this.eventPublisher.publish(\n                    new GroupUpdateErrorEvent({\n                        input,\n                        original,\n                        group,\n                        error: result.error\n                    })\n                );\n                return Result.fail(result.error);\n            }\n\n            // Publish after event\n            await this.eventPublisher.publish(\n                new GroupAfterUpdateEvent({\n                    original,\n                    group: result.value\n                })\n            );\n\n            return Result.ok(result.value);\n        } catch (error) {\n            // Publish error event for unexpected errors\n            await this.eventPublisher.publish(\n                new GroupUpdateErrorEvent({\n                    input,\n                    original,\n                    group,\n                    error: error as Error\n                })\n            );\n            return Result.fail(error as UseCaseAbstraction.Error);\n        }\n    }\n}\n\nexport const UpdateGroupUseCase = createImplementation({\n    abstraction: UseCaseAbstraction,\n    implementation: UpdateGroupUseCaseImpl,\n    dependencies: [\n        EventPublisher,\n        UpdateGroupRepository,\n        GetGroupUseCase,\n        AccessControl,\n        TenantContext\n    ]\n});\n"],"names":["UpdateGroupUseCaseImpl","eventPublisher","repository","getGroupUseCase","accessControl","tenantContext","groupId","input","canAccess","Result","GroupNotAuthorizedError","getResult","original","canAccessGroup","validationResult","createGroupUpdateValidation","zodError","createZodError","GroupValidationError","data","Object","tenant","group","Date","GroupBeforeUpdateEvent","result","GroupUpdateErrorEvent","GroupAfterUpdateEvent","error","UpdateGroupUseCase","createImplementation","UseCaseAbstraction","EventPublisher","UpdateGroupRepository","GetGroupUseCase","AccessControl","TenantContext"],"mappings":";;;;;;;;;;AAiCA,MAAMA;IACF,YACYC,cAAwC,EACxCC,UAA2C,EAC3CC,eAA0C,EAC1CC,aAAsC,EACtCC,aAAsC,CAChD;aALUJ,cAAc,GAAdA;aACAC,UAAU,GAAVA;aACAC,eAAe,GAAfA;aACAC,aAAa,GAAbA;aACAC,aAAa,GAAbA;IACT;IAEH,MAAM,QACFC,OAAe,EACfC,KAA0B,EACyB;QAEnD,MAAMC,YAAY,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAE,KAAK;QAAI;QACrE,IAAI,CAACA,WACD,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAI3B,MAAMC,YAAY,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAACL;QACrD,IAAIK,UAAU,MAAM,IAChB,OAAOF,OAAO,IAAI,CAACE,UAAU,KAAK;QAEtC,MAAMC,WAAWD,UAAU,KAAK;QAGhC,MAAME,iBAAiB,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAE,OAAOD;QAAS;QACjF,IAAI,CAACC,gBACD,OAAOJ,OAAO,IAAI,CAAC,IAAIC;QAI3B,MAAMI,mBAAmB,MAAMC,8BAA8B,cAAc,CAACR;QAC5E,IAAI,CAACO,iBAAiB,OAAO,EAAE;YAC3B,MAAME,WAAWC,eAAeH,iBAAiB,KAAK;YACtD,OAAOL,OAAO,IAAI,CACd,IAAIS,qBAAqBF,SAAS,OAAO,EAAEA,SAAS,IAAI,CAAE,aAAa;QAE/E;QACA,MAAMG,OAAOL,iBAAiB,IAAI;QAGlC,IAAIM,AAA6B,MAA7BA,OAAO,IAAI,CAACD,MAAM,MAAM,EACxB,OAAOV,OAAO,EAAE,CAACG;QAIrB,MAAMS,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;QAC3C,MAAMC,QAAkB;YACpB,GAAGV,QAAQ;YACX,GAAGO,IAAI;YACP,QAAQE,OAAO,EAAE;YACjB,SAAS,IAAIE,OAAO,WAAW;QACnC;QAEA,IAAI;YAEA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIC,uBAAuB;gBACvBZ;gBACAU;YACJ;YAIJ,MAAMG,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACH;YAC7C,IAAIG,OAAO,MAAM,IAAI;gBAEjB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIC,sBAAsB;oBACtBnB;oBACAK;oBACAU;oBACA,OAAOG,OAAO,KAAK;gBACvB;gBAEJ,OAAOhB,OAAO,IAAI,CAACgB,OAAO,KAAK;YACnC;YAGA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIE,sBAAsB;gBACtBf;gBACA,OAAOa,OAAO,KAAK;YACvB;YAGJ,OAAOhB,OAAO,EAAE,CAACgB,OAAO,KAAK;QACjC,EAAE,OAAOG,OAAO;YAEZ,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIF,sBAAsB;gBACtBnB;gBACAK;gBACAU;gBACA,OAAOM;YACX;YAEJ,OAAOnB,OAAO,IAAI,CAACmB;QACvB;IACJ;AACJ;AAEO,MAAMC,wCAAqBC,qBAAqB;IACnD,aAAaC;IACb,gBAAgB/B;IAChB,cAAc;QACVgC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

package/features/contentModelGroup/UpdateGroup/abstractions.d.ts

@@ -27,7 +27,7 @@ export declare namespace UpdateGroupUseCase {
  * UpdateGroupRepository - Persists group updates to storage.
  */
 export interface IUpdateGroupRepository {
-    execute(group: CmsGroup): Promise<Result<void, RepositoryError>>;
+    execute(group: CmsGroup): Promise<Result<CmsGroup, RepositoryError>>;
 }
 export interface IUpdateGroupRepositoryErrors {
     cannotUpdate: GroupCannotUpdateCodeDefinedError;

package/features/contentModelGroup/UpdateGroup/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModelGroup/UpdateGroup/abstractions.js","sources":["../../../../src/features/contentModelGroup/UpdateGroup/abstractions.ts"],"sourcesContent":["import { createAbstraction, Result } from \"@webiny/feature/api\";\nimport type { CmsGroup, CmsGroupUpdateInput } from \"~/types/index.js\";\nimport type {\n    GroupCannotUpdateCodeDefinedError,\n    GroupPersistenceError,\n    GroupValidationError\n} from \"~/domain/contentModelGroup/errors.js\";\nimport {\n    GroupNotAuthorizedError,\n    type GroupNotFoundError\n} from \"~/domain/contentModelGroup/errors.js\";\n\n/**\n * UpdateGroup Use Case\n */\nexport interface IUpdateGroupUseCase {\n    execute(groupId: string, input: CmsGroupUpdateInput): Promise<Result<CmsGroup, UseCaseError>>;\n}\n\nexport interface IUpdateGroupUseCaseErrors {\n    notFound: GroupNotFoundError;\n    notAuthorized: GroupNotAuthorizedError;\n    validation: GroupValidationError;\n    repository: RepositoryError;\n}\n\ntype UseCaseError = IUpdateGroupUseCaseErrors[keyof IUpdateGroupUseCaseErrors];\n\n/** Update a content model group. */\nexport const UpdateGroupUseCase = createAbstraction<IUpdateGroupUseCase>(\"UpdateGroupUseCase\");\n\nexport namespace UpdateGroupUseCase {\n    export type Interface = IUpdateGroupUseCase;\n    export type Input = CmsGroupUpdateInput;\n\n    export type Error = UseCaseError;\n    export type Return = Promise<Result<CmsGroup, UseCaseError>>;\n}\n\n/**\n * UpdateGroupRepository - Persists group updates to storage.\n */\nexport interface IUpdateGroupRepository {\n    execute(group: CmsGroup): Promise<Result<void, RepositoryError>>;\n}\n\nexport interface IUpdateGroupRepositoryErrors {\n    cannotUpdate: GroupCannotUpdateCodeDefinedError;\n    storage: GroupPersistenceError;\n}\n\ntype RepositoryError = IUpdateGroupRepositoryErrors[keyof IUpdateGroupRepositoryErrors];\n\nexport const UpdateGroupRepository =\n    createAbstraction<IUpdateGroupRepository>(\"UpdateGroupRepository\");\n\nexport namespace UpdateGroupRepository {\n    export type Interface = IUpdateGroupRepository;\n    export type Error = RepositoryError;\n}\n"],"names":["UpdateGroupUseCase","createAbstraction","UpdateGroupRepository"],"mappings":";AA6BO,MAAMA,qBAAqBC,kBAAuC;AAwBlE,MAAMC,wBACTD,kBAA0C"}
+{"version":3,"file":"features/contentModelGroup/UpdateGroup/abstractions.js","sources":["../../../../src/features/contentModelGroup/UpdateGroup/abstractions.ts"],"sourcesContent":["import { createAbstraction, Result } from \"@webiny/feature/api\";\nimport type { CmsGroup, CmsGroupUpdateInput } from \"~/types/index.js\";\nimport type {\n    GroupCannotUpdateCodeDefinedError,\n    GroupPersistenceError,\n    GroupValidationError\n} from \"~/domain/contentModelGroup/errors.js\";\nimport {\n    GroupNotAuthorizedError,\n    type GroupNotFoundError\n} from \"~/domain/contentModelGroup/errors.js\";\n\n/**\n * UpdateGroup Use Case\n */\nexport interface IUpdateGroupUseCase {\n    execute(groupId: string, input: CmsGroupUpdateInput): Promise<Result<CmsGroup, UseCaseError>>;\n}\n\nexport interface IUpdateGroupUseCaseErrors {\n    notFound: GroupNotFoundError;\n    notAuthorized: GroupNotAuthorizedError;\n    validation: GroupValidationError;\n    repository: RepositoryError;\n}\n\ntype UseCaseError = IUpdateGroupUseCaseErrors[keyof IUpdateGroupUseCaseErrors];\n\n/** Update a content model group. */\nexport const UpdateGroupUseCase = createAbstraction<IUpdateGroupUseCase>(\"UpdateGroupUseCase\");\n\nexport namespace UpdateGroupUseCase {\n    export type Interface = IUpdateGroupUseCase;\n    export type Input = CmsGroupUpdateInput;\n\n    export type Error = UseCaseError;\n    export type Return = Promise<Result<CmsGroup, UseCaseError>>;\n}\n\n/**\n * UpdateGroupRepository - Persists group updates to storage.\n */\nexport interface IUpdateGroupRepository {\n    execute(group: CmsGroup): Promise<Result<CmsGroup, RepositoryError>>;\n}\n\nexport interface IUpdateGroupRepositoryErrors {\n    cannotUpdate: GroupCannotUpdateCodeDefinedError;\n    storage: GroupPersistenceError;\n}\n\ntype RepositoryError = IUpdateGroupRepositoryErrors[keyof IUpdateGroupRepositoryErrors];\n\nexport const UpdateGroupRepository =\n    createAbstraction<IUpdateGroupRepository>(\"UpdateGroupRepository\");\n\nexport namespace UpdateGroupRepository {\n    export type Interface = IUpdateGroupRepository;\n    export type Error = RepositoryError;\n}\n"],"names":["UpdateGroupUseCase","createAbstraction","UpdateGroupRepository"],"mappings":";AA6BO,MAAMA,qBAAqBC,kBAAuC;AAwBlE,MAAMC,wBACTD,kBAA0C"}

package/features/graphql/fields/base/DynamicZoneToGraphQL.js

@@ -68,6 +68,7 @@ class ReadApi {
         });
         const templateIds = templateTypes.map((type)=>`extend type ${type} {
                 _templateId: ID!
+                _id: ID
             }
             `);
         typeDefs.unshift(`union ${unionTypeName} = ${templateTypes.join(" | ")}`);
@@ -97,6 +98,7 @@ class ManageApi {
         });
         const templateIds = templateTypes.map((type)=>`extend type ${type} {
                 _templateId: ID!
+                _id: ID
             }
             `);
         typeDefs.unshift(`union ${unionTypeName} = ${templateTypes.join(" | ")}`);
@@ -131,9 +133,13 @@ class ManageApi {
                 ${key}: ${value}
             `)}
         }`);
+        const templateInputIds = templateTypes.map((inputTypeName)=>`extend input ${inputTypeName} {
+                _id: ID
+            }
+            `);
         return {
             fields: createGraphQLInputField(field, `${typeName}Input`),
-            typeDefs: typeDefs.join("\n")
+            typeDefs: typeDefs.concat(templateInputIds).join("\n")
         };
     }
     createResolver(params) {

package/features/graphql/fields/base/DynamicZoneToGraphQL.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/graphql/fields/base/DynamicZoneToGraphQL.js","sources":["../../../../../src/features/graphql/fields/base/DynamicZoneToGraphQL.ts"],"sourcesContent":["import { CmsModelFieldToGraphQL } from \"../abstractions/CmsModelFieldToGraphQL.js\";\nimport type {\n    ApiEndpoint,\n    CmsDynamicZoneTemplate,\n    CmsModel,\n    CmsModelDynamicZoneField,\n    CmsModelField,\n    CmsModelFieldType,\n    CmsModelFieldDefinition\n} from \"~/types/index.js\";\nimport type { ValidateChildFieldsParams } from \"../abstractions/CmsModelFieldToGraphQL.js\";\nimport type { CmsModelFieldAstNode, ICmsModelFieldToAst } from \"~/types/modelAst.js\";\nimport type { GraphQLFieldResolver } from \"@webiny/handler-graphql/types.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\nimport { createTypeName } from \"~/utils/createTypeName.js\";\nimport { createGraphQLInputField } from \"./utils/createGraphQLInputField.js\";\nimport { createTypeDefsForTemplates } from \"./dynamicZone/createTypeDefsForTemplates.js\";\nimport { normalizeDynamicZoneInput } from \"./dynamicZone/normalizeDynamicZoneInput.js\";\n\nconst createUnionTypeName = (model: CmsModel, field: CmsModelField) => {\n    return `${model.singularApiName}_${createTypeName(field.fieldId)}`;\n};\n\nconst getFieldTemplates = (field: CmsModelDynamicZoneField): CmsDynamicZoneTemplate[] => {\n    if (!Array.isArray(field.settings?.templates)) {\n        return [];\n    }\n    return field.settings.templates;\n};\n\nconst remapTemplateValue = (value: any, typeName: string) => {\n    return { ...value, __typename: typeName };\n};\n\nconst createDynamicZoneResolver = (\n    endpointType: ApiEndpoint\n): ((params: CmsModelFieldToGraphQL.ResolverParams) => CmsModelFieldToGraphQL.Resolver) => {\n    return ({ model, models, field, fieldRegistry, createFieldResolvers, graphQLType }) => {\n        const dzField = field as CmsModelDynamicZoneField;\n        const templates = getFieldTemplates(dzField);\n\n        if (!templates.length) {\n            return false;\n        }\n\n        const resolver = (parent: any) => {\n            const value = parent[field.fieldId];\n            if (!value) {\n                return value;\n            }\n\n            const typeName = `${graphQLType}_${createTypeName(field.fieldId)}`;\n\n            if (field.list && Array.isArray(value)) {\n                return value.map(v => {\n                    const template = templates.find(tpl => tpl.id === v._templateId);\n                    if (!template) {\n                        return undefined;\n                    }\n                    return remapTemplateValue(v, `${typeName}_${template.gqlTypeName}`);\n                });\n            }\n\n            const template = templates.find(tpl => tpl.id === value._templateId);\n            if (!template) {\n                return undefined;\n            }\n            return remapTemplateValue(value, `${typeName}_${template.gqlTypeName}`);\n        };\n\n        const { templateTypes } = createTypeDefsForTemplates({\n            models,\n            field,\n            type: endpointType,\n            typeOfType: \"type\",\n            model,\n            fieldRegistry,\n            templates\n        });\n\n        const replace = new RegExp(`${model.singularApiName}_`, \"g\");\n\n        const typeResolvers = templateTypes\n            .map(templateType => {\n                return templateType.replace(replace, `${graphQLType}_`);\n            })\n            .reduce<Record<string, Record<string, GraphQLFieldResolver>>>(\n                (typeResolvers, templateType, index) => {\n                    return {\n                        ...typeResolvers,\n                        ...createFieldResolvers({\n                            graphQLType: templateType,\n                            fields: dzField.settings.templates[index].fields\n                        })\n                    };\n                },\n                {}\n            );\n\n        return {\n            resolver,\n            typeResolvers\n        };\n    };\n};\n\nclass ReadApi implements CmsModelFieldToGraphQL.ReadApi {\n    public createTypeField({\n        models,\n        model,\n        field,\n        fieldRegistry\n    }: CmsModelFieldToGraphQL.TypeFieldParams): CmsModelFieldDefinition | null {\n        const dzField = field as CmsModelDynamicZoneField;\n        const templates = getFieldTemplates(dzField);\n        if (!templates.length) {\n            return null;\n        }\n\n        const unionTypeName = createUnionTypeName(model, field);\n\n        const { typeDefs, templateTypes } = createTypeDefsForTemplates({\n            models,\n            field,\n            type: \"read\",\n            typeOfType: \"type\",\n            model,\n            fieldRegistry,\n            templates\n        });\n\n        const templateIds = templateTypes.map(type => {\n            return `extend type ${type} {\n                _templateId: ID!\n            }\n            `;\n        });\n\n        typeDefs.unshift(`union ${unionTypeName} = ${templateTypes.join(\" | \")}`);\n\n        return {\n            fields: `${field.fieldId}: ${field.list ? `[${unionTypeName}!]` : unionTypeName}`,\n            typeDefs: typeDefs.concat(templateIds).join(\"\\n\")\n        };\n    }\n\n    public createResolver(\n        params: CmsModelFieldToGraphQL.ResolverParams\n    ): CmsModelFieldToGraphQL.Resolver {\n        return createDynamicZoneResolver(\"read\")(params);\n    }\n}\n\nclass ManageApi implements CmsModelFieldToGraphQL.ManageApi {\n    public createTypeField({\n        models,\n        model,\n        field,\n        fieldRegistry\n    }: CmsModelFieldToGraphQL.TypeFieldParams): CmsModelFieldDefinition | null {\n        const dzField = field as CmsModelDynamicZoneField;\n        const templates = getFieldTemplates(dzField);\n\n        if (!templates.length) {\n            return null;\n        }\n\n        const unionTypeName = createUnionTypeName(model, field);\n\n        const { typeDefs, templateTypes } = createTypeDefsForTemplates({\n            models,\n            field,\n            type: \"manage\",\n            typeOfType: \"type\",\n            model,\n            fieldRegistry,\n            templates\n        });\n\n        /* Add _templateId. */\n        const templateIds = templateTypes.map(type => {\n            return `extend type ${type} {\n                _templateId: ID!\n            }\n            `;\n        });\n\n        typeDefs.unshift(`union ${unionTypeName} = ${templateTypes.join(\" | \")}`);\n\n        return {\n            fields: `${field.fieldId}: ${field.list ? `[${unionTypeName}!]` : unionTypeName}`,\n            typeDefs: typeDefs.concat(templateIds).join(\"\\n\")\n        };\n    }\n\n    public createInputField({\n        models,\n        model,\n        field,\n        fieldRegistry\n    }: CmsModelFieldToGraphQL.TypeFieldParams): CmsModelFieldDefinition | null {\n        const dzField = field as CmsModelDynamicZoneField;\n        const templates = getFieldTemplates(dzField);\n\n        if (!templates.length) {\n            return null;\n        }\n\n        const { typeDefs, templateTypes } = createTypeDefsForTemplates({\n            models,\n            field,\n            type: \"manage\",\n            typeOfType: \"input\",\n            model,\n            fieldRegistry,\n            templates\n        });\n\n        const typeName = `${model.singularApiName}_${createTypeName(field.fieldId)}`;\n\n        const inputProperties = templateTypes.map(inputTypeName => {\n            const key = inputTypeName.replace(`${typeName}_`, \"\").replace(\"Input\", \"\");\n            return [key, inputTypeName];\n        });\n\n        /**\n         * Generate a field input type, similar to this example:\n         *\n         * input Article_ContentInput {\n         *     Hero: Article_Content_HeroInput\n         *     SimpleText: Article_Content_SimpleTextInput\n         * }\n         */\n        typeDefs.push(`input ${typeName}Input {\n            ${inputProperties.map(\n                ([key, value]) => `\n                ${key}: ${value}\n            `\n            )}\n        }`);\n\n        return {\n            fields: createGraphQLInputField(field, `${typeName}Input`),\n            typeDefs: typeDefs.join(\"\\n\")\n        };\n    }\n\n    public createResolver(\n        params: CmsModelFieldToGraphQL.ResolverParams\n    ): CmsModelFieldToGraphQL.Resolver {\n        return createDynamicZoneResolver(\"manage\")(params);\n    }\n\n    public async normalizeInput<T>({\n        field,\n        input\n    }: CmsModelFieldToGraphQL.InputNormalizeParams): Promise<T> {\n        const dzField = field as CmsModelDynamicZoneField;\n        const templates = dzField.settings?.templates || [];\n\n        if (Array.isArray(input) && field.list) {\n            return input\n                .map(value => normalizeDynamicZoneInput(value, templates))\n                .filter(Boolean) as T;\n        }\n\n        return normalizeDynamicZoneInput(input as GenericRecord<string>, templates) as T;\n    }\n}\n\nclass DynamicZoneToGraphQL implements CmsModelFieldToGraphQL.Interface {\n    public readonly read = new ReadApi();\n    public readonly manage = new ManageApi();\n\n    public readonly fieldType: CmsModelFieldType = \"dynamicZone\";\n    public readonly isSearchable: boolean = false;\n    public readonly isSortable: boolean = false;\n    public readonly isFullTextSearchable: boolean = false;\n\n    public getReadApi(): CmsModelFieldToGraphQL.ReadApi {\n        return this.read;\n    }\n\n    public getManageApi(): CmsModelFieldToGraphQL.ManageApi {\n        return this.manage;\n    }\n\n    public validateChildFields(params: ValidateChildFieldsParams<CmsModelField>): void {\n        const field = params.field as CmsModelDynamicZoneField;\n        const originalField = params.originalField as CmsModelDynamicZoneField | undefined;\n\n        const getOriginalTemplateFields = (templateId: string) => {\n            if (!originalField?.settings?.templates) {\n                return [];\n            }\n            const template = originalField.settings.templates.find(t => t.id === templateId);\n            return template?.fields || [];\n        };\n\n        for (const template of field.settings.templates) {\n            params.validate({\n                fields: template.fields,\n                originalFields: getOriginalTemplateFields(template.id)\n            });\n        }\n    }\n\n    public getFieldAst(field: CmsModelField, converter: ICmsModelFieldToAst): CmsModelFieldAstNode {\n        const dzField = field as CmsModelDynamicZoneField;\n        const { templates = [] } = dzField.settings;\n\n        return {\n            type: \"field\",\n            field,\n            children: templates.map(({ fields, ...template }) => {\n                return {\n                    type: \"collection\" as const,\n                    collection: {\n                        ...template,\n                        discriminator: \"_templateId\"\n                    },\n                    children: fields.map(f => converter.toAst(f))\n                };\n            })\n        };\n    }\n}\n\nexport const DynamicZoneFieldToGraphQL = CmsModelFieldToGraphQL.createImplementation({\n    implementation: DynamicZoneToGraphQL,\n    dependencies: []\n});\n"],"names":["createUnionTypeName","model","field","createTypeName","getFieldTemplates","Array","remapTemplateValue","value","typeName","createDynamicZoneResolver","endpointType","models","fieldRegistry","createFieldResolvers","graphQLType","dzField","templates","resolver","parent","v","template","tpl","templateTypes","createTypeDefsForTemplates","replace","RegExp","typeResolvers","templateType","index","ReadApi","unionTypeName","typeDefs","templateIds","type","params","ManageApi","inputProperties","inputTypeName","key","createGraphQLInputField","input","normalizeDynamicZoneInput","Boolean","DynamicZoneToGraphQL","originalField","getOriginalTemplateFields","templateId","t","converter","fields","f","DynamicZoneFieldToGraphQL","CmsModelFieldToGraphQL"],"mappings":"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"}
+{"version":3,"file":"features/graphql/fields/base/DynamicZoneToGraphQL.js","sources":["../../../../../src/features/graphql/fields/base/DynamicZoneToGraphQL.ts"],"sourcesContent":["import { CmsModelFieldToGraphQL } from \"../abstractions/CmsModelFieldToGraphQL.js\";\nimport type {\n    ApiEndpoint,\n    CmsDynamicZoneTemplate,\n    CmsModel,\n    CmsModelDynamicZoneField,\n    CmsModelField,\n    CmsModelFieldType,\n    CmsModelFieldDefinition\n} from \"~/types/index.js\";\nimport type { ValidateChildFieldsParams } from \"../abstractions/CmsModelFieldToGraphQL.js\";\nimport type { CmsModelFieldAstNode, ICmsModelFieldToAst } from \"~/types/modelAst.js\";\nimport type { GraphQLFieldResolver } from \"@webiny/handler-graphql/types.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\nimport { createTypeName } from \"~/utils/createTypeName.js\";\nimport { createGraphQLInputField } from \"./utils/createGraphQLInputField.js\";\nimport { createTypeDefsForTemplates } from \"./dynamicZone/createTypeDefsForTemplates.js\";\nimport { normalizeDynamicZoneInput } from \"./dynamicZone/normalizeDynamicZoneInput.js\";\n\nconst createUnionTypeName = (model: CmsModel, field: CmsModelField) => {\n    return `${model.singularApiName}_${createTypeName(field.fieldId)}`;\n};\n\nconst getFieldTemplates = (field: CmsModelDynamicZoneField): CmsDynamicZoneTemplate[] => {\n    if (!Array.isArray(field.settings?.templates)) {\n        return [];\n    }\n    return field.settings.templates;\n};\n\nconst remapTemplateValue = (value: any, typeName: string) => {\n    return { ...value, __typename: typeName };\n};\n\nconst createDynamicZoneResolver = (\n    endpointType: ApiEndpoint\n): ((params: CmsModelFieldToGraphQL.ResolverParams) => CmsModelFieldToGraphQL.Resolver) => {\n    return ({ model, models, field, fieldRegistry, createFieldResolvers, graphQLType }) => {\n        const dzField = field as CmsModelDynamicZoneField;\n        const templates = getFieldTemplates(dzField);\n\n        if (!templates.length) {\n            return false;\n        }\n\n        const resolver = (parent: any) => {\n            const value = parent[field.fieldId];\n            if (!value) {\n                return value;\n            }\n\n            const typeName = `${graphQLType}_${createTypeName(field.fieldId)}`;\n\n            if (field.list && Array.isArray(value)) {\n                return value.map(v => {\n                    const template = templates.find(tpl => tpl.id === v._templateId);\n                    if (!template) {\n                        return undefined;\n                    }\n                    return remapTemplateValue(v, `${typeName}_${template.gqlTypeName}`);\n                });\n            }\n\n            const template = templates.find(tpl => tpl.id === value._templateId);\n            if (!template) {\n                return undefined;\n            }\n            return remapTemplateValue(value, `${typeName}_${template.gqlTypeName}`);\n        };\n\n        const { templateTypes } = createTypeDefsForTemplates({\n            models,\n            field,\n            type: endpointType,\n            typeOfType: \"type\",\n            model,\n            fieldRegistry,\n            templates\n        });\n\n        const replace = new RegExp(`${model.singularApiName}_`, \"g\");\n\n        const typeResolvers = templateTypes\n            .map(templateType => {\n                return templateType.replace(replace, `${graphQLType}_`);\n            })\n            .reduce<Record<string, Record<string, GraphQLFieldResolver>>>(\n                (typeResolvers, templateType, index) => {\n                    return {\n                        ...typeResolvers,\n                        ...createFieldResolvers({\n                            graphQLType: templateType,\n                            fields: dzField.settings.templates[index].fields\n                        })\n                    };\n                },\n                {}\n            );\n\n        return {\n            resolver,\n            typeResolvers\n        };\n    };\n};\n\nclass ReadApi implements CmsModelFieldToGraphQL.ReadApi {\n    public createTypeField({\n        models,\n        model,\n        field,\n        fieldRegistry\n    }: CmsModelFieldToGraphQL.TypeFieldParams): CmsModelFieldDefinition | null {\n        const dzField = field as CmsModelDynamicZoneField;\n        const templates = getFieldTemplates(dzField);\n        if (!templates.length) {\n            return null;\n        }\n\n        const unionTypeName = createUnionTypeName(model, field);\n\n        const { typeDefs, templateTypes } = createTypeDefsForTemplates({\n            models,\n            field,\n            type: \"read\",\n            typeOfType: \"type\",\n            model,\n            fieldRegistry,\n            templates\n        });\n\n        const templateIds = templateTypes.map(type => {\n            return `extend type ${type} {\n                _templateId: ID!\n                _id: ID\n            }\n            `;\n        });\n\n        typeDefs.unshift(`union ${unionTypeName} = ${templateTypes.join(\" | \")}`);\n\n        return {\n            fields: `${field.fieldId}: ${field.list ? `[${unionTypeName}!]` : unionTypeName}`,\n            typeDefs: typeDefs.concat(templateIds).join(\"\\n\")\n        };\n    }\n\n    public createResolver(\n        params: CmsModelFieldToGraphQL.ResolverParams\n    ): CmsModelFieldToGraphQL.Resolver {\n        return createDynamicZoneResolver(\"read\")(params);\n    }\n}\n\nclass ManageApi implements CmsModelFieldToGraphQL.ManageApi {\n    public createTypeField({\n        models,\n        model,\n        field,\n        fieldRegistry\n    }: CmsModelFieldToGraphQL.TypeFieldParams): CmsModelFieldDefinition | null {\n        const dzField = field as CmsModelDynamicZoneField;\n        const templates = getFieldTemplates(dzField);\n\n        if (!templates.length) {\n            return null;\n        }\n\n        const unionTypeName = createUnionTypeName(model, field);\n\n        const { typeDefs, templateTypes } = createTypeDefsForTemplates({\n            models,\n            field,\n            type: \"manage\",\n            typeOfType: \"type\",\n            model,\n            fieldRegistry,\n            templates\n        });\n\n        /* Add _templateId and _id. */\n        const templateIds = templateTypes.map(type => {\n            return `extend type ${type} {\n                _templateId: ID!\n                _id: ID\n            }\n            `;\n        });\n\n        typeDefs.unshift(`union ${unionTypeName} = ${templateTypes.join(\" | \")}`);\n\n        return {\n            fields: `${field.fieldId}: ${field.list ? `[${unionTypeName}!]` : unionTypeName}`,\n            typeDefs: typeDefs.concat(templateIds).join(\"\\n\")\n        };\n    }\n\n    public createInputField({\n        models,\n        model,\n        field,\n        fieldRegistry\n    }: CmsModelFieldToGraphQL.TypeFieldParams): CmsModelFieldDefinition | null {\n        const dzField = field as CmsModelDynamicZoneField;\n        const templates = getFieldTemplates(dzField);\n\n        if (!templates.length) {\n            return null;\n        }\n\n        const { typeDefs, templateTypes } = createTypeDefsForTemplates({\n            models,\n            field,\n            type: \"manage\",\n            typeOfType: \"input\",\n            model,\n            fieldRegistry,\n            templates\n        });\n\n        const typeName = `${model.singularApiName}_${createTypeName(field.fieldId)}`;\n\n        const inputProperties = templateTypes.map(inputTypeName => {\n            const key = inputTypeName.replace(`${typeName}_`, \"\").replace(\"Input\", \"\");\n            return [key, inputTypeName];\n        });\n\n        /**\n         * Generate a field input type, similar to this example:\n         *\n         * input Article_ContentInput {\n         *     Hero: Article_Content_HeroInput\n         *     SimpleText: Article_Content_SimpleTextInput\n         * }\n         */\n        typeDefs.push(`input ${typeName}Input {\n            ${inputProperties.map(\n                ([key, value]) => `\n                ${key}: ${value}\n            `\n            )}\n        }`);\n\n        /* Extend each template input type with _id. */\n        const templateInputIds = templateTypes.map(inputTypeName => {\n            return `extend input ${inputTypeName} {\n                _id: ID\n            }\n            `;\n        });\n\n        return {\n            fields: createGraphQLInputField(field, `${typeName}Input`),\n            typeDefs: typeDefs.concat(templateInputIds).join(\"\\n\")\n        };\n    }\n\n    public createResolver(\n        params: CmsModelFieldToGraphQL.ResolverParams\n    ): CmsModelFieldToGraphQL.Resolver {\n        return createDynamicZoneResolver(\"manage\")(params);\n    }\n\n    public async normalizeInput<T>({\n        field,\n        input\n    }: CmsModelFieldToGraphQL.InputNormalizeParams): Promise<T> {\n        const dzField = field as CmsModelDynamicZoneField;\n        const templates = dzField.settings?.templates || [];\n\n        if (Array.isArray(input) && field.list) {\n            return input\n                .map(value => normalizeDynamicZoneInput(value, templates))\n                .filter(Boolean) as T;\n        }\n\n        return normalizeDynamicZoneInput(input as GenericRecord<string>, templates) as T;\n    }\n}\n\nclass DynamicZoneToGraphQL implements CmsModelFieldToGraphQL.Interface {\n    public readonly read = new ReadApi();\n    public readonly manage = new ManageApi();\n\n    public readonly fieldType: CmsModelFieldType = \"dynamicZone\";\n    public readonly isSearchable: boolean = false;\n    public readonly isSortable: boolean = false;\n    public readonly isFullTextSearchable: boolean = false;\n\n    public getReadApi(): CmsModelFieldToGraphQL.ReadApi {\n        return this.read;\n    }\n\n    public getManageApi(): CmsModelFieldToGraphQL.ManageApi {\n        return this.manage;\n    }\n\n    public validateChildFields(params: ValidateChildFieldsParams<CmsModelField>): void {\n        const field = params.field as CmsModelDynamicZoneField;\n        const originalField = params.originalField as CmsModelDynamicZoneField | undefined;\n\n        const getOriginalTemplateFields = (templateId: string) => {\n            if (!originalField?.settings?.templates) {\n                return [];\n            }\n            const template = originalField.settings.templates.find(t => t.id === templateId);\n            return template?.fields || [];\n        };\n\n        for (const template of field.settings.templates) {\n            params.validate({\n                fields: template.fields,\n                originalFields: getOriginalTemplateFields(template.id)\n            });\n        }\n    }\n\n    public getFieldAst(field: CmsModelField, converter: ICmsModelFieldToAst): CmsModelFieldAstNode {\n        const dzField = field as CmsModelDynamicZoneField;\n        const { templates = [] } = dzField.settings;\n\n        return {\n            type: \"field\",\n            field,\n            children: templates.map(({ fields, ...template }) => {\n                return {\n                    type: \"collection\" as const,\n                    collection: {\n                        ...template,\n                        discriminator: \"_templateId\"\n                    },\n                    children: fields.map(f => converter.toAst(f))\n                };\n            })\n        };\n    }\n}\n\nexport const DynamicZoneFieldToGraphQL = CmsModelFieldToGraphQL.createImplementation({\n    implementation: DynamicZoneToGraphQL,\n    dependencies: []\n});\n"],"names":["createUnionTypeName","model","field","createTypeName","getFieldTemplates","Array","remapTemplateValue","value","typeName","createDynamicZoneResolver","endpointType","models","fieldRegistry","createFieldResolvers","graphQLType","dzField","templates","resolver","parent","v","template","tpl","templateTypes","createTypeDefsForTemplates","replace","RegExp","typeResolvers","templateType","index","ReadApi","unionTypeName","typeDefs","templateIds","type","params","ManageApi","inputProperties","inputTypeName","key","templateInputIds","createGraphQLInputField","input","normalizeDynamicZoneInput","Boolean","DynamicZoneToGraphQL","originalField","getOriginalTemplateFields","templateId","t","converter","fields","f","DynamicZoneFieldToGraphQL","CmsModelFieldToGraphQL"],"mappings":"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"}

package/features/graphql/fields/base/ObjectToGraphQL.js

@@ -74,9 +74,10 @@ class ReadApi {
             fieldRegistry,
             endpointType: "read"
         });
+        const itemIdTypeDef = `\nextend type ${fieldType} {\n    _id: ID\n}\n`;
         return {
             fields: `${field.fieldId}: ${field.list ? `[${fieldType}!]` : fieldType}`,
-            typeDefs: `${typeDefs}${childTypeDefs}`
+            typeDefs: `${typeDefs}${childTypeDefs}${itemIdTypeDef}`
         };
     }
     createResolver({ field, createFieldResolvers, graphQLType }) {
@@ -118,9 +119,10 @@ class ManageApi {
             fieldRegistry,
             endpointType: "manage"
         });
+        const itemIdTypeDef = `\nextend type ${fieldType} {\n    _id: ID\n}\n`;
         return {
             fields: `${field.fieldId}: ${field.list ? `[${fieldType}!]` : fieldType}`,
-            typeDefs: `${typeDefs}\n${childTypeDefs}`
+            typeDefs: `${typeDefs}\n${childTypeDefs}${itemIdTypeDef}`
         };
     }
     createInputField({ models, model, field, fieldRegistry }) {
@@ -139,9 +141,10 @@ class ManageApi {
         });
         if (!result) return null;
         const { fieldType, typeDefs } = result;
+        const itemIdTypeDef = `\nextend input ${fieldType} {\n    _id: ID\n}\n`;
         return {
             fields: `${field.fieldId}: ${field.list ? `[${fieldType}!]` : fieldType}`,
-            typeDefs
+            typeDefs: `${typeDefs}${itemIdTypeDef}`
         };
     }
     createResolver({ graphQLType, field, createFieldResolvers }) {