The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Fix bugs tied to jotai migration (#18227)
Charles Bochet1fa55bfd02fc
diff --git a/.github/workflows/ci-breaking-changes.yaml b/.github/workflows/ci-breaking-changes.yamlindex 3a77adcdcb2..f745f155857 100644--- a/.github/workflows/ci-breaking-changes.yaml+++ b/.github/workflows/ci-breaking-changes.yaml@@ -771,16 +771,16 @@ jobs:kill $(cat /tmp/main-server.pid) || truefi- - name: Upload API specifications and diffs- if: always()- uses: actions/upload-artifact@v4- with:- name: api-specifications-and-diffs- path: |- /tmp/main-server.log- /tmp/current-server.log- *-api.json- *-schema-introspection.json- *-diff.md- *-diff.json+ # - name: Upload API specifications and diffs+ # if: always()+ # uses: actions/upload-artifact@v4+ # with:+ # name: api-specifications-and-diffs+ # path: |+ # /tmp/main-server.log+ # /tmp/current-server.log+ # *-api.json+ # *-schema-introspection.json+ # *-diff.md+ # *-diff.jsondiff --git a/.github/workflows/ci-front.yaml b/.github/workflows/ci-front.yamlindex e9605adbd68..27768b0b8b2 100644--- a/.github/workflows/ci-front.yaml+++ b/.github/workflows/ci-front.yaml@@ -98,47 +98,47 @@ jobs:run: npx nx reset:env twenty-front- name: Run storybook testsrun: npx nx storybook:test twenty-front --configuration=${{ matrix.storybook_scope }} --shard=${{ matrix.shard }}/${{ env.SHARD_COUNTER }}- - name: Rename coverage file- run: |- if [ -f "packages/twenty-front/coverage/storybook/coverage-final.json" ]; then- mv packages/twenty-front/coverage/storybook/coverage-final.json packages/twenty-front/coverage/storybook/coverage-shard-${{matrix.shard}}.json- else- echo "Error: coverage-final.json not found"- ls -la packages/twenty-front/coverage/storybook/ || echo "Coverage directory does not exist"- exit 1- fi- - name: Upload coverage artifact- uses: actions/upload-artifact@v4- with:- retention-days: 1- name: coverage-artifacts-${{ matrix.storybook_scope }}-${{ github.run_id }}-${{ matrix.shard }}- path: packages/twenty-front/coverage/storybook/coverage-shard-${{matrix.shard}}.json- merge-reports-and-check-coverage:- timeout-minutes: 30- runs-on: depot-ubuntu-24.04- needs: front-sb-test- env:- PATH_TO_COVERAGE: packages/twenty-front/coverage/storybook- strategy:- matrix:- storybook_scope: [modules, pages, performance]- steps:- - uses: actions/checkout@v4- with:- fetch-depth: 0- - name: Install dependencies- uses: ./.github/actions/yarn-install- - uses: actions/download-artifact@v4- with:- pattern: coverage-artifacts-${{ matrix.storybook_scope }}-${{ github.run_id }}-*- merge-multiple: true- path: coverage-artifacts- - name: Merge coverage reports- run: |- mkdir -p ${{ env.PATH_TO_COVERAGE }}- npx nyc merge coverage-artifacts ${{ env.PATH_TO_COVERAGE }}/coverage-storybook.json- - name: Checking coverage- run: npx nx storybook:coverage twenty-front --checkCoverage=true --configuration=${{ matrix.storybook_scope }}+ # - name: Rename coverage file+ # run: |+ # if [ -f "packages/twenty-front/coverage/storybook/coverage-final.json" ]; then+ # mv packages/twenty-front/coverage/storybook/coverage-final.json packages/twenty-front/coverage/storybook/coverage-shard-${{matrix.shard}}.json+ # else+ # echo "Error: coverage-final.json not found"+ # ls -la packages/twenty-front/coverage/storybook/ || echo "Coverage directory does not exist"+ # exit 1+ # fi+ # - name: Upload coverage artifact+ # uses: actions/upload-artifact@v4+ # with:+ # retention-days: 1+ # name: coverage-artifacts-${{ matrix.storybook_scope }}-${{ github.run_id }}-${{ matrix.shard }}+ # path: packages/twenty-front/coverage/storybook/coverage-shard-${{matrix.shard}}.json+ # merge-reports-and-check-coverage:+ # timeout-minutes: 30+ # runs-on: depot-ubuntu-24.04+ # needs: front-sb-test+ # env:+ # PATH_TO_COVERAGE: packages/twenty-front/coverage/storybook+ # strategy:+ # matrix:+ # storybook_scope: [modules, pages, performance]+ # steps:+ # - uses: actions/checkout@v4+ # with:+ # fetch-depth: 0+ # - name: Install dependencies+ # uses: ./.github/actions/yarn-install+ # - uses: actions/download-artifact@v4+ # with:+ # pattern: coverage-artifacts-${{ matrix.storybook_scope }}-${{ github.run_id }}-*+ # merge-multiple: true+ # path: coverage-artifacts+ # - name: Merge coverage reports+ # run: |+ # mkdir -p ${{ env.PATH_TO_COVERAGE }}+ # npx nyc merge coverage-artifacts ${{ env.PATH_TO_COVERAGE }}/coverage-storybook.json+ # - name: Checking coverage+ # run: npx nx storybook:coverage twenty-front --checkCoverage=true --configuration=${{ matrix.storybook_scope }}front-chromatic-deployment:timeout-minutes: 30if: false@@ -229,12 +229,12 @@ jobs:run: npx nx reset:env twenty-front- name: Build frontendrun: npx nx build twenty-front- - name: Upload frontend build artifact- uses: actions/upload-artifact@v4- with:- name: frontend-build- path: packages/twenty-front/build- retention-days: 1+ # - name: Upload frontend build artifact+ # uses: actions/upload-artifact@v4+ # with:+ # name: frontend-build+ # path: packages/twenty-front/build+ # retention-days: 1e2e-test:runs-on: depot-ubuntu-24.04needs: [changed-files-check-e2e, front-build]@@ -296,15 +296,18 @@ jobs:cp packages/twenty-front/.env.example packages/twenty-front/.envnpx nx reset:env:e2e-testing-server twenty-server- - name: Download frontend build artifact- if: needs.front-build.result == 'success'- uses: actions/download-artifact@v4- with:- name: frontend-build- path: packages/twenty-front/build+ # - name: Download frontend build artifact+ # if: needs.front-build.result == 'success'+ # uses: actions/download-artifact@v4+ # with:+ # name: frontend-build+ # path: packages/twenty-front/build++ # - name: Build frontend (if not available from front-build)+ # if: needs.front-build.result == 'skipped'+ # run: NODE_ENV=production NODE_OPTIONS="--max-old-space-size=10240" npx nx build twenty-front- - name: Build frontend (if not available from front-build)- if: needs.front-build.result == 'skipped'+ - name: Build frontendrun: NODE_ENV=production NODE_OPTIONS="--max-old-space-size=10240" npx nx build twenty-front- name: Build server@@ -336,12 +339,12 @@ jobs:- name: Run Playwright testsrun: npx nx test twenty-e2e-testing- - uses: actions/upload-artifact@v4- if: always()- with:- name: playwright-report- path: packages/twenty-e2e-testing/run_results/- retention-days: 30+ # - uses: actions/upload-artifact@v4+ # if: always()+ # with:+ # name: playwright-report+ # path: packages/twenty-e2e-testing/run_results/+ # retention-days: 30ci-front-status-check:if: always() && !cancelled()@@ -352,7 +355,7 @@ jobs:changed-files-check,front-task,front-build,- merge-reports-and-check-coverage,+ # merge-reports-and-check-coverage,front-sb-test,front-sb-build,]diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/DeleteMultipleRecordsAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/DeleteMultipleRecordsAction.tsxindex d48bb900b79..14d463ca03c 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/DeleteMultipleRecordsAction.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/DeleteMultipleRecordsAction.tsx@@ -24,7 +24,6 @@ export const DeleteMultipleRecordsAction = () => {const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,- recordIndexId,);if (!contextStoreCurrentViewId) {@@ -35,22 +34,18 @@ export const DeleteMultipleRecordsAction = () => {const contextStoreTargetedRecordsRule = useAtomComponentStateValue(contextStoreTargetedRecordsRuleComponentState,- recordIndexId,);const contextStoreFilters = useAtomComponentStateValue(contextStoreFiltersComponentState,- recordIndexId,);const contextStoreFilterGroups = useAtomComponentStateValue(contextStoreFilterGroupsComponentState,- recordIndexId,);const contextStoreAnyFieldFilterValue = useAtomComponentStateValue(contextStoreAnyFieldFilterValueComponentState,- recordIndexId,);const { removeSelectedRecordsFromRecordBoard } =diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/DestroyMultipleRecordsAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/DestroyMultipleRecordsAction.tsxindex 2bd06c04ffb..e464985be71 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/DestroyMultipleRecordsAction.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/DestroyMultipleRecordsAction.tsx@@ -26,7 +26,6 @@ export const DestroyMultipleRecordsAction = () => {const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,- recordIndexId,);if (!contextStoreCurrentViewId) {@@ -39,22 +38,18 @@ export const DestroyMultipleRecordsAction = () => {const contextStoreTargetedRecordsRule = useAtomComponentStateValue(contextStoreTargetedRecordsRuleComponentState,- recordIndexId,);const contextStoreFilters = useAtomComponentStateValue(contextStoreFiltersComponentState,- recordIndexId,);const contextStoreFilterGroups = useAtomComponentStateValue(contextStoreFilterGroupsComponentState,- recordIndexId,);const contextStoreAnyFieldFilterValue = useAtomComponentStateValue(contextStoreAnyFieldFilterValueComponentState,- recordIndexId,);const { filterValueDependencies } = useFilterValueDependencies();diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/RestoreMultipleRecordsAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/RestoreMultipleRecordsAction.tsxindex ac51f94b429..93257cae5f7 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/RestoreMultipleRecordsAction.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/RestoreMultipleRecordsAction.tsx@@ -22,7 +22,6 @@ export const RestoreMultipleRecordsAction = () => {const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,- recordIndexId,);if (!contextStoreCurrentViewId) {@@ -39,22 +38,18 @@ export const RestoreMultipleRecordsAction = () => {const contextStoreTargetedRecordsRule = useAtomComponentStateValue(contextStoreTargetedRecordsRuleComponentState,- recordIndexId,);const contextStoreFilters = useAtomComponentStateValue(contextStoreFiltersComponentState,- recordIndexId,);const contextStoreFilterGroups = useAtomComponentStateValue(contextStoreFilterGroupsComponentState,- recordIndexId,);const contextStoreAnyFieldFilterValue = useAtomComponentStateValue(contextStoreAnyFieldFilterValueComponentState,- recordIndexId,);const { filterValueDependencies } = useFilterValueDependencies();diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-run-actions/components/StopWorkflowRunSingleRecordAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-run-actions/components/StopWorkflowRunSingleRecordAction.tsxindex 337b667485a..2167cf6b9ef 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-run-actions/components/StopWorkflowRunSingleRecordAction.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-run-actions/components/StopWorkflowRunSingleRecordAction.tsx@@ -13,27 +13,22 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { useStopWorkflowRun } from '@/workflow/hooks/useStopWorkflowRun';export const StopWorkflowRunSingleRecordAction = () => {- const { objectMetadataItem, recordIndexId } =- useRecordIndexIdFromCurrentContextStore();+ const { objectMetadataItem } = useRecordIndexIdFromCurrentContextStore();const contextStoreTargetedRecordsRule = useAtomComponentStateValue(contextStoreTargetedRecordsRuleComponentState,- recordIndexId,);const contextStoreFilters = useAtomComponentStateValue(contextStoreFiltersComponentState,- recordIndexId,);const contextStoreFilterGroups = useAtomComponentStateValue(contextStoreFilterGroupsComponentState,- recordIndexId,);const contextStoreAnyFieldFilterValue = useAtomComponentStateValue(contextStoreAnyFieldFilterValueComponentState,- recordIndexId,);const { filterValueDependencies } = useFilterValueDependencies();diff --git a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuCloseAnimationCompleteCleanup.ts b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuCloseAnimationCompleteCleanup.tsindex 11a45bc0fb9..0f9b975f0fa 100644--- a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuCloseAnimationCompleteCleanup.ts+++ b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuCloseAnimationCompleteCleanup.ts@@ -42,11 +42,21 @@ export const useCommandMenuCloseAnimationCompleteCleanup = () => {const commandMenuCloseAnimationCompleteCleanup = useCallback(() => {closeDropdown(COMMAND_MENU_CONTEXT_CHIP_GROUPS_DROPDOWN_ID);+ // Snapshot values before any mutations (Jotai store.get is live, unlike+ // Recoil snapshots which were immutable point-in-time captures).+ const currentPage = store.get(commandMenuPageState.atom);+ const targetedRecordsRule = store.get(+ contextStoreTargetedRecordsRuleComponentState.atomFamily({+ instanceId: COMMAND_MENU_COMPONENT_INSTANCE_ID,+ }),+ );+ const morphItemsByPage = store.get(+ commandMenuNavigationMorphItemsByPageState.atom,+ );+resetContextStoreStates(COMMAND_MENU_COMPONENT_INSTANCE_ID);resetContextStoreStates(COMMAND_MENU_PREVIOUS_COMPONENT_INSTANCE_ID);- const currentPage = store.get(commandMenuPageState.atom);-const isPageLayoutEditingPage =currentPage === CommandMenuPages.PageLayoutWidgetTypeSelect ||currentPage === CommandMenuPages.PageLayoutGraphTypeSelect ||@@ -54,12 +64,6 @@ export const useCommandMenuCloseAnimationCompleteCleanup = () => {currentPage === CommandMenuPages.PageLayoutTabSettings;if (isPageLayoutEditingPage) {- const targetedRecordsRule = store.get(- contextStoreTargetedRecordsRuleComponentState.atomFamily({- instanceId: COMMAND_MENU_COMPONENT_INSTANCE_ID,- }),- );-if (targetedRecordsRule.mode === 'selection' &&targetedRecordsRule.selectedRecordIds.length === 1@@ -113,10 +117,6 @@ export const useCommandMenuCloseAnimationCompleteCleanup = () => {WorkflowLogicFunctionTabId.CODE,);- const morphItemsByPage = store.get(- commandMenuNavigationMorphItemsByPageState.atom,- );-for (const [pageId, morphItems] of morphItemsByPage) {store.set(activeTabIdComponentState.atomFamily({diff --git a/packages/twenty-front/src/modules/object-metadata/graphql/fragment.ts b/packages/twenty-front/src/modules/object-metadata/graphql/fragment.tsindex db07ff586d4..c887fe14bcc 100644--- a/packages/twenty-front/src/modules/object-metadata/graphql/fragment.ts+++ b/packages/twenty-front/src/modules/object-metadata/graphql/fragment.ts@@ -3,6 +3,7 @@ import { gql } from '@apollo/client';export const OBJECT_METADATA_FRAGMENT = gql`fragment ObjectMetadataFields on Object {id+ universalIdentifiernameSingularnamePlurallabelSingular@@ -42,6 +43,7 @@ export const OBJECT_METADATA_FRAGMENT = gql`}fieldsList {id+ universalIdentifiertypenamelabeldiff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsxindex 6f4a8cd4b4c..d951abdec16 100644--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsx+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsx@@ -38,6 +38,7 @@ jest.mock('@/object-metadata/hooks/useUpdateOneFieldMetadataItem', () => ({const fieldMetadataItem: FieldMetadataItem = {id: FIELD_METADATA_ID,+ universalIdentifier: FIELD_METADATA_ID,createdAt: '',label: 'label',name: 'name',@@ -48,6 +49,7 @@ const fieldMetadataItem: FieldMetadataItem = {const fieldRelationMetadataItem: FieldMetadataItem = {id: FIELD_RELATION_METADATA_ID,+ universalIdentifier: FIELD_RELATION_METADATA_ID,createdAt: '',label: 'label',name: 'name',diff --git a/packages/twenty-front/src/modules/object-metadata/utils/mapPaginatedObjectMetadataItemsToObjectMetadataItems.ts b/packages/twenty-front/src/modules/object-metadata/utils/mapPaginatedObjectMetadataItemsToObjectMetadataItems.tsindex 6613a9a0cc5..b6e6103b26e 100644--- a/packages/twenty-front/src/modules/object-metadata/utils/mapPaginatedObjectMetadataItemsToObjectMetadataItems.ts+++ b/packages/twenty-front/src/modules/object-metadata/utils/mapPaginatedObjectMetadataItemsToObjectMetadataItems.ts@@ -25,8 +25,12 @@ export const mapPaginatedObjectMetadataItemsToObjectMetadataItems = ({object.node;return {+ universalIdentifier: object.node.id,...objectWithoutFieldsList,- fields: fieldsList,+ fields: fieldsList.map((field) => ({+ universalIdentifier: field.id,+ ...field,+ })),labelIdentifierFieldMetadataId,indexMetadatas: indexMetadataList.map((index) =>diff --git a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useAggregateRecordsQuery.test.tsx b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useAggregateRecordsQuery.test.tsxindex 482da0540e2..4502ebf1082 100644--- a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useAggregateRecordsQuery.test.tsx+++ b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useAggregateRecordsQuery.test.tsx@@ -14,6 +14,7 @@ jest.mock('@/object-record/utils/generateAggregateQuery');const fields = [{id: '20202020-fed9-4ce5-9502-02a8efaf46e1',+ universalIdentifier: '20202020-fed9-4ce5-9502-02a8efaf46e1',name: 'amount',label: 'Amount',type: FieldMetadataType.NUMBER,@@ -24,6 +25,7 @@ const fields = [} as FieldMetadataItem,{id: '20202020-dd4a-4ea4-bb7b-1c7300491b65',+ universalIdentifier: '20202020-dd4a-4ea4-bb7b-1c7300491b65',name: 'name',label: 'Name',type: FieldMetadataType.TEXT,@@ -38,6 +40,7 @@ const mockObjectMetadataItem: ObjectMetadataItem = {nameSingular: 'company',namePlural: 'companies',id: 'test-id',+ universalIdentifier: 'test-id',labelSingular: 'Company',labelPlural: 'Companies',isCustom: false,diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/__tests__/turnSortsIntoOrderBy.test.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/__tests__/turnSortsIntoOrderBy.test.tsindex bf8c5fb49b9..4c6b54d0ee3 100644--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/__tests__/turnSortsIntoOrderBy.test.ts+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/__tests__/turnSortsIntoOrderBy.test.ts@@ -16,6 +16,7 @@ const fields = [updatedAt: '2021-01-01',createdAt: '2021-01-01',id: '20202020-18b3-4099-86e3-c46b2d5d42f2',+ universalIdentifier: '20202020-18b3-4099-86e3-c46b2d5d42f2',type: FieldMetadataType.POSITION,label: 'label',},@@ -23,6 +24,7 @@ const fields = [const objectMetadataItemWithPositionField: ObjectMetadataItem = {id: 'object1',+ universalIdentifier: 'object1',fields,readableFields: fields,updatableFields: fields,@@ -50,6 +52,7 @@ const getMockFieldMetadataItem = (overrides: PartialFieldMetadaItemWithRequiredId,): FieldMetadataItem => ({name: 'name',+ universalIdentifier: overrides.id,updatedAt: '2021-01-01',createdAt: '2021-01-01',type: FieldMetadataType.TEXT,@@ -170,9 +173,11 @@ describe('turnSortsIntoOrderBy', () => {describe('relation field sorting', () => {const companyObjectMetadataItem: ObjectMetadataItem = {id: 'company-object-id',+ universalIdentifier: 'company-object-id',fields: [{id: 'company-name-field-id',+ universalIdentifier: 'company-name-field-id',name: 'name',type: FieldMetadataType.TEXT,label: 'Name',@@ -203,9 +208,11 @@ describe('turnSortsIntoOrderBy', () => {const personObjectMetadataItem: ObjectMetadataItem = {id: 'person-object-id',+ universalIdentifier: 'person-object-id',fields: [{id: 'company-relation-field-id',+ universalIdentifier: 'company-relation-field-id',name: 'company',type: FieldMetadataType.RELATION,label: 'Company',@@ -221,6 +228,7 @@ describe('turnSortsIntoOrderBy', () => {} as unknown as FieldMetadataItem,{id: 'position-field-id',+ universalIdentifier: 'position-field-id',name: 'position',type: FieldMetadataType.POSITION,label: 'Position',diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardSelectRecordsEffect.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardSelectRecordsEffect.tsxindex 4ccc59c3fe0..327ddbe3757 100644--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardSelectRecordsEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardSelectRecordsEffect.tsx@@ -2,20 +2,16 @@ import { useEffect } from 'react';import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';import { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector';-import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';export const RecordBoardSelectRecordsEffect = () => {- const { recordIndexId } = useRecordIndexContextOrThrow();-const selectedRecordIds = useAtomComponentSelectorValue(recordBoardSelectedRecordIdsComponentSelector,);const setContextStoreTargetedRecords = useSetAtomComponentState(contextStoreTargetedRecordsRuleComponentState,- recordIndexId,);useEffect(() => {diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/buildRecordGqlFieldsAggregateForView.test.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/buildRecordGqlFieldsAggregateForView.test.tsindex ee381d1d1bc..a7d85f8b322 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/buildRecordGqlFieldsAggregateForView.test.ts+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/buildRecordGqlFieldsAggregateForView.test.ts@@ -11,16 +11,19 @@ describe('buildRecordGqlFieldsAggregateForView', () => {const fields = [{id: MOCK_FIELD_ID,+ universalIdentifier: MOCK_FIELD_ID,name: 'amount',type: FieldMetadataType.NUMBER,} as FieldMetadataItem,{id: '06b33746-5293-4d07-9f7f-ebf5ad396064',+ universalIdentifier: '06b33746-5293-4d07-9f7f-ebf5ad396064',name: 'name',type: FieldMetadataType.TEXT,} as FieldMetadataItem,{id: 'e46b9ba4-144b-4d10-a092-03a7521c8aa0',+ universalIdentifier: 'e46b9ba4-144b-4d10-a092-03a7521c8aa0',name: 'createdAt',type: FieldMetadataType.DATE_TIME,} as FieldMetadataItem,@@ -28,6 +31,7 @@ describe('buildRecordGqlFieldsAggregateForView', () => {const mockObjectMetadata: ObjectMetadataItem = {id: '123',+ universalIdentifier: '123',nameSingular: 'opportunity',namePlural: 'opportunities',labelSingular: 'Opportunity',diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsxindex 8cc9421b8d9..c9f20a99c63 100644--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx@@ -40,7 +40,6 @@ export const RecordIndexContainerGater = () => {const { indexIdentifierUrl } = useHandleIndexIdentifierClick({objectMetadataItem,- recordIndexId,});const { objectPermissionsByObjectMetadataId } = useObjectPermissions();diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexFiltersToContextStoreEffect.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexFiltersToContextStoreEffect.tsxindex 702f8f8bf49..de991479736 100644--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexFiltersToContextStoreEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexFiltersToContextStoreEffect.tsx@@ -1,23 +1,32 @@-import { useEffect } from 'react';+import { useEffect, useMemo } from 'react';import { contextStoreAnyFieldFilterValueComponentState } from '@/context-store/states/contextStoreAnyFieldFilterValueComponentState';import { contextStoreFilterGroupsComponentState } from '@/context-store/states/contextStoreFilterGroupsComponentState';import { contextStoreFiltersComponentState } from '@/context-store/states/contextStoreFiltersComponentState';-import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';+import {+ contextStoreTargetedRecordsRuleComponentState,+ type ContextStoreTargetedRecordsRule,+} from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';+import { type RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup';import { anyFieldFilterValueComponentState } from '@/object-record/record-filter/states/anyFieldFilterValueComponentState';import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';+import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';import { hasUserSelectedAllRowsComponentState } from '@/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState';import { selectedRowIdsComponentSelector } from '@/object-record/record-table/states/selectors/selectedRowIdsComponentSelector';import { unselectedRowIdsComponentSelector } from '@/object-record/record-table/states/selectors/unselectedRowIdsComponentSelector';-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';+import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';+import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';+import { atom, useStore } from 'jotai';+import { isDeeplyEqual } from '~/utils/isDeeplyEqual';export const RecordIndexFiltersToContextStoreEffect = () => {const { recordIndexId } = useRecordIndexContextOrThrow();+ const store = useStore();+const recordIndexFilters = useAtomComponentStateValue(currentRecordFiltersComponentState,recordIndexId,@@ -28,92 +37,158 @@ export const RecordIndexFiltersToContextStoreEffect = () => {recordIndexId,);- const setContextStoreTargetedRecords = useSetAtomComponentState(- contextStoreTargetedRecordsRuleComponentState,+ const anyFieldFilterValue = useAtomComponentStateValue(+ anyFieldFilterValueComponentState,recordIndexId,);- const hasUserSelectedAllRows = useAtomComponentStateValue(+ const hasUserSelectedAllRowsAtom = useAtomComponentStateCallbackState(hasUserSelectedAllRowsComponentState,recordIndexId,);- const selectedRowIds = useAtomComponentSelectorValue(+ const selectedRowIdsAtom = useAtomComponentSelectorCallbackState(selectedRowIdsComponentSelector,recordIndexId,);- const unselectedRowIds = useAtomComponentSelectorValue(++ const unselectedRowIdsAtom = useAtomComponentSelectorCallbackState(unselectedRowIdsComponentSelector,recordIndexId,);- useEffect(() => {- if (hasUserSelectedAllRows) {- setContextStoreTargetedRecords({- mode: 'exclusion',- excludedRecordIds: unselectedRowIds,- });- } else {- setContextStoreTargetedRecords({- mode: 'selection',- selectedRecordIds: selectedRowIds,- });- }+ const contextStoreTargetedRecordsRuleAtom =+ useAtomComponentStateCallbackState(+ contextStoreTargetedRecordsRuleComponentState,+ );- return () => {- setContextStoreTargetedRecords({- mode: 'selection',- selectedRecordIds: [],- });- };- }, [- hasUserSelectedAllRows,- selectedRowIds,- setContextStoreTargetedRecords,- unselectedRowIds,- ]);-- const setContextStoreFilters = useSetAtomComponentState(+ const contextStoreFiltersAtom = useAtomComponentStateCallbackState(contextStoreFiltersComponentState,- recordIndexId,);- const setContextStoreFilterGroups = useSetAtomComponentState(+ const contextStoreFilterGroupsAtom = useAtomComponentStateCallbackState(contextStoreFilterGroupsComponentState,- recordIndexId,);- useEffect(() => {- setContextStoreFilters(recordIndexFilters);- setContextStoreFilterGroups(recordIndexFilterGroups);-- return () => {- setContextStoreFilters([]);- };- }, [- recordIndexFilterGroups,- recordIndexFilters,- setContextStoreFilterGroups,- setContextStoreFilters,- ]);-- const setContextStoreAnyFieldFilterValue = useSetAtomComponentState(- contextStoreAnyFieldFilterValueComponentState,- recordIndexId,+ const contextStoreAnyFieldFilterValueAtom =+ useAtomComponentStateCallbackState(+ contextStoreAnyFieldFilterValueComponentState,+ );++ const syncWriteAtom = useMemo(+ () =>+ atom(+ null,+ (+ get,+ set,+ payload: {+ filters: RecordFilter[];+ filterGroups: RecordFilterGroup[];+ anyFieldFilterValue: string;+ },+ ) => {+ const hasUserSelectedAllRows = get(hasUserSelectedAllRowsAtom);+ let newRule: ContextStoreTargetedRecordsRule;++ if (hasUserSelectedAllRows) {+ const unselectedRowIds = get(unselectedRowIdsAtom);+ newRule = {+ mode: 'exclusion',+ excludedRecordIds: unselectedRowIds,+ };+ } else {+ const selectedRowIds = get(selectedRowIdsAtom);+ newRule = {+ mode: 'selection',+ selectedRecordIds: selectedRowIds,+ };+ }++ const currentRule = get(contextStoreTargetedRecordsRuleAtom);+ if (!isDeeplyEqual(currentRule, newRule)) {+ set(contextStoreTargetedRecordsRuleAtom, newRule);+ }++ const currentFilters = get(contextStoreFiltersAtom);+ if (!isDeeplyEqual(currentFilters, payload.filters)) {+ set(contextStoreFiltersAtom, payload.filters);+ }++ const currentFilterGroups = get(contextStoreFilterGroupsAtom);+ if (!isDeeplyEqual(currentFilterGroups, payload.filterGroups)) {+ set(contextStoreFilterGroupsAtom, payload.filterGroups);+ }++ const currentAnyFieldFilter = get(+ contextStoreAnyFieldFilterValueAtom,+ );+ if (currentAnyFieldFilter !== payload.anyFieldFilterValue) {+ set(+ contextStoreAnyFieldFilterValueAtom,+ payload.anyFieldFilterValue,+ );+ }+ },+ ),+ [+ hasUserSelectedAllRowsAtom,+ selectedRowIdsAtom,+ unselectedRowIdsAtom,+ contextStoreTargetedRecordsRuleAtom,+ contextStoreFiltersAtom,+ contextStoreFilterGroupsAtom,+ contextStoreAnyFieldFilterValueAtom,+ ],);- const anyFieldFilterValue = useAtomComponentStateValue(- anyFieldFilterValueComponentState,- recordIndexId,+ const resetWriteAtom = useMemo(+ () =>+ atom(null, (get, set) => {+ const currentRule = get(contextStoreTargetedRecordsRuleAtom);+ const resetRule: ContextStoreTargetedRecordsRule = {+ mode: 'selection',+ selectedRecordIds: [],+ };+ if (!isDeeplyEqual(currentRule, resetRule)) {+ set(contextStoreTargetedRecordsRuleAtom, resetRule);+ }++ const currentFilters = get(contextStoreFiltersAtom);+ if (!isDeeplyEqual(currentFilters, [])) {+ set(contextStoreFiltersAtom, []);+ }++ const currentAnyFieldFilter = get(contextStoreAnyFieldFilterValueAtom);+ if (currentAnyFieldFilter !== '') {+ set(contextStoreAnyFieldFilterValueAtom, '');+ }+ }),+ [+ contextStoreTargetedRecordsRuleAtom,+ contextStoreFiltersAtom,+ contextStoreAnyFieldFilterValueAtom,+ ],);useEffect(() => {- setContextStoreAnyFieldFilterValue(anyFieldFilterValue);+ store.set(syncWriteAtom, {+ filters: recordIndexFilters,+ filterGroups: recordIndexFilterGroups,+ anyFieldFilterValue,+ });return () => {- setContextStoreAnyFieldFilterValue('');+ store.set(resetWriteAtom);};- }, [anyFieldFilterValue, setContextStoreAnyFieldFilterValue]);+ }, [+ recordIndexFilters,+ recordIndexFilterGroups,+ anyFieldFilterValue,+ store,+ syncWriteAtom,+ resetWriteAtom,+ ]);return <></>;};diff --git a/packages/twenty-front/src/modules/object-record/record-index/export/hooks/useRecordIndexLazyFetchRecords.ts b/packages/twenty-front/src/modules/object-record/record-index/export/hooks/useRecordIndexLazyFetchRecords.tsindex 5aa93699d45..6dd8189f584 100644--- a/packages/twenty-front/src/modules/object-record/record-index/export/hooks/useRecordIndexLazyFetchRecords.ts+++ b/packages/twenty-front/src/modules/object-record/record-index/export/hooks/useRecordIndexLazyFetchRecords.ts@@ -70,22 +70,18 @@ export const useRecordIndexLazyFetchRecords = ({const contextStoreTargetedRecordsRule = useAtomComponentStateValue(contextStoreTargetedRecordsRuleComponentState,- recordIndexId,);const contextStoreFilters = useAtomComponentStateValue(contextStoreFiltersComponentState,- recordIndexId,);const contextStoreFilterGroups = useAtomComponentStateValue(contextStoreFilterGroupsComponentState,- recordIndexId,);const contextStoreAnyFieldFilterValue = useAtomComponentStateValue(contextStoreAnyFieldFilterValueComponentState,- recordIndexId,);const { filterValueDependencies } = useFilterValueDependencies();diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleIndexIdentifierClick.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleIndexIdentifierClick.tsindex 2be5aaeec1e..2d6b3692635 100644--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleIndexIdentifierClick.ts+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleIndexIdentifierClick.ts@@ -6,14 +6,11 @@ import { getAppPath } from 'twenty-shared/utils';export const useHandleIndexIdentifierClick = ({objectMetadataItem,- recordIndexId,}: {- recordIndexId: string;objectMetadataItem: ObjectMetadataItem;}) => {const currentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,- recordIndexId,);const indexIdentifierUrl = (recordId: string) => {diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellAnchoredPortal.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellAnchoredPortal.tsxindex 4eee7a2c311..9c8bcb497f5 100644--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellAnchoredPortal.tsx+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellAnchoredPortal.tsx@@ -23,6 +23,7 @@ type RecordInlineCellAnchoredPortalProps = {fieldMetadataItem: Pick<FieldMetadataItem,| 'id'+ | 'universalIdentifier'| 'name'| 'type'| 'createdAt'diff --git a/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useReapplyRowSelection.ts b/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useReapplyRowSelection.tsindex 8323890d97c..b3193f4fcc3 100644--- a/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useReapplyRowSelection.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useReapplyRowSelection.ts@@ -1,19 +1,24 @@+import { useCallback } from 'react';+import { useStore } from 'jotai';+import { useSelectAllRows } from '@/object-record/record-table/hooks/internal/useSelectAllRows';import { hasUserSelectedAllRowsComponentState } from '@/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';export const useReapplyRowSelection = () => {const { selectAllRows } = useSelectAllRows();- const hasUserSelectedAllRows = useAtomComponentStateValue(+ const hasUserSelectedAllRowsAtom = useAtomComponentStateCallbackState(hasUserSelectedAllRowsComponentState,);- const reapplyRowSelection = () => {- if (hasUserSelectedAllRows) {+ const store = useStore();++ const reapplyRowSelection = useCallback(() => {+ if (store.get(hasUserSelectedAllRowsAtom)) {selectAllRows();}- };+ }, [store, hasUserSelectedAllRowsAtom, selectAllRows]);return {reapplyRowSelection,diff --git a/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useResetTableFocuses.ts b/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useResetTableFocuses.tsindex 3e0d8b9e650..6b15df0212e 100644--- a/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useResetTableFocuses.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useResetTableFocuses.ts@@ -1,3 +1,5 @@+import { useCallback } from 'react';+import { useFocusedRecordTableRow } from '@/object-record/record-table/hooks/useFocusedRecordTableRow';import { useUnfocusRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useUnfocusRecordTableCell';import { recordTableHoverPositionComponentState } from '@/object-record/record-table/states/recordTableHoverPositionComponentState';@@ -12,11 +14,15 @@ export const useResetTableFocuses = (recordTableId: string) => {recordTableId,);- const resetTableFocuses = () => {+ const resetTableFocuses = useCallback(() => {unfocusRecordTableCell();unfocusRecordTableRow();setRecordTableHoverPosition(null);- };+ }, [+ unfocusRecordTableCell,+ unfocusRecordTableRow,+ setRecordTableHoverPosition,+ ]);return {resetTableFocuses,diff --git a/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/__tests__/useBuildSpreadSheetImportFields.test.tsx b/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/__tests__/useBuildSpreadSheetImportFields.test.tsxindex 644e0bbb2a5..bcc92a050ea 100644--- a/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/__tests__/useBuildSpreadSheetImportFields.test.tsx+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/__tests__/useBuildSpreadSheetImportFields.test.tsx@@ -41,6 +41,7 @@ describe('useBuildSpreadSheetImportFields', () => {overrides: Partial<FieldMetadataItem> = {},): FieldMetadataItem => ({id: 'test-field-id',+ universalIdentifier: 'test-field-id',name: 'testField',label: 'Test Field',type: FieldMetadataType.TEXT,@@ -59,6 +60,7 @@ describe('useBuildSpreadSheetImportFields', () => {): ObjectMetadataItem =>({id: 'test-object-id',+ universalIdentifier: 'test-object-id',nameSingular: 'testObject',namePlural: 'testObjects',labelSingular: 'Test Object',diff --git a/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/__tests__/buildRecordFromImportedStructuredRow.test.ts b/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/__tests__/buildRecordFromImportedStructuredRow.test.tsindex bd54a445bb8..1d3ed13a192 100644--- a/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/__tests__/buildRecordFromImportedStructuredRow.test.ts+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/__tests__/buildRecordFromImportedStructuredRow.test.ts@@ -11,6 +11,7 @@ describe('buildRecordFromImportedStructuredRow', () => {const fields: FieldMetadataItem[] = [{id: '3',+ universalIdentifier: '3',name: 'booleanField',label: 'Boolean Field',type: FieldMetadataType.BOOLEAN,@@ -25,6 +26,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '4',+ universalIdentifier: '4',name: 'numberField',label: 'Number Field',type: FieldMetadataType.NUMBER,@@ -39,6 +41,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '5',+ universalIdentifier: '5',name: 'multiSelectField',label: 'Multi-Select Field',type: FieldMetadataType.MULTI_SELECT,@@ -76,6 +79,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '6',+ universalIdentifier: '6',name: 'relationField',label: 'Relation Field',type: FieldMetadataType.RELATION,@@ -93,6 +97,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '7',+ universalIdentifier: '7',name: 'fullNameField',label: 'Full Name Field',type: FieldMetadataType.FULL_NAME,@@ -107,6 +112,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '8',+ universalIdentifier: '8',name: 'currencyField',label: 'Currency Field',type: FieldMetadataType.CURRENCY,@@ -121,6 +127,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '9',+ universalIdentifier: '9',name: 'addressField',label: 'Address Field',type: FieldMetadataType.ADDRESS,@@ -135,6 +142,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '10',+ universalIdentifier: '10',name: 'selectField',label: 'Select Field',type: FieldMetadataType.SELECT,@@ -165,6 +173,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '11',+ universalIdentifier: '11',name: 'arrayField',label: 'Array Field',type: FieldMetadataType.ARRAY,@@ -179,6 +188,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '12',+ universalIdentifier: '12',name: 'jsonField',label: 'JSON Field',type: FieldMetadataType.RAW_JSON,@@ -193,6 +203,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '13',+ universalIdentifier: '13',name: 'phoneField',label: 'Phone Field',type: FieldMetadataType.PHONES,@@ -207,6 +218,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '14',+ universalIdentifier: '14',name: 'linksField',label: 'Links Field',type: FieldMetadataType.LINKS,@@ -221,6 +233,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '15',+ universalIdentifier: '15',name: 'createdBy',label: 'Created by',type: FieldMetadataType.ACTOR,@@ -235,6 +248,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '16',+ universalIdentifier: '16',name: 'richTextField',label: 'Rich Text Field',type: FieldMetadataType.RICH_TEXT_V2,@@ -249,6 +263,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '17',+ universalIdentifier: '17',name: 'dateField',label: 'Date Field',type: FieldMetadataType.DATE,@@ -263,6 +278,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '18',+ universalIdentifier: '18',name: 'dateTimeField',label: 'Date Time Field',type: FieldMetadataType.DATE_TIME,@@ -277,6 +293,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '19',+ universalIdentifier: '19',name: 'ratingField',label: 'Rating Field',type: FieldMetadataType.RATING,@@ -291,6 +308,7 @@ describe('buildRecordFromImportedStructuredRow', () => {},{id: '20',+ universalIdentifier: '20',name: 'emailField',label: 'Email Field',type: FieldMetadataType.EMAILS,diff --git a/packages/twenty-front/src/modules/object-record/utils/__tests__/generateAggregateQuery.test.ts b/packages/twenty-front/src/modules/object-record/utils/__tests__/generateAggregateQuery.test.tsindex 1e41d98a590..fdca3d9b2f5 100644--- a/packages/twenty-front/src/modules/object-record/utils/__tests__/generateAggregateQuery.test.ts+++ b/packages/twenty-front/src/modules/object-record/utils/__tests__/generateAggregateQuery.test.ts@@ -7,6 +7,7 @@ describe('generateAggregateQuery', () => {nameSingular: 'company',namePlural: 'companies',id: 'test-id',+ universalIdentifier: 'test-id',labelSingular: 'Company',labelPlural: 'Companies',labelIdentifierFieldMetadataId: '20202020-72ba-4e11-a36d-e17b544541e1',@@ -49,6 +50,7 @@ describe('generateAggregateQuery', () => {nameSingular: 'person',namePlural: 'people',id: 'test-id',+ universalIdentifier: 'test-id',labelSingular: 'Person',labelPlural: 'People',labelIdentifierFieldMetadataId: '20202020-72ba-4e11-a36d-e17b544541e1',diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/usePageLayoutWithRelationWidgets.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/usePageLayoutWithRelationWidgets.test.tsxindex e4ed172f3fb..66421331c30 100644--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/usePageLayoutWithRelationWidgets.test.tsx+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/usePageLayoutWithRelationWidgets.test.tsx@@ -124,6 +124,7 @@ describe('usePageLayoutWithRelationWidgets', () => {const mockRelationFields: FieldMetadataItem[] = [{id: 'field-1',+ universalIdentifier: 'field-1',label: 'Related Companies',name: 'relatedCompanies',type: 'RELATION',@@ -142,6 +143,7 @@ describe('usePageLayoutWithRelationWidgets', () => {} as FieldMetadataItem,{id: 'field-2',+ universalIdentifier: 'field-2',label: 'Related People',name: 'relatedPeople',type: 'RELATION',diff --git a/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useScrollWrapperHTMLElement.ts b/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useScrollWrapperHTMLElement.tsindex 70b2a385c51..c251ecc9475 100644--- a/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useScrollWrapperHTMLElement.ts+++ b/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useScrollWrapperHTMLElement.ts@@ -1,3 +1,5 @@+import { useCallback } from 'react';+import { ScrollWrapperComponentInstanceContext } from '@/ui/utilities/scroll/states/contexts/ScrollWrapperComponentInstanceContext';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useHTMLElementByIdWhenAvailable } from '~/hooks/useHTMLElementByIdWhenAvailable';@@ -15,13 +17,13 @@ export const useScrollWrapperHTMLElement = (const { element: scrollWrapperHTMLElement } =useHTMLElementByIdWhenAvailable(scrollWrapperId);- const getScrollWrapperElement = () => {+ const getScrollWrapperElement = useCallback(() => {const scrollWrapperElement = document.getElementById(scrollWrapperId);return {scrollWrapperElement,};- };+ }, [scrollWrapperId]);return {scrollWrapperHTMLElement,diff --git a/packages/twenty-front/src/modules/views/utils/__tests__/viewMapFunctions.test.ts b/packages/twenty-front/src/modules/views/utils/__tests__/viewMapFunctions.test.tsindex 4570ff6e683..7ea656e234e 100644--- a/packages/twenty-front/src/modules/views/utils/__tests__/viewMapFunctions.test.ts+++ b/packages/twenty-front/src/modules/views/utils/__tests__/viewMapFunctions.test.ts@@ -12,6 +12,7 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';const baseFieldMetadataItem = {id: '05731f68-6e7a-4903-8374-c0b6a9063482',+ universalIdentifier: '05731f68-6e7a-4903-8374-c0b6a9063482',createdAt: '2021-01-01',updatedAt: '2021-01-01',name: 'name',diff --git a/packages/twenty-front/src/modules/workflow/components/__stories__/WorkflowFieldsMultiSelect.stories.ts b/packages/twenty-front/src/modules/workflow/components/__stories__/WorkflowFieldsMultiSelect.stories.tsindex 87ab35556ef..0def34cf65b 100644--- a/packages/twenty-front/src/modules/workflow/components/__stories__/WorkflowFieldsMultiSelect.stories.ts+++ b/packages/twenty-front/src/modules/workflow/components/__stories__/WorkflowFieldsMultiSelect.stories.ts@@ -18,6 +18,7 @@ type Story = StoryObj<typeof WorkflowFieldsMultiSelect>;const fields = [{id: '1',+ universalIdentifier: '1',name: 'name',label: 'Name',type: FieldMetadataType.TEXT,@@ -32,6 +33,7 @@ const fields = [},{id: '2',+ universalIdentifier: '2',name: 'domainName',label: 'Domain Name',type: FieldMetadataType.TEXT,@@ -46,6 +48,7 @@ const fields = [},{id: '3',+ universalIdentifier: '3',name: 'employees',label: 'Employees',type: FieldMetadataType.NUMBER,@@ -62,6 +65,7 @@ const fields = [const mockObjectMetadataItem: ObjectMetadataItem = {id: '1',+ universalIdentifier: '1',nameSingular: 'company',namePlural: 'companies',labelSingular: 'Company',diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationPermissionsTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationPermissionsTab.tsxindex 071aec8d79a..67c4cd3ce40 100644--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationPermissionsTab.tsx+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationPermissionsTab.tsx@@ -162,6 +162,7 @@ const buildFieldMetadataItemFromMarketplaceField = (return {id: field.universalIdentifier ?? uuidv4(),+ universalIdentifier: field.universalIdentifier ?? uuidv4(),name: field.name,label: field.label,type: (field.type as FieldMetadataType) ?? FieldMetadataType.TEXT,@@ -239,6 +240,7 @@ const buildobjectMetadataItemsFromMarketplaceApp = (const item: ObjectMetadataItem = {__typename: 'Object',id: universalId,+ universalIdentifier: universalId,nameSingular: appObject.nameSingular,namePlural: appObject.namePlural,labelSingular: appObject.labelSingular,diff --git a/packages/twenty-front/src/testing/utils/generatedMockObjectMetadataItems.ts b/packages/twenty-front/src/testing/utils/generatedMockObjectMetadataItems.tsindex 8a7aa075e04..200ab0d57fe 100644--- a/packages/twenty-front/src/testing/utils/generatedMockObjectMetadataItems.ts+++ b/packages/twenty-front/src/testing/utils/generatedMockObjectMetadataItems.ts@@ -1,8 +1,19 @@+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import { objectMetadataItemSchema } from '@/object-metadata/validation-schemas/objectMetadataItemSchema';import { mockedStandardObjectMetadataQueryResult } from '~/testing/mock-data/generated/mock-metadata-query-result';+// TODO: remove once we have a way to generate the mocks against a seeded workspace+const addUniversalIdentifierToField = (+ field: Record<string, unknown>,+): FieldMetadataItem => ({+ ...(field as FieldMetadataItem),+ universalIdentifier:+ (field as { universalIdentifier?: string }).universalIdentifier ??+ (field as { id: string }).id,+});+export const generatedMockObjectMetadataItems: ObjectMetadataItem[] =mockedStandardObjectMetadataQueryResult.objects.edges.map((edge) => {const labelIdentifierFieldMetadataId =@@ -13,11 +24,16 @@ export const generatedMockObjectMetadataItems: ObjectMetadataItem[] =const { fieldsList, indexMetadataList, ...objectWithoutFieldsList } =edge.node;+ const fields = fieldsList.map(addUniversalIdentifierToField);+return {...objectWithoutFieldsList,- fields: fieldsList,- readableFields: fieldsList,- updatableFields: fieldsList,+ universalIdentifier:+ (objectWithoutFieldsList as { universalIdentifier?: string })+ .universalIdentifier ?? objectWithoutFieldsList.id,+ fields,+ readableFields: fields,+ updatableFields: fields,labelIdentifierFieldMetadataId,indexMetadatas: indexMetadataList.map((index) => ({...index,diff --git a/yarn.lock b/yarn.lockindex 40089575c4b..0d58f659246 100644--- a/yarn.lock+++ b/yarn.lock@@ -39083,13 +39083,6 @@ __metadata:languageName: nodelinkType: hard-"hamt_plus@npm:1.0.2":- version: 1.0.2- resolution: "hamt_plus@npm:1.0.2"- checksum: 10c0/c5aa5cc08228e8cc2a90150fef680bd5b09f16a327bdab799daeb80fd3c987663308b14e2c6718abdf75afce21d29607e35f2705eb336a14aa935c0ca5949ce7- languageName: node- linkType: hard-"handlebars@npm:*, handlebars@npm:^4.7.7, handlebars@npm:^4.7.8":version: 4.7.8resolution: "handlebars@npm:4.7.8"@@ -53359,22 +53352,6 @@ __metadata:languageName: nodelinkType: hard-"recoil@npm:^0.7.7":- version: 0.7.7- resolution: "recoil@npm:0.7.7"- dependencies:- hamt_plus: "npm:1.0.2"- peerDependencies:- react: ">=16.13.1"- peerDependenciesMeta:- react-dom:- optional: true- react-native:- optional: true- checksum: 10c0/630a73b0bdfb1b453c68eca9b3fa0771d489006fbd856a7700174d775978ba3faa10d251ac2af7c07142014dcba07c2b103f448ecc19b6124d3228ec810f5c28- languageName: node- linkType: hard-"redent@npm:^3.0.0":version: 3.0.0resolution: "redent@npm:3.0.0"@@ -58708,7 +58685,6 @@ __metadata:react-responsive: "npm:^9.0.2"react-router-dom: "npm:^6.4.4"react-textarea-autosize: "npm:^8.4.1"- recoil: "npm:^0.7.7"remark-gfm: "npm:^4.0.1"rollup-plugin-visualizer: "npm:^5.14.0"transliteration: "npm:^2.3.5"@@ -59282,7 +59258,6 @@ __metadata:react-responsive: "npm:^9.0.2"react-router-dom: "npm:^6.4.4"react-tooltip: "npm:^5.13.1"- recoil: "npm:^0.7.7"remark-gfm: "npm:^3.0.1"rimraf: "npm:^5.0.5"rxjs: "npm:^7.2.0"