The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
feat: hash-based metadata staleness detection (#18649)
Charles Bochet06efee1eef24
diff --git a/packages/twenty-front/jest.config.mjs b/packages/twenty-front/jest.config.mjsindex e0687879701..4f304117172 100644--- a/packages/twenty-front/jest.config.mjs+++ b/packages/twenty-front/jest.config.mjs@@ -61,7 +61,7 @@ const jestConfig = {extensionsToTreatAsEsm: ['.ts', '.tsx'],coverageThreshold: {global: {- statements: 48.8,+ statements: 48.5,lines: 47.0,functions: 39.5,},diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex be0483f4d5e..fc8ffad795d 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -2404,6 +2404,7 @@ export type MetadataEvent = {properties: ObjectRecordEventProperties;recordId: Scalars['String'];type: MetadataEventAction;+ updatedCollectionHash?: Maybe<Scalars['String']>;};/** Metadata Event Action */@@ -2421,7 +2422,7 @@ export type MetadataEventWithQueryIds = {export type MinimalMetadata = {__typename?: 'MinimalMetadata';- metadataVersion: Scalars['Int'];+ collectionHashes: Scalars['JSON'];objectMetadataItems: Array<MinimalObjectMetadata>;views: Array<MinimalView>;};diff --git a/packages/twenty-front/src/modules/browser-event/types/MetadataOperationBrowserEventDetail.ts b/packages/twenty-front/src/modules/browser-event/types/MetadataOperationBrowserEventDetail.tsindex cff91e97490..68e4c7fd446 100644--- a/packages/twenty-front/src/modules/browser-event/types/MetadataOperationBrowserEventDetail.ts+++ b/packages/twenty-front/src/modules/browser-event/types/MetadataOperationBrowserEventDetail.ts@@ -6,4 +6,5 @@ export type MetadataOperationBrowserEventDetail<> = {metadataName: AllMetadataName;operation: MetadataOperation<T>;+ updatedCollectionHash?: string;};diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/FieldMetadataSSEEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/FieldMetadataSSEEffect.tsxindex f44521b2240..ee6da8a242b 100644--- a/packages/twenty-front/src/modules/metadata-store/effect-components/FieldMetadataSSEEffect.tsx+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/FieldMetadataSSEEffect.tsx@@ -24,6 +24,7 @@ export const FieldMetadataSSEEffect = () => {store,'fieldMetadataItems',eventDetail.operation,+ eventDetail.updatedCollectionHash,);},});diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/NavigationMenuItemSSEEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/NavigationMenuItemSSEEffect.tsxindex ac84c01155a..2ad80901d04 100644--- a/packages/twenty-front/src/modules/metadata-store/effect-components/NavigationMenuItemSSEEffect.tsx+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/NavigationMenuItemSSEEffect.tsx@@ -34,6 +34,7 @@ export const NavigationMenuItemSSEEffect = () => {store,'navigationMenuItems',eventDetail.operation,+ eventDetail.updatedCollectionHash,);const result = await client.query({diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/ObjectMetadataItemSSEEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/ObjectMetadataItemSSEEffect.tsxindex ef0ce959d84..142779f6d56 100644--- a/packages/twenty-front/src/modules/metadata-store/effect-components/ObjectMetadataItemSSEEffect.tsx+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/ObjectMetadataItemSSEEffect.tsx@@ -31,6 +31,7 @@ export const ObjectMetadataItemSSEEffect = () => {store,'objectMetadataItems',eventDetail.operation,+ eventDetail.updatedCollectionHash,);const navigationMenuItemsResult = await client.query({diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/PageLayoutSSEEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/PageLayoutSSEEffect.tsxindex fbe8418686e..f95296ba57b 100644--- a/packages/twenty-front/src/modules/metadata-store/effect-components/PageLayoutSSEEffect.tsx+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/PageLayoutSSEEffect.tsx@@ -26,6 +26,7 @@ export const PageLayoutSSEEffect = () => {store,'pageLayouts',eventDetail.operation,+ eventDetail.updatedCollectionHash,);refreshPageLayouts();diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/PageLayoutTabSSEEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/PageLayoutTabSSEEffect.tsxindex 4efa02f7000..0108be39ccd 100644--- a/packages/twenty-front/src/modules/metadata-store/effect-components/PageLayoutTabSSEEffect.tsx+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/PageLayoutTabSSEEffect.tsx@@ -26,6 +26,7 @@ export const PageLayoutTabSSEEffect = () => {store,'pageLayoutTabs',eventDetail.operation,+ eventDetail.updatedCollectionHash,);refreshPageLayouts();diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/PageLayoutWidgetSSEEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/PageLayoutWidgetSSEEffect.tsxindex 74dcb856242..0bbd0b3fcf9 100644--- a/packages/twenty-front/src/modules/metadata-store/effect-components/PageLayoutWidgetSSEEffect.tsx+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/PageLayoutWidgetSSEEffect.tsx@@ -26,6 +26,7 @@ export const PageLayoutWidgetSSEEffect = () => {store,'pageLayoutWidgets',eventDetail.operation,+ eventDetail.updatedCollectionHash,);refreshPageLayouts();diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/ViewFieldSSEEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/ViewFieldSSEEffect.tsxindex 6b706fd2518..22cc77d0e19 100644--- a/packages/twenty-front/src/modules/metadata-store/effect-components/ViewFieldSSEEffect.tsx+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/ViewFieldSSEEffect.tsx@@ -33,6 +33,7 @@ export const ViewFieldSSEEffect = () => {store,'viewFields',eventDetail.operation,+ eventDetail.updatedCollectionHash,);const coreViews = store.get(coreViewsState.atom);diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/ViewFilterGroupSSEEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/ViewFilterGroupSSEEffect.tsxindex cf25b070989..4a10c1cfc73 100644--- a/packages/twenty-front/src/modules/metadata-store/effect-components/ViewFilterGroupSSEEffect.tsx+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/ViewFilterGroupSSEEffect.tsx@@ -28,6 +28,7 @@ export const ViewFilterGroupSSEEffect = () => {store,'viewFilterGroups',eventDetail.operation,+ eventDetail.updatedCollectionHash,);const coreViews = store.get(coreViewsState.atom);diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/ViewFilterSSEEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/ViewFilterSSEEffect.tsxindex 0978da19a0a..aaafada345b 100644--- a/packages/twenty-front/src/modules/metadata-store/effect-components/ViewFilterSSEEffect.tsx+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/ViewFilterSSEEffect.tsx@@ -28,6 +28,7 @@ export const ViewFilterSSEEffect = () => {store,'viewFilters',eventDetail.operation,+ eventDetail.updatedCollectionHash,);const coreViews = store.get(coreViewsState.atom);diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/ViewSSEEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/ViewSSEEffect.tsxindex 6cdf8c836bf..a52c32e2c7c 100644--- a/packages/twenty-front/src/modules/metadata-store/effect-components/ViewSSEEffect.tsx+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/ViewSSEEffect.tsx@@ -27,7 +27,12 @@ export const ViewSSEEffect = () => {useListenToMetadataOperationBrowserEvent({metadataName: AllMetadataName.view,onMetadataOperationBrowserEvent: async (eventDetail) => {- patchMetadataStoreFromSSEEvent(store, 'views', eventDetail.operation);+ patchMetadataStoreFromSSEEvent(+ store,+ 'views',+ eventDetail.operation,+ eventDetail.updatedCollectionHash,+ );switch (eventDetail.operation.type) {case 'create': {diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/ViewSortSSEEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/ViewSortSSEEffect.tsxindex 44b7bc6ce30..e665a476a71 100644--- a/packages/twenty-front/src/modules/metadata-store/effect-components/ViewSortSSEEffect.tsx+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/ViewSortSSEEffect.tsx@@ -24,7 +24,12 @@ export const ViewSortSSEEffect = () => {useListenToMetadataOperationBrowserEvent({metadataName: AllMetadataName.viewSort,onMetadataOperationBrowserEvent: (eventDetail) => {- patchMetadataStoreFromSSEEvent(store, 'viewSorts', eventDetail.operation);+ patchMetadataStoreFromSSEEvent(+ store,+ 'viewSorts',+ eventDetail.operation,+ eventDetail.updatedCollectionHash,+ );const coreViews = store.get(coreViewsState.atom);diff --git a/packages/twenty-front/src/modules/metadata-store/graphql/queries/findMinimalMetadata.ts b/packages/twenty-front/src/modules/metadata-store/graphql/queries/findMinimalMetadata.tsindex 117e9f1c7db..44ef62f9e77 100644--- a/packages/twenty-front/src/modules/metadata-store/graphql/queries/findMinimalMetadata.ts+++ b/packages/twenty-front/src/modules/metadata-store/graphql/queries/findMinimalMetadata.ts@@ -21,7 +21,7 @@ export const FIND_MINIMAL_METADATA = gql`keyobjectMetadataId}- metadataVersion+ collectionHashes}}`;diff --git a/packages/twenty-front/src/modules/metadata-store/hooks/useLoadMinimalMetadata.ts b/packages/twenty-front/src/modules/metadata-store/hooks/useLoadMinimalMetadata.tsindex e4945c9543d..7187a275ae7 100644--- a/packages/twenty-front/src/modules/metadata-store/hooks/useLoadMinimalMetadata.ts+++ b/packages/twenty-front/src/modules/metadata-store/hooks/useLoadMinimalMetadata.ts@@ -1,9 +1,13 @@import { FIND_MINIMAL_METADATA } from '@/metadata-store/graphql/queries/findMinimalMetadata';-import { metadataStoreState } from '@/metadata-store/states/metadataStoreState';-import { metadataVersionState } from '@/metadata-store/states/metadataVersionState';+import { metadataCollectionHashesState } from '@/metadata-store/states/metadataCollectionHashesState';+import {+ metadataStoreState,+ type MetadataEntityKey,+} from '@/metadata-store/states/metadataStoreState';import { type FlatObjectMetadataItem } from '@/metadata-store/types/FlatObjectMetadataItem';import { type FlatView } from '@/metadata-store/types/FlatView';import { type FindMinimalMetadataQuery } from '@/metadata-store/types/MinimalMetadata';+import { mapAllMetadataNameToEntityKey } from '@/metadata-store/utils/mapAllMetadataNameToEntityKey';import { useApolloClient } from '@apollo/client/react';import { useStore } from 'jotai';import { useCallback } from 'react';@@ -23,19 +27,34 @@ export const useLoadMinimalMetadata = () => {return null;}- const { objectMetadataItems, views, metadataVersion } =+ const { objectMetadataItems, views, collectionHashes } =result.data.minimalMetadata;- const localMetadataVersion = store.get(metadataVersionState.atom);+ const localHashes = store.get(metadataCollectionHashesState.atom);- // Skip hydration if data already loaded with same or newer version- if (- isDefined(localMetadataVersion) &&- localMetadataVersion >= metadataVersion- ) {- return { metadataVersion, isStale: false };+ const serverHashes: Partial<Record<MetadataEntityKey, string>> = {};++ if (isDefined(collectionHashes)) {+ for (const [metadataName, hash] of Object.entries(+ collectionHashes as Record<string, string>,+ )) {+ const entityKey = mapAllMetadataNameToEntityKey(metadataName);++ if (isDefined(entityKey)) {+ serverHashes[entityKey] = hash;+ }+ }}+ store.set(metadataCollectionHashesState.atom, serverHashes);++ const staleEntityKeys: MetadataEntityKey[] = Object.entries(serverHashes)+ .filter(+ ([entityKey, hash]) =>+ localHashes[entityKey as MetadataEntityKey] !== hash,+ )+ .map(([entityKey]) => entityKey as MetadataEntityKey);+const objectsEntry = store.get(metadataStoreState.atomFamily('objectMetadataItems'),);@@ -58,12 +77,7 @@ export const useLoadMinimalMetadata = () => {});}- store.set(metadataVersionState.atom, metadataVersion);-- const isStale =- isDefined(localMetadataVersion) && localMetadataVersion < metadataVersion;-- return { metadataVersion, isStale };+ return { staleEntityKeys };}, [client, store]);return { loadMinimalMetadata };diff --git a/packages/twenty-front/src/modules/metadata-store/hooks/useMetadataStore.ts b/packages/twenty-front/src/modules/metadata-store/hooks/useMetadataStore.tsindex 64f69f51556..dd4322d9aff 100644--- a/packages/twenty-front/src/modules/metadata-store/hooks/useMetadataStore.ts+++ b/packages/twenty-front/src/modules/metadata-store/hooks/useMetadataStore.ts@@ -1,3 +1,4 @@+import { metadataCollectionHashesState } from '@/metadata-store/states/metadataCollectionHashesState';import { isAppMetadataReadyState } from '@/metadata-store/states/isAppMetadataReadyState';import {ALL_METADATA_ENTITY_KEYS,@@ -36,6 +37,7 @@ export const resetMetadataStore = (store: JotaiStore) => {store.set(metadataStoreState.atomFamily(key), EMPTY_ENTRY);}+ store.set(metadataCollectionHashesState.atom, {});store.set(isAppMetadataReadyState.atom, false);};diff --git a/packages/twenty-front/src/modules/metadata-store/hooks/useStaleMetadataEntities.ts b/packages/twenty-front/src/modules/metadata-store/hooks/useStaleMetadataEntities.tsnew file mode 100644index 00000000000..795ea76167b--- /dev/null+++ b/packages/twenty-front/src/modules/metadata-store/hooks/useStaleMetadataEntities.ts@@ -0,0 +1,27 @@+import { metadataCollectionHashesState } from '@/metadata-store/states/metadataCollectionHashesState';+import {+ ALL_METADATA_ENTITY_KEYS,+ type MetadataEntityKey,+} from '@/metadata-store/states/metadataStoreState';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { useMemo } from 'react';++// Returns the list of MetadataEntityKey whose local collection hash+// is missing or differs from the last known server collection hash.+export const useStaleMetadataEntities = (): MetadataEntityKey[] => {+ const metadataCollectionHashes = useAtomStateValue(+ metadataCollectionHashesState,+ );++ return useMemo(() => {+ const staleKeys: MetadataEntityKey[] = [];++ for (const entityKey of ALL_METADATA_ENTITY_KEYS) {+ if (metadataCollectionHashes[entityKey] === undefined) {+ staleKeys.push(entityKey);+ }+ }++ return staleKeys;+ }, [metadataCollectionHashes]);+};diff --git a/packages/twenty-front/src/modules/metadata-store/states/metadataCollectionHashesState.ts b/packages/twenty-front/src/modules/metadata-store/states/metadataCollectionHashesState.tsnew file mode 100644index 00000000000..a7d40251ca9--- /dev/null+++ b/packages/twenty-front/src/modules/metadata-store/states/metadataCollectionHashesState.ts@@ -0,0 +1,11 @@+import { type MetadataEntityKey } from '@/metadata-store/states/metadataStoreState';+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';++export const metadataCollectionHashesState = createAtomState<+ Partial<Record<MetadataEntityKey, string>>+>({+ key: 'metadataCollectionHashesState',+ defaultValue: {},+ useLocalStorage: true,+ localStorageOptions: { getOnInit: true },+});diff --git a/packages/twenty-front/src/modules/metadata-store/states/metadataVersionState.ts b/packages/twenty-front/src/modules/metadata-store/states/metadataVersionState.tsdeleted file mode 100644index b78166033f1..00000000000--- a/packages/twenty-front/src/modules/metadata-store/states/metadataVersionState.ts+++ /dev/null@@ -1,8 +0,0 @@-import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';--export const metadataVersionState = createAtomState<number | null>({- key: 'metadataVersionState',- defaultValue: null,- useLocalStorage: true,- localStorageOptions: { getOnInit: true },-});diff --git a/packages/twenty-front/src/modules/metadata-store/utils/mapAllMetadataNameToEntityKey.ts b/packages/twenty-front/src/modules/metadata-store/utils/mapAllMetadataNameToEntityKey.tsnew file mode 100644index 00000000000..98ddfa03418--- /dev/null+++ b/packages/twenty-front/src/modules/metadata-store/utils/mapAllMetadataNameToEntityKey.ts@@ -0,0 +1,32 @@+import { type MetadataEntityKey } from '@/metadata-store/states/metadataStoreState';++const METADATA_NAME_TO_ENTITY_KEY: Record<string, MetadataEntityKey> = {+ objectMetadata: 'objectMetadataItems',+ fieldMetadata: 'fieldMetadataItems',+ index: 'indexMetadataItems',+ view: 'views',+ viewField: 'viewFields',+ viewFieldGroup: 'viewFieldGroups',+ viewGroup: 'viewGroups',+ viewSort: 'viewSorts',+ viewFilter: 'viewFilters',+ viewFilterGroup: 'viewFilterGroups',+ rowLevelPermissionPredicate: 'rowLevelPermissionPredicates',+ rowLevelPermissionPredicateGroup: 'rowLevelPermissionPredicateGroups',+ logicFunction: 'logicFunctions',+ role: 'roles',+ roleTarget: 'roleTargets',+ agent: 'agents',+ skill: 'skills',+ pageLayout: 'pageLayouts',+ pageLayoutWidget: 'pageLayoutWidgets',+ pageLayoutTab: 'pageLayoutTabs',+ commandMenuItem: 'commandMenuItems',+ navigationMenuItem: 'navigationMenuItems',+ frontComponent: 'frontComponents',+ webhook: 'webhooks',+};++export const mapAllMetadataNameToEntityKey = (+ metadataName: string,+): MetadataEntityKey | undefined => METADATA_NAME_TO_ENTITY_KEY[metadataName];diff --git a/packages/twenty-front/src/modules/metadata-store/utils/patchMetadataStoreFromSSEEvent.ts b/packages/twenty-front/src/modules/metadata-store/utils/patchMetadataStoreFromSSEEvent.tsindex 23787e396ae..c9b863a19f8 100644--- a/packages/twenty-front/src/modules/metadata-store/utils/patchMetadataStoreFromSSEEvent.ts+++ b/packages/twenty-front/src/modules/metadata-store/utils/patchMetadataStoreFromSSEEvent.ts@@ -1,8 +1,10 @@+import { metadataCollectionHashesState } from '@/metadata-store/states/metadataCollectionHashesState';import {metadataStoreState,type MetadataEntityKey,} from '@/metadata-store/states/metadataStoreState';import { type createStore } from 'jotai';+import { isDefined } from 'twenty-shared/utils';type JotaiStore = ReturnType<typeof createStore>;@@ -24,6 +26,7 @@ export const patchMetadataStoreFromSSEEvent = (store: JotaiStore,entityKey: MetadataEntityKey,operation: SSEEventOperation,+ updatedCollectionHash?: string,) => {const entry = store.get(metadataStoreState.atomFamily(entityKey));const currentItems = entry.current as Array<{ id: string }>;@@ -57,4 +60,13 @@ export const patchMetadataStoreFromSSEEvent = (break;}}++ if (isDefined(updatedCollectionHash)) {+ const currentHashes = store.get(metadataCollectionHashesState.atom);++ store.set(metadataCollectionHashesState.atom, {+ ...currentHashes,+ [entityKey]: updatedCollectionHash,+ });+ }};diff --git a/packages/twenty-front/src/modules/sse-db-event/utils/turnSseMetadataEventsToMetadataOperationBrowserEvents.ts b/packages/twenty-front/src/modules/sse-db-event/utils/turnSseMetadataEventsToMetadataOperationBrowserEvents.tsindex 7fdea55d36d..7d8d864c518 100644--- a/packages/twenty-front/src/modules/sse-db-event/utils/turnSseMetadataEventsToMetadataOperationBrowserEvents.ts+++ b/packages/twenty-front/src/modules/sse-db-event/utils/turnSseMetadataEventsToMetadataOperationBrowserEvents.ts@@ -17,6 +17,8 @@ export const turnSseMetadataEventsToMetadataOperationBrowserEvents = <}): MetadataOperationBrowserEventDetail<T>[] => {return sseMetadataEvents.map((event): MetadataOperationBrowserEventDetail<T> | null => {+ const updatedCollectionHash = event.updatedCollectionHash ?? undefined;+switch (event.type) {case MetadataEventAction.CREATED: {const createdRecord = event.properties.after;@@ -31,6 +33,7 @@ export const turnSseMetadataEventsToMetadataOperationBrowserEvents = <type: 'create',createdRecord,},+ updatedCollectionHash,};}case MetadataEventAction.UPDATED: {@@ -47,6 +50,7 @@ export const turnSseMetadataEventsToMetadataOperationBrowserEvents = <updatedRecord,updatedFields: event.properties.updatedFields ?? undefined,},+ updatedCollectionHash,};}case MetadataEventAction.DELETED: {@@ -56,6 +60,7 @@ export const turnSseMetadataEventsToMetadataOperationBrowserEvents = <type: 'delete',deletedRecordId: event.recordId,},+ updatedCollectionHash,};}default:diff --git a/packages/twenty-sdk/src/clients/generated/metadata/schema.graphql b/packages/twenty-sdk/src/clients/generated/metadata/schema.graphqlindex 1d55db20506..57e5ac4e4ce 100644--- a/packages/twenty-sdk/src/clients/generated/metadata/schema.graphql+++ b/packages/twenty-sdk/src/clients/generated/metadata/schema.graphql@@ -1245,6 +1245,7 @@ type MetadataEvent {metadataName: String!recordId: String!properties: ObjectRecordEventProperties!+ updatedCollectionHash: String}"""Metadata Event Action"""@@ -2227,7 +2228,7 @@ type MinimalView {type MinimalMetadata {objectMetadataItems: [MinimalObjectMetadata!]!views: [MinimalView!]!- metadataVersion: Int!+ collectionHashes: JSON!}type Webhook {diff --git a/packages/twenty-sdk/src/clients/generated/metadata/schema.ts b/packages/twenty-sdk/src/clients/generated/metadata/schema.tsindex 9cbeccff29a..59b0074b639 100644--- a/packages/twenty-sdk/src/clients/generated/metadata/schema.ts+++ b/packages/twenty-sdk/src/clients/generated/metadata/schema.ts@@ -974,6 +974,7 @@ export interface MetadataEvent {metadataName: Scalars['String']recordId: Scalars['String']properties: ObjectRecordEventProperties+ updatedCollectionHash?: Scalars['String']__typename: 'MetadataEvent'}@@ -1910,7 +1911,7 @@ export interface MinimalView {export interface MinimalMetadata {objectMetadataItems: MinimalObjectMetadata[]views: MinimalView[]- metadataVersion: Scalars['Int']+ collectionHashes: Scalars['JSON']__typename: 'MinimalMetadata'}@@ -3902,6 +3903,7 @@ export interface MetadataEventGenqlSelection{metadataName?: boolean | numberrecordId?: boolean | numberproperties?: ObjectRecordEventPropertiesGenqlSelection+ updatedCollectionHash?: boolean | number__typename?: boolean | number__scalar?: boolean | number}@@ -4905,7 +4907,7 @@ export interface MinimalViewGenqlSelection{export interface MinimalMetadataGenqlSelection{objectMetadataItems?: MinimalObjectMetadataGenqlSelectionviews?: MinimalViewGenqlSelection- metadataVersion?: boolean | number+ collectionHashes?: boolean | number__typename?: boolean | number__scalar?: boolean | number}diff --git a/packages/twenty-sdk/src/clients/generated/metadata/types.ts b/packages/twenty-sdk/src/clients/generated/metadata/types.tsindex 4ac4e27d1db..581dc806964 100644--- a/packages/twenty-sdk/src/clients/generated/metadata/types.ts+++ b/packages/twenty-sdk/src/clients/generated/metadata/types.ts@@ -2589,6 +2589,9 @@ export default {"properties": [113],+ "updatedCollectionHash": [+ 1+ ],"__typename": [1]@@ -4382,8 +4385,8 @@ export default {"views": [237],- "metadataVersion": [- 21+ "collectionHashes": [+ 15],"__typename": [1diff --git a/packages/twenty-server/src/engine/metadata-event-emitter/listeners/metadata-events-to-db.listener.ts b/packages/twenty-server/src/engine/metadata-event-emitter/listeners/metadata-events-to-db.listener.tsindex 2f2916f8d4b..e11e09fe1bc 100644--- a/packages/twenty-server/src/engine/metadata-event-emitter/listeners/metadata-events-to-db.listener.ts+++ b/packages/twenty-server/src/engine/metadata-event-emitter/listeners/metadata-events-to-db.listener.ts@@ -7,7 +7,10 @@ import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decoraimport { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';import { type MetadataEventBatch } from 'src/engine/metadata-event-emitter/types/metadata-event-batch.type';+import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';import { CallWebhookJobsForMetadataJob } from 'src/engine/metadata-modules/webhook/jobs/call-webhook-jobs-for-metadata.job';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { type WorkspaceCacheKeyName } from 'src/engine/workspace-cache/types/workspace-cache-key.type';import { WorkspaceEventEmitterService } from 'src/engine/workspace-event-emitter/workspace-event-emitter.service';import { type AllMetadataEventType } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event';@@ -17,6 +20,7 @@ export class MetadataEventsToDbListener {@InjectMessageQueue(MessageQueue.webhookQueue)private readonly webhookQueueService: MessageQueueService,private readonly workspaceEventEmitterService: WorkspaceEventEmitterService,+ private readonly workspaceCacheService: WorkspaceCacheService,) {}@OnEvent('metadata.*.created')@@ -53,7 +57,21 @@ export class MetadataEventsToDbListener {});if (metadataEventBatch.events.length > 0) {- await this.workspaceEventEmitterService.publish(metadataEventBatch);+ const cacheKeyName = getMetadataFlatEntityMapsKey(+ metadataEventBatch.metadataName,+ ) as WorkspaceCacheKeyName;++ const cacheHashes = await this.workspaceCacheService.getCacheHashes(+ metadataEventBatch.workspaceId,+ [cacheKeyName],+ );++ const updatedCollectionHash = cacheHashes[cacheKeyName];++ await this.workspaceEventEmitterService.publish({+ ...metadataEventBatch,+ updatedCollectionHash,+ });}}}diff --git a/packages/twenty-server/src/engine/metadata-event-emitter/metadata-event-emitter.module.ts b/packages/twenty-server/src/engine/metadata-event-emitter/metadata-event-emitter.module.tsindex 1ae18b09dd6..3e89c281a66 100644--- a/packages/twenty-server/src/engine/metadata-event-emitter/metadata-event-emitter.module.ts+++ b/packages/twenty-server/src/engine/metadata-event-emitter/metadata-event-emitter.module.ts@@ -3,10 +3,11 @@ import { Global, Module } from '@nestjs/common';import { MetadataEventsToDbListener } from 'src/engine/metadata-event-emitter/listeners/metadata-events-to-db.listener';import { MetadataEventEmitter } from 'src/engine/metadata-event-emitter/metadata-event-emitter';import { SubscriptionsModule } from 'src/engine/subscriptions/subscriptions.module';+import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';@Global()@Module({- imports: [SubscriptionsModule],+ imports: [SubscriptionsModule, WorkspaceCacheModule],providers: [MetadataEventEmitter, MetadataEventsToDbListener],exports: [MetadataEventEmitter],})diff --git a/packages/twenty-server/src/engine/metadata-event-emitter/types/metadata-event-batch.type.ts b/packages/twenty-server/src/engine/metadata-event-emitter/types/metadata-event-batch.type.tsindex 3d7fdfc7794..71d6dc10375 100644--- a/packages/twenty-server/src/engine/metadata-event-emitter/types/metadata-event-batch.type.ts+++ b/packages/twenty-server/src/engine/metadata-event-emitter/types/metadata-event-batch.type.ts@@ -16,4 +16,5 @@ export type MetadataEventBatch<events: MetadataEvent[];userId?: string;apiKeyId?: string;+ updatedCollectionHash?: string;};diff --git a/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/dtos/minimal-metadata.dto.ts b/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/dtos/minimal-metadata.dto.tsindex 56264888996..0eec46bb05b 100644--- a/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/dtos/minimal-metadata.dto.ts+++ b/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/dtos/minimal-metadata.dto.ts@@ -1,4 +1,5 @@-import { Field, Int, ObjectType } from '@nestjs/graphql';+import { Field, ObjectType } from '@nestjs/graphql';+import { GraphQLJSON } from 'graphql-type-json';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';@@ -11,6 +12,6 @@ export class MinimalMetadataDTO {@Field(() => [MinimalViewDTO])views: MinimalViewDTO[];- @Field(() => Int)- metadataVersion: number;+ @Field(() => GraphQLJSON)+ collectionHashes: Record<string, string>;}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.tsindex b3b5c630f3f..c8eebfc5094 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,16 +1,12 @@import { Module } from '@nestjs/common';-import { TypeOrmModule } from '@nestjs/typeorm';-import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';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: [- TypeOrmModule.forFeature([WorkspaceEntity]),- WorkspaceManyOrAllFlatEntityMapsCacheModule,- ],+ imports: [WorkspaceManyOrAllFlatEntityMapsCacheModule, WorkspaceCacheModule],providers: [MinimalMetadataResolver, MinimalMetadataService],exports: [MinimalMetadataService],})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.tsindex 9f2f1f980d9..48623f5700b 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@@ -1,40 +1,66 @@import { Injectable } from '@nestjs/common';-import { InjectRepository } from '@nestjs/typeorm';+import {+ ALL_METADATA_NAME,+ type AllMetadataName,+} from 'twenty-shared/metadata';import { ViewVisibility } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { Repository } from 'typeorm';+import { isDefined, uncapitalize } from 'twenty-shared/utils';-import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+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 { 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 { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { type WorkspaceCacheKeyName } from 'src/engine/workspace-cache/types/workspace-cache-key.type';++// Inverse of getMetadataFlatEntityMapsKey: "flatObjectMetadataMaps" -> "objectMetadata"+const flatMapsKeyToMetadataName = (+ flatMapsKey: string,+): AllMetadataName | undefined => {+ const withoutPrefix = flatMapsKey.replace(/^flat/, '');+ const withoutSuffix = withoutPrefix.replace(/Maps$/, '');+ const metadataName = uncapitalize(withoutSuffix);++ return metadataName in ALL_METADATA_NAME+ ? (metadataName as AllMetadataName)+ : undefined;+};@Injectable()export class MinimalMetadataService {constructor(- @InjectRepository(WorkspaceEntity)- private readonly workspaceRepository: Repository<WorkspaceEntity>,private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,+ private readonly workspaceCacheService: WorkspaceCacheService,) {}async getMinimalMetadata(workspaceId: string,userWorkspaceId?: string,): Promise<MinimalMetadataDTO> {- const [workspace, { flatObjectMetadataMaps, flatViewMaps }] =+ const [{ flatObjectMetadataMaps, flatViewMaps }, cacheHashes] =await Promise.all([- this.workspaceRepository.findOneOrFail({- where: { id: workspaceId },- select: ['metadataVersion'],- }),this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps({workspaceId,flatMapsKeys: ['flatObjectMetadataMaps', 'flatViewMaps'],}),+ this.workspaceCacheService.getCacheHashes(+ workspaceId,+ ALL_FLAT_ENTITY_MAPS_PROPERTIES as WorkspaceCacheKeyName[],+ ),]);+ const collectionHashes: Record<string, string> = {};++ for (const [cacheKey, hash] of Object.entries(cacheHashes)) {+ const metadataName = flatMapsKeyToMetadataName(cacheKey);++ if (isDefined(metadataName) && isDefined(hash)) {+ collectionHashes[metadataName] = hash;+ }+ }+const objectMetadataItems: MinimalObjectMetadataDTO[] = Object.values(flatObjectMetadataMaps.byUniversalIdentifier,)@@ -76,7 +102,7 @@ export class MinimalMetadataService {return {objectMetadataItems,views,- metadataVersion: workspace.metadataVersion,+ collectionHashes,};}}diff --git a/packages/twenty-server/src/engine/subscriptions/dtos/metadata-event.dto.ts b/packages/twenty-server/src/engine/subscriptions/dtos/metadata-event.dto.tsindex 6b7bcdd4feb..3ed17b7bcc0 100644--- a/packages/twenty-server/src/engine/subscriptions/dtos/metadata-event.dto.ts+++ b/packages/twenty-server/src/engine/subscriptions/dtos/metadata-event.dto.ts@@ -16,4 +16,7 @@ export class MetadataEventDTO {@Field(() => ObjectRecordEventPropertiesDTO)properties: ObjectRecordEventPropertiesDTO;++ @Field(() => String, { nullable: true })+ updatedCollectionHash?: string;}diff --git a/packages/twenty-server/src/engine/workspace-cache/services/workspace-cache.service.ts b/packages/twenty-server/src/engine/workspace-cache/services/workspace-cache.service.tsindex c5703ce6746..cfa88d2090c 100644--- a/packages/twenty-server/src/engine/workspace-cache/services/workspace-cache.service.ts+++ b/packages/twenty-server/src/engine/workspace-cache/services/workspace-cache.service.ts@@ -170,6 +170,31 @@ export class WorkspaceCacheService implements OnModuleInit {await this.recomputeDataFromProvider(workspaceId, cacheKeyNames);}+ public async getCacheHashes(+ workspaceId: string,+ cacheKeyNames: WorkspaceCacheKeyName[],+ ): Promise<Partial<Record<WorkspaceCacheKeyName, string>>> {+ if (cacheKeyNames.length === 0) {+ return {};+ }++ const hashKeys = cacheKeyNames.map(+ (keyName) => `${this.buildCacheKey(workspaceId, keyName)}:hash`,+ );++ const hashes = await this.cacheStorage.mget<string>(hashKeys);++ const result: Partial<Record<WorkspaceCacheKeyName, string>> = {};++ for (const [index, keyName] of cacheKeyNames.entries()) {+ if (isDefined(hashes[index])) {+ result[keyName] = hashes[index];+ }+ }++ return result;+ }+public async flush(workspaceId: string,cacheKeyNames: WorkspaceCacheKeyName[],diff --git a/packages/twenty-server/src/engine/workspace-event-emitter/workspace-event-emitter.service.ts b/packages/twenty-server/src/engine/workspace-event-emitter/workspace-event-emitter.service.tsindex 7ed6fd78df7..11e10a3be75 100644--- a/packages/twenty-server/src/engine/workspace-event-emitter/workspace-event-emitter.service.ts+++ b/packages/twenty-server/src/engine/workspace-event-emitter/workspace-event-emitter.service.ts@@ -188,7 +188,7 @@ export class WorkspaceEventEmitterService {): Promise<void> {const metadataEventsWithQueryIds: {queryIds: string[];- metadataEvent: MetadataEvent;+ metadataEvent: MetadataEvent & { updatedCollectionHash?: string };}[] = [];for (const metadataEvent of metadataEventBatch.events) {@@ -203,7 +203,10 @@ export class WorkspaceEventEmitterService {metadataEventsWithQueryIds.push({queryIds: matchedQueryIds,- metadataEvent,+ metadataEvent: {+ ...metadataEvent,+ updatedCollectionHash: metadataEventBatch.updatedCollectionHash,+ },});}