Skip to content

The open alternative to Salesforce, designed for AI.

refactor(i18n) - resolve page layout and view field group labels through one resolver [2/6] (#24304)

Félix Malfait2711d27e9276
diff --git a/packages/twenty-server/.oxlintrc.json b/packages/twenty-server/.oxlintrc.json
index 1ec6c4c250d..8ab3681d7b5 100644
--- a/packages/twenty-server/.oxlintrc.json
+++ b/packages/twenty-server/.oxlintrc.json
@@ -37,6 +37,17 @@
"no-restricted-imports": [
"error",
{
+ "paths": [
+ {
+ "name": "twenty-shared/i18n",
+ "importNames": ["generateMessageId"],
+ "message": "Provider-owned metadata strings must resolve through resolveEffectiveEntityProperty, which owns the catalog lookup. Hashing message ids by hand is how the per-entity resolvers drifted apart."
+ },
+ {
+ "name": "src/engine/core-modules/i18n/utils/translate-standard-label.util",
+ "message": "Call resolveEffectiveEntityProperty instead: it arbitrates overrides and overrides.translations before delegating here."
+ }
+ ],
"patterns": [
{
"group": ["**../"],
@@ -112,6 +123,33 @@
"rules": {
"twenty/max-consts-per-file": "off"
}
+ },
+ {
+ "files": [
+ "src/engine/core-modules/i18n/**",
+ "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/view/services/view.service.ts",
+ "test/**"
+ ],
+ "rules": {
+ "no-restricted-imports": [
+ "error",
+ {
+ "patterns": [
+ {
+ "group": ["**../"],
+ "message": "Relative imports are not allowed."
+ },
+ {
+ "group": ["lodash"],
+ "message": "Please use the standalone lodash package (for instance: `import groupBy from 'lodash.groupby'` instead of `import { groupBy } from 'lodash'`)"
+ }
+ ]
+ }
+ ]
+ }
}
]
}
diff --git a/packages/twenty-server/src/engine/core-modules/i18n/i18n.service.ts b/packages/twenty-server/src/engine/core-modules/i18n/i18n.service.ts
index 89df3e17f2b..86bb857bd35 100644
--- a/packages/twenty-server/src/engine/core-modules/i18n/i18n.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/i18n/i18n.service.ts
@@ -9,6 +9,10 @@ import {
} from '@lingui/core';
import { compileMessage } from '@lingui/message-utils/compileMessage';
import { type APP_LOCALES, SOURCE_LOCALE } from 'twenty-shared/translations';
+import { isDefined } from 'twenty-shared/utils';
+
+import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
+import { type EffectiveEntityI18nContext } from 'src/engine/metadata-modules/utils/effective-entity-i18n-context.type';
import { messages as afMessages } from 'src/engine/core-modules/i18n/locales/generated/af-ZA';
import { messages as arMessages } from 'src/engine/core-modules/i18n/locales/generated/ar-SA';
@@ -123,6 +127,38 @@ export class I18nService implements OnModuleInit {
return i18n._(messageId, values, options);
}
+ async buildEffectiveEntityI18nContext({
+ applicationId,
+ loaders,
+ locale,
+ workspaceId,
+ }: {
+ applicationId: string | undefined;
+ loaders: IDataloaders;
+ locale: keyof typeof APP_LOCALES | undefined;
+ workspaceId: string;
+ }): Promise<EffectiveEntityI18nContext> {
+ const safeLocale = locale ?? SOURCE_LOCALE;
+
+ const standardApplicationId =
+ await loaders.standardApplicationIdLoader.load({ workspaceId });
+
+ const applicationCatalog = isDefined(applicationId)
+ ? await loaders.applicationTranslationCatalogLoader.load({
+ applicationId,
+ workspaceId,
+ locale: safeLocale,
+ })
+ : undefined;
+
+ return {
+ locale,
+ i18nInstance: this.getI18nInstance(safeLocale),
+ isStandardApp: applicationId === standardApplicationId,
+ applicationCatalog,
+ };
+ }
+
async onModuleInit() {
await this.loadTranslations();
}
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 9172deaf2c2..19deca72e53 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
@@ -29,7 +29,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 { resolvePageLayoutTabTitle } from 'src/engine/metadata-modules/page-layout-tab/utils/resolve-page-layout-tab-title.util';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/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';
@@ -50,27 +50,19 @@ export class PageLayoutTabResolver {
@Context() context: { loaders: IDataloaders } & I18nContext,
@AuthWorkspace() workspace: WorkspaceEntity,
): Promise<string> {
- const i18n = this.i18nService.getI18nInstance(context.req.locale);
-
- const standardApplicationId =
- await context.loaders.standardApplicationIdLoader.load({
- workspaceId: workspace.id,
- });
-
- const applicationCatalog =
- await context.loaders.applicationTranslationCatalogLoader.load({
- applicationId: tab.applicationId,
- workspaceId: workspace.id,
- locale: context.req.locale,
- });
-
- return resolvePageLayoutTabTitle({
- title: tab.title,
+ const i18nContext = await this.i18nService.buildEffectiveEntityI18nContext({
applicationId: tab.applicationId,
- twentyStandardApplicationId: standardApplicationId,
+ loaders: context.loaders,
+ locale: context.req.locale,
+ workspaceId: workspace.id,
+ });
+
+ return resolveEffectiveEntityProperty({
+ metadataName: 'pageLayoutTab',
+ baseValue: tab.title,
overrides: tab.overrides,
- i18nInstance: i18n,
- applicationCatalog,
+ property: 'title',
+ i18nContext,
});
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/utils/__tests__/resolve-page-layout-tab-title.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/utils/__tests__/resolve-page-layout-tab-title.util.spec.ts
deleted file mode 100644
index 4b3230c85c3..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/utils/__tests__/resolve-page-layout-tab-title.util.spec.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import { type I18n } from '@lingui/core';
-
-import { generateMessageId } from 'twenty-shared/i18n';
-import { resolvePageLayoutTabTitle } from 'src/engine/metadata-modules/page-layout-tab/utils/resolve-page-layout-tab-title.util';
-
-jest.mock('twenty-shared/i18n');
-
-const mockGenerateMessageId = generateMessageId as jest.MockedFunction<
- typeof generateMessageId
->;
-
-const STANDARD_APPLICATION_ID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa';
-
-describe('resolvePageLayoutTabTitle', () => {
- let mockI18n: jest.Mocked<I18n>;
-
- beforeEach(() => {
- jest.clearAllMocks();
- mockI18n = {
- _: jest.fn(),
- } as unknown as jest.Mocked<I18n>;
- });
-
- it('should return translated title when catalog has a match', () => {
- mockGenerateMessageId.mockReturnValue('abc123');
- mockI18n._.mockReturnValue('Accueil');
-
- const result = resolvePageLayoutTabTitle({
- title: 'Home',
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- i18nInstance: mockI18n,
- });
-
- expect(mockGenerateMessageId).toHaveBeenCalledWith('Home');
- expect(mockI18n._).toHaveBeenCalledWith('abc123');
- expect(result).toBe('Accueil');
- });
-
- it('should return original title when catalog returns the hash (no translation found)', () => {
- mockGenerateMessageId.mockReturnValue('xyz789');
- mockI18n._.mockReturnValue('xyz789');
-
- const result = resolvePageLayoutTabTitle({
- title: 'My Custom Tab',
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- i18nInstance: mockI18n,
- });
-
- expect(mockGenerateMessageId).toHaveBeenCalledWith('My Custom Tab');
- expect(mockI18n._).toHaveBeenCalledWith('xyz789');
- expect(result).toBe('My Custom Tab');
- });
-
- it('should return original title for empty string', () => {
- mockGenerateMessageId.mockReturnValue('empty-hash');
- mockI18n._.mockReturnValue('empty-hash');
-
- const result = resolvePageLayoutTabTitle({
- title: '',
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- i18nInstance: mockI18n,
- });
-
- expect(result).toBe('');
- });
-
- it('should translate standard tab titles', () => {
- const standardTabs = [
- { source: 'Home', translated: 'Accueil' },
- { source: 'Timeline', translated: 'Chronologie' },
- { source: 'Tasks', translated: 'Tâches' },
- { source: 'Notes', translated: 'Notes' },
- { source: 'Files', translated: 'Fichiers' },
- { source: 'Emails', translated: 'E-mails' },
- { source: 'Calendar', translated: 'Calendrier' },
- { source: 'Note', translated: 'Note' },
- { source: 'Flow', translated: 'Flux' },
- ];
-
- standardTabs.forEach(({ source, translated }) => {
- jest.clearAllMocks();
- mockGenerateMessageId.mockReturnValue(`hash-${source}`);
- mockI18n._.mockReturnValue(translated);
-
- const result = resolvePageLayoutTabTitle({
- title: source,
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- i18nInstance: mockI18n,
- });
-
- expect(result).toBe(translated);
- });
- });
-
- it('should not translate title when applicationId is not from standard app', () => {
- mockGenerateMessageId.mockReturnValue('abc123');
- mockI18n._.mockReturnValue('Accueil');
-
- const customAppId = '11111111-1111-1111-1111-111111111111';
-
- const result = resolvePageLayoutTabTitle({
- title: 'Home',
- applicationId: customAppId,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- i18nInstance: mockI18n,
- });
-
- expect(mockGenerateMessageId).not.toHaveBeenCalled();
- expect(mockI18n._).not.toHaveBeenCalled();
- expect(result).toBe('Home');
- });
-
- it('should not translate title when overrides.title is defined', () => {
- mockGenerateMessageId.mockReturnValue('abc123');
- mockI18n._.mockReturnValue('Accueil');
-
- const result = resolvePageLayoutTabTitle({
- title: 'Home',
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- overrides: { title: 'Home' },
- i18nInstance: mockI18n,
- });
-
- expect(mockGenerateMessageId).not.toHaveBeenCalled();
- expect(mockI18n._).not.toHaveBeenCalled();
- expect(result).toBe('Home');
- });
-
- it('should translate title when overrides is defined but overrides.title is not', () => {
- mockGenerateMessageId.mockReturnValue('abc123');
- mockI18n._.mockReturnValue('Accueil');
-
- const result = resolvePageLayoutTabTitle({
- title: 'Home',
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- overrides: { icon: 'IconCustom' },
- i18nInstance: mockI18n,
- });
-
- expect(mockGenerateMessageId).toHaveBeenCalledWith('Home');
- expect(mockI18n._).toHaveBeenCalledWith('abc123');
- expect(result).toBe('Accueil');
- });
-});
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/utils/resolve-page-layout-tab-title.util.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/utils/resolve-page-layout-tab-title.util.ts
deleted file mode 100644
index 64db8480ce0..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/utils/resolve-page-layout-tab-title.util.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { type I18n } from '@lingui/core';
-
-import { isDefined } from 'twenty-shared/utils';
-
-import { translateStandardLabel } from 'src/engine/core-modules/i18n/utils/translate-standard-label.util';
-import { type PageLayoutTabOverrides } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity';
-
-export const resolvePageLayoutTabTitle = ({
- title,
- applicationId,
- twentyStandardApplicationId,
- overrides,
- i18nInstance,
- applicationCatalog,
-}: {
- title: string;
- applicationId: string;
- twentyStandardApplicationId: string;
- overrides?: PageLayoutTabOverrides | null;
- i18nInstance: I18n;
- applicationCatalog?: Record<string, string>;
-}): string => {
- const isStandardApp = applicationId === twentyStandardApplicationId;
-
- if (isDefined(overrides?.title)) {
- return title;
- }
-
- return translateStandardLabel({
- sourceValue: title,
- isStandardApp,
- applicationCatalog,
- i18nInstance,
- });
-};
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 8b436da5af1..077a70fba94 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
@@ -30,7 +30,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 { resolvePageLayoutWidgetTitle } from 'src/engine/metadata-modules/page-layout-widget/utils/resolve-page-layout-widget-title.util';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/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';
@@ -51,27 +51,19 @@ export class PageLayoutWidgetResolver {
@Context() context: { loaders: IDataloaders } & I18nContext,
@AuthWorkspace() workspace: WorkspaceEntity,
): Promise<string> {
- const i18n = this.i18nService.getI18nInstance(context.req.locale);
-
- const standardApplicationId =
- await context.loaders.standardApplicationIdLoader.load({
- workspaceId: workspace.id,
- });
-
- const applicationCatalog =
- await context.loaders.applicationTranslationCatalogLoader.load({
- applicationId: widget.applicationId,
- workspaceId: workspace.id,
- locale: context.req.locale,
- });
-
- return resolvePageLayoutWidgetTitle({
- title: widget.title,
+ const i18nContext = await this.i18nService.buildEffectiveEntityI18nContext({
applicationId: widget.applicationId,
- twentyStandardApplicationId: standardApplicationId,
+ loaders: context.loaders,
+ locale: context.req.locale,
+ workspaceId: workspace.id,
+ });
+
+ return resolveEffectiveEntityProperty({
+ metadataName: 'pageLayoutWidget',
+ baseValue: widget.title,
overrides: widget.overrides,
- i18nInstance: i18n,
- applicationCatalog,
+ property: 'title',
+ i18nContext,
});
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/__tests__/resolve-page-layout-widget-title.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/__tests__/resolve-page-layout-widget-title.util.spec.ts
deleted file mode 100644
index 54a9d79dece..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/__tests__/resolve-page-layout-widget-title.util.spec.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-import { type I18n } from '@lingui/core';
-
-import { generateMessageId } from 'twenty-shared/i18n';
-import { resolvePageLayoutWidgetTitle } from 'src/engine/metadata-modules/page-layout-widget/utils/resolve-page-layout-widget-title.util';
-
-jest.mock('twenty-shared/i18n');
-
-const mockGenerateMessageId = generateMessageId as jest.MockedFunction<
- typeof generateMessageId
->;
-
-const STANDARD_APPLICATION_ID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa';
-
-describe('resolvePageLayoutWidgetTitle', () => {
- let mockI18n: jest.Mocked<I18n>;
-
- beforeEach(() => {
- jest.clearAllMocks();
- mockI18n = {
- _: jest.fn(),
- } as unknown as jest.Mocked<I18n>;
- });
-
- it('should return translated title when catalog has a match', () => {
- mockGenerateMessageId.mockReturnValue('abc123');
- mockI18n._.mockReturnValue('Champs');
-
- const result = resolvePageLayoutWidgetTitle({
- title: 'Fields',
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- i18nInstance: mockI18n,
- });
-
- expect(mockGenerateMessageId).toHaveBeenCalledWith('Fields');
- expect(mockI18n._).toHaveBeenCalledWith('abc123');
- expect(result).toBe('Champs');
- });
-
- it('should return original title when catalog returns the hash (no translation found)', () => {
- mockGenerateMessageId.mockReturnValue('xyz789');
- mockI18n._.mockReturnValue('xyz789');
-
- const result = resolvePageLayoutWidgetTitle({
- title: 'My Custom Widget',
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- i18nInstance: mockI18n,
- });
-
- expect(mockGenerateMessageId).toHaveBeenCalledWith('My Custom Widget');
- expect(mockI18n._).toHaveBeenCalledWith('xyz789');
- expect(result).toBe('My Custom Widget');
- });
-
- it('should return original title for empty string', () => {
- mockGenerateMessageId.mockReturnValue('empty-hash');
- mockI18n._.mockReturnValue('empty-hash');
-
- const result = resolvePageLayoutWidgetTitle({
- title: '',
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- i18nInstance: mockI18n,
- });
-
- expect(result).toBe('');
- });
-
- it('should translate standard widget titles', () => {
- const standardWidgets = [
- { source: 'Fields', translated: 'Champs' },
- { source: 'Timeline', translated: 'Chronologie' },
- { source: 'Tasks', translated: 'Tâches' },
- { source: 'Notes', translated: 'Notes' },
- { source: 'Files', translated: 'Fichiers' },
- { source: 'Emails', translated: 'E-mails' },
- { source: 'Calendar', translated: 'Calendrier' },
- { source: 'Note', translated: 'Note' },
- { source: 'Task', translated: 'Tâche' },
- { source: 'Flow', translated: 'Flux' },
- { source: 'Thread', translated: 'Fil' },
- { source: 'People', translated: 'Personnes' },
- { source: 'Opportunities', translated: 'Opportunités' },
- { source: 'Company', translated: 'Entreprise' },
- { source: 'Point of Contact', translated: 'Point de contact' },
- { source: 'Owner', translated: 'Propriétaire' },
- { source: 'Workflow', translated: 'Flux de travail' },
- { source: 'Deals by Company', translated: 'Affaires par entreprise' },
- ];
-
- standardWidgets.forEach(({ source, translated }) => {
- jest.clearAllMocks();
- mockGenerateMessageId.mockReturnValue(`hash-${source}`);
- mockI18n._.mockReturnValue(translated);
-
- const result = resolvePageLayoutWidgetTitle({
- title: source,
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- i18nInstance: mockI18n,
- });
-
- expect(result).toBe(translated);
- });
- });
-
- it('should not translate title when applicationId is not from standard app', () => {
- mockGenerateMessageId.mockReturnValue('abc123');
- mockI18n._.mockReturnValue('Champs');
-
- const customAppId = '11111111-1111-1111-1111-111111111111';
-
- const result = resolvePageLayoutWidgetTitle({
- title: 'Fields',
- applicationId: customAppId,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- i18nInstance: mockI18n,
- });
-
- expect(mockGenerateMessageId).not.toHaveBeenCalled();
- expect(mockI18n._).not.toHaveBeenCalled();
- expect(result).toBe('Fields');
- });
-
- it('should not translate title when overrides.title is defined', () => {
- mockGenerateMessageId.mockReturnValue('abc123');
- mockI18n._.mockReturnValue('Champs');
-
- const result = resolvePageLayoutWidgetTitle({
- title: 'Fields',
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- overrides: { title: 'Fields' },
- i18nInstance: mockI18n,
- });
-
- expect(mockGenerateMessageId).not.toHaveBeenCalled();
- expect(mockI18n._).not.toHaveBeenCalled();
- expect(result).toBe('Fields');
- });
-
- it('should translate title when overrides is defined but overrides.title is not', () => {
- mockGenerateMessageId.mockReturnValue('abc123');
- mockI18n._.mockReturnValue('Champs');
-
- const result = resolvePageLayoutWidgetTitle({
- title: 'Fields',
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- overrides: { conditionalAvailabilityExpression: 'device == "MOBILE"' },
- i18nInstance: mockI18n,
- });
-
- expect(mockGenerateMessageId).toHaveBeenCalledWith('Fields');
- expect(mockI18n._).toHaveBeenCalledWith('abc123');
- expect(result).toBe('Champs');
- });
-});
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/resolve-page-layout-widget-title.util.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/resolve-page-layout-widget-title.util.ts
deleted file mode 100644
index 9245b1ffac5..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/resolve-page-layout-widget-title.util.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { type I18n } from '@lingui/core';
-
-import { isDefined } from 'twenty-shared/utils';
-
-import { translateStandardLabel } from 'src/engine/core-modules/i18n/utils/translate-standard-label.util';
-import { type PageLayoutWidgetOverrides } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity';
-
-export const resolvePageLayoutWidgetTitle = ({
- title,
- applicationId,
- twentyStandardApplicationId,
- overrides,
- i18nInstance,
- applicationCatalog,
-}: {
- title: string;
- applicationId: string;
- twentyStandardApplicationId: string;
- overrides?: PageLayoutWidgetOverrides | null;
- i18nInstance: I18n;
- applicationCatalog?: Record<string, string>;
-}): string => {
- const isStandardApp = applicationId === twentyStandardApplicationId;
-
- if (isDefined(overrides?.title)) {
- return title;
- }
-
- return translateStandardLabel({
- sourceValue: title,
- isStandardApp,
- applicationCatalog,
- i18nInstance,
- });
-};
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/utils/__tests__/resolve-effective-entity.util.spec.ts
index f96f7de8702..ff79f1f5caf 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/utils/__tests__/resolve-effective-entity.util.spec.ts
@@ -290,3 +290,122 @@ describe('resolveEffectiveEntity (parity with legacy flat spread)', () => {
}
});
});
+
+// Frozen reference implementation of the three per-entity resolvers that
+// existed before this unification (resolve-view-field-group-name,
+// resolve-page-layout-tab-title, resolve-page-layout-widget-title). All three
+// were the same nine lines with a different property name.
+const frozenResolveBespokeProperty = (
+ baseValue: string,
+ overrides: AnyOverrides,
+ property: string,
+ isStandardApp: boolean,
+ i18nInstance: I18n,
+ applicationCatalog?: Record<string, string>,
+): string => {
+ if (isDefined(overrides?.[property])) {
+ return baseValue;
+ }
+
+ return translateStandardLabel({
+ sourceValue: baseValue,
+ isStandardApp,
+ applicationCatalog,
+ i18nInstance,
+ });
+};
+
+// The DTO mappers spread overrides onto the base value before a resolver sees
+// it, so an overridden entity arrives with base === overrides[property]. The
+// corpus mirrors that rather than inventing states production cannot produce.
+const BESPOKE_CORPUS: { base: string; overrides: AnyOverrides }[] = [
+ { base: 'Details', overrides: undefined },
+ { base: 'Details', overrides: null },
+ { base: 'Details', overrides: {} },
+ { base: 'Renamed', overrides: { name: 'Renamed', title: 'Renamed' } },
+ { base: '', overrides: { name: '', title: '' } },
+ { base: 'Details', overrides: { position: 2 } },
+];
+
+// Each per-entity resolver ran the frozen shape above against its own
+// property. The generic is instantiated per entity rather than over a union,
+// because a union of metadata names collapses the allowed property names to
+// their intersection.
+const expectParityFor = (
+ resolve: (
+ base: string,
+ overrides: AnyOverrides,
+ context: AnyOverrides,
+ ) => string,
+ property: string,
+) => {
+ for (const { base, overrides } of BESPOKE_CORPUS) {
+ for (const locale of LOCALES) {
+ for (const isStandardApp of BOOLS) {
+ for (const applicationCatalog of CATALOGS) {
+ const expected = frozenResolveBespokeProperty(
+ base,
+ overrides,
+ property,
+ isStandardApp,
+ mockI18n,
+ applicationCatalog,
+ );
+
+ const actual = resolve(base, overrides, {
+ locale,
+ i18nInstance: mockI18n,
+ isStandardApp,
+ applicationCatalog,
+ });
+
+ expect(actual).toBe(expected);
+ }
+ }
+ }
+ }
+};
+
+describe('resolveEffectiveEntityProperty (parity with the per-entity resolvers)', () => {
+ it('matches the frozen viewFieldGroup resolver across the corpus', () => {
+ expectParityFor(
+ (baseValue, overrides, i18nContext) =>
+ resolveEffectiveEntityProperty({
+ metadataName: 'viewFieldGroup',
+ baseValue,
+ overrides,
+ property: 'name',
+ i18nContext,
+ }),
+ 'name',
+ );
+ });
+
+ it('matches the frozen pageLayoutTab resolver across the corpus', () => {
+ expectParityFor(
+ (baseValue, overrides, i18nContext) =>
+ resolveEffectiveEntityProperty({
+ metadataName: 'pageLayoutTab',
+ baseValue,
+ overrides,
+ property: 'title',
+ i18nContext,
+ }),
+ 'title',
+ );
+ });
+
+ it('matches the frozen pageLayoutWidget resolver across the corpus', () => {
+ expectParityFor(
+ (baseValue, overrides, i18nContext) =>
+ resolveEffectiveEntityProperty({
+ metadataName: 'pageLayoutWidget',
+ baseValue,
+ overrides,
+ property: 'title',
+ i18nContext,
+ }),
+ 'title',
+ );
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/metadata-presentation-overrides.type.ts b/packages/twenty-server/src/engine/metadata-modules/utils/metadata-presentation-overrides.type.ts
index fcb01db8387..410b0191c6c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/utils/metadata-presentation-overrides.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/utils/metadata-presentation-overrides.type.ts
@@ -10,8 +10,18 @@ type OverridesTranslationEntry<T extends AllMetadataName> = {
[P in MetadataEntityTranslatablePropertyName<T>]?: string | null;
};
+// Only translatable properties are guaranteed to hold strings. The rest are
+// overridable but not textual -- pageLayoutTab.position is a number,
+// commandMenuItem.isPinned a boolean -- so typing every overridable property as
+// `string | null` made the entity-local override types unassignable to this one
+// and kept those entities out of the shared resolver.
export type MetadataPresentationOverrides<T extends AllMetadataName> = {
- [P in MetadataEntityOverridablePropertyName<T>]?: string | null;
+ [P in MetadataEntityTranslatablePropertyName<T>]?: string | null;
+} & {
+ [P in Exclude<
+ MetadataEntityOverridablePropertyName<T>,
+ MetadataEntityTranslatablePropertyName<T>
+ >]?: unknown;
} & {
translations?: Partial<
Record<keyof typeof APP_LOCALES, OverridesTranslationEntry<T>>
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 64be19d1ed6..63004620bc1 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
@@ -27,7 +27,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 { resolveViewFieldGroupName } from 'src/engine/metadata-modules/view-field-group/utils/resolve-view-field-group-name.util';
+import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/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';
@@ -49,27 +49,19 @@ export class ViewFieldGroupResolver {
@Context() context: { loaders: IDataloaders } & I18nContext,
@AuthWorkspace() workspace: WorkspaceEntity,
): Promise<string> {
- const i18n = this.i18nService.getI18nInstance(context.req.locale);
-
- const standardApplicationId =
- await context.loaders.standardApplicationIdLoader.load({
- workspaceId: workspace.id,
- });
-
- const applicationCatalog =
- await context.loaders.applicationTranslationCatalogLoader.load({
- applicationId: viewFieldGroup.applicationId,
- workspaceId: workspace.id,
- locale: context.req.locale,
- });
-
- return resolveViewFieldGroupName({
- name: viewFieldGroup.name,
+ const i18nContext = await this.i18nService.buildEffectiveEntityI18nContext({
applicationId: viewFieldGroup.applicationId,
- twentyStandardApplicationId: standardApplicationId,
+ loaders: context.loaders,
+ locale: context.req.locale,
+ workspaceId: workspace.id,
+ });
+
+ return resolveEffectiveEntityProperty({
+ metadataName: 'viewFieldGroup',
+ baseValue: viewFieldGroup.name,
overrides: viewFieldGroup.overrides,
- i18nInstance: i18n,
- applicationCatalog,
+ property: 'name',
+ i18nContext,
});
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field-group/utils/__tests__/resolve-view-field-group-name.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/view-field-group/utils/__tests__/resolve-view-field-group-name.util.spec.ts
deleted file mode 100644
index 13dbe1a8f31..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/view-field-group/utils/__tests__/resolve-view-field-group-name.util.spec.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import { type I18n } from '@lingui/core';
-
-import { generateMessageId } from 'twenty-shared/i18n';
-import { resolveViewFieldGroupName } from 'src/engine/metadata-modules/view-field-group/utils/resolve-view-field-group-name.util';
-
-jest.mock('twenty-shared/i18n');
-
-const mockGenerateMessageId = generateMessageId as jest.MockedFunction<
- typeof generateMessageId
->;
-
-const STANDARD_APPLICATION_ID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa';
-
-describe('resolveViewFieldGroupName', () => {
- let mockI18n: jest.Mocked<I18n>;
-
- beforeEach(() => {
- jest.clearAllMocks();
- mockI18n = {
- _: jest.fn(),
- } as unknown as jest.Mocked<I18n>;
- });
-
- it('should return translated name when catalog has a match', () => {
- mockGenerateMessageId.mockReturnValue('abc123');
- mockI18n._.mockReturnValue('Général');
-
- const result = resolveViewFieldGroupName({
- name: 'General',
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- i18nInstance: mockI18n,
- });
-
- expect(mockGenerateMessageId).toHaveBeenCalledWith('General');
- expect(mockI18n._).toHaveBeenCalledWith('abc123');
- expect(result).toBe('Général');
- });
-
- it('should return original name when catalog returns the hash (no translation found)', () => {
- mockGenerateMessageId.mockReturnValue('xyz789');
- mockI18n._.mockReturnValue('xyz789');
-
- const result = resolveViewFieldGroupName({
- name: 'My Custom Group',
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- i18nInstance: mockI18n,
- });
-
- expect(mockGenerateMessageId).toHaveBeenCalledWith('My Custom Group');
- expect(mockI18n._).toHaveBeenCalledWith('xyz789');
- expect(result).toBe('My Custom Group');
- });
-
- it('should return original name for empty string', () => {
- mockGenerateMessageId.mockReturnValue('empty-hash');
- mockI18n._.mockReturnValue('empty-hash');
-
- const result = resolveViewFieldGroupName({
- name: '',
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- i18nInstance: mockI18n,
- });
-
- expect(result).toBe('');
- });
-
- it('should translate standard view field group names', () => {
- const standardGroups = [
- { source: 'General', translated: 'Général' },
- { source: 'System', translated: 'Système' },
- { source: 'Work', translated: 'Travail' },
- { source: 'Social', translated: 'Social' },
- { source: 'Deal', translated: 'Affaire' },
- { source: 'Relations', translated: 'Relations' },
- { source: 'Business', translated: 'Entreprise' },
- { source: 'Contact', translated: 'Contact' },
- ];
-
- standardGroups.forEach(({ source, translated }) => {
- jest.clearAllMocks();
- mockGenerateMessageId.mockReturnValue(`hash-${source}`);
- mockI18n._.mockReturnValue(translated);
-
- const result = resolveViewFieldGroupName({
- name: source,
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- i18nInstance: mockI18n,
- });
-
- expect(result).toBe(translated);
- });
- });
-
- it('should not translate name when applicationId is not from standard app', () => {
- mockGenerateMessageId.mockReturnValue('abc123');
- mockI18n._.mockReturnValue('Général');
-
- const customAppId = '11111111-1111-1111-1111-111111111111';
-
- const result = resolveViewFieldGroupName({
- name: 'General',
- applicationId: customAppId,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- i18nInstance: mockI18n,
- });
-
- expect(mockGenerateMessageId).not.toHaveBeenCalled();
- expect(mockI18n._).not.toHaveBeenCalled();
- expect(result).toBe('General');
- });
-
- it('should not translate name when overrides.name is defined', () => {
- mockGenerateMessageId.mockReturnValue('abc123');
- mockI18n._.mockReturnValue('Général');
-
- const result = resolveViewFieldGroupName({
- name: 'General',
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- overrides: { name: 'General' },
- i18nInstance: mockI18n,
- });
-
- expect(mockGenerateMessageId).not.toHaveBeenCalled();
- expect(mockI18n._).not.toHaveBeenCalled();
- expect(result).toBe('General');
- });
-
- it('should translate name when overrides is defined but overrides.name is not', () => {
- mockGenerateMessageId.mockReturnValue('abc123');
- mockI18n._.mockReturnValue('Général');
-
- const result = resolveViewFieldGroupName({
- name: 'General',
- applicationId: STANDARD_APPLICATION_ID,
- twentyStandardApplicationId: STANDARD_APPLICATION_ID,
- overrides: { position: 3 },
- i18nInstance: mockI18n,
- });
-
- expect(mockGenerateMessageId).toHaveBeenCalledWith('General');
- expect(mockI18n._).toHaveBeenCalledWith('abc123');
- expect(result).toBe('Général');
- });
-});
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field-group/utils/resolve-view-field-group-name.util.ts b/packages/twenty-server/src/engine/metadata-modules/view-field-group/utils/resolve-view-field-group-name.util.ts
deleted file mode 100644
index e6912f9e7e0..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/view-field-group/utils/resolve-view-field-group-name.util.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { type I18n } from '@lingui/core';
-
-import { isDefined } from 'twenty-shared/utils';
-
-import { translateStandardLabel } from 'src/engine/core-modules/i18n/utils/translate-standard-label.util';
-import { type ViewFieldGroupOverrides } from 'src/engine/metadata-modules/view-field-group/entities/view-field-group.entity';
-
-export const resolveViewFieldGroupName = ({
- name,
- applicationId,
- twentyStandardApplicationId,
- overrides,
- i18nInstance,
- applicationCatalog,
-}: {
- name: string;
- applicationId: string;
- twentyStandardApplicationId: string;
- overrides?: ViewFieldGroupOverrides | null;
- i18nInstance: I18n;
- applicationCatalog?: Record<string, string>;
-}): string => {
- const isStandardApp = applicationId === twentyStandardApplicationId;
-
- if (isDefined(overrides?.name)) {
- return name;
- }
-
- return translateStandardLabel({
- sourceValue: name,
- isStandardApp,
- applicationCatalog,
- i18nInstance,
- });
-};