The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Rework atom naming (#18240)
Charles Bochetbc4ae35bc4e1
diff --git a/packages/twenty-eslint-rules/rules/matching-state-variable.spec.ts b/packages/twenty-eslint-rules/rules/matching-state-variable.spec.tsindex de1c55b0a74..0d4325aaf29 100644--- a/packages/twenty-eslint-rules/rules/matching-state-variable.spec.ts+++ b/packages/twenty-eslint-rules/rules/matching-state-variable.spec.ts@@ -5,58 +5,131 @@ const ruleTester = new TSESLint.RuleTester();ruleTester.run(RULE_NAME, rule, {valid: [+ // useAtomState / useAtomStateValue (existing){code: 'const variable = useAtomStateValue(variableState);',},{code: 'const [variable, setVariable] = useAtomState(variableState);',},- // Component/Family hooks are not checked by this rule++ // useAtomComponentStateValue / useAtomComponentState+ {+ code: 'const variable = useAtomComponentStateValue(variableComponentState);',+ },+ {+ code: 'const [variable, setVariable] = useAtomComponentState(variableComponentState);',+ },++ // useAtomFamilyStateValue+ {+ code: 'const variable = useAtomFamilyStateValue(variableFamilyState, key);',+ },++ // useAtomComponentFamilyStateValue / useAtomComponentFamilyState+ {+ code: 'const variable = useAtomComponentFamilyStateValue(variableComponentFamilyState, key);',+ },+ {+ code: 'const [variable, setVariable] = useAtomComponentFamilyState(variableComponentFamilyState, key);',+ },++ // Setter hooks+ {+ code: 'const setVariable = useSetAtomState(variableState);',+ },{- code: 'const anything = useAtomComponentStateValue(variableComponentState);',+ code: 'const setVariable = useSetAtomComponentState(variableComponentState);',},{- code: 'const anything = useAtomFamilyStateValue(variableFamilyState);',+ code: 'const setVariable = useSetAtomFamilyState(variableFamilyState, key);',},{- code: 'const [anything, setAnything] = useAtomComponentFamilyState(variableComponentFamilyState);',+ code: 'const setVariable = useSetAtomComponentFamilyState(variableComponentFamilyState, key);',},],invalid: [+ // useAtomStateValue - wrong variable name{code: 'const myValue = useAtomStateValue(variableState);',- errors: [- {- messageId: 'invalidVariableName',- },- ],+ errors: [{ messageId: 'invalidVariableName' }],},++ // useAtomState - wrong variable and setter{code: 'const [myValue, setMyValue] = useAtomState(variableState);',errors: [- {- messageId: 'invalidVariableName',- },- {- messageId: 'invalidSetterName',- },+ { messageId: 'invalidVariableName' },+ { messageId: 'invalidSetterName' },],},{code: 'const [myValue] = useAtomState(variableState);',+ errors: [{ messageId: 'invalidVariableName' }],+ },+ {+ code: 'const [, setMyValue] = useAtomState(variableState);',+ errors: [{ messageId: 'invalidSetterName' }],+ },++ // useAtomComponentStateValue - wrong variable name+ {+ code: 'const myValue = useAtomComponentStateValue(variableComponentState);',+ errors: [{ messageId: 'invalidVariableName' }],+ },++ // useAtomComponentState - wrong variable and setter+ {+ code: 'const [myValue, setMyValue] = useAtomComponentState(variableComponentState);',errors: [- {- messageId: 'invalidVariableName',- },+ { messageId: 'invalidVariableName' },+ { messageId: 'invalidSetterName' },],},++ // useAtomFamilyStateValue - wrong variable name{- code: 'const [, setMyValue] = useAtomState(variableState);',+ code: 'const myValue = useAtomFamilyStateValue(variableFamilyState, key);',+ errors: [{ messageId: 'invalidVariableName' }],+ },++ // useAtomComponentFamilyStateValue - wrong variable name+ {+ code: 'const myValue = useAtomComponentFamilyStateValue(variableComponentFamilyState, key);',+ errors: [{ messageId: 'invalidVariableName' }],+ },++ // useAtomComponentFamilyState - wrong variable and setter+ {+ code: 'const [myValue, setMyValue] = useAtomComponentFamilyState(variableComponentFamilyState, key);',errors: [- {- messageId: 'invalidSetterName',- },+ { messageId: 'invalidVariableName' },+ { messageId: 'invalidSetterName' },],},++ // useSetAtomState - wrong setter name+ {+ code: 'const myValue = useSetAtomState(variableState);',+ errors: [{ messageId: 'invalidSetterName' }],+ },++ // useSetAtomComponentState - wrong setter name+ {+ code: 'const myValue = useSetAtomComponentState(variableComponentState);',+ errors: [{ messageId: 'invalidSetterName' }],+ },++ // useSetAtomFamilyState - wrong setter name+ {+ code: 'const myValue = useSetAtomFamilyState(variableFamilyState, key);',+ errors: [{ messageId: 'invalidSetterName' }],+ },++ // useSetAtomComponentFamilyState - wrong setter name+ {+ code: 'const myValue = useSetAtomComponentFamilyState(variableComponentFamilyState, key);',+ errors: [{ messageId: 'invalidSetterName' }],+ },],});diff --git a/packages/twenty-eslint-rules/rules/matching-state-variable.ts b/packages/twenty-eslint-rules/rules/matching-state-variable.tsindex ce9bf18483e..48a0e6e55f6 100644--- a/packages/twenty-eslint-rules/rules/matching-state-variable.ts+++ b/packages/twenty-eslint-rules/rules/matching-state-variable.ts@@ -8,6 +8,37 @@ import { isIdentifier } from '@typescript-eslint/utils/ast-utils';// NOTE: The rule will be available in ESLint configs as "@nx/workspace-matching-state-variable"export const RULE_NAME = 'matching-state-variable';+const VALUE_HOOKS = [+ 'useAtomStateValue',+ 'useAtomComponentStateValue',+ 'useAtomFamilyStateValue',+ 'useAtomComponentFamilyStateValue',+];++const STATE_HOOKS = [+ 'useAtomState',+ 'useAtomComponentState',+ 'useAtomComponentFamilyState',+];++const SETTER_HOOKS = [+ 'useSetAtomState',+ 'useSetAtomComponentState',+ 'useSetAtomFamilyState',+ 'useSetAtomComponentFamilyState',+];++const ALL_HOOKS = [...VALUE_HOOKS, ...STATE_HOOKS, ...SETTER_HOOKS];++const SUFFIX_PATTERN =+ /(ComponentFamilyState|ComponentState|ScopedFamilyState|FamilyState|ScopedState|ScopedSelector|Selector|State)$/;++const getExpectedBaseName = (stateArgName: string): string =>+ stateArgName.replace(SUFFIX_PATTERN, '');++const getExpectedSetterName = (baseName: string): string =>+ `set${baseName.charAt(0).toUpperCase()}${baseName.slice(1)}`;+export const rule = ESLintUtils.RuleCreator(() => __filename)({name: RULE_NAME,meta: {@@ -30,104 +61,148 @@ export const rule = ESLintUtils.RuleCreator(() => __filename)({return {VariableDeclarator: (node: TSESTree.VariableDeclarator) => {if (- node?.init?.type === AST_NODE_TYPES.CallExpression &&- isIdentifier(node.init.callee) &&- ['useAtomState', 'useAtomStateValue'].includes(- node.init.callee.name,- )+ node?.init?.type !== AST_NODE_TYPES.CallExpression ||+ !isIdentifier(node.init.callee) ||+ !ALL_HOOKS.includes(node.init.callee.name)) {- const stateNameBase = isIdentifier(node.init.arguments[0])- ? node.init.arguments[0].name- : undefined;+ return;+ }++ const hookName = node.init.callee.name;++ const stateNameBase = isIdentifier(node.init.arguments[0])+ ? node.init.arguments[0].name+ : undefined;- if (!stateNameBase) {- return;+ if (!stateNameBase) {+ return;+ }++ const expectedVariableNameBase = getExpectedBaseName(stateNameBase);++ if (SETTER_HOOKS.includes(hookName)) {+ if (isIdentifier(node.id)) {+ const actualName = node.id.name;+ const expectedSetterName =+ getExpectedSetterName(expectedVariableNameBase);++ if (actualName !== expectedSetterName) {+ context.report({+ node,+ messageId: 'invalidSetterName',+ data: {+ hookName: stateNameBase,+ actualName,+ expectedName: expectedSetterName,+ },+ fix: (fixer) => fixer.replaceText(node.id, expectedSetterName),+ });+ }}- const expectedVariableNameBase = stateNameBase.replace(- /(State|Selector|ScopedState|ScopedFamilyState|ScopedSelector)$/,- '',- );+ return;+ }+ if (VALUE_HOOKS.includes(hookName)) {if (isIdentifier(node.id)) {- const actualVariableName = node.id.name;+ const actualName = node.id.name;- if (actualVariableName !== expectedVariableNameBase) {+ if (actualName !== expectedVariableNameBase) {context.report({node,messageId: 'invalidVariableName',data: {- actualName: actualVariableName,+ actualName,expectedName: expectedVariableNameBase,hookName: stateNameBase,- callee: node.init.callee.name,- },- fix: (fixer) => {- return fixer.replaceText(node.id, expectedVariableNameBase);+ callee: hookName,},+ fix: (fixer) =>+ fixer.replaceText(node.id, expectedVariableNameBase),});}+ }++ return;+ }++ if (isIdentifier(node.id)) {+ const actualVariableName = node.id.name;- return;+ if (actualVariableName !== expectedVariableNameBase) {+ context.report({+ node,+ messageId: 'invalidVariableName',+ data: {+ actualName: actualVariableName,+ expectedName: expectedVariableNameBase,+ hookName: stateNameBase,+ callee: hookName,+ },+ fix: (fixer) =>+ fixer.replaceText(node.id, expectedVariableNameBase),+ });}- if (node.id.type === AST_NODE_TYPES.ArrayPattern) {- const actualVariableName =- node.id.elements?.[0]?.type === AST_NODE_TYPES.Identifier- ? node.id.elements[0].name- : undefined;+ return;+ }++ if (node.id.type === AST_NODE_TYPES.ArrayPattern) {+ const actualVariableName =+ node.id.elements?.[0]?.type === AST_NODE_TYPES.Identifier+ ? node.id.elements[0].name+ : undefined;++ if (+ actualVariableName &&+ actualVariableName !== expectedVariableNameBase+ ) {+ context.report({+ node,+ messageId: 'invalidVariableName',+ data: {+ actualName: actualVariableName,+ expectedName: expectedVariableNameBase,+ hookName: stateNameBase,+ callee: hookName,+ },+ fix: (fixer) => {+ if (node.id.type === AST_NODE_TYPES.ArrayPattern) {+ return fixer.replaceText(+ node.id.elements[0] as TSESTree.Node,+ expectedVariableNameBase,+ );+ }+ return null;+ },+ });+ }++ if (isIdentifier(node.id.elements[1])) {+ const actualSetterName = node.id.elements[1].name;+ const expectedSetterName =+ getExpectedSetterName(expectedVariableNameBase);- if (- actualVariableName &&- actualVariableName !== expectedVariableNameBase- ) {+ if (actualSetterName !== expectedSetterName) {context.report({node,- messageId: 'invalidVariableName',+ messageId: 'invalidSetterName',data: {- actual: actualVariableName,- expected: expectedVariableNameBase,- callee: node.init.callee.name,+ hookName: stateNameBase,+ actualName: actualSetterName,+ expectedName: expectedSetterName,},fix: (fixer) => {if (node.id.type === AST_NODE_TYPES.ArrayPattern) {return fixer.replaceText(- node.id.elements[0] as TSESTree.Node,- expectedVariableNameBase,+ node.id.elements[1]!,+ expectedSetterName,);}return null;},});}-- if (isIdentifier(node.id.elements[1])) {- const actualSetterName = node.id.elements[1].name;- const expectedSetterName = `set${expectedVariableNameBase- .charAt(0)- .toUpperCase()}${expectedVariableNameBase.slice(1)}`;-- if (actualSetterName !== expectedSetterName) {- context.report({- node,- messageId: 'invalidSetterName',- data: {- hookName: stateNameBase,- actualName: actualSetterName,- expectedName: expectedSetterName,- },- fix: (fixer) => {- if (node.id.type === AST_NODE_TYPES.ArrayPattern) {- return fixer.replaceText(- node.id.elements[1]!,- expectedSetterName,- );- }- return null;- },- });- }- }}}},diff --git a/packages/twenty-front/src/modules/action-menu/actions/components/ActionOpenSidePanelPage.tsx b/packages/twenty-front/src/modules/action-menu/actions/components/ActionOpenSidePanelPage.tsxindex 0ed770838cd..ce8b2bc1f1e 100644--- a/packages/twenty-front/src/modules/action-menu/actions/components/ActionOpenSidePanelPage.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/components/ActionOpenSidePanelPage.tsx@@ -26,7 +26,7 @@ export const ActionOpenSidePanelPage = ({const { navigateCommandMenu } = useNavigateCommandMenu();- const setCommandMenuSearchState = useSetAtomState(commandMenuSearchState);+ const setCommandMenuSearch = useSetAtomState(commandMenuSearchState);if (!actionConfig) {return null;@@ -42,7 +42,7 @@ export const ActionOpenSidePanelPage = ({});if (shouldResetSearchState) {- setCommandMenuSearchState('');+ setCommandMenuSearch('');}};diff --git a/packages/twenty-front/src/modules/action-menu/actions/display/components/ActionDropdownItem.tsx b/packages/twenty-front/src/modules/action-menu/actions/display/components/ActionDropdownItem.tsxindex 55abb466e5e..539374d895c 100644--- a/packages/twenty-front/src/modules/action-menu/actions/display/components/ActionDropdownItem.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/display/components/ActionDropdownItem.tsx@@ -31,7 +31,7 @@ export const ActionDropdownItem = ({SelectableListComponentInstanceContext,);- const isSelected = useAtomComponentFamilyStateValue(+ const isSelectedItemId = useAtomComponentFamilyStateValue(isSelectedItemIdComponentFamilyState,action.key,selectableListInstanceId,@@ -40,7 +40,7 @@ export const ActionDropdownItem = ({return (<SelectableListItem itemId={action.key} onEnter={handleClick}><MenuItem- focused={isSelected}+ focused={isSelectedItemId}key={action.key}LeftIcon={action.Icon}onClick={handleClick}diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/components/CreateNewViewNoSelectionRecord.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/components/CreateNewViewNoSelectionRecord.tsxindex c81db6342ce..548bd69f7f1 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/components/CreateNewViewNoSelectionRecord.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/components/CreateNewViewNoSelectionRecord.tsx@@ -13,17 +13,17 @@ export const CreateNewViewNoSelectionRecord = () => {const { objectMetadataItem } = useContextStoreObjectMetadataItemOrThrow();const { openDropdown } = useOpenDropdown();- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);- if (!currentViewId) {+ if (!contextStoreCurrentViewId) {throw new Error('Current view ID is not defined');}const recordIndexId = getRecordIndexIdFromObjectNamePluralAndViewId(objectMetadataItem.namePlural,- currentViewId,+ contextStoreCurrentViewId,);const setViewPickerReferenceViewId = useSetAtomComponentState(@@ -34,7 +34,7 @@ export const CreateNewViewNoSelectionRecord = () => {const { setViewPickerMode } = useViewPickerMode(recordIndexId);const handleAddViewButtonClick = () => {- setViewPickerReferenceViewId(currentViewId);+ setViewPickerReferenceViewId(contextStoreCurrentViewId);setViewPickerMode('create-empty');openDropdown({dropdownComponentInstanceIdFromProps: VIEW_PICKER_DROPDOWN_ID,diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/components/HideDeletedRecordsNoSelectionRecordAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/components/HideDeletedRecordsNoSelectionRecordAction.tsxindex 512e1576994..ed425948ef7 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/components/HideDeletedRecordsNoSelectionRecordAction.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/components/HideDeletedRecordsNoSelectionRecordAction.tsx@@ -12,17 +12,17 @@ import { isDefined } from 'twenty-shared/utils';export const HideDeletedRecordsNoSelectionRecordAction = () => {const { objectMetadataItem } = useContextStoreObjectMetadataItemOrThrow();- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);- if (!currentViewId) {+ if (!contextStoreCurrentViewId) {throw new Error('Current view ID is not defined');}const recordIndexId = getRecordIndexIdFromObjectNamePluralAndViewId(objectMetadataItem.namePlural,- currentViewId,+ contextStoreCurrentViewId,);const { toggleSoftDeleteFilterState } = useHandleToggleTrashColumnFilter({diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/components/SeeDeletedRecordsNoSelectionRecordAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/components/SeeDeletedRecordsNoSelectionRecordAction.tsxindex b457b269d36..8f079b0c506 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/components/SeeDeletedRecordsNoSelectionRecordAction.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/components/SeeDeletedRecordsNoSelectionRecordAction.tsx@@ -8,17 +8,17 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useexport const SeeDeletedRecordsNoSelectionRecordAction = () => {const { objectMetadataItem } = useContextStoreObjectMetadataItemOrThrow();- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);- if (!currentViewId) {+ if (!contextStoreCurrentViewId) {throw new Error('Current view ID is not defined');}const recordIndexId = getRecordIndexIdFromObjectNamePluralAndViewId(objectMetadataItem.namePlural,- currentViewId,+ contextStoreCurrentViewId,);const { handleToggleTrashColumnFilter, toggleSoftDeleteFilterState } =diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/run-workflow-actions/hooks/useRunWorkflowRecordActions.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/run-workflow-actions/hooks/useRunWorkflowRecordActions.tsxindex 097ddb8e025..c5fdb79e6ce 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/run-workflow-actions/hooks/useRunWorkflowRecordActions.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/run-workflow-actions/hooks/useRunWorkflowRecordActions.tsx@@ -35,7 +35,7 @@ export const useRunWorkflowRecordActions = ({contextStoreTargetedRecordsRuleComponentState,);- const isPageInEditMode = useAtomComponentStateValue(+ const contextStoreIsPageInEditMode = useAtomComponentStateValue(contextStoreIsPageInEditModeComponentState,);@@ -138,7 +138,7 @@ export const useRunWorkflowRecordActions = ({position: index,Icon,isPinned:- !isPageInEditMode &&+ !contextStoreIsPageInEditMode &&activeWorkflowVersion.trigger?.settings?.isPinned,shouldBeRegistered: () => true,component: (diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/components/AddToFavoritesSingleRecordAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/components/AddToFavoritesSingleRecordAction.tsxindex 40c043c09ac..ea30d8916d7 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/components/AddToFavoritesSingleRecordAction.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/components/AddToFavoritesSingleRecordAction.tsx@@ -13,17 +13,14 @@ export const AddToFavoritesSingleRecordAction = () => {const { createFavorite } = useCreateFavorite();- const selectedRecord = useAtomFamilyStateValue(- recordStoreFamilyState,- recordId,- );+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);const handleClick = () => {- if (!isDefined(selectedRecord)) {+ if (!isDefined(recordStore)) {return;}- createFavorite(selectedRecord, objectMetadataItem.nameSingular);+ createFavorite(recordStore, objectMetadataItem.nameSingular);};return <Action onClick={handleClick} />;diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/components/ExportNoteActionSingleRecordAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/components/ExportNoteActionSingleRecordAction.tsxindex 88c85b7862a..57c8b537eb6 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/components/ExportNoteActionSingleRecordAction.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/components/ExportNoteActionSingleRecordAction.tsx@@ -7,19 +7,16 @@ import { isDefined } from 'twenty-shared/utils';export const ExportNoteActionSingleRecordAction = () => {const recordId = useSelectedRecordIdOrThrow();- const selectedRecord = useAtomFamilyStateValue(- recordStoreFamilyState,- recordId,- );+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);- const filename = `${(selectedRecord?.title || 'Untitled Note').replace(/[<>:"/\\|?*]/g, '-')}`;+ const filename = `${(recordStore?.title || 'Untitled Note').replace(/[<>:"/\\|?*]/g, '-')}`;const handleClick = async () => {- if (!isDefined(selectedRecord)) {+ if (!isDefined(recordStore)) {return;}- const initialBody = selectedRecord.bodyV2?.blocknote;+ const initialBody = recordStore.bodyV2?.blocknote;let parsedBody = [];diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/dashboard-actions/components/CancelDashboardSingleRecordAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/dashboard-actions/components/CancelDashboardSingleRecordAction.tsxindex cf35093ea65..6c29dd8b413 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/dashboard-actions/components/CancelDashboardSingleRecordAction.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/dashboard-actions/components/CancelDashboardSingleRecordAction.tsx@@ -9,12 +9,9 @@ import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtoexport const CancelDashboardSingleRecordAction = () => {const recordId = useSelectedRecordIdOrThrow();- const selectedRecord = useAtomFamilyStateValue(- recordStoreFamilyState,- recordId,- );+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);- const pageLayoutId = selectedRecord?.pageLayoutId;+ const pageLayoutId = recordStore?.pageLayoutId;const { closeCommandMenu } = useCommandMenu();diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/dashboard-actions/components/EditDashboardSingleRecordAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/dashboard-actions/components/EditDashboardSingleRecordAction.tsxindex 9c7649910fa..2c77a80ee9a 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/dashboard-actions/components/EditDashboardSingleRecordAction.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/dashboard-actions/components/EditDashboardSingleRecordAction.tsx@@ -8,12 +8,9 @@ import { useResetLocationHash } from 'twenty-ui/utilities';export const EditDashboardSingleRecordAction = () => {const recordId = useSelectedRecordIdOrThrow();- const selectedRecord = useAtomFamilyStateValue(- recordStoreFamilyState,- recordId,- );+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);- const pageLayoutId = selectedRecord?.pageLayoutId;+ const pageLayoutId = recordStore?.pageLayoutId;const { setIsPageLayoutInEditMode } =useSetIsPageLayoutInEditMode(pageLayoutId);diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/dashboard-actions/components/SaveDashboardSingleRecordAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/dashboard-actions/components/SaveDashboardSingleRecordAction.tsxindex 2967c689c92..92ead9ea54a 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/dashboard-actions/components/SaveDashboardSingleRecordAction.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/dashboard-actions/components/SaveDashboardSingleRecordAction.tsx@@ -9,12 +9,9 @@ import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtoexport const SaveDashboardSingleRecordAction = () => {const recordId = useSelectedRecordIdOrThrow();- const selectedRecord = useAtomFamilyStateValue(- recordStoreFamilyState,- recordId,- );+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);- const pageLayoutId = selectedRecord?.pageLayoutId;+ const pageLayoutId = recordStore?.pageLayoutId;const { savePageLayout } = useSavePageLayout(pageLayoutId);diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-run-actions/components/SeeVersionWorkflowRunSingleRecordAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-run-actions/components/SeeVersionWorkflowRunSingleRecordAction.tsxindex ae9d135400c..8c582291884 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-run-actions/components/SeeVersionWorkflowRunSingleRecordAction.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-run-actions/components/SeeVersionWorkflowRunSingleRecordAction.tsx@@ -8,9 +8,9 @@ import { isDefined } from 'twenty-shared/utils';export const SeeVersionWorkflowRunSingleRecordAction = () => {const recordId = useSelectedRecordIdOrThrow();- const workflowRun = useAtomFamilyStateValue(recordStoreFamilyState, recordId);+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);- if (!isDefined(workflowRun) || !isDefined(workflowRun?.workflowVersion?.id)) {+ if (!isDefined(recordStore) || !isDefined(recordStore?.workflowVersion?.id)) {return null;}@@ -19,7 +19,7 @@ export const SeeVersionWorkflowRunSingleRecordAction = () => {to={AppPath.RecordShowPage}params={{objectNameSingular: CoreObjectNameSingular.WorkflowVersion,- objectRecordId: workflowRun.workflowVersion.id,+ objectRecordId: recordStore.workflowVersion.id,}}/>);diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-run-actions/components/SeeWorkflowWorkflowRunSingleRecordAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-run-actions/components/SeeWorkflowWorkflowRunSingleRecordAction.tsxindex 0b48c2556a7..b80aa519b1d 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-run-actions/components/SeeWorkflowWorkflowRunSingleRecordAction.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-run-actions/components/SeeWorkflowWorkflowRunSingleRecordAction.tsx@@ -8,9 +8,9 @@ import { isDefined } from 'twenty-shared/utils';export const SeeWorkflowWorkflowRunSingleRecordAction = () => {const recordId = useSelectedRecordIdOrThrow();- const workflowRun = useAtomFamilyStateValue(recordStoreFamilyState, recordId);+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);- if (!isDefined(workflowRun) || !isDefined(workflowRun?.workflow?.id)) {+ if (!isDefined(recordStore) || !isDefined(recordStore?.workflow?.id)) {return null;}@@ -19,7 +19,7 @@ export const SeeWorkflowWorkflowRunSingleRecordAction = () => {to={AppPath.RecordShowPage}params={{objectNameSingular: CoreObjectNameSingular.Workflow,- objectRecordId: workflowRun.workflow.id,+ objectRecordId: recordStore.workflow.id,}}/>);diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/components/SeeRunsWorkflowVersionSingleRecordAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/components/SeeRunsWorkflowVersionSingleRecordAction.tsxindex dcc90967b9d..4eb73199fde 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/components/SeeRunsWorkflowVersionSingleRecordAction.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/components/SeeRunsWorkflowVersionSingleRecordAction.tsx@@ -27,7 +27,7 @@ const SeeRunsWorkflowVersionSingleRecordActionContent = ({selectedRecordIds: [workflowWithCurrentVersion?.id],},},- workflowVersion: {+ recordStore: {[ViewFilterOperand.IS]: {selectedRecordIds: [recordId],},@@ -40,12 +40,9 @@ const SeeRunsWorkflowVersionSingleRecordActionContent = ({export const SeeRunsWorkflowVersionSingleRecordAction = () => {const recordId = useSelectedRecordIdOrThrow();- const workflowVersion = useAtomFamilyStateValue(- recordStoreFamilyState,- recordId,- );+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);- const workflowId = workflowVersion?.workflow?.id;+ const workflowId = recordStore?.workflow?.id;if (!isDefined(workflowId)) {return null;diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/components/SeeVersionsWorkflowVersionSingleRecordAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/components/SeeVersionsWorkflowVersionSingleRecordAction.tsxindex 44b40f01cf9..c2621c38144 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/components/SeeVersionsWorkflowVersionSingleRecordAction.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/components/SeeVersionsWorkflowVersionSingleRecordAction.tsx@@ -33,18 +33,15 @@ const SeeVersionsWorkflowVersionSingleRecordActionContent = ({export const SeeVersionsWorkflowVersionSingleRecordAction = () => {const recordId = useSelectedRecordIdOrThrow();- const workflowVersion = useAtomFamilyStateValue(- recordStoreFamilyState,- recordId,- );+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);- if (!isDefined(workflowVersion) || !isDefined(workflowVersion.workflowId)) {+ if (!isDefined(recordStore) || !isDefined(recordStore.workflowId)) {return null;}return (<SeeVersionsWorkflowVersionSingleRecordActionContent- workflowId={workflowVersion.workflowId}+ workflowId={recordStore.workflowId}/>);};diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/components/SeeWorkflowWorkflowVersionSingleRecordAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/components/SeeWorkflowWorkflowVersionSingleRecordAction.tsxindex 77a3666cb08..3cf8c39d5d2 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/components/SeeWorkflowWorkflowVersionSingleRecordAction.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/components/SeeWorkflowWorkflowVersionSingleRecordAction.tsx@@ -7,17 +7,14 @@ import { AppPath } from 'twenty-shared/types';export const SeeWorkflowWorkflowVersionSingleRecordAction = () => {const recordId = useSelectedRecordIdOrThrow();- const workflowVersion = useAtomFamilyStateValue(- recordStoreFamilyState,- recordId,- );+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);return (<ActionLinkto={AppPath.RecordShowPage}params={{objectNameSingular: CoreObjectNameSingular.Workflow,- objectRecordId: workflowVersion?.workflow?.id,+ objectRecordId: recordStore?.workflow?.id,}}/>);diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-agnostic-actions/run-workflow-actions/hooks/useRunWorkflowRecordAgnosticActions.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-agnostic-actions/run-workflow-actions/hooks/useRunWorkflowRecordAgnosticActions.tsxindex 5c305c96731..7a4332f1ec9 100644--- a/packages/twenty-front/src/modules/action-menu/actions/record-agnostic-actions/run-workflow-actions/hooks/useRunWorkflowRecordAgnosticActions.tsx+++ b/packages/twenty-front/src/modules/action-menu/actions/record-agnostic-actions/run-workflow-actions/hooks/useRunWorkflowRecordAgnosticActions.tsx@@ -14,7 +14,7 @@ import { useIcons } from 'twenty-ui/display';export const useRunWorkflowRecordAgnosticActions = () => {const { getIcon } = useIcons();- const isPageInEditMode = useAtomComponentStateValue(+ const contextStoreIsPageInEditMode = useAtomComponentStateValue(contextStoreIsPageInEditModeComponentState,);@@ -50,7 +50,7 @@ export const useRunWorkflowRecordAgnosticActions = () => {shortLabel: name,position: index,isPinned:- !isPageInEditMode &&+ !contextStoreIsPageInEditMode &&activeWorkflowVersion.trigger?.settings?.isPinned,Icon,shouldBeRegistered: () => true,diff --git a/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuDropdown.tsx b/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuDropdown.tsxindex d371fd2127f..142927ef30f 100644--- a/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuDropdown.tsx+++ b/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuDropdown.tsx@@ -49,7 +49,7 @@ export const RecordIndexActionMenuDropdown = () => {const dropdownId = getActionMenuDropdownIdFromActionMenuId(actionMenuId);const { closeDropdown } = useCloseDropdown();- const actionMenuDropdownPosition = useAtomComponentStateValue(+ const recordIndexActionMenuDropdownPosition = useAtomComponentStateValue(recordIndexActionMenuDropdownPositionComponentState,dropdownId,);@@ -73,8 +73,8 @@ export const RecordIndexActionMenuDropdown = () => {dropdownPlacement="bottom-start"dropdownStrategy="absolute"dropdownOffset={{- x: actionMenuDropdownPosition.x ?? 0,- y: actionMenuDropdownPosition.y ?? 0,+ x: recordIndexActionMenuDropdownPosition.x ?? 0,+ y: recordIndexActionMenuDropdownPosition.y ?? 0,}}dropdownComponents={<DropdownContent>diff --git a/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerOpenRecordButton.tsx b/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerOpenRecordButton.tsxindex 1cc2722196f..aecfae39153 100644--- a/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerOpenRecordButton.tsx+++ b/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerOpenRecordButton.tsx@@ -52,7 +52,7 @@ export const RecordShowRightDrawerOpenRecordButton = ({targetObjectId: recordId,});- const activeTabIdInRightDrawer = useAtomComponentStateValue(+ const activeTabId = useAtomComponentStateValue(activeTabIdComponentState,tabListComponentId,);@@ -61,7 +61,7 @@ export const RecordShowRightDrawerOpenRecordButton = ({targetObjectId: recordId,});- const setActiveTabIdInRecordPage = useSetAtomComponentState(+ const setActiveTabId = useSetAtomComponentState(activeTabIdComponentState,tabListComponentIdInRecordPage,);@@ -83,14 +83,14 @@ export const RecordShowRightDrawerOpenRecordButton = ({const handleOpenRecord = useCallback(() => {const tabIdToOpen =- activeTabIdInRightDrawer === 'home'+ activeTabId === 'home'? objectNameSingular === CoreObjectNameSingular.Note ||objectNameSingular === CoreObjectNameSingular.Task? 'richText': 'timeline'- : activeTabIdInRightDrawer;+ : activeTabId;- setActiveTabIdInRecordPage(tabIdToOpen);+ setActiveTabId(tabIdToOpen);const parentView = store.get(parentViewState);@@ -110,14 +110,14 @@ export const RecordShowRightDrawerOpenRecordButton = ({closeCommandMenu();}, [actionMenuId,- activeTabIdInRightDrawer,+ activeTabId,closeCommandMenu,closeDropdown,navigate,objectNameSingular,parentViewState,recordId,- setActiveTabIdInRecordPage,+ setActiveTabId,store,]);diff --git a/packages/twenty-front/src/modules/action-menu/hooks/useRegisteredActions.ts b/packages/twenty-front/src/modules/action-menu/hooks/useRegisteredActions.tsindex 9dfada00450..f9be2a54aac 100644--- a/packages/twenty-front/src/modules/action-menu/hooks/useRegisteredActions.ts+++ b/packages/twenty-front/src/modules/action-menu/hooks/useRegisteredActions.ts@@ -28,7 +28,7 @@ export const useRegisteredActions = (contextStoreCurrentViewTypeComponentState,);- const isFullTabWidgetInEditMode = useAtomComponentStateValue(+ const contextStoreIsPageInEditMode = useAtomComponentStateValue(contextStoreIsPageInEditModeComponentState,);@@ -58,7 +58,7 @@ export const useRegisteredActions = (const permissionMap = usePermissionFlagMap();const actionsToRegister = Object.values(actionsConfig).filter((action) => {- if (isFullTabWidgetInEditMode) {+ if (contextStoreIsPageInEditMode) {return (isDefined(action.availableOn) &&action.availableOn.includes(ActionViewType.PAGE_EDIT_MODE)diff --git a/packages/twenty-front/src/modules/action-menu/hooks/useShouldActionBeRegisteredParams.ts b/packages/twenty-front/src/modules/action-menu/hooks/useShouldActionBeRegisteredParams.tsindex b8496723d44..5859bc23852 100644--- a/packages/twenty-front/src/modules/action-menu/hooks/useShouldActionBeRegisteredParams.ts+++ b/packages/twenty-front/src/modules/action-menu/hooks/useShouldActionBeRegisteredParams.ts@@ -98,7 +98,7 @@ export const useShouldActionBeRegisteredParams = ({useAtomComponentStateValue(contextStoreCurrentViewTypeComponentState) ===ContextStoreViewType.ShowPage;- const numberOfSelectedRecords = useAtomComponentStateValue(+ const contextStoreNumberOfSelectedRecords = useAtomComponentStateValue(contextStoreNumberOfSelectedRecordsComponentState,);@@ -159,7 +159,7 @@ export const useShouldActionBeRegisteredParams = ({isShowPage,isSelectAll,selectedRecord,- numberOfSelectedRecords,+ numberOfSelectedRecords: contextStoreNumberOfSelectedRecords,viewType: viewType ?? undefined,getTargetObjectReadPermission: getObjectReadPermission,getTargetObjectWritePermission: getObjectWritePermission,diff --git a/packages/twenty-front/src/modules/activities/hooks/__tests__/useActivityTargetObjectRecords.test.tsx b/packages/twenty-front/src/modules/activities/hooks/__tests__/useActivityTargetObjectRecords.test.tsxindex d46db433c3a..58ad90b01b0 100644--- a/packages/twenty-front/src/modules/activities/hooks/__tests__/useActivityTargetObjectRecords.test.tsx+++ b/packages/twenty-front/src/modules/activities/hooks/__tests__/useActivityTargetObjectRecords.test.tsx@@ -140,7 +140,7 @@ describe('useActivityTargetObjectRecords', () => {const { result } = renderHook(() => {- const setRecordFromStore = useSetAtomFamilyState(+ const setRecordStore = useSetAtomFamilyState(recordStoreFamilyState,task.id,);@@ -151,14 +151,14 @@ describe('useActivityTargetObjectRecords', () => {return {activityTargetObjectRecords,- setRecordFromStore,+ setRecordStore,};},{ wrapper: Wrapper },);act(() => {- result.current.setRecordFromStore(task);+ result.current.setRecordStore(task);});const activityTargetObjectRecords =diff --git a/packages/twenty-front/src/modules/activities/inline-cell/hooks/useUpdateActivityTargetFromCell.ts b/packages/twenty-front/src/modules/activities/inline-cell/hooks/useUpdateActivityTargetFromCell.tsindex bea4a1e29ff..60b16af6387 100644--- a/packages/twenty-front/src/modules/activities/inline-cell/hooks/useUpdateActivityTargetFromCell.ts+++ b/packages/twenty-front/src/modules/activities/inline-cell/hooks/useUpdateActivityTargetFromCell.ts@@ -66,7 +66,7 @@ export const useUpdateActivityTargetFromCell = ({: isNoteTargetMigrated;const store = useStore();- const setActivityFromStore = useSetAtomFamilyState(+ const setRecordStore = useSetAtomFamilyState(recordStoreFamilyState,activityId,);@@ -194,7 +194,7 @@ export const useUpdateActivityTargetFromCell = ({await createOneActivityTarget(activityTargetInput);}- setActivityFromStore((currentActivity) => {+ setRecordStore((currentActivity) => {if (!isDefined(currentActivity)) {return null;}@@ -212,7 +212,7 @@ export const useUpdateActivityTargetFromCell = ({createOneActivityTarget,deleteOneActivityTarget,isMorphRelation,- setActivityFromStore,+ setRecordStore,],);diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/EventRow.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/EventRow.tsxindex 4ebb5ddfdc2..a61b063a50a 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/EventRow.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/EventRow.tsx@@ -103,10 +103,7 @@ export const EventRow = ({const { recordId } = useContext(TimelineActivityContext);- const recordFromStore = useAtomFamilyStateValue(- recordStoreFamilyState,- recordId,- );+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);const beautifiedCreatedAt = beautifyPastDateRelativeToNow(event.createdAt,@@ -120,7 +117,7 @@ export const EventRow = ({return null;}- if (isUndefinedOrNull(recordFromStore)) {+ if (isUndefinedOrNull(recordStore)) {return null;}if (isUndefinedOrNull(mainObjectMetadataItem)) {@@ -129,7 +126,7 @@ export const EventRow = ({const labelIdentifier = getObjectRecordIdentifier({objectMetadataItem: mainObjectMetadataItem,- record: recordFromStore,+ record: recordStore,allowRequestsToTwentyIcons,});diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventFieldDiffValueEffect.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventFieldDiffValueEffect.tsxindex d559eed26b1..35e6cd1983f 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventFieldDiffValueEffect.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventFieldDiffValueEffect.tsx@@ -17,7 +17,7 @@ export const EventFieldDiffValueEffect = ({mainObjectMetadataItem: ObjectMetadataItem;fieldMetadataItem: FieldMetadataItem;}) => {- const setEntity = useSetAtomFamilyState(+ const setRecordStore = useSetAtomFamilyState(recordStoreFamilyState,diffArtificialRecordStoreId,);@@ -31,13 +31,13 @@ export const EventFieldDiffValueEffect = ({[fieldMetadataItem.name]: diffRecord,};- setEntity(forgedObjectRecord);+ setRecordStore(forgedObjectRecord);}, [diffRecord,diffArtificialRecordStoreId,fieldMetadataItem.name,mainObjectMetadataItem.nameSingular,- setEntity,+ setRecordStore,]);return <></>;diff --git a/packages/twenty-front/src/modules/ai/components/ThinkingStepsDisplay.tsx b/packages/twenty-front/src/modules/ai/components/ThinkingStepsDisplay.tsxindex 99d60caaec7..ff615e8459c 100644--- a/packages/twenty-front/src/modules/ai/components/ThinkingStepsDisplay.tsx+++ b/packages/twenty-front/src/modules/ai/components/ThinkingStepsDisplay.tsx@@ -277,12 +277,12 @@ const ThinkingToolStepRow = ({? unwrappedResult.data.result: unwrappedOutput;const toolTabListComponentInstanceId = `ai-thinking-tool-tabs-${part.toolCallId ?? rawToolName}-${rowIndex}`;- const activeToolTabId = useAtomComponentStateValue(+ const activeTabId = useAtomComponentStateValue(activeTabIdComponentState,toolTabListComponentInstanceId,);const activeTab: ToolDetailsTab =- activeToolTabId === 'input' ? 'input' : 'output';+ activeTabId === 'input' ? 'input' : 'output';const toolTabs = [{ id: 'output', title: t`Output` },{ id: 'input', title: t`Input` },diff --git a/packages/twenty-front/src/modules/ai/hooks/useAgentChatScrollToBottom.ts b/packages/twenty-front/src/modules/ai/hooks/useAgentChatScrollToBottom.tsindex c659891c65c..c61e4132ba4 100644--- a/packages/twenty-front/src/modules/ai/hooks/useAgentChatScrollToBottom.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useAgentChatScrollToBottom.ts@@ -11,12 +11,12 @@ export const useAgentChatScrollToBottom = () => {AI_CHAT_SCROLL_WRAPPER_ID,);- const scrollBottom = useAtomComponentStateValue(+ const scrollWrapperScrollBottom = useAtomComponentStateValue(scrollWrapperScrollBottomComponentState,AI_CHAT_SCROLL_WRAPPER_ID,);- const isNearBottom = scrollBottom <= SCROLL_BOTTOM_THRESHOLD_PX;+ const isNearBottom = scrollWrapperScrollBottom <= SCROLL_BOTTOM_THRESHOLD_PX;const scrollToBottom = () => {const { scrollWrapperElement } = getScrollWrapperElement();diff --git a/packages/twenty-front/src/modules/auth/components/TwoFactorAuthenticationProvisionEffect.tsx b/packages/twenty-front/src/modules/auth/components/TwoFactorAuthenticationProvisionEffect.tsxindex cb5f3295b48..243f90b3d4c 100644--- a/packages/twenty-front/src/modules/auth/components/TwoFactorAuthenticationProvisionEffect.tsx+++ b/packages/twenty-front/src/modules/auth/components/TwoFactorAuthenticationProvisionEffect.tsx@@ -20,7 +20,7 @@ export const TwoFactorAuthenticationSetupEffect = () => {const { origin } = useOrigin();const loginToken = useAtomStateValue(loginTokenState);const qrCode = useAtomStateValue(qrCodeState);- const setQrCodeState = useSetAtomState(qrCodeState);+ const setQrCode = useSetAtomState(qrCodeState);const { t } = useLingui();@@ -52,7 +52,7 @@ export const TwoFactorAuthenticationSetupEffect = () => {if (!initiateOTPProvisioningResult.data?.initiateOTPProvisioning.uri)return;- setQrCodeState(+ setQrCode(initiateOTPProvisioningResult.data?.initiateOTPProvisioning.uri,);} catch {diff --git a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenuListItem.tsx b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenuListItem.tsxindex 4851f3c31a8..2ce91eb7356 100644--- a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenuListItem.tsx+++ b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenuListItem.tsx@@ -15,7 +15,7 @@ export const CustomSlashMenuListItem = ({}: CustomSlashMenuListItemProps) => {const { resetSelectedItem } = useSelectableList(SLASH_MENU_LIST_ID);- const isSelectedItem = useAtomComponentFamilyStateValue(+ const isSelectedItemId = useAtomComponentFamilyStateValue(isSelectedItemIdComponentFamilyState,item.title,);@@ -28,7 +28,7 @@ export const CustomSlashMenuListItem = ({return (<SelectableListItem itemId={item.title} onEnter={handleClick}><MenuItemSuggestion- selected={isSelectedItem}+ selected={isSelectedItemId}onClick={handleClick}LeftIcon={item.Icon}text={item.title}diff --git a/packages/twenty-front/src/modules/client-config/hooks/useClientConfig.ts b/packages/twenty-front/src/modules/client-config/hooks/useClientConfig.tsindex d26eb2868ad..3020837c5c8 100644--- a/packages/twenty-front/src/modules/client-config/hooks/useClientConfig.ts+++ b/packages/twenty-front/src/modules/client-config/hooks/useClientConfig.ts@@ -75,19 +75,19 @@ export const useClientConfig = (): UseClientConfigResult => {const setLabPublicFeatureFlags = useSetAtomState(labPublicFeatureFlagsState);- const setMicrosoftMessagingEnabled = useSetAtomState(+ const setIsMicrosoftMessagingEnabled = useSetAtomState(isMicrosoftMessagingEnabledState,);- const setMicrosoftCalendarEnabled = useSetAtomState(+ const setIsMicrosoftCalendarEnabled = useSetAtomState(isMicrosoftCalendarEnabledState,);- const setGoogleMessagingEnabled = useSetAtomState(+ const setIsGoogleMessagingEnabled = useSetAtomState(isGoogleMessagingEnabledState,);- const setGoogleCalendarEnabled = useSetAtomState(+ const setIsGoogleCalendarEnabled = useSetAtomState(isGoogleCalendarEnabledState,);@@ -178,10 +178,10 @@ export const useClientConfig = (): UseClientConfigResult => {});setCanManageFeatureFlags(clientConfig?.canManageFeatureFlags);setLabPublicFeatureFlags(clientConfig?.publicFeatureFlags);- setMicrosoftMessagingEnabled(clientConfig?.isMicrosoftMessagingEnabled);- setMicrosoftCalendarEnabled(clientConfig?.isMicrosoftCalendarEnabled);- setGoogleMessagingEnabled(clientConfig?.isGoogleMessagingEnabled);- setGoogleCalendarEnabled(clientConfig?.isGoogleCalendarEnabled);+ setIsMicrosoftMessagingEnabled(clientConfig?.isMicrosoftMessagingEnabled);+ setIsMicrosoftCalendarEnabled(clientConfig?.isMicrosoftCalendarEnabled);+ setIsGoogleMessagingEnabled(clientConfig?.isGoogleMessagingEnabled);+ setIsGoogleCalendarEnabled(clientConfig?.isGoogleCalendarEnabled);setIsAttachmentPreviewEnabled(clientConfig?.isAttachmentPreviewEnabled);setIsConfigVariablesInDbEnabled(clientConfig?.isConfigVariablesInDbEnabled,@@ -222,8 +222,8 @@ export const useClientConfig = (): UseClientConfigResult => {setChromeExtensionId,setClientConfigApiStatus,setDomainConfiguration,- setGoogleCalendarEnabled,- setGoogleMessagingEnabled,+ setIsGoogleCalendarEnabled,+ setIsGoogleMessagingEnabled,setIsAnalyticsEnabled,setIsAttachmentPreviewEnabled,setIsConfigVariablesInDbEnabled,@@ -235,8 +235,8 @@ export const useClientConfig = (): UseClientConfigResult => {setIsClickHouseConfigured,setIsCloudflareIntegrationEnabled,setLabPublicFeatureFlags,- setMicrosoftCalendarEnabled,- setMicrosoftMessagingEnabled,+ setIsMicrosoftCalendarEnabled,+ setIsMicrosoftMessagingEnabled,setSentryConfig,setSupportChat,setAllowRequestsToTwentyIcons,diff --git a/packages/twenty-front/src/modules/command-menu-item/hooks/useCommandMenuItemFrontComponentActions.tsx b/packages/twenty-front/src/modules/command-menu-item/hooks/useCommandMenuItemFrontComponentActions.tsxindex 0143308a1a7..a6f251a2cf9 100644--- a/packages/twenty-front/src/modules/command-menu-item/hooks/useCommandMenuItemFrontComponentActions.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/hooks/useCommandMenuItemFrontComponentActions.tsx@@ -94,17 +94,17 @@ export const useCommandMenuItemFrontComponentActions = () => {useOpenFrontComponentInCommandMenu();const mountHeadlessFrontComponent = useMountHeadlessFrontComponent();- const isPageInEditMode = useAtomComponentStateValue(+ const contextStoreIsPageInEditMode = useAtomComponentStateValue(contextStoreIsPageInEditModeComponentState,);const { actionMenuType } = useContext(ActionMenuContext);- const currentObjectMetadataItemId = useAtomComponentStateValue(+ const contextStoreCurrentObjectMetadataItemId = useAtomComponentStateValue(contextStoreCurrentObjectMetadataItemIdComponentState,);- const targetedRecordsRule = useAtomComponentStateValue(+ const contextStoreTargetedRecordsRule = useAtomComponentStateValue(contextStoreTargetedRecordsRuleComponentState,);@@ -126,13 +126,14 @@ export const useCommandMenuItemFrontComponentActions = () => {) ?? [];const selectedRecordCount =- targetedRecordsRule.mode === 'selection'- ? targetedRecordsRule.selectedRecordIds.length+ contextStoreTargetedRecordsRule.mode === 'selection'+ ? contextStoreTargetedRecordsRule.selectedRecordIds.length: 0;const objectMatches = (item: CommandMenuItemWithFrontComponent) =>!isDefined(item.availabilityObjectMetadataId) ||- item.availabilityObjectMetadataId === currentObjectMetadataItemId;+ item.availabilityObjectMetadataId ===+ contextStoreCurrentObjectMetadataItemId;const globalItems = frontComponentItems.filter((item) => item.availabilityType === CommandMenuItemAvailabilityType.GLOBAL,@@ -152,7 +153,7 @@ export const useCommandMenuItemFrontComponentActions = () => {item,scope: ActionScope.Global,index,- isPinned: !isPageInEditMode && item.isPinned,+ isPinned: !contextStoreIsPageInEditMode && item.isPinned,getIcon,openFrontComponentInCommandMenu,mountHeadlessFrontComponent,@@ -164,7 +165,7 @@ export const useCommandMenuItemFrontComponentActions = () => {item,scope: ActionScope.RecordSelection,index,- isPinned: !isPageInEditMode && item.isPinned,+ isPinned: !contextStoreIsPageInEditMode && item.isPinned,getIcon,openFrontComponentInCommandMenu,mountHeadlessFrontComponent,diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenu.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenu.tsxindex e6931f1712f..7073987a82a 100644--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenu.tsx+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenu.tsx@@ -39,17 +39,18 @@ export const CommandMenu = () => {commandMenuSearch,});+ // eslint-disable-next-line twenty/matching-state-variableconst previousContextStoreCurrentObjectMetadataItemId =useAtomComponentStateValue(contextStoreCurrentObjectMetadataItemIdComponentState,'command-menu-previous',);- const objectMetadataItemId = useAtomComponentStateValue(+ const contextStoreCurrentObjectMetadataItemId = useAtomComponentStateValue(contextStoreCurrentObjectMetadataItemIdComponentState,);const currentObjectMetadataItem = objectMetadataItems.find(- (item) => item.id === objectMetadataItemId,+ (item) => item.id === contextStoreCurrentObjectMetadataItemId,);const commandGroups: ActionGroupConfig[] = [diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuContainer.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuContainer.tsxindex e54b2fbd465..c4d7f5333fa 100644--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuContainer.tsx+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuContainer.tsx@@ -29,7 +29,7 @@ type CommandMenuContainerProps = {export const CommandMenuContainer = ({children,}: CommandMenuContainerProps) => {- const objectMetadataItemId = useAtomComponentStateValue(+ const contextStoreCurrentObjectMetadataItemId = useAtomComponentStateValue(contextStoreCurrentObjectMetadataItemIdComponentState,COMMAND_MENU_COMPONENT_INSTANCE_ID,);@@ -38,17 +38,18 @@ export const CommandMenuContainer = ({const objectMetadataItems = useAtomStateValue(objectMetadataItemsState);const objectMetadataItem = objectMetadataItems.find(- (objectMetadataItem) => objectMetadataItem.id === objectMetadataItemId,+ (objectMetadataItem) =>+ objectMetadataItem.id === contextStoreCurrentObjectMetadataItemId,);- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,COMMAND_MENU_COMPONENT_INSTANCE_ID,);const recordIndexId = getRecordIndexIdFromObjectNamePluralAndViewId(objectMetadataItem?.namePlural ?? '',- currentViewId ?? '',+ contextStoreCurrentViewId ?? '',);return (diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuFolderInfo.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuFolderInfo.tsxindex 8ff2a81309c..e98b02655ca 100644--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuFolderInfo.tsx+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuFolderInfo.tsx@@ -27,11 +27,13 @@ export const CommandMenuFolderInfo = () => {const { t } = useLingui();const { getIcon } = useIcons();const commandMenuPageInfo = useAtomStateValue(commandMenuPageInfoState);- const [shouldFocusTitleInput, setShouldFocusTitleInput] =- useAtomComponentState(- commandMenuShouldFocusTitleInputComponentState,- commandMenuPageInfo.instanceId,- );+ const [+ commandMenuShouldFocusTitleInput,+ setCommandMenuShouldFocusTitleInput,+ ] = useAtomComponentState(+ commandMenuShouldFocusTitleInputComponentState,+ commandMenuPageInfo.instanceId,+ );const selectedNavigationMenuItemInEditMode = useAtomStateValue(selectedNavigationMenuItemInEditModeState,);@@ -106,8 +108,8 @@ export const CommandMenuFolderInfo = () => {onClickOutside={handleSave}onTab={handleSave}onShiftTab={handleSave}- shouldFocus={shouldFocusTitleInput}- onFocus={() => setShouldFocusTitleInput(false)}+ shouldFocus={commandMenuShouldFocusTitleInput}+ onFocus={() => setCommandMenuShouldFocusTitleInput(false)}/>}/>diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemWithAddToNavigationDrag.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemWithAddToNavigationDrag.tsxindex aa0061cd4f4..10abb650af7 100644--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemWithAddToNavigationDrag.tsx+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemWithAddToNavigationDrag.tsx@@ -41,7 +41,9 @@ export const CommandMenuItemWithAddToNavigationDrag = ({dragIndex,}: CommandMenuItemWithAddToNavigationDragProps) => {const { t } = useLingui();- const setRegistry = useSetAtomState(addToNavPayloadRegistryState);+ const setAddToNavPayloadRegistry = useSetAtomState(+ addToNavPayloadRegistryState,+ );const [isHovered, setIsHovered] = useState(false);const contextualDescription = isHovered@@ -59,7 +61,7 @@ export const CommandMenuItemWithAddToNavigationDrag = ({const registerPayload = () => {if (dragIndex !== undefined) {- setRegistry((prev) => new Map(prev).set(id, payload));+ setAddToNavPayloadRegistry((prev) => new Map(prev).set(id, payload));}};diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuLinkInfo.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuLinkInfo.tsxindex edd72a63876..bc74cfa0f16 100644--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuLinkInfo.tsx+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuLinkInfo.tsx@@ -19,11 +19,13 @@ export const CommandMenuLinkInfo = () => {const theme = useTheme();const { t } = useLingui();const commandMenuPageInfo = useAtomStateValue(commandMenuPageInfoState);- const [shouldFocusTitleInput, setShouldFocusTitleInput] =- useAtomComponentState(- commandMenuShouldFocusTitleInputComponentState,- commandMenuPageInfo.instanceId,- );+ const [+ commandMenuShouldFocusTitleInput,+ setCommandMenuShouldFocusTitleInput,+ ] = useAtomComponentState(+ commandMenuShouldFocusTitleInputComponentState,+ commandMenuPageInfo.instanceId,+ );const selectedNavigationMenuItemInEditMode = useAtomStateValue(selectedNavigationMenuItemInEditModeState,);@@ -84,8 +86,8 @@ export const CommandMenuLinkInfo = () => {onClickOutside={handleSave}onTab={handleSave}onShiftTab={handleSave}- shouldFocus={shouldFocusTitleInput}- onFocus={() => setShouldFocusTitleInput(false)}+ shouldFocus={commandMenuShouldFocusTitleInput}+ onFocus={() => setCommandMenuShouldFocusTitleInput(false)}/>}label={t`link`}diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuPageLayoutInfo.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuPageLayoutInfo.tsxindex 50180f8e251..b898d6c989f 100644--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuPageLayoutInfo.tsx+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuPageLayoutInfo.tsx@@ -7,16 +7,16 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { isDefined } from 'twenty-shared/utils';export const CommandMenuPageLayoutInfo = () => {- const objectMetadataId = useAtomComponentStateValue(+ const contextStoreCurrentObjectMetadataItemId = useAtomComponentStateValue(contextStoreCurrentObjectMetadataItemIdComponentState,);- if (!isDefined(objectMetadataId)) {+ if (!isDefined(contextStoreCurrentObjectMetadataItemId)) {throw new Error('Object metadata ID is not defined');}const { objectMetadataItem } = useObjectMetadataItemById({- objectId: objectMetadataId,+ objectId: contextStoreCurrentObjectMetadataItemId,});const isDashboardContext =diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuPageLayoutInfoContent.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuPageLayoutInfoContent.tsxindex bc0a7c4d822..15c2a07d4ba 100644--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuPageLayoutInfoContent.tsx+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuPageLayoutInfoContent.tsx@@ -30,17 +30,19 @@ export const CommandMenuPageLayoutInfoContent = ({const commandMenuPage = useAtomStateValue(commandMenuPageState);const commandMenuPageInfo = useAtomStateValue(commandMenuPageInfoState);- const [shouldFocusTitleInput, setShouldFocusTitleInput] =- useAtomComponentState(- commandMenuShouldFocusTitleInputComponentState,- commandMenuPageInfo.instanceId,- );+ const [+ commandMenuShouldFocusTitleInput,+ setCommandMenuShouldFocusTitleInput,+ ] = useAtomComponentState(+ commandMenuShouldFocusTitleInputComponentState,+ commandMenuPageInfo.instanceId,+ );const handleTitleInputOpen = () => {- setShouldFocusTitleInput(false);+ setCommandMenuShouldFocusTitleInput(false);};- const draftPageLayout = useAtomComponentStateValue(+ const pageLayoutDraft = useAtomComponentStateValue(pageLayoutDraftComponentState,pageLayoutId,);@@ -50,7 +52,7 @@ export const CommandMenuPageLayoutInfoContent = ({pageLayoutId,);- const [openTabId] = useAtomComponentState(+ const [pageLayoutTabSettingsOpenTabId] = useAtomComponentState(pageLayoutTabSettingsOpenTabIdComponentState,pageLayoutId,);@@ -63,9 +65,9 @@ export const CommandMenuPageLayoutInfoContent = ({const headerInfo = usePageLayoutHeaderInfo({commandMenuPage,- draftPageLayout,+ draftPageLayout: pageLayoutDraft,pageLayoutEditingWidgetId,- openTabId,+ openTabId: pageLayoutTabSettingsOpenTabId,editedTitle,});@@ -136,7 +138,7 @@ export const CommandMenuPageLayoutInfoContent = ({onClickOutside={saveTitle}onTab={saveTitle}onShiftTab={saveTitle}- shouldFocus={shouldFocusTitleInput}+ shouldFocus={commandMenuShouldFocusTitleInput}onFocus={handleTitleInputOpen}/>}diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuWorkflowStepInfo.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuWorkflowStepInfo.tsxindex d6481a68d59..580c9e3e88d 100644--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuWorkflowStepInfo.tsx+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuWorkflowStepInfo.tsx@@ -39,7 +39,7 @@ export const CommandMenuWorkflowStepInfo = ({const workflowId = useCommandMenuWorkflowIdOrThrow();- const workflowStepId = useAtomComponentStateValue(+ const commandMenuWorkflowStepId = useAtomComponentStateValue(commandMenuWorkflowStepIdComponentState,commandMenuPageInstanceId,);@@ -71,13 +71,13 @@ export const CommandMenuWorkflowStepInfo = ({id: undefined,};- const isTriggerStep = workflowStepId === TRIGGER_STEP_ID;+ const isTriggerStep = commandMenuWorkflowStepId === TRIGGER_STEP_ID;const stepDefinition =- isDefined(workflowStepId) && isDefined(trigger)+ isDefined(commandMenuWorkflowStepId) && isDefined(trigger)? isTriggerStep || isDefined(steps)? getStepDefinitionOrThrow({- stepId: workflowStepId,+ stepId: commandMenuWorkflowStepId,trigger,steps,})@@ -109,7 +109,7 @@ export const CommandMenuWorkflowStepInfo = ({if (!isDefined(workflowId) ||- !isDefined(workflowStepId) ||+ !isDefined(commandMenuWorkflowStepId) ||!isDefined(workflowWithCurrentVersion?.currentVersion) ||!isDefined(stepDefinition) ||!isDefined(stepDefinition.definition)diff --git a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useOpenRecordInCommandMenu.test.tsx b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useOpenRecordInCommandMenu.test.tsxindex 18941f08d8b..bb2181970e1 100644--- a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useOpenRecordInCommandMenu.test.tsx+++ b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useOpenRecordInCommandMenu.test.tsx@@ -60,19 +60,20 @@ const renderHooks = () => {viewableRecordNameSingularComponentState,'mocked-uuid',);- const currentObjectMetadataItemId = useAtomComponentStateValue(- contextStoreCurrentObjectMetadataItemIdComponentState,- 'mocked-uuid',- );- const targetedRecordsRule = useAtomComponentStateValue(+ const contextStoreCurrentObjectMetadataItemId =+ useAtomComponentStateValue(+ contextStoreCurrentObjectMetadataItemIdComponentState,+ 'mocked-uuid',+ );+ const contextStoreTargetedRecordsRule = useAtomComponentStateValue(contextStoreTargetedRecordsRuleComponentState,'mocked-uuid',);- const numberOfSelectedRecords = useAtomComponentStateValue(+ const contextStoreNumberOfSelectedRecords = useAtomComponentStateValue(contextStoreNumberOfSelectedRecordsComponentState,'mocked-uuid',);- const currentViewType = useAtomComponentStateValue(+ const contextStoreCurrentViewType = useAtomComponentStateValue(contextStoreCurrentViewTypeComponentState,'mocked-uuid',);@@ -82,10 +83,10 @@ const renderHooks = () => {openRecordInCommandMenu,viewableRecordId,viewableRecordNameSingular,- currentObjectMetadataItemId,- targetedRecordsRule,- numberOfSelectedRecords,- currentViewType,+ contextStoreCurrentObjectMetadataItemId,+ contextStoreTargetedRecordsRule,+ contextStoreNumberOfSelectedRecords,+ contextStoreCurrentViewType,getIcon,};},@@ -116,15 +117,17 @@ describe('useOpenRecordInCommandMenu', () => {expect(result.current.viewableRecordId).toBe(recordId);expect(result.current.viewableRecordNameSingular).toBe(objectNameSingular);- expect(result.current.currentObjectMetadataItemId).toBe(+ expect(result.current.contextStoreCurrentObjectMetadataItemId).toBe(personMockObjectMetadataItem.id,);- expect(result.current.targetedRecordsRule).toEqual({+ expect(result.current.contextStoreTargetedRecordsRule).toEqual({mode: 'selection',selectedRecordIds: [recordId],});- expect(result.current.numberOfSelectedRecords).toBe(1);- expect(result.current.currentViewType).toBe(ContextStoreViewType.ShowPage);+ expect(result.current.contextStoreNumberOfSelectedRecords).toBe(1);+ expect(result.current.contextStoreCurrentViewType).toBe(+ ContextStoreViewType.ShowPage,+ );const commandMenuNavigationMorphItemsByPage = jotaiStore.get(commandMenuNavigationMorphItemsByPageState.atom,diff --git a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useSetGlobalCommandMenuContext.test.tsx b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useSetGlobalCommandMenuContext.test.tsxindex b2b0125bce5..c0f1ed611e3 100644--- a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useSetGlobalCommandMenuContext.test.tsx+++ b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useSetGlobalCommandMenuContext.test.tsx@@ -60,44 +60,44 @@ describe('useSetGlobalCommandMenuContext', () => {const { setGlobalCommandMenuContext } =useSetGlobalCommandMenuContext();- const targetedRecordsRule = useAtomComponentStateValue(+ const contextStoreTargetedRecordsRule = useAtomComponentStateValue(contextStoreTargetedRecordsRuleComponentState,COMMAND_MENU_COMPONENT_INSTANCE_ID,);- const numberOfSelectedRecords = useAtomComponentStateValue(+ const contextStoreNumberOfSelectedRecords = useAtomComponentStateValue(contextStoreNumberOfSelectedRecordsComponentState,COMMAND_MENU_COMPONENT_INSTANCE_ID,);- const filters = useAtomComponentStateValue(+ const contextStoreFilters = useAtomComponentStateValue(contextStoreFiltersComponentState,COMMAND_MENU_COMPONENT_INSTANCE_ID,);- const filterGroups = useAtomComponentStateValue(+ const contextStoreFilterGroups = useAtomComponentStateValue(contextStoreFilterGroupsComponentState,COMMAND_MENU_COMPONENT_INSTANCE_ID,);- const anyFieldFilterValue = useAtomComponentStateValue(+ const contextStoreAnyFieldFilterValue = useAtomComponentStateValue(contextStoreAnyFieldFilterValueComponentState,COMMAND_MENU_COMPONENT_INSTANCE_ID,);- const currentViewType = useAtomComponentStateValue(+ const contextStoreCurrentViewType = useAtomComponentStateValue(contextStoreCurrentViewTypeComponentState,COMMAND_MENU_COMPONENT_INSTANCE_ID,);return {setGlobalCommandMenuContext,- targetedRecordsRule,- numberOfSelectedRecords,- filters,- filterGroups,- currentViewType,- anyFieldFilterValue,+ contextStoreTargetedRecordsRule,+ contextStoreNumberOfSelectedRecords,+ contextStoreFilters,+ contextStoreFilterGroups,+ contextStoreCurrentViewType,+ contextStoreAnyFieldFilterValue,};},{@@ -105,14 +105,16 @@ describe('useSetGlobalCommandMenuContext', () => {},);- expect(result.current.targetedRecordsRule).toEqual({+ expect(result.current.contextStoreTargetedRecordsRule).toEqual({mode: 'selection',selectedRecordIds: [peopleMock[0].id, peopleMock[1].id],});- expect(result.current.numberOfSelectedRecords).toBe(2);- expect(result.current.filters).toEqual([]);- expect(result.current.anyFieldFilterValue).toEqual('');- expect(result.current.currentViewType).toBe(ContextStoreViewType.Table);+ expect(result.current.contextStoreNumberOfSelectedRecords).toBe(2);+ expect(result.current.contextStoreFilters).toEqual([]);+ expect(result.current.contextStoreAnyFieldFilterValue).toEqual('');+ expect(result.current.contextStoreCurrentViewType).toBe(+ ContextStoreViewType.Table,+ );const commandMenuPageInfo = jotaiStore.get(commandMenuPageInfoState.atom);expect(commandMenuPageInfo).toEqual({title: undefined,@@ -128,14 +130,16 @@ describe('useSetGlobalCommandMenuContext', () => {result.current.setGlobalCommandMenuContext();});- expect(result.current.targetedRecordsRule).toEqual({+ expect(result.current.contextStoreTargetedRecordsRule).toEqual({mode: 'selection',selectedRecordIds: [],});- expect(result.current.numberOfSelectedRecords).toBe(0);- expect(result.current.filters).toEqual([]);- expect(result.current.anyFieldFilterValue).toEqual('');- expect(result.current.currentViewType).toBe(ContextStoreViewType.Table);+ expect(result.current.contextStoreNumberOfSelectedRecords).toBe(0);+ expect(result.current.contextStoreFilters).toEqual([]);+ expect(result.current.contextStoreAnyFieldFilterValue).toEqual('');+ expect(result.current.contextStoreCurrentViewType).toBe(+ ContextStoreViewType.Table,+ );const commandMenuPageInfoAfter = jotaiStore.get(commandMenuPageInfoState.atom,);@@ -156,11 +160,13 @@ describe('useSetGlobalCommandMenuContext', () => {const { setGlobalCommandMenuContext } =useSetGlobalCommandMenuContext();+ // eslint-disable-next-line twenty/matching-state-variableconst previousTargetedRecordsRule = useAtomComponentStateValue(contextStoreTargetedRecordsRuleComponentState,COMMAND_MENU_PREVIOUS_COMPONENT_INSTANCE_ID,);+ // eslint-disable-next-line twenty/matching-state-variableconst previousNumberOfSelectedRecords = useAtomComponentStateValue(contextStoreNumberOfSelectedRecordsComponentState,COMMAND_MENU_PREVIOUS_COMPONENT_INSTANCE_ID,diff --git a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useWorkflowCommandMenu.test.tsx b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useWorkflowCommandMenu.test.tsxindex e621ce22236..ec31da767e8 100644--- a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useWorkflowCommandMenu.test.tsx+++ b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useWorkflowCommandMenu.test.tsx@@ -2,7 +2,6 @@ import { renderHook } from '@testing-library/react';import { COMMAND_MENU_COMPONENT_INSTANCE_ID } from '@/command-menu/constants/CommandMenuComponentInstanceId';import { useWorkflowCommandMenu } from '@/command-menu/hooks/useWorkflowCommandMenu';-import { viewableRecordIdComponentState } from '@/command-menu/pages/record-page/states/viewableRecordIdComponentState';import { viewableRecordNameSingularComponentState } from '@/command-menu/pages/record-page/states/viewableRecordNameSingularComponentState';import { commandMenuWorkflowIdComponentState } from '@/command-menu/pages/workflow/states/commandMenuWorkflowIdComponentState';import { commandMenuWorkflowVersionIdComponentState } from '@/command-menu/pages/workflow/states/commandMenuWorkflowVersionIdComponentState';@@ -65,35 +64,32 @@ const renderHooks = () => {openWorkflowViewStepInCommandMenu,} = useWorkflowCommandMenu();- const _viewableRecordId = useAtomComponentStateValue(- viewableRecordIdComponentState,- 'mocked-uuid',- );const viewableRecordNameSingular = useAtomComponentStateValue(viewableRecordNameSingularComponentState,'mocked-uuid',);- const currentObjectMetadataItemId = useAtomComponentStateValue(- contextStoreCurrentObjectMetadataItemIdComponentState,- 'mocked-uuid',- );- const targetedRecordsRule = useAtomComponentStateValue(+ const contextStoreCurrentObjectMetadataItemId =+ useAtomComponentStateValue(+ contextStoreCurrentObjectMetadataItemIdComponentState,+ 'mocked-uuid',+ );+ const contextStoreTargetedRecordsRule = useAtomComponentStateValue(contextStoreTargetedRecordsRuleComponentState,'mocked-uuid',);- const numberOfSelectedRecords = useAtomComponentStateValue(+ const contextStoreNumberOfSelectedRecords = useAtomComponentStateValue(contextStoreNumberOfSelectedRecordsComponentState,'mocked-uuid',);- const currentViewType = useAtomComponentStateValue(+ const contextStoreCurrentViewType = useAtomComponentStateValue(contextStoreCurrentViewTypeComponentState,'mocked-uuid',);- const workflowId = useAtomComponentStateValue(+ const commandMenuWorkflowId = useAtomComponentStateValue(commandMenuWorkflowIdComponentState,'mocked-uuid',);- const workflowVersionId = useAtomComponentStateValue(+ const commandMenuWorkflowVersionId = useAtomComponentStateValue(commandMenuWorkflowVersionIdComponentState,'mocked-uuid',);@@ -105,13 +101,13 @@ const renderHooks = () => {openWorkflowEditStepInCommandMenu,openWorkflowEditStepTypeInCommandMenu,openWorkflowViewStepInCommandMenu,- workflowId,- workflowVersionId,+ commandMenuWorkflowId,+ commandMenuWorkflowVersionId,viewableRecordNameSingular,- currentObjectMetadataItemId,- targetedRecordsRule,- numberOfSelectedRecords,- currentViewType,+ contextStoreCurrentObjectMetadataItemId,+ contextStoreTargetedRecordsRule,+ contextStoreNumberOfSelectedRecords,+ contextStoreCurrentViewType,getIcon,};},@@ -134,7 +130,7 @@ describe('useWorkflowCommandMenu', () => {result.current.openWorkflowTriggerTypeInCommandMenu('test-workflow-id');});- expect(result.current.workflowId).toBe('test-workflow-id');+ expect(result.current.commandMenuWorkflowId).toBe('test-workflow-id');expect(mockNavigateCommandMenu).toHaveBeenCalledWith({page: CommandMenuPages.WorkflowTriggerSelectType,@@ -151,7 +147,7 @@ describe('useWorkflowCommandMenu', () => {result.current.openWorkflowCreateStepInCommandMenu('test-workflow-id');});- expect(result.current.workflowId).toBe('test-workflow-id');+ expect(result.current.commandMenuWorkflowId).toBe('test-workflow-id');expect(mockNavigateCommandMenu).toHaveBeenCalledWith({page: CommandMenuPages.WorkflowStepCreate,@@ -168,7 +164,7 @@ describe('useWorkflowCommandMenu', () => {result.current.openWorkflowEditStepTypeInCommandMenu('test-workflow-id');});- expect(result.current.workflowId).toBe('test-workflow-id');+ expect(result.current.commandMenuWorkflowId).toBe('test-workflow-id');expect(mockNavigateCommandMenu).toHaveBeenCalledWith({page: CommandMenuPages.WorkflowStepEditType,@@ -189,7 +185,7 @@ describe('useWorkflowCommandMenu', () => {);});- expect(result.current.workflowId).toBe('test-workflow-id');+ expect(result.current.commandMenuWorkflowId).toBe('test-workflow-id');expect(mockNavigateCommandMenu).toHaveBeenCalledWith({page: CommandMenuPages.WorkflowStepEdit,@@ -211,8 +207,10 @@ describe('useWorkflowCommandMenu', () => {});});- expect(result.current.workflowId).toBe('test-workflow-id');- expect(result.current.workflowVersionId).toBe('test-workflow-version-id');+ expect(result.current.commandMenuWorkflowId).toBe('test-workflow-id');+ expect(result.current.commandMenuWorkflowVersionId).toBe(+ 'test-workflow-version-id',+ );expect(mockNavigateCommandMenu).toHaveBeenCalledWith({page: CommandMenuPages.WorkflowStepView,diff --git a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.tsindex 06ff285c146..84d6a131eaa 100644--- a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts+++ b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts@@ -38,7 +38,7 @@ export const useCommandMenuHotKeys = () => {const isAiEnabled = useIsFeatureEnabled(FeatureFlagKey.IS_AI_ENABLED);- const contextStoreTargetedRecordsRuleComponent = useAtomComponentStateValue(+ const contextStoreTargetedRecordsRule = useAtomComponentStateValue(contextStoreTargetedRecordsRuleComponentState,COMMAND_MENU_COMPONENT_INSTANCE_ID,);@@ -101,9 +101,8 @@ export const useCommandMenuHotKeys = () => {if (commandMenuPage === CommandMenuPages.Root &&!(- contextStoreTargetedRecordsRuleComponent.mode === 'selection' &&- contextStoreTargetedRecordsRuleComponent.selectedRecordIds.length ===- 0+ contextStoreTargetedRecordsRule.mode === 'selection' &&+ contextStoreTargetedRecordsRule.selectedRecordIds.length === 0)) {setGlobalCommandMenuContext();@@ -116,7 +115,7 @@ export const useCommandMenuHotKeys = () => {dependencies: [commandMenuPage,commandMenuSearch,- contextStoreTargetedRecordsRuleComponent,+ contextStoreTargetedRecordsRule,goBackFromCommandMenu,setGlobalCommandMenuContext,],diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/CommandMenuPageLayoutChartSettings.tsx b/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/CommandMenuPageLayoutChartSettings.tsxindex cac2c26059d..f839f41d2cc 100644--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/CommandMenuPageLayoutChartSettings.tsx+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/CommandMenuPageLayoutChartSettings.tsx@@ -18,7 +18,7 @@ const StyledContainer = styled.div`export const CommandMenuPageLayoutChartSettings = () => {const { pageLayoutId } = usePageLayoutIdFromContextStoreTargetedRecord();- const draftPageLayout = useAtomComponentStateValue(+ const pageLayoutDraft = useAtomComponentStateValue(pageLayoutDraftComponentState,pageLayoutId,);@@ -28,7 +28,7 @@ export const CommandMenuPageLayoutChartSettings = () => {pageLayoutId,);- const widgetInEditMode = draftPageLayout.tabs+ const widgetInEditMode = pageLayoutDraft.tabs.flatMap((tab) => tab.widgets).find((widget) => widget.id === pageLayoutEditingWidgetId);diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/CommandMenuPageLayoutGraphFilter.tsx b/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/CommandMenuPageLayoutGraphFilter.tsxindex 6465507cecb..557c7cd389a 100644--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/CommandMenuPageLayoutGraphFilter.tsx+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/CommandMenuPageLayoutGraphFilter.tsx@@ -11,7 +11,7 @@ import { isDefined } from 'twenty-shared/utils';export const CommandMenuPageLayoutGraphFilter = () => {const { pageLayoutId } = usePageLayoutIdFromContextStoreTargetedRecord();- const draftPageLayout = useAtomComponentStateValue(+ const pageLayoutDraft = useAtomComponentStateValue(pageLayoutDraftComponentState,pageLayoutId,);@@ -21,7 +21,7 @@ export const CommandMenuPageLayoutGraphFilter = () => {pageLayoutId,);- const widgetInEditMode = draftPageLayout.tabs+ const widgetInEditMode = pageLayoutDraft.tabs.flatMap((tab) => tab.widgets).find((widget) => widget.id === pageLayoutEditingWidgetId);diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/CommandMenuPageLayoutTabSettings.tsx b/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/CommandMenuPageLayoutTabSettings.tsxindex cd05609a07d..0de75cb603f 100644--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/CommandMenuPageLayoutTabSettings.tsx+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/CommandMenuPageLayoutTabSettings.tsx@@ -26,26 +26,29 @@ export const CommandMenuPageLayoutTabSettings = () => {const { closeCommandMenu } = useCommandMenu();const { pageLayoutId } = usePageLayoutIdFromContextStoreTargetedRecord();- const draft = useAtomComponentStateValue(+ const pageLayoutDraft = useAtomComponentStateValue(pageLayoutDraftComponentState,pageLayoutId,);- const [openTabId, setOpenTabId] = useAtomComponentState(- pageLayoutTabSettingsOpenTabIdComponentState,- pageLayoutId,- );+ const [pageLayoutTabSettingsOpenTabId, setPageLayoutTabSettingsOpenTabId] =+ useAtomComponentState(+ pageLayoutTabSettingsOpenTabIdComponentState,+ pageLayoutId,+ );const { moveLeft, moveRight } = useMovePageLayoutTab(pageLayoutId);const { deleteTab } = useDeletePageLayoutTab(pageLayoutId);const { duplicateTab } = useDuplicatePageLayoutTab(pageLayoutId);- if (!isDefined(openTabId)) {+ if (!isDefined(pageLayoutTabSettingsOpenTabId)) {return null;}- const tabsSorted = sortTabsByPosition(draft.tabs);- const currentIndex = tabsSorted.findIndex((t) => t.id === openTabId);+ const tabsSorted = sortTabsByPosition(pageLayoutDraft.tabs);+ const currentIndex = tabsSorted.findIndex(+ (t) => t.id === pageLayoutTabSettingsOpenTabId,+ );if (currentIndex < 0) return null;const tab = tabsSorted[currentIndex];const canMoveLeft = currentIndex > 0;@@ -54,7 +57,7 @@ export const CommandMenuPageLayoutTabSettings = () => {const handleDelete = () => {deleteTab(tab.id);- setOpenTabId(null);+ setPageLayoutTabSettingsOpenTabId(null);closeCommandMenu();};diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/CommandMenuPageLayoutWidgetTypeSelect.tsx b/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/CommandMenuPageLayoutWidgetTypeSelect.tsxindex ad241d35120..6e8e296d53a 100644--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/CommandMenuPageLayoutWidgetTypeSelect.tsx+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/CommandMenuPageLayoutWidgetTypeSelect.tsx@@ -84,13 +84,13 @@ export const CommandMenuPageLayoutWidgetTypeSelect = () => {pageLayoutId,);- const draftPageLayout = useAtomComponentStateValue(+ const pageLayoutDraft = useAtomComponentStateValue(pageLayoutDraftComponentState,pageLayoutId,);const existingWidget = isDefined(pageLayoutEditingWidgetId)- ? draftPageLayout.tabs+ ? pageLayoutDraft.tabs.flatMap((tab) => tab.widgets).find((widget) => widget.id === pageLayoutEditingWidgetId): undefined;diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/WidgetSettingsFooter.tsx b/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/WidgetSettingsFooter.tsxindex da6903aef16..7f4f315999e 100644--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/WidgetSettingsFooter.tsx+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/WidgetSettingsFooter.tsx@@ -23,21 +23,21 @@ export const WidgetSettingsFooter = ({const { closeDropdown } = useCloseDropdown();const { duplicateWidget } = useDuplicatePageLayoutWidget(pageLayoutId);const { deletePageLayoutWidget } = useDeletePageLayoutWidget(pageLayoutId);- const editingWidgetId = useAtomComponentStateValue(+ const pageLayoutEditingWidgetId = useAtomComponentStateValue(pageLayoutEditingWidgetIdComponentState,pageLayoutId,);const handleDuplicateWidget = () => {- if (isDefined(editingWidgetId)) {- duplicateWidget(editingWidgetId);+ if (isDefined(pageLayoutEditingWidgetId)) {+ duplicateWidget(pageLayoutEditingWidgetId);}closeDropdown(dropdownId);};const handleDeleteWidget = () => {- if (isDefined(editingWidgetId)) {- deletePageLayoutWidget(editingWidgetId);+ if (isDefined(pageLayoutEditingWidgetId)) {+ deletePageLayoutWidget(pageLayoutEditingWidgetId);}closeDropdown(dropdownId);};diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/usePageLayoutFromContextStoreTargetedRecord.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/usePageLayoutFromContextStoreTargetedRecord.tsindex 1c75867a354..bb2b2640f76 100644--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/usePageLayoutFromContextStoreTargetedRecord.ts+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/usePageLayoutFromContextStoreTargetedRecord.ts@@ -4,22 +4,22 @@ import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtoimport { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';export const usePageLayoutIdFromContextStoreTargetedRecord = () => {- const targetedRecordsRule = useAtomComponentStateValue(+ const contextStoreTargetedRecordsRule = useAtomComponentStateValue(contextStoreTargetedRecordsRuleComponentState,);if (!(- targetedRecordsRule.mode === 'selection' &&- targetedRecordsRule.selectedRecordIds.length === 1+ contextStoreTargetedRecordsRule.mode === 'selection' &&+ contextStoreTargetedRecordsRule.selectedRecordIds.length === 1)) {- throw new Error('Only one record should be selected');+ throw new Error('Only one recordStore should be selected');}- const recordId: string = targetedRecordsRule.selectedRecordIds[0];+ const recordId: string = contextStoreTargetedRecordsRule.selectedRecordIds[0];- const record = useAtomFamilyStateValue(recordStoreFamilyState, recordId);+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);- return { pageLayoutId: record?.pageLayoutId };+ return { pageLayoutId: recordStore?.pageLayoutId };};diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/usePageLayoutIdForRecordPageLayoutFromContextStoreTargetedRecord.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/usePageLayoutIdForRecordPageLayoutFromContextStoreTargetedRecord.tsindex 99da7e7d937..f90027d2b6f 100644--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/usePageLayoutIdForRecordPageLayoutFromContextStoreTargetedRecord.ts+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/usePageLayoutIdForRecordPageLayoutFromContextStoreTargetedRecord.ts@@ -7,26 +7,26 @@ import { isDefined } from 'twenty-shared/utils';export const usePageLayoutIdForRecordPageLayoutFromContextStoreTargetedRecord =() => {- const targetedRecordsRule = useAtomComponentStateValue(+ const contextStoreTargetedRecordsRule = useAtomComponentStateValue(contextStoreTargetedRecordsRuleComponentState,);- const objectMetadataId = useAtomComponentStateValue(+ const contextStoreCurrentObjectMetadataItemId = useAtomComponentStateValue(contextStoreCurrentObjectMetadataItemIdComponentState,);- if (!isDefined(objectMetadataId)) {+ if (!isDefined(contextStoreCurrentObjectMetadataItemId)) {throw new Error('Object metadata ID is not defined');}const { objectMetadataItem } = useObjectMetadataItemById({- objectId: objectMetadataId ?? undefined,+ objectId: contextStoreCurrentObjectMetadataItemId ?? undefined,});if (!(- targetedRecordsRule.mode === 'selection' &&- targetedRecordsRule.selectedRecordIds.length === 1+ contextStoreTargetedRecordsRule.mode === 'selection' &&+ contextStoreTargetedRecordsRule.selectedRecordIds.length === 1)) {throw new Error('Only one record should be selected');diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/useUpdateCurrentWidgetConfig.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/useUpdateCurrentWidgetConfig.tsindex fbfcdc00e09..879260eeea4 100644--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/useUpdateCurrentWidgetConfig.ts+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/useUpdateCurrentWidgetConfig.ts@@ -12,7 +12,7 @@ export const useUpdateCurrentWidgetConfig = (pageLayoutIdFromProps: string) => {pageLayoutIdFromProps,);- const currentlyEditingWidgetId = useAtomComponentStateValue(+ const pageLayoutEditingWidgetId = useAtomComponentStateValue(pageLayoutEditingWidgetIdComponentState,pageLayoutIdFromProps,);@@ -33,7 +33,7 @@ export const useUpdateCurrentWidgetConfig = (pageLayoutIdFromProps: string) => {tabs: prev.tabs.map((tab) => ({...tab,widgets: tab.widgets.map((widget) =>- widget.id === currentlyEditingWidgetId+ widget.id === pageLayoutEditingWidgetId? {...widget,objectMetadataId: objectMetadataId ?? widget.objectMetadataId,@@ -47,7 +47,7 @@ export const useUpdateCurrentWidgetConfig = (pageLayoutIdFromProps: string) => {})),});},- [pageLayoutDraft, currentlyEditingWidgetId, store],+ [pageLayoutDraft, pageLayoutEditingWidgetId, store],);return { updateCurrentWidgetConfig };diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/useWidgetInEditMode.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/useWidgetInEditMode.tsindex a0b837e4707..be5eab8ea9e 100644--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/useWidgetInEditMode.ts+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/useWidgetInEditMode.ts@@ -3,7 +3,7 @@ import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/paimport { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';export const useWidgetInEditMode = (pageLayoutId: string) => {- const draftPageLayout = useAtomComponentStateValue(+ const pageLayoutDraft = useAtomComponentStateValue(pageLayoutDraftComponentState,pageLayoutId,);@@ -13,7 +13,7 @@ export const useWidgetInEditMode = (pageLayoutId: string) => {pageLayoutId,);- const widgetInEditMode = draftPageLayout.tabs+ const widgetInEditMode = pageLayoutDraft.tabs.flatMap((tab) => tab.widgets).find((widget) => widget.id === pageLayoutEditingWidgetId);diff --git a/packages/twenty-front/src/modules/command-menu/pages/workflow/hooks/useCommandMenuWorkflowIdOrThrow.ts b/packages/twenty-front/src/modules/command-menu/pages/workflow/hooks/useCommandMenuWorkflowIdOrThrow.tsindex 19ac2d58b32..2a075cf5b28 100644--- a/packages/twenty-front/src/modules/command-menu/pages/workflow/hooks/useCommandMenuWorkflowIdOrThrow.ts+++ b/packages/twenty-front/src/modules/command-menu/pages/workflow/hooks/useCommandMenuWorkflowIdOrThrow.ts@@ -3,14 +3,14 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { isDefined } from 'twenty-shared/utils';export const useCommandMenuWorkflowIdOrThrow = () => {- const workflowId = useAtomComponentStateValue(+ const commandMenuWorkflowId = useAtomComponentStateValue(commandMenuWorkflowIdComponentState,);- if (!isDefined(workflowId)) {+ if (!isDefined(commandMenuWorkflowId)) {throw new Error('Expected commandMenuWorkflowIdComponentState to be defined',);}- return workflowId;+ return commandMenuWorkflowId;};diff --git a/packages/twenty-front/src/modules/command-menu/pages/workflow/step/view-run/hooks/useCommandMenuWorkflowRunIdOrThrow.ts b/packages/twenty-front/src/modules/command-menu/pages/workflow/step/view-run/hooks/useCommandMenuWorkflowRunIdOrThrow.tsindex 43ce756f17e..998910f0359 100644--- a/packages/twenty-front/src/modules/command-menu/pages/workflow/step/view-run/hooks/useCommandMenuWorkflowRunIdOrThrow.ts+++ b/packages/twenty-front/src/modules/command-menu/pages/workflow/step/view-run/hooks/useCommandMenuWorkflowRunIdOrThrow.ts@@ -3,14 +3,14 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { isDefined } from 'twenty-shared/utils';export const useCommandMenuWorkflowRunIdOrThrow = () => {- const workflowRunId = useAtomComponentStateValue(+ const commandMenuWorkflowRunId = useAtomComponentStateValue(commandMenuWorkflowRunIdComponentState,);- if (!isDefined(workflowRunId)) {+ if (!isDefined(commandMenuWorkflowRunId)) {throw new Error('Expected the commandMenuWorkflowRunIdComponentState to be defined.',);}- return workflowRunId;+ return commandMenuWorkflowRunId;};diff --git a/packages/twenty-front/src/modules/command-menu/pages/workflow/step/view/hooks/useCommandMenuWorkflowVersionIdOrThrow.ts b/packages/twenty-front/src/modules/command-menu/pages/workflow/step/view/hooks/useCommandMenuWorkflowVersionIdOrThrow.tsindex 561c637c13b..d9a89385fb1 100644--- a/packages/twenty-front/src/modules/command-menu/pages/workflow/step/view/hooks/useCommandMenuWorkflowVersionIdOrThrow.ts+++ b/packages/twenty-front/src/modules/command-menu/pages/workflow/step/view/hooks/useCommandMenuWorkflowVersionIdOrThrow.ts@@ -3,14 +3,14 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { isDefined } from 'twenty-shared/utils';export const useCommandMenuWorkflowVersionIdOrThrow = () => {- const workflowVersionId = useAtomComponentStateValue(+ const commandMenuWorkflowVersionId = useAtomComponentStateValue(commandMenuWorkflowVersionIdComponentState,);- if (!isDefined(workflowVersionId)) {+ if (!isDefined(commandMenuWorkflowVersionId)) {throw new Error('Expected commandMenuWorkflowVersionIdComponentState to be defined',);}- return workflowVersionId;+ return commandMenuWorkflowVersionId;};diff --git a/packages/twenty-front/src/modules/context-store/components/MainContextStoreProvider.tsx b/packages/twenty-front/src/modules/context-store/components/MainContextStoreProvider.tsxindex ab60d686117..51e3f5ecd2c 100644--- a/packages/twenty-front/src/modules/context-store/components/MainContextStoreProvider.tsx+++ b/packages/twenty-front/src/modules/context-store/components/MainContextStoreProvider.tsx@@ -49,7 +49,7 @@ export const MainContextStoreProvider = () => {const viewIdQueryParam = searchParams.get('viewId');const objectMetadataItems = useAtomStateValue(objectMetadataItemsState);- const viewsEntry = useAtomFamilyStateValue(metadataStoreState, 'views');+ const metadataStore = useAtomFamilyStateValue(metadataStoreState, 'views');const coreViews = useAtomStateValue(coreViewsState);const objectMetadataItem = objectMetadataItems.find(@@ -76,7 +76,7 @@ export const MainContextStoreProvider = () => {const shouldComputeContextStore =(isRecordIndexPage || isRecordShowPage || isSettingsPage) &&!showAuthModal &&- viewsEntry.status === 'up-to-date';+ metadataStore.status === 'up-to-date';if (!shouldComputeContextStore) {return null;diff --git a/packages/twenty-front/src/modules/context-store/hooks/useContextStoreObjectMetadataItem.ts b/packages/twenty-front/src/modules/context-store/hooks/useContextStoreObjectMetadataItem.tsindex 17cde7b30bf..d94af2b809d 100644--- a/packages/twenty-front/src/modules/context-store/hooks/useContextStoreObjectMetadataItem.ts+++ b/packages/twenty-front/src/modules/context-store/hooks/useContextStoreObjectMetadataItem.ts@@ -6,7 +6,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateexport const useContextStoreObjectMetadataItem = (contextStoreInstanceId?: string,) => {- const objectMetadataItemId = useAtomComponentStateValue(+ const contextStoreCurrentObjectMetadataItemId = useAtomComponentStateValue(contextStoreCurrentObjectMetadataItemIdComponentState,contextStoreInstanceId,);@@ -15,7 +15,7 @@ export const useContextStoreObjectMetadataItem = (const objectMetadataItem = objectMetadataItems.find((objectMetadataItemToFind) =>- objectMetadataItemToFind.id === objectMetadataItemId,+ objectMetadataItemToFind.id === contextStoreCurrentObjectMetadataItemId,);return { objectMetadataItem };diff --git a/packages/twenty-front/src/modules/context-store/hooks/useContextStoreObjectMetadataItemOrThrow.ts b/packages/twenty-front/src/modules/context-store/hooks/useContextStoreObjectMetadataItemOrThrow.tsindex cd897a82e5e..60720287503 100644--- a/packages/twenty-front/src/modules/context-store/hooks/useContextStoreObjectMetadataItemOrThrow.ts+++ b/packages/twenty-front/src/modules/context-store/hooks/useContextStoreObjectMetadataItemOrThrow.ts@@ -5,13 +5,13 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useexport const useContextStoreObjectMetadataItemOrThrow = (contextStoreInstanceId?: string,) => {- const objectMetadataItemId = useAtomComponentStateValue(+ const contextStoreCurrentObjectMetadataItemId = useAtomComponentStateValue(contextStoreCurrentObjectMetadataItemIdComponentState,contextStoreInstanceId,);const { objectMetadataItem } = useObjectMetadataItemById({- objectId: objectMetadataItemId ?? '',+ objectId: contextStoreCurrentObjectMetadataItemId ?? '',});if (!objectMetadataItem) {diff --git a/packages/twenty-front/src/modules/domain-manager/hooks/useGetPublicWorkspaceDataByDomain.ts b/packages/twenty-front/src/modules/domain-manager/hooks/useGetPublicWorkspaceDataByDomain.tsindex 2d7f5a3fb60..f5000cb8a6d 100644--- a/packages/twenty-front/src/modules/domain-manager/hooks/useGetPublicWorkspaceDataByDomain.ts+++ b/packages/twenty-front/src/modules/domain-manager/hooks/useGetPublicWorkspaceDataByDomain.ts@@ -25,7 +25,7 @@ export const useGetPublicWorkspaceDataByDomain = () => {);const workspacePublicData = useAtomStateValue(workspacePublicDataState);const { redirectToDefaultDomain } = useRedirectToDefaultDomain();- const setWorkspacePublicDataState = useSetAtomState(workspacePublicDataState);+ const setWorkspacePublicData = useSetAtomState(workspacePublicDataState);const clientConfigApiStatus = useAtomStateValue(clientConfigApiStatusState);const { loading, data, error } = useGetPublicWorkspaceDataByDomainQuery({@@ -43,7 +43,7 @@ export const useGetPublicWorkspaceDataByDomain = () => {setWorkspaceAuthBypassProviders(data.getPublicWorkspaceDataByDomain.authBypassProviders ?? null,);- setWorkspacePublicDataState(data.getPublicWorkspaceDataByDomain);+ setWorkspacePublicData(data.getPublicWorkspaceDataByDomain);},onError: (error) => {// Only redirect to default domain if it's a workspace not found errordiff --git a/packages/twenty-front/src/modules/favorites/components/CurrentWorkspaceMemberFavorites.tsx b/packages/twenty-front/src/modules/favorites/components/CurrentWorkspaceMemberFavorites.tsxindex 2d09d5d1f4f..86f8c51398b 100644--- a/packages/twenty-front/src/modules/favorites/components/CurrentWorkspaceMemberFavorites.tsx+++ b/packages/twenty-front/src/modules/favorites/components/CurrentWorkspaceMemberFavorites.tsx@@ -68,13 +68,15 @@ export const CurrentWorkspaceMemberFavorites = ({openFavoriteFolderIdsState,);- const setCurrentFolderId = useSetAtomState(currentFavoriteFolderIdState);+ const setCurrentFavoriteFolderId = useSetAtomState(+ currentFavoriteFolderIdState,+ );const isOpen = openFavoriteFolderIds.includes(folder.folderId);const handleToggle = () => {if (isMobile) {- setCurrentFolderId((prev) =>+ setCurrentFavoriteFolderId((prev) =>prev === folder.folderId ? null : folder.folderId,);} else {@@ -93,7 +95,7 @@ export const CurrentWorkspaceMemberFavorites = ({const dropdownId = `favorite-folder-edit-${folder.folderId}`;- const isDropdownOpenComponent = useAtomComponentStateValue(+ const isDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,dropdownId,);@@ -190,7 +192,7 @@ export const CurrentWorkspaceMemberFavorites = ({onClick={handleToggle}rightOptions={rightOptions}className="navigation-drawer-item"- isRightOptionsDropdownOpen={isDropdownOpenComponent}+ isRightOptionsDropdownOpen={isDropdownOpen}triggerEvent="CLICK"preventCollapseOnMobile={isMobile}/>diff --git a/packages/twenty-front/src/modules/favorites/components/FavoritesBackButton.tsx b/packages/twenty-front/src/modules/favorites/components/FavoritesBackButton.tsxindex 6bb25d235cf..daf1c017194 100644--- a/packages/twenty-front/src/modules/favorites/components/FavoritesBackButton.tsx+++ b/packages/twenty-front/src/modules/favorites/components/FavoritesBackButton.tsx@@ -35,12 +35,14 @@ export const FavoritesBackButton = ({folderName,}: FavoritesBackButtonProps) => {const theme = useTheme();- const setCurrentFolderId = useSetAtomState(currentFavoriteFolderIdState);+ const setCurrentFavoriteFolderId = useSetAtomState(+ currentFavoriteFolderIdState,+ );const handleClick = (e: React.MouseEvent) => {e.preventDefault();e.stopPropagation();- setCurrentFolderId(null);+ setCurrentFavoriteFolderId(null);};return (diff --git a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPicker.tsx b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPicker.tsxindex 903cd0c38be..d7f93a3a5f8 100644--- a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPicker.tsx+++ b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPicker.tsx@@ -43,19 +43,19 @@ export const FavoriteFolderPicker = ({objectNameSingular,});- const [favoriteFoldersSearchFilter] = useAtomComponentState(+ const [favoriteFolderSearchFilter] = useAtomComponentState(favoriteFolderSearchFilterComponentState,);const filteredFolders = favoriteFolders.filter((folder) =>folder.name.toLowerCase()- .includes(favoriteFoldersSearchFilter.toLowerCase()),+ .includes(favoriteFolderSearchFilter.toLowerCase()),);const showNoFolderOption =- !favoriteFoldersSearchFilter ||- 'no folder'.includes(favoriteFoldersSearchFilter.toLowerCase());+ !favoriteFolderSearchFilter ||+ 'no folder'.includes(favoriteFolderSearchFilter.toLowerCase());useHotkeysOnFocusedElement({keys: [Key.Escape],diff --git a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPickerEffect.tsx b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPickerEffect.tsxindex 40617bb4d2a..6f0a3f5d655 100644--- a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPickerEffect.tsx+++ b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPickerEffect.tsx@@ -32,7 +32,7 @@ export const FavoriteFolderPickerEffect = ({const { favoriteFolders } = usePrefetchedFavoritesFoldersData();const { sortedFavorites: favorites } = useFavorites();- const setCheckedState = useSetAtomComponentState(+ const setFavoriteFolderPickerChecked = useSetAtomComponentState(favoriteFolderPickerCheckedComponentState,);@@ -74,8 +74,8 @@ export const FavoriteFolderPickerEffect = ({favorite.recordId === targetId && favorite.forWorkspaceMemberId,).map((favorite) => favorite.favoriteFolderId || 'no-folder');- setCheckedState(checkedFolderIds);- }, [favorites, setCheckedState, record?.id]);+ setFavoriteFolderPickerChecked(checkedFolderIds);+ }, [favorites, setFavoriteFolderPickerChecked, record?.id]);return null;};diff --git a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPickerList.tsx b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPickerList.tsxindex a1ada657b0b..89fcdad4d5e 100644--- a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPickerList.tsx+++ b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPickerList.tsx@@ -28,7 +28,7 @@ export const FavoriteFolderPickerList = ({toggleFolderSelection,}: FavoriteFolderPickerListProps) => {const { t } = useLingui();- const [favoriteFoldersSearchFilter] = useAtomComponentState(+ const [favoriteFolderSearchFilter] = useAtomComponentState(favoriteFolderSearchFilterComponentState,);@@ -39,12 +39,12 @@ export const FavoriteFolderPickerList = ({const filteredFolders = folders.filter((folder) =>folder.name.toLowerCase()- .includes(favoriteFoldersSearchFilter.toLowerCase()),+ .includes(favoriteFolderSearchFilter.toLowerCase()),);const showNoFolderOption =- !favoriteFoldersSearchFilter ||- 'no folder'.includes(favoriteFoldersSearchFilter.toLowerCase());+ !favoriteFolderSearchFilter ||+ 'no folder'.includes(favoriteFolderSearchFilter.toLowerCase());return (<StyledItemsContainer>diff --git a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPickerSearchInput.tsx b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPickerSearchInput.tsxindex 83a87c8661c..e407f2469b2 100644--- a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPickerSearchInput.tsx+++ b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPickerSearchInput.tsx@@ -5,11 +5,11 @@ import { useCallback } from 'react';import { useDebouncedCallback } from 'use-debounce';export const FavoriteFolderPickerSearchInput = () => {- const [favoriteFoldersSearchFilter, setFavoriteFoldersSearchFilter] =+ const [favoriteFolderSearchFilter, setFavoriteFolderSearchFilter] =useAtomComponentState(favoriteFolderSearchFilterComponentState);const debouncedSetSearchFilter = useDebouncedCallback(- setFavoriteFoldersSearchFilter,+ setFavoriteFolderSearchFilter,100,{ leading: true },);@@ -23,7 +23,7 @@ export const FavoriteFolderPickerSearchInput = () => {return (<DropdownMenuSearchInput- value={favoriteFoldersSearchFilter}+ value={favoriteFolderSearchFilter}onChange={handleFilterChange}autoFocus/>diff --git a/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx b/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsxindex a320001d0e3..32d6de909a5 100644--- a/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx+++ b/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx@@ -23,7 +23,7 @@ export const FrontComponentRenderer = ({const theme = useTheme();const { enqueueErrorSnackBar } = useSnackBar();- const setApplicationTokenPair = useSetAtomComponentState(+ const setFrontComponentApplicationTokenPair = useSetAtomComponentState(frontComponentApplicationTokenPairComponentState,frontComponentId,);@@ -53,7 +53,7 @@ export const FrontComponentRenderer = ({const tokenPair = completedData.frontComponent?.applicationTokenPair;if (isDefined(tokenPair)) {- setApplicationTokenPair(tokenPair);+ setFrontComponentApplicationTokenPair(tokenPair);}},});diff --git a/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts b/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.tsindex 7d822a21474..e57e0ba7094 100644--- a/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts+++ b/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts@@ -31,7 +31,7 @@ export const useFrontComponentExecutionContext = ({frontComponentId,});const { navigateCommandMenu } = useNavigateCommandMenu();- const setCommandMenuSearchState = useSetAtomState(commandMenuSearchState);+ const setCommandMenuSearch = useSetAtomState(commandMenuSearchState);const { getIcon } = useIcons();const unmountHeadlessFrontComponent = useUnmountHeadlessFrontComponent();const {@@ -65,7 +65,7 @@ export const useFrontComponentExecutionContext = ({});if (shouldResetSearchState === true) {- setCommandMenuSearchState('');+ setCommandMenuSearch('');}};diff --git a/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx b/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsxindex bf3d20c800b..5b771222daf 100644--- a/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx+++ b/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx@@ -51,7 +51,7 @@ export const InformationBanner = ({onClose?: () => void;componentInstanceId: string;}) => {- const informationBannerIsOpenComponent = useAtomComponentStateValue(+ const informationBannerIsOpen = useAtomComponentStateValue(informationBannerIsOpenComponentState,componentInstanceId,);@@ -62,7 +62,7 @@ export const InformationBanner = ({instanceId: componentInstanceId,}}>- {informationBannerIsOpenComponent && (+ {informationBannerIsOpen && (<Banner variant={variant}><StyledContent hasCloseButton={!!onClose}><StyledText>{message}</StyledText>diff --git a/packages/twenty-front/src/modules/information-banner/hooks/useDismissReconnectAccountBanner.ts b/packages/twenty-front/src/modules/information-banner/hooks/useDismissReconnectAccountBanner.tsindex 714d3708361..6b6e1fa5c5a 100644--- a/packages/twenty-front/src/modules/information-banner/hooks/useDismissReconnectAccountBanner.ts+++ b/packages/twenty-front/src/modules/information-banner/hooks/useDismissReconnectAccountBanner.ts@@ -25,7 +25,7 @@ export const useDismissReconnectAccountBanner = (client: apolloCoreClient,});- const setInformationBannerIsOpenComponent = useSetAtomComponentState(+ const setInformationBannerIsOpen = useSetAtomComponentState(informationBannerIsOpenComponentState,componentInstanceId,);@@ -36,7 +36,7 @@ export const useDismissReconnectAccountBanner = (connectedAccountId,},});- setInformationBannerIsOpenComponent(false);+ setInformationBannerIsOpen(false);};return {diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/IsAppMetadataReadyEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/IsAppMetadataReadyEffect.tsxindex 3a72877161b..869175af542 100644--- a/packages/twenty-front/src/modules/metadata-store/effect-components/IsAppMetadataReadyEffect.tsx+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/IsAppMetadataReadyEffect.tsx@@ -14,18 +14,22 @@ export const IsAppMetadataReadyEffect = () => {const isLoggedIn = useIsLogged();const currentUser = useAtomStateValue(currentUserState);const currentWorkspace = useAtomStateValue(currentWorkspaceState);- const objectMetadataItemsEntry = useAtomFamilyStateValue(+ const metadataStore = useAtomFamilyStateValue(metadataStoreState,'objectMetadataItems',);- const viewsEntry = useAtomFamilyStateValue(metadataStoreState, 'views');+ // eslint-disable-next-line twenty/matching-state-variable+ const metadataStoreViews = useAtomFamilyStateValue(+ metadataStoreState,+ 'views',+ );const setIsAppMetadataReady = useSetAtomState(isAppMetadataReadyState);useEffect(() => {const hasActiveWorkspace = isWorkspaceActiveOrSuspended(currentWorkspace);- const areObjectsLoaded = objectMetadataItemsEntry.status === 'up-to-date';- const areViewsLoaded = viewsEntry.status === 'up-to-date';+ const areObjectsLoaded = metadataStore.status === 'up-to-date';+ const areViewsLoaded = metadataStoreViews.status === 'up-to-date';if (!areObjectsLoaded) {setIsAppMetadataReady(false);@@ -41,8 +45,8 @@ export const IsAppMetadataReadyEffect = () => {isLoggedIn,currentUser,currentWorkspace,- objectMetadataItemsEntry.status,- viewsEntry.status,+ metadataStore.status,+ metadataStoreViews.status,setIsAppMetadataReady,]);diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/UserMetadataProviderInitialEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/UserMetadataProviderInitialEffect.tsxindex 23becbc9874..750c88672ed 100644--- a/packages/twenty-front/src/modules/metadata-store/effect-components/UserMetadataProviderInitialEffect.tsx+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/UserMetadataProviderInitialEffect.tsx@@ -41,7 +41,7 @@ export const UserMetadataProviderInitialEffect = () => {const setCurrentWorkspaceMembers = useSetAtomState(currentWorkspaceMembersState,);- const setCurrentWorkspaceMembersWithDeleted = useSetAtomState(+ const setCurrentWorkspaceDeletedMembers = useSetAtomState(currentWorkspaceDeletedMembersState,);const setIsCurrentUserLoaded = useSetAtomState(isCurrentUserLoadedState);@@ -151,7 +151,7 @@ export const UserMetadataProviderInitialEffect = () => {}if (isDefined(deletedWorkspaceMembers)) {- setCurrentWorkspaceMembersWithDeleted(deletedWorkspaceMembers);+ setCurrentWorkspaceDeletedMembers(deletedWorkspaceMembers);}if (isDefined(availableWorkspaces)) {@@ -172,7 +172,7 @@ export const UserMetadataProviderInitialEffect = () => {setCurrentWorkspace,setCurrentWorkspaceMember,initializeFormatPreferences,- setCurrentWorkspaceMembersWithDeleted,+ setCurrentWorkspaceDeletedMembers,updateLocaleCatalog,setIsCurrentUserLoaded,]);diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/CurrentWorkspaceMemberNavigationMenuItems.tsx b/packages/twenty-front/src/modules/navigation-menu-item/components/CurrentWorkspaceMemberNavigationMenuItems.tsxindex b039d837e71..8ecc9f0a70d 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/CurrentWorkspaceMemberNavigationMenuItems.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/components/CurrentWorkspaceMemberNavigationMenuItems.tsx@@ -85,7 +85,7 @@ export const CurrentWorkspaceMemberNavigationMenuItems = ({const [openNavigationMenuItemFolderIds, setOpenNavigationMenuItemFolderIds] =useAtomState(openNavigationMenuItemFolderIdsState);- const setCurrentFolderId = useSetAtomState(+ const setCurrentNavigationMenuItemFolderId = useSetAtomState(currentNavigationMenuItemFolderIdState,);@@ -93,7 +93,9 @@ export const CurrentWorkspaceMemberNavigationMenuItems = ({const handleToggle = () => {if (isMobile) {- setCurrentFolderId((prev) => (prev === folder.id ? null : folder.id));+ setCurrentNavigationMenuItemFolderId((prev) =>+ prev === folder.id ? null : folder.id,+ );} else {setOpenNavigationMenuItemFolderIds((currentOpenFolders) => {if (isOpen) {@@ -123,7 +125,7 @@ export const CurrentWorkspaceMemberNavigationMenuItems = ({const dropdownId = `navigation-menu-item-folder-edit-${folder.id}`;- const isDropdownOpenComponent = useAtomComponentStateValue(+ const isDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,dropdownId,);@@ -237,7 +239,7 @@ export const CurrentWorkspaceMemberNavigationMenuItems = ({onClick={handleToggle}rightOptions={rightOptions}className="navigation-drawer-item"- isRightOptionsDropdownOpen={isDropdownOpenComponent}+ isRightOptionsDropdownOpen={isDropdownOpen}triggerEvent="CLICK"preventCollapseOnMobile={isMobile}/>diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemBackButton.tsx b/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemBackButton.tsxindex 5245975f45f..f789ec84fff 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemBackButton.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemBackButton.tsx@@ -36,14 +36,14 @@ export const NavigationMenuItemBackButton = ({folderName,}: NavigationMenuItemBackButtonProps) => {const theme = useTheme();- const setCurrentFolderId = useSetAtomState(+ const setCurrentNavigationMenuItemFolderId = useSetAtomState(currentNavigationMenuItemFolderIdState,);const handleClick = (e: React.MouseEvent) => {e.preventDefault();e.stopPropagation();- setCurrentFolderId(null);+ setCurrentNavigationMenuItemFolderId(null);};return (diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItemsFolder.tsx b/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItemsFolder.tsxindex 456b9aaf7ef..6a74c92e7b3 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItemsFolder.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItemsFolder.tsx@@ -110,7 +110,7 @@ export const WorkspaceNavigationMenuItemsFolder = ({const [openNavigationMenuItemFolderIds, setOpenNavigationMenuItemFolderIds] =useAtomState(openNavigationMenuItemFolderIdsState);- const setCurrentFolderId = useSetAtomState(+ const setCurrentNavigationMenuItemFolderId = useSetAtomState(currentNavigationMenuItemFolderIdState,);@@ -118,7 +118,9 @@ export const WorkspaceNavigationMenuItemsFolder = ({const handleToggle = () => {if (isMobile) {- setCurrentFolderId((prev) => (prev === folderId ? null : folderId));+ setCurrentNavigationMenuItemFolderId((prev) =>+ prev === folderId ? null : folderId,+ );} else {setOpenNavigationMenuItemFolderIds((current) =>isOpendiff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useRemoveNavigationMenuItemByTargetRecordId.ts b/packages/twenty-front/src/modules/navigation-menu-item/hooks/useRemoveNavigationMenuItemByTargetRecordId.tsindex 81e284ca026..edd725563d8 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useRemoveNavigationMenuItemByTargetRecordId.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/hooks/useRemoveNavigationMenuItemByTargetRecordId.ts@@ -12,7 +12,7 @@ export const useRemoveNavigationMenuItemByTargetRecordId = () => {const apolloCoreClient = useApolloCoreClient();const cache = apolloCoreClient.cache;- const setNavigationMenuItemsState = useSetAtomState(+ const setPrefetchNavigationMenuItems = useSetAtomState(prefetchNavigationMenuItemsState,);@@ -29,7 +29,7 @@ export const useRemoveNavigationMenuItemByTargetRecordId = () => {!targetRecordIdsSet.has(item.targetRecordId),);- setNavigationMenuItemsState(updatedNavigationMenuItems);+ setPrefetchNavigationMenuItems(updatedNavigationMenuItems);cache.updateQuery({ query: FIND_MANY_NAVIGATION_MENU_ITEMS }, (data) => {if (!isDefined(data?.navigationMenuItems)) {@@ -42,7 +42,7 @@ export const useRemoveNavigationMenuItemByTargetRecordId = () => {};});},- [cache, setNavigationMenuItemsState, store],+ [cache, setPrefetchNavigationMenuItems, store],);return {diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.ts b/packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.tsindex 42e1713ff2c..7d78d5f2362 100644--- a/packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.ts+++ b/packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.ts@@ -94,7 +94,7 @@ export const useFetchMoreRecordsWithPagination = <queryIdentifier,);- const setIsFetchingMoreObjects = useSetAtomFamilyState(+ const setIsFetchingMoreRecords = useSetAtomFamilyState(isFetchingMoreRecordsFamilyState,queryIdentifier,);@@ -119,7 +119,7 @@ export const useFetchMoreRecordsWithPagination = <hasNextPageLocal ||(!isAggregationEnabled(objectMetadataItem) && !error)) {- setIsFetchingMoreObjects(true);+ setIsFetchingMoreRecords(true);try {const { data: fetchMoreDataResult } = await fetchMore({@@ -193,13 +193,13 @@ export const useFetchMoreRecordsWithPagination = <handleFindManyRecordsError(error as ApolloError);return { error: error as ApolloError };} finally {- setIsFetchingMoreObjects(false);+ setIsFetchingMoreRecords(false);}}}, [objectMetadataItem,error,- setIsFetchingMoreObjects,+ setIsFetchingMoreRecords,fetchMore,filter,orderBy,diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownAnyFieldSearchInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownAnyFieldSearchInput.tsxindex 829528e7383..aea11a81be0 100644--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownAnyFieldSearchInput.tsx+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownAnyFieldSearchInput.tsx@@ -6,20 +6,21 @@ import { useLingui } from '@lingui/react/macro';export const ObjectFilterDropdownAnyFieldSearchInput = () => {const { t } = useLingui();- const [anyFieldFilterSearchValue, setAnyFieldFilterSearchValue] =- useAtomComponentState(anyFieldFilterValueComponentState);+ const [anyFieldFilterValue, setAnyFieldFilterValue] = useAtomComponentState(+ anyFieldFilterValueComponentState,+ );const handleSearchChange = (event: React.ChangeEvent<HTMLInputElement>) => {const inputValue = event.target.value;- setAnyFieldFilterSearchValue(inputValue);+ setAnyFieldFilterValue(inputValue);};return (<DropdownMenuSearchInputautoFocustype="text"- value={anyFieldFilterSearchValue}+ value={anyFieldFilterValue}placeholder={t`Search any field`}onChange={handleSearchChange}/>diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsxindex 1ebc8821a56..092fe7cbcea 100644--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx@@ -18,7 +18,7 @@ export const ObjectFilterDropdownFilterSelectMenuItem = ({}: ObjectFilterDropdownFilterSelectMenuItemProps) => {const { resetSelectedItem } = useSelectableList(FILTER_FIELD_LIST_ID);- const isSelectedItem = useAtomComponentFamilyStateValue(+ const isSelectedItemId = useAtomComponentFamilyStateValue(isSelectedItemIdComponentFamilyState,fieldMetadataItemToSelect.id,);@@ -39,7 +39,7 @@ export const ObjectFilterDropdownFilterSelectMenuItem = ({return (<MenuItem- focused={isSelectedItem}+ focused={isSelectedItemId}onClick={handleClick}LeftIcon={Icon}text={fieldMetadataItemToSelect.label}diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useObjectFilterDropdownFilterValue.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useObjectFilterDropdownFilterValue.tsindex 2a9beb94b63..24e91f6cb05 100644--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useObjectFilterDropdownFilterValue.ts+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useObjectFilterDropdownFilterValue.ts@@ -2,11 +2,12 @@ import { objectFilterDropdownCurrentRecordFilterComponentState } from '@/object-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';export const useObjectFilterDropdownFilterValue = () => {- const currentRecordFilter = useAtomComponentStateValue(+ const objectFilterDropdownCurrentRecordFilter = useAtomComponentStateValue(objectFilterDropdownCurrentRecordFilterComponentState,);- const objectFilterDropdownFilterValue = currentRecordFilter?.value;+ const objectFilterDropdownFilterValue =+ objectFilterDropdownCurrentRecordFilter?.value;return { objectFilterDropdownFilterValue };};diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsxindex 5a4b23be442..fd0533d21df 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx@@ -54,7 +54,7 @@ export const ObjectOptionsDropdownCustomView = ({}: null;- const recordGroupFieldMetadata = useAtomComponentStateValue(+ const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(recordIndexGroupFieldMetadataItemComponentState,);@@ -224,7 +224,7 @@ export const ObjectOptionsDropdownCustomView = ({<SelectableListItemitemId="Group"onEnter={() =>- isDefined(recordGroupFieldMetadata)+ isDefined(recordIndexGroupFieldMetadataItem)? onContentChange('recordGroups'): onContentChange('recordGroupFields')}@@ -232,7 +232,7 @@ export const ObjectOptionsDropdownCustomView = ({<MenuItemfocused={selectedItemId === 'Group'}onClick={() =>- isDefined(recordGroupFieldMetadata)+ isDefined(recordIndexGroupFieldMetadataItem)? onContentChange('recordGroups'): onContentChange('recordGroupFields')}@@ -241,7 +241,7 @@ export const ObjectOptionsDropdownCustomView = ({contextualText={isDefaultView? t`Not available on Default View`- : recordGroupFieldMetadata?.label+ : recordIndexGroupFieldMetadataItem?.label}contextualTextPosition="right"hasSubMenudiff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsxindex cd4f86a2976..5b54617da9a 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx@@ -36,7 +36,7 @@ export const ObjectOptionsDropdownHiddenRecordGroupsContent = () => {viewType,} = useObjectOptionsDropdown();- const recordGroupFieldMetadata = useAtomComponentStateValue(+ const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(recordIndexGroupFieldMetadataItemComponentState,);@@ -61,7 +61,7 @@ export const ObjectOptionsDropdownHiddenRecordGroupsContent = () => {const viewGroupSettingsUrl = getSettingsPath(SettingsPath.ObjectFieldEdit, {objectNamePlural,- fieldName: recordGroupFieldMetadata?.name ?? '',+ fieldName: recordIndexGroupFieldMetadataItem?.name ?? '',});const location = useLocation();@@ -88,10 +88,10 @@ export const ObjectOptionsDropdownHiddenRecordGroupsContent = () => {/>}>- {t`Hidden`} {recordGroupFieldMetadata?.label}+ {t`Hidden`} {recordIndexGroupFieldMetadataItem?.label}</DropdownMenuHeader><RecordGroupsVisibilityDropdownSection- title={`${t`Hidden`} ${recordGroupFieldMetadata?.label}`}+ title={`${t`Hidden`} ${recordIndexGroupFieldMetadataItem?.label}`}recordGroupIds={hiddenRecordGroupIds}onVisibilityChange={handleRecordGroupVisibilityChange}isDraggable={false}diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsxindex 96aa54a0088..a68d4df1de8 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx@@ -66,7 +66,7 @@ export const ObjectOptionsDropdownLayoutContent = () => {const recordIndexCalendarLayout = useAtomStateValue(recordIndexCalendarLayoutState,);- const recordGroupFieldMetadata = useAtomComponentStateValue(+ const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(recordIndexGroupFieldMetadataItemComponentState,);@@ -282,7 +282,7 @@ export const ObjectOptionsDropdownLayoutContent = () => {<SelectableListItemitemId="Group"onEnter={() => {- isDefined(recordGroupFieldMetadata)+ isDefined(recordIndexGroupFieldMetadataItem)? onContentChange('recordGroups'): onContentChange('recordGroupFields');}}@@ -290,13 +290,13 @@ export const ObjectOptionsDropdownLayoutContent = () => {<MenuItemfocused={selectedItemId === 'Group'}onClick={() =>- isDefined(recordGroupFieldMetadata)+ isDefined(recordIndexGroupFieldMetadataItem)? onContentChange('recordGroups'): onContentChange('recordGroupFields')}LeftIcon={IconLayoutList}text={t`Group`}- contextualText={recordGroupFieldMetadata?.label}+ contextualText={recordIndexGroupFieldMetadataItem?.label}contextualTextPosition="right"hasSubMenu/>diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsxindex c6cdbee6f14..e2e8e176a47 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx@@ -52,7 +52,7 @@ export const ObjectOptionsDropdownRecordGroupFieldsContent = () => {hiddenRecordGroupIdsComponentSelector,);- const recordGroupFieldMetadata = useAtomComponentStateValue(+ const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(recordIndexGroupFieldMetadataItemComponentState,);@@ -109,7 +109,7 @@ export const ObjectOptionsDropdownRecordGroupFieldsContent = () => {StartComponent={<DropdownMenuHeaderLeftComponentonClick={() =>- isDefined(recordGroupFieldMetadata)+ isDefined(recordIndexGroupFieldMetadataItem)? onContentChange('recordGroups'): resetContent()}@@ -130,14 +130,16 @@ export const ObjectOptionsDropdownRecordGroupFieldsContent = () => {{viewType === ViewType.Table && (<MenuItemSelecttext={t`None`}- selected={!isDefined(recordGroupFieldMetadata)}+ selected={!isDefined(recordIndexGroupFieldMetadataItem)}onClick={handleResetRecordGroupField}/>)}{filteredRecordGroupFieldMetadataItems.map((fieldMetadataItem) => (<MenuItemSelectkey={fieldMetadataItem.id}- selected={fieldMetadataItem.id === recordGroupFieldMetadata?.id}+ selected={+ fieldMetadataItem.id === recordIndexGroupFieldMetadataItem?.id+ }onClick={() => handleRecordGroupFieldChange(fieldMetadataItem)}LeftIcon={getIcon(fieldMetadataItem.icon)}text={fieldMetadataItem.label}diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsxindex 9f8ff6caeb6..432ec23f025 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx@@ -31,12 +31,11 @@ export const ObjectOptionsDropdownRecordGroupSortContent = () => {hiddenRecordGroupIdsComponentSelector,);- const [recordGroupSort, setRecordGroupSort] = useAtomComponentState(- recordIndexRecordGroupSortComponentState,- );+ const [recordIndexRecordGroupSort, setRecordIndexRecordGroupSort] =+ useAtomComponentState(recordIndexRecordGroupSortComponentState);const handleRecordGroupSortChange = (sort: RecordGroupSort) => {- setRecordGroupSort(sort);+ setRecordIndexRecordGroupSort(sort);};const selectedItemId = useAtomComponentStateValue(@@ -87,7 +86,7 @@ export const ObjectOptionsDropdownRecordGroupSortContent = () => {}LeftIcon={IconHandMove}text={RecordGroupSort.Manual}- selected={recordGroupSort === RecordGroupSort.Manual}+ selected={recordIndexRecordGroupSort === RecordGroupSort.Manual}focused={selectedItemId === RecordGroupSort.Manual}/></SelectableListItem>@@ -103,7 +102,9 @@ export const ObjectOptionsDropdownRecordGroupSortContent = () => {}LeftIcon={IconSortAZ}text={RecordGroupSort.Alphabetical}- selected={recordGroupSort === RecordGroupSort.Alphabetical}+ selected={+ recordIndexRecordGroupSort === RecordGroupSort.Alphabetical+ }focused={selectedItemId === RecordGroupSort.Alphabetical}/></SelectableListItem>@@ -119,7 +120,10 @@ export const ObjectOptionsDropdownRecordGroupSortContent = () => {}LeftIcon={IconSortZA}text={RecordGroupSort.ReverseAlphabetical}- selected={recordGroupSort === RecordGroupSort.ReverseAlphabetical}+ selected={+ recordIndexRecordGroupSort ===+ RecordGroupSort.ReverseAlphabetical+ }focused={selectedItemId === RecordGroupSort.ReverseAlphabetical}/></SelectableListItem>diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsxindex c3ddf229c6e..38d4a236c83 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx@@ -48,7 +48,7 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => {const { currentView } = useGetCurrentViewOnly();- const recordGroupFieldMetadata = useAtomComponentStateValue(+ const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(recordIndexGroupFieldMetadataItemComponentState,);@@ -61,14 +61,16 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => {hiddenRecordGroupIdsComponentSelector,);- const hideEmptyRecordGroup = useAtomComponentStateValue(+ const recordIndexShouldHideEmptyRecordGroups = useAtomComponentStateValue(recordIndexShouldHideEmptyRecordGroupsComponentState,);const shouldHideEmptyGroups =- hideEmptyRecordGroup ?? currentView?.shouldHideEmptyGroups ?? false;+ recordIndexShouldHideEmptyRecordGroups ??+ currentView?.shouldHideEmptyGroups ??+ false;- const recordGroupSort = useAtomComponentStateValue(+ const recordIndexRecordGroupSort = useAtomComponentStateValue(recordIndexRecordGroupSortComponentState,);@@ -136,7 +138,7 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => {onClick={() => onContentChange('recordGroupFields')}LeftIcon={IconLayoutList}text={t`Group by`}- contextualText={recordGroupFieldMetadata?.label}+ contextualText={recordIndexGroupFieldMetadataItem?.label}contextualTextPosition="right"hasSubMenu/>@@ -150,7 +152,7 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => {onClick={() => onContentChange('recordGroupSort')}LeftIcon={IconSortDescending}text={t`Sort`}- contextualText={recordGroupSort}+ contextualText={recordIndexRecordGroupSort}contextualTextPosition="right"hasSubMenu/>@@ -201,7 +203,7 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => {<MenuItemNavigateonClick={() => onContentChange('hiddenRecordGroups')}LeftIcon={IconEyeOff}- text={`${t`Hidden`} ${recordGroupFieldMetadata?.label ?? ''}`}+ text={`${t`Hidden`} ${recordIndexGroupFieldMetadataItem?.label ?? ''}`}/></SelectableListItem></SelectableList>diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useSearchRecordGroupField.ts b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useSearchRecordGroupField.tsindex 31ec829f8c6..c516cacdc72 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useSearchRecordGroupField.ts+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useSearchRecordGroupField.ts@@ -7,12 +7,14 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';export const useSearchRecordGroupField = () => {const { objectMetadataItem } = useRecordIndexContextOrThrow();- const [recordGroupFieldSearchInput, setRecordGroupFieldSearchInput] =- useAtomComponentState(objectOptionsDropdownSearchInputComponentState);+ const [+ objectOptionsDropdownSearchInput,+ setObjectOptionsDropdownSearchInput,+ ] = useAtomComponentState(objectOptionsDropdownSearchInputComponentState);const filteredRecordGroupFieldMetadataItems = useMemo(() => {const searchInputLowerCase =- recordGroupFieldSearchInput.toLocaleLowerCase();+ objectOptionsDropdownSearchInput.toLocaleLowerCase();return objectMetadataItem.readableFields.filter((field) =>@@ -20,11 +22,11 @@ export const useSearchRecordGroupField = () => {field.isActive &&field.label.toLocaleLowerCase().includes(searchInputLowerCase),);- }, [objectMetadataItem.readableFields, recordGroupFieldSearchInput]);+ }, [objectMetadataItem.readableFields, objectOptionsDropdownSearchInput]);return {- recordGroupFieldSearchInput,- setRecordGroupFieldSearchInput,+ recordGroupFieldSearchInput: objectOptionsDropdownSearchInput,+ setRecordGroupFieldSearchInput: setObjectOptionsDropdownSearchInput,filteredRecordGroupFieldMetadataItems,};};diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useUpdateObjectViewOptions.ts b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useUpdateObjectViewOptions.tsindex afc4984aaa4..2bea1195768 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useUpdateObjectViewOptions.ts+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useUpdateObjectViewOptions.ts@@ -16,11 +16,11 @@ export const useUpdateObjectViewOptions = () => {recordIndexOpenRecordInState,);- const setRecordIndexViewName = useSetAtomComponentState(+ const setViewPickerInputName = useSetAtomComponentState(viewPickerInputNameComponentState,);- const setRecordIndexViewIcon = useSetAtomComponentState(+ const setViewPickerSelectedIcon = useSetAtomComponentState(viewPickerSelectedIconComponentState,);@@ -41,23 +41,23 @@ export const useUpdateObjectViewOptions = () => {const setAndPersistViewName = useCallback((viewName: string, view: GraphQLView | undefined) => {if (!view) return;- setRecordIndexViewName(viewName);+ setViewPickerInputName(viewName);updateCurrentView({name: viewName,});},- [setRecordIndexViewName, updateCurrentView],+ [setViewPickerInputName, updateCurrentView],);const setAndPersistViewIcon = useCallback((viewIcon: string, view: GraphQLView | undefined) => {if (!view) return;- setRecordIndexViewIcon(viewIcon);+ setViewPickerSelectedIcon(viewIcon);updateCurrentView({icon: viewIcon,});},- [setRecordIndexViewIcon, updateCurrentView],+ [setViewPickerSelectedIcon, updateCurrentView],);return {diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsxindex c0e82decfca..877b9f646d4 100644--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx@@ -131,13 +131,13 @@ export const ObjectSortDropdownButton = () => {const [selectedRecordSortDirection, setSelectedRecordSortDirection] =useAtomComponentState(selectedRecordSortDirectionComponentState);- const setIsRecordSortDirectionMenuUnfolded = useSetAtomComponentState(+ const setIsRecordSortDirectionDropdownMenuUnfolded = useSetAtomComponentState(isRecordSortDirectionDropdownMenuUnfoldedComponentState,);const handleSortDirectionClick = (sortDirection: ViewSortDirection) => {setSelectedRecordSortDirection(sortDirection);- setIsRecordSortDirectionMenuUnfolded(false);+ setIsRecordSortDirectionDropdownMenuUnfolded(false);};const isDropdownOpen = useAtomComponentStateValue(diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardContainer.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardContainer.tsxindex 6db4308facf..6263d027d8a 100644--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardContainer.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardContainer.tsx@@ -55,7 +55,7 @@ export const RecordBoardContainer = ({...args,});- const isRecordIndexRemoveSortingModalOpened = useAtomComponentStateValue(+ const isModalOpened = useAtomComponentStateValue(isModalOpenedComponentState,RECORD_INDEX_REMOVE_SORTING_MODAL_ID,);@@ -80,9 +80,7 @@ export const RecordBoardContainer = ({value={{ instanceId: recordBoardId }}><RecordBoard />- {isRecordIndexRemoveSortingModalOpened && (- <RecordIndexRemoveSortingModal />- )}+ {isModalOpened && <RecordIndexRemoveSortingModal />}<RecordBoardHotkeyEffect /><RecordBoardBodyEscapeHotkeyEffect /></RecordBoardComponentInstanceContext.Provider>diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardFetchMoreInViewTriggerComponent.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardFetchMoreInViewTriggerComponent.tsxindex 5bd76a72d57..b9df7a5b93f 100644--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardFetchMoreInViewTriggerComponent.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardFetchMoreInViewTriggerComponent.tsx@@ -21,15 +21,14 @@ const StyledFetchMoreTriggerDiv = styled.div<{ width: number }>``;export const RecordBoardFetchMoreInViewTriggerComponent = () => {- const [shouldFetchMore, setShouldFetchMore] = useAtomComponentState(- recordBoardShouldFetchMoreComponentState,- );+ const [recordBoardShouldFetchMore, setRecordBoardShouldFetchMore] =+ useAtomComponentState(recordBoardShouldFetchMoreComponentState);- const isInitialLoading = useAtomComponentStateValue(+ const recordIndexRecordGroupsAreInInitialLoading = useAtomComponentStateValue(recordIndexRecordGroupsAreInInitialLoadingComponentState,);- const isFetchingMore = useAtomComponentStateValue(+ const recordBoardIsFetchingMore = useAtomComponentStateValue(recordBoardIsFetchingMoreComponentState,);@@ -52,19 +51,22 @@ export const RecordBoardFetchMoreInViewTriggerComponent = () => {1;useEffect(() => {- if (!isInitialLoading && !isFetchingMore) {+ if (+ !recordIndexRecordGroupsAreInInitialLoading &&+ !recordBoardIsFetchingMore+ ) {const newShouldFetchMore = inView;- if (shouldFetchMore !== newShouldFetchMore) {- setShouldFetchMore(newShouldFetchMore);+ if (recordBoardShouldFetchMore !== newShouldFetchMore) {+ setRecordBoardShouldFetchMore(newShouldFetchMore);}}}, [- shouldFetchMore,- setShouldFetchMore,+ recordBoardShouldFetchMore,+ setRecordBoardShouldFetchMore,inView,- isInitialLoading,- isFetchingMore,+ recordIndexRecordGroupsAreInInitialLoading,+ recordBoardIsFetchingMore,]);return (diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardQueryEffect.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardQueryEffect.tsxindex 832a523eeec..74af4fcf6d1 100644--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardQueryEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardQueryEffect.tsx@@ -51,7 +51,7 @@ export const RecordBoardQueryEffect = () => {const { scrollWrapperHTMLElement } = useScrollWrapperHTMLElement();- const [shouldFetchMore] = useAtomComponentState(+ const [recordBoardShouldFetchMore] = useAtomComponentState(recordBoardShouldFetchMoreComponentState,);@@ -64,11 +64,11 @@ export const RecordBoardQueryEffect = () => {const { triggerRecordBoardInitialQuery } =useTriggerRecordBoardInitialQuery();- const recordGroupdIds = useAtomComponentStateValue(+ const recordGroupIds = useAtomComponentStateValue(recordGroupIdsComponentState,);const recordGroupIdsHaveChanged = !isDeeplyEqual(- [...recordGroupdIds].sort(),+ [...recordGroupIds].sort(),[...lastRecordGroupIds].sort(),);@@ -78,10 +78,10 @@ export const RecordBoardQueryEffect = () => {(queryIdentifierHasChanged || recordGroupIdsHaveChanged)) {triggerRecordBoardInitialQuery();- setLastRecordGroupIds(recordGroupdIds);+ setLastRecordGroupIds(recordGroupIds);} else if (!recordIndexRecordGroupsAreInInitialLoading &&- shouldFetchMore &&+ recordBoardShouldFetchMore &&!queryIdentifierHasChanged &&!recordBoardIsFetchingMore) {@@ -95,11 +95,11 @@ export const RecordBoardQueryEffect = () => {setRecordBoardCurrentGroupByQueryOffset,scrollWrapperHTMLElement,recordIndexRecordGroupsAreInInitialLoading,- shouldFetchMore,+ recordBoardShouldFetchMore,recordBoardIsFetchingMore,triggerRecordBoardFetchMore,setLastRecordGroupIds,- recordGroupdIds,+ recordGroupIds,recordGroupIdsHaveChanged,]);diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardScrollToFocusedCardEffect.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardScrollToFocusedCardEffect.tsxindex c83a2d4bfc3..0198804f98c 100644--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardScrollToFocusedCardEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardScrollToFocusedCardEffect.tsx@@ -8,22 +8,22 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useexport const RecordBoardScrollToFocusedCardEffect = () => {const { recordBoardId } = useContext(RecordBoardContext);- const focusedCardIndexes = useAtomComponentStateValue(+ const focusedRecordBoardCardIndexes = useAtomComponentStateValue(focusedRecordBoardCardIndexesComponentState,recordBoardId,);- const isFocusActive = useAtomComponentStateValue(+ const isRecordBoardCardFocusActive = useAtomComponentStateValue(isRecordBoardCardFocusActiveComponentState,recordBoardId,);useEffect(() => {- if (!isFocusActive || !focusedCardIndexes) {+ if (!isRecordBoardCardFocusActive || !focusedRecordBoardCardIndexes) {return;}- const { rowIndex, columnIndex } = focusedCardIndexes;+ const { rowIndex, columnIndex } = focusedRecordBoardCardIndexes;const focusElement = document.getElementById(`record-board-card-${columnIndex}-${rowIndex}`,@@ -36,7 +36,7 @@ export const RecordBoardScrollToFocusedCardEffect = () => {if (focusElement instanceof HTMLElement) {focusElement.scrollIntoView({ behavior: 'smooth', block: 'nearest' });}- }, [focusedCardIndexes, isFocusActive]);+ }, [focusedRecordBoardCardIndexes, isRecordBoardCardFocusActive]);return null;};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 327ddbe3757..7450167693b 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@@ -10,23 +10,23 @@ export const RecordBoardSelectRecordsEffect = () => {recordBoardSelectedRecordIdsComponentSelector,);- const setContextStoreTargetedRecords = useSetAtomComponentState(+ const setContextStoreTargetedRecordsRule = useSetAtomComponentState(contextStoreTargetedRecordsRuleComponentState,);useEffect(() => {- setContextStoreTargetedRecords({+ setContextStoreTargetedRecordsRule({mode: 'selection',selectedRecordIds: selectedRecordIds,});return () => {- setContextStoreTargetedRecords({+ setContextStoreTargetedRecordsRule({mode: 'selection',selectedRecordIds: [],});};- }, [selectedRecordIds, setContextStoreTargetedRecords]);+ }, [selectedRecordIds, setContextStoreTargetedRecordsRule]);return <></>;};diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardStickyHeaderEffect.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardStickyHeaderEffect.tsxindex 837c306080f..ebfd43351ca 100644--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardStickyHeaderEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardStickyHeaderEffect.tsx@@ -3,13 +3,13 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { useEffect } from 'react';export const RecordBoardStickyHeaderEffect = () => {- const scrollTop = useAtomComponentStateValue(+ const scrollWrapperScrollTop = useAtomComponentStateValue(scrollWrapperScrollTopComponentState,);// TODO: move this outside because it might cause way too many re-renders for other hooksuseEffect(() => {- if (scrollTop > 0) {+ if (scrollWrapperScrollTop > 0) {document.getElementById('record-board-header')?.classList.add('header-sticky');@@ -18,7 +18,7 @@ export const RecordBoardStickyHeaderEffect = () => {.getElementById('record-board-header')?.classList.remove('header-sticky');}- }, [scrollTop]);+ }, [scrollWrapperScrollTop]);return <></>;};diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRemoveSelectedRecordsFromRecordBoard.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRemoveSelectedRecordsFromRecordBoard.tsindex d5ee347e083..1b81d2337fb 100644--- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRemoveSelectedRecordsFromRecordBoard.ts+++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRemoveSelectedRecordsFromRecordBoard.ts@@ -21,7 +21,7 @@ export const useRemoveSelectedRecordsFromRecordBoard = (recordBoardIndexId,);- const groupByFieldMetadataItem = useAtomComponentStateValue(+ const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(recordIndexGroupFieldMetadataItemComponentState,recordBoardIndexId,);@@ -46,7 +46,7 @@ export const useRemoveSelectedRecordsFromRecordBoard = () as string[];if (- !isDefined(groupByFieldMetadataItem) ||+ !isDefined(recordIndexGroupFieldMetadataItem) ||!isNonEmptyArray(recordGroupDefinitions) ||!isNonEmptyArray(deletedRecordIds)) {@@ -86,7 +86,7 @@ export const useRemoveSelectedRecordsFromRecordBoard = (resetRecordBoardSelection();}, [store,- groupByFieldMetadataItem,+ recordIndexGroupFieldMetadataItem,recordIndexRecordIdsByGroupCallbackState,recordGroupDefinitions,recordBoardSelectedRecordIds,diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/anchored-portal/components/RecordBoardCardCellEditModePortal.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/anchored-portal/components/RecordBoardCardCellEditModePortal.tsxindex 2d7add27c97..606fdb1eaa8 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/anchored-portal/components/RecordBoardCardCellEditModePortal.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/anchored-portal/components/RecordBoardCardCellEditModePortal.tsx@@ -16,13 +16,16 @@ export const RecordBoardCardCellEditModePortal = () => {const { objectMetadataItem } = useContext(RecordBoardContext);const { recordId } = useContext(RecordBoardCardContext);- const editModePosition = useAtomComponentStateValue(+ const recordBoardCardEditModePosition = useAtomComponentStateValue(recordBoardCardEditModePositionComponentState,);const { editedFieldMetadataItem } = useRecordBoardCardMetadataFromPosition();- if (!isDefined(editModePosition) || !isDefined(editedFieldMetadataItem)) {+ if (+ !isDefined(recordBoardCardEditModePosition) ||+ !isDefined(editedFieldMetadataItem)+ ) {return null;}diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsxindex b8e345c6a07..be40c552b34 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx@@ -73,18 +73,19 @@ export const RecordBoardCard = () => {const isCompactModeActive = currentView?.isCompact ?? false;- const [isCardExpanded, setIsCardExpanded] = useAtomComponentState(- recordBoardCardIsExpandedComponentState,- `record-board-card-${recordId}`,- );+ const [recordBoardCardIsExpanded, setRecordBoardCardIsExpanded] =+ useAtomComponentState(+ recordBoardCardIsExpandedComponentState,+ `record-board-card-${recordId}`,+ );- const [isCurrentCardSelected, setIsCurrentCardSelected] =+ const [isRecordBoardCardSelected, setIsRecordBoardCardSelected] =useAtomComponentFamilyState(isRecordBoardCardSelectedComponentFamilyState,recordId,);- const isCurrentCardFocused = useAtomComponentFamilyStateValue(+ const isRecordBoardCardFocused = useAtomComponentFamilyStateValue(isRecordBoardCardFocusedComponentFamilyState,{rowIndex,@@ -92,7 +93,7 @@ export const RecordBoardCard = () => {},);- const isCurrentCardActive = useAtomComponentFamilyStateValue(+ const isRecordBoardCardActive = useAtomComponentFamilyStateValue(isRecordBoardCardActiveComponentFamilyState,{rowIndex,@@ -105,7 +106,7 @@ export const RecordBoardCard = () => {const actionMenuDropdownId =getActionMenuDropdownIdFromActionMenuId(actionMenuId);- const setActionMenuDropdownPosition = useSetAtomComponentState(+ const setRecordIndexActionMenuDropdownPosition = useSetAtomComponentState(recordIndexActionMenuDropdownPositionComponentState,actionMenuDropdownId,);@@ -118,8 +119,8 @@ export const RecordBoardCard = () => {const handleContextMenuOpen = (event: React.MouseEvent) => {event.preventDefault();- setIsCurrentCardSelected(true);- setActionMenuDropdownPosition({+ setIsRecordBoardCardSelected(true);+ setRecordIndexActionMenuDropdownPosition({x: event.clientX,y: event.clientY,});@@ -139,8 +140,8 @@ export const RecordBoardCard = () => {};const onMouseLeaveBoard = useDebouncedCallback(() => {- if (isCompactModeActive && isCardExpanded) {- setIsCardExpanded(false);+ if (isCompactModeActive && recordBoardCardIsExpanded) {+ setRecordBoardCardIsExpanded(false);}}, 800);@@ -165,9 +166,9 @@ export const RecordBoardCard = () => {>{isRecordIdPrimaryDragMultiple && <RecordBoardCardMultiDragStack />}<RecordCard- data-selected={isCurrentCardSelected}- data-focused={isCurrentCardFocused}- data-active={isCurrentCardActive}+ data-selected={isRecordBoardCardSelected}+ data-focused={isRecordBoardCardFocused}+ data-active={isRecordBoardCardActive}onMouseLeave={onMouseLeaveBoard}onClick={handleCardClick}isPrimaryMultiDrag={isRecordIdPrimaryDragMultiple}@@ -176,7 +177,7 @@ export const RecordBoardCard = () => {><RecordBoardCardHeader /><AnimatedEaseInOut- isOpen={isCardExpanded || !isCompactModeActive}+ isOpen={recordBoardCardIsExpanded || !isCompactModeActive}initial={false}><RecordBoardCardBody />diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardDraggableContainer.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardDraggableContainer.tsxindex 4083d59c38b..cfbb276dcbc 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardDraggableContainer.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardDraggableContainer.tsx@@ -36,7 +36,7 @@ export const RecordBoardCardDraggableContainer = ({const { columnIndex } = useContext(RecordBoardColumnContext);- const isRecordBoardCardFocusActive = useAtomComponentFamilyStateValue(+ const isRecordBoardCardFocused = useAtomComponentFamilyStateValue(isRecordBoardCardFocusedComponentFamilyState,{rowIndex,@@ -61,7 +61,7 @@ export const RecordBoardCardDraggableContainer = ({data-select-disable><DragAndDropLibraryLegacyReRenderBreaker memoizationId={recordId}>- {isRecordBoardCardFocusActive && <RecordBoardCardHotkeysEffect />}+ {isRecordBoardCardFocused && <RecordBoardCardHotkeysEffect />}<RecordBoardCard /><RecordBoardCardMultiDragPreview /></DragAndDropLibraryLegacyReRenderBreaker>diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsxindex d0cb6c16954..38f5db67c62 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx@@ -54,14 +54,13 @@ export const RecordBoardCardHeader = () => {const isCompactModeActive = currentView?.isCompact ?? false;- const [isCardExpanded, setIsCardExpanded] = useAtomComponentState(- recordBoardCardIsExpandedComponentState,- );+ const [recordBoardCardIsExpanded, setRecordBoardCardIsExpanded] =+ useAtomComponentState(recordBoardCardIsExpandedComponentState);const { checkIfLastUnselectAndCloseDropdown } =useRecordBoardSelection(recordBoardId);- const [isCurrentCardSelected, setIsCurrentCardSelected] =+ const [isRecordBoardCardSelected, setIsRecordBoardCardSelected] =useAtomComponentFamilyState(isRecordBoardCardSelectedComponentFamilyState,recordId,@@ -73,7 +72,7 @@ export const RecordBoardCardHeader = () => {recordIndexOpenRecordInState,);- const record = useAtomFamilyStateValue(recordStoreFamilyState, recordId);+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);const triggerEvent =recordIndexOpenRecordIn === ViewOpenRecordInType.SIDE_PANEL@@ -84,10 +83,10 @@ export const RecordBoardCardHeader = () => {<RecordCardHeaderContainer isCompact={isCompactModeActive}><StyledRecordChipContainer><StopPropagationContainer>- {isDefined(record) && (+ {isDefined(recordStore) && (<RecordChipobjectNameSingular={objectMetadataItem.nameSingular}- record={record}+ record={recordStore}variant={ChipVariant.Transparent}onClick={() => {activateBoardCard({ rowIndex, columnIndex });@@ -104,10 +103,10 @@ export const RecordBoardCardHeader = () => {<StyledCompactIconContainer className="compact-icon-container"><StopPropagationContainer><LightIconButton- Icon={isCardExpanded ? IconEyeOff : IconEye}+ Icon={recordBoardCardIsExpanded ? IconEyeOff : IconEye}accent="tertiary"onClick={() => {- setIsCardExpanded(!isCardExpanded);+ setRecordBoardCardIsExpanded(!recordBoardCardIsExpanded);}}/></StopPropagationContainer>@@ -117,9 +116,9 @@ export const RecordBoardCardHeader = () => {<StopPropagationContainer><Checkboxhoverable- checked={isCurrentCardSelected}+ checked={isRecordBoardCardSelected}onChange={(value) => {- setIsCurrentCardSelected(value.target.checked);+ setIsRecordBoardCardSelected(value.target.checked);checkIfLastUnselectAndCloseDropdown();}}variant={CheckboxVariant.Secondary}diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/hooks/useRecordBoardCardMetadataFromPosition.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/hooks/useRecordBoardCardMetadataFromPosition.tsindex d6bb3826a29..483ac3831c0 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/hooks/useRecordBoardCardMetadataFromPosition.ts+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/hooks/useRecordBoardCardMetadataFromPosition.ts@@ -11,11 +11,11 @@ import { isDefined } from 'twenty-shared/utils';export const useRecordBoardCardMetadataFromPosition = () => {const { objectMetadataItem } = useContext(RecordBoardContext);- const hoverPosition = useAtomComponentStateValue(+ const recordBoardCardHoverPosition = useAtomComponentStateValue(recordBoardCardHoverPositionComponentState,);- const editModePosition = useAtomComponentStateValue(+ const recordBoardCardEditModePosition = useAtomComponentStateValue(recordBoardCardEditModePositionComponentState,);@@ -30,12 +30,12 @@ export const useRecordBoardCardMetadataFromPosition = () => {labelIdentifierFieldMetadataItem?.id !== recordField.fieldMetadataItemId,);- const hoveredRecordField = isDefined(hoverPosition)- ? visibleRecordFieldsFiltered.at(hoverPosition)+ const hoveredRecordField = isDefined(recordBoardCardHoverPosition)+ ? visibleRecordFieldsFiltered.at(recordBoardCardHoverPosition): undefined;- const editedRecordField = isDefined(editModePosition)- ? visibleRecordFieldsFiltered.at(editModePosition)+ const editedRecordField = isDefined(recordBoardCardEditModePosition)+ ? visibleRecordFieldsFiltered.at(recordBoardCardEditModePosition): undefined;const hoveredFieldMetadataItem = isDefined(hoveredRecordField)diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumn.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumn.tsxindex 67c5a233aa2..e7000513c7d 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumn.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumn.tsx@@ -38,7 +38,7 @@ export const RecordBoardColumn = ({recordGroupDefinitionFamilyState,recordBoardColumnId,);- const recordIdsByGroup = useAtomComponentFamilyStateValue(+ const recordIndexRecordIdsByGroup = useAtomComponentFamilyStateValue(recordIndexRecordIdsByGroupComponentFamilyState,recordBoardColumnId,);@@ -58,7 +58,7 @@ export const RecordBoardColumn = ({value={{columnDefinition: recordGroupDefinition,columnId: recordBoardColumnId,- recordIds: recordIdsByGroup,+ recordIds: recordIndexRecordIdsByGroup,columnIndex: recordBoardColumnIndex,}}>diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnCardsContainer.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnCardsContainer.tsxindex bd3a5a90fa0..e78ef43fefb 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnCardsContainer.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnCardsContainer.tsx@@ -33,7 +33,7 @@ export const RecordBoardColumnCardsContainer = ({}: RecordBoardColumnCardsContainerProps) => {const { columnDefinition } = useContext(RecordBoardColumnContext);- const recordIds = useAtomComponentFamilyStateValue(+ const recordIndexRecordIdsByGroup = useAtomComponentFamilyStateValue(recordIndexRecordIdsByGroupComponentFamilyState,recordBoardColumnId,);@@ -49,7 +49,7 @@ export const RecordBoardColumnCardsContainer = ({// eslint-disable-next-line react/jsx-props-no-spreading{...droppableProvided?.droppableProps}>- {recordIds.map((recordId, index) => (+ {recordIndexRecordIdsByGroup.map((recordId, index) => (<RecordBoardCardDraggableContainerkey={recordId}recordId={recordId}@@ -61,7 +61,7 @@ export const RecordBoardColumnCardsContainer = ({) : null}<DraggabledraggableId={`new-${columnDefinition.id}-bottom`}- index={recordIds.length}+ index={recordIndexRecordIdsByGroup.length}isDragDisabled={true}>{(draggableProvided) => (diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownFieldsContent.tsxindex e97188f221b..1931d070310 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownFieldsContent.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownFieldsContent.tsx@@ -39,7 +39,7 @@ export const RecordBoardColumnHeaderAggregateDropdownFieldsContent = () => {aggregateOperationComponentState,);- const availableFieldsIdsForAggregateOperation = useAtomComponentStateValue(+ const availableFieldIdsForAggregateOperation = useAtomComponentStateValue(availableFieldIdsForAggregateOperationComponentState,);@@ -72,7 +72,7 @@ export const RecordBoardColumnHeaderAggregateDropdownFieldsContent = () => {{getAggregateOperationLabel(aggregateOperation)}</DropdownMenuHeader><DropdownMenuItemsContainer>- {availableFieldsIdsForAggregateOperation.map((fieldId) => {+ {availableFieldIdsForAggregateOperation.map((fieldId) => {const fieldMetadata = objectMetadataItem.fields.find((field) => field.id === fieldId,);diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownOptionsContent.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownOptionsContent.tsxindex ab0d601285d..411e144f775 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownOptionsContent.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownOptionsContent.tsx@@ -39,7 +39,7 @@ export const RecordBoardColumnHeaderAggregateDropdownOptionsContent = ({aggregateOperationComponentState,);- const setAvailableFieldsForAggregateOperation = useSetAtomComponentState(+ const setAvailableFieldIdsForAggregateOperation = useSetAtomComponentState(availableFieldIdsForAggregateOperationComponentState,);@@ -79,7 +79,7 @@ export const RecordBoardColumnHeaderAggregateDropdownOptionsContent = ({availableAggregationOperation as ExtendedAggregateOperations,);- setAvailableFieldsForAggregateOperation(+ setAvailableFieldIdsForAggregateOperation(availableAggregationFieldsIdsForOperation,);onContentChange('aggregateFields');diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderWrapper.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderWrapper.tsxindex e2e10b8b992..019e28c7f66 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderWrapper.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderWrapper.tsx@@ -21,7 +21,7 @@ export const RecordBoardColumnHeaderWrapper = ({columnId,);- const recordIdsByGroup = useAtomComponentFamilyStateValue(+ const recordIndexRecordIdsByGroup = useAtomComponentFamilyStateValue(recordIndexRecordIdsByGroupComponentFamilyState,columnId,);@@ -41,7 +41,7 @@ export const RecordBoardColumnHeaderWrapper = ({value={{columnId,columnDefinition: recordGroupDefinition,- recordIds: recordIdsByGroup,+ recordIds: recordIndexRecordIdsByGroup,columnIndex,}}>diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordIndexCalendarDataLoaderEffect.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordIndexCalendarDataLoaderEffect.tsxindex 8dc88dd5e45..a85557035da 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordIndexCalendarDataLoaderEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordIndexCalendarDataLoaderEffect.tsx@@ -29,7 +29,7 @@ export const RecordIndexCalendarDataLoaderEffect = () => {const { upsertRecordsInStore } = useUpsertRecordsInStore();- const setContextStoreTargetedRecords = useSetAtomComponentState(+ const setContextStoreTargetedRecordsRule = useSetAtomComponentState(contextStoreTargetedRecordsRuleComponentState,recordCalendarId,);@@ -64,18 +64,18 @@ export const RecordIndexCalendarDataLoaderEffect = () => {]);useEffect(() => {- setContextStoreTargetedRecords({+ setContextStoreTargetedRecordsRule({mode: 'selection',selectedRecordIds,});return () => {- setContextStoreTargetedRecords({+ setContextStoreTargetedRecordsRule({mode: 'selection',selectedRecordIds: [],});};- }, [selectedRecordIds, setContextStoreTargetedRecords]);+ }, [selectedRecordIds, setContextStoreTargetedRecordsRule]);return <></>;};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/__stories__/RecordCalendarMonth.stories.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/month/components/__stories__/RecordCalendarMonth.stories.tsxindex 48f59c0276b..482e1eb6364 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/__stories__/RecordCalendarMonth.stories.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/month/components/__stories__/RecordCalendarMonth.stories.tsx@@ -48,7 +48,7 @@ const meta: Meta<typeof RecordCalendarMonth> = {const mockCoreView = mockedCoreViewsData[0];- const setCurrentViewId = useSetAtomComponentState(+ const setContextStoreCurrentViewId = useSetAtomComponentState(contextStoreCurrentViewIdComponentState,MAIN_CONTEXT_STORE_INSTANCE_ID,);@@ -72,12 +72,12 @@ const meta: Meta<typeof RecordCalendarMonth> = {useEffect(() => {setCoreViews([mockCoreView]);- setCurrentViewId(mockCoreView.id);+ setContextStoreCurrentViewId(mockCoreView.id);setCurrentRecordFields(columns);setIsLoaded(true);}, [setCoreViews,- setCurrentViewId,+ setContextStoreCurrentViewId,setCurrentRecordFields,mockCoreView,columns,diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/anchored-portal/components/RecordCalendarCardCellEditModePortal.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/anchored-portal/components/RecordCalendarCardCellEditModePortal.tsxindex 1de59477c41..b30be91da98 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/anchored-portal/components/RecordCalendarCardCellEditModePortal.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/anchored-portal/components/RecordCalendarCardCellEditModePortal.tsx@@ -19,14 +19,17 @@ export const RecordCalendarCardCellEditModePortal = ({}: RecordCalendarCardCellEditModePortalProps) => {const { objectMetadataItem } = useRecordCalendarContextOrThrow();- const editModePosition = useAtomComponentStateValue(+ const recordCalendarCardEditModePosition = useAtomComponentStateValue(recordCalendarCardEditModePositionComponentState,);const { editedFieldMetadataItem } =useRecordCalendarCardMetadataFromPosition();- if (!isDefined(editModePosition) || !isDefined(editedFieldMetadataItem)) {+ if (+ !isDefined(recordCalendarCardEditModePosition) ||+ !isDefined(editedFieldMetadataItem)+ ) {return null;}diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/anchored-portal/components/RecordCalendarCardCellHoveredPortal.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/anchored-portal/components/RecordCalendarCardCellHoveredPortal.tsxindex 2dd8717b53b..ddcbb8e107e 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/anchored-portal/components/RecordCalendarCardCellHoveredPortal.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/anchored-portal/components/RecordCalendarCardCellHoveredPortal.tsx@@ -18,14 +18,17 @@ export const RecordCalendarCardCellHoveredPortal = ({}: RecordCalendarCardCellHoveredPortalProps) => {const { objectMetadataItem } = useRecordCalendarContextOrThrow();- const hoverPosition = useAtomComponentStateValue(+ const recordCalendarCardHoverPosition = useAtomComponentStateValue(recordCalendarCardHoverPositionComponentState,);const { hoveredFieldMetadataItem } =useRecordCalendarCardMetadataFromPosition();- if (!isDefined(hoverPosition) || !isDefined(hoveredFieldMetadataItem)) {+ if (+ !isDefined(recordCalendarCardHoverPosition) ||+ !isDefined(hoveredFieldMetadataItem)+ ) {return null;}diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsxindex 6db54d82085..b873ebbb0b0 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx@@ -36,7 +36,7 @@ export const RecordCalendarCard = ({ recordId }: RecordCalendarCardProps) => {const { currentView } = useGetCurrentViewOnly();const isCompactModeActive = currentView?.isCompact ?? false;- const [isCurrentCardSelected, setIsCurrentCardSelected] =+ const [isRecordCalendarCardSelected, setIsRecordCalendarCardSelected] =useAtomComponentFamilyState(isRecordCalendarCardSelectedComponentFamilyState,recordId,@@ -51,7 +51,7 @@ export const RecordCalendarCard = ({ recordId }: RecordCalendarCardProps) => {const actionMenuDropdownId =getActionMenuDropdownIdFromActionMenuId(actionMenuId);- const setActionMenuDropdownPosition = useSetAtomComponentState(+ const setRecordIndexActionMenuDropdownPosition = useSetAtomComponentState(recordIndexActionMenuDropdownPositionComponentState,actionMenuDropdownId,);@@ -60,8 +60,8 @@ export const RecordCalendarCard = ({ recordId }: RecordCalendarCardProps) => {const handleContextMenuOpen = (event: React.MouseEvent) => {event.preventDefault();- setIsCurrentCardSelected(true);- setActionMenuDropdownPosition({+ setIsRecordCalendarCardSelected(true);+ setRecordIndexActionMenuDropdownPosition({x: event.clientX,y: event.clientY,});@@ -85,7 +85,7 @@ export const RecordCalendarCard = ({ recordId }: RecordCalendarCardProps) => {><StyledContainer onContextMenu={handleContextMenuOpen}><StyledRecordCard- data-selected={isCurrentCardSelected}+ data-selected={isRecordCalendarCardSelected}data-click-outside-id={RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID}><RecordCalendarCardHeader recordId={recordId} />diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader.tsxindex 5f76340b3ad..7c24567129d 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader.tsx@@ -38,7 +38,7 @@ export const RecordCalendarCardHeader = ({recordId,}: RecordCalendarCardHeaderProps) => {const { objectMetadataItem } = useRecordCalendarContextOrThrow();- const record = useAtomFamilyStateValue(recordStoreFamilyState, recordId);+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);const { openRecordFromIndexView } = useOpenRecordFromIndexView();const { currentView } = useGetCurrentViewOnly();@@ -49,7 +49,7 @@ export const RecordCalendarCardHeader = ({isDraggingRecordComponentState,);- const [isCurrentCardSelected, setIsCurrentCardSelected] =+ const [isRecordCalendarCardSelected, setIsRecordCalendarCardSelected] =useAtomComponentFamilyState(isRecordCalendarCardSelectedComponentFamilyState,recordId,@@ -62,7 +62,7 @@ export const RecordCalendarCardHeader = ({openRecordFromIndexView({ recordId });};- if (!isDefined(record)) {+ if (!isDefined(recordStore)) {return null;}@@ -72,7 +72,7 @@ export const RecordCalendarCardHeader = ({<StopPropagationContainer><RecordChipobjectNameSingular={objectMetadataItem.nameSingular}- record={record}+ record={recordStore}variant={ChipVariant.Transparent}isIconHidden={true}onClick={handleChipClick}@@ -84,9 +84,9 @@ export const RecordCalendarCardHeader = ({<StopPropagationContainer><Checkboxhoverable- checked={isCurrentCardSelected}+ checked={isRecordCalendarCardSelected}onChange={(value) => {- setIsCurrentCardSelected(value.target.checked);+ setIsRecordCalendarCardSelected(value.target.checked);}}variant={CheckboxVariant.Secondary}/>diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/hooks/useRecordCalendarCardMetadataFromPosition.ts b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/hooks/useRecordCalendarCardMetadataFromPosition.tsindex 2ae39b73769..f974cb99929 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/hooks/useRecordCalendarCardMetadataFromPosition.ts+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/hooks/useRecordCalendarCardMetadataFromPosition.ts@@ -10,11 +10,11 @@ import { isDefined } from 'twenty-shared/utils';export const useRecordCalendarCardMetadataFromPosition = () => {const { objectMetadataItem } = useRecordCalendarContextOrThrow();- const hoverPosition = useAtomComponentStateValue(+ const recordCalendarCardHoverPosition = useAtomComponentStateValue(recordCalendarCardHoverPositionComponentState,);- const editModePosition = useAtomComponentStateValue(+ const recordCalendarCardEditModePosition = useAtomComponentStateValue(recordCalendarCardEditModePositionComponentState,);@@ -29,12 +29,12 @@ export const useRecordCalendarCardMetadataFromPosition = () => {labelIdentifierFieldMetadataItem?.id !== recordField.fieldMetadataItemId,);- const hoveredRecordField = isDefined(hoverPosition)- ? visibleRecordFieldsFiltered.at(hoverPosition)+ const hoveredRecordField = isDefined(recordCalendarCardHoverPosition)+ ? visibleRecordFieldsFiltered.at(recordCalendarCardHoverPosition): undefined;- const editedRecordField = isDefined(editModePosition)- ? visibleRecordFieldsFiltered.at(editModePosition)+ const editedRecordField = isDefined(recordCalendarCardEditModePosition)+ ? visibleRecordFieldsFiltered.at(recordCalendarCardEditModePosition): undefined;const hoveredFieldMetadataItem = isDefined(hoveredRecordField)diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useEndRecordDrag.test.tsx b/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useEndRecordDrag.test.tsxindex 5e81152b13a..7c1d5a7aa13 100644--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useEndRecordDrag.test.tsx+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useEndRecordDrag.test.tsx@@ -26,9 +26,8 @@ describe('useEndRecordDrag', () => {const [primaryDraggedRecordId, setPrimaryDraggedRecordId] =useAtomComponentState(primaryDraggedRecordIdComponentState);- const [originalSelection, setOriginalSelection] = useAtomComponentState(- originalDragSelectionComponentState,- );+ const [originalDragSelection, setOriginalDragSelection] =+ useAtomComponentState(originalDragSelectionComponentState);const { endRecordDrag } = useEndRecordDrag();@@ -37,11 +36,11 @@ describe('useEndRecordDrag', () => {isMultiDragActive,draggedRecordIds,primaryDraggedRecordId,- originalSelection,+ originalDragSelection,setIsMultiDragActive,setDraggedRecordIds,setPrimaryDraggedRecordId,- setOriginalSelection,+ setOriginalDragSelection,};},{ wrapper: Wrapper },@@ -51,13 +50,17 @@ describe('useEndRecordDrag', () => {result.current.setIsMultiDragActive(true);result.current.setDraggedRecordIds(['record-1', 'record-2']);result.current.setPrimaryDraggedRecordId('record-1');- result.current.setOriginalSelection(['record-1', 'record-2', 'record-3']);+ result.current.setOriginalDragSelection([+ 'record-1',+ 'record-2',+ 'record-3',+ ]);});expect(result.current.isMultiDragActive).toBe(true);expect(result.current.draggedRecordIds).toEqual(['record-1', 'record-2']);expect(result.current.primaryDraggedRecordId).toBe('record-1');- expect(result.current.originalSelection).toEqual([+ expect(result.current.originalDragSelection).toEqual(['record-1','record-2','record-3',@@ -70,6 +73,6 @@ describe('useEndRecordDrag', () => {expect(result.current.isMultiDragActive).toBe(false);expect(result.current.draggedRecordIds).toEqual([]);expect(result.current.primaryDraggedRecordId).toBeNull();- expect(result.current.originalSelection).toEqual([]);+ expect(result.current.originalDragSelection).toEqual([]);});});diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useStartRecordDrag.test.tsx b/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useStartRecordDrag.test.tsxindex 28c9329412a..8a4973aec93 100644--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useStartRecordDrag.test.tsx+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/__tests__/useStartRecordDrag.test.tsx@@ -35,7 +35,7 @@ describe('useStartRecordDrag', () => {const primaryDraggedRecordId = useAtomComponentStateValue(primaryDraggedRecordIdComponentState,);- const originalSelection = useAtomComponentStateValue(+ const originalDragSelection = useAtomComponentStateValue(originalDragSelectionComponentState,);@@ -46,7 +46,7 @@ describe('useStartRecordDrag', () => {isMultiDragActive,draggedRecordIds,primaryDraggedRecordId,- originalSelection,+ originalDragSelection,};},{ wrapper: Wrapper },@@ -62,7 +62,7 @@ describe('useStartRecordDrag', () => {expect(result.current.isMultiDragActive).toBe(true);expect(result.current.draggedRecordIds).toEqual(['record-1']);expect(result.current.primaryDraggedRecordId).toBe('record-1');- expect(result.current.originalSelection).toEqual(['record-1']);+ expect(result.current.originalDragSelection).toEqual(['record-1']);});it('should set single drag state when only one record is selected', () => {@@ -77,7 +77,7 @@ describe('useStartRecordDrag', () => {const primaryDraggedRecordId = useAtomComponentStateValue(primaryDraggedRecordIdComponentState,);- const originalSelection = useAtomComponentStateValue(+ const originalDragSelection = useAtomComponentStateValue(originalDragSelectionComponentState,);@@ -88,7 +88,7 @@ describe('useStartRecordDrag', () => {isMultiDragActive,draggedRecordIds,primaryDraggedRecordId,- originalSelection,+ originalDragSelection,};},{ wrapper: Wrapper },@@ -104,7 +104,7 @@ describe('useStartRecordDrag', () => {expect(result.current.isMultiDragActive).toBe(true);expect(result.current.draggedRecordIds).toEqual(['record-1']);expect(result.current.primaryDraggedRecordId).toBe('record-1');- expect(result.current.originalSelection).toEqual(['record-1']);+ expect(result.current.originalDragSelection).toEqual(['record-1']);});it('should set multi drag state when multiple records are selected', () => {@@ -119,7 +119,7 @@ describe('useStartRecordDrag', () => {const primaryDraggedRecordId = useAtomComponentStateValue(primaryDraggedRecordIdComponentState,);- const originalSelection = useAtomComponentStateValue(+ const originalDragSelection = useAtomComponentStateValue(originalDragSelectionComponentState,);@@ -130,7 +130,7 @@ describe('useStartRecordDrag', () => {isMultiDragActive,draggedRecordIds,primaryDraggedRecordId,- originalSelection,+ originalDragSelection,};},{ wrapper: Wrapper },@@ -150,7 +150,7 @@ describe('useStartRecordDrag', () => {'record-3',]);expect(result.current.primaryDraggedRecordId).toBe('record-2');- expect(result.current.originalSelection).toEqual([+ expect(result.current.originalDragSelection).toEqual(['record-1','record-2','record-3',@@ -169,7 +169,7 @@ describe('useStartRecordDrag', () => {const primaryDraggedRecordId = useAtomComponentStateValue(primaryDraggedRecordIdComponentState,);- const originalSelection = useAtomComponentStateValue(+ const originalDragSelection = useAtomComponentStateValue(originalDragSelectionComponentState,);@@ -180,7 +180,7 @@ describe('useStartRecordDrag', () => {isMultiDragActive,draggedRecordIds,primaryDraggedRecordId,- originalSelection,+ originalDragSelection,};},{ wrapper: Wrapper },@@ -196,7 +196,7 @@ describe('useStartRecordDrag', () => {expect(result.current.isMultiDragActive).toBe(true);expect(result.current.draggedRecordIds).toEqual(['record-1']);expect(result.current.primaryDraggedRecordId).toBe('record-1');- expect(result.current.originalSelection).toEqual(['record-1']);+ expect(result.current.originalDragSelection).toEqual(['record-1']);});it('should set single drag state when dragged record is not in selection', () => {@@ -211,7 +211,7 @@ describe('useStartRecordDrag', () => {const primaryDraggedRecordId = useAtomComponentStateValue(primaryDraggedRecordIdComponentState,);- const originalSelection = useAtomComponentStateValue(+ const originalDragSelection = useAtomComponentStateValue(originalDragSelectionComponentState,);@@ -222,7 +222,7 @@ describe('useStartRecordDrag', () => {isMultiDragActive,draggedRecordIds,primaryDraggedRecordId,- originalSelection,+ originalDragSelection,};},{ wrapper: Wrapper },@@ -238,7 +238,7 @@ describe('useStartRecordDrag', () => {expect(result.current.isMultiDragActive).toBe(true);expect(result.current.draggedRecordIds).toEqual(['record-1']);expect(result.current.primaryDraggedRecordId).toBe('record-1');- expect(result.current.originalSelection).toEqual(['record-1']);+ expect(result.current.originalDragSelection).toEqual(['record-1']);});it('should set multi drag state when multiple records are selected', () => {@@ -253,7 +253,7 @@ describe('useStartRecordDrag', () => {const primaryDraggedRecordId = useAtomComponentStateValue(primaryDraggedRecordIdComponentState,);- const originalSelection = useAtomComponentStateValue(+ const originalDragSelection = useAtomComponentStateValue(originalDragSelectionComponentState,);@@ -264,7 +264,7 @@ describe('useStartRecordDrag', () => {isMultiDragActive,draggedRecordIds,primaryDraggedRecordId,- originalSelection,+ originalDragSelection,};},{ wrapper: Wrapper },@@ -284,7 +284,7 @@ describe('useStartRecordDrag', () => {'record-3',]);expect(result.current.primaryDraggedRecordId).toBe('record-2');- expect(result.current.originalSelection).toEqual([+ expect(result.current.originalDragSelection).toEqual(['record-1','record-2','record-3',diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithGroupRecordDrop.ts b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithGroupRecordDrop.tsindex bc4f8831870..a7ebfdc533d 100644--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithGroupRecordDrop.ts+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithGroupRecordDrop.ts@@ -55,7 +55,7 @@ export const useProcessTableWithGroupRecordDrop = () => {recordIndexId,);- const groupFieldMetadata = useAtomComponentStateValue(+ const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(recordIndexGroupFieldMetadataItemComponentState,);@@ -73,7 +73,7 @@ export const useProcessTableWithGroupRecordDrop = () => {}const fieldMetadata = objectMetadataItem.fields.find(- (field) => field.id === groupFieldMetadata?.id,+ (field) => field.id === recordIndexGroupFieldMetadataItem?.id,);if (!isDefined(fieldMetadata)) {@@ -121,7 +121,7 @@ export const useProcessTableWithGroupRecordDrop = () => {isDraggingRecord,selectedRowIds,recordIdsByGroupFamilyState,- groupFieldMetadata?.id,+ recordIndexGroupFieldMetadataItem?.id,openModal,updateOneRecord,],diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/anchored-portal/components/RecordFieldListCellEditModePortal.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/anchored-portal/components/RecordFieldListCellEditModePortal.tsxindex 0aea4d968a6..96668e86025 100644--- a/packages/twenty-front/src/modules/object-record/record-field-list/anchored-portal/components/RecordFieldListCellEditModePortal.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field-list/anchored-portal/components/RecordFieldListCellEditModePortal.tsx@@ -24,7 +24,7 @@ export const RecordFieldListCellEditModePortal = ({RecordFieldListComponentInstanceContext,);- const editModePosition = useAtomComponentStateValue(+ const recordFieldListCellEditModePosition = useAtomComponentStateValue(recordFieldListCellEditModePositionComponentState,);@@ -32,7 +32,10 @@ export const RecordFieldListCellEditModePortal = ({objectNameSingular: objectMetadataItem.nameSingular,});- if (!isDefined(editModePosition) || !isDefined(editedFieldMetadataItem)) {+ if (+ !isDefined(recordFieldListCellEditModePosition) ||+ !isDefined(editedFieldMetadataItem)+ ) {return null;}diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/anchored-portal/components/RecordFieldListCellHoveredPortal.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/anchored-portal/components/RecordFieldListCellHoveredPortal.tsxindex 6839378159d..37e472c6a21 100644--- a/packages/twenty-front/src/modules/object-record/record-field-list/anchored-portal/components/RecordFieldListCellHoveredPortal.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field-list/anchored-portal/components/RecordFieldListCellHoveredPortal.tsx@@ -23,7 +23,7 @@ export const RecordFieldListCellHoveredPortal = ({RecordFieldListComponentInstanceContext,);- const hoverPosition = useAtomComponentStateValue(+ const recordFieldListHoverPosition = useAtomComponentStateValue(recordFieldListHoverPositionComponentState,);@@ -31,7 +31,10 @@ export const RecordFieldListCellHoveredPortal = ({objectNameSingular: objectMetadataItem.nameSingular,});- if (!isDefined(hoverPosition) || !isDefined(hoveredFieldMetadataItem)) {+ if (+ !isDefined(recordFieldListHoverPosition) ||+ !isDefined(hoveredFieldMetadataItem)+ ) {return null;}diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useFieldListFieldMetadataFromPosition.ts b/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useFieldListFieldMetadataFromPosition.tsindex 6c482da99d4..d5daa306e5f 100644--- a/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useFieldListFieldMetadataFromPosition.ts+++ b/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useFieldListFieldMetadataFromPosition.ts@@ -11,11 +11,11 @@ type UseFieldListFieldMetadataFromPositionProps = {export const useFieldListFieldMetadataFromPosition = ({objectNameSingular,}: UseFieldListFieldMetadataFromPositionProps) => {- const hoverPosition = useAtomComponentStateValue(+ const recordFieldListHoverPosition = useAtomComponentStateValue(recordFieldListHoverPositionComponentState,);- const editModePosition = useAtomComponentStateValue(+ const recordFieldListCellEditModePosition = useAtomComponentStateValue(recordFieldListCellEditModePositionComponentState,);@@ -33,12 +33,12 @@ export const useFieldListFieldMetadataFromPosition = ({...boxedRelationFieldMetadataItems,];- const hoveredFieldMetadataItem = isDefined(hoverPosition)- ? fieldMetadataItems.at(hoverPosition)+ const hoveredFieldMetadataItem = isDefined(recordFieldListHoverPosition)+ ? fieldMetadataItems.at(recordFieldListHoverPosition): undefined;- const editedFieldMetadataItem = isDefined(editModePosition)- ? fieldMetadataItems.at(editModePosition)+ const editedFieldMetadataItem = isDefined(recordFieldListCellEditModePosition)+ ? fieldMetadataItems.at(recordFieldListCellEditModePosition): undefined;return {diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsxindex 47f8a26999d..02d2c3bd26b 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx@@ -116,14 +116,14 @@ export const FormSingleRecordPicker = ({const { closeDropdown } = useCloseDropdown();- const setRecordPickerSearchFilter = useSetAtomComponentState(+ const setSingleRecordPickerSearchFilter = useSetAtomComponentState(singleRecordPickerSearchFilterComponentState,dropdownId,);const handleCloseRelationPickerDropdown = useCallback(() => {- setRecordPickerSearchFilter('');- }, [setRecordPickerSearchFilter]);+ setSingleRecordPickerSearchFilter('');+ }, [setSingleRecordPickerSearchFilter]);const handleMorphItemSelected = (selectedMorphItem: RecordPickerPickableMorphItem | null | undefined,@@ -148,7 +148,7 @@ export const FormSingleRecordPicker = ({onClear?.();};- const setRecordPickerSelectedId = useSetAtomComponentState(+ const setSingleRecordPickerSelectedId = useSetAtomComponentState(singleRecordPickerSelectedIdComponentState,dropdownId,);@@ -158,7 +158,7 @@ export const FormSingleRecordPicker = ({isDefined(draftValue?.value) &&!isStandaloneVariableString(draftValue.value)) {- setRecordPickerSelectedId(draftValue.value);+ setSingleRecordPickerSelectedId(draftValue.value);}};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/__tests__/useIsFieldEmpty.test.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/__tests__/useIsFieldEmpty.test.tsxindex bc09aad6562..611f9119fd0 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/__tests__/useIsFieldEmpty.test.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/__tests__/useIsFieldEmpty.test.tsx@@ -30,12 +30,12 @@ describe('useIsFieldEmpty', () => {it('should work as expected', () => {const { result } = renderHook(() => {- const setFieldState = useSetAtomFamilyState(+ const setRecordStore = useSetAtomFamilyState(recordStoreFamilyState,recordId,);return {- setFieldState,+ setRecordStore,isFieldEditModeValueEmpty: useIsFieldEmpty(),};},@@ -47,7 +47,7 @@ describe('useIsFieldEmpty', () => {expect(result.current.isFieldEditModeValueEmpty).toBe(true);act(() => {- result.current.setFieldState({+ result.current.setRecordStore({id: 'id',phone: '+1 233223',__typename: 'Person',diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/ChipFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/ChipFieldDisplay.tsxindex 8df8c06ba81..2a981969d8d 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/ChipFieldDisplay.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/ChipFieldDisplay.tsx@@ -5,7 +5,7 @@ import { ChipSize } from 'twenty-ui/components';export const ChipFieldDisplay = () => {const {- recordValue,+ recordStore: recordValue,objectNameSingular,labelIdentifierLink,disableChipClick,diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/FilesFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/FilesFieldDisplay.tsxindex f07438d670c..cfcf78267bc 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/FilesFieldDisplay.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/FilesFieldDisplay.tsx@@ -9,13 +9,13 @@ export const FilesFieldDisplay = () => {const { recordId, fieldDefinition } = useContext(FieldContext);const { fieldValue, disableChipClick } = useFilesFieldDisplay();- const uploadState = useAtomFamilyStateValue(filesFieldUploadState, {+ const filesFieldUpload = useAtomFamilyStateValue(filesFieldUploadState, {recordId,fieldName: fieldDefinition.metadata.fieldName,});- const isUploadWindowOpen = uploadState === 'UPLOAD_WINDOW_OPEN';- const isFileUploading = uploadState === 'UPLOADING_FILE';+ const isUploadWindowOpen = filesFieldUpload === 'UPLOAD_WINDOW_OPEN';+ const isFileUploading = filesFieldUpload === 'UPLOADING_FILE';return (<FilesDisplaydiff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/__stories__/perf/RelationFromManyFieldDisplay.perf.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/__stories__/perf/RelationFromManyFieldDisplay.perf.stories.tsxindex 062b0240aa4..4eb9f3c3729 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/__stories__/perf/RelationFromManyFieldDisplay.perf.stories.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/__stories__/perf/RelationFromManyFieldDisplay.perf.stories.tsx@@ -19,18 +19,18 @@ import {} from './relationFromManyFieldDisplayMock';const RelationFieldValueSetterEffect = () => {- const setEntity = useSetAtomFamilyState(+ const setRecordStore = useSetAtomFamilyState(recordStoreFamilyState,relationFromManyFieldDisplayMock.entityValue.id,);useEffect(() => {- setEntity({+ setRecordStore({__typename: relationFromManyFieldDisplayMock.entityValue.__typename,id: relationFromManyFieldDisplayMock.entityValue.id,company: [relationFromManyFieldDisplayMock.entityValue],} satisfies ObjectRecord);- }, [setEntity]);+ }, [setRecordStore]);return null;};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useAddressField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useAddressField.tsindex b98aa2caa64..0795babf681 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useAddressField.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useAddressField.ts@@ -30,7 +30,7 @@ export const useAddressField = () => {const { setDraftValue } = useRecordFieldInput<FieldAddressValue>();- const draftValue = useAtomComponentStateValue(+ const recordFieldInputDraftValue = useAtomComponentStateValue(recordFieldInputDraftValueComponentState,);@@ -38,7 +38,7 @@ export const useAddressField = () => {fieldDefinition,fieldValue,setFieldValue,- draftValue,+ draftValue: recordFieldInputDraftValue,setDraftValue,};};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useArrayField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useArrayField.tsindex 18438432cb9..21e17e57df8 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useArrayField.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useArrayField.ts@@ -24,14 +24,14 @@ export const useArrayField = () => {const { setDraftValue } = useRecordFieldInput<FieldArrayValue>();- const draftValue = useAtomComponentStateValue(+ const recordFieldInputDraftValue = useAtomComponentStateValue(recordFieldInputDraftValueComponentState,);return {fieldValue,fieldDefinition,- draftValue,+ draftValue: recordFieldInputDraftValue,setFieldValue,setDraftValue,};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipField.tsindex 4a617dc483e..0154d072964 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipField.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipField.ts@@ -17,10 +17,10 @@ export const useChipField = () => {? fieldDefinition.metadata.objectMetadataNameSingular: undefined;- const record = useAtomFamilyStateValue(recordStoreFamilyState, recordId);+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);return {objectNameSingular,- record,+ recordStore,};};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipFieldDisplay.tsindex ff1ffbaaeea..4f1db7e2303 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipFieldDisplay.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipFieldDisplay.ts@@ -50,7 +50,7 @@ export const useChipFieldDisplay = () => {? fieldDefinition.metadata.objectMetadataNameSingular: undefined;- const recordValue = useAtomFamilyStateValue(recordStoreFamilyState, recordId);+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);if (!isNonEmptyString(objectNameSingular)) {throw new Error('Object metadata name singular is not a non-empty string');@@ -58,7 +58,7 @@ export const useChipFieldDisplay = () => {return {objectNameSingular,- recordValue,+ recordStore,isLabelIdentifier,labelIdentifierLink,disableChipClick,diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useCurrencyField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useCurrencyField.tsindex a7a7e1398c9..276d228d3a9 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useCurrencyField.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useCurrencyField.ts@@ -30,7 +30,7 @@ export const useCurrencyField = () => {const { setDraftValue } = useRecordFieldInput<FieldCurrencyValue>();- const draftValue = useAtomComponentStateValue(+ const recordFieldInputDraftValue = useAtomComponentStateValue(recordFieldInputDraftValueComponentState,);@@ -42,7 +42,7 @@ export const useCurrencyField = () => {return {fieldDefinition,fieldValue,- draftValue,+ draftValue: recordFieldInputDraftValue,setDraftValue,setFieldValue,defaultValue,diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useEmailsField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useEmailsField.tsindex 86849a77041..a3426dbde82 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useEmailsField.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useEmailsField.ts@@ -26,14 +26,14 @@ export const useEmailsField = () => {const { setDraftValue } = useRecordFieldInput<FieldEmailsValue>();- const draftValue = useAtomComponentStateValue(+ const recordFieldInputDraftValue = useAtomComponentStateValue(recordFieldInputDraftValueComponentState,);return {fieldDefinition,fieldValue,- draftValue,+ draftValue: recordFieldInputDraftValue,setDraftValue,setFieldValue,};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useFilesField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useFilesField.tsindex d6a7d481a54..c4700a31b7d 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useFilesField.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useFilesField.ts@@ -26,14 +26,14 @@ export const useFilesField = () => {const { setDraftValue } = useRecordFieldInput<FieldFilesValue[]>();- const draftValue = useAtomComponentStateValue(+ const recordFieldInputDraftValue = useAtomComponentStateValue(recordFieldInputDraftValueComponentState,);return {fieldDefinition,fieldValue,- draftValue,+ draftValue: recordFieldInputDraftValue,setDraftValue,setFieldValue,};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useFullNameField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useFullNameField.tsindex 9e7b4c7ff28..4532ff82f4d 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useFullNameField.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useFullNameField.ts@@ -29,7 +29,7 @@ export const useFullNameField = () => {const { setDraftValue } = useRecordFieldInput<FieldFullNameValue>();- const draftValue = useAtomComponentStateValue(+ const recordFieldInputDraftValue = useAtomComponentStateValue(recordFieldInputDraftValueComponentState,);@@ -37,7 +37,7 @@ export const useFullNameField = () => {fieldDefinition,fieldValue,setFieldValue,- draftValue,+ draftValue: recordFieldInputDraftValue,setDraftValue,};};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useJsonField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useJsonField.tsindex ed54b34640f..d4b9730ef52 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useJsonField.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useJsonField.ts@@ -31,16 +31,16 @@ export const useJsonField = () => {const { setDraftValue } = useRecordFieldInput<FieldJsonValue>();- const draftValue = useAtomComponentStateValue(+ const recordFieldInputDraftValue = useAtomComponentStateValue(recordFieldInputDraftValueComponentState,);const precomputedDraftValue = usePrecomputedJsonDraftValue({- draftValue,+ draftValue: recordFieldInputDraftValue,});return {- draftValue,+ draftValue: recordFieldInputDraftValue,precomputedDraftValue,setDraftValue,maxWidth,diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useLinksField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useLinksField.tsindex 799ba872ee5..6dd9a104af2 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useLinksField.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useLinksField.ts@@ -26,14 +26,14 @@ export const useLinksField = () => {const { setDraftValue } = useRecordFieldInput<FieldLinksValue>();- const draftValue = useAtomComponentStateValue(+ const recordFieldInputDraftValue = useAtomComponentStateValue(recordFieldInputDraftValueComponentState,);return {fieldDefinition,fieldValue,- draftValue,+ draftValue: recordFieldInputDraftValue,setDraftValue,setFieldValue,};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useMorphRelationField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useMorphRelationField.tsindex 00c965d9432..4b698972605 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useMorphRelationField.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useMorphRelationField.ts@@ -32,11 +32,11 @@ export const useMorphRelationField = <{ recordId, fieldName },) as [FieldRelationValue<T>, (value: FieldRelationValue<T>) => void];- const draftValue = useAtomComponentStateValue(+ const recordFieldInputDraftValue = useAtomComponentStateValue(recordFieldInputDraftValueComponentState,);- const initialSearchValue = draftValue;+ const initialSearchValue = recordFieldInputDraftValue;return {fieldDefinition,diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useMultiSelectField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useMultiSelectField.tsindex 0f61c72bacf..d1ea51ddc1e 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useMultiSelectField.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useMultiSelectField.ts@@ -34,7 +34,7 @@ export const useMultiSelectField = () => {const { setDraftValue } = useRecordFieldInput<FieldMultiSelectValue>();- const draftValue = useAtomComponentStateValue(+ const recordFieldInputDraftValue = useAtomComponentStateValue(recordFieldInputDraftValueComponentState,);@@ -42,7 +42,7 @@ export const useMultiSelectField = () => {recordId,fieldDefinition,fieldValues: fieldMultiSelectValues,- draftValue,+ draftValue: recordFieldInputDraftValue,setDraftValue,setFieldValue,};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useNumberField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useNumberField.tsindex fc58975ae59..53fb4accb1c 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useNumberField.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useNumberField.ts@@ -26,14 +26,14 @@ export const useNumberField = () => {const { setDraftValue } = useRecordFieldInput<FieldNumberValue>();- const draftValue = useAtomComponentStateValue(+ const recordFieldInputDraftValue = useAtomComponentStateValue(recordFieldInputDraftValueComponentState,);return {fieldDefinition,fieldValue,- draftValue,+ draftValue: recordFieldInputDraftValue,setDraftValue,setFieldValue,};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/usePhonesField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/usePhonesField.tsindex f60880535a7..4594f8d1f30 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/usePhonesField.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/usePhonesField.ts@@ -26,14 +26,14 @@ export const usePhonesField = () => {const { setDraftValue } = useRecordFieldInput<FieldPhonesValue>();- const draftValue = useAtomComponentStateValue(+ const recordFieldInputDraftValue = useAtomComponentStateValue(recordFieldInputDraftValueComponentState,);return {fieldDefinition,fieldValue,- draftValue,+ draftValue: recordFieldInputDraftValue,setDraftValue,setFieldValue,};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRelationField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRelationField.tsindex 9766717f251..c1bc7bb12d2 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRelationField.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRelationField.ts@@ -30,11 +30,11 @@ export const useRelationField = <T extends ObjectRecord | ObjectRecord[]>() => {{ recordId, fieldName },) as [FieldRelationValue<T>, (value: FieldRelationValue<T>) => void];- const draftValue = useAtomComponentStateValue(+ const recordFieldInputDraftValue = useAtomComponentStateValue(recordFieldInputDraftValueComponentState,);- const initialSearchValue = draftValue;+ const initialSearchValue = recordFieldInputDraftValue;return {fieldDefinition,diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useSelectField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useSelectField.tsindex 40047e93ee4..0e9d154805b 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useSelectField.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useSelectField.ts@@ -29,7 +29,7 @@ export const useSelectField = () => {const { setDraftValue } = useRecordFieldInput<FieldSelectValue>();- const draftValue = useAtomComponentStateValue(+ const recordFieldInputDraftValue = useAtomComponentStateValue(recordFieldInputDraftValueComponentState,);@@ -37,7 +37,7 @@ export const useSelectField = () => {recordId,fieldDefinition,fieldValue: fieldSelectValue,- draftValue,+ draftValue: recordFieldInputDraftValue,setDraftValue,setFieldValue,};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useTextField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useTextField.tsindex de086f977bd..f37e0fb039f 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useTextField.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useTextField.ts@@ -27,12 +27,12 @@ export const useTextField = () => {const { setDraftValue } = useRecordFieldInput<FieldTextValue>();- const draftValue = useAtomComponentStateValue(+ const recordFieldInputDraftValue = useAtomComponentStateValue(recordFieldInputDraftValueComponentState,);return {- draftValue,+ draftValue: recordFieldInputDraftValue,setDraftValue,maxWidth,fieldDefinition,diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/EmailsFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/EmailsFieldInput.tsxindex c156dd8ec4e..a193b4bbd67 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/EmailsFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/EmailsFieldInput.tsx@@ -68,12 +68,12 @@ export const EmailsFieldInput = () => {index === 0 && emails.length > 1;const getShowSetAsPrimaryButton = (index: number) => index > 0;- const setIsFieldInError = useSetAtomComponentState(+ const setRecordFieldInputIsFieldInError = useSetAtomComponentState(recordFieldInputIsFieldInErrorComponentState,);const handleError = (hasError: boolean, values: any[]) => {- setIsFieldInError(hasError && values.length === 0);+ setRecordFieldInputIsFieldInError(hasError && values.length === 0);};const handleCopy = (email: string) => {diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldInput.tsxindex 271e7037cc9..39bc8f80979 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldInput.tsx@@ -122,12 +122,12 @@ export const FilesFieldInput = () => {fieldDefinition,]);- const setIsFieldInError = useSetAtomComponentState(+ const setRecordFieldInputIsFieldInError = useSetAtomComponentState(recordFieldInputIsFieldInErrorComponentState,);const handleError = (hasError: boolean, values: FieldFilesValue[]) => {- setIsFieldInError(hasError && values.length === 0);+ setRecordFieldInputIsFieldInError(hasError && values.length === 0);};const handleClickOutside = (diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/LinksFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/LinksFieldInput.tsxindex 593258fe70f..4ff44c5ea6b 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/LinksFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/LinksFieldInput.tsx@@ -57,12 +57,12 @@ export const LinksFieldInput = () => {const getShowPrimaryIcon = (index: number) => index === 0 && links.length > 1;const getShowSetAsPrimaryButton = (index: number) => index > 0;- const setIsFieldInError = useSetAtomComponentState(+ const setRecordFieldInputIsFieldInError = useSetAtomComponentState(recordFieldInputIsFieldInErrorComponentState,);const handleError = (hasError: boolean, values: any[]) => {- setIsFieldInError(hasError && values.length === 0);+ setRecordFieldInputIsFieldInError(hasError && values.length === 0);};const handleClickOutside = (diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MorphRelationManyToOneFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MorphRelationManyToOneFieldInput.tsxindex 40acfe42ad6..2bdab5e8b92 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MorphRelationManyToOneFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MorphRelationManyToOneFieldInput.tsx@@ -63,15 +63,15 @@ export const MorphRelationManyToOneFieldInput = () => {onCancel?.();};- const layoutDirection = useAtomComponentStateValue(+ const recordFieldInputLayoutDirection = useAtomComponentStateValue(recordFieldInputLayoutDirectionComponentState,);- const isLoading = useAtomComponentStateValue(+ const recordFieldInputLayoutDirectionLoading = useAtomComponentStateValue(recordFieldInputLayoutDirectionLoadingComponentState,);- if (isLoading) {+ if (recordFieldInputLayoutDirectionLoading) {return <></>;}@@ -95,7 +95,7 @@ export const MorphRelationManyToOneFieldInput = () => {objectNameSingulars={objectNameSingulars}recordPickerInstanceId={instanceId}layoutDirection={- layoutDirection === 'downward'+ recordFieldInputLayoutDirection === 'downward'? 'search-bar-on-top': 'search-bar-on-bottom'}diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MorphRelationOneToManyFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MorphRelationOneToManyFieldInput.tsxindex 700c33cd540..6934e7647d1 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MorphRelationOneToManyFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MorphRelationOneToManyFieldInput.tsx@@ -23,7 +23,7 @@ export const MorphRelationOneToManyFieldInput = () => {onSubmit?.({ skipPersist: true });};- const layoutDirection = useAtomComponentStateValue(+ const recordFieldInputLayoutDirection = useAtomComponentStateValue(recordFieldInputLayoutDirectionComponentState,);@@ -37,7 +37,7 @@ export const MorphRelationOneToManyFieldInput = () => {}}onClickOutside={handleSubmit}layoutDirection={- layoutDirection === 'downward'+ recordFieldInputLayoutDirection === 'downward'? 'search-bar-on-top': 'search-bar-on-bottom'}diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/PhonesFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/PhonesFieldInput.tsxindex 9bc3ced547f..84008ede030 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/PhonesFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/PhonesFieldInput.tsx@@ -128,12 +128,12 @@ export const PhonesFieldInput = () => {index === 0 && phones.length > 1;const getShowSetAsPrimaryButton = (index: number) => index > 0;- const setIsFieldInError = useSetAtomComponentState(+ const setRecordFieldInputIsFieldInError = useSetAtomComponentState(recordFieldInputIsFieldInErrorComponentState,);const handleError = (hasError: boolean, values: any[]) => {- setIsFieldInError(hasError && values.length === 0);+ setRecordFieldInputIsFieldInError(hasError && values.length === 0);};const handleClickOutside = (diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationManyToOneFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationManyToOneFieldInput.tsxindex ba7228bd4ac..5500d67e89c 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationManyToOneFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationManyToOneFieldInput.tsx@@ -77,11 +77,11 @@ export const RelationManyToOneFieldInput = () => {recordId,});- const layoutDirection = useAtomComponentStateValue(+ const recordFieldInputLayoutDirection = useAtomComponentStateValue(recordFieldInputLayoutDirectionComponentState,);- const isLoading = useAtomComponentStateValue(+ const recordFieldInputLayoutDirectionLoading = useAtomComponentStateValue(recordFieldInputLayoutDirectionLoadingComponentState,instanceId,);@@ -99,7 +99,7 @@ export const RelationManyToOneFieldInput = () => {}};- if (isLoading) {+ if (recordFieldInputLayoutDirectionLoading) {return <></>;}const fieldLabel = fieldDefinition.label;@@ -122,7 +122,7 @@ export const RelationManyToOneFieldInput = () => {]}recordPickerInstanceId={instanceId}layoutDirection={- layoutDirection === 'downward'+ recordFieldInputLayoutDirection === 'downward'? 'search-bar-on-top': 'search-bar-on-bottom'}diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationOneToManyFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationOneToManyFieldInput.tsxindex 34e491aed66..4a30c988488 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationOneToManyFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationOneToManyFieldInput.tsx@@ -158,7 +158,7 @@ export const RelationOneToManyFieldInput = () => {relationFieldDefinition.metadata.relationObjectMetadataNameSingular,});- const layoutDirection = useAtomComponentStateValue(+ const recordFieldInputLayoutDirection = useAtomComponentStateValue(recordFieldInputLayoutDirectionComponentState,);@@ -329,7 +329,7 @@ export const RelationOneToManyFieldInput = () => {objectMetadataItemIdForCreate={objectMetadataItemIdForCreate}onClickOutside={handleSubmit}layoutDirection={- layoutDirection === 'downward'+ recordFieldInputLayoutDirection === 'downward'? 'search-bar-on-top': 'search-bar-on-bottom'}diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsxindex 6797fa00a1b..ce9576bb294 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx@@ -23,11 +23,14 @@ const BooleanFieldValueSetterEffect = ({value: boolean;recordId: string;}) => {- const setField = useSetAtomFamilyState(recordStoreFamilyState, recordId);+ const setRecordStore = useSetAtomFamilyState(+ recordStoreFamilyState,+ recordId,+ );useEffect(() => {- setField({ id: recordId, Boolean: value, __typename: 'Person' });- }, [recordId, setField, value]);+ setRecordStore({ id: recordId, Boolean: value, __typename: 'Person' });+ }, [recordId, setRecordStore, value]);return <></>;};diff --git a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupMenuItemDraggable.tsx b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupMenuItemDraggable.tsxindex 40332d06f3a..047eff4cc7e 100644--- a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupMenuItemDraggable.tsx+++ b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupMenuItemDraggable.tsx@@ -14,7 +14,7 @@ type RecordGroupMenuItemDraggableProps = {recordGroupId: string;showDragGrip?: boolean;isDraggable?: boolean;- onVisibilityChange: (recordGroup: RecordGroupDefinition) => void;+ onVisibilityChange: (recordGroupDefinition: RecordGroupDefinition) => void;isVisibleLimitReached?: boolean;};@@ -25,37 +25,38 @@ export const RecordGroupMenuItemDraggable = ({onVisibilityChange,isVisibleLimitReached = false,}: RecordGroupMenuItemDraggableProps) => {- const recordGroup = useAtomFamilyStateValue(+ const recordGroupDefinition = useAtomFamilyStateValue(recordGroupDefinitionFamilyState,recordGroupId,);- if (!isDefined(recordGroup)) {+ if (!isDefined(recordGroupDefinition)) {return null;}- const isNoValue = recordGroup.type === RecordGroupDefinitionType.NoValue;+ const isNoValue =+ recordGroupDefinition.type === RecordGroupDefinitionType.NoValue;- const getIconButtons = (recordGroup: RecordGroupDefinition) => {- const groupValue = recordGroup.value;+ const getIconButtons = (recordGroupDefinition: RecordGroupDefinition) => {+ const groupValue = recordGroupDefinition.value;- if (!recordGroup.isVisible && isVisibleLimitReached) {+ if (!recordGroupDefinition.isVisible && isVisibleLimitReached) {return undefined;}const iconButtons = [{- Icon: recordGroup.isVisible ? IconEyeOff : IconEye,- ariaLabel: recordGroup.isVisible+ Icon: recordGroupDefinition.isVisible ? IconEyeOff : IconEye,+ ariaLabel: recordGroupDefinition.isVisible? t`Hide group ${groupValue}`: t`Show group ${groupValue}`,- dataTestId: recordGroup.isVisible- ? `hide-group-${recordGroup.value?.toLowerCase().replace(' ', '-') ?? ''}`- : `show-group-${recordGroup.value?.toLowerCase().replace(' ', '-') ?? ''}`,+ dataTestId: recordGroupDefinition.isVisible+ ? `hide-group-${recordGroupDefinition.value?.toLowerCase().replace(' ', '-') ?? ''}`+ : `show-group-${recordGroupDefinition.value?.toLowerCase().replace(' ', '-') ?? ''}`,onClick: () =>onVisibilityChange({- ...recordGroup,- isVisible: !recordGroup.isVisible,+ ...recordGroupDefinition,+ isVisible: !recordGroupDefinition.isVisible,}),},].filter(isDefined);@@ -65,29 +66,29 @@ export const RecordGroupMenuItemDraggable = ({return (<MenuItemDraggable- key={recordGroup.id}+ key={recordGroupDefinition.id}text={<Tagvariant={- recordGroup.type !== RecordGroupDefinitionType.NoValue+ recordGroupDefinition.type !== RecordGroupDefinitionType.NoValue? 'solid': 'outline'}color={- recordGroup.type !== RecordGroupDefinitionType.NoValue- ? recordGroup.color+ recordGroupDefinition.type !== RecordGroupDefinitionType.NoValue+ ? recordGroupDefinition.color: 'transparent'}- text={recordGroup.title}+ text={recordGroupDefinition.title}weight={- recordGroup.type !== RecordGroupDefinitionType.NoValue+ recordGroupDefinition.type !== RecordGroupDefinitionType.NoValue? 'regular': 'medium'}/>}accent={isNoValue || showDragGrip ? 'placeholder' : 'default'}- iconButtons={getIconButtons(recordGroup)}+ iconButtons={getIconButtons(recordGroupDefinition)}gripMode={isNoValue || showDragGrip ? 'always' : 'never'}isDragDisabled={!isDraggable}/>diff --git a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupReorderConfirmationModal.tsx b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupReorderConfirmationModal.tsxindex 04b331e932e..9977208905b 100644--- a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupReorderConfirmationModal.tsx+++ b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupReorderConfirmationModal.tsx@@ -13,7 +13,7 @@ type RecordGroupReorderConfirmationModalProps = {export const RecordGroupReorderConfirmationModal = ({onConfirmClick,}: RecordGroupReorderConfirmationModalProps): ReactNode => {- const recordGroupSort = useAtomComponentStateValue(+ const recordIndexRecordGroupSort = useAtomComponentStateValue(recordIndexRecordGroupSortComponentState,);@@ -23,7 +23,7 @@ export const RecordGroupReorderConfirmationModal = ({<ConfirmationModalmodalId={RECORD_GROUP_REORDER_CONFIRMATION_MODAL_ID}title={t`Group sorting`}- subtitle={t`Would you like to remove ${recordGroupSort} group sorting?`}+ subtitle={t`Would you like to remove ${recordIndexRecordGroupSort} group sorting?`}onConfirmClick={onConfirmClick}confirmButtonText={t`Remove`}/>,diff --git a/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupFilter.ts b/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupFilter.tsindex 6bfc93487be..fb4358a4b8e 100644--- a/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupFilter.ts+++ b/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupFilter.ts@@ -7,19 +7,20 @@ import { isDefined } from 'twenty-shared/utils';export const useRecordGroupFilter = (fields: FieldMetadataItem[]) => {const currentRecordGroupDefinition = useCurrentRecordGroupDefinition();- const groupFieldMetadata = useAtomComponentStateValue(+ const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(recordIndexGroupFieldMetadataItemComponentState,);const recordGroupFilter = useMemo(() => {if (isDefined(currentRecordGroupDefinition)) {const fieldMetadataItem = fields.find(- (fieldMetadataItem) => fieldMetadataItem.id === groupFieldMetadata?.id,+ (fieldMetadataItem) =>+ fieldMetadataItem.id === recordIndexGroupFieldMetadataItem?.id,);if (!fieldMetadataItem) {throw new Error(- `Field metadata item with id ${groupFieldMetadata?.id} not found`,+ `Field metadata item with id ${recordIndexGroupFieldMetadataItem?.id} not found`,);}@@ -35,7 +36,11 @@ export const useRecordGroupFilter = (fields: FieldMetadataItem[]) => {}return {};- }, [currentRecordGroupDefinition, fields, groupFieldMetadata?.id]);+ }, [+ currentRecordGroupDefinition,+ fields,+ recordIndexGroupFieldMetadataItem?.id,+ ]);return { recordGroupFilter };};diff --git a/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupReorderConfirmationModal.ts b/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupReorderConfirmationModal.tsindex a5feb2eca32..b5ee2eca709 100644--- a/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupReorderConfirmationModal.ts+++ b/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupReorderConfirmationModal.ts@@ -52,7 +52,7 @@ export const useRecordGroupReorderConfirmationModal = ({recordIndexId,);- const [, setRecordGroupSort] = useAtomComponentState(+ const [, setRecordIndexRecordGroupSort] = useAtomComponentState(recordIndexRecordGroupSortComponentState,);const { closeAnyOpenDropdown } = useCloseAnyOpenDropdown();@@ -73,7 +73,7 @@ export const useRecordGroupReorderConfirmationModal = ({throw new Error('pendingDragEndReorder is not set');}- setRecordGroupSort(RecordGroupSort.Manual);+ setRecordIndexRecordGroupSort(RecordGroupSort.Manual);setPendingDragEndHandlerParams(null);handleDragEnd(...pendingDragEndHandlerParams);goBackToPreviousDropdownFocusId();diff --git a/packages/twenty-front/src/modules/object-record/record-group/hooks/useReorderRecordGroups.ts b/packages/twenty-front/src/modules/object-record/record-group/hooks/useReorderRecordGroups.tsindex 84b03116ae9..a061f6b9261 100644--- a/packages/twenty-front/src/modules/object-record/record-group/hooks/useReorderRecordGroups.ts+++ b/packages/twenty-front/src/modules/object-record/record-group/hooks/useReorderRecordGroups.ts@@ -42,7 +42,7 @@ export const useReorderRecordGroups = ({const { saveViewGroups } = useSaveCurrentViewGroups();- const groupFieldMetadata = useAtomComponentStateValue(+ const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(recordIndexGroupFieldMetadataItemComponentState,);@@ -86,12 +86,12 @@ export const useReorderRecordGroups = ({];}, []);- if (!isDefined(groupFieldMetadata?.id)) {+ if (!isDefined(recordIndexGroupFieldMetadataItem?.id)) {throw new Error('mainGroupByFieldMetadataId is required');}setRecordGroups({- mainGroupByFieldMetadataId: groupFieldMetadata?.id,+ mainGroupByFieldMetadataId: recordIndexGroupFieldMetadataItem?.id,recordGroups: updatedRecordGroups,recordIndexId,objectMetadataItemId: objectMetadataItem.id,@@ -102,7 +102,7 @@ export const useReorderRecordGroups = ({},[objectMetadataItem.id,- groupFieldMetadata?.id,+ recordIndexGroupFieldMetadataItem?.id,recordIndexId,saveViewGroups,setRecordGroups,diff --git a/packages/twenty-front/src/modules/object-record/record-group/hooks/useShouldHideRecordGroup.ts b/packages/twenty-front/src/modules/object-record/record-group/hooks/useShouldHideRecordGroup.tsindex 5b42c6c1cec..3db359e3de5 100644--- a/packages/twenty-front/src/modules/object-record/record-group/hooks/useShouldHideRecordGroup.ts+++ b/packages/twenty-front/src/modules/object-record/record-group/hooks/useShouldHideRecordGroup.ts@@ -4,14 +4,14 @@ import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooimport { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';export const useShouldHideRecordGroup = (recordGroupId: string): boolean => {- const shouldHideEmptyRecordGroups = useAtomComponentStateValue(+ const recordIndexShouldHideEmptyRecordGroups = useAtomComponentStateValue(recordIndexShouldHideEmptyRecordGroupsComponentState,);- const isRecordGroupEmpty = useAtomComponentFamilyStateValue(+ const emptyRecordGroupById = useAtomComponentFamilyStateValue(emptyRecordGroupByIdComponentFamilyState,recordGroupId,);- return shouldHideEmptyRecordGroups && isRecordGroupEmpty;+ return recordIndexShouldHideEmptyRecordGroups && emptyRecordGroupById;};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 de991479736..6b98b4c192e 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@@ -27,12 +27,12 @@ export const RecordIndexFiltersToContextStoreEffect = () => {const store = useStore();- const recordIndexFilters = useAtomComponentStateValue(+ const currentRecordFilters = useAtomComponentStateValue(currentRecordFiltersComponentState,recordIndexId,);- const recordIndexFilterGroups = useAtomComponentStateValue(+ const currentRecordFilterGroups = useAtomComponentStateValue(currentRecordFilterGroupsComponentState,recordIndexId,);@@ -173,8 +173,8 @@ export const RecordIndexFiltersToContextStoreEffect = () => {useEffect(() => {store.set(syncWriteAtom, {- filters: recordIndexFilters,- filterGroups: recordIndexFilterGroups,+ filters: currentRecordFilters,+ filterGroups: currentRecordFilterGroups,anyFieldFilterValue,});@@ -182,8 +182,8 @@ export const RecordIndexFiltersToContextStoreEffect = () => {store.set(resetWriteAtom);};}, [- recordIndexFilters,- recordIndexFilterGroups,+ currentRecordFilters,+ currentRecordFilterGroups,anyFieldFilterValue,store,syncWriteAtom,diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainer.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainer.tsxindex 00ad5d8449e..c272c9eccbc 100644--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainer.tsx+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainer.tsx@@ -17,7 +17,7 @@ export const RecordIndexTableContainer = ({const { objectNameSingular, viewBarInstanceId } =useRecordIndexContextOrThrow();- const isRecordIndexRemoveSortingModalOpened = useAtomComponentStateValue(+ const isModalOpened = useAtomComponentStateValue(isModalOpenedComponentState,RECORD_INDEX_REMOVE_SORTING_MODAL_ID,);@@ -40,9 +40,7 @@ export const RecordIndexTableContainer = ({viewBarId={viewBarInstanceId}updateRecordMutation={updateEntity}/>- {isRecordIndexRemoveSortingModalOpened && (- <RecordIndexRemoveSortingModal />- )}+ {isModalOpened && <RecordIndexRemoveSortingModal />}</>);};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 6dd8189f584..1ea16f16adb 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@@ -59,13 +59,14 @@ export const useRecordIndexLazyFetchRecords = ({viewBarId: recordIndexId,});- const recordGroupFieldMetadata = useAtomComponentStateValue(+ const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(recordIndexGroupFieldMetadataItemComponentState,recordIndexId,);const hiddenKanbanFieldColumn = hiddenBoardFields.find(- (column) => column.metadata.fieldName === recordGroupFieldMetadata?.name,+ (column) =>+ column.metadata.fieldName === recordIndexGroupFieldMetadataItem?.name,);const contextStoreTargetedRecordsRule = useAtomComponentStateValue(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 2d6b3692635..a13f1ef9817 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@@ -9,7 +9,7 @@ export const useHandleIndexIdentifierClick = ({}: {objectMetadataItem: ObjectMetadataItem;}) => {- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);@@ -21,7 +21,7 @@ export const useHandleIndexIdentifierClick = ({objectRecordId: recordId,},{- viewId: currentViewId,+ viewId: contextStoreCurrentViewId,},);};diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexGroupCommonQueryVariables.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexGroupCommonQueryVariables.tsindex 11cab8d143a..351cd15929c 100644--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexGroupCommonQueryVariables.ts+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexGroupCommonQueryVariables.ts@@ -59,13 +59,13 @@ export const useRecordIndexGroupCommonQueryVariables = () => {objectMetadataItems,);- const recordGroupFieldMetadata = useAtomComponentStateValue(+ const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(recordIndexGroupFieldMetadataItemComponentState,);const recordGqlFields = useRecordsFieldVisibleGqlFields({objectMetadataItem,- additionalFieldMetadataId: recordGroupFieldMetadata?.id,+ additionalFieldMetadataId: recordIndexGroupFieldMetadataItem?.id,});const recordGroupDefinitions = useAtomComponentSelectorValue(@@ -81,7 +81,7 @@ export const useRecordIndexGroupCommonQueryVariables = () => {);const recordGroupOptionsFilter = computeRecordGroupOptionsFilter({- recordGroupFieldMetadata,+ recordGroupFieldMetadata: recordIndexGroupFieldMetadataItem,recordGroupValues,});diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditMode.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditMode.tsxindex 483c59949d3..eb960474f01 100644--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditMode.tsx+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditMode.tsx@@ -42,12 +42,12 @@ export const RecordInlineCellEditMode = ({RecordFieldComponentInstanceContext,);- const setFieldInputLayoutDirection = useSetAtomComponentState(+ const setRecordFieldInputLayoutDirection = useSetAtomComponentState(recordFieldInputLayoutDirectionComponentState,recordFieldComponentInstanceId,);- const setFieldInputLayoutDirectionLoading = useSetAtomComponentState(+ const setRecordFieldInputLayoutDirectionLoading = useSetAtomComponentState(recordFieldInputLayoutDirectionLoadingComponentState,recordFieldComponentInstanceId,);@@ -55,15 +55,15 @@ export const RecordInlineCellEditMode = ({const setFieldInputLayoutDirectionMiddleware = {name: 'middleware',fn: async (state: MiddlewareState) => {- setFieldInputLayoutDirection(+ setRecordFieldInputLayoutDirection(state.placement.startsWith('bottom') ? 'downward' : 'upward',);- setFieldInputLayoutDirectionLoading(false);+ setRecordFieldInputLayoutDirectionLoading(false);return {};},};- const isFieldInError = useAtomComponentStateValue(+ const recordFieldInputIsFieldInError = useAtomComponentStateValue(recordFieldInputIsFieldInErrorComponentState,);@@ -98,7 +98,7 @@ export const RecordInlineCellEditMode = ({ref={refs.setFloating}style={floatingStyles}borderRadius="sm"- hasDangerBorder={isFieldInError}+ hasDangerBorder={recordFieldInputIsFieldInError}>{children}</OverlayContainer>,diff --git a/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsActions.ts b/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsActions.tsindex fd78f0c38bf..056d1e6fe38 100644--- a/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsActions.ts+++ b/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsActions.ts@@ -26,7 +26,7 @@ export const useMergeRecordsActions = ({objectNameSingular,});- const setMergeInProgress = useSetAtomState(isMergeInProgressState);+ const setIsMergeInProgress = useSetAtomState(isMergeInProgressState);const { t } = useLingui();const { enqueueSuccessSnackBar, enqueueErrorSnackBar } = useSnackBar();@@ -34,7 +34,7 @@ export const useMergeRecordsActions = ({const navigate = useNavigateApp();const handleMergeRecords = async () => {- setMergeInProgress(true);+ setIsMergeInProgress(true);try {const mergedRecord = await mergeManyRecords({recordIds: selectedRecords.map((record) => record.id),@@ -65,7 +65,7 @@ export const useMergeRecordsActions = ({: t`Failed to merge records. Please try again.`,});} finally {- setMergeInProgress(false);+ setIsMergeInProgress(false);}};diff --git a/packages/twenty-front/src/modules/object-record/record-picker/hooks/useRecordPickerGetSearchRecordAndObjectMetadataItemFromRecordId.ts b/packages/twenty-front/src/modules/object-record/record-picker/hooks/useRecordPickerGetSearchRecordAndObjectMetadataItemFromRecordId.tsindex 45c60985914..c4cd6d52041 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/hooks/useRecordPickerGetSearchRecordAndObjectMetadataItemFromRecordId.ts+++ b/packages/twenty-front/src/modules/object-record/record-picker/hooks/useRecordPickerGetSearchRecordAndObjectMetadataItemFromRecordId.ts@@ -20,12 +20,12 @@ export const useRecordPickerGetSearchRecordAndObjectMetadataItemFromRecordId =recordId,);- const searchRecord = useAtomFamilyStateValue(+ const searchRecordStore = useAtomFamilyStateValue(searchRecordStoreFamilyState,recordId,);- if (!isDefined(pickableMorphItem) || !isDefined(searchRecord)) {+ if (!isDefined(pickableMorphItem) || !isDefined(searchRecordStore)) {return { searchRecord: null, objectMetadataItem: null };}@@ -38,5 +38,5 @@ export const useRecordPickerGetSearchRecordAndObjectMetadataItemFromRecordId =return { searchRecord: null, objectMetadataItem: null };}- return { searchRecord, objectMetadataItem };+ return { searchRecord: searchRecordStore, objectMetadataItem };};diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerFetchMoreLoader.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerFetchMoreLoader.tsxindex efd9c8b1006..ef602b99f92 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerFetchMoreLoader.tsx+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerFetchMoreLoader.tsx@@ -49,12 +49,12 @@ export const MultipleRecordPickerFetchMoreLoader = () => {componentInstanceId,);- const isLoading = useAtomComponentStateValue(+ const multipleRecordPickerIsLoading = useAtomComponentStateValue(multipleRecordPickerIsLoadingComponentState,componentInstanceId,);- const searchFilter = useAtomComponentStateValue(+ const multipleRecordPickerSearchFilter = useAtomComponentStateValue(multipleRecordPickerSearchFilterComponentState,componentInstanceId,);@@ -77,16 +77,22 @@ export const MultipleRecordPickerFetchMoreLoader = () => {}),);- if (isLoading || !currentPaginationState.hasNextPage) {+ if (multipleRecordPickerIsLoading || !currentPaginationState.hasNextPage) {return;}await performSearch({multipleRecordPickerInstanceId: componentInstanceId,- forceSearchFilter: searchFilter,+ forceSearchFilter: multipleRecordPickerSearchFilter,loadMore: true,});- }, [componentInstanceId, performSearch, searchFilter, isLoading, store]);+ }, [+ componentInstanceId,+ performSearch,+ multipleRecordPickerSearchFilter,+ multipleRecordPickerIsLoading,+ store,+ ]);const { ref } = useInView({onChange: useCallback(@@ -107,7 +113,7 @@ export const MultipleRecordPickerFetchMoreLoader = () => {!paginationState.hasNextPage ||multipleRecordPickerShouldShowInitialLoading ||multipleRecordPickerShouldShowSkeleton ||- (isLoading && !multipleRecordPickerIsFetchingMore)+ (multipleRecordPickerIsLoading && !multipleRecordPickerIsFetchingMore)) {return null;}diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerLoadingEffect.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerLoadingEffect.tsxindex 74278b56def..ea30656ba61 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerLoadingEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerLoadingEffect.tsx@@ -10,11 +10,11 @@ import { useDebouncedCallback } from 'use-debounce';export const MultipleRecordPickerLoadingEffect = () => {const [previousLoading, setPreviousLoading] = useState(false);- const loading = useAtomComponentStateValue(+ const multipleRecordPickerIsLoading = useAtomComponentStateValue(multipleRecordPickerIsLoadingComponentState,);- const setMultipleRecordPickerShowSkeleton = useSetAtomComponentState(+ const setMultipleRecordPickerShouldShowSkeleton = useSetAtomComponentState(multipleRecordPickerShouldShowSkeletonComponentState,);@@ -23,27 +23,27 @@ export const MultipleRecordPickerLoadingEffect = () => {);const debouncedShowPickerSearchSkeleton = useDebouncedCallback(- () => setMultipleRecordPickerShowSkeleton(true),+ () => setMultipleRecordPickerShouldShowSkeleton(true),350,);useEffect(() => {- if (previousLoading !== loading) {- setPreviousLoading(loading);+ if (previousLoading !== multipleRecordPickerIsLoading) {+ setPreviousLoading(multipleRecordPickerIsLoading);- if (loading) {+ if (multipleRecordPickerIsLoading) {if (!multipleRecordPickerIsFetchingMore) {debouncedShowPickerSearchSkeleton();}} else {debouncedShowPickerSearchSkeleton.cancel();- setMultipleRecordPickerShowSkeleton(false);+ setMultipleRecordPickerShouldShowSkeleton(false);}}}, [- loading,+ multipleRecordPickerIsLoading,previousLoading,- setMultipleRecordPickerShowSkeleton,+ setMultipleRecordPickerShouldShowSkeleton,multipleRecordPickerIsFetchingMore,debouncedShowPickerSearchSkeleton,]);diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsxindex fd02609461e..4655fbbdea3 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx@@ -43,7 +43,7 @@ export const MultipleRecordPickerMenuItemContent = ({const selectableListComponentInstanceId =getMultipleRecordPickerSelectableListId(componentInstanceId);- const isSelectedByKeyboard = useAtomComponentFamilyStateValue(+ const isSelectedItemId = useAtomComponentFamilyStateValue(isSelectedItemIdComponentFamilyState,searchRecord.recordId,selectableListComponentInstanceId,@@ -68,12 +68,14 @@ export const MultipleRecordPickerMenuItemContent = ({const displayText =searchRecord.label?.trim() || t`Untitled ${labelSingular}`;- const searchableObjectMetadataItems = useAtomComponentStateValue(- multipleRecordPickerSearchableObjectMetadataItemsComponentState,- componentInstanceId,- );+ const multipleRecordPickerSearchableObjectMetadataItems =+ useAtomComponentStateValue(+ multipleRecordPickerSearchableObjectMetadataItemsComponentState,+ componentInstanceId,+ );- const showObjectName = searchableObjectMetadataItems.length > 1;+ const showObjectName =+ multipleRecordPickerSearchableObjectMetadataItems.length > 1;return (<StyledSelectableItem@@ -83,7 +85,7 @@ export const MultipleRecordPickerMenuItemContent = ({><MenuItemMultiSelectAvataronSelectChange={(isSelected) => handleSelectChange(isSelected)}- isKeySelected={isSelectedByKeyboard}+ isKeySelected={isSelectedItemId}selected={isRecordSelectedWithObjectItem}avatar={<Avatardiff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerSearchInput.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerSearchInput.tsxindex f2594501c23..6885ee7f5a2 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerSearchInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerSearchInput.tsx@@ -14,8 +14,10 @@ export const MultipleRecordPickerSearchInput = () => {MultipleRecordPickerComponentInstanceContext,);- const [recordPickerSearchFilter, setRecordPickerSearchFilter] =- useAtomComponentState(multipleRecordPickerSearchFilterComponentState);+ const [+ multipleRecordPickerSearchFilter,+ setMultipleRecordPickerSearchFilter,+ ] = useAtomComponentState(multipleRecordPickerSearchFilterComponentState);const { performSearch } = useMultipleRecordPickerPerformSearch();@@ -43,13 +45,13 @@ export const MultipleRecordPickerSearchInput = () => {const handleFilterChange = (event: React.ChangeEvent<HTMLInputElement>) => {const newSearchFilter = event.currentTarget.value;- setRecordPickerSearchFilter(newSearchFilter);+ setMultipleRecordPickerSearchFilter(newSearchFilter);debouncedSearch(newSearchFilter);};return (<DropdownMenuSearchInput- value={recordPickerSearchFilter}+ value={multipleRecordPickerSearchFilter}onChange={handleFilterChange}autoFocus/>diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPicker.tsx b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPicker.tsxindex fec6c91b225..00056e0a6a8 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPicker.tsx+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPicker.tsx@@ -33,13 +33,13 @@ export const SingleRecordPicker = ({}: SingleRecordPickerProps) => {const containerRef = useRef<HTMLDivElement>(null);- const setRecordPickerSearchFilter = useSetAtomComponentState(+ const setSingleRecordPickerSearchFilter = useSetAtomComponentState(singleRecordPickerSearchFilterComponentState,componentInstanceId,);const handleCancel = () => {- setRecordPickerSearchFilter('');+ setSingleRecordPickerSearchFilter('');onCancel?.();};@@ -47,7 +47,7 @@ export const SingleRecordPicker = ({const handleMorphItemSelected = (selectedMorphItem?: RecordPickerPickableMorphItem | undefined,) => {- setRecordPickerSearchFilter('');+ setSingleRecordPickerSearchFilter('');onMorphItemSelected?.(selectedMorphItem);};diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItem.tsx b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItem.tsxindex 5c90cbb3fdc..73b6f29d8a3 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItem.tsx+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItem.tsx@@ -39,27 +39,29 @@ export const SingleRecordPickerMenuItem = ({const selectableListComponentInstanceId =getSingleRecordPickerSelectableListId(recordPickerComponentInstanceId);- const isSelectedByKeyboard = useAtomComponentFamilyStateValue(+ const isSelectedItemId = useAtomComponentFamilyStateValue(isSelectedItemIdComponentFamilyState,morphItem.recordId,selectableListComponentInstanceId,);- const searchRecord = useAtomFamilyStateValue(+ const searchRecordStore = useAtomFamilyStateValue(searchRecordStoreFamilyState,morphItem.recordId,);- const searchableObjectMetadataItems = useAtomComponentStateValue(- singleRecordPickerSearchableObjectMetadataItemsComponentState,- recordPickerComponentInstanceId,- );+ const singleRecordPickerSearchableObjectMetadataItems =+ useAtomComponentStateValue(+ singleRecordPickerSearchableObjectMetadataItemsComponentState,+ recordPickerComponentInstanceId,+ );- if (!isDefined(searchRecord)) {+ if (!isDefined(searchRecordStore)) {return null;}- const showObjectName = searchableObjectMetadataItems.length > 1;+ const showObjectName =+ singleRecordPickerSearchableObjectMetadataItems.length > 1;return (<StyledSelectableItem@@ -72,21 +74,23 @@ export const SingleRecordPickerMenuItem = ({<MenuItemSelectAvatartestId="menu-item"onClick={() => onMorphItemSelected(morphItem)}- text={searchRecord.label}+ text={searchRecordStore.label}selected={isRecordSelected}- focused={isSelectedByKeyboard}+ focused={isSelectedItemId}avatar={<Avatar- avatarUrl={searchRecord.imageUrl}+ avatarUrl={searchRecordStore.imageUrl}placeholderColorSeed={morphItem.recordId}- placeholder={searchRecord.label}+ placeholder={searchRecordStore.label}size="md"- type={getAvatarType(searchRecord.objectNameSingular) ?? 'rounded'}+ type={+ getAvatarType(searchRecordStore.objectNameSingular) ?? 'rounded'+ }/>}contextualText={showObjectName- ? capitalize(searchRecord.objectLabelSingular)+ ? capitalize(searchRecordStore.objectLabelSingular): undefined}/>diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItems.tsx b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItems.tsxindex e7426bb52a5..be2aa60bdaa 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItems.tsx+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItems.tsx@@ -53,7 +53,7 @@ export const SingleRecordPickerMenuItems = ({selectableListComponentInstanceId,);- const isSelectedSelectNoneButton = useAtomComponentFamilyStateValue(+ const isSelectedItemId = useAtomComponentFamilyStateValue(isSelectedItemIdComponentFamilyState,selectableListComponentInstanceId,'select-none',@@ -72,9 +72,8 @@ export const SingleRecordPickerMenuItems = ({const selectableItemIds = pickableMorphItems.map((morphItem) => morphItem.recordId,);- const [selectedRecordId, setSelectedRecordId] = useAtomComponentState(- singleRecordPickerSelectedIdComponentState,- );+ const [singleRecordPickerSelectedId, setSingleRecordPickerSelectedId] =+ useAtomComponentState(singleRecordPickerSelectedIdComponentState);const singleRecordPickerShouldShowSkeleton = useAtomComponentStateValue(singleRecordPickerShouldShowSkeletonComponentState,@@ -101,19 +100,19 @@ export const SingleRecordPickerMenuItems = ({key="select-none"itemId="select-none"onEnter={() => {- setSelectedRecordId(undefined);+ setSingleRecordPickerSelectedId(undefined);onMorphItemSelected();}}><MenuItemSelectonClick={() => {- setSelectedRecordId(undefined);+ setSingleRecordPickerSelectedId(undefined);onMorphItemSelected();}}LeftIcon={EmptyIcon}text={emptyLabel}- selected={isUndefined(selectedRecordId)}- focused={isSelectedSelectNoneButton}+ selected={isUndefined(singleRecordPickerSelectedId)}+ focused={isSelectedItemId}/></SelectableListItem>)}@@ -127,7 +126,9 @@ export const SingleRecordPickerMenuItems = ({key={morphItem.recordId}morphItem={morphItem}onMorphItemSelected={onMorphItemSelected}- isRecordSelected={selectedRecordId === morphItem.recordId}+ isRecordSelected={+ singleRecordPickerSelectedId === morphItem.recordId+ }/>)))}diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItemsWithSearch.tsx b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItemsWithSearch.tsxindex ec626f7d303..0a1acc3b573 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItemsWithSearch.tsx+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItemsWithSearch.tsx@@ -49,7 +49,7 @@ export const SingleRecordPickerMenuItemsWithSearch = ({SingleRecordPickerComponentInstanceContext,);- const recordPickerSearchFilter = useAtomComponentStateValue(+ const singleRecordPickerSearchFilter = useAtomComponentStateValue(singleRecordPickerSearchFilterComponentState,recordPickerInstanceId,);@@ -75,7 +75,7 @@ export const SingleRecordPickerMenuItemsWithSearch = ({);const handleCreateNew = () => {- onCreate?.(recordPickerSearchFilter);+ onCreate?.(singleRecordPickerSearchFilter);};return (diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/__tests__/useSingleRecordPickerRecords.test.tsx b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/__tests__/useSingleRecordPickerRecords.test.tsxindex b2e27683d28..769a95a1ab6 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/__tests__/useSingleRecordPickerRecords.test.tsx+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/__tests__/useSingleRecordPickerRecords.test.tsx@@ -18,11 +18,11 @@ describe('useSingleRecordPickerRecords', () => {const { result } = renderHook(() => {const recordSelectSearchHook = useSingleRecordPickerSearch(instanceId);- const internallyStoredFilter = useAtomComponentStateValue(+ const singleRecordPickerSearchFilter = useAtomComponentStateValue(singleRecordPickerSearchFilterComponentState,instanceId,);- return { recordSelectSearchHook, internallyStoredFilter };+ return { recordSelectSearchHook, singleRecordPickerSearchFilter };},{wrapper: Wrapper,@@ -37,6 +37,6 @@ describe('useSingleRecordPickerRecords', () => {} as ChangeEvent<HTMLInputElement>);});- expect(result.current.internallyStoredFilter).toBe(filter);+ expect(result.current.singleRecordPickerSearchFilter).toBe(filter);});});diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerRecords.ts b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerRecords.tsindex c5df06e6e48..84aa619efae 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerRecords.ts+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerRecords.ts@@ -10,16 +10,18 @@ export const useSingleRecordPickerRecords = ({objectNameSingulars: string[];excludedRecordIds?: string[];}) => {- const recordPickerSearchFilter = useAtomComponentStateValue(+ const singleRecordPickerSearchFilter = useAtomComponentStateValue(singleRecordPickerSearchFilterComponentState,);- const selectedRecordId = useAtomComponentStateValue(+ const singleRecordPickerSelectedId = useAtomComponentStateValue(singleRecordPickerSelectedIdComponentState,);const { pickableMorphItems, loading } = useSingleRecordPickerPerformSearch({- searchFilter: recordPickerSearchFilter,- selectedIds: selectedRecordId ? [selectedRecordId] : [],+ searchFilter: singleRecordPickerSearchFilter,+ selectedIds: singleRecordPickerSelectedId+ ? [singleRecordPickerSelectedId]+ : [],excludedRecordIds: excludedRecordIds,objectNameSingulars,});diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerSearch.ts b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerSearch.tsindex 90aed183dba..608ae23d88f 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerSearch.ts+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerSearch.ts@@ -14,18 +14,18 @@ export const useSingleRecordPickerSearch = (recordPickerComponentInstanceIdFromProps,);- const setRecordPickerSearchFilter = useSetAtomComponentState(+ const setSingleRecordPickerSearchFilter = useSetAtomComponentState(singleRecordPickerSearchFilterComponentState,recordPickerComponentInstanceId,);- const setRecordPickerSelectedId = useSetAtomComponentState(+ const setSingleRecordPickerSelectedId = useSetAtomComponentState(singleRecordPickerSelectedIdComponentState,recordPickerComponentInstanceId,);const debouncedSetSearchFilter = useDebouncedCallback(- setRecordPickerSearchFilter,+ setSingleRecordPickerSearchFilter,100,{leading: true,@@ -34,7 +34,7 @@ export const useSingleRecordPickerSearch = (const resetSearchFilter = () => {debouncedSetSearchFilter('');- setRecordPickerSelectedId(undefined);+ setSingleRecordPickerSelectedId(undefined);};const handleSearchFilterChange = (diff --git a/packages/twenty-front/src/modules/object-record/record-store/hooks/__tests__/useUpsertRecordsInStore.test.tsx b/packages/twenty-front/src/modules/object-record/record-store/hooks/__tests__/useUpsertRecordsInStore.test.tsxindex 97acb66ea78..f05a1752b6c 100644--- a/packages/twenty-front/src/modules/object-record/record-store/hooks/__tests__/useUpsertRecordsInStore.test.tsx+++ b/packages/twenty-front/src/modules/object-record/record-store/hooks/__tests__/useUpsertRecordsInStore.test.tsx@@ -12,23 +12,23 @@ const Wrapper = ({ children }: { children: ReactNode }) => ();describe('useUpsertRecordsInStore', () => {- it('should insert a new record when no current record exists', () => {+ it('should insert a new recordStore when no current recordStore exists', () => {const recordId = 'test-record-1';const { result } = renderHook(() => {- const record = useAtomFamilyStateValue(+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState,recordId,);const { upsertRecordsInStore } = useUpsertRecordsInStore();- return { record, upsertRecordsInStore };+ return { recordStore, upsertRecordsInStore };},{ wrapper: Wrapper },);- expect(result.current.record).toBeNull();+ expect(result.current.recordStore).toBeNull();act(() => {result.current.upsertRecordsInStore({@@ -43,7 +43,7 @@ describe('useUpsertRecordsInStore', () => {});});- expect(result.current.record).toEqual({+ expect(result.current.recordStore).toEqual({id: recordId,__typename: 'Person',name: 'John Doe',@@ -51,18 +51,18 @@ describe('useUpsertRecordsInStore', () => {});});- it('should merge filtered partial record with existing record', () => {+ it('should merge filtered partial recordStore with existing recordStore', () => {const recordId = 'test-record-2';const { result } = renderHook(() => {- const record = useAtomFamilyStateValue(+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState,recordId,);const { upsertRecordsInStore } = useUpsertRecordsInStore();- return { record, upsertRecordsInStore };+ return { recordStore, upsertRecordsInStore };},{ wrapper: Wrapper },);@@ -80,7 +80,7 @@ describe('useUpsertRecordsInStore', () => {});});- expect(result.current.record).toEqual({+ expect(result.current.recordStore).toEqual({id: recordId,__typename: 'Person',name: 'John Doe',@@ -104,7 +104,7 @@ describe('useUpsertRecordsInStore', () => {});});- expect(result.current.record).toEqual({+ expect(result.current.recordStore).toEqual({id: recordId,__typename: 'Person',name: 'Jane Doe',@@ -117,13 +117,13 @@ describe('useUpsertRecordsInStore', () => {const { result } = renderHook(() => {- const record = useAtomFamilyStateValue(+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState,recordId,);const { upsertRecordsInStore } = useUpsertRecordsInStore();- return { record, upsertRecordsInStore };+ return { recordStore, upsertRecordsInStore };},{ wrapper: Wrapper },);@@ -141,7 +141,7 @@ describe('useUpsertRecordsInStore', () => {});});- const recordAfterFirstUpsert = result.current.record;+ const recordAfterFirstUpsert = result.current.recordStore;act(() => {result.current.upsertRecordsInStore({@@ -160,6 +160,6 @@ describe('useUpsertRecordsInStore', () => {});});- expect(result.current.record).toBe(recordAfterFirstUpsert);+ expect(result.current.recordStore).toBe(recordAfterFirstUpsert);});});diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableColumnWidthEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableColumnWidthEffect.tsxindex 98e30682d06..390101294aa 100644--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableColumnWidthEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableColumnWidthEffect.tsx@@ -21,7 +21,7 @@ import { useEffect } from 'react';import { isDefined } from 'twenty-shared/utils';export const RecordTableColumnWidthEffect = () => {- const [resizedFieldMetadataItemId] = useAtomComponentState(+ const [resizedFieldMetadataId] = useAtomComponentState(resizedFieldMetadataIdComponentState,);@@ -36,7 +36,7 @@ export const RecordTableColumnWidthEffect = () => {);useEffect(() => {- if (isDefined(resizedFieldMetadataItemId)) {+ if (isDefined(resizedFieldMetadataId)) {return;}@@ -98,7 +98,7 @@ export const RecordTableColumnWidthEffect = () => {);}}, [- resizedFieldMetadataItemId,+ resizedFieldMetadataId,visibleRecordFields,recordTableWidth,shouldCompactRecordTableFirstColumn,diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsxindex d0a2ef15863..495d3e0a7dd 100644--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx@@ -22,7 +22,7 @@ export const RecordTableRecordGroupRows = () => {recordIndexAllRecordIdsComponentSelector,);- const recordIdsByGroup = useAtomComponentFamilyStateValue(+ const recordIndexRecordIdsByGroup = useAtomComponentFamilyStateValue(recordIndexRecordIdsByGroupComponentFamilyState,currentRecordGroupId,);@@ -47,7 +47,7 @@ export const RecordTableRecordGroupRows = () => {return (<>- {recordIdsByGroup.map((recordId, rowIndexInGroup) => {+ {recordIndexRecordIdsByGroup.map((recordId, rowIndexInGroup) => {const rowIndex = rowIndexMap.get(recordId);if (!isDefined(rowIndex)) {diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableScrollToFocusedCellEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableScrollToFocusedCellEffect.tsxindex b0d05bc9375..4040db18920 100644--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableScrollToFocusedCellEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableScrollToFocusedCellEffect.tsx@@ -14,7 +14,7 @@ export const RecordTableScrollToFocusedCellEffect = () => {recordTableId,);- const focusPosition = useAtomComponentStateValue(+ const recordTableFocusPosition = useAtomComponentStateValue(recordTableFocusPositionComponentState,recordTableId,);@@ -25,19 +25,19 @@ export const RecordTableScrollToFocusedCellEffect = () => {return;}- if (!focusPosition) {+ if (!recordTableFocusPosition) {return;}const focusElement = document.getElementById(- `record-table-cell-${focusPosition.column}-${focusPosition.row}`,+ `record-table-cell-${recordTableFocusPosition.column}-${recordTableFocusPosition.row}`,);if (!focusElement) {return;}- const isSecondColumn = focusPosition.column === 1;+ const isSecondColumn = recordTableFocusPosition.column === 1;if (isSecondColumn) {const checkBoxColumnCell = document.getElementById(@@ -63,7 +63,7 @@ export const RecordTableScrollToFocusedCellEffect = () => {focusElement.style.scrollMarginBottom = '';}};- }, [focusPosition, isRecordTableCellFocusActive]);+ }, [recordTableFocusPosition, isRecordTableCellFocusActive]);return null;};diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableScrollToFocusedRowEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableScrollToFocusedRowEffect.tsxindex 023117ceedd..58bbbc9b08c 100644--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableScrollToFocusedRowEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableScrollToFocusedRowEffect.tsx@@ -11,12 +11,12 @@ import { isDefined } from 'twenty-shared/utils';export const RecordTableScrollToFocusedRowEffect = () => {const { recordTableId } = useRecordTableContextOrThrow();- const focusedRowIndex = useAtomComponentStateValue(+ const focusedRecordTableRowIndex = useAtomComponentStateValue(focusedRecordTableRowIndexComponentState,recordTableId,);- const isRowFocusActive = useAtomComponentStateValue(+ const isRecordTableRowFocusActive = useAtomComponentStateValue(isRecordTableRowFocusActiveComponentState,recordTableId,);@@ -28,21 +28,21 @@ export const RecordTableScrollToFocusedRowEffect = () => {useEffect(() => {if (- !isRowFocusActive ||- !isDefined(focusedRowIndex) ||+ !isRecordTableRowFocusActive ||+ !isDefined(focusedRecordTableRowIndex) ||!allRecordIds?.length) {return;}- const recordId = allRecordIds[focusedRowIndex];+ const recordId = allRecordIds[focusedRecordTableRowIndex];if (!recordId) {return;}const focusElement = document.getElementById(- `record-table-cell-0-${focusedRowIndex}`,+ `record-table-cell-0-${focusedRecordTableRowIndex}`,);if (!focusElement) {@@ -59,7 +59,7 @@ export const RecordTableScrollToFocusedRowEffect = () => {focusElement.style.scrollMarginBottom = '';}};- }, [focusedRowIndex, isRowFocusActive, allRecordIds]);+ }, [focusedRecordTableRowIndex, isRecordTableRowFocusActive, allRecordIds]);return null;};diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/RecordTableCell.perf.stories.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/RecordTableCell.perf.stories.tsxindex a5280f3eb59..7f965b6e355 100644--- a/packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/RecordTableCell.perf.stories.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/RecordTableCell.perf.stories.tsx@@ -37,12 +37,13 @@ import { ComponentDecorator } from 'twenty-ui/testing';import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';const RelationFieldValueSetterEffect = () => {- const setEntity = useSetAtomFamilyState(+ const setRecordStore = useSetAtomFamilyState(recordStoreFamilyState,mockPerformance.recordId,);- const setRelationEntity = useSetAtomFamilyState(+ // eslint-disable-next-line twenty/matching-state-variable+ const setRelationRecordStore = useSetAtomFamilyState(recordStoreFamilyState,mockPerformance.relationRecordId,);@@ -55,8 +56,8 @@ const RelationFieldValueSetterEffect = () => {const [, setObjectMetadataItems] = useAtomState(objectMetadataItemsState);useEffect(() => {- setEntity(mockPerformance.entityValue);- setRelationEntity(mockPerformance.relationFieldValue);+ setRecordStore(mockPerformance.entityValue);+ setRelationRecordStore(mockPerformance.relationFieldValue);setCurrentRecordFields(mockPerformance.visibleTableColumns.map((tableColumn) =>@@ -72,8 +73,8 @@ const RelationFieldValueSetterEffect = () => {setObjectMetadataItems(generatedMockObjectMetadataItems);}, [- setEntity,- setRelationEntity,+ setRecordStore,+ setRelationRecordStore,setObjectMetadataItems,setCurrentRecordFields,]);diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyState.tsx b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyState.tsxindex 8120a961c12..9580e425616 100644--- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyState.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyState.tsx@@ -18,7 +18,7 @@ export const RecordTableEmptyState = () => {const isRemote = objectMetadataItem.isRemote;- const isSoftDeleteActive = useAtomComponentStateValue(+ const isSoftDeleteFilterActive = useAtomComponentStateValue(isSoftDeleteFilterActiveComponentState,recordTableId,);@@ -35,7 +35,7 @@ export const RecordTableEmptyState = () => {if (isRemote) {return <RecordTableEmptyStateRemote />;- } else if (isSoftDeleteActive === true) {+ } else if (isSoftDeleteFilterActive === true) {return <RecordTableEmptyStateSoftDelete />;} else if (noRecordAtAll) {return <RecordTableEmptyStateNoGroupNoRecordAtAll />;diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffect.tsxindex 2d5373148eb..605324bdc85 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffect.tsx@@ -32,7 +32,7 @@ export const RecordTableRecordGroupBodyEffect = () => {const { records, loading, hasNextPage } =useRecordIndexTableQuery(objectNameSingular);- const setHasRecordFetchedAllRecordsComponents =+ const setRecordIndexHasFetchedAllRecordsByGroup =useSetAtomComponentFamilyState(recordIndexHasFetchedAllRecordsByGroupComponentState,recordGroupId,@@ -49,14 +49,14 @@ export const RecordTableRecordGroupBodyEffect = () => {currentRecordGroupId: recordGroupId,});setIsRecordTableInitialLoading(false);- setHasRecordFetchedAllRecordsComponents(!hasNextPage);+ setRecordIndexHasFetchedAllRecordsByGroup(!hasNextPage);}}, [hasNextPage,loading,records,recordGroupId,- setHasRecordFetchedAllRecordsComponents,+ setRecordIndexHasFetchedAllRecordsByGroup,setIsRecordTableInitialLoading,setRecordTableData,]);diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditMode.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditMode.tsxindex 3552e7c4d8f..718f3a8b2b7 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditMode.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditMode.tsx@@ -45,19 +45,19 @@ export type RecordTableCellEditModeProps = {export const RecordTableCellEditMode = ({children,}: RecordTableCellEditModeProps) => {- const isFieldInError = useAtomComponentStateValue(+ const recordFieldInputIsFieldInError = useAtomComponentStateValue(recordFieldInputIsFieldInErrorComponentState,);const recordFieldComponentInstanceId = useAvailableComponentInstanceIdOrThrow(RecordFieldComponentInstanceContext,);- const setFieldInputLayoutDirection = useSetAtomComponentState(+ const setRecordFieldInputLayoutDirection = useSetAtomComponentState(recordFieldInputLayoutDirectionComponentState,recordFieldComponentInstanceId,);- const setFieldInputLayoutDirectionLoading = useSetAtomComponentState(+ const setRecordFieldInputLayoutDirectionLoading = useSetAtomComponentState(recordFieldInputLayoutDirectionLoadingComponentState,recordFieldComponentInstanceId,);@@ -65,10 +65,10 @@ export const RecordTableCellEditMode = ({const setFieldInputLayoutDirectionMiddleware = {name: 'middleware',fn: async (state: MiddlewareState) => {- setFieldInputLayoutDirection(+ setRecordFieldInputLayoutDirection(state.placement.startsWith('bottom') ? 'downward' : 'upward',);- setFieldInputLayoutDirectionLoading(false);+ setRecordFieldInputLayoutDirectionLoading(false);return {};},};@@ -112,7 +112,7 @@ export const RecordTableCellEditMode = ({ref={refs.setFloating}style={floatingStyles}borderRadius="sm"- hasDangerBorder={isFieldInError}+ hasDangerBorder={recordFieldInputIsFieldInError}>{children}</OverlayContainer>diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditModePortal.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditModePortal.tsxindex 1fa1852281a..2bfc12f8c8d 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditModePortal.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditModePortal.tsx@@ -14,11 +14,11 @@ import { recordTableFocusPositionComponentState } from '@/object-record/record-timport { isDefined } from 'twenty-shared/utils';export const RecordTableCellEditModePortal = () => {- const focusedCellPosition = useAtomComponentStateValue(+ const recordTableFocusPosition = useAtomComponentStateValue(recordTableFocusPositionComponentState,);- const currentTableCellInEditModePosition = useAtomComponentStateValue(+ const recordTableCellEditModePosition = useAtomComponentStateValue(recordTableCellEditModePositionComponentState,);@@ -28,13 +28,13 @@ export const RecordTableCellEditModePortal = () => {const cellFocusId = useCurrentlyFocusedRecordTableCellFocusId();- if (!isDefined(focusedCellPosition) || !isDefined(cellFocusId)) {+ if (!isDefined(recordTableFocusPosition) || !isDefined(cellFocusId)) {return null;}return (- <RecordTableCellPortalWrapper position={focusedCellPosition}>- {currentTableCellInEditModePosition && (+ <RecordTableCellPortalWrapper position={recordTableFocusPosition}>+ {recordTableCellEditModePosition && (<RecordTableCellPortalRootContainerzIndex={hasRecordGroupsdiff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFirstRowFirstColumn.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFirstRowFirstColumn.tsxindex ac8d22a9f8f..9b229954c8a 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFirstRowFirstColumn.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFirstRowFirstColumn.tsx@@ -33,19 +33,21 @@ export const RecordTableCellFirstRowFirstColumn = ({} & (Partial<DraggableProvidedDragHandleProps> | null)) => {const { theme } = useContext(ThemeContext);- const hoverPosition = useAtomComponentStateValue(+ const recordTableHoverPosition = useAtomComponentStateValue(recordTableHoverPositionComponentState,);- const focusPosition = useAtomComponentStateValue(+ const recordTableFocusPosition = useAtomComponentStateValue(recordTableFocusPositionComponentState,);const isFocusPortalOnThisCell =- focusPosition?.column === 0 && focusPosition.row === 0;+ recordTableFocusPosition?.column === 0 &&+ recordTableFocusPosition.row === 0;const isHoveredPortalOnThisCell =- hoverPosition?.column === 0 && hoverPosition.row === 0;+ recordTableHoverPosition?.column === 0 &&+ recordTableHoverPosition.row === 0;const [isRecordTableScrolledVertically] = useAtomComponentState(isRecordTableScrolledVerticallyComponentState,diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortal.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortal.tsxindex 4fa10a9e1d7..31231be3e85 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortal.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortal.tsx@@ -13,7 +13,7 @@ import { recordTableHoverPositionComponentState } from '@/object-record/record-timport { isDefined } from 'twenty-shared/utils';export const RecordTableCellFocusedPortal = () => {- const focusPosition = useAtomComponentStateValue(+ const recordTableFocusPosition = useAtomComponentStateValue(recordTableFocusPositionComponentState,);@@ -29,22 +29,22 @@ export const RecordTableCellFocusedPortal = () => {hasRecordGroupsComponentSelector,);- const hoverPosition = useAtomComponentStateValue(+ const recordTableHoverPosition = useAtomComponentStateValue(recordTableHoverPositionComponentState,);const isUnderHoveredPortal =- isDefined(hoverPosition) &&- isDefined(focusPosition) &&- hoverPosition.column === focusPosition.column &&- hoverPosition.row === focusPosition.row;+ isDefined(recordTableHoverPosition) &&+ isDefined(recordTableFocusPosition) &&+ recordTableHoverPosition.column === recordTableFocusPosition.column &&+ recordTableHoverPosition.row === recordTableFocusPosition.row;- if (!isDefined(focusPosition) || isUnderHoveredPortal) {+ if (!isDefined(recordTableFocusPosition) || isUnderHoveredPortal) {return null;}- const isOnFirstScrollableColumn = focusPosition.column === 1;- const isOnLabelIdentifierStickyColumn = focusPosition.column === 0;+ const isOnFirstScrollableColumn = recordTableFocusPosition.column === 1;+ const isOnLabelIdentifierStickyColumn = recordTableFocusPosition.column === 0;const zIndexForHoveredPortalOnFirstScrollableColumnWithoutGroups =isRecordTableScrolledHorizontally && isRecordTableScrolledVertically@@ -141,7 +141,7 @@ export const RecordTableCellFocusedPortal = () => {: zIndexForHoveredPortalWithoutGroups;return (- <RecordTableCellPortalWrapper position={focusPosition}>+ <RecordTableCellPortalWrapper position={recordTableFocusPosition}><RecordTableCellPortalRootContainer zIndex={zIndex}><RecordTableCellFocusedPortalContent /></RecordTableCellPortalRootContainer>diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortalContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortalContent.tsxindex 84d010e560e..d0416af17bd 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortalContent.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortalContent.tsx@@ -14,12 +14,14 @@ import { isDefined } from 'twenty-shared/utils';import { BORDER_COMMON } from 'twenty-ui/theme';const StyledRecordTableCellFocusPortalContent = styled.div<{- isRowActive: boolean;+ isRecordTableRowActive: boolean;}>`align-items: center;background: ${({ theme }) => theme.background.transparent.secondary};- background-color: ${({ theme, isRowActive }) =>- isRowActive ? theme.accent.quaternary : theme.background.primary};+ background-color: ${({ theme, isRecordTableRowActive }) =>+ isRecordTableRowActive+ ? theme.accent.quaternary+ : theme.background.primary};border-radius: ${BORDER_COMMON.radius.sm};box-sizing: border-box;display: flex;@@ -35,32 +37,32 @@ export const RecordTableCellFocusedPortalContent = () => {const { rowIndex } = useRecordTableRowContextOrThrow();const { onMoveHoverToCurrentCell } = useRecordTableBodyContextOrThrow();- const focusPosition = useAtomComponentStateValue(+ const recordTableFocusPosition = useAtomComponentStateValue(recordTableFocusPositionComponentState,);- const isRowActive = useAtomComponentFamilyStateValue(+ const isRecordTableRowActive = useAtomComponentFamilyStateValue(isRecordTableRowActiveComponentFamilyState,rowIndex,);- const hoverPosition = useAtomComponentStateValue(+ const recordTableHoverPosition = useAtomComponentStateValue(recordTableHoverPositionComponentState,);const arePositionsDifferent =- hoverPosition?.row !== focusPosition?.row ||- hoverPosition?.column !== focusPosition?.column;+ recordTableHoverPosition?.row !== recordTableFocusPosition?.row ||+ recordTableHoverPosition?.column !== recordTableFocusPosition?.column;const handleContainerMouseMove = () => {- if (arePositionsDifferent && isDefined(focusPosition)) {- onMoveHoverToCurrentCell(focusPosition);+ if (arePositionsDifferent && isDefined(recordTableFocusPosition)) {+ onMoveHoverToCurrentCell(recordTableFocusPosition);}};return (<StyledRecordTableCellFocusPortalContent- isRowActive={isRowActive}+ isRecordTableRowActive={isRecordTableRowActive}onMouseMove={handleContainerMouseMove}><RecordTableCellDisplayMode>diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortal.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortal.tsxindex 2f72671d3bf..196228c6b3d 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortal.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortal.tsx@@ -12,7 +12,7 @@ import { isRecordTableScrolledVerticallyComponentState } from '@/object-record/rimport { isDefined } from 'twenty-shared/utils';export const RecordTableCellHoveredPortal = () => {- const hoverPosition = useAtomComponentStateValue(+ const recordTableHoverPosition = useAtomComponentStateValue(recordTableHoverPositionComponentState,);@@ -28,12 +28,12 @@ export const RecordTableCellHoveredPortal = () => {hasRecordGroupsComponentSelector,);- if (!isDefined(hoverPosition)) {+ if (!isDefined(recordTableHoverPosition)) {return null;}- const isOnFirstScrollableColumn = hoverPosition.column === 1;- const isOnLabelIdentifierStickyColumn = hoverPosition.column === 0;+ const isOnFirstScrollableColumn = recordTableHoverPosition.column === 1;+ const isOnLabelIdentifierStickyColumn = recordTableHoverPosition.column === 0;const zIndexForHoveredPortalOnFirstScrollableColumnWithoutGroups =isRecordTableScrolledHorizontally && isRecordTableScrolledVertically@@ -130,7 +130,7 @@ export const RecordTableCellHoveredPortal = () => {: zIndexForHoveredPortalWithoutGroups;return (- <RecordTableCellPortalWrapper position={hoverPosition}>+ <RecordTableCellPortalWrapper position={recordTableHoverPosition}><RecordTableCellPortalRootContainer zIndex={zIndex}><RecordTableCellHoveredPortalContent /></RecordTableCellPortalRootContainer>diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortalContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortalContent.tsxindex 66dcfa5baea..2e18b316e29 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortalContent.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortalContent.tsx@@ -19,12 +19,14 @@ import { useIsMobile } from 'twenty-ui/utilities';const StyledRecordTableCellHoveredPortalContent = styled.div<{showInteractiveStyle: boolean;- isRowActive: boolean;+ isRecordTableRowActive: boolean;}>`align-items: center;background: ${({ theme }) => theme.background.transparent.secondary};- background-color: ${({ theme, isRowActive }) =>- isRowActive ? theme.accent.quaternary : theme.background.primary};+ background-color: ${({ theme, isRecordTableRowActive }) =>+ isRecordTableRowActive+ ? theme.accent.quaternary+ : theme.background.primary};border-radius: ${({ showInteractiveStyle }) =>showInteractiveStyle ? BORDER_COMMON.radius.sm : 'none'};box-sizing: border-box;@@ -34,8 +36,8 @@ const StyledRecordTableCellHoveredPortalContent = styled.div<{height: ${RECORD_TABLE_ROW_HEIGHT}px;- outline: ${({ theme, showInteractiveStyle, isRowActive }) =>- isRowActive+ outline: ${({ theme, showInteractiveStyle, isRecordTableRowActive }) =>+ isRecordTableRowActive? 'none': showInteractiveStyle? `1px solid ${theme.font.color.extraLight}`@@ -45,13 +47,13 @@ const StyledRecordTableCellHoveredPortalContent = styled.div<{`;export const RecordTableCellHoveredPortalContent = () => {- const hoverPosition = useAtomComponentStateValue(+ const recordTableHoverPosition = useAtomComponentStateValue(recordTableHoverPositionComponentState,);const isMobile = useIsMobile();- const isFirstColumn = hoverPosition?.column === 0;+ const isFirstColumn = recordTableHoverPosition?.column === 0;const { isRecordFieldReadOnly: isReadOnly } = useContext(FieldContext);@@ -66,7 +68,7 @@ export const RecordTableCellHoveredPortalContent = () => {const { rowIndex } = useRecordTableRowContextOrThrow();- const isRowActive = useAtomComponentFamilyStateValue(+ const isRecordTableRowActive = useAtomComponentFamilyStateValue(isRecordTableRowActiveComponentFamilyState,rowIndex,);@@ -74,7 +76,7 @@ export const RecordTableCellHoveredPortalContent = () => {return (<StyledRecordTableCellHoveredPortalContentshowInteractiveStyle={showInteractiveStyle}- isRowActive={isRowActive}+ isRecordTableRowActive={isRecordTableRowActive}>{isFieldInputOnly ? (<RecordTableCellEditMode>diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellPortals.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellPortals.tsxindex 68f48e99ce6..890c0501af3 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellPortals.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellPortals.tsx@@ -11,7 +11,7 @@ import { isDefined } from 'twenty-shared/utils';export const RecordTableCellPortals = () => {const { recordTableId } = useRecordTableContextOrThrow();- const isRecordTableFocusActive = useAtomComponentStateValue(+ const isRecordTableCellFocusActive = useAtomComponentStateValue(isRecordTableCellFocusActiveComponentState,recordTableId,);@@ -22,7 +22,7 @@ export const RecordTableCellPortals = () => {<><RecordTableCellHoveredPortal /><RecordTableCellFocusedPortal />- {isRecordTableFocusActive && (+ {isRecordTableCellFocusActive && (<><RecordTableCellEditModePortal />{isDefined(recordTableCellFocusId) && (diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCellInGroup.test.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCellInGroup.test.tsxindex 4b85aa1c73c..7b7e9bee4e8 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCellInGroup.test.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCellInGroup.test.tsx@@ -73,14 +73,14 @@ describe('useCloseRecordTableCellInGroup', () => {it('should work as expected', async () => {const { result } = renderHook(() => {- const currentTableCellInEditModePosition = useAtomComponentStateValue(+ const recordTableCellEditModePosition = useAtomComponentStateValue(recordTableCellEditModePositionComponentState,recordTableId,);return {...useCloseRecordTableCellInGroup(),...useDragSelect(),- currentTableCellInEditModePosition,+ recordTableCellEditModePosition,};},{@@ -93,6 +93,6 @@ describe('useCloseRecordTableCellInGroup', () => {});expect(result.current.isDragSelectionStartEnabled()).toBe(true);- expect(result.current.currentTableCellInEditModePosition).toBe(null);+ expect(result.current.recordTableCellEditModePosition).toBe(null);});});diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCellNoGroup.test.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCellNoGroup.test.tsxindex 401c7b482cb..106633da6c7 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCellNoGroup.test.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/__tests__/useCloseRecordTableCellNoGroup.test.tsx@@ -74,7 +74,7 @@ describe('useCloseRecordTableCellNoGroup', () => {it('should work as expected', async () => {const { result } = renderHook(() => {- const currentTableCellInEditModePosition = useAtomComponentStateValue(+ const recordTableCellEditModePosition = useAtomComponentStateValue(recordTableCellEditModePositionComponentState,recordTableId,);@@ -82,7 +82,7 @@ describe('useCloseRecordTableCellNoGroup', () => {return {...useCloseRecordTableCellNoGroup(),...useDragSelect(),- currentTableCellInEditModePosition,+ recordTableCellEditModePosition,};},{@@ -95,6 +95,6 @@ describe('useCloseRecordTableCellNoGroup', () => {});expect(result.current.isDragSelectionStartEnabled()).toBe(true);- expect(result.current.currentTableCellInEditModePosition).toBe(null);+ expect(result.current.recordTableCellEditModePosition).toBe(null);});});diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useCurrentlyFocusedRecordTableCellFocusId.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useCurrentlyFocusedRecordTableCellFocusId.tsindex 5192692ffea..ee8bd4a6712 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useCurrentlyFocusedRecordTableCellFocusId.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useCurrentlyFocusedRecordTableCellFocusId.ts@@ -7,15 +7,15 @@ import { isDefined } from 'twenty-shared/utils';export const useCurrentlyFocusedRecordTableCellFocusId = () => {const { recordTableId } = useRecordTableContextOrThrow();- const focusPosition = useAtomComponentStateValue(+ const recordTableFocusPosition = useAtomComponentStateValue(recordTableFocusPositionComponentState,recordTableId,);- return isDefined(focusPosition)+ return isDefined(recordTableFocusPosition)? getRecordTableCellFocusId({recordTableId,- cellPosition: focusPosition,+ cellPosition: recordTableFocusPosition,}): null;};diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useMoveHoverToCurrentCell.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useMoveHoverToCurrentCell.tsindex 5c2a69603d7..ed6e5f2c30c 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useMoveHoverToCurrentCell.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useMoveHoverToCurrentCell.ts@@ -9,7 +9,7 @@ import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotaimport { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';export const useMoveHoverToCurrentCell = (recordTableId: string) => {- const setHoverPosition = useSetAtomComponentState(+ const setRecordTableHoverPosition = useSetAtomComponentState(recordTableHoverPositionComponentState,recordTableId,);@@ -26,10 +26,10 @@ export const useMoveHoverToCurrentCell = (recordTableId: string) => {const cellInEditMode = store.get(isSomeCellInEditMode);if (!cellInEditMode) {- setHoverPosition(cellPosition);+ setRecordTableHoverPosition(cellPosition);}},- [store, isSomeCellInEditMode, setHoverPosition],+ [store, isSomeCellInEditMode, setRecordTableHoverPosition],);return { moveHoverToCurrentCell };diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell.tsindex b8f01967bd7..3f5de32e1c7 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell.ts@@ -42,7 +42,7 @@ export const useOpenRecordTableCell = (recordTableId: string) => {const { scopeInstanceId } = useRecordFieldsScopeContextOrThrow();const store = useStore();- const setCurrentTableCellInEditModePosition = useSetAtomComponentState(+ const setRecordTableCellEditModePosition = useSetAtomComponentState(recordTableCellEditModePositionComponentState,recordTableId,);@@ -66,7 +66,7 @@ export const useOpenRecordTableCell = (recordTableId: string) => {const { unfocusRecordTableRow } = useFocusedRecordTableRow(recordTableId);- const setIsRowFocusActive = useSetAtomComponentState(+ const setIsRecordTableRowFocusActive = useSetAtomComponentState(isRecordTableRowFocusActiveComponentState,recordTableId,);@@ -129,7 +129,7 @@ export const useOpenRecordTableCell = (recordTableId: string) => {focusRecordTableCell(cellPosition);- setIsRowFocusActive(false);+ setIsRecordTableRowFocusActive(false);setDragSelectionStartEnabled(false);@@ -139,7 +139,7 @@ export const useOpenRecordTableCell = (recordTableId: string) => {prefix: RECORD_TABLE_CELL_INPUT_ID_PREFIX,});- setCurrentTableCellInEditModePosition(cellPosition);+ setRecordTableCellEditModePosition(cellPosition);initDraftValue({value: initialValue,@@ -166,10 +166,10 @@ export const useOpenRecordTableCell = (recordTableId: string) => {[deactivateRecordTableRow,focusRecordTableCell,- setIsRowFocusActive,+ setIsRecordTableRowFocusActive,setDragSelectionStartEnabled,openFieldInput,- setCurrentTableCellInEditModePosition,+ setRecordTableCellEditModePosition,initDraftValue,toggleClickOutside,setActiveDropdownFocusIdAndMemorizePrevious,diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter.tsxindex b38c182b29b..74b9579530c 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter.tsx@@ -65,27 +65,27 @@ export const useAggregateRecordsForRecordTableColumnFooter = (// TODO: This shouldn't be set with impossible values,// see problem with view id not being set early enoughby Effect component in context store,// This happens here when switching from a view to another.- const aggregateOperationForViewFieldWithProbableImpossibleValues =- useAtomFamilyStateValue(viewFieldAggregateOperationState, { viewFieldId });+ const viewFieldAggregateOperation = useAtomFamilyStateValue(+ viewFieldAggregateOperationState,+ { viewFieldId },+ );const isAggregateOperationImpossibleForDateField =isDefined(fieldMetadataItem) &&isFieldMetadataDateKind(fieldMetadataItem.type) &&- isDefined(aggregateOperationForViewFieldWithProbableImpossibleValues) &&- (aggregateOperationForViewFieldWithProbableImpossibleValues ===- AggregateOperations.MIN ||- aggregateOperationForViewFieldWithProbableImpossibleValues ===- AggregateOperations.MAX);+ isDefined(viewFieldAggregateOperation) &&+ (viewFieldAggregateOperation === AggregateOperations.MIN ||+ viewFieldAggregateOperation === AggregateOperations.MAX);const aggregateOperationForViewField:| ExtendedAggregateOperations| undefined| null = isAggregateOperationImpossibleForDateField? convertAggregateOperationToExtendedAggregateOperation(- aggregateOperationForViewFieldWithProbableImpossibleValues,+ viewFieldAggregateOperation,fieldMetadataItem.type,)- : aggregateOperationForViewFieldWithProbableImpossibleValues;+ : viewFieldAggregateOperation;const fieldName = fieldMetadataItem?.name;diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useViewFieldAggregateOperation.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useViewFieldAggregateOperation.tsxindex 2bb366eaf77..4e701b394fb 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useViewFieldAggregateOperation.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useViewFieldAggregateOperation.tsx@@ -52,13 +52,13 @@ export const useViewFieldAggregateOperation = () => {refreshCoreViewsByObjectMetadataId(objectMetadataItem.id);};- const currentViewFieldAggregateOperation = useAtomFamilyStateValue(+ const viewFieldAggregateOperation = useAtomFamilyStateValue(viewFieldAggregateOperationState,{ viewFieldId: currentViewField?.id ?? '' },);return {updateViewFieldAggregateOperation,- currentViewFieldAggregateOperation,+ currentViewFieldAggregateOperation: viewFieldAggregateOperation,};};diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton.tsxindex ddca7ebf69c..a8c5719ca68 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton.tsx@@ -62,24 +62,25 @@ const StyledDropdownContainer = styled.div`export const RecordTableHeaderAddColumnButton = () => {const theme = useTheme();- const isFirstRowActive = useAtomComponentFamilyStateValue(+ const isRecordTableRowActive = useAtomComponentFamilyStateValue(isRecordTableRowActiveComponentFamilyState,0,);- const isFirstRowFocused = useAtomComponentFamilyStateValue(+ const isRecordTableRowFocused = useAtomComponentFamilyStateValue(isRecordTableRowFocusedComponentFamilyState,0,);- const isRowFocusActive = useAtomComponentStateValue(+ const isRecordTableRowFocusActive = useAtomComponentStateValue(isRecordTableRowFocusActiveComponentState,);const isFirstRowActiveOrFocused =- isFirstRowActive || (isFirstRowFocused && isRowFocusActive);+ isRecordTableRowActive ||+ (isRecordTableRowFocused && isRecordTableRowFocusActive);- const isScrolledVertically = useAtomComponentStateValue(+ const isRecordTableScrolledVertically = useAtomComponentStateValue(isRecordTableScrolledVerticallyComponentState,);@@ -88,7 +89,9 @@ export const RecordTableHeaderAddColumnButton = () => {);const shouldDisplayBorderBottom =- hasRecordGroups || !isFirstRowActiveOrFocused || isScrolledVertically;+ hasRecordGroups ||+ !isFirstRowActiveOrFocused ||+ isRecordTableScrolledVertically;const { visibleRecordFields } = useRecordTableContextOrThrow();diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCell.tsxindex 23372b41829..fadbc5ed892 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCell.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCell.tsx@@ -28,39 +28,42 @@ export const RecordTableHeaderCell = ({}: RecordTableHeaderCellProps) => {const { objectMetadataItem } = useRecordTableContextOrThrow();- const isFirstRowActive = useAtomComponentFamilyStateValue(+ const isRecordTableRowActive = useAtomComponentFamilyStateValue(isRecordTableRowActiveComponentFamilyState,0,);- const isFirstRowFocused = useAtomComponentFamilyStateValue(+ const isRecordTableRowFocused = useAtomComponentFamilyStateValue(isRecordTableRowFocusedComponentFamilyState,0,);- const isScrolledVertically = useAtomComponentStateValue(+ const isRecordTableScrolledVertically = useAtomComponentStateValue(isRecordTableScrolledVerticallyComponentState,);- const isRowFocusActive = useAtomComponentStateValue(+ const isRecordTableRowFocusActive = useAtomComponentStateValue(isRecordTableRowFocusActiveComponentState,);const isFirstRowActiveOrFocused =- isFirstRowActive || (isFirstRowFocused && isRowFocusActive);+ isRecordTableRowActive ||+ (isRecordTableRowFocused && isRecordTableRowFocusActive);const hasRecordGroups = useAtomComponentSelectorValue(hasRecordGroupsComponentSelector,);- const resizedFieldMetadataItemId = useAtomComponentStateValue(+ const resizedFieldMetadataId = useAtomComponentStateValue(resizedFieldMetadataIdComponentState,);- const isResizingAnyColumn = isDefined(resizedFieldMetadataItemId);+ const isResizingAnyColumn = isDefined(resizedFieldMetadataId);const shouldDisplayBorderBottom =- hasRecordGroups || !isFirstRowActiveOrFocused || isScrolledVertically;+ hasRecordGroups ||+ !isFirstRowActiveOrFocused ||+ isRecordTableScrolledVertically;return (<RecordTableHeaderCellContainerdiff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCheckboxColumn.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCheckboxColumn.tsxindex 2594984a42d..ea4f5e7d003 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCheckboxColumn.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCheckboxColumn.tsx@@ -84,24 +84,25 @@ export const RecordTableHeaderCheckboxColumn = () => {}};- const isFirstRowActive = useAtomComponentFamilyStateValue(+ const isRecordTableRowActive = useAtomComponentFamilyStateValue(isRecordTableRowActiveComponentFamilyState,0,);- const isFirstRowFocused = useAtomComponentFamilyStateValue(+ const isRecordTableRowFocused = useAtomComponentFamilyStateValue(isRecordTableRowFocusedComponentFamilyState,0,);- const isRowFocusActive = useAtomComponentStateValue(+ const isRecordTableRowFocusActive = useAtomComponentStateValue(isRecordTableRowFocusActiveComponentState,);const isFirstRowActiveOrFocused =- isFirstRowActive || (isFirstRowFocused && isRowFocusActive);+ isRecordTableRowActive ||+ (isRecordTableRowFocused && isRecordTableRowFocusActive);- const isScrolledVertically = useAtomComponentStateValue(+ const isRecordTableScrolledVertically = useAtomComponentStateValue(isRecordTableScrolledVerticallyComponentState,);@@ -110,7 +111,9 @@ export const RecordTableHeaderCheckboxColumn = () => {);const shouldDisplayBorderBottom =- hasRecordGroups || !isFirstRowActiveOrFocused || isScrolledVertically;+ hasRecordGroups ||+ !isFirstRowActiveOrFocused ||+ isRecordTableScrolledVertically;return (<StyledColumnHeaderCelldiff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderDragDropColumn.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderDragDropColumn.tsxindex 526d34c1422..68738188986 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderDragDropColumn.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderDragDropColumn.tsx@@ -36,33 +36,36 @@ const StyledDragDropHeaderCell = styled.div<{export const RecordTableHeaderDragDropColumn = () => {const { theme } = useContext(ThemeContext);- const isScrolledVertically = useAtomComponentStateValue(+ const isRecordTableScrolledVertically = useAtomComponentStateValue(isRecordTableScrolledVerticallyComponentState,);- const isRowFocusActive = useAtomComponentStateValue(+ const isRecordTableRowFocusActive = useAtomComponentStateValue(isRecordTableRowFocusActiveComponentState,);- const isFirstRowActive = useAtomComponentFamilyStateValue(+ const isRecordTableRowActive = useAtomComponentFamilyStateValue(isRecordTableRowActiveComponentFamilyState,0,);- const isFirstRowFocused = useAtomComponentFamilyStateValue(+ const isRecordTableRowFocused = useAtomComponentFamilyStateValue(isRecordTableRowFocusedComponentFamilyState,0,);const isFirstRowActiveOrFocused =- isFirstRowActive || (isFirstRowFocused && isRowFocusActive);+ isRecordTableRowActive ||+ (isRecordTableRowFocused && isRecordTableRowFocusActive);const hasRecordGroups = useAtomComponentSelectorValue(hasRecordGroupsComponentSelector,);const shouldDisplayBorderBottom =- hasRecordGroups || !isFirstRowActiveOrFocused || isScrolledVertically;+ hasRecordGroups ||+ !isFirstRowActiveOrFocused ||+ isRecordTableScrolledVertically;return (<StyledDragDropHeaderCelldiff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstCell.tsxindex 13fa9466bbd..0ca8fff4c03 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstCell.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstCell.tsx@@ -36,41 +36,44 @@ export const RecordTableHeaderFirstCell = () => {const [iconIsVisible, setIconIsVisible] = useState(false);- const isFirstRowActive = useAtomComponentFamilyStateValue(+ const isRecordTableRowActive = useAtomComponentFamilyStateValue(isRecordTableRowActiveComponentFamilyState,0,);- const isFirstRowFocused = useAtomComponentFamilyStateValue(+ const isRecordTableRowFocused = useAtomComponentFamilyStateValue(isRecordTableRowFocusedComponentFamilyState,0,);const recordField = getVisibleFieldWithLowestPosition(visibleRecordFields);- const isScrolledVertically = useAtomComponentStateValue(+ const isRecordTableScrolledVertically = useAtomComponentStateValue(isRecordTableScrolledVerticallyComponentState,);- const isRowFocusActive = useAtomComponentStateValue(+ const isRecordTableRowFocusActive = useAtomComponentStateValue(isRecordTableRowFocusActiveComponentState,);const isFirstRowActiveOrFocused =- isFirstRowActive || (isFirstRowFocused && isRowFocusActive);+ isRecordTableRowActive ||+ (isRecordTableRowFocused && isRecordTableRowFocusActive);const hasRecordGroups = useAtomComponentSelectorValue(hasRecordGroupsComponentSelector,);- const resizedFieldMetadataItemId = useAtomComponentStateValue(+ const resizedFieldMetadataId = useAtomComponentStateValue(resizedFieldMetadataIdComponentState,);- const isResizingAnyColumn = isDefined(resizedFieldMetadataItemId);+ const isResizingAnyColumn = isDefined(resizedFieldMetadataId);const shouldDisplayBorderBottom =- hasRecordGroups || !isFirstRowActiveOrFocused || isScrolledVertically;+ hasRecordGroups ||+ !isFirstRowActiveOrFocused ||+ isRecordTableScrolledVertically;if (!recordField) {return <></>;diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstScrollableCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstScrollableCell.tsxindex 0ea7dbfcb0e..5c3cccf5384 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstScrollableCell.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstScrollableCell.tsx@@ -25,12 +25,12 @@ export const RecordTableHeaderFirstScrollableCell = () => {const { objectMetadataItem, visibleRecordFields } =useRecordTableContextOrThrow();- const isFirstRowActive = useAtomComponentFamilyStateValue(+ const isRecordTableRowActive = useAtomComponentFamilyStateValue(isRecordTableRowActiveComponentFamilyState,0,);- const isFirstRowFocused = useAtomComponentFamilyStateValue(+ const isRecordTableRowFocused = useAtomComponentFamilyStateValue(isRecordTableRowFocusedComponentFamilyState,0,);@@ -44,12 +44,13 @@ export const RecordTableHeaderFirstScrollableCell = () => {),)[0] as RecordField | undefined;- const isRowFocusActive = useAtomComponentStateValue(+ const isRecordTableRowFocusActive = useAtomComponentStateValue(isRecordTableRowFocusActiveComponentState,);const isFirstRowActiveOrFocused =- isFirstRowActive || (isFirstRowFocused && isRowFocusActive);+ isRecordTableRowActive ||+ (isRecordTableRowFocused && isRecordTableRowFocusActive);const isRecordTableScrolledVertically = useAtomComponentStateValue(isRecordTableScrolledVerticallyComponentState,@@ -89,18 +90,16 @@ export const RecordTableHeaderFirstScrollableCell = () => {const zIndex = hasRecordGroups ? zIndexWithGroups : zIndexWithoutGroups;- const isScrolledVertically = useAtomComponentStateValue(- isRecordTableScrolledVerticallyComponentState,- );-const shouldDisplayBorderBottom =- hasRecordGroups || !isFirstRowActiveOrFocused || isScrolledVertically;+ hasRecordGroups ||+ !isFirstRowActiveOrFocused ||+ isRecordTableScrolledVertically;- const resizedFieldMetadataItemId = useAtomComponentStateValue(+ const resizedFieldMetadataId = useAtomComponentStateValue(resizedFieldMetadataIdComponentState,);- const isResizingAnyColumn = isDefined(resizedFieldMetadataItemId);+ const isResizingAnyColumn = isDefined(resizedFieldMetadataId);if (!recordField) {return <></>;diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLastEmptyColumn.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLastEmptyColumn.tsxindex 12677f879bf..c931425cb9b 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLastEmptyColumn.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLastEmptyColumn.tsx@@ -30,33 +30,36 @@ const StyledLastColumnHeader = styled.div<{`;export const RecordTableHeaderLastEmptyColumn = () => {- const isScrolledVertically = useAtomComponentStateValue(+ const isRecordTableScrolledVertically = useAtomComponentStateValue(isRecordTableScrolledVerticallyComponentState,);- const isFirstRowActive = useAtomComponentFamilyStateValue(+ const isRecordTableRowActive = useAtomComponentFamilyStateValue(isRecordTableRowActiveComponentFamilyState,0,);- const isFirstRowFocused = useAtomComponentFamilyStateValue(+ const isRecordTableRowFocused = useAtomComponentFamilyStateValue(isRecordTableRowFocusedComponentFamilyState,0,);- const isRowFocusActive = useAtomComponentStateValue(+ const isRecordTableRowFocusActive = useAtomComponentStateValue(isRecordTableRowFocusActiveComponentState,);const isFirstRowActiveOrFocused =- isFirstRowActive || (isFirstRowFocused && isRowFocusActive);+ isRecordTableRowActive ||+ (isRecordTableRowFocused && isRecordTableRowFocusActive);const hasRecordGroups = useAtomComponentSelectorValue(hasRecordGroupsComponentSelector,);const shouldDisplayBorderBottom =- hasRecordGroups || !isFirstRowActiveOrFocused || isScrolledVertically;+ hasRecordGroups ||+ !isFirstRowActiveOrFocused ||+ isRecordTableScrolledVertically;return (<StyledLastColumnHeaderdiff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderResizeHandler.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderResizeHandler.tsxindex f0d5782816f..d6c49b06efb 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderResizeHandler.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderResizeHandler.tsx@@ -53,17 +53,17 @@ export const RecordTableHeaderResizeHandler = ({const columnResizeDisabled = isMobile;- const [resizedFieldMetadataItemId, setResizedFieldMetadataItemId] =+ const [resizedFieldMetadataId, setResizedFieldMetadataId] =useAtomComponentState(resizedFieldMetadataIdComponentState);const isResizing =- recordField?.fieldMetadataItemId === resizedFieldMetadataItemId;+ recordField?.fieldMetadataItemId === resizedFieldMetadataId;const { setDragSelectionStartEnabled } = useDragSelect();const handlePointerDown = () => {setDragSelectionStartEnabled(false);- setResizedFieldMetadataItemId(recordField?.fieldMetadataItemId);+ setResizedFieldMetadataId(recordField?.fieldMetadataItemId);};return (diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useResizeTableHeader.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useResizeTableHeader.tsindex 4bfcc1aead2..0502642d514 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useResizeTableHeader.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useResizeTableHeader.ts@@ -46,11 +46,11 @@ export const useResizeTableHeader = () => {number | null>(null);- const [resizedFieldMetadataItemId, setResizedFieldMetadataItemId] =+ const [resizedFieldMetadataId, setResizedFieldMetadataId] =useAtomComponentState(resizedFieldMetadataIdComponentState);const recordField = visibleRecordFields.find(- findByProperty('fieldMetadataItemId', resizedFieldMetadataItemId),+ findByProperty('fieldMetadataItemId', resizedFieldMetadataId),);const { resetTableRowSelection } = useResetTableRowSelection();@@ -144,7 +144,7 @@ export const useResizeTableHeader = () => {const handleResizeHandlerEnd = useCallback(async () => {throwIfNotDefined(recordField, 'recordField');- if (!resizedFieldMetadataItemId) return;+ if (!resizedFieldMetadataId) return;const currentResizeFieldOffset = store.get(resizeFieldOffset);@@ -157,10 +157,10 @@ export const useResizeTableHeader = () => {store.set(resizeFieldOffset, 0);setInitialPointerPositionX(null);- setResizedFieldMetadataItemId(null);+ setResizedFieldMetadataId(null);if (nextWidth !== recordField.size) {- const updatedRecordField = updateRecordField(resizedFieldMetadataItemId, {+ const updatedRecordField = updateRecordField(resizedFieldMetadataId, {size: nextWidth,});@@ -170,17 +170,17 @@ export const useResizeTableHeader = () => {setDragSelectionStartEnabled(true);}, [saveRecordFields,- resizedFieldMetadataItemId,+ resizedFieldMetadataId,resizeFieldOffset,store,- setResizedFieldMetadataItemId,+ setResizedFieldMetadataId,updateRecordField,setDragSelectionStartEnabled,recordField,]);useTrackPointer({- shouldTrackPointer: resizedFieldMetadataItemId !== null,+ shouldTrackPointer: resizedFieldMetadataId !== null,onMouseDown: handleResizeHandlerStart,onMouseMove: handleResizeHandlerMove,onMouseUp: handleResizeHandlerEnd,diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTrFirstRowOfGroup.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTrFirstRowOfGroup.tsxindex 27bbd898346..67bd892780d 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTrFirstRowOfGroup.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTrFirstRowOfGroup.tsx@@ -33,7 +33,7 @@ export const RecordTableDraggableTrFirstRowOfGroup = ({const { isSecondaryDragged } = useIsTableRowSecondaryDragged(recordId);- const isScrolledVertically = useAtomComponentStateValue(+ const isRecordTableScrolledVertically = useAtomComponentStateValue(isRecordTableScrolledVerticallyComponentState,);@@ -68,7 +68,7 @@ export const RecordTableDraggableTrFirstRowOfGroup = ({data-selectable-id={recordId}onClick={onClick}isFirstRowOfGroup={true}- isScrolledVertically={isScrolledVertically}+ isScrolledVertically={isRecordTableScrolledVertically}><RecordTableRowDraggableContextProvidervalue={{diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableFirstRowOfGroup.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableFirstRowOfGroup.tsxindex 4386ade8964..52eb37904ca 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableFirstRowOfGroup.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableFirstRowOfGroup.tsx@@ -33,7 +33,7 @@ export const RecordTableFirstRowOfGroup = forwardRef<},ref,) => {- const isScrolledVertically = useAtomComponentStateValue(+ const isRecordTableScrolledVertically = useAtomComponentStateValue(isRecordTableScrolledVerticallyComponentState,);@@ -48,7 +48,7 @@ export const RecordTableFirstRowOfGroup = forwardRef<data-next-row-active-or-focused={isNextRowActiveOrFocused}// eslint-disable-next-line react/jsx-props-no-spreading{...props}- isScrolledVertically={isScrolledVertically}+ isScrolledVertically={isRecordTableScrolledVertically}isFirstRowOfGroup={true}>{children}diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRow.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRow.tsxindex efdd244ed60..df39625f700 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRow.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRow.tsx@@ -29,11 +29,11 @@ export const RecordTableRow = ({}: RecordTableRowProps) => {const { recordTableId } = useRecordTableContextOrThrow();- const isFocused = useAtomComponentFamilyStateValue(+ const isRecordTableRowFocused = useAtomComponentFamilyStateValue(isRecordTableRowFocusedComponentFamilyState,rowIndexForFocus,);- const isRowFocusActive = useAtomComponentStateValue(+ const isRecordTableRowFocusActive = useAtomComponentStateValue(isRecordTableRowFocusActiveComponentState,recordTableId,);@@ -44,7 +44,7 @@ export const RecordTableRow = ({draggableIndex={rowIndexForDrag}focusIndex={rowIndexForFocus}>- {isRowFocusActive && isFocused && (+ {isRecordTableRowFocusActive && isRecordTableRowFocused && (<><RecordTableRowHotkeyEffect /><RecordTableRowArrowKeysEffect />@@ -62,7 +62,7 @@ export const RecordTableRow = ({draggableIndex={rowIndexForDrag}focusIndex={rowIndexForFocus}>- {isRowFocusActive && isFocused && (+ {isRecordTableRowFocusActive && isRecordTableRowFocused && (<><RecordTableRowHotkeyEffect /><RecordTableRowArrowKeysEffect />diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableTr.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableTr.tsxindex c63ec91c618..a2cfdf4e200 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableTr.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableTr.tsx@@ -41,17 +41,18 @@ export const RecordTableTr = forwardRef<HTMLDivElement, RecordTableTrProps>() => {const { objectMetadataItem } = useRecordTableContextOrThrow();- const currentRowSelected = useAtomComponentFamilyStateValue(+ const isRowSelected = useAtomComponentFamilyStateValue(isRowSelectedComponentFamilyState,recordId,);- const isActive = useAtomComponentFamilyStateValue(+ const isRecordTableRowActive = useAtomComponentFamilyStateValue(isRecordTableRowActiveComponentFamilyState,focusIndex,);- const isNextRowActive = useAtomComponentFamilyStateValue(+ // eslint-disable-next-line twenty/matching-state-variable+ const isNextRecordTableRowActive = useAtomComponentFamilyStateValue(isRecordTableRowActiveComponentFamilyState,focusIndex + 1,);@@ -66,23 +67,25 @@ export const RecordTableTr = forwardRef<HTMLDivElement, RecordTableTrProps>(nextRecordId ?? '',);- const isFocused = useAtomComponentFamilyStateValue(+ const isRecordTableRowFocused = useAtomComponentFamilyStateValue(isRecordTableRowFocusedComponentFamilyState,focusIndex,);- const isRowFocusActive = useAtomComponentStateValue(+ const isRecordTableRowFocusActive = useAtomComponentStateValue(isRecordTableRowFocusActiveComponentState,);- const isNextRowFocused = useAtomComponentFamilyStateValue(+ // eslint-disable-next-line twenty/matching-state-variable+ const isNextRecordTableRowFocused = useAtomComponentFamilyStateValue(isRecordTableRowFocusedComponentFamilyState,focusIndex + 1,);const isNextRowActiveOrFocused =!isNextRecordIdFirstOfGroup &&- ((isRowFocusActive && isNextRowFocused) || isNextRowActive);+ ((isRecordTableRowFocusActive && isNextRecordTableRowFocused) ||+ isNextRecordTableRowActive);const isRecordReadOnly = useIsRecordReadOnly({recordId,@@ -99,7 +102,7 @@ export const RecordTableTr = forwardRef<HTMLDivElement, RecordTableTrProps>(objectNameSingular: objectMetadataItem.nameSingular,}) + recordId,objectNameSingular: objectMetadataItem.nameSingular,- isSelected: currentRowSelected,+ isSelected: isRowSelected,isRecordReadOnly,}}>@@ -109,13 +112,17 @@ export const RecordTableTr = forwardRef<HTMLDivElement, RecordTableTrProps>(data-virtualized-id={recordId}isDragging={isDragging}ref={ref}- data-active={isActive}- data-focused={isRowFocusActive && isFocused && !isActive}+ data-active={isRecordTableRowActive}+ data-focused={+ isRecordTableRowFocusActive &&+ isRecordTableRowFocused &&+ !isRecordTableRowActive+ }data-next-row-active-or-focused={isNextRowActiveOrFocused}isNextRowActiveOrFocused={isNextRowActiveOrFocused}focusIndex={focusIndex}- isFocused={isFocused}- isRowFocusActive={isRowFocusActive}+ isFocused={isRecordTableRowFocused}+ isRowFocusActive={isRecordTableRowFocusActive}recordId={recordId}// eslint-disable-next-line react/jsx-props-no-spreading{...props}@@ -128,8 +135,12 @@ export const RecordTableTr = forwardRef<HTMLDivElement, RecordTableTrProps>(data-virtualized-id={recordId}isDragging={isDragging}ref={ref}- data-active={isActive}- data-focused={isRowFocusActive && isFocused && !isActive}+ data-active={isRecordTableRowActive}+ data-focused={+ isRecordTableRowFocusActive &&+ isRecordTableRowFocused &&+ !isRecordTableRowActive+ }data-next-row-active-or-focused={isNextRowActiveOrFocused}// eslint-disable-next-line react/jsx-props-no-spreading{...props}diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useIsRecordSecondaryDragged.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useIsRecordSecondaryDragged.tsindex dcde8188ad2..b0566976889 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useIsRecordSecondaryDragged.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useIsRecordSecondaryDragged.ts@@ -3,12 +3,12 @@ import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooimport { type Nullable } from 'twenty-shared/types';export const useIsTableRowSecondaryDragged = (recordId: Nullable<string>) => {- const isSecondaryDragged = useAtomComponentFamilyStateValue(+ const isRecordIdSecondaryDragMultiple = useAtomComponentFamilyStateValue(isRecordIdSecondaryDragMultipleComponentFamilyState,{ recordId: recordId ?? '' },);return {- isSecondaryDragged,+ isSecondaryDragged: isRecordIdSecondaryDragMultiple,};};diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useRecordTableRowHotkeys.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useRecordTableRowHotkeys.tsindex 8b995b8d1f0..3c7d2f1480d 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useRecordTableRowHotkeys.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useRecordTableRowHotkeys.ts@@ -27,7 +27,7 @@ export const useRecordTableRowHotkeys = (focusId: string) => {const { activateRecordTableRow } = useActiveRecordTableRow();- const setIsRowFocusActive = useSetAtomComponentState(+ const setIsRecordTableRowFocusActive = useSetAtomComponentState(isRecordTableRowFocusActiveComponentState,);@@ -61,7 +61,7 @@ export const useRecordTableRowHotkeys = (focusId: string) => {};const handleEnterRow = () => {- setIsRowFocusActive(false);+ setIsRecordTableRowFocusActive(false);const cellPosition = {row: rowIndex,column: 0,diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsxindex 1e95e404d80..afe9ff1169e 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx@@ -123,7 +123,7 @@ export const RecordTableRecordGroupSection = () => {const { objectMetadataItem } = useRecordTableContextOrThrow();- const recordGroup = useAtomFamilyStateValue(+ const recordGroupDefinition = useAtomFamilyStateValue(recordGroupDefinitionFamilyState,currentRecordGroupId,);@@ -131,7 +131,7 @@ export const RecordTableRecordGroupSection = () => {const recordIndexAggregateDisplayValueForGroupValue =useAtomComponentFamilyStateValue(recordIndexAggregateDisplayValueForGroupValueComponentFamilyState,- { groupValue: recordGroup?.value ?? '' },+ { groupValue: recordGroupDefinition?.value ?? '' },);const recordIndexAggregateDisplayLabel = useAtomComponentStateValue(@@ -187,7 +187,7 @@ export const RecordTableRecordGroupSection = () => {return null;}- if (!isDefined(recordGroup)) {+ if (!isDefined(recordGroupDefinition)) {return null;}@@ -209,16 +209,16 @@ export const RecordTableRecordGroupSection = () => {><StyledTagvariant={- recordGroup.type !== RecordGroupDefinitionType.NoValue+ recordGroupDefinition.type !== RecordGroupDefinitionType.NoValue? 'solid': 'outline'}color={- recordGroup.type !== RecordGroupDefinitionType.NoValue- ? recordGroup.color+ recordGroupDefinition.type !== RecordGroupDefinitionType.NoValue+ ? recordGroupDefinition.color: 'transparent'}- text={recordGroup.title}+ text={recordGroupDefinition.title}weight="medium"/><RecordBoardColumnHeaderAggregateDropdowndiff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew.tsxindex b425bf41556..fd1f78ed771 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew.tsx@@ -15,12 +15,12 @@ export const RecordTableRecordGroupSectionAddNew = () => {const currentRecordGroupId = useCurrentRecordGroupId();- const recordGroup = useAtomFamilyStateValue(+ const recordGroupDefinition = useAtomFamilyStateValue(recordGroupDefinitionFamilyState,currentRecordGroupId,);- const mainGroupByFieldMetadata = useAtomComponentStateValue(+ const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(recordIndexGroupFieldMetadataItemComponentState,);@@ -29,7 +29,7 @@ export const RecordTableRecordGroupSectionAddNew = () => {});const fieldMetadataItem = objectMetadataItem.fields.find(- (field) => field.id === mainGroupByFieldMetadata?.id,+ (field) => field.id === recordIndexGroupFieldMetadataItem?.id,);const objectPermissions = useObjectPermissionsForObject(@@ -53,7 +53,7 @@ export const RecordTableRecordGroupSectionAddNew = () => {createNewIndexRecord({position: 'last',- [fieldMetadataItem.name]: recordGroup?.value,+ [fieldMetadataItem.name]: recordGroupDefinition?.value,});}}/>diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionLoadMore.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionLoadMore.tsxindex 9429f3e43dd..57a9c6ff1b3 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionLoadMore.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionLoadMore.tsx@@ -15,16 +15,17 @@ export const RecordTableRecordGroupSectionLoadMore = () => {const { fetchMoreRecordsLazy } =useRecordIndexTableFetchMore(objectNameSingular);- const hasFetchedAllRecords = useAtomComponentFamilyStateValue(- recordIndexHasFetchedAllRecordsByGroupComponentState,- currentRecordGroupId,- );+ const recordIndexHasFetchedAllRecordsByGroup =+ useAtomComponentFamilyStateValue(+ recordIndexHasFetchedAllRecordsByGroupComponentState,+ currentRecordGroupId,+ );const handleLoadMore = () => {fetchMoreRecordsLazy();};- if (hasFetchedAllRecords) {+ if (recordIndexHasFetchedAllRecordsByGroup) {return null;}diff --git a/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableRowVirtualizedContainer.tsx b/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableRowVirtualizedContainer.tsxindex d52bc4ff8f4..57fbc26a6b6 100644--- a/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableRowVirtualizedContainer.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableRowVirtualizedContainer.tsx@@ -26,7 +26,7 @@ type RecordTableRowVirtualizedContainerProps = {export const RecordTableRowVirtualizedContainer = ({virtualIndex,}: RecordTableRowVirtualizedContainerProps) => {- const realIndex = useAtomComponentFamilyStateValue(+ const realIndexByVirtualIndex = useAtomComponentFamilyStateValue(realIndexByVirtualIndexComponentFamilyState,{ virtualIndex },);@@ -36,12 +36,16 @@ export const RecordTableRowVirtualizedContainer = ({totalNumberOfRecordsToVirtualizeComponentState,) ?? 0;- if (!isDefined(realIndex) || realIndex >= totalNumberOfRecordsToVirtualize) {+ if (+ !isDefined(realIndexByVirtualIndex) ||+ realIndexByVirtualIndex >= totalNumberOfRecordsToVirtualize+ ) {return null;}const pixelsFromTop =- realIndex * (RECORD_TABLE_ROW_HEIGHT + 1) + (RECORD_TABLE_ROW_HEIGHT + 1);+ realIndexByVirtualIndex * (RECORD_TABLE_ROW_HEIGHT + 1) ++ (RECORD_TABLE_ROW_HEIGHT + 1);return (<StyledVirtualizedRowContainer@@ -51,7 +55,9 @@ export const RecordTableRowVirtualizedContainer = ({{TABLE_VIRTUALIZATION_DEBUG_ACTIVATED && (<RecordTableRowVirtualizedDebugRowHelper virtualIndex={virtualIndex} />)}- <RecordTableRowVirtualizedRouterLevel1 realIndex={realIndex} />+ <RecordTableRowVirtualizedRouterLevel1+ realIndex={realIndexByVirtualIndex}+ /></StyledVirtualizedRowContainer>);};diff --git a/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableRowVirtualizedDebugRowHelper.tsx b/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableRowVirtualizedDebugRowHelper.tsxindex 11c269d4756..863501ba49d 100644--- a/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableRowVirtualizedDebugRowHelper.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableRowVirtualizedDebugRowHelper.tsx@@ -46,26 +46,26 @@ type RecordTableRowVirtualizedDebugRowHelperProps = {export const RecordTableRowVirtualizedDebugRowHelper = ({virtualIndex,}: RecordTableRowVirtualizedDebugRowHelperProps) => {- const realIndex = useAtomComponentFamilyStateValue(+ const realIndexByVirtualIndex = useAtomComponentFamilyStateValue(realIndexByVirtualIndexComponentFamilyState,{ virtualIndex },);const recordId = useAtomComponentFamilySelectorValue(recordIdByRealIndexComponentFamilySelector,- realIndex,+ realIndexByVirtualIndex,);const dataLoadingStatus = useAtomComponentFamilySelectorValue(dataLoadingStatusByRealIndexComponentFamilySelector,- realIndex,+ realIndexByVirtualIndex,);const pixelsFromTop =- (realIndex ?? 0) * (RECORD_TABLE_ROW_HEIGHT + 1) ++ (realIndexByVirtualIndex ?? 0) * (RECORD_TABLE_ROW_HEIGHT + 1) +(RECORD_TABLE_ROW_HEIGHT + 1);- const record = useAtomFamilyStateValue(+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState,recordId ?? '',);@@ -73,16 +73,21 @@ export const RecordTableRowVirtualizedDebugRowHelper = ({const labelIdentifierFieldMetadataItem =getLabelIdentifierFieldMetadataItem(objectMetadataItem);- const labelIdentifier = isDefined(record)- ? getLabelIdentifierFieldValue(record, labelIdentifierFieldMetadataItem)+ const labelIdentifier = isDefined(recordStore)+ ? getLabelIdentifierFieldValue(+ recordStore,+ labelIdentifierFieldMetadataItem,+ ): '-';- const position = record?.position;+ const position = recordStore?.position;return (<StyledDebugRow><StyledDebugColumn width={70}>virtual :{virtualIndex}</StyledDebugColumn>- <StyledDebugColumn width={70}>real :{realIndex}</StyledDebugColumn>+ <StyledDebugColumn width={70}>+ real :{realIndexByVirtualIndex}+ </StyledDebugColumn><StyledDebugColumn width={100}>pos :{position}</StyledDebugColumn><StyledDebugColumn width={80}>px:diff --git a/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableRowVirtualizedFullData.tsx b/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableRowVirtualizedFullData.tsxindex 8f7c40a17cd..8f8e0bab73c 100644--- a/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableRowVirtualizedFullData.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableRowVirtualizedFullData.tsx@@ -27,12 +27,12 @@ export const RecordTableRowVirtualizedFullData = ({}: RecordTableRowVirtualizedFullDataProps) => {const { recordTableId } = useRecordTableContextOrThrow();- const isFocused = useAtomComponentFamilyStateValue(+ const isRecordTableRowFocused = useAtomComponentFamilyStateValue(isRecordTableRowFocusedComponentFamilyState,realIndex,);- const isRowFocusActive = useAtomComponentStateValue(+ const isRecordTableRowFocusActive = useAtomComponentStateValue(isRecordTableRowFocusActiveComponentState,recordTableId,);@@ -52,7 +52,7 @@ export const RecordTableRowVirtualizedFullData = ({draggableIndex={realIndex}focusIndex={realIndex}>- {isRowFocusActive && isFocused && (+ {isRecordTableRowFocusActive && isRecordTableRowFocused && (<><RecordTableRowHotkeyEffect /><RecordTableRowArrowKeysEffect />diff --git a/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableVirtualizedInitialDataLoadEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableVirtualizedInitialDataLoadEffect.tsxindex 29a04733554..3c95c5e65e9 100644--- a/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableVirtualizedInitialDataLoadEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableVirtualizedInitialDataLoadEffect.tsx@@ -45,8 +45,8 @@ export const RecordTableVirtualizedInitialDataLoadEffect = () => {] = useAtomComponentState(lastContextStoreVirtualizedViewIdComponentState);const [- lastContextStoreVisibleRecordFields,- setLastContextStoreVisibleRecordFields,+ lastContextStoreVirtualizedVisibleRecordFields,+ setLastContextStoreVirtualizedVisibleRecordFields,] = useAtomComponentState(lastContextStoreVirtualizedVisibleRecordFieldsComponentState,);@@ -69,7 +69,7 @@ export const RecordTableVirtualizedInitialDataLoadEffect = () => {setLastContextStoreVirtualizedViewId(currentView?.id ?? null);setLastRecordTableQueryIdentifier(queryIdentifier);- setLastContextStoreVisibleRecordFields(visibleRecordFields);+ setLastContextStoreVirtualizedVisibleRecordFields(visibleRecordFields);await triggerInitialRecordTableDataLoad();} else if (@@ -80,13 +80,13 @@ export const RecordTableVirtualizedInitialDataLoadEffect = () => {await triggerInitialRecordTableDataLoad();} else if (- JSON.stringify(lastContextStoreVisibleRecordFields) !==+ JSON.stringify(lastContextStoreVirtualizedVisibleRecordFields) !==JSON.stringify(visibleRecordFields)) {- const lastFields = lastContextStoreVisibleRecordFields || [];+ const lastFields = lastContextStoreVirtualizedVisibleRecordFields || [];const currentFields = visibleRecordFields || [];- setLastContextStoreVisibleRecordFields(visibleRecordFields);+ setLastContextStoreVirtualizedVisibleRecordFields(visibleRecordFields);const shouldRefetchData = currentFields.length > lastFields.length;@@ -107,8 +107,8 @@ export const RecordTableVirtualizedInitialDataLoadEffect = () => {currentView,lastContextStoreVirtualizedViewId,setLastContextStoreVirtualizedViewId,- lastContextStoreVisibleRecordFields,- setLastContextStoreVisibleRecordFields,+ lastContextStoreVirtualizedVisibleRecordFields,+ setLastContextStoreVirtualizedVisibleRecordFields,visibleRecordFields,]);diff --git a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldDisplay.tsxindex bf8acf8b68c..739e31eb552 100644--- a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldDisplay.tsx+++ b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldDisplay.tsx@@ -39,10 +39,10 @@ export const RecordTitleCellSingleTextDisplayMode = ({}) => {const { recordId, fieldDefinition } = useContext(FieldContext);- const recordValue = useAtomFamilyStateValue(recordStoreFamilyState, recordId);+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);const isEmpty =- recordValue?.[fieldDefinition.metadata.fieldName]?.trim() === '';+ recordStore?.[fieldDefinition.metadata.fieldName]?.trim() === '';const { openRecordTitleCell } = useRecordTitleCell();@@ -65,7 +65,7 @@ export const RecordTitleCellSingleTextDisplayMode = ({) : (<OverflowingTextWithTooltiptext={- recordValue?.[fieldDefinition.metadata.fieldName] ||+ recordStore?.[fieldDefinition.metadata.fieldName] ||fieldDefinition.label}/>diff --git a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellUuidFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellUuidFieldDisplay.tsxindex edd2e3821f6..0e2a66effc5 100644--- a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellUuidFieldDisplay.tsx+++ b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellUuidFieldDisplay.tsx@@ -27,9 +27,9 @@ export const RecordTitleCellUuidFieldDisplay = ({}) => {const { recordId, fieldDefinition } = useContext(FieldContext);- const recordValue = useAtomFamilyStateValue(recordStoreFamilyState, recordId);+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);- const uuidValue = recordValue?.[fieldDefinition.metadata.fieldName] ?? '';+ const uuidValue = recordStore?.[fieldDefinition.metadata.fieldName] ?? '';return (<StyledDiv>diff --git a/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.ts b/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.tsindex 8b83a5f0c5a..d7c325d097b 100644--- a/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.ts+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.ts@@ -26,7 +26,7 @@ export const useOpenObjectRecordsSpreadsheetImportDialog = (objectNameSingular,});- const setCreatedRecordsProgress = useSetAtomState(+ const setSpreadsheetImportCreatedRecordsProgress = useSetAtomState(spreadsheetImportCreatedRecordsProgressState,);@@ -41,7 +41,7 @@ export const useOpenObjectRecordsSpreadsheetImportDialog = (objectNameSingular,recordGqlFields,mutationBatchSize: SPREADSHEET_IMPORT_CREATE_RECORDS_BATCH_SIZE,- setBatchedRecordsCount: setCreatedRecordsProgress,+ setBatchedRecordsCount: setSpreadsheetImportCreatedRecordsProgress,abortController,});diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutGridLayout.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutGridLayout.tsxindex fb610670bfb..8676845ced4 100644--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutGridLayout.tsx+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutGridLayout.tsx@@ -104,11 +104,11 @@ export const PageLayoutGridLayout = ({ tabId }: PageLayoutGridLayoutProps) => {pageLayoutCurrentBreakpointComponentState,);- const setDraggingWidgetId = useSetAtomComponentState(+ const setPageLayoutDraggingWidgetId = useSetAtomComponentState(pageLayoutDraggingWidgetIdComponentState,);- const setResizingWidgetId = useSetAtomComponentState(+ const setPageLayoutResizingWidgetId = useSetAtomComponentState(pageLayoutResizingWidgetIdComponentState,);@@ -137,7 +137,7 @@ export const PageLayoutGridLayout = ({ tabId }: PageLayoutGridLayoutProps) => {const pageLayoutDraggedArea = useAtomComponentStateValue(pageLayoutDraggedAreaComponentState,);- const draggingWidgetId = useAtomComponentStateValue(+ const pageLayoutDraggingWidgetId = useAtomComponentStateValue(pageLayoutDraggingWidgetIdComponentState,);@@ -167,7 +167,7 @@ export const PageLayoutGridLayout = ({ tabId }: PageLayoutGridLayoutProps) => {[activeTabWidgets, hasPendingPlaceholder],);- const shouldDisableTransitions = !isDefined(draggingWidgetId);+ const shouldDisableTransitions = !isDefined(pageLayoutDraggingWidgetId);return (<StyledGridContainer@@ -202,16 +202,16 @@ export const PageLayoutGridLayout = ({ tabId }: PageLayoutGridLayoutProps) => {}resizeHandles={['n', 's', 'e', 'w', 'ne', 'nw', 'se', 'sw']}onDragStart={(_layout, _oldItem, newItem) => {- setDraggingWidgetId(newItem.i);+ setPageLayoutDraggingWidgetId(newItem.i);}}onDragStop={() => {- setDraggingWidgetId(null);+ setPageLayoutDraggingWidgetId(null);}}onResizeStart={(_layout, _oldItem, newItem) => {- setResizingWidgetId(newItem.i);+ setPageLayoutResizingWidgetId(newItem.i);}}onResizeStop={() => {- setResizingWidgetId(null);+ setPageLayoutResizingWidgetId(null);}}onLayoutChange={handleLayoutChangeWithoutPendingPlaceholder}onBreakpointChange={(newBreakpoint) =>diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutInitializationQueryEffect.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutInitializationQueryEffect.tsxindex 5985a0d8df5..8376e0dab8a 100644--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutInitializationQueryEffect.tsx+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutInitializationQueryEffect.tsx@@ -22,9 +22,8 @@ export const PageLayoutInitializationQueryEffect = ({pageLayoutId,onInitialized,}: PageLayoutInitializationQueryEffectProps) => {- const [isInitialized, setIsInitialized] = useAtomComponentState(- pageLayoutIsInitializedComponentState,- );+ const [pageLayoutIsInitialized, setPageLayoutIsInitialized] =+ useAtomComponentState(pageLayoutIsInitializedComponentState);const basePageLayout = useBasePageLayout(pageLayoutId);@@ -70,17 +69,17 @@ export const PageLayoutInitializationQueryEffect = ({);useEffect(() => {- if (!isInitialized && isDefined(pageLayout)) {+ if (!pageLayoutIsInitialized && isDefined(pageLayout)) {initializePageLayout(pageLayout);onInitialized?.(pageLayout);- setIsInitialized(true);+ setPageLayoutIsInitialized(true);}}, [initializePageLayout,- isInitialized,+ pageLayoutIsInitialized,pageLayout,onInitialized,- setIsInitialized,+ setPageLayoutIsInitialized,]);return null;diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutRelationWidgetsSyncEffect.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutRelationWidgetsSyncEffect.tsxindex e51a3be83e6..9119a0f9c74 100644--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutRelationWidgetsSyncEffect.tsx+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutRelationWidgetsSyncEffect.tsx@@ -25,7 +25,7 @@ export const PageLayoutRelationWidgetsSyncEffect = ({}: PageLayoutRelationWidgetsSyncEffectProps) => {const { targetRecordIdentifier, layoutType } = useLayoutRenderingContext();- const isInitialized = useAtomComponentStateValue(+ const pageLayoutIsInitialized = useAtomComponentStateValue(pageLayoutIsInitializedComponentState,);@@ -75,7 +75,7 @@ export const PageLayoutRelationWidgetsSyncEffect = ({);useEffect(() => {- if (!isInitialized) {+ if (!pageLayoutIsInitialized) {return;}@@ -97,7 +97,7 @@ export const PageLayoutRelationWidgetsSyncEffect = ({}, [basePageLayout,boxedRelationFieldMetadataItems,- isInitialized,+ pageLayoutIsInitialized,layoutType,syncPageLayoutWithRelationWidgets,]);diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutRendererContent.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutRendererContent.tsxindex adb32ce234c..682726aa261 100644--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutRendererContent.tsx+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutRendererContent.tsx@@ -63,7 +63,7 @@ export const PageLayoutRendererContent = () => {const { createPageLayoutTab } = useCreatePageLayoutTab(currentPageLayout?.id);const { reorderTabs } = useReorderPageLayoutTabs(currentPageLayout?.id ?? '');- const setTabSettingsOpenTabId = useSetAtomComponentState(+ const setPageLayoutTabSettingsOpenTabId = useSetAtomComponentState(pageLayoutTabSettingsOpenTabIdComponentState,);const { navigatePageLayoutCommandMenu } = useNavigatePageLayoutCommandMenu();@@ -79,7 +79,7 @@ export const PageLayoutRendererContent = () => {shouldEnableTabEditingFeatures(currentPageLayout.type)? () => {const newTabId = createPageLayoutTab(t`Untitled`);- setTabSettingsOpenTabId(newTabId);+ setPageLayoutTabSettingsOpenTabId(newTabId);navigatePageLayoutCommandMenu({commandMenuPage: CommandMenuPages.PageLayoutTabSettings,focusTitleInput: true,diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabList.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabList.tsxindex bbb26a2ae0b..6be8c2a20f2 100644--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabList.tsx+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabList.tsx@@ -143,7 +143,7 @@ export const PageLayoutTabList = ({const { openDropdown } = useOpenDropdown();const { toggleClickOutside } = useClickOutsideListener(dropdownId);- const setIsTabDragging = useSetAtomComponentState(+ const setIsPageLayoutTabDragging = useSetAtomComponentState(isPageLayoutTabDraggingComponentState,componentInstanceId,);@@ -188,9 +188,9 @@ export const PageLayoutTabList = ({};const handleDragStart = useCallback<OnDragStartResponder>(() => {- setIsTabDragging(true);+ setIsPageLayoutTabDragging(true);toggleClickOutside(false);- }, [setIsTabDragging, toggleClickOutside]);+ }, [setIsPageLayoutTabDragging, toggleClickOutside]);const handleDragEnd = useCallback<OnDragEndResponder>((result, provided) => {@@ -199,7 +199,7 @@ export const PageLayoutTabList = ({PAGE_LAYOUT_TAB_LIST_DROPPABLE_IDS.OVERFLOW_TABS;if (!droppedInOverflow) {- setIsTabDragging(false);+ setIsPageLayoutTabDragging(false);}toggleClickOutside(true);@@ -216,18 +216,24 @@ export const PageLayoutTabList = ({});}},- [onReorder, setIsTabDragging, toggleClickOutside, openDropdown, dropdownId],+ [+ onReorder,+ setIsPageLayoutTabDragging,+ toggleClickOutside,+ openDropdown,+ dropdownId,+ ],);const isPageLayoutInEditMode = useAtomComponentStateValue(isPageLayoutInEditModeComponentState,pageLayoutId,);- const tabSettingsOpenTabId = useAtomComponentStateValue(+ const pageLayoutTabSettingsOpenTabId = useAtomComponentStateValue(pageLayoutTabSettingsOpenTabIdComponentState,pageLayoutId,);- const setTabSettingsOpenTabId = useSetAtomComponentState(+ const setPageLayoutTabSettingsOpenTabId = useSetAtomComponentState(pageLayoutTabSettingsOpenTabIdComponentState,pageLayoutId,);@@ -235,16 +241,16 @@ export const PageLayoutTabList = ({const openTabSettings = useCallback((tabId: string) => {- setTabSettingsOpenTabId(tabId);+ setPageLayoutTabSettingsOpenTabId(tabId);navigatePageLayoutCommandMenu({commandMenuPage: CommandMenuPages.PageLayoutTabSettings,resetNavigationStack: true,});},- [setTabSettingsOpenTabId, navigatePageLayoutCommandMenu],+ [setPageLayoutTabSettingsOpenTabId, navigatePageLayoutCommandMenu],);- const isTabSettingsOpen = isDefined(tabSettingsOpenTabId);+ const isTabSettingsOpen = isDefined(pageLayoutTabSettingsOpenTabId);const handleSelectTab = useCallback((tabId: string) => {diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListReorderableOverflowDropdown.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListReorderableOverflowDropdown.tsxindex 8445e7ed284..89bdd818db7 100644--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListReorderableOverflowDropdown.tsx+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListReorderableOverflowDropdown.tsx@@ -81,17 +81,17 @@ export const PageLayoutTabListReorderableOverflowDropdown = ({const shouldShowEditButton =isPageLayoutInEditMode && shouldEnableTabEditingFeatures(pageLayoutType);- const isTabDragging = useAtomComponentStateValue(+ const isPageLayoutTabDragging = useAtomComponentStateValue(isPageLayoutTabDraggingComponentState,instanceId,);- const setIsTabDragging = useSetAtomComponentState(+ const setIsPageLayoutTabDragging = useSetAtomComponentState(isPageLayoutTabDraggingComponentState,instanceId,);- const setTabSettingsOpenTabId = useSetAtomComponentState(+ const setPageLayoutTabSettingsOpenTabId = useSetAtomComponentState(pageLayoutTabSettingsOpenTabIdComponentState,pageLayoutId,);@@ -99,19 +99,19 @@ export const PageLayoutTabListReorderableOverflowDropdown = ({const { navigatePageLayoutCommandMenu } = useNavigatePageLayoutCommandMenu();const handleClose = () => {- if (!isTabDragging) {+ if (!isPageLayoutTabDragging) {onClose();}};const handleTabSelect = (tabId: string) => {- setIsTabDragging(false);+ setIsPageLayoutTabDragging(false);onSelect(tabId);handleClose();};const handleEditClick = (tabId: string) => {- setTabSettingsOpenTabId(tabId);+ setPageLayoutTabSettingsOpenTabId(tabId);navigatePageLayoutCommandMenu({commandMenuPage: CommandMenuPages.PageLayoutTabSettings,});diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListReorderableTab.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListReorderableTab.tsxindex f8d4ea6a55f..796910d1637 100644--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListReorderableTab.tsx+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabListReorderableTab.tsx@@ -27,11 +27,11 @@ export const PageLayoutTabListReorderableTab = ({disabled,onSelect,}: PageLayoutTabListReorderableTabProps) => {- const tabSettingsOpenTabId = useAtomComponentStateValue(+ const pageLayoutTabSettingsOpenTabId = useAtomComponentStateValue(pageLayoutTabSettingsOpenTabIdComponentState,);- const isSettingsOpenForThisTab = tabSettingsOpenTabId === tab.id;+ const isSettingsOpenForThisTab = pageLayoutTabSettingsOpenTabId === tab.id;return (<Draggable draggableId={tab.id} index={index} isDragDisabled={disabled}>{(draggableProvided, draggableSnapshot) => (diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutVerticalListEditor.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutVerticalListEditor.tsxindex de9bdbc1775..2cc8bc9bb72 100644--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutVerticalListEditor.tsx+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutVerticalListEditor.tsx@@ -61,17 +61,17 @@ export const PageLayoutVerticalListEditor = ({isInRightDrawer,});- const setDraggingWidgetId = useSetAtomComponentState(+ const setPageLayoutDraggingWidgetId = useSetAtomComponentState(pageLayoutDraggingWidgetIdComponentState,);return (<DragDropContextonDragStart={(result) => {- setDraggingWidgetId(result.draggableId);+ setPageLayoutDraggingWidgetId(result.draggableId);}}onDragEnd={(result) => {- setDraggingWidgetId(null);+ setPageLayoutDraggingWidgetId(null);onReorder(result);}}>diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreatePageLayoutTab.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreatePageLayoutTab.test.tsxindex e4e7142b94c..03699347607 100644--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreatePageLayoutTab.test.tsx+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreatePageLayoutTab.test.tsx@@ -174,13 +174,13 @@ describe('useCreatePageLayoutTab', () => {const { result } = renderHook(() => {- const getActiveTabId = useAtomComponentStateValue(+ const activeTabId = useAtomComponentStateValue(activeTabIdComponentState,`${PAGE_LAYOUT_TEST_INSTANCE_ID}-tab-list`,);return {createTab: useCreatePageLayoutTab(PAGE_LAYOUT_TEST_INSTANCE_ID),- activeTabId: getActiveTabId,+ activeTabId: activeTabId,};},{diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useDuplicatePageLayoutTab.ts b/packages/twenty-front/src/modules/page-layout/hooks/useDuplicatePageLayoutTab.tsindex 8dcab8c72fd..3a9d4c8599d 100644--- a/packages/twenty-front/src/modules/page-layout/hooks/useDuplicatePageLayoutTab.ts+++ b/packages/twenty-front/src/modules/page-layout/hooks/useDuplicatePageLayoutTab.ts@@ -43,7 +43,7 @@ export const useDuplicatePageLayoutTab = (pageLayoutIdFromProps?: string) => {tabListInstanceId,);- const setTabSettingsOpenTabId = useSetAtomComponentState(+ const setPageLayoutTabSettingsOpenTabId = useSetAtomComponentState(pageLayoutTabSettingsOpenTabIdComponentState,pageLayoutId,);@@ -128,7 +128,7 @@ export const useDuplicatePageLayoutTab = (pageLayoutIdFromProps?: string) => {setActiveTabId(newTabId);- setTabSettingsOpenTabId(newTabId);+ setPageLayoutTabSettingsOpenTabId(newTabId);navigatePageLayoutCommandMenu({commandMenuPage: CommandMenuPages.PageLayoutTabSettings,@@ -144,7 +144,7 @@ export const useDuplicatePageLayoutTab = (pageLayoutIdFromProps?: string) => {pageLayoutCurrentLayouts,pageLayoutDraft,setActiveTabId,- setTabSettingsOpenTabId,+ setPageLayoutTabSettingsOpenTabId,store,],);diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useDuplicatePageLayoutWidget.ts b/packages/twenty-front/src/modules/page-layout/hooks/useDuplicatePageLayoutWidget.tsindex c8ba2ccf9bc..35af390b281 100644--- a/packages/twenty-front/src/modules/page-layout/hooks/useDuplicatePageLayoutWidget.ts+++ b/packages/twenty-front/src/modules/page-layout/hooks/useDuplicatePageLayoutWidget.ts@@ -34,7 +34,7 @@ export const useDuplicatePageLayoutWidget = (pageLayoutId,);- const setEditingWidgetId = useSetAtomComponentState(+ const setPageLayoutEditingWidgetId = useSetAtomComponentState(pageLayoutEditingWidgetIdComponentState,pageLayoutId,);@@ -115,7 +115,7 @@ export const useDuplicatePageLayoutWidget = (tabs: addWidgetToTab(prev.tabs, sourceTab.id, clonedWidget),}));- setEditingWidgetId(newWidgetId);+ setPageLayoutEditingWidgetId(newWidgetId);const { scrollWrapperElement } = getScrollWrapperElement();@@ -139,7 +139,7 @@ export const useDuplicatePageLayoutWidget = ([pageLayoutCurrentLayoutsState,pageLayoutDraftState,- setEditingWidgetId,+ setPageLayoutEditingWidgetId,getScrollWrapperElement,store,],diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetRenderer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetRenderer.tsxindex 1f9d584fc35..126d60f58ee 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetRenderer.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetRenderer.tsx@@ -54,23 +54,23 @@ export const WidgetRenderer = ({ widget }: WidgetRendererProps) => {isPageLayoutInEditModeComponentState,);- const draggingWidgetId = useAtomComponentStateValue(+ const pageLayoutDraggingWidgetId = useAtomComponentStateValue(pageLayoutDraggingWidgetIdComponentState,);- const resizingWidgetId = useAtomComponentStateValue(+ const pageLayoutResizingWidgetId = useAtomComponentStateValue(pageLayoutResizingWidgetIdComponentState,);- const currentlyEditingWidgetId = useAtomComponentStateValue(+ const pageLayoutEditingWidgetId = useAtomComponentStateValue(pageLayoutEditingWidgetIdComponentState,);- const isEditing = currentlyEditingWidgetId === widget.id;+ const isEditing = pageLayoutEditingWidgetId === widget.id;- const isDragging = draggingWidgetId === widget.id;+ const isDragging = pageLayoutDraggingWidgetId === widget.id;- const isResizing = resizingWidgetId === widget.id;+ const isResizing = pageLayoutResizingWidgetId === widget.id;const { hasAccess, restriction } = useWidgetPermissions(widget);@@ -109,17 +109,17 @@ export const WidgetRenderer = ({ widget }: WidgetRendererProps) => {deletePageLayoutWidget(widget.id);};- const setIsHovered = useSetAtomComponentFamilyState(+ const setWidgetCardHovered = useSetAtomComponentFamilyState(widgetCardHoveredComponentFamilyState,widget.id,);const handleMouseEnter = () => {- setIsHovered(true);+ setWidgetCardHovered(true);};const handleMouseLeave = () => {- setIsHovered(false);+ setWidgetCardHovered(false);};const variant = getWidgetCardVariant({diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetCellEditModePortal.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetCellEditModePortal.tsxindex 40b6e49d0ad..a4ae0c82495 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetCellEditModePortal.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetCellEditModePortal.tsx@@ -24,12 +24,14 @@ export const FieldWidgetCellEditModePortal = ({}: FieldWidgetCellEditModePortalProps) => {const { isEditing } = useIsFieldWidgetEditing();- const setIsHovered = useSetAtomComponentState(fieldWidgetHoverComponentState);+ const setFieldWidgetHover = useSetAtomComponentState(+ fieldWidgetHoverComponentState,+ );const { closeFieldInput } = useOpenFieldWidgetFieldInputEditMode();const handleCloseEditMode = () => {- setIsHovered(false);+ setFieldWidgetHover(false);closeFieldInput();};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetDisplay.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetDisplay.tsxindex 2f969946721..1ade1d33bac 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetDisplay.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetDisplay.tsx@@ -41,7 +41,7 @@ export const FieldWidgetDisplay = ({}: FieldWidgetDisplayProps) => {const widget = useCurrentWidget();- const [isHovered, setIsHovered] = useAtomComponentState(+ const [fieldWidgetHover, setFieldWidgetHover] = useAtomComponentState(fieldWidgetHoverComponentState,);@@ -63,8 +63,8 @@ export const FieldWidgetDisplay = ({objectMetadataId: objectMetadataItem.id,});- const handleMouseEnter = () => setIsHovered(true);- const handleMouseLeave = () => setIsHovered(false);+ const handleMouseEnter = () => setFieldWidgetHover(true);+ const handleMouseLeave = () => setFieldWidgetHover(false);return (<RecordFieldsScopeContextProvider value={{ scopeInstanceId: instanceId }}>@@ -116,7 +116,7 @@ export const FieldWidgetDisplay = ({fieldMetadataItem={fieldMetadataItem}recordId={recordId}instanceId={instanceId}- isHovered={isHovered}+ isHovered={fieldWidgetHover}onMouseLeave={handleMouseLeave}/><FieldWidgetCellEditModePortaldiff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationEditAction.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationEditAction.tsxindex 1be0eee0e88..4f6d7b15a76 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationEditAction.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationEditAction.tsx@@ -99,7 +99,7 @@ export const FieldWidgetRelationEditAction = ({instanceId: scopeInstanceId,});- const isRelationSelectionDropdownOpen = useAtomComponentStateValue(+ const isDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,relationSelectionDropdownId,);@@ -108,7 +108,7 @@ export const FieldWidgetRelationEditAction = ({const dropdownTriggerClickableComponent = (<StyledEditButton- isDropdownOpen={isRelationSelectionDropdownOpen}+ isDropdownOpen={isDropdownOpen}isMobile={isMobile}Icon={IconPencil}accent="secondary"diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetCellEditModePortal.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetCellEditModePortal.tsxindex 1477a31915d..2689e79bf91 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetCellEditModePortal.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetCellEditModePortal.tsx@@ -25,15 +25,18 @@ export const FieldsWidgetCellEditModePortal = ({RecordFieldListComponentInstanceContext,);- const editModePosition = useAtomComponentStateValue(+ const recordFieldListCellEditModePosition = useAtomComponentStateValue(recordFieldListCellEditModePositionComponentState,);- const editedFieldMetadataItem = isDefined(editModePosition)- ? flattenedFieldMetadataItems.at(editModePosition)+ const editedFieldMetadataItem = isDefined(recordFieldListCellEditModePosition)+ ? flattenedFieldMetadataItems.at(recordFieldListCellEditModePosition): undefined;- if (!isDefined(editModePosition) || !isDefined(editedFieldMetadataItem)) {+ if (+ !isDefined(recordFieldListCellEditModePosition) ||+ !isDefined(editedFieldMetadataItem)+ ) {return null;}diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetCellHoveredPortal.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetCellHoveredPortal.tsxindex b2ecd3cf9d9..aadf2180f98 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetCellHoveredPortal.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetCellHoveredPortal.tsx@@ -24,15 +24,18 @@ export const FieldsWidgetCellHoveredPortal = ({RecordFieldListComponentInstanceContext,);- const hoverPosition = useAtomComponentStateValue(+ const recordFieldListHoverPosition = useAtomComponentStateValue(recordFieldListHoverPositionComponentState,);- const hoveredFieldMetadataItem = isDefined(hoverPosition)- ? flattenedFieldMetadataItems.at(hoverPosition)+ const hoveredFieldMetadataItem = isDefined(recordFieldListHoverPosition)+ ? flattenedFieldMetadataItems.at(recordFieldListHoverPosition): undefined;- if (!isDefined(hoverPosition) || !isDefined(hoveredFieldMetadataItem)) {+ if (+ !isDefined(recordFieldListHoverPosition) ||+ !isDefined(hoveredFieldMetadataItem)+ ) {return null;}diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetGroupsDraft.ts b/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetGroupsDraft.tsindex ad411a49b7e..ef79568e474 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetGroupsDraft.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetGroupsDraft.ts@@ -14,14 +14,14 @@ export const useFieldsWidgetGroupsDraft = ({}: UseFieldsWidgetGroupsDraftParams): {draftGroups: FieldsWidgetGroup[];} => {- const allDraftGroups = useAtomComponentStateValue(+ const fieldsWidgetGroupsDraft = useAtomComponentStateValue(fieldsWidgetGroupsDraftComponentState,pageLayoutId,);const draftGroups = useMemo(- () => allDraftGroups[widgetId] ?? [],- [allDraftGroups, widgetId],+ () => fieldsWidgetGroupsDraft[widgetId] ?? [],+ [fieldsWidgetGroupsDraft, widgetId],);return { draftGroups };diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetGroupsForDisplay.ts b/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetGroupsForDisplay.tsindex e3a1428bd23..e94a46649d8 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetGroupsForDisplay.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetGroupsForDisplay.ts@@ -22,7 +22,7 @@ export const useFieldsWidgetGroupsForDisplay = ({isPageLayoutInEditModeComponentState,);- const allDraftGroups = useAtomComponentStateValue(+ const fieldsWidgetGroupsDraft = useAtomComponentStateValue(fieldsWidgetGroupsDraftComponentState,);@@ -31,7 +31,7 @@ export const useFieldsWidgetGroupsForDisplay = ({objectNameSingular,});- const draftGroupsForWidget = allDraftGroups[widgetId];+ const draftGroupsForWidget = fieldsWidgetGroupsDraft[widgetId];const hasDraftGroups =isDefined(draftGroupsForWidget) && draftGroupsForWidget.length > 0;diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidgetLegend.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidgetLegend.tsxindex 89568cbb0b2..6b62e069481 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidgetLegend.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidgetLegend.tsx@@ -152,13 +152,12 @@ export const GraphWidgetLegend = ({const isInteractive = !isPageLayoutInEditMode;- const setHighlightedLegendId = useSetAtomComponentState(+ const setGraphWidgetHighlightedLegendId = useSetAtomComponentState(graphWidgetHighlightedLegendIdComponentState,);- const [hiddenLegendIds, setHiddenLegendIds] = useAtomComponentState(- graphWidgetHiddenLegendIdsComponentState,- );+ const [graphWidgetHiddenLegendIds, setGraphWidgetHiddenLegendIds] =+ useAtomComponentState(graphWidgetHiddenLegendIdsComponentState);const itemIds = items.map((item) => item.id);@@ -167,22 +166,22 @@ export const GraphWidgetLegend = ({isInteractive,});- if (isPageLayoutInEditMode && hiddenLegendIds.length > 0) {- setHiddenLegendIds([]);+ if (isPageLayoutInEditMode && graphWidgetHiddenLegendIds.length > 0) {+ setGraphWidgetHiddenLegendIds([]);}const handleLegendItemMouseEnter = (itemId: string) => {if (!isInteractive) {return;}- setHighlightedLegendId(itemId);+ setGraphWidgetHighlightedLegendId(itemId);};const handleLegendItemMouseLeave = () => {if (!isInteractive) {return;}- setHighlightedLegendId(null);+ setGraphWidgetHighlightedLegendId(null);};const shouldShowLegend = show && items.length > 1;@@ -302,7 +301,9 @@ export const GraphWidgetLegend = ({centered={!needsPagination}>{visibleItems.map((item) => {- const isHidden = hiddenLegendIds.includes(item.id);+ const isHidden = graphWidgetHiddenLegendIds.includes(+ item.id,+ );return (<StyledLegendItemkey={item.id}diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/components/BarChart.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/components/BarChart.tsxindex 87871d97a20..86f987111c2 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/components/BarChart.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/components/BarChart.tsx@@ -77,7 +77,7 @@ export const BarChart = ({hasNoData = false,}: BarChartProps) => {const theme = useTheme();- const highlightedLegendId = useAtomComponentStateValue(+ const graphWidgetHighlightedLegendId = useAtomComponentStateValue(graphWidgetHighlightedLegendIdComponentState,);@@ -225,7 +225,7 @@ export const BarChart = ({groupMode={groupMode}hasNegativeValues={hasNegativeValues}hasNoData={hasNoData}- highlightedLegendId={highlightedLegendId}+ highlightedLegendId={graphWidgetHighlightedLegendId}hoveredSlice={hoveredSlice}innerHeight={innerHeight}innerWidth={innerWidth}diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/components/BarChartTooltip.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/components/BarChartTooltip.tsxindex 6a2ed948778..a6589ffe6bc 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/components/BarChartTooltip.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/components/BarChartTooltip.tsx@@ -30,7 +30,7 @@ export const BarChartTooltip = ({onMouseEnter,onMouseLeave,}: BarChartTooltipProps) => {- const tooltipState = useAtomComponentStateValue(+ const graphWidgetBarTooltip = useAtomComponentStateValue(graphWidgetBarTooltipComponentState,);@@ -41,27 +41,27 @@ export const BarChartTooltip = ({const handleTooltipClick: (() => void) | undefined = isDefined(onSliceClick)? () => {- if (isDefined(tooltipState)) {- onSliceClick(tooltipState.slice);+ if (isDefined(graphWidgetBarTooltip)) {+ onSliceClick(graphWidgetBarTooltip.slice);}}: undefined;- const tooltipData = !isDefined(tooltipState)+ const tooltipData = !isDefined(graphWidgetBarTooltip)? null: getBarChartTooltipData({- slice: tooltipState.slice,+ slice: graphWidgetBarTooltip.slice,dataByIndexValue,enrichedKeys,formatOptions,});- const reference = !isDefined(tooltipState)+ const reference = !isDefined(graphWidgetBarTooltip)? null: createVirtualElementFromContainerOffset(containerElement,- tooltipState.offsetLeft,- tooltipState.offsetTop,+ graphWidgetBarTooltip.offsetLeft,+ graphWidgetBarTooltip.offsetTop,);return (diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/components/GraphWidgetBarChart.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/components/GraphWidgetBarChart.tsxindex bd671acb89a..b4dc7ab7280 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/components/GraphWidgetBarChart.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/components/GraphWidgetBarChart.tsx@@ -91,30 +91,32 @@ export const GraphWidgetBarChart = ({const [chartHeight, setChartHeight] = useState<number>(0);const containerRef = useRef<HTMLDivElement>(null);- const setActiveBarTooltip = useSetAtomComponentState(+ const setGraphWidgetBarTooltip = useSetAtomComponentState(graphWidgetBarTooltipComponentState,);- const setHoveredSliceIndex = useSetAtomComponentState(+ const setGraphWidgetHoveredSliceIndex = useSetAtomComponentState(graphWidgetHoveredSliceIndexComponentState,);- const hoveredSliceIndexValue = useAtomComponentStateValue(+ const graphWidgetHoveredSliceIndex = useAtomComponentStateValue(graphWidgetHoveredSliceIndexComponentState,);- const draggingWidgetId = useAtomComponentStateValue(+ const pageLayoutDraggingWidgetId = useAtomComponentStateValue(pageLayoutDraggingWidgetIdComponentState,);- const resizingWidgetId = useAtomComponentStateValue(+ const pageLayoutResizingWidgetId = useAtomComponentStateValue(pageLayoutResizingWidgetIdComponentState,);const isSidePanelAnimating = useAtomStateValue(isSidePanelAnimatingState);const isLayoutAnimating =- isSidePanelAnimating || draggingWidgetId === id || resizingWidgetId === id;+ isSidePanelAnimating ||+ pageLayoutDraggingWidgetId === id ||+ pageLayoutResizingWidgetId === id;const allowDataTransitions = !isLayoutAnimating;@@ -157,8 +159,8 @@ export const GraphWidgetBarChart = ({const hasClickableItems = isDefined(onSliceClick);const hideTooltip = () => {- setActiveBarTooltip(null);- setHoveredSliceIndex(null);+ setGraphWidgetBarTooltip(null);+ setGraphWidgetHoveredSliceIndex(null);};const debouncedHideTooltip = useDebouncedCallback(hideTooltip, 300);@@ -172,8 +174,8 @@ export const GraphWidgetBarChart = ({const handleSliceHover = (sliceData: BarChartSliceHoverData | null) => {if (isDefined(sliceData)) {debouncedHideTooltip.cancel();- setHoveredSliceIndex(sliceData.slice.indexValue);- setActiveBarTooltip({+ setGraphWidgetHoveredSliceIndex(sliceData.slice.indexValue);+ setGraphWidgetBarTooltip({offsetLeft: sliceData.offsetLeft,offsetTop: sliceData.offsetTop,slice: sliceData.slice,@@ -224,7 +226,7 @@ export const GraphWidgetBarChart = ({formatOptions={formatOptions}groupMode={groupMode}hasNoData={hasNoData}- hoveredSliceIndexValue={hoveredSliceIndexValue}+ hoveredSliceIndexValue={graphWidgetHoveredSliceIndex}indexBy={indexBy}keys={orderedKeys}layout={layout}diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/hooks/useBarChartData.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/hooks/useBarChartData.tsindex 0290b6401d6..90d5e06cef4 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/hooks/useBarChartData.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/hooks/useBarChartData.ts@@ -24,7 +24,7 @@ export const useBarChartData = ({seriesLabels,colorMode,}: UseBarChartDataProps) => {- const hiddenLegendIds = useAtomComponentStateValue(+ const graphWidgetHiddenLegendIds = useAtomComponentStateValue(graphWidgetHiddenLegendIdsComponentState,);@@ -62,10 +62,12 @@ export const useBarChartData = ({color: item.colorScheme.solid,}));- const visibleKeys = keys.filter((key) => !hiddenLegendIds.includes(key));+ const visibleKeys = keys.filter(+ (key) => !graphWidgetHiddenLegendIds.includes(key),+ );const enrichedKeys = allEnrichedKeys.filter(- (item) => !hiddenLegendIds.includes(item.key),+ (item) => !graphWidgetHiddenLegendIds.includes(item.key),);const enrichedKeysMap = useMemo(diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/CustomCrosshairLayer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/CustomCrosshairLayer.tsxindex 16f0cb9dfe8..d9a44d17528 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/CustomCrosshairLayer.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/CustomCrosshairLayer.tsx@@ -41,7 +41,7 @@ export const CustomCrosshairLayer = ({onRectLeave,}: CustomCrosshairLayerProps) => {const theme = useTheme();- const crosshairX = useAtomComponentStateValue(+ const graphWidgetLineCrosshairX = useAtomComponentStateValue(graphWidgetLineCrosshairXComponentState,);@@ -109,7 +109,7 @@ export const CustomCrosshairLayer = ({return;}- if (sliceData.sliceX === crosshairX) {+ if (sliceData.sliceX === graphWidgetLineCrosshairX) {return;}@@ -140,18 +140,26 @@ export const CustomCrosshairLayer = ({return (<g>- {isDefined(crosshairX) && (+ {isDefined(graphWidgetLineCrosshairX) && (<motion.line- x1={crosshairX}- x2={crosshairX}+ x1={graphWidgetLineCrosshairX}+ x2={graphWidgetLineCrosshairX}y1={0}y2={innerHeight}stroke={theme.font.color.primary}strokeWidth={LINE_CHART_CONSTANTS.CROSSHAIR_STROKE_WIDTH}strokeOpacity={LINE_CHART_CONSTANTS.CROSSHAIR_STROKE_OPACITY}strokeDasharray={LINE_CHART_CONSTANTS.CROSSHAIR_DASH_ARRAY}- initial={{ x1: crosshairX, x2: crosshairX, opacity: 0 }}- animate={{ x1: crosshairX, x2: crosshairX, opacity: 0.5 }}+ initial={{+ x1: graphWidgetLineCrosshairX,+ x2: graphWidgetLineCrosshairX,+ opacity: 0,+ }}+ animate={{+ x1: graphWidgetLineCrosshairX,+ x2: graphWidgetLineCrosshairX,+ opacity: 0.5,+ }}exit={{ opacity: 0 }}transition={transition}pointerEvents="none"diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/CustomLinesLayer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/CustomLinesLayer.tsxindex ba1483245c5..6a7823e07e2 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/CustomLinesLayer.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/CustomLinesLayer.tsx@@ -31,11 +31,13 @@ const AnimatedLinePath = ({}: AnimatedLinePathProps) => {const animatedPath = useAnimatedPath(path);- const highlightedLegendId = useAtomComponentStateValue(+ const graphWidgetHighlightedLegendId = useAtomComponentStateValue(graphWidgetHighlightedLegendIdComponentState,);- const isDimmed = isDefined(highlightedLegendId) && highlightedLegendId !== id;+ const isDimmed =+ isDefined(graphWidgetHighlightedLegendId) &&+ graphWidgetHighlightedLegendId !== id;return (<animated.pathdiff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/GraphLineChartTooltip.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/GraphLineChartTooltip.tsxindex 17da3695c43..0a8835147bf 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/GraphLineChartTooltip.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/GraphLineChartTooltip.tsx@@ -29,7 +29,7 @@ export const GraphLineChartTooltip = ({onMouseEnter,onMouseLeave,}: GraphLineChartTooltipProps) => {- const tooltipState = useAtomComponentStateValue(+ const graphWidgetLineTooltip = useAtomComponentStateValue(graphWidgetLineTooltipComponentState,);@@ -40,11 +40,12 @@ export const GraphLineChartTooltip = ({const handleTooltipClick: (() => void) | undefined = isDefined(onSliceClick)? () => {- if (!isDefined(tooltipState)) return;+ if (!isDefined(graphWidgetLineTooltip)) return;- const highlightedPoint = tooltipState.slice.points.find(+ const highlightedPoint = graphWidgetLineTooltip.slice.points.find((point) =>- String(point.seriesId) === tooltipState.highlightedSeriesId,+ String(point.seriesId) ===+ graphWidgetLineTooltip.highlightedSeriesId,);if (!isDefined(highlightedPoint)) return;@@ -53,21 +54,21 @@ export const GraphLineChartTooltip = ({}: undefined;- const tooltipData = !isDefined(tooltipState)+ const tooltipData = !isDefined(graphWidgetLineTooltip)? null: getLineChartTooltipData({- slice: tooltipState.slice,+ slice: graphWidgetLineTooltip.slice,enrichedSeries,formatOptions,isStacked,});- const reference = !isDefined(tooltipState)+ const reference = !isDefined(graphWidgetLineTooltip)? null: createVirtualElementFromContainerOffset(containerElement,- tooltipState.offsetLeft,- tooltipState.offsetTop,+ graphWidgetLineTooltip.offsetLeft,+ graphWidgetLineTooltip.offsetTop,);return (@@ -77,7 +78,7 @@ export const GraphLineChartTooltip = ({tooltipOffsetFromAnchorInPx={LINE_CHART_CONSTANTS.TOOLTIP_OFFSET_PX}items={tooltipData?.items ?? []}indexLabel={tooltipData?.indexLabel}- highlightedKey={tooltipState?.highlightedSeriesId}+ highlightedKey={graphWidgetLineTooltip?.highlightedSeriesId}onGraphWidgetTooltipClick={handleTooltipClick}onMouseEnter={onMouseEnter}onMouseLeave={onMouseLeave}diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/GraphWidgetLineChart.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/GraphWidgetLineChart.tsxindex c9ca88cd3bd..524050ca25c 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/GraphWidgetLineChart.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/GraphWidgetLineChart.tsx@@ -131,18 +131,18 @@ export const GraphWidgetLineChart = ({const hasClickableItems = isDefined(onSliceClick);- const setActiveLineTooltip = useSetAtomComponentState(+ const setGraphWidgetLineTooltip = useSetAtomComponentState(graphWidgetLineTooltipComponentState,);- const setCrosshairX = useSetAtomComponentState(+ const setGraphWidgetLineCrosshairX = useSetAtomComponentState(graphWidgetLineCrosshairXComponentState,);const hideTooltip = useCallback(() => {- setActiveLineTooltip(null);- setCrosshairX(null);- }, [setActiveLineTooltip, setCrosshairX]);+ setGraphWidgetLineTooltip(null);+ setGraphWidgetLineCrosshairX(null);+ }, [setGraphWidgetLineTooltip, setGraphWidgetLineCrosshairX]);const debouncedHideTooltip = useDebouncedCallback(hideTooltip, 300);@@ -189,8 +189,8 @@ export const GraphWidgetLineChart = ({const offsetTop = sliceData.mouseY + margins.top;debouncedHideTooltip.cancel();- setCrosshairX(sliceData.sliceX);- setActiveLineTooltip({+ setGraphWidgetLineCrosshairX(sliceData.sliceX);+ setGraphWidgetLineTooltip({slice,offsetLeft,offsetTop,diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/LineAnimatedAreaPath.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/LineAnimatedAreaPath.tsxindex a02706c40ca..e528e52f695 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/LineAnimatedAreaPath.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/components/LineAnimatedAreaPath.tsx@@ -18,11 +18,13 @@ export const LineAnimatedAreaPath = ({}: LineAnimatedAreaPathProps) => {const animatedPath = useAnimatedPath(path);- const highlightedLegendId = useAtomComponentStateValue(+ const graphWidgetHighlightedLegendId = useAtomComponentStateValue(graphWidgetHighlightedLegendIdComponentState,);- const isDimmed = isDefined(highlightedLegendId) && highlightedLegendId !== id;+ const isDimmed =+ isDefined(graphWidgetHighlightedLegendId) &&+ graphWidgetHighlightedLegendId !== id;return (<animated.pathdiff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/hooks/useLineChartData.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/hooks/useLineChartData.tsindex bf5af19a6b3..43d19b160e9 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/hooks/useLineChartData.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/hooks/useLineChartData.ts@@ -22,7 +22,7 @@ export const useLineChartData = ({id,colorMode,}: UseLineChartDataProps) => {- const hiddenLegendIds = useAtomComponentStateValue(+ const graphWidgetHiddenLegendIds = useAtomComponentStateValue(graphWidgetHiddenLegendIdsComponentState,);@@ -55,11 +55,11 @@ export const useLineChartData = ({);const visibleData = data.filter(- (series) => !hiddenLegendIds.includes(series.id),+ (series) => !graphWidgetHiddenLegendIds.includes(series.id),);const enrichedSeries = allEnrichedSeries.filter(- (series) => !hiddenLegendIds.includes(series.id),+ (series) => !graphWidgetHiddenLegendIds.includes(series.id),);const nivoData: LineSeries[] = visibleData.map((series) => ({diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/components/CustomArcsLayer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/components/CustomArcsLayer.tsxindex 4bb8f0035f1..4cb5703315e 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/components/CustomArcsLayer.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/components/CustomArcsLayer.tsx@@ -27,7 +27,7 @@ export const CustomArcsLayer = ({onMouseLeave,onClick,}: CustomArcsLayerProps) => {- const highlightedLegendId = useAtomComponentStateValue(+ const graphWidgetHighlightedLegendId = useAtomComponentStateValue(graphWidgetHighlightedLegendIdComponentState,);@@ -37,8 +37,8 @@ export const CustomArcsLayer = ({<g transform={`translate(${centerX},${centerY})`}>{transition((_, datum) => {const isDimmed =- isDefined(highlightedLegendId) &&- String(highlightedLegendId) !== String(datum.id);+ isDefined(graphWidgetHighlightedLegendId) &&+ String(graphWidgetHighlightedLegendId) !== String(datum.id);const arcLength = datum.arc.endAngle - datum.arc.startAngle;const padAngleRadians = (padAngle * Math.PI) / 180;const clampedPadAngle = Math.min(diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/components/GraphPieChartTooltip.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/components/GraphPieChartTooltip.tsxindex 548d3af9a3e..8e256294749 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/components/GraphPieChartTooltip.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/components/GraphPieChartTooltip.tsx@@ -25,7 +25,7 @@ export const GraphPieChartTooltip = ({displayType,onSliceClick,}: GraphPieChartTooltipProps) => {- const tooltipState = useAtomComponentStateValue(+ const graphWidgetPieTooltip = useAtomComponentStateValue(graphWidgetPieTooltipComponentState,);@@ -34,10 +34,10 @@ export const GraphPieChartTooltip = ({return null;}- const tooltipData = !isDefined(tooltipState)+ const tooltipData = !isDefined(graphWidgetPieTooltip)? null: getPieChartTooltipData({- datum: tooltipState.datum,+ datum: graphWidgetPieTooltip.datum,enrichedData,formatOptions,displayType,@@ -45,18 +45,18 @@ export const GraphPieChartTooltip = ({const handleTooltipClick: (() => void) | undefined = isDefined(onSliceClick)? () => {- if (isDefined(tooltipState)) {- onSliceClick(tooltipState.datum.data);+ if (isDefined(graphWidgetPieTooltip)) {+ onSliceClick(graphWidgetPieTooltip.datum.data);}}: undefined;- const reference = !isDefined(tooltipState)+ const reference = !isDefined(graphWidgetPieTooltip)? null: createVirtualElementFromContainerOffset(containerElement,- tooltipState.offsetLeft,- tooltipState.offsetTop,+ graphWidgetPieTooltip.offsetLeft,+ graphWidgetPieTooltip.offsetTop,);return (diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/components/GraphWidgetPieChart.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/components/GraphWidgetPieChart.tsxindex bb78d3b0565..ef8d7c46129 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/components/GraphWidgetPieChart.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/components/GraphWidgetPieChart.tsx@@ -91,7 +91,7 @@ export const GraphWidgetPieChart = ({const theme = useTheme();const colorRegistry = createGraphColorRegistry(theme);const containerRef = useRef<HTMLDivElement>(null);- const setActivePieTooltip = useSetAtomComponentState(+ const setGraphWidgetPieTooltip = useSetAtomComponentState(graphWidgetPieTooltipComponentState,);@@ -117,18 +117,18 @@ export const GraphWidgetPieChart = ({if (!isDefined(containerRef.current)) return;const containerRect = containerRef.current.getBoundingClientRect();- setActivePieTooltip({+ setGraphWidgetPieTooltip({datum,offsetLeft: event.clientX - containerRect.left,offsetTop: event.clientY - containerRect.top,});},- [setActivePieTooltip],+ [setGraphWidgetPieTooltip],);const handleSliceLeave = useCallback(() => {- setActivePieTooltip(null);- }, [setActivePieTooltip]);+ setGraphWidgetPieTooltip(null);+ }, [setGraphWidgetPieTooltip]);const hasNoData = useMemo(() =>diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/hooks/usePieChartData.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/hooks/usePieChartData.tsindex 7b2dc73bd26..cfc776ad467 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/hooks/usePieChartData.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/hooks/usePieChartData.ts@@ -20,7 +20,7 @@ export const usePieChartData = ({colorRegistry,colorMode,}: UsePieChartDataProps) => {- const hiddenLegendIds = useAtomComponentStateValue(+ const graphWidgetHiddenLegendIds = useAtomComponentStateValue(graphWidgetHiddenLegendIdsComponentState,);@@ -54,7 +54,7 @@ export const usePieChartData = ({}));const enrichedData = allEnrichedData.filter(- (item) => !hiddenLegendIds.includes(item.id),+ (item) => !graphWidgetHiddenLegendIds.includes(item.id),);const enrichedDataMap = useMemo(diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/hooks/useLegendItemToggle.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/hooks/useLegendItemToggle.tsindex d39c62b8f9d..7fe8083acd8 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/hooks/useLegendItemToggle.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/hooks/useLegendItemToggle.ts@@ -11,7 +11,7 @@ export const useLegendItemToggle = ({itemIds,isInteractive,}: UseLegendItemToggleProps) => {- const setHiddenLegendIds = useSetAtomComponentState(+ const setGraphWidgetHiddenLegendIds = useSetAtomComponentState(graphWidgetHiddenLegendIdsComponentState,);@@ -19,7 +19,7 @@ export const useLegendItemToggle = ({(itemId: string) => {if (!isInteractive) return;- setHiddenLegendIds((previousHiddenIds) => {+ setGraphWidgetHiddenLegendIds((previousHiddenIds) => {const hasStaleIds = previousHiddenIds.some((id) => !itemIds.includes(id),);@@ -40,7 +40,7 @@ export const useLegendItemToggle = ({return [...validHiddenIds, itemId];});},- [isInteractive, itemIds, setHiddenLegendIds],+ [isInteractive, itemIds, setGraphWidgetHiddenLegendIds],);return { toggleLegendItem };diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/StandaloneRichTextWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/StandaloneRichTextWidget.tsxindex a2937c18202..b9f727b09a2 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/StandaloneRichTextWidget.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/StandaloneRichTextWidget.tsx@@ -43,7 +43,7 @@ export const StandaloneRichTextWidget = ({isPageLayoutInEditModeComponentState,);- const editingWidgetId = useAtomComponentStateValue(+ const pageLayoutEditingWidgetId = useAtomComponentStateValue(pageLayoutEditingWidgetIdComponentState,);@@ -73,7 +73,7 @@ export const StandaloneRichTextWidget = ({skip: !isDefined(dashboardId),});- const isThisWidgetBeingEdited = editingWidgetId === widget.id;+ const isThisWidgetBeingEdited = pageLayoutEditingWidgetId === widget.id;const isEditable = isPageLayoutInEditMode && isThisWidgetBeingEdited;if (!isDefined(dashboardId)) {diff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsxindex 314cd61a512..a2ebaea68c3 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx@@ -90,7 +90,7 @@ export const WidgetCardHeader = ({}: WidgetCardHeaderProps) => {const theme = useTheme();- const isWidgetCardHovered = useAtomComponentFamilyStateValue(+ const widgetCardHovered = useAtomComponentFamilyStateValue(widgetCardHoveredComponentFamilyState,widgetId,);@@ -123,7 +123,7 @@ export const WidgetCardHeader = ({isInEditMode &&isDeletingWidgetEnabled &&onRemove &&- isWidgetCardHovered && (+ widgetCardHovered && (<StyledIconButtonContainerinitial={{ width: 0, opacity: 0 }}animate={{ width: 'auto', opacity: 1 }}diff --git a/packages/twenty-front/src/modules/prefetch/components/PrefetchRunFavoriteQueriesEffect.tsx b/packages/twenty-front/src/modules/prefetch/components/PrefetchRunFavoriteQueriesEffect.tsxindex a035b00fe61..73dc9c44133 100644--- a/packages/twenty-front/src/modules/prefetch/components/PrefetchRunFavoriteQueriesEffect.tsx+++ b/packages/twenty-front/src/modules/prefetch/components/PrefetchRunFavoriteQueriesEffect.tsx@@ -37,18 +37,21 @@ export const PrefetchRunFavoriteQueriesEffect = () => {const { objectMetadataItems } = useObjectMetadataItems();- const setIsPrefetchFavoritesLoaded = useSetAtomFamilyState(+ const setPrefetchIsLoaded = useSetAtomFamilyState(prefetchIsLoadedFamilyState,PrefetchKey.AllFavorites,);- const setIsPrefetchFavoritesFoldersLoaded = useSetAtomFamilyState(+ // eslint-disable-next-line twenty/matching-state-variable+ const setPrefetchIsLoadedFolders = useSetAtomFamilyState(prefetchIsLoadedFamilyState,PrefetchKey.AllFavoritesFolders,);- const setFavoritesState = useSetAtomState(prefetchFavoritesState);- const setFavoriteFoldersState = useSetAtomState(prefetchFavoriteFoldersState);+ const setPrefetchFavorites = useSetAtomState(prefetchFavoritesState);+ const setPrefetchFavoriteFolders = useSetAtomState(+ prefetchFavoriteFoldersState,+ );const { objectMetadataItem: favoriteObjectMetadataItem } =useObjectMetadataItem({@@ -90,10 +93,10 @@ export const PrefetchRunFavoriteQueriesEffect = () => {(newFavorites: Favorite[]) => {const existingFavorites = store.get(prefetchFavoritesState.atom);if (!isDeeplyEqual(existingFavorites, newFavorites)) {- setFavoritesState(newFavorites);+ setPrefetchFavorites(newFavorites);}},- [setFavoritesState, store],+ [setPrefetchFavorites, store],);const setPrefetchFavoriteFoldersStateIfChanged = useCallback(@@ -102,34 +105,30 @@ export const PrefetchRunFavoriteQueriesEffect = () => {prefetchFavoriteFoldersState.atom,);if (!isDeeplyEqual(existingFavoriteFolders, newFavoriteFolders)) {- setFavoriteFoldersState(newFavoriteFolders);+ setPrefetchFavoriteFolders(newFavoriteFolders);}},- [setFavoriteFoldersState, store],+ [setPrefetchFavoriteFolders, store],);useEffect(() => {if (isDefined(favorites)) {setPrefetchFavoritesStateIfChanged(favorites as Favorite[]);- setIsPrefetchFavoritesLoaded(true);+ setPrefetchIsLoaded(true);}- }, [- favorites,- setPrefetchFavoritesStateIfChanged,- setIsPrefetchFavoritesLoaded,- ]);+ }, [favorites, setPrefetchFavoritesStateIfChanged, setPrefetchIsLoaded]);useEffect(() => {if (isDefined(favoriteFolders)) {setPrefetchFavoriteFoldersStateIfChanged(favoriteFolders as FavoriteFolder[],);- setIsPrefetchFavoritesFoldersLoaded(true);+ setPrefetchIsLoadedFolders(true);}}, [favoriteFolders,setPrefetchFavoriteFoldersStateIfChanged,- setIsPrefetchFavoritesFoldersLoaded,+ setPrefetchIsLoadedFolders,]);return <></>;diff --git a/packages/twenty-front/src/modules/prefetch/components/PrefetchRunNavigationMenuItemQueriesEffect.tsx b/packages/twenty-front/src/modules/prefetch/components/PrefetchRunNavigationMenuItemQueriesEffect.tsxindex c763aed596d..6448c58f37d 100644--- a/packages/twenty-front/src/modules/prefetch/components/PrefetchRunNavigationMenuItemQueriesEffect.tsx+++ b/packages/twenty-front/src/modules/prefetch/components/PrefetchRunNavigationMenuItemQueriesEffect.tsx@@ -31,12 +31,12 @@ export const PrefetchRunNavigationMenuItemQueriesEffect = () => {const isWorkspaceActive =currentWorkspace?.activationStatus === WorkspaceActivationStatus.ACTIVE;- const setIsPrefetchNavigationMenuItemsLoaded = useSetAtomFamilyState(+ const setPrefetchIsLoaded = useSetAtomFamilyState(prefetchIsLoadedFamilyState,PrefetchKey.AllNavigationMenuItems,);- const setNavigationMenuItemsState = useSetAtomState(+ const setPrefetchNavigationMenuItems = useSetAtomState(prefetchNavigationMenuItemsState,);@@ -55,22 +55,22 @@ export const PrefetchRunNavigationMenuItemQueriesEffect = () => {prefetchNavigationMenuItemsState.atom,);if (!isDeeplyEqual(existingNavigationMenuItems, navigationMenuItems)) {- setNavigationMenuItemsState(navigationMenuItems);+ setPrefetchNavigationMenuItems(navigationMenuItems);}},- [setNavigationMenuItemsState, store],+ [setPrefetchNavigationMenuItems, store],);useEffect(() => {if (!loading && isDefined(data?.navigationMenuItems)) {setPrefetchNavigationMenuItemsStateIfChanged(data.navigationMenuItems);- setIsPrefetchNavigationMenuItemsLoaded(true);+ setPrefetchIsLoaded(true);}}, [data,loading,setPrefetchNavigationMenuItemsStateIfChanged,- setIsPrefetchNavigationMenuItemsLoaded,+ setPrefetchIsLoaded,]);return <></>;diff --git a/packages/twenty-front/src/modules/prefetch/hooks/useIsPrefetchLoading.ts b/packages/twenty-front/src/modules/prefetch/hooks/useIsPrefetchLoading.tsindex a3e5cde8668..aec33a28bf5 100644--- a/packages/twenty-front/src/modules/prefetch/hooks/useIsPrefetchLoading.ts+++ b/packages/twenty-front/src/modules/prefetch/hooks/useIsPrefetchLoading.ts@@ -8,18 +8,16 @@ export const useIsPrefetchLoading = () => {const isWorkspaceActive = useIsWorkspaceActivationStatusEqualsTo(WorkspaceActivationStatus.ACTIVE,);- const isFavoriteFoldersPrefetched = useAtomFamilyStateValue(+ const prefetchIsLoaded = useAtomFamilyStateValue(prefetchIsLoadedFamilyState,PrefetchKey.AllFavoritesFolders,);- const areFavoritesPrefetched = useAtomFamilyStateValue(+ // eslint-disable-next-line twenty/matching-state-variable+ const prefetchIsLoadedFavorites = useAtomFamilyStateValue(prefetchIsLoadedFamilyState,PrefetchKey.AllFavorites,);- return (- isWorkspaceActive &&- (!areFavoritesPrefetched || !isFavoriteFoldersPrefetched)- );+ return isWorkspaceActive && (!prefetchIsLoadedFavorites || !prefetchIsLoaded);};diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelsContainer.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelsContainer.tsxindex cb4f636a5ab..e5006b57080 100644--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelsContainer.tsx+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelsContainer.tsx@@ -31,7 +31,7 @@ export const SettingsAccountsMessageChannelsContainer = () => {SETTINGS_ACCOUNT_MESSAGE_CHANNELS_TAB_LIST_COMPONENT_ID,);const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);- const setSelectedMessageChannel = useSetAtomState(+ const setSettingsAccountsSelectedMessageChannel = useSetAtomState(settingsAccountsSelectedMessageChannelState,);@@ -68,7 +68,7 @@ export const SettingsAccountsMessageChannelsContainer = () => {},recordGqlFields,onCompleted: (data) => {- setSelectedMessageChannel(data[0]);+ setSettingsAccountsSelectedMessageChannel(data[0]);},skip: !accounts.length,});@@ -84,10 +84,10 @@ export const SettingsAccountsMessageChannelsContainer = () => {(channel) => channel.id === tabId,);if (isDefined(selectedMessageChannel)) {- setSelectedMessageChannel(selectedMessageChannel);+ setSettingsAccountsSelectedMessageChannel(selectedMessageChannel);}},- [messageChannels, setSelectedMessageChannel],+ [messageChannels, setSettingsAccountsSelectedMessageChannel],);if (!messageChannels.length) {diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelSetLabelIdentifierRecordEffect.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelSetLabelIdentifierRecordEffect.tsxindex 9ebcfd8b91a..5370c332c64 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelSetLabelIdentifierRecordEffect.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelSetLabelIdentifierRecordEffect.tsx@@ -16,11 +16,14 @@ export const SettingsDataModelSetLabelIdentifierRecordEffect = ({objectNameSingular: objectNameSingular,});- const setRecord = useSetAtomFamilyState(recordStoreFamilyState, recordId);+ const setRecordStore = useSetAtomFamilyState(+ recordStoreFamilyState,+ recordId,+ );useEffect(() => {- setRecord(recordPreviewForLabelIdentifier);- }, [recordPreviewForLabelIdentifier, setRecord, recordId]);+ setRecordStore(recordPreviewForLabelIdentifier);+ }, [recordPreviewForLabelIdentifier, setRecordStore, recordId]);return null;};diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsxindex 5df162e4a3d..e8a0e7001d0 100644--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx@@ -139,13 +139,13 @@ export const SettingsObjectFieldItemTableRow = ({const { deleteOneFieldMetadataItem } = useDeleteOneFieldMetadataItem();- const setActiveSettingsObjectFields = useSetAtomFamilyState(+ const setSettingsObjectFields = useSetAtomFamilyState(settingsObjectFieldsFamilyState,{ objectMetadataItemId: objectMetadataItem.id },);const handleToggleField = () => {- setActiveSettingsObjectFields((previousFields) => {+ setSettingsObjectFields((previousFields) => {const newFields = isDefined(previousFields)? previousFields?.map((field) =>field.id === fieldMetadataItem.iddiff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/stories/SettingsRoleAssignment.stories.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/stories/SettingsRoleAssignment.stories.tsxindex 0c7fe76c7a1..625b04e2156 100644--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/stories/SettingsRoleAssignment.stories.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/stories/SettingsRoleAssignment.stories.tsx@@ -9,7 +9,7 @@ import { getRolesMock } from '~/testing/mock-data/roles';const SettingsRoleAssignmentWrapper = (args: React.ComponentProps<typeof SettingsRoleAssignment>,) => {- const setDraftRole = useSetAtomFamilyState(+ const setSettingsDraftRole = useSetAtomFamilyState(settingsDraftRoleFamilyState,args.roleId,);@@ -17,7 +17,7 @@ const SettingsRoleAssignmentWrapper = (const role = getRolesMock().find((role) => role.id === args.roleId);if (isDefined(role)) {- setDraftRole(role);+ setSettingsDraftRole(role);}return <SettingsRoleAssignment roleId={args.roleId} />;diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/components/stories/SettingsRolePermissions.stories.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/components/stories/SettingsRolePermissions.stories.tsxindex 8220a1df14b..6c3de310b8d 100644--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/components/stories/SettingsRolePermissions.stories.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/components/stories/SettingsRolePermissions.stories.tsx@@ -9,7 +9,7 @@ import { getRolesMock } from '~/testing/mock-data/roles';const SettingsRolePermissionsWrapper = (args: React.ComponentProps<typeof SettingsRolePermissions>,) => {- const setDraftRole = useSetAtomFamilyState(+ const setSettingsDraftRole = useSetAtomFamilyState(settingsDraftRoleFamilyState,args.roleId,);@@ -17,7 +17,7 @@ const SettingsRolePermissionsWrapper = (const role = getRolesMock().find((role) => role.id === args.roleId);if (isDefined(role)) {- setDraftRole(role);+ setSettingsDraftRole(role);}return (diff --git a/packages/twenty-front/src/modules/settings/roles/role-settings/components/stories/SettingsRoleSettings.stories.tsx b/packages/twenty-front/src/modules/settings/roles/role-settings/components/stories/SettingsRoleSettings.stories.tsxindex 3b32289aa05..11b615ab592 100644--- a/packages/twenty-front/src/modules/settings/roles/role-settings/components/stories/SettingsRoleSettings.stories.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-settings/components/stories/SettingsRoleSettings.stories.tsx@@ -9,7 +9,7 @@ import { getRolesMock } from '~/testing/mock-data/roles';const SettingsRoleSettingsWrapper = (args: React.ComponentProps<typeof SettingsRoleSettings>,) => {- const setDraftRole = useSetAtomFamilyState(+ const setSettingsDraftRole = useSetAtomFamilyState(settingsDraftRoleFamilyState,args.roleId,);@@ -17,7 +17,7 @@ const SettingsRoleSettingsWrapper = (const role = getRolesMock().find((role) => role.id === args.roleId);if (isDefined(role)) {- setDraftRole(role);+ setSettingsDraftRole(role);}return (diff --git a/packages/twenty-front/src/modules/settings/roles/role/components/SettingsRoleEditEffect.tsx b/packages/twenty-front/src/modules/settings/roles/role/components/SettingsRoleEditEffect.tsxindex 92449c16823..659c05188be 100644--- a/packages/twenty-front/src/modules/settings/roles/role/components/SettingsRoleEditEffect.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role/components/SettingsRoleEditEffect.tsx@@ -19,7 +19,7 @@ export const SettingsRoleEditEffect = ({}: SettingsRoleEditEffectProps) => {const [isInitialized, setIsInitialized] = useState(false);- const role = useAtomFamilyStateValue(+ const settingsPersistedRole = useAtomFamilyStateValue(settingsPersistedRoleFamilyState,roleId,);@@ -44,14 +44,19 @@ export const SettingsRoleEditEffect = ({);useEffect(() => {- if (isInitialized || !isDefined(role)) {+ if (isInitialized || !isDefined(settingsPersistedRole)) {return;}setActiveTabId(SETTINGS_ROLE_DETAIL_TABS.TABS_IDS.PERMISSIONS);- updateDraftRoleIfNeeded(role);+ updateDraftRoleIfNeeded(settingsPersistedRole);setIsInitialized(true);- }, [isInitialized, role, setActiveTabId, updateDraftRoleIfNeeded]);+ }, [+ isInitialized,+ settingsPersistedRole,+ setActiveTabId,+ updateDraftRoleIfNeeded,+ ]);return <></>;};diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsxindex a3329ee035c..239b2ecc860 100644--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx+++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx@@ -31,13 +31,14 @@ export const SignInBackgroundMockContainer = () => {const objectMetadataItems = useAtomStateValue(objectMetadataItemsState);- const objectMetadataItemId = useAtomComponentStateValue(+ const contextStoreCurrentObjectMetadataItemId = useAtomComponentStateValue(contextStoreCurrentObjectMetadataItemIdComponentState,MAIN_CONTEXT_STORE_INSTANCE_ID,);const objectMetadataItem = objectMetadataItems.find(- (objectMetadataItem) => objectMetadataItem.id === objectMetadataItemId,+ (objectMetadataItem) =>+ objectMetadataItem.id === contextStoreCurrentObjectMetadataItemId,);const {diff --git a/packages/twenty-front/src/modules/spreadsheet-import/hooks/useOpenSpreadsheetImportDialog.ts b/packages/twenty-front/src/modules/spreadsheet-import/hooks/useOpenSpreadsheetImportDialog.tsindex 5090d5cc0ee..9acf9e5133c 100644--- a/packages/twenty-front/src/modules/spreadsheet-import/hooks/useOpenSpreadsheetImportDialog.ts+++ b/packages/twenty-front/src/modules/spreadsheet-import/hooks/useOpenSpreadsheetImportDialog.ts@@ -5,7 +5,9 @@ import { useModal } from '@/ui/layout/modal/hooks/useModal';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';export const useOpenSpreadsheetImportDialog = () => {- const setSpreadSheetImport = useSetAtomState(spreadsheetImportDialogState);+ const setSpreadsheetImportDialog = useSetAtomState(+ spreadsheetImportDialogState,+ );const { openModal } = useModal();@@ -13,7 +15,7 @@ export const useOpenSpreadsheetImportDialog = () => {options: Omit<SpreadsheetImportDialogOptions, 'isOpen' | 'onClose'>,) => {openModal(SPREADSHEET_IMPORT_MODAL_ID);- setSpreadSheetImport({+ setSpreadsheetImportDialog({isOpen: true,isStepBarVisible: true,options,diff --git a/packages/twenty-front/src/modules/spreadsheet-import/provider/components/SpreadsheetImportProvider.tsx b/packages/twenty-front/src/modules/spreadsheet-import/provider/components/SpreadsheetImportProvider.tsxindex 568efa6b81e..3ab2ba8d148 100644--- a/packages/twenty-front/src/modules/spreadsheet-import/provider/components/SpreadsheetImportProvider.tsx+++ b/packages/twenty-front/src/modules/spreadsheet-import/provider/components/SpreadsheetImportProvider.tsx@@ -39,7 +39,7 @@ export const SpreadsheetImportProvider = (spreadsheetImportDialogState,);- const setMatchColumnsState = useSetAtomState(matchColumnsState);+ const setMatchColumns = useSetAtomState(matchColumnsState);const { closeModal } = useModal();@@ -53,7 +53,7 @@ export const SpreadsheetImportProvider = (closeModal(SPREADSHEET_IMPORT_MODAL_ID);- setMatchColumnsState([]);+ setMatchColumns([]);};return (diff --git a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsxindex e9b33f5e2cf..8583630297b 100644--- a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx+++ b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx@@ -103,7 +103,7 @@ const IconPickerIcon = ({Icon,focusedIconKey,}: IconPickerIconProps) => {- const isSelectedItemId = useAtomComponentStateValue(+ const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,iconKey,);@@ -116,7 +116,7 @@ const IconPickerIcon = ({aria-label={convertIconKeyToLabel(iconKey)}size="medium"title={iconKey}- isSelected={iconKey === selectedIconKey || !!isSelectedItemId}+ isSelected={iconKey === selectedIconKey || !!selectedItemId}isFocused={iconKey === focusedIconKey}Icon={Icon}onClick={onSelect}diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/__tests__/useCloseDropdown.test.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/__tests__/useCloseDropdown.test.tsxindex 8079bfa14b7..a71c691930c 100644--- a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/__tests__/useCloseDropdown.test.tsx+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/__tests__/useCloseDropdown.test.tsx@@ -44,12 +44,13 @@ describe('useCloseDropdown', () => {it('should close dropdown from inside component instance context', async () => {const { result } = renderHook(() => {+ // eslint-disable-next-line twenty/matching-state-variableconst isOutsideDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,outsideDropdownId,);- const isInsideDropdownOpen = useAtomComponentStateValue(+ const isDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,);@@ -58,7 +59,7 @@ describe('useCloseDropdown', () => {return {isOutsideDropdownOpen,- isInsideDropdownOpen,+ isDropdownOpen,closeDropdown,openDropdown,};@@ -72,26 +73,27 @@ describe('useCloseDropdown', () => {result.current.openDropdown();});- expect(result.current.isInsideDropdownOpen).toBe(true);+ expect(result.current.isDropdownOpen).toBe(true);expect(result.current.isOutsideDropdownOpen).toBe(false);act(() => {result.current.closeDropdown();});- expect(result.current.isInsideDropdownOpen).toBe(false);+ expect(result.current.isDropdownOpen).toBe(false);expect(result.current.isOutsideDropdownOpen).toBe(false);});it('should close dropdown from outside component instance context', async () => {const { result } = renderHook(() => {+ // eslint-disable-next-line twenty/matching-state-variableconst isOutsideDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,outsideDropdownId,);- const isInsideDropdownOpen = useAtomComponentStateValue(+ const isDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,);@@ -100,7 +102,7 @@ describe('useCloseDropdown', () => {return {isOutsideDropdownOpen,- isInsideDropdownOpen,+ isDropdownOpen,closeDropdown,openDropdown,};@@ -116,14 +118,14 @@ describe('useCloseDropdown', () => {});});- expect(result.current.isInsideDropdownOpen).toBe(false);+ expect(result.current.isDropdownOpen).toBe(false);expect(result.current.isOutsideDropdownOpen).toBe(true);act(() => {result.current.closeDropdown(outsideDropdownId);});- expect(result.current.isInsideDropdownOpen).toBe(false);+ expect(result.current.isDropdownOpen).toBe(false);expect(result.current.isOutsideDropdownOpen).toBe(false);});});diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/__tests__/useOpenDropdown.test.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/__tests__/useOpenDropdown.test.tsxindex 7b90d9a3140..c44b42b3a92 100644--- a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/__tests__/useOpenDropdown.test.tsx+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/__tests__/useOpenDropdown.test.tsx@@ -42,57 +42,59 @@ describe('useOpenDropdown', () => {it('should open dropdown from inside component instance context', async () => {const { result } = renderHook(() => {+ // eslint-disable-next-line twenty/matching-state-variableconst isOutsideDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,outsideDropdownId,);- const isInsideDropdownOpen = useAtomComponentStateValue(+ const isDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,);const { openDropdown } = useOpenDropdown();- return { isOutsideDropdownOpen, isInsideDropdownOpen, openDropdown };+ return { isOutsideDropdownOpen, isDropdownOpen, openDropdown };},{wrapper: Wrapper,},);- expect(result.current.isInsideDropdownOpen).toBe(false);+ expect(result.current.isDropdownOpen).toBe(false);expect(result.current.isOutsideDropdownOpen).toBe(false);act(() => {result.current.openDropdown();});- expect(result.current.isInsideDropdownOpen).toBe(true);+ expect(result.current.isDropdownOpen).toBe(true);expect(result.current.isOutsideDropdownOpen).toBe(false);});it('should open dropdown from outside component instance context', async () => {const { result } = renderHook(() => {+ // eslint-disable-next-line twenty/matching-state-variableconst isOutsideDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,outsideDropdownId,);- const isInsideDropdownOpen = useAtomComponentStateValue(+ const isDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,);const { openDropdown } = useOpenDropdown();- return { isInsideDropdownOpen, isOutsideDropdownOpen, openDropdown };+ return { isDropdownOpen, isOutsideDropdownOpen, openDropdown };},{wrapper: Wrapper,},);- expect(result.current.isInsideDropdownOpen).toBe(false);+ expect(result.current.isDropdownOpen).toBe(false);expect(result.current.isOutsideDropdownOpen).toBe(false);act(() => {@@ -101,7 +103,7 @@ describe('useOpenDropdown', () => {});});- expect(result.current.isInsideDropdownOpen).toBe(false);+ expect(result.current.isDropdownOpen).toBe(false);expect(result.current.isOutsideDropdownOpen).toBe(true);});});diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/__tests__/useToggleDropdown.test.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/__tests__/useToggleDropdown.test.tsxindex 3b3047c4c25..1e3ea7ceff8 100644--- a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/__tests__/useToggleDropdown.test.tsx+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/__tests__/useToggleDropdown.test.tsx@@ -43,69 +43,71 @@ describe('useToggleDropdown', () => {it('should toggle dropdown from inside component instance context', async () => {const { result } = renderHook(() => {+ // eslint-disable-next-line twenty/matching-state-variableconst isOutsideDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,outsideDropdownId,);- const isInsideDropdownOpen = useAtomComponentStateValue(+ const isDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,);const { toggleDropdown } = useToggleDropdown();- return { isOutsideDropdownOpen, isInsideDropdownOpen, toggleDropdown };+ return { isOutsideDropdownOpen, isDropdownOpen, toggleDropdown };},{wrapper: Wrapper,},);- expect(result.current.isInsideDropdownOpen).toBe(false);+ expect(result.current.isDropdownOpen).toBe(false);expect(result.current.isOutsideDropdownOpen).toBe(false);act(() => {result.current.toggleDropdown();});- expect(result.current.isInsideDropdownOpen).toBe(true);+ expect(result.current.isDropdownOpen).toBe(true);expect(result.current.isOutsideDropdownOpen).toBe(false);act(() => {result.current.toggleDropdown();});- expect(result.current.isInsideDropdownOpen).toBe(false);+ expect(result.current.isDropdownOpen).toBe(false);expect(result.current.isOutsideDropdownOpen).toBe(false);act(() => {result.current.toggleDropdown();});- expect(result.current.isInsideDropdownOpen).toBe(true);+ expect(result.current.isDropdownOpen).toBe(true);expect(result.current.isOutsideDropdownOpen).toBe(false);});it('should toggle dropdown from outside component instance context', async () => {const { result } = renderHook(() => {+ // eslint-disable-next-line twenty/matching-state-variableconst isOutsideDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,outsideDropdownId,);- const isInsideDropdownOpen = useAtomComponentStateValue(+ const isDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,);const { toggleDropdown } = useToggleDropdown();- return { isOutsideDropdownOpen, isInsideDropdownOpen, toggleDropdown };+ return { isOutsideDropdownOpen, isDropdownOpen, toggleDropdown };},{wrapper: Wrapper,},);- expect(result.current.isInsideDropdownOpen).toBe(false);+ expect(result.current.isDropdownOpen).toBe(false);expect(result.current.isOutsideDropdownOpen).toBe(false);act(() => {@@ -114,7 +116,7 @@ describe('useToggleDropdown', () => {});});- expect(result.current.isInsideDropdownOpen).toBe(false);+ expect(result.current.isDropdownOpen).toBe(false);expect(result.current.isOutsideDropdownOpen).toBe(true);act(() => {@@ -123,7 +125,7 @@ describe('useToggleDropdown', () => {});});- expect(result.current.isInsideDropdownOpen).toBe(false);+ expect(result.current.isDropdownOpen).toBe(false);expect(result.current.isOutsideDropdownOpen).toBe(false);act(() => {@@ -132,7 +134,7 @@ describe('useToggleDropdown', () => {});});- expect(result.current.isInsideDropdownOpen).toBe(false);+ expect(result.current.isDropdownOpen).toBe(false);expect(result.current.isOutsideDropdownOpen).toBe(true);});});diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsxindex 8e476273100..e287ca5610d 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx@@ -75,7 +75,7 @@ export const MultiWorkspaceDropdownDefaultComponents = () => {const [signUpInNewWorkspaceMutation] = useSignUpInNewWorkspaceMutation();- const setMultiWorkspaceDropdownState = useSetAtomState(+ const setMultiWorkspaceDropdown = useSetAtomState(multiWorkspaceDropdownState,);@@ -195,9 +195,7 @@ export const MultiWorkspaceDropdownDefaultComponents = () => {<MenuItemLeftIcon={IconSwitchHorizontal}text={t`Other workspaces`}- onClick={() =>- setMultiWorkspaceDropdownState('workspaces-list')- }+ onClick={() => setMultiWorkspaceDropdown('workspaces-list')}hasSubMenu={true}/>)}@@ -215,7 +213,7 @@ export const MultiWorkspaceDropdownDefaultComponents = () => {</>}hasSubMenu={true}- onClick={() => setMultiWorkspaceDropdownState('themes')}+ onClick={() => setMultiWorkspaceDropdown('themes')}/><UndecoratedLinkto={getSettingsPath(SettingsPath.WorkspaceMembersPage)}diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsxindex 50cbfc44d12..74a9d703100 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsx@@ -14,7 +14,7 @@ export const MultiWorkspaceDropdownThemesComponents = () => {const { setColorScheme, colorScheme, colorSchemeList } = useColorScheme();- const setMultiWorkspaceDropdownState = useSetAtomState(+ const setMultiWorkspaceDropdown = useSetAtomState(multiWorkspaceDropdownState,);@@ -23,7 +23,7 @@ export const MultiWorkspaceDropdownThemesComponents = () => {<DropdownMenuHeaderStartComponent={<DropdownMenuHeaderLeftComponent- onClick={() => setMultiWorkspaceDropdownState('default')}+ onClick={() => setMultiWorkspaceDropdown('default')}Icon={IconChevronLeft}/>}diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsxindex 683b83fd5ca..6b208dd0b93 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsx@@ -19,7 +19,7 @@ export const MultiWorkspaceDropdownWorkspacesListComponents = () => {const availableWorkspaces = useAtomStateValue(availableWorkspacesState);- const setMultiWorkspaceDropdownState = useSetAtomState(+ const setMultiWorkspaceDropdown = useSetAtomState(multiWorkspaceDropdownState,);const [searchValue, setSearchValue] = useState('');@@ -29,7 +29,7 @@ export const MultiWorkspaceDropdownWorkspacesListComponents = () => {<DropdownMenuHeaderStartComponent={<DropdownMenuHeaderLeftComponent- onClick={() => setMultiWorkspaceDropdownState('default')}+ onClick={() => setMultiWorkspaceDropdown('default')}Icon={IconChevronLeft}/>}diff --git a/packages/twenty-front/src/modules/ui/utilities/scroll/components/ScrollWrapper.tsx b/packages/twenty-front/src/modules/ui/utilities/scroll/components/ScrollWrapper.tsxindex 3f14da2be89..5653c96d52a 100644--- a/packages/twenty-front/src/modules/ui/utilities/scroll/components/ScrollWrapper.tsx+++ b/packages/twenty-front/src/modules/ui/utilities/scroll/components/ScrollWrapper.tsx@@ -35,26 +35,26 @@ export const ScrollWrapper = ({defaultEnableXScroll = true,defaultEnableYScroll = true,}: ScrollWrapperProps) => {- const setScrollTop = useSetAtomComponentState(+ const setScrollWrapperScrollTop = useSetAtomComponentState(scrollWrapperScrollTopComponentState,componentInstanceId,);- const setScrollLeft = useSetAtomComponentState(+ const setScrollWrapperScrollLeft = useSetAtomComponentState(scrollWrapperScrollLeftComponentState,componentInstanceId,);- const setScrollBottom = useSetAtomComponentState(+ const setScrollWrapperScrollBottom = useSetAtomComponentState(scrollWrapperScrollBottomComponentState,componentInstanceId,);const handleScroll = (event: React.UIEvent<HTMLDivElement>) => {const target = event.currentTarget;- setScrollTop(target.scrollTop);- setScrollLeft(target.scrollLeft);- setScrollBottom(+ setScrollWrapperScrollTop(target.scrollTop);+ setScrollWrapperScrollLeft(target.scrollLeft);+ setScrollWrapperScrollBottom(target.scrollHeight - target.clientHeight - target.scrollTop,);};diff --git a/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useScrollRestoration.ts b/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useScrollRestoration.tsindex b47a02b1ae4..cc46948b261 100644--- a/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useScrollRestoration.ts+++ b/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useScrollRestoration.ts@@ -10,7 +10,7 @@ export const useScrollRestoration = (componentInstanceId: string) => {const storageKey = `scroll-${location.pathname}`;const [isRestoring, setIsRestoring] = useState(false);- const scrollTop = useAtomComponentStateValue(+ const scrollWrapperScrollTop = useAtomComponentStateValue(scrollWrapperScrollTopComponentState,componentInstanceId,);@@ -46,13 +46,13 @@ export const useScrollRestoration = (componentInstanceId: string) => {useEffect(() => {if (isRestoring) return;- if (scrollTop <= SCROLL_RESTORATION_TOP_THRESHOLD_PX) {+ if (scrollWrapperScrollTop <= SCROLL_RESTORATION_TOP_THRESHOLD_PX) {sessionStorage.removeItem(storageKey);return;}- sessionStorage.setItem(storageKey, scrollTop.toString());- }, [scrollTop, storageKey, isRestoring]);+ sessionStorage.setItem(storageKey, scrollWrapperScrollTop.toString());+ }, [scrollWrapperScrollTop, storageKey, isRestoring]);useEffect(() => {const savedPosition = sessionStorage.getItem(storageKey);diff --git a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsxindex f5b8d6b98d0..fd43a350347 100644--- a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx+++ b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx@@ -45,7 +45,7 @@ export const UpdateViewButtonGroup = () => {const { setViewPickerMode } = useViewPickerMode();- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);@@ -58,14 +58,14 @@ export const UpdateViewButtonGroup = () => {);const openViewPickerInCreateMode = () => {- if (!currentViewId) {+ if (!contextStoreCurrentViewId) {return;}openViewPickerDropdown({dropdownComponentInstanceIdFromProps: VIEW_PICKER_DROPDOWN_ID,});- setViewPickerReferenceViewId(currentViewId);+ setViewPickerReferenceViewId(contextStoreCurrentViewId);setViewPickerMode('create-from-current');closeUpdateViewButtonDropdown(UPDATE_VIEW_BUTTON_DROPDOWN_ID);diff --git a/packages/twenty-front/src/modules/views/components/ViewBarAnyFieldFilterEffect.tsx b/packages/twenty-front/src/modules/views/components/ViewBarAnyFieldFilterEffect.tsxindex b65b900e9e8..3a11249aa87 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarAnyFieldFilterEffect.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarAnyFieldFilterEffect.tsx@@ -11,7 +11,7 @@ import { useEffect } from 'react';import { isDefined } from 'twenty-shared/utils';export const ViewBarAnyFieldFilterEffect = () => {- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);@@ -20,7 +20,7 @@ export const ViewBarAnyFieldFilterEffect = () => {const currentView = useAtomFamilySelectorValue(coreViewFromViewIdFamilySelector,{- viewId: currentViewId ?? '',+ viewId: contextStoreCurrentViewId ?? '',},);@@ -28,7 +28,7 @@ export const ViewBarAnyFieldFilterEffect = () => {useAtomComponentFamilyState(hasInitializedAnyFieldFilterComponentFamilyState,{- viewId: currentViewId ?? undefined,+ viewId: contextStoreCurrentViewId ?? undefined,},);@@ -49,7 +49,7 @@ export const ViewBarAnyFieldFilterEffect = () => {}}, [setAnyFieldFilterValue,- currentViewId,+ contextStoreCurrentViewId,hasInitializedAnyFieldFilter,setHasInitializedAnyFieldFilter,currentView,diff --git a/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx b/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsxindex e684dc236a9..c63a066be1e 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx@@ -189,7 +189,7 @@ export const ViewBarDetails = ({const shouldShowAdvancedFilterDropdownButton =currentRecordFilterGroups.length > 0;- const isAnyFieldSearchDropdownOpen = useAtomComponentStateValue(+ const isDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,ANY_FIELD_SEARCH_DROPDOWN_ID,);@@ -202,7 +202,7 @@ export const ViewBarDetails = ({!hasFiltersQueryParams;const shouldShowAnyFieldSearchChip =- isNonEmptyString(anyFieldFilterValue) || isAnyFieldSearchDropdownOpen;+ isNonEmptyString(anyFieldFilterValue) || isDropdownOpen;const shouldExpandViewBar =shouldShowAnyFieldSearchChip ||diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsxindex 223191aaaa7..ec5a1c61722 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx@@ -35,7 +35,7 @@ export const ViewBarFilterDropdownAdvancedFilterButton = () => {const { t } = useLingui();- const isSelected = useAtomComponentFamilyStateValue(+ const isSelectedItemId = useAtomComponentFamilyStateValue(isSelectedItemIdComponentFamilyState,VIEW_BAR_FILTER_BOTTOM_MENU_ITEM_IDS.ADVANCED_FILTER,);@@ -130,7 +130,7 @@ export const ViewBarFilterDropdownAdvancedFilterButton = () => {text={t`Advanced filter`}onClick={handleClick}LeftIcon={IconFilter}- focused={isSelected}+ focused={isSelectedItemId}/>{advancedFilterQuerySubFilterCount > 0 && (<StyledPill label={advancedFilterQuerySubFilterCount.toString()} />diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAnyFieldSearchButtonMenuItem.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAnyFieldSearchButtonMenuItem.tsxindex 9041094f820..4a19b513975 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAnyFieldSearchButtonMenuItem.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAnyFieldSearchButtonMenuItem.tsx@@ -29,7 +29,7 @@ export const ViewBarFilterDropdownAnyFieldSearchButtonMenuItem = ({objectFilterDropdownSearchInputComponentState,);- const isSelected = useAtomComponentFamilyStateValue(+ const isSelectedItemId = useAtomComponentFamilyStateValue(isSelectedItemIdComponentFamilyState,VIEW_BAR_FILTER_BOTTOM_MENU_ITEM_IDS.SEARCH,);@@ -40,7 +40,7 @@ export const ViewBarFilterDropdownAnyFieldSearchButtonMenuItem = ({onEnter={onClick}><MenuItem- focused={isSelected}+ focused={isSelectedItemId}onClick={onClick}LeftIcon={IconSearch}text={diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenuItem.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenuItem.tsxindex 3c04a5bcede..537fbd2b4d6 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenuItem.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenuItem.tsx@@ -17,7 +17,7 @@ export const ViewBarFilterDropdownFieldSelectMenuItem = ({}: ViewBarFilterDropdownFieldSelectMenuItemProps) => {const { resetSelectedItem } = useSelectableList(FILTER_FIELD_LIST_ID);- const isSelectedItem = useAtomComponentFamilyStateValue(+ const isSelectedItemId = useAtomComponentFamilyStateValue(isSelectedItemIdComponentFamilyState,fieldMetadataItemToSelect.id,);@@ -43,7 +43,7 @@ export const ViewBarFilterDropdownFieldSelectMenuItem = ({onEnter={handleClick}><MenuItem- focused={isSelectedItem}+ focused={isSelectedItemId}onClick={handleClick}LeftIcon={Icon}text={fieldMetadataItemToSelect.label}diff --git a/packages/twenty-front/src/modules/views/components/ViewBarRecordFieldEffect.tsx b/packages/twenty-front/src/modules/views/components/ViewBarRecordFieldEffect.tsxindex 3f39a590b77..fca05af700e 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarRecordFieldEffect.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarRecordFieldEffect.tsx@@ -12,7 +12,7 @@ import { useEffect } from 'react';import { isDefined } from 'twenty-shared/utils';export const ViewBarRecordFieldEffect = () => {- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);@@ -21,7 +21,7 @@ export const ViewBarRecordFieldEffect = () => {const currentView = useAtomFamilySelectorValue(coreViewFromViewIdFamilySelector,{- viewId: currentViewId ?? '',+ viewId: contextStoreCurrentViewId ?? '',},);@@ -31,7 +31,7 @@ export const ViewBarRecordFieldEffect = () => {] = useAtomComponentFamilyState(hasInitializedCurrentRecordFieldsComponentFamilyState,{- viewId: currentViewId ?? undefined,+ viewId: contextStoreCurrentViewId ?? undefined,},);@@ -54,7 +54,7 @@ export const ViewBarRecordFieldEffect = () => {setHasInitializedCurrentRecordFields(true);}}, [- currentViewId,+ contextStoreCurrentViewId,setCurrentRecordFields,hasInitializedCurrentRecordFields,setHasInitializedCurrentRecordFields,diff --git a/packages/twenty-front/src/modules/views/components/ViewBarRecordFilterEffect.tsx b/packages/twenty-front/src/modules/views/components/ViewBarRecordFilterEffect.tsxindex bd9ff224a34..28fcdd518d7 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarRecordFilterEffect.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarRecordFilterEffect.tsx@@ -12,7 +12,7 @@ import { useEffect } from 'react';import { isDefined } from 'twenty-shared/utils';export const ViewBarRecordFilterEffect = () => {- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);@@ -21,7 +21,7 @@ export const ViewBarRecordFilterEffect = () => {const currentView = useAtomFamilySelectorValue(coreViewFromViewIdFamilySelector,{- viewId: currentViewId ?? '',+ viewId: contextStoreCurrentViewId ?? '',},);@@ -31,7 +31,7 @@ export const ViewBarRecordFilterEffect = () => {] = useAtomComponentFamilyState(hasInitializedCurrentRecordFiltersComponentFamilyState,{- viewId: currentViewId ?? undefined,+ viewId: contextStoreCurrentViewId ?? undefined,},);@@ -55,7 +55,7 @@ export const ViewBarRecordFilterEffect = () => {setHasInitializedCurrentRecordFilters(true);}}, [- currentViewId,+ contextStoreCurrentViewId,setCurrentRecordFilters,mapViewFiltersToRecordFilters,hasInitializedCurrentRecordFilters,diff --git a/packages/twenty-front/src/modules/views/components/ViewBarRecordFilterGroupEffect.tsx b/packages/twenty-front/src/modules/views/components/ViewBarRecordFilterGroupEffect.tsxindex c6a3e4ba733..69d9d7ca35a 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarRecordFilterGroupEffect.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarRecordFilterGroupEffect.tsx@@ -12,7 +12,7 @@ import { useEffect } from 'react';import { isDefined } from 'twenty-shared/utils';export const ViewBarRecordFilterGroupEffect = () => {- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);@@ -21,7 +21,7 @@ export const ViewBarRecordFilterGroupEffect = () => {const currentView = useAtomFamilySelectorValue(coreViewFromViewIdFamilySelector,{- viewId: currentViewId ?? '',+ viewId: contextStoreCurrentViewId ?? '',},);@@ -31,7 +31,7 @@ export const ViewBarRecordFilterGroupEffect = () => {] = useAtomComponentFamilyState(hasInitializedCurrentRecordFilterGroupsComponentFamilyState,{- viewId: currentViewId ?? undefined,+ viewId: contextStoreCurrentViewId ?? undefined,},);@@ -57,7 +57,7 @@ export const ViewBarRecordFilterGroupEffect = () => {}}}, [- currentViewId,+ contextStoreCurrentViewId,setCurrentRecordFilterGroups,hasInitializedCurrentRecordFilterGroups,setHasInitializedCurrentRecordFilterGroups,diff --git a/packages/twenty-front/src/modules/views/components/ViewBarRecordSortEffect.tsx b/packages/twenty-front/src/modules/views/components/ViewBarRecordSortEffect.tsxindex 522891ccedf..b83a057fc5c 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarRecordSortEffect.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarRecordSortEffect.tsx@@ -11,7 +11,7 @@ import { useEffect } from 'react';import { isDefined } from 'twenty-shared/utils';export const ViewBarRecordSortEffect = () => {- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);@@ -20,7 +20,7 @@ export const ViewBarRecordSortEffect = () => {const currentView = useAtomFamilySelectorValue(coreViewFromViewIdFamilySelector,{- viewId: currentViewId ?? '',+ viewId: contextStoreCurrentViewId ?? '',},);@@ -30,7 +30,7 @@ export const ViewBarRecordSortEffect = () => {] = useAtomComponentFamilyState(hasInitializedCurrentRecordSortsComponentFamilyState,{- viewId: currentViewId ?? undefined,+ viewId: contextStoreCurrentViewId ?? undefined,},);diff --git a/packages/twenty-front/src/modules/views/components/__stories__/ViewBarFilterDropdown.stories.tsx b/packages/twenty-front/src/modules/views/components/__stories__/ViewBarFilterDropdown.stories.tsxindex 5d71658b3c3..ba7842ef49b 100644--- a/packages/twenty-front/src/modules/views/components/__stories__/ViewBarFilterDropdown.stories.tsx+++ b/packages/twenty-front/src/modules/views/components/__stories__/ViewBarFilterDropdown.stories.tsx@@ -47,7 +47,7 @@ const meta: Meta<typeof ViewBarFilterDropdown> = {const mockCoreView = mockedCoreViewsData[0];- const setCurrentViewId = useSetAtomComponentState(+ const setContextStoreCurrentViewId = useSetAtomComponentState(contextStoreCurrentViewIdComponentState,MAIN_CONTEXT_STORE_INSTANCE_ID,);@@ -71,12 +71,12 @@ const meta: Meta<typeof ViewBarFilterDropdown> = {useEffect(() => {setCoreViews([mockCoreView]);- setCurrentViewId(mockCoreView.id);+ setContextStoreCurrentViewId(mockCoreView.id);setCurrentRecordFields(columns);setIsLoaded(true);}, [setCoreViews,- setCurrentViewId,+ setContextStoreCurrentViewId,setCurrentRecordFields,mockCoreView,columns,diff --git a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewFiltersToCurrentRecordFilters.test.tsx b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewFiltersToCurrentRecordFilters.test.tsxindex 04a0005d767..48badad1669 100644--- a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewFiltersToCurrentRecordFilters.test.tsx+++ b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewFiltersToCurrentRecordFilters.test.tsx@@ -97,14 +97,14 @@ describe('useApplyCurrentViewFiltersToCurrentRecordFilters', () => {const { applyCurrentViewFiltersToCurrentRecordFilters } =useApplyCurrentViewFiltersToCurrentRecordFilters();- const currentFilters = useAtomComponentStateValue(+ const currentRecordFilters = useAtomComponentStateValue(currentRecordFiltersComponentState,'recordIndexId',);return {applyCurrentViewFiltersToCurrentRecordFilters,- currentFilters,+ currentRecordFilters,};},{@@ -122,7 +122,7 @@ describe('useApplyCurrentViewFiltersToCurrentRecordFilters', () => {result.current.applyCurrentViewFiltersToCurrentRecordFilters();});- expect(result.current.currentFilters).toEqual([+ expect(result.current.currentRecordFilters).toEqual([{id: mockViewFilter.id,fieldMetadataId: mockViewFilter.fieldMetadataId,@@ -146,14 +146,14 @@ describe('useApplyCurrentViewFiltersToCurrentRecordFilters', () => {const { applyCurrentViewFiltersToCurrentRecordFilters } =useApplyCurrentViewFiltersToCurrentRecordFilters();- const currentFilters = useAtomComponentStateValue(+ const currentRecordFilters = useAtomComponentStateValue(currentRecordFiltersComponentState,'recordIndexId',);return {applyCurrentViewFiltersToCurrentRecordFilters,- currentFilters,+ currentRecordFilters,};},{@@ -178,7 +178,7 @@ describe('useApplyCurrentViewFiltersToCurrentRecordFilters', () => {result.current.applyCurrentViewFiltersToCurrentRecordFilters();});- expect(result.current.currentFilters).toEqual([]);+ expect(result.current.currentRecordFilters).toEqual([]);});it('should handle view with empty filters', () => {@@ -189,14 +189,14 @@ describe('useApplyCurrentViewFiltersToCurrentRecordFilters', () => {const { applyCurrentViewFiltersToCurrentRecordFilters } =useApplyCurrentViewFiltersToCurrentRecordFilters();- const currentFilters = useAtomComponentStateValue(+ const currentRecordFilters = useAtomComponentStateValue(currentRecordFiltersComponentState,'recordIndexId',);return {applyCurrentViewFiltersToCurrentRecordFilters,- currentFilters,+ currentRecordFilters,};},{@@ -221,6 +221,6 @@ describe('useApplyCurrentViewFiltersToCurrentRecordFilters', () => {result.current.applyCurrentViewFiltersToCurrentRecordFilters();});- expect(result.current.currentFilters).toEqual([]);+ expect(result.current.currentRecordFilters).toEqual([]);});});diff --git a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewSortsToCurrentRecordSorts.test.tsx b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewSortsToCurrentRecordSorts.test.tsxindex 0d8bd61eda5..d12fdb446fc 100644--- a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewSortsToCurrentRecordSorts.test.tsx+++ b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewSortsToCurrentRecordSorts.test.tsx@@ -84,14 +84,14 @@ describe('useApplyCurrentViewSortsToCurrentRecordSorts', () => {const { applyCurrentViewSortsToCurrentRecordSorts } =useApplyCurrentViewSortsToCurrentRecordSorts();- const currentSorts = useAtomComponentStateValue(+ const currentRecordSorts = useAtomComponentStateValue(currentRecordSortsComponentState,'recordIndexId',);return {applyCurrentViewSortsToCurrentRecordSorts,- currentSorts,+ currentRecordSorts,};},{@@ -109,7 +109,7 @@ describe('useApplyCurrentViewSortsToCurrentRecordSorts', () => {result.current.applyCurrentViewSortsToCurrentRecordSorts();});- expect(result.current.currentSorts).toEqual([+ expect(result.current.currentRecordSorts).toEqual([{id: mockViewSort.id,fieldMetadataId: mockViewSort.fieldMetadataId,@@ -126,14 +126,14 @@ describe('useApplyCurrentViewSortsToCurrentRecordSorts', () => {const { applyCurrentViewSortsToCurrentRecordSorts } =useApplyCurrentViewSortsToCurrentRecordSorts();- const currentSorts = useAtomComponentStateValue(+ const currentRecordSorts = useAtomComponentStateValue(currentRecordSortsComponentState,'recordIndexId',);return {applyCurrentViewSortsToCurrentRecordSorts,- currentSorts,+ currentRecordSorts,};},{@@ -158,7 +158,7 @@ describe('useApplyCurrentViewSortsToCurrentRecordSorts', () => {result.current.applyCurrentViewSortsToCurrentRecordSorts();});- expect(result.current.currentSorts).toEqual([]);+ expect(result.current.currentRecordSorts).toEqual([]);});it('should handle view with empty sorts', () => {@@ -174,14 +174,14 @@ describe('useApplyCurrentViewSortsToCurrentRecordSorts', () => {const { applyCurrentViewSortsToCurrentRecordSorts } =useApplyCurrentViewSortsToCurrentRecordSorts();- const currentSorts = useAtomComponentStateValue(+ const currentRecordSorts = useAtomComponentStateValue(currentRecordSortsComponentState,'recordIndexId',);return {applyCurrentViewSortsToCurrentRecordSorts,- currentSorts,+ currentRecordSorts,};},{@@ -206,6 +206,6 @@ describe('useApplyCurrentViewSortsToCurrentRecordSorts', () => {result.current.applyCurrentViewSortsToCurrentRecordSorts();});- expect(result.current.currentSorts).toEqual([]);+ expect(result.current.currentRecordSorts).toEqual([]);});});diff --git a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewFiltersToCurrentRecordFilters.test.tsx b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewFiltersToCurrentRecordFilters.test.tsxindex 8991c04ba5c..196012f2b27 100644--- a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewFiltersToCurrentRecordFilters.test.tsx+++ b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewFiltersToCurrentRecordFilters.test.tsx@@ -42,11 +42,11 @@ describe('useApplyViewFiltersToCurrentRecordFilters', () => {const { applyViewFiltersToCurrentRecordFilters } =useApplyViewFiltersToCurrentRecordFilters();- const currentFilters = useAtomComponentStateValue(+ const currentRecordFilters = useAtomComponentStateValue(currentRecordFiltersComponentState,);- return { applyViewFiltersToCurrentRecordFilters, currentFilters };+ return { applyViewFiltersToCurrentRecordFilters, currentRecordFilters };},{wrapper: getJestMetadataAndApolloMocksAndActionMenuWrapper({@@ -62,7 +62,7 @@ describe('useApplyViewFiltersToCurrentRecordFilters', () => {result.current.applyViewFiltersToCurrentRecordFilters([mockViewFilter]);});- expect(result.current.currentFilters).toEqual([+ expect(result.current.currentRecordFilters).toEqual([{id: mockViewFilter.id,fieldMetadataId: mockViewFilter.fieldMetadataId,@@ -83,11 +83,11 @@ describe('useApplyViewFiltersToCurrentRecordFilters', () => {const { applyViewFiltersToCurrentRecordFilters } =useApplyViewFiltersToCurrentRecordFilters();- const currentFilters = useAtomComponentStateValue(+ const currentRecordFilters = useAtomComponentStateValue(currentRecordFiltersComponentState,);- return { applyViewFiltersToCurrentRecordFilters, currentFilters };+ return { applyViewFiltersToCurrentRecordFilters, currentRecordFilters };},{wrapper: getJestMetadataAndApolloMocksAndActionMenuWrapper({@@ -103,6 +103,6 @@ describe('useApplyViewFiltersToCurrentRecordFilters', () => {result.current.applyViewFiltersToCurrentRecordFilters([]);});- expect(result.current.currentFilters).toEqual([]);+ expect(result.current.currentRecordFilters).toEqual([]);});});diff --git a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewSortsToCurrentRecordSorts.test.tsx b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewSortsToCurrentRecordSorts.test.tsxindex ebcc60fa43f..53274867cb4 100644--- a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewSortsToCurrentRecordSorts.test.tsx+++ b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewSortsToCurrentRecordSorts.test.tsx@@ -45,11 +45,11 @@ describe('useApplyViewSortsToCurrentRecordSorts', () => {const { applyViewSortsToCurrentRecordSorts } =useApplyViewSortsToCurrentRecordSorts();- const currentSorts = useAtomComponentStateValue(+ const currentRecordSorts = useAtomComponentStateValue(currentRecordSortsComponentState,);- return { applyViewSortsToCurrentRecordSorts, currentSorts };+ return { applyViewSortsToCurrentRecordSorts, currentRecordSorts };},{wrapper: getJestMetadataAndApolloMocksAndActionMenuWrapper({@@ -65,7 +65,7 @@ describe('useApplyViewSortsToCurrentRecordSorts', () => {result.current.applyViewSortsToCurrentRecordSorts([mockViewSort]);});- expect(result.current.currentSorts).toEqual([+ expect(result.current.currentRecordSorts).toEqual([{id: mockViewSort.id,fieldMetadataId: mockViewSort.fieldMetadataId,@@ -80,11 +80,11 @@ describe('useApplyViewSortsToCurrentRecordSorts', () => {const { applyViewSortsToCurrentRecordSorts } =useApplyViewSortsToCurrentRecordSorts();- const currentSorts = useAtomComponentStateValue(+ const currentRecordSorts = useAtomComponentStateValue(currentRecordSortsComponentState,);- return { applyViewSortsToCurrentRecordSorts, currentSorts };+ return { applyViewSortsToCurrentRecordSorts, currentRecordSorts };},{wrapper: getJestMetadataAndApolloMocksAndActionMenuWrapper({@@ -100,6 +100,6 @@ describe('useApplyViewSortsToCurrentRecordSorts', () => {result.current.applyViewSortsToCurrentRecordSorts([]);});- expect(result.current.currentSorts).toEqual([]);+ expect(result.current.currentRecordSorts).toEqual([]);});});diff --git a/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewAnyFieldFilterToAnyFieldFilter.ts b/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewAnyFieldFilterToAnyFieldFilter.tsindex c78733517d8..3f4c609d8b4 100644--- a/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewAnyFieldFilterToAnyFieldFilter.ts+++ b/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewAnyFieldFilterToAnyFieldFilter.ts@@ -8,7 +8,7 @@ import { useCallback } from 'react';import { isDefined } from 'twenty-shared/utils';export const useApplyCurrentViewAnyFieldFilterToAnyFieldFilter = () => {- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);@@ -21,14 +21,14 @@ export const useApplyCurrentViewAnyFieldFilterToAnyFieldFilter = () => {const applyCurrentViewAnyFieldFilterToAnyFieldFilter = useCallback(() => {const currentView = store.get(coreViewFromViewIdFamilySelector.selectorFamily({- viewId: currentViewId ?? '',+ viewId: contextStoreCurrentViewId ?? '',}),);if (isDefined(currentView)) {setAnyFieldFilterValue(currentView.anyFieldFilterValue ?? '');}- }, [currentViewId, setAnyFieldFilterValue, store]);+ }, [contextStoreCurrentViewId, setAnyFieldFilterValue, store]);return {applyCurrentViewAnyFieldFilterToAnyFieldFilter,diff --git a/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewFilterGroupsToCurrentRecordFilterGroups.ts b/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewFilterGroupsToCurrentRecordFilterGroups.tsindex a8a9f5bddc2..09a74126ff2 100644--- a/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewFilterGroupsToCurrentRecordFilterGroups.ts+++ b/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewFilterGroupsToCurrentRecordFilterGroups.ts@@ -12,7 +12,7 @@ import { isDeeplyEqual } from '~/utils/isDeeplyEqual';export const useApplyCurrentViewFilterGroupsToCurrentRecordFilterGroups =() => {- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);@@ -30,7 +30,7 @@ export const useApplyCurrentViewFilterGroupsToCurrentRecordFilterGroups =useCallback(() => {const currentView = store.get(coreViewFromViewIdFamilySelector.selectorFamily({- viewId: currentViewId ?? '',+ viewId: contextStoreCurrentViewId ?? '',}),);@@ -50,7 +50,7 @@ export const useApplyCurrentViewFilterGroupsToCurrentRecordFilterGroups =}}}, [- currentViewId,+ contextStoreCurrentViewId,setCurrentRecordFilterGroups,currentRecordFilterGroups,store,diff --git a/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewFiltersToCurrentRecordFilters.ts b/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewFiltersToCurrentRecordFilters.tsindex 6ac6746ee7b..080112a4729 100644--- a/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewFiltersToCurrentRecordFilters.ts+++ b/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewFiltersToCurrentRecordFilters.ts@@ -9,7 +9,7 @@ import { isDefined } from 'twenty-shared/utils';import { useMapViewFiltersToFilters } from './useMapViewFiltersToFilters';export const useApplyCurrentViewFiltersToCurrentRecordFilters = () => {- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);@@ -24,7 +24,7 @@ export const useApplyCurrentViewFiltersToCurrentRecordFilters = () => {const applyCurrentViewFiltersToCurrentRecordFilters = useCallback(() => {const currentView = store.get(coreViewFromViewIdFamilySelector.selectorFamily({- viewId: currentViewId ?? '',+ viewId: contextStoreCurrentViewId ?? '',}),);@@ -34,7 +34,7 @@ export const useApplyCurrentViewFiltersToCurrentRecordFilters = () => {);}}, [- currentViewId,+ contextStoreCurrentViewId,mapViewFiltersToRecordFilters,setCurrentRecordFilters,store,diff --git a/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewSortsToCurrentRecordSorts.ts b/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewSortsToCurrentRecordSorts.tsindex 06da42f9ea9..b76d69f9c82 100644--- a/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewSortsToCurrentRecordSorts.ts+++ b/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewSortsToCurrentRecordSorts.ts@@ -7,14 +7,14 @@ import { coreViewFromViewIdFamilySelector } from '@/views/states/selectors/coreVimport { isDefined } from 'twenty-shared/utils';export const useApplyCurrentViewSortsToCurrentRecordSorts = () => {- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);const currentView = useAtomFamilySelectorValue(coreViewFromViewIdFamilySelector,{- viewId: currentViewId ?? '',+ viewId: contextStoreCurrentViewId ?? '',},);diff --git a/packages/twenty-front/src/modules/views/hooks/useGetCurrentViewOnly.ts b/packages/twenty-front/src/modules/views/hooks/useGetCurrentViewOnly.tsindex f69faa27652..2a4ea021a5a 100644--- a/packages/twenty-front/src/modules/views/hooks/useGetCurrentViewOnly.ts+++ b/packages/twenty-front/src/modules/views/hooks/useGetCurrentViewOnly.ts@@ -4,14 +4,14 @@ import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useimport { coreViewFromViewIdFamilySelector } from '@/views/states/selectors/coreViewFromViewIdFamilySelector';export const useGetCurrentViewOnly = () => {- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);const currentView = useAtomFamilySelectorValue(coreViewFromViewIdFamilySelector,{- viewId: currentViewId ?? '',+ viewId: contextStoreCurrentViewId ?? '',},);diff --git a/packages/twenty-front/src/modules/views/hooks/useOpenAnyFieldSearchFilterFromViewBar.ts b/packages/twenty-front/src/modules/views/hooks/useOpenAnyFieldSearchFilterFromViewBar.tsindex 80090ae0d5f..f68d73fdee6 100644--- a/packages/twenty-front/src/modules/views/hooks/useOpenAnyFieldSearchFilterFromViewBar.ts+++ b/packages/twenty-front/src/modules/views/hooks/useOpenAnyFieldSearchFilterFromViewBar.ts@@ -14,7 +14,7 @@ export const useOpenAnyFieldSearchFilterFromViewBar = () => {const { objectMetadataItem } = useRecordIndexContextOrThrow();- const setObjectFilterDropdownAnyFieldSearchIsSelectedComponentState =+ const setObjectFilterDropdownAnyFieldSearchIsSelected =useSetAtomComponentState(objectFilterDropdownAnyFieldSearchIsSelectedComponentState,);@@ -48,7 +48,7 @@ export const useOpenAnyFieldSearchFilterFromViewBar = () => {setAnyFieldFilterValue(filterValue);}- setObjectFilterDropdownAnyFieldSearchIsSelectedComponentState(true);+ setObjectFilterDropdownAnyFieldSearchIsSelected(true);};return {diff --git a/packages/twenty-front/src/modules/views/hooks/useQueryVariablesFromParentView.ts b/packages/twenty-front/src/modules/views/hooks/useQueryVariablesFromParentView.tsindex 1e0fc511bc1..f1698713e28 100644--- a/packages/twenty-front/src/modules/views/hooks/useQueryVariablesFromParentView.ts+++ b/packages/twenty-front/src/modules/views/hooks/useQueryVariablesFromParentView.ts@@ -13,7 +13,7 @@ export const useQueryVariablesFromParentView = ({}) => {const { objectMetadataItems } = useObjectMetadataItems();- const recordShowParentView = useAtomComponentStateValue(+ const contextStoreRecordShowParentView = useAtomComponentStateValue(contextStoreRecordShowParentViewComponentState,MAIN_CONTEXT_STORE_INSTANCE_ID,);@@ -21,9 +21,10 @@ export const useQueryVariablesFromParentView = ({const { filterValueDependencies } = useFilterValueDependencies();const { filter, orderBy } = getQueryVariablesFromFiltersAndSorts({- recordFilterGroups: recordShowParentView?.parentViewFilterGroups ?? [],- recordFilters: recordShowParentView?.parentViewFilters ?? [],- recordSorts: recordShowParentView?.parentViewSorts ?? [],+ recordFilterGroups:+ contextStoreRecordShowParentView?.parentViewFilterGroups ?? [],+ recordFilters: contextStoreRecordShowParentView?.parentViewFilters ?? [],+ recordSorts: contextStoreRecordShowParentView?.parentViewSorts ?? [],objectMetadataItem,objectMetadataItems,filterValueDependencies,diff --git a/packages/twenty-front/src/modules/views/hooks/useUpdateViewAggregate.ts b/packages/twenty-front/src/modules/views/hooks/useUpdateViewAggregate.tsindex 60052dc6748..30e508dbad4 100644--- a/packages/twenty-front/src/modules/views/hooks/useUpdateViewAggregate.ts+++ b/packages/twenty-front/src/modules/views/hooks/useUpdateViewAggregate.ts@@ -19,7 +19,7 @@ import { useStore } from 'jotai';export const useUpdateViewAggregate = () => {const store = useStore();const { canPersistChanges } = useCanPersistViewChanges();- const currentViewId = useAtomComponentStateValue(+ const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);const { performViewAPIUpdate } = usePerformViewAPIUpdate();@@ -47,12 +47,12 @@ export const useUpdateViewAggregate = () => {): null;- if (!isDefined(currentViewId)) {+ if (!isDefined(contextStoreCurrentViewId)) {return;}const updatedViewResult = await performViewAPIUpdate({- id: currentViewId,+ id: contextStoreCurrentViewId,input: {kanbanAggregateOperationFieldMetadataId,kanbanAggregateOperation: convertedKanbanAggregateOperation,@@ -81,7 +81,7 @@ export const useUpdateViewAggregate = () => {},[canPersistChanges,- currentViewId,+ contextStoreCurrentViewId,performViewAPIUpdate,loadRecordIndexStates,store,diff --git a/packages/twenty-front/src/modules/workflow/hooks/useWorkflowRunIdOrThrow.ts b/packages/twenty-front/src/modules/workflow/hooks/useWorkflowRunIdOrThrow.tsindex 2c5e0433e1e..5715755abc9 100644--- a/packages/twenty-front/src/modules/workflow/hooks/useWorkflowRunIdOrThrow.ts+++ b/packages/twenty-front/src/modules/workflow/hooks/useWorkflowRunIdOrThrow.ts@@ -3,13 +3,13 @@ import { workflowVisualizerWorkflowRunIdComponentState } from '@/workflow/statesimport { isDefined } from 'twenty-shared/utils';export const useWorkflowRunIdOrThrow = () => {- const workflowRunId = useAtomComponentStateValue(+ const workflowVisualizerWorkflowRunId = useAtomComponentStateValue(workflowVisualizerWorkflowRunIdComponentState,);- if (!isDefined(workflowRunId)) {+ if (!isDefined(workflowVisualizerWorkflowRunId)) {throw new Error('Expected the workflow run ID to be defined');}- return workflowRunId;+ return workflowVisualizerWorkflowRunId;};diff --git a/packages/twenty-front/src/modules/workflow/hooks/useWorkflowVersionIdOrThrow.ts b/packages/twenty-front/src/modules/workflow/hooks/useWorkflowVersionIdOrThrow.tsindex 0d8ff647123..5d1fb926c17 100644--- a/packages/twenty-front/src/modules/workflow/hooks/useWorkflowVersionIdOrThrow.ts+++ b/packages/twenty-front/src/modules/workflow/hooks/useWorkflowVersionIdOrThrow.ts@@ -3,13 +3,13 @@ import { workflowVisualizerWorkflowVersionIdComponentState } from '@/workflow/stimport { isDefined } from 'twenty-shared/utils';export const useWorkflowVersionIdOrThrow = () => {- const workflowVersionId = useAtomComponentStateValue(+ const workflowVisualizerWorkflowVersionId = useAtomComponentStateValue(workflowVisualizerWorkflowVersionIdComponentState,);- if (!isDefined(workflowVersionId)) {+ if (!isDefined(workflowVisualizerWorkflowVersionId)) {throw new Error('Expected the workflow version ID to be defined');}- return workflowVersionId;+ return workflowVisualizerWorkflowVersionId;};diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsxindex 895745d3372..041477e9049 100644--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx@@ -170,13 +170,13 @@ export const WorkflowDiagramCanvasBase = ({const reactflow = useReactFlow();- const currentWorkflowDiagram = useAtomComponentStateValue(+ const workflowDiagram = useAtomComponentStateValue(workflowDiagramComponentState,);const workflowDiagramPanOnDrag = useAtomComponentStateValue(workflowDiagramPanOnDragComponentState,);- const workflowDiagram = useAtomComponentStateCallbackState(+ const workflowDiagramCallbackState = useAtomComponentStateCallbackState(workflowDiagramComponentState,);const setWorkflowDiagram = useSetAtomComponentState(@@ -213,12 +213,12 @@ export const WorkflowDiagramCanvasBase = ({} | null>(null);const { nodes, edges } = useMemo(() => {- if (!isDefined(currentWorkflowDiagram)) {+ if (!isDefined(workflowDiagram)) {return { nodes: [], edges: [] };}- const nodes = [...currentWorkflowDiagram.nodes];- const edges = [...currentWorkflowDiagram.edges];+ const nodes = [...workflowDiagram.nodes];+ const edges = [...workflowDiagram.edges];if (isDefined(workflowInsertStepIds.position) &&@@ -255,7 +255,7 @@ export const WorkflowDiagramCanvasBase = ({}return { nodes, edges };- }, [currentWorkflowDiagram, workflowInsertStepIds]);+ }, [workflowDiagram, workflowInsertStepIds]);const isCommandMenuOpened = useAtomStateValue(isCommandMenuOpenedState);const { isInRightDrawer } = useContext(ActionMenuContext);@@ -357,10 +357,10 @@ export const WorkflowDiagramCanvasBase = ({isInRightDrawer,isCommandMenuOpened,workflowDiagramFlowInitialized,- workflowDiagram: store.get(workflowDiagram),+ workflowDiagram: store.get(workflowDiagramCallbackState),});},- [setFlowViewport, workflowDiagram, store],+ [setFlowViewport, workflowDiagramCallbackState, store],);useEffect(() => {@@ -378,7 +378,7 @@ export const WorkflowDiagramCanvasBase = ({const handleNodesChanges = useCallback((changes: NodeChange<WorkflowDiagramNode>[]) => {- const existingWorkflowDiagram = store.get(workflowDiagram);+ const existingWorkflowDiagram = store.get(workflowDiagramCallbackState);const filteredChanges = changes.filter((change) =>@@ -399,7 +399,7 @@ export const WorkflowDiagramCanvasBase = ({};}- store.set(workflowDiagram, updatedWorkflowDiagram);+ store.set(workflowDiagramCallbackState, updatedWorkflowDiagram);const currentWorkflowDiagramWaitingNodesDimensions = store.get(workflowDiagramWaitingNodesDimensions,@@ -419,7 +419,7 @@ export const WorkflowDiagramCanvasBase = ({isCommandMenuOpened,setFlowViewport,workflowDiagramFlowInitialized,- workflowDiagram,+ workflowDiagramCallbackState,workflowDiagramWaitingNodesDimensions,isInRightDrawer,store,diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsxindex 0b27af8750c..490a8d63f51 100644--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx@@ -30,7 +30,7 @@ export const WorkflowRunVisualizerEffect = ({const { getIcon } = useIcons();const workflowRun = useWorkflowRun({ workflowRunId });- const setWorkflowRunId = useSetAtomComponentState(+ const setWorkflowVisualizerWorkflowRunId = useSetAtomComponentState(workflowVisualizerWorkflowRunIdComponentState,);@@ -72,8 +72,8 @@ export const WorkflowRunVisualizerEffect = ({const store = useStore();useEffect(() => {- setWorkflowRunId(workflowRunId);- }, [setWorkflowRunId, workflowRunId]);+ setWorkflowVisualizerWorkflowRunId(workflowRunId);+ }, [setWorkflowVisualizerWorkflowRunId, workflowRunId]);useEffect(() => {if (!isDefined(workflowRun)) {diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowRunDiagramStepNode.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowRunDiagramStepNode.tsxindex 3c637248920..cb56c72723f 100644--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowRunDiagramStepNode.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowRunDiagramStepNode.tsx@@ -87,7 +87,7 @@ export const WorkflowRunDiagramStepNode = ({const { getIcon } = useIcons();const theme = useTheme();- const workflowId = useAtomComponentStateValue(+ const workflowVisualizerWorkflowId = useAtomComponentStateValue(workflowVisualizerWorkflowIdComponentState,);const workflowRunId = useWorkflowRunIdOrThrow();@@ -116,7 +116,7 @@ export const WorkflowRunDiagramStepNode = ({: 0;const handleClick = () => {- if (!isDefined(workflowId)) {+ if (!isDefined(workflowVisualizerWorkflowId)) {throw new Error('Workflow ID must be defined');}@@ -127,7 +127,7 @@ export const WorkflowRunDiagramStepNode = ({setWorkflowSelectedNode(id);openWorkflowRunViewStepInCommandMenu({- workflowId,+ workflowId: workflowVisualizerWorkflowId,workflowRunId,title: data.name,icon: getIcon(getWorkflowNodeIconKey(data)),diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/hooks/useChildStepFiltersAndChildStepFilterGroups.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/hooks/useChildStepFiltersAndChildStepFilterGroups.tsindex ffd305201a2..633a8d62bc6 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/hooks/useChildStepFiltersAndChildStepFilterGroups.ts+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/hooks/useChildStepFiltersAndChildStepFilterGroups.ts@@ -9,15 +9,15 @@ export const useChildStepFiltersAndChildStepFilterGroups = ({}: {stepFilterGroupId: string;}) => {- const stepFilterGroups = useAtomComponentStateValue(+ const currentStepFilterGroups = useAtomComponentStateValue(currentStepFilterGroupsComponentState,);- const stepFilters = useAtomComponentStateValue(+ const currentStepFilters = useAtomComponentStateValue(currentStepFiltersComponentState,);- const currentStepFilterGroup = stepFilterGroups?.find(+ const currentStepFilterGroup = currentStepFilterGroups?.find((stepFilterGroup) => stepFilterGroup.id === stepFilterGroupId,);@@ -33,11 +33,11 @@ export const useChildStepFiltersAndChildStepFilterGroups = ({};}- const childStepFilters = stepFilters?.filter(+ const childStepFilters = currentStepFilters?.filter((filter) => filter.stepFilterGroupId === currentStepFilterGroup.id,);- const childStepFilterGroups = stepFilterGroups?.filter(+ const childStepFilterGroups = currentStepFilterGroups?.filter((filterGroup) =>filterGroup.parentStepFilterGroupId === currentStepFilterGroup.id,);diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/hooks/useResetWorkflowAiAgentPermissionsStateOnCommandMenuClose.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/hooks/useResetWorkflowAiAgentPermissionsStateOnCommandMenuClose.tsindex 704b69d8e64..219692fc258 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/hooks/useResetWorkflowAiAgentPermissionsStateOnCommandMenuClose.ts+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/hooks/useResetWorkflowAiAgentPermissionsStateOnCommandMenuClose.ts@@ -5,18 +5,20 @@ import { workflowAiAgentPermissionsIsAddingPermissionState } from '@/workflow/woimport { workflowAiAgentPermissionsSelectedObjectIdState } from '@/workflow/workflow-steps/workflow-actions/ai-agent-action/states/workflowAiAgentPermissionsSelectedObjectIdState';export const useResetWorkflowAiAgentPermissionsStateOnCommandMenuClose = () => {- const setSelectedObjectId = useSetAtomState(+ const setWorkflowAiAgentPermissionsSelectedObjectId = useSetAtomState(workflowAiAgentPermissionsSelectedObjectIdState,);- const setIsAddingPermission = useSetAtomState(+ const setWorkflowAiAgentPermissionsIsAddingPermission = useSetAtomState(workflowAiAgentPermissionsIsAddingPermissionState,);- const setAgentState = useSetAtomState(workflowAiAgentActionAgentState);+ const setWorkflowAiAgentActionAgent = useSetAtomState(+ workflowAiAgentActionAgentState,+ );const resetPermissionState = () => {- setSelectedObjectId(undefined);- setIsAddingPermission(false);- setAgentState(undefined);+ setWorkflowAiAgentPermissionsSelectedObjectId(undefined);+ setWorkflowAiAgentPermissionsIsAddingPermission(false);+ setWorkflowAiAgentActionAgent(undefined);};useListenToSidePanelClosing(resetPermissionState);diff --git a/packages/twenty-front/src/pages/object-record/RecordShowPageTitle.tsx b/packages/twenty-front/src/pages/object-record/RecordShowPageTitle.tsxindex 7863afe982c..e81a2ecaec4 100644--- a/packages/twenty-front/src/pages/object-record/RecordShowPageTitle.tsx+++ b/packages/twenty-front/src/pages/object-record/RecordShowPageTitle.tsx@@ -18,13 +18,16 @@ export const RecordShowPageTitle = ({const { objectMetadataItem } = useObjectMetadataItem({ objectNameSingular });- const record = useAtomFamilyStateValue(+ const recordStore = useAtomFamilyStateValue(recordStoreFamilyState,objectRecordId,);- const pageName = isDefined(record)- ? getLabelIdentifierFieldValue(record, labelIdentifierFieldMetadataItem)+ const pageName = isDefined(recordStore)+ ? getLabelIdentifierFieldValue(+ recordStore,+ labelIdentifierFieldMetadataItem,+ ): '';const pageTitle = pageName.trim()diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfiguration.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfiguration.tsxindex 97539f490e3..3f7df922193 100644--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfiguration.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfiguration.tsx@@ -30,7 +30,7 @@ export const SettingsAccountsConfiguration = () => {const { enqueueSuccessSnackBar, enqueueErrorSnackBar } = useSnackBar();const [startChannelSyncMutation, { loading: isSubmitting }] =useStartChannelSyncMutation();- const setSelectedMessageChannel = useSetAtomState(+ const setSettingsAccountsSelectedMessageChannel = useSetAtomState(settingsAccountsSelectedMessageChannelState,);@@ -55,7 +55,7 @@ export const SettingsAccountsConfiguration = () => {recordGqlFields,onCompleted: (data) => {if (isDefined(data[0])) {- setSelectedMessageChannel(data[0]);+ setSettingsAccountsSelectedMessageChannel(data[0]);}},skip: !connectedAccountId,diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationPermissionsTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationPermissionsTab.tsxindex 67c4cd3ce40..8646be4a1b2 100644--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationPermissionsTab.tsx+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationPermissionsTab.tsx@@ -284,7 +284,7 @@ const MarketplaceRoleEffect = ({) => void;}) => {const objectMetadataItems = useAtomStateValue(objectMetadataItemsState);- const setDraftRole = useSetAtomFamilyState(+ const setSettingsDraftRole = useSetAtomFamilyState(settingsDraftRoleFamilyState,defaultRole.id,);@@ -310,8 +310,8 @@ const MarketplaceRoleEffect = ({}, [defaultRole, objectMetadataItems, marketplaceAppObjects]);useEffect(() => {- setDraftRole(resolvedRole);- }, [resolvedRole, setDraftRole]);+ setSettingsDraftRole(resolvedRole);+ }, [resolvedRole, setSettingsDraftRole]);useEffect(() => {onObjectMetadataItemsFromMarketplaceApp(diff --git a/packages/twenty-front/src/pages/settings/roles/SettingsRoleEdit.tsx b/packages/twenty-front/src/pages/settings/roles/SettingsRoleEdit.tsxindex a11c11ff89b..09770592de6 100644--- a/packages/twenty-front/src/pages/settings/roles/SettingsRoleEdit.tsx+++ b/packages/twenty-front/src/pages/settings/roles/SettingsRoleEdit.tsx@@ -10,7 +10,7 @@ import { settingsPersistedRoleFamilyState } from '~/modules/settings/roles/stateexport const SettingsRoleEdit = () => {const { roleId } = useParams();- const persistedRole = useAtomFamilyStateValue(+ const settingsPersistedRole = useAtomFamilyStateValue(settingsPersistedRoleFamilyState,roleId ?? '',);@@ -19,7 +19,7 @@ export const SettingsRoleEdit = () => {return <Navigate to={getSettingsPath(SettingsPath.Roles)} />;}- const isCreateMode = !isDefined(persistedRole?.id);+ const isCreateMode = !isDefined(settingsPersistedRole?.id);return (<>diff --git a/packages/twenty-front/src/testing/decorators/ContextStoreDecorator.tsx b/packages/twenty-front/src/testing/decorators/ContextStoreDecorator.tsxindex d5e9eb2998f..55e4fed904a 100644--- a/packages/twenty-front/src/testing/decorators/ContextStoreDecorator.tsx+++ b/packages/twenty-front/src/testing/decorators/ContextStoreDecorator.tsx@@ -17,7 +17,7 @@ export const ContextStoreDecorator: Decorator = (Story, context) => {componentInstanceId = MAIN_CONTEXT_STORE_INSTANCE_ID;}- const setCurrentObjectMetadataItemId = useSetAtomComponentState(+ const setContextStoreCurrentObjectMetadataItemId = useSetAtomComponentState(contextStoreCurrentObjectMetadataItemIdComponentState,componentInstanceId,);@@ -27,9 +27,9 @@ export const ContextStoreDecorator: Decorator = (Story, context) => {const objectMetadataItem = getMockCompanyObjectMetadataItem();useEffect(() => {- setCurrentObjectMetadataItemId(objectMetadataItem.id);+ setContextStoreCurrentObjectMetadataItemId(objectMetadataItem.id);setIsLoaded(true);- }, [setCurrentObjectMetadataItemId, objectMetadataItem]);+ }, [setContextStoreCurrentObjectMetadataItemId, objectMetadataItem]);return (<ContextStoreComponentInstanceContext.Providerdiff --git a/packages/twenty-front/src/testing/decorators/PrefetchLoadedDecorator.tsx b/packages/twenty-front/src/testing/decorators/PrefetchLoadedDecorator.tsxindex 71366dfdfb3..c576f36cc24 100644--- a/packages/twenty-front/src/testing/decorators/PrefetchLoadedDecorator.tsx+++ b/packages/twenty-front/src/testing/decorators/PrefetchLoadedDecorator.tsx@@ -5,17 +5,18 @@ import { PrefetchKey } from '@/prefetch/types/PrefetchKey';import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';export const PrefetchLoadedDecorator: Decorator = (Story) => {- const setAreFavoritesPrefetched = useSetAtomFamilyState(+ const setPrefetchIsLoaded = useSetAtomFamilyState(prefetchIsLoadedFamilyState,PrefetchKey.AllFavorites,);- const setAreFavoritesFoldersPrefetched = useSetAtomFamilyState(+ // eslint-disable-next-line twenty/matching-state-variable+ const setPrefetchIsLoadedFolders = useSetAtomFamilyState(prefetchIsLoadedFamilyState,PrefetchKey.AllFavoritesFolders,);- setAreFavoritesPrefetched(true);- setAreFavoritesFoldersPrefetched(true);+ setPrefetchIsLoaded(true);+ setPrefetchIsLoadedFolders(true);return <Story />;};diff --git a/packages/twenty-front/src/testing/decorators/PrefetchLoadingDecorator.tsx b/packages/twenty-front/src/testing/decorators/PrefetchLoadingDecorator.tsxindex e231eb62bdd..c8ebfa33a53 100644--- a/packages/twenty-front/src/testing/decorators/PrefetchLoadingDecorator.tsx+++ b/packages/twenty-front/src/testing/decorators/PrefetchLoadingDecorator.tsx@@ -10,12 +10,13 @@ export const PrefetchLoadingDecorator: Decorator = (Story, context) => {const prefetchLoadingSetDelay = parameters.prefetchLoadingSetDelay ?? 0;- const setAreFavoritesFoldersPrefetched = useSetAtomFamilyState(+ const setPrefetchIsLoaded = useSetAtomFamilyState(prefetchIsLoadedFamilyState,PrefetchKey.AllFavoritesFolders,);- const setAreFavoritesPrefetched = useSetAtomFamilyState(+ // eslint-disable-next-line twenty/matching-state-variable+ const setPrefetchIsLoadedFavorites = useSetAtomFamilyState(prefetchIsLoadedFamilyState,PrefetchKey.AllFavorites,);@@ -30,14 +31,14 @@ export const PrefetchLoadingDecorator: Decorator = (Story, context) => {setIsInitialized(true);setTimeout(() => {- setAreFavoritesPrefetched(false);- setAreFavoritesFoldersPrefetched(false);+ setPrefetchIsLoadedFavorites(false);+ setPrefetchIsLoaded(false);}, prefetchLoadingSetDelay);}, [isInitialized,prefetchLoadingSetDelay,- setAreFavoritesFoldersPrefetched,- setAreFavoritesPrefetched,+ setPrefetchIsLoaded,+ setPrefetchIsLoadedFavorites,]);return <Story />;diff --git a/packages/twenty-front/src/testing/jest/JestContextStoreSetter.tsx b/packages/twenty-front/src/testing/jest/JestContextStoreSetter.tsxindex de583e0324e..c4ae490a6fe 100644--- a/packages/twenty-front/src/testing/jest/JestContextStoreSetter.tsx+++ b/packages/twenty-front/src/testing/jest/JestContextStoreSetter.tsx@@ -64,12 +64,12 @@ export const JestContextStoreSetter = ({instanceId,);- const setContextStoreFiltersComponentState = useSetAtomComponentState(+ const setContextStoreFilters = useSetAtomComponentState(contextStoreFiltersComponentState,instanceId,);- const setContextStoreFilterGroupsComponentState = useSetAtomComponentState(+ const setContextStoreFilterGroups = useSetAtomComponentState(contextStoreFilterGroupsComponentState,instanceId,);@@ -96,8 +96,8 @@ export const JestContextStoreSetter = ({setContextStoreTargetedRecordsRule(contextStoreTargetedRecordsRule);setContextStoreCurrentObjectMetadataItemId(objectMetadataItem.id);setContextStoreNumberOfSelectedRecords(contextStoreNumberOfSelectedRecords);- setContextStoreFiltersComponentState(contextStoreFilters);- setContextStoreFilterGroupsComponentState(contextStoreFilterGroups);+ setContextStoreFilters(contextStoreFilters);+ setContextStoreFilterGroups(contextStoreFilterGroups);setContextStoreCurrentViewType(contextStoreCurrentViewType ?? null);setIsLoaded(true);}, [@@ -107,14 +107,14 @@ export const JestContextStoreSetter = ({contextStoreCurrentObjectMetadataId,setContextStoreNumberOfSelectedRecords,contextStoreNumberOfSelectedRecords,- setContextStoreFiltersComponentState,+ setContextStoreFilters,contextStoreFilters,objectMetadataItem,setContextStoreCurrentViewId,contextStoreCurrentViewId,setContextStoreCurrentViewType,contextStoreCurrentViewType,- setContextStoreFilterGroupsComponentState,+ setContextStoreFilterGroups,contextStoreFilterGroups,]);