The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
refactor(i18n): own catalog resolution in one service so REST reaches app catalogs (#24321)
Félix Malfait1143f28e6f3b
diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.module.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.module.tsindex 5692e0ff50b..29212a4291f 100644--- a/packages/twenty-server/src/engine/dataloaders/dataloader.module.ts+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.module.ts@@ -1,4 +1,5 @@import { Module } from '@nestjs/common';+import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module';import { ApplicationRegistrationVariableModule } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.module';import { ApplicationTranslationModule } from 'src/engine/core-modules/application/application-translation/application-translation.module';@@ -10,6 +11,7 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata@Module({imports: [+ ApplicationTranslationCatalogModule,FieldMetadataModule,WorkspaceManyOrAllFlatEntityMapsCacheModule,ApplicationRegistrationVariableModule,diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.service.tsindex 70a59f26b32..934f657fe34 100644--- a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts@@ -8,13 +8,12 @@ import { isDefined } from 'twenty-shared/utils';import { type IndexMetadataInterface } from 'src/engine/metadata-modules/index-metadata/interfaces/index-metadata.interface';import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.service';-import { ApplicationTranslationCacheService } from 'src/engine/core-modules/application/application-translation/application-translation-cache.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';import { filterMorphRelationDuplicateFields } from 'src/engine/dataloaders/utils/filter-morph-relation-duplicate-fields.util';-import { loadApplicationCatalogsByRegistrationId } from 'src/engine/dataloaders/utils/load-application-catalogs-by-registration-id.util';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';@@ -27,7 +26,6 @@ import { findManyFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-moduimport { 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 { getTwentyStandardApplicationIdOrThrow } from 'src/engine/metadata-modules/utils/get-twenty-standard-application-id-or-throw.util';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';@@ -145,7 +143,7 @@ export class DataloaderService {private readonly i18nService: I18nService,private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,private readonly applicationRegistrationVariableService: ApplicationRegistrationVariableService,- private readonly applicationTranslationCacheService: ApplicationTranslationCacheService,+ private readonly applicationTranslationCatalogService: ApplicationTranslationCatalogService,private readonly fieldMetadataConnectionLoaderFactory: FieldMetadataConnectionLoaderFactory,private readonly indexMetadataConnectionLoaderFactory: IndexMetadataConnectionLoaderFactory,) {}@@ -376,19 +374,11 @@ export class DataloaderService {(dataLoaderParam) => dataLoaderParam.objectMetadata.id,);- const {- flatFieldMetadataMaps,- flatObjectMetadataMaps,- flatApplicationMaps,- } =+ const { flatFieldMetadataMaps, flatObjectMetadataMaps } =await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps({workspaceId,- flatMapsKeys: [- 'flatFieldMetadataMaps',- 'flatObjectMetadataMaps',- 'flatApplicationMaps',- ],+ flatMapsKeys: ['flatFieldMetadataMaps', 'flatObjectMetadataMaps'],},);@@ -407,29 +397,23 @@ export class DataloaderService {},);- const applicationCatalogByRegistrationId =- await loadApplicationCatalogsByRegistrationId({+ const { catalogByApplicationId: applicationCatalogByApplicationId } =+ await this.applicationTranslationCatalogService.getCatalogs({applicationIds: objectFlatFieldMetadatasList.flat().map((flatFieldMetadata) => flatFieldMetadata.applicationId),- flatApplicationMaps,locale: safeLocale,- applicationTranslationCacheService:- this.applicationTranslationCacheService,+ workspaceId,});const fieldMetadataCollection = objectFlatFieldMetadatasList.map((objectFlatFieldMetadatas) => {const overriddenFieldMetadataEntities =objectFlatFieldMetadatas.map((flatFieldMetadata) => {- const applicationRegistrationId =- flatApplicationMaps.byId[flatFieldMetadata.applicationId]- ?.applicationRegistrationId;- const applicationCatalog = isDefined(applicationRegistrationId)- ? applicationCatalogByRegistrationId.get(- applicationRegistrationId,- )- : undefined;+ const applicationCatalog =+ applicationCatalogByApplicationId.get(+ flatFieldMetadata.applicationId,+ );const overrides = flatFieldMetadata.overrides ?? undefined;const i18nContext = {@@ -876,18 +860,10 @@ export class DataloaderService {private createStandardApplicationIdLoader() {return new DataLoader<StandardApplicationIdLoaderPayload, string>(async (params: StandardApplicationIdLoaderPayload[]) => {- const workspaceId = params[0].workspaceId;-- const { flatApplicationMaps } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatApplicationMaps'],- },- );-const standardApplicationId =- getTwentyStandardApplicationIdOrThrow(flatApplicationMaps);+ await this.applicationTranslationCatalogService.getStandardApplicationId(+ { workspaceId: params[0].workspaceId },+ );return params.map(() => standardApplicationId);},@@ -899,42 +875,16 @@ export class DataloaderService {ApplicationTranslationCatalogLoaderPayload,Record<string, string> | undefined>(async (params: ApplicationTranslationCatalogLoaderPayload[]) => {- const workspaceId = params[0].workspaceId;- const locale = params[0].locale;-- const { flatApplicationMaps } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatApplicationMaps'],- },- );-- const standardApplicationId =- getTwentyStandardApplicationIdOrThrow(flatApplicationMaps);-- const catalogByRegistrationId =- await loadApplicationCatalogsByRegistrationId({+ const { catalogByApplicationId } =+ await this.applicationTranslationCatalogService.getCatalogs({applicationIds: params.map((param) => param.applicationId),- flatApplicationMaps,- locale,- applicationTranslationCacheService:- this.applicationTranslationCacheService,+ locale: params[0].locale,+ workspaceId: params[0].workspaceId,});- return params.map((param) => {- if (param.applicationId === standardApplicationId) {- return undefined;- }-- const applicationRegistrationId =- flatApplicationMaps.byId[param.applicationId]- ?.applicationRegistrationId;-- return isDefined(applicationRegistrationId)- ? catalogByRegistrationId.get(applicationRegistrationId)- : undefined;- });+ return params.map((param) =>+ catalogByApplicationId.get(param.applicationId),+ );});}}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.tsindex c4fc7c39edb..3ed85d7762e 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@@ -3,11 +3,9 @@ import { Injectable } from '@nestjs/common';import DataLoader from 'dataloader';import { type APP_LOCALES, SOURCE_LOCALE } from 'twenty-shared/translations';import { FieldMetadataType } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { ApplicationTranslationCacheService } from 'src/engine/core-modules/application/application-translation/application-translation-cache.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 { loadApplicationCatalogsByRegistrationId } from 'src/engine/dataloaders/utils/load-application-catalogs-by-registration-id.util';import {FIELD_FILTER_COLUMN_BY_FILTER_FIELD,type FieldFilterInput,@@ -42,7 +40,7 @@ export class FieldMetadataConnectionLoaderFactory {constructor(private readonly i18nService: I18nService,private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,- private readonly applicationTranslationCacheService: ApplicationTranslationCacheService,+ private readonly applicationTranslationCatalogService: ApplicationTranslationCatalogService,) {}create(): DataLoader<@@ -57,19 +55,11 @@ export class FieldMetadataConnectionLoaderFactory {const safeLocale = locale ?? SOURCE_LOCALE;const i18nInstance = this.i18nService.getI18nInstance(safeLocale);const workspaceId = dataLoaderParams[0].workspaceId;- const {- flatFieldMetadataMaps,- flatObjectMetadataMaps,- flatApplicationMaps,- } =+ const { flatFieldMetadataMaps, flatObjectMetadataMaps } =await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps({workspaceId,- flatMapsKeys: [- 'flatFieldMetadataMaps',- 'flatObjectMetadataMaps',- 'flatApplicationMaps',- ],+ flatMapsKeys: ['flatFieldMetadataMaps', 'flatObjectMetadataMaps'],},);@@ -99,27 +89,22 @@ export class FieldMetadataConnectionLoaderFactory {const selectedFlatFieldMetadatas = connections.flatMap((connection) =>connection.edges.map(({ node }) => node),);- const applicationCatalogByRegistrationId =- await loadApplicationCatalogsByRegistrationId({+ const { catalogByApplicationId: applicationCatalogByApplicationId } =+ await this.applicationTranslationCatalogService.getCatalogs({applicationIds: selectedFlatFieldMetadatas.map((flatFieldMetadata) => flatFieldMetadata.applicationId,),- flatApplicationMaps,locale: safeLocale,- applicationTranslationCacheService:- this.applicationTranslationCacheService,+ workspaceId,});return connections.map((connection) => ({...connection,edges: connection.edges.map((edge) => {const flatFieldMetadata = edge.node;- const applicationRegistrationId =- flatApplicationMaps.byId[flatFieldMetadata.applicationId]- ?.applicationRegistrationId;- const applicationCatalog = isDefined(applicationRegistrationId)- ? applicationCatalogByRegistrationId.get(applicationRegistrationId)- : undefined;+ const applicationCatalog = applicationCatalogByApplicationId.get(+ flatFieldMetadata.applicationId,+ );const overrides = flatFieldMetadata.overrides ?? undefined;const i18nContext = {locale,diff --git a/packages/twenty-server/src/engine/dataloaders/utils/__tests__/load-application-catalogs-by-registration-id.util.spec.ts b/packages/twenty-server/src/engine/dataloaders/utils/__tests__/load-application-catalogs-by-registration-id.util.spec.tsdeleted file mode 100644index 154f54101b9..00000000000--- a/packages/twenty-server/src/engine/dataloaders/utils/__tests__/load-application-catalogs-by-registration-id.util.spec.ts+++ /dev/null@@ -1,55 +0,0 @@-import { type ApplicationTranslationCacheService } from 'src/engine/core-modules/application/application-translation/application-translation-cache.service';-import { type FlatApplicationCacheMaps } from 'src/engine/core-modules/application/types/flat-application-cache-maps.type';-import { loadApplicationCatalogsByRegistrationId } from 'src/engine/dataloaders/utils/load-application-catalogs-by-registration-id.util';--describe('loadApplicationCatalogsByRegistrationId', () => {- it('loads each unique application registration catalog once', async () => {- const getCatalog = jest.fn(- async ({- applicationRegistrationId,- }: {- applicationRegistrationId: string;- }) => ({- applicationRegistrationId,- }),- );- const applicationTranslationCacheService = {- getCatalog,- } as unknown as ApplicationTranslationCacheService;- const flatApplicationMaps = {- byId: {- 'application-1': { applicationRegistrationId: 'registration-1' },- 'application-2': { applicationRegistrationId: 'registration-1' },- 'application-3': { applicationRegistrationId: 'registration-2' },- },- } as unknown as FlatApplicationCacheMaps;-- const catalogs = await loadApplicationCatalogsByRegistrationId({- applicationIds: [- 'application-1',- 'application-2',- 'application-3',- 'unknown-application',- ],- flatApplicationMaps,- locale: 'en',- applicationTranslationCacheService,- });-- expect(getCatalog).toHaveBeenCalledTimes(2);- expect(getCatalog).toHaveBeenCalledWith({- applicationRegistrationId: 'registration-1',- locale: 'en',- });- expect(getCatalog).toHaveBeenCalledWith({- applicationRegistrationId: 'registration-2',- locale: 'en',- });- expect(catalogs).toEqual(- new Map([- ['registration-1', { applicationRegistrationId: 'registration-1' }],- ['registration-2', { applicationRegistrationId: 'registration-2' }],- ]),- );- });-});diff --git a/packages/twenty-server/src/engine/dataloaders/utils/load-application-catalogs-by-registration-id.util.ts b/packages/twenty-server/src/engine/dataloaders/utils/load-application-catalogs-by-registration-id.util.tsdeleted file mode 100644index 336b2e4edb0..00000000000--- a/packages/twenty-server/src/engine/dataloaders/utils/load-application-catalogs-by-registration-id.util.ts+++ /dev/null@@ -1,43 +0,0 @@-import { type APP_LOCALES } from 'twenty-shared/translations';-import { isDefined } from 'twenty-shared/utils';--import { ApplicationTranslationCacheService } from 'src/engine/core-modules/application/application-translation/application-translation-cache.service';-import { type FlatApplicationCacheMaps } from 'src/engine/core-modules/application/types/flat-application-cache-maps.type';--export const loadApplicationCatalogsByRegistrationId = async ({- applicationIds,- flatApplicationMaps,- locale,- applicationTranslationCacheService,-}: {- applicationIds: string[];- flatApplicationMaps: FlatApplicationCacheMaps;- locale: keyof typeof APP_LOCALES;- applicationTranslationCacheService: ApplicationTranslationCacheService;-}): Promise<Map<string, Record<string, string>>> => {- const registrationIds = [- ...new Set(- applicationIds- .map(- (applicationId) =>- flatApplicationMaps.byId[applicationId]?.applicationRegistrationId,- )- .filter(isDefined),- ),- ];-- const catalogByRegistrationId = new Map<string, Record<string, string>>();-- await Promise.all(- registrationIds.map(async (applicationRegistrationId) => {- const catalog = await applicationTranslationCacheService.getCatalog({- applicationRegistrationId,- locale,- });-- catalogByRegistrationId.set(applicationRegistrationId, catalog);- }),- );-- return catalogByRegistrationId;-};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.tsnew file mode 100644index 00000000000..f86f636b487--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module.ts@@ -0,0 +1,15 @@+import { Module } from '@nestjs/common';++import { ApplicationTranslationModule } from 'src/engine/core-modules/application/application-translation/application-translation.module';+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: [+ ApplicationTranslationModule,+ WorkspaceManyOrAllFlatEntityMapsCacheModule,+ ],+ providers: [ApplicationTranslationCatalogService],+ exports: [ApplicationTranslationCatalogService],+})+export class ApplicationTranslationCatalogModule {}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.tsnew file mode 100644index 00000000000..f7c9da52743--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service.ts@@ -0,0 +1,105 @@+import { Injectable } from '@nestjs/common';++import { type APP_LOCALES } from 'twenty-shared/translations';++import { ApplicationTranslationCacheService } from 'src/engine/core-modules/application/application-translation/application-translation-cache.service';+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 { resolveRegistrationIdByApplicationId } from 'src/engine/metadata-modules/application-translation-catalog/utils/resolve-registration-id-by-application-id.util';+import { getTwentyStandardApplicationIdOrThrow } from 'src/engine/metadata-modules/utils/get-twenty-standard-application-id-or-throw.util';++export type ApplicationCatalogs = {+ standardApplicationId: string;+ catalogByApplicationId: Map<string, Record<string, string> | undefined>;+};++@Injectable()+export class ApplicationTranslationCatalogService {+ constructor(+ private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,+ private readonly applicationTranslationCacheService: ApplicationTranslationCacheService,+ ) {}++ async getStandardApplicationId({+ workspaceId,+ }: {+ workspaceId: string;+ }): Promise<string> {+ return getTwentyStandardApplicationIdOrThrow(+ await this.getFlatApplicationMaps({ workspaceId }),+ );+ }++ // Batched on purpose: one flat-maps read and one fetch per distinct+ // application, however many entities the caller is resolving.+ async getCatalogs({+ applicationIds,+ locale,+ workspaceId,+ }: {+ applicationIds: (string | undefined)[];+ locale: keyof typeof APP_LOCALES;+ workspaceId: string;+ }): Promise<ApplicationCatalogs> {+ const flatApplicationMaps = await this.getFlatApplicationMaps({+ workspaceId,+ });++ const standardApplicationId =+ getTwentyStandardApplicationIdOrThrow(flatApplicationMaps);++ const registrationIdByApplicationId = resolveRegistrationIdByApplicationId({+ applicationIds,+ flatApplicationMaps,+ standardApplicationId,+ });++ const catalogByRegistrationId = new Map(+ await Promise.all(+ [...new Set(registrationIdByApplicationId.values())].map(+ async (applicationRegistrationId) =>+ [+ applicationRegistrationId,+ await this.applicationTranslationCacheService.getCatalog({+ applicationRegistrationId,+ locale,+ }),+ ] as const,+ ),+ ),+ );++ const catalogByApplicationId = new Map<+ string,+ Record<string, string> | undefined+ >();++ for (const [+ applicationId,+ applicationRegistrationId,+ ] of registrationIdByApplicationId) {+ catalogByApplicationId.set(+ applicationId,+ catalogByRegistrationId.get(applicationRegistrationId),+ );+ }++ return { standardApplicationId, catalogByApplicationId };+ }++ private async getFlatApplicationMaps({+ workspaceId,+ }: {+ workspaceId: string;+ }): Promise<FlatApplicationCacheMaps> {+ const { flatApplicationMaps } =+ await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(+ {+ workspaceId,+ flatMapsKeys: ['flatApplicationMaps'],+ },+ );++ return flatApplicationMaps;+ }+}diff --git a/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/utils/__tests__/resolve-registration-id-by-application-id.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/utils/__tests__/resolve-registration-id-by-application-id.util.spec.tsnew file mode 100644index 00000000000..65309b591ca--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/utils/__tests__/resolve-registration-id-by-application-id.util.spec.ts@@ -0,0 +1,57 @@+import { resolveRegistrationIdByApplicationId } from 'src/engine/metadata-modules/application-translation-catalog/utils/resolve-registration-id-by-application-id.util';++const STANDARD_APPLICATION_ID = '20202020-0000-0000-0000-000000000001';+const INSTALLED_APPLICATION_ID = '20202020-0000-0000-0000-000000000002';+const UNREGISTERED_APPLICATION_ID = '20202020-0000-0000-0000-000000000003';+const INSTALLED_REGISTRATION_ID = '30303030-0000-0000-0000-000000000002';++const flatApplicationMaps = {+ byId: {+ [STANDARD_APPLICATION_ID]: { applicationRegistrationId: null },+ [INSTALLED_APPLICATION_ID]: {+ applicationRegistrationId: INSTALLED_REGISTRATION_ID,+ },+ [UNREGISTERED_APPLICATION_ID]: { applicationRegistrationId: null },+ },+};++const resolve = (applicationIds: (string | undefined)[]) =>+ resolveRegistrationIdByApplicationId({+ applicationIds,+ flatApplicationMaps,+ standardApplicationId: STANDARD_APPLICATION_ID,+ });++describe('resolveRegistrationIdByApplicationId', () => {+ it('should map an installed application to its registration', () => {+ expect([...resolve([INSTALLED_APPLICATION_ID])]).toEqual([+ [INSTALLED_APPLICATION_ID, INSTALLED_REGISTRATION_ID],+ ]);+ });++ it('should skip the standard application', () => {+ expect(resolve([STANDARD_APPLICATION_ID]).size).toBe(0);+ });++ it('should skip an application with no registration', () => {+ expect(resolve([UNREGISTERED_APPLICATION_ID]).size).toBe(0);+ });++ it('should skip an unknown application', () => {+ expect(resolve(['unknown-application-id']).size).toBe(0);+ });++ it('should skip entities with no application', () => {+ expect(resolve([undefined]).size).toBe(0);+ });++ it('should dedupe repeated application ids', () => {+ expect(+ resolve([+ INSTALLED_APPLICATION_ID,+ INSTALLED_APPLICATION_ID,+ STANDARD_APPLICATION_ID,+ ]).size,+ ).toBe(1);+ });+});diff --git a/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/utils/resolve-registration-id-by-application-id.util.ts b/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/utils/resolve-registration-id-by-application-id.util.tsnew file mode 100644index 00000000000..a7359a38122--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/application-translation-catalog/utils/resolve-registration-id-by-application-id.util.ts@@ -0,0 +1,40 @@+import { isDefined } from 'twenty-shared/utils';++type ApplicationRegistrationLookup = {+ byId: Record<+ string,+ { applicationRegistrationId?: string | null } | undefined+ >;+};++// The standard application is skipped: its strings live in the server's own+// lingui catalog, not in applicationTranslation.+export const resolveRegistrationIdByApplicationId = ({+ applicationIds,+ flatApplicationMaps,+ standardApplicationId,+}: {+ applicationIds: (string | undefined)[];+ flatApplicationMaps: ApplicationRegistrationLookup;+ standardApplicationId: string;+}): Map<string, string> => {+ const registrationIdByApplicationId = new Map<string, string>();++ for (const applicationId of new Set(applicationIds)) {+ if (!isDefined(applicationId) || applicationId === standardApplicationId) {+ continue;+ }++ const applicationRegistrationId =+ flatApplicationMaps.byId[applicationId]?.applicationRegistrationId;++ if (isDefined(applicationRegistrationId)) {+ registrationIdByApplicationId.set(+ applicationId,+ applicationRegistrationId,+ );+ }+ }++ return registrationIdByApplicationId;+};diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout.controller.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout.controller.tsindex 7d24e56325b..a968b64c653 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout.controller.ts@@ -34,8 +34,7 @@ import { PageLayoutRestApiExceptionFilter } from 'src/engine/metadata-modules/paimport { PageLayoutService } from 'src/engine/metadata-modules/page-layout/services/page-layout.service';import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';-import { getTwentyStandardApplicationIdOrThrow } from 'src/engine/metadata-modules/utils/get-twenty-standard-application-id-or-throw.util';-import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';+import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';@Controller(`${ApiPath.Rest}/metadata/pageLayouts`)@@ -49,7 +48,7 @@ import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/worksexport class PageLayoutController {constructor(private readonly pageLayoutService: PageLayoutService,- private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,+ private readonly applicationTranslationCatalogService: ApplicationTranslationCatalogService,private readonly i18nService: I18nService,) {}@@ -150,20 +149,18 @@ export class PageLayoutController {workspaceId: string;locale: keyof typeof APP_LOCALES | undefined;}): Promise<PageLayoutDTO[]> {- const { flatApplicationMaps } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatApplicationMaps'],- },- );+ const safeLocale = locale ?? SOURCE_LOCALE;- const standardApplicationId =- getTwentyStandardApplicationIdOrThrow(flatApplicationMaps);+ const i18nInstance = this.i18nService.getI18nInstance(safeLocale);- const i18nInstance = this.i18nService.getI18nInstance(- locale ?? SOURCE_LOCALE,- );+ const { standardApplicationId, catalogByApplicationId } =+ await this.applicationTranslationCatalogService.getCatalogs({+ applicationIds: pageLayouts.map(+ (pageLayout) => pageLayout.applicationId,+ ),+ locale: safeLocale,+ workspaceId,+ });return pageLayouts.map((pageLayout) => ({...pageLayout,@@ -178,10 +175,9 @@ export class PageLayoutController {locale,i18nInstance,isStandardApp: pageLayout.applicationId === standardApplicationId,- // This REST path reads from the flat entity cache and has no- // dataloader, so installed-application catalogs are not resolved- // here the way they are in the GraphQL resolver.- applicationCatalog: undefined,+ applicationCatalog: catalogByApplicationId.get(+ pageLayout.applicationId,+ ),},}),}));diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/page-layout.module.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/page-layout.module.tsindex 41c746aef8c..2a1b5805b1e 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/page-layout.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/page-layout.module.ts@@ -5,6 +5,7 @@ import { ApplicationModule } from 'src/engine/core-modules/application/applicatiimport { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';import { I18nModule } from 'src/engine/core-modules/i18n/i18n.module';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module';import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';import { FlatPageLayoutTabModule } from 'src/engine/metadata-modules/flat-page-layout-tab/flat-page-layout-tab.module';import { FlatPageLayoutWidgetModule } from 'src/engine/metadata-modules/flat-page-layout-widget/flat-page-layout-widget.module';@@ -34,6 +35,7 @@ import { DashboardSyncModule } from 'src/modules/dashboard-sync/dashboard-sync.mWorkspaceCacheStorageModule,WorkspaceMigrationModule,WorkspaceManyOrAllFlatEntityMapsCacheModule,+ ApplicationTranslationCatalogModule,FlatPageLayoutModule,FlatPageLayoutTabModule,FlatPageLayoutWidgetModule,diff --git a/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.tsindex f6926fe2b59..0e3e6e3e8cc 100644--- a/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts@@ -28,9 +28,9 @@ import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';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 { getTwentyStandardApplicationIdOrThrow } from 'src/engine/metadata-modules/utils/get-twenty-standard-application-id-or-throw.util';import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';import { OBJECT_LABEL_PLURAL_PLACEHOLDER } from 'src/engine/metadata-modules/view/constants/object-label-plural-placeholder.constant';+import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';import { resolveViewName } from 'src/engine/metadata-modules/view/utils/resolve-view-name.util';import { belongsToTwentyStandardApp } from 'src/engine/metadata-modules/utils/belongs-to-twenty-standard-app.util';import { CreateViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-permission.guard';@@ -64,6 +64,7 @@ export class ViewController {constructor(private readonly viewService: ViewService,private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,+ private readonly applicationTranslationCatalogService: ApplicationTranslationCatalogService,private readonly i18nService: I18nService,) {}@@ -204,20 +205,24 @@ export class ViewController {return views;}- const { flatObjectMetadataMaps, flatApplicationMaps } =+ const { flatObjectMetadataMaps } =await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps({workspaceId,- flatMapsKeys: ['flatObjectMetadataMaps', 'flatApplicationMaps'],+ flatMapsKeys: ['flatObjectMetadataMaps'],},);- const standardApplicationId =- getTwentyStandardApplicationIdOrThrow(flatApplicationMaps);+ const safeLocale = locale ?? SOURCE_LOCALE;- const i18nInstance = this.i18nService.getI18nInstance(- locale ?? SOURCE_LOCALE,- );+ const i18nInstance = this.i18nService.getI18nInstance(safeLocale);++ const { standardApplicationId, catalogByApplicationId } =+ await this.applicationTranslationCatalogService.getCatalogs({+ applicationIds: views.map((view) => view.applicationId),+ locale: safeLocale,+ workspaceId,+ });return views.map((view) => {const objectMetadata = view.name.includes(OBJECT_LABEL_PLURAL_PLACEHOLDER)@@ -250,10 +255,7 @@ export class ViewController {locale,i18nInstance,isStandardApp: view.applicationId === standardApplicationId,- // This REST path reads from the flat entity cache and has no- // dataloader, so installed-application catalogs are not resolved- // here the way they are in the GraphQL resolver.- applicationCatalog: undefined,+ applicationCatalog: catalogByApplicationId.get(view.applicationId),},}),};diff --git a/packages/twenty-server/src/engine/metadata-modules/view/view.module.ts b/packages/twenty-server/src/engine/metadata-modules/view/view.module.tsindex 422542874b2..df38e3d5f0d 100644--- a/packages/twenty-server/src/engine/metadata-modules/view/view.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view/view.module.ts@@ -3,6 +3,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { I18nModule } from 'src/engine/core-modules/i18n/i18n.module';+import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module';import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';import { FlatViewModule } from 'src/engine/metadata-modules/flat-view/flat-view.module';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';@@ -26,6 +27,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace@Module({imports: [+ ApplicationTranslationCatalogModule,TypeOrmModule.forFeature([ViewEntity]),ViewPermissionsModule,ViewFieldGroupModule,