Skip to content

The open alternative to Salesforce, designed for AI.

feat(metadata): author-keyed overrides blob (steps 1 to 3) (#25284)

Paul Rastoinfba83555465d
diff --git a/packages/twenty-server/.oxlintrc.json b/packages/twenty-server/.oxlintrc.json
index 5f68cb23be6..b90194d527d 100644
--- a/packages/twenty-server/.oxlintrc.json
+++ b/packages/twenty-server/.oxlintrc.json
@@ -130,8 +130,8 @@
"files": [
"src/engine/core-modules/i18n/utils/translate-standard-label.util.ts",
"src/engine/core-modules/tool-provider/**",
- "src/engine/metadata-modules/utils/resolve-effective-entity-property.util.ts",
- "src/engine/metadata-modules/utils/__tests__/**",
+ "src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util.ts",
+ "src/engine/metadata-modules/overrides/utils/__tests__/**",
"src/engine/core-modules/i18n/utils/__tests__/**",
"src/engine/workspace-manager/twenty-standard-application/__tests__/**",
"test/**"
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/__tests__/build-edit-layout-command-menu-item-update.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/__tests__/build-edit-layout-command-menu-item-update.util.spec.ts
index cae51dddeae..c65a09acea0 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/__tests__/build-edit-layout-command-menu-item-update.util.spec.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/utils/__tests__/build-edit-layout-command-menu-item-update.util.spec.ts
@@ -23,8 +23,12 @@ const LEGACY_COMMAND_MENU_ITEM: FlatCommandMenuItem = Object.freeze({
label: 'Customize layout',
isPinned: true,
position: 42,
- overrides: { label: 'Customize layout' },
- universalOverrides: { label: 'Customize layout' },
+ overrides: {
+ '20202020-aaaa-4aaa-8aaa-000000000001': { label: 'Customize layout' },
+ },
+ universalOverrides: {
+ '20202020-aaaa-4aaa-8aaa-000000000001': { label: 'Customize layout' },
+ },
});
describe('buildEditLayoutCommandMenuItemUpdate', () => {
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts
index c95c04def34..1e80a501225 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts
@@ -50,6 +50,7 @@ import { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-meta
import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util';
import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
@Injectable()
export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerService<
@@ -305,7 +306,11 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServ
if (
!isMorphOrRelationFlatFieldMetadata(field) ||
field.relationTargetObjectMetadataId !== flatObjectMetadata.id ||
- !field.isActive
+ !resolveEffectiveFlatEntityProperty({
+ metadataName: 'fieldMetadata',
+ flatEntity: field,
+ property: 'isActive',
+ })
) {
continue;
}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-data-model-manifest.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-data-model-manifest.util.spec.ts
index 8b69478f181..c2ab56a61bf 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-data-model-manifest.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-data-model-manifest.util.spec.ts
@@ -296,7 +296,11 @@ describe('reconstructDataModelManifest', () => {
nameField,
buildPetField({
...ageField,
- overrides: { label: 'Age in years' },
+ overrides: {
+ '20202020-aaaa-4aaa-8aaa-000000000001': {
+ label: 'Age in years',
+ },
+ },
}),
],
}),
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-views-manifest.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-views-manifest.util.spec.ts
index dba3a513c78..a14c57f79bf 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-views-manifest.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-views-manifest.util.spec.ts
@@ -1071,14 +1071,18 @@ describe('reconstructViewsManifest', () => {
}),
buildFlatView({
viewManifest: ZOO_PETS_VIEW_MANIFEST,
- overrides: { name: 'Zoo animals' },
+ overrides: {
+ '20202020-aaaa-4aaa-8aaa-000000000001': { name: 'Zoo animals' },
+ },
}),
],
viewFields: [
buildFlatViewField({
viewFieldManifest: NAME_VIEW_FIELD_MANIFEST,
viewUniversalIdentifier: ALL_PETS_VIEW_UID,
- overrides: { isVisible: false },
+ overrides: {
+ '20202020-aaaa-4aaa-8aaa-000000000001': { isVisible: false },
+ },
}),
buildFlatViewField({
viewFieldManifest: AGE_VIEW_FIELD_MANIFEST,
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/build-exported-coverage-entry.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/build-exported-coverage-entry.util.ts
index 6f4eeeb01d5..2c6f1d30f4e 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/build-exported-coverage-entry.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/build-exported-coverage-entry.util.ts
@@ -17,7 +17,7 @@ export const buildExportedCoverageEntry = ({
universalIdentifier: string;
} & Partial<WorkspaceLocalStateProperties>;
}): ApplicationExportCoverageEntry => {
- const reason = getWorkspaceLocalStateReason(flatEntity);
+ const reason = getWorkspaceLocalStateReason({ metadataName, ...flatEntity });
return {
metadataName,
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/get-workspace-local-state-reason.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/get-workspace-local-state-reason.util.ts
index 449c0873288..ddacba68642 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/get-workspace-local-state-reason.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/get-workspace-local-state-reason.util.ts
@@ -1,16 +1,37 @@
import { isDefined, isEmptyObject } from 'twenty-shared/utils';
+import { type AllMetadataName } from 'twenty-shared/metadata';
+
+import { readAuthoredOverrideProperty } from 'src/engine/metadata-modules/overrides/utils/read-authored-override-property.util';
+
export type WorkspaceLocalStateProperties = {
isActive: boolean;
overrides: object | null;
+ applicationUniversalIdentifier: string;
};
export const getWorkspaceLocalStateReason = ({
+ metadataName,
isActive = true,
overrides = null,
-}: Partial<WorkspaceLocalStateProperties>): string | undefined => {
+ applicationUniversalIdentifier,
+}: Partial<WorkspaceLocalStateProperties> & {
+ metadataName: AllMetadataName;
+}): string | undefined => {
+ const overriddenIsActive = readAuthoredOverrideProperty({
+ metadataName,
+ overrides,
+ path: ['isActive'],
+ authorContext: {
+ ownerApplicationUniversalIdentifier: applicationUniversalIdentifier,
+ },
+ });
+ const effectiveIsActive =
+ typeof overriddenIsActive === 'boolean' ? overriddenIsActive : isActive;
const reasons = [
- ...(isActive ? [] : ['deactivated in this workspace, exported active']),
+ ...(effectiveIsActive
+ ? []
+ : ['deactivated in this workspace, exported active']),
...(isDefined(overrides) && !isEmptyObject(overrides)
? ['workspace overrides not exported']
: []),
diff --git a/packages/twenty-server/src/engine/core-modules/i18n/utils/translate-standard-label.util.ts b/packages/twenty-server/src/engine/core-modules/i18n/utils/translate-standard-label.util.ts
index 17e4391240d..91375895749 100644
--- a/packages/twenty-server/src/engine/core-modules/i18n/utils/translate-standard-label.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/i18n/utils/translate-standard-label.util.ts
@@ -6,7 +6,7 @@ import {
METADATA_LABEL_PLACEHOLDER_PASS_THROUGH,
} from 'twenty-shared/i18n';
-import { type MessageIdTranslator } from 'src/engine/metadata-modules/utils/message-id-translator.type';
+import { type MessageIdTranslator } from 'src/engine/metadata-modules/overrides/types/message-id-translator.type';
export const translateStandardLabel = ({
sourceValue,
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/utils/__tests__/get-record-image-identifier.util.spec.ts b/packages/twenty-server/src/engine/core-modules/record-crud/utils/__tests__/get-record-image-identifier.util.spec.ts
index ea773096380..00bd3ec36d6 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/utils/__tests__/get-record-image-identifier.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/utils/__tests__/get-record-image-identifier.util.spec.ts
@@ -27,6 +27,9 @@ const buildFieldMaps = (
const signUrl = (fileId: string, fileFolder: FileFolder) =>
`signed:${fileFolder}:${fileId}`;
+const WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER =
+ '20202020-aaaa-4aaa-8aaa-000000000001';
+
describe('getRecordImageIdentifier', () => {
it('resolves a LINKS image identifier to a favicon url', async () => {
const domainNameField = getFlatFieldMetadataMock({
@@ -149,7 +152,11 @@ describe('getRecordImageIdentifier', () => {
id: 'custom-id',
nameSingular: 'custom',
imageIdentifierFieldMetadataId: 'text-id',
- overrides: { imageIdentifierFieldMetadataId: 'domain-id' },
+ overrides: {
+ [WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER]: {
+ imageIdentifierFieldMetadataId: 'domain-id',
+ },
+ },
});
const result = await getRecordImageIdentifier({
@@ -178,7 +185,11 @@ describe('getRecordImageIdentifier', () => {
id: 'custom-id',
nameSingular: 'custom',
imageIdentifierFieldMetadataId: 'domain-id',
- overrides: { imageIdentifierFieldMetadataId: null },
+ overrides: {
+ [WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER]: {
+ imageIdentifierFieldMetadataId: null,
+ },
+ },
});
const result = await getRecordImageIdentifier({
diff --git a/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts b/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts
index 19867bf2a57..c9bf87b1b61 100644
--- a/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts
@@ -50,13 +50,14 @@ import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-m
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { getEffectiveImageIdentifierFieldMetadataId } from 'src/engine/metadata-modules/object-metadata/utils/get-effective-image-identifier-field-metadata-id.util';
import { SEARCH_VECTOR_FIELD } from 'src/engine/metadata-modules/search-field-metadata/constants/search-vector-field.constants';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';
import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
type LastRanks = { tsRankCD: number; tsRank: number };
@@ -161,38 +162,44 @@ export class SearchService {
}) {
const hasExplicitInclusion = includedObjectNameSingulars.length > 0;
- return flatObjectMetadatas.filter(
- ({ nameSingular, isSearchable, isActive }) => {
- if (!isActive) {
- return false;
- }
-
- if (hasExplicitInclusion) {
- if (
- OBJECTS_WITH_CHANNEL_VISIBILITY_CONSTRAINTS.includes(
- nameSingular as (typeof OBJECTS_WITH_CHANNEL_VISIBILITY_CONSTRAINTS)[number],
- )
- ) {
- return false;
- }
+ return flatObjectMetadatas.filter((flatObjectMetadata) => {
+ const { nameSingular, isSearchable } = flatObjectMetadata;
- return (
- includedObjectNameSingulars.includes(nameSingular) &&
- !excludedObjectNameSingulars.includes(nameSingular)
- );
- }
+ if (
+ !resolveEffectiveFlatEntityProperty({
+ metadataName: 'objectMetadata',
+ flatEntity: flatObjectMetadata,
+ property: 'isActive',
+ })
+ ) {
+ return false;
+ }
- if (!isSearchable) {
+ if (hasExplicitInclusion) {
+ if (
+ OBJECTS_WITH_CHANNEL_VISIBILITY_CONSTRAINTS.includes(
+ nameSingular as (typeof OBJECTS_WITH_CHANNEL_VISIBILITY_CONSTRAINTS)[number],
+ )
+ ) {
return false;
}
- if (excludedObjectNameSingulars.includes(nameSingular)) {
- return false;
- }
+ return (
+ includedObjectNameSingulars.includes(nameSingular) &&
+ !excludedObjectNameSingulars.includes(nameSingular)
+ );
+ }
- return true;
- },
- );
+ if (!isSearchable) {
+ return false;
+ }
+
+ if (excludedObjectNameSingulars.includes(nameSingular)) {
+ return false;
+ }
+
+ return true;
+ });
}
// Runs a fast tsvector query first (uses GIN index). If tsvector returns zero
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/database-tool.provider.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/database-tool.provider.spec.ts
index 57b3269a8b6..e6b529e3612 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/database-tool.provider.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/database-tool.provider.spec.ts
@@ -1,6 +1,7 @@
import { type ObjectPermissions } from 'twenty-shared/types';
import { type I18nService } from 'src/engine/core-modules/i18n/i18n.service';
+import { type ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
import { DatabaseToolProvider } from 'src/engine/core-modules/tool-provider/providers/database-tool.provider';
import { type ToolDescriptor } from 'src/engine/core-modules/tool-provider/types/tool-descriptor.type';
import { type ToolIndexEntry } from 'src/engine/core-modules/tool-provider/types/tool-index-entry.type';
@@ -111,10 +112,20 @@ describe('DatabaseToolProvider', () => {
})),
} as unknown as I18nService;
+ const applicationTranslationCatalogService = {
+ getApplicationAuthorIdentifiers: jest.fn().mockResolvedValue({
+ standardApplicationId: 'standard-application-id',
+ workspaceCustomApplicationUniversalIdentifier:
+ 'workspace-custom-application-universal-identifier',
+ universalIdentifierByApplicationId: {},
+ }),
+ } as unknown as ApplicationTranslationCatalogService;
+
const provider = new DatabaseToolProvider(
workspaceCacheService,
flatEntityMapsCacheService,
i18nService,
+ applicationTranslationCatalogService,
);
return (await provider.generateDescriptors(
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/database-tool.provider.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/database-tool.provider.ts
index ac7339176f8..967845fbffa 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/database-tool.provider.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/database-tool.provider.ts
@@ -1,3 +1,4 @@
+import { type I18n } from '@lingui/core';
import { Injectable } from '@nestjs/common';
import { SOURCE_LOCALE } from 'twenty-shared/translations';
@@ -10,6 +11,7 @@ import { type ToolProviderContext } from 'src/engine/core-modules/tool-provider/
import { type ToolProvider } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider.interface';
import { getCrudToolLabels } from 'src/engine/core-modules/tool-provider/utils/get-crud-tool-label.util';
import { resolveEffectiveFieldDescription } from 'src/engine/core-modules/tool-provider/utils/resolve-effective-field-description.util';
+import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
import { getFlatFieldsFromFlatObjectMetadata } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util';
import { generateCreateManyRecordInputSchema } from 'src/engine/core-modules/record-crud/utils/generate-create-many-record-input-schema.util';
@@ -35,6 +37,9 @@ import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/twenty
import { getRoleIdsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-role-ids-from-role-permission-config.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { ToolCategory } from 'twenty-shared/ai';
+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
+import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@Injectable()
export class DatabaseToolProvider implements ToolProvider {
@@ -44,6 +49,7 @@ export class DatabaseToolProvider implements ToolProvider {
private readonly workspaceCacheService: WorkspaceCacheService,
private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
private readonly i18nService: I18nService,
+ private readonly applicationTranslationCatalogService: ApplicationTranslationCatalogService,
) {}
async isAvailable(_context: ToolProviderContext): Promise<boolean> {
@@ -131,6 +137,14 @@ export class DatabaseToolProvider implements ToolProvider {
context.locale ?? SOURCE_LOCALE,
);
+ const resolveFields = includeSchemas
+ ? await this.buildFieldsResolver({
+ context,
+ flatFieldMetadataMaps,
+ i18nInstance,
+ })
+ : () => [];
+
for (const flatObject of allFlatObjects) {
const permission = objectPermissions[flatObject.id];
const explicitPermission = explicitPermissionByObjectId.get(
@@ -164,19 +178,7 @@ export class DatabaseToolProvider implements ToolProvider {
continue;
}
- const fields = includeSchemas
- ? getFlatFieldsFromFlatObjectMetadata(
- flatObject,
- flatFieldMetadataMaps,
- ).map((flatFieldMetadata) => ({
- ...flatFieldMetadata,
- description: resolveEffectiveFieldDescription({
- flatFieldMetadata,
- locale: context.locale,
- i18nInstance,
- }),
- }))
- : [];
+ const fields = resolveFields(flatObject);
const objectMetadata = { ...flatObject, fields };
@@ -468,6 +470,39 @@ export class DatabaseToolProvider implements ToolProvider {
return descriptors;
}
+ private async buildFieldsResolver({
+ context,
+ flatFieldMetadataMaps,
+ i18nInstance,
+ }: {
+ context: ToolProviderContext;
+ flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ i18nInstance: I18n;
+ }): Promise<(flatObject: FlatObjectMetadata) => FlatFieldMetadata[]> {
+ const { workspaceCustomApplicationUniversalIdentifier } =
+ await this.applicationTranslationCatalogService.getApplicationAuthorIdentifiers(
+ {
+ workspaceId: context.workspaceId,
+ workspaceCustomApplicationId:
+ context.authContext?.workspace.workspaceCustomApplicationId,
+ },
+ );
+
+ return (flatObject) =>
+ getFlatFieldsFromFlatObjectMetadata(
+ flatObject,
+ flatFieldMetadataMaps,
+ ).map((flatFieldMetadata) => ({
+ ...flatFieldMetadata,
+ description: resolveEffectiveFieldDescription({
+ flatFieldMetadata,
+ locale: context.locale,
+ i18nInstance,
+ workspaceCustomApplicationUniversalIdentifier,
+ }),
+ }));
+ }
+
private hasMatchingTool(
toolNames: Set<string>,
snakeSingular: string,
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/record-files-resolver.service.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/record-files-resolver.service.ts
index 9855c6cdcd8..1e1ebcaaba1 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/services/record-files-resolver.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/record-files-resolver.service.ts
@@ -16,6 +16,7 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadat
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
export type RecordFilesResolution = {
records: Record<string, unknown>[];
@@ -54,7 +55,11 @@ export class RecordFilesResolverService {
(metadata): metadata is FlatObjectMetadata =>
isDefined(metadata) &&
metadata.nameSingular === objectNameSingular &&
- metadata.isActive,
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'objectMetadata',
+ flatEntity: metadata,
+ property: 'isActive',
+ }),
);
if (!isDefined(flatObjectMetadata)) {
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/tool-provider.module.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/tool-provider.module.ts
index 849049d82e9..af9d43ceb92 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/tool-provider.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/tool-provider.module.ts
@@ -20,6 +20,7 @@ import { ToolExecutorService } from 'src/engine/core-modules/tool-provider/servi
import { ToolModule } from 'src/engine/core-modules/tool/tool.module';
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { UserEntity } from 'src/engine/core-modules/user/user.entity';
+import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module';
import { AiAgentExecutionModule } from 'src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module';
import { AiModelsModule } from 'src/engine/metadata-modules/ai/ai-models/ai-models.module';
import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/field-metadata.module';
@@ -54,6 +55,7 @@ import { ToolRegistryService } from './services/tool-registry.service';
@Module({
imports: [
+ ApplicationTranslationCatalogModule,
ToolModule,
RecordCrudModule,
FilesFieldModule,
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/resolve-effective-field-description.util.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/resolve-effective-field-description.util.spec.ts
index 3fb8f64c259..a14fb2f3d2a 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/resolve-effective-field-description.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/resolve-effective-field-description.util.spec.ts
@@ -1,12 +1,16 @@
import { generateMessageId } from 'twenty-shared/i18n';
import { SOURCE_LOCALE } from 'twenty-shared/translations';
import { FieldMetadataType } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
import { resolveEffectiveFieldDescription } from 'src/engine/core-modules/tool-provider/utils/resolve-effective-field-description.util';
+import { type FieldMetadataOverrides } from 'src/engine/metadata-modules/field-metadata/types/field-metadata-overrides.type';
import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';
-import { type MessageIdTranslator } from 'src/engine/metadata-modules/utils/message-id-translator.type';
+import { type MessageIdTranslator } from 'src/engine/metadata-modules/overrides/types/message-id-translator.type';
import { TWENTY_STANDARD_APPLICATION } from 'src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications';
+const WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER =
+ '20202020-aaaa-4aaa-8aaa-000000000001';
const BASE_DESCRIPTION = 'Task due date';
const OVERRIDDEN_DESCRIPTION =
'Stored in UTC; users dictate local time, convert before writing';
@@ -20,7 +24,7 @@ const buildTranslator = (
const untranslated = buildTranslator();
const getStandardFlatFieldMetadata = (
- overrides?: Parameters<typeof getFlatFieldMetadataMock>[0]['overrides'],
+ workspaceOverridesEntry?: FieldMetadataOverrides,
) =>
getFlatFieldMetadataMock({
universalIdentifier: 'due-at-field',
@@ -30,7 +34,12 @@ const getStandardFlatFieldMetadata = (
description: BASE_DESCRIPTION,
applicationUniversalIdentifier:
TWENTY_STANDARD_APPLICATION.universalIdentifier,
- overrides,
+ overrides: isDefined(workspaceOverridesEntry)
+ ? {
+ [WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER]:
+ workspaceOverridesEntry,
+ }
+ : undefined,
});
describe('resolveEffectiveFieldDescription', () => {
@@ -41,6 +50,8 @@ describe('resolveEffectiveFieldDescription', () => {
}),
locale: SOURCE_LOCALE,
i18nInstance: untranslated,
+ workspaceCustomApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
});
expect(result).toBe(OVERRIDDEN_DESCRIPTION);
@@ -51,6 +62,8 @@ describe('resolveEffectiveFieldDescription', () => {
flatFieldMetadata: getStandardFlatFieldMetadata({ description: null }),
locale: SOURCE_LOCALE,
i18nInstance: untranslated,
+ workspaceCustomApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
});
expect(result).toBe(BASE_DESCRIPTION);
@@ -61,6 +74,8 @@ describe('resolveEffectiveFieldDescription', () => {
flatFieldMetadata: getStandardFlatFieldMetadata(),
locale: SOURCE_LOCALE,
i18nInstance: untranslated,
+ workspaceCustomApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
});
expect(result).toBe(BASE_DESCRIPTION);
@@ -74,6 +89,8 @@ describe('resolveEffectiveFieldDescription', () => {
[generateMessageId(BASE_DESCRIPTION, 'fieldMetadata.description')]:
"Date d'échéance",
}),
+ workspaceCustomApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
});
expect(result).toBe("Date d'échéance");
@@ -87,6 +104,8 @@ describe('resolveEffectiveFieldDescription', () => {
}),
locale: 'fr-FR',
i18nInstance: untranslated,
+ workspaceCustomApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
});
expect(result).toBe('Stocké en UTC');
@@ -103,6 +122,8 @@ describe('resolveEffectiveFieldDescription', () => {
}),
locale: SOURCE_LOCALE,
i18nInstance: untranslated,
+ workspaceCustomApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
});
expect(result).toBe('Our own custom text');
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/resolve-effective-field-description.util.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/resolve-effective-field-description.util.ts
index 4a6d826b420..9b9709afc4a 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/resolve-effective-field-description.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/resolve-effective-field-description.util.ts
@@ -2,17 +2,19 @@ import { type APP_LOCALES } from 'twenty-shared/translations';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { belongsToTwentyStandardApp } from 'src/engine/metadata-modules/utils/belongs-to-twenty-standard-app.util';
-import { type MessageIdTranslator } from 'src/engine/metadata-modules/utils/message-id-translator.type';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { type MessageIdTranslator } from 'src/engine/metadata-modules/overrides/types/message-id-translator.type';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
export const resolveEffectiveFieldDescription = ({
flatFieldMetadata,
locale,
i18nInstance,
+ workspaceCustomApplicationUniversalIdentifier,
}: {
flatFieldMetadata: FlatFieldMetadata;
locale: keyof typeof APP_LOCALES | undefined;
i18nInstance: MessageIdTranslator;
+ workspaceCustomApplicationUniversalIdentifier: string;
}): string =>
resolveEffectiveEntityProperty({
metadataName: 'fieldMetadata',
@@ -23,5 +25,8 @@ export const resolveEffectiveFieldDescription = ({
locale,
i18nInstance,
isStandardApp: belongsToTwentyStandardApp(flatFieldMetadata),
+ workspaceCustomApplicationUniversalIdentifier,
+ ownerApplicationUniversalIdentifier:
+ flatFieldMetadata.applicationUniversalIdentifier,
},
});
diff --git a/packages/twenty-server/src/engine/core-modules/tool/tools/navigate-tool/navigate-app-tool.ts b/packages/twenty-server/src/engine/core-modules/tool/tools/navigate-tool/navigate-app-tool.ts
index a9891e78ef7..9baacb9bdcc 100644
--- a/packages/twenty-server/src/engine/core-modules/tool/tools/navigate-tool/navigate-app-tool.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool/tools/navigate-tool/navigate-app-tool.ts
@@ -22,6 +22,7 @@ import { NavigationMenuItemService } from 'src/engine/metadata-modules/navigatio
import { ViewService } from 'src/engine/metadata-modules/view/services/view.service';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
@Injectable()
export class NavigateAppTool implements Tool {
@@ -278,7 +279,11 @@ export class NavigateAppTool implements Tool {
(metadata): metadata is FlatObjectMetadata =>
isDefined(metadata) &&
metadata.nameSingular === objectNameSingular &&
- metadata.isActive,
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'objectMetadata',
+ flatEntity: metadata,
+ property: 'isActive',
+ }),
);
if (!isDefined(flatObjectMetadata)) {
@@ -287,7 +292,12 @@ export class NavigateAppTool implements Tool {
)
.filter(
(metadata): metadata is FlatObjectMetadata =>
- isDefined(metadata) && metadata.isActive,
+ isDefined(metadata) &&
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'objectMetadata',
+ flatEntity: metadata,
+ property: 'isActive',
+ }),
)
.map((metadata) => metadata.nameSingular)
.join(', ');
diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.interface.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.interface.ts
index 9f54b5c6c2c..a2f30f240ed 100644
--- a/packages/twenty-server/src/engine/dataloaders/dataloader.interface.ts
+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.interface.ts
@@ -10,7 +10,7 @@ import {
type SearchFieldMetadataLoaderPayload,
type IsConfiguredLoaderPayload,
type MorphRelationLoaderPayload,
- type StandardApplicationIdLoaderPayload,
+ type ApplicationAuthorIdentifiersLoaderPayload,
type ObjectMetadataLoaderPayload,
type RelationLoaderPayload,
type ViewFieldGroupsByViewIdLoaderPayload,
@@ -21,6 +21,7 @@ import {
type ViewGroupsByViewIdLoaderPayload,
type ViewSortsByViewIdLoaderPayload,
} from 'src/engine/dataloaders/dataloader.service';
+import { type ApplicationAuthorIdentifiers } from 'src/engine/metadata-modules/application-translation-catalog/types/application-author-identifiers.type';
import { type FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
import { type RelationDTO } from 'src/engine/metadata-modules/field-metadata/dtos/relation.dto';
import { type IndexFieldMetadataDTO } from 'src/engine/metadata-modules/index-metadata/dtos/index-field-metadata.dto';
@@ -115,9 +116,9 @@ export interface IDataloaders {
isConfiguredLoader: DataLoader<IsConfiguredLoaderPayload, boolean>;
- standardApplicationIdLoader: DataLoader<
- StandardApplicationIdLoaderPayload,
- string
+ applicationAuthorIdentifiersLoader: DataLoader<
+ ApplicationAuthorIdentifiersLoaderPayload,
+ ApplicationAuthorIdentifiers
>;
applicationTranslationCatalogLoader: DataLoader<
diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts
index 934f657fe34..19ab14b3b4b 100644
--- a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts
+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts
@@ -1,7 +1,7 @@
import { Injectable } from '@nestjs/common';
import DataLoader from 'dataloader';
-import { type APP_LOCALES, SOURCE_LOCALE } from 'twenty-shared/translations';
+import { type APP_LOCALES } from 'twenty-shared/translations';
import { FieldMetadataType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
@@ -9,7 +9,6 @@ import { type IndexMetadataInterface } from 'src/engine/metadata-modules/index-m
import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.service';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
-import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
import { FieldMetadataConnectionLoaderFactory } from 'src/engine/dataloaders/factories/field-metadata-connection-loader.factory';
import { IndexMetadataConnectionLoaderFactory } from 'src/engine/dataloaders/factories/index-metadata-connection-loader.factory';
@@ -17,15 +16,13 @@ import { filterMorphRelationDuplicateFields } from 'src/engine/dataloaders/utils
import { type FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
import { RelationDTO } from 'src/engine/metadata-modules/field-metadata/dtos/relation.dto';
import { type FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-overridable-properties-by-metadata-name.constant';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { findManyFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps.util';
import { findManyFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { fromFlatFieldMetadataToFieldMetadataDto } from 'src/engine/metadata-modules/flat-field-metadata/utils/from-flat-field-metadata-to-field-metadata-dto.util';
-import { belongsToTwentyStandardApp } from 'src/engine/metadata-modules/utils/belongs-to-twenty-standard-app.util';
+import { type ApplicationAuthorIdentifiers } from 'src/engine/metadata-modules/application-translation-catalog/types/application-author-identifiers.type';
import { isFlatFieldMetadataOfType } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util';
import { resolveMorphRelationsFromFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/resolve-morph-relations-from-flat-field-metadata.util';
import { resolveRelationFromFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/resolve-relation-from-flat-field-metadata.util';
@@ -43,6 +40,8 @@ import { type IndexMetadataDTO } from 'src/engine/metadata-modules/index-metadat
import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';
import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { type SearchFieldMetadataDTO } from 'src/engine/metadata-modules/search-field-metadata/dtos/search-field-metadata.dto';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
+import { resolveEffectiveTranslatedFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-translated-flat-entity.util';
export type RelationMetadataLoaderPayload = {
workspaceId: string;
@@ -127,7 +126,7 @@ export type IsConfiguredLoaderPayload = {
applicationRegistrationId: string;
};
-export type StandardApplicationIdLoaderPayload = {
+export type ApplicationAuthorIdentifiersLoaderPayload = {
workspaceId: string;
};
@@ -140,7 +139,6 @@ export type ApplicationTranslationCatalogLoaderPayload = {
@Injectable()
export class DataloaderService {
constructor(
- private readonly i18nService: I18nService,
private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
private readonly applicationRegistrationVariableService: ApplicationRegistrationVariableService,
private readonly applicationTranslationCatalogService: ApplicationTranslationCatalogService,
@@ -171,8 +169,8 @@ export class DataloaderService {
const viewFilterGroupsByViewIdLoader =
this.createViewFilterGroupsByViewIdLoader();
const isConfiguredLoader = this.createIsConfiguredLoader();
- const standardApplicationIdLoader =
- this.createStandardApplicationIdLoader();
+ const applicationAuthorIdentifiersLoader =
+ this.createApplicationAuthorIdentifiersLoader();
const applicationTranslationCatalogLoader =
this.createApplicationTranslationCatalogLoader();
@@ -194,7 +192,7 @@ export class DataloaderService {
viewGroupsByViewIdLoader,
viewFilterGroupsByViewIdLoader,
isConfiguredLoader,
- standardApplicationIdLoader,
+ applicationAuthorIdentifiersLoader,
applicationTranslationCatalogLoader,
};
}
@@ -367,8 +365,6 @@ export class DataloaderService {
return new DataLoader<FieldMetadataLoaderPayload, FieldMetadataDTO[]>(
async (dataLoaderParams: FieldMetadataLoaderPayload[]) => {
const locale = dataLoaderParams[0].locale;
- const safeLocale = locale ?? SOURCE_LOCALE;
- const i18nInstance = this.i18nService.getI18nInstance(safeLocale);
const workspaceId = dataLoaderParams[0].workspaceId;
const objectMetadataIds = dataLoaderParams.map(
(dataLoaderParam) => dataLoaderParam.objectMetadata.id,
@@ -397,46 +393,27 @@ export class DataloaderService {
},
);
- const { catalogByApplicationId: applicationCatalogByApplicationId } =
- await this.applicationTranslationCatalogService.getCatalogs({
- applicationIds: objectFlatFieldMetadatasList
- .flat()
- .map((flatFieldMetadata) => flatFieldMetadata.applicationId),
- locale: safeLocale,
- workspaceId,
- });
+ const getI18nContext =
+ await this.applicationTranslationCatalogService.getI18nContextByApplicationId(
+ {
+ applicationIds: objectFlatFieldMetadatasList
+ .flat()
+ .map((flatFieldMetadata) => flatFieldMetadata.applicationId),
+ locale,
+ workspaceId,
+ },
+ );
const fieldMetadataCollection = objectFlatFieldMetadatasList.map(
(objectFlatFieldMetadatas) => {
const overriddenFieldMetadataEntities =
- objectFlatFieldMetadatas.map((flatFieldMetadata) => {
- const applicationCatalog =
- applicationCatalogByApplicationId.get(
- flatFieldMetadata.applicationId,
- );
-
- const overrides = flatFieldMetadata.overrides ?? undefined;
- const i18nContext = {
- locale,
- i18nInstance,
- isStandardApp: belongsToTwentyStandardApp(flatFieldMetadata),
- applicationCatalog,
- };
-
- return ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME.fieldMetadata.reduce(
- (acc, property) => ({
- ...acc,
- [property]: resolveEffectiveEntityProperty({
- metadataName: 'fieldMetadata',
- baseValue: flatFieldMetadata[property],
- overrides,
- property,
- i18nContext,
- }),
- }),
- flatFieldMetadata,
- );
- });
+ objectFlatFieldMetadatas.map((flatFieldMetadata) =>
+ resolveEffectiveTranslatedFlatEntity({
+ metadataName: 'fieldMetadata',
+ flatEntity: flatFieldMetadata,
+ i18nContext: getI18nContext(flatFieldMetadata.applicationId),
+ }),
+ );
const filteredFieldMetadataEntities =
filterMorphRelationDuplicateFields(
@@ -589,7 +566,11 @@ export class DataloaderService {
.filter(
(flatViewFieldGroup) =>
flatViewFieldGroup.deletedAt === null &&
- flatViewFieldGroup.isActive,
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'viewFieldGroup',
+ flatEntity: flatViewFieldGroup,
+ property: 'isActive',
+ }),
)
.map(fromFlatViewFieldGroupToViewFieldGroupDto);
});
@@ -622,15 +603,20 @@ export class DataloaderService {
if (
!isDefined(flatViewField) ||
flatViewField.deletedAt !== null ||
- !flatViewField.isActive
+ !resolveEffectiveFlatEntityProperty({
+ metadataName: 'viewField',
+ flatEntity: flatViewField,
+ property: 'isActive',
+ })
) {
continue;
}
- const resolvedGroupId =
- flatViewField.overrides?.viewFieldGroupId !== undefined
- ? flatViewField.overrides.viewFieldGroupId
- : flatViewField.viewFieldGroupId;
+ const resolvedGroupId = resolveEffectiveFlatEntityProperty({
+ metadataName: 'viewField',
+ flatEntity: flatViewField,
+ property: 'viewFieldGroupId',
+ });
if (!isDefined(resolvedGroupId)) {
continue;
@@ -691,7 +677,12 @@ export class DataloaderService {
})
.filter(
(flatViewField) =>
- flatViewField.deletedAt === null && flatViewField.isActive,
+ flatViewField.deletedAt === null &&
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'viewField',
+ flatEntity: flatViewField,
+ property: 'isActive',
+ }),
)
.map(fromFlatViewFieldToViewFieldDto);
});
@@ -857,17 +848,18 @@ export class DataloaderService {
);
}
- private createStandardApplicationIdLoader() {
- return new DataLoader<StandardApplicationIdLoaderPayload, string>(
- async (params: StandardApplicationIdLoaderPayload[]) => {
- const standardApplicationId =
- await this.applicationTranslationCatalogService.getStandardApplicationId(
- { workspaceId: params[0].workspaceId },
- );
+ private createApplicationAuthorIdentifiersLoader() {
+ return new DataLoader<
+ ApplicationAuthorIdentifiersLoaderPayload,
+ ApplicationAuthorIdentifiers
+ >(async (params: ApplicationAuthorIdentifiersLoaderPayload[]) => {
+ const applicationAuthorIdentifiers =
+ await this.applicationTranslationCatalogService.getApplicationAuthorIdentifiers(
+ { workspaceId: params[0].workspaceId },
+ );
- return params.map(() => standardApplicationId);
- },
- );
+ return params.map(() => applicationAuthorIdentifiers);
+ });
}
private createApplicationTranslationCatalogLoader() {
diff --git a/packages/twenty-server/src/engine/dataloaders/factories/field-metadata-connection-loader.factory.ts b/packages/twenty-server/src/engine/dataloaders/factories/field-metadata-connection-loader.factory.ts
index 3ed85d7762e..56683983912 100644
--- a/packages/twenty-server/src/engine/dataloaders/factories/field-metadata-connection-loader.factory.ts
+++ b/packages/twenty-server/src/engine/dataloaders/factories/field-metadata-connection-loader.factory.ts
@@ -1,11 +1,10 @@
import { Injectable } from '@nestjs/common';
import DataLoader from 'dataloader';
-import { type APP_LOCALES, SOURCE_LOCALE } from 'twenty-shared/translations';
+import { type APP_LOCALES } from 'twenty-shared/translations';
import { FieldMetadataType } from 'twenty-shared/types';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
-import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
import {
FIELD_FILTER_COLUMN_BY_FILTER_FIELD,
type FieldFilterInput,
@@ -14,11 +13,8 @@ import { type FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadat
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { findManyFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
-import { ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-overridable-properties-by-metadata-name.constant';
import { fromFlatFieldMetadataToFieldMetadataDto } from 'src/engine/metadata-modules/flat-field-metadata/utils/from-flat-field-metadata-to-field-metadata-dto.util';
import { isFlatFieldMetadataOfType } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util';
-import { belongsToTwentyStandardApp } from 'src/engine/metadata-modules/utils/belongs-to-twenty-standard-app.util';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
import { getMorphNameFromMorphFieldMetadataName } from 'src/engine/metadata-modules/flat-object-metadata/utils/get-morph-name-from-morph-field-metadata-name.util';
import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { type CursorConnection } from 'src/engine/metadata-modules/pagination/dtos/cursor-connection-type.factory';
@@ -26,6 +22,7 @@ import { type CursorPagingInput } from 'src/engine/metadata-modules/pagination/d
import { applyMetadataFilterToItems } from 'src/engine/metadata-modules/pagination/utils/apply-metadata-filter-to-items.util';
import { findManyItemsWithCursorPagination } from 'src/engine/metadata-modules/pagination/utils/find-many-items-with-cursor-pagination.util';
import { filterMorphRelationDuplicateFields } from 'src/engine/dataloaders/utils/filter-morph-relation-duplicate-fields.util';
+import { resolveEffectiveTranslatedFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-translated-flat-entity.util';
export type FieldMetadataConnectionLoaderPayload = {
workspaceId: string;
@@ -38,7 +35,6 @@ export type FieldMetadataConnectionLoaderPayload = {
@Injectable()
export class FieldMetadataConnectionLoaderFactory {
constructor(
- private readonly i18nService: I18nService,
private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
private readonly applicationTranslationCatalogService: ApplicationTranslationCatalogService,
) {}
@@ -52,8 +48,6 @@ export class FieldMetadataConnectionLoaderFactory {
CursorConnection<FieldMetadataDTO>
>(async (dataLoaderParams: FieldMetadataConnectionLoaderPayload[]) => {
const locale = dataLoaderParams[0].locale;
- const safeLocale = locale ?? SOURCE_LOCALE;
- const i18nInstance = this.i18nService.getI18nInstance(safeLocale);
const workspaceId = dataLoaderParams[0].workspaceId;
const { flatFieldMetadataMaps, flatObjectMetadataMaps } =
await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
@@ -89,43 +83,27 @@ export class FieldMetadataConnectionLoaderFactory {
const selectedFlatFieldMetadatas = connections.flatMap((connection) =>
connection.edges.map(({ node }) => node),
);
- const { catalogByApplicationId: applicationCatalogByApplicationId } =
- await this.applicationTranslationCatalogService.getCatalogs({
- applicationIds: selectedFlatFieldMetadatas.map(
- (flatFieldMetadata) => flatFieldMetadata.applicationId,
- ),
- locale: safeLocale,
- workspaceId,
- });
+ const getI18nContext =
+ await this.applicationTranslationCatalogService.getI18nContextByApplicationId(
+ {
+ applicationIds: selectedFlatFieldMetadatas.map(
+ (flatFieldMetadata) => flatFieldMetadata.applicationId,
+ ),
+ locale,
+ workspaceId,
+ },
+ );
return connections.map((connection) => ({
...connection,
edges: connection.edges.map((edge) => {
const flatFieldMetadata = edge.node;
- const applicationCatalog = applicationCatalogByApplicationId.get(
- flatFieldMetadata.applicationId,
- );
- const overrides = flatFieldMetadata.overrides ?? undefined;
- const i18nContext = {
- locale,
- i18nInstance,
- isStandardApp: belongsToTwentyStandardApp(flatFieldMetadata),
- applicationCatalog,
- };
const overriddenFlatFieldMetadata =
- ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME.fieldMetadata.reduce(
- (acc, property) => ({
- ...acc,
- [property]: resolveEffectiveEntityProperty({
- metadataName: 'fieldMetadata',
- baseValue: flatFieldMetadata[property],
- overrides,
- property,
- i18nContext,
- }),
- }),
- flatFieldMetadata,
- );
+ resolveEffectiveTranslatedFlatEntity({
+ metadataName: 'fieldMetadata',
+ flatEntity: flatFieldMetadata,
+ i18nContext: getI18nContext(flatFieldMetadata.applicationId),
+ });
let renamedFlatFieldMetadata = overriddenFlatFieldMetadata;
if (
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/get-database-crud-tool-flat-objects.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/get-database-crud-tool-flat-objects.util.ts
index 835b0612969..4eb0716fa23 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/get-database-crud-tool-flat-objects.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/get-database-crud-tool-flat-objects.util.ts
@@ -1,8 +1,12 @@
import { isDefined } from 'twenty-shared/utils';
import { isWorkflowRelatedObject } from 'src/engine/metadata-modules/ai/ai-agent/utils/is-workflow-related-object.util';
+import {
+ type OverridableFlatEntity,
+ resolveEffectiveFlatEntityProperty,
+} from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
-type FlatObjectWithActivityAndIdentifier = {
+type FlatObjectWithActivityAndIdentifier = OverridableFlatEntity & {
isActive: boolean;
universalIdentifier: string;
};
@@ -14,5 +18,12 @@ export const getDatabaseCrudToolFlatObjects = <
): T[] => {
return Object.values(byUniversalIdentifier)
.filter(isDefined)
- .filter((obj) => obj.isActive && !isWorkflowRelatedObject(obj));
+ .filter(
+ (obj) =>
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'objectMetadata',
+ flatEntity: obj,
+ property: 'isActive',
+ }) && !isWorkflowRelatedObject(obj),
+ );
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module.ts b/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module.ts
index f86f636b487..8c04c3b4df9 100644
--- a/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module.ts
@@ -1,11 +1,14 @@
import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
import { ApplicationTranslationModule } from 'src/engine/core-modules/application/application-translation/application-translation.module';
+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
@Module({
imports: [
+ TypeOrmModule.forFeature([WorkspaceEntity]),
ApplicationTranslationModule,
WorkspaceManyOrAllFlatEntityMapsCacheModule,
],
diff --git a/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service.ts b/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service.ts
index 961491cefd9..4855431e157 100644
--- a/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service.ts
@@ -1,18 +1,27 @@
import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
import { type TranslatableMetadataName } from 'twenty-shared/i18n';
import { type APP_LOCALES, SOURCE_LOCALE } from 'twenty-shared/translations';
import { isDefined } from 'twenty-shared/utils';
+import { Repository } from 'typeorm';
import { ApplicationTranslationCacheService } from 'src/engine/core-modules/application/application-translation/application-translation-cache.service';
-import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
+import {
+ ApplicationException,
+ ApplicationExceptionCode,
+} from 'src/engine/core-modules/application/application.exception';
import { type FlatApplicationCacheMaps } from 'src/engine/core-modules/application/types/flat-application-cache-maps.type';
-import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
+import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
+import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
+import { type ApplicationAuthorIdentifiers } from 'src/engine/metadata-modules/application-translation-catalog/types/application-author-identifiers.type';
import { resolveRegistrationIdByApplicationId } from 'src/engine/metadata-modules/application-translation-catalog/utils/resolve-registration-id-by-application-id.util';
import { resolveTranslatableProperties } from 'src/engine/metadata-modules/application-translation-catalog/utils/resolve-translatable-properties.util';
-import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
-import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/utils/effective-entity-i18n-context.type';
+import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
+import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type';
import { getTwentyStandardApplicationIdOrThrow } from 'src/engine/metadata-modules/utils/get-twenty-standard-application-id-or-throw.util';
+import { getWorkspaceCustomApplicationUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/overrides/utils/get-workspace-custom-application-universal-identifier-or-throw.util';
export type ApplicationCatalogs = {
standardApplicationId: string;
@@ -22,19 +31,45 @@ export type ApplicationCatalogs = {
@Injectable()
export class ApplicationTranslationCatalogService {
constructor(
+ @InjectRepository(WorkspaceEntity)
+ private readonly workspaceRepository: Repository<WorkspaceEntity>,
private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
private readonly applicationTranslationCacheService: ApplicationTranslationCacheService,
private readonly i18nService: I18nService,
) {}
- async getStandardApplicationId({
+ async getApplicationAuthorIdentifiers({
workspaceId,
+ workspaceCustomApplicationId,
}: {
workspaceId: string;
- }): Promise<string> {
- return getTwentyStandardApplicationIdOrThrow(
- await this.getFlatApplicationMaps({ workspaceId }),
- );
+ workspaceCustomApplicationId?: string;
+ }): Promise<ApplicationAuthorIdentifiers> {
+ const [flatApplicationMaps, resolvedWorkspaceCustomApplicationId] =
+ await Promise.all([
+ this.getFlatApplicationMaps({ workspaceId }),
+ isDefined(workspaceCustomApplicationId)
+ ? workspaceCustomApplicationId
+ : this.findWorkspaceCustomApplicationIdOrThrow(workspaceId),
+ ]);
+
+ return {
+ standardApplicationId:
+ getTwentyStandardApplicationIdOrThrow(flatApplicationMaps),
+ workspaceCustomApplicationUniversalIdentifier:
+ getWorkspaceCustomApplicationUniversalIdentifierOrThrow({
+ workspaceCustomApplicationId: resolvedWorkspaceCustomApplicationId,
+ flatApplicationMaps,
+ }),
+ universalIdentifierByApplicationId: Object.fromEntries(
+ Object.values(flatApplicationMaps.byId)
+ .filter(isDefined)
+ .map((flatApplication) => [
+ flatApplication.id,
+ flatApplication.universalIdentifier,
+ ]),
+ ),
+ };
}
// Batched on purpose: one flat-maps read and one fetch per distinct
@@ -122,9 +157,10 @@ export class ApplicationTranslationCatalogService {
}
const getI18nContext = this.toI18nContextResolver({
- standardApplicationId: await loaders.standardApplicationIdLoader.load({
- workspaceId,
- }),
+ applicationAuthorIdentifiers:
+ await loaders.applicationAuthorIdentifiersLoader.load({
+ workspaceId,
+ }),
catalogByApplicationId: new Map(
isDefined(applicationId)
? [
@@ -156,15 +192,18 @@ export class ApplicationTranslationCatalogService {
}): Promise<
(applicationId: string | undefined) => EffectiveEntityI18nContext
> {
- const { standardApplicationId, catalogByApplicationId } =
- await this.getCatalogs({
- applicationIds,
- locale: locale ?? SOURCE_LOCALE,
- workspaceId,
- });
+ const [applicationAuthorIdentifiers, { catalogByApplicationId }] =
+ await Promise.all([
+ this.getApplicationAuthorIdentifiers({ workspaceId }),
+ this.getCatalogs({
+ applicationIds,
+ locale: locale ?? SOURCE_LOCALE,
+ workspaceId,
+ }),
+ ]);
return this.toI18nContextResolver({
- standardApplicationId,
+ applicationAuthorIdentifiers,
catalogByApplicationId,
locale,
});
@@ -173,11 +212,15 @@ export class ApplicationTranslationCatalogService {
// The one place the context shape is built, so the loader-backed and
// batched sources cannot drift apart.
private toI18nContextResolver({
- standardApplicationId,
+ applicationAuthorIdentifiers: {
+ standardApplicationId,
+ workspaceCustomApplicationUniversalIdentifier,
+ universalIdentifierByApplicationId,
+ },
catalogByApplicationId,
locale,
}: {
- standardApplicationId: string;
+ applicationAuthorIdentifiers: ApplicationAuthorIdentifiers;
catalogByApplicationId: Map<string, Record<string, string> | undefined>;
locale: keyof typeof APP_LOCALES | undefined;
}): (applicationId: string | undefined) => EffectiveEntityI18nContext {
@@ -192,6 +235,10 @@ export class ApplicationTranslationCatalogService {
applicationCatalog: isDefined(applicationId)
? catalogByApplicationId.get(applicationId)
: undefined,
+ workspaceCustomApplicationUniversalIdentifier,
+ ownerApplicationUniversalIdentifier: isDefined(applicationId)
+ ? universalIdentifierByApplicationId[applicationId]
+ : undefined,
});
}
@@ -229,6 +276,25 @@ export class ApplicationTranslationCatalogService {
}));
}
+ private async findWorkspaceCustomApplicationIdOrThrow(
+ workspaceId: string,
+ ): Promise<string> {
+ const workspace = await this.workspaceRepository.findOne({
+ select: ['id', 'workspaceCustomApplicationId'],
+ where: { id: workspaceId },
+ withDeleted: true,
+ });
+
+ if (!isDefined(workspace)) {
+ throw new ApplicationException(
+ `Could not find workspace ${workspaceId}`,
+ ApplicationExceptionCode.APPLICATION_NOT_FOUND,
+ );
+ }
+
+ return workspace.workspaceCustomApplicationId;
+ }
+
private async getFlatApplicationMaps({
workspaceId,
}: {
diff --git a/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/types/application-author-identifiers.type.ts b/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/types/application-author-identifiers.type.ts
new file mode 100644
index 00000000000..71e9cbc003b
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/types/application-author-identifiers.type.ts
@@ -0,0 +1,5 @@
+export type ApplicationAuthorIdentifiers = {
+ standardApplicationId: string;
+ workspaceCustomApplicationUniversalIdentifier: string;
+ universalIdentifierByApplicationId: Partial<Record<string, string>>;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/utils/__tests__/resolve-translatable-properties.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/utils/__tests__/resolve-translatable-properties.util.spec.ts
index 3dfec34429c..6bcc6ecf8d7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/utils/__tests__/resolve-translatable-properties.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/utils/__tests__/resolve-translatable-properties.util.spec.ts
@@ -1,13 +1,16 @@
import { SOURCE_LOCALE } from 'twenty-shared/translations';
import { resolveTranslatableProperties } from 'src/engine/metadata-modules/application-translation-catalog/utils/resolve-translatable-properties.util';
-import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/utils/effective-entity-i18n-context.type';
+import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type';
const i18nContext: EffectiveEntityI18nContext = {
locale: 'fr-FR',
i18nInstance: { _: (messageId: string) => messageId },
isStandardApp: false,
applicationCatalog: undefined,
+ workspaceCustomApplicationUniversalIdentifier:
+ 'workspace-custom-application-universal-identifier',
+ ownerApplicationUniversalIdentifier: undefined,
};
describe('resolveTranslatableProperties', () => {
diff --git a/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/utils/resolve-translatable-properties.util.ts b/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/utils/resolve-translatable-properties.util.ts
index 1a5a91ef8b9..35c05e640dc 100644
--- a/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/utils/resolve-translatable-properties.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/utils/resolve-translatable-properties.util.ts
@@ -2,8 +2,8 @@ import { type TranslatableMetadataName } from 'twenty-shared/i18n';
import { isDefined } from 'twenty-shared/utils';
import { ALL_TRANSLATABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-translatable-properties-by-metadata-name.constant';
-import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/utils/effective-entity-i18n-context.type';
-import { resolveEffectiveEntityPropertyByName } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type';
+import { resolveEffectiveEntityPropertyByName } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
export const resolveTranslatableProperties = ({
metadataName,
diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.service.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.service.ts
index 133999d72bd..b5dba082994 100644
--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.service.ts
@@ -13,7 +13,7 @@ import {
} from 'src/engine/metadata-modules/command-menu-item/command-menu-item.exception';
import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
import { type CommandMenuItemDTO } from 'src/engine/metadata-modules/command-menu-item/dtos/command-menu-item.dto';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
import { type CreateCommandMenuItemInput } from 'src/engine/metadata-modules/command-menu-item/dtos/create-command-menu-item.input';
import { type UpdateCommandMenuItemInput } from 'src/engine/metadata-modules/command-menu-item/dtos/update-command-menu-item.input';
import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
@@ -27,10 +27,12 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadat
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { type ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';
-import { isCallerOverridingEntity } from 'src/engine/metadata-modules/utils/is-caller-overriding-entity.util';
+import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';
import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
+import { dispatchIsActiveUpdateToAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/dispatch-is-active-update-to-authored-override.util';
+import { resetAuthoredOverrides } from 'src/engine/metadata-modules/overrides/utils/reset-authored-overrides.util';
@Injectable()
export class CommandMenuItemService {
@@ -284,10 +286,15 @@ export class CommandMenuItemService {
}
const flatCommandMenuItemToUpdate: FlatCommandMenuItem = {
- ...existingFlatCommandMenuItem,
+ ...resetAuthoredOverrides({
+ metadataName: 'commandMenuItem',
+ flatEntity: existingFlatCommandMenuItem,
+ authorUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ }),
isActive: true,
- overrides: null,
- universalOverrides: null,
updatedAt: new Date().toISOString(),
};
@@ -362,8 +369,15 @@ export class CommandMenuItemService {
});
const deactivatedFlatCommandMenuItem = {
- ...flatCommandMenuItemToDelete,
- isActive: false,
+ ...dispatchIsActiveUpdateToAuthoredOverride({
+ metadataName: 'commandMenuItem',
+ flatEntity: flatCommandMenuItemToDelete,
+ isActive: false,
+ authorUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ }),
updatedAt: new Date().toISOString(),
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/dtos/command-menu-item.dto.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/dtos/command-menu-item.dto.ts
index aab6ca51a38..fd02ab69817 100644
--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/dtos/command-menu-item.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/dtos/command-menu-item.dto.ts
@@ -17,6 +17,7 @@ import {
IsUUID,
} from 'class-validator';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { CommandMenuItemAvailabilityType } from 'twenty-shared/types';
import { type CommandMenuItemOverrides } from 'src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity';
@@ -122,7 +123,7 @@ export class CommandMenuItemDTO {
// cannot tell a standard label from one a workspace renamed, and would match
// the workspace's own copy against the standard catalog.
@HideField()
- overrides?: CommandMenuItemOverrides | null;
+ overrides?: AuthoredOverrides<CommandMenuItemOverrides> | null;
@Field(() => UUIDScalarType, { nullable: true })
universalIdentifier?: string;
diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity.ts
index 4b4bfead83b..33153912fc4 100644
--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity.ts
@@ -27,6 +27,7 @@ import { PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entiti
import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity';
export type CommandMenuItemOverrides = {
+ isActive?: boolean;
label?: string;
icon?: string | null;
shortLabel?: string | null;
diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/utils/__tests__/interpolate-navigation-command-menu-item-field.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/utils/__tests__/interpolate-navigation-command-menu-item-field.util.spec.ts
index e417f796cb7..0ed0d66cb08 100644
--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/utils/__tests__/interpolate-navigation-command-menu-item-field.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/utils/__tests__/interpolate-navigation-command-menu-item-field.util.spec.ts
@@ -16,6 +16,9 @@ const buildI18nContext = () => ({
i18nInstance: mockI18nInstance,
isStandardApp: true,
applicationCatalog: undefined,
+ workspaceCustomApplicationUniversalIdentifier:
+ 'workspace-custom-application-universal-identifier',
+ ownerApplicationUniversalIdentifier: undefined,
});
const mockObjectMetadata = {
diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/utils/build-navigation-placeholder-values.util.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/utils/build-navigation-placeholder-values.util.ts
index c0d29ca08be..2b3e57f8b11 100644
--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/utils/build-navigation-placeholder-values.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/utils/build-navigation-placeholder-values.util.ts
@@ -4,13 +4,14 @@ import {
} from 'twenty-shared/i18n';
import { type ObjectMetadataOverrides } from 'src/engine/metadata-modules/object-metadata/types/object-metadata-overrides.type';
-import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/utils/effective-entity-i18n-context.type';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
export type NavigationPlaceholderObjectMetadata = {
labelPlural: string;
icon?: string | null;
- overrides?: ObjectMetadataOverrides | null;
+ overrides?: AuthoredOverrides<ObjectMetadataOverrides> | null;
};
export const buildNavigationPlaceholderValues = ({
diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/utils/interpolate-navigation-command-menu-item-field.util.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/utils/interpolate-navigation-command-menu-item-field.util.ts
index d63b42ca520..b76ec05087a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/utils/interpolate-navigation-command-menu-item-field.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/utils/interpolate-navigation-command-menu-item-field.util.ts
@@ -8,7 +8,7 @@ import {
buildNavigationPlaceholderValues,
type NavigationPlaceholderObjectMetadata,
} from 'src/engine/metadata-modules/command-menu-item/utils/build-navigation-placeholder-values.util';
-import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/utils/effective-entity-i18n-context.type';
+import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type';
// NAVIGATION items are the only ones whose placeholders the server can fill:
// they carry their target object as a foreign key. Every other availability
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto.ts
index 0de644f897b..a76bc18f3fc 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto.ts
@@ -24,6 +24,7 @@ import {
MetadataWritability,
} from 'twenty-shared/types';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { IsValidMetadataName } from 'src/engine/decorators/metadata/is-valid-metadata-name.decorator';
import { type FieldMetadataOverrides } from 'src/engine/metadata-modules/field-metadata/types/field-metadata-overrides.type';
@@ -74,7 +75,7 @@ export class FieldMetadataDTO<T extends FieldMetadataType = FieldMetadataType> {
icon?: string;
@HideField()
- overrides?: FieldMetadataOverrides | null;
+ overrides?: AuthoredOverrides<FieldMetadataOverrides> | null;
@IsBoolean()
@IsOptional()
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.entity.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.entity.ts
index 9ef8a75ca6e..4e2ac28f677 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.entity.ts
@@ -41,6 +41,7 @@ import { ViewFilterEntity } from 'src/engine/metadata-modules/view-filter/entiti
import { ViewSortEntity } from 'src/engine/metadata-modules/view-sort/entities/view-sort.entity';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-entity.interface';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
import { JsonbProperty } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/jsonb-property.type';
// This entity is used as a reference test case for type utilities in:
@@ -111,7 +112,7 @@ export class FieldMetadataEntity<
upgradeCommandName: ADD_METADATA_OVERRIDES_COLUMN_UPGRADE_COMMAND_NAME,
})
@Column({ type: 'jsonb', nullable: true })
- overrides: JsonbProperty<FieldMetadataOverrides> | null;
+ overrides: JsonbProperty<AuthoredOverrides<FieldMetadataOverrides>> | null;
/**
* @deprecated Please use `overrides` instead.
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts
index 2c6e33d2317..1b2cf989dc2 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts
@@ -49,7 +49,7 @@ import { applyMetadataFilterToQueryBuilder } from 'src/engine/metadata-modules/p
import { findManyWithCursorPagination } from 'src/engine/metadata-modules/pagination/utils/find-many-with-cursor-pagination.util';
import { fieldMetadataGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/field-metadata/utils/field-metadata-graphql-api-exception-handler.util';
import { fromFlatFieldMetadataToFieldMetadataDto } from 'src/engine/metadata-modules/flat-field-metadata/utils/from-flat-field-metadata-to-field-metadata-dto.util';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts
index fe55f8a0e6f..25aa8563f68 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts
@@ -217,13 +217,12 @@ export class FieldMetadataService {
isSystemBuild?: boolean;
ownerFlatApplication?: FlatApplication;
}): Promise<FlatFieldMetadata> {
+ const { workspaceCustomFlatApplication } =
+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
+ { workspaceId },
+ );
const resolvedOwnerFlatApplication =
- ownerFlatApplication ??
- (
- await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
- { workspaceId },
- )
- ).workspaceCustomFlatApplication;
+ ownerFlatApplication ?? workspaceCustomFlatApplication;
const {
flatObjectMetadataMaps: existingFlatObjectMetadataMaps,
@@ -259,6 +258,8 @@ export class FieldMetadataService {
flatViewFieldMaps: existingFlatViewFieldMaps,
flatApplication: resolvedOwnerFlatApplication,
isSystemBuild,
+ workspaceCustomApplicationUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
});
if (inputTranspilationResult.status === 'fail') {
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/types/field-metadata-overrides.type.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/types/field-metadata-overrides.type.ts
index f9b1d218efc..5adae237564 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/types/field-metadata-overrides.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/types/field-metadata-overrides.type.ts
@@ -1,6 +1,7 @@
import { type APP_LOCALES } from 'twenty-shared/translations';
export type FieldMetadataOverrides = {
+ isActive?: boolean;
label?: string | null;
description?: string | null;
icon?: string | null;
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/from-field-metadata-entity-to-field-metadata-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/from-field-metadata-entity-to-field-metadata-dto.util.ts
index 1179828363e..d4bd0b364f5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/from-field-metadata-entity-to-field-metadata-dto.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/from-field-metadata-entity-to-field-metadata-dto.util.ts
@@ -1,11 +1,27 @@
import { type DerivedFieldMetadataIds } from 'src/engine/metadata-modules/derived-field-metadata-ids/types/derived-field-metadata-ids.type';
import { type FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
import { type FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { readAuthoredOverrideProperty } from 'src/engine/metadata-modules/overrides/utils/read-authored-override-property.util';
+
+const resolveEffectiveEntityIsActive = (entity: {
+ isActive: boolean;
+ overrides: unknown;
+}): boolean => {
+ const overrideValue = readAuthoredOverrideProperty({
+ metadataName: 'fieldMetadata',
+ overrides: entity.overrides,
+ path: ['isActive'],
+ authorContext: { ownerApplicationUniversalIdentifier: undefined },
+ });
+
+ return typeof overrideValue === 'boolean' ? overrideValue : entity.isActive;
+};
// isUnique is derived from IndexMetadata rather than stored on the field
// entity; callers that need an accurate value (e.g. the REST controller)
// pass the precomputed Set<fieldMetadataId>. Callers in pure-entity
// contexts that don't care about uniqueness can omit it.
+
export const fromFieldMetadataEntityToFieldMetadataDto = (
entity: FieldMetadataEntity,
derivedFieldMetadataIds?: DerivedFieldMetadataIds,
@@ -19,7 +35,7 @@ export const fromFieldMetadataEntityToFieldMetadataDto = (
description: entity.description ?? undefined,
icon: entity.icon ?? undefined,
overrides: entity.overrides ?? undefined,
- isActive: entity.isActive,
+ isActive: resolveEffectiveEntityIsActive(entity),
isSystem: entity.isSystem,
isUIEditable: entity.isUIEditable,
isUIReadOnly: !entity.isUIEditable,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-command-menu-item-overrides-to-universal-overrides.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-command-menu-item-overrides-to-universal-overrides.util.ts
index 2e26ec00ea9..891f7aab841 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-command-menu-item-overrides-to-universal-overrides.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-command-menu-item-overrides-to-universal-overrides.util.ts
@@ -6,6 +6,8 @@ import {
FlatEntityMapsException,
FlatEntityMapsExceptionCode,
} from 'src/engine/metadata-modules/flat-entity/exceptions/flat-entity-maps.exception';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
+import { mapAuthoredOverrideEntries } from 'src/engine/metadata-modules/overrides/utils/map-authored-override-entries.util';
type UniversalCommandMenuItemOverrides =
FormatRecordSerializedRelationProperties<CommandMenuItemOverrides>;
@@ -23,7 +25,7 @@ const COMMAND_MENU_ITEM_OVERRIDES_FOREIGN_KEYS = [
},
] as const;
-export const fromCommandMenuItemOverridesToUniversalOverrides = ({
+const fromCommandMenuItemOverridesToUniversalOverridesEntry = ({
overrides,
objectMetadataUniversalIdentifierById,
pageLayoutUniversalIdentifierById,
@@ -76,3 +78,26 @@ export const fromCommandMenuItemOverridesToUniversalOverrides = ({
scalarOverrides,
);
};
+
+export const fromCommandMenuItemOverridesToUniversalOverrides = ({
+ overrides,
+ objectMetadataUniversalIdentifierById,
+ pageLayoutUniversalIdentifierById,
+ shouldThrowOnMissingIdentifier,
+}: {
+ overrides: AuthoredOverrides<CommandMenuItemOverrides>;
+ objectMetadataUniversalIdentifierById: Partial<Record<string, string>>;
+ pageLayoutUniversalIdentifierById: Partial<Record<string, string>>;
+ shouldThrowOnMissingIdentifier?: boolean;
+}): AuthoredOverrides<UniversalCommandMenuItemOverrides> =>
+ mapAuthoredOverrideEntries({
+ metadataName: 'commandMenuItem',
+ overrides,
+ mapEntry: (entry) =>
+ fromCommandMenuItemOverridesToUniversalOverridesEntry({
+ overrides: entry,
+ objectMetadataUniversalIdentifierById,
+ pageLayoutUniversalIdentifierById,
+ shouldThrowOnMissingIdentifier,
+ }),
+ });
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-flat-command-menu-item-to-command-menu-item-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-flat-command-menu-item-to-command-menu-item-dto.util.ts
index fc0c4e03f12..808d3180b1d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-flat-command-menu-item-to-command-menu-item-dto.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-flat-command-menu-item-to-command-menu-item-dto.util.ts
@@ -1,14 +1,15 @@
import { type CommandMenuItemDTO } from 'src/engine/metadata-modules/command-menu-item/dtos/command-menu-item.dto';
import { isObjectMetadataCommandMenuItemPayload } from 'src/engine/metadata-modules/command-menu-item/utils/is-object-metadata-command-menu-item-payload.util';
import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';
+import { resolveEffectiveFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity.util';
export const fromFlatCommandMenuItemToCommandMenuItemDto = (
flatCommandMenuItem: FlatCommandMenuItem,
): CommandMenuItemDTO => {
- const effectiveFlatCommandMenuItem = {
- ...flatCommandMenuItem,
- ...(flatCommandMenuItem.overrides ?? {}),
- };
+ const effectiveFlatCommandMenuItem = resolveEffectiveFlatEntity({
+ metadataName: 'commandMenuItem',
+ flatEntity: flatCommandMenuItem,
+ });
return {
id: effectiveFlatCommandMenuItem.id,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-update-command-menu-item-input-to-flat-command-menu-item-to-update-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-update-command-menu-item-input-to-flat-command-menu-item-to-update-or-throw.util.ts
index a7cd1d12d07..482745f4baa 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-update-command-menu-item-input-to-flat-command-menu-item-to-update-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-update-command-menu-item-input-to-flat-command-menu-item-to-update-or-throw.util.ts
@@ -5,7 +5,6 @@ import {
CommandMenuItemExceptionCode,
} from 'src/engine/metadata-modules/command-menu-item/command-menu-item.exception';
import { type UpdateCommandMenuItemInput } from 'src/engine/metadata-modules/command-menu-item/dtos/update-command-menu-item.input';
-import { type CommandMenuItemOverrides } from 'src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity';
import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { resolveEntityRelationUniversalIdentifiers } from 'src/engine/metadata-modules/flat-entity/utils/resolve-entity-relation-universal-identifiers.util';
@@ -13,8 +12,8 @@ import { FLAT_COMMAND_MENU_ITEM_EDITABLE_PROPERTIES } from 'src/engine/metadata-
import { type FlatCommandMenuItemMaps } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item-maps.type';
import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';
import { fromCommandMenuItemOverridesToUniversalOverrides } from 'src/engine/metadata-modules/flat-command-menu-item/utils/from-command-menu-item-overrides-to-universal-overrides.util';
-import { isCallerOverridingEntity } from 'src/engine/metadata-modules/utils/is-caller-overriding-entity.util';
-import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util';
+import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';
+import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/overrides/utils/sanitize-overridable-entity-input.util';
import { mergeUpdateInExistingRecord } from 'src/utils/merge-update-in-existing-record.util';
export const fromUpdateCommandMenuItemInputToFlatCommandMenuItemToUpdateOrThrow =
@@ -62,6 +61,8 @@ export const fromUpdateCommandMenuItemInputToFlatCommandMenuItemToUpdateOrThrow
existingFlatEntity: existingFlatCommandMenuItem,
updatedEditableProperties: updates,
shouldOverride,
+ callerApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
});
const mergedRecord = mergeUpdateInExistingRecord({
@@ -108,7 +109,7 @@ export const fromUpdateCommandMenuItemInputToFlatCommandMenuItemToUpdateOrThrow
if (isDefined(overrides)) {
flatCommandMenuItemToUpdate.universalOverrides =
fromCommandMenuItemOverridesToUniversalOverrides({
- overrides: overrides as CommandMenuItemOverrides,
+ overrides,
objectMetadataUniversalIdentifierById:
flatObjectMetadataMaps.universalIdentifierById,
pageLayoutUniversalIdentifierById:
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/overridable-and-translatable-properties.constant.spec.ts.snap b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/overridable-and-translatable-properties.constant.spec.ts.snap
index f852939dacf..0d520d0e5aa 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/overridable-and-translatable-properties.constant.spec.ts.snap
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/overridable-and-translatable-properties.constant.spec.ts.snap
@@ -15,11 +15,13 @@ exports[`registry-derived override property maps derives the overridable propert
"engineComponentKey",
"hotKeys",
"pageLayoutId",
+ "isActive",
],
"connectionProvider": [],
"fieldMetadata": [
"description",
"icon",
+ "isActive",
"label",
],
"fieldPermission": [],
@@ -32,6 +34,7 @@ exports[`registry-derived override property maps derives the overridable propert
"color",
"description",
"icon",
+ "isActive",
"labelPlural",
"labelSingular",
"imageIdentifierFieldMetadataId",
@@ -42,6 +45,7 @@ exports[`registry-derived override property maps derives the overridable propert
"title",
"position",
"icon",
+ "isActive",
],
"pageLayoutWidget": [
"title",
@@ -49,6 +53,7 @@ exports[`registry-derived override property maps derives the overridable propert
"pageLayoutTabId",
"conditionalDisplay",
"conditionalAvailabilityExpression",
+ "isActive",
],
"permissionFlag": [],
"role": [],
@@ -61,6 +66,7 @@ exports[`registry-derived override property maps derives the overridable propert
"timelineActivityType": [
"label",
"icon",
+ "isActive",
],
"view": [
"name",
@@ -79,6 +85,7 @@ exports[`registry-derived override property maps derives the overridable propert
"mainGroupByFieldMetadataId",
"shouldHideEmptyGroups",
"kanbanColumnWidth",
+ "isActive",
],
"viewField": [
"isVisible",
@@ -86,11 +93,13 @@ exports[`registry-derived override property maps derives the overridable propert
"position",
"aggregateOperation",
"viewFieldGroupId",
+ "isActive",
],
"viewFieldGroup": [
"name",
"position",
"isVisible",
+ "isActive",
],
"viewFilter": [],
"viewFilterGroup": [],
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/overridable-and-translatable-properties.constant.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/overridable-and-translatable-properties.constant.spec.ts
index 08680cfd476..640e3df1a54 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/overridable-and-translatable-properties.constant.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/overridable-and-translatable-properties.constant.spec.ts
@@ -1,4 +1,4 @@
-import { ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-overridable-properties-by-metadata-name.constant';
+import { ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/overrides/constants/all-overridable-properties-by-metadata-name.constant';
import { ALL_TRANSLATABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-translatable-properties-by-metadata-name.constant';
describe('registry-derived override property maps', () => {
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts
index 72ff984f652..5fd356d5537 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts
@@ -72,6 +72,7 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {
isOverridable: true,
},
isActive: {
+ isOverridable: true,
toCompare: true,
toStringify: false,
universalProperty: undefined,
@@ -211,6 +212,7 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {
isOverridable: true,
},
isActive: {
+ isOverridable: true,
toCompare: true,
toStringify: false,
universalProperty: undefined,
@@ -441,10 +443,10 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {
isOverridable: true,
},
isActive: {
+ isOverridable: true,
toCompare: true,
toStringify: false,
universalProperty: undefined,
- isOverridable: false,
},
overrides: {
toCompare: true,
@@ -497,10 +499,10 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {
isOverridable: true,
},
isActive: {
+ isOverridable: true,
toCompare: true,
toStringify: false,
universalProperty: undefined,
- isOverridable: false,
},
deletedAt: {
toStringify: false,
@@ -590,10 +592,10 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {
universalProperty: 'viewUniversalIdentifier',
},
isActive: {
+ isOverridable: true,
toCompare: true,
toStringify: false,
universalProperty: undefined,
- isOverridable: false,
},
overrides: {
toCompare: true,
@@ -1099,10 +1101,10 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {
isOverridable: true,
},
isActive: {
+ isOverridable: true,
toCompare: true,
toStringify: false,
universalProperty: undefined,
- isOverridable: false,
},
overrides: {
toCompare: true,
@@ -1160,10 +1162,10 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {
universalProperty: undefined,
},
isActive: {
+ isOverridable: true,
toCompare: true,
toStringify: false,
universalProperty: undefined,
- isOverridable: false,
},
overrides: {
toCompare: true,
@@ -1322,10 +1324,10 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {
isOverridable: true,
},
isActive: {
+ isOverridable: true,
toCompare: true,
toStringify: false,
universalProperty: undefined,
- isOverridable: false,
},
overrides: {
toCompare: true,
@@ -1979,10 +1981,10 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {
universalProperty: undefined,
},
isActive: {
+ isOverridable: true,
toCompare: true,
toStringify: false,
universalProperty: undefined,
- isOverridable: false,
},
overrides: {
toCompare: true,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/split-entities-by-reset-strategy.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/split-entities-by-reset-strategy.util.spec.ts
new file mode 100644
index 00000000000..ab6cc96dad9
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/split-entities-by-reset-strategy.util.spec.ts
@@ -0,0 +1,67 @@
+import { splitEntitiesByResetStrategy } from 'src/engine/metadata-modules/flat-entity/utils/split-entities-by-reset-strategy.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = '20202020-bbbb-4bbb-8bbb-000000000002';
+const NOW = '2026-01-01T00:00:00.000Z';
+
+describe('splitEntitiesByResetStrategy', () => {
+ it('hard deletes a row the custom application owns outright', () => {
+ const customViewField = {
+ applicationUniversalIdentifier: CUSTOM,
+ isActive: true,
+ isSystemSideEffect: false,
+ overrides: null,
+ };
+
+ expect(
+ splitEntitiesByResetStrategy({
+ metadataName: 'viewField',
+ entities: [customViewField],
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ now: NOW,
+ }),
+ ).toEqual({ toHardDelete: [customViewField], toReset: [] });
+ });
+
+ it('reactivates a row deactivated on the column', () => {
+ const deactivatedViewField = {
+ applicationUniversalIdentifier: OWNER,
+ isActive: false,
+ isSystemSideEffect: false,
+ overrides: null,
+ };
+
+ expect(
+ splitEntitiesByResetStrategy({
+ metadataName: 'viewField',
+ entities: [deactivatedViewField],
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ now: NOW,
+ }),
+ ).toEqual({
+ toHardDelete: [],
+ toReset: [{ ...deactivatedViewField, isActive: true, updatedAt: NOW }],
+ });
+ });
+
+ it('reactivates an engine-managed row the custom application owns', () => {
+ const engineManagedViewField = {
+ applicationUniversalIdentifier: CUSTOM,
+ isActive: false,
+ isSystemSideEffect: true,
+ overrides: null,
+ };
+
+ expect(
+ splitEntitiesByResetStrategy({
+ metadataName: 'viewField',
+ entities: [engineManagedViewField],
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ now: NOW,
+ }),
+ ).toEqual({
+ toHardDelete: [],
+ toReset: [{ ...engineManagedViewField, isActive: true, updatedAt: NOW }],
+ });
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/split-entities-by-removal-strategy.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/split-entities-by-removal-strategy.util.ts
index 134fb9ee258..77cc23da096 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/split-entities-by-removal-strategy.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/split-entities-by-removal-strategy.util.ts
@@ -1,24 +1,32 @@
+import { type AllMetadataName } from 'twenty-shared/metadata';
+
+import { dispatchIsActiveUpdateToAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/dispatch-is-active-update-to-authored-override.util';
+
type EntityWithApplicationIdentifier = {
applicationUniversalIdentifier: string;
+ isActive?: boolean;
+ overrides?: unknown;
isSystemSideEffect?: boolean;
};
export const splitEntitiesByRemovalStrategy = <
T extends EntityWithApplicationIdentifier,
>({
+ metadataName,
entitiesToRemove,
workspaceCustomApplicationUniversalIdentifier,
now,
}: {
+ metadataName: AllMetadataName;
entitiesToRemove: T[];
workspaceCustomApplicationUniversalIdentifier: string;
now: string;
}): {
toHardDelete: T[];
- toDeactivate: (T & { isActive: false; updatedAt: string })[];
+ toDeactivate: (T & { updatedAt: string })[];
} => {
const toHardDelete: T[] = [];
- const toDeactivate: (T & { isActive: false; updatedAt: string })[] = [];
+ const toDeactivate: (T & { updatedAt: string })[] = [];
for (const entity of entitiesToRemove) {
if (
@@ -29,8 +37,14 @@ export const splitEntitiesByRemovalStrategy = <
toHardDelete.push(entity);
} else {
toDeactivate.push({
- ...entity,
- isActive: false as const,
+ ...dispatchIsActiveUpdateToAuthoredOverride({
+ metadataName,
+ flatEntity: entity,
+ isActive: false,
+ authorUniversalIdentifier:
+ workspaceCustomApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
+ }),
updatedAt: now,
});
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/split-entities-by-reset-strategy.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/split-entities-by-reset-strategy.util.ts
index f08b4df79f0..443a4af24f7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/split-entities-by-reset-strategy.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/split-entities-by-reset-strategy.util.ts
@@ -1,3 +1,7 @@
+import { type AllMetadataName } from 'twenty-shared/metadata';
+
+import { resetAuthoredOverrides } from 'src/engine/metadata-modules/overrides/utils/reset-authored-overrides.util';
+
type EntityWithApplicationIdentifierAndOverrides = {
applicationUniversalIdentifier: string;
isActive: boolean;
@@ -8,23 +12,21 @@ type EntityWithApplicationIdentifierAndOverrides = {
export const splitEntitiesByResetStrategy = <
T extends EntityWithApplicationIdentifierAndOverrides,
>({
+ metadataName,
entities,
workspaceCustomApplicationUniversalIdentifier,
now,
}: {
+ metadataName: AllMetadataName;
entities: T[];
workspaceCustomApplicationUniversalIdentifier: string;
now: string;
}): {
toHardDelete: T[];
- toReset: (T & { isActive: true; overrides: null; updatedAt: string })[];
+ toReset: (T & { updatedAt: string })[];
} => {
const toHardDelete: T[] = [];
- const toReset: (T & {
- isActive: true;
- overrides: null;
- updatedAt: string;
- })[] = [];
+ const toReset: (T & { updatedAt: string })[] = [];
for (const entity of entities) {
if (
@@ -35,10 +37,14 @@ export const splitEntitiesByResetStrategy = <
toHardDelete.push(entity);
} else {
toReset.push({
- ...entity,
- isActive: true as const,
- overrides: null,
- ...('universalOverrides' in entity ? { universalOverrides: null } : {}),
+ ...resetAuthoredOverrides({
+ metadataName,
+ flatEntity: entity,
+ authorUniversalIdentifier:
+ workspaceCustomApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
+ }),
+ isActive: true,
updatedAt: now,
});
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/__tests__/compute-flat-field-to-update-and-related-flat-field-to-update.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/__tests__/compute-flat-field-to-update-and-related-flat-field-to-update.util.spec.ts
new file mode 100644
index 00000000000..e2fc33f7879
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/__tests__/compute-flat-field-to-update-and-related-flat-field-to-update.util.spec.ts
@@ -0,0 +1,171 @@
+import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';
+import { FieldMetadataType } from 'twenty-shared/types';
+
+import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
+import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
+import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';
+import { computeFlatFieldToUpdateAndRelatedFlatFieldToUpdate } from 'src/engine/metadata-modules/flat-field-metadata/utils/compute-flat-field-to-update-and-related-flat-field-to-update.util';
+import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+const STANDARD = TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER;
+
+const buildRelationPair = (applicationUniversalIdentifier: string) => {
+ const flatObjectMetadata = getFlatObjectMetadataMock({
+ universalIdentifier: 'object-uid',
+ id: 'object-id',
+ applicationUniversalIdentifier,
+ });
+ const sourceFlatFieldMetadata = getFlatFieldMetadataMock({
+ universalIdentifier: 'source-uid',
+ id: 'source-id',
+ objectMetadataId: flatObjectMetadata.id,
+ type: FieldMetadataType.RELATION,
+ relationTargetFieldMetadataId: 'target-id',
+ applicationUniversalIdentifier,
+ });
+ const targetFlatFieldMetadata = getFlatFieldMetadataMock({
+ universalIdentifier: 'target-uid',
+ id: 'target-id',
+ objectMetadataId: 'other-object-id',
+ type: FieldMetadataType.RELATION,
+ relationTargetFieldMetadataId: sourceFlatFieldMetadata.id,
+ applicationUniversalIdentifier,
+ });
+ const flatFieldMetadataMaps = [
+ sourceFlatFieldMetadata,
+ targetFlatFieldMetadata,
+ ].reduce(
+ (maps, flatEntity) =>
+ addFlatEntityToFlatEntityMapsOrThrow({
+ flatEntity,
+ flatEntityMaps: maps,
+ }),
+ createEmptyFlatEntityMaps(),
+ );
+
+ return { flatObjectMetadata, sourceFlatFieldMetadata, flatFieldMetadataMaps };
+};
+
+describe('computeFlatFieldToUpdateAndRelatedFlatFieldToUpdate', () => {
+ it('dispatches a standard relation deactivation into both sides overrides', () => {
+ const {
+ flatObjectMetadata,
+ sourceFlatFieldMetadata,
+ flatFieldMetadataMaps,
+ } = buildRelationPair(STANDARD);
+
+ const { flatFieldMetadataFromTo, relatedFlatFieldMetadatasFromTo } =
+ computeFlatFieldToUpdateAndRelatedFlatFieldToUpdate({
+ rawUpdateFieldInput: {
+ id: sourceFlatFieldMetadata.id,
+ workspaceId: 'workspace-id',
+ isActive: false,
+ },
+ fromFlatFieldMetadata: sourceFlatFieldMetadata,
+ flatObjectMetadata,
+ flatFieldMetadataMaps,
+ isSystemBuild: false,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ });
+
+ expect(flatFieldMetadataFromTo.toFlatFieldMetadata).toMatchObject({
+ isActive: true,
+ overrides: { [CUSTOM]: { isActive: false } },
+ });
+ expect(relatedFlatFieldMetadatasFromTo).toHaveLength(1);
+ expect(
+ relatedFlatFieldMetadatasFromTo[0].toFlatFieldMetadata,
+ ).toMatchObject({
+ id: 'target-id',
+ isActive: true,
+ overrides: { [CUSTOM]: { isActive: false } },
+ });
+ });
+
+ it('writes the column on both sides of a custom relation', () => {
+ const {
+ flatObjectMetadata,
+ sourceFlatFieldMetadata,
+ flatFieldMetadataMaps,
+ } = buildRelationPair(CUSTOM);
+
+ const { flatFieldMetadataFromTo, relatedFlatFieldMetadatasFromTo } =
+ computeFlatFieldToUpdateAndRelatedFlatFieldToUpdate({
+ rawUpdateFieldInput: {
+ id: sourceFlatFieldMetadata.id,
+ workspaceId: 'workspace-id',
+ isActive: false,
+ },
+ fromFlatFieldMetadata: sourceFlatFieldMetadata,
+ flatObjectMetadata,
+ flatFieldMetadataMaps,
+ isSystemBuild: false,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ });
+
+ expect(flatFieldMetadataFromTo.toFlatFieldMetadata).toMatchObject({
+ isActive: false,
+ overrides: null,
+ });
+ expect(
+ relatedFlatFieldMetadatasFromTo[0].toFlatFieldMetadata,
+ ).toMatchObject({ id: 'target-id', isActive: false, overrides: null });
+ });
+
+ it('writes the column on both sides of a standard relation in a system build', () => {
+ const {
+ flatObjectMetadata,
+ sourceFlatFieldMetadata,
+ flatFieldMetadataMaps,
+ } = buildRelationPair(STANDARD);
+
+ const { flatFieldMetadataFromTo, relatedFlatFieldMetadatasFromTo } =
+ computeFlatFieldToUpdateAndRelatedFlatFieldToUpdate({
+ rawUpdateFieldInput: {
+ id: sourceFlatFieldMetadata.id,
+ workspaceId: 'workspace-id',
+ isActive: false,
+ },
+ fromFlatFieldMetadata: sourceFlatFieldMetadata,
+ flatObjectMetadata,
+ flatFieldMetadataMaps,
+ isSystemBuild: true,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ });
+
+ expect(flatFieldMetadataFromTo.toFlatFieldMetadata).toMatchObject({
+ isActive: false,
+ overrides: null,
+ });
+ expect(
+ relatedFlatFieldMetadatasFromTo[0].toFlatFieldMetadata,
+ ).toMatchObject({ id: 'target-id', isActive: false, overrides: null });
+ });
+
+ it('leaves the related field untouched when isActive is not updated', () => {
+ const {
+ flatObjectMetadata,
+ sourceFlatFieldMetadata,
+ flatFieldMetadataMaps,
+ } = buildRelationPair(STANDARD);
+
+ const { relatedFlatFieldMetadatasFromTo } =
+ computeFlatFieldToUpdateAndRelatedFlatFieldToUpdate({
+ rawUpdateFieldInput: {
+ id: sourceFlatFieldMetadata.id,
+ workspaceId: 'workspace-id',
+ label: 'Renamed',
+ },
+ fromFlatFieldMetadata: sourceFlatFieldMetadata,
+ flatObjectMetadata,
+ flatFieldMetadataMaps,
+ isSystemBuild: false,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ });
+
+ expect(relatedFlatFieldMetadatasFromTo[0].toFlatFieldMetadata).toEqual(
+ relatedFlatFieldMetadatasFromTo[0].fromFlatFieldMetadata,
+ );
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/compute-flat-field-to-update-and-related-flat-field-to-update.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/compute-flat-field-to-update-and-related-flat-field-to-update.util.ts
index 2e278293146..0aeb05182f2 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/compute-flat-field-to-update-and-related-flat-field-to-update.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/compute-flat-field-to-update-and-related-flat-field-to-update.util.ts
@@ -19,6 +19,7 @@ import { isFlatFieldMetadataOfType } from 'src/engine/metadata-modules/flat-fiel
import { sanitizeRawUpdateFieldInput } from 'src/engine/metadata-modules/flat-field-metadata/utils/sanitize-raw-update-field-input';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { belongsToTwentyStandardApp } from 'src/engine/metadata-modules/utils/belongs-to-twenty-standard-app.util';
+import { dispatchIsActiveUpdateToAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/dispatch-is-active-update-to-authored-override.util';
import { mergeUpdateInExistingRecord } from 'src/utils/merge-update-in-existing-record.util';
type ComputeFlatFieldToUpdateAndRelatedFlatFieldToUpdateReturnType = {
@@ -34,6 +35,7 @@ type ComputeFlatFieldToUpdateAndRelatedFlatFieldToUpdateArgs = {
fromFlatFieldMetadata: FlatFieldMetadata;
flatObjectMetadata: FlatObjectMetadata;
isSystemBuild: boolean;
+ workspaceCustomApplicationUniversalIdentifier: string;
} & Pick<AllFlatEntityMaps, 'flatFieldMetadataMaps'>;
// Note: Standard override is way too complex we should land a smoother implemenentation once we standardize
// them across every flat entities
@@ -43,15 +45,31 @@ export const computeFlatFieldToUpdateAndRelatedFlatFieldToUpdate = ({
flatFieldMetadataMaps,
flatObjectMetadata,
isSystemBuild,
+ workspaceCustomApplicationUniversalIdentifier,
}: ComputeFlatFieldToUpdateAndRelatedFlatFieldToUpdateArgs): ComputeFlatFieldToUpdateAndRelatedFlatFieldToUpdateReturnType => {
const { overrides, updatedEditableFieldProperties } =
sanitizeRawUpdateFieldInput({
existingFlatFieldMetadata: fromFlatFieldMetadata,
rawUpdateFieldInput,
isSystemBuild,
+ workspaceCustomApplicationUniversalIdentifier,
});
const isStandardField = belongsToTwentyStandardApp(fromFlatFieldMetadata);
+ const updatedIsActive = rawUpdateFieldInput.isActive;
+ const dispatchIsActiveToRelatedFlatFieldMetadata = (
+ relatedFlatFieldMetadata: FlatFieldMetadata,
+ ): FlatFieldMetadata =>
+ isSystemBuild || !isDefined(updatedIsActive)
+ ? relatedFlatFieldMetadata
+ : dispatchIsActiveUpdateToAuthoredOverride({
+ metadataName: 'fieldMetadata',
+ flatEntity: relatedFlatFieldMetadata,
+ isActive: updatedIsActive,
+ authorUniversalIdentifier:
+ workspaceCustomApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
+ });
const toFlatFieldMetadata = {
...mergeUpdateInExistingRecord({
@@ -113,12 +131,15 @@ export const computeFlatFieldToUpdateAndRelatedFlatFieldToUpdate = ({
flatFieldMetadataMaps,
});
- const relatedFlatFieldMetadataTo = mergeUpdateInExistingRecord({
- existing: relatedFlatFieldMetadataFrom as FlatFieldMetadata,
- properties:
- FLAT_FIELD_METADATA_RELATION_EDITABLE_PROPERTIES_ON_SIBLING_MORPH_OR_RELATION_UPDATE_CONSTANT,
- update: updatedEditableFieldProperties,
- });
+ const relatedFlatFieldMetadataTo =
+ dispatchIsActiveToRelatedFlatFieldMetadata(
+ mergeUpdateInExistingRecord({
+ existing: relatedFlatFieldMetadataFrom as FlatFieldMetadata,
+ properties:
+ FLAT_FIELD_METADATA_RELATION_EDITABLE_PROPERTIES_ON_SIBLING_MORPH_OR_RELATION_UPDATE_CONSTANT,
+ update: updatedEditableFieldProperties,
+ }),
+ );
return {
flatFieldMetadataFromTo: {
@@ -155,14 +176,15 @@ export const computeFlatFieldToUpdateAndRelatedFlatFieldToUpdate = ({
FLAT_FIELD_METADATA_MORPH_RELATION_EDITABLE_PROPERTIES_ON_SIBLING_MORPH_RELATION_UPDATE_CONSTANT[
isStandardField && !isSystemBuild ? 'standard' : 'custom'
];
- const relatedFlatFieldMetadataTo = {
- ...mergeUpdateInExistingRecord({
- existing: relatedFlatFieldMetadataFrom as FlatFieldMetadata,
- properties: relatedMorphPropertiesToUpdateTo,
- update: updatedEditableFieldProperties,
- }),
- overrides,
- };
+ const relatedFlatFieldMetadataTo =
+ dispatchIsActiveToRelatedFlatFieldMetadata({
+ ...mergeUpdateInExistingRecord({
+ existing: relatedFlatFieldMetadataFrom as FlatFieldMetadata,
+ properties: relatedMorphPropertiesToUpdateTo,
+ update: updatedEditableFieldProperties,
+ }),
+ overrides,
+ });
return {
fromFlatFieldMetadata: relatedFlatFieldMetadataFrom,
@@ -173,12 +195,15 @@ export const computeFlatFieldToUpdateAndRelatedFlatFieldToUpdate = ({
const relatedRelationFlatFieldMetadataTo = relationFlatFieldMetadatas.map<
FromTo<FlatFieldMetadata, 'flatFieldMetadata'>
>((relatedFlatFieldMetadataFrom) => {
- const relatedFlatFieldMetadataTo = mergeUpdateInExistingRecord({
- existing: relatedFlatFieldMetadataFrom as FlatFieldMetadata,
- properties:
- FLAT_FIELD_METADATA_RELATION_EDITABLE_PROPERTIES_ON_SIBLING_MORPH_OR_RELATION_UPDATE_CONSTANT,
- update: updatedEditableFieldProperties,
- });
+ const relatedFlatFieldMetadataTo =
+ dispatchIsActiveToRelatedFlatFieldMetadata(
+ mergeUpdateInExistingRecord({
+ existing: relatedFlatFieldMetadataFrom as FlatFieldMetadata,
+ properties:
+ FLAT_FIELD_METADATA_RELATION_EDITABLE_PROPERTIES_ON_SIBLING_MORPH_OR_RELATION_UPDATE_CONSTANT,
+ update: updatedEditableFieldProperties,
+ }),
+ );
return {
fromFlatFieldMetadata: relatedFlatFieldMetadataFrom,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-flat-field-metadata-to-field-metadata-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-flat-field-metadata-to-field-metadata-dto.util.ts
index 1339ccd234d..7d7dee78034 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-flat-field-metadata-to-field-metadata-dto.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-flat-field-metadata-to-field-metadata-dto.util.ts
@@ -1,5 +1,6 @@
import { type FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
export const fromFlatFieldMetadataToFieldMetadataDto = (
flatFieldMetadata: FlatFieldMetadata,
@@ -23,7 +24,6 @@ export const fromFlatFieldMetadataToFieldMetadataDto = (
type,
workspaceId,
defaultValue,
- isActive,
isLabelSyncedWithName,
isSystem,
isUIEditable,
@@ -42,7 +42,11 @@ export const fromFlatFieldMetadataToFieldMetadataDto = (
type,
workspaceId,
defaultValue,
- isActive,
+ isActive: resolveEffectiveFlatEntityProperty({
+ metadataName: 'fieldMetadata',
+ flatEntity: flatFieldMetadata,
+ property: 'isActive',
+ }),
isLabelSyncedWithName,
isSystem,
isUIEditable,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-update-field-input-to-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-update-field-input-to-flat-field-metadata.util.ts
index ecd56d1ad88..7999c85be91 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-update-field-input-to-flat-field-metadata.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-update-field-input-to-flat-field-metadata.util.ts
@@ -26,6 +26,7 @@ type FromUpdateFieldInputToFlatFieldMetadataArgs = {
updateFieldInput: UpdateFieldInput;
flatApplication: FlatApplication;
isSystemBuild: boolean;
+ workspaceCustomApplicationUniversalIdentifier: string;
} & Pick<
AllFlatEntityMaps,
| 'flatObjectMetadataMaps'
@@ -52,6 +53,7 @@ export const fromUpdateFieldInputToFlatFieldMetadata = ({
flatViewMaps,
flatViewFieldMaps,
isSystemBuild,
+ workspaceCustomApplicationUniversalIdentifier,
}: FromUpdateFieldInputToFlatFieldMetadataArgs): FieldInputTranspilationResult<FlatFieldMetadataAndIndexToUpdate> => {
const updateFieldInputInformalProperties =
extractAndSanitizeObjectStringFields(rawUpdateFieldInput, [
@@ -102,6 +104,7 @@ export const fromUpdateFieldInputToFlatFieldMetadata = ({
fromFlatFieldMetadata: existingFlatFieldMetadataToUpdate,
rawUpdateFieldInput,
isSystemBuild,
+ workspaceCustomApplicationUniversalIdentifier,
});
const { flatFieldMetadatasToCreate, flatIndexMetadatasToCreate } =
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/handle-flat-field-metadata-update-side-effect.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/handle-flat-field-metadata-update-side-effect.util.ts
index a8838c15597..b4734605139 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/handle-flat-field-metadata-update-side-effect.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/handle-flat-field-metadata-update-side-effect.util.ts
@@ -15,6 +15,7 @@ import {
import { isEnumFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-enum-flat-field-metadata.util';
import { type FlatViewFiltersToDeleteAndUpdate } from 'src/engine/metadata-modules/flat-field-metadata/utils/recompute-view-filters-on-flat-field-metadata-options-update.util';
import { type FlatViewGroupsToDeleteUpdateAndCreate } from 'src/engine/metadata-modules/flat-field-metadata/utils/recompute-view-groups-on-flat-field-metadata-options-update.util';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
export type FlatFieldMetadataUpdateSideEffects =
FlatViewFiltersToDeleteAndUpdate &
@@ -68,8 +69,16 @@ export const handleFlatFieldMetadataUpdateSideEffect = ({
);
const isDeactivation =
- fromFlatFieldMetadata.isActive === true &&
- toFlatFieldMetadata.isActive === false;
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'fieldMetadata',
+ flatEntity: fromFlatFieldMetadata,
+ property: 'isActive',
+ }) === true &&
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'fieldMetadata',
+ flatEntity: toFlatFieldMetadata,
+ property: 'isActive',
+ }) === false;
if (isDeactivation) {
const {
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/sanitize-raw-update-field-input.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/sanitize-raw-update-field-input.ts
index 6489815bac1..1cddfa0c6d9 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/sanitize-raw-update-field-input.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/sanitize-raw-update-field-input.ts
@@ -10,7 +10,6 @@ import {
FieldMetadataExceptionCode,
} from 'src/engine/metadata-modules/field-metadata/field-metadata.exception';
import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
-import { ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-overridable-properties-by-metadata-name.constant';
import {
FLAT_FIELD_METADATA_EDITABLE_PROPERTIES,
FLAT_FIELD_METADATA_SYSTEM_SIDE_EFFECT_EDITABLE_PROPERTIES,
@@ -19,20 +18,27 @@ import { type FlatFieldMetadataEditableProperties } from 'src/engine/metadata-mo
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { nullifyEmptyCompositeDefaultValue } from 'src/engine/metadata-modules/flat-field-metadata/utils/nullify-empty-composite-default-value.util';
import { belongsToTwentyStandardApp } from 'src/engine/metadata-modules/utils/belongs-to-twenty-standard-app.util';
-import { computeMetadataOverridesBlob } from 'src/engine/metadata-modules/utils/compute-metadata-overrides-blob.util';
-import { findInvalidTranslationOverrideProperties } from 'src/engine/metadata-modules/utils/find-invalid-translation-override-properties.util';
-import { mergeTranslationsIntoOverrides } from 'src/engine/metadata-modules/utils/merge-translations-into-overrides.util';
+import { dispatchUpdateToAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/dispatch-update-to-authored-override.util';
+import { findInvalidTranslationOverrideProperties } from 'src/engine/metadata-modules/overrides/utils/find-invalid-translation-override-properties.util';
+import { mergeTranslationsIntoOverrides } from 'src/engine/metadata-modules/overrides/utils/merge-translations-into-overrides.util';
type SanitizeRawUpdateFieldInputArgs = {
rawUpdateFieldInput: UpdateFieldInput;
existingFlatFieldMetadata: FlatFieldMetadata;
isSystemBuild: boolean;
+ workspaceCustomApplicationUniversalIdentifier: string;
};
export const sanitizeRawUpdateFieldInput = ({
existingFlatFieldMetadata,
rawUpdateFieldInput,
isSystemBuild,
+ workspaceCustomApplicationUniversalIdentifier,
}: SanitizeRawUpdateFieldInputArgs) => {
+ const authorContext = {
+ workspaceCustomApplicationUniversalIdentifier,
+ ownerApplicationUniversalIdentifier:
+ existingFlatFieldMetadata.applicationUniversalIdentifier,
+ };
const isStandardField = belongsToTwentyStandardApp(existingFlatFieldMetadata);
const updatedEditableFieldProperties = extractAndSanitizeObjectStringFields(
rawUpdateFieldInput,
@@ -108,8 +114,12 @@ export const sanitizeRawUpdateFieldInput = ({
return {
updatedEditableFieldProperties,
overrides: mergeTranslationsIntoOverrides({
+ metadataName: 'fieldMetadata',
existingOverrides: existingFlatFieldMetadata.overrides,
translationEntries,
+ authorUniversalIdentifier:
+ workspaceCustomApplicationUniversalIdentifier,
+ authorContext,
}),
};
}
@@ -130,19 +140,23 @@ export const sanitizeRawUpdateFieldInput = ({
);
}
- const { overrides, remainingProperties } = computeMetadataOverridesBlob({
- overridableProperties:
- ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME.fieldMetadata,
+ const { overrides, columnProperties } = dispatchUpdateToAuthoredOverride({
+ metadataName: 'fieldMetadata',
updatedProperties: updatedEditableFieldProperties,
existingEntity: existingFlatFieldMetadata,
existingOverrides: existingFlatFieldMetadata.overrides,
+ authorUniversalIdentifier: workspaceCustomApplicationUniversalIdentifier,
+ authorContext,
});
return {
overrides: mergeTranslationsIntoOverrides({
+ metadataName: 'fieldMetadata',
existingOverrides: overrides,
translationEntries,
+ authorUniversalIdentifier: workspaceCustomApplicationUniversalIdentifier,
+ authorContext,
}),
- updatedEditableFieldProperties: remainingProperties,
+ updatedEditableFieldProperties: columnProperties,
};
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-flat-object-metadata-to-object-metadata-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-flat-object-metadata-to-object-metadata-dto.util.ts
index f02253b4584..2e3ca9d0767 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-flat-object-metadata-to-object-metadata-dto.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-flat-object-metadata-to-object-metadata-dto.util.ts
@@ -1,5 +1,6 @@
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
export const fromFlatObjectMetadataToObjectMetadataDto = (
flatObjectMetadata: FlatObjectMetadata,
@@ -15,7 +16,6 @@ export const fromFlatObjectMetadataToObjectMetadataDto = (
duplicateCriteria,
id,
universalIdentifier,
- isActive,
isLabelSyncedWithName,
isRemote,
isSearchable,
@@ -38,7 +38,11 @@ export const fromFlatObjectMetadataToObjectMetadataDto = (
return {
id,
universalIdentifier,
- isActive,
+ isActive: resolveEffectiveFlatEntityProperty({
+ metadataName: 'objectMetadata',
+ flatEntity: flatObjectMetadata,
+ property: 'isActive',
+ }),
isLabelSyncedWithName,
isRemote,
isSearchable,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-update-object-input-to-flat-object-metadata-and-related-flat-entities.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-update-object-input-to-flat-object-metadata-and-related-flat-entities.util.ts
index 74501f054f9..ac264679792 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-update-object-input-to-flat-object-metadata-and-related-flat-entities.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-update-object-input-to-flat-object-metadata-and-related-flat-entities.util.ts
@@ -21,9 +21,11 @@ import {
import { belongsToTwentyStandardApp } from 'src/engine/metadata-modules/utils/belongs-to-twenty-standard-app.util';
import { type UniversalFlatObjectMetadata } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-object-metadata.type';
import { mergeUpdateInExistingRecord } from 'src/utils/merge-update-in-existing-record.util';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
type FromUpdateObjectInputToFlatObjectMetadataArgs = {
updateObjectInput: UpdateOneObjectInput;
+ workspaceCustomApplicationUniversalIdentifier: string;
} & Pick<
AllFlatEntityMaps,
| 'flatIndexMaps'
@@ -43,6 +45,7 @@ export const fromUpdateObjectInputToFlatObjectMetadataAndRelatedFlatEntities =
flatViewFieldMaps,
flatViewMaps,
flatSearchFieldMetadataMaps,
+ workspaceCustomApplicationUniversalIdentifier,
}: FromUpdateObjectInputToFlatObjectMetadataArgs): FlatObjectMetadataUpdateSideEffects & {
flatObjectMetadataToUpdate: UniversalFlatObjectMetadata;
} => {
@@ -102,7 +105,13 @@ export const fromUpdateObjectInputToFlatObjectMetadataAndRelatedFlatEntities =
);
}
- if (!imageIdentifierFlatFieldMetadata.isActive) {
+ if (
+ !resolveEffectiveFlatEntityProperty({
+ metadataName: 'fieldMetadata',
+ flatEntity: imageIdentifierFlatFieldMetadata,
+ property: 'isActive',
+ })
+ ) {
throw new ObjectMetadataException(
'Field cannot be used as image identifier because it is deactivated',
ObjectMetadataExceptionCode.INVALID_OBJECT_INPUT,
@@ -117,6 +126,7 @@ export const fromUpdateObjectInputToFlatObjectMetadataAndRelatedFlatEntities =
sanitizeRawUpdateObjectInput({
existingFlatObjectMetadata,
rawUpdateObjectInput,
+ workspaceCustomApplicationUniversalIdentifier,
});
const toFlatObjectMetadata = {
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/sanitize-raw-update-object-input.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/sanitize-raw-update-object-input.ts
index 5bf79f0368a..5ac6e682049 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/sanitize-raw-update-object-input.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/sanitize-raw-update-object-input.ts
@@ -1,6 +1,5 @@
import { extractAndSanitizeObjectStringFields } from 'twenty-shared/utils';
-import { ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-overridable-properties-by-metadata-name.constant';
import { FLAT_OBJECT_METADATA_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-object-metadata/constants/flat-object-metadata-editable-properties.constant';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type UpdateOneObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/update-object.input';
@@ -9,19 +8,26 @@ import {
ObjectMetadataExceptionCode,
} from 'src/engine/metadata-modules/object-metadata/object-metadata.exception';
import { belongsToTwentyStandardApp } from 'src/engine/metadata-modules/utils/belongs-to-twenty-standard-app.util';
-import { computeMetadataOverridesBlob } from 'src/engine/metadata-modules/utils/compute-metadata-overrides-blob.util';
-import { findInvalidTranslationOverrideProperties } from 'src/engine/metadata-modules/utils/find-invalid-translation-override-properties.util';
-import { mergeTranslationsIntoOverrides } from 'src/engine/metadata-modules/utils/merge-translations-into-overrides.util';
+import { dispatchUpdateToAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/dispatch-update-to-authored-override.util';
+import { findInvalidTranslationOverrideProperties } from 'src/engine/metadata-modules/overrides/utils/find-invalid-translation-override-properties.util';
+import { mergeTranslationsIntoOverrides } from 'src/engine/metadata-modules/overrides/utils/merge-translations-into-overrides.util';
type SanitizeRawUpdateObjectInputArgs = {
rawUpdateObjectInput: UpdateOneObjectInput;
existingFlatObjectMetadata: FlatObjectMetadata;
+ workspaceCustomApplicationUniversalIdentifier: string;
};
export const sanitizeRawUpdateObjectInput = ({
existingFlatObjectMetadata,
rawUpdateObjectInput,
+ workspaceCustomApplicationUniversalIdentifier,
}: SanitizeRawUpdateObjectInputArgs) => {
+ const authorContext = {
+ workspaceCustomApplicationUniversalIdentifier,
+ ownerApplicationUniversalIdentifier:
+ existingFlatObjectMetadata.applicationUniversalIdentifier,
+ };
const isStandardObject = belongsToTwentyStandardApp(
existingFlatObjectMetadata,
);
@@ -51,8 +57,12 @@ export const sanitizeRawUpdateObjectInput = ({
return {
updatedEditableObjectProperties,
overrides: mergeTranslationsIntoOverrides({
+ metadataName: 'objectMetadata',
existingOverrides: existingFlatObjectMetadata.overrides,
translationEntries,
+ authorUniversalIdentifier:
+ workspaceCustomApplicationUniversalIdentifier,
+ authorContext,
}),
};
}
@@ -73,19 +83,23 @@ export const sanitizeRawUpdateObjectInput = ({
);
}
- const { overrides, remainingProperties } = computeMetadataOverridesBlob({
- overridableProperties:
- ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME.objectMetadata,
+ const { overrides, columnProperties } = dispatchUpdateToAuthoredOverride({
+ metadataName: 'objectMetadata',
updatedProperties: updatedEditableObjectProperties,
existingEntity: existingFlatObjectMetadata,
existingOverrides: existingFlatObjectMetadata.overrides,
+ authorUniversalIdentifier: workspaceCustomApplicationUniversalIdentifier,
+ authorContext,
});
return {
overrides: mergeTranslationsIntoOverrides({
+ metadataName: 'objectMetadata',
existingOverrides: overrides,
translationEntries,
+ authorUniversalIdentifier: workspaceCustomApplicationUniversalIdentifier,
+ authorContext,
}),
- updatedEditableObjectProperties: remainingProperties,
+ updatedEditableObjectProperties: columnProperties,
};
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-update-page-layout-tab-input-to-flat-page-layout-tab-to-update-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-update-page-layout-tab-input-to-flat-page-layout-tab-to-update-or-throw.util.ts
index b6079721131..0fb97d8acae 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-update-page-layout-tab-input-to-flat-page-layout-tab-to-update-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-update-page-layout-tab-input-to-flat-page-layout-tab-to-update-or-throw.util.ts
@@ -13,8 +13,8 @@ import {
PageLayoutTabException,
PageLayoutTabExceptionCode,
} from 'src/engine/metadata-modules/page-layout-tab/exceptions/page-layout-tab.exception';
-import { isCallerOverridingEntity } from 'src/engine/metadata-modules/utils/is-caller-overriding-entity.util';
-import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util';
+import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';
+import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/overrides/utils/sanitize-overridable-entity-input.util';
import { mergeUpdateInExistingRecord } from 'src/utils/merge-update-in-existing-record.util';
export type UpdatePageLayoutTabInputWithId = {
@@ -69,6 +69,8 @@ export const fromUpdatePageLayoutTabInputToFlatPageLayoutTabToUpdateOrThrow = ({
existingFlatEntity: existingFlatPageLayoutTabToUpdate,
updatedEditableProperties: editableProperties,
shouldOverride,
+ callerApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
});
return {
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-overrides-to-universal-overrides.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-overrides-to-universal-overrides.util.ts
index efba976d612..0c026c37167 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-overrides-to-universal-overrides.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-overrides-to-universal-overrides.util.ts
@@ -6,11 +6,13 @@ import {
FlatEntityMapsExceptionCode,
} from 'src/engine/metadata-modules/flat-entity/exceptions/flat-entity-maps.exception';
import { type PageLayoutWidgetOverrides } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
+import { mapAuthoredOverrideEntries } from 'src/engine/metadata-modules/overrides/utils/map-authored-override-entries.util';
type UniversalPageLayoutWidgetOverrides =
FormatRecordSerializedRelationProperties<PageLayoutWidgetOverrides>;
-export const fromPageLayoutWidgetOverridesToUniversalOverrides = ({
+const fromPageLayoutWidgetOverridesToUniversalOverridesEntry = ({
overrides,
pageLayoutTabUniversalIdentifierById,
shouldThrowOnMissingIdentifier = true,
@@ -52,3 +54,23 @@ export const fromPageLayoutWidgetOverridesToUniversalOverrides = ({
pageLayoutTabUniversalIdentifier,
};
};
+
+export const fromPageLayoutWidgetOverridesToUniversalOverrides = ({
+ overrides,
+ pageLayoutTabUniversalIdentifierById,
+ shouldThrowOnMissingIdentifier,
+}: {
+ overrides: AuthoredOverrides<PageLayoutWidgetOverrides>;
+ pageLayoutTabUniversalIdentifierById: Partial<Record<string, string>>;
+ shouldThrowOnMissingIdentifier?: boolean;
+}): AuthoredOverrides<UniversalPageLayoutWidgetOverrides> =>
+ mapAuthoredOverrideEntries({
+ metadataName: 'pageLayoutWidget',
+ overrides,
+ mapEntry: (entry) =>
+ fromPageLayoutWidgetOverridesToUniversalOverridesEntry({
+ overrides: entry,
+ pageLayoutTabUniversalIdentifierById,
+ shouldThrowOnMissingIdentifier,
+ }),
+ });
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-update-page-layout-widget-input-to-flat-page-layout-widget-to-update-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-update-page-layout-widget-input-to-flat-page-layout-widget-to-update-or-throw.util.ts
index 720ed124189..679ad601f1d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-update-page-layout-widget-input-to-flat-page-layout-widget-to-update-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-update-page-layout-widget-input-to-flat-page-layout-widget-to-update-or-throw.util.ts
@@ -18,8 +18,8 @@ import {
PageLayoutWidgetExceptionCode,
} from 'src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception';
import { validateWidgetConfigurationInput } from 'src/engine/metadata-modules/page-layout-widget/utils/validate-widget-configuration-input.util';
-import { isCallerOverridingEntity } from 'src/engine/metadata-modules/utils/is-caller-overriding-entity.util';
-import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util';
+import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';
+import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/overrides/utils/sanitize-overridable-entity-input.util';
import { mergeUpdateInExistingRecord } from 'src/utils/merge-update-in-existing-record.util';
export type UpdatePageLayoutWidgetInputWithId = {
@@ -99,6 +99,8 @@ export const fromUpdatePageLayoutWidgetInputToFlatPageLayoutWidgetToUpdateOrThro
existingFlatEntity: existingFlatPageLayoutWidgetToUpdate,
updatedEditableProperties: editableProperties,
shouldOverride,
+ callerApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
});
const flatPageLayoutWidgetToUpdate = {
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/validators/utils/__tests__/validate-tab-viewport-constraints.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/validators/utils/__tests__/validate-tab-viewport-constraints.util.spec.ts
index 5ff75d87745..2edda3b24ae 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/validators/utils/__tests__/validate-tab-viewport-constraints.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/validators/utils/__tests__/validate-tab-viewport-constraints.util.spec.ts
@@ -5,13 +5,15 @@ import {
} from 'twenty-shared/types';
import { validateTabViewportConstraints } from 'src/engine/metadata-modules/flat-page-layout-widget/validators/utils/validate-tab-viewport-constraints.util';
-import { resolveEffectiveEntity } from 'src/engine/metadata-modules/utils/resolve-effective-entity.util';
+import { resolveEffectiveUniversalFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-universal-flat-entity.util';
type ViewportWidget = Parameters<
typeof validateTabViewportConstraints
>[0]['widget'];
const TAB_UNIVERSAL_IDENTIFIER = '00000000-0000-4000-8000-000000000001';
+const OWNER_APPLICATION_UNIVERSAL_IDENTIFIER =
+ '00000000-0000-4000-8000-0000000000aa';
const buildWidget = ({
universalIdentifier,
@@ -25,6 +27,7 @@ const buildWidget = ({
type?: WidgetType;
}): ViewportWidget => ({
universalIdentifier,
+ applicationUniversalIdentifier: OWNER_APPLICATION_UNIVERSAL_IDENTIFIER,
title: universalIdentifier,
type,
isActive: true,
@@ -46,9 +49,9 @@ describe('validateTabViewportConstraints', () => {
siblingWidgets?: ViewportWidget[];
}) =>
validateTabViewportConstraints({
- widget: resolveEffectiveEntity({
- ...widget,
- overrides: widget.universalOverrides,
+ widget: resolveEffectiveUniversalFlatEntity({
+ metadataName: 'pageLayoutWidget',
+ universalFlatEntity: widget,
}),
relatedWidgets: siblingWidgets,
pageLayoutTab: { layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST },
@@ -130,7 +133,13 @@ describe('validateTabViewportConstraints', () => {
...timeline,
...(positionSource === 'base'
? { position: null }
- : { universalOverrides: { position: null } }),
+ : {
+ universalOverrides: {
+ [OWNER_APPLICATION_UNIVERSAL_IDENTIFIER]: {
+ position: null,
+ },
+ },
+ }),
},
],
});
@@ -158,7 +167,11 @@ describe('validateTabViewportConstraints', () => {
}),
...(positionSource === 'base'
? { position: null }
- : { universalOverrides: { position: null } }),
+ : {
+ universalOverrides: {
+ [OWNER_APPLICATION_UNIVERSAL_IDENTIFIER]: { position: null },
+ },
+ }),
};
const fitContentWidget = buildWidget({
universalIdentifier: 'fit-content',
@@ -234,9 +247,11 @@ describe('validateTabViewportConstraints', () => {
? otherTabUniversalIdentifier
: TAB_UNIVERSAL_IDENTIFIER,
universalOverrides: {
- pageLayoutTabUniversalIdentifier: isMovedIntoTab
- ? TAB_UNIVERSAL_IDENTIFIER
- : otherTabUniversalIdentifier,
+ [OWNER_APPLICATION_UNIVERSAL_IDENTIFIER]: {
+ pageLayoutTabUniversalIdentifier: isMovedIntoTab
+ ? TAB_UNIVERSAL_IDENTIFIER
+ : otherTabUniversalIdentifier,
+ },
},
},
],
@@ -261,7 +276,11 @@ describe('validateTabViewportConstraints', () => {
heightBehavior:
PageLayoutWidgetVerticalListHeightBehavior.TAB_VIEWPORT,
}),
- universalOverrides: { pageLayoutTabUniversalIdentifier: null },
+ universalOverrides: {
+ [OWNER_APPLICATION_UNIVERSAL_IDENTIFIER]: {
+ pageLayoutTabUniversalIdentifier: null,
+ },
+ },
},
],
});
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/validators/utils/validate-tab-viewport-constraints.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/validators/utils/validate-tab-viewport-constraints.util.ts
index b3e464d9e3a..64760b51577 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/validators/utils/validate-tab-viewport-constraints.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/validators/utils/validate-tab-viewport-constraints.util.ts
@@ -10,7 +10,7 @@ import {
PageLayoutWidgetExceptionCode,
PageLayoutWidgetExceptionMessageKey,
} from 'src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception';
-import { resolveEffectiveEntity } from 'src/engine/metadata-modules/utils/resolve-effective-entity.util';
+import { resolveEffectiveUniversalFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-universal-flat-entity.util';
import { type UniversalFlatPageLayoutTab } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-page-layout-tab.type';
import { type UniversalFlatPageLayoutWidget } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-page-layout-widget.type';
import { type FlatEntityValidationError } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/types/failed-flat-entity-validation.type';
@@ -18,6 +18,7 @@ import { type FlatEntityValidationError } from 'src/engine/workspace-manager/wor
type PageLayoutWidgetForViewportValidation = Pick<
UniversalFlatPageLayoutWidget,
| 'universalIdentifier'
+ | 'applicationUniversalIdentifier'
| 'title'
| 'type'
| 'isActive'
@@ -58,17 +59,10 @@ export const validateTabViewportConstraints = ({
const isTabViewportWidget = isViewportFillingWidget(widget);
const activeSiblingWidgets = relatedWidgets
- .filter(
- (relatedWidget) =>
- relatedWidget.pageLayoutTabUniversalIdentifier ===
- widget.pageLayoutTabUniversalIdentifier ||
- relatedWidget.universalOverrides?.pageLayoutTabUniversalIdentifier ===
- widget.pageLayoutTabUniversalIdentifier,
- )
.map((relatedWidget) =>
- resolveEffectiveEntity({
- ...relatedWidget,
- overrides: relatedWidget.universalOverrides,
+ resolveEffectiveUniversalFlatEntity({
+ metadataName: 'pageLayoutWidget',
+ universalFlatEntity: relatedWidget,
}),
)
.filter(
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/utils/reconstruct-flat-page-layout-with-tabs-and-widgets.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/utils/reconstruct-flat-page-layout-with-tabs-and-widgets.util.ts
index 054bd4dbf56..03dd4bf294b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/utils/reconstruct-flat-page-layout-with-tabs-and-widgets.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/utils/reconstruct-flat-page-layout-with-tabs-and-widgets.util.ts
@@ -5,7 +5,7 @@ import { type FlatPageLayoutTab } from 'src/engine/metadata-modules/flat-page-la
import { type FlatPageLayoutWidgetMaps } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget-maps.type';
import { type FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type';
import { type FlatPageLayout } from 'src/engine/metadata-modules/flat-page-layout/types/flat-page-layout.type';
-import { resolveOverridableEntityProperty } from 'src/engine/metadata-modules/utils/resolve-overridable-entity-property.util';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
export type FlatPageLayoutTabWithWidgets = FlatPageLayoutTab & {
widgets: FlatPageLayoutWidget[];
@@ -16,7 +16,11 @@ export type FlatPageLayoutWithTabsAndWidgets = FlatPageLayout & {
};
const getResolvedPageLayoutTabId = (widget: FlatPageLayoutWidget): string =>
- resolveOverridableEntityProperty(widget, 'pageLayoutTabId');
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'pageLayoutWidget',
+ flatEntity: widget,
+ property: 'pageLayoutTabId',
+ });
export const reconstructFlatPageLayoutWithTabsAndWidgets = ({
layout,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view-field-group/utils/from-update-view-field-group-input-to-flat-view-field-group-to-update-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view-field-group/utils/from-update-view-field-group-input-to-flat-view-field-group-to-update-or-throw.util.ts
index 12bb5d39ad7..6580db5681d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-view-field-group/utils/from-update-view-field-group-input-to-flat-view-field-group-to-update-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-view-field-group/utils/from-update-view-field-group-input-to-flat-view-field-group-to-update-or-throw.util.ts
@@ -8,8 +8,8 @@ import {
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { FLAT_VIEW_FIELD_GROUP_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-view-field-group/constants/flat-view-field-group-editable-properties.constant';
import { type FlatViewFieldGroupMaps } from 'src/engine/metadata-modules/flat-view-field-group/types/flat-view-field-group-maps.type';
-import { isCallerOverridingEntity } from 'src/engine/metadata-modules/utils/is-caller-overriding-entity.util';
-import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util';
+import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';
+import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/overrides/utils/sanitize-overridable-entity-input.util';
import { type UpdateViewFieldGroupInput } from 'src/engine/metadata-modules/view-field-group/dtos/inputs/update-view-field-group.input';
import {
ViewFieldGroupException,
@@ -68,6 +68,8 @@ export const fromUpdateViewFieldGroupInputToFlatViewFieldGroupToUpdateOrThrow =
existingFlatEntity: existingFlatViewFieldGroupToUpdate,
updatedEditableProperties: editableProperties,
shouldOverride,
+ callerApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
});
return {
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view-field/utils/from-update-view-field-input-to-flat-view-field-to-update-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view-field/utils/from-update-view-field-input-to-flat-view-field-to-update-or-throw.util.ts
index 5ba0cd540f6..c876c344583 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-view-field/utils/from-update-view-field-input-to-flat-view-field-to-update-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-view-field/utils/from-update-view-field-input-to-flat-view-field-to-update-or-throw.util.ts
@@ -11,8 +11,8 @@ import { resolveEntityRelationUniversalIdentifiers } from 'src/engine/metadata-m
import { FLAT_VIEW_FIELD_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-view-field/constants/flat-view-field-editable-properties.constant';
import { type FlatViewFieldMaps } from 'src/engine/metadata-modules/flat-view-field/types/flat-view-field-maps.type';
import { fromViewFieldOverridesToUniversalOverrides } from 'src/engine/metadata-modules/flat-view-field/utils/from-view-field-overrides-to-universal-overrides.util';
-import { isCallerOverridingEntity } from 'src/engine/metadata-modules/utils/is-caller-overriding-entity.util';
-import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util';
+import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';
+import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/overrides/utils/sanitize-overridable-entity-input.util';
import { type UpdateViewFieldInput } from 'src/engine/metadata-modules/view-field/dtos/inputs/update-view-field.input';
import {
ViewFieldException,
@@ -73,6 +73,8 @@ export const fromUpdateViewFieldInputToFlatViewFieldToUpdateOrThrow = ({
existingFlatEntity: existingFlatViewFieldToUpdate,
updatedEditableProperties: editableProperties,
shouldOverride,
+ callerApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
});
const mergedRecord = mergeUpdateInExistingRecord({
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view-field/utils/from-view-field-overrides-to-universal-overrides.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view-field/utils/from-view-field-overrides-to-universal-overrides.util.ts
index 9a565e47872..10c0dcde22c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-view-field/utils/from-view-field-overrides-to-universal-overrides.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-view-field/utils/from-view-field-overrides-to-universal-overrides.util.ts
@@ -6,11 +6,13 @@ import {
FlatEntityMapsExceptionCode,
} from 'src/engine/metadata-modules/flat-entity/exceptions/flat-entity-maps.exception';
import { type ViewFieldOverrides } from 'src/engine/metadata-modules/view-field/entities/view-field.entity';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
+import { mapAuthoredOverrideEntries } from 'src/engine/metadata-modules/overrides/utils/map-authored-override-entries.util';
type UniversalViewFieldOverrides =
FormatRecordSerializedRelationProperties<ViewFieldOverrides>;
-export const fromViewFieldOverridesToUniversalOverrides = ({
+const fromViewFieldOverridesToUniversalOverridesEntry = ({
overrides,
viewFieldGroupUniversalIdentifierById,
shouldThrowOnMissingIdentifier = true,
@@ -52,3 +54,23 @@ export const fromViewFieldOverridesToUniversalOverrides = ({
viewFieldGroupUniversalIdentifier,
};
};
+
+export const fromViewFieldOverridesToUniversalOverrides = ({
+ overrides,
+ viewFieldGroupUniversalIdentifierById,
+ shouldThrowOnMissingIdentifier,
+}: {
+ overrides: AuthoredOverrides<ViewFieldOverrides>;
+ viewFieldGroupUniversalIdentifierById: Partial<Record<string, string>>;
+ shouldThrowOnMissingIdentifier?: boolean;
+}): AuthoredOverrides<UniversalViewFieldOverrides> =>
+ mapAuthoredOverrideEntries({
+ metadataName: 'viewField',
+ overrides,
+ mapEntry: (entry) =>
+ fromViewFieldOverridesToUniversalOverridesEntry({
+ overrides: entry,
+ viewFieldGroupUniversalIdentifierById,
+ shouldThrowOnMissingIdentifier,
+ }),
+ });
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-delete-view-input-to-flat-view-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-delete-view-input-to-flat-view-or-throw.util.ts
index ca17087d9f5..82066baab18 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-delete-view-input-to-flat-view-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-delete-view-input-to-flat-view-or-throw.util.ts
@@ -6,13 +6,14 @@ import {
import { type FlatViewMaps } from 'src/engine/metadata-modules/flat-view/types/flat-view-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
-import { isCallerOverridingEntity } from 'src/engine/metadata-modules/utils/is-caller-overriding-entity.util';
+import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';
import { type DeleteViewInput } from 'src/engine/metadata-modules/view/dtos/inputs/delete-view.input';
import {
ViewException,
ViewExceptionCode,
} from 'src/engine/metadata-modules/view/exceptions/view.exception';
import { type UniversalFlatView } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view.type';
+import { dispatchIsActiveUpdateToAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/dispatch-is-active-update-to-authored-override.util';
export const fromDeleteViewInputToFlatViewOrThrow = ({
deleteViewInput: rawDeleteViewInput,
@@ -54,8 +55,13 @@ export const fromDeleteViewInputToFlatViewOrThrow = ({
if (shouldDeactivate) {
return {
- ...existingFlatViewToDelete,
- isActive: false,
+ ...dispatchIsActiveUpdateToAuthoredOverride({
+ metadataName: 'view',
+ flatEntity: existingFlatViewToDelete,
+ isActive: false,
+ authorUniversalIdentifier: callerApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
+ }),
updatedAt: now,
};
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-update-view-input-to-flat-view-to-update-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-update-view-input-to-flat-view-to-update-or-throw.util.ts
index d95504797d7..76c5aabb7c3 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-update-view-input-to-flat-view-to-update-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-update-view-input-to-flat-view-to-update-or-throw.util.ts
@@ -14,10 +14,9 @@ import { FLAT_VIEW_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-
import { type FlatViewMaps } from 'src/engine/metadata-modules/flat-view/types/flat-view-maps.type';
import { fromViewOverridesToUniversalOverrides } from 'src/engine/metadata-modules/flat-view/utils/from-view-overrides-to-universal-overrides.util';
import { handleFlatViewUpdateSideEffect } from 'src/engine/metadata-modules/flat-view/utils/handle-flat-view-update-side-effect.util';
-import { isCallerOverridingEntity } from 'src/engine/metadata-modules/utils/is-caller-overriding-entity.util';
-import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util';
+import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';
+import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/overrides/utils/sanitize-overridable-entity-input.util';
import { type UpdateViewInput } from 'src/engine/metadata-modules/view/dtos/inputs/update-view.input';
-import { type ViewOverrides } from 'src/engine/metadata-modules/view/entities/view.entity';
import {
ViewException,
ViewExceptionCode,
@@ -25,6 +24,7 @@ import {
import { type UniversalFlatViewGroup } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view-group.type';
import { type UniversalFlatView } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view.type';
import { mergeUpdateInExistingRecord } from 'src/utils/merge-update-in-existing-record.util';
+import { resolveEffectiveFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity.util';
export const fromUpdateViewInputToFlatViewToUpdateOrThrow = ({
updateViewInput: rawUpdateViewInput,
@@ -84,6 +84,8 @@ export const fromUpdateViewInputToFlatViewToUpdateOrThrow = ({
existingFlatEntity: existingFlatViewToUpdate,
updatedEditableProperties: editableProperties,
shouldOverride,
+ callerApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
});
const mergedRecord = mergeUpdateInExistingRecord({
@@ -160,7 +162,7 @@ export const fromUpdateViewInputToFlatViewToUpdateOrThrow = ({
if (isDefined(overrides)) {
flatViewToUpdate.universalOverrides = fromViewOverridesToUniversalOverrides(
{
- overrides: overrides as ViewOverrides,
+ overrides,
fieldMetadataUniversalIdentifierById:
flatFieldMetadataMaps.universalIdentifierById,
},
@@ -180,10 +182,10 @@ export const fromUpdateViewInputToFlatViewToUpdateOrThrow = ({
flatViewToUpdate.createdByUserWorkspaceId = userWorkspaceId;
}
- const effectiveFlatViewToUpdate = {
- ...mergedRecord,
- ...((overrides as ViewOverrides | null) ?? {}),
- };
+ const effectiveFlatViewToUpdate = resolveEffectiveFlatEntity({
+ metadataName: 'view',
+ flatEntity: { ...mergedRecord, overrides },
+ });
const { flatViewGroupsToDelete, flatViewGroupsToCreate } =
handleFlatViewUpdateSideEffect({
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-view-overrides-to-universal-overrides.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-view-overrides-to-universal-overrides.util.ts
index 8e77d45752e..b716226c0b6 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-view-overrides-to-universal-overrides.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-view-overrides-to-universal-overrides.util.ts
@@ -6,6 +6,8 @@ import {
FlatEntityMapsExceptionCode,
} from 'src/engine/metadata-modules/flat-entity/exceptions/flat-entity-maps.exception';
import { type ViewOverrides } from 'src/engine/metadata-modules/view/entities/view.entity';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
+import { mapAuthoredOverrideEntries } from 'src/engine/metadata-modules/overrides/utils/map-authored-override-entries.util';
type UniversalViewOverrides =
FormatRecordSerializedRelationProperties<ViewOverrides>;
@@ -28,7 +30,7 @@ const toUniversalIdentifierProperty = (
'UniversalIdentifier',
) as keyof UniversalViewOverrides;
-export const fromViewOverridesToUniversalOverrides = ({
+const fromViewOverridesToUniversalOverridesEntry = ({
overrides,
fieldMetadataUniversalIdentifierById,
shouldThrowOnMissingIdentifier = true,
@@ -79,3 +81,23 @@ export const fromViewOverridesToUniversalOverrides = ({
scalarOverrides,
);
};
+
+export const fromViewOverridesToUniversalOverrides = ({
+ overrides,
+ fieldMetadataUniversalIdentifierById,
+ shouldThrowOnMissingIdentifier,
+}: {
+ overrides: AuthoredOverrides<ViewOverrides>;
+ fieldMetadataUniversalIdentifierById: Partial<Record<string, string>>;
+ shouldThrowOnMissingIdentifier?: boolean;
+}): AuthoredOverrides<UniversalViewOverrides> =>
+ mapAuthoredOverrideEntries({
+ metadataName: 'view',
+ overrides,
+ mapEntry: (entry) =>
+ fromViewOverridesToUniversalOverridesEntry({
+ overrides: entry,
+ fieldMetadataUniversalIdentifierById,
+ shouldThrowOnMissingIdentifier,
+ }),
+ });
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/field-metadata/services/field-index-view-field-on-create-side-effect-handler.service.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/field-metadata/services/field-index-view-field-on-create-side-effect-handler.service.ts
index b3ad98e5a5f..5d0c91775b6 100644
--- a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/field-metadata/services/field-index-view-field-on-create-side-effect-handler.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/field-metadata/services/field-index-view-field-on-create-side-effect-handler.service.ts
@@ -22,6 +22,7 @@ import {
import { type MetadataSideEffectResult } from 'src/engine/metadata-modules/metadata-side-effect/types/metadata-side-effect-result.type';
import { type UniversalFlatFieldMetadata } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-field-metadata.type';
import { type UniversalFlatViewField } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view-field.type';
+import { resolveEffectiveUniversalFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-universal-flat-entity-property.util';
@Injectable()
export class FieldIndexViewFieldOnCreateSideEffectHandlerService extends MetadataSideEffectHandler(
@@ -165,8 +166,11 @@ export class FieldIndexViewFieldOnCreateSideEffectHandlerService extends Metadat
.filter(isDefined)
.filter(
(existingFlatViewField) =>
- existingFlatViewField.isActive &&
- !isDefined(existingFlatViewField.deletedAt),
+ resolveEffectiveUniversalFlatEntityProperty({
+ metadataName: 'viewField',
+ universalFlatEntity: existingFlatViewField,
+ property: 'isActive',
+ }) && !isDefined(existingFlatViewField.deletedAt),
)
.map((existingFlatViewField) => existingFlatViewField.position);
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-index-view-label-identifier-on-update-side-effect-handler.service.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-index-view-label-identifier-on-update-side-effect-handler.service.ts
index 6835a625c5f..4746eb25eb5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-index-view-label-identifier-on-update-side-effect-handler.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-index-view-label-identifier-on-update-side-effect-handler.service.ts
@@ -15,6 +15,7 @@ import {
} from 'src/engine/metadata-modules/metadata-side-effect/interfaces/base-metadata-side-effect-handler.service';
import { type MetadataSideEffectResult } from 'src/engine/metadata-modules/metadata-side-effect/types/metadata-side-effect-result.type';
import { type UniversalFlatViewField } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view-field.type';
+import { resolveEffectiveUniversalFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-universal-flat-entity-property.util';
@Injectable()
export class ObjectIndexViewLabelIdentifierOnUpdateSideEffectHandlerService extends MetadataSideEffectHandler(
@@ -94,7 +95,11 @@ export class ObjectIndexViewLabelIdentifierOnUpdateSideEffectHandlerService exte
.filter(isDefined)
.filter(
(flatViewField) =>
- flatViewField.isActive && !isDefined(flatViewField.deletedAt),
+ resolveEffectiveUniversalFlatEntityProperty({
+ metadataName: 'viewField',
+ universalFlatEntity: flatViewField,
+ property: 'isActive',
+ }) && !isDefined(flatViewField.deletedAt),
) as UniversalFlatViewField[];
const labelIdentifierFlatViewField = indexFlatViewFields.find(
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-create-side-effect-handler.service.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-create-side-effect-handler.service.ts
index af3aa5ffdef..d1ab765c613 100644
--- a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-create-side-effect-handler.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-create-side-effect-handler.service.ts
@@ -9,6 +9,7 @@ import {
} from 'src/engine/metadata-modules/metadata-side-effect/interfaces/base-metadata-side-effect-handler.service';
import { type MetadataSideEffectResult } from 'src/engine/metadata-modules/metadata-side-effect/types/metadata-side-effect-result.type';
import { type UniversalFlatObjectMetadata } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-object-metadata.type';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
@Injectable()
export class ObjectNavigationCommandOnCreateSideEffectHandlerService extends MetadataSideEffectHandler(
@@ -57,7 +58,11 @@ export class ObjectNavigationCommandOnCreateSideEffectHandlerService extends Met
universalIdentifier: sourceFlatObjectMetadata.universalIdentifier,
nameSingular: sourceFlatObjectMetadata.nameSingular,
shortcut: sourceFlatObjectMetadata.shortcut,
- isActive: sourceFlatObjectMetadata.isActive,
+ isActive: resolveEffectiveFlatEntityProperty({
+ metadataName: 'objectMetadata',
+ flatEntity: sourceFlatObjectMetadata,
+ property: 'isActive',
+ }),
},
applicationUniversalIdentifier:
sourceFlatObjectMetadata.applicationUniversalIdentifier,
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-update-side-effect-handler.service.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-update-side-effect-handler.service.ts
index abbaf30bfdd..abf2e8494cd 100644
--- a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-update-side-effect-handler.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/object-metadata/services/object-navigation-command-on-update-side-effect-handler.service.ts
@@ -13,6 +13,7 @@ import {
MetadataSideEffectHandler,
} from 'src/engine/metadata-modules/metadata-side-effect/interfaces/base-metadata-side-effect-handler.service';
import { type MetadataSideEffectResult } from 'src/engine/metadata-modules/metadata-side-effect/types/metadata-side-effect-result.type';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
@Injectable()
export class ObjectNavigationCommandOnUpdateSideEffectHandlerService extends MetadataSideEffectHandler(
@@ -51,9 +52,18 @@ export class ObjectNavigationCommandOnUpdateSideEffectHandlerService extends Met
};
}
+ const updatedIsActive = resolveEffectiveFlatEntityProperty({
+ metadataName: 'objectMetadata',
+ flatEntity: updatedFlatObjectMetadata,
+ property: 'isActive',
+ });
const isActiveChanged =
- updatedFlatObjectMetadata.isActive !==
- existingFlatObjectMetadata.isActive;
+ updatedIsActive !==
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'objectMetadata',
+ flatEntity: existingFlatObjectMetadata,
+ property: 'isActive',
+ });
const nameSingularChanged =
updatedFlatObjectMetadata.nameSingular !==
existingFlatObjectMetadata.nameSingular;
@@ -84,9 +94,7 @@ export class ObjectNavigationCommandOnUpdateSideEffectHandlerService extends Met
const navigationFlatCommandMenuItemToUpdate = {
...existingNavigationFlatCommandMenuItem,
- ...(isActiveChanged
- ? { isActive: updatedFlatObjectMetadata.isActive }
- : {}),
+ ...(isActiveChanged ? { isActive: updatedIsActive } : {}),
...(nameSingularChanged
? {
conditionalAvailabilityExpression:
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/utils/compute-record-page-view-field-for-existing-object.util.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/utils/compute-record-page-view-field-for-existing-object.util.ts
index dc5472d1934..d0b1779344c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/utils/compute-record-page-view-field-for-existing-object.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/utils/compute-record-page-view-field-for-existing-object.util.ts
@@ -6,6 +6,8 @@ import { DEFAULT_VIEW_FIELD_SIZE } from 'src/engine/metadata-modules/flat-view-f
import { WidgetConfigurationType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-configuration-type.type';
import { type UniversalFlatFieldMetadata } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-field-metadata.type';
import { type UniversalFlatViewField } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view-field.type';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
+import { resolveEffectiveUniversalFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-universal-flat-entity-property.util';
export const computeRecordPageViewFieldForExistingObject = ({
sourceFlatFieldMetadata,
@@ -41,7 +43,11 @@ export const computeRecordPageViewFieldForExistingObject = ({
.filter(isDefined)
.find(
(widget) =>
- widget.isActive &&
+ resolveEffectiveUniversalFlatEntityProperty({
+ metadataName: 'pageLayoutWidget',
+ universalFlatEntity: widget,
+ property: 'isActive',
+ }) &&
!isDefined(widget.deletedAt) &&
widget.universalConfiguration?.configurationType ===
WidgetConfigurationType.FIELDS &&
@@ -72,7 +78,14 @@ export const computeRecordPageViewFieldForExistingObject = ({
],
)
.filter(isDefined)
- .filter((group) => group.isActive && !isDefined(group.deletedAt));
+ .filter(
+ (group) =>
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'viewFieldGroup',
+ flatEntity: group,
+ property: 'isActive',
+ }) && !isDefined(group.deletedAt),
+ );
const lastFlatViewFieldGroup =
activeFlatViewFieldGroups.length > 0
@@ -93,7 +106,11 @@ export const computeRecordPageViewFieldForExistingObject = ({
.filter(isDefined)
.filter(
(flatViewField) =>
- flatViewField.isActive &&
+ resolveEffectiveUniversalFlatEntityProperty({
+ metadataName: 'viewField',
+ universalFlatEntity: flatViewField,
+ property: 'isActive',
+ }) &&
!isDefined(flatViewField.deletedAt) &&
flatViewField.viewFieldGroupUniversalIdentifier ===
targetSystemViewFieldGroupUniversalIdentifier,
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/utils/is-flat-field-metadata-eligible-for-record-form.util.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/utils/is-flat-field-metadata-eligible-for-record-form.util.ts
index 84b0bcdcb6f..52a3097d76a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/utils/is-flat-field-metadata-eligible-for-record-form.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-side-effect/handlers/utils/is-flat-field-metadata-eligible-for-record-form.util.ts
@@ -4,6 +4,7 @@ import {
} from 'twenty-shared/utils';
import { type UniversalFlatFieldMetadata } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-field-metadata.type';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
export type RecordFormCandidateFlatFieldMetadata = Pick<
UniversalFlatFieldMetadata,
@@ -15,6 +16,8 @@ export type RecordFormCandidateFlatFieldMetadata = Pick<
| 'isUIEditable'
| 'isSystemSideEffect'
| 'universalSettings'
+ | 'applicationUniversalIdentifier'
+ | 'overrides'
>;
export const isFlatFieldMetadataEligibleForRecordForm = (
@@ -29,7 +32,11 @@ export const isFlatFieldMetadataEligibleForRecordForm = (
return isFieldMetadataEligibleForRecordForm({
fieldName: flatFieldMetadata.name,
fieldType: flatFieldMetadata.type,
- isActive: flatFieldMetadata.isActive,
+ isActive: resolveEffectiveFlatEntityProperty({
+ metadataName: 'fieldMetadata',
+ flatEntity: flatFieldMetadata,
+ property: 'isActive',
+ }),
isSystem: flatFieldMetadata.isSystem,
isUIEditable: flatFieldMetadata.isUIEditable,
relationType:
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-translation/services/metadata-translation.service.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-translation/services/metadata-translation.service.ts
index 1d1640515bb..68675271aa7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/metadata-translation/services/metadata-translation.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-translation/services/metadata-translation.service.ts
@@ -5,7 +5,6 @@ import { APP_LOCALES } from 'twenty-shared/translations';
import { isDefined } from 'twenty-shared/utils';
import { UserInputError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
-import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
import { ALL_TRANSLATABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-translatable-properties-by-metadata-name.constant';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
@@ -20,7 +19,8 @@ import { type MetadataTranslationsInput } from 'src/engine/metadata-modules/meta
import {
readOverrideTranslation,
resolveEffectiveEntityPropertyByName,
-} from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+} from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
+import { readAuthoredOverrideProperty } from 'src/engine/metadata-modules/overrides/utils/read-authored-override-property.util';
type TranslatableFlatEntity = FlatObjectMetadata | FlatFieldMetadata;
@@ -68,7 +68,6 @@ export class MetadataTranslationService {
constructor(
private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
private readonly applicationTranslationCatalogService: ApplicationTranslationCatalogService,
- private readonly i18nService: I18nService,
) {}
async findMetadataTranslations({
@@ -97,21 +96,25 @@ export class MetadataTranslationService {
const translations: MetadataTranslationDTO[] = [];
for (const locale of locales) {
- const { standardApplicationId, catalogByApplicationId } =
- await this.applicationTranslationCatalogService.getCatalogs({
- applicationIds: [applicationId],
- locale,
- workspaceId,
- });
- const i18nInstance = this.i18nService.getI18nInstance(locale);
+ const getI18nContext =
+ await this.applicationTranslationCatalogService.getI18nContextByApplicationId(
+ {
+ applicationIds: [applicationId],
+ locale,
+ workspaceId,
+ },
+ );
for (const property of ALL_TRANSLATABLE_PROPERTIES_BY_METADATA_NAME[
metadataName
] ?? []) {
const sourceValue = readStringProperty(entity, property);
- const overrideValue = (overrides as Record<string, unknown> | null)?.[
- property
- ];
+ const overrideValue = readAuthoredOverrideProperty({
+ metadataName,
+ overrides,
+ path: [property],
+ authorContext: getI18nContext(applicationId),
+ });
const canonicalValue = isNonEmptyString(overrideValue)
? overrideValue
: sourceValue;
@@ -125,14 +128,7 @@ export class MetadataTranslationService {
baseValue: sourceValue,
overrides,
property,
- i18nContext: {
- locale,
- i18nInstance,
- isStandardApp: applicationId === standardApplicationId,
- applicationCatalog: isDefined(applicationId)
- ? catalogByApplicationId.get(applicationId)
- : undefined,
- },
+ i18nContext: getI18nContext(applicationId),
});
translations.push({
@@ -146,9 +142,11 @@ export class MetadataTranslationService {
value,
provenance: resolveProvenance({
workspaceTranslation: readOverrideTranslation({
+ metadataName,
overrides,
locale,
property,
+ authorContext: getI18nContext(applicationId),
}),
value,
canonicalValue,
diff --git a/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.module.ts
index c8eebfc5094..b07d4633498 100644
--- a/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.module.ts
@@ -1,12 +1,11 @@
import { Module } from '@nestjs/common';
-import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { MinimalMetadataResolver } from 'src/engine/metadata-modules/minimal-metadata/minimal-metadata.resolver';
import { MinimalMetadataService } from 'src/engine/metadata-modules/minimal-metadata/minimal-metadata.service';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
@Module({
- imports: [WorkspaceManyOrAllFlatEntityMapsCacheModule, WorkspaceCacheModule],
+ imports: [WorkspaceCacheModule],
providers: [MinimalMetadataResolver, MinimalMetadataService],
exports: [MinimalMetadataService],
})
diff --git a/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.resolver.ts
index dd679d336f2..f0c24d2bf73 100644
--- a/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.resolver.ts
@@ -25,10 +25,11 @@ export class MinimalMetadataResolver {
userWorkspaceId: string | undefined,
@Context() context: I18nContext,
): Promise<MinimalMetadataDTO> {
- return this.minimalMetadataService.getMinimalMetadata(
- workspace.id,
+ return this.minimalMetadataService.getMinimalMetadata({
+ workspaceId: workspace.id,
+ workspaceCustomApplicationId: workspace.workspaceCustomApplicationId,
userWorkspaceId,
- context.req.locale,
- );
+ locale: context.req.locale,
+ });
}
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.service.ts
index 7eea41cbc09..ff675e20338 100644
--- a/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.service.ts
@@ -10,13 +10,14 @@ import { isDefined, uncapitalize } from 'twenty-shared/utils';
import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
import { ALL_FLAT_ENTITY_MAPS_PROPERTIES } from 'src/engine/metadata-modules/flat-entity/constant/all-flat-entity-maps-properties.constant';
-import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { type CollectionHashDTO } from 'src/engine/metadata-modules/minimal-metadata/dtos/collection-hash.dto';
import { MinimalMetadataDTO } from 'src/engine/metadata-modules/minimal-metadata/dtos/minimal-metadata.dto';
import { MinimalObjectMetadataDTO } from 'src/engine/metadata-modules/minimal-metadata/dtos/minimal-object-metadata.dto';
import { MinimalViewDTO } from 'src/engine/metadata-modules/minimal-metadata/dtos/minimal-view.dto';
+import { getWorkspaceCustomApplicationUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/overrides/utils/get-workspace-custom-application-universal-identifier-or-throw.util';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
import { belongsToTwentyStandardApp } from 'src/engine/metadata-modules/utils/belongs-to-twenty-standard-app.util';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { type WorkspaceCacheKeyName } from 'src/engine/workspace-cache/types/workspace-cache-key.type';
@@ -35,27 +36,41 @@ const flatMapsKeyToMetadataName = (
@Injectable()
export class MinimalMetadataService {
constructor(
- private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
private readonly workspaceCacheService: WorkspaceCacheService,
private readonly i18nService: I18nService,
) {}
- async getMinimalMetadata(
- workspaceId: string,
- userWorkspaceId?: string,
- locale?: string,
- ): Promise<MinimalMetadataDTO> {
- const [{ flatObjectMetadataMaps, flatViewMaps }, cacheHashes] =
- await Promise.all([
- this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps({
- workspaceId,
- flatMapsKeys: ['flatObjectMetadataMaps', 'flatViewMaps'],
- }),
- this.workspaceCacheService.getCacheHashes(
- workspaceId,
- ALL_FLAT_ENTITY_MAPS_PROPERTIES as WorkspaceCacheKeyName[],
- ),
- ]);
+ async getMinimalMetadata({
+ workspaceId,
+ workspaceCustomApplicationId,
+ userWorkspaceId,
+ locale,
+ }: {
+ workspaceId: string;
+ workspaceCustomApplicationId: string;
+ userWorkspaceId?: string;
+ locale?: string;
+ }): Promise<MinimalMetadataDTO> {
+ const [
+ { flatObjectMetadataMaps, flatViewMaps, flatApplicationMaps },
+ cacheHashes,
+ ] = await Promise.all([
+ this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatApplicationMaps',
+ 'flatObjectMetadataMaps',
+ 'flatViewMaps',
+ ]),
+ this.workspaceCacheService.getCacheHashes(
+ workspaceId,
+ ALL_FLAT_ENTITY_MAPS_PROPERTIES as WorkspaceCacheKeyName[],
+ ),
+ ]);
+
+ const workspaceCustomApplicationUniversalIdentifier =
+ getWorkspaceCustomApplicationUniversalIdentifierOrThrow({
+ workspaceCustomApplicationId,
+ flatApplicationMaps,
+ });
const collectionHashes: CollectionHashDTO[] = Object.entries(cacheHashes)
.map(([cacheKey, hash]) => {
@@ -76,7 +91,17 @@ export class MinimalMetadataService {
flatObjectMetadataMaps.byUniversalIdentifier,
)
.filter(isDefined)
- .filter((flatObjectMetadata) => flatObjectMetadata.isActive === true)
+ .filter(
+ (flatObjectMetadata) =>
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'objectMetadata',
+ flatEntity: flatObjectMetadata,
+ property: 'isActive',
+ authorContext: {
+ workspaceCustomApplicationUniversalIdentifier,
+ },
+ }) === true,
+ )
.map((flatObjectMetadata) => {
const isStandardApp = belongsToTwentyStandardApp(flatObjectMetadata);
@@ -85,6 +110,9 @@ export class MinimalMetadataService {
locale: safeLocale,
i18nInstance,
isStandardApp,
+ workspaceCustomApplicationUniversalIdentifier,
+ ownerApplicationUniversalIdentifier:
+ flatObjectMetadata.applicationUniversalIdentifier,
};
return {
@@ -106,7 +134,7 @@ export class MinimalMetadataService {
i18nContext,
}),
icon: flatObjectMetadata.icon ?? undefined,
- isActive: flatObjectMetadata.isActive,
+ isActive: true,
isSystem: flatObjectMetadata.isSystem,
isRemote: flatObjectMetadata.isRemote,
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.resolver.ts
index cd56af1a928..1250d56d236 100644
--- a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.resolver.ts
@@ -30,7 +30,7 @@ import { RecordIdentifierDTO } from 'src/engine/metadata-modules/navigation-menu
import { UpdateOneNavigationMenuItemInput } from 'src/engine/metadata-modules/navigation-menu-item/dtos/update-navigation-menu-item.input';
import { NavigationMenuItemGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/navigation-menu-item/interceptors/navigation-menu-item-graphql-api-exception.interceptor';
import { NavigationMenuItemService } from 'src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.service';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto.ts
index 98a85ec7dfd..a11665a101f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto.ts
@@ -11,6 +11,7 @@ import {
ObjectOpenRecordIn,
} from 'twenty-shared/types';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
import { type WorkspaceEntityDuplicateCriteria } from 'src/engine/api/graphql/workspace-query-builder/types/workspace-entity-duplicate-criteria.type';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { type ObjectMetadataOverrides } from 'src/engine/metadata-modules/object-metadata/types/object-metadata-overrides.type';
@@ -46,7 +47,7 @@ export class ObjectMetadataDTO {
icon?: string;
@HideField()
- overrides?: ObjectMetadataOverrides | null;
+ overrides?: AuthoredOverrides<ObjectMetadataOverrides> | null;
@Field({ nullable: true })
shortcut?: string;
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts
index 72e2505e1ef..26e418c304d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts
@@ -34,6 +34,7 @@ import { PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entiti
import { SearchFieldMetadataEntity } from 'src/engine/metadata-modules/search-field-metadata/search-field-metadata.entity';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-entity.interface';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
import { type JsonbProperty } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/jsonb-property.type';
@Entity('objectMetadata')
@@ -91,7 +92,7 @@ export class ObjectMetadataEntity
upgradeCommandName: ADD_METADATA_OVERRIDES_COLUMN_UPGRADE_COMMAND_NAME,
})
@Column({ type: 'jsonb', nullable: true })
- overrides: JsonbProperty<ObjectMetadataOverrides> | null;
+ overrides: JsonbProperty<AuthoredOverrides<ObjectMetadataOverrides>> | null;
/**
* @deprecated Please use `overrides` instead.
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts
index b322b37b53f..df04bec8824 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts
@@ -56,8 +56,9 @@ import { ObjectRecordCountService } from 'src/engine/metadata-modules/object-met
import { objectMetadataGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/object-metadata/utils/object-metadata-graphql-api-exception-handler.util';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { SearchFieldMetadataDTO } from 'src/engine/metadata-modules/search-field-metadata/dtos/search-field-metadata.dto';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
+import { fromObjectMetadataEntityToObjectMetadataDto } from 'src/engine/metadata-modules/object-metadata/utils/from-object-metadata-entity-to-object-metadata-dto.util';
@UseGuards(WorkspaceAuthGuard)
@MetadataResolver(() => ObjectMetadataDTO)
@@ -92,7 +93,7 @@ export class ObjectMetadataResolver {
description: 'Specify to filter the records returned.',
})
filter: ObjectFilterInput,
- ): Promise<CursorConnection<ObjectMetadataEntity>> {
+ ): Promise<CursorConnection<ObjectMetadataDTO>> {
const queryBuilder = this.objectMetadataRepository
.createQueryBuilder('objectMetadata')
.where('"objectMetadata"."workspaceId" = :workspaceId', { workspaceId });
@@ -104,11 +105,19 @@ export class ObjectMetadataResolver {
columnByFilterField: OBJECT_FILTER_COLUMN_BY_FILTER_FIELD,
});
- return findManyWithCursorPagination({
+ const connection = await findManyWithCursorPagination({
queryBuilder,
alias: 'objectMetadata',
paging,
});
+
+ return {
+ ...connection,
+ edges: connection.edges.map((edge) => ({
+ ...edge,
+ node: fromObjectMetadataEntityToObjectMetadataDto(edge.node),
+ })),
+ };
}
@UseGuards(NoPermissionGuard)
@@ -120,7 +129,7 @@ export class ObjectMetadataResolver {
})
id: string,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
- ): Promise<ObjectMetadataEntity> {
+ ): Promise<ObjectMetadataDTO> {
const objectMetadata = await this.objectMetadataRepository.findOne({
where: { id, workspaceId },
});
@@ -131,7 +140,7 @@ export class ObjectMetadataResolver {
);
}
- return objectMetadata;
+ return fromObjectMetadataEntityToObjectMetadataDto(objectMetadata);
}
@ResolveField(() => ObjectFieldsConnectionDTO)
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
index 0ac9d887af7..aaad8c98374 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
@@ -97,6 +97,8 @@ export class ObjectMetadataService {
flatViewFieldMaps: existingFlatViewFieldMaps,
flatViewMaps: existingFlatViewMaps,
flatSearchFieldMetadataMaps: existingFlatSearchFieldMetadataMaps,
+ workspaceCustomApplicationUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
});
const isActiveChangeDefined = isDefined(updateObjectInput.update.isActive);
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/types/object-metadata-overrides.type.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/types/object-metadata-overrides.type.ts
index b1fe656876d..f888adcfbfe 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/types/object-metadata-overrides.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/types/object-metadata-overrides.type.ts
@@ -1,6 +1,7 @@
import { type APP_LOCALES } from 'twenty-shared/translations';
export type ObjectMetadataOverrides = {
+ isActive?: boolean;
labelSingular?: string | null;
labelPlural?: string | null;
description?: string | null;
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/__tests__/compute-mostly-empty-field-metadata-ids.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/__tests__/compute-mostly-empty-field-metadata-ids.util.spec.ts
index af9b262e8a4..bec6385f4f6 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/__tests__/compute-mostly-empty-field-metadata-ids.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/__tests__/compute-mostly-empty-field-metadata-ids.util.spec.ts
@@ -13,6 +13,8 @@ const buildFieldMetadata = (
type: FieldMetadataType.TEXT,
isActive: true,
isSystem: false,
+ applicationUniversalIdentifier: '20202020-aaaa-4aaa-8aaa-000000000001',
+ overrides: null,
...overrides,
});
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/__tests__/from-object-metadata-entity-to-object-metadata-dto.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/__tests__/from-object-metadata-entity-to-object-metadata-dto.util.spec.ts
new file mode 100644
index 00000000000..080d56125db
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/__tests__/from-object-metadata-entity-to-object-metadata-dto.util.spec.ts
@@ -0,0 +1,52 @@
+import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { fromObjectMetadataEntityToObjectMetadataDto } from 'src/engine/metadata-modules/object-metadata/utils/from-object-metadata-entity-to-object-metadata-dto.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+
+const buildEntity = (
+ partial: Partial<ObjectMetadataEntity>,
+): ObjectMetadataEntity =>
+ ({
+ id: 'object-id',
+ universalIdentifier: 'object-universal-identifier',
+ applicationId: 'application-id',
+ nameSingular: 'task',
+ namePlural: 'tasks',
+ labelSingular: 'Task',
+ labelPlural: 'Tasks',
+ isActive: true,
+ overrides: null,
+ ...partial,
+ }) as ObjectMetadataEntity;
+
+describe('fromObjectMetadataEntityToObjectMetadataDto', () => {
+ it('reads isActive from the workspace entry over the column', () => {
+ expect(
+ fromObjectMetadataEntityToObjectMetadataDto(
+ buildEntity({
+ isActive: true,
+ overrides: { [CUSTOM]: { isActive: false } },
+ }),
+ ).isActive,
+ ).toBe(false);
+ expect(
+ fromObjectMetadataEntityToObjectMetadataDto(
+ buildEntity({
+ isActive: false,
+ overrides: { [CUSTOM]: { isActive: true } },
+ }),
+ ).isActive,
+ ).toBe(true);
+ });
+
+ it('falls back to the column without an entry', () => {
+ expect(
+ fromObjectMetadataEntityToObjectMetadataDto(
+ buildEntity({
+ isActive: false,
+ overrides: { [CUSTOM]: { icon: 'X' } },
+ }),
+ ).isActive,
+ ).toBe(false);
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/compute-mostly-empty-field-metadata-ids.util.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/compute-mostly-empty-field-metadata-ids.util.ts
index b641ffbb0e7..f1a3bd11028 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/compute-mostly-empty-field-metadata-ids.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/compute-mostly-empty-field-metadata-ids.util.ts
@@ -3,10 +3,17 @@ import { isDefined } from 'twenty-shared/utils';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { MOSTLY_EMPTY_FRACTION_THRESHOLD } from 'src/engine/metadata-modules/object-metadata/constants/mostly-empty-fraction-threshold.constant';
import { getEmptinessColumnNamesForField } from 'src/engine/metadata-modules/object-metadata/utils/get-emptiness-column-names-for-field.util';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
export type FieldMetadataForEmptinessCheck = Pick<
FlatFieldMetadata,
- 'id' | 'name' | 'type' | 'isActive' | 'isSystem'
+ | 'id'
+ | 'name'
+ | 'type'
+ | 'isActive'
+ | 'isSystem'
+ | 'applicationUniversalIdentifier'
+ | 'overrides'
>;
export const computeMostlyEmptyFieldMetadataIds = ({
@@ -20,7 +27,14 @@ export const computeMostlyEmptyFieldMetadataIds = ({
}): string[] => {
return fieldMetadatas
.filter((fieldMetadata) => {
- if (!fieldMetadata.isActive || fieldMetadata.isSystem) {
+ if (
+ !resolveEffectiveFlatEntityProperty({
+ metadataName: 'fieldMetadata',
+ flatEntity: fieldMetadata,
+ property: 'isActive',
+ }) ||
+ fieldMetadata.isSystem
+ ) {
return false;
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/from-object-metadata-entity-to-object-metadata-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/from-object-metadata-entity-to-object-metadata-dto.util.ts
index eaa5a8df57a..1a2c080fcc3 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/from-object-metadata-entity-to-object-metadata-dto.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/from-object-metadata-entity-to-object-metadata-dto.util.ts
@@ -1,5 +1,20 @@
import { type ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';
import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { readAuthoredOverrideProperty } from 'src/engine/metadata-modules/overrides/utils/read-authored-override-property.util';
+
+const resolveEffectiveEntityIsActive = (entity: {
+ isActive: boolean;
+ overrides: unknown;
+}): boolean => {
+ const overrideValue = readAuthoredOverrideProperty({
+ metadataName: 'objectMetadata',
+ overrides: entity.overrides,
+ path: ['isActive'],
+ authorContext: { ownerApplicationUniversalIdentifier: undefined },
+ });
+
+ return typeof overrideValue === 'boolean' ? overrideValue : entity.isActive;
+};
export const fromObjectMetadataEntityToObjectMetadataDto = (
entity: ObjectMetadataEntity,
@@ -17,7 +32,7 @@ export const fromObjectMetadataEntityToObjectMetadataDto = (
shortcut: entity.shortcut ?? undefined,
overrides: entity.overrides ?? undefined,
isRemote: entity.isRemote,
- isActive: entity.isActive,
+ isActive: resolveEffectiveEntityIsActive(entity),
isSystem: entity.isSystem,
isUIEditable: entity.isUIEditable,
isUICreatable: entity.isUICreatable,
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/get-effective-image-identifier-field-metadata-id.util.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/get-effective-image-identifier-field-metadata-id.util.ts
index 6b7fadff33a..2639e32e956 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/get-effective-image-identifier-field-metadata-id.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/get-effective-image-identifier-field-metadata-id.util.ts
@@ -1,19 +1,28 @@
-import { isDefined } from 'twenty-shared/utils';
-
-import { type ObjectMetadataOverrides } from 'src/engine/metadata-modules/object-metadata/types/object-metadata-overrides.type';
+import { type OverrideAuthorReadContext } from 'src/engine/metadata-modules/overrides/types/override-author-context.type';
+import { readAuthoredOverrideProperty } from 'src/engine/metadata-modules/overrides/utils/read-authored-override-property.util';
type ImageIdentifierResolvableObjectMetadata = {
- overrides?: ObjectMetadataOverrides | null;
+ overrides?: unknown;
imageIdentifierFieldMetadataId?: string | null;
+ applicationUniversalIdentifier?: string;
};
export const getEffectiveImageIdentifierFieldMetadataId = (
objectMetadata: ImageIdentifierResolvableObjectMetadata,
+ authorContext?: OverrideAuthorReadContext,
): string | null => {
- const { overrides } = objectMetadata;
+ const overrideValue = readAuthoredOverrideProperty({
+ metadataName: 'objectMetadata',
+ overrides: objectMetadata.overrides,
+ path: ['imageIdentifierFieldMetadataId'],
+ authorContext: authorContext ?? {
+ ownerApplicationUniversalIdentifier:
+ objectMetadata.applicationUniversalIdentifier,
+ },
+ });
- if (isDefined(overrides) && 'imageIdentifierFieldMetadataId' in overrides) {
- return overrides.imageIdentifierFieldMetadataId ?? null;
+ if (overrideValue !== undefined) {
+ return (overrideValue as string | null) ?? null;
}
return objectMetadata.imageIdentifierFieldMetadataId ?? null;
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-overridable-properties-by-metadata-name.constant.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/constants/all-overridable-properties-by-metadata-name.constant.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-overridable-properties-by-metadata-name.constant.ts
rename to packages/twenty-server/src/engine/metadata-modules/overrides/constants/all-overridable-properties-by-metadata-name.constant.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/constants/all-overridable-universal-properties-by-metadata-name.constant.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/constants/all-overridable-universal-properties-by-metadata-name.constant.ts
new file mode 100644
index 00000000000..c7a5feff3fa
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/constants/all-overridable-universal-properties-by-metadata-name.constant.ts
@@ -0,0 +1,27 @@
+import {
+ ALL_METADATA_NAME,
+ type AllMetadataName,
+} from 'twenty-shared/metadata';
+
+import { ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant';
+
+type OverridablePropertyConfiguration = {
+ isOverridable?: boolean;
+ universalProperty?: string;
+};
+
+export const ALL_OVERRIDABLE_UNIVERSAL_PROPERTIES_BY_METADATA_NAME: Record<
+ AllMetadataName,
+ readonly string[]
+> = Object.fromEntries(
+ Object.values(ALL_METADATA_NAME).map((metadataName) => [
+ metadataName,
+ Object.entries(
+ ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME[
+ metadataName
+ ] as Record<string, OverridablePropertyConfiguration>,
+ ).flatMap(([property, { isOverridable, universalProperty }]) =>
+ isOverridable === true ? [universalProperty ?? property] : [],
+ ),
+ ]),
+) as unknown as Record<AllMetadataName, readonly string[]>;
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/constants/all-override-entry-property-names-by-metadata-name.constant.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/constants/all-override-entry-property-names-by-metadata-name.constant.ts
new file mode 100644
index 00000000000..e86b84b2de3
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/constants/all-override-entry-property-names-by-metadata-name.constant.ts
@@ -0,0 +1,32 @@
+import {
+ ALL_METADATA_NAME,
+ type AllMetadataName,
+} from 'twenty-shared/metadata';
+
+import { ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant';
+
+type OverridablePropertyConfiguration = {
+ isOverridable?: boolean;
+ universalProperty?: string;
+};
+
+export const ALL_OVERRIDE_ENTRY_PROPERTY_NAMES_BY_METADATA_NAME: Record<
+ AllMetadataName,
+ ReadonlySet<string>
+> = Object.fromEntries(
+ Object.values(ALL_METADATA_NAME).map((metadataName) => [
+ metadataName,
+ new Set([
+ 'translations',
+ ...Object.entries(
+ ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME[
+ metadataName
+ ] as Record<string, OverridablePropertyConfiguration>,
+ ).flatMap(([property, { isOverridable, universalProperty }]) =>
+ isOverridable === true
+ ? [property, ...(universalProperty ? [universalProperty] : [])]
+ : [],
+ ),
+ ]),
+ ]),
+) as unknown as Record<AllMetadataName, ReadonlySet<string>>;
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/types/authored-overrides.type.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/types/authored-overrides.type.ts
new file mode 100644
index 00000000000..1da7c820bab
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/types/authored-overrides.type.ts
@@ -0,0 +1 @@
+export type AuthoredOverrides<TEntry> = Partial<Record<string, TEntry>>;
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/effective-entity-i18n-context.type.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type.ts
similarity index 66%
rename from packages/twenty-server/src/engine/metadata-modules/utils/effective-entity-i18n-context.type.ts
rename to packages/twenty-server/src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type.ts
index bbcd2f9d5e3..c24e6a13450 100644
--- a/packages/twenty-server/src/engine/metadata-modules/utils/effective-entity-i18n-context.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type.ts
@@ -1,10 +1,12 @@
import { type APP_LOCALES } from 'twenty-shared/translations';
-import { type MessageIdTranslator } from 'src/engine/metadata-modules/utils/message-id-translator.type';
+import { type MessageIdTranslator } from 'src/engine/metadata-modules/overrides/types/message-id-translator.type';
export type EffectiveEntityI18nContext = {
locale: keyof typeof APP_LOCALES | undefined;
i18nInstance: MessageIdTranslator;
isStandardApp: boolean;
applicationCatalog?: Record<string, string>;
+ workspaceCustomApplicationUniversalIdentifier: string;
+ ownerApplicationUniversalIdentifier: string | undefined;
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/message-id-translator.type.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/types/message-id-translator.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/utils/message-id-translator.type.ts
rename to packages/twenty-server/src/engine/metadata-modules/overrides/types/message-id-translator.type.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/metadata-presentation-overrides.type.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/types/metadata-presentation-overrides.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/utils/metadata-presentation-overrides.type.ts
rename to packages/twenty-server/src/engine/metadata-modules/overrides/types/metadata-presentation-overrides.type.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/types/override-author-context.type.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/types/override-author-context.type.ts
new file mode 100644
index 00000000000..6ea915ff779
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/types/override-author-context.type.ts
@@ -0,0 +1,9 @@
+export type OverrideAuthorContext = {
+ workspaceCustomApplicationUniversalIdentifier: string;
+ ownerApplicationUniversalIdentifier: string | undefined;
+};
+
+export type OverrideAuthorReadContext = {
+ workspaceCustomApplicationUniversalIdentifier?: string;
+ ownerApplicationUniversalIdentifier: string | undefined;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/translation-override-entry.type.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/types/translation-override-entry.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/utils/translation-override-entry.type.ts
rename to packages/twenty-server/src/engine/metadata-modules/overrides/types/translation-override-entry.type.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/compute-override-author-order.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/compute-override-author-order.util.spec.ts
new file mode 100644
index 00000000000..c72b61924db
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/compute-override-author-order.util.spec.ts
@@ -0,0 +1,33 @@
+import { computeOverrideAuthorOrder } from 'src/engine/metadata-modules/overrides/utils/compute-override-author-order.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = '20202020-bbbb-4bbb-8bbb-000000000002';
+
+describe('computeOverrideAuthorOrder', () => {
+ it('ranks the workspace custom application before the owner', () => {
+ expect(
+ computeOverrideAuthorOrder({
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ ownerApplicationUniversalIdentifier: OWNER,
+ }),
+ ).toEqual([CUSTOM, OWNER]);
+ });
+
+ it('dedupes when the custom application owns the entity', () => {
+ expect(
+ computeOverrideAuthorOrder({
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ ownerApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toEqual([CUSTOM]);
+ });
+
+ it('skips an unknown owner', () => {
+ expect(
+ computeOverrideAuthorOrder({
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ ownerApplicationUniversalIdentifier: undefined,
+ }),
+ ).toEqual([CUSTOM]);
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/dispatch-is-active-update-to-authored-override.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/dispatch-is-active-update-to-authored-override.util.spec.ts
new file mode 100644
index 00000000000..4b29045605a
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/dispatch-is-active-update-to-authored-override.util.spec.ts
@@ -0,0 +1,98 @@
+import { dispatchIsActiveUpdateToAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/dispatch-is-active-update-to-authored-override.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = '20202020-bbbb-4bbb-8bbb-000000000002';
+
+const view = {
+ applicationUniversalIdentifier: OWNER,
+ isActive: true,
+ overrides: { [CUSTOM]: { name: 'Mine' } },
+ universalOverrides: { [CUSTOM]: { name: 'Mine' } },
+};
+
+describe('dispatchIsActiveUpdateToAuthoredOverride', () => {
+ it('writes a non-owner deactivation on both blobs and leaves the column', () => {
+ expect(
+ dispatchIsActiveUpdateToAuthoredOverride({
+ metadataName: 'view',
+ flatEntity: view,
+ isActive: false,
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toEqual({
+ ...view,
+ overrides: { [CUSTOM]: { name: 'Mine', isActive: false } },
+ universalOverrides: { [CUSTOM]: { name: 'Mine', isActive: false } },
+ });
+ });
+
+ it('drops the entry when the restore matches the column', () => {
+ expect(
+ dispatchIsActiveUpdateToAuthoredOverride({
+ metadataName: 'view',
+ flatEntity: {
+ ...view,
+ overrides: { [CUSTOM]: { isActive: false } },
+ universalOverrides: { [CUSTOM]: { isActive: false } },
+ },
+ isActive: true,
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toEqual({ ...view, overrides: null, universalOverrides: null });
+ });
+
+ it('writes the column when the author owns the entity', () => {
+ const ownedView = { ...view, applicationUniversalIdentifier: CUSTOM };
+
+ expect(
+ dispatchIsActiveUpdateToAuthoredOverride({
+ metadataName: 'view',
+ flatEntity: ownedView,
+ isActive: false,
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toEqual({ ...ownedView, isActive: false });
+ });
+
+ it('writes the entry when the author owns an engine-managed entity', () => {
+ const engineManagedView = {
+ ...view,
+ applicationUniversalIdentifier: CUSTOM,
+ isSystemSideEffect: true,
+ };
+
+ expect(
+ dispatchIsActiveUpdateToAuthoredOverride({
+ metadataName: 'view',
+ flatEntity: engineManagedView,
+ isActive: false,
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toEqual({
+ ...engineManagedView,
+ overrides: { [CUSTOM]: { name: 'Mine', isActive: false } },
+ universalOverrides: { [CUSTOM]: { name: 'Mine', isActive: false } },
+ });
+ });
+
+ it('writes the column for kinds without an overrides column', () => {
+ const viewFilter = {
+ applicationUniversalIdentifier: OWNER,
+ isActive: true,
+ };
+
+ expect(
+ dispatchIsActiveUpdateToAuthoredOverride({
+ metadataName: 'viewFilter',
+ flatEntity: viewFilter,
+ isActive: false,
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toEqual({ ...viewFilter, isActive: false });
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/dispatch-update-to-authored-override.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/dispatch-update-to-authored-override.util.spec.ts
new file mode 100644
index 00000000000..6d0692c8f86
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/dispatch-update-to-authored-override.util.spec.ts
@@ -0,0 +1,134 @@
+import { dispatchUpdateToAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/dispatch-update-to-authored-override.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = '20202020-bbbb-4bbb-8bbb-000000000002';
+
+const authorContext = {
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ ownerApplicationUniversalIdentifier: OWNER,
+};
+
+const existingEntity = {
+ applicationUniversalIdentifier: OWNER,
+ label: 'Company',
+ icon: 'IconBuilding',
+ isActive: true,
+ position: 0,
+};
+
+const compute = ({
+ updatedProperties,
+ existingOverrides = null,
+ authorUniversalIdentifier = CUSTOM,
+}: {
+ updatedProperties: Record<string, unknown>;
+ existingOverrides?: unknown;
+ authorUniversalIdentifier?: string;
+}) =>
+ dispatchUpdateToAuthoredOverride({
+ metadataName: 'fieldMetadata',
+ updatedProperties,
+ existingEntity,
+ existingOverrides,
+ authorUniversalIdentifier,
+ authorContext,
+ });
+
+describe('dispatchUpdateToAuthoredOverride', () => {
+ it('moves overridable properties into the author entry and leaves the rest', () => {
+ expect(
+ compute({ updatedProperties: { label: 'Société', position: 3 } }),
+ ).toEqual({
+ overrides: { [CUSTOM]: { label: 'Société' } },
+ columnProperties: { position: 3 },
+ });
+ });
+
+ it('merges into the existing author entry and keeps other authors', () => {
+ expect(
+ compute({
+ updatedProperties: { icon: 'IconStar' },
+ existingOverrides: {
+ [CUSTOM]: { label: 'Société' },
+ [OWNER]: { icon: 'IconHome' },
+ },
+ }),
+ ).toEqual({
+ overrides: {
+ [OWNER]: { icon: 'IconHome' },
+ [CUSTOM]: { label: 'Société', icon: 'IconStar' },
+ },
+ columnProperties: {},
+ });
+ });
+
+ it('treats a value equal to the column as a revert', () => {
+ expect(
+ compute({
+ updatedProperties: { label: 'Company' },
+ existingOverrides: { [CUSTOM]: { label: 'Société', icon: 'IconStar' } },
+ }).overrides,
+ ).toEqual({ [CUSTOM]: { icon: 'IconStar' } });
+ });
+
+ it('compares the revert against the entry beneath, not the column', () => {
+ const existingOverrides = { [OWNER]: { label: 'Account' } };
+
+ expect(
+ compute({ updatedProperties: { label: 'Account' }, existingOverrides })
+ .overrides,
+ ).toEqual(existingOverrides);
+ expect(
+ compute({ updatedProperties: { label: 'Company' }, existingOverrides })
+ .overrides,
+ ).toEqual({ ...existingOverrides, [CUSTOM]: { label: 'Company' } });
+ });
+
+ it('stores an explicit null as a value', () => {
+ expect(compute({ updatedProperties: { icon: null } }).overrides).toEqual({
+ [CUSTOM]: { icon: null },
+ });
+ });
+
+ it('collapses an emptied entry and an emptied map to null', () => {
+ expect(
+ compute({
+ updatedProperties: { label: 'Company' },
+ existingOverrides: { [CUSTOM]: { label: 'Société' } },
+ }).overrides,
+ ).toBeNull();
+ });
+
+ it('ignores an undefined update and keeps the entry', () => {
+ expect(
+ compute({
+ updatedProperties: { label: undefined },
+ existingOverrides: { [CUSTOM]: { label: 'Société' } },
+ }),
+ ).toEqual({
+ overrides: { [CUSTOM]: { label: 'Société' } },
+ columnProperties: { label: undefined },
+ });
+ });
+
+ it('lifts a legacy non-authored override under the custom key first', () => {
+ expect(
+ compute({
+ updatedProperties: { icon: 'IconStar' },
+ existingOverrides: { label: 'Société' },
+ }).overrides,
+ ).toEqual({ [CUSTOM]: { label: 'Société', icon: 'IconStar' } });
+ });
+
+ it('falls back to the column when the author is outside the order', () => {
+ const OTHER = '20202020-cccc-4ccc-8ccc-000000000003';
+
+ expect(
+ compute({
+ updatedProperties: { label: 'Company' },
+ existingOverrides: { [OWNER]: { label: 'Account' } },
+ authorUniversalIdentifier: OTHER,
+ }).overrides,
+ ).toEqual({ [OWNER]: { label: 'Account' } });
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/__tests__/find-invalid-translation-override-properties.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/find-invalid-translation-override-properties.util.spec.ts
similarity index 96%
rename from packages/twenty-server/src/engine/metadata-modules/utils/__tests__/find-invalid-translation-override-properties.util.spec.ts
rename to packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/find-invalid-translation-override-properties.util.spec.ts
index e51d6a99e93..9bb20eaa28d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/utils/__tests__/find-invalid-translation-override-properties.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/find-invalid-translation-override-properties.util.spec.ts
@@ -1,4 +1,4 @@
-import { findInvalidTranslationOverrideProperties } from 'src/engine/metadata-modules/utils/find-invalid-translation-override-properties.util';
+import { findInvalidTranslationOverrideProperties } from 'src/engine/metadata-modules/overrides/utils/find-invalid-translation-override-properties.util';
describe('findInvalidTranslationOverrideProperties', () => {
it('returns nothing when every property is translatable', () => {
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/get-workspace-custom-application-universal-identifier-or-throw.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/get-workspace-custom-application-universal-identifier-or-throw.util.spec.ts
new file mode 100644
index 00000000000..a42d227b52c
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/get-workspace-custom-application-universal-identifier-or-throw.util.spec.ts
@@ -0,0 +1,30 @@
+import { ApplicationException } from 'src/engine/core-modules/application/application.exception';
+import { type FlatApplicationCacheMaps } from 'src/engine/core-modules/application/types/flat-application-cache-maps.type';
+import { getWorkspaceCustomApplicationUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/overrides/utils/get-workspace-custom-application-universal-identifier-or-throw.util';
+
+const CUSTOM_ID = 'custom-application-id';
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+
+const flatApplicationMaps = {
+ byId: { [CUSTOM_ID]: { id: CUSTOM_ID, universalIdentifier: CUSTOM } },
+} as unknown as FlatApplicationCacheMaps;
+
+describe('getWorkspaceCustomApplicationUniversalIdentifierOrThrow', () => {
+ it('returns the universal identifier of the workspace custom application', () => {
+ expect(
+ getWorkspaceCustomApplicationUniversalIdentifierOrThrow({
+ workspaceCustomApplicationId: CUSTOM_ID,
+ flatApplicationMaps,
+ }),
+ ).toBe(CUSTOM);
+ });
+
+ it('throws when the application is missing from the cache', () => {
+ expect(() =>
+ getWorkspaceCustomApplicationUniversalIdentifierOrThrow({
+ workspaceCustomApplicationId: 'missing',
+ flatApplicationMaps,
+ }),
+ ).toThrow(ApplicationException);
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/__tests__/is-caller-overriding-entity.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/is-caller-overriding-entity.util.spec.ts
similarity index 75%
rename from packages/twenty-server/src/engine/metadata-modules/utils/__tests__/is-caller-overriding-entity.util.spec.ts
rename to packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/is-caller-overriding-entity.util.spec.ts
index a714b740d50..eaddfdc6060 100644
--- a/packages/twenty-server/src/engine/metadata-modules/utils/__tests__/is-caller-overriding-entity.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/is-caller-overriding-entity.util.spec.ts
@@ -1,4 +1,4 @@
-import { isCallerOverridingEntity } from 'src/engine/metadata-modules/utils/is-caller-overriding-entity.util';
+import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';
const CUSTOM_APP_ID = 'custom-app-universal-id';
const STANDARD_APP_ID = 'standard-app-universal-id';
@@ -37,4 +37,15 @@ describe('isCallerOverridingEntity', () => {
}),
).toBe(false);
});
+
+ it('should return true when custom app updates an engine-managed entity it owns', () => {
+ expect(
+ isCallerOverridingEntity({
+ callerApplicationUniversalIdentifier: CUSTOM_APP_ID,
+ entityApplicationUniversalIdentifier: CUSTOM_APP_ID,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM_APP_ID,
+ isSystemSideEffect: true,
+ }),
+ ).toBe(true);
+ });
});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/is-legacy-non-authored-override.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/is-legacy-non-authored-override.util.spec.ts
new file mode 100644
index 00000000000..dbdf45dd871
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/is-legacy-non-authored-override.util.spec.ts
@@ -0,0 +1,61 @@
+import { isLegacyNonAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/is-legacy-non-authored-override.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+
+describe('isLegacyNonAuthoredOverride', () => {
+ it('detects a flat entry by an overridable property name', () => {
+ expect(
+ isLegacyNonAuthoredOverride({
+ metadataName: 'fieldMetadata',
+ overrides: { label: 'Société' },
+ }),
+ ).toBe(true);
+ expect(
+ isLegacyNonAuthoredOverride({
+ metadataName: 'fieldMetadata',
+ overrides: { isActive: false },
+ }),
+ ).toBe(true);
+ });
+
+ it('detects a flat entry by its translations key', () => {
+ expect(
+ isLegacyNonAuthoredOverride({
+ metadataName: 'fieldMetadata',
+ overrides: { translations: { fr: { label: 'X' } } },
+ }),
+ ).toBe(true);
+ });
+
+ it('detects a flat universal entry by a universal property name', () => {
+ expect(
+ isLegacyNonAuthoredOverride({
+ metadataName: 'viewField',
+ overrides: {
+ viewFieldGroupUniversalIdentifier: 'group-universal-identifier',
+ },
+ }),
+ ).toBe(true);
+ });
+
+ it('does not flag an author map or an empty object', () => {
+ expect(
+ isLegacyNonAuthoredOverride({
+ metadataName: 'fieldMetadata',
+ overrides: { [CUSTOM]: { label: 'X' } },
+ }),
+ ).toBe(false);
+ expect(
+ isLegacyNonAuthoredOverride({
+ metadataName: 'fieldMetadata',
+ overrides: { 'my-application': {} },
+ }),
+ ).toBe(false);
+ expect(
+ isLegacyNonAuthoredOverride({
+ metadataName: 'fieldMetadata',
+ overrides: {},
+ }),
+ ).toBe(false);
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/map-authored-override-entries.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/map-authored-override-entries.util.spec.ts
new file mode 100644
index 00000000000..2efd2e310ef
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/map-authored-override-entries.util.spec.ts
@@ -0,0 +1,59 @@
+import { mapAuthoredOverrideEntries } from 'src/engine/metadata-modules/overrides/utils/map-authored-override-entries.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = '20202020-bbbb-4bbb-8bbb-000000000002';
+
+type ViewEntry = { viewId?: string; name?: string };
+
+const toUniversal = ({ viewId, ...rest }: ViewEntry) => ({
+ ...rest,
+ viewUniversalIdentifier: `universal-${viewId}`,
+});
+
+describe('mapAuthoredOverrideEntries', () => {
+ it('maps every entry and keeps its author key', () => {
+ expect(
+ mapAuthoredOverrideEntries({
+ metadataName: 'viewField',
+ overrides: {
+ [CUSTOM]: { viewId: 'view-1' },
+ [OWNER]: { viewId: 'view-2' },
+ },
+ mapEntry: toUniversal,
+ }),
+ ).toEqual({
+ [CUSTOM]: { viewUniversalIdentifier: 'universal-view-1' },
+ [OWNER]: { viewUniversalIdentifier: 'universal-view-2' },
+ });
+ });
+
+ it('maps a legacy flat blob as a single entry without keying it', () => {
+ expect(
+ mapAuthoredOverrideEntries({
+ metadataName: 'view',
+ overrides: { name: 'Mine', viewId: 'view-1' } as never,
+ mapEntry: toUniversal,
+ }),
+ ).toEqual({ name: 'Mine', viewUniversalIdentifier: 'universal-view-1' });
+ });
+
+ it('drops undefined entries and maps an empty map to an empty map', () => {
+ const mapEntry = jest.fn((entry: { name: string }) => entry);
+
+ expect(
+ mapAuthoredOverrideEntries({
+ metadataName: 'view',
+ overrides: { [CUSTOM]: undefined },
+ mapEntry,
+ }),
+ ).toEqual({});
+ expect(
+ mapAuthoredOverrideEntries({
+ metadataName: 'view',
+ overrides: {},
+ mapEntry,
+ }),
+ ).toEqual({});
+ expect(mapEntry).not.toHaveBeenCalled();
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/merge-translations-into-overrides.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/merge-translations-into-overrides.util.spec.ts
new file mode 100644
index 00000000000..0ea4f253936
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/merge-translations-into-overrides.util.spec.ts
@@ -0,0 +1,151 @@
+import { mergeTranslationsIntoOverrides } from 'src/engine/metadata-modules/overrides/utils/merge-translations-into-overrides.util';
+
+const AUTHOR = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = '20202020-bbbb-4bbb-8bbb-000000000002';
+
+const authorContext = {
+ workspaceCustomApplicationUniversalIdentifier: AUTHOR,
+ ownerApplicationUniversalIdentifier: OWNER,
+};
+
+const merge = (
+ existingOverrides: unknown,
+ translationEntries: Parameters<
+ typeof mergeTranslationsIntoOverrides
+ >[0]['translationEntries'],
+) =>
+ mergeTranslationsIntoOverrides({
+ metadataName: 'objectMetadata',
+ existingOverrides,
+ translationEntries,
+ authorUniversalIdentifier: AUTHOR,
+ authorContext,
+ });
+
+describe('mergeTranslationsIntoOverrides', () => {
+ it('returns existing overrides untouched when there is nothing to merge', () => {
+ const existingOverrides = { [AUTHOR]: { labelSingular: 'Client' } };
+
+ expect(merge(existingOverrides, [])).toBe(existingOverrides);
+ });
+
+ it('adds a translation to the author entry without touching other overrides', () => {
+ expect(
+ merge({ [AUTHOR]: { labelSingular: 'Client' } }, [
+ { locale: 'fr-FR', property: 'labelSingular', value: 'Entreprise' },
+ ]),
+ ).toEqual({
+ [AUTHOR]: {
+ labelSingular: 'Client',
+ translations: { 'fr-FR': { labelSingular: 'Entreprise' } },
+ },
+ });
+ });
+
+ it('leaves other authors entries untouched', () => {
+ expect(
+ merge({ [OWNER]: { labelSingular: 'Account' } }, [
+ { locale: 'fr-FR', property: 'labelSingular', value: 'Entreprise' },
+ ]),
+ ).toEqual({
+ [OWNER]: { labelSingular: 'Account' },
+ [AUTHOR]: {
+ translations: { 'fr-FR': { labelSingular: 'Entreprise' } },
+ },
+ });
+ });
+
+ it('lifts a flat blob under the workspace custom application before merging', () => {
+ expect(
+ merge({ labelSingular: 'Client' }, [
+ { locale: 'fr-FR', property: 'labelSingular', value: 'Entreprise' },
+ ]),
+ ).toEqual({
+ [AUTHOR]: {
+ labelSingular: 'Client',
+ translations: { 'fr-FR': { labelSingular: 'Entreprise' } },
+ },
+ });
+ });
+
+ it('merges into an existing locale group without dropping siblings', () => {
+ expect(
+ merge(
+ {
+ [AUTHOR]: {
+ translations: {
+ 'fr-FR': { labelSingular: 'Entreprise' },
+ 'de-DE': { labelSingular: 'Unternehmen' },
+ },
+ },
+ },
+ [{ locale: 'fr-FR', property: 'labelPlural', value: 'Entreprises' }],
+ ),
+ ).toEqual({
+ [AUTHOR]: {
+ translations: {
+ 'fr-FR': { labelSingular: 'Entreprise', labelPlural: 'Entreprises' },
+ 'de-DE': { labelSingular: 'Unternehmen' },
+ },
+ },
+ });
+ });
+
+ it('deletes an entry on empty value and prunes the emptied locale group', () => {
+ expect(
+ merge(
+ {
+ [AUTHOR]: {
+ labelSingular: 'Client',
+ translations: {
+ 'fr-FR': { labelSingular: 'Entreprise' },
+ 'de-DE': { labelSingular: 'Unternehmen' },
+ },
+ },
+ },
+ [{ locale: 'fr-FR', property: 'labelSingular', value: null }],
+ ),
+ ).toEqual({
+ [AUTHOR]: {
+ labelSingular: 'Client',
+ translations: { 'de-DE': { labelSingular: 'Unternehmen' } },
+ },
+ });
+ });
+
+ it('collapses to null when the last translation of an otherwise empty blob is removed', () => {
+ expect(
+ merge(
+ {
+ [AUTHOR]: {
+ translations: { 'fr-FR': { labelSingular: 'Entreprise' } },
+ },
+ },
+ [{ locale: 'fr-FR', property: 'labelSingular', value: '' }],
+ ),
+ ).toBeNull();
+ });
+
+ it('removing an absent entry is a no-op that still returns null', () => {
+ expect(
+ merge(null, [
+ { locale: 'fr-FR', property: 'labelSingular', value: null },
+ ]),
+ ).toBeNull();
+ });
+
+ it('does not mutate the existing overrides', () => {
+ const existingOverrides = {
+ [AUTHOR]: { translations: { 'fr-FR': { labelSingular: 'Entreprise' } } },
+ };
+
+ merge(existingOverrides, [
+ { locale: 'fr-FR', property: 'labelSingular', value: 'Société' },
+ { locale: 'it-IT', property: 'labelSingular', value: 'Azienda' },
+ ]);
+
+ expect(existingOverrides).toEqual({
+ [AUTHOR]: { translations: { 'fr-FR': { labelSingular: 'Entreprise' } } },
+ });
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/normalize-authored-overrides.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/normalize-authored-overrides.util.spec.ts
new file mode 100644
index 00000000000..c09ef04e794
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/normalize-authored-overrides.util.spec.ts
@@ -0,0 +1,53 @@
+import { normalizeAuthoredOverrides } from 'src/engine/metadata-modules/overrides/utils/normalize-authored-overrides.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = 'my-application';
+
+describe('normalizeAuthoredOverrides', () => {
+ it('returns null for an absent blob', () => {
+ expect(
+ normalizeAuthoredOverrides({
+ metadataName: 'fieldMetadata',
+ overrides: null,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toBeNull();
+ });
+
+ it('lifts a flat blob under the workspace custom application key', () => {
+ expect(
+ normalizeAuthoredOverrides({
+ metadataName: 'fieldMetadata',
+ overrides: { label: 'Société', translations: { 'fr-FR': {} } },
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toEqual({
+ [CUSTOM]: { label: 'Société', translations: { 'fr-FR': {} } },
+ });
+ });
+
+ it('lifts a flat universal blob too', () => {
+ expect(
+ normalizeAuthoredOverrides({
+ metadataName: 'viewField',
+ overrides: { viewFieldGroupUniversalIdentifier: 'group' },
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toEqual({ [CUSTOM]: { viewFieldGroupUniversalIdentifier: 'group' } });
+ });
+
+ it('returns an author-keyed blob as is, whatever the identifier format', () => {
+ const overrides = {
+ [OWNER]: { label: 'Account' },
+ [CUSTOM]: { icon: 'x' },
+ };
+
+ expect(
+ normalizeAuthoredOverrides({
+ metadataName: 'fieldMetadata',
+ overrides,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toBe(overrides);
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/read-authored-override-entry.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/read-authored-override-entry.util.spec.ts
new file mode 100644
index 00000000000..77a6f5e0312
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/read-authored-override-entry.util.spec.ts
@@ -0,0 +1,47 @@
+import { readAuthoredOverrideEntry } from 'src/engine/metadata-modules/overrides/utils/read-authored-override-entry.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = '20202020-bbbb-4bbb-8bbb-000000000002';
+
+describe('readAuthoredOverrideEntry', () => {
+ it('returns the author entry only', () => {
+ expect(
+ readAuthoredOverrideEntry({
+ metadataName: 'fieldMetadata',
+ overrides: { [CUSTOM]: { isActive: false }, [OWNER]: { label: 'X' } },
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toEqual({ isActive: false });
+ });
+
+ it('lifts a legacy non-authored override under the custom key', () => {
+ expect(
+ readAuthoredOverrideEntry({
+ metadataName: 'fieldMetadata',
+ overrides: { label: 'Legacy' },
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toEqual({ label: 'Legacy' });
+ });
+
+ it('returns undefined without an entry for the author', () => {
+ expect(
+ readAuthoredOverrideEntry({
+ metadataName: 'fieldMetadata',
+ overrides: { [OWNER]: { label: 'X' } },
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toBeUndefined();
+ expect(
+ readAuthoredOverrideEntry({
+ metadataName: 'fieldMetadata',
+ overrides: null,
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toBeUndefined();
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/read-authored-override-property.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/read-authored-override-property.util.spec.ts
new file mode 100644
index 00000000000..b0c774d6c5a
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/read-authored-override-property.util.spec.ts
@@ -0,0 +1,123 @@
+import { readAuthoredOverrideProperty } from 'src/engine/metadata-modules/overrides/utils/read-authored-override-property.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = 'my-application';
+
+describe('readAuthoredOverrideProperty', () => {
+ const overrides = {
+ [OWNER]: { label: 'Account', icon: 'IconBuilding' },
+ [CUSTOM]: { label: 'Société' },
+ };
+
+ it('reads the custom entry before the owner entry with an explicit context', () => {
+ const authorContext = {
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ ownerApplicationUniversalIdentifier: OWNER,
+ };
+
+ expect(
+ readAuthoredOverrideProperty({
+ metadataName: 'fieldMetadata',
+ overrides,
+ path: ['label'],
+ authorContext,
+ }),
+ ).toBe('Société');
+ expect(
+ readAuthoredOverrideProperty({
+ metadataName: 'fieldMetadata',
+ overrides,
+ path: ['icon'],
+ authorContext,
+ }),
+ ).toBe('IconBuilding');
+ });
+
+ it('ranks non-owner entries first when only the owner is known', () => {
+ expect(
+ readAuthoredOverrideProperty({
+ metadataName: 'fieldMetadata',
+ overrides,
+ path: ['label'],
+ authorContext: { ownerApplicationUniversalIdentifier: OWNER },
+ }),
+ ).toBe('Société');
+ });
+
+ it('reads a legacy non-authored override as the one non-owner entry', () => {
+ expect(
+ readAuthoredOverrideProperty({
+ metadataName: 'fieldMetadata',
+ overrides: { label: 'Legacy' },
+ path: ['label'],
+ authorContext: { ownerApplicationUniversalIdentifier: OWNER },
+ }),
+ ).toBe('Legacy');
+ });
+
+ it('reads a nested translation path', () => {
+ expect(
+ readAuthoredOverrideProperty({
+ metadataName: 'fieldMetadata',
+ overrides: { [CUSTOM]: { translations: { fr: { label: 'Société' } } } },
+ path: ['translations', 'fr', 'label'],
+ authorContext: { ownerApplicationUniversalIdentifier: OWNER },
+ }),
+ ).toBe('Société');
+ });
+
+ it('keeps an explicit null and falls through an absent key', () => {
+ expect(
+ readAuthoredOverrideProperty({
+ metadataName: 'fieldMetadata',
+ overrides: { [CUSTOM]: { icon: null }, [OWNER]: { icon: 'IconX' } },
+ path: ['icon'],
+ authorContext: {
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ ownerApplicationUniversalIdentifier: OWNER,
+ },
+ }),
+ ).toBeNull();
+ expect(
+ readAuthoredOverrideProperty({
+ metadataName: 'fieldMetadata',
+ overrides,
+ path: ['description'],
+ authorContext: { ownerApplicationUniversalIdentifier: OWNER },
+ }),
+ ).toBeUndefined();
+ });
+
+ it('dedupes when the owner is the workspace custom application', () => {
+ expect(
+ readAuthoredOverrideProperty({
+ metadataName: 'fieldMetadata',
+ overrides: { [CUSTOM]: { label: 'Mine' } },
+ path: ['label'],
+ authorContext: {
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ ownerApplicationUniversalIdentifier: CUSTOM,
+ },
+ }),
+ ).toBe('Mine');
+ });
+
+ it('returns undefined for absent or non-object overrides', () => {
+ expect(
+ readAuthoredOverrideProperty({
+ metadataName: 'fieldMetadata',
+ overrides: null,
+ path: ['label'],
+ authorContext: { ownerApplicationUniversalIdentifier: OWNER },
+ }),
+ ).toBeUndefined();
+ expect(
+ readAuthoredOverrideProperty({
+ metadataName: 'fieldMetadata',
+ overrides: { [CUSTOM]: { translations: 'broken' } },
+ path: ['translations', 'fr', 'label'],
+ authorContext: { ownerApplicationUniversalIdentifier: OWNER },
+ }),
+ ).toBeUndefined();
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/remove-authored-override-entry.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/remove-authored-override-entry.util.spec.ts
new file mode 100644
index 00000000000..a25b1677c40
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/remove-authored-override-entry.util.spec.ts
@@ -0,0 +1,61 @@
+import { removeAuthoredOverrideEntry } from 'src/engine/metadata-modules/overrides/utils/remove-authored-override-entry.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = '20202020-bbbb-4bbb-8bbb-000000000002';
+
+describe('removeAuthoredOverrideEntry', () => {
+ it('drops the author entry and keeps the others', () => {
+ expect(
+ removeAuthoredOverrideEntry({
+ metadataName: 'fieldMetadata',
+ overrides: {
+ [CUSTOM]: { label: 'Mine' },
+ [OWNER]: { label: 'Theirs' },
+ },
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toEqual({ [OWNER]: { label: 'Theirs' } });
+ });
+
+ it('returns null when the last entry goes', () => {
+ expect(
+ removeAuthoredOverrideEntry({
+ metadataName: 'fieldMetadata',
+ overrides: { [CUSTOM]: { label: 'Mine' } },
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toBeNull();
+ });
+
+ it('lifts a legacy non-authored override before removing it', () => {
+ expect(
+ removeAuthoredOverrideEntry({
+ metadataName: 'fieldMetadata',
+ overrides: { label: 'Legacy' },
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toBeNull();
+ });
+
+ it('returns null for absent overrides and leaves other authors untouched', () => {
+ expect(
+ removeAuthoredOverrideEntry({
+ metadataName: 'fieldMetadata',
+ overrides: null,
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toBeNull();
+ expect(
+ removeAuthoredOverrideEntry({
+ metadataName: 'fieldMetadata',
+ overrides: { [OWNER]: { label: 'Theirs' } },
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toEqual({ [OWNER]: { label: 'Theirs' } });
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/reset-authored-overrides.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/reset-authored-overrides.util.spec.ts
new file mode 100644
index 00000000000..17cf8ff97c0
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/reset-authored-overrides.util.spec.ts
@@ -0,0 +1,59 @@
+import { resetAuthoredOverrides } from 'src/engine/metadata-modules/overrides/utils/reset-authored-overrides.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = '20202020-bbbb-4bbb-8bbb-000000000002';
+
+const view = {
+ applicationUniversalIdentifier: OWNER,
+ isActive: true,
+ overrides: { [CUSTOM]: { name: 'Mine' } } as unknown,
+ universalOverrides: { [CUSTOM]: { name: 'Mine' } } as unknown,
+};
+
+describe('resetAuthoredOverrides', () => {
+ it('drops the caller entry on both blobs and keeps the others', () => {
+ expect(
+ resetAuthoredOverrides({
+ metadataName: 'view',
+ flatEntity: {
+ ...view,
+ overrides: {
+ [OWNER]: { isActive: false },
+ [CUSTOM]: { name: 'Mine', isActive: false },
+ },
+ universalOverrides: { [CUSTOM]: { name: 'Mine', isActive: false } },
+ },
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toEqual({
+ ...view,
+ overrides: { [OWNER]: { isActive: false } },
+ universalOverrides: null,
+ });
+ });
+
+ it('leaves the column alone', () => {
+ expect(
+ resetAuthoredOverrides({
+ metadataName: 'view',
+ flatEntity: { ...view, isActive: false },
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }).isActive,
+ ).toBe(false);
+ });
+
+ it('only touches overrides on a kind without a universal twin', () => {
+ const { universalOverrides: _universalOverrides, ...tab } = view;
+
+ expect(
+ resetAuthoredOverrides({
+ metadataName: 'view',
+ flatEntity: tab,
+ authorUniversalIdentifier: CUSTOM,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ }),
+ ).toEqual({ ...tab, overrides: null });
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/__tests__/resolve-effective-entity.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-entity-property.util.spec.ts
similarity index 82%
rename from packages/twenty-server/src/engine/metadata-modules/utils/__tests__/resolve-effective-entity.util.spec.ts
rename to packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-entity-property.util.spec.ts
index 499e3cf0c94..3ff677496ac 100644
--- a/packages/twenty-server/src/engine/metadata-modules/utils/__tests__/resolve-effective-entity.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-entity-property.util.spec.ts
@@ -4,8 +4,11 @@ import { type APP_LOCALES, SOURCE_LOCALE } from 'twenty-shared/translations';
import { isDefined } from 'twenty-shared/utils';
import { translateStandardLabel } from 'src/engine/core-modules/i18n/utils/translate-standard-label.util';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
-import { resolveEffectiveEntity } from 'src/engine/metadata-modules/utils/resolve-effective-entity.util';
+import {
+ readOverrideTranslation,
+ resolveEffectiveEntityProperty,
+} from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
+import { resolveEffectiveFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity.util';
// Frozen reference implementations of the three resolvers that existed before
// unification (resolve-object-metadata-standard-override,
@@ -225,6 +228,9 @@ describe('resolveEffectiveEntityProperty (parity with legacy resolvers)', () =>
i18nInstance: mockI18n,
isStandardApp,
applicationCatalog,
+ workspaceCustomApplicationUniversalIdentifier:
+ 'workspace-custom-application-universal-identifier',
+ ownerApplicationUniversalIdentifier: undefined,
},
});
@@ -263,6 +269,9 @@ describe('resolveEffectiveEntityProperty (parity with legacy resolvers)', () =>
i18nInstance: mockI18n,
isStandardApp,
applicationCatalog,
+ workspaceCustomApplicationUniversalIdentifier:
+ 'workspace-custom-application-universal-identifier',
+ ownerApplicationUniversalIdentifier: undefined,
},
});
@@ -275,7 +284,7 @@ describe('resolveEffectiveEntityProperty (parity with legacy resolvers)', () =>
});
});
-describe('resolveEffectiveEntity (parity with legacy flat spread)', () => {
+describe('resolveEffectiveFlatEntity (parity with legacy flat spread)', () => {
it('matches the frozen flat spread across the corpus', () => {
const flatCorpus: AnyOverrides[] = [
{ name: 'View', position: 1, overrides: undefined },
@@ -291,9 +300,9 @@ describe('resolveEffectiveEntity (parity with legacy flat spread)', () => {
];
for (const flatEntity of flatCorpus) {
- expect(resolveEffectiveEntity(flatEntity)).toEqual(
- frozenResolveFlat(flatEntity),
- );
+ expect(
+ resolveEffectiveFlatEntity({ metadataName: 'view', flatEntity }),
+ ).toEqual(frozenResolveFlat(flatEntity));
}
});
});
@@ -423,3 +432,64 @@ describe('resolveEffectiveEntityProperty (parity with the per-entity resolvers)'
);
});
});
+
+describe('readOverrideTranslation', () => {
+ const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+ const OWNER = '20202020-bbbb-4bbb-8bbb-000000000002';
+ const authorContext = {
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ ownerApplicationUniversalIdentifier: OWNER,
+ };
+
+ it('reads the locale translation of the first author carrying it', () => {
+ expect(
+ readOverrideTranslation({
+ metadataName: 'fieldMetadata',
+ overrides: {
+ [OWNER]: { translations: { 'fr-FR': { label: 'Compte' } } },
+ [CUSTOM]: { translations: { 'fr-FR': { label: 'Société' } } },
+ },
+ locale: 'fr-FR',
+ property: 'label',
+ authorContext,
+ }),
+ ).toBe('Société');
+ });
+
+ it('falls through a locale or property the entries do not carry', () => {
+ const overrides = {
+ [CUSTOM]: { translations: { 'fr-FR': { label: 'Société' } } },
+ };
+
+ expect(
+ readOverrideTranslation({
+ metadataName: 'fieldMetadata',
+ overrides,
+ locale: 'de-DE',
+ property: 'label',
+ authorContext,
+ }),
+ ).toBeUndefined();
+ expect(
+ readOverrideTranslation({
+ metadataName: 'fieldMetadata',
+ overrides,
+ locale: 'fr-FR',
+ property: 'description',
+ authorContext,
+ }),
+ ).toBeUndefined();
+ });
+
+ it('ignores a non-string translation value', () => {
+ expect(
+ readOverrideTranslation({
+ metadataName: 'fieldMetadata',
+ overrides: { [CUSTOM]: { translations: { 'fr-FR': { label: null } } } },
+ locale: 'fr-FR',
+ property: 'label',
+ authorContext,
+ }),
+ ).toBeUndefined();
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-flat-entity-property.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-flat-entity-property.util.spec.ts
new file mode 100644
index 00000000000..0d3755239a0
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-flat-entity-property.util.spec.ts
@@ -0,0 +1,130 @@
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = '20202020-bbbb-4bbb-8bbb-000000000002';
+
+type TestEntity = {
+ applicationUniversalIdentifier: string;
+ title: string;
+ position: number;
+ icon: string | null;
+ overrides?: AuthoredOverrides<Partial<TestEntity>> | null;
+};
+
+const buildEntity = (
+ overrides: TestEntity['overrides'],
+ icon: string | null = null,
+): TestEntity => ({
+ applicationUniversalIdentifier: OWNER,
+ title: 'Base Title',
+ position: 0,
+ icon,
+ overrides,
+});
+
+describe('resolveEffectiveFlatEntityProperty', () => {
+ it('should return the override value when an entry carries the property', () => {
+ expect(
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'pageLayoutTab',
+ flatEntity: buildEntity({ [CUSTOM]: { title: 'Overridden Title' } }),
+ property: 'title',
+ }),
+ ).toBe('Overridden Title');
+ });
+
+ it('should return base value when overrides is null', () => {
+ expect(
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'pageLayoutTab',
+ flatEntity: buildEntity(null),
+ property: 'title',
+ }),
+ ).toBe('Base Title');
+ });
+
+ it('should return base value when no entry carries the requested property', () => {
+ expect(
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'pageLayoutTab',
+ flatEntity: buildEntity({ [CUSTOM]: { position: 5 } }),
+ property: 'title',
+ }),
+ ).toBe('Base Title');
+ });
+
+ it('should return base value when overrides is undefined', () => {
+ expect(
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'pageLayoutTab',
+ flatEntity: buildEntity(undefined),
+ property: 'title',
+ }),
+ ).toBe('Base Title');
+ });
+
+ it('should return null when an entry explicitly sets a nullable property to null', () => {
+ expect(
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'pageLayoutTab',
+ flatEntity: buildEntity({ [CUSTOM]: { icon: null } }, 'IconStar'),
+ property: 'icon',
+ }),
+ ).toBeNull();
+ });
+
+ it('should rank the workspace custom application entry before the owner entry', () => {
+ const entity = buildEntity({
+ [OWNER]: { title: 'Owner Title', position: 3 },
+ [CUSTOM]: { title: 'Custom Title' },
+ });
+
+ expect(
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'pageLayoutTab',
+ flatEntity: entity,
+ property: 'title',
+ }),
+ ).toBe('Custom Title');
+ expect(
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'pageLayoutTab',
+ flatEntity: entity,
+ property: 'position',
+ }),
+ ).toBe(3);
+ expect(
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'pageLayoutTab',
+ flatEntity: entity,
+ property: 'title',
+ authorContext: {
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ },
+ }),
+ ).toBe('Custom Title');
+ });
+
+ it('should read a flat blob as the workspace custom application entry', () => {
+ const entity = buildEntity({ title: 'Legacy Title' } as never);
+
+ expect(
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'pageLayoutTab',
+ flatEntity: entity,
+ property: 'title',
+ }),
+ ).toBe('Legacy Title');
+ expect(
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'pageLayoutTab',
+ flatEntity: entity,
+ property: 'title',
+ authorContext: {
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ },
+ }),
+ ).toBe('Legacy Title');
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-flat-entity.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-flat-entity.util.spec.ts
new file mode 100644
index 00000000000..532f250f874
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-flat-entity.util.spec.ts
@@ -0,0 +1,78 @@
+import { resolveEffectiveFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = '20202020-bbbb-4bbb-8bbb-000000000002';
+
+const flatView = {
+ applicationUniversalIdentifier: OWNER,
+ name: 'All companies',
+ icon: 'IconList',
+ isActive: true,
+ position: 0,
+ overrides: null as unknown,
+};
+
+describe('resolveEffectiveFlatEntity', () => {
+ it('returns the entity as is without overrides', () => {
+ expect(
+ resolveEffectiveFlatEntity({
+ metadataName: 'view',
+ flatEntity: flatView,
+ }),
+ ).toEqual(flatView);
+ });
+
+ it('resolves every overridable property across author entries', () => {
+ const overrides = {
+ [CUSTOM]: { name: 'Mine' },
+ [OWNER]: { name: 'Theirs', icon: 'IconStar', isActive: false },
+ };
+
+ expect(
+ resolveEffectiveFlatEntity({
+ metadataName: 'view',
+ flatEntity: { ...flatView, overrides },
+ }),
+ ).toEqual({
+ ...flatView,
+ overrides,
+ name: 'Mine',
+ icon: 'IconStar',
+ isActive: false,
+ });
+ });
+
+ it('only walks the overridable properties of the given kind', () => {
+ const overrides = { [CUSTOM]: { labelSingular: 'Société', name: 'Mine' } };
+
+ expect(
+ resolveEffectiveFlatEntity({
+ metadataName: 'view',
+ flatEntity: { ...flatView, labelSingular: 'Company', overrides },
+ }),
+ ).toEqual({
+ ...flatView,
+ labelSingular: 'Company',
+ overrides,
+ name: 'Mine',
+ });
+ });
+
+ it('honours the workspace custom application order when given', () => {
+ expect(
+ resolveEffectiveFlatEntity({
+ metadataName: 'view',
+ flatEntity: {
+ ...flatView,
+ overrides: {
+ [OWNER]: { name: 'Theirs' },
+ [CUSTOM]: { name: 'Mine' },
+ },
+ },
+ authorContext: {
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ },
+ }).name,
+ ).toBe('Mine');
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-translated-flat-entity.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-translated-flat-entity.util.spec.ts
new file mode 100644
index 00000000000..44615878a98
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-translated-flat-entity.util.spec.ts
@@ -0,0 +1,90 @@
+import { generateMessageId } from 'twenty-shared/i18n';
+
+import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type';
+import { resolveEffectiveTranslatedFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-translated-flat-entity.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = '20202020-bbbb-4bbb-8bbb-000000000002';
+
+const flatFieldMetadata = {
+ applicationUniversalIdentifier: OWNER,
+ label: 'Company',
+ description: null,
+ icon: 'IconBuilding',
+ isActive: true,
+ overrides: null as unknown,
+};
+
+const buildI18nContext = (
+ partial: Partial<EffectiveEntityI18nContext> = {},
+): EffectiveEntityI18nContext => ({
+ locale: 'fr-FR',
+ i18nInstance: { _: (id: string) => `translated:${id}` },
+ isStandardApp: true,
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ ownerApplicationUniversalIdentifier: OWNER,
+ ...partial,
+});
+
+describe('resolveEffectiveTranslatedFlatEntity', () => {
+ it('translates a standard label through the catalog when nothing overrides it', () => {
+ const messageId = generateMessageId('Company', 'fieldMetadata.label');
+
+ expect(
+ resolveEffectiveTranslatedFlatEntity({
+ metadataName: 'fieldMetadata',
+ flatEntity: flatFieldMetadata,
+ i18nContext: buildI18nContext(),
+ }).label,
+ ).toBe(`translated:${messageId}`);
+ });
+
+ it('prefers a workspace translation, then the override, for the locale', () => {
+ const resolve = (overrides: unknown) =>
+ resolveEffectiveTranslatedFlatEntity({
+ metadataName: 'fieldMetadata',
+ flatEntity: { ...flatFieldMetadata, overrides },
+ i18nContext: buildI18nContext(),
+ }).label;
+
+ expect(
+ resolve({
+ [CUSTOM]: {
+ label: 'Société',
+ translations: { 'fr-FR': { label: 'Entreprise' } },
+ },
+ }),
+ ).toBe('Entreprise');
+ expect(resolve({ [CUSTOM]: { label: 'Société' } })).toBe('Société');
+ });
+
+ it('resolves non-translatable properties with their own type', () => {
+ const effective = resolveEffectiveTranslatedFlatEntity({
+ metadataName: 'fieldMetadata',
+ flatEntity: {
+ ...flatFieldMetadata,
+ overrides: { [CUSTOM]: { icon: 'IconStar', isActive: false } },
+ },
+ i18nContext: buildI18nContext(),
+ });
+
+ expect(effective.icon).toBe('IconStar');
+ expect(effective.isActive).toBe(false);
+ });
+
+ it('leaves a custom entity without a catalog untranslated', () => {
+ expect(
+ resolveEffectiveTranslatedFlatEntity({
+ metadataName: 'fieldMetadata',
+ flatEntity: {
+ ...flatFieldMetadata,
+ applicationUniversalIdentifier: CUSTOM,
+ },
+ i18nContext: buildI18nContext({
+ isStandardApp: false,
+ ownerApplicationUniversalIdentifier: CUSTOM,
+ }),
+ }).label,
+ ).toBe('Company');
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-universal-flat-entity-property.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-universal-flat-entity-property.util.spec.ts
new file mode 100644
index 00000000000..018f4a3bad0
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-universal-flat-entity-property.util.spec.ts
@@ -0,0 +1,65 @@
+import { resolveEffectiveUniversalFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-universal-flat-entity-property.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = '20202020-bbbb-4bbb-8bbb-000000000002';
+
+const universalFlatViewField = {
+ applicationUniversalIdentifier: OWNER,
+ isActive: true,
+ viewFieldGroupUniversalIdentifier: 'group-a',
+ overrides: { [CUSTOM]: { isActive: false, viewFieldGroupId: 'group-b-id' } },
+ universalOverrides: {
+ [CUSTOM]: { isActive: false, viewFieldGroupUniversalIdentifier: 'group-b' },
+ },
+};
+
+describe('resolveEffectiveUniversalFlatEntityProperty', () => {
+ it('reads universalOverrides, not overrides', () => {
+ expect(
+ resolveEffectiveUniversalFlatEntityProperty({
+ metadataName: 'viewField',
+ universalFlatEntity: universalFlatViewField,
+ property: 'viewFieldGroupUniversalIdentifier',
+ }),
+ ).toBe('group-b');
+ expect(
+ resolveEffectiveUniversalFlatEntityProperty({
+ metadataName: 'viewField',
+ universalFlatEntity: universalFlatViewField,
+ property: 'isActive',
+ }),
+ ).toBe(false);
+ });
+
+ it('falls back to the column without a matching entry', () => {
+ expect(
+ resolveEffectiveUniversalFlatEntityProperty({
+ metadataName: 'viewField',
+ universalFlatEntity: {
+ ...universalFlatViewField,
+ universalOverrides: null,
+ },
+ property: 'isActive',
+ }),
+ ).toBe(true);
+ });
+
+ it('ranks the custom entry before the owner entry with an explicit context', () => {
+ expect(
+ resolveEffectiveUniversalFlatEntityProperty({
+ metadataName: 'viewField',
+ universalFlatEntity: {
+ ...universalFlatViewField,
+ universalOverrides: {
+ [OWNER]: { isActive: false },
+ [CUSTOM]: { isActive: true },
+ },
+ },
+ property: 'isActive',
+ authorContext: {
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ },
+ }),
+ ).toBe(true);
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-universal-flat-entity.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-universal-flat-entity.util.spec.ts
new file mode 100644
index 00000000000..9190bd9635a
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/resolve-effective-universal-flat-entity.util.spec.ts
@@ -0,0 +1,64 @@
+import { resolveEffectiveUniversalFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-universal-flat-entity.util';
+
+const CUSTOM = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = '20202020-bbbb-4bbb-8bbb-000000000002';
+
+const universalFlatPageLayoutWidget = {
+ applicationUniversalIdentifier: OWNER,
+ title: 'Timeline',
+ isActive: true,
+ pageLayoutTabUniversalIdentifier: 'tab-1',
+ position: { index: 0 },
+ universalOverrides: null as unknown,
+};
+
+describe('resolveEffectiveUniversalFlatEntity', () => {
+ it('returns the entity as is without overrides', () => {
+ expect(
+ resolveEffectiveUniversalFlatEntity({
+ metadataName: 'pageLayoutWidget',
+ universalFlatEntity: universalFlatPageLayoutWidget,
+ }),
+ ).toEqual(universalFlatPageLayoutWidget);
+ });
+
+ it('resolves relation overrides through their universal property', () => {
+ const universalOverrides = {
+ [CUSTOM]: { pageLayoutTabUniversalIdentifier: 'tab-2' },
+ [OWNER]: { title: 'Activity', position: null },
+ };
+
+ expect(
+ resolveEffectiveUniversalFlatEntity({
+ metadataName: 'pageLayoutWidget',
+ universalFlatEntity: {
+ ...universalFlatPageLayoutWidget,
+ universalOverrides,
+ },
+ authorContext: {
+ workspaceCustomApplicationUniversalIdentifier: CUSTOM,
+ },
+ }),
+ ).toEqual({
+ ...universalFlatPageLayoutWidget,
+ universalOverrides,
+ title: 'Activity',
+ position: null,
+ pageLayoutTabUniversalIdentifier: 'tab-2',
+ });
+ });
+
+ it('lifts a legacy flat blob as the owner entry', () => {
+ const universalOverrides = { pageLayoutTabUniversalIdentifier: null };
+
+ expect(
+ resolveEffectiveUniversalFlatEntity({
+ metadataName: 'pageLayoutWidget',
+ universalFlatEntity: {
+ ...universalFlatPageLayoutWidget,
+ universalOverrides,
+ },
+ }).pageLayoutTabUniversalIdentifier,
+ ).toBeNull();
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/sanitize-overridable-entity-input.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/sanitize-overridable-entity-input.util.spec.ts
new file mode 100644
index 00000000000..c6da26101e1
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/__tests__/sanitize-overridable-entity-input.util.spec.ts
@@ -0,0 +1,207 @@
+import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/overrides/utils/sanitize-overridable-entity-input.util';
+
+const CALLER = '20202020-aaaa-4aaa-8aaa-000000000001';
+const OWNER = '20202020-bbbb-4bbb-8bbb-000000000002';
+
+const authorArgs = {
+ callerApplicationUniversalIdentifier: CALLER,
+ workspaceCustomApplicationUniversalIdentifier: CALLER,
+};
+
+const baseTab = {
+ applicationUniversalIdentifier: OWNER,
+ title: 'Base Title',
+ position: 0,
+ icon: null,
+};
+
+describe('sanitizeOverridableEntityInput', () => {
+ describe('when shouldOverride is false', () => {
+ it('should pass through properties unchanged and preserve existing overrides', () => {
+ const existingOverrides = { [CALLER]: { title: 'Previous Override' } };
+ const result = sanitizeOverridableEntityInput({
+ metadataName: 'pageLayoutTab',
+ existingFlatEntity: { ...baseTab, overrides: existingOverrides },
+ updatedEditableProperties: { title: 'New Title' },
+ shouldOverride: false,
+ ...authorArgs,
+ });
+
+ expect(result.updatedEditableProperties).toEqual({ title: 'New Title' });
+ expect(result.overrides).toBe(existingOverrides);
+ });
+ });
+
+ describe('when shouldOverride is true', () => {
+ it('should move overridable property into the caller entry and remove it from editableProperties', () => {
+ const result = sanitizeOverridableEntityInput({
+ metadataName: 'pageLayoutTab',
+ existingFlatEntity: { ...baseTab, overrides: null },
+ updatedEditableProperties: { title: 'Overridden Title' },
+ shouldOverride: true,
+ ...authorArgs,
+ });
+
+ expect(result.overrides).toEqual({
+ [CALLER]: { title: 'Overridden Title' },
+ });
+ expect(result.updatedEditableProperties).not.toHaveProperty('title');
+ });
+
+ it('should implicitly restore when new value matches base value by removing the key from the caller entry', () => {
+ const result = sanitizeOverridableEntityInput({
+ metadataName: 'pageLayoutTab',
+ existingFlatEntity: {
+ ...baseTab,
+ overrides: { [CALLER]: { title: 'Old Override', position: 5 } },
+ },
+ updatedEditableProperties: { title: 'Base Title' },
+ shouldOverride: true,
+ ...authorArgs,
+ });
+
+ expect(result.overrides).toEqual({ [CALLER]: { position: 5 } });
+ expect(result.updatedEditableProperties).not.toHaveProperty('title');
+ });
+
+ it('should restore against the owner entry rather than the base column', () => {
+ const result = sanitizeOverridableEntityInput({
+ metadataName: 'pageLayoutTab',
+ existingFlatEntity: {
+ ...baseTab,
+ overrides: {
+ [OWNER]: { title: 'Owner Title' },
+ [CALLER]: { title: 'Old Override' },
+ },
+ },
+ updatedEditableProperties: { title: 'Owner Title' },
+ shouldOverride: true,
+ ...authorArgs,
+ });
+
+ expect(result.overrides).toEqual({ [OWNER]: { title: 'Owner Title' } });
+ });
+
+ it('should return null overrides when removing the last override key', () => {
+ const result = sanitizeOverridableEntityInput({
+ metadataName: 'pageLayoutTab',
+ existingFlatEntity: {
+ ...baseTab,
+ overrides: { [CALLER]: { title: 'Old Override' } },
+ },
+ updatedEditableProperties: { title: 'Base Title' },
+ shouldOverride: true,
+ ...authorArgs,
+ });
+
+ expect(result.overrides).toBeNull();
+ expect(result.updatedEditableProperties).not.toHaveProperty('title');
+ });
+
+ it('should lift a flat blob under the workspace custom application', () => {
+ const result = sanitizeOverridableEntityInput({
+ metadataName: 'pageLayoutTab',
+ existingFlatEntity: {
+ ...baseTab,
+ overrides: { position: 5 } as never,
+ },
+ updatedEditableProperties: { title: 'Overridden Title' },
+ shouldOverride: true,
+ ...authorArgs,
+ });
+
+ expect(result.overrides).toEqual({
+ [CALLER]: { position: 5, title: 'Overridden Title' },
+ });
+ });
+
+ it('should not move non-overridable properties to overrides', () => {
+ const result = sanitizeOverridableEntityInput({
+ metadataName: 'pageLayoutTab',
+ existingFlatEntity: {
+ ...baseTab,
+ pageLayoutId: 'layout-1',
+ overrides: null,
+ },
+ updatedEditableProperties: {
+ title: 'Overridden Title',
+ pageLayoutId: 'layout-2',
+ },
+ shouldOverride: true,
+ ...authorArgs,
+ });
+
+ expect(result.overrides).toEqual({
+ [CALLER]: { title: 'Overridden Title' },
+ });
+ expect(result.updatedEditableProperties).toEqual({
+ pageLayoutId: 'layout-2',
+ });
+ });
+
+ it('should preserve existing override keys when updating a different overridable property', () => {
+ const result = sanitizeOverridableEntityInput({
+ metadataName: 'pageLayoutTab',
+ existingFlatEntity: {
+ ...baseTab,
+ overrides: { [CALLER]: { title: 'Overridden Title' } },
+ },
+ updatedEditableProperties: { position: 5 },
+ shouldOverride: true,
+ ...authorArgs,
+ });
+
+ expect(result.overrides).toEqual({
+ [CALLER]: { title: 'Overridden Title', position: 5 },
+ });
+ expect(result.updatedEditableProperties).not.toHaveProperty('position');
+ });
+
+ it('should route isActive into the caller entry like any other property', () => {
+ const result = sanitizeOverridableEntityInput({
+ metadataName: 'pageLayoutTab',
+ existingFlatEntity: { ...baseTab, isActive: true, overrides: null },
+ updatedEditableProperties: { isActive: false },
+ shouldOverride: true,
+ ...authorArgs,
+ });
+
+ expect(result.overrides).toEqual({ [CALLER]: { isActive: false } });
+ expect(result.updatedEditableProperties).toEqual({});
+ });
+
+ it('should drop the isActive entry when the restore matches the column', () => {
+ const result = sanitizeOverridableEntityInput({
+ metadataName: 'pageLayoutTab',
+ existingFlatEntity: {
+ ...baseTab,
+ isActive: true,
+ overrides: { [CALLER]: { isActive: false } },
+ },
+ updatedEditableProperties: { isActive: true },
+ shouldOverride: true,
+ ...authorArgs,
+ });
+
+ expect(result.overrides).toBeNull();
+ expect(result.updatedEditableProperties).toEqual({});
+ });
+
+ it('should keep the isActive entry when the owner column disagrees', () => {
+ const result = sanitizeOverridableEntityInput({
+ metadataName: 'pageLayoutTab',
+ existingFlatEntity: {
+ ...baseTab,
+ isActive: false,
+ overrides: { [CALLER]: { isActive: false } },
+ },
+ updatedEditableProperties: { isActive: true },
+ shouldOverride: true,
+ ...authorArgs,
+ });
+
+ expect(result.overrides).toEqual({ [CALLER]: { isActive: true } });
+ expect(result.updatedEditableProperties).toEqual({});
+ });
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/compute-override-author-order.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/compute-override-author-order.util.ts
new file mode 100644
index 00000000000..909373b84b6
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/compute-override-author-order.util.ts
@@ -0,0 +1,15 @@
+import { isDefined } from 'twenty-shared/utils';
+
+import { type OverrideAuthorContext } from 'src/engine/metadata-modules/overrides/types/override-author-context.type';
+
+export const computeOverrideAuthorOrder = ({
+ workspaceCustomApplicationUniversalIdentifier,
+ ownerApplicationUniversalIdentifier,
+}: OverrideAuthorContext): string[] => [
+ ...new Set(
+ [
+ workspaceCustomApplicationUniversalIdentifier,
+ ownerApplicationUniversalIdentifier,
+ ].filter(isDefined),
+ ),
+];
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/dispatch-is-active-update-to-authored-override.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/dispatch-is-active-update-to-authored-override.util.ts
new file mode 100644
index 00000000000..48867daa1b7
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/dispatch-is-active-update-to-authored-override.util.ts
@@ -0,0 +1,65 @@
+import { type AllMetadataName } from 'twenty-shared/metadata';
+
+import { dispatchUpdateToAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/dispatch-update-to-authored-override.util';
+import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';
+
+type FlatEntityWithIsActive = {
+ applicationUniversalIdentifier: string;
+ isActive?: boolean;
+ overrides?: unknown;
+ universalOverrides?: unknown;
+ isSystemSideEffect?: boolean;
+};
+
+export const dispatchIsActiveUpdateToAuthoredOverride = <
+ T extends FlatEntityWithIsActive,
+>({
+ metadataName,
+ flatEntity,
+ isActive,
+ authorUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
+}: {
+ metadataName: AllMetadataName;
+ flatEntity: T;
+ isActive: boolean;
+ authorUniversalIdentifier: string;
+ workspaceCustomApplicationUniversalIdentifier: string;
+}): T => {
+ const isAuthorOverridingEntity = isCallerOverridingEntity({
+ callerApplicationUniversalIdentifier: authorUniversalIdentifier,
+ entityApplicationUniversalIdentifier:
+ flatEntity.applicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
+ isSystemSideEffect: flatEntity.isSystemSideEffect ?? false,
+ });
+
+ if (!isAuthorOverridingEntity || !('overrides' in flatEntity)) {
+ return { ...flatEntity, isActive };
+ }
+
+ const authorContext = {
+ workspaceCustomApplicationUniversalIdentifier,
+ ownerApplicationUniversalIdentifier:
+ flatEntity.applicationUniversalIdentifier,
+ };
+ const dispatchIsActive = (existingOverrides: unknown) =>
+ dispatchUpdateToAuthoredOverride<{ isActive: boolean }>({
+ metadataName,
+ updatedProperties: { isActive },
+ existingEntity: flatEntity,
+ existingOverrides,
+ authorUniversalIdentifier,
+ authorContext,
+ }).overrides;
+
+ return {
+ ...flatEntity,
+ overrides: dispatchIsActive(flatEntity.overrides),
+ ...('universalOverrides' in flatEntity
+ ? {
+ universalOverrides: dispatchIsActive(flatEntity.universalOverrides),
+ }
+ : {}),
+ };
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/dispatch-update-to-authored-override.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/dispatch-update-to-authored-override.util.ts
new file mode 100644
index 00000000000..f19b4d304da
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/dispatch-update-to-authored-override.util.ts
@@ -0,0 +1,111 @@
+import { type AllMetadataName } from 'twenty-shared/metadata';
+import { fastDeepEqual } from 'twenty-shared/utils';
+
+import { ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/overrides/constants/all-overridable-properties-by-metadata-name.constant';
+
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
+import { computeOverrideAuthorOrder } from 'src/engine/metadata-modules/overrides/utils/compute-override-author-order.util';
+import { normalizeAuthoredOverrides } from 'src/engine/metadata-modules/overrides/utils/normalize-authored-overrides.util';
+import { type OverrideAuthorContext } from 'src/engine/metadata-modules/overrides/types/override-author-context.type';
+import { readAuthoredOverrideProperty } from 'src/engine/metadata-modules/overrides/utils/read-authored-override-property.util';
+
+type DispatchUpdateToAuthoredOverrideArgs<TProperties extends object> = {
+ metadataName: AllMetadataName;
+ updatedProperties: TProperties;
+ existingEntity: object;
+ existingOverrides: unknown;
+ authorUniversalIdentifier: string;
+ authorContext: OverrideAuthorContext;
+};
+
+const isEmptyRecord = (record: object): boolean =>
+ Object.keys(record).length === 0;
+
+export const dispatchUpdateToAuthoredOverride = <
+ TProperties extends object,
+ TEntry = Record<string, unknown>,
+>({
+ metadataName,
+ updatedProperties,
+ existingEntity,
+ existingOverrides,
+ authorUniversalIdentifier,
+ authorContext,
+}: DispatchUpdateToAuthoredOverrideArgs<TProperties>): {
+ overrides: AuthoredOverrides<TEntry> | null;
+ columnProperties: TProperties;
+} => {
+ const columnRecord: Record<string, unknown> = {
+ ...(updatedProperties as unknown as Record<string, unknown>),
+ };
+ const existingRecord = existingEntity as Record<string, unknown>;
+ const overridableProperties: readonly string[] =
+ ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME[metadataName];
+
+ const authoredOverrides =
+ normalizeAuthoredOverrides<Record<string, unknown>>({
+ metadataName,
+ overrides: existingOverrides,
+ workspaceCustomApplicationUniversalIdentifier:
+ authorContext.workspaceCustomApplicationUniversalIdentifier,
+ }) ?? {};
+
+ const authorOrder = computeOverrideAuthorOrder(authorContext);
+ const authorIndex = authorOrder.indexOf(authorUniversalIdentifier);
+ const beneathOverrides = Object.fromEntries(
+ Object.entries(authoredOverrides).filter(
+ ([author]) =>
+ authorIndex !== -1 && authorOrder.indexOf(author) > authorIndex,
+ ),
+ );
+
+ const readBeneathValue = (property: string): unknown => {
+ const beneathValue = readAuthoredOverrideProperty({
+ metadataName,
+ overrides: beneathOverrides,
+ path: [property],
+ authorContext,
+ });
+
+ if (beneathValue !== undefined) {
+ return beneathValue;
+ }
+
+ return existingRecord[property];
+ };
+
+ const authorEntry = overridableProperties.reduce<Record<string, unknown>>(
+ (entry, property) => {
+ if (columnRecord[property] === undefined) {
+ return entry;
+ }
+
+ const propertyValue = columnRecord[property];
+
+ delete columnRecord[property];
+
+ if (fastDeepEqual(propertyValue, readBeneathValue(property))) {
+ const { [property]: _revertedProperty, ...restEntry } = entry;
+
+ return restEntry;
+ }
+
+ return { ...entry, [property]: propertyValue };
+ },
+ { ...(authoredOverrides[authorUniversalIdentifier] ?? {}) },
+ );
+
+ const { [authorUniversalIdentifier]: _previousEntry, ...otherEntries } =
+ authoredOverrides;
+ const nextAuthoredOverrides = isEmptyRecord(authorEntry)
+ ? otherEntries
+ : { ...otherEntries, [authorUniversalIdentifier]: authorEntry };
+ const overrides = isEmptyRecord(nextAuthoredOverrides)
+ ? null
+ : (nextAuthoredOverrides as AuthoredOverrides<TEntry>);
+
+ return {
+ overrides,
+ columnProperties: columnRecord as unknown as TProperties,
+ };
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/find-invalid-translation-override-properties.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/find-invalid-translation-override-properties.util.ts
similarity index 92%
rename from packages/twenty-server/src/engine/metadata-modules/utils/find-invalid-translation-override-properties.util.ts
rename to packages/twenty-server/src/engine/metadata-modules/overrides/utils/find-invalid-translation-override-properties.util.ts
index c586689afc7..4366ad129df 100644
--- a/packages/twenty-server/src/engine/metadata-modules/utils/find-invalid-translation-override-properties.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/find-invalid-translation-override-properties.util.ts
@@ -1,5 +1,5 @@
import { ALL_TRANSLATABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-translatable-properties-by-metadata-name.constant';
-import { type TranslationOverrideEntry } from 'src/engine/metadata-modules/utils/translation-override-entry.type';
+import { type TranslationOverrideEntry } from 'src/engine/metadata-modules/overrides/types/translation-override-entry.type';
export const findInvalidTranslationOverrideProperties = (
translationEntries: TranslationOverrideEntry[],
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/get-workspace-custom-application-universal-identifier-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/get-workspace-custom-application-universal-identifier-or-throw.util.ts
new file mode 100644
index 00000000000..b3775707089
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/get-workspace-custom-application-universal-identifier-or-throw.util.ts
@@ -0,0 +1,27 @@
+import { isDefined } from 'twenty-shared/utils';
+
+import {
+ ApplicationException,
+ ApplicationExceptionCode,
+} from 'src/engine/core-modules/application/application.exception';
+import { type FlatApplicationCacheMaps } from 'src/engine/core-modules/application/types/flat-application-cache-maps.type';
+
+export const getWorkspaceCustomApplicationUniversalIdentifierOrThrow = ({
+ workspaceCustomApplicationId,
+ flatApplicationMaps,
+}: {
+ workspaceCustomApplicationId: string;
+ flatApplicationMaps: FlatApplicationCacheMaps;
+}): string => {
+ const workspaceCustomFlatApplication =
+ flatApplicationMaps.byId[workspaceCustomApplicationId];
+
+ if (!isDefined(workspaceCustomFlatApplication)) {
+ throw new ApplicationException(
+ 'Could not find the workspace custom application in the workspace cache',
+ ApplicationExceptionCode.APPLICATION_NOT_FOUND,
+ );
+ }
+
+ return workspaceCustomFlatApplication.universalIdentifier;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/is-caller-overriding-entity.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util.ts
similarity index 50%
rename from packages/twenty-server/src/engine/metadata-modules/utils/is-caller-overriding-entity.util.ts
rename to packages/twenty-server/src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util.ts
index e63d0f1d1ec..3e0ce1e18b0 100644
--- a/packages/twenty-server/src/engine/metadata-modules/utils/is-caller-overriding-entity.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util.ts
@@ -9,11 +9,17 @@ export const isCallerOverridingEntity = ({
workspaceCustomApplicationUniversalIdentifier: string;
isSystemSideEffect: boolean;
}): boolean => {
- return (
+ const isCallerWorkspaceCustomApplication =
callerApplicationUniversalIdentifier ===
- workspaceCustomApplicationUniversalIdentifier &&
- (entityApplicationUniversalIdentifier !==
- workspaceCustomApplicationUniversalIdentifier ||
- isSystemSideEffect)
- );
+ workspaceCustomApplicationUniversalIdentifier;
+ const isEntityOwnedByWorkspaceCustomApplication =
+ entityApplicationUniversalIdentifier ===
+ workspaceCustomApplicationUniversalIdentifier;
+ const isEntityEngineManaged = isSystemSideEffect;
+
+ if (!isCallerWorkspaceCustomApplication) {
+ return false;
+ }
+
+ return !isEntityOwnedByWorkspaceCustomApplication || isEntityEngineManaged;
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/is-legacy-non-authored-override.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/is-legacy-non-authored-override.util.ts
new file mode 100644
index 00000000000..e42c3728b10
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/is-legacy-non-authored-override.util.ts
@@ -0,0 +1,14 @@
+import { type AllMetadataName } from 'twenty-shared/metadata';
+
+import { ALL_OVERRIDE_ENTRY_PROPERTY_NAMES_BY_METADATA_NAME } from 'src/engine/metadata-modules/overrides/constants/all-override-entry-property-names-by-metadata-name.constant';
+
+export const isLegacyNonAuthoredOverride = ({
+ metadataName,
+ overrides,
+}: {
+ metadataName: AllMetadataName;
+ overrides: Record<string, unknown>;
+}): boolean =>
+ Object.keys(overrides).some((key) =>
+ ALL_OVERRIDE_ENTRY_PROPERTY_NAMES_BY_METADATA_NAME[metadataName].has(key),
+ );
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/map-authored-override-entries.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/map-authored-override-entries.util.ts
new file mode 100644
index 00000000000..e4adbd2120e
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/map-authored-override-entries.util.ts
@@ -0,0 +1,32 @@
+import { type AllMetadataName } from 'twenty-shared/metadata';
+import { isDefined } from 'twenty-shared/utils';
+
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
+import { isLegacyNonAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/is-legacy-non-authored-override.util';
+
+export const mapAuthoredOverrideEntries = <TEntry, TMappedEntry>({
+ metadataName,
+ overrides,
+ mapEntry,
+}: {
+ metadataName: AllMetadataName;
+ overrides: AuthoredOverrides<TEntry>;
+ mapEntry: (entry: TEntry) => TMappedEntry;
+}): AuthoredOverrides<TMappedEntry> => {
+ if (
+ isLegacyNonAuthoredOverride({
+ metadataName,
+ overrides: overrides as Record<string, unknown>,
+ })
+ ) {
+ return mapEntry(
+ overrides as unknown as TEntry,
+ ) as unknown as AuthoredOverrides<TMappedEntry>;
+ }
+
+ return Object.fromEntries(
+ Object.entries(overrides)
+ .filter((entry): entry is [string, TEntry] => isDefined(entry[1]))
+ .map(([author, entry]) => [author, mapEntry(entry)]),
+ );
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/merge-translations-into-overrides.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/merge-translations-into-overrides.util.ts
similarity index 56%
rename from packages/twenty-server/src/engine/metadata-modules/utils/merge-translations-into-overrides.util.ts
rename to packages/twenty-server/src/engine/metadata-modules/overrides/utils/merge-translations-into-overrides.util.ts
index 5135c523b87..81751fa06d5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/utils/merge-translations-into-overrides.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/merge-translations-into-overrides.util.ts
@@ -1,8 +1,12 @@
import { isNonEmptyString } from '@sniptt/guards';
+import { type AllMetadataName } from 'twenty-shared/metadata';
-import { type TranslationOverrideEntry } from 'src/engine/metadata-modules/utils/translation-override-entry.type';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
+import { normalizeAuthoredOverrides } from 'src/engine/metadata-modules/overrides/utils/normalize-authored-overrides.util';
+import { type OverrideAuthorContext } from 'src/engine/metadata-modules/overrides/types/override-author-context.type';
+import { type TranslationOverrideEntry } from 'src/engine/metadata-modules/overrides/types/translation-override-entry.type';
-type OverridesWithTranslations = Record<string, unknown> & {
+type EntryWithTranslations = Record<string, unknown> & {
translations?: Record<string, Record<string, unknown>> | null;
};
@@ -11,31 +15,47 @@ type OverridesWithTranslations = Record<string, unknown> & {
const isSafeObjectKey = (key: string): boolean =>
!['__proto__', 'constructor', 'prototype'].includes(key);
-// Mirrors computeMetadataOverridesBlob for the nested translations key: an
+// Mirrors dispatchUpdateToAuthoredOverride for the nested translations key: an
// empty value deletes the entry, empty locale groups and an empty blob
// collapse to null so a fully-reverted entity stores no overrides at all.
// Custom entities call this too: their property edits live in base columns,
// but per-locale translations still belong in the overrides blob.
export const mergeTranslationsIntoOverrides = <
- TOverrides = Record<string, unknown>,
+ TEntry = Record<string, unknown>,
>({
+ metadataName,
existingOverrides,
translationEntries,
+ authorUniversalIdentifier,
+ authorContext,
}: {
- existingOverrides: TOverrides | null;
+ metadataName: AllMetadataName;
+ existingOverrides: unknown;
translationEntries: TranslationOverrideEntry[];
-}): TOverrides | null => {
+ authorUniversalIdentifier: string;
+ authorContext: OverrideAuthorContext;
+}): AuthoredOverrides<TEntry> | null => {
+ const authoredOverrides =
+ normalizeAuthoredOverrides<EntryWithTranslations>({
+ metadataName,
+ overrides: existingOverrides,
+ workspaceCustomApplicationUniversalIdentifier:
+ authorContext.workspaceCustomApplicationUniversalIdentifier,
+ }) ?? {};
+
const safeTranslationEntries = translationEntries.filter(
({ locale, property }) =>
isSafeObjectKey(locale) && isSafeObjectKey(property),
);
if (safeTranslationEntries.length === 0) {
- return existingOverrides;
+ return Object.keys(authoredOverrides).length > 0
+ ? (authoredOverrides as AuthoredOverrides<TEntry>)
+ : null;
}
- const { translations: existingTranslations, ...otherOverrides } =
- (existingOverrides ?? {}) as OverridesWithTranslations;
+ const { translations: existingTranslations, ...otherEntryProperties } =
+ authoredOverrides[authorUniversalIdentifier] ?? {};
const locales = new Set([
...Object.keys(existingTranslations ?? {}),
@@ -74,14 +94,21 @@ export const mergeTranslationsIntoOverrides = <
.filter(([, values]) => Object.keys(values).length > 0),
);
- const overrides =
+ const authorEntry =
Object.keys(mergedTranslations).length > 0
- ? { ...otherOverrides, translations: mergedTranslations }
- : otherOverrides;
+ ? { ...otherEntryProperties, translations: mergedTranslations }
+ : otherEntryProperties;
+
+ const { [authorUniversalIdentifier]: _previousEntry, ...otherEntries } =
+ authoredOverrides;
+ const overrides =
+ Object.keys(authorEntry).length > 0
+ ? { ...otherEntries, [authorUniversalIdentifier]: authorEntry }
+ : otherEntries;
if (Object.keys(overrides).length === 0) {
return null;
}
- return overrides as TOverrides;
+ return overrides as AuthoredOverrides<TEntry>;
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/normalize-authored-overrides.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/normalize-authored-overrides.util.ts
new file mode 100644
index 00000000000..d2b44f1192e
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/normalize-authored-overrides.util.ts
@@ -0,0 +1,31 @@
+import { type AllMetadataName } from 'twenty-shared/metadata';
+import { isDefined } from 'twenty-shared/utils';
+
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
+import { isLegacyNonAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/is-legacy-non-authored-override.util';
+
+export const normalizeAuthoredOverrides = <TEntry>({
+ metadataName,
+ overrides,
+ workspaceCustomApplicationUniversalIdentifier,
+}: {
+ metadataName: AllMetadataName;
+ overrides: unknown;
+ workspaceCustomApplicationUniversalIdentifier: string;
+}): AuthoredOverrides<TEntry> | null => {
+ if (!isDefined(overrides) || typeof overrides !== 'object') {
+ return null;
+ }
+
+ const overridesRecord = overrides as Record<string, unknown>;
+
+ if (
+ !isLegacyNonAuthoredOverride({ metadataName, overrides: overridesRecord })
+ ) {
+ return overridesRecord as AuthoredOverrides<TEntry>;
+ }
+
+ return {
+ [workspaceCustomApplicationUniversalIdentifier]: overridesRecord as TEntry,
+ };
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/read-authored-override-entry.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/read-authored-override-entry.util.ts
new file mode 100644
index 00000000000..6943694e3a8
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/read-authored-override-entry.util.ts
@@ -0,0 +1,20 @@
+import { type AllMetadataName } from 'twenty-shared/metadata';
+
+import { normalizeAuthoredOverrides } from 'src/engine/metadata-modules/overrides/utils/normalize-authored-overrides.util';
+
+export const readAuthoredOverrideEntry = <TEntry>({
+ metadataName,
+ overrides,
+ authorUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
+}: {
+ metadataName: AllMetadataName;
+ overrides: unknown;
+ authorUniversalIdentifier: string;
+ workspaceCustomApplicationUniversalIdentifier: string;
+}): TEntry | undefined =>
+ normalizeAuthoredOverrides<TEntry>({
+ metadataName,
+ overrides,
+ workspaceCustomApplicationUniversalIdentifier,
+ })?.[authorUniversalIdentifier];
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/read-authored-override-property.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/read-authored-override-property.util.ts
new file mode 100644
index 00000000000..d2b15e5caf8
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/read-authored-override-property.util.ts
@@ -0,0 +1,79 @@
+import { type AllMetadataName } from 'twenty-shared/metadata';
+import { isDefined } from 'twenty-shared/utils';
+
+import { computeOverrideAuthorOrder } from 'src/engine/metadata-modules/overrides/utils/compute-override-author-order.util';
+import { isLegacyNonAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/is-legacy-non-authored-override.util';
+import { normalizeAuthoredOverrides } from 'src/engine/metadata-modules/overrides/utils/normalize-authored-overrides.util';
+import { type OverrideAuthorReadContext } from 'src/engine/metadata-modules/overrides/types/override-author-context.type';
+
+const isRecord = (value: unknown): value is Record<string, unknown> =>
+ isDefined(value) && typeof value === 'object';
+
+const listAuthoredOverrideEntries = ({
+ metadataName,
+ overrides,
+ authorContext,
+}: {
+ metadataName: AllMetadataName;
+ overrides: unknown;
+ authorContext: OverrideAuthorReadContext;
+}): unknown[] => {
+ if (!isRecord(overrides)) {
+ return [];
+ }
+
+ const {
+ workspaceCustomApplicationUniversalIdentifier,
+ ownerApplicationUniversalIdentifier,
+ } = authorContext;
+
+ if (isDefined(workspaceCustomApplicationUniversalIdentifier)) {
+ const authoredOverrides =
+ normalizeAuthoredOverrides<unknown>({
+ metadataName,
+ overrides,
+ workspaceCustomApplicationUniversalIdentifier,
+ }) ?? {};
+
+ return computeOverrideAuthorOrder({
+ workspaceCustomApplicationUniversalIdentifier,
+ ownerApplicationUniversalIdentifier,
+ })
+ .map((author) => authoredOverrides[author])
+ .filter(isDefined);
+ }
+
+ if (isLegacyNonAuthoredOverride({ metadataName, overrides })) {
+ return [overrides];
+ }
+
+ const ownerEntry = isDefined(ownerApplicationUniversalIdentifier)
+ ? overrides[ownerApplicationUniversalIdentifier]
+ : undefined;
+ const nonOwnerEntries = Object.entries(overrides)
+ .filter(([author]) => author !== ownerApplicationUniversalIdentifier)
+ .map(([, entry]) => entry);
+
+ return [...nonOwnerEntries, ownerEntry].filter(isDefined);
+};
+
+const readPath = (value: unknown, path: readonly string[]): unknown =>
+ path.reduce<unknown>(
+ (current, key) => (isRecord(current) ? current[key] : undefined),
+ value,
+ );
+
+export const readAuthoredOverrideProperty = ({
+ metadataName,
+ overrides,
+ path,
+ authorContext,
+}: {
+ metadataName: AllMetadataName;
+ overrides: unknown;
+ path: readonly string[];
+ authorContext: OverrideAuthorReadContext;
+}): unknown =>
+ listAuthoredOverrideEntries({ metadataName, overrides, authorContext })
+ .map((entry) => readPath(entry, path))
+ .find((value) => value !== undefined);
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/remove-authored-override-entry.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/remove-authored-override-entry.util.ts
new file mode 100644
index 00000000000..5d265c89225
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/remove-authored-override-entry.util.ts
@@ -0,0 +1,32 @@
+import { type AllMetadataName } from 'twenty-shared/metadata';
+import { isDefined } from 'twenty-shared/utils';
+
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
+import { normalizeAuthoredOverrides } from 'src/engine/metadata-modules/overrides/utils/normalize-authored-overrides.util';
+
+export const removeAuthoredOverrideEntry = <TEntry>({
+ metadataName,
+ overrides,
+ authorUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
+}: {
+ metadataName: AllMetadataName;
+ overrides: unknown;
+ authorUniversalIdentifier: string;
+ workspaceCustomApplicationUniversalIdentifier: string;
+}): AuthoredOverrides<TEntry> | null => {
+ const authoredOverrides = normalizeAuthoredOverrides<TEntry>({
+ metadataName,
+ overrides,
+ workspaceCustomApplicationUniversalIdentifier,
+ });
+
+ if (!isDefined(authoredOverrides)) {
+ return null;
+ }
+
+ const { [authorUniversalIdentifier]: _removedEntry, ...otherEntries } =
+ authoredOverrides;
+
+ return Object.keys(otherEntries).length > 0 ? otherEntries : null;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/reset-authored-overrides.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/reset-authored-overrides.util.ts
new file mode 100644
index 00000000000..eb9a5ab7e66
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/reset-authored-overrides.util.ts
@@ -0,0 +1,39 @@
+import { type AllMetadataName } from 'twenty-shared/metadata';
+
+import { removeAuthoredOverrideEntry } from 'src/engine/metadata-modules/overrides/utils/remove-authored-override-entry.util';
+
+type FlatEntityWithOverrides = {
+ applicationUniversalIdentifier: string;
+ overrides: unknown;
+ universalOverrides?: unknown;
+};
+
+export const resetAuthoredOverrides = <T extends FlatEntityWithOverrides>({
+ metadataName,
+ flatEntity,
+ authorUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
+}: {
+ metadataName: AllMetadataName;
+ flatEntity: T;
+ authorUniversalIdentifier: string;
+ workspaceCustomApplicationUniversalIdentifier: string;
+}): T => ({
+ ...flatEntity,
+ overrides: removeAuthoredOverrideEntry({
+ metadataName,
+ overrides: flatEntity.overrides,
+ authorUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
+ }),
+ ...('universalOverrides' in flatEntity
+ ? {
+ universalOverrides: removeAuthoredOverrideEntry({
+ metadataName,
+ overrides: flatEntity.universalOverrides,
+ authorUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
+ }),
+ }
+ : {}),
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/resolve-effective-entity-property.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util.ts
similarity index 79%
rename from packages/twenty-server/src/engine/metadata-modules/utils/resolve-effective-entity-property.util.ts
rename to packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util.ts
index c3ada0a0856..975a91733d8 100644
--- a/packages/twenty-server/src/engine/metadata-modules/utils/resolve-effective-entity-property.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util.ts
@@ -10,26 +10,31 @@ import {
type MetadataEntityTranslatablePropertyName,
} from 'src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant';
import { ALL_TRANSLATABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-translatable-properties-by-metadata-name.constant';
-import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/utils/effective-entity-i18n-context.type';
-import { type MetadataPresentationOverrides } from 'src/engine/metadata-modules/utils/metadata-presentation-overrides.type';
-
-const readOverrideProperty = (overrides: unknown, property: string): unknown =>
- isDefined(overrides) && typeof overrides === 'object'
- ? (overrides as Record<string, unknown>)[property]
- : undefined;
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
+import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type';
+import { type MetadataPresentationOverrides } from 'src/engine/metadata-modules/overrides/types/metadata-presentation-overrides.type';
+import { type OverrideAuthorReadContext } from 'src/engine/metadata-modules/overrides/types/override-author-context.type';
+import { readAuthoredOverrideProperty } from 'src/engine/metadata-modules/overrides/utils/read-authored-override-property.util';
export const readOverrideTranslation = ({
+ metadataName,
overrides,
locale,
property,
+ authorContext,
}: {
+ metadataName: AllMetadataName;
overrides: unknown;
locale: string;
property: string;
+ authorContext: OverrideAuthorReadContext;
}): string | undefined => {
- const translations = readOverrideProperty(overrides, 'translations');
- const translationsForLocale = readOverrideProperty(translations, locale);
- const translation = readOverrideProperty(translationsForLocale, property);
+ const translation = readAuthoredOverrideProperty({
+ metadataName,
+ overrides,
+ path: ['translations', locale, property],
+ authorContext,
+ });
return typeof translation === 'string' ? translation : undefined;
};
@@ -52,7 +57,12 @@ const resolveEffectiveProperty = ({
const isTranslatable = translatableProperties.includes(property);
- const overrideValue = readOverrideProperty(overrides, property);
+ const overrideValue = readAuthoredOverrideProperty({
+ metadataName,
+ overrides,
+ path: [property],
+ authorContext: i18nContext,
+ });
const { locale, i18nInstance, isStandardApp, applicationCatalog } =
i18nContext;
@@ -64,9 +74,11 @@ const resolveEffectiveProperty = ({
// translation even though it has no catalog to fall back to.
if (isTranslatable) {
const translation = readOverrideTranslation({
+ metadataName,
overrides,
locale: safeLocale,
property,
+ authorContext: i18nContext,
});
if (isDefined(translation)) {
@@ -106,7 +118,10 @@ export const resolveEffectiveEntityProperty = <T extends AllMetadataName>({
}: {
metadataName: T;
baseValue: string | null | undefined;
- overrides: MetadataPresentationOverrides<T> | null | undefined;
+ overrides:
+ | AuthoredOverrides<MetadataPresentationOverrides<T>>
+ | null
+ | undefined;
// A property is resolvable if it is overridable, translatable, or both:
// navigationMenuItem.name is translated but never renamed, so keying this on
// "overridable" alone would lock it out of the shared resolution path.
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util.ts
new file mode 100644
index 00000000000..548633f635d
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util.ts
@@ -0,0 +1,46 @@
+import { type AllMetadataName } from 'twenty-shared/metadata';
+
+import { type MetadataEntityOverridablePropertyName } from 'src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant';
+import { type OverrideAuthorReadContext } from 'src/engine/metadata-modules/overrides/types/override-author-context.type';
+import { readAuthoredOverrideProperty } from 'src/engine/metadata-modules/overrides/utils/read-authored-override-property.util';
+
+export type OverridableFlatEntity = {
+ applicationUniversalIdentifier: string;
+ overrides?: unknown;
+};
+
+export const resolveEffectiveFlatEntityProperty = <
+ TMetadataName extends AllMetadataName,
+ TFlatEntity extends OverridableFlatEntity,
+ TProperty extends MetadataEntityOverridablePropertyName<TMetadataName> &
+ string &
+ keyof TFlatEntity,
+>({
+ metadataName,
+ flatEntity,
+ property,
+ authorContext,
+}: {
+ metadataName: TMetadataName;
+ flatEntity: TFlatEntity;
+ property: TProperty;
+ authorContext?: Pick<
+ OverrideAuthorReadContext,
+ 'workspaceCustomApplicationUniversalIdentifier'
+ >;
+}): TFlatEntity[TProperty] => {
+ const overrideValue = readAuthoredOverrideProperty({
+ metadataName,
+ overrides: flatEntity.overrides,
+ path: [property],
+ authorContext: {
+ ...authorContext,
+ ownerApplicationUniversalIdentifier:
+ flatEntity.applicationUniversalIdentifier,
+ },
+ });
+
+ return overrideValue !== undefined
+ ? (overrideValue as TFlatEntity[TProperty])
+ : flatEntity[property];
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity.util.ts
new file mode 100644
index 00000000000..3f3472312d3
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity.util.ts
@@ -0,0 +1,39 @@
+import { type AllMetadataName } from 'twenty-shared/metadata';
+
+import { ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/overrides/constants/all-overridable-properties-by-metadata-name.constant';
+import { type OverrideAuthorReadContext } from 'src/engine/metadata-modules/overrides/types/override-author-context.type';
+import {
+ type OverridableFlatEntity,
+ resolveEffectiveFlatEntityProperty,
+} from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
+
+export const resolveEffectiveFlatEntity = <
+ TFlatEntity extends OverridableFlatEntity & Record<string, unknown>,
+>({
+ metadataName,
+ flatEntity,
+ authorContext,
+}: {
+ metadataName: AllMetadataName;
+ flatEntity: TFlatEntity;
+ authorContext?: Pick<
+ OverrideAuthorReadContext,
+ 'workspaceCustomApplicationUniversalIdentifier'
+ >;
+}): TFlatEntity => {
+ const overridableProperties: readonly string[] =
+ ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME[metadataName];
+
+ return overridableProperties.reduce<TFlatEntity>(
+ (effectiveFlatEntity, property) => ({
+ ...effectiveFlatEntity,
+ [property]: resolveEffectiveFlatEntityProperty({
+ metadataName,
+ flatEntity,
+ property: property as never,
+ authorContext,
+ }),
+ }),
+ flatEntity,
+ );
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-translated-flat-entity.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-translated-flat-entity.util.ts
new file mode 100644
index 00000000000..2da57e1fecf
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-translated-flat-entity.util.ts
@@ -0,0 +1,49 @@
+import { type TranslatableMetadataName } from 'twenty-shared/i18n';
+import { type AllMetadataName } from 'twenty-shared/metadata';
+
+import { ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/overrides/constants/all-overridable-properties-by-metadata-name.constant';
+import { ALL_TRANSLATABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-translatable-properties-by-metadata-name.constant';
+import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type';
+import { resolveEffectiveEntityPropertyByName } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
+import {
+ type OverridableFlatEntity,
+ resolveEffectiveFlatEntityProperty,
+} from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
+
+export const resolveEffectiveTranslatedFlatEntity = <
+ TFlatEntity extends OverridableFlatEntity & Record<string, unknown>,
+>({
+ metadataName,
+ flatEntity,
+ i18nContext,
+}: {
+ metadataName: AllMetadataName;
+ flatEntity: TFlatEntity;
+ i18nContext: EffectiveEntityI18nContext;
+}): TFlatEntity => {
+ const overridableProperties: readonly string[] =
+ ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME[metadataName];
+ const translatableProperties: readonly string[] =
+ ALL_TRANSLATABLE_PROPERTIES_BY_METADATA_NAME[metadataName] ?? [];
+
+ return overridableProperties.reduce<TFlatEntity>(
+ (effectiveFlatEntity, property) => ({
+ ...effectiveFlatEntity,
+ [property]: translatableProperties.includes(property)
+ ? resolveEffectiveEntityPropertyByName({
+ metadataName: metadataName as TranslatableMetadataName,
+ baseValue: flatEntity[property],
+ overrides: flatEntity.overrides,
+ property,
+ i18nContext,
+ })
+ : resolveEffectiveFlatEntityProperty({
+ metadataName,
+ flatEntity,
+ property: property as never,
+ authorContext: i18nContext,
+ }),
+ }),
+ flatEntity,
+ );
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-universal-flat-entity-property.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-universal-flat-entity-property.util.ts
new file mode 100644
index 00000000000..301cc529bba
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-universal-flat-entity-property.util.ts
@@ -0,0 +1,42 @@
+import { type AllMetadataName } from 'twenty-shared/metadata';
+
+import { type OverrideAuthorReadContext } from 'src/engine/metadata-modules/overrides/types/override-author-context.type';
+import { readAuthoredOverrideProperty } from 'src/engine/metadata-modules/overrides/utils/read-authored-override-property.util';
+
+export type OverridableUniversalFlatEntity = {
+ applicationUniversalIdentifier: string;
+ universalOverrides?: unknown;
+};
+
+export const resolveEffectiveUniversalFlatEntityProperty = <
+ TUniversalFlatEntity extends OverridableUniversalFlatEntity,
+ TProperty extends string & keyof TUniversalFlatEntity,
+>({
+ metadataName,
+ universalFlatEntity,
+ property,
+ authorContext,
+}: {
+ metadataName: AllMetadataName;
+ universalFlatEntity: TUniversalFlatEntity;
+ property: TProperty;
+ authorContext?: Pick<
+ OverrideAuthorReadContext,
+ 'workspaceCustomApplicationUniversalIdentifier'
+ >;
+}): TUniversalFlatEntity[TProperty] => {
+ const overrideValue = readAuthoredOverrideProperty({
+ metadataName,
+ overrides: universalFlatEntity.universalOverrides,
+ path: [property],
+ authorContext: {
+ ...authorContext,
+ ownerApplicationUniversalIdentifier:
+ universalFlatEntity.applicationUniversalIdentifier,
+ },
+ });
+
+ return overrideValue !== undefined
+ ? (overrideValue as TUniversalFlatEntity[TProperty])
+ : universalFlatEntity[property];
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-universal-flat-entity.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-universal-flat-entity.util.ts
new file mode 100644
index 00000000000..c20e0e0ea2a
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/resolve-effective-universal-flat-entity.util.ts
@@ -0,0 +1,38 @@
+import { type AllMetadataName } from 'twenty-shared/metadata';
+
+import { ALL_OVERRIDABLE_UNIVERSAL_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/overrides/constants/all-overridable-universal-properties-by-metadata-name.constant';
+import { type OverrideAuthorReadContext } from 'src/engine/metadata-modules/overrides/types/override-author-context.type';
+import {
+ type OverridableUniversalFlatEntity,
+ resolveEffectiveUniversalFlatEntityProperty,
+} from 'src/engine/metadata-modules/overrides/utils/resolve-effective-universal-flat-entity-property.util';
+
+export const resolveEffectiveUniversalFlatEntity = <
+ TUniversalFlatEntity extends OverridableUniversalFlatEntity &
+ Record<string, unknown>,
+>({
+ metadataName,
+ universalFlatEntity,
+ authorContext,
+}: {
+ metadataName: AllMetadataName;
+ universalFlatEntity: TUniversalFlatEntity;
+ authorContext?: Pick<
+ OverrideAuthorReadContext,
+ 'workspaceCustomApplicationUniversalIdentifier'
+ >;
+}): TUniversalFlatEntity =>
+ ALL_OVERRIDABLE_UNIVERSAL_PROPERTIES_BY_METADATA_NAME[
+ metadataName
+ ].reduce<TUniversalFlatEntity>(
+ (effectiveUniversalFlatEntity, property) => ({
+ ...effectiveUniversalFlatEntity,
+ [property]: resolveEffectiveUniversalFlatEntityProperty({
+ metadataName,
+ universalFlatEntity,
+ property: property as never,
+ authorContext,
+ }),
+ }),
+ universalFlatEntity,
+ );
diff --git a/packages/twenty-server/src/engine/metadata-modules/overrides/utils/sanitize-overridable-entity-input.util.ts b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/sanitize-overridable-entity-input.util.ts
new file mode 100644
index 00000000000..3554f227044
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/overrides/utils/sanitize-overridable-entity-input.util.ts
@@ -0,0 +1,58 @@
+import { type AllMetadataName } from 'twenty-shared/metadata';
+
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
+import { dispatchUpdateToAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/dispatch-update-to-authored-override.util';
+
+type FlatEntityWithOverrides<TEntry> = {
+ [key: string]: unknown;
+ applicationUniversalIdentifier: string;
+ overrides: AuthoredOverrides<TEntry> | null;
+};
+
+export const sanitizeOverridableEntityInput = <
+ T extends AllMetadataName,
+ TProperties extends Record<string, unknown>,
+ TEntry = Record<string, unknown>,
+>({
+ metadataName,
+ existingFlatEntity,
+ updatedEditableProperties,
+ shouldOverride,
+ callerApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
+}: {
+ metadataName: T;
+ existingFlatEntity: FlatEntityWithOverrides<TEntry>;
+ updatedEditableProperties: TProperties;
+ shouldOverride: boolean;
+ callerApplicationUniversalIdentifier: string;
+ workspaceCustomApplicationUniversalIdentifier: string;
+}): {
+ overrides: AuthoredOverrides<TEntry> | null;
+ updatedEditableProperties: TProperties;
+} => {
+ if (!shouldOverride) {
+ return {
+ overrides: existingFlatEntity.overrides,
+ updatedEditableProperties,
+ };
+ }
+
+ const { overrides, columnProperties } = dispatchUpdateToAuthoredOverride<
+ TProperties,
+ TEntry
+ >({
+ metadataName,
+ updatedProperties: updatedEditableProperties,
+ existingEntity: existingFlatEntity,
+ existingOverrides: existingFlatEntity.overrides,
+ authorUniversalIdentifier: callerApplicationUniversalIdentifier,
+ authorContext: {
+ workspaceCustomApplicationUniversalIdentifier,
+ ownerApplicationUniversalIdentifier:
+ existingFlatEntity.applicationUniversalIdentifier,
+ },
+ });
+
+ return { overrides, updatedEditableProperties: columnProperties };
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto.ts
index 7f1e9b617ea..e4e61122e15 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto.ts
@@ -7,6 +7,7 @@ import {
} from '@nestjs/graphql';
import { PageLayoutTabLayoutMode } from 'twenty-shared/types';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { type PageLayoutTabOverrides } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity';
import { PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto';
@@ -75,5 +76,5 @@ export class PageLayoutTabDTO {
isOverridden?: boolean;
@HideField()
- overrides?: PageLayoutTabOverrides | null;
+ overrides?: AuthoredOverrides<PageLayoutTabOverrides> | null;
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity.ts
index 7f8d08757af..f505c947c3d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity.ts
@@ -22,6 +22,7 @@ import { PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entiti
import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity';
export type PageLayoutTabOverrides = {
+ isActive?: boolean;
title?: string;
position?: number;
icon?: string | null;
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/resolvers/page-layout-tab.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/resolvers/page-layout-tab.resolver.ts
index 94ddce838ac..2fcb780cc5f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/resolvers/page-layout-tab.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/resolvers/page-layout-tab.resolver.ts
@@ -28,7 +28,7 @@ import { CreatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layou
import { UpdatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab.input';
import { PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto';
import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
import { PageLayoutGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception.filter';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/utils/from-flat-page-layout-tab-to-page-layout-tab-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/utils/from-flat-page-layout-tab-to-page-layout-tab-dto.util.ts
index b3206bd7c67..62e67c98fe4 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/utils/from-flat-page-layout-tab-to-page-layout-tab-dto.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/utils/from-flat-page-layout-tab-to-page-layout-tab-dto.util.ts
@@ -1,22 +1,24 @@
import { type FlatPageLayoutTab } from 'src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab.type';
import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto';
+import { resolveEffectiveFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity.util';
export const fromFlatPageLayoutTabToPageLayoutTabDto = (
flatPageLayoutTab: FlatPageLayoutTab,
): Omit<PageLayoutTabDTO, 'widgets'> => {
+ const effectiveFlatPageLayoutTab = resolveEffectiveFlatEntity({
+ metadataName: 'pageLayoutTab',
+ flatEntity: flatPageLayoutTab,
+ });
const {
createdAt,
updatedAt,
deletedAt,
widgetIds: _widgetIds,
- overrides,
...rest
- } = flatPageLayoutTab;
+ } = effectiveFlatPageLayoutTab;
return {
...rest,
- ...(overrides ?? {}),
- overrides,
isOverridden: false,
createdAt: new Date(createdAt),
updatedAt: new Date(updatedAt),
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto.ts
index 833116823b4..cc553dd7264 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto.ts
@@ -11,6 +11,7 @@ import {
WidgetType,
} from 'twenty-shared/types';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { PageLayoutWidgetPositionUnion } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget-position.union';
import { WidgetConfiguration } from 'src/engine/metadata-modules/page-layout-widget/dtos/widget-configuration.interface';
@@ -97,5 +98,5 @@ export class PageLayoutWidgetDTO {
isOverridden?: boolean;
@HideField()
- overrides?: PageLayoutWidgetOverrides | null;
+ overrides?: AuthoredOverrides<PageLayoutWidgetOverrides> | null;
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts
index ef0911e9874..7430f67e39c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts
@@ -31,6 +31,7 @@ import { OverridableEntity } from 'src/engine/workspace-manager/types/overridabl
import { type JsonbProperty } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/jsonb-property.type';
export type PageLayoutWidgetOverrides = {
+ isActive?: boolean;
title?: string;
position?: PageLayoutWidgetPosition | null;
conditionalDisplay?: PageLayoutWidgetConditionalDisplay | null;
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/resolvers/page-layout-widget.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/resolvers/page-layout-widget.resolver.ts
index 08996813c25..13a80be8e25 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/resolvers/page-layout-widget.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/resolvers/page-layout-widget.resolver.ts
@@ -29,7 +29,7 @@ import { UpdatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-la
import { PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto';
import { WidgetConfiguration } from 'src/engine/metadata-modules/page-layout-widget/dtos/widget-configuration.interface';
import { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
import { PageLayoutGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception.filter';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts
index a653de12efd..d2962d2af41 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts
@@ -18,7 +18,7 @@ import {
import { CreatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/create-page-layout-widget.input';
import { UpdatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input';
import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto';
-import { resolveOverridableEntityProperty } from 'src/engine/metadata-modules/utils/resolve-overridable-entity-property.util';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
import { WidgetConfigurationType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-configuration-type.type';
import {
PageLayoutWidgetException,
@@ -171,8 +171,11 @@ export class PageLayoutWidgetService {
.filter(isDefined)
.filter(
(widget) =>
- resolveOverridableEntityProperty(widget, 'pageLayoutTabId') ===
- pageLayoutTabId && !isDefined(widget.deletedAt),
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'pageLayoutWidget',
+ flatEntity: widget,
+ property: 'pageLayoutTabId',
+ }) === pageLayoutTabId && !isDefined(widget.deletedAt),
)
.sort((widgetA, widgetB) => {
const createdAtComparison =
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/find-active-flat-field-metadata-by-id.util.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/find-active-flat-field-metadata-by-id.util.ts
index 7083179372e..3405e5f8d05 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/find-active-flat-field-metadata-by-id.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/find-active-flat-field-metadata-by-id.util.ts
@@ -3,6 +3,7 @@ import { isDefined } from 'twenty-shared/utils';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
export const findActiveFlatFieldMetadataById = (
fieldId: string | null | undefined,
@@ -15,7 +16,16 @@ export const findActiveFlatFieldMetadataById = (
flatEntityMaps: flatFieldMetadataMaps,
});
- if (!isDefined(field) || !field.isActive) return null;
+ if (
+ !isDefined(field) ||
+ !resolveEffectiveFlatEntityProperty({
+ metadataName: 'fieldMetadata',
+ flatEntity: field,
+ property: 'isActive',
+ })
+ ) {
+ return null;
+ }
return field;
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/from-flat-page-layout-widget-to-page-layout-widget-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/from-flat-page-layout-widget-to-page-layout-widget-dto.util.ts
index 5f17a853fdf..0de8fc371ff 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/from-flat-page-layout-widget-to-page-layout-widget-dto.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/from-flat-page-layout-widget-to-page-layout-widget-dto.util.ts
@@ -1,22 +1,19 @@
import { type FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type';
import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto';
+import { resolveEffectiveFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity.util';
export const fromFlatPageLayoutWidgetToPageLayoutWidgetDto = (
flatPageLayoutWidget: FlatPageLayoutWidget,
): PageLayoutWidgetDTO => {
- const {
- createdAt,
- updatedAt,
- deletedAt,
- objectMetadataId,
- overrides,
- ...rest
- } = flatPageLayoutWidget;
+ const effectiveFlatPageLayoutWidget = resolveEffectiveFlatEntity({
+ metadataName: 'pageLayoutWidget',
+ flatEntity: flatPageLayoutWidget,
+ });
+ const { createdAt, updatedAt, deletedAt, objectMetadataId, ...rest } =
+ effectiveFlatPageLayoutWidget;
return {
...rest,
- ...(overrides ?? {}),
- overrides,
isOverridden: false,
objectMetadataId: objectMetadataId ?? undefined,
createdAt: new Date(createdAt),
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/validate-chart-configuration-field-references.util.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/validate-chart-configuration-field-references.util.ts
index c8e6cc68e6a..74f14a2431e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/validate-chart-configuration-field-references.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/validate-chart-configuration-field-references.util.ts
@@ -22,6 +22,7 @@ import { type AllPageLayoutWidgetConfiguration } from 'src/engine/metadata-modul
import { findActiveFlatFieldMetadataById } from 'src/engine/metadata-modules/page-layout-widget/utils/find-active-flat-field-metadata-by-id.util';
import { isChartReferencingFieldInConfiguration } from 'src/engine/metadata-modules/page-layout-widget/utils/is-chart-referencing-field-in-configuration.util';
import { validateGroupByFieldOrThrow } from 'src/engine/metadata-modules/page-layout-widget/utils/validate-group-by-field.util';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
const buildChartFieldValidationException = (
message: string,
@@ -126,7 +127,14 @@ export const validateChartConfigurationFieldReferencesOrThrow = ({
flatEntityMaps: flatObjectMetadataMaps,
});
- if (!isDefined(objectMetadata) || !objectMetadata.isActive) {
+ if (
+ !isDefined(objectMetadata) ||
+ !resolveEffectiveFlatEntityProperty({
+ metadataName: 'objectMetadata',
+ flatEntity: objectMetadata,
+ property: 'isActive',
+ })
+ ) {
throw buildChartFieldValidationException(
`objectMetadataId "${widgetObjectMetadataId}" not found.`,
widgetTitle,
@@ -135,7 +143,13 @@ export const validateChartConfigurationFieldReferencesOrThrow = ({
const allFields = Object.values(flatFieldMetadataMaps.byUniversalIdentifier)
.filter(isDefined)
- .filter((field) => field.isActive);
+ .filter((field) =>
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'fieldMetadata',
+ flatEntity: field,
+ property: 'isActive',
+ }),
+ );
const fieldsByObjectId = new Map<string, FlatFieldMetadata[]>();
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/resolvers/page-layout.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/resolvers/page-layout.resolver.ts
index 0b756d26104..2f23138b360 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/resolvers/page-layout.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/resolvers/page-layout.resolver.ts
@@ -35,7 +35,7 @@ import { PageLayoutResetService } from 'src/engine/metadata-modules/page-layout/
import { PageLayoutUpdateService } from 'src/engine/metadata-modules/page-layout/services/page-layout-update.service';
import { PageLayoutService } from 'src/engine/metadata-modules/page-layout/services/page-layout.service';
import { PageLayoutGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception.filter';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-reset.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-reset.service.ts
index 26644ffd507..f2cdf4aed5b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-reset.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-reset.service.ts
@@ -43,6 +43,7 @@ import { ViewService } from 'src/engine/metadata-modules/view/services/view.serv
import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
import { DashboardSyncService } from 'src/modules/dashboard-sync/services/dashboard-sync.service';
+import { resetAuthoredOverrides } from 'src/engine/metadata-modules/overrides/utils/reset-authored-overrides.util';
@Injectable()
export class PageLayoutResetService {
@@ -125,9 +126,14 @@ export class PageLayoutResetService {
const now = new Date().toISOString();
const widgetToUpdate: FlatPageLayoutWidget = {
- ...widget,
- overrides: null,
- universalOverrides: null,
+ ...resetAuthoredOverrides({
+ metadataName: 'pageLayoutWidget',
+ flatEntity: widget,
+ authorUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ }),
updatedAt: now,
};
@@ -269,8 +275,14 @@ export class PageLayoutResetService {
const now = new Date().toISOString();
const tabToUpdate: FlatPageLayoutTab = {
- ...tab,
- overrides: null,
+ ...resetAuthoredOverrides({
+ metadataName: 'pageLayoutTab',
+ flatEntity: tab,
+ authorUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ }),
updatedAt: now,
};
@@ -432,6 +444,7 @@ export class PageLayoutResetService {
const { toHardDelete: tabsToDelete, toReset: tabsToReset } =
splitEntitiesByResetStrategy({
+ metadataName: 'pageLayoutTab',
entities: existingTabs,
workspaceCustomApplicationUniversalIdentifier:
workspaceCustomFlatApplication.universalIdentifier,
@@ -606,6 +619,7 @@ export class PageLayoutResetService {
const { toHardDelete: widgetsToDelete, toReset: widgetsToReset } =
splitEntitiesByResetStrategy({
+ metadataName: 'pageLayoutWidget',
entities: existingWidgets,
workspaceCustomApplicationUniversalIdentifier,
now,
@@ -756,6 +770,7 @@ export class PageLayoutResetService {
const { toHardDelete: groupsToDelete, toReset: groupsToReset } =
splitEntitiesByResetStrategy({
+ metadataName: 'viewFieldGroup',
entities: existingGroups,
workspaceCustomApplicationUniversalIdentifier,
now,
@@ -763,6 +778,7 @@ export class PageLayoutResetService {
const { toHardDelete: fieldsToDelete, toReset: fieldsToReset } =
splitEntitiesByResetStrategy({
+ metadataName: 'viewField',
entities: existingFields,
workspaceCustomApplicationUniversalIdentifier,
now,
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-update.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-update.service.ts
index ef833767d0b..c750f530483 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-update.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-update.service.ts
@@ -36,13 +36,15 @@ import {
PageLayoutExceptionMessageKey,
} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout.exception';
import { fromFlatPageLayoutWithTabsAndWidgetsToPageLayoutDto } from 'src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-with-tabs-and-widgets-to-page-layout-dto.util';
-import { isCallerOverridingEntity } from 'src/engine/metadata-modules/utils/is-caller-overriding-entity.util';
-import { resolveEffectiveEntity } from 'src/engine/metadata-modules/utils/resolve-effective-entity.util';
-import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util';
+import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';
+import { resolveEffectiveFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity.util';
+import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/overrides/utils/sanitize-overridable-entity-input.util';
import { ViewService } from 'src/engine/metadata-modules/view/services/view.service';
import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
import { DashboardSyncService } from 'src/modules/dashboard-sync/services/dashboard-sync.service';
+import { dispatchIsActiveUpdateToAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/dispatch-is-active-update-to-authored-override.util';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
type UpdatePageLayoutWithTabsParams = {
id: string;
@@ -285,7 +287,12 @@ export class PageLayoutUpdateService {
.filter(isDefined)
.filter((tab) => tab.pageLayoutId === existingPageLayout.id);
- const resolvedExistingTabs = existingTabs.map(resolveEffectiveEntity);
+ const resolvedExistingTabs = existingTabs.map((tab) =>
+ resolveEffectiveFlatEntity({
+ metadataName: 'pageLayoutTab',
+ flatEntity: tab,
+ }),
+ );
const {
toCreate: entitiesToCreate,
@@ -362,6 +369,9 @@ export class PageLayoutUpdateService {
existingFlatEntity: existingTab,
updatedEditableProperties: editableProperties,
shouldOverride,
+ callerApplicationUniversalIdentifier:
+ workspaceCustomApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
});
return {
@@ -402,13 +412,24 @@ export class PageLayoutUpdateService {
existingFlatEntity: existingTab,
updatedEditableProperties: editableProperties,
shouldOverride,
+ callerApplicationUniversalIdentifier:
+ workspaceCustomApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
});
return {
- ...existingTab,
- ...updatedEditableProperties,
- overrides,
- isActive: true,
+ ...dispatchIsActiveUpdateToAuthoredOverride({
+ metadataName: 'pageLayoutTab',
+ flatEntity: {
+ ...existingTab,
+ ...updatedEditableProperties,
+ overrides,
+ },
+ isActive: true,
+ authorUniversalIdentifier:
+ workspaceCustomApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
+ }),
updatedAt: now.toISOString(),
};
});
@@ -423,6 +444,7 @@ export class PageLayoutUpdateService {
.filter(isDefined);
const { toHardDelete, toDeactivate } = splitEntitiesByRemovalStrategy({
+ metadataName: 'pageLayoutTab',
entitiesToRemove: tabsToRemove,
workspaceCustomApplicationUniversalIdentifier,
now: now.toISOString(),
@@ -561,7 +583,12 @@ export class PageLayoutUpdateService {
flatPageLayoutWidgetMaps,
});
- const resolvedExistingWidgets = existingWidgets.map(resolveEffectiveEntity);
+ const resolvedExistingWidgets = existingWidgets.map((widget) =>
+ resolveEffectiveFlatEntity({
+ metadataName: 'pageLayoutWidget',
+ flatEntity: widget,
+ }),
+ );
const {
toCreate: entitiesToCreate,
@@ -639,21 +666,27 @@ export class PageLayoutUpdateService {
);
const widgetsToRestoreAndUpdate: FlatPageLayoutWidget[] =
- entitiesToRestoreAndUpdate.map((widgetInput) => ({
- ...this.buildUpdatedFlatPageLayoutWidget({
- widgetInput,
- flatPageLayoutWidgetMaps,
- flatPageLayoutTabMaps,
- flatObjectMetadataMaps,
- flatFieldMetadataMaps,
- flatFrontComponentMaps,
- flatViewFieldGroupMaps,
- flatViewMaps,
+ entitiesToRestoreAndUpdate.map((widgetInput) =>
+ dispatchIsActiveUpdateToAuthoredOverride({
+ metadataName: 'pageLayoutWidget',
+ flatEntity: this.buildUpdatedFlatPageLayoutWidget({
+ widgetInput,
+ flatPageLayoutWidgetMaps,
+ flatPageLayoutTabMaps,
+ flatObjectMetadataMaps,
+ flatFieldMetadataMaps,
+ flatFrontComponentMaps,
+ flatViewFieldGroupMaps,
+ flatViewMaps,
+ workspaceCustomApplicationUniversalIdentifier,
+ now,
+ }),
+ isActive: true,
+ authorUniversalIdentifier:
+ workspaceCustomApplicationUniversalIdentifier,
workspaceCustomApplicationUniversalIdentifier,
- now,
}),
- isActive: true,
- }));
+ );
const widgetIdsToRemoveExcludingMovedToOtherTabs =
this.excludeWidgetsMovedToOtherTabs({
@@ -671,6 +704,7 @@ export class PageLayoutUpdateService {
.filter(isDefined);
const { toHardDelete, toDeactivate } = splitEntitiesByRemovalStrategy({
+ metadataName: 'pageLayoutWidget',
entitiesToRemove: widgetsToRemove,
workspaceCustomApplicationUniversalIdentifier,
now: now.toISOString(),
@@ -753,6 +787,9 @@ export class PageLayoutUpdateService {
existingFlatEntity: existingWidget,
updatedEditableProperties: editableProperties,
shouldOverride,
+ callerApplicationUniversalIdentifier:
+ workspaceCustomApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
});
const updatedWidget: FlatPageLayoutWidget = {
@@ -908,13 +945,28 @@ export class PageLayoutUpdateService {
}
for (const widget of widgetsToUpdate) {
- if (!widget.isActive) {
+ if (
+ !resolveEffectiveFlatEntityProperty({
+ metadataName: 'pageLayoutWidget',
+ flatEntity: widget,
+ property: 'isActive',
+ })
+ ) {
directlyRemovedWidgetIds.add(widget.id);
}
}
const removedTabIds = new Set([
- ...tabsToUpdate.filter((tab) => !tab.isActive).map((tab) => tab.id),
+ ...tabsToUpdate
+ .filter(
+ (tab) =>
+ !resolveEffectiveFlatEntityProperty({
+ metadataName: 'pageLayoutTab',
+ flatEntity: tab,
+ property: 'isActive',
+ }),
+ )
+ .map((tab) => tab.id),
...tabsToDelete.map((tab) => tab.id),
]);
@@ -923,7 +975,14 @@ export class PageLayoutUpdateService {
).filter(isDefined);
for (const widget of allExistingWidgets) {
- if (widget.isActive && removedTabIds.has(widget.pageLayoutTabId)) {
+ if (
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'pageLayoutWidget',
+ flatEntity: widget,
+ property: 'isActive',
+ }) &&
+ removedTabIds.has(widget.pageLayoutTabId)
+ ) {
const viewId = this.getViewIdFromFieldsWidget(widget);
if (isDefined(viewId)) {
@@ -934,7 +993,11 @@ export class PageLayoutUpdateService {
for (const widget of allExistingWidgets) {
if (
- widget.isActive &&
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'pageLayoutWidget',
+ flatEntity: widget,
+ property: 'isActive',
+ }) &&
!directlyRemovedWidgetIds.has(widget.id) &&
!removedTabIds.has(widget.pageLayoutTabId)
) {
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type.dto.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type.dto.ts
index fcc483478a8..65aacd043db 100644
--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type.dto.ts
@@ -9,6 +9,7 @@ import {
} from 'class-validator';
import { type TimelineActivityAction } from 'twenty-shared/timeline';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { TimelineActivityTypeEmitDTO } from 'src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type-emit.dto';
import { type TimelineActivityTypeOverrides } from 'src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity';
@@ -75,7 +76,7 @@ export class TimelineActivityTypeDTO {
applicationId?: string;
@HideField()
- overrides: TimelineActivityTypeOverrides | null;
+ overrides: AuthoredOverrides<TimelineActivityTypeOverrides> | null;
@IsDateString()
@Field()
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity.ts
index 40d3a9c7463..f692d061750 100644
--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity.ts
@@ -24,6 +24,7 @@ import { WasRemovedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/
import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity';
export type TimelineActivityTypeOverrides = {
+ isActive?: boolean;
label?: string;
icon?: string | null;
translations?: Partial<
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.resolver.ts
index 01d9943f3a0..baacb15ddd5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.resolver.ts
@@ -26,7 +26,7 @@ import { TimelineActivityTypeDTO } from 'src/engine/metadata-modules/timeline-ac
import { UpdateTimelineActivityTypeInput } from 'src/engine/metadata-modules/timeline-activity-type/dtos/update-timeline-activity-type.input';
import { TimelineActivityTypeGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/timeline-activity-type/interceptors/timeline-activity-type-graphql-api-exception.interceptor';
import { TimelineActivityTypeService } from 'src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.service';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
@UseGuards(WorkspaceAuthGuard)
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.service.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.service.ts
index 5e04e773fc9..8fac18746d8 100644
--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.service.ts
@@ -15,6 +15,7 @@ import { fromFlatTimelineActivityTypeToTimelineActivityTypeDto } from 'src/engin
import { fromUpdateTimelineActivityTypeInputToFlatTimelineActivityTypeToUpdateOrThrow } from 'src/engine/metadata-modules/timeline-activity-type/utils/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util';
import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
+import { resetAuthoredOverrides } from 'src/engine/metadata-modules/overrides/utils/reset-authored-overrides.util';
@Injectable()
export class TimelineActivityTypeService {
@@ -101,8 +102,14 @@ export class TimelineActivityTypeService {
return this.persistUpdate({
flatTimelineActivityTypeToUpdate: {
- ...existingFlatTimelineActivityType,
- overrides: null,
+ ...resetAuthoredOverrides({
+ metadataName: 'timelineActivityType',
+ flatEntity: existingFlatTimelineActivityType,
+ authorUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ }),
isActive: true,
updatedAt: new Date().toISOString(),
},
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/__tests__/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/__tests__/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util.spec.ts
index 143dda352fb..8950f26bddc 100644
--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/__tests__/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/__tests__/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util.spec.ts
@@ -57,8 +57,14 @@ describe('fromUpdateTimelineActivityTypeInputToFlatTimelineActivityTypeToUpdateO
expect(result).toMatchObject({
label: 'was created by',
icon: 'IconPlus',
- isActive: false,
- overrides: { label: 'was added by', icon: 'IconSparkles' },
+ isActive: true,
+ overrides: {
+ [WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER]: {
+ label: 'was added by',
+ icon: 'IconSparkles',
+ isActive: false,
+ },
+ },
});
expect(
fromFlatTimelineActivityTypeToTimelineActivityTypeDto(result),
@@ -115,7 +121,9 @@ describe('fromUpdateTimelineActivityTypeInputToFlatTimelineActivityTypeToUpdateO
);
expect(result.overrides).toEqual({
- translations: { 'fr-FR': { label: 'a été créé par' } },
+ [WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER]: {
+ translations: { 'fr-FR': { label: 'a été créé par' } },
+ },
});
});
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/from-flat-timeline-activity-type-to-timeline-activity-type-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/from-flat-timeline-activity-type-to-timeline-activity-type-dto.util.ts
index 032fc5e834d..4f454520d26 100644
--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/from-flat-timeline-activity-type-to-timeline-activity-type-dto.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/from-flat-timeline-activity-type-to-timeline-activity-type-dto.util.ts
@@ -2,7 +2,7 @@ import { isDefined } from 'twenty-shared/utils';
import { type FlatTimelineActivityType } from 'src/engine/metadata-modules/flat-timeline-activity-type/types/flat-timeline-activity-type.type';
import { type TimelineActivityTypeDTO } from 'src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type.dto';
-import { resolveOverridableEntityProperty } from 'src/engine/metadata-modules/utils/resolve-overridable-entity-property.util';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
export const fromFlatTimelineActivityTypeToTimelineActivityTypeDto = (
flatTimelineActivityType: FlatTimelineActivityType,
@@ -10,7 +10,11 @@ export const fromFlatTimelineActivityTypeToTimelineActivityTypeDto = (
id: flatTimelineActivityType.id,
universalIdentifier: flatTimelineActivityType.universalIdentifier,
name: flatTimelineActivityType.name,
- label: resolveOverridableEntityProperty(flatTimelineActivityType, 'label'),
+ label: resolveEffectiveFlatEntityProperty({
+ metadataName: 'timelineActivityType',
+ flatEntity: flatTimelineActivityType,
+ property: 'label',
+ }),
emit: isDefined(flatTimelineActivityType.action)
? {
on: flatTimelineActivityType.action,
@@ -31,13 +35,21 @@ export const fromFlatTimelineActivityTypeToTimelineActivityTypeDto = (
}
: null,
action: flatTimelineActivityType.action,
- icon: resolveOverridableEntityProperty(flatTimelineActivityType, 'icon'),
+ icon: resolveEffectiveFlatEntityProperty({
+ metadataName: 'timelineActivityType',
+ flatEntity: flatTimelineActivityType,
+ property: 'icon',
+ }),
frontComponentUniversalIdentifier:
flatTimelineActivityType.frontComponentUniversalIdentifier,
objectUniversalIdentifier: flatTimelineActivityType.objectUniversalIdentifier,
replacesTimelineActivityTypeUniversalIdentifier:
flatTimelineActivityType.replacesTimelineActivityTypeUniversalIdentifier,
- isActive: flatTimelineActivityType.isActive,
+ isActive: resolveEffectiveFlatEntityProperty({
+ metadataName: 'timelineActivityType',
+ flatEntity: flatTimelineActivityType,
+ property: 'isActive',
+ }),
workspaceId: flatTimelineActivityType.workspaceId,
applicationId: flatTimelineActivityType.applicationId,
overrides: flatTimelineActivityType.overrides,
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util.ts
index 7ded3f9d2df..8823c7fe02d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util.ts
@@ -7,10 +7,10 @@ import { type UpdateTimelineActivityTypeInput } from 'src/engine/metadata-module
import { type TimelineActivityTypeOverrides } from 'src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity';
import { TimelineActivityTypeExceptionCode } from 'src/engine/metadata-modules/timeline-activity-type/enums/timeline-activity-type-exception-code.enum';
import { TimelineActivityTypeException } from 'src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.exception';
-import { findInvalidTranslationOverrideProperties } from 'src/engine/metadata-modules/utils/find-invalid-translation-override-properties.util';
-import { isCallerOverridingEntity } from 'src/engine/metadata-modules/utils/is-caller-overriding-entity.util';
-import { mergeTranslationsIntoOverrides } from 'src/engine/metadata-modules/utils/merge-translations-into-overrides.util';
-import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util';
+import { findInvalidTranslationOverrideProperties } from 'src/engine/metadata-modules/overrides/utils/find-invalid-translation-override-properties.util';
+import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';
+import { mergeTranslationsIntoOverrides } from 'src/engine/metadata-modules/overrides/utils/merge-translations-into-overrides.util';
+import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/overrides/utils/sanitize-overridable-entity-input.util';
import { mergeUpdateInExistingRecord } from 'src/utils/merge-update-in-existing-record.util';
const WORKSPACE_EDITABLE_TIMELINE_ACTIVITY_TYPE_PROPERTIES = [
@@ -76,6 +76,8 @@ export const fromUpdateTimelineActivityTypeInputToFlatTimelineActivityTypeToUpda
existingFlatEntity: existingFlatTimelineActivityType,
updatedEditableProperties: updates,
shouldOverride,
+ callerApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
});
return {
@@ -85,8 +87,15 @@ export const fromUpdateTimelineActivityTypeInputToFlatTimelineActivityTypeToUpda
update: updatedEditableProperties,
}),
overrides: mergeTranslationsIntoOverrides<TimelineActivityTypeOverrides>({
+ metadataName: 'timelineActivityType',
existingOverrides: overrides,
translationEntries: translations,
+ authorUniversalIdentifier: callerApplicationUniversalIdentifier,
+ authorContext: {
+ workspaceCustomApplicationUniversalIdentifier,
+ ownerApplicationUniversalIdentifier:
+ existingFlatTimelineActivityType.applicationUniversalIdentifier,
+ },
}),
updatedAt: new Date().toISOString(),
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/__tests__/merge-translations-into-overrides.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/utils/__tests__/merge-translations-into-overrides.util.spec.ts
deleted file mode 100644
index 4cfe1a0a29a..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/utils/__tests__/merge-translations-into-overrides.util.spec.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { mergeTranslationsIntoOverrides } from 'src/engine/metadata-modules/utils/merge-translations-into-overrides.util';
-
-describe('mergeTranslationsIntoOverrides', () => {
- it('returns existing overrides untouched when there is nothing to merge', () => {
- const existingOverrides = { labelSingular: 'Client' };
-
- expect(
- mergeTranslationsIntoOverrides({
- existingOverrides,
- translationEntries: [],
- }),
- ).toBe(existingOverrides);
- });
-
- it('adds a translation without touching other overrides', () => {
- expect(
- mergeTranslationsIntoOverrides({
- existingOverrides: { labelSingular: 'Client' },
- translationEntries: [
- { locale: 'fr-FR', property: 'labelSingular', value: 'Entreprise' },
- ],
- }),
- ).toEqual({
- labelSingular: 'Client',
- translations: { 'fr-FR': { labelSingular: 'Entreprise' } },
- });
- });
-
- it('merges into an existing locale group without dropping siblings', () => {
- expect(
- mergeTranslationsIntoOverrides({
- existingOverrides: {
- translations: {
- 'fr-FR': { labelSingular: 'Entreprise' },
- 'de-DE': { labelSingular: 'Unternehmen' },
- },
- },
- translationEntries: [
- { locale: 'fr-FR', property: 'labelPlural', value: 'Entreprises' },
- ],
- }),
- ).toEqual({
- translations: {
- 'fr-FR': { labelSingular: 'Entreprise', labelPlural: 'Entreprises' },
- 'de-DE': { labelSingular: 'Unternehmen' },
- },
- });
- });
-
- it('deletes an entry on empty value and prunes the emptied locale group', () => {
- expect(
- mergeTranslationsIntoOverrides({
- existingOverrides: {
- labelSingular: 'Client',
- translations: {
- 'fr-FR': { labelSingular: 'Entreprise' },
- 'de-DE': { labelSingular: 'Unternehmen' },
- },
- },
- translationEntries: [
- { locale: 'fr-FR', property: 'labelSingular', value: null },
- ],
- }),
- ).toEqual({
- labelSingular: 'Client',
- translations: { 'de-DE': { labelSingular: 'Unternehmen' } },
- });
- });
-
- it('collapses to null when the last translation of an otherwise empty blob is removed', () => {
- expect(
- mergeTranslationsIntoOverrides({
- existingOverrides: {
- translations: { 'fr-FR': { labelSingular: 'Entreprise' } },
- },
- translationEntries: [
- { locale: 'fr-FR', property: 'labelSingular', value: '' },
- ],
- }),
- ).toBeNull();
- });
-
- it('removing an absent entry is a no-op that still returns a copy', () => {
- expect(
- mergeTranslationsIntoOverrides({
- existingOverrides: null,
- translationEntries: [
- { locale: 'fr-FR', property: 'labelSingular', value: null },
- ],
- }),
- ).toBeNull();
- });
-
- it('does not mutate the existing overrides', () => {
- const existingOverrides = {
- translations: { 'fr-FR': { labelSingular: 'Entreprise' } },
- };
-
- mergeTranslationsIntoOverrides({
- existingOverrides,
- translationEntries: [
- { locale: 'fr-FR', property: 'labelSingular', value: 'Société' },
- { locale: 'it-IT', property: 'labelSingular', value: 'Azienda' },
- ],
- });
-
- expect(existingOverrides).toEqual({
- translations: { 'fr-FR': { labelSingular: 'Entreprise' } },
- });
- });
-});
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/__tests__/resolve-overridable-entity-property.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/utils/__tests__/resolve-overridable-entity-property.util.spec.ts
deleted file mode 100644
index 59a46b8c7e1..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/utils/__tests__/resolve-overridable-entity-property.util.spec.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { resolveOverridableEntityProperty } from 'src/engine/metadata-modules/utils/resolve-overridable-entity-property.util';
-
-type TestEntity = {
- title: string;
- position: number;
- icon: string | null;
- overrides?: Partial<TestEntity> | null;
-};
-
-describe('resolveOverridableEntityProperty', () => {
- it('should return override value when override exists for the property', () => {
- const entity: TestEntity = {
- title: 'Base Title',
- position: 0,
- icon: null,
- overrides: { title: 'Overridden Title' },
- };
-
- expect(resolveOverridableEntityProperty(entity, 'title')).toBe(
- 'Overridden Title',
- );
- });
-
- it('should return base value when overrides is null', () => {
- const entity: TestEntity = {
- title: 'Base Title',
- position: 0,
- icon: null,
- overrides: null,
- };
-
- expect(resolveOverridableEntityProperty(entity, 'title')).toBe(
- 'Base Title',
- );
- });
-
- it('should return base value when overrides exist but not for the requested property', () => {
- const entity: TestEntity = {
- title: 'Base Title',
- position: 0,
- icon: null,
- overrides: { position: 5 },
- };
-
- expect(resolveOverridableEntityProperty(entity, 'title')).toBe(
- 'Base Title',
- );
- });
-
- it('should return base value when overrides is undefined', () => {
- const entity: TestEntity = {
- title: 'Base Title',
- position: 0,
- icon: null,
- overrides: undefined,
- };
-
- expect(resolveOverridableEntityProperty(entity, 'title')).toBe(
- 'Base Title',
- );
- });
-
- it('should return null when override explicitly sets a nullable property to null', () => {
- const entity: TestEntity = {
- title: 'Base Title',
- position: 0,
- icon: 'IconStar',
- overrides: { icon: null },
- };
-
- expect(resolveOverridableEntityProperty(entity, 'icon')).toBeNull();
- });
-});
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/__tests__/sanitize-overridable-entity-input.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/utils/__tests__/sanitize-overridable-entity-input.util.spec.ts
deleted file mode 100644
index 2f1fe7b75a3..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/utils/__tests__/sanitize-overridable-entity-input.util.spec.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util';
-
-describe('sanitizeOverridableEntityInput', () => {
- describe('when shouldOverride is false', () => {
- it('should pass through properties unchanged and preserve existing overrides', () => {
- const existingOverrides = { title: 'Previous Override' };
- const result = sanitizeOverridableEntityInput({
- metadataName: 'pageLayoutTab',
- existingFlatEntity: {
- title: 'Base Title',
- position: 0,
- icon: null,
- overrides: existingOverrides,
- },
- updatedEditableProperties: { title: 'New Title' },
- shouldOverride: false,
- });
-
- expect(result.updatedEditableProperties).toEqual({ title: 'New Title' });
- expect(result.overrides).toBe(existingOverrides);
- });
- });
-
- describe('when shouldOverride is true', () => {
- it('should move overridable property to overrides and remove it from editableProperties', () => {
- const result = sanitizeOverridableEntityInput({
- metadataName: 'pageLayoutTab',
- existingFlatEntity: {
- title: 'Base Title',
- position: 0,
- icon: null,
- overrides: null,
- },
- updatedEditableProperties: { title: 'Overridden Title' },
- shouldOverride: true,
- });
-
- expect(result.overrides).toEqual({ title: 'Overridden Title' });
- expect(result.updatedEditableProperties).not.toHaveProperty('title');
- });
-
- it('should implicitly restore when new value matches base value by removing the key from overrides', () => {
- const result = sanitizeOverridableEntityInput({
- metadataName: 'pageLayoutTab',
- existingFlatEntity: {
- title: 'Base Title',
- position: 0,
- icon: null,
- overrides: { title: 'Old Override', position: 5 },
- },
- updatedEditableProperties: { title: 'Base Title' },
- shouldOverride: true,
- });
-
- expect(result.overrides).toEqual({ position: 5 });
- expect(result.updatedEditableProperties).not.toHaveProperty('title');
- });
-
- it('should return null overrides when removing the last override key', () => {
- const result = sanitizeOverridableEntityInput({
- metadataName: 'pageLayoutTab',
- existingFlatEntity: {
- title: 'Base Title',
- position: 0,
- icon: null,
- overrides: { title: 'Old Override' },
- },
- updatedEditableProperties: { title: 'Base Title' },
- shouldOverride: true,
- });
-
- expect(result.overrides).toBeNull();
- expect(result.updatedEditableProperties).not.toHaveProperty('title');
- });
-
- it('should not move non-overridable properties to overrides', () => {
- const result = sanitizeOverridableEntityInput({
- metadataName: 'pageLayoutTab',
- existingFlatEntity: {
- title: 'Base Title',
- position: 0,
- icon: null,
- pageLayoutId: 'layout-1',
- overrides: null,
- },
- updatedEditableProperties: {
- title: 'Overridden Title',
- pageLayoutId: 'layout-2',
- },
- shouldOverride: true,
- });
-
- expect(result.overrides).toEqual({ title: 'Overridden Title' });
- expect(result.updatedEditableProperties).toEqual({
- pageLayoutId: 'layout-2',
- });
- });
-
- it('should preserve existing override keys when updating a different overridable property', () => {
- const result = sanitizeOverridableEntityInput({
- metadataName: 'pageLayoutTab',
- existingFlatEntity: {
- title: 'Base Title',
- position: 0,
- icon: null,
- overrides: { title: 'Overridden Title' },
- },
- updatedEditableProperties: { position: 5 },
- shouldOverride: true,
- });
-
- expect(result.overrides).toEqual({
- title: 'Overridden Title',
- position: 5,
- });
- expect(result.updatedEditableProperties).not.toHaveProperty('position');
- });
-
- it('should create new overrides object when no existing overrides', () => {
- const result = sanitizeOverridableEntityInput({
- metadataName: 'pageLayoutTab',
- existingFlatEntity: {
- title: 'Base Title',
- position: 0,
- icon: null,
- overrides: null,
- },
- updatedEditableProperties: { icon: 'IconStar' },
- shouldOverride: true,
- });
-
- expect(result.overrides).toEqual({ icon: 'IconStar' });
- expect(result.updatedEditableProperties).not.toHaveProperty('icon');
- });
- });
-});
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/compute-metadata-overrides-blob.util.ts b/packages/twenty-server/src/engine/metadata-modules/utils/compute-metadata-overrides-blob.util.ts
deleted file mode 100644
index 996f190b9d8..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/utils/compute-metadata-overrides-blob.util.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { fastDeepEqual, isDefined } from 'twenty-shared/utils';
-
-type ComputeMetadataOverridesBlobArgs<
- TProperties extends object,
- TOverrides,
-> = {
- overridableProperties: readonly string[];
- updatedProperties: TProperties;
- existingEntity: object;
- existingOverrides: TOverrides | null;
-};
-
-export const computeMetadataOverridesBlob = <
- TProperties extends object,
- TOverrides = Record<string, unknown>,
->({
- overridableProperties,
- updatedProperties,
- existingEntity,
- existingOverrides,
-}: ComputeMetadataOverridesBlobArgs<TProperties, TOverrides>): {
- overrides: TOverrides | null;
- remainingProperties: TProperties;
-} => {
- const remainingRecord: Record<string, unknown> = {
- ...(updatedProperties as unknown as Record<string, unknown>),
- };
- const existingRecord = existingEntity as Record<string, unknown>;
-
- const overrides = overridableProperties.reduce<Record<
- string,
- unknown
- > | null>(
- (acc, property) => {
- if (remainingRecord[property] === undefined) {
- return acc;
- }
-
- const propertyValue = remainingRecord[property];
-
- delete remainingRecord[property];
-
- if (fastDeepEqual(propertyValue, existingRecord[property])) {
- if (
- isDefined(acc) &&
- Object.prototype.hasOwnProperty.call(acc, property)
- ) {
- const { [property]: _removedProperty, ...restOverrides } = acc;
-
- return restOverrides;
- }
-
- return acc;
- }
-
- return {
- ...acc,
- [property]: propertyValue,
- };
- },
- existingOverrides as unknown as Record<string, unknown> | null,
- );
-
- const remainingProperties = remainingRecord as unknown as TProperties;
-
- if (isDefined(overrides) && Object.keys(overrides).length === 0) {
- return { overrides: null, remainingProperties };
- }
-
- return {
- overrides: overrides as unknown as TOverrides | null,
- remainingProperties,
- };
-};
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/resolve-effective-entity.util.ts b/packages/twenty-server/src/engine/metadata-modules/utils/resolve-effective-entity.util.ts
deleted file mode 100644
index 617a84f1162..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/utils/resolve-effective-entity.util.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { isDefined } from 'twenty-shared/utils';
-
-type FlatEntityWithOverrides = {
- [key: string]: unknown;
- overrides: Record<string, unknown> | null;
-};
-
-export const resolveEffectiveEntity = <T extends FlatEntityWithOverrides>(
- flatEntity: T,
-): T => {
- if (!isDefined(flatEntity.overrides)) {
- return flatEntity;
- }
-
- return {
- ...flatEntity,
- ...flatEntity.overrides,
- };
-};
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/resolve-overridable-entity-property.util.ts b/packages/twenty-server/src/engine/metadata-modules/utils/resolve-overridable-entity-property.util.ts
deleted file mode 100644
index 2684c104b14..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/utils/resolve-overridable-entity-property.util.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export const resolveOverridableEntityProperty = <
- TEntity extends { overrides?: Partial<TEntity> | null },
- K extends string & keyof TEntity,
->(
- entity: TEntity,
- property: K,
-): TEntity[K] => {
- const overrideValue = entity.overrides?.[property];
-
- return overrideValue !== undefined ? overrideValue : entity[property];
-};
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util.ts b/packages/twenty-server/src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util.ts
deleted file mode 100644
index 2a5f080d57c..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { type AllMetadataName } from 'twenty-shared/metadata';
-
-import { ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-overridable-properties-by-metadata-name.constant';
-import { computeMetadataOverridesBlob } from 'src/engine/metadata-modules/utils/compute-metadata-overrides-blob.util';
-
-type FlatEntityWithOverrides<TOverrides> = {
- [key: string]: unknown;
- overrides: TOverrides | null;
-};
-
-export const sanitizeOverridableEntityInput = <
- T extends AllMetadataName,
- TProperties extends Record<string, unknown>,
- TOverrides = Record<string, unknown>,
->({
- metadataName,
- existingFlatEntity,
- updatedEditableProperties,
- shouldOverride,
-}: {
- metadataName: T;
- existingFlatEntity: FlatEntityWithOverrides<TOverrides>;
- updatedEditableProperties: TProperties;
- shouldOverride: boolean;
-}): {
- overrides: TOverrides | null;
- updatedEditableProperties: TProperties;
-} => {
- if (!shouldOverride) {
- return {
- overrides: existingFlatEntity.overrides,
- updatedEditableProperties,
- };
- }
-
- const { overrides, remainingProperties } = computeMetadataOverridesBlob<
- TProperties,
- TOverrides
- >({
- overridableProperties: ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME[
- metadataName
- ] as string[],
- updatedProperties: updatedEditableProperties,
- existingEntity: existingFlatEntity,
- existingOverrides: existingFlatEntity.overrides,
- });
-
- return { overrides, updatedEditableProperties: remainingProperties };
-};
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field-group/dtos/view-field-group.dto.ts b/packages/twenty-server/src/engine/metadata-modules/view-field-group/dtos/view-field-group.dto.ts
index 99ff19502ef..38afb551096 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field-group/dtos/view-field-group.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field-group/dtos/view-field-group.dto.ts
@@ -1,5 +1,6 @@
import { Field, HideField, ObjectType } from '@nestjs/graphql';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { type ViewFieldGroupOverrides } from 'src/engine/metadata-modules/view-field-group/entities/view-field-group.entity';
import { ViewFieldDTO } from 'src/engine/metadata-modules/view-field/dtos/view-field.dto';
@@ -49,5 +50,5 @@ export class ViewFieldGroupDTO {
isOverridden: boolean;
@HideField()
- overrides?: ViewFieldGroupOverrides | null;
+ overrides?: AuthoredOverrides<ViewFieldGroupOverrides> | null;
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field-group/entities/view-field-group.entity.ts b/packages/twenty-server/src/engine/metadata-modules/view-field-group/entities/view-field-group.entity.ts
index c8678238166..845958f681f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field-group/entities/view-field-group.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field-group/entities/view-field-group.entity.ts
@@ -19,6 +19,7 @@ import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entit
import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity';
export type ViewFieldGroupOverrides = {
+ isActive?: boolean;
name?: string;
position?: number;
isVisible?: boolean;
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field-group/resolvers/view-field-group.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/view-field-group/resolvers/view-field-group.resolver.ts
index e8bddde1176..61dfd883758 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field-group/resolvers/view-field-group.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field-group/resolvers/view-field-group.resolver.ts
@@ -26,7 +26,7 @@ import { UpsertFieldsWidgetInput } from 'src/engine/metadata-modules/view-field-
import { ViewFieldGroupDTO } from 'src/engine/metadata-modules/view-field-group/dtos/view-field-group.dto';
import { FieldsWidgetUpsertService } from 'src/engine/metadata-modules/view-field-group/services/fields-widget-upsert.service';
import { ViewFieldGroupService } from 'src/engine/metadata-modules/view-field-group/services/view-field-group.service';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
import { ViewFieldDTO } from 'src/engine/metadata-modules/view-field/dtos/view-field.dto';
import { ViewDTO } from 'src/engine/metadata-modules/view/dtos/view.dto';
import { type ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field-group/services/fields-widget-upsert.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-field-group/services/fields-widget-upsert.service.ts
index ab30b681f11..38053b6530f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field-group/services/fields-widget-upsert.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field-group/services/fields-widget-upsert.service.ts
@@ -13,6 +13,7 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadat
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
+import { resolveEffectiveFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity.util';
import { resolveEntityRelationUniversalIdentifiers } from 'src/engine/metadata-modules/flat-entity/utils/resolve-entity-relation-universal-identifiers.util';
import { splitEntitiesByRemovalStrategy } from 'src/engine/metadata-modules/flat-entity/utils/split-entities-by-removal-strategy.util';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
@@ -25,8 +26,8 @@ import { type FlatViewField } from 'src/engine/metadata-modules/flat-view-field/
import { fromViewFieldOverridesToUniversalOverrides } from 'src/engine/metadata-modules/flat-view-field/utils/from-view-field-overrides-to-universal-overrides.util';
import { type FlatViewMaps } from 'src/engine/metadata-modules/flat-view/types/flat-view-maps.type';
import { WidgetConfigurationType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-configuration-type.type';
-import { isCallerOverridingEntity } from 'src/engine/metadata-modules/utils/is-caller-overriding-entity.util';
-import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util';
+import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';
+import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/overrides/utils/sanitize-overridable-entity-input.util';
import { type UpsertFieldsWidgetFieldInput } from 'src/engine/metadata-modules/view-field-group/dtos/inputs/upsert-fields-widget-field.input';
import { UpsertFieldsWidgetGroupInput } from 'src/engine/metadata-modules/view-field-group/dtos/inputs/upsert-fields-widget-group.input';
import { UpsertFieldsWidgetInput } from 'src/engine/metadata-modules/view-field-group/dtos/inputs/upsert-fields-widget.input';
@@ -39,6 +40,7 @@ import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
@Injectable()
export class FieldsWidgetUpsertService {
@@ -143,13 +145,27 @@ export class FieldsWidgetUpsertService {
flatViewFieldGroupMaps.byUniversalIdentifier,
)
.filter(isDefined)
- .filter((group) => group.isActive && group.viewId === viewId);
+ .filter(
+ (group) =>
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'viewFieldGroup',
+ flatEntity: group,
+ property: 'isActive',
+ }) && group.viewId === viewId,
+ );
const existingViewFields = Object.values(
flatViewFieldMaps.byUniversalIdentifier,
)
.filter(isDefined)
- .filter((field) => field.isActive && field.viewId === viewId);
+ .filter(
+ (field) =>
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'viewField',
+ flatEntity: field,
+ property: 'isActive',
+ }) && field.viewId === viewId,
+ );
if (hasGroups) {
await this.upsertFieldsWidgetWithGroups({
@@ -263,6 +279,10 @@ export class FieldsWidgetUpsertService {
isVisible: inputGroup.isVisible,
},
shouldOverride,
+ callerApplicationUniversalIdentifier:
+ applicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ applicationUniversalIdentifier,
});
groupsToUpdate.push({
@@ -311,22 +331,15 @@ export class FieldsWidgetUpsertService {
const newViewFieldGroupId = inputGroup.id;
- const resolvedIsVisible = isDefined(existingField.overrides?.isVisible)
- ? existingField.overrides.isVisible
- : existingField.isVisible;
- const resolvedPosition = isDefined(existingField.overrides?.position)
- ? existingField.overrides.position
- : existingField.position;
- // null is a valid override value (meaning "ungrouped"), so use !== undefined
- const resolvedViewFieldGroupId =
- existingField.overrides?.viewFieldGroupId !== undefined
- ? existingField.overrides.viewFieldGroupId
- : existingField.viewFieldGroupId;
+ const effectiveExistingField = resolveEffectiveFlatEntity({
+ metadataName: 'viewField',
+ flatEntity: existingField,
+ });
const hasChanged =
- resolvedIsVisible !== inputField.isVisible ||
- resolvedPosition !== inputField.position ||
- resolvedViewFieldGroupId !== newViewFieldGroupId;
+ effectiveExistingField.isVisible !== inputField.isVisible ||
+ effectiveExistingField.position !== inputField.position ||
+ effectiveExistingField.viewFieldGroupId !== newViewFieldGroupId;
if (!hasChanged) {
return [];
@@ -363,6 +376,9 @@ export class FieldsWidgetUpsertService {
viewFieldGroupId: newViewFieldGroupId,
},
shouldOverride,
+ callerApplicationUniversalIdentifier: applicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ applicationUniversalIdentifier,
});
const updatedField: FlatViewField = {
@@ -450,6 +466,10 @@ export class FieldsWidgetUpsertService {
viewFieldGroupId: inputGroup.id,
},
shouldOverride,
+ callerApplicationUniversalIdentifier:
+ applicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ applicationUniversalIdentifier,
});
const updatedField: FlatViewField = {
@@ -545,6 +565,7 @@ export class FieldsWidgetUpsertService {
toHardDelete: customGroupsToDelete,
toDeactivate: deactivatedGroupUpdates,
} = splitEntitiesByRemovalStrategy({
+ metadataName: 'viewFieldGroup',
entitiesToRemove: groupsToDeactivate,
workspaceCustomApplicationUniversalIdentifier:
applicationUniversalIdentifier,
@@ -619,21 +640,15 @@ export class FieldsWidgetUpsertService {
return [];
}
- const resolvedIsVisible = isDefined(existingField.overrides?.isVisible)
- ? existingField.overrides.isVisible
- : existingField.isVisible;
- const resolvedPosition = isDefined(existingField.overrides?.position)
- ? existingField.overrides.position
- : existingField.position;
- const resolvedViewFieldGroupId =
- existingField.overrides?.viewFieldGroupId !== undefined
- ? existingField.overrides.viewFieldGroupId
- : existingField.viewFieldGroupId;
+ const effectiveExistingField = resolveEffectiveFlatEntity({
+ metadataName: 'viewField',
+ flatEntity: existingField,
+ });
const hasChanged =
- resolvedIsVisible !== inputField.isVisible ||
- resolvedPosition !== inputField.position ||
- resolvedViewFieldGroupId !== null;
+ effectiveExistingField.isVisible !== inputField.isVisible ||
+ effectiveExistingField.position !== inputField.position ||
+ effectiveExistingField.viewFieldGroupId !== null;
if (!hasChanged) {
return [];
@@ -658,6 +673,9 @@ export class FieldsWidgetUpsertService {
viewFieldGroupId: null as string | null,
},
shouldOverride,
+ callerApplicationUniversalIdentifier: applicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ applicationUniversalIdentifier,
});
const updatedField: FlatViewField = {
@@ -718,6 +736,10 @@ export class FieldsWidgetUpsertService {
viewFieldGroupId: null,
},
shouldOverride,
+ callerApplicationUniversalIdentifier:
+ applicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ applicationUniversalIdentifier,
});
const updatedField: FlatViewField = {
@@ -805,6 +827,7 @@ export class FieldsWidgetUpsertService {
toHardDelete: customGroupsToDelete,
toDeactivate: deactivatedGroupUpdates,
} = splitEntitiesByRemovalStrategy({
+ metadataName: 'viewFieldGroup',
entitiesToRemove: groupsToDeactivate,
workspaceCustomApplicationUniversalIdentifier:
applicationUniversalIdentifier,
@@ -890,20 +913,15 @@ export class FieldsWidgetUpsertService {
existing: FlatViewFieldGroup,
input: UpsertFieldsWidgetGroupInput,
): boolean {
- const resolvedName = isDefined(existing.overrides?.name)
- ? existing.overrides.name
- : existing.name;
- const resolvedPosition = isDefined(existing.overrides?.position)
- ? existing.overrides.position
- : existing.position;
- const resolvedIsVisible = isDefined(existing.overrides?.isVisible)
- ? existing.overrides.isVisible
- : existing.isVisible;
+ const effectiveExisting = resolveEffectiveFlatEntity({
+ metadataName: 'viewFieldGroup',
+ flatEntity: existing,
+ });
return (
- resolvedName !== input.name ||
- resolvedPosition !== input.position ||
- resolvedIsVisible !== input.isVisible
+ effectiveExisting.name !== input.name ||
+ effectiveExisting.position !== input.position ||
+ effectiveExisting.isVisible !== input.isVisible
);
}
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field-group/utils/from-flat-view-field-group-to-view-field-group-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/view-field-group/utils/from-flat-view-field-group-to-view-field-group-dto.util.ts
index 434c3656a6b..9884178218b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field-group/utils/from-flat-view-field-group-to-view-field-group-dto.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field-group/utils/from-flat-view-field-group-to-view-field-group-dto.util.ts
@@ -1,16 +1,19 @@
import { type FlatViewFieldGroup } from 'src/engine/metadata-modules/flat-view-field-group/types/flat-view-field-group.type';
import { type ViewFieldGroupDTO } from 'src/engine/metadata-modules/view-field-group/dtos/view-field-group.dto';
+import { resolveEffectiveFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity.util';
export const fromFlatViewFieldGroupToViewFieldGroupDto = (
flatViewFieldGroup: FlatViewFieldGroup,
): ViewFieldGroupDTO => {
- const { createdAt, updatedAt, deletedAt, overrides, ...rest } =
- flatViewFieldGroup;
+ const effectiveFlatViewFieldGroup = resolveEffectiveFlatEntity({
+ metadataName: 'viewFieldGroup',
+ flatEntity: flatViewFieldGroup,
+ });
+ const { createdAt, updatedAt, deletedAt, ...rest } =
+ effectiveFlatViewFieldGroup;
return {
...rest,
- ...(overrides ?? {}),
- overrides,
isOverridden: false,
createdAt: new Date(createdAt),
updatedAt: new Date(updatedAt),
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/dtos/view-field.dto.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/dtos/view-field.dto.ts
index 3ea27d8dd78..bd07d826e7c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field/dtos/view-field.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/dtos/view-field.dto.ts
@@ -6,6 +6,7 @@ import {
} from '@nestjs/graphql';
import { AggregateOperations } from 'twenty-shared/types';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { type ViewFieldOverrides } from 'src/engine/metadata-modules/view-field/entities/view-field.entity';
@@ -68,5 +69,5 @@ export class ViewFieldDTO {
isOverridden?: boolean;
@HideField()
- overrides?: ViewFieldOverrides | null;
+ overrides?: AuthoredOverrides<ViewFieldOverrides> | null;
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/entities/view-field.entity.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/entities/view-field.entity.ts
index ab9890cc7d1..aa62d7cce63 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field/entities/view-field.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/entities/view-field.entity.ts
@@ -23,6 +23,7 @@ import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entit
import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity';
export type ViewFieldOverrides = {
+ isActive?: boolean;
isVisible?: boolean;
size?: number;
position?: number;
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/utils/from-flat-view-field-to-view-field-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/utils/from-flat-view-field-to-view-field-dto.util.ts
index 3e22ccd4eeb..63d4192eb7a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field/utils/from-flat-view-field-to-view-field-dto.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/utils/from-flat-view-field-to-view-field-dto.util.ts
@@ -1,14 +1,24 @@
import { type FlatViewField } from 'src/engine/metadata-modules/flat-view-field/types/flat-view-field.type';
import { type ViewFieldDTO } from 'src/engine/metadata-modules/view-field/dtos/view-field.dto';
+import { resolveEffectiveFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity.util';
export const fromFlatViewFieldToViewFieldDto = (
flatViewField: FlatViewField,
): ViewFieldDTO => {
- const { createdAt, updatedAt, deletedAt, overrides, ...rest } = flatViewField;
+ const effectiveFlatViewField = resolveEffectiveFlatEntity({
+ metadataName: 'viewField',
+ flatEntity: flatViewField,
+ });
+ const {
+ createdAt,
+ updatedAt,
+ deletedAt,
+ overrides: _overrides,
+ ...rest
+ } = effectiveFlatViewField;
return {
...rest,
- ...(overrides ?? {}),
isOverridden: false,
createdAt: new Date(createdAt),
updatedAt: new Date(updatedAt),
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/dtos/view.dto.ts b/packages/twenty-server/src/engine/metadata-modules/view/dtos/view.dto.ts
index 5c798f9e069..217a4a78a7f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/dtos/view.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/dtos/view.dto.ts
@@ -14,6 +14,7 @@ import {
ViewKey,
} from 'twenty-shared/types';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { ViewFieldGroupDTO } from 'src/engine/metadata-modules/view-field-group/dtos/view-field-group.dto';
import { type ViewOverrides } from 'src/engine/metadata-modules/view/entities/view.entity';
@@ -144,5 +145,5 @@ export class ViewDTO {
isActive: boolean;
@HideField()
- overrides?: ViewOverrides | null;
+ overrides?: AuthoredOverrides<ViewOverrides> | null;
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.ts b/packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.ts
index e5857d74b53..fd50b77a5e1 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.ts
@@ -38,6 +38,7 @@ import { ViewSortEntity } from 'src/engine/metadata-modules/view-sort/entities/v
import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity';
export type ViewOverrides = {
+ isActive?: boolean;
name?: string;
type?: ViewType;
icon?: string;
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/services/view-widget-upsert.service.ts b/packages/twenty-server/src/engine/metadata-modules/view/services/view-widget-upsert.service.ts
index 70e454bd0cb..cec633c2a01 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/services/view-widget-upsert.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/services/view-widget-upsert.service.ts
@@ -16,6 +16,7 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadat
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
+import { resolveEffectiveFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity.util';
import { resolveEntityRelationUniversalIdentifiers } from 'src/engine/metadata-modules/flat-entity/utils/resolve-entity-relation-universal-identifiers.util';
import { splitEntitiesByRemovalStrategy } from 'src/engine/metadata-modules/flat-entity/utils/split-entities-by-removal-strategy.util';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
@@ -32,8 +33,8 @@ import { type FlatViewSort } from 'src/engine/metadata-modules/flat-view-sort/ty
import { type FlatViewMaps } from 'src/engine/metadata-modules/flat-view/types/flat-view-maps.type';
import { fromUpdateViewInputToFlatViewToUpdateOrThrow } from 'src/engine/metadata-modules/flat-view/utils/from-update-view-input-to-flat-view-to-update-or-throw.util';
import { WidgetConfigurationType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-configuration-type.type';
-import { isCallerOverridingEntity } from 'src/engine/metadata-modules/utils/is-caller-overriding-entity.util';
-import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util';
+import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';
+import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/overrides/utils/sanitize-overridable-entity-input.util';
import { type UpsertViewWidgetViewFieldInput } from 'src/engine/metadata-modules/view/dtos/inputs/upsert-view-widget-view-field.input';
import { type UpsertViewWidgetViewFilterGroupInput } from 'src/engine/metadata-modules/view/dtos/inputs/upsert-view-widget-view-filter-group.input';
import { type UpsertViewWidgetViewFilterInput } from 'src/engine/metadata-modules/view/dtos/inputs/upsert-view-widget-view-filter.input';
@@ -48,6 +49,7 @@ import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
const EMPTY_FIELD_OPS = {
fieldsToCreate: [] as FlatViewField[],
@@ -235,7 +237,14 @@ export class ViewWidgetUpsertService {
flatViewFieldMaps.byUniversalIdentifier,
)
.filter(isDefined)
- .filter((field) => field.isActive && field.viewId === viewId);
+ .filter(
+ (field) =>
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'viewField',
+ flatEntity: field,
+ property: 'isActive',
+ }) && field.viewId === viewId,
+ );
const existingViewFilters = Object.values(
flatViewFilterMaps.byUniversalIdentifier,
@@ -326,6 +335,7 @@ export class ViewWidgetUpsertService {
toHardDelete: filterGroupsToDelete,
toDeactivate: filterGroupsToDeactivate,
} = splitEntitiesByRemovalStrategy({
+ metadataName: 'viewFilterGroup',
entitiesToRemove: viewFilterGroupOperations.filterGroupsToRemove,
workspaceCustomApplicationUniversalIdentifier:
upsertContext.applicationUniversalIdentifier,
@@ -334,6 +344,7 @@ export class ViewWidgetUpsertService {
const { toHardDelete: filtersToDelete, toDeactivate: filtersToDeactivate } =
splitEntitiesByRemovalStrategy({
+ metadataName: 'viewFilter',
entitiesToRemove: viewFilterOperations.filtersToRemove,
workspaceCustomApplicationUniversalIdentifier:
upsertContext.applicationUniversalIdentifier,
@@ -342,6 +353,7 @@ export class ViewWidgetUpsertService {
const { toHardDelete: sortsToDelete, toDeactivate: sortsToDeactivate } =
splitEntitiesByRemovalStrategy({
+ metadataName: 'viewSort',
entitiesToRemove: viewSortOperations.sortsToRemove,
workspaceCustomApplicationUniversalIdentifier:
upsertContext.applicationUniversalIdentifier,
@@ -474,26 +486,19 @@ export class ViewWidgetUpsertService {
existingFieldByViewFieldId ?? existingFieldByFieldMetadataId;
if (isDefined(existingField)) {
- const resolvedIsVisible = isDefined(existingField.overrides?.isVisible)
- ? existingField.overrides.isVisible
- : existingField.isVisible;
- const resolvedPosition = isDefined(existingField.overrides?.position)
- ? existingField.overrides.position
- : existingField.position;
- const resolvedSize = isDefined(existingField.overrides?.size)
- ? existingField.overrides.size
- : existingField.size;
- const resolvedAggregateOperation =
- existingField.overrides?.aggregateOperation !== undefined
- ? existingField.overrides.aggregateOperation
- : existingField.aggregateOperation;
+ const effectiveExistingField = resolveEffectiveFlatEntity({
+ metadataName: 'viewField',
+ flatEntity: existingField,
+ });
const hasChanged =
- resolvedIsVisible !== inputField.isVisible ||
- resolvedPosition !== inputField.position ||
- (isDefined(inputField.size) && resolvedSize !== inputField.size) ||
+ effectiveExistingField.isVisible !== inputField.isVisible ||
+ effectiveExistingField.position !== inputField.position ||
+ (isDefined(inputField.size) &&
+ effectiveExistingField.size !== inputField.size) ||
(inputField.aggregateOperation !== undefined &&
- resolvedAggregateOperation !== inputField.aggregateOperation);
+ effectiveExistingField.aggregateOperation !==
+ inputField.aggregateOperation);
if (!hasChanged) {
continue;
@@ -521,6 +526,10 @@ export class ViewWidgetUpsertService {
: {}),
},
shouldOverride,
+ callerApplicationUniversalIdentifier:
+ applicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ applicationUniversalIdentifier,
});
const updatedField: FlatViewField = {
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts b/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts
index a50dfa7f5ab..eb6bc52965b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts
@@ -14,7 +14,7 @@ import { fromCreateViewInputToFlatViewToCreate } from 'src/engine/metadata-modul
import { fromDeleteViewInputToFlatViewOrThrow } from 'src/engine/metadata-modules/flat-view/utils/from-delete-view-input-to-flat-view-or-throw.util';
import { fromDestroyViewInputToFlatViewOrThrow } from 'src/engine/metadata-modules/flat-view/utils/from-destroy-view-input-to-flat-view-or-throw.util';
import { fromUpdateViewInputToFlatViewToUpdateOrThrow } from 'src/engine/metadata-modules/flat-view/utils/from-update-view-input-to-flat-view-to-update-or-throw.util';
-import { isCallerOverridingEntity } from 'src/engine/metadata-modules/utils/is-caller-overriding-entity.util';
+import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';
import { fromFlatViewFieldGroupToViewFieldGroupDto } from 'src/engine/metadata-modules/view-field-group/utils/from-flat-view-field-group-to-view-field-group-dto.util';
import { fromFlatViewFieldToViewFieldDto } from 'src/engine/metadata-modules/view-field/utils/from-flat-view-field-to-view-field-dto.util';
import { fromFlatViewFilterGroupToViewFilterGroupDto } from 'src/engine/metadata-modules/view-filter-group/utils/from-flat-view-filter-group-to-view-filter-group-dto.util';
@@ -35,6 +35,7 @@ import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
+import { dispatchIsActiveUpdateToAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/dispatch-is-active-update-to-authored-override.util';
@Injectable()
export class ViewService {
@@ -332,6 +333,18 @@ export class ViewService {
});
const now = new Date().toISOString();
+ const deactivatedFlatView = {
+ ...dispatchIsActiveUpdateToAuthoredOverride({
+ metadataName: 'view',
+ flatEntity: existingFlatView,
+ isActive: false,
+ authorUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ }),
+ updatedAt: now,
+ };
const validateAndBuildResult =
await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
@@ -342,9 +355,7 @@ export class ViewService {
flatEntityToDelete: shouldDeactivate
? []
: [flatViewFromDestroyInput],
- flatEntityToUpdate: shouldDeactivate
- ? [{ ...existingFlatView, isActive: false, updatedAt: now }]
- : [],
+ flatEntityToUpdate: shouldDeactivate ? [deactivatedFlatView] : [],
},
},
workspaceId,
@@ -362,11 +373,7 @@ export class ViewService {
}
if (shouldDeactivate) {
- return fromFlatViewToViewDto({
- ...existingFlatView,
- isActive: false,
- updatedAt: now,
- });
+ return fromFlatViewToViewDto(deactivatedFlatView);
}
return fromFlatViewToViewDto({
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/utils/__tests__/build-view-name-object-labels.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/view/utils/__tests__/build-view-name-object-labels.util.spec.ts
index a9ca53318ae..c1a4883fa2c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/utils/__tests__/build-view-name-object-labels.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/utils/__tests__/build-view-name-object-labels.util.spec.ts
@@ -9,6 +9,9 @@ const i18nContext = {
locale: 'fr-FR' as const,
i18nInstance: { _: (id: string) => id },
isStandardApp: true,
+ workspaceCustomApplicationUniversalIdentifier:
+ 'workspace-custom-application-universal-identifier',
+ ownerApplicationUniversalIdentifier: undefined,
};
describe('buildViewNameObjectLabels', () => {
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/utils/__tests__/resolve-view-name.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/view/utils/__tests__/resolve-view-name.util.spec.ts
index da592583f5b..f779a978dff 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/utils/__tests__/resolve-view-name.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/utils/__tests__/resolve-view-name.util.spec.ts
@@ -2,6 +2,9 @@ import { buildObjectMetadataLabelPlaceholderValues } from 'twenty-shared/i18n';
import { resolveViewName } from 'src/engine/metadata-modules/view/utils/resolve-view-name.util';
+const WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER =
+ '20202020-aaaa-4aaa-8aaa-000000000001';
+
const mockI18n = {
_: (id: string) => (id === 'known-id' ? 'Toutes les entreprises' : id),
};
@@ -17,6 +20,9 @@ const buildContext = ({
i18nInstance: mockI18n,
isStandardApp,
applicationCatalog,
+ workspaceCustomApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ ownerApplicationUniversalIdentifier: undefined,
});
describe('resolveViewName', () => {
@@ -79,7 +85,14 @@ describe('resolveViewName', () => {
it('prefers a workspace override over the catalog', () => {
expect(
resolveViewName({
- view: { name: 'Renamed', overrides: { name: 'Renamed' } },
+ view: {
+ name: 'Renamed',
+ overrides: {
+ [WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER]: {
+ name: 'Renamed',
+ },
+ },
+ },
i18nContext: buildContext(),
}),
).toBe('Renamed');
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/utils/build-view-name-object-labels.util.ts b/packages/twenty-server/src/engine/metadata-modules/view/utils/build-view-name-object-labels.util.ts
index 766a61b82eb..67e935a7033 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/utils/build-view-name-object-labels.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/utils/build-view-name-object-labels.util.ts
@@ -5,13 +5,14 @@ import {
} from 'twenty-shared/i18n';
import { type ObjectMetadataOverrides } from 'src/engine/metadata-modules/object-metadata/types/object-metadata-overrides.type';
-import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/utils/effective-entity-i18n-context.type';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
type ViewNameObjectMetadata = {
labelSingular: string;
labelPlural: string;
- overrides?: ObjectMetadataOverrides | null;
+ overrides?: AuthoredOverrides<ObjectMetadataOverrides> | null;
};
// Each placeholder resolved costs a catalog lookup, so only the ones the name
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/utils/from-flat-view-to-view-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/view/utils/from-flat-view-to-view-dto.util.ts
index 9e73386e2fc..604dbf34097 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/utils/from-flat-view-to-view-dto.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/utils/from-flat-view-to-view-dto.util.ts
@@ -1,12 +1,22 @@
import { type FlatView } from 'src/engine/metadata-modules/flat-view/types/flat-view.type';
import { type ViewDTO } from 'src/engine/metadata-modules/view/dtos/view.dto';
+import { resolveEffectiveFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity.util';
export const fromFlatViewToViewDto = (flatView: FlatView): ViewDTO => {
- const { createdAt, updatedAt, deletedAt, overrides, ...rest } = flatView;
+ const effectiveFlatView = resolveEffectiveFlatEntity({
+ metadataName: 'view',
+ flatEntity: flatView,
+ });
+ const {
+ createdAt,
+ updatedAt,
+ deletedAt,
+ overrides: _overrides,
+ ...rest
+ } = effectiveFlatView;
return {
...rest,
- ...(overrides ?? {}),
createdAt: new Date(createdAt),
updatedAt: new Date(updatedAt),
deletedAt: deletedAt ? new Date(deletedAt) : null,
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/utils/resolve-view-name.util.ts b/packages/twenty-server/src/engine/metadata-modules/view/utils/resolve-view-name.util.ts
index 3ddd89126c3..59aed56da32 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/utils/resolve-view-name.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/utils/resolve-view-name.util.ts
@@ -4,8 +4,9 @@ import {
} from 'twenty-shared/i18n';
import { type ViewOverrides } from 'src/engine/metadata-modules/view/entities/view.entity';
-import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/utils/effective-entity-i18n-context.type';
-import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
export const resolveViewName = ({
view,
@@ -14,7 +15,7 @@ export const resolveViewName = ({
}: {
view: {
name: string;
- overrides?: ViewOverrides | null;
+ overrides?: AuthoredOverrides<ViewOverrides> | null;
};
objectLabelPlaceholderValues?: MetadataLabelPlaceholderValues;
i18nContext: EffectiveEntityI18nContext;
diff --git a/packages/twenty-server/src/engine/subscriptions/metadata-event/services/metadata-event-resolution.service.ts b/packages/twenty-server/src/engine/subscriptions/metadata-event/services/metadata-event-resolution.service.ts
index e7f89bc3f96..188edbf1b18 100644
--- a/packages/twenty-server/src/engine/subscriptions/metadata-event/services/metadata-event-resolution.service.ts
+++ b/packages/twenty-server/src/engine/subscriptions/metadata-event/services/metadata-event-resolution.service.ts
@@ -1,12 +1,10 @@
import { Injectable } from '@nestjs/common';
-import { type APP_LOCALES, SOURCE_LOCALE } from 'twenty-shared/translations';
+import { type APP_LOCALES } from 'twenty-shared/translations';
import { isDefined } from 'twenty-shared/utils';
-import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
-import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/utils/effective-entity-i18n-context.type';
import { interpolateNavigationCommandMenuItemEvent } from 'src/engine/subscriptions/metadata-event/utils/interpolate-navigation-command-menu-item-event.util';
import { isTranslatableMetadataName } from 'src/engine/subscriptions/metadata-event/utils/is-translatable-metadata-name.util';
import { resolveMetadataEventRecord } from 'src/engine/subscriptions/metadata-event/utils/resolve-metadata-event-record.util';
@@ -23,15 +21,9 @@ const recordCarriesOverrides = (
record: EventStreamMetadataEvent['properties'][(typeof RECORD_KEYS)[number]],
): boolean => isDefined(record) && isDefined(record.overrides);
-const EMPTY_CATALOGS = {
- standardApplicationId: undefined,
- catalogByApplicationId: new Map<string, never>(),
-};
-
@Injectable()
export class MetadataEventResolutionService {
constructor(
- private readonly i18nService: I18nService,
private readonly applicationTranslationCatalogService: ApplicationTranslationCatalogService,
private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
) {}
@@ -59,33 +51,18 @@ export class MetadataEventResolutionService {
return metadataEvents;
}
- const safeLocale = locale ?? SOURCE_LOCALE;
-
- const { standardApplicationId, catalogByApplicationId } =
- translatableEvents.length > 0
- ? await this.applicationTranslationCatalogService.getCatalogs({
- applicationIds: translatableEvents.flatMap((metadataEvent) =>
- RECORD_KEYS.map((key) =>
- readRecordApplicationId(metadataEvent.properties[key]),
- ),
+ const buildI18nContext =
+ await this.applicationTranslationCatalogService.getI18nContextByApplicationId(
+ {
+ applicationIds: translatableEvents.flatMap((metadataEvent) =>
+ RECORD_KEYS.map((key) =>
+ readRecordApplicationId(metadataEvent.properties[key]),
),
- locale: safeLocale,
- workspaceId,
- })
- : EMPTY_CATALOGS;
-
- const i18nInstance = this.i18nService.getI18nInstance(safeLocale);
-
- const buildI18nContext = (
- applicationId: string | undefined,
- ): EffectiveEntityI18nContext => ({
- locale,
- i18nInstance,
- isStandardApp: applicationId === standardApplicationId,
- applicationCatalog: isDefined(applicationId)
- ? catalogByApplicationId.get(applicationId)
- : undefined,
- });
+ ),
+ locale,
+ workspaceId,
+ },
+ );
const flatObjectMetadataMaps = metadataEvents.some(
(metadataEvent) => metadataEvent.metadataName === 'commandMenuItem',
diff --git a/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/__tests__/interpolate-navigation-command-menu-item-event.util.spec.ts b/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/__tests__/interpolate-navigation-command-menu-item-event.util.spec.ts
index e3901ecaff5..c5e5e3ef74f 100644
--- a/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/__tests__/interpolate-navigation-command-menu-item-event.util.spec.ts
+++ b/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/__tests__/interpolate-navigation-command-menu-item-event.util.spec.ts
@@ -1,4 +1,4 @@
-import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/utils/effective-entity-i18n-context.type';
+import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type';
import { SOURCE_LOCALE } from 'twenty-shared/translations';
import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
@@ -67,6 +67,10 @@ const buildStandardI18nContext = (): EffectiveEntityI18nContext => ({
i18nInstance: mockI18nInstance,
isStandardApp: true,
applicationCatalog: undefined,
+ workspaceCustomApplicationUniversalIdentifier:
+ 'workspace-custom-application-universal-identifier',
+ ownerApplicationUniversalIdentifier:
+ TWENTY_STANDARD_APPLICATION.universalIdentifier,
});
describe('interpolateNavigationCommandMenuItemEvent', () => {
diff --git a/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/__tests__/resolve-metadata-event-record.util.spec.ts b/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/__tests__/resolve-metadata-event-record.util.spec.ts
index f6af8a39a47..c4421914ec6 100644
--- a/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/__tests__/resolve-metadata-event-record.util.spec.ts
+++ b/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/__tests__/resolve-metadata-event-record.util.spec.ts
@@ -1,6 +1,6 @@
import { SOURCE_LOCALE } from 'twenty-shared/translations';
-import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/utils/effective-entity-i18n-context.type';
+import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type';
import { resolveMetadataEventRecord } from 'src/engine/subscriptions/metadata-event/utils/resolve-metadata-event-record.util';
const buildI18nContext = (
@@ -10,6 +10,9 @@ const buildI18nContext = (
i18nInstance: { _: (messageId: string) => `translated:${messageId}` },
isStandardApp: true,
applicationCatalog: undefined,
+ workspaceCustomApplicationUniversalIdentifier:
+ 'workspace-custom-application-universal-identifier',
+ ownerApplicationUniversalIdentifier: undefined,
...overrides,
});
diff --git a/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/interpolate-navigation-command-menu-item-event.util.ts b/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/interpolate-navigation-command-menu-item-event.util.ts
index 59cbfd30a0e..c9fbb1a5592 100644
--- a/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/interpolate-navigation-command-menu-item-event.util.ts
+++ b/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/interpolate-navigation-command-menu-item-event.util.ts
@@ -7,7 +7,7 @@ import { buildNavigationPlaceholderValues } from 'src/engine/metadata-modules/co
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/utils/effective-entity-i18n-context.type';
+import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type';
type InterpolatableCommandMenuItemRecord = Record<string, unknown> & {
engineComponentKey?: unknown;
diff --git a/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/resolve-metadata-event-record.util.ts b/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/resolve-metadata-event-record.util.ts
index 45aac325406..877b5c2a638 100644
--- a/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/resolve-metadata-event-record.util.ts
+++ b/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/resolve-metadata-event-record.util.ts
@@ -1,9 +1,11 @@
import { isNonEmptyString } from '@sniptt/guards';
import { TRANSLATABLE_PROPERTIES_BY_METADATA_NAME } from 'twenty-shared/i18n';
-import { isDefined } from 'twenty-shared/utils';
+import { type AllMetadataName } from 'twenty-shared/metadata';
-import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/utils/effective-entity-i18n-context.type';
-import { resolveEffectiveEntityPropertyByName } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/overrides/constants/all-overridable-properties-by-metadata-name.constant';
+import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/overrides/types/effective-entity-i18n-context.type';
+import { resolveEffectiveEntityPropertyByName } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
+import { readAuthoredOverrideProperty } from 'src/engine/metadata-modules/overrides/utils/read-authored-override-property.util';
import { isTranslatableMetadataName } from 'src/engine/subscriptions/metadata-event/utils/is-translatable-metadata-name.util';
const TRANSLATIONS_OVERRIDE_KEY = 'translations';
@@ -19,18 +21,21 @@ export const resolveMetadataEventRecord = ({
}): Record<string, unknown> => {
const { overrides, ...baseRecord } = record;
- const overrideRecord = (overrides ?? {}) as Record<string, unknown>;
const translatable = isTranslatableMetadataName(metadataName);
const translatableProperties = new Set<string>(
translatable ? TRANSLATABLE_PROPERTIES_BY_METADATA_NAME[metadataName] : [],
);
+ const overridableProperties: readonly string[] =
+ ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME[
+ metadataName as AllMetadataName
+ ] ?? [];
const resolved: Record<string, unknown> = { ...baseRecord };
// Overridable-but-not-translatable properties are not all strings --
// pageLayoutTab.position is a number, commandMenuItem.isPinned a boolean --
// so they pass through as they are rather than through the resolver.
- for (const [property, overrideValue] of Object.entries(overrideRecord)) {
+ for (const property of overridableProperties) {
if (
property === TRANSLATIONS_OVERRIDE_KEY ||
translatableProperties.has(property)
@@ -38,7 +43,16 @@ export const resolveMetadataEventRecord = ({
continue;
}
- resolved[property] = overrideValue;
+ const overrideValue = readAuthoredOverrideProperty({
+ metadataName: metadataName as AllMetadataName,
+ overrides,
+ path: [property],
+ authorContext: i18nContext,
+ });
+
+ if (overrideValue !== undefined) {
+ resolved[property] = overrideValue;
+ }
}
if (!translatable) {
@@ -46,25 +60,17 @@ export const resolveMetadataEventRecord = ({
}
for (const property of translatableProperties) {
- const baseValue = baseRecord[property];
-
- // An override with no base value still has to win, so absence of a base is
- // not on its own a reason to skip.
- if (
- !isNonEmptyString(baseValue) &&
- !isDefined(overrideRecord[property]) &&
- !isDefined(overrideRecord[TRANSLATIONS_OVERRIDE_KEY])
- ) {
- continue;
- }
-
- resolved[property] = resolveEffectiveEntityPropertyByName({
+ const effectiveValue = resolveEffectiveEntityPropertyByName({
metadataName,
- baseValue,
+ baseValue: baseRecord[property],
overrides,
property,
i18nContext,
});
+
+ if (isNonEmptyString(effectiveValue)) {
+ resolved[property] = effectiveValue;
+ }
}
return resolved;
diff --git a/packages/twenty-server/src/engine/workspace-manager/types/overridable-entity.ts b/packages/twenty-server/src/engine/workspace-manager/types/overridable-entity.ts
index b0ccdf25132..f922ce94998 100644
--- a/packages/twenty-server/src/engine/workspace-manager/types/overridable-entity.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/types/overridable-entity.ts
@@ -1,5 +1,6 @@
import { Column } from 'typeorm';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-entity.interface';
import { type JsonbProperty } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/jsonb-property.type';
@@ -7,7 +8,7 @@ export abstract class OverridableEntity<
TOverrides = Record<string, unknown>,
> extends SyncableEntity {
@Column({ type: 'jsonb', nullable: true })
- overrides: JsonbProperty<TOverrides> | null;
+ overrides: JsonbProperty<AuthoredOverrides<TOverrides>> | null;
@Column({ type: 'boolean', default: true })
isActive: boolean;
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-field-metadata-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-field-metadata-validator.service.ts
index 9353a6908b6..226fed1bfd6 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-field-metadata-validator.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-field-metadata-validator.service.ts
@@ -21,6 +21,8 @@ import { FailedFlatEntityValidation } from 'src/engine/workspace-manager/workspa
import { getEmptyFlatEntityValidationError } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/utils/get-flat-entity-validation-error.util';
import { FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type';
import { UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
+import { readAuthoredOverrideEntry } from 'src/engine/metadata-modules/overrides/utils/read-authored-override-entry.util';
@Injectable()
export class FlatFieldMetadataValidatorService {
@@ -86,13 +88,36 @@ export class FlatFieldMetadataValidatorService {
!buildOptions.isSystemBuild &&
existingFlatFieldMetadataToUpdate.isSystem
) {
- const disallowedProperties = Object.keys(flatEntityUpdate).filter(
+ const { overrides: updatedOverrides, ...columnUpdate } = flatEntityUpdate;
+
+ const disallowedColumnProperties = Object.keys(columnUpdate).filter(
(property) =>
!SYSTEM_FIELD_ALLOWED_UPDATE_PROPERTIES.includes(
property as (typeof SYSTEM_FIELD_ALLOWED_UPDATE_PROPERTIES)[number],
),
);
+ const callerEntry = isDefined(updatedOverrides)
+ ? readAuthoredOverrideEntry<Record<string, unknown>>({
+ metadataName: 'fieldMetadata',
+ overrides: updatedOverrides,
+ authorUniversalIdentifier:
+ buildOptions.applicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ buildOptions.applicationUniversalIdentifier,
+ })
+ : undefined;
+ const disallowedOverriddenProperties = Object.keys(
+ callerEntry ?? {},
+ ).filter((property) => property !== 'isActive');
+
+ const disallowedProperties = [
+ ...new Set([
+ ...disallowedColumnProperties,
+ ...disallowedOverriddenProperties,
+ ]),
+ ];
+
if (disallowedProperties.length > 0) {
validationResult.errors.push({
code: FieldMetadataExceptionCode.FIELD_MUTATION_NOT_ALLOWED,
@@ -131,8 +156,13 @@ export class FlatFieldMetadataValidatorService {
} else if (
flatObjectMetadata.labelIdentifierFieldMetadataUniversalIdentifier ===
flatFieldMetadataToValidate.universalIdentifier &&
- isDefined(flatEntityUpdate.isActive) &&
- flatFieldMetadataToValidate.isActive === false
+ (isDefined(flatEntityUpdate.isActive) ||
+ isDefined(flatEntityUpdate.overrides)) &&
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'fieldMetadata',
+ flatEntity: flatFieldMetadataToValidate,
+ property: 'isActive',
+ }) === false
) {
validationResult.errors.push({
code: FieldMetadataExceptionCode.LABEL_IDENTIFIER_FIELD_METADATA_ID_NOT_FOUND,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-page-layout-widget-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-page-layout-widget-validator.service.ts
index 59b4bffb988..89eebff4399 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-page-layout-widget-validator.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-page-layout-widget-validator.service.ts
@@ -15,7 +15,7 @@ import { PageLayoutTabExceptionCode } from 'src/engine/metadata-modules/page-lay
import { PageLayoutWidgetExceptionCode } from 'src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception';
import { validatePageLayoutWidgetGridPosition } from 'src/engine/metadata-modules/page-layout-widget/utils/validate-page-layout-widget-grid-position.util';
import { validatePageLayoutWidgetVerticalListPosition } from 'src/engine/metadata-modules/page-layout-widget/utils/validate-page-layout-widget-vertical-list-position.util';
-import { resolveEffectiveEntity } from 'src/engine/metadata-modules/utils/resolve-effective-entity.util';
+import { resolveEffectiveUniversalFlatEntity } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-universal-flat-entity.util';
import { type UniversalFlatPageLayoutTab } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-page-layout-tab.type';
import { type UniversalFlatPageLayoutWidget } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-page-layout-widget.type';
import {
@@ -282,9 +282,9 @@ export class FlatPageLayoutWidgetValidatorService {
private getEffectiveWidget(
widget: UniversalFlatPageLayoutWidget,
): EffectivePageLayoutWidget {
- return resolveEffectiveEntity({
- ...widget,
- overrides: widget.universalOverrides,
+ return resolveEffectiveUniversalFlatEntity({
+ metadataName: 'pageLayoutWidget',
+ universalFlatEntity: widget,
});
}
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/command-menu-item/services/utils/from-universal-overrides-to-command-menu-item-overrides.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/command-menu-item/services/utils/from-universal-overrides-to-command-menu-item-overrides.util.ts
index 43cc309f215..9ab9a1721f4 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/command-menu-item/services/utils/from-universal-overrides-to-command-menu-item-overrides.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/command-menu-item/services/utils/from-universal-overrides-to-command-menu-item-overrides.util.ts
@@ -5,11 +5,13 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typ
import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type FlatPageLayout } from 'src/engine/metadata-modules/flat-page-layout/types/flat-page-layout.type';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
+import { mapAuthoredOverrideEntries } from 'src/engine/metadata-modules/overrides/utils/map-authored-override-entries.util';
type UniversalCommandMenuItemOverrides =
FormatRecordSerializedRelationProperties<CommandMenuItemOverrides>;
-export const fromUniversalOverridesToCommandMenuItemOverrides = ({
+const fromUniversalOverridesToCommandMenuItemOverridesEntry = ({
universalOverrides,
flatObjectMetadataMaps,
flatPageLayoutMaps,
@@ -56,3 +58,23 @@ export const fromUniversalOverridesToCommandMenuItemOverrides = ({
return overrides;
};
+
+export const fromUniversalOverridesToCommandMenuItemOverrides = ({
+ universalOverrides,
+ flatObjectMetadataMaps,
+ flatPageLayoutMaps,
+}: {
+ universalOverrides: AuthoredOverrides<UniversalCommandMenuItemOverrides>;
+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
+ flatPageLayoutMaps: FlatEntityMaps<FlatPageLayout>;
+}): AuthoredOverrides<CommandMenuItemOverrides> =>
+ mapAuthoredOverrideEntries({
+ metadataName: 'commandMenuItem',
+ overrides: universalOverrides,
+ mapEntry: (entry) =>
+ fromUniversalOverridesToCommandMenuItemOverridesEntry({
+ universalOverrides: entry,
+ flatObjectMetadataMaps,
+ flatPageLayoutMaps,
+ }),
+ });
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/utils/from-universal-overrides-to-page-layout-widget-overrides.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/utils/from-universal-overrides-to-page-layout-widget-overrides.util.ts
index 648899b0088..286febb2dbf 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/utils/from-universal-overrides-to-page-layout-widget-overrides.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/utils/from-universal-overrides-to-page-layout-widget-overrides.util.ts
@@ -5,11 +5,13 @@ import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-
import { type FlatPageLayoutTabMaps } from 'src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab-maps.type';
import { type FlatPageLayoutTab } from 'src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab.type';
import { type PageLayoutWidgetOverrides } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
+import { mapAuthoredOverrideEntries } from 'src/engine/metadata-modules/overrides/utils/map-authored-override-entries.util';
type UniversalPageLayoutWidgetOverrides =
FormatRecordSerializedRelationProperties<PageLayoutWidgetOverrides>;
-export const fromUniversalOverridesToPageLayoutWidgetOverrides = ({
+const fromUniversalOverridesToPageLayoutWidgetOverridesEntry = ({
universalOverrides,
flatPageLayoutTabMaps,
}: {
@@ -37,3 +39,20 @@ export const fromUniversalOverridesToPageLayoutWidgetOverrides = ({
flatPageLayoutTab.id as PageLayoutWidgetOverrides['pageLayoutTabId'],
};
};
+
+export const fromUniversalOverridesToPageLayoutWidgetOverrides = ({
+ universalOverrides,
+ flatPageLayoutTabMaps,
+}: {
+ universalOverrides: AuthoredOverrides<UniversalPageLayoutWidgetOverrides>;
+ flatPageLayoutTabMaps: FlatPageLayoutTabMaps;
+}): AuthoredOverrides<PageLayoutWidgetOverrides> =>
+ mapAuthoredOverrideEntries({
+ metadataName: 'pageLayoutWidget',
+ overrides: universalOverrides,
+ mapEntry: (entry) =>
+ fromUniversalOverridesToPageLayoutWidgetOverridesEntry({
+ universalOverrides: entry,
+ flatPageLayoutTabMaps,
+ }),
+ });
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view-field/services/utils/from-universal-overrides-to-view-field-overrides.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view-field/services/utils/from-universal-overrides-to-view-field-overrides.util.ts
index 5ae4f6b7f35..bf56c6b4059 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view-field/services/utils/from-universal-overrides-to-view-field-overrides.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view-field/services/utils/from-universal-overrides-to-view-field-overrides.util.ts
@@ -5,11 +5,13 @@ import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules
import { type FlatViewFieldGroupMaps } from 'src/engine/metadata-modules/flat-view-field-group/types/flat-view-field-group-maps.type';
import { type FlatViewFieldGroup } from 'src/engine/metadata-modules/flat-view-field-group/types/flat-view-field-group.type';
import { type ViewFieldOverrides } from 'src/engine/metadata-modules/view-field/entities/view-field.entity';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
+import { mapAuthoredOverrideEntries } from 'src/engine/metadata-modules/overrides/utils/map-authored-override-entries.util';
type UniversalViewFieldOverrides =
FormatRecordSerializedRelationProperties<ViewFieldOverrides>;
-export const fromUniversalOverridesToViewFieldOverrides = ({
+const fromUniversalOverridesToViewFieldOverridesEntry = ({
universalOverrides,
flatViewFieldGroupMaps,
}: {
@@ -39,3 +41,20 @@ export const fromUniversalOverridesToViewFieldOverrides = ({
viewFieldGroupId: flatViewFieldGroup?.id ?? null,
};
};
+
+export const fromUniversalOverridesToViewFieldOverrides = ({
+ universalOverrides,
+ flatViewFieldGroupMaps,
+}: {
+ universalOverrides: AuthoredOverrides<UniversalViewFieldOverrides>;
+ flatViewFieldGroupMaps: FlatViewFieldGroupMaps;
+}): AuthoredOverrides<ViewFieldOverrides> =>
+ mapAuthoredOverrideEntries({
+ metadataName: 'viewField',
+ overrides: universalOverrides,
+ mapEntry: (entry) =>
+ fromUniversalOverridesToViewFieldOverridesEntry({
+ universalOverrides: entry,
+ flatViewFieldGroupMaps,
+ }),
+ });
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view/services/utils/from-universal-overrides-to-view-overrides.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view/services/utils/from-universal-overrides-to-view-overrides.util.ts
index 23f6878ba4a..0999d9acd6a 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view/services/utils/from-universal-overrides-to-view-overrides.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/view/services/utils/from-universal-overrides-to-view-overrides.util.ts
@@ -4,6 +4,8 @@ import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { type ViewOverrides } from 'src/engine/metadata-modules/view/entities/view.entity';
+import { type AuthoredOverrides } from 'src/engine/metadata-modules/overrides/types/authored-overrides.type';
+import { mapAuthoredOverrideEntries } from 'src/engine/metadata-modules/overrides/utils/map-authored-override-entries.util';
type UniversalViewOverrides =
FormatRecordSerializedRelationProperties<ViewOverrides>;
@@ -26,7 +28,7 @@ const toForeignKeyProperty = (
'Id',
) as keyof ViewOverrides;
-export const fromUniversalOverridesToViewOverrides = ({
+const fromUniversalOverridesToViewOverridesEntry = ({
universalOverrides,
flatFieldMetadataMaps,
}: {
@@ -66,3 +68,20 @@ export const fromUniversalOverridesToViewOverrides = ({
scalarOverrides,
);
};
+
+export const fromUniversalOverridesToViewOverrides = ({
+ universalOverrides,
+ flatFieldMetadataMaps,
+}: {
+ universalOverrides: AuthoredOverrides<UniversalViewOverrides>;
+ flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+}): AuthoredOverrides<ViewOverrides> =>
+ mapAuthoredOverrideEntries({
+ metadataName: 'view',
+ overrides: universalOverrides,
+ mapEntry: (entry) =>
+ fromUniversalOverridesToViewOverridesEntry({
+ universalOverrides: entry,
+ flatFieldMetadataMaps,
+ }),
+ });
diff --git a/packages/twenty-server/src/modules/dashboard/tools/get-dashboard.tool.ts b/packages/twenty-server/src/modules/dashboard/tools/get-dashboard.tool.ts
index 75ae64dfdb8..333f774a932 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/get-dashboard.tool.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/get-dashboard.tool.ts
@@ -12,6 +12,7 @@ import {
type DashboardToolDependencies,
} from 'src/modules/dashboard/tools/types/dashboard-tool-dependencies.type';
import { buildResolvedGroupBy } from 'src/modules/dashboard/tools/utils/build-resolved-group-by.util';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
const getDashboardSchema = z.object({
dashboardId: z.string().uuid().describe('The UUID of the dashboard to fetch'),
@@ -42,7 +43,13 @@ export const createGetDashboardTool = (
flatFieldMetadataMaps.byUniversalIdentifier,
)
.filter(isDefined)
- .filter((field) => field.isActive);
+ .filter((field) =>
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'fieldMetadata',
+ flatEntity: field,
+ property: 'isActive',
+ }),
+ );
const fieldsByObjectId = new Map<string, FlatFieldMetadata[]>();
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity-routing-plan.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity-routing-plan.service.ts
index 343be80580a..e303d2d430c 100644
--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity-routing-plan.service.ts
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity-routing-plan.service.ts
@@ -21,6 +21,7 @@ import {
type ResolvableTimelineActivityType,
type TimelineActivityTypeResolver,
} from 'src/modules/timeline/utils/resolve-timeline-activity-type.util';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
const EMPTY_NON_AUDIT_LOGGED_FIELD_NAMES: ReadonlySet<string> = new Set();
@@ -165,7 +166,12 @@ export class TimelineActivityRoutingPlanService {
});
const activeTimelineActivityTypes = effectiveTimelineActivityTypes.filter(
- (timelineActivityType) => timelineActivityType.isActive,
+ (timelineActivityType) =>
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'timelineActivityType',
+ flatEntity: timelineActivityType,
+ property: 'isActive',
+ }),
);
const throughRules = activeTimelineActivityTypes
.map((timelineActivityType): TimelineActivityRule | undefined => {
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity-type-cache.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity-type-cache.service.ts
index 6450c2081df..59c29b36392 100644
--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity-type-cache.service.ts
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity-type-cache.service.ts
@@ -11,6 +11,7 @@ import {
type ResolvedTimelineActivityType,
type TimelineActivityTypeResolver,
} from 'src/modules/timeline/utils/resolve-timeline-activity-type.util';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
@Injectable()
export class TimelineActivityTypeCacheService {
@@ -60,7 +61,14 @@ export class TimelineActivityTypeCacheService {
flatEntityMaps: flatTimelineActivityTypeMaps,
});
- if (!isDefined(timelineActivityType) || !timelineActivityType.isActive) {
+ if (
+ !isDefined(timelineActivityType) ||
+ !resolveEffectiveFlatEntityProperty({
+ metadataName: 'timelineActivityType',
+ flatEntity: timelineActivityType,
+ property: 'isActive',
+ })
+ ) {
throw new TimelineException(
`Active timeline activity type ${timelineActivityTypeId} was not found in workspace ${workspaceId}`,
);
diff --git a/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-type.util.spec.ts b/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-type.util.spec.ts
index da65fe3295d..58a44dc551f 100644
--- a/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-type.util.spec.ts
+++ b/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-type.util.spec.ts
@@ -127,8 +127,10 @@ describe('buildTimelineActivityTypeResolution', () => {
noteLinked: {
...noteLinkedTimelineActivityType,
overrides: {
- label: 'Added a note',
- icon: 'IconPencil',
+ '20202020-aaaa-4aaa-8aaa-000000000001': {
+ label: 'Added a note',
+ icon: 'IconPencil',
+ },
},
},
},
diff --git a/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-type.util.ts b/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-type.util.ts
index 52099fa94c3..4bf6dc1a1f5 100644
--- a/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-type.util.ts
+++ b/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-type.util.ts
@@ -5,7 +5,7 @@ import {
import { isDefined } from 'twenty-shared/utils';
import { type FlatTimelineActivityType } from 'src/engine/metadata-modules/flat-timeline-activity-type/types/flat-timeline-activity-type.type';
-import { resolveOverridableEntityProperty } from 'src/engine/metadata-modules/utils/resolve-overridable-entity-property.util';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
import { partitionTimelineActivityTypesByValidity } from 'src/engine/metadata-modules/timeline-activity-type/utils/is-valid-timeline-activity-type-override.util';
import { resolveTimelineActivityTypeOverride } from 'src/engine/metadata-modules/timeline-activity-type/utils/resolve-timeline-activity-type-override.util';
import { resolveTimelineActivityTypeRouting } from 'src/modules/timeline/utils/resolve-timeline-activity-type-routing.util';
@@ -76,9 +76,17 @@ export const toResolvedTimelineActivityType = (
id: timelineActivityType.id,
universalIdentifier: timelineActivityType.universalIdentifier,
name: timelineActivityType.name,
- label: resolveOverridableEntityProperty(timelineActivityType, 'label'),
+ label: resolveEffectiveFlatEntityProperty({
+ metadataName: 'timelineActivityType',
+ flatEntity: timelineActivityType,
+ property: 'label',
+ }),
action: timelineActivityType.action,
- icon: resolveOverridableEntityProperty(timelineActivityType, 'icon'),
+ icon: resolveEffectiveFlatEntityProperty({
+ metadataName: 'timelineActivityType',
+ flatEntity: timelineActivityType,
+ property: 'icon',
+ }),
objectUniversalIdentifier: timelineActivityType.objectUniversalIdentifier,
frontComponentUniversalIdentifier:
timelineActivityType.frontComponentUniversalIdentifier,
@@ -202,7 +210,13 @@ export const buildTimelineActivityTypeResolution = (
}
if (!isDefined(objectUniversalIdentifier)) {
- if (timelineActivityType.isActive) {
+ if (
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'timelineActivityType',
+ flatEntity: timelineActivityType,
+ property: 'isActive',
+ })
+ ) {
typeByAction.set(
action,
toResolvedTimelineActivityType(timelineActivityType),
@@ -214,7 +228,13 @@ export const buildTimelineActivityTypeResolution = (
const key = `${objectUniversalIdentifier}|${action}`;
- if (timelineActivityType.isActive) {
+ if (
+ resolveEffectiveFlatEntityProperty({
+ metadataName: 'timelineActivityType',
+ flatEntity: timelineActivityType,
+ property: 'isActive',
+ })
+ ) {
typeByObjectAndAction.set(
key,
toResolvedTimelineActivityType(timelineActivityType),
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-schema/utils/should-generate-field-fake-value.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-schema/utils/should-generate-field-fake-value.ts
index fa4703cc3cb..1fce3f63393 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-schema/utils/should-generate-field-fake-value.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-schema/utils/should-generate-field-fake-value.ts
@@ -3,11 +3,16 @@ import { FieldMetadataType, RelationType } from 'twenty-shared/types';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { isFlatFieldMetadataOfType } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util';
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
+import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
const EXCLUDED_SYSTEM_FIELDS = ['searchVector', 'position'];
const isActiveField = (field: FlatFieldMetadata) => {
- return field.isActive;
+ return resolveEffectiveFlatEntityProperty({
+ metadataName: 'fieldMetadata',
+ flatEntity: field,
+ property: 'isActive',
+ });
};
const isExcludedSystemField = (field: FlatFieldMetadata) => {