The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Keep non-editable roles out of application manifests (#28674)
Paul Rastoin12c1d184870d
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.spec.tsindex 5a8259df98a..f29494c2455 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.spec.ts@@ -12,6 +12,7 @@ import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';import { type FlatNavigationMenuItem } from 'src/engine/metadata-modules/flat-navigation-menu-item/types/flat-navigation-menu-item.type';import { type FlatPageLayout } from 'src/engine/metadata-modules/flat-page-layout/types/flat-page-layout.type';+import { type FlatRole } from 'src/engine/metadata-modules/flat-role/types/flat-role.type';import { type FlatRoleTarget } from 'src/engine/metadata-modules/flat-role-target/types/flat-role-target.type';import { type FlatWebhook } from 'src/engine/metadata-modules/flat-webhook/types/flat-webhook.type';@@ -162,6 +163,23 @@ const withRoleTarget =}),});+const ROLE = {+ ...SYNCABLE,+ id: 'role-id',+ universalIdentifier: 'role-universal-identifier',+ label: 'App role',+ isEditable: true,+} as FlatRole;++const withRole =+ (flatRole: FlatRole) => (allFlatEntityMaps: AllFlatEntityMaps) => ({+ ...allFlatEntityMaps,+ flatRoleMaps: addFlatEntityToFlatEntityMapsOrThrow({+ flatEntity: flatRole,+ flatEntityMaps: allFlatEntityMaps.flatRoleMaps,+ }),+ });+const withWebhook =(flatWebhook: FlatWebhook) => (allFlatEntityMaps: AllFlatEntityMaps) => ({...allFlatEntityMaps,@@ -221,6 +239,20 @@ describe('buildAllFlatEntityOperationRecordByMetadataNameFromFromTo', () => {).toBeDefined();});+ it('does not delete a non-editable role the manifest cannot express', () => {+ const result = inferDeletionOf(withRole({ ...ROLE, isEditable: false }));++ expect(result.role?.flatEntityToDelete).toBeUndefined();+ });++ it('still deletes an editable role', () => {+ const result = inferDeletionOf(withRole(ROLE));++ expect(+ result.role?.flatEntityToDelete?.[ROLE.universalIdentifier],+ ).toBeDefined();+ });+it('does not delete a webhook the manifest cannot express', () => {const result = inferDeletionOf(withWebhook(WEBHOOK));diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/classify-application-flat-entities.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/classify-application-flat-entities.util.spec.tsindex a1c317cb3ef..750e4923f3c 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/classify-application-flat-entities.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/classify-application-flat-entities.util.spec.ts@@ -28,6 +28,7 @@ const CUSTOM_FIELD_UID = '44444444-4444-4444-8444-444444444444';const ROLE_TARGET_UID = '55555555-5555-4555-8555-555555555555';const ROLE_UID = '66666666-6666-4666-8666-666666666666';const FOREIGN_ROLE_TARGET_UID = '77777777-7777-4777-8777-777777777777';+const NON_EDITABLE_ROLE_UID = 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb';const COMPANY_UID = '88888888-8888-4888-8888-888888888888';const COMPANY_PET_FIELD_UID = 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa';const NOW = '2026-09-03T10:00:00.000Z';@@ -200,6 +201,36 @@ describe('classifyApplicationFlatEntities', () => {);});+ it('should exclude a non-editable role', () => {+ const nonEditableRole = {+ ...applicationRole,+ id: 'non-editable-role-id',+ universalIdentifier: NON_EDITABLE_ROLE_UID,+ isEditable: false,+ } as FlatRole;+ const maps = buildMaps({+ objects: [],+ fields: [],+ roles: [nonEditableRole],+ roleTargets: [],+ });++ expect(+ classifyApplicationFlatEntities({+ flatApplication,+ allFlatEntityMaps: maps,+ applicationAllFlatEntityMaps: maps,+ reconstructedCoverage: [],+ }).find(+ ({ universalIdentifier }) =>+ universalIdentifier === NON_EDITABLE_ROLE_UID,+ ),+ ).toMatchObject({+ status: ApplicationExportCoverageStatus.EXCLUDED,+ reason: 'non-editable role',+ });+ });+it('should exclude a member role assignment as runtime state', () => {expect(entryOf(ROLE_TARGET_UID)).toMatchObject({status: ApplicationExportCoverageStatus.EXCLUDED,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-roles-manifest.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-roles-manifest.util.spec.tsindex d169b7942c6..7ec552ed249 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-roles-manifest.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-roles-manifest.util.spec.ts@@ -44,6 +44,7 @@ const PET_SECRET_FIELD_UID = '30000000-0000-4000-8000-000000000002';const TOY_NAME_FIELD_UID = '30000000-0000-4000-8000-000000000003';const SUPPORT_ROLE_UID = '40000000-0000-4000-8000-000000000001';const ADMIN_ROLE_UID = '40000000-0000-4000-8000-000000000002';+const NON_EDITABLE_ROLE_UID = '40000000-0000-4000-8000-000000000003';const EXPORT_PETS_FLAG_UID = '50000000-0000-4000-8000-000000000001';const WORKSPACE_FLAG_UID = '50000000-0000-4000-8000-000000000002';const PERSON_OBJECT_PERMISSION_UID = '60000000-0000-4000-8000-000000000001';@@ -780,4 +781,31 @@ describe('reconstructRolesManifest', () => {]),);});++ it('should not export a non-editable role nor report it as covered', () => {+ const nonEditableRole = {+ ...buildFlatRole(NON_EDITABLE_ROLE_UID, 'System'),+ isEditable: false,+ };+ const { roles, coverage } = reconstructRolesManifest({+ applicationAllFlatEntityMaps: buildMaps({+ roles: [...applicationRoles, nonEditableRole],+ }),+ allFlatEntityMaps: buildMaps({+ roles: [...applicationRoles, nonEditableRole],+ }),+ exportedObjectUniversalIdentifiers: new Set(),+ resolvableFieldUniversalIdentifiers: new Set(),+ });++ expect(roles.map(({ universalIdentifier }) => universalIdentifier)).toEqual(+ [SUPPORT_ROLE_UID],+ );+ expect(+ coverage.find(+ ({ universalIdentifier }) =>+ universalIdentifier === NON_EDITABLE_ROLE_UID,+ ),+ ).toBeUndefined();+ });});diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/can-manifest-express-flat-entity.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/can-manifest-express-flat-entity.util.tsindex 8c8f4aeea09..172705e3b3c 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/can-manifest-express-flat-entity.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/can-manifest-express-flat-entity.util.ts@@ -20,6 +20,7 @@ type ProbedPropertyName =type ProbedFlatEntity = {universalIdentifier: string;+ isEditable?: boolean;} & Partial<Record<ProbedPropertyName, string | null>>;export const canManifestExpressFlatEntity = ({@@ -41,6 +42,10 @@ export const canManifestExpressFlatEntity = ({return false;}+ if (metadataName === 'role' && flatEntity.isEditable === false) {+ return false;+ }+return (metadataName !== 'commandMenuItem' ||isDefined(flatEntity.frontComponentUniversalIdentifier)diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/classify-application-flat-entities.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/classify-application-flat-entities.util.tsindex 513a355b45b..dd81bd4d870 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/classify-application-flat-entities.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/classify-application-flat-entities.util.ts@@ -75,6 +75,13 @@ const classifyFlatEntity = ({status: ApplicationExportCoverageStatus.EXCLUDED,reason: 'runtime configuration',};+ case 'role':+ return 'isEditable' in flatEntity && flatEntity.isEditable === false+ ? {+ status: ApplicationExportCoverageStatus.EXCLUDED,+ reason: 'non-editable role',+ }+ : { status: ApplicationExportCoverageStatus.UNSUPPORTED };case 'searchFieldMetadata':return { status: ApplicationExportCoverageStatus.ENGINE_DERIVED };case 'roleTarget':diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/reconstruct-roles-manifest.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/reconstruct-roles-manifest.util.tsindex 55315f14df7..598c1c27f66 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/reconstruct-roles-manifest.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/reconstruct-roles-manifest.util.ts@@ -73,7 +73,7 @@ export const reconstructRolesManifest = ({const flatRoles = sortFlatEntitiesByUniversalIdentifier(applicationAllFlatEntityMaps.flatRoleMaps,- );+ ).filter((flatRole) => flatRole.isEditable);const parentRoleStatusByUniversalIdentifier = new Map<string, ParentStatus>(flatRoles.map(({ universalIdentifier }) => [universalIdentifier,