From de802b1447c3f9e4105c8634e8ee313fdcdb0fb4 Mon Sep 17 00:00:00 2001 From: Lucas Bordeau Date: Wed, 6 Aug 2025 12:09:15 +0200 Subject: [PATCH] Removed all v2 in naming of state management logic (#13675) This PR removes any V2 naming in state management logic and some minor utils and hooks. It has a lot of changes but nearly all of them were made by the rename functionality of vscode which is deterministic, so it shouldn't introduce any regression. QA has been made on this PR on the main features of the app without any noticeable issue. Also renamed some other v2 naming related items : - TextInputV2 => TextInput - TextInput => SettingsTextInput - ObjectFilterDropdownFilterSelectMenuItemV2 => ObjectFilterDropdownFilterSelectMenuItem - useInitDraftValueV2 => useInitDraftValue - useOpenRecordTableCellV2 => useOpenRecordTableCell --- .../actions/components/ActionModal.tsx | 4 +- .../display/components/ActionDropdownItem.tsx | 4 +- .../DeleteMultipleRecordsAction.tsx | 10 +- .../DestroyMultipleRecordsAction.tsx | 10 +- .../ExportMultipleRecordsAction.tsx | 4 +- .../RestoreMultipleRecordsAction.tsx | 10 +- .../CreateNewViewNoSelectionRecord.tsx | 10 +- ...eDeletedRecordsNoSelectionRecordAction.tsx | 6 +- ...eDeletedRecordsNoSelectionRecordAction.tsx | 4 +- .../hooks/useRunWorkflowRecordActions.tsx | 4 +- .../components/ExportSingleRecordAction.tsx | 4 +- .../hooks/useSelectedRecordIdOrThrow.tsx | 4 +- .../components/RecordIndexActionMenu.tsx | 4 +- .../RecordIndexActionMenuDropdown.tsx | 6 +- .../components/RecordShowActionMenu.tsx | 6 +- .../RecordShowRightDrawerActionMenu.tsx | 4 +- .../RecordShowRightDrawerOpenRecordButton.tsx | 12 +- .../contexts/ActionMenuContextProvider.tsx | 4 +- ...ionMenuContextProviderWorkflowsEnabled.tsx | 4 +- .../action-menu/hooks/useRegisteredActions.ts | 6 +- .../useShouldActionBeRegisteredParams.ts | 12 +- ...ctionMenuDropdownPositionComponentState.ts | 4 +- .../files/components/AttachmentRow.tsx | 4 +- .../tasks/components/TaskGroups.tsx | 4 +- .../src/modules/ai/components/AIChatTab.tsx | 16 +- .../ai/components/AIChatThreadGroup.tsx | 4 +- .../internal/AgentChatContextPreview.tsx | 26 +- .../AgentChatContextRecordPreview.tsx | 16 +- .../internal/AgentChatFileUploadButton.tsx | 4 +- .../modules/ai/hooks/useAIChatFileUpload.ts | 10 +- .../src/modules/ai/hooks/useAgentChat.ts | 42 +- .../ai/hooks/useCreateNewAIChatThread.ts | 4 +- .../states/agentChatMessagesComponentState.ts | 4 +- ...ChatObjectMetadataAndRecordContextState.ts | 4 +- .../agentChatSelectedFilesComponentState.ts | 4 +- .../agentChatUploadedFilesComponentState.ts | 4 +- .../currentAIChatThreadComponentState.ts | 4 +- .../isAgentChatCurrentContextActiveState.ts | 4 +- .../effect-components/PageChangeEffect.tsx | 6 +- .../internal/SignInUpEmailField.tsx | 4 +- .../internal/SignInUpPasswordField.tsx | 4 +- .../command-menu/components/CommandMenu.tsx | 6 +- .../components/CommandMenuContainer.tsx | 6 +- .../CommandMenuDefaultSelectionEffect.tsx | 4 +- .../components/CommandMenuItem.tsx | 4 +- .../components/CommandMenuTopBar.tsx | 4 +- .../ResetContextToSelectionCommandButton.tsx | 6 +- ...useOpenCalendarEventInCommandMenu.test.tsx | 4 +- .../useOpenEmailThreadInCommandMenu.test.tsx | 4 +- .../useOpenRecordInCommandMenu.test.tsx | 14 +- .../__tests__/useWorkflowCommandMenu.test.tsx | 18 +- .../hooks/useCommandMenuHotKeys.ts | 4 +- .../CommandMenuCalendarEventPage.tsx | 4 +- .../CommandMenuMessageThreadPage.tsx | 4 +- .../hooks/useEmailThreadInCommandMenu.ts | 4 +- .../states/messageThreadComponentState.ts | 4 +- .../components/CommandMenuRecordPage.tsx | 6 +- .../states/viewableRecordIdComponentState.ts | 4 +- ...iewableRecordNameSingularComponentState.ts | 4 +- ...CommandMenuWorkflowSelectActionContent.tsx | 6 +- .../hooks/useCommandMenuWorkflowIdOrThrow.ts | 4 +- .../commandMenuWorkflowIdComponentState.ts | 4 +- .../commandMenuWorkflowRunIdComponentState.ts | 4 +- ...mandMenuWorkflowVersionIdComponentState.ts | 15 +- .../CommandMenuWorkflowRunViewStepContent.tsx | 6 +- .../useCommandMenuWorkflowRunIdOrThrow.ts | 4 +- .../useCommandMenuWorkflowVersionIdOrThrow.ts | 4 +- ...ndMenuWorkflowSelectTriggerTypeContent.tsx | 6 +- .../MainContextStoreProviderEffect.tsx | 8 +- ...seContextStoreObjectMetadataItemOrThrow.ts | 4 +- ...seFindManyRecordsSelectedInContextStore.ts | 10 +- ...tStoreAnyFieldFilterValueComponentState.ts | 4 +- ...rrentObjectMetadataItemIdComponentState.ts | 4 +- ...contextStoreCurrentViewIdComponentState.ts | 4 +- ...ntextStoreCurrentViewTypeComponentState.ts | 4 +- .../contextStoreFiltersComponentState.ts | 4 +- ...reNumberOfSelectedRecordsComponentState.ts | 4 +- ...StoreRecordShowParentViewComponentState.ts | 14 +- ...tStoreTargetedRecordsRuleComponentState.ts | 4 +- .../CurrentWorkspaceMemberFavorites.tsx | 6 +- .../components/FavoriteFolderPicker.tsx | 4 +- .../components/FavoriteFolderPickerEffect.tsx | 12 +- .../components/FavoriteFolderPickerList.tsx | 6 +- .../FavoriteFolderPickerSearchInput.tsx | 4 +- .../hooks/useFavoriteFolderPicker.ts | 10 +- .../favoriteFolderIdPickerComponentState.ts | 4 +- ...voriteFolderPickerCheckedComponentState.ts | 4 +- ...avoriteFolderPickerComponentFamilyState.ts | 4 +- ...voriteFoldersSearchFilterComponentState.ts | 4 +- .../favoriteFoldersComponentSelector.ts | 4 +- ...igationDrawerItemForObjectMetadataItem.tsx | 8 +- .../AdvancedFilterDropdownFilterInput.tsx | 4 +- .../AdvancedFilterDropdownNumberInput.tsx | 10 +- .../AdvancedFilterDropdownTextInput.tsx | 4 +- ...vancedFilterFieldSelectDropdownContent.tsx | 4 +- .../AdvancedFilterFieldSelectMenu.tsx | 22 +- .../AdvancedFilterFieldSelectSearchInput.tsx | 4 +- ...dvancedFilterRecordFilterOperandSelect.tsx | 4 +- ...FilterRecordFilterOperandSelectContent.tsx | 4 +- ...ancedFilterRecordFilterOptionsDropdown.tsx | 4 +- .../AdvancedFilterRootRecordFilterGroup.tsx | 4 +- .../AdvancedFilterSubFieldSelectMenu.tsx | 12 +- .../components/AdvancedFilterValueInput.tsx | 19 +- ...alueInputDropdownButtonClickableSelect.tsx | 4 +- ...ChildRecordFiltersAndRecordFilterGroups.ts | 6 +- .../hooks/useRecordFilterField.ts | 4 +- ...SelectFieldUsedInAdvancedFilterDropdown.ts | 21 +- ...eSetAdvancedFilterDropdownAllRowsStates.ts | 8 +- ...LevelRecordFilterGroupComponentSelector.ts | 4 +- ...bjectFilterDropdownAnyFieldSearchInput.tsx | 4 +- .../ObjectFilterDropdownContentWrapper.tsx | 4 +- .../ObjectFilterDropdownCountrySelect.tsx | 6 +- .../ObjectFilterDropdownCurrencySelect.tsx | 6 +- .../ObjectFilterDropdownDateInput.tsx | 8 +- .../ObjectFilterDropdownFilterInput.tsx | 6 +- .../ObjectFilterDropdownFilterInputHeader.tsx | 6 +- ...ectFilterDropdownFilterSelectMenuItem.tsx} | 10 +- ...lterDropdownInnerSelectOperandDropdown.tsx | 8 +- .../ObjectFilterDropdownNumberInput.tsx | 4 +- .../ObjectFilterDropdownOptionSelect.tsx | 10 +- .../ObjectFilterDropdownRecordSelect.tsx | 10 +- .../ObjectFilterDropdownSearchInput.tsx | 12 +- .../ObjectFilterDropdownSourceSelect.tsx | 8 +- .../ObjectFilterDropdownTextInput.tsx | 4 +- .../ObjectFilterDropdownVectorSearchInput.tsx | 4 +- ...useApplyObjectFilterDropdownFilterValue.ts | 6 +- .../useApplyObjectFilterDropdownOperand.ts | 10 +- .../hooks/useEmptyRecordFilter.ts | 6 +- ...terDropdownSelectableFieldMetadataItems.ts | 6 +- .../useObjectFilterDropdownFilterValue.ts | 4 +- .../hooks/useResetFilterDropdown.ts | 16 +- ...UpsertObjectFilterDropdownCurrentFilter.ts | 4 +- ...adataItemIdUsedInDropdownComponentState.ts | 4 +- ...dataItemUsedInDropdownComponentSelector.ts | 4 +- ...downOperandSelectUnfoldedComponentState.ts | 4 +- ...ectFilterDropdownUnfoldedComponentState.ts | 4 +- ...nAnyFieldSearchIsSelectedComponentState.ts | 4 +- ...opdownCurrentRecordFilterComponentState.ts | 4 +- ...rDropdownFilterIsSelectedComponentState.ts | 4 +- ...IsSelectingCompositeFieldComponentState.ts | 4 +- ...FilterDropdownSearchInputComponentState.ts | 4 +- ...pdownSelectedOptionValuesComponentState.ts | 4 +- ...rDropdownSubMenuFieldTypeComponentState.ts | 4 +- ...selectedOperandInDropdownComponentState.ts | 4 +- ...ubFieldNameUsedInDropdownComponentState.ts | 4 +- .../components/ObjectOptionsDropdown.tsx | 4 +- ...tionsDropdownHiddenRecordGroupsContent.tsx | 6 +- .../ObjectOptionsDropdownLayoutContent.tsx | 6 +- ...jectOptionsDropdownLayoutOpenInContent.tsx | 4 +- .../ObjectOptionsDropdownMenuContent.tsx | 10 +- .../ObjectOptionsDropdownMenuViewName.tsx | 16 +- ...ptionsDropdownRecordGroupFieldsContent.tsx | 6 +- ...tOptionsDropdownRecordGroupSortContent.tsx | 10 +- ...jectOptionsDropdownRecordGroupsContent.tsx | 16 +- .../hooks/useObjectOptionsForBoard.ts | 11 +- .../hooks/useObjectOptionsForTable.ts | 6 +- .../hooks/useSearchRecordGroupField.ts | 4 +- .../hooks/useUpdateObjectViewOptions.ts | 6 +- ...ptionsDropdownSearchInputComponentState.ts | 4 +- .../components/ObjectSortDropdownButton.tsx | 24 +- .../useResetRecordSortDropdownSearchInput.ts | 4 +- .../hooks/useResetSortDropdown.ts | 6 +- ...ctionDropdownMenuUnfoldedComponentState.ts | 4 +- ...ctSortDropdownSearchInputComponentState.ts | 4 +- ...lectedRecordSortDirectionComponentState.ts | 4 +- .../record-board/components/RecordBoard.tsx | 19 +- .../RecordBoardBodyEscapeHotkeyEffect.tsx | 4 +- .../components/RecordBoardHeader.tsx | 4 +- .../RecordBoardScrollToFocusedCardEffect.tsx | 6 +- .../RecordBoardStickyHeaderEffect.tsx | 4 +- .../hooks/useActiveRecordBoardCard.ts | 6 +- .../hooks/useBoardCardDragState.ts | 10 +- .../record-board/hooks/useEndBoardCardDrag.ts | 10 +- .../hooks/useFocusedRecordBoardCard.ts | 8 +- .../hooks/useRecordBoardCardHotkeys.ts | 8 +- .../hooks/useRecordBoardCardNavigation.ts | 10 +- .../hooks/useRecordBoardDragOperations.ts | 4 +- .../hooks/useRecordBoardSelection.ts | 20 +- .../record-board/hooks/useSelectAllCards.ts | 15 +- .../hooks/useSetRecordBoardRecordIds.ts | 10 +- .../hooks/useSetRecordIdsForColumn.ts | 8 +- .../hooks/useStartBoardCardDrag.ts | 10 +- .../components/RecordBoardCard.tsx | 20 +- .../RecordBoardCardDraggableContainer.tsx | 4 +- .../components/RecordBoardCardHeader.tsx | 10 +- .../components/RecordBoardColumn.tsx | 4 +- .../RecordBoardColumnCardsContainer.tsx | 6 +- .../RecordBoardColumnFetchMoreLoader.tsx | 4 +- ...ardColumnHeaderAggregateDropdownButton.tsx | 4 +- ...mnHeaderAggregateDropdownFieldsContent.tsx | 6 +- ...nHeaderAggregateDropdownOptionsContent.tsx | 6 +- .../RecordBoardColumnHeaderWrapper.tsx | 4 +- .../aggregateOperationComponentState.ts | 4 +- ...dIdsForAggregateOperationComponentState.ts | 4 +- ...iveRecordBoardCardIndexesComponentState.ts | 4 +- .../states/draggedRecordIdsComponentState.ts | 4 +- ...sedRecordBoardCardIndexesComponentState.ts | 4 +- .../states/isMultiDragActiveComponentState.ts | 4 +- ...cordBoardCardActiveComponentFamilyState.ts | 4 +- ...ecordBoardCardFocusActiveComponentState.ts | 4 +- ...ordBoardCardFocusedComponentFamilyState.ts | 4 +- ...rdBoardCardSelectedComponentFamilyState.ts | 4 +- ...ordBoardCompactModeActiveComponentState.ts | 4 +- .../states/originalSelectionComponentState.ts | 14 +- .../primaryDraggedRecordIdComponentState.ts | 4 +- ...cordBoardFieldDefinitionsComponentState.ts | 4 +- ...ldFetchMoreInColumnComponentFamilyState.ts | 4 +- ...allCardsSelectedStatusComponentSelector.ts | 4 +- ...BoardSelectedRecordIdsComponentSelector.ts | 4 +- ...isibleFieldDefinitionsComponentSelector.ts | 4 +- .../components/FormSingleRecordPicker.tsx | 6 +- ...itDraftValueV2.ts => useInitDraftValue.ts} | 2 +- .../record-field/hooks/useRecordFieldInput.ts | 4 +- .../meta-types/hooks/useAddressField.ts | 4 +- .../meta-types/hooks/useCurrencyField.ts | 4 +- .../meta-types/hooks/useEmailsField.ts | 4 +- .../meta-types/hooks/useFullNameField.ts | 4 +- .../meta-types/hooks/useJsonField.ts | 4 +- .../meta-types/hooks/useLinksField.ts | 4 +- .../meta-types/hooks/useMultiSelectField.ts | 4 +- .../meta-types/hooks/useNumberField.ts | 4 +- .../meta-types/hooks/usePhonesField.ts | 4 +- .../meta-types/hooks/useRelationField.ts | 4 +- .../meta-types/hooks/useRichTextField.ts | 4 +- .../meta-types/hooks/useRichTextV2Field.ts | 4 +- .../meta-types/hooks/useSelectField.ts | 4 +- .../meta-types/hooks/useTextField.ts | 4 +- .../input/components/EmailsFieldInput.tsx | 4 +- .../input/components/LinksFieldInput.tsx | 4 +- .../components/MultiItemFieldMenuItem.tsx | 4 +- .../input/components/PhonesFieldInput.tsx | 4 +- .../components/RelationFromManyFieldInput.tsx | 8 +- .../components/RelationToOneFieldInput.tsx | 10 +- .../RelationToOneFieldInput.stories.tsx | 11 +- .../RecordFieldComponentInstanceContext.ts | 4 +- ...ecordFieldInputDraftValueComponentState.ts | 4 +- ...dFieldInputIsFieldInErrorComponentState.ts | 4 +- ...FieldInputLayoutDirectionComponentState.ts | 4 +- ...putLayoutDirectionLoadingComponentState.ts | 4 +- .../useRemoveRecordFilterGroup.test.tsx | 6 +- .../useUpsertRecordFilterGroup.test.tsx | 6 +- .../hooks/useRemoveRecordFilterGroup.ts | 4 +- .../useRemoveRootRecordFilterGroupIfEmpty.ts | 6 +- .../hooks/useUpsertRecordFilterGroup.ts | 4 +- ...currentRecordFilterGroupsComponentState.ts | 4 +- .../__tests__/useRemoveRecordFilter.test.tsx | 6 +- .../__tests__/useUpsertRecordFilter.test.tsx | 6 +- .../hooks/useCheckIsSoftDeleteFilter.ts | 4 +- ...erFromObjectFilterDropdownCurrentStates.ts | 12 +- .../hooks/useRemoveRecordFilter.ts | 4 +- .../hooks/useUpsertRecordFilter.ts | 4 +- .../anyFieldFilterValueComponentState.ts | 14 +- .../currentRecordFiltersComponentState.ts | 4 +- .../RecordGroupReorderConfirmationModal.tsx | 4 +- .../hooks/useRecordGroupActions.ts | 8 +- .../useRecordGroupReorderConfirmationModal.ts | 8 +- .../hooks/useRecordGroupVisibility.ts | 4 +- .../hooks/useReorderRecordGroups.ts | 4 +- .../recordGroupFieldMetadataComponentState.ts | 4 +- .../states/recordGroupIdsComponentState.ts | 4 +- ...vailableRecordGroupIdsComponentSelector.ts | 69 ++- .../hasRecordGroupsComponentSelector.ts | 4 +- .../hiddenRecordGroupIdsComponentSelector.ts | 4 +- ...recordGroupDefinitionsComponentSelector.ts | 55 +- ...leRecordGroupIdsComponentFamilySelector.ts | 4 +- .../RecordIndexBoardColumnLoaderEffect.tsx | 4 +- .../components/RecordIndexBoardContainer.tsx | 4 +- .../components/RecordIndexBoardDataLoader.tsx | 6 +- .../RecordIndexBoardDataLoaderEffect.tsx | 12 +- ...textStoreNumberOfSelectedRecordsEffect.tsx | 12 +- .../components/RecordIndexContainerGater.tsx | 4 +- ...RecordIndexFiltersToContextStoreEffect.tsx | 20 +- ...ecordIndexLoadBaseOnContextStoreEffect.tsx | 4 +- .../components/RecordIndexPageHeader.tsx | 6 +- .../RecordIndexRemoveSortingModal.tsx | 4 +- .../components/RecordIndexTableContainer.tsx | 4 +- .../useRecordIndexLazyFetchRecords.test.ts | 6 +- .../hooks/useRecordIndexLazyFetchRecords.ts | 12 +- .../useFindManyRecordIndexTableParams.ts | 10 +- .../hooks/useHandleIndexIdentifierClick.ts | 4 +- .../hooks/useHandleRecordGroupField.ts | 4 +- .../hooks/useHandleToggleTrashColumnFilter.ts | 4 +- .../hooks/useLoadRecordIndexBoardColumn.ts | 10 +- .../hooks/useLoadRecordIndexStates.ts | 4 +- .../hooks/useOpenRecordFromIndexView.ts | 8 +- .../hooks/useRecordBoardRecordGqlFields.ts | 6 +- .../hooks/useRecordTableRecordGqlFields.ts | 4 +- ...xEntityCountByGroupComponentFamilyState.ts | 14 +- ...sFetchedAllRecordsByGroupComponentState.ts | 4 +- ...ndexRecordGroupHideComponentFamilyState.ts | 4 +- ...ecordIndexRecordGroupSortComponentState.ts | 4 +- ...dexRecordIdsByGroupComponentFamilyState.ts | 4 +- ...ecordIndexAllRecordIdsComponentSelector.ts | 87 +-- ...rdGroupIsDraggableSortComponentSelector.ts | 4 +- .../components/RecordInlineCellEditMode.tsx | 10 +- .../record-inline-cell/hooks/useInlineCell.ts | 4 +- .../components/MergeRecordsContainer.tsx | 6 +- ...RecordAndObjectMetadataItemFromRecordId.ts | 6 +- .../components/MultipleRecordPicker.tsx | 13 +- .../MultipleRecordPickerFetchMoreLoader.tsx | 23 +- .../MultipleRecordPickerLoadingEffect.tsx | 12 +- .../MultipleRecordPickerMenuItemContent.tsx | 6 +- .../MultipleRecordPickerMenuItems.tsx | 17 +- .../MultipleRecordPickerSearchInput.tsx | 4 +- ...pleRecordPickerComponentInstanceContext.ts | 4 +- ...ecordPickerIsFetchingMoreComponentState.ts | 4 +- ...ipleRecordPickerIsLoadingComponentState.ts | 4 +- .../multipleRecordPickerPaginationState.ts | 4 +- ...dPickerPickableMorphItemsComponentState.ts | 4 +- ...eRecordPickerSearchFilterComponentState.ts | 4 +- ...chableObjectMetadataItemsComponentState.ts | 4 +- ...rShouldShowInitialLoadingComponentState.ts | 4 +- ...dPickerShouldShowSkeletonComponentState.ts | 4 +- .../searchRecordStoreComponentFamilyState.ts | 19 +- ...PickerIsSelectedComponentFamilySelector.ts | 4 +- .../multipleRecordPickerPaginationSelector.ts | 30 +- ...ckableMorphItemsLengthComponentSelector.ts | 4 +- ...ecordIdsMatchingSearchComponentSelector.ts | 4 +- ...ickableMorphItemComponentFamilySelector.ts | 4 +- .../components/SingleRecordPicker.tsx | 4 +- .../SingleRecordPickerLoadingEffect.tsx | 4 +- .../components/SingleRecordPickerMenuItem.tsx | 4 +- .../SingleRecordPickerMenuItems.tsx | 14 +- .../SingleRecordPickerMenuItemsWithSearch.tsx | 4 +- .../useSingleRecordPickerRecords.test.tsx | 4 +- .../hooks/useSingleRecordPickerRecords.ts | 6 +- .../hooks/useSingleRecordPickerSearch.ts | 6 +- ...eRecordPickerSearchFilterComponentState.ts | 4 +- ...leRecordPickerSearchQueryComponentState.ts | 4 +- ...gleRecordPickerSelectedIdComponentState.ts | 15 +- ...rShouldShowInitialLoadingComponentState.ts | 4 +- ...dPickerShouldShowSkeletonComponentState.ts | 4 +- ...ainerContextStoreTargetedRecordsEffect.tsx | 6 +- .../RecordDetailRelationRecordsListItem.tsx | 8 +- .../RecordDetailRelationSection.tsx | 4 +- ...ordDetailRelationSectionDropdownToMany.tsx | 19 +- ...cordDetailRelationSectionDropdownToOne.tsx | 10 +- .../record-sort/hooks/useRemoveRecordSort.ts | 4 +- .../record-sort/hooks/useUpsertRecordSort.ts | 4 +- .../currentRecordSortsComponentState.ts | 4 +- .../record-table/components/RecordTable.tsx | 8 +- .../components/RecordTableContextProvider.tsx | 4 +- ...dTableNoRecordGroupBodyContextProvider.tsx | 6 +- .../RecordTableNoRecordGroupRows.tsx | 6 +- ...ordTableRecordGroupBodyContextProvider.tsx | 6 +- .../components/RecordTableRecordGroupRows.tsx | 10 +- .../RecordTableScrollToFocusedCellEffect.tsx | 6 +- .../RecordTableScrollToFocusedRowEffect.tsx | 8 +- .../RecordTableStickyBottomEffect.tsx | 4 +- .../components/RecordTableStickyEffect.tsx | 10 +- .../contexts/RecordTableBodyContext.ts | 2 +- .../components/RecordTableEmptyHandler.tsx | 6 +- .../components/RecordTableEmptyState.tsx | 4 +- .../RecordTableEmptyStateSoftDelete.tsx | 4 +- .../useCloseCurrentTableCellInEditMode.ts | 4 +- .../internal/useHandleContainerMouseEnter.ts | 4 +- .../hooks/internal/useLeaveTableFocus.ts | 4 +- .../internal/useResetTableRowSelection.ts | 10 +- .../hooks/internal/useSelectAllRows.ts | 8 +- .../internal/useSetAllRowSelectedState.ts | 4 +- .../hooks/internal/useSetRecordTableData.ts | 16 +- .../hooks/internal/useSetRowSelectedState.ts | 4 +- .../hooks/useActiveRecordTableRow.ts | 6 +- .../hooks/useAggregateRecordsForHeader.ts | 8 +- .../hooks/useBuildRecordInputFromFilters.ts | 4 +- .../hooks/useFocusedRecordTableRow.ts | 12 +- .../record-table/hooks/useRecordTable.ts | 14 +- .../hooks/useRecordTableMoveFocusedCell.ts | 8 +- .../hooks/useRecordTableMoveFocusedRow.ts | 6 +- .../record-table/hooks/useTableColumns.ts | 8 +- ...RecordTableBodyDragDropContextProvider.tsx | 8 +- .../components/RecordTableBodyDroppable.tsx | 4 +- .../RecordTableBodyEscapeHotkeyEffect.tsx | 4 +- .../RecordTableBodyFetchMoreLoader.tsx | 8 +- .../components/RecordTableBodyLoading.tsx | 4 +- ...BodyRecordGroupDragDropContextProvider.tsx | 6 +- .../RecordTableNoRecordGroupBody.tsx | 6 +- .../RecordTableNoRecordGroupBodyEffect.tsx | 10 +- .../RecordTableRecordGroupBodyEffect.tsx | 8 +- .../RecordTableRecordGroupBodyEffects.tsx | 6 +- .../RecordTableRecordGroupsBody.tsx | 10 +- .../components/RecordTableCellEditMode.tsx | 10 +- .../RecordTableCellEditModePortal.tsx | 6 +- ...rdTableCellFieldContextLabelIdentifier.tsx | 4 +- .../RecordTableCellHoveredPortal.tsx | 10 +- .../RecordTableCellPortalWrapper.tsx | 6 +- .../components/RecordTableCellPortals.tsx | 4 +- .../useCloseRecordTableCellInGroup.test.tsx | 4 +- .../useCloseRecordTableCellNoGroup.test.tsx | 4 +- .../useCloseRecordTableCellInGroup.ts | 11 +- .../useCloseRecordTableCellNoGroup.ts | 11 +- ...eCurrentlyFocusedRecordTableCellFocusId.ts | 4 +- .../hooks/useFocusRecordTableCell.ts | 4 +- .../hooks/useMoveHoverToCurrentCell.ts | 8 +- ...bleCellV2.ts => useOpenRecordTableCell.ts} | 23 +- .../useSetIsRecordTableCellFocusActive.ts | 4 +- .../hooks/useTriggerActionMenuDropdown.ts | 6 +- .../hooks/useUnfocusRecordTableCell.ts | 4 +- .../components/RecordTableAggregateFooter.tsx | 4 +- .../RecordTableAggregateFooterCell.tsx | 4 +- ...ordTableColumnAggregateFooterValueCell.tsx | 6 +- ...egateRecordsForRecordTableColumnFooter.tsx | 8 +- .../components/RecordTableColumnHead.tsx | 8 +- .../RecordTableColumnHeadDropdownMenu.tsx | 6 +- .../components/RecordTableHeaderCell.tsx | 20 +- .../RecordTableHeaderCheckboxColumn.tsx | 14 +- .../RecordTableHeaderLastColumn.tsx | 6 +- .../RecordTableHeaderPlusButtonContent.tsx | 4 +- .../useOpenRecordFilterChipFromTableHeader.ts | 4 +- .../components/RecordTableCellsEmpty.tsx | 4 +- .../components/RecordTableCellsVisible.tsx | 4 +- .../components/RecordTableRow.tsx | 8 +- .../components/RecordTableTr.tsx | 18 +- .../components/RecordTableTrEffect.tsx | 4 +- .../hooks/useRecordTableRowHotkeys.ts | 8 +- .../hooks/useSetCurrentRowSelected.ts | 8 +- .../hasUserSelectedAllRowsFamilyState.ts | 4 +- .../isAtLeastOneTableRowSelectedSelector.ts | 4 +- .../isRowSelectedComponentFamilyState.ts | 4 +- .../isRowVisibleComponentFamilyState.ts | 4 +- .../lastSelectedRowIndexComponentState.ts | 4 +- .../RecordTableRecordGroupSection.tsx | 12 +- .../RecordTableRecordGroupSectionAddNew.tsx | 4 +- .../RecordTableRecordGroupSectionLoadMore.tsx | 8 +- .../RecordTableRecordGroupStickyEffect.tsx | 8 +- ...dGroupTableSectionToggledComponentState.ts | 4 +- ...activeRecordTableRowIndexComponentState.ts | 4 +- .../availableTableColumnsComponentState.ts | 4 +- .../RecordTableComponentInstanceContext.ts | 4 +- ...ocusedRecordTableRowIndexComponentState.ts | 4 +- ...ordTableFetchedAllRecordsComponentState.ts | 9 + ...dTableFetchedAllRecordsComponentStateV2.ts | 9 - ...ecordTableCellFocusActiveComponentState.ts | 4 +- ...RecordTableInitialLoadingComponentState.ts | 4 +- ...ecordTableRowActiveComponentFamilyState.ts | 4 +- ...RecordTableRowFocusActiveComponentState.ts | 4 +- ...cordTableRowFocusedComponentFamilyState.ts | 4 +- ...isRecordTableScrolledLeftComponentState.ts | 4 +- .../isSoftDeleteFilterActiveComponentState.ts | 4 +- .../states/numberOfTableRowsComponentState.ts | 4 +- .../states/onColumnsChangeComponentState.ts | 4 +- .../onToggleColumnSortComponentState.ts | 4 +- ...TableCellEditModePositionComponentState.ts | 4 +- .../recordTableFocusPositionComponentState.ts | 4 +- .../recordTableHoverPositionComponentState.ts | 4 +- .../states/resizeFieldOffsetComponentState.ts | 4 +- .../allRowsSelectedStatusComponentSelector.ts | 4 +- .../hiddenTableColumnsComponentSelector.ts | 4 +- .../isSomeCellInEditModeComponentSelector.ts | 4 +- .../numberOfTableColumnsComponentSelector.ts | 4 +- .../selectedRowIdsComponentSelector.ts | 4 +- .../unselectedRowIdsComponentSelector.ts | 4 +- .../visibleTableColumnsComponentSelector.ts | 4 +- .../states/tableColumnsComponentState.ts | 4 +- .../RecordTitleCellTextFieldInput.tsx | 4 +- .../components/RecordTitleDoubleTextInput.tsx | 6 +- .../hooks/useRecordTitleCell.tsx | 4 +- .../components/MultipleSelectDropdown.tsx | 4 +- .../SettingsAccountsBlocklistInput.tsx | 4 +- ...tingsAccountsCalendarChannelsContainer.tsx | 4 +- .../SettingsAccountsConnectionForm.tsx | 22 +- ...ttingsAccountsMessageChannelsContainer.tsx | 4 +- .../components/SettingsAdminGeneral.tsx | 8 +- .../components/SettingsAdminTabContent.tsx | 4 +- .../ConfigVariableDatabaseInput.tsx | 6 +- .../components/ConfigVariableSearchInput.tsx | 4 +- .../components/ConfigVariableValueInput.tsx | 9 +- .../settings/components/SettingsCounter.tsx | 4 +- .../SettingsDataModelFieldIconLabelForm.tsx | 6 +- .../SettingsObjectNewFieldSelector.tsx | 4 +- .../SettingsDataModelFieldDateForm.tsx | 4 +- .../SettingsDataModelFieldRelationForm.tsx | 4 +- ...tingsDataModelFieldSelectFormOptionRow.tsx | 4 +- .../SettingsDataModelObjectAboutForm.tsx | 8 +- .../developers/components/ApiKeyInput.tsx | 8 +- .../developers/components/ApiKeyNameInput.tsx | 4 +- .../SettingsDevelopersWebhookForm.tsx | 6 +- ...tingsIntegrationDatabaseConnectionForm.tsx | 4 +- .../components/PlaygroundSetupForm.tsx | 4 +- .../profile/components/EmailField.tsx | 4 +- .../profile/components/NameFields.tsx | 6 +- .../components/SettingsRoleAssignment.tsx | 8 +- ...RolePermissionsObjectLevelObjectPicker.tsx | 4 +- ...sObjectLevelObjectFieldPermissionTable.tsx | 4 +- .../components/SettingsRoleSettings.tsx | 6 +- .../roles/role/components/SettingsRole.tsx | 4 +- .../components/SettingsRoleCreateEffect.tsx | 4 +- .../components/SettingsRoleEditEffect.tsx | 4 +- .../SettingsSSOIdentitiesProvidersForm.tsx | 4 +- .../components/SSO/SettingsSSOOIDCForm.tsx | 12 +- .../components/SSO/SettingsSSOSAMLForm.tsx | 6 +- .../SettingsServerlessFunctionNewForm.tsx | 4 +- ...ettingsServerlessFunctionCodeEditorTab.tsx | 4 +- ...FunctionTabEnvironmentVariableTableRow.tsx | 6 +- ...FunctionTabEnvironmentVariablesSection.tsx | 4 +- .../workspace/components/NameField.tsx | 4 +- .../SignInBackgroundMockContainer.tsx | 4 +- .../SignInBackgroundMockContainerEffect.tsx | 4 +- .../components/MatchColumnToFieldSelect.tsx | 2 +- .../ValidationStep/components/columns.tsx | 4 +- .../components/DialogManager.tsx | 6 +- .../components/DialogManagerEffect.tsx | 6 +- .../hooks/__tests__/useDialogManager.test.tsx | 4 +- .../states/dialogInternalComponentState.ts | 18 +- .../components/SnackBarProvider.tsx | 4 +- .../states/snackBarInternalComponentState.ts | 4 +- .../field/input/components/AddressInput.tsx | 12 +- .../input/components/MultiSelectInput.tsx | 4 +- .../ui/input/components/IconPicker.tsx | 6 +- .../modules/ui/input/components/Select.tsx | 4 +- .../ui/input/components/SelectInput.tsx | 4 +- .../ui/input/components/SettingsTextInput.tsx | 132 +++++ .../modules/ui/input/components/TextInput.tsx | 544 ++++++++++++++---- .../ui/input/components/TextInputV2.tsx | 446 -------------- .../ui/input/components/TitleInput.tsx | 11 +- .../__stories__/TextInput.stories.tsx | 35 +- .../__stories__/TextInputV2.stories.tsx | 70 --- .../components/RelativeDatePickerHeader.tsx | 4 +- .../PhoneCountryPickerDropdownButton.tsx | 4 +- .../BlockEditorDropdownFocusEffect.tsx | 4 +- .../components/CustomSlashMenuListItem.tsx | 4 +- .../states/isSlashMenuOpenComponentState.ts | 4 +- .../layout/dropdown/components/Dropdown.tsx | 10 +- .../components/DropdownOnToggleEffect.tsx | 6 +- .../internal/DropdownInternalContainer.tsx | 14 +- .../useCloseAnyOpenDropdown.test.tsx | 4 +- .../hooks/__tests__/useCloseDropdown.test.tsx | 10 +- .../hooks/__tests__/useOpenDropdown.test.tsx | 10 +- .../__tests__/useToggleDropdown.test.tsx | 10 +- .../states/dropdownPlacementComponentState.ts | 4 +- .../dropdownMaxHeightComponentState.ts | 4 +- .../dropdownMaxWidthComponentState.ts | 4 +- .../states/isDropdownOpenComponentState.ts | 4 +- .../modal/components/ConfirmationModal.tsx | 4 +- .../ui/layout/modal/components/Modal.tsx | 4 +- .../states/isModalOpenedComponentState.ts | 4 +- .../components/SelectableList.tsx | 4 +- .../components/SelectableListItem.tsx | 4 +- .../hooks/__tests__/useSelectableList.test.ts | 12 +- .../isSelectedItemIdComponentFamilyState.ts | 16 +- .../states/selectableItemIdsComponentState.ts | 16 +- .../states/selectedItemIdComponentState.ts | 16 +- ...isSelectedItemIdComponentFamilySelector.ts | 4 +- .../components/ShowPageSubContainer.tsx | 4 +- .../ui/layout/tab-list/components/TabList.tsx | 4 +- .../TabListFromUrlOptionalEffect.tsx | 10 +- .../states/activeTabIdComponentState.ts | 4 +- .../components/NavigationDrawerInput.tsx | 4 +- .../useClickOutsideListener.test.tsx | 4 +- .../hooks/useClickOutsideListener.ts | 13 +- .../hooks/useListenClickOutside.ts | 15 +- ...utsideListenerIsActivatedComponentState.ts | 4 +- ...ListenerIsMouseDownInsideComponentState.ts | 4 +- ...ListenerMouseDownHappenedComponentState.ts | 4 +- .../scroll/components/ScrollWrapper.tsx | 8 +- .../scroll/hooks/useScrollRestoration.ts | 4 +- ...scrollWrapperScrollBottomComponentState.ts | 4 +- .../scrollWrapperScrollLeftComponentState.ts | 4 +- .../scrollWrapperScrollTopComponentState.ts | 4 +- ....ts => useRecoilComponentCallbackState.ts} | 58 +- ... useRecoilComponentFamilyCallbackState.ts} | 30 +- ...V2.ts => useRecoilComponentFamilyState.ts} | 10 +- ...V2.ts => useRecoilComponentFamilyValue.ts} | 28 +- ...tStateV2.ts => useRecoilComponentState.ts} | 6 +- .../hooks/useRecoilComponentValue.ts | 44 ++ .../hooks/useRecoilComponentValueV2.ts | 44 -- ...ts => useSetRecoilComponentFamilyState.ts} | 10 +- ...ateV2.ts => useSetRecoilComponentState.ts} | 6 +- .../types/ComponentFamilyReadOnlySelector.ts | 14 + .../ComponentFamilyReadOnlySelectorV2.ts | 14 - .../types/ComponentFamilySelector.ts | 14 + .../types/ComponentFamilySelectorV2.ts | 14 - .../types/ComponentFamilyState.ts | 14 + .../types/ComponentFamilyStateKey.ts | 7 + .../types/ComponentFamilyStateKeyV2.ts | 7 - .../types/ComponentFamilyStateV2.ts | 14 - .../types/ComponentReadOnlySelector.ts | 11 + .../types/ComponentReadOnlySelectorV2.ts | 11 - .../types/ComponentSelector.ts | 11 + .../types/ComponentSelectorV2.ts | 11 - .../component-state/types/ComponentState.ts | 9 + .../types/ComponentStateKey.ts | 3 + .../types/ComponentStateKeyV2.ts | 3 - ...ntStateTypeV2.ts => ComponentStateType.ts} | 2 +- .../component-state/types/ComponentStateV2.ts | 11 - ...V2.ts => createComponentFamilySelector.ts} | 38 +- ...ateV2.ts => createComponentFamilyState.ts} | 18 +- .../utils/createComponentInstanceContext.ts | 4 +- ...lectorV2.ts => createComponentSelector.ts} | 36 +- ...nentStateV2.ts => createComponentState.ts} | 12 +- .../views/components/AdvancedFilterChip.tsx | 8 +- .../AdvancedFilterDropdownButton.tsx | 4 +- .../views/components/AnyFieldSearchChip.tsx | 7 +- .../EditableFilterChipDropdownMenuHeader.tsx | 6 +- .../views/components/SoftDeleteFilterChip.tsx | 4 +- .../components/UpdateViewButtonGroup.tsx | 8 +- .../ViewBarAnyFieldFilterEffect.tsx | 12 +- .../views/components/ViewBarDetails.tsx | 14 +- .../views/components/ViewBarFilterButton.tsx | 4 +- .../components/ViewBarFilterDropdown.tsx | 4 +- ...wBarFilterDropdownAdvancedFilterButton.tsx | 8 +- ...erDropdownAnyFieldSearchButtonMenuItem.tsx | 8 +- .../ViewBarFilterDropdownContent.tsx | 15 +- .../ViewBarFilterDropdownFieldSelectMenu.tsx | 4 +- ...ewBarFilterDropdownFieldSelectMenuItem.tsx | 4 +- ...BarFilterDropdownFilterInputMenuHeader.tsx | 6 +- ...iewBarFilterDropdownVectorSearchButton.tsx | 12 +- .../components/ViewBarRecordFilterEffect.tsx | 12 +- .../ViewBarRecordFilterGroupEffect.tsx | 12 +- .../components/ViewBarRecordSortEffect.tsx | 12 +- .../ViewBarFilterDropdown.stories.tsx | 6 +- ...GroupsToCurrentRecordFilterGroups.test.tsx | 8 +- ...ViewFiltersToCurrentRecordFilters.test.tsx | 8 +- ...rentViewSortsToCurrentRecordSorts.test.tsx | 8 +- ...ViewFiltersToCurrentRecordFilters.test.tsx | 6 +- ...pplyViewSortsToCurrentRecordSorts.test.tsx | 6 +- ...temFromViewBarFilterDropdown.test.test.tsx | 50 +- .../__tests__/useUpdateViewAggregate.test.tsx | 8 +- .../internal/useGetRecordIndexTotalCount.ts | 8 +- ...rrentViewAnyFieldFilterToAnyFieldFilter.ts | 8 +- ...FilterGroupsToCurrentRecordFilterGroups.ts | 16 +- ...urrentViewFiltersToCurrentRecordFilters.ts | 8 +- ...plyCurrentViewSortsToCurrentRecordSorts.ts | 8 +- ...eApplyViewFiltersToCurrentRecordFilters.ts | 4 +- .../useApplyViewSortsToCurrentRecordSorts.ts | 4 +- ...erGroupsDifferentFromRecordFilterGroups.ts | 4 +- ...reViewFiltersDifferentFromRecordFilters.ts | 4 +- ...useAreViewSortsDifferentFromRecordSorts.ts | 4 +- .../views/hooks/useClearVectorSearchInput.ts | 4 +- .../hooks/useCreateViewFromCurrentView.ts | 14 +- .../views/hooks/useGetCurrentViewOnly.ts | 4 +- .../src/modules/views/hooks/useInitViewBar.ts | 6 +- ...ldMetadataItemFromViewBarFilterDropdown.ts | 14 +- ...ilterDifferentFromCurrentAnyFieldFilter.ts | 4 +- .../useOpenAnyFieldSearchFilterFromViewBar.ts | 10 +- .../views/hooks/useOpenVectorSearchFilter.ts | 6 +- .../hooks/useQueryVariablesFromParentView.ts | 4 +- .../hooks/useSaveAnyFieldFilterToView.ts | 4 +- .../views/hooks/useSaveCurrentViewFields.ts | 6 +- .../views/hooks/useSaveCurrentViewGroups.ts | 6 +- ...aveRecordFilterGroupsToViewFilterGroups.ts | 4 +- .../useSaveRecordFiltersToViewFilters.ts | 4 +- .../hooks/useSaveRecordSortsToViewSorts.ts | 4 +- ...ectorSearchInputValueFromExistingFilter.ts | 4 +- .../views/hooks/useUpdateCurrentView.ts | 4 +- .../views/hooks/useUpdateViewAggregate.ts | 4 +- .../views/hooks/useVectorSearchFilterState.ts | 4 +- ...availableFieldDefinitionsComponentState.ts | 4 +- ...lizedAnyFieldFilterComponentFamilyState.ts | 4 +- ...tRecordFilterGroupsComponentFamilyState.ts | 4 +- ...urrentRecordFiltersComponentFamilyState.ts | 4 +- ...dCurrentRecordSortsComponentFamilyState.ts | 4 +- .../isCurrentViewIndexComponentState.ts | 4 +- .../states/isViewBarExpandedComponentState.ts | 4 +- .../states/vectorSearchInputComponentState.ts | 4 +- .../viewObjectMetadataIdComponentState.ts | 4 +- .../ViewPickerContentCreateMode.tsx | 27 +- .../components/ViewPickerContentEditMode.tsx | 21 +- .../components/ViewPickerContentEffect.tsx | 20 +- .../components/ViewPickerCreateButton.tsx | 10 +- .../components/ViewPickerDropdown.tsx | 4 +- .../components/ViewPickerEditButton.tsx | 10 +- .../ViewPickerFavoriteFoldersDropdown.tsx | 4 +- .../components/ViewPickerListContent.tsx | 4 +- .../components/ViewPickerOptionDropdown.tsx | 4 +- .../hooks/useCloseAndResetViewPicker.ts | 6 +- .../hooks/useCreateViewFromCurrentState.ts | 16 +- .../hooks/useDeleteViewFromCurrentState.ts | 8 +- .../hooks/useGetAvailableFieldsForKanban.ts | 6 +- .../hooks/useUpdateViewFromCurrentState.ts | 12 +- .../view-picker/hooks/useViewPickerMode.ts | 4 +- .../viewPickerInputNameComponentState.ts | 14 +- .../states/viewPickerIsDirtyComponentState.ts | 4 +- .../viewPickerIsPersistingComponentState.ts | 4 +- ...ckerKanbanFieldMetadataIdComponentState.ts | 4 +- .../states/viewPickerModeComponentState.ts | 4 +- ...viewPickerReferenceViewIdComponentState.ts | 4 +- .../viewPickerSelectedIconComponentState.ts | 4 +- .../states/viewPickerTypeComponentState.ts | 4 +- .../modules/workflow/hooks/useFlowOrThrow.ts | 4 +- .../workflow/hooks/useWorkflowRunIdOrThrow.ts | 4 +- .../workflow/states/flowComponentState.ts | 4 +- ...workflowLastCreatedStepIdComponentState.ts | 4 +- ...kflowVisualizerWorkflowIdComponentState.ts | 15 +- ...owVisualizerWorkflowRunIdComponentState.ts | 4 +- ...sualizerWorkflowVersionIdComponentState.ts | 4 +- .../components/WorkflowDiagramCanvasBase.tsx | 36 +- .../WorkflowDiagramCanvasEditable.tsx | 22 +- .../WorkflowDiagramCanvasEditableEffect.tsx | 8 +- .../WorkflowDiagramCanvasReadonlyEffect.tsx | 10 +- .../WorkflowDiagramDefaultEdgeEditable.tsx | 6 +- .../components/WorkflowDiagramEffect.tsx | 12 +- .../WorkflowDiagramFilterEdgeEditable.tsx | 12 +- .../WorkflowDiagramFilterEdgeReadonly.tsx | 4 +- .../WorkflowDiagramFilterEdgeRun.tsx | 4 +- .../WorkflowDiagramRightClickCommandMenu.tsx | 26 +- ...ightClickCommandMenuClickOutsideEffect.tsx | 6 +- .../WorkflowDiagramStepNodeEditable.tsx | 4 +- .../WorkflowRunDiagramCanvasEffect.tsx | 8 +- .../components/WorkflowRunVisualizer.tsx | 4 +- .../WorkflowRunVisualizerEffect.tsx | 22 +- .../WorkflowVersionVisualizerEffect.tsx | 10 +- .../components/WorkflowVisualizerEffect.tsx | 4 +- .../useTriggerNodeSelection.test.tsx | 4 +- .../hooks/useCloseRightClickMenu.ts | 4 +- .../useHandleWorkflowRunDiagramCanvasInit.ts | 12 +- .../hooks/useIsEdgeHovered.ts | 4 +- .../useOpenWorkflowEditFilterInCommandMenu.ts | 10 +- .../useOpenWorkflowRunFilterInCommandMenu.ts | 12 +- .../useOpenWorkflowViewFilterInCommandMenu.ts | 12 +- .../hooks/useStartNodeCreation.ts | 8 +- .../hooks/useTriggerNodeSelection.ts | 4 +- .../hooks/useWorkflowSelectedNodeOrThrow.ts | 4 +- .../states/workflowDiagramComponentState.ts | 4 +- .../workflowDiagramPanOnDragComponentState.ts | 4 +- ...kflowDiagramRightClickMenuPositionState.ts | 4 +- .../workflowDiagramStatusComponentState.ts | 4 +- ...agramTriggerNodeSelectionComponentState.ts | 4 +- ...ramWaitingNodesDimensionsComponentState.ts | 4 +- .../workflowHoveredEdgeIdComponentState.ts | 4 +- ...mAutomaticallyOpenedStepsComponentState.ts | 4 +- ...lowRunStepToOpenByDefaultComponentState.ts | 4 +- .../workflowSelectedNodeComponentState.ts | 4 +- .../workflow-steps/hooks/useCreateStep.ts | 6 +- .../workflowInsertStepIdsComponentState.ts | 4 +- .../WorkflowEditActionServerlessFunction.tsx | 6 +- .../WorkflowEditActionSendEmail.tsx | 4 +- .../WorkflowEditActionFilterBody.tsx | 4 +- .../WorkflowEditActionFilterBodyEffect.tsx | 12 +- .../hooks/useAddRootStepFilter.ts | 22 +- ...hildStepFiltersAndChildStepFilterGroups.ts | 8 +- .../hooks/useRemoveStepFilter.ts | 9 +- .../hooks/useRemoveStepFilterGroup.ts | 9 +- .../hooks/useUpsertStepFilterSettings.ts | 9 +- .../currentStepFilterGroupsComponentState.ts | 4 +- .../currentStepFiltersComponentState.ts | 4 +- ...entStepFilterGroupsComponentFamilyState.ts | 4 +- ...dCurrentStepFiltersComponentFamilyState.ts | 4 +- ...otLevelStepFilterGroupComponentSelector.ts | 4 +- .../WorkflowAdvancedFilterFormInput.tsx | 8 +- ...dvancedFilterRecordFilterOperandSelect.tsx | 4 +- ...ncedFilterValueFormCompositeFieldInput.tsx | 4 +- .../WorkflowFindRecordsAddFilterButton.tsx | 8 +- .../components/WorkflowFindRecordsFilters.tsx | 10 +- .../WorkflowFindRecordsFiltersEffect.tsx | 12 +- .../WorkflowEditTriggerWebhookForm.tsx | 10 +- .../components/WorkflowVariablesDropdown.tsx | 4 +- .../hooks/useVariableDropdown.ts | 8 +- .../hooks/useTidyUpWorkflowVersion.ts | 4 +- .../components/WorkspaceInviteLink.tsx | 4 +- .../components/WorkspaceInviteTeam.tsx | 4 +- .../src/pages/auth/PasswordReset.tsx | 6 +- .../pages/object-record/RecordIndexPage.tsx | 4 +- .../src/pages/onboarding/CreateProfile.tsx | 6 +- .../src/pages/onboarding/CreateWorkspace.tsx | 4 +- .../src/pages/onboarding/InviteTeam.tsx | 4 +- .../settings/SettingsWorkspaceMembers.tsx | 4 +- .../ai/components/SettingsAIAgentsTable.tsx | 4 +- .../components/SettingsAgentHandoffTable.tsx | 4 +- .../forms/components/SettingsAIAgentForm.tsx | 4 +- .../data-model/SettingsObjectDetailPage.tsx | 4 +- .../data-model/SettingsObjectFieldTable.tsx | 4 +- .../data-model/SettingsObjectIndexTable.tsx | 4 +- .../settings/data-model/SettingsObjects.tsx | 4 +- .../SettingsDevelopersApiKeyDetail.tsx | 4 +- .../api-keys/SettingsDevelopersApiKeysNew.tsx | 4 +- .../SettingsSecurityApprovedAccessDomain.tsx | 6 +- .../SettingsServerlessFunctionDetail.tsx | 4 +- .../workspace/SettingsCustomDomain.tsx | 14 +- .../settings/workspace/SettingsSubdomain.tsx | 6 +- .../decorators/ContextStoreDecorator.tsx | 4 +- .../decorators/RecordTableDecorator.tsx | 4 +- .../testing/jest/JestContextStoreSetter.tsx | 19 +- 773 files changed, 3355 insertions(+), 3462 deletions(-) rename packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/{ObjectFilterDropdownFilterSelectMenuItemV2.tsx => ObjectFilterDropdownFilterSelectMenuItem.tsx} (79%) rename packages/twenty-front/src/modules/object-record/record-field/hooks/{useInitDraftValueV2.ts => useInitDraftValue.ts} (97%) rename packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/{useOpenRecordTableCellV2.ts => useOpenRecordTableCell.ts} (91%) create mode 100644 packages/twenty-front/src/modules/object-record/record-table/states/hasRecordTableFetchedAllRecordsComponentState.ts delete mode 100644 packages/twenty-front/src/modules/object-record/record-table/states/hasRecordTableFetchedAllRecordsComponentStateV2.ts create mode 100644 packages/twenty-front/src/modules/ui/input/components/SettingsTextInput.tsx delete mode 100644 packages/twenty-front/src/modules/ui/input/components/TextInputV2.tsx delete mode 100644 packages/twenty-front/src/modules/ui/input/components/__stories__/TextInputV2.stories.tsx rename packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/{useRecoilComponentCallbackStateV2.ts => useRecoilComponentCallbackState.ts} (61%) rename packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/{useRecoilComponentFamilyCallbackStateV2.ts => useRecoilComponentFamilyCallbackState.ts} (71%) rename packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/{useRecoilComponentFamilyStateV2.ts => useRecoilComponentFamilyState.ts} (74%) rename packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/{useRecoilComponentFamilyValueV2.ts => useRecoilComponentFamilyValue.ts} (52%) rename packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/{useRecoilComponentStateV2.ts => useRecoilComponentState.ts} (80%) create mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/useRecoilComponentValue.ts delete mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2.ts rename packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/{useSetRecoilComponentFamilyStateV2.ts => useSetRecoilComponentFamilyState.ts} (79%) rename packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/{useSetRecoilComponentStateV2.ts => useSetRecoilComponentState.ts} (80%) create mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentFamilyReadOnlySelector.ts delete mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentFamilyReadOnlySelectorV2.ts create mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentFamilySelector.ts delete mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentFamilySelectorV2.ts create mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentFamilyState.ts create mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentFamilyStateKey.ts delete mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentFamilyStateKeyV2.ts delete mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentFamilyStateV2.ts create mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentReadOnlySelector.ts delete mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentReadOnlySelectorV2.ts create mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentSelector.ts delete mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentSelectorV2.ts create mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentState.ts create mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentStateKey.ts delete mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentStateKeyV2.ts rename packages/twenty-front/src/modules/ui/utilities/state/component-state/types/{ComponentStateTypeV2.ts => ComponentStateType.ts} (83%) delete mode 100644 packages/twenty-front/src/modules/ui/utilities/state/component-state/types/ComponentStateV2.ts rename packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/{createComponentFamilySelectorV2.ts => createComponentFamilySelector.ts} (54%) rename packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/{createComponentFamilyStateV2.ts => createComponentFamilyState.ts} (68%) rename packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/{createComponentSelectorV2.ts => createComponentSelector.ts} (56%) rename packages/twenty-front/src/modules/ui/utilities/state/component-state/utils/{createComponentStateV2.ts => createComponentState.ts} (66%) diff --git a/packages/twenty-front/src/modules/action-menu/actions/components/ActionModal.tsx b/packages/twenty-front/src/modules/action-menu/actions/components/ActionModal.tsx index 23e21b191c..fbbe0d8da8 100644 --- a/packages/twenty-front/src/modules/action-menu/actions/components/ActionModal.tsx +++ b/packages/twenty-front/src/modules/action-menu/actions/components/ActionModal.tsx @@ -8,7 +8,7 @@ import { useCloseActionMenu } from '@/action-menu/hooks/useCloseActionMenu'; import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal'; import { useModal } from '@/ui/layout/modal/hooks/useModal'; import { isModalOpenedComponentState } from '@/ui/layout/modal/states/isModalOpenedComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { ButtonAccent } from 'twenty-ui/input'; export type ActionModalProps = { @@ -49,7 +49,7 @@ export const ActionModal = ({ const modalId = `${actionConfig?.key}-action-modal-${actionMenuType}`; - const isModalOpened = useRecoilComponentValueV2( + const isModalOpened = useRecoilComponentValue( isModalOpenedComponentState, modalId, ); 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.tsx index 1eb31bbeaa..72447ac136 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 @@ -4,7 +4,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec import { SelectableListComponentInstanceContext } from '@/ui/layout/selectable-list/states/contexts/SelectableListComponentInstanceContext'; import { isSelectedItemIdComponentFamilySelector } from '@/ui/layout/selectable-list/states/selectors/isSelectedItemIdComponentFamilySelector'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; import { useNavigate } from 'react-router-dom'; import { isDefined } from 'twenty-shared/utils'; import { MenuItem } from 'twenty-ui/navigation'; @@ -31,7 +31,7 @@ export const ActionDropdownItem = ({ SelectableListComponentInstanceContext, ); - const isSelected = useRecoilComponentFamilyValueV2( + const isSelected = useRecoilComponentFamilyValue( isSelectedItemIdComponentFamilySelector, action.key, selectableListInstanceId, diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/DeleteMultipleRecordsAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/DeleteMultipleRecordsAction.tsx index 7d6e4cbfea..a9b8a668f3 100644 --- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/DeleteMultipleRecordsAction.tsx +++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/DeleteMultipleRecordsAction.tsx @@ -11,13 +11,13 @@ import { useLazyFetchAllRecords } from '@/object-record/hooks/useLazyFetchAllRec import { useFilterValueDependencies } from '@/object-record/record-filter/hooks/useFilterValueDependencies'; import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable'; import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { t } from '@lingui/core/macro'; export const DeleteMultipleRecordsAction = () => { const { objectMetadataItem } = useContextStoreObjectMetadataItemOrThrow(); - const contextStoreCurrentViewId = useRecoilComponentValueV2( + const contextStoreCurrentViewId = useRecoilComponentValue( contextStoreCurrentViewIdComponentState, ); @@ -36,15 +36,15 @@ export const DeleteMultipleRecordsAction = () => { objectNameSingular: objectMetadataItem.nameSingular, }); - const contextStoreTargetedRecordsRule = useRecoilComponentValueV2( + const contextStoreTargetedRecordsRule = useRecoilComponentValue( contextStoreTargetedRecordsRuleComponentState, ); - const contextStoreFilters = useRecoilComponentValueV2( + const contextStoreFilters = useRecoilComponentValue( contextStoreFiltersComponentState, ); - const contextStoreAnyFieldFilterValue = useRecoilComponentValueV2( + const contextStoreAnyFieldFilterValue = useRecoilComponentValue( contextStoreAnyFieldFilterValueComponentState, ); diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/DestroyMultipleRecordsAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/DestroyMultipleRecordsAction.tsx index a41b7adcdf..558a76626a 100644 --- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/DestroyMultipleRecordsAction.tsx +++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/DestroyMultipleRecordsAction.tsx @@ -12,12 +12,12 @@ import { useLazyFetchAllRecords } from '@/object-record/hooks/useLazyFetchAllRec import { useFilterValueDependencies } from '@/object-record/record-filter/hooks/useFilterValueDependencies'; import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable'; import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const DestroyMultipleRecordsAction = () => { const { objectMetadataItem } = useContextStoreObjectMetadataItemOrThrow(); - const contextStoreCurrentViewId = useRecoilComponentValueV2( + const contextStoreCurrentViewId = useRecoilComponentValue( contextStoreCurrentViewIdComponentState, ); @@ -36,15 +36,15 @@ export const DestroyMultipleRecordsAction = () => { objectNameSingular: objectMetadataItem.nameSingular, }); - const contextStoreTargetedRecordsRule = useRecoilComponentValueV2( + const contextStoreTargetedRecordsRule = useRecoilComponentValue( contextStoreTargetedRecordsRuleComponentState, ); - const contextStoreFilters = useRecoilComponentValueV2( + const contextStoreFilters = useRecoilComponentValue( contextStoreFiltersComponentState, ); - const contextStoreAnyFieldFilterValue = useRecoilComponentValueV2( + const contextStoreAnyFieldFilterValue = useRecoilComponentValue( contextStoreAnyFieldFilterValueComponentState, ); diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/ExportMultipleRecordsAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/ExportMultipleRecordsAction.tsx index 3c18ce5197..86b27f16c2 100644 --- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/ExportMultipleRecordsAction.tsx +++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/ExportMultipleRecordsAction.tsx @@ -5,13 +5,13 @@ import { useContextStoreObjectMetadataItemOrThrow } from '@/context-store/hooks/ import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState'; import { useRecordIndexExportRecords } from '@/object-record/record-index/export/hooks/useRecordIndexExportRecords'; import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useContext, useMemo } from 'react'; export const ExportMultipleRecordsAction = () => { const { objectMetadataItem } = useContextStoreObjectMetadataItemOrThrow(); - const contextStoreCurrentViewId = useRecoilComponentValueV2( + const contextStoreCurrentViewId = useRecoilComponentValue( contextStoreCurrentViewIdComponentState, ); diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/RestoreMultipleRecordsAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/RestoreMultipleRecordsAction.tsx index d970c35b05..d46a854e3d 100644 --- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/RestoreMultipleRecordsAction.tsx +++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/components/RestoreMultipleRecordsAction.tsx @@ -12,12 +12,12 @@ import { useRestoreManyRecords } from '@/object-record/hooks/useRestoreManyRecor import { useFilterValueDependencies } from '@/object-record/record-filter/hooks/useFilterValueDependencies'; import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable'; import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const RestoreMultipleRecordsAction = () => { const { objectMetadataItem } = useContextStoreObjectMetadataItemOrThrow(); - const contextStoreCurrentViewId = useRecoilComponentValueV2( + const contextStoreCurrentViewId = useRecoilComponentValue( contextStoreCurrentViewIdComponentState, ); @@ -36,15 +36,15 @@ export const RestoreMultipleRecordsAction = () => { objectNameSingular: objectMetadataItem.nameSingular, }); - const contextStoreTargetedRecordsRule = useRecoilComponentValueV2( + const contextStoreTargetedRecordsRule = useRecoilComponentValue( contextStoreTargetedRecordsRuleComponentState, ); - const contextStoreFilters = useRecoilComponentValueV2( + const contextStoreFilters = useRecoilComponentValue( contextStoreFiltersComponentState, ); - const contextStoreAnyFieldFilterValue = useRecoilComponentValueV2( + const contextStoreAnyFieldFilterValue = useRecoilComponentValue( contextStoreAnyFieldFilterValueComponentState, ); 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.tsx index 978f046cc5..c602c70b0c 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 @@ -3,17 +3,17 @@ import { useContextStoreObjectMetadataItemOrThrow } from '@/context-store/hooks/ import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState'; import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId'; import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; +import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId'; import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode'; import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState'; -import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId'; export const CreateNewViewNoSelectionRecord = () => { const { objectMetadataItem } = useContextStoreObjectMetadataItemOrThrow(); const { openDropdown } = useOpenDropdown(); - const currentViewId = useRecoilComponentValueV2( + const currentViewId = useRecoilComponentValue( contextStoreCurrentViewIdComponentState, ); @@ -26,7 +26,7 @@ export const CreateNewViewNoSelectionRecord = () => { currentViewId, ); - const setViewPickerReferenceViewId = useSetRecoilComponentStateV2( + const setViewPickerReferenceViewId = useSetRecoilComponentState( viewPickerReferenceViewIdComponentState, recordIndexId, ); 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.tsx index 5beee94c8e..6e73b5eb9b 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 @@ -6,13 +6,13 @@ import { useRemoveRecordFilter } from '@/object-record/record-filter/hooks/useRe import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState'; import { useHandleToggleTrashColumnFilter } from '@/object-record/record-index/hooks/useHandleToggleTrashColumnFilter'; import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; export const HideDeletedRecordsNoSelectionRecordAction = () => { const { objectMetadataItem } = useContextStoreObjectMetadataItemOrThrow(); - const currentViewId = useRecoilComponentValueV2( + const currentViewId = useRecoilComponentValue( contextStoreCurrentViewIdComponentState, ); @@ -32,7 +32,7 @@ export const HideDeletedRecordsNoSelectionRecordAction = () => { const { checkIsSoftDeleteFilter } = useCheckIsSoftDeleteFilter(); - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, recordIndexId, ); 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.tsx index af1ef0ec67..3c8a4d355f 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 @@ -3,12 +3,12 @@ import { useContextStoreObjectMetadataItemOrThrow } from '@/context-store/hooks/ import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState'; import { useHandleToggleTrashColumnFilter } from '@/object-record/record-index/hooks/useHandleToggleTrashColumnFilter'; import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const SeeDeletedRecordsNoSelectionRecordAction = () => { const { objectMetadataItem } = useContextStoreObjectMetadataItemOrThrow(); - const currentViewId = useRecoilComponentValueV2( + const currentViewId = useRecoilComponentValue( contextStoreCurrentViewIdComponentState, ); 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.tsx index 71596f60d4..2d170aef5d 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 @@ -4,7 +4,7 @@ import { ActionType } from '@/action-menu/actions/types/ActionType'; import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState'; import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem'; import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useActiveWorkflowVersionsWithManualTrigger } from '@/workflow/hooks/useActiveWorkflowVersionsWithManualTrigger'; import { useRunWorkflowVersion } from '@/workflow/hooks/useRunWorkflowVersion'; import { msg } from '@lingui/core/macro'; @@ -23,7 +23,7 @@ export const useRunWorkflowRecordActions = ({ skip?: boolean; }) => { const { getIcon } = useIcons(); - const contextStoreTargetedRecordsRule = useRecoilComponentValueV2( + const contextStoreTargetedRecordsRule = useRecoilComponentValue( contextStoreTargetedRecordsRuleComponentState, ); diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/components/ExportSingleRecordAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/components/ExportSingleRecordAction.tsx index 28a4858294..902324d581 100644 --- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/components/ExportSingleRecordAction.tsx +++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/components/ExportSingleRecordAction.tsx @@ -2,14 +2,14 @@ import { useSelectedRecordIdOrThrow } from '@/action-menu/actions/record-actions import { useContextStoreObjectMetadataItemOrThrow } from '@/context-store/hooks/useContextStoreObjectMetadataItemOrThrow'; import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState'; import { useExportSingleRecord } from '@/object-record/record-show/hooks/useExportSingleRecord'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { Action } from '@/action-menu/actions/components/Action'; export const ExportSingleRecordAction = () => { const { objectMetadataItem } = useContextStoreObjectMetadataItemOrThrow(); - const contextStoreCurrentViewId = useRecoilComponentValueV2( + const contextStoreCurrentViewId = useRecoilComponentValue( contextStoreCurrentViewIdComponentState, ); diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/hooks/useSelectedRecordIdOrThrow.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/hooks/useSelectedRecordIdOrThrow.tsx index 17f5aab14b..5e7ab0a76c 100644 --- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/hooks/useSelectedRecordIdOrThrow.tsx +++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/hooks/useSelectedRecordIdOrThrow.tsx @@ -1,8 +1,8 @@ import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const useSelectedRecordIdOrThrow = () => { - const contextStoreTargetedRecordsRule = useRecoilComponentValueV2( + const contextStoreTargetedRecordsRule = useRecoilComponentValue( contextStoreTargetedRecordsRuleComponentState, ); diff --git a/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenu.tsx b/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenu.tsx index 2d54b922fc..9373ed3ce8 100644 --- a/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenu.tsx +++ b/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenu.tsx @@ -2,11 +2,11 @@ import { PageHeaderActionMenuButtons } from '@/action-menu/components/PageHeader import { RecordIndexActionMenuDropdown } from '@/action-menu/components/RecordIndexActionMenuDropdown'; import { ActionMenuContextProvider } from '@/action-menu/contexts/ActionMenuContextProvider'; import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useIsMobile } from 'twenty-ui/utilities'; export const RecordIndexActionMenu = () => { - const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValueV2( + const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValue( contextStoreCurrentObjectMetadataItemIdComponentState, ); diff --git a/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuDropdown.tsx b/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuDropdown.tsx index ee28b9dec6..32e18d18ae 100644 --- a/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuDropdown.tsx +++ b/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuDropdown.tsx @@ -15,7 +15,7 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectabl import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem'; import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import styled from '@emotion/styled'; import { useContext } from 'react'; import { IconLayoutSidebarRightExpand } from 'twenty-ui/display'; @@ -47,7 +47,7 @@ export const RecordIndexActionMenuDropdown = () => { const dropdownId = getActionMenuDropdownIdFromActionMenuId(actionMenuId); const { closeDropdown } = useCloseDropdown(); - const actionMenuDropdownPosition = useRecoilComponentValueV2( + const actionMenuDropdownPosition = useRecoilComponentValue( recordIndexActionMenuDropdownPositionComponentState, dropdownId, ); @@ -59,7 +59,7 @@ export const RecordIndexActionMenuDropdown = () => { 'more-actions', ]; - const selectedItemId = useRecoilComponentValueV2( + const selectedItemId = useRecoilComponentValue( selectedItemIdComponentState, dropdownId, ); diff --git a/packages/twenty-front/src/modules/action-menu/components/RecordShowActionMenu.tsx b/packages/twenty-front/src/modules/action-menu/components/RecordShowActionMenu.tsx index eb77588719..a34468b55f 100644 --- a/packages/twenty-front/src/modules/action-menu/components/RecordShowActionMenu.tsx +++ b/packages/twenty-front/src/modules/action-menu/components/RecordShowActionMenu.tsx @@ -2,15 +2,15 @@ import { PageHeaderActionMenuButtons } from '@/action-menu/components/PageHeader import { ActionMenuContextProvider } from '@/action-menu/contexts/ActionMenuContextProvider'; import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState'; import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useIsMobile } from 'twenty-ui/utilities'; export const RecordShowActionMenu = () => { - const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValueV2( + const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValue( contextStoreCurrentObjectMetadataItemIdComponentState, ); - const contextStoreTargetedRecordsRule = useRecoilComponentValueV2( + const contextStoreTargetedRecordsRule = useRecoilComponentValue( contextStoreTargetedRecordsRuleComponentState, ); diff --git a/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerActionMenu.tsx b/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerActionMenu.tsx index a6204c69b3..c052e4b5ed 100644 --- a/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerActionMenu.tsx +++ b/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerActionMenu.tsx @@ -1,10 +1,10 @@ import { CommandMenuActionMenuDropdown } from '@/action-menu/components/CommandMenuActionMenuDropdown'; import { ActionMenuContextProvider } from '@/action-menu/contexts/ActionMenuContextProvider'; import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const RecordShowRightDrawerActionMenu = () => { - const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValueV2( + const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValue( contextStoreCurrentObjectMetadataItemIdComponentState, ); diff --git a/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerOpenRecordButton.tsx b/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerOpenRecordButton.tsx index de06dc0ccb..9fd22e22c1 100644 --- a/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerOpenRecordButton.tsx +++ b/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerOpenRecordButton.tsx @@ -15,9 +15,9 @@ import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTab import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; import { useComponentInstanceStateContext } from '@/ui/utilities/state/component-state/hooks/useComponentInstanceStateContext'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { useRecoilCallback, useRecoilValue } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; import { IconBrowserMaximize } from 'twenty-ui/display'; @@ -48,7 +48,7 @@ export const RecordShowRightDrawerOpenRecordButton = ({ targetObjectId: recordId, }); - const activeTabIdInRightDrawer = useRecoilComponentValueV2( + const activeTabIdInRightDrawer = useRecoilComponentValue( activeTabIdComponentState, tabListComponentId, ); @@ -57,12 +57,12 @@ export const RecordShowRightDrawerOpenRecordButton = ({ targetObjectId: recordId, }); - const setActiveTabIdInRecordPage = useSetRecoilComponentStateV2( + const setActiveTabIdInRecordPage = useSetRecoilComponentState( activeTabIdComponentState, tabListComponentIdInRecordPage, ); - const parentViewState = useRecoilComponentCallbackStateV2( + const parentViewState = useRecoilComponentCallbackState( contextStoreRecordShowParentViewComponentState, MAIN_CONTEXT_STORE_INSTANCE_ID, ); diff --git a/packages/twenty-front/src/modules/action-menu/contexts/ActionMenuContextProvider.tsx b/packages/twenty-front/src/modules/action-menu/contexts/ActionMenuContextProvider.tsx index a859118905..fabaf47b7d 100644 --- a/packages/twenty-front/src/modules/action-menu/contexts/ActionMenuContextProvider.tsx +++ b/packages/twenty-front/src/modules/action-menu/contexts/ActionMenuContextProvider.tsx @@ -5,7 +5,7 @@ import { ActionMenuContextProviderWorkflowsNotEnabled } from '@/action-menu/cont import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState'; import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState'; import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useRecoilValue } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; @@ -17,7 +17,7 @@ export const ActionMenuContextProvider = ({ }: Omit & { children: React.ReactNode; }) => { - const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValueV2( + const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValue( contextStoreCurrentObjectMetadataItemIdComponentState, ); diff --git a/packages/twenty-front/src/modules/action-menu/contexts/ActionMenuContextProviderWorkflowsEnabled.tsx b/packages/twenty-front/src/modules/action-menu/contexts/ActionMenuContextProviderWorkflowsEnabled.tsx index 54dd2deb80..c14b4df503 100644 --- a/packages/twenty-front/src/modules/action-menu/contexts/ActionMenuContextProviderWorkflowsEnabled.tsx +++ b/packages/twenty-front/src/modules/action-menu/contexts/ActionMenuContextProviderWorkflowsEnabled.tsx @@ -8,7 +8,7 @@ import { useRegisteredActions } from '@/action-menu/hooks/useRegisteredActions'; import { useShouldActionBeRegisteredParams } from '@/action-menu/hooks/useShouldActionBeRegisteredParams'; import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState'; import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const ActionMenuContextProviderWorkflowsEnabled = ({ objectMetadataItem, @@ -33,7 +33,7 @@ export const ActionMenuContextProviderWorkflowsEnabled = ({ const actions = useRegisteredActions(shouldBeRegisteredParams); - const contextStoreTargetedRecordsRule = useRecoilComponentValueV2( + const contextStoreTargetedRecordsRule = useRecoilComponentValue( contextStoreTargetedRecordsRuleComponentState, ); diff --git a/packages/twenty-front/src/modules/action-menu/hooks/useRegisteredActions.ts b/packages/twenty-front/src/modules/action-menu/hooks/useRegisteredActions.ts index 5391a229f5..2b0559a65a 100644 --- a/packages/twenty-front/src/modules/action-menu/hooks/useRegisteredActions.ts +++ b/packages/twenty-front/src/modules/action-menu/hooks/useRegisteredActions.ts @@ -7,7 +7,7 @@ import { getActionViewType } from '@/action-menu/actions/utils/getActionViewType import { contextStoreCurrentViewTypeComponentState } from '@/context-store/states/contextStoreCurrentViewTypeComponentState'; import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState'; import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; import { useIcons } from 'twenty-ui/display'; @@ -18,11 +18,11 @@ export const useRegisteredActions = ( const { getIcon } = useIcons(); - const contextStoreTargetedRecordsRule = useRecoilComponentValueV2( + const contextStoreTargetedRecordsRule = useRecoilComponentValue( contextStoreTargetedRecordsRuleComponentState, ); - const contextStoreCurrentViewType = useRecoilComponentValueV2( + const contextStoreCurrentViewType = useRecoilComponentValue( contextStoreCurrentViewTypeComponentState, ); diff --git a/packages/twenty-front/src/modules/action-menu/hooks/useShouldActionBeRegisteredParams.ts b/packages/twenty-front/src/modules/action-menu/hooks/useShouldActionBeRegisteredParams.ts index 7a9450778f..5f53e22421 100644 --- a/packages/twenty-front/src/modules/action-menu/hooks/useShouldActionBeRegisteredParams.ts +++ b/packages/twenty-front/src/modules/action-menu/hooks/useShouldActionBeRegisteredParams.ts @@ -12,7 +12,7 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem'; import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject'; import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState'; import { isSoftDeleteFilterActiveComponentState } from '@/object-record/record-table/states/isSoftDeleteFilterActiveComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useContext } from 'react'; import { useRecoilCallback, useRecoilValue } from 'recoil'; @@ -23,7 +23,7 @@ export const useShouldActionBeRegisteredParams = ({ }): ShouldBeRegisteredFunctionParams => { const { sortedFavorites: favorites } = useFavorites(); - const contextStoreTargetedRecordsRule = useRecoilComponentValueV2( + const contextStoreTargetedRecordsRule = useRecoilComponentValue( contextStoreTargetedRecordsRuleComponentState, ); @@ -51,19 +51,19 @@ export const useShouldActionBeRegisteredParams = ({ const { isInRightDrawer } = useContext(ActionMenuContext); - const isSoftDeleteFilterActive = useRecoilComponentValueV2( + const isSoftDeleteFilterActive = useRecoilComponentValue( isSoftDeleteFilterActiveComponentState, ); const isShowPage = - useRecoilComponentValueV2(contextStoreCurrentViewTypeComponentState) === + useRecoilComponentValue(contextStoreCurrentViewTypeComponentState) === ContextStoreViewType.ShowPage; - const numberOfSelectedRecords = useRecoilComponentValueV2( + const numberOfSelectedRecords = useRecoilComponentValue( contextStoreNumberOfSelectedRecordsComponentState, ); - const contextStoreCurrentViewType = useRecoilComponentValueV2( + const contextStoreCurrentViewType = useRecoilComponentValue( contextStoreCurrentViewTypeComponentState, ); diff --git a/packages/twenty-front/src/modules/action-menu/states/recordIndexActionMenuDropdownPositionComponentState.ts b/packages/twenty-front/src/modules/action-menu/states/recordIndexActionMenuDropdownPositionComponentState.ts index a1f03ad470..2960a1ef1a 100644 --- a/packages/twenty-front/src/modules/action-menu/states/recordIndexActionMenuDropdownPositionComponentState.ts +++ b/packages/twenty-front/src/modules/action-menu/states/recordIndexActionMenuDropdownPositionComponentState.ts @@ -1,9 +1,9 @@ import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext'; import { PositionType } from '@/action-menu/types/PositionType'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const recordIndexActionMenuDropdownPositionComponentState = - createComponentStateV2({ + createComponentState({ key: 'recordIndexActionMenuDropdownPositionComponentState', defaultValue: { x: null, diff --git a/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx b/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx index 2903b87e7c..d10ecbd0c5 100644 --- a/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx +++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx @@ -9,7 +9,7 @@ import { FieldContext, GenericFieldContextType, } from '@/object-record/record-field/contexts/FieldContext'; -import { TextInput } from '@/ui/input/components/TextInput'; +import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; import { useState } from 'react'; @@ -164,7 +164,7 @@ export const AttachmentRow = ({ {isEditing ? ( - { activityObjectNameSingular: CoreObjectNameSingular.Task, }); - const activeTabId = useRecoilComponentValueV2(activeTabIdComponentState); + const activeTabId = useRecoilComponentValue(activeTabIdComponentState); const isLoading = (activeTabId !== 'done' && tasksLoading) || diff --git a/packages/twenty-front/src/modules/ai/components/AIChatTab.tsx b/packages/twenty-front/src/modules/ai/components/AIChatTab.tsx index bb39232f64..19b0b62076 100644 --- a/packages/twenty-front/src/modules/ai/components/AIChatTab.tsx +++ b/packages/twenty-front/src/modules/ai/components/AIChatTab.tsx @@ -3,25 +3,25 @@ import styled from '@emotion/styled'; import { IconHistory, IconMessageCirclePlus } from 'twenty-ui/display'; import { DropZone } from '@/activities/files/components/DropZone'; +import { AgentChatFileUploadButton } from '@/ai/components/internal/AgentChatFileUploadButton'; import { useCreateNewAIChatThread } from '@/ai/hooks/useCreateNewAIChatThread'; import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu'; import { CommandMenuPages } from '@/command-menu/types/CommandMenuPages'; import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper'; -import { AgentChatFileUploadButton } from '@/ai/components/internal/AgentChatFileUploadButton'; import { AIChatEmptyState } from '@/ai/components/AIChatEmptyState'; import { AIChatMessage } from '@/ai/components/AIChatMessage'; +import { AIChatSkeletonLoader } from '@/ai/components/internal/AIChatSkeletonLoader'; +import { AgentChatContextPreview } from '@/ai/components/internal/AgentChatContextPreview'; +import { SendMessageButton } from '@/ai/components/internal/SendMessageButton'; +import { SendMessageWithRecordsContextButton } from '@/ai/components/internal/SendMessageWithRecordsContextButton'; import { useAIChatFileUpload } from '@/ai/hooks/useAIChatFileUpload'; +import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { t } from '@lingui/core/macro'; import { useState } from 'react'; import { Button } from 'twenty-ui/input'; import { useAgentChat } from '../hooks/useAgentChat'; -import { AIChatSkeletonLoader } from '@/ai/components/internal/AIChatSkeletonLoader'; -import { AgentChatContextPreview } from '@/ai/components/internal/AgentChatContextPreview'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState'; -import { SendMessageWithRecordsContextButton } from '@/ai/components/internal/SendMessageWithRecordsContextButton'; -import { SendMessageButton } from '@/ai/components/internal/SendMessageButton'; const StyledContainer = styled.div<{ isDraggingFile: boolean }>` background: ${({ theme }) => theme.background.primary}; @@ -67,7 +67,7 @@ export const AIChatTab = ({ }) => { const [isDraggingFile, setIsDraggingFile] = useState(false); - const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValueV2( + const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValue( contextStoreCurrentObjectMetadataItemIdComponentState, ); diff --git a/packages/twenty-front/src/modules/ai/components/AIChatThreadGroup.tsx b/packages/twenty-front/src/modules/ai/components/AIChatThreadGroup.tsx index cd9d1c236f..b3fc19b019 100644 --- a/packages/twenty-front/src/modules/ai/components/AIChatThreadGroup.tsx +++ b/packages/twenty-front/src/modules/ai/components/AIChatThreadGroup.tsx @@ -1,6 +1,6 @@ import { currentAIChatThreadComponentState } from '@/ai/states/currentAIChatThreadComponentState'; import { useOpenAskAIPageInCommandMenu } from '@/command-menu/hooks/useOpenAskAIPageInCommandMenu'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; import { useLingui } from '@lingui/react/macro'; @@ -77,7 +77,7 @@ export const AIChatThreadGroup = ({ }) => { const { t } = useLingui(); const theme = useTheme(); - const [, setCurrentThreadId] = useRecoilComponentStateV2( + const [, setCurrentThreadId] = useRecoilComponentState( currentAIChatThreadComponentState, agentId, ); diff --git a/packages/twenty-front/src/modules/ai/components/internal/AgentChatContextPreview.tsx b/packages/twenty-front/src/modules/ai/components/internal/AgentChatContextPreview.tsx index c1e89c621a..a46fcb97a1 100644 --- a/packages/twenty-front/src/modules/ai/components/internal/AgentChatContextPreview.tsx +++ b/packages/twenty-front/src/modules/ai/components/internal/AgentChatContextPreview.tsx @@ -1,14 +1,14 @@ -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { agentChatUploadedFilesComponentState } from '@/ai/states/agentChatUploadedFilesComponentState'; -import styled from '@emotion/styled'; -import { AgentChatFilePreview } from './AgentChatFilePreview'; -import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState'; -import { useLingui } from '@lingui/react/macro'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; -import { agentChatSelectedFilesComponentState } from '@/ai/states/agentChatSelectedFilesComponentState'; -import { useDeleteFileMutation } from '~/generated-metadata/graphql'; -import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; import { AgentChatContextRecordPreview } from '@/ai/components/internal/AgentChatContextRecordPreview'; +import { agentChatSelectedFilesComponentState } from '@/ai/states/agentChatSelectedFilesComponentState'; +import { agentChatUploadedFilesComponentState } from '@/ai/states/agentChatUploadedFilesComponentState'; +import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState'; +import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import styled from '@emotion/styled'; +import { useLingui } from '@lingui/react/macro'; +import { useDeleteFileMutation } from '~/generated-metadata/graphql'; +import { AgentChatFilePreview } from './AgentChatFilePreview'; const StyledContainer = styled.div` display: flex; @@ -27,9 +27,9 @@ const StyledPreviewsContainer = styled.div` export const AgentChatContextPreview = ({ agentId }: { agentId: string }) => { const { t } = useLingui(); const [agentChatSelectedFiles, setAgentChatSelectedFiles] = - useRecoilComponentStateV2(agentChatSelectedFilesComponentState, agentId); + useRecoilComponentState(agentChatSelectedFilesComponentState, agentId); const [agentChatUploadedFiles, setAgentChatUploadedFiles] = - useRecoilComponentStateV2(agentChatUploadedFilesComponentState, agentId); + useRecoilComponentState(agentChatUploadedFilesComponentState, agentId); const { enqueueErrorSnackBar } = useSnackBar(); @@ -52,7 +52,7 @@ export const AgentChatContextPreview = ({ agentId }: { agentId: string }) => { } }; - const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValueV2( + const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValue( contextStoreCurrentObjectMetadataItemIdComponentState, ); diff --git a/packages/twenty-front/src/modules/ai/components/internal/AgentChatContextRecordPreview.tsx b/packages/twenty-front/src/modules/ai/components/internal/AgentChatContextRecordPreview.tsx index b2370a2c9e..dd89d42e21 100644 --- a/packages/twenty-front/src/modules/ai/components/internal/AgentChatContextRecordPreview.tsx +++ b/packages/twenty-front/src/modules/ai/components/internal/AgentChatContextRecordPreview.tsx @@ -1,14 +1,14 @@ -import { useFindManyRecordsSelectedInContextStore } from '@/context-store/hooks/useFindManyRecordsSelectedInContextStore'; -import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; import { isAgentChatCurrentContextActiveState } from '@/ai/states/isAgentChatCurrentContextActiveState'; -import { MultipleAvatarChip } from 'twenty-ui/components'; -import { t } from '@lingui/core/macro'; -import { IconReload, IconX } from 'twenty-ui/display'; import { CommandMenuContextRecordChipAvatars } from '@/command-menu/components/CommandMenuContextRecordChipAvatars'; import { getSelectedRecordsContextText } from '@/command-menu/utils/getRecordContextText'; -import styled from '@emotion/styled'; +import { useFindManyRecordsSelectedInContextStore } from '@/context-store/hooks/useFindManyRecordsSelectedInContextStore'; +import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { useTheme } from '@emotion/react'; +import styled from '@emotion/styled'; +import { t } from '@lingui/core/macro'; +import { MultipleAvatarChip } from 'twenty-ui/components'; +import { IconReload, IconX } from 'twenty-ui/display'; const StyledRightIconContainer = styled.div` display: flex; @@ -41,7 +41,7 @@ export const AgentChatContextRecordPreview = ({ }); const [isAgentChatCurrentContextActive, setIsAgentChatCurrentContextActive] = - useRecoilComponentStateV2(isAgentChatCurrentContextActiveState, agentId); + useRecoilComponentState(isAgentChatCurrentContextActiveState, agentId); const Avatars = records.map((record) => ( // @todo move this components to be less specific. (Outside of CommandMenu diff --git a/packages/twenty-front/src/modules/ai/components/internal/AgentChatFileUploadButton.tsx b/packages/twenty-front/src/modules/ai/components/internal/AgentChatFileUploadButton.tsx index 8b9cd05787..d934b4a60d 100644 --- a/packages/twenty-front/src/modules/ai/components/internal/AgentChatFileUploadButton.tsx +++ b/packages/twenty-front/src/modules/ai/components/internal/AgentChatFileUploadButton.tsx @@ -1,10 +1,10 @@ import { useAIChatFileUpload } from '@/ai/hooks/useAIChatFileUpload'; import { agentChatSelectedFilesComponentState } from '@/ai/states/agentChatSelectedFilesComponentState'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import styled from '@emotion/styled'; import React, { useRef } from 'react'; import { IconPaperclip } from 'twenty-ui/display'; import { Button } from 'twenty-ui/input'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; const StyledFileUploadContainer = styled.div` display: flex; @@ -17,7 +17,7 @@ const StyledFileInput = styled.input` `; export const AgentChatFileUploadButton = ({ agentId }: { agentId: string }) => { - const setAgentChatSelectedFiles = useSetRecoilComponentStateV2( + const setAgentChatSelectedFiles = useSetRecoilComponentState( agentChatSelectedFilesComponentState, agentId, ); diff --git a/packages/twenty-front/src/modules/ai/hooks/useAIChatFileUpload.ts b/packages/twenty-front/src/modules/ai/hooks/useAIChatFileUpload.ts index 2a4315cf13..ebf67c2ce4 100644 --- a/packages/twenty-front/src/modules/ai/hooks/useAIChatFileUpload.ts +++ b/packages/twenty-front/src/modules/ai/hooks/useAIChatFileUpload.ts @@ -1,8 +1,8 @@ -import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient'; -import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; import { agentChatSelectedFilesComponentState } from '@/ai/states/agentChatSelectedFilesComponentState'; import { agentChatUploadedFilesComponentState } from '@/ai/states/agentChatUploadedFilesComponentState'; +import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient'; +import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { useLingui } from '@lingui/react/macro'; import { isDefined } from 'twenty-shared/utils'; import { @@ -16,9 +16,9 @@ export const useAIChatFileUpload = ({ agentId }: { agentId: string }) => { const { t } = useLingui(); const { enqueueErrorSnackBar } = useSnackBar(); const [agentChatSelectedFiles, setAgentChatSelectedFiles] = - useRecoilComponentStateV2(agentChatSelectedFilesComponentState, agentId); + useRecoilComponentState(agentChatSelectedFilesComponentState, agentId); const [agentChatUploadedFiles, setAgentChatUploadedFiles] = - useRecoilComponentStateV2(agentChatUploadedFilesComponentState, agentId); + useRecoilComponentState(agentChatUploadedFilesComponentState, agentId); const sendFile = async (file: File) => { try { diff --git a/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts b/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts index 41b30cd602..5278306cb6 100644 --- a/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts +++ b/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts @@ -1,17 +1,25 @@ import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { useState } from 'react'; import { useRecoilState } from 'recoil'; import { Key } from 'ts-key-enum'; -import { currentAIChatThreadComponentState } from '@/ai/states/currentAIChatThreadComponentState'; -import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement'; -import { useScrollWrapperElement } from '@/ui/utilities/scroll/hooks/useScrollWrapperElement'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { STREAM_CHAT_QUERY } from '@/ai/rest-api/agent-chat-apollo.api'; import { AgentChatMessageRole } from '@/ai/constants/agent-chat-message-role'; +import { STREAM_CHAT_QUERY } from '@/ai/rest-api/agent-chat-apollo.api'; +import { + AIChatObjectMetadataAndRecordContext, + agentChatObjectMetadataAndRecordContextState, +} from '@/ai/states/agentChatObjectMetadataAndRecordContextState'; import { agentChatSelectedFilesComponentState } from '@/ai/states/agentChatSelectedFilesComponentState'; import { agentChatUploadedFilesComponentState } from '@/ai/states/agentChatUploadedFilesComponentState'; +import { currentAIChatThreadComponentState } from '@/ai/states/currentAIChatThreadComponentState'; +import { isAgentChatCurrentContextActiveState } from '@/ai/states/isAgentChatCurrentContextActiveState'; +import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState'; +import { useGetObjectMetadataItemById } from '@/object-metadata/hooks/useGetObjectMetadataItemById'; +import { ObjectRecord } from '@/object-record/types/ObjectRecord'; +import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement'; +import { useScrollWrapperElement } from '@/ui/utilities/scroll/hooks/useScrollWrapperElement'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useApolloClient } from '@apollo/client'; import { isDefined } from 'twenty-shared/utils'; import { v4 } from 'uuid'; @@ -24,14 +32,6 @@ import { agentChatInputState } from '../states/agentChatInputState'; import { agentChatMessagesComponentState } from '../states/agentChatMessagesComponentState'; import { agentStreamingMessageState } from '../states/agentStreamingMessageState'; import { parseAgentStreamingChunk } from '../utils/parseAgentStreamingChunk'; -import { - agentChatObjectMetadataAndRecordContextState, - AIChatObjectMetadataAndRecordContext, -} from '@/ai/states/agentChatObjectMetadataAndRecordContextState'; -import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState'; -import { useGetObjectMetadataItemById } from '@/object-metadata/hooks/useGetObjectMetadataItemById'; -import { ObjectRecord } from '@/object-record/types/ObjectRecord'; -import { isAgentChatCurrentContextActiveState } from '@/ai/states/isAgentChatCurrentContextActiveState'; type OptimisticMessage = AgentChatMessage & { isPending: boolean; @@ -42,33 +42,33 @@ export const useAgentChat = (agentId: string, records?: ObjectRecord[]) => { const { enqueueErrorSnackBar } = useSnackBar(); const { getObjectMetadataItemById } = useGetObjectMetadataItemById(); - const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValueV2( + const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValue( contextStoreCurrentObjectMetadataItemIdComponentState, ); - const isAgentChatCurrentContextActive = useRecoilComponentValueV2( + const isAgentChatCurrentContextActive = useRecoilComponentValue( isAgentChatCurrentContextActiveState, agentId, ); - const agentChatSelectedFiles = useRecoilComponentValueV2( + const agentChatSelectedFiles = useRecoilComponentValue( agentChatSelectedFilesComponentState, agentId, ); - const [agentChatContext, setAgentChatContext] = useRecoilComponentStateV2( + const [agentChatContext, setAgentChatContext] = useRecoilComponentState( agentChatObjectMetadataAndRecordContextState, agentId, ); - const [currentThreadId, setCurrentThreadId] = useRecoilComponentStateV2( + const [currentThreadId, setCurrentThreadId] = useRecoilComponentState( currentAIChatThreadComponentState, agentId, ); const [agentChatUploadedFiles, setAgentChatUploadedFiles] = - useRecoilComponentStateV2(agentChatUploadedFilesComponentState, agentId); + useRecoilComponentState(agentChatUploadedFilesComponentState, agentId); - const [agentChatMessages, setAgentChatMessages] = useRecoilComponentStateV2( + const [agentChatMessages, setAgentChatMessages] = useRecoilComponentState( agentChatMessagesComponentState, agentId, ); diff --git a/packages/twenty-front/src/modules/ai/hooks/useCreateNewAIChatThread.ts b/packages/twenty-front/src/modules/ai/hooks/useCreateNewAIChatThread.ts index d894bfa4a9..585fb3c453 100644 --- a/packages/twenty-front/src/modules/ai/hooks/useCreateNewAIChatThread.ts +++ b/packages/twenty-front/src/modules/ai/hooks/useCreateNewAIChatThread.ts @@ -1,10 +1,10 @@ import { currentAIChatThreadComponentState } from '@/ai/states/currentAIChatThreadComponentState'; import { useOpenAskAIPageInCommandMenu } from '@/command-menu/hooks/useOpenAskAIPageInCommandMenu'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { useCreateAgentChatThreadMutation } from '~/generated-metadata/graphql'; export const useCreateNewAIChatThread = ({ agentId }: { agentId: string }) => { - const [, setCurrentThreadId] = useRecoilComponentStateV2( + const [, setCurrentThreadId] = useRecoilComponentState( currentAIChatThreadComponentState, agentId, ); diff --git a/packages/twenty-front/src/modules/ai/states/agentChatMessagesComponentState.ts b/packages/twenty-front/src/modules/ai/states/agentChatMessagesComponentState.ts index 90b95e9997..af13c6722e 100644 --- a/packages/twenty-front/src/modules/ai/states/agentChatMessagesComponentState.ts +++ b/packages/twenty-front/src/modules/ai/states/agentChatMessagesComponentState.ts @@ -1,11 +1,11 @@ import { createComponentInstanceContext } from '@/ui/utilities/state/component-state/utils/createComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; import { AgentChatMessage } from '~/generated-metadata/graphql'; export const AgentChatMessagesComponentInstanceContext = createComponentInstanceContext(); -export const agentChatMessagesComponentState = createComponentStateV2< +export const agentChatMessagesComponentState = createComponentState< AgentChatMessage[] >({ key: 'agentChatMessagesComponentState', diff --git a/packages/twenty-front/src/modules/ai/states/agentChatObjectMetadataAndRecordContextState.ts b/packages/twenty-front/src/modules/ai/states/agentChatObjectMetadataAndRecordContextState.ts index 3795ee4944..7c12de1d79 100644 --- a/packages/twenty-front/src/modules/ai/states/agentChatObjectMetadataAndRecordContextState.ts +++ b/packages/twenty-front/src/modules/ai/states/agentChatObjectMetadataAndRecordContextState.ts @@ -1,5 +1,5 @@ import { AgentChatMessagesComponentInstanceContext } from '@/ai/states/agentChatMessagesComponentState'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export type AIChatObjectMetadataAndRecordContext = { type: 'objectMetadataId' | 'recordId'; @@ -7,7 +7,7 @@ export type AIChatObjectMetadataAndRecordContext = { }; export const agentChatObjectMetadataAndRecordContextState = - createComponentStateV2>({ + createComponentState>({ defaultValue: [], key: 'agentChatObjectMetadataAndRecordContextState', componentInstanceContext: AgentChatMessagesComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/ai/states/agentChatSelectedFilesComponentState.ts b/packages/twenty-front/src/modules/ai/states/agentChatSelectedFilesComponentState.ts index a966d4e683..9501b7b76c 100644 --- a/packages/twenty-front/src/modules/ai/states/agentChatSelectedFilesComponentState.ts +++ b/packages/twenty-front/src/modules/ai/states/agentChatSelectedFilesComponentState.ts @@ -1,7 +1,7 @@ -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; import { AgentChatMessagesComponentInstanceContext } from '@/ai/states/agentChatMessagesComponentState'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const agentChatSelectedFilesComponentState = createComponentStateV2< +export const agentChatSelectedFilesComponentState = createComponentState< File[] >({ key: 'agentChatSelectedFilesComponentState', diff --git a/packages/twenty-front/src/modules/ai/states/agentChatUploadedFilesComponentState.ts b/packages/twenty-front/src/modules/ai/states/agentChatUploadedFilesComponentState.ts index 46f4a5d5f4..82fc45f169 100644 --- a/packages/twenty-front/src/modules/ai/states/agentChatUploadedFilesComponentState.ts +++ b/packages/twenty-front/src/modules/ai/states/agentChatUploadedFilesComponentState.ts @@ -1,8 +1,8 @@ -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; import { AgentChatMessagesComponentInstanceContext } from '@/ai/states/agentChatMessagesComponentState'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; import { File } from '~/generated-metadata/graphql'; -export const agentChatUploadedFilesComponentState = createComponentStateV2< +export const agentChatUploadedFilesComponentState = createComponentState< File[] >({ key: 'agentChatUploadedFilesComponentState', diff --git a/packages/twenty-front/src/modules/ai/states/currentAIChatThreadComponentState.ts b/packages/twenty-front/src/modules/ai/states/currentAIChatThreadComponentState.ts index 52c04b4977..2397eab321 100644 --- a/packages/twenty-front/src/modules/ai/states/currentAIChatThreadComponentState.ts +++ b/packages/twenty-front/src/modules/ai/states/currentAIChatThreadComponentState.ts @@ -1,7 +1,7 @@ import { CommandMenuPageComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuPageComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const currentAIChatThreadComponentState = createComponentStateV2< +export const currentAIChatThreadComponentState = createComponentState< string | null >({ key: 'currentAIChatThreadComponentState', diff --git a/packages/twenty-front/src/modules/ai/states/isAgentChatCurrentContextActiveState.ts b/packages/twenty-front/src/modules/ai/states/isAgentChatCurrentContextActiveState.ts index 478eb233fb..b16bb03384 100644 --- a/packages/twenty-front/src/modules/ai/states/isAgentChatCurrentContextActiveState.ts +++ b/packages/twenty-front/src/modules/ai/states/isAgentChatCurrentContextActiveState.ts @@ -1,11 +1,11 @@ -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; import { createComponentInstanceContext } from '@/ui/utilities/state/component-state/utils/createComponentInstanceContext'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const IsAgentChatCurrentContextActiveInstanceContext = createComponentInstanceContext(); export const isAgentChatCurrentContextActiveState = - createComponentStateV2({ + createComponentState({ defaultValue: true, key: 'isAgentChatCurrentContextActiveState', componentInstanceContext: IsAgentChatCurrentContextActiveInstanceContext, diff --git a/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx b/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx index 1ff100cbaf..33eb047e14 100644 --- a/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx +++ b/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx @@ -34,7 +34,7 @@ import { AppPath } from '@/types/AppPath'; import { PageFocusId } from '@/types/PageFocusId'; import { useResetFocusStackToFocusItem } from '@/ui/utilities/focus/hooks/useResetFocusStackToFocusItem'; import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; import { AnalyticsType } from '~/generated/graphql'; import { usePageChangeEffectNavigateLocation } from '~/hooks/usePageChangeEffectNavigateLocation'; @@ -63,12 +63,12 @@ export const PageChangeEffect = () => { const objectNamePlural = useParams().objectNamePlural ?? CoreObjectNamePlural.Person; - const contextStoreCurrentViewId = useRecoilComponentValueV2( + const contextStoreCurrentViewId = useRecoilComponentValue( contextStoreCurrentViewIdComponentState, MAIN_CONTEXT_STORE_INSTANCE_ID, ); - const contextStoreCurrentViewType = useRecoilComponentValueV2( + const contextStoreCurrentViewType = useRecoilComponentValue( contextStoreCurrentViewTypeComponentState, MAIN_CONTEXT_STORE_INSTANCE_ID, ); diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpEmailField.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpEmailField.tsx index e6a2e3d331..9c2abc2c2f 100644 --- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpEmailField.tsx +++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpEmailField.tsx @@ -1,5 +1,5 @@ import { Form } from '@/auth/sign-in-up/hooks/useSignInUpForm'; -import { TextInput } from '@/ui/input/components/TextInput'; +import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput'; import styled from '@emotion/styled'; import { motion } from 'framer-motion'; import { Controller, useFormContext } from 'react-hook-form'; @@ -40,7 +40,7 @@ export const SignInUpEmailField = ({ fieldState: { error }, }) => ( - ( - { }); const previousContextStoreCurrentObjectMetadataItemId = - useRecoilComponentValueV2( + useRecoilComponentValue( contextStoreCurrentObjectMetadataItemIdComponentState, 'command-menu-previous', ); - const objectMetadataItemId = useRecoilComponentValueV2( + const objectMetadataItemId = useRecoilComponentValue( contextStoreCurrentObjectMetadataItemIdComponentState, ); const currentObjectMetadataItem = objectMetadataItems.find( diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuContainer.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuContainer.tsx index 4437f37597..429239aae0 100644 --- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuContainer.tsx +++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuContainer.tsx @@ -12,7 +12,7 @@ import { RecordFilterGroupsComponentInstanceContext } from '@/object-record/reco import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext'; import { RecordSortsComponentInstanceContext } from '@/object-record/record-sort/states/context/RecordSortsComponentInstanceContext'; import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { AnimatePresence } from 'framer-motion'; import { useRecoilValue } from 'recoil'; @@ -26,7 +26,7 @@ export const CommandMenuContainer = ({ const isCommandMenuOpened = useRecoilValue(isCommandMenuOpenedState); - const objectMetadataItemId = useRecoilComponentValueV2( + const objectMetadataItemId = useRecoilComponentValue( contextStoreCurrentObjectMetadataItemIdComponentState, COMMAND_MENU_COMPONENT_INSTANCE_ID, ); @@ -37,7 +37,7 @@ export const CommandMenuContainer = ({ (objectMetadataItem) => objectMetadataItem.id === objectMetadataItemId, ); - const currentViewId = useRecoilComponentValueV2( + const currentViewId = useRecoilComponentValue( contextStoreCurrentViewIdComponentState, COMMAND_MENU_COMPONENT_INSTANCE_ID, ); diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuDefaultSelectionEffect.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuDefaultSelectionEffect.tsx index e7939c38a3..d46e17253b 100644 --- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuDefaultSelectionEffect.tsx +++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuDefaultSelectionEffect.tsx @@ -1,7 +1,7 @@ import { hasUserSelectedCommandState } from '@/command-menu/states/hasUserSelectedCommandState'; import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList'; import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useEffect } from 'react'; import { useRecoilValue } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; @@ -13,7 +13,7 @@ export const CommandMenuDefaultSelectionEffect = ({ }) => { const { setSelectedItemId } = useSelectableList('command-menu-list'); - const selectedItemId = useRecoilComponentValueV2( + const selectedItemId = useRecoilComponentValue( selectedItemIdComponentState, 'command-menu-list', ); diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx index 553aa73db3..6a11519c62 100644 --- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx +++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx @@ -2,7 +2,7 @@ import { isNonEmptyString } from '@sniptt/guards'; import { useCommandMenuOnItemClick } from '@/command-menu/hooks/useCommandMenuOnItemClick'; import { isSelectedItemIdComponentFamilySelector } from '@/ui/layout/selectable-list/states/selectors/isSelectedItemIdComponentFamilySelector'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; import { ReactNode } from 'react'; import { IconArrowUpRight, IconComponent } from 'twenty-ui/display'; import { MenuItemCommand } from 'twenty-ui/navigation'; @@ -34,7 +34,7 @@ export const CommandMenuItem = ({ Icon = IconArrowUpRight; } - const isSelectedItemId = useRecoilComponentFamilyValueV2( + const isSelectedItemId = useRecoilComponentFamilyValue( isSelectedItemIdComponentFamilySelector, id, ); diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuTopBar.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuTopBar.tsx index b0138e3155..cc6f3b9681 100644 --- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuTopBar.tsx +++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuTopBar.tsx @@ -12,7 +12,7 @@ import { commandMenuPageState } from '@/command-menu/states/commandMenuPageState import { commandMenuSearchState } from '@/command-menu/states/commandMenuSearchState'; import { CommandMenuPages } from '@/command-menu/types/CommandMenuPages'; import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; import { useLingui } from '@lingui/react/macro'; @@ -92,7 +92,7 @@ export const CommandMenuTopBar = () => { const { goBackFromCommandMenu } = useCommandMenuHistory(); - const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValueV2( + const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValue( contextStoreCurrentObjectMetadataItemIdComponentState, COMMAND_MENU_COMPONENT_INSTANCE_ID, ); diff --git a/packages/twenty-front/src/modules/command-menu/components/ResetContextToSelectionCommandButton.tsx b/packages/twenty-front/src/modules/command-menu/components/ResetContextToSelectionCommandButton.tsx index 5b4b557b87..19b99b6e20 100644 --- a/packages/twenty-front/src/modules/command-menu/components/ResetContextToSelectionCommandButton.tsx +++ b/packages/twenty-front/src/modules/command-menu/components/ResetContextToSelectionCommandButton.tsx @@ -7,19 +7,19 @@ import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState'; import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState'; import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { t } from '@lingui/core/macro'; import { useRecoilValue } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; import { IconArrowBackUp } from 'twenty-ui/display'; export const ResetContextToSelectionCommandButton = () => { - const contextStoreTargetedRecordsRule = useRecoilComponentValueV2( + const contextStoreTargetedRecordsRule = useRecoilComponentValue( contextStoreTargetedRecordsRuleComponentState, 'command-menu-previous', ); - const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValueV2( + const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValue( contextStoreCurrentObjectMetadataItemIdComponentState, 'command-menu-previous', ); diff --git a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useOpenCalendarEventInCommandMenu.test.tsx b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useOpenCalendarEventInCommandMenu.test.tsx index 846cc7a56a..dc7b79af3a 100644 --- a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useOpenCalendarEventInCommandMenu.test.tsx +++ b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useOpenCalendarEventInCommandMenu.test.tsx @@ -6,7 +6,7 @@ import { useOpenCalendarEventInCommandMenu } from '@/command-menu/hooks/useOpenC import { viewableRecordIdComponentState } from '@/command-menu/pages/record-page/states/viewableRecordIdComponentState'; import { CommandMenuPages } from '@/command-menu/types/CommandMenuPages'; import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewType'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { IconCalendarEvent } from 'twenty-ui/display'; import { getJestMetadataAndApolloMocksAndActionMenuWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksAndActionMenuWrapper'; import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems'; @@ -46,7 +46,7 @@ const renderHooks = () => { const { openCalendarEventInCommandMenu } = useOpenCalendarEventInCommandMenu(); - const viewableRecordId = useRecoilComponentValueV2( + const viewableRecordId = useRecoilComponentValue( viewableRecordIdComponentState, 'mocked-uuid', ); diff --git a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useOpenEmailThreadInCommandMenu.test.tsx b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useOpenEmailThreadInCommandMenu.test.tsx index fe9455d547..ffa4cad18f 100644 --- a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useOpenEmailThreadInCommandMenu.test.tsx +++ b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useOpenEmailThreadInCommandMenu.test.tsx @@ -6,7 +6,7 @@ import { useOpenEmailThreadInCommandMenu } from '@/command-menu/hooks/useOpenEma import { viewableRecordIdComponentState } from '@/command-menu/pages/record-page/states/viewableRecordIdComponentState'; import { CommandMenuPages } from '@/command-menu/types/CommandMenuPages'; import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewType'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { IconMail } from 'twenty-ui/display'; import { getJestMetadataAndApolloMocksAndActionMenuWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksAndActionMenuWrapper'; import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems'; @@ -46,7 +46,7 @@ const renderHooks = () => { const { openEmailThreadInCommandMenu } = useOpenEmailThreadInCommandMenu(); - const viewableRecordId = useRecoilComponentValueV2( + const viewableRecordId = useRecoilComponentValue( viewableRecordIdComponentState, 'mocked-uuid', ); 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.tsx index 726a26abb5..d0a984c8c8 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 @@ -14,7 +14,7 @@ import { contextStoreCurrentViewTypeComponentState } from '@/context-store/state import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState'; import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState'; import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewType'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useIcons } from 'twenty-ui/display'; import { getJestMetadataAndApolloMocksAndActionMenuWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksAndActionMenuWrapper'; import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems'; @@ -58,27 +58,27 @@ const renderHooks = () => { commandMenuNavigationMorphItemByPageState, ); - const viewableRecordId = useRecoilComponentValueV2( + const viewableRecordId = useRecoilComponentValue( viewableRecordIdComponentState, 'mocked-uuid', ); - const viewableRecordNameSingular = useRecoilComponentValueV2( + const viewableRecordNameSingular = useRecoilComponentValue( viewableRecordNameSingularComponentState, 'mocked-uuid', ); - const currentObjectMetadataItemId = useRecoilComponentValueV2( + const currentObjectMetadataItemId = useRecoilComponentValue( contextStoreCurrentObjectMetadataItemIdComponentState, 'mocked-uuid', ); - const targetedRecordsRule = useRecoilComponentValueV2( + const targetedRecordsRule = useRecoilComponentValue( contextStoreTargetedRecordsRuleComponentState, 'mocked-uuid', ); - const numberOfSelectedRecords = useRecoilComponentValueV2( + const numberOfSelectedRecords = useRecoilComponentValue( contextStoreNumberOfSelectedRecordsComponentState, 'mocked-uuid', ); - const currentViewType = useRecoilComponentValueV2( + const currentViewType = useRecoilComponentValue( contextStoreCurrentViewTypeComponentState, 'mocked-uuid', ); 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.tsx index 221cc18c4c..ae2d188934 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 @@ -14,7 +14,7 @@ import { contextStoreCurrentViewTypeComponentState } from '@/context-store/state import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState'; import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState'; import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewType'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { t } from '@lingui/core/macro'; import { act } from 'react'; import { IconBolt, IconSettingsAutomation, useIcons } from 'twenty-ui/display'; @@ -71,35 +71,35 @@ const renderHooks = () => { commandMenuNavigationMorphItemByPageState, ); - const viewableRecordId = useRecoilComponentValueV2( + const viewableRecordId = useRecoilComponentValue( viewableRecordIdComponentState, 'mocked-uuid', ); - const viewableRecordNameSingular = useRecoilComponentValueV2( + const viewableRecordNameSingular = useRecoilComponentValue( viewableRecordNameSingularComponentState, 'mocked-uuid', ); - const currentObjectMetadataItemId = useRecoilComponentValueV2( + const currentObjectMetadataItemId = useRecoilComponentValue( contextStoreCurrentObjectMetadataItemIdComponentState, 'mocked-uuid', ); - const targetedRecordsRule = useRecoilComponentValueV2( + const targetedRecordsRule = useRecoilComponentValue( contextStoreTargetedRecordsRuleComponentState, 'mocked-uuid', ); - const numberOfSelectedRecords = useRecoilComponentValueV2( + const numberOfSelectedRecords = useRecoilComponentValue( contextStoreNumberOfSelectedRecordsComponentState, 'mocked-uuid', ); - const currentViewType = useRecoilComponentValueV2( + const currentViewType = useRecoilComponentValue( contextStoreCurrentViewTypeComponentState, 'mocked-uuid', ); - const workflowId = useRecoilComponentValueV2( + const workflowId = useRecoilComponentValue( commandMenuWorkflowIdComponentState, 'mocked-uuid', ); - const workflowVersionId = useRecoilComponentValueV2( + const workflowVersionId = useRecoilComponentValue( commandMenuWorkflowVersionIdComponentState, 'mocked-uuid', ); diff --git a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts index 881496624a..5535b8e8cf 100644 --- a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts +++ b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts @@ -12,7 +12,7 @@ import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/s import { useKeyboardShortcutMenu } from '@/keyboard-shortcut-menu/hooks/useKeyboardShortcutMenu'; import { useGlobalHotkeys } from '@/ui/utilities/hotkey/hooks/useGlobalHotkeys'; import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled'; import { isNonEmptyString } from '@sniptt/guards'; import { useRecoilValue } from 'recoil'; @@ -38,7 +38,7 @@ export const useCommandMenuHotKeys = () => { const isAiEnabled = useIsFeatureEnabled(FeatureFlagKey.IS_AI_ENABLED); - const contextStoreTargetedRecordsRuleComponent = useRecoilComponentValueV2( + const contextStoreTargetedRecordsRuleComponent = useRecoilComponentValue( contextStoreTargetedRecordsRuleComponentState, COMMAND_MENU_COMPONENT_INSTANCE_ID, ); diff --git a/packages/twenty-front/src/modules/command-menu/pages/calendar-event/components/CommandMenuCalendarEventPage.tsx b/packages/twenty-front/src/modules/command-menu/pages/calendar-event/components/CommandMenuCalendarEventPage.tsx index 2e8e21f845..dd97cd1b01 100644 --- a/packages/twenty-front/src/modules/command-menu/pages/calendar-event/components/CommandMenuCalendarEventPage.tsx +++ b/packages/twenty-front/src/modules/command-menu/pages/calendar-event/components/CommandMenuCalendarEventPage.tsx @@ -5,11 +5,11 @@ import { CalendarEvent } from '@/activities/calendar/types/CalendarEvent'; import { viewableRecordIdComponentState } from '@/command-menu/pages/record-page/states/viewableRecordIdComponentState'; import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord'; import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const CommandMenuCalendarEventPage = () => { const { upsertRecords } = useUpsertRecordsInStore(); - const viewableRecordId = useRecoilComponentValueV2( + const viewableRecordId = useRecoilComponentValue( viewableRecordIdComponentState, ); diff --git a/packages/twenty-front/src/modules/command-menu/pages/message-thread/components/CommandMenuMessageThreadPage.tsx b/packages/twenty-front/src/modules/command-menu/pages/message-thread/components/CommandMenuMessageThreadPage.tsx index 7c04b7e64b..ac36744987 100644 --- a/packages/twenty-front/src/modules/command-menu/pages/message-thread/components/CommandMenuMessageThreadPage.tsx +++ b/packages/twenty-front/src/modules/command-menu/pages/message-thread/components/CommandMenuMessageThreadPage.tsx @@ -9,7 +9,7 @@ import { CommandMenuMessageThreadIntermediaryMessages } from '@/command-menu/pag import { useEmailThreadInCommandMenu } from '@/command-menu/pages/message-thread/hooks/useEmailThreadInCommandMenu'; import { messageThreadComponentState } from '@/command-menu/pages/message-thread/states/messageThreadComponentState'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { assertUnreachable } from '@/workflow/utils/assertUnreachable'; import { ConnectedAccountProvider } from 'twenty-shared/types'; import { isDefined } from 'twenty-shared/utils'; @@ -49,7 +49,7 @@ const ALLOWED_REPLY_PROVIDERS = [ ]; export const CommandMenuMessageThreadPage = () => { - const setMessageThread = useSetRecoilComponentStateV2( + const setMessageThread = useSetRecoilComponentState( messageThreadComponentState, ); diff --git a/packages/twenty-front/src/modules/command-menu/pages/message-thread/hooks/useEmailThreadInCommandMenu.ts b/packages/twenty-front/src/modules/command-menu/pages/message-thread/hooks/useEmailThreadInCommandMenu.ts index 45988d8152..cabca35443 100644 --- a/packages/twenty-front/src/modules/command-menu/pages/message-thread/hooks/useEmailThreadInCommandMenu.ts +++ b/packages/twenty-front/src/modules/command-menu/pages/message-thread/hooks/useEmailThreadInCommandMenu.ts @@ -13,12 +13,12 @@ import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSi import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords'; import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord'; import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; // to improve - https://github.com/twentyhq/twenty/issues/12190 export const useEmailThreadInCommandMenu = () => { - const viewableRecordId = useRecoilComponentValueV2( + const viewableRecordId = useRecoilComponentValue( viewableRecordIdComponentState, ); const { upsertRecords } = useUpsertRecordsInStore(); diff --git a/packages/twenty-front/src/modules/command-menu/pages/message-thread/states/messageThreadComponentState.ts b/packages/twenty-front/src/modules/command-menu/pages/message-thread/states/messageThreadComponentState.ts index 07be81316c..3e2d7eac8a 100644 --- a/packages/twenty-front/src/modules/command-menu/pages/message-thread/states/messageThreadComponentState.ts +++ b/packages/twenty-front/src/modules/command-menu/pages/message-thread/states/messageThreadComponentState.ts @@ -1,9 +1,9 @@ import { MessageThread } from '@/activities/emails/types/MessageThread'; import { CommandMenuPageComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuPageComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const messageThreadComponentState = - createComponentStateV2({ + createComponentState({ key: 'messageThreadComponentState', defaultValue: null, componentInstanceContext: CommandMenuPageComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/command-menu/pages/record-page/components/CommandMenuRecordPage.tsx b/packages/twenty-front/src/modules/command-menu/pages/record-page/components/CommandMenuRecordPage.tsx index ceec1d1022..16b6d9a707 100644 --- a/packages/twenty-front/src/modules/command-menu/pages/record-page/components/CommandMenuRecordPage.tsx +++ b/packages/twenty-front/src/modules/command-menu/pages/record-page/components/CommandMenuRecordPage.tsx @@ -14,7 +14,7 @@ import { RecordSortsComponentInstanceContext } from '@/object-record/record-sort import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; import { useComponentInstanceStateContext } from '@/ui/utilities/state/component-state/hooks/useComponentInstanceStateContext'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import styled from '@emotion/styled'; import { useRecoilValue } from 'recoil'; @@ -34,11 +34,11 @@ const StyledRightDrawerRecord = styled.div<{ export const CommandMenuRecordPage = () => { const isMobile = useIsMobile(); - const viewableRecordNameSingular = useRecoilComponentValueV2( + const viewableRecordNameSingular = useRecoilComponentValue( viewableRecordNameSingularComponentState, ); - const viewableRecordId = useRecoilComponentValueV2( + const viewableRecordId = useRecoilComponentValue( viewableRecordIdComponentState, ); diff --git a/packages/twenty-front/src/modules/command-menu/pages/record-page/states/viewableRecordIdComponentState.ts b/packages/twenty-front/src/modules/command-menu/pages/record-page/states/viewableRecordIdComponentState.ts index e804612f11..6df54415c6 100644 --- a/packages/twenty-front/src/modules/command-menu/pages/record-page/states/viewableRecordIdComponentState.ts +++ b/packages/twenty-front/src/modules/command-menu/pages/record-page/states/viewableRecordIdComponentState.ts @@ -1,7 +1,7 @@ import { CommandMenuPageComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuPageComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const viewableRecordIdComponentState = createComponentStateV2< +export const viewableRecordIdComponentState = createComponentState< string | null >({ key: 'command-menu/viewable-record-id', diff --git a/packages/twenty-front/src/modules/command-menu/pages/record-page/states/viewableRecordNameSingularComponentState.ts b/packages/twenty-front/src/modules/command-menu/pages/record-page/states/viewableRecordNameSingularComponentState.ts index 91b1d7dcaa..7b1bc3769e 100644 --- a/packages/twenty-front/src/modules/command-menu/pages/record-page/states/viewableRecordNameSingularComponentState.ts +++ b/packages/twenty-front/src/modules/command-menu/pages/record-page/states/viewableRecordNameSingularComponentState.ts @@ -1,7 +1,7 @@ import { CommandMenuPageComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuPageComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const viewableRecordNameSingularComponentState = createComponentStateV2< +export const viewableRecordNameSingularComponentState = createComponentState< string | null >({ key: 'command-menu/viewable-record-name-singular', diff --git a/packages/twenty-front/src/modules/command-menu/pages/workflow/action/components/CommandMenuWorkflowSelectActionContent.tsx b/packages/twenty-front/src/modules/command-menu/pages/workflow/action/components/CommandMenuWorkflowSelectActionContent.tsx index 1b6af8f9ca..12cc5e7b34 100644 --- a/packages/twenty-front/src/modules/command-menu/pages/workflow/action/components/CommandMenuWorkflowSelectActionContent.tsx +++ b/packages/twenty-front/src/modules/command-menu/pages/workflow/action/components/CommandMenuWorkflowSelectActionContent.tsx @@ -1,8 +1,9 @@ -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { WorkflowActionType, WorkflowWithCurrentVersion, } from '@/workflow/types/Workflow'; +import { useCloseRightClickMenu } from '@/workflow/workflow-diagram/hooks/useCloseRightClickMenu'; import { RightDrawerStepListContainer } from '@/workflow/workflow-steps/components/RightDrawerWorkflowSelectStepContainer'; import { RightDrawerWorkflowSelectStepTitle } from '@/workflow/workflow-steps/components/RightDrawerWorkflowSelectStepTitle'; import { useCreateStep } from '@/workflow/workflow-steps/hooks/useCreateStep'; @@ -11,7 +12,6 @@ import { RECORD_ACTIONS } from '@/workflow/workflow-steps/workflow-actions/const import { useFilteredOtherActions } from '@/workflow/workflow-steps/workflow-actions/hooks/useFilteredOtherActions'; import { useIcons } from 'twenty-ui/display'; import { MenuItemCommand } from 'twenty-ui/navigation'; -import { useCloseRightClickMenu } from '@/workflow/workflow-diagram/hooks/useCloseRightClickMenu'; export const CommandMenuWorkflowSelectActionContent = ({ workflow, @@ -28,7 +28,7 @@ export const CommandMenuWorkflowSelectActionContent = ({ const { closeRightClickMenu } = useCloseRightClickMenu(); const [workflowInsertStepIds, setWorkflowInsertStepIds] = - useRecoilComponentStateV2(workflowInsertStepIdsComponentState); + useRecoilComponentState(workflowInsertStepIdsComponentState); const handleCreateStep = async (actionType: WorkflowActionType) => { const { parentStepId, nextStepId, position } = workflowInsertStepIds; 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.ts index 047435f058..6c5132afd6 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 @@ -1,9 +1,9 @@ import { commandMenuWorkflowIdComponentState } from '@/command-menu/pages/workflow/states/commandMenuWorkflowIdComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; export const useCommandMenuWorkflowIdOrThrow = () => { - const workflowId = useRecoilComponentValueV2( + const workflowId = useRecoilComponentValue( commandMenuWorkflowIdComponentState, ); if (!isDefined(workflowId)) { diff --git a/packages/twenty-front/src/modules/command-menu/pages/workflow/states/commandMenuWorkflowIdComponentState.ts b/packages/twenty-front/src/modules/command-menu/pages/workflow/states/commandMenuWorkflowIdComponentState.ts index 19e2b6a6a8..61a49868f3 100644 --- a/packages/twenty-front/src/modules/command-menu/pages/workflow/states/commandMenuWorkflowIdComponentState.ts +++ b/packages/twenty-front/src/modules/command-menu/pages/workflow/states/commandMenuWorkflowIdComponentState.ts @@ -1,7 +1,7 @@ import { CommandMenuPageComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuPageComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const commandMenuWorkflowIdComponentState = createComponentStateV2< +export const commandMenuWorkflowIdComponentState = createComponentState< string | undefined >({ key: 'command-menu/workflow-id', diff --git a/packages/twenty-front/src/modules/command-menu/pages/workflow/states/commandMenuWorkflowRunIdComponentState.ts b/packages/twenty-front/src/modules/command-menu/pages/workflow/states/commandMenuWorkflowRunIdComponentState.ts index 55a39168a8..28f36e828a 100644 --- a/packages/twenty-front/src/modules/command-menu/pages/workflow/states/commandMenuWorkflowRunIdComponentState.ts +++ b/packages/twenty-front/src/modules/command-menu/pages/workflow/states/commandMenuWorkflowRunIdComponentState.ts @@ -1,7 +1,7 @@ import { CommandMenuPageComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuPageComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const commandMenuWorkflowRunIdComponentState = createComponentStateV2< +export const commandMenuWorkflowRunIdComponentState = createComponentState< string | undefined >({ key: 'command-menu/workflow-run-id', diff --git a/packages/twenty-front/src/modules/command-menu/pages/workflow/states/commandMenuWorkflowVersionIdComponentState.ts b/packages/twenty-front/src/modules/command-menu/pages/workflow/states/commandMenuWorkflowVersionIdComponentState.ts index cf0f5c15b9..c70a9c830a 100644 --- a/packages/twenty-front/src/modules/command-menu/pages/workflow/states/commandMenuWorkflowVersionIdComponentState.ts +++ b/packages/twenty-front/src/modules/command-menu/pages/workflow/states/commandMenuWorkflowVersionIdComponentState.ts @@ -1,9 +1,10 @@ import { CommandMenuPageComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuPageComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const commandMenuWorkflowVersionIdComponentState = - createComponentStateV2({ - key: 'command-menu/workflow-version-id', - defaultValue: undefined, - componentInstanceContext: CommandMenuPageComponentInstanceContext, - }); +export const commandMenuWorkflowVersionIdComponentState = createComponentState< + string | undefined +>({ + key: 'command-menu/workflow-version-id', + defaultValue: undefined, + componentInstanceContext: CommandMenuPageComponentInstanceContext, +}); diff --git a/packages/twenty-front/src/modules/command-menu/pages/workflow/step/view-run/components/CommandMenuWorkflowRunViewStepContent.tsx b/packages/twenty-front/src/modules/command-menu/pages/workflow/step/view-run/components/CommandMenuWorkflowRunViewStepContent.tsx index cf4a93862c..9b7845da49 100644 --- a/packages/twenty-front/src/modules/command-menu/pages/workflow/step/view-run/components/CommandMenuWorkflowRunViewStepContent.tsx +++ b/packages/twenty-front/src/modules/command-menu/pages/workflow/step/view-run/components/CommandMenuWorkflowRunViewStepContent.tsx @@ -6,7 +6,7 @@ import { TabList } from '@/ui/layout/tab-list/components/TabList'; import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState'; import { SingleTabProps } from '@/ui/layout/tab-list/types/SingleTabProps'; import { useComponentInstanceStateContext } from '@/ui/utilities/state/component-state/hooks/useComponentInstanceStateContext'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useFlowOrThrow } from '@/workflow/hooks/useFlowOrThrow'; import { useWorkflowRun } from '@/workflow/hooks/useWorkflowRun'; import { useWorkflowRunIdOrThrow } from '@/workflow/hooks/useWorkflowRunIdOrThrow'; @@ -20,11 +20,11 @@ import { WorkflowRunTabId, WorkflowRunTabIdType, } from '@/workflow/workflow-steps/types/WorkflowRunTabId'; +import { getWorkflowRunStepExecutionStatus } from '@/workflow/workflow-steps/utils/getWorkflowRunStepExecutionStatus'; import styled from '@emotion/styled'; import { isNull } from '@sniptt/guards'; import { isDefined } from 'twenty-shared/utils'; import { IconLogin2, IconLogout, IconStepInto } from 'twenty-ui/display'; -import { getWorkflowRunStepExecutionStatus } from '@/workflow/workflow-steps/utils/getWorkflowRunStepExecutionStatus'; const StyledContainer = styled.div` display: flex; @@ -55,7 +55,7 @@ export const CommandMenuWorkflowRunViewStepContent = () => { ); } - const activeTabId = useRecoilComponentValueV2( + const activeTabId = useRecoilComponentValue( activeTabIdComponentState, commandMenuPageComponentInstance.instanceId, ); 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.ts index 6afcf4e714..17a0f346b0 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 @@ -1,9 +1,9 @@ import { commandMenuWorkflowRunIdComponentState } from '@/command-menu/pages/workflow/states/commandMenuWorkflowRunIdComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; export const useCommandMenuWorkflowRunIdOrThrow = () => { - const workflowRunId = useRecoilComponentValueV2( + const workflowRunId = useRecoilComponentValue( commandMenuWorkflowRunIdComponentState, ); if (!isDefined(workflowRunId)) { 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.ts index 230c617103..5ad0c58ee6 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 @@ -1,9 +1,9 @@ import { commandMenuWorkflowVersionIdComponentState } from '@/command-menu/pages/workflow/states/commandMenuWorkflowVersionIdComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; export const useCommandMenuWorkflowVersionIdOrThrow = () => { - const workflowVersionId = useRecoilComponentValueV2( + const workflowVersionId = useRecoilComponentValue( commandMenuWorkflowVersionIdComponentState, ); if (!isDefined(workflowVersionId)) { diff --git a/packages/twenty-front/src/modules/command-menu/pages/workflow/trigger-type/components/CommandMenuWorkflowSelectTriggerTypeContent.tsx b/packages/twenty-front/src/modules/command-menu/pages/workflow/trigger-type/components/CommandMenuWorkflowSelectTriggerTypeContent.tsx index 23cca632e8..aac54719d7 100644 --- a/packages/twenty-front/src/modules/command-menu/pages/workflow/trigger-type/components/CommandMenuWorkflowSelectTriggerTypeContent.tsx +++ b/packages/twenty-front/src/modules/command-menu/pages/workflow/trigger-type/components/CommandMenuWorkflowSelectTriggerTypeContent.tsx @@ -1,6 +1,6 @@ import { useWorkflowCommandMenu } from '@/command-menu/hooks/useWorkflowCommandMenu'; import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { WorkflowTriggerType, WorkflowWithCurrentVersion, @@ -13,9 +13,9 @@ import { OTHER_TRIGGER_TYPES } from '@/workflow/workflow-trigger/constants/Other import { TRIGGER_STEP_ID } from '@/workflow/workflow-trigger/constants/TriggerStepId'; import { useUpdateWorkflowVersionTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger'; import { getTriggerDefaultDefinition } from '@/workflow/workflow-trigger/utils/getTriggerDefaultDefinition'; +import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled'; import { useIcons } from 'twenty-ui/display'; import { MenuItemCommand } from 'twenty-ui/navigation'; -import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled'; import { FeatureFlagKey } from '~/generated/graphql'; export const CommandMenuWorkflowSelectTriggerTypeContent = ({ @@ -29,7 +29,7 @@ export const CommandMenuWorkflowSelectTriggerTypeContent = ({ const { activeNonSystemObjectMetadataItems } = useFilteredObjectMetadataItems(); - const setWorkflowSelectedNode = useSetRecoilComponentStateV2( + const setWorkflowSelectedNode = useSetRecoilComponentState( workflowSelectedNodeComponentState, ); const { openWorkflowEditStepInCommandMenu } = useWorkflowCommandMenu(); diff --git a/packages/twenty-front/src/modules/context-store/components/MainContextStoreProviderEffect.tsx b/packages/twenty-front/src/modules/context-store/components/MainContextStoreProviderEffect.tsx index 8fcaee7580..040c1dfc72 100644 --- a/packages/twenty-front/src/modules/context-store/components/MainContextStoreProviderEffect.tsx +++ b/packages/twenty-front/src/modules/context-store/components/MainContextStoreProviderEffect.tsx @@ -7,7 +7,7 @@ import { useSetLastVisitedObjectMetadataId } from '@/navigation/hooks/useSetLast import { useSetLastVisitedViewForObjectMetadataNamePlural } from '@/navigation/hooks/useSetLastVisitedViewForObjectMetadataNamePlural'; import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem'; import { prefetchViewFromViewIdFamilySelector } from '@/prefetch/states/selector/prefetchViewFromViewIdFamilySelector'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { useEffect } from 'react'; import { useRecoilValue } from 'recoil'; @@ -33,13 +33,13 @@ export const MainContextStoreProviderEffect = ({ useSetLastVisitedObjectMetadataId(); const [contextStoreCurrentViewId, setContextStoreCurrentViewId] = - useRecoilComponentStateV2( + useRecoilComponentState( contextStoreCurrentViewIdComponentState, MAIN_CONTEXT_STORE_INSTANCE_ID, ); const [contextStoreCurrentViewType, setContextStoreCurrentViewType] = - useRecoilComponentStateV2( + useRecoilComponentState( contextStoreCurrentViewTypeComponentState, MAIN_CONTEXT_STORE_INSTANCE_ID, ); @@ -47,7 +47,7 @@ export const MainContextStoreProviderEffect = ({ const [ contextStoreCurrentObjectMetadataItemId, setContextStoreCurrentObjectMetadataItemId, - ] = useRecoilComponentStateV2( + ] = useRecoilComponentState( contextStoreCurrentObjectMetadataItemIdComponentState, MAIN_CONTEXT_STORE_INSTANCE_ID, ); diff --git a/packages/twenty-front/src/modules/context-store/hooks/useContextStoreObjectMetadataItemOrThrow.ts b/packages/twenty-front/src/modules/context-store/hooks/useContextStoreObjectMetadataItemOrThrow.ts index 6f49badcce..baab22ef6f 100644 --- a/packages/twenty-front/src/modules/context-store/hooks/useContextStoreObjectMetadataItemOrThrow.ts +++ b/packages/twenty-front/src/modules/context-store/hooks/useContextStoreObjectMetadataItemOrThrow.ts @@ -1,11 +1,11 @@ import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState'; import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const useContextStoreObjectMetadataItemOrThrow = ( contextStoreInstanceId?: string, ) => { - const objectMetadataItemId = useRecoilComponentValueV2( + const objectMetadataItemId = useRecoilComponentValue( contextStoreCurrentObjectMetadataItemIdComponentState, contextStoreInstanceId, ); diff --git a/packages/twenty-front/src/modules/context-store/hooks/useFindManyRecordsSelectedInContextStore.ts b/packages/twenty-front/src/modules/context-store/hooks/useFindManyRecordsSelectedInContextStore.ts index c30ce792fa..02f1ebc48e 100644 --- a/packages/twenty-front/src/modules/context-store/hooks/useFindManyRecordsSelectedInContextStore.ts +++ b/packages/twenty-front/src/modules/context-store/hooks/useFindManyRecordsSelectedInContextStore.ts @@ -8,7 +8,7 @@ import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadat import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords'; import { useFilterValueDependencies } from '@/object-record/record-filter/hooks/useFilterValueDependencies'; import { RecordFilterOperand } from '@/object-record/record-filter/types/RecordFilterOperand'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useRecoilValue } from 'recoil'; export const useFindManyRecordsSelectedInContextStore = ({ @@ -18,7 +18,7 @@ export const useFindManyRecordsSelectedInContextStore = ({ instanceId?: string; limit?: number; }) => { - const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValueV2( + const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValue( contextStoreCurrentObjectMetadataItemIdComponentState, instanceId, ); @@ -27,17 +27,17 @@ export const useFindManyRecordsSelectedInContextStore = ({ objectId: contextStoreCurrentObjectMetadataItemId ?? '', }); - const contextStoreTargetedRecordsRule = useRecoilComponentValueV2( + const contextStoreTargetedRecordsRule = useRecoilComponentValue( contextStoreTargetedRecordsRuleComponentState, instanceId, ); - const contextStoreFilters = useRecoilComponentValueV2( + const contextStoreFilters = useRecoilComponentValue( contextStoreFiltersComponentState, instanceId, ); - const contextStoreAnyFieldFilterValue = useRecoilComponentValueV2( + const contextStoreAnyFieldFilterValue = useRecoilComponentValue( contextStoreAnyFieldFilterValueComponentState, instanceId, ); diff --git a/packages/twenty-front/src/modules/context-store/states/contextStoreAnyFieldFilterValueComponentState.ts b/packages/twenty-front/src/modules/context-store/states/contextStoreAnyFieldFilterValueComponentState.ts index dff10d24d4..8668e3b1ac 100644 --- a/packages/twenty-front/src/modules/context-store/states/contextStoreAnyFieldFilterValueComponentState.ts +++ b/packages/twenty-front/src/modules/context-store/states/contextStoreAnyFieldFilterValueComponentState.ts @@ -1,8 +1,8 @@ import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const contextStoreAnyFieldFilterValueComponentState = - createComponentStateV2({ + createComponentState({ key: 'contextStoreAnyFieldFilterValueComponentState', defaultValue: '', componentInstanceContext: ContextStoreComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState.ts b/packages/twenty-front/src/modules/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState.ts index 1528f047c5..dab731c864 100644 --- a/packages/twenty-front/src/modules/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState.ts +++ b/packages/twenty-front/src/modules/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState.ts @@ -1,8 +1,8 @@ import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const contextStoreCurrentObjectMetadataItemIdComponentState = - createComponentStateV2({ + createComponentState({ key: 'contextStoreCurrentObjectMetadataItemIdComponentState', defaultValue: undefined, componentInstanceContext: ContextStoreComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/context-store/states/contextStoreCurrentViewIdComponentState.ts b/packages/twenty-front/src/modules/context-store/states/contextStoreCurrentViewIdComponentState.ts index c351a84958..348a1e3f59 100644 --- a/packages/twenty-front/src/modules/context-store/states/contextStoreCurrentViewIdComponentState.ts +++ b/packages/twenty-front/src/modules/context-store/states/contextStoreCurrentViewIdComponentState.ts @@ -1,7 +1,7 @@ import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const contextStoreCurrentViewIdComponentState = createComponentStateV2< +export const contextStoreCurrentViewIdComponentState = createComponentState< string | undefined >({ key: 'contextStoreCurrentViewIdComponentState', diff --git a/packages/twenty-front/src/modules/context-store/states/contextStoreCurrentViewTypeComponentState.ts b/packages/twenty-front/src/modules/context-store/states/contextStoreCurrentViewTypeComponentState.ts index d9a5bca60c..76c2ce720e 100644 --- a/packages/twenty-front/src/modules/context-store/states/contextStoreCurrentViewTypeComponentState.ts +++ b/packages/twenty-front/src/modules/context-store/states/contextStoreCurrentViewTypeComponentState.ts @@ -1,9 +1,9 @@ import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext'; import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewType'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const contextStoreCurrentViewTypeComponentState = - createComponentStateV2({ + createComponentState({ key: 'contextStoreCurrentViewTypeComponentState', defaultValue: null, componentInstanceContext: ContextStoreComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/context-store/states/contextStoreFiltersComponentState.ts b/packages/twenty-front/src/modules/context-store/states/contextStoreFiltersComponentState.ts index 8c0225df63..be0738c4c3 100644 --- a/packages/twenty-front/src/modules/context-store/states/contextStoreFiltersComponentState.ts +++ b/packages/twenty-front/src/modules/context-store/states/contextStoreFiltersComponentState.ts @@ -1,8 +1,8 @@ import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext'; import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const contextStoreFiltersComponentState = createComponentStateV2< +export const contextStoreFiltersComponentState = createComponentState< RecordFilter[] >({ key: 'contextStoreFiltersComponentState', diff --git a/packages/twenty-front/src/modules/context-store/states/contextStoreNumberOfSelectedRecordsComponentState.ts b/packages/twenty-front/src/modules/context-store/states/contextStoreNumberOfSelectedRecordsComponentState.ts index 54a6cb1adb..fbf2f80e51 100644 --- a/packages/twenty-front/src/modules/context-store/states/contextStoreNumberOfSelectedRecordsComponentState.ts +++ b/packages/twenty-front/src/modules/context-store/states/contextStoreNumberOfSelectedRecordsComponentState.ts @@ -1,8 +1,8 @@ import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const contextStoreNumberOfSelectedRecordsComponentState = - createComponentStateV2({ + createComponentState({ key: 'contextStoreNumberOfSelectedRecordsComponentState', defaultValue: 0, componentInstanceContext: ContextStoreComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/context-store/states/contextStoreRecordShowParentViewComponentState.ts b/packages/twenty-front/src/modules/context-store/states/contextStoreRecordShowParentViewComponentState.ts index 6afd0c1413..2bcf884be9 100644 --- a/packages/twenty-front/src/modules/context-store/states/contextStoreRecordShowParentViewComponentState.ts +++ b/packages/twenty-front/src/modules/context-store/states/contextStoreRecordShowParentViewComponentState.ts @@ -2,7 +2,7 @@ import { ContextStoreComponentInstanceContext } from '@/context-store/states/con import { RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup'; import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter'; import { RecordSort } from '@/object-record/record-sort/types/RecordSort'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; type RecordShowParentViewComponentState = { parentViewComponentId: string; @@ -13,10 +13,8 @@ type RecordShowParentViewComponentState = { }; export const contextStoreRecordShowParentViewComponentState = - createComponentStateV2( - { - key: 'contextStoreRecordShowParentViewComponentState', - defaultValue: undefined, - componentInstanceContext: ContextStoreComponentInstanceContext, - }, - ); + createComponentState({ + key: 'contextStoreRecordShowParentViewComponentState', + defaultValue: undefined, + componentInstanceContext: ContextStoreComponentInstanceContext, + }); diff --git a/packages/twenty-front/src/modules/context-store/states/contextStoreTargetedRecordsRuleComponentState.ts b/packages/twenty-front/src/modules/context-store/states/contextStoreTargetedRecordsRuleComponentState.ts index 296884fd04..a10e2f3fea 100644 --- a/packages/twenty-front/src/modules/context-store/states/contextStoreTargetedRecordsRuleComponentState.ts +++ b/packages/twenty-front/src/modules/context-store/states/contextStoreTargetedRecordsRuleComponentState.ts @@ -1,5 +1,5 @@ import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; type ContextStoreTargetedRecordsRuleSelectionMode = { mode: 'selection'; @@ -16,7 +16,7 @@ export type ContextStoreTargetedRecordsRule = | ContextStoreTargetedRecordsRuleExclusionMode; export const contextStoreTargetedRecordsRuleComponentState = - createComponentStateV2({ + createComponentState({ key: 'contextStoreTargetedRecordsRuleComponentState', defaultValue: { mode: 'selection', diff --git a/packages/twenty-front/src/modules/favorites/components/CurrentWorkspaceMemberFavorites.tsx b/packages/twenty-front/src/modules/favorites/components/CurrentWorkspaceMemberFavorites.tsx index 05d7cc13db..795dc37502 100644 --- a/packages/twenty-front/src/modules/favorites/components/CurrentWorkspaceMemberFavorites.tsx +++ b/packages/twenty-front/src/modules/favorites/components/CurrentWorkspaceMemberFavorites.tsx @@ -20,7 +20,7 @@ import { NavigationDrawerInput } from '@/ui/navigation/navigation-drawer/compone import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem'; import { NavigationDrawerItemsCollapsableContainer } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItemsCollapsableContainer'; import { getNavigationSubItemLeftAdornment } from '@/ui/navigation/navigation-drawer/utils/getNavigationSubItemLeftAdornment'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { Droppable } from '@hello-pangea/dnd'; import { useContext, useState } from 'react'; import { createPortal } from 'react-dom'; @@ -73,7 +73,7 @@ export const CurrentWorkspaceMemberFavorites = ({ const dropdownId = `favorite-folder-edit-${folder.folderId}`; - const isDropdownOpenComponent = useRecoilComponentValueV2( + const isDropdownOpenComponent = useRecoilComponentValue( isDropdownOpenComponentState, dropdownId, ); @@ -140,7 +140,7 @@ export const CurrentWorkspaceMemberFavorites = ({ /> ); - const isModalOpened = useRecoilComponentValueV2( + const isModalOpened = useRecoilComponentValue( isModalOpenedComponentState, modalId, ); 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.tsx index 0e42341e8e..30a90d41e9 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 @@ -11,7 +11,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator'; import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { useRecoilState } from 'recoil'; import { Key } from 'ts-key-enum'; @@ -43,7 +43,7 @@ export const FavoriteFolderPicker = ({ objectNameSingular, }); - const [favoriteFoldersSearchFilter] = useRecoilComponentStateV2( + const [favoriteFoldersSearchFilter] = useRecoilComponentState( favoriteFolderSearchFilterComponentState, ); 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.tsx index b64d7ca2c3..f826478f89 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 @@ -9,9 +9,9 @@ import { useFavorites } from '@/favorites/hooks/useFavorites'; import { usePrefetchedFavoritesFoldersData } from '@/favorites/hooks/usePrefetchedFavoritesFoldersData'; import { FavoriteFolder } from '@/favorites/types/FavoriteFolder'; import { ObjectRecord } from '@/object-record/types/ObjectRecord'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { isDefined } from 'twenty-shared/utils'; type FavoriteFolderPickerEffectProps = { @@ -22,16 +22,16 @@ export const FavoriteFolderPickerEffect = ({ record, }: FavoriteFolderPickerEffectProps) => { const [favoriteFolderIdsPicker, setFavoriteFolderIdsPicker] = - useRecoilComponentStateV2(favoriteFolderIdsPickerComponentState); + useRecoilComponentState(favoriteFolderIdsPickerComponentState); - const favoriteFolderPickerFamilyState = useRecoilComponentCallbackStateV2( + const favoriteFolderPickerFamilyState = useRecoilComponentCallbackState( favoriteFolderPickerComponentFamilyState, ); const { favoriteFolders } = usePrefetchedFavoritesFoldersData(); const { sortedFavorites: favorites } = useFavorites(); - const setCheckedState = useSetRecoilComponentStateV2( + const setCheckedState = useSetRecoilComponentState( favoriteFolderPickerCheckedComponentState, ); 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.tsx index 5287f268c6..1ef2acdb25 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 @@ -2,7 +2,7 @@ import { favoriteFolderPickerCheckedComponentState } from '@/favorites/favorite- import { favoriteFolderSearchFilterComponentState } from '@/favorites/favorite-folder-picker/states/favoriteFoldersSearchFilterComponentState'; import { FavoriteFolder } from '@/favorites/types/FavoriteFolder'; import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import styled from '@emotion/styled'; import { MenuItem, MenuItemMultiSelect } from 'twenty-ui/navigation'; @@ -26,11 +26,11 @@ export const FavoriteFolderPickerList = ({ folders, toggleFolderSelection, }: FavoriteFolderPickerListProps) => { - const [favoriteFoldersSearchFilter] = useRecoilComponentStateV2( + const [favoriteFoldersSearchFilter] = useRecoilComponentState( favoriteFolderSearchFilterComponentState, ); - const [favoriteFolderPickerChecked] = useRecoilComponentStateV2( + const [favoriteFolderPickerChecked] = useRecoilComponentState( favoriteFolderPickerCheckedComponentState, ); 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.tsx index 611aeec5d9..9f35f47992 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 @@ -1,12 +1,12 @@ import { favoriteFolderSearchFilterComponentState } from '@/favorites/favorite-folder-picker/states/favoriteFoldersSearchFilterComponentState'; import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { useCallback } from 'react'; import { useDebouncedCallback } from 'use-debounce'; export const FavoriteFolderPickerSearchInput = () => { const [favoriteFoldersSearchFilter, setFavoriteFoldersSearchFilter] = - useRecoilComponentStateV2(favoriteFolderSearchFilterComponentState); + useRecoilComponentState(favoriteFolderSearchFilterComponentState); const debouncedSetSearchFilter = useDebouncedCallback( setFavoriteFoldersSearchFilter, diff --git a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/hooks/useFavoriteFolderPicker.ts b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/hooks/useFavoriteFolderPicker.ts index fb0e7f403a..eae9a6b6bd 100644 --- a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/hooks/useFavoriteFolderPicker.ts +++ b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/hooks/useFavoriteFolderPicker.ts @@ -6,8 +6,8 @@ import { useFavorites } from '@/favorites/hooks/useFavorites'; import { FavoriteFolder } from '@/favorites/types/FavoriteFolder'; import { ObjectRecord } from '@/object-record/types/ObjectRecord'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useRecoilCallback } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; @@ -26,15 +26,13 @@ export const useFavoriteFolderPicker = ({ objectNameSingular, }: useFavoriteFolderPickerProps): useFavoriteFolderPickerReturnType => { const favoriteFoldersMultiSelectCheckedState = - useRecoilComponentCallbackStateV2( - favoriteFolderPickerCheckedComponentState, - ); + useRecoilComponentCallbackState(favoriteFolderPickerCheckedComponentState); const { sortedFavorites: favorites } = useFavorites(); const { createFavorite } = useCreateFavorite(); const { deleteFavorite } = useDeleteFavorite(); - const favoriteFolders = useRecoilComponentValueV2( + const favoriteFolders = useRecoilComponentValue( favoriteFoldersComponentSelector, ); diff --git a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/favoriteFolderIdPickerComponentState.ts b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/favoriteFolderIdPickerComponentState.ts index d79a26b2ea..2a52ea254c 100644 --- a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/favoriteFolderIdPickerComponentState.ts +++ b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/favoriteFolderIdPickerComponentState.ts @@ -1,7 +1,7 @@ import { FavoriteFolderPickerInstanceContext } from '@/favorites/favorite-folder-picker/states/context/FavoriteFolderPickerInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const favoriteFolderIdsPickerComponentState = createComponentStateV2< +export const favoriteFolderIdsPickerComponentState = createComponentState< string[] >({ key: 'favoriteFolderIdsPickerComponentState', diff --git a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/favoriteFolderPickerCheckedComponentState.ts b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/favoriteFolderPickerCheckedComponentState.ts index 1f98d0635d..14bb431021 100644 --- a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/favoriteFolderPickerCheckedComponentState.ts +++ b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/favoriteFolderPickerCheckedComponentState.ts @@ -1,7 +1,7 @@ import { FavoriteFolderPickerInstanceContext } from '@/favorites/favorite-folder-picker/states/context/FavoriteFolderPickerInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const favoriteFolderPickerCheckedComponentState = createComponentStateV2< +export const favoriteFolderPickerCheckedComponentState = createComponentState< string[] >({ key: 'favoriteFolderPickerCheckedComponentState', diff --git a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/favoriteFolderPickerComponentFamilyState.ts b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/favoriteFolderPickerComponentFamilyState.ts index 9aaa1b0234..98929f686d 100644 --- a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/favoriteFolderPickerComponentFamilyState.ts +++ b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/favoriteFolderPickerComponentFamilyState.ts @@ -1,9 +1,9 @@ import { FavoriteFolderPickerInstanceContext } from '@/favorites/favorite-folder-picker/states/context/FavoriteFolderPickerInstanceContext'; import { FavoriteFolder } from '@/favorites/types/FavoriteFolder'; -import { createComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilyStateV2'; +import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState'; export const favoriteFolderPickerComponentFamilyState = - createComponentFamilyStateV2({ + createComponentFamilyState({ key: 'favoriteFolderPickerComponentFamilyState', defaultValue: undefined, componentInstanceContext: FavoriteFolderPickerInstanceContext, diff --git a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/favoriteFoldersSearchFilterComponentState.ts b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/favoriteFoldersSearchFilterComponentState.ts index c075f0ea50..9e079da31d 100644 --- a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/favoriteFoldersSearchFilterComponentState.ts +++ b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/favoriteFoldersSearchFilterComponentState.ts @@ -1,8 +1,8 @@ import { FavoriteFolderPickerInstanceContext } from '@/favorites/favorite-folder-picker/states/context/FavoriteFolderPickerInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const favoriteFolderSearchFilterComponentState = - createComponentStateV2({ + createComponentState({ key: 'favoriteFolderSearchFilterComponentState', defaultValue: '', componentInstanceContext: FavoriteFolderPickerInstanceContext, diff --git a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/selectors/favoriteFoldersComponentSelector.ts b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/selectors/favoriteFoldersComponentSelector.ts index 977b04a661..241dceed49 100644 --- a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/selectors/favoriteFoldersComponentSelector.ts +++ b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/states/selectors/favoriteFoldersComponentSelector.ts @@ -2,10 +2,10 @@ import { FavoriteFolderPickerInstanceContext } from '@/favorites/favorite-folder import { favoriteFolderIdsPickerComponentState } from '@/favorites/favorite-folder-picker/states/favoriteFolderIdPickerComponentState'; import { favoriteFolderPickerComponentFamilyState } from '@/favorites/favorite-folder-picker/states/favoriteFolderPickerComponentFamilyState'; import { FavoriteFolder } from '@/favorites/types/FavoriteFolder'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; import { isDefined } from 'twenty-shared/utils'; -export const favoriteFoldersComponentSelector = createComponentSelectorV2< +export const favoriteFoldersComponentSelector = createComponentSelector< FavoriteFolder[] >({ key: 'favoriteFoldersComponentSelector', diff --git a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerItemForObjectMetadataItem.tsx b/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerItemForObjectMetadataItem.tsx index e8dd590d0e..3a17261ef0 100644 --- a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerItemForObjectMetadataItem.tsx +++ b/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerItemForObjectMetadataItem.tsx @@ -8,12 +8,12 @@ import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/componen import { NavigationDrawerItemsCollapsableContainer } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItemsCollapsableContainer'; import { NavigationDrawerSubItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSubItem'; import { getNavigationSubItemLeftAdornment } from '@/ui/navigation/navigation-drawer/utils/getNavigationSubItemLeftAdornment'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useLocation } from 'react-router-dom'; import { useRecoilValue } from 'recoil'; -import { getAppPath } from '~/utils/navigation/getAppPath'; -import { AnimatedExpandableContainer } from 'twenty-ui/layout'; import { useIcons } from 'twenty-ui/display'; +import { AnimatedExpandableContainer } from 'twenty-ui/layout'; +import { getAppPath } from '~/utils/navigation/getAppPath'; export type NavigationDrawerItemForObjectMetadataItemProps = { objectMetadataItem: ObjectMetadataItem; @@ -28,7 +28,7 @@ export const NavigationDrawerItemForObjectMetadataItem = ({ }), ); - const contextStoreCurrentViewId = useRecoilComponentValueV2( + const contextStoreCurrentViewId = useRecoilComponentValue( contextStoreCurrentViewIdComponentState, MAIN_CONTEXT_STORE_INSTANCE_ID, ); diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownFilterInput.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownFilterInput.tsx index da1e637abd..5ab7fa3ad8 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownFilterInput.tsx +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownFilterInput.tsx @@ -18,7 +18,7 @@ import { isFilterOnActorSourceSubField } from '@/object-record/object-filter-dro import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter'; import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { FieldMetadataType } from 'twenty-shared/types'; type AdvancedFilterDropdownFilterInputProps = { @@ -30,7 +30,7 @@ export const AdvancedFilterDropdownFilterInput = ({ filterDropdownId, recordFilter, }: AdvancedFilterDropdownFilterInputProps) => { - const subFieldNameUsedInDropdown = useRecoilComponentValueV2( + const subFieldNameUsedInDropdown = useRecoilComponentValue( subFieldNameUsedInDropdownComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownNumberInput.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownNumberInput.tsx index d20eade9c1..fd21082c26 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownNumberInput.tsx +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownNumberInput.tsx @@ -2,15 +2,15 @@ import { useApplyObjectFilterDropdownFilterValue } from '@/object-record/object- import { useObjectFilterDropdownFilterValue } from '@/object-record/object-filter-dropdown/hooks/useObjectFilterDropdownFilterValue'; import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector'; import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState'; -import { TextInputV2 } from '@/ui/input/components/TextInputV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { TextInput } from '@/ui/input/components/TextInput'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const AdvancedFilterDropdownNumberInput = () => { - const selectedOperandInDropdown = useRecoilComponentValueV2( + const selectedOperandInDropdown = useRecoilComponentValue( selectedOperandInDropdownComponentState, ); - const fieldMetadataItemUsedInDropdown = useRecoilComponentValueV2( + const fieldMetadataItemUsedInDropdown = useRecoilComponentValue( fieldMetadataItemUsedInDropdownComponentSelector, ); @@ -29,7 +29,7 @@ export const AdvancedFilterDropdownNumberInput = () => { } return ( - { const [objectFilterDropdownIsSelectingCompositeField] = - useRecoilComponentStateV2( + useRecoilComponentState( objectFilterDropdownIsSelectingCompositeFieldComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu.tsx index 8691fb8358..7baf2d85c8 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu.tsx +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu.tsx @@ -8,14 +8,14 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownM import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList'; import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem'; import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem'; import { getFilterTypeFromFieldType } from '@/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions'; import { AdvancedFilterFieldSelectSearchInput } from '@/object-record/advanced-filter/components/AdvancedFilterFieldSelectSearchInput'; import { useAdvancedFilterFieldSelectDropdown } from '@/object-record/advanced-filter/hooks/useAdvancedFilterFieldSelectDropdown'; import { useSelectFieldUsedInAdvancedFilterDropdown } from '@/object-record/advanced-filter/hooks/useSelectFieldUsedInAdvancedFilterDropdown'; -import { ObjectFilterDropdownFilterSelectMenuItemV2 } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItemV2'; +import { ObjectFilterDropdownFilterSelectMenuItem } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem'; import { fieldMetadataItemIdUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemIdUsedInDropdownComponentState'; import { objectFilterDropdownIsSelectingCompositeFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState'; import { objectFilterDropdownSubMenuFieldTypeComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState'; @@ -24,8 +24,8 @@ import { useFilterableFieldMetadataItemsInRecordIndexContext } from '@/object-re import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel'; import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { useLingui } from '@lingui/react/macro'; type AdvancedFilterFieldSelectMenuProps = { @@ -42,14 +42,14 @@ export const AdvancedFilterFieldSelectMenu = ({ advancedFilterFieldSelectDropdownId, } = useAdvancedFilterFieldSelectDropdown(recordFilterId); - const [objectFilterDropdownSearchInput] = useRecoilComponentStateV2( + const [objectFilterDropdownSearchInput] = useRecoilComponentState( objectFilterDropdownSearchInputComponentState, ); const { filterableFieldMetadataItems } = useFilterableFieldMetadataItemsInRecordIndexContext(); - const visibleTableColumns = useRecoilComponentValueV2( + const visibleTableColumns = useRecoilComponentValue( visibleTableColumnsComponentSelector, recordIndexId, ); @@ -85,16 +85,16 @@ export const AdvancedFilterFieldSelectMenu = ({ const { selectFieldUsedInAdvancedFilterDropdown } = useSelectFieldUsedInAdvancedFilterDropdown(); - const [, setObjectFilterDropdownSubMenuFieldType] = useRecoilComponentStateV2( + const [, setObjectFilterDropdownSubMenuFieldType] = useRecoilComponentState( objectFilterDropdownSubMenuFieldTypeComponentState, ); const [, setObjectFilterDropdownIsSelectingCompositeField] = - useRecoilComponentStateV2( + useRecoilComponentState( objectFilterDropdownIsSelectingCompositeFieldComponentState, ); - const setFieldMetadataItemIdUsedInDropdown = useSetRecoilComponentStateV2( + const setFieldMetadataItemIdUsedInDropdown = useSetRecoilComponentState( fieldMetadataItemIdUsedInDropdownComponentState, ); @@ -161,7 +161,7 @@ export const AdvancedFilterFieldSelectMenu = ({ handleFieldMetadataItemSelect(visibleFieldMetadataItem); }} > - @@ -187,7 +187,7 @@ export const AdvancedFilterFieldSelectMenu = ({ handleFieldMetadataItemSelect(hiddenFieldMetadataItem); }} > - diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectSearchInput.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectSearchInput.tsx index 4a57b07348..9e4c1f9758 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectSearchInput.tsx +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectSearchInput.tsx @@ -1,5 +1,5 @@ import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import styled from '@emotion/styled'; import { t } from '@lingui/core/macro'; @@ -31,7 +31,7 @@ export const StyledInput = styled.input` export const AdvancedFilterFieldSelectSearchInput = () => { const [objectFilterDropdownSearchInput, setObjectFilterDropdownSearchInput] = - useRecoilComponentStateV2(objectFilterDropdownSearchInputComponentState); + useRecoilComponentState(objectFilterDropdownSearchInputComponentState); return ( { - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOperandSelectContent.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOperandSelectContent.tsx index be95703911..ad0346a983 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOperandSelectContent.tsx +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOperandSelectContent.tsx @@ -13,7 +13,7 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown'; import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList'; import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem'; import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { ViewFilterOperand } from 'twenty-shared/src/types/ViewFilterOperand'; import { MenuItem } from 'twenty-ui/navigation'; @@ -41,7 +41,7 @@ export const AdvancedFilterRecordFilterOperandSelectContent = ({ applyObjectFilterDropdownOperand(operand); }; - const selectedItemId = useRecoilComponentValueV2( + const selectedItemId = useRecoilComponentValue( selectedItemIdComponentState, dropdownId, ); diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOptionsDropdown.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOptionsDropdown.tsx index 6b16359539..97de43b716 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOptionsDropdown.tsx +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOptionsDropdown.tsx @@ -10,7 +10,7 @@ import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; import { IconDotsVertical, IconTrash } from 'twenty-ui/display'; import { IconButton } from 'twenty-ui/input'; @@ -30,7 +30,7 @@ export const AdvancedFilterRecordFilterOptionsDropdown = ({ const { removeRecordFilter } = useRemoveRecordFilter(); const { removeRecordFilterGroup } = useRemoveRecordFilterGroup(); - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRootRecordFilterGroup.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRootRecordFilterGroup.tsx index f0e351b7b8..88fc55ad38 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRootRecordFilterGroup.tsx +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRootRecordFilterGroup.tsx @@ -8,7 +8,7 @@ import { rootLevelRecordFilterGroupComponentSelector } from '@/object-record/adv import { isRecordFilterGroupChildARecordFilterGroup } from '@/object-record/advanced-filter/utils/isRecordFilterGroupChildARecordFilterGroup'; import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import styled from '@emotion/styled'; import { id } from 'date-fns/locale'; import { isDefined } from 'twenty-shared/utils'; @@ -23,7 +23,7 @@ const StyledContainer = styled.div` `; export const AdvancedFilterRootRecordFilterGroup = () => { - const rootRecordFilterGroup = useRecoilComponentValueV2( + const rootRecordFilterGroup = useRecoilComponentValue( rootLevelRecordFilterGroupComponentSelector, ); diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterSubFieldSelectMenu.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterSubFieldSelectMenu.tsx index 9dbb6f1774..48b5b19916 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterSubFieldSelectMenu.tsx +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterSubFieldSelectMenu.tsx @@ -1,6 +1,6 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem'; @@ -22,7 +22,7 @@ import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/Gene import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList'; import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem'; import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { IconChevronLeft, useIcons } from 'twenty-ui/display'; import { MenuItem } from 'twenty-ui/navigation'; @@ -35,19 +35,19 @@ export const AdvancedFilterSubFieldSelectMenu = ({ }: AdvancedFilterSubFieldSelectMenuProps) => { const { getIcon } = useIcons(); - const fieldMetadataItemUsedInDropdown = useRecoilComponentValueV2( + const fieldMetadataItemUsedInDropdown = useRecoilComponentValue( fieldMetadataItemUsedInDropdownComponentSelector, ); const [, setObjectFilterDropdownIsSelectingCompositeField] = - useRecoilComponentStateV2( + useRecoilComponentState( objectFilterDropdownIsSelectingCompositeFieldComponentState, ); const [ objectFilterDropdownSubMenuFieldType, setObjectFilterDropdownSubMenuFieldType, - ] = useRecoilComponentStateV2( + ] = useRecoilComponentState( objectFilterDropdownSubMenuFieldTypeComponentState, ); @@ -82,7 +82,7 @@ export const AdvancedFilterSubFieldSelectMenu = ({ const { advancedFilterFieldSelectDropdownId } = useAdvancedFilterFieldSelectDropdown(recordFilterId); - const selectedItemId = useRecoilComponentValueV2( + const selectedItemId = useRecoilComponentValue( selectedItemIdComponentState, advancedFilterFieldSelectDropdownId, ); diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterValueInput.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterValueInput.tsx index 01ba1af24e..27aed6ed7b 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterValueInput.tsx +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterValueInput.tsx @@ -11,8 +11,8 @@ import { configurableViewFilterOperands } from '@/object-record/object-filter-dr import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState'; import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; import { DropdownOffset } from '@/ui/layout/dropdown/types/DropdownOffset'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import styled from '@emotion/styled'; import { isDefined } from 'twenty-shared/utils'; @@ -30,11 +30,11 @@ export const AdvancedFilterValueInput = ({ }: AdvancedFilterValueInputProps) => { const dropdownId = `advanced-filter-view-filter-value-input-${recordFilterId}`; - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); - const subFieldNameUsedInDropdown = useRecoilComponentValueV2( + const subFieldNameUsedInDropdown = useRecoilComponentValue( subFieldNameUsedInDropdownComponentState, ); @@ -44,18 +44,17 @@ export const AdvancedFilterValueInput = ({ const isDisabled = !recordFilter?.fieldMetadataId || !recordFilter.operand; - const setObjectFilterDropdownSearchInput = useSetRecoilComponentStateV2( + const setObjectFilterDropdownSearchInput = useSetRecoilComponentState( objectFilterDropdownSearchInputComponentState, ); - const setFieldMetadataItemIdUsedInDropdown = useSetRecoilComponentStateV2( + const setFieldMetadataItemIdUsedInDropdown = useSetRecoilComponentState( fieldMetadataItemIdUsedInDropdownComponentState, ); - const setObjectFilterDropdownCurrentRecordFilter = - useSetRecoilComponentStateV2( - objectFilterDropdownCurrentRecordFilterComponentState, - ); + const setObjectFilterDropdownCurrentRecordFilter = useSetRecoilComponentState( + objectFilterDropdownCurrentRecordFilterComponentState, + ); const operandHasNoInput = recordFilter && !configurableViewFilterOperands.has(recordFilter.operand); diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterValueInputDropdownButtonClickableSelect.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterValueInputDropdownButtonClickableSelect.tsx index 18d1871d4c..8a49b2b5b3 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterValueInputDropdownButtonClickableSelect.tsx +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterValueInputDropdownButtonClickableSelect.tsx @@ -2,7 +2,7 @@ import { useGetFieldMetadataItemById } from '@/object-metadata/hooks/useGetField import { getAdvancedFilterInputPlaceholderText } from '@/object-record/advanced-filter/utils/getAdvancedFilterInputPlacedholderText'; import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState'; import { SelectControl } from '@/ui/input/components/SelectControl'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isNonEmptyString } from '@sniptt/guards'; @@ -34,7 +34,7 @@ type AdvancedFilterValueInputDropdownButtonClickableSelectProps = { export const AdvancedFilterValueInputDropdownButtonClickableSelect = ({ recordFilterId, }: AdvancedFilterValueInputDropdownButtonClickableSelectProps) => { - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useChildRecordFiltersAndRecordFilterGroups.ts b/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useChildRecordFiltersAndRecordFilterGroups.ts index bcfc6bdbd6..e82b6dfe24 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useChildRecordFiltersAndRecordFilterGroups.ts +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useChildRecordFiltersAndRecordFilterGroups.ts @@ -2,7 +2,7 @@ import { currentRecordFilterGroupsComponentState } from '@/object-record/record- import { RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup'; import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState'; import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; export const useChildRecordFiltersAndRecordFilterGroups = ({ @@ -10,11 +10,11 @@ export const useChildRecordFiltersAndRecordFilterGroups = ({ }: { recordFilterGroupId?: string; }) => { - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); - const currentRecordFilterGroups = useRecoilComponentValueV2( + const currentRecordFilterGroups = useRecoilComponentValue( currentRecordFilterGroupsComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useRecordFilterField.ts b/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useRecordFilterField.ts index b18990b836..8c9587c32a 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useRecordFilterField.ts +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useRecordFilterField.ts @@ -3,13 +3,13 @@ import { getCompositeSubFieldLabel } from '@/object-record/object-filter-dropdow import { isCompositeFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFieldType'; import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState'; import { isValidSubFieldName } from '@/settings/data-model/utils/isValidSubFieldName'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isNonEmptyString } from '@sniptt/guards'; import { isDefined } from 'twenty-shared/utils'; import { useIcons } from 'twenty-ui/display'; export const useRecordFilterField = (recordFilterId: string) => { - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useSelectFieldUsedInAdvancedFilterDropdown.ts b/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useSelectFieldUsedInAdvancedFilterDropdown.ts index 7c90bc4170..fa5a768677 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useSelectFieldUsedInAdvancedFilterDropdown.ts +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useSelectFieldUsedInAdvancedFilterDropdown.ts @@ -16,8 +16,8 @@ import { isCompositeTypeNonFilterableByAnySubField } from '@/object-record/recor import { CompositeFieldSubFieldName } from '@/settings/data-model/types/CompositeFieldSubFieldName'; import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack'; import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { isDefined } from 'twenty-shared/utils'; type SelectFilterParams = { @@ -27,19 +27,19 @@ type SelectFilterParams = { }; export const useSelectFieldUsedInAdvancedFilterDropdown = () => { - const setSelectedOperandInDropdown = useSetRecoilComponentStateV2( + const setSelectedOperandInDropdown = useSetRecoilComponentState( selectedOperandInDropdownComponentState, ); - const setFieldMetadataItemIdUsedInDropdown = useSetRecoilComponentStateV2( + const setFieldMetadataItemIdUsedInDropdown = useSetRecoilComponentState( fieldMetadataItemIdUsedInDropdownComponentState, ); - const setObjectFilterDropdownSearchInput = useSetRecoilComponentStateV2( + const setObjectFilterDropdownSearchInput = useSetRecoilComponentState( objectFilterDropdownSearchInputComponentState, ); - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); @@ -47,14 +47,13 @@ export const useSelectFieldUsedInAdvancedFilterDropdown = () => { const { getFieldMetadataItemById } = useGetFieldMetadataItemById(); - const setSubFieldNameUsedInDropdown = useSetRecoilComponentStateV2( + const setSubFieldNameUsedInDropdown = useSetRecoilComponentState( subFieldNameUsedInDropdownComponentState, ); - const setObjectFilterDropdownCurrentRecordFilter = - useSetRecoilComponentStateV2( - objectFilterDropdownCurrentRecordFilterComponentState, - ); + const setObjectFilterDropdownCurrentRecordFilter = useSetRecoilComponentState( + objectFilterDropdownCurrentRecordFilterComponentState, + ); const { upsertRecordFilter } = useUpsertRecordFilter(); diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useSetAdvancedFilterDropdownAllRowsStates.ts b/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useSetAdvancedFilterDropdownAllRowsStates.ts index b418628263..6a2db43c94 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useSetAdvancedFilterDropdownAllRowsStates.ts +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/hooks/useSetAdvancedFilterDropdownAllRowsStates.ts @@ -6,19 +6,19 @@ import { subFieldNameUsedInDropdownComponentState } from '@/object-record/object import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState'; import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState'; import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useRecoilCallback } from 'recoil'; export const useSetAdvancedFilterDropdownStates = () => { - const rootLevelRecordFilterGroup = useRecoilComponentValueV2( + const rootLevelRecordFilterGroup = useRecoilComponentValue( rootLevelRecordFilterGroupComponentSelector, ); - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); - const currentRecordFilterGroups = useRecoilComponentValueV2( + const currentRecordFilterGroups = useRecoilComponentValue( currentRecordFilterGroupsComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/states/rootLevelRecordFilterGroupComponentSelector.ts b/packages/twenty-front/src/modules/object-record/advanced-filter/states/rootLevelRecordFilterGroupComponentSelector.ts index 44250fb635..d5e2711bcc 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/states/rootLevelRecordFilterGroupComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/states/rootLevelRecordFilterGroupComponentSelector.ts @@ -1,10 +1,10 @@ import { RecordFilterGroupsComponentInstanceContext } from '@/object-record/record-filter-group/states/context/RecordFilterGroupsComponentInstanceContext'; import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; import { isDefined } from 'twenty-shared/utils'; export const rootLevelRecordFilterGroupComponentSelector = - createComponentSelectorV2({ + createComponentSelector({ key: 'rootLevelRecordFilterGroupComponentSelector', get: ({ instanceId }) => 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.tsx index 432d5472da..81034600ba 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 @@ -1,13 +1,13 @@ import { anyFieldFilterValueComponentState } from '@/object-record/record-filter/states/anyFieldFilterValueComponentState'; import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { useLingui } from '@lingui/react/macro'; export const ObjectFilterDropdownAnyFieldSearchInput = () => { const { t } = useLingui(); const [anyFieldFilterSearchValue, setAnyFieldFilterSearchValue] = - useRecoilComponentStateV2(anyFieldFilterValueComponentState); + useRecoilComponentState(anyFieldFilterValueComponentState); const handleSearchChange = (event: React.ChangeEvent) => { const inputValue = event.target.value; diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownContentWrapper.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownContentWrapper.tsx index 74d77a3a3f..fff046822f 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownContentWrapper.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownContentWrapper.tsx @@ -4,13 +4,13 @@ import { DATE_PICKER_DROPDOWN_CONTENT_WIDTH } from '@/object-record/object-filte import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector'; import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; export const ObjectFilterDropdownContentWrapper = ({ children, }: React.PropsWithChildren) => { - const fieldMetadataItemUsedInDropdown = useRecoilComponentValueV2( + const fieldMetadataItemUsedInDropdown = useRecoilComponentValue( fieldMetadataItemUsedInDropdownComponentSelector, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCountrySelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCountrySelect.tsx index da67ec9761..ea23d0088f 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCountrySelect.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCountrySelect.tsx @@ -10,7 +10,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator'; import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useLingui } from '@lingui/react/macro'; import { isNonEmptyString } from '@sniptt/guards'; import { ChangeEvent, useState } from 'react'; @@ -23,14 +23,14 @@ export const MAX_ITEMS_TO_DISPLAY = 5; export const ObjectFilterDropdownCountrySelect = () => { const [searchText, setSearchText] = useState(''); - const objectFilterDropdownCurrentRecordFilter = useRecoilComponentValueV2( + const objectFilterDropdownCurrentRecordFilter = useRecoilComponentValue( objectFilterDropdownCurrentRecordFilterComponentState, ); const { applyObjectFilterDropdownFilterValue } = useApplyObjectFilterDropdownFilterValue(); - const fieldMetadataItemUsedInFilterDropdown = useRecoilComponentValueV2( + const fieldMetadataItemUsedInFilterDropdown = useRecoilComponentValue( fieldMetadataItemUsedInDropdownComponentSelector, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx index 0144d346a0..3308ed423d 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx @@ -9,7 +9,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator'; import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useLingui } from '@lingui/react/macro'; import { isNonEmptyString } from '@sniptt/guards'; import { ChangeEvent, useState } from 'react'; @@ -22,14 +22,14 @@ export const MAX_ITEMS_TO_DISPLAY = 3; export const ObjectFilterDropdownCurrencySelect = () => { const [searchText, setSearchText] = useState(''); - const objectFilterDropdownCurrentRecordFilter = useRecoilComponentValueV2( + const objectFilterDropdownCurrentRecordFilter = useRecoilComponentValue( objectFilterDropdownCurrentRecordFilterComponentState, ); const { applyObjectFilterDropdownFilterValue } = useApplyObjectFilterDropdownFilterValue(); - const fieldMetadataItemUsedInFilterDropdown = useRecoilComponentValueV2( + const fieldMetadataItemUsedInFilterDropdown = useRecoilComponentValue( fieldMetadataItemUsedInDropdownComponentSelector, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput.tsx index 3294eb5e35..e7ae85f212 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput.tsx @@ -4,7 +4,7 @@ import { objectFilterDropdownCurrentRecordFilterComponentState } from '@/object- import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState'; import { getRelativeDateDisplayValue } from '@/object-record/object-filter-dropdown/utils/getRelativeDateDisplayValue'; import { DateTimePicker } from '@/ui/input/components/internal/date/components/InternalDatePicker'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { computeVariableDateViewFilterValue } from '@/views/view-filter-value/utils/computeVariableDateViewFilterValue'; import { resolveDateViewFilterValue, @@ -17,15 +17,15 @@ import { isDefined } from 'twenty-shared/utils'; import { FieldMetadataType } from '~/generated-metadata/graphql'; export const ObjectFilterDropdownDateInput = () => { - const fieldMetadataItemUsedInDropdown = useRecoilComponentValueV2( + const fieldMetadataItemUsedInDropdown = useRecoilComponentValue( fieldMetadataItemUsedInDropdownComponentSelector, ); - const selectedOperandInDropdown = useRecoilComponentValueV2( + const selectedOperandInDropdown = useRecoilComponentValue( selectedOperandInDropdownComponentState, ); - const objectFilterDropdownCurrentRecordFilter = useRecoilComponentValueV2( + const objectFilterDropdownCurrentRecordFilter = useRecoilComponentValue( objectFilterDropdownCurrentRecordFilterComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInput.tsx index 4ca9a22445..930a942633 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInput.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInput.tsx @@ -18,7 +18,7 @@ import { NUMBER_FILTER_TYPES } from '@/object-record/object-filter-dropdown/cons import { TEXT_FILTER_TYPES } from '@/object-record/object-filter-dropdown/constants/TextFilterTypes'; import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector'; import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; type ObjectFilterDropdownFilterInputProps = { @@ -30,12 +30,12 @@ export const ObjectFilterDropdownFilterInput = ({ filterDropdownId, recordFilterId, }: ObjectFilterDropdownFilterInputProps) => { - const fieldMetadataItemUsedInDropdown = useRecoilComponentValueV2( + const fieldMetadataItemUsedInDropdown = useRecoilComponentValue( fieldMetadataItemUsedInDropdownComponentSelector, filterDropdownId, ); - const selectedOperandInDropdown = useRecoilComponentValueV2( + const selectedOperandInDropdown = useRecoilComponentValue( selectedOperandInDropdownComponentState, filterDropdownId, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInputHeader.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInputHeader.tsx index 44e52b08e8..bae4b1bdb7 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInputHeader.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInputHeader.tsx @@ -4,7 +4,7 @@ import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenu import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent'; import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext'; import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { ViewBarFilterDropdownFilterInputMenuHeader } from '@/views/components/ViewBarFilterDropdownFilterInputMenuHeader'; import { VIEW_BAR_FILTER_DROPDOWN_ID } from '@/views/constants/ViewBarFilterDropdownId'; import { useLingui } from '@lingui/react/macro'; @@ -15,11 +15,11 @@ import { IconX } from 'twenty-ui/display'; export const ObjectFilterDropdownFilterInputHeader = () => { const { t } = useLingui(); - const fieldMetadataItemUsedInDropdown = useRecoilComponentValueV2( + const fieldMetadataItemUsedInDropdown = useRecoilComponentValue( fieldMetadataItemUsedInDropdownComponentSelector, ); - const selectedOperandInDropdown = useRecoilComponentValueV2( + const selectedOperandInDropdown = useRecoilComponentValue( selectedOperandInDropdownComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItemV2.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx similarity index 79% rename from packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItemV2.tsx rename to packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx index b9ee167071..27e1f6a43e 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItemV2.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx @@ -3,22 +3,22 @@ import { FILTER_FIELD_LIST_ID } from '@/object-record/object-filter-dropdown/con import { isCompositeFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFieldType'; import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList'; import { isSelectedItemIdComponentFamilySelector } from '@/ui/layout/selectable-list/states/selectors/isSelectedItemIdComponentFamilySelector'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; import { useIcons } from 'twenty-ui/display'; import { MenuItem } from 'twenty-ui/navigation'; -export type ObjectFilterDropdownFilterSelectMenuItemV2Props = { +export type ObjectFilterDropdownFilterSelectMenuItemProps = { fieldMetadataItemToSelect: FieldMetadataItem; onClick: (selectedFieldMetadataItem: FieldMetadataItem) => void; }; -export const ObjectFilterDropdownFilterSelectMenuItemV2 = ({ +export const ObjectFilterDropdownFilterSelectMenuItem = ({ fieldMetadataItemToSelect, onClick, -}: ObjectFilterDropdownFilterSelectMenuItemV2Props) => { +}: ObjectFilterDropdownFilterSelectMenuItemProps) => { const { resetSelectedItem } = useSelectableList(FILTER_FIELD_LIST_ID); - const isSelectedItem = useRecoilComponentFamilyValueV2( + const isSelectedItem = useRecoilComponentFamilyValue( isSelectedItemIdComponentFamilySelector, fieldMetadataItemToSelect.id, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownInnerSelectOperandDropdown.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownInnerSelectOperandDropdown.tsx index ae9984749f..6b54fb36e3 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownInnerSelectOperandDropdown.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownInnerSelectOperandDropdown.tsx @@ -10,7 +10,7 @@ import { RecordFilterOperand } from '@/object-record/record-filter/types/RecordF import { getRecordFilterOperands } from '@/object-record/record-filter/utils/getRecordFilterOperands'; import { DropdownMenuInnerSelect } from '@/ui/layout/dropdown/components/DropdownMenuInnerSelect'; import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; import { SelectOption } from 'twenty-ui/input'; @@ -18,15 +18,15 @@ const OBJECT_FILTER_DROPDOWN_INNER_SELECT_OPERAND_DROPDOWN_ID = 'object-filter-dropdown-inner-select-operand-dropdown'; export const ObjectFilterDropdownInnerSelectOperandDropdown = () => { - const selectedOperandInDropdown = useRecoilComponentValueV2( + const selectedOperandInDropdown = useRecoilComponentValue( selectedOperandInDropdownComponentState, ); - const fieldMetadataItemUsedInDropdown = useRecoilComponentValueV2( + const fieldMetadataItemUsedInDropdown = useRecoilComponentValue( fieldMetadataItemUsedInDropdownComponentSelector, ); - const subFieldNameUsedInDropdown = useRecoilComponentValueV2( + const subFieldNameUsedInDropdown = useRecoilComponentValue( subFieldNameUsedInDropdownComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberInput.tsx index 41c4cb8c88..91ec0c1acd 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberInput.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberInput.tsx @@ -5,10 +5,10 @@ import { useObjectFilterDropdownFilterValue } from '@/object-record/object-filte import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector'; import { DropdownMenuInput } from '@/ui/layout/dropdown/components/DropdownMenuInput'; import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const ObjectFilterDropdownNumberInput = () => { - const fieldMetadataItemUsedInDropdown = useRecoilComponentValueV2( + const fieldMetadataItemUsedInDropdown = useRecoilComponentValue( fieldMetadataItemUsedInDropdownComponentSelector, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx index 02cf50f759..1b2f7d48f8 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx @@ -17,7 +17,7 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown'; import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState'; import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isNonEmptyString } from '@sniptt/guards'; import { MAX_OPTIONS_TO_DISPLAY } from 'twenty-shared/constants'; import { isDefined } from 'twenty-shared/utils'; @@ -34,11 +34,11 @@ export const ObjectFilterDropdownOptionSelect = ({ }: { focusId: string; }) => { - const fieldMetadataItemUsedInDropdown = useRecoilComponentValueV2( + const fieldMetadataItemUsedInDropdown = useRecoilComponentValue( fieldMetadataItemUsedInDropdownComponentSelector, ); - const objectFilterDropdownSearchInput = useRecoilComponentValueV2( + const objectFilterDropdownSearchInput = useRecoilComponentValue( objectFilterDropdownSearchInputComponentState, ); @@ -46,7 +46,7 @@ export const ObjectFilterDropdownOptionSelect = ({ ObjectFilterDropdownComponentInstanceContext, ); - const objectFilterDropdownCurrentRecordFilter = useRecoilComponentValueV2( + const objectFilterDropdownCurrentRecordFilter = useRecoilComponentValue( objectFilterDropdownCurrentRecordFilterComponentState, ); @@ -67,7 +67,7 @@ export const ObjectFilterDropdownOptionSelect = ({ const { resetSelectedItem } = useSelectableList(componentInstanceId); - const selectedItemId = useRecoilComponentValueV2( + const selectedItemId = useRecoilComponentValue( selectedItemIdComponentState, componentInstanceId, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx index 248d70b130..4ba332f94e 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx @@ -12,7 +12,7 @@ import { MultipleSelectDropdown } from '@/object-record/select/components/Multip import { useRecordsForSelect } from '@/object-record/select/hooks/useRecordsForSelect'; import { SelectableItem } from '@/object-record/select/types/SelectableItem'; import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { RelationFilterValue } from '@/views/view-filter-value/types/RelationFilterValue'; import { arrayOfUuidOrVariableSchema } from '@/views/view-filter-value/validation-schemas/arrayOfUuidsOrVariablesSchema'; import { jsonRelationFilterValueSchema } from '@/views/view-filter-value/validation-schemas/jsonRelationFilterValueSchema'; @@ -35,7 +35,7 @@ export const ObjectFilterDropdownRecordSelect = ({ recordFilterId, dropdownId, }: ObjectFilterDropdownRecordSelectProps) => { - const fieldMetadataItemUsedInFilterDropdown = useRecoilComponentValueV2( + const fieldMetadataItemUsedInFilterDropdown = useRecoilComponentValue( fieldMetadataItemUsedInDropdownComponentSelector, ); @@ -45,15 +45,15 @@ export const ObjectFilterDropdownRecordSelect = ({ const { applyObjectFilterDropdownFilterValue } = useApplyObjectFilterDropdownFilterValue(); - const selectedOperandInDropdown = useRecoilComponentValueV2( + const selectedOperandInDropdown = useRecoilComponentValue( selectedOperandInDropdownComponentState, ); - const objectFilterDropdownSearchInput = useRecoilComponentValueV2( + const objectFilterDropdownSearchInput = useRecoilComponentValue( objectFilterDropdownSearchInputComponentState, ); - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSearchInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSearchInput.tsx index 9a4a7b3b99..c8ed89a841 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSearchInput.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSearchInput.tsx @@ -4,23 +4,23 @@ import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-recor import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState'; import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState'; import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; export const ObjectFilterDropdownSearchInput = () => { - const fieldMetadataItemUsedInDropdown = useRecoilComponentValueV2( + const fieldMetadataItemUsedInDropdown = useRecoilComponentValue( fieldMetadataItemUsedInDropdownComponentSelector, ); - const selectedOperandInDropdown = useRecoilComponentValueV2( + const selectedOperandInDropdown = useRecoilComponentValue( selectedOperandInDropdownComponentState, ); - const objectFilterDropdownSearchInput = useRecoilComponentValueV2( + const objectFilterDropdownSearchInput = useRecoilComponentValue( objectFilterDropdownSearchInputComponentState, ); - const setObjectFilterDropdownSearchInput = useSetRecoilComponentStateV2( + const setObjectFilterDropdownSearchInput = useSetRecoilComponentState( objectFilterDropdownSearchInputComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect.tsx index d13cac9342..9a4298bfeb 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect.tsx @@ -7,7 +7,7 @@ import { MultipleSelectDropdown } from '@/object-record/select/components/Multip import { SelectableItem } from '@/object-record/select/types/SelectableItem'; import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isNonEmptyString } from '@sniptt/guards'; import { isDefined } from 'twenty-shared/utils'; @@ -19,15 +19,15 @@ export const ObjectFilterDropdownSourceSelect = ({ }: { dropdownId: string; }) => { - const objectFilterDropdownSearchInput = useRecoilComponentValueV2( + const objectFilterDropdownSearchInput = useRecoilComponentValue( objectFilterDropdownSearchInputComponentState, ); - const fieldMetadataItemUsedInFilterDropdown = useRecoilComponentValueV2( + const fieldMetadataItemUsedInFilterDropdown = useRecoilComponentValue( fieldMetadataItemUsedInDropdownComponentSelector, ); - const objectFilterDropdownCurrentRecordFilter = useRecoilComponentValueV2( + const objectFilterDropdownCurrentRecordFilter = useRecoilComponentValue( objectFilterDropdownCurrentRecordFilterComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownTextInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownTextInput.tsx index ad9a404337..de2d26d5b8 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownTextInput.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownTextInput.tsx @@ -5,10 +5,10 @@ import { useObjectFilterDropdownFilterValue } from '@/object-record/object-filte import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector'; import { DropdownMenuInput } from '@/ui/layout/dropdown/components/DropdownMenuInput'; import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const ObjectFilterDropdownTextInput = () => { - const fieldMetadataItemUsedInDropdown = useRecoilComponentValueV2( + const fieldMetadataItemUsedInDropdown = useRecoilComponentValue( fieldMetadataItemUsedInDropdownComponentSelector, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownVectorSearchInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownVectorSearchInput.tsx index 4f80772da5..5d6349eadc 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownVectorSearchInput.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownVectorSearchInput.tsx @@ -1,5 +1,5 @@ import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { useVectorSearchFilterActions } from '@/views/hooks/useVectorSearchFilterActions'; import { vectorSearchInputComponentState } from '@/views/states/vectorSearchInputComponentState'; import { useLingui } from '@lingui/react/macro'; @@ -9,7 +9,7 @@ export const ObjectFilterDropdownVectorSearchInput = () => { const { t } = useLingui(); const [vectorSearchInputValue, setVectorSearchInputValue] = - useRecoilComponentStateV2(vectorSearchInputComponentState); + useRecoilComponentState(vectorSearchInputComponentState); const { applyVectorSearchFilter } = useVectorSearchFilterActions(); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useApplyObjectFilterDropdownFilterValue.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useApplyObjectFilterDropdownFilterValue.ts index bdc26e9740..aaf72e8b18 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useApplyObjectFilterDropdownFilterValue.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useApplyObjectFilterDropdownFilterValue.ts @@ -3,18 +3,18 @@ import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-recor import { objectFilterDropdownCurrentRecordFilterComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState'; import { useCreateRecordFilterFromObjectFilterDropdownCurrentStates } from '@/object-record/record-filter/hooks/useCreateRecordFilterFromObjectFilterDropdownCurrentStates'; import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useRecoilCallback } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; export const useApplyObjectFilterDropdownFilterValue = () => { const objectFilterDropdownCurrentRecordFilterCallbackState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( objectFilterDropdownCurrentRecordFilterComponentState, ); const fieldMetadataItemUsedInDropdownCallbackState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( fieldMetadataItemUsedInDropdownComponentSelector, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useApplyObjectFilterDropdownOperand.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useApplyObjectFilterDropdownOperand.ts index 9a91efd10e..189b8fdee1 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useApplyObjectFilterDropdownOperand.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useApplyObjectFilterDropdownOperand.ts @@ -8,8 +8,8 @@ import { useCreateEmptyRecordFilterFromFieldMetadataItem } from '@/object-record import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter'; import { RecordFilterOperand } from '@/object-record/record-filter/types/RecordFilterOperand'; import { getDateFilterDisplayValue } from '@/object-record/record-filter/utils/getDateFilterDisplayValue'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { computeVariableDateViewFilterValue } from '@/views/view-filter-value/utils/computeVariableDateViewFilterValue'; import { VariableDateViewFilterValueDirection, @@ -18,11 +18,11 @@ import { import { isDefined } from 'twenty-shared/utils'; export const useApplyObjectFilterDropdownOperand = () => { - const objectFilterDropdownCurrentRecordFilter = useRecoilComponentValueV2( + const objectFilterDropdownCurrentRecordFilter = useRecoilComponentValue( objectFilterDropdownCurrentRecordFilterComponentState, ); - const setSelectedOperandInDropdown = useSetRecoilComponentStateV2( + const setSelectedOperandInDropdown = useSetRecoilComponentState( selectedOperandInDropdownComponentState, ); @@ -30,7 +30,7 @@ export const useApplyObjectFilterDropdownOperand = () => { objectFilterDropdownCurrentRecordFilter, ); - const fieldMetadataItemUsedInDropdown = useRecoilComponentValueV2( + const fieldMetadataItemUsedInDropdown = useRecoilComponentValue( fieldMetadataItemUsedInDropdownComponentSelector, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useEmptyRecordFilter.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useEmptyRecordFilter.ts index 42393dd68c..8e733f1b20 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useEmptyRecordFilter.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useEmptyRecordFilter.ts @@ -1,17 +1,17 @@ import { objectFilterDropdownCurrentRecordFilterComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState'; import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useRecoilCallback } from 'recoil'; export const useEmptyRecordFilter = (componentInstanceId?: string) => { const objectFilterDropdownSearchInputCallbackState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( objectFilterDropdownSearchInputComponentState, componentInstanceId, ); const objectFilterDropdownCurrentRecordFilter = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( objectFilterDropdownCurrentRecordFilterComponentState, componentInstanceId, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdownSelectableFieldMetadataItems.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdownSelectableFieldMetadataItems.ts index 7b4f066d59..8992beb096 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdownSelectableFieldMetadataItems.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdownSelectableFieldMetadataItems.ts @@ -2,19 +2,19 @@ import { objectFilterDropdownSearchInputComponentState } from '@/object-record/o import { useFilterableFieldMetadataItemsInRecordIndexContext } from '@/object-record/record-filter/hooks/useFilterableFieldMetadataItemsInRecordIndexContext'; import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext'; import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const useFilterDropdownSelectableFieldMetadataItems = () => { const { recordIndexId } = useRecordIndexContextOrThrow(); - const objectFilterDropdownSearchInput = useRecoilComponentValueV2( + const objectFilterDropdownSearchInput = useRecoilComponentValue( objectFilterDropdownSearchInputComponentState, ); const { filterableFieldMetadataItems } = useFilterableFieldMetadataItemsInRecordIndexContext(); - const visibleTableColumns = useRecoilComponentValueV2( + const visibleTableColumns = useRecoilComponentValue( visibleTableColumnsComponentSelector, recordIndexId, ); 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.ts index 54c721cbd4..7a228f12a2 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 @@ -1,8 +1,8 @@ import { objectFilterDropdownCurrentRecordFilterComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const useObjectFilterDropdownFilterValue = () => { - const currentRecordFilter = useRecoilComponentValueV2( + const currentRecordFilter = useRecoilComponentValue( objectFilterDropdownCurrentRecordFilterComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useResetFilterDropdown.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useResetFilterDropdown.ts index 0a2a7a923b..452086dd7d 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useResetFilterDropdown.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useResetFilterDropdown.ts @@ -5,48 +5,48 @@ import { objectFilterDropdownFilterIsSelectedComponentState } from '@/object-rec import { objectFilterDropdownIsSelectingCompositeFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState'; import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState'; import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useRecoilCallback } from 'recoil'; export const useResetFilterDropdown = (componentInstanceId?: string) => { const objectFilterDropdownSearchInputCallbackState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( objectFilterDropdownSearchInputComponentState, componentInstanceId, ); const fieldMetadataItemIdUsedInDropdownCallbackState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( fieldMetadataItemIdUsedInDropdownComponentState, componentInstanceId, ); const selectedOperandInDropdownCallbackState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( selectedOperandInDropdownComponentState, componentInstanceId, ); const objectFilterDropdownFilterIsSelectedCallbackState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( objectFilterDropdownFilterIsSelectedComponentState, componentInstanceId, ); const objectFilterDropdownAnyFieldSearchIsSelectedCallbackState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( objectFilterDropdownAnyFieldSearchIsSelectedComponentState, componentInstanceId, ); const objectFilterDropdownIsSelectingCompositeFieldCallbackState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( objectFilterDropdownIsSelectingCompositeFieldComponentState, componentInstanceId, ); const objectFilterDropdownCurrentRecordFilterCallbackState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( objectFilterDropdownCurrentRecordFilterComponentState, componentInstanceId, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useUpsertObjectFilterDropdownCurrentFilter.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useUpsertObjectFilterDropdownCurrentFilter.ts index 9438600c0c..48b181fdcb 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useUpsertObjectFilterDropdownCurrentFilter.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useUpsertObjectFilterDropdownCurrentFilter.ts @@ -1,12 +1,12 @@ import { objectFilterDropdownCurrentRecordFilterComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState'; import { useUpsertRecordFilter } from '@/object-record/record-filter/hooks/useUpsertRecordFilter'; import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useRecoilCallback } from 'recoil'; export const useUpsertObjectFilterDropdownCurrentFilter = () => { const objectFilterDropdownCurrentRecordFilterCallbackState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( objectFilterDropdownCurrentRecordFilterComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/fieldMetadataItemIdUsedInDropdownComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/fieldMetadataItemIdUsedInDropdownComponentState.ts index cefeb2b739..a750726365 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/fieldMetadataItemIdUsedInDropdownComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/fieldMetadataItemIdUsedInDropdownComponentState.ts @@ -1,8 +1,8 @@ import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const fieldMetadataItemIdUsedInDropdownComponentState = - createComponentStateV2({ + createComponentState({ key: 'fieldMetadataItemIdUsedInDropdownComponentState', defaultValue: null, componentInstanceContext: ObjectFilterDropdownComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector.ts index bf3e6622e4..37c9ef0a85 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector.ts @@ -2,10 +2,10 @@ import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadat import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem'; import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext'; import { fieldMetadataItemIdUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemIdUsedInDropdownComponentState'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; export const fieldMetadataItemUsedInDropdownComponentSelector = - createComponentSelectorV2({ + createComponentSelector({ key: 'fieldMetadataItemUsedInDropdownComponentSelector', get: ({ instanceId }) => diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedComponentState.ts index eacaa84cc0..9fd17b10c1 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedComponentState.ts @@ -1,8 +1,8 @@ import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const isObjectFilterDropdownOperandSelectUnfoldedComponentState = - createComponentStateV2({ + createComponentState({ key: 'isObjectFilterDropdownOperandSelectUnfoldedComponentState', defaultValue: false, componentInstanceContext: ObjectFilterDropdownComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedComponentState.ts index ac62700b8d..2303169912 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedComponentState.ts @@ -1,8 +1,8 @@ import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const isObjectFilterDropdownUnfoldedComponentState = - createComponentStateV2({ + createComponentState({ key: 'isObjectFilterDropdownUnfoldedComponentState', defaultValue: false, componentInstanceContext: ObjectFilterDropdownComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownAnyFieldSearchIsSelectedComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownAnyFieldSearchIsSelectedComponentState.ts index 1d7dbc36eb..bc3c965449 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownAnyFieldSearchIsSelectedComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownAnyFieldSearchIsSelectedComponentState.ts @@ -1,8 +1,8 @@ import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const objectFilterDropdownAnyFieldSearchIsSelectedComponentState = - createComponentStateV2({ + createComponentState({ key: 'objectFilterDropdownAnyFieldSearchIsSelectedComponentState', defaultValue: false, componentInstanceContext: ObjectFilterDropdownComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState.ts index f275d9d77f..f2b16bed04 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState.ts @@ -1,9 +1,9 @@ import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; import { RecordFilter } from '../../record-filter/types/RecordFilter'; export const objectFilterDropdownCurrentRecordFilterComponentState = - createComponentStateV2({ + createComponentState({ key: 'objectFilterDropdownCurrentRecordFilterComponentState', defaultValue: undefined, componentInstanceContext: ObjectFilterDropdownComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownFilterIsSelectedComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownFilterIsSelectedComponentState.ts index 051f5b9e7b..142c17e625 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownFilterIsSelectedComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownFilterIsSelectedComponentState.ts @@ -1,8 +1,8 @@ import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const objectFilterDropdownFilterIsSelectedComponentState = - createComponentStateV2({ + createComponentState({ key: 'objectFilterDropdownFilterIsSelectedComponentState', defaultValue: false, componentInstanceContext: ObjectFilterDropdownComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState.ts index 68a141fd88..7dc4668545 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState.ts @@ -1,8 +1,8 @@ import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const objectFilterDropdownIsSelectingCompositeFieldComponentState = - createComponentStateV2({ + createComponentState({ key: 'objectFilterDropdownIsSelectingCompositeFieldComponentState', defaultValue: false, componentInstanceContext: ObjectFilterDropdownComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState.ts index 47ed066c2f..24565e244b 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState.ts @@ -1,8 +1,8 @@ import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const objectFilterDropdownSearchInputComponentState = - createComponentStateV2({ + createComponentState({ key: 'objectFilterDropdownSearchInputComponentState', defaultValue: '', componentInstanceContext: ObjectFilterDropdownComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedOptionValuesComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedOptionValuesComponentState.ts index da1b563a6a..10c54a86c9 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedOptionValuesComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedOptionValuesComponentState.ts @@ -1,8 +1,8 @@ import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const objectFilterDropdownSelectedOptionValuesComponentState = - createComponentStateV2({ + createComponentState({ key: 'objectFilterDropdownSelectedOptionValuesComponentState', defaultValue: [], componentInstanceContext: ObjectFilterDropdownComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState.ts index 4bf9c12f4f..71b2af9cd9 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState.ts @@ -1,9 +1,9 @@ import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext'; import { CompositeFilterableFieldType } from '@/object-record/record-filter/types/CompositeFilterableFieldType'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const objectFilterDropdownSubMenuFieldTypeComponentState = - createComponentStateV2({ + createComponentState({ key: 'objectFilterDropdownSubMenuFieldTypeComponentState', defaultValue: null, componentInstanceContext: ObjectFilterDropdownComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState.ts index d5831012e6..f60b495c53 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState.ts @@ -1,9 +1,9 @@ import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; import { ViewFilterOperand } from 'twenty-shared/src/types/ViewFilterOperand'; export const selectedOperandInDropdownComponentState = - createComponentStateV2({ + createComponentState({ key: 'selectedOperandInDropdownComponentState', defaultValue: null, componentInstanceContext: ObjectFilterDropdownComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/subFieldNameUsedInDropdownComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/subFieldNameUsedInDropdownComponentState.ts index 66058e6920..c692c60925 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/subFieldNameUsedInDropdownComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/subFieldNameUsedInDropdownComponentState.ts @@ -1,8 +1,8 @@ import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext'; import { CompositeFieldSubFieldName } from '@/settings/data-model/types/CompositeFieldSubFieldName'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const subFieldNameUsedInDropdownComponentState = createComponentStateV2< +export const subFieldNameUsedInDropdownComponentState = createComponentState< CompositeFieldSubFieldName | null | undefined >({ key: 'subFieldNameUsedInDropdownComponentState', diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdown.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdown.tsx index ef552de166..02febd0a32 100644 --- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdown.tsx +++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdown.tsx @@ -10,7 +10,7 @@ import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton'; import { DROPDOWN_OFFSET_Y } from '@/ui/layout/dropdown/constants/DropdownOffsetY'; import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { ViewType } from '@/views/types/ViewType'; import { Trans } from '@lingui/react/macro'; @@ -28,7 +28,7 @@ export const ObjectOptionsDropdown = ({ const { currentContentId, handleContentChange, handleResetContent } = useDropdownContextCurrentContentId(); - const isDropdownOpen = useRecoilComponentValueV2( + const isDropdownOpen = useRecoilComponentValue( isDropdownOpenComponentState, OBJECT_OPTIONS_DROPDOWN_ID, ); diff --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.tsx index 8258b4fa93..1809fe5268 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 @@ -14,7 +14,7 @@ import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator'; import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useLingui } from '@lingui/react/macro'; import { useLocation } from 'react-router-dom'; import { useSetRecoilState } from 'recoil'; @@ -32,11 +32,11 @@ export const ObjectOptionsDropdownHiddenRecordGroupsContent = () => { closeDropdown, } = useObjectOptionsDropdown(); - const recordGroupFieldMetadata = useRecoilComponentValueV2( + const recordGroupFieldMetadata = useRecoilComponentValue( recordGroupFieldMetadataComponentState, ); - const hiddenRecordGroupIds = useRecoilComponentValueV2( + const hiddenRecordGroupIds = useRecoilComponentValue( hiddenRecordGroupIdsComponentSelector, ); 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.tsx index 0fdcabe94f..5c07f458ae 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 @@ -13,7 +13,7 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown'; import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList'; import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem'; import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly'; import { ViewOpenRecordInType } from '@/views/types/ViewOpenRecordInType'; import { ViewType, viewTypeIconMapping } from '@/views/types/ViewType'; @@ -53,7 +53,7 @@ export const ObjectOptionsDropdownLayoutContent = () => { const recordIndexOpenRecordIn = useRecoilValue(recordIndexOpenRecordInState); - const recordGroupFieldMetadata = useRecoilComponentValueV2( + const recordGroupFieldMetadata = useRecoilComponentValue( recordGroupFieldMetadataComponentState, ); @@ -86,7 +86,7 @@ export const ObjectOptionsDropdownLayoutContent = () => { ...(currentView?.type === ViewType.Kanban ? ['Group', 'Compact view'] : []), ]; - const selectedItemId = useRecoilComponentValueV2( + const selectedItemId = useRecoilComponentValue( selectedItemIdComponentState, OBJECT_OPTIONS_DROPDOWN_ID, ); diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutOpenInContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutOpenInContent.tsx index 8eab2895ce..371b7baa04 100644 --- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutOpenInContent.tsx +++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutOpenInContent.tsx @@ -11,7 +11,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList'; import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem'; import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly'; import { ViewOpenRecordInType } from '@/views/types/ViewOpenRecordInType'; import { t } from '@lingui/core/macro'; @@ -33,7 +33,7 @@ export const ObjectOptionsDropdownLayoutOpenInContent = () => { objectMetadataItem.nameSingular, ); - const selectedItemId = useRecoilComponentValueV2( + const selectedItemId = useRecoilComponentValue( selectedItemIdComponentState, OBJECT_OPTIONS_DROPDOWN_ID, ); diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuContent.tsx index 31253b4b29..380e3a1f84 100644 --- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuContent.tsx +++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuContent.tsx @@ -9,8 +9,8 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownM import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList'; import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem'; import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly'; import { ViewType, viewTypeIconMapping } from '@/views/types/ViewType'; import { useDeleteViewFromCurrentState } from '@/views/view-picker/hooks/useDeleteViewFromCurrentState'; @@ -34,7 +34,7 @@ export const ObjectOptionsDropdownMenuContent = () => { const { currentView } = useGetCurrentViewOnly(); - const recordGroupFieldMetadata = useRecoilComponentValueV2( + const recordGroupFieldMetadata = useRecoilComponentValue( recordGroupFieldMetadataComponentState, ); @@ -49,7 +49,7 @@ export const ObjectOptionsDropdownMenuContent = () => { }); const { deleteViewFromCurrentState } = useDeleteViewFromCurrentState(); - const setViewPickerReferenceViewId = useSetRecoilComponentStateV2( + const setViewPickerReferenceViewId = useSetRecoilComponentState( viewPickerReferenceViewIdComponentState, ); const handleDelete = () => { @@ -71,7 +71,7 @@ export const ObjectOptionsDropdownMenuContent = () => { ...(isDefaultView ? [] : ['Delete view']), ]; - const selectedItemId = useRecoilComponentValueV2( + const selectedItemId = useRecoilComponentValue( selectedItemIdComponentState, OBJECT_OPTIONS_DROPDOWN_ID, ); diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName.tsx index 7c4f7e7cd2..b359174065 100644 --- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName.tsx +++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName.tsx @@ -2,12 +2,12 @@ import { Key } from 'ts-key-enum'; import { useUpdateObjectViewOptions } from '@/object-record/object-options-dropdown/hooks/useUpdateObjectViewOptions'; import { IconPicker } from '@/ui/input/components/IconPicker'; -import { TextInputV2 } from '@/ui/input/components/TextInputV2'; +import { TextInput } from '@/ui/input/components/TextInput'; import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { View } from '@/views/types/View'; import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId'; import { useUpdateViewFromCurrentState } from '@/views/view-picker/hooks/useUpdateViewFromCurrentState'; @@ -60,12 +60,12 @@ export const ObjectOptionsDropdownMenuViewName = ({ currentView, }: ObjectOptionsDropdownMenuViewNameProps) => { const [viewPickerSelectedIcon, setViewPickerSelectedIcon] = - useRecoilComponentStateV2(viewPickerSelectedIconComponentState); + useRecoilComponentState(viewPickerSelectedIconComponentState); - const viewPickerIsPersisting = useRecoilComponentValueV2( + const viewPickerIsPersisting = useRecoilComponentValue( viewPickerIsPersistingComponentState, ); - const setViewPickerIsDirty = useSetRecoilComponentStateV2( + const setViewPickerIsDirty = useSetRecoilComponentState( viewPickerIsDirtyComponentState, ); @@ -126,7 +126,7 @@ export const ObjectOptionsDropdownMenuViewName = ({ onChange={handleIconChange} selectedIconKey={viewPickerSelectedIcon} /> - { setViewName(value); 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.tsx index 8445c064bb..9242696c41 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 @@ -16,7 +16,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator'; import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { ViewType } from '@/views/types/ViewType'; import { useLingui } from '@lingui/react/macro'; import { useLocation } from 'react-router-dom'; @@ -48,11 +48,11 @@ export const ObjectOptionsDropdownRecordGroupFieldsContent = () => { objectNameSingular: objectMetadataItem.nameSingular, }); - const hiddenRecordGroupIds = useRecoilComponentValueV2( + const hiddenRecordGroupIds = useRecoilComponentValue( hiddenRecordGroupIdsComponentSelector, ); - const recordGroupFieldMetadata = useRecoilComponentValueV2( + const recordGroupFieldMetadata = useRecoilComponentValue( recordGroupFieldMetadataComponentState, ); 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.tsx index 1de3d11a09..3f1f1aa05a 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 @@ -12,8 +12,8 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList'; import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem'; import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { IconChevronLeft, IconHandMove, @@ -25,11 +25,11 @@ import { MenuItemSelect } from 'twenty-ui/navigation'; export const ObjectOptionsDropdownRecordGroupSortContent = () => { const { currentContentId, onContentChange } = useObjectOptionsDropdown(); - const hiddenRecordGroupIds = useRecoilComponentValueV2( + const hiddenRecordGroupIds = useRecoilComponentValue( hiddenRecordGroupIdsComponentSelector, ); - const [recordGroupSort, setRecordGroupSort] = useRecoilComponentStateV2( + const [recordGroupSort, setRecordGroupSort] = useRecoilComponentState( recordIndexRecordGroupSortComponentState, ); @@ -37,7 +37,7 @@ export const ObjectOptionsDropdownRecordGroupSortContent = () => { setRecordGroupSort(sort); }; - const selectedItemId = useRecoilComponentValueV2( + const selectedItemId = useRecoilComponentValue( selectedItemIdComponentState, OBJECT_OPTIONS_DROPDOWN_ID, ); 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.tsx index bad13ff55c..f43f8d7e50 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 @@ -17,8 +17,8 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownM import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList'; import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem'; import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly'; import { useLingui } from '@lingui/react/macro'; import { @@ -46,25 +46,25 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => { const { currentView } = useGetCurrentViewOnly(); - const recordGroupFieldMetadata = useRecoilComponentValueV2( + const recordGroupFieldMetadata = useRecoilComponentValue( recordGroupFieldMetadataComponentState, ); - const visibleRecordGroupIds = useRecoilComponentFamilyValueV2( + const visibleRecordGroupIds = useRecoilComponentFamilyValue( visibleRecordGroupIdsComponentFamilySelector, viewType, ); - const hiddenRecordGroupIds = useRecoilComponentValueV2( + const hiddenRecordGroupIds = useRecoilComponentValue( hiddenRecordGroupIdsComponentSelector, ); - const hideEmptyRecordGroup = useRecoilComponentFamilyValueV2( + const hideEmptyRecordGroup = useRecoilComponentFamilyValue( recordIndexRecordGroupHideComponentFamilyState, viewType, ); - const recordGroupSort = useRecoilComponentValueV2( + const recordGroupSort = useRecoilComponentValue( recordIndexRecordGroupSortComponentState, ); @@ -83,7 +83,7 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => { } }, [hiddenRecordGroupIds, currentContentId, onContentChange]); - const selectedItemId = useRecoilComponentValueV2( + const selectedItemId = useRecoilComponentValue( selectedItemIdComponentState, OBJECT_OPTIONS_DROPDOWN_ID, ); diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard.ts b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard.ts index 607eab23fa..353890eae8 100644 --- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard.ts +++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard.ts @@ -8,7 +8,7 @@ import { isRecordBoardCompactModeActiveComponentState } from '@/object-record/re import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata'; import { recordIndexFieldDefinitionsState } from '@/object-record/record-index/states/recordIndexFieldDefinitionsState'; import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { useSaveCurrentViewFields } from '@/views/hooks/useSaveCurrentViewFields'; import { useUpdateCurrentView } from '@/views/hooks/useUpdateCurrentView'; import { GraphQLView } from '@/views/types/GraphQLView'; @@ -33,11 +33,10 @@ export const useObjectOptionsForBoard = ({ const { saveViewFields } = useSaveCurrentViewFields(); const { updateCurrentView } = useUpdateCurrentView(); - const [isCompactModeActive, setIsCompactModeActive] = - useRecoilComponentStateV2( - isRecordBoardCompactModeActiveComponentState, - recordBoardId, - ); + const [isCompactModeActive, setIsCompactModeActive] = useRecoilComponentState( + isRecordBoardCompactModeActiveComponentState, + recordBoardId, + ); const { objectMetadataItem } = useObjectMetadataItem({ objectNameSingular, diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useObjectOptionsForTable.ts b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useObjectOptionsForTable.ts index a82b9d9f8c..c5d4845336 100644 --- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useObjectOptionsForTable.ts +++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useObjectOptionsForTable.ts @@ -4,18 +4,18 @@ import { useCallback } from 'react'; import { useTableColumns } from '@/object-record/record-table/hooks/useTableColumns'; import { hiddenTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/hiddenTableColumnsComponentSelector'; import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { moveArrayItem } from '~/utils/array/moveArrayItem'; export const useObjectOptionsForTable = ( recordTableId: string, objectMetadataId: string, ) => { - const hiddenTableColumns = useRecoilComponentValueV2( + const hiddenTableColumns = useRecoilComponentValue( hiddenTableColumnsComponentSelector, recordTableId, ); - const visibleTableColumns = useRecoilComponentValueV2( + const visibleTableColumns = useRecoilComponentValue( visibleTableColumnsComponentSelector, recordTableId, ); 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.ts index bd6ed6b77a..ffa590bf6f 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 @@ -1,6 +1,6 @@ import { objectOptionsDropdownSearchInputComponentState } from '@/object-record/object-options-dropdown/states/objectOptionsDropdownSearchInputComponentState'; import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { useMemo } from 'react'; import { FieldMetadataType } from '~/generated-metadata/graphql'; @@ -8,7 +8,7 @@ export const useSearchRecordGroupField = () => { const { objectMetadataItem } = useRecordIndexContextOrThrow(); const [recordGroupFieldSearchInput, setRecordGroupFieldSearchInput] = - useRecoilComponentStateV2(objectOptionsDropdownSearchInputComponentState); + useRecoilComponentState(objectOptionsDropdownSearchInputComponentState); const filteredRecordGroupFieldMetadataItems = useMemo(() => { const searchInputLowerCase = 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.ts index d731441279..35b110335f 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 @@ -1,5 +1,5 @@ import { recordIndexOpenRecordInState } from '@/object-record/record-index/states/recordIndexOpenRecordInState'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { useUpdateCurrentView } from '@/views/hooks/useUpdateCurrentView'; import { GraphQLView } from '@/views/types/GraphQLView'; import { ViewOpenRecordInType } from '@/views/types/ViewOpenRecordInType'; @@ -13,11 +13,11 @@ export const useUpdateObjectViewOptions = () => { recordIndexOpenRecordInState, ); - const setRecordIndexViewName = useSetRecoilComponentStateV2( + const setRecordIndexViewName = useSetRecoilComponentState( viewPickerInputNameComponentState, ); - const setRecordIndexViewIcon = useSetRecoilComponentStateV2( + const setRecordIndexViewIcon = useSetRecoilComponentState( viewPickerSelectedIconComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/states/objectOptionsDropdownSearchInputComponentState.ts b/packages/twenty-front/src/modules/object-record/object-options-dropdown/states/objectOptionsDropdownSearchInputComponentState.ts index 9852bad830..3741c4b7a4 100644 --- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/states/objectOptionsDropdownSearchInputComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/states/objectOptionsDropdownSearchInputComponentState.ts @@ -1,8 +1,8 @@ -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; export const objectOptionsDropdownSearchInputComponentState = - createComponentStateV2({ + createComponentState({ key: 'objectOptionsDropdownSearchInputComponentState', defaultValue: '', componentInstanceContext: ViewComponentInstanceContext, 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.tsx index 4f5573d21a..a796bbf082 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 @@ -30,9 +30,9 @@ import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDrop import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList'; import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem'; import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { Trans, useLingui } from '@lingui/react/macro'; import { useRecoilValue } from 'recoil'; import { IconX, useIcons } from 'twenty-ui/display'; @@ -43,7 +43,7 @@ export const ObjectSortDropdownButton = () => { const { resetRecordSortDropdownSearchInput } = useResetRecordSortDropdownSearchInput(); - const setObjectSortDropdownSearchInput = useSetRecoilComponentStateV2( + const setObjectSortDropdownSearchInput = useSetRecoilComponentState( objectSortDropdownSearchInputComponentState, ); @@ -51,7 +51,7 @@ export const ObjectSortDropdownButton = () => { const { recordIndexId, objectMetadataItem } = useRecordIndexContextOrThrow(); - const objectSortDropdownSearchInput = useRecoilComponentValueV2( + const objectSortDropdownSearchInput = useRecoilComponentValue( objectSortDropdownSearchInputComponentState, ); @@ -63,14 +63,14 @@ export const ObjectSortDropdownButton = () => { const { getIcon } = useIcons(); - const visibleTableColumns = useRecoilComponentValueV2( + const visibleTableColumns = useRecoilComponentValue( visibleTableColumnsComponentSelector, recordIndexId, ); const visibleColumnsFieldMetadataIds = visibleTableColumns.map( (column) => column.fieldMetadataId, ); - const hiddenTableColumns = useRecoilComponentValueV2( + const hiddenTableColumns = useRecoilComponentValue( hiddenTableColumnsComponentSelector, recordIndexId, ); @@ -132,9 +132,9 @@ export const ObjectSortDropdownButton = () => { }; const [selectedRecordSortDirection, setSelectedRecordSortDirection] = - useRecoilComponentStateV2(selectedRecordSortDirectionComponentState); + useRecoilComponentState(selectedRecordSortDirectionComponentState); - const setIsRecordSortDirectionMenuUnfolded = useSetRecoilComponentStateV2( + const setIsRecordSortDirectionMenuUnfolded = useSetRecoilComponentState( isRecordSortDirectionDropdownMenuUnfoldedComponentState, ); @@ -143,7 +143,7 @@ export const ObjectSortDropdownButton = () => { setIsRecordSortDirectionMenuUnfolded(false); }; - const isDropdownOpen = useRecoilComponentValueV2( + const isDropdownOpen = useRecoilComponentValue( isDropdownOpenComponentState, OBJECT_SORT_DROPDOWN_ID, ); @@ -155,12 +155,12 @@ export const ObjectSortDropdownButton = () => { ...hiddenFieldMetadataItems.map((item) => item.id), ]; - const selectedItemId = useRecoilComponentValueV2( + const selectedItemId = useRecoilComponentValue( selectedItemIdComponentState, OBJECT_SORT_DROPDOWN_ID, ); - const setSelectedItemId = useSetRecoilComponentStateV2( + const setSelectedItemId = useSetRecoilComponentState( selectedItemIdComponentState, OBJECT_SORT_DROPDOWN_ID, ); diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useResetRecordSortDropdownSearchInput.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useResetRecordSortDropdownSearchInput.ts index 4abb3d6bee..d5dafae001 100644 --- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useResetRecordSortDropdownSearchInput.ts +++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useResetRecordSortDropdownSearchInput.ts @@ -1,10 +1,10 @@ import { objectSortDropdownSearchInputComponentState } from '@/object-record/object-sort-dropdown/states/objectSortDropdownSearchInputComponentState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useRecoilCallback } from 'recoil'; export const useResetRecordSortDropdownSearchInput = () => { const objectSortDropdownSearchInputCallbackState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( objectSortDropdownSearchInputComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useResetSortDropdown.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useResetSortDropdown.ts index a46bb9876f..2e873783cd 100644 --- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useResetSortDropdown.ts +++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useResetSortDropdown.ts @@ -1,14 +1,14 @@ import { isRecordSortDirectionDropdownMenuUnfoldedComponentState } from '@/object-record/object-sort-dropdown/states/isRecordSortDirectionDropdownMenuUnfoldedComponentState'; import { selectedRecordSortDirectionComponentState } from '@/object-record/object-sort-dropdown/states/selectedRecordSortDirectionComponentState'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; export const useResetSortDropdown = () => { const setIsRecordSortDirectionDropdownMenuUnfolded = - useSetRecoilComponentStateV2( + useSetRecoilComponentState( isRecordSortDirectionDropdownMenuUnfoldedComponentState, ); - const setSelectedRecordSortDirection = useSetRecoilComponentStateV2( + const setSelectedRecordSortDirection = useSetRecoilComponentState( selectedRecordSortDirectionComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isRecordSortDirectionDropdownMenuUnfoldedComponentState.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isRecordSortDirectionDropdownMenuUnfoldedComponentState.ts index 51c2d3ee33..84ea0cd096 100644 --- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isRecordSortDirectionDropdownMenuUnfoldedComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isRecordSortDirectionDropdownMenuUnfoldedComponentState.ts @@ -1,8 +1,8 @@ import { ObjectSortDropdownComponentInstanceContext } from '@/object-record/object-sort-dropdown/states/context/ObjectSortDropdownComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const isRecordSortDirectionDropdownMenuUnfoldedComponentState = - createComponentStateV2({ + createComponentState({ key: 'isRecordSortDirectionDropdownMenuUnfoldedComponentState', defaultValue: false, componentInstanceContext: ObjectSortDropdownComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/objectSortDropdownSearchInputComponentState.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/objectSortDropdownSearchInputComponentState.ts index 5185dbf2d3..dd3894c371 100644 --- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/objectSortDropdownSearchInputComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/objectSortDropdownSearchInputComponentState.ts @@ -1,8 +1,8 @@ import { ObjectSortDropdownComponentInstanceContext } from '@/object-record/object-sort-dropdown/states/context/ObjectSortDropdownComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const objectSortDropdownSearchInputComponentState = - createComponentStateV2({ + createComponentState({ key: 'objectSortDropdownSearchInputComponentState', defaultValue: '', componentInstanceContext: ObjectSortDropdownComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/selectedRecordSortDirectionComponentState.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/selectedRecordSortDirectionComponentState.ts index 6796150a58..787d09418f 100644 --- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/selectedRecordSortDirectionComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/selectedRecordSortDirectionComponentState.ts @@ -1,9 +1,9 @@ import { ObjectSortDropdownComponentInstanceContext } from '@/object-record/object-sort-dropdown/states/context/ObjectSortDropdownComponentInstanceContext'; import { RecordSortDirection } from '@/object-record/record-sort/types/RecordSortDirection'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const selectedRecordSortDirectionComponentState = - createComponentStateV2({ + createComponentState({ key: 'selectedRecordSortDirectionComponentState', defaultValue: 'asc', componentInstanceContext: ObjectSortDropdownComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoard.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoard.tsx index ac73d9fdbb..f531d592d7 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoard.tsx +++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoard.tsx @@ -38,9 +38,9 @@ import { RECORD_INDEX_DRAG_SELECT_BOUNDARY_CLASS } from '@/ui/utilities/drag-sel import { useClickOutsideListener } from '@/ui/utilities/pointer-event/hooks/useClickOutsideListener'; import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside'; import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { ViewType } from '@/views/types/ViewType'; import { LINK_CHIP_CLICK_OUTSIDE_ID } from 'twenty-ui/components'; @@ -96,7 +96,7 @@ export const RecordBoard = () => { toggleClickOutside(true); }; - const visibleRecordGroupIds = useRecoilComponentFamilyValueV2( + const visibleRecordGroupIds = useRecoilComponentFamilyValue( visibleRecordGroupIdsComponentFamilySelector, ViewType.Kanban, ); @@ -104,15 +104,14 @@ export const RecordBoard = () => { const { resetRecordSelection, setRecordAsSelected } = useRecordBoardSelection(recordBoardId); - const currentRecordSorts = useRecoilComponentValueV2( + const currentRecordSorts = useRecoilComponentValue( currentRecordSortsComponentState, ); - const recordBoardSelectedRecordIdsSelector = - useRecoilComponentCallbackStateV2( - recordBoardSelectedRecordIdsComponentSelector, - recordBoardId, - ); + const recordBoardSelectedRecordIdsSelector = useRecoilComponentCallbackState( + recordBoardSelectedRecordIdsComponentSelector, + recordBoardId, + ); const startDrag = useStartBoardCardDrag(recordBoardId); const endDrag = useEndBoardCardDrag(recordBoardId); diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardBodyEscapeHotkeyEffect.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardBodyEscapeHotkeyEffect.tsx index 5fee55e102..ff2adc4caa 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardBodyEscapeHotkeyEffect.tsx +++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardBodyEscapeHotkeyEffect.tsx @@ -8,7 +8,7 @@ import { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/r import { useResetFocusStackToRecordIndex } from '@/object-record/record-index/hooks/useResetFocusStackToRecordIndex'; import { PageFocusId } from '@/types/PageFocusId'; import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const RecordBoardBodyEscapeHotkeyEffect = () => { const { recordBoardId } = useContext(RecordBoardContext); @@ -17,7 +17,7 @@ export const RecordBoardBodyEscapeHotkeyEffect = () => { const { unfocusBoardCard } = useFocusedRecordBoardCard(recordBoardId); const { resetFocusStackToRecordIndex } = useResetFocusStackToRecordIndex(); - const selectedRecordIds = useRecoilComponentValueV2( + const selectedRecordIds = useRecoilComponentValue( recordBoardSelectedRecordIdsComponentSelector, recordBoardId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardHeader.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardHeader.tsx index 187606a64f..2da8f4cf18 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardHeader.tsx +++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardHeader.tsx @@ -1,6 +1,6 @@ import { RecordBoardColumnHeaderWrapper } from '@/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderWrapper'; import { visibleRecordGroupIdsComponentFamilySelector } from '@/object-record/record-group/states/selectors/visibleRecordGroupIdsComponentFamilySelector'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; import { ViewType } from '@/views/types/ViewType'; import styled from '@emotion/styled'; @@ -24,7 +24,7 @@ const StyledHeaderContainer = styled.div` `; export const RecordBoardHeader = () => { - const visibleRecordGroupIds = useRecoilComponentFamilyValueV2( + const visibleRecordGroupIds = useRecoilComponentFamilyValue( visibleRecordGroupIdsComponentFamilySelector, ViewType.Kanban, ); 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.tsx index 2eee76facc..d0e0e6b3f4 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 @@ -2,14 +2,14 @@ import { useEffect } from 'react'; import { focusedRecordBoardCardIndexesComponentState } from '@/object-record/record-board/states/focusedRecordBoardCardIndexesComponentState'; import { isRecordBoardCardFocusActiveComponentState } from '@/object-record/record-board/states/isRecordBoardCardFocusActiveComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const RecordBoardScrollToFocusedCardEffect = () => { - const focusedCardIndexes = useRecoilComponentValueV2( + const focusedCardIndexes = useRecoilComponentValue( focusedRecordBoardCardIndexesComponentState, ); - const isFocusActive = useRecoilComponentValueV2( + const isFocusActive = useRecoilComponentValue( isRecordBoardCardFocusActiveComponentState, ); 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.tsx index 2f5f23fbcf..bdf26ff557 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 @@ -1,9 +1,9 @@ import { scrollWrapperScrollTopComponentState } from '@/ui/utilities/scroll/states/scrollWrapperScrollTopComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useEffect } from 'react'; export const RecordBoardStickyHeaderEffect = () => { - const scrollTop = useRecoilComponentValueV2( + const scrollTop = useRecoilComponentValue( scrollWrapperScrollTopComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useActiveRecordBoardCard.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useActiveRecordBoardCard.ts index 03ce8f6235..454d234ca8 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useActiveRecordBoardCard.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useActiveRecordBoardCard.ts @@ -1,17 +1,17 @@ import { activeRecordBoardCardIndexesComponentState } from '@/object-record/record-board/states/activeRecordBoardCardIndexesComponentState'; import { isRecordBoardCardActiveComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardActiveComponentFamilyState'; import { BoardCardIndexes } from '@/object-record/record-board/types/BoardCardIndexes'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useRecoilCallback } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; export const useActiveRecordBoardCard = (recordBoardId?: string) => { - const isCardActiveState = useRecoilComponentCallbackStateV2( + const isCardActiveState = useRecoilComponentCallbackState( isRecordBoardCardActiveComponentFamilyState, recordBoardId, ); - const activeBoardCardIndexesState = useRecoilComponentCallbackStateV2( + const activeBoardCardIndexesState = useRecoilComponentCallbackState( activeRecordBoardCardIndexesComponentState, recordBoardId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useBoardCardDragState.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useBoardCardDragState.ts index 36a761ce63..3f9b0f4f59 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useBoardCardDragState.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useBoardCardDragState.ts @@ -2,25 +2,25 @@ import { draggedRecordIdsComponentState } from '@/object-record/record-board/sta import { isMultiDragActiveComponentState } from '@/object-record/record-board/states/isMultiDragActiveComponentState'; import { originalSelectionComponentState } from '@/object-record/record-board/states/originalSelectionComponentState'; import { primaryDraggedRecordIdComponentState } from '@/object-record/record-board/states/primaryDraggedRecordIdComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const useBoardCardDragState = (recordBoardId?: string) => { - const isDragging = useRecoilComponentValueV2( + const isDragging = useRecoilComponentValue( isMultiDragActiveComponentState, recordBoardId, ); - const draggedRecordIds = useRecoilComponentValueV2( + const draggedRecordIds = useRecoilComponentValue( draggedRecordIdsComponentState, recordBoardId, ); - const primaryDraggedRecordId = useRecoilComponentValueV2( + const primaryDraggedRecordId = useRecoilComponentValue( primaryDraggedRecordIdComponentState, recordBoardId, ); - const originalSelection = useRecoilComponentValueV2( + const originalSelection = useRecoilComponentValue( originalSelectionComponentState, recordBoardId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useEndBoardCardDrag.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useEndBoardCardDrag.ts index 7cd2b59c8b..ef121fcbcb 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useEndBoardCardDrag.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useEndBoardCardDrag.ts @@ -4,25 +4,25 @@ import { draggedRecordIdsComponentState } from '@/object-record/record-board/sta import { isMultiDragActiveComponentState } from '@/object-record/record-board/states/isMultiDragActiveComponentState'; import { originalSelectionComponentState } from '@/object-record/record-board/states/originalSelectionComponentState'; import { primaryDraggedRecordIdComponentState } from '@/object-record/record-board/states/primaryDraggedRecordIdComponentState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; export const useEndBoardCardDrag = (recordBoardId?: string) => { - const isMultiDragActiveState = useRecoilComponentCallbackStateV2( + const isMultiDragActiveState = useRecoilComponentCallbackState( isMultiDragActiveComponentState, recordBoardId, ); - const draggedRecordIdsState = useRecoilComponentCallbackStateV2( + const draggedRecordIdsState = useRecoilComponentCallbackState( draggedRecordIdsComponentState, recordBoardId, ); - const primaryDraggedRecordIdState = useRecoilComponentCallbackStateV2( + const primaryDraggedRecordIdState = useRecoilComponentCallbackState( primaryDraggedRecordIdComponentState, recordBoardId, ); - const originalSelectionState = useRecoilComponentCallbackStateV2( + const originalSelectionState = useRecoilComponentCallbackState( originalSelectionComponentState, recordBoardId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useFocusedRecordBoardCard.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useFocusedRecordBoardCard.ts index 961a7701ae..8dba83b677 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useFocusedRecordBoardCard.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useFocusedRecordBoardCard.ts @@ -6,22 +6,22 @@ import { BoardCardIndexes } from '@/object-record/record-board/types/BoardCardIn import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack'; import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById'; import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useRecoilCallback } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; export const useFocusedRecordBoardCard = (recordBoardId?: string) => { - const isCardFocusedState = useRecoilComponentCallbackStateV2( + const isCardFocusedState = useRecoilComponentCallbackState( isRecordBoardCardFocusedComponentFamilyState, recordBoardId, ); - const focusedBoardCardIndexesState = useRecoilComponentCallbackStateV2( + const focusedBoardCardIndexesState = useRecoilComponentCallbackState( focusedRecordBoardCardIndexesComponentState, recordBoardId, ); - const isCardFocusActiveState = useRecoilComponentCallbackStateV2( + const isCardFocusActiveState = useRecoilComponentCallbackState( isRecordBoardCardFocusActiveComponentState, recordBoardId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardCardHotkeys.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardCardHotkeys.ts index 6b27006d5d..c0422967d9 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardCardHotkeys.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardCardHotkeys.ts @@ -8,8 +8,8 @@ import { RecordBoardCardContext } from '@/object-record/record-board/record-boar import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState'; import { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector'; import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useContext } from 'react'; import { Key } from 'ts-key-enum'; @@ -25,12 +25,12 @@ export const useRecordBoardCardHotkeys = (focusId: string) => { useRecordBoardSelection(); const { unfocusBoardCard } = useFocusedRecordBoardCard(recordBoardId); - const isRecordBoardCardSelected = useRecoilComponentFamilyValueV2( + const isRecordBoardCardSelected = useRecoilComponentFamilyValue( isRecordBoardCardSelectedComponentFamilyState, recordId, ); - const selectedRecordIds = useRecoilComponentValueV2( + const selectedRecordIds = useRecoilComponentValue( recordBoardSelectedRecordIdsComponentSelector, recordBoardId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardCardNavigation.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardCardNavigation.ts index 41a8a9e8be..2ed606e207 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardCardNavigation.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardCardNavigation.ts @@ -4,8 +4,8 @@ import { useFocusedRecordBoardCard } from '@/object-record/record-board/hooks/us import { focusedRecordBoardCardIndexesComponentState } from '@/object-record/record-board/states/focusedRecordBoardCardIndexesComponentState'; import { visibleRecordGroupIdsComponentFamilySelector } from '@/object-record/record-group/states/selectors/visibleRecordGroupIdsComponentFamilySelector'; import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; import { ViewType } from '@/views/types/ViewType'; import { isDefined } from 'twenty-shared/utils'; @@ -14,17 +14,17 @@ type NavigationDirection = 'up' | 'down' | 'left' | 'right'; export const useRecordBoardCardNavigation = (recordBoardId?: string) => { const { focusBoardCard } = useFocusedRecordBoardCard(recordBoardId); - const focusedBoardCardIndexesState = useRecoilComponentCallbackStateV2( + const focusedBoardCardIndexesState = useRecoilComponentCallbackState( focusedRecordBoardCardIndexesComponentState, recordBoardId, ); - const visibleRecordGroupIds = useRecoilComponentFamilyValueV2( + const visibleRecordGroupIds = useRecoilComponentFamilyValue( visibleRecordGroupIdsComponentFamilySelector, ViewType.Kanban, ); - const recordIdsByGroupState = useRecoilComponentCallbackStateV2( + const recordIdsByGroupState = useRecoilComponentCallbackState( recordIndexRecordIdsByGroupComponentFamilyState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardDragOperations.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardDragOperations.ts index 8431513ba9..3f072502f0 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardDragOperations.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardDragOperations.ts @@ -2,7 +2,7 @@ import { RecordBoardContext } from '@/object-record/record-board/contexts/Record import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/states/recordGroupDefinitionFamilyState'; import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState'; import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { DropResult } from '@hello-pangea/dnd'; import { useContext } from 'react'; @@ -16,7 +16,7 @@ export const useRecordBoardDragOperations = () => { useContext(RecordBoardContext); const recordIndexRecordIdsByGroupFamilyState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( recordIndexRecordIdsByGroupComponentFamilyState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts index 351fed1e40..e807c68618 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts @@ -7,7 +7,7 @@ import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/r import { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector'; import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; export const useRecordBoardSelection = (recordBoardId?: string) => { @@ -16,17 +16,15 @@ export const useRecordBoardSelection = (recordBoardId?: string) => { recordBoardId, ); - const isRecordBoardCardSelectedFamilyState = - useRecoilComponentCallbackStateV2( - isRecordBoardCardSelectedComponentFamilyState, - recordBoardId, - ); + const isRecordBoardCardSelectedFamilyState = useRecoilComponentCallbackState( + isRecordBoardCardSelectedComponentFamilyState, + recordBoardId, + ); - const recordBoardSelectedRecordIdsSelector = - useRecoilComponentCallbackStateV2( - recordBoardSelectedRecordIdsComponentSelector, - recordBoardId, - ); + const recordBoardSelectedRecordIdsSelector = useRecoilComponentCallbackState( + recordBoardSelectedRecordIdsComponentSelector, + recordBoardId, + ); const { closeDropdown } = useCloseDropdown(); diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useSelectAllCards.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useSelectAllCards.ts index 03cebc8794..cc67a38554 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useSelectAllCards.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useSelectAllCards.ts @@ -4,20 +4,19 @@ import { useRecordBoardSelection } from '@/object-record/record-board/hooks/useR import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState'; import { allCardsSelectedStatusComponentSelector } from '@/object-record/record-board/states/selectors/allCardsSelectedStatusComponentSelector'; import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; export const useSelectAllCards = (recordBoardId?: string) => { - const allCardsSelectedStatusSelector = useRecoilComponentCallbackStateV2( + const allCardsSelectedStatusSelector = useRecoilComponentCallbackState( allCardsSelectedStatusComponentSelector, recordBoardId, ); - const isRecordBoardCardSelectedFamilyState = - useRecoilComponentCallbackStateV2( - isRecordBoardCardSelectedComponentFamilyState, - recordBoardId, - ); - const recordIndexAllRecordIdsSelector = useRecoilComponentCallbackStateV2( + const isRecordBoardCardSelectedFamilyState = useRecoilComponentCallbackState( + isRecordBoardCardSelectedComponentFamilyState, + recordBoardId, + ); + const recordIndexAllRecordIdsSelector = useRecoilComponentCallbackState( recordIndexAllRecordIdsComponentSelector, recordBoardId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useSetRecordBoardRecordIds.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useSetRecordBoardRecordIds.ts index c114a6893c..1ae5c572fb 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useSetRecordBoardRecordIds.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useSetRecordBoardRecordIds.ts @@ -6,24 +6,24 @@ import { visibleRecordGroupIdsComponentFamilySelector } from '@/object-record/re import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState'; import { ObjectRecord } from '@/object-record/types/ObjectRecord'; import { sortRecordsByPosition } from '@/object-record/utils/sortRecordsByPosition'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { ViewType } from '@/views/types/ViewType'; -import { isDeeplyEqual } from '~/utils/isDeeplyEqual'; import { isDefined } from 'twenty-shared/utils'; +import { isDeeplyEqual } from '~/utils/isDeeplyEqual'; export const useSetRecordBoardRecordIds = (recordBoardId?: string) => { - const visibleRecordGroupIdsFamilySelector = useRecoilComponentCallbackStateV2( + const visibleRecordGroupIdsFamilySelector = useRecoilComponentCallbackState( visibleRecordGroupIdsComponentFamilySelector, ); - const recordGroupFieldMetadataState = useRecoilComponentCallbackStateV2( + const recordGroupFieldMetadataState = useRecoilComponentCallbackState( recordGroupFieldMetadataComponentState, recordBoardId, ); const recordIndexRecordIdsByGroupFamilyState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( recordIndexRecordIdsByGroupComponentFamilyState, recordBoardId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useSetRecordIdsForColumn.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useSetRecordIdsForColumn.ts index cc6e364073..4258e4954a 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useSetRecordIdsForColumn.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useSetRecordIdsForColumn.ts @@ -4,19 +4,19 @@ import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/s import { recordGroupFieldMetadataComponentState } from '@/object-record/record-group/states/recordGroupFieldMetadataComponentState'; import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState'; import { ObjectRecord } from '@/object-record/types/ObjectRecord'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; -import { isDeeplyEqual } from '~/utils/isDeeplyEqual'; import { isDefined } from 'twenty-shared/utils'; +import { isDeeplyEqual } from '~/utils/isDeeplyEqual'; export const useSetRecordIdsForColumn = (recordBoardId?: string) => { - const recordGroupFieldMetadataState = useRecoilComponentCallbackStateV2( + const recordGroupFieldMetadataState = useRecoilComponentCallbackState( recordGroupFieldMetadataComponentState, recordBoardId, ); const recordIndexRecordIdsByGroupFamilyState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( recordIndexRecordIdsByGroupComponentFamilyState, recordBoardId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useStartBoardCardDrag.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useStartBoardCardDrag.ts index 21d73f5af1..6b779863a9 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useStartBoardCardDrag.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useStartBoardCardDrag.ts @@ -5,26 +5,26 @@ import { draggedRecordIdsComponentState } from '@/object-record/record-board/sta import { isMultiDragActiveComponentState } from '@/object-record/record-board/states/isMultiDragActiveComponentState'; import { originalSelectionComponentState } from '@/object-record/record-board/states/originalSelectionComponentState'; import { primaryDraggedRecordIdComponentState } from '@/object-record/record-board/states/primaryDraggedRecordIdComponentState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getDragOperationType } from '../utils/getDragOperationType'; export const useStartBoardCardDrag = (recordBoardId?: string) => { - const isMultiDragActiveState = useRecoilComponentCallbackStateV2( + const isMultiDragActiveState = useRecoilComponentCallbackState( isMultiDragActiveComponentState, recordBoardId, ); - const draggedRecordIdsState = useRecoilComponentCallbackStateV2( + const draggedRecordIdsState = useRecoilComponentCallbackState( draggedRecordIdsComponentState, recordBoardId, ); - const primaryDraggedRecordIdState = useRecoilComponentCallbackStateV2( + const primaryDraggedRecordIdState = useRecoilComponentCallbackState( primaryDraggedRecordIdComponentState, recordBoardId, ); - const originalSelectionState = useRecoilComponentCallbackStateV2( + const originalSelectionState = useRecoilComponentCallbackState( originalSelectionComponentState, recordBoardId, ); 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.tsx index 25e43041d6..31815e1186 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 @@ -19,10 +19,10 @@ import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/u import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown'; import { useScrollWrapperElement } from '@/ui/utilities/scroll/hooks/useScrollWrapperElement'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyStateV2'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentFamilyState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyState'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import styled from '@emotion/styled'; import { useContext, useState } from 'react'; import { InView, useInView } from 'react-intersection-observer'; @@ -134,23 +134,23 @@ export const RecordBoardCard = () => { multiDragState.originalSelection.includes(recordId) && recordId !== multiDragState.primaryDraggedRecordId; - const visibleFieldDefinitions = useRecoilComponentValueV2( + const visibleFieldDefinitions = useRecoilComponentValue( recordBoardVisibleFieldDefinitionsComponentSelector, ); - const isCompactModeActive = useRecoilComponentValueV2( + const isCompactModeActive = useRecoilComponentValue( isRecordBoardCompactModeActiveComponentState, ); const [isCardExpanded, setIsCardExpanded] = useState(false); const [isCurrentCardSelected, setIsCurrentCardSelected] = - useRecoilComponentFamilyStateV2( + useRecoilComponentFamilyState( isRecordBoardCardSelectedComponentFamilyState, recordId, ); - const isCurrentCardFocused = useRecoilComponentFamilyValueV2( + const isCurrentCardFocused = useRecoilComponentFamilyValue( isRecordBoardCardFocusedComponentFamilyState, { rowIndex, @@ -158,7 +158,7 @@ export const RecordBoardCard = () => { }, ); - const isCurrentCardActive = useRecoilComponentFamilyValueV2( + const isCurrentCardActive = useRecoilComponentFamilyValue( isRecordBoardCardActiveComponentFamilyState, { rowIndex, @@ -175,7 +175,7 @@ export const RecordBoardCard = () => { const actionMenuDropdownId = getActionMenuDropdownIdFromActionMenuId(actionMenuId); - const setActionMenuDropdownPosition = useSetRecoilComponentStateV2( + const setActionMenuDropdownPosition = useSetRecoilComponentState( recordIndexActionMenuDropdownPositionComponentState, actionMenuDropdownId, ); 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.tsx index 94427717ed..2df1e71c9b 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 @@ -10,7 +10,7 @@ import { RecordBoardCardContext } from '@/object-record/record-board/record-boar import { RecordBoardColumnContext } from '@/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext'; import { isRecordBoardCardFocusedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardFocusedComponentFamilyState'; import { useIsRecordReadOnly } from '@/object-record/record-field/hooks/read-only/useIsRecordReadOnly'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; const StyledDraggableContainer = styled.div` position: relative; @@ -35,7 +35,7 @@ export const RecordBoardCardDraggableContainer = ({ const { columnIndex } = useContext(RecordBoardColumnContext); - const isRecordBoardCardFocusActive = useRecoilComponentFamilyValueV2( + const isRecordBoardCardFocusActive = useRecoilComponentFamilyValue( isRecordBoardCardFocusedComponentFamilyState, { rowIndex, 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.tsx index f2e8708669..1f3cdc2463 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 @@ -12,16 +12,16 @@ import { useFocusedRecordBoardCard } from '@/object-record/record-board/hooks/us import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/useOpenRecordFromIndexView'; import { recordIndexOpenRecordInState } from '@/object-record/record-index/states/recordIndexOpenRecordInState'; import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState'; -import { useRecoilComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyStateV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentFamilyState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyState'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { ViewOpenRecordInType } from '@/views/types/ViewOpenRecordInType'; import styled from '@emotion/styled'; import { Dispatch, SetStateAction, useContext } from 'react'; import { useRecoilValue } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; +import { ChipVariant } from 'twenty-ui/components'; import { IconEye, IconEyeOff } from 'twenty-ui/display'; import { Checkbox, CheckboxVariant, LightIconButton } from 'twenty-ui/input'; -import { ChipVariant } from 'twenty-ui/components'; const StyledCompactIconContainer = styled.div` align-items: center; @@ -52,7 +52,7 @@ export const RecordBoardCardHeader = ({ const { activateBoardCard } = useActiveRecordBoardCard(recordBoardId); const { unfocusBoardCard } = useFocusedRecordBoardCard(recordBoardId); - const showCompactView = useRecoilComponentValueV2( + const showCompactView = useRecoilComponentValue( isRecordBoardCompactModeActiveComponentState, ); @@ -60,7 +60,7 @@ export const RecordBoardCardHeader = ({ useRecordBoardSelection(recordBoardId); const [isCurrentCardSelected, setIsCurrentCardSelected] = - useRecoilComponentFamilyStateV2( + useRecoilComponentFamilyState( isRecordBoardCardSelectedComponentFamilyState, recordId, ); 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.tsx index 01420907da..c6c1c988b9 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 @@ -5,7 +5,7 @@ import { RecordBoardColumnCardsContainer } from '@/object-record/record-board/re import { RecordBoardColumnContext } from '@/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext'; import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/states/recordGroupDefinitionFamilyState'; import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; import { useRecoilValue } from 'recoil'; const StyledColumn = styled.div` @@ -35,7 +35,7 @@ export const RecordBoardColumn = ({ recordGroupDefinitionFamilyState(recordBoardColumnId), ); - const recordIdsByGroup = useRecoilComponentFamilyValueV2( + const recordIdsByGroup = useRecoilComponentFamilyValue( recordIndexRecordIdsByGroupComponentFamilyState, recordBoardColumnId, ); 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.tsx index 964e16742d..e4165e20ac 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 @@ -12,7 +12,7 @@ import { getNumberOfCardsPerColumnForSkeletonLoading } from '@/object-record/rec import { isRecordBoardCompactModeActiveComponentState } from '@/object-record/record-board/states/isRecordBoardCompactModeActiveComponentState'; import { recordBoardVisibleFieldDefinitionsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardVisibleFieldDefinitionsComponentSelector'; import { isRecordIndexBoardColumnLoadingFamilyState } from '@/object-record/states/isRecordBoardColumnLoadingFamilyState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; const StyledColumnCardsContainer = styled.div` display: flex; @@ -52,13 +52,13 @@ export const RecordBoardColumnCardsContainer = ({ isRecordIndexBoardColumnLoadingFamilyState(columnId), ); - const visibleFieldDefinitions = useRecoilComponentValueV2( + const visibleFieldDefinitions = useRecoilComponentValue( recordBoardVisibleFieldDefinitionsComponentSelector, ); const numberOfFields = visibleFieldDefinitions.length; - const isCompactModeActive = useRecoilComponentValueV2( + const isCompactModeActive = useRecoilComponentValue( isRecordBoardCompactModeActiveComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnFetchMoreLoader.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnFetchMoreLoader.tsx index c6524bae50..3c89076ad1 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnFetchMoreLoader.tsx +++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnFetchMoreLoader.tsx @@ -6,7 +6,7 @@ import { useRecoilValue } from 'recoil'; import { RecordBoardColumnContext } from '@/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext'; import { isRecordBoardFetchingRecordsByColumnFamilyState } from '@/object-record/record-board/states/isRecordBoardFetchingRecordsByColumnFamilyState'; import { recordBoardShouldFetchMoreInColumnComponentFamilyState } from '@/object-record/record-board/states/recordBoardShouldFetchMoreInColumnComponentFamilyState'; -import { useSetRecoilComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentFamilyStateV2'; +import { useSetRecoilComponentFamilyState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentFamilyState'; import { GRAY_SCALE } from 'twenty-ui/theme'; const StyledText = styled.div` @@ -26,7 +26,7 @@ export const RecordBoardColumnFetchMoreLoader = () => { isRecordBoardFetchingRecordsByColumnFamilyState(columnDefinition.id), ); - const setShouldFetchMore = useSetRecoilComponentFamilyStateV2( + const setShouldFetchMore = useSetRecoilComponentFamilyState( recordBoardShouldFetchMoreInColumnComponentFamilyState, columnDefinition.id, ); diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownButton.tsx index 1330d5685a..21612254a7 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownButton.tsx +++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownButton.tsx @@ -1,6 +1,6 @@ import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton'; import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import styled from '@emotion/styled'; import { Tag } from 'twenty-ui/components'; import { AppTooltip, TooltipDelay } from 'twenty-ui/display'; @@ -22,7 +22,7 @@ export const RecordBoardColumnHeaderAggregateDropdownButton = ({ value?: string | number; tooltip?: string; }) => { - const isDropdownOpen = useRecoilComponentValueV2( + const isDropdownOpen = useRecoilComponentValue( isDropdownOpenComponentState, dropdownId, ); 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.tsx index 258058d642..ff85e52156 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 @@ -8,7 +8,7 @@ import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader'; import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent'; import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useUpdateViewAggregate } from '@/views/hooks/useUpdateViewAggregate'; import { useRecoilValue } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; @@ -35,11 +35,11 @@ export const RecordBoardColumnHeaderAggregateDropdownFieldsContent = () => { const { getIcon } = useIcons(); - const aggregateOperation = useRecoilComponentValueV2( + const aggregateOperation = useRecoilComponentValue( aggregateOperationComponentState, ); - const availableFieldsIdsForAggregateOperation = useRecoilComponentValueV2( + const availableFieldsIdsForAggregateOperation = useRecoilComponentValue( availableFieldIdsForAggregateOperationComponentState, ); 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.tsx index faa70c8850..117210c2ab 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 @@ -15,7 +15,7 @@ import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader'; import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent'; import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { useUpdateViewAggregate } from '@/views/hooks/useUpdateViewAggregate'; import isEmpty from 'lodash.isempty'; import { useRecoilValue } from 'recoil'; @@ -35,11 +35,11 @@ export const RecordBoardColumnHeaderAggregateDropdownOptionsContent = ({ }, ); - const setAggregateOperation = useSetRecoilComponentStateV2( + const setAggregateOperation = useSetRecoilComponentState( aggregateOperationComponentState, ); - const setAvailableFieldsForAggregateOperation = useSetRecoilComponentStateV2( + const setAvailableFieldsForAggregateOperation = useSetRecoilComponentState( availableFieldIdsForAggregateOperationComponentState, ); 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.tsx index e9952130db..0a9e2e262b 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 @@ -2,7 +2,7 @@ import { RecordBoardColumnHeader } from '@/object-record/record-board/record-boa import { RecordBoardColumnContext } from '@/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext'; import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/states/recordGroupDefinitionFamilyState'; import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; import { useRecoilValue } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; @@ -19,7 +19,7 @@ export const RecordBoardColumnHeaderWrapper = ({ recordGroupDefinitionFamilyState(columnId), ); - const recordIdsByGroup = useRecoilComponentFamilyValueV2( + const recordIdsByGroup = useRecoilComponentFamilyValue( recordIndexRecordIdsByGroupComponentFamilyState, columnId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/states/aggregateOperationComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/states/aggregateOperationComponentState.ts index 01dcbd5f4e..a3b8ab1e61 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/states/aggregateOperationComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/states/aggregateOperationComponentState.ts @@ -1,9 +1,9 @@ import { RecordBoardColumnHeaderAggregateDropdownComponentInstanceContext } from '@/object-record/record-board/contexts/RecordBoardColumnHeaderAggregateDropdownComponentInstanceContext'; import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const aggregateOperationComponentState = - createComponentStateV2({ + createComponentState({ key: 'aggregateOperationComponentFamilyState', defaultValue: null, componentInstanceContext: diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/states/availableFieldIdsForAggregateOperationComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/states/availableFieldIdsForAggregateOperationComponentState.ts index fae2666b63..ddcbd9553b 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/states/availableFieldIdsForAggregateOperationComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/states/availableFieldIdsForAggregateOperationComponentState.ts @@ -1,8 +1,8 @@ import { RecordBoardColumnHeaderAggregateDropdownComponentInstanceContext } from '@/object-record/record-board/contexts/RecordBoardColumnHeaderAggregateDropdownComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const availableFieldIdsForAggregateOperationComponentState = - createComponentStateV2({ + createComponentState({ key: 'availableFieldIdsForAggregateOperationComponentFamilyState', defaultValue: [], componentInstanceContext: diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/activeRecordBoardCardIndexesComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/activeRecordBoardCardIndexesComponentState.ts index be299045fe..4650776066 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/states/activeRecordBoardCardIndexesComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/states/activeRecordBoardCardIndexesComponentState.ts @@ -1,9 +1,9 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext'; import { BoardCardIndexes } from '@/object-record/record-board/types/BoardCardIndexes'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const activeRecordBoardCardIndexesComponentState = - createComponentStateV2({ + createComponentState({ key: 'activeRecordBoardCardIndexesComponentState', defaultValue: null, componentInstanceContext: RecordBoardComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/draggedRecordIdsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/draggedRecordIdsComponentState.ts index bf5d219d08..a14972d2bb 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/states/draggedRecordIdsComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/states/draggedRecordIdsComponentState.ts @@ -1,7 +1,7 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const draggedRecordIdsComponentState = createComponentStateV2({ +export const draggedRecordIdsComponentState = createComponentState({ key: 'draggedRecordIdsComponentState', defaultValue: [], componentInstanceContext: RecordBoardComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/focusedRecordBoardCardIndexesComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/focusedRecordBoardCardIndexesComponentState.ts index 3809d3aae3..796fe87ad4 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/states/focusedRecordBoardCardIndexesComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/states/focusedRecordBoardCardIndexesComponentState.ts @@ -1,9 +1,9 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext'; import { BoardCardIndexes } from '@/object-record/record-board/types/BoardCardIndexes'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const focusedRecordBoardCardIndexesComponentState = - createComponentStateV2({ + createComponentState({ key: 'focusedRecordBoardCardIndexesComponentState', defaultValue: null, componentInstanceContext: RecordBoardComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isMultiDragActiveComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isMultiDragActiveComponentState.ts index 23f384bd71..a3622333d7 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/states/isMultiDragActiveComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/states/isMultiDragActiveComponentState.ts @@ -1,7 +1,7 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const isMultiDragActiveComponentState = createComponentStateV2({ +export const isMultiDragActiveComponentState = createComponentState({ key: 'isMultiDragActiveComponentState', defaultValue: false, componentInstanceContext: RecordBoardComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardActiveComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardActiveComponentFamilyState.ts index 0cdc010362..eb99da3ba7 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardActiveComponentFamilyState.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardActiveComponentFamilyState.ts @@ -1,9 +1,9 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext'; import { BoardCardIndexes } from '@/object-record/record-board/types/BoardCardIndexes'; -import { createComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilyStateV2'; +import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState'; export const isRecordBoardCardActiveComponentFamilyState = - createComponentFamilyStateV2({ + createComponentFamilyState({ key: 'isRecordBoardCardActiveComponentFamilyState', defaultValue: false, componentInstanceContext: RecordBoardComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardFocusActiveComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardFocusActiveComponentState.ts index 9a943c6e9f..e430aa2d9f 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardFocusActiveComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardFocusActiveComponentState.ts @@ -1,8 +1,8 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const isRecordBoardCardFocusActiveComponentState = - createComponentStateV2({ + createComponentState({ key: 'isRecordBoardCardFocusActiveComponentState', defaultValue: false, componentInstanceContext: RecordBoardComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardFocusedComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardFocusedComponentFamilyState.ts index ab697d923d..0e09ad7eba 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardFocusedComponentFamilyState.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardFocusedComponentFamilyState.ts @@ -1,9 +1,9 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext'; import { BoardCardIndexes } from '@/object-record/record-board/types/BoardCardIndexes'; -import { createComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilyStateV2'; +import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState'; export const isRecordBoardCardFocusedComponentFamilyState = - createComponentFamilyStateV2({ + createComponentFamilyState({ key: 'isRecordBoardCardFocusedComponentFamilyState', defaultValue: false, componentInstanceContext: RecordBoardComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState.ts index 3b446676de..24a211c9e3 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState.ts @@ -1,8 +1,8 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext'; -import { createComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilyStateV2'; +import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState'; export const isRecordBoardCardSelectedComponentFamilyState = - createComponentFamilyStateV2({ + createComponentFamilyState({ key: 'isRecordBoardCardSelectedComponentFamilyState', defaultValue: false, componentInstanceContext: RecordBoardComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCompactModeActiveComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCompactModeActiveComponentState.ts index bde53d616e..5c388bb9a8 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCompactModeActiveComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCompactModeActiveComponentState.ts @@ -1,8 +1,8 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const isRecordBoardCompactModeActiveComponentState = - createComponentStateV2({ + createComponentState({ key: 'isRecordBoardCompactModeActiveComponentState', defaultValue: false, componentInstanceContext: RecordBoardComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/originalSelectionComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/originalSelectionComponentState.ts index eda6fae48a..21d3bf1356 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/states/originalSelectionComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/states/originalSelectionComponentState.ts @@ -1,10 +1,8 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const originalSelectionComponentState = createComponentStateV2( - { - key: 'originalSelectionComponentState', - defaultValue: [], - componentInstanceContext: RecordBoardComponentInstanceContext, - }, -); +export const originalSelectionComponentState = createComponentState({ + key: 'originalSelectionComponentState', + defaultValue: [], + componentInstanceContext: RecordBoardComponentInstanceContext, +}); diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/primaryDraggedRecordIdComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/primaryDraggedRecordIdComponentState.ts index 9a21e06ac5..170244aaed 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/states/primaryDraggedRecordIdComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/states/primaryDraggedRecordIdComponentState.ts @@ -1,7 +1,7 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const primaryDraggedRecordIdComponentState = createComponentStateV2< +export const primaryDraggedRecordIdComponentState = createComponentState< string | null >({ key: 'primaryDraggedRecordIdComponentState', diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardFieldDefinitionsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardFieldDefinitionsComponentState.ts index 36696c0004..e67749e9bd 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardFieldDefinitionsComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardFieldDefinitionsComponentState.ts @@ -1,9 +1,9 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext'; import { RecordBoardFieldDefinition } from '@/object-record/record-board/types/RecordBoardFieldDefinition'; import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const recordBoardFieldDefinitionsComponentState = createComponentStateV2< +export const recordBoardFieldDefinitionsComponentState = createComponentState< RecordBoardFieldDefinition[] >({ key: 'recordBoardFieldDefinitionsComponentState', diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardShouldFetchMoreInColumnComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardShouldFetchMoreInColumnComponentFamilyState.ts index 2dec1d6b87..f79c886be3 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardShouldFetchMoreInColumnComponentFamilyState.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/states/recordBoardShouldFetchMoreInColumnComponentFamilyState.ts @@ -1,8 +1,8 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext'; -import { createComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilyStateV2'; +import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState'; export const recordBoardShouldFetchMoreInColumnComponentFamilyState = - createComponentFamilyStateV2({ + createComponentFamilyState({ key: 'recordBoardShouldFetchMoreInColumnComponentFamilyState', defaultValue: false, componentInstanceContext: RecordBoardComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/allCardsSelectedStatusComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/allCardsSelectedStatusComponentSelector.ts index b4957811db..5b930580d8 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/allCardsSelectedStatusComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/allCardsSelectedStatusComponentSelector.ts @@ -2,10 +2,10 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-boar import { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector'; import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector'; import { AllRowsSelectedStatus } from '@/object-record/record-table/types/AllRowSelectedStatus'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; export const allCardsSelectedStatusComponentSelector = - createComponentSelectorV2({ + createComponentSelector({ key: 'allCardsSelectedStatusComponentSelector', componentInstanceContext: RecordBoardComponentInstanceContext, get: diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector.ts index 1a4be45f4f..2779cf6fff 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector.ts @@ -1,10 +1,10 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext'; import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState'; import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; export const recordBoardSelectedRecordIdsComponentSelector = - createComponentSelectorV2({ + createComponentSelector({ key: 'recordBoardSelectedRecordIdsSelector', componentInstanceContext: RecordBoardComponentInstanceContext, get: diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardVisibleFieldDefinitionsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardVisibleFieldDefinitionsComponentSelector.ts index 62ae69407b..f4a4af4336 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardVisibleFieldDefinitionsComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardVisibleFieldDefinitionsComponentSelector.ts @@ -1,9 +1,9 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext'; import { recordBoardFieldDefinitionsComponentState } from '@/object-record/record-board/states/recordBoardFieldDefinitionsComponentState'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; export const recordBoardVisibleFieldDefinitionsComponentSelector = - createComponentSelectorV2({ + createComponentSelector({ key: 'recordBoardVisibleFieldDefinitionsComponentSelector', get: ({ instanceId }) => diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormSingleRecordPicker.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormSingleRecordPicker.tsx index 4de268b38a..eb68fb4802 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormSingleRecordPicker.tsx +++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormSingleRecordPicker.tsx @@ -12,7 +12,7 @@ import { InputLabel } from '@/ui/input/components/InputLabel'; import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth'; import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { isStandaloneVariableString } from '@/workflow/utils/isStandaloneVariableString'; import { css, useTheme } from '@emotion/react'; import styled from '@emotion/styled'; @@ -106,7 +106,7 @@ export const FormSingleRecordPicker = ({ const { closeDropdown } = useCloseDropdown(); - const setRecordPickerSearchFilter = useSetRecoilComponentStateV2( + const setRecordPickerSearchFilter = useSetRecoilComponentState( singleRecordPickerSearchFilterComponentState, dropdownId, ); @@ -141,7 +141,7 @@ export const FormSingleRecordPicker = ({ onChange(null); }; - const setRecordPickerSelectedId = useSetRecoilComponentStateV2( + const setRecordPickerSelectedId = useSetRecoilComponentState( singleRecordPickerSelectedIdComponentState, dropdownId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/hooks/useInitDraftValueV2.ts b/packages/twenty-front/src/modules/object-record/record-field/hooks/useInitDraftValue.ts similarity index 97% rename from packages/twenty-front/src/modules/object-record/record-field/hooks/useInitDraftValueV2.ts rename to packages/twenty-front/src/modules/object-record/record-field/hooks/useInitDraftValue.ts index 2bd9e15712..343b74e354 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/hooks/useInitDraftValueV2.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/hooks/useInitDraftValue.ts @@ -9,7 +9,7 @@ import { computeDraftValueFromFieldValue } from '@/object-record/record-field/ut import { computeDraftValueFromString } from '@/object-record/record-field/utils/computeDraftValueFromString'; import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector'; -export const useInitDraftValueV2 = () => { +export const useInitDraftValue = () => { return useRecoilCallback( ({ set, snapshot }) => ({ diff --git a/packages/twenty-front/src/modules/object-record/record-field/hooks/useRecordFieldInput.ts b/packages/twenty-front/src/modules/object-record/record-field/hooks/useRecordFieldInput.ts index b7ae62bae0..e30ab1dca2 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/hooks/useRecordFieldInput.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/hooks/useRecordFieldInput.ts @@ -1,9 +1,9 @@ import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/states/recordFieldInputDraftValueComponentState'; import { FieldInputDraftValue } from '@/object-record/record-field/types/FieldInputDraftValue'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; export const useRecordFieldInput = () => { - const setDraftValue = useSetRecoilComponentStateV2( + const setDraftValue = useSetRecoilComponentState( recordFieldInputDraftValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useAddressField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useAddressField.ts index db72a656a2..03f76974ba 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useAddressField.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useAddressField.ts @@ -7,7 +7,7 @@ import { recordStoreFamilySelector } from '@/object-record/record-store/states/s import { FieldMetadataType } from '~/generated-metadata/graphql'; import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/states/recordFieldInputDraftValueComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { FieldContext } from '../../contexts/FieldContext'; import { usePersistField } from '../../hooks/usePersistField'; import { FieldAddressValue } from '../../types/FieldMetadata'; @@ -44,7 +44,7 @@ export const useAddressField = () => { const { setDraftValue } = useRecordFieldInput(); - const draftValue = useRecoilComponentValueV2( + const draftValue = useRecoilComponentValue( recordFieldInputDraftValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useCurrencyField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useCurrencyField.ts index 9760bbc815..6b42d18eec 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useCurrencyField.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useCurrencyField.ts @@ -10,7 +10,7 @@ import { assertFieldMetadata } from '@/object-record/record-field/types/guards/a import { isFieldCurrency } from '@/object-record/record-field/types/guards/isFieldCurrency'; import { isFieldCurrencyValue } from '@/object-record/record-field/types/guards/isFieldCurrencyValue'; import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { FieldMetadataType } from '~/generated-metadata/graphql'; import { convertCurrencyAmountToCurrencyMicros } from '~/utils/convertCurrencyToCurrencyMicros'; @@ -58,7 +58,7 @@ export const useCurrencyField = () => { const { setDraftValue } = useRecordFieldInput(); - const draftValue = useRecoilComponentValueV2( + const draftValue = useRecoilComponentValue( recordFieldInputDraftValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useEmailsField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useEmailsField.ts index df720f7b09..8d3171d786 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useEmailsField.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useEmailsField.ts @@ -10,7 +10,7 @@ import { recordStoreFamilySelector } from '@/object-record/record-store/states/s import { FieldMetadataType } from '~/generated-metadata/graphql'; import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/states/recordFieldInputDraftValueComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { FieldContext } from '../../contexts/FieldContext'; import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata'; @@ -30,7 +30,7 @@ export const useEmailsField = () => { const { setDraftValue } = useRecordFieldInput(); - const draftValue = useRecoilComponentValueV2( + const draftValue = useRecoilComponentValue( recordFieldInputDraftValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useFullNameField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useFullNameField.ts index 753f076de7..3b821a2af0 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useFullNameField.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useFullNameField.ts @@ -10,7 +10,7 @@ import { assertFieldMetadata } from '@/object-record/record-field/types/guards/a import { isFieldFullName } from '@/object-record/record-field/types/guards/isFieldFullName'; import { isFieldFullNameValue } from '@/object-record/record-field/types/guards/isFieldFullNameValue'; import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { FieldMetadataType } from '~/generated-metadata/graphql'; export const useFullNameField = () => { @@ -43,7 +43,7 @@ export const useFullNameField = () => { const { setDraftValue } = useRecordFieldInput(); - const draftValue = useRecoilComponentValueV2( + const draftValue = useRecoilComponentValue( recordFieldInputDraftValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useJsonField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useJsonField.ts index d4431788fe..198bdeab67 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useJsonField.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useJsonField.ts @@ -9,7 +9,7 @@ import { FieldMetadataType } from '~/generated-metadata/graphql'; import { usePrecomputedJsonDraftValue } from '@/object-record/record-field/meta-types/hooks/usePrecomputedJsonDraftValue'; import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/states/recordFieldInputDraftValueComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { FieldContext } from '../../contexts/FieldContext'; import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata'; import { isFieldRawJson } from '../../types/guards/isFieldRawJson'; @@ -46,7 +46,7 @@ export const useJsonField = () => { const { setDraftValue } = useRecordFieldInput(); - const draftValue = useRecoilComponentValueV2( + const draftValue = useRecoilComponentValue( recordFieldInputDraftValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useLinksField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useLinksField.ts index aab8f9568b..1b812d6c60 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useLinksField.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useLinksField.ts @@ -10,7 +10,7 @@ import { recordStoreFamilySelector } from '@/object-record/record-store/states/s import { FieldMetadataType } from '~/generated-metadata/graphql'; import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/states/recordFieldInputDraftValueComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { FieldContext } from '../../contexts/FieldContext'; import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata'; @@ -30,7 +30,7 @@ export const useLinksField = () => { const { setDraftValue } = useRecordFieldInput(); - const draftValue = useRecoilComponentValueV2( + const draftValue = useRecoilComponentValue( recordFieldInputDraftValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useMultiSelectField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useMultiSelectField.ts index 9660594a43..8b806c6879 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useMultiSelectField.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useMultiSelectField.ts @@ -10,7 +10,7 @@ import { assertFieldMetadata } from '@/object-record/record-field/types/guards/a import { isFieldMultiSelect } from '@/object-record/record-field/types/guards/isFieldMultiSelect'; import { isFieldMultiSelectValue } from '@/object-record/record-field/types/guards/isFieldMultiSelectValue'; import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { FieldMetadataType } from '~/generated-metadata/graphql'; export const useMultiSelectField = () => { @@ -38,7 +38,7 @@ export const useMultiSelectField = () => { const { setDraftValue } = useRecordFieldInput(); - const draftValue = useRecoilComponentValueV2( + const draftValue = useRecoilComponentValue( recordFieldInputDraftValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useNumberField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useNumberField.ts index 89be7aa15d..cbff2f87cb 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useNumberField.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useNumberField.ts @@ -12,7 +12,7 @@ import { } from '~/utils/cast-as-number-or-null'; import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/states/recordFieldInputDraftValueComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isNull } from '@sniptt/guards'; import { FieldContext } from '../../contexts/FieldContext'; import { usePersistField } from '../../hooks/usePersistField'; @@ -58,7 +58,7 @@ export const useNumberField = () => { const { setDraftValue } = useRecordFieldInput(); - const draftValue = useRecoilComponentValueV2( + const draftValue = useRecoilComponentValue( recordFieldInputDraftValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/usePhonesField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/usePhonesField.ts index 09db8f61fc..89766e4ecd 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/usePhonesField.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/usePhonesField.ts @@ -10,7 +10,7 @@ import { recordStoreFamilySelector } from '@/object-record/record-store/states/s import { FieldMetadataType } from '~/generated-metadata/graphql'; import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/states/recordFieldInputDraftValueComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { FieldContext } from '../../contexts/FieldContext'; import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata'; @@ -30,7 +30,7 @@ export const usePhonesField = () => { const { setDraftValue } = useRecordFieldInput(); - const draftValue = useRecoilComponentValueV2( + const draftValue = useRecoilComponentValue( recordFieldInputDraftValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationField.ts index a244fc02fa..6f004a46f2 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationField.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationField.ts @@ -11,7 +11,7 @@ import { recordFieldInputDraftValueComponentState } from '@/object-record/record import { assertFieldMetadata } from '@/object-record/record-field/types/guards/assertFieldMetadata'; import { isFieldRelation } from '@/object-record/record-field/types/guards/isFieldRelation'; import { ObjectRecord } from '@/object-record/types/ObjectRecord'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const useRelationField = () => { const { recordId, fieldDefinition, maxWidth } = useContext(FieldContext); @@ -29,7 +29,7 @@ export const useRelationField = () => { recordStoreFamilySelector({ recordId, fieldName }), ); - const draftValue = useRecoilComponentValueV2( + const draftValue = useRecoilComponentValue( recordFieldInputDraftValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRichTextField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRichTextField.ts index 17d5eaf4c9..e1ddcfa788 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRichTextField.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRichTextField.ts @@ -10,7 +10,7 @@ import { usePersistField } from '@/object-record/record-field/hooks/usePersistFi import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/states/recordFieldInputDraftValueComponentState'; import { isFieldRichText } from '@/object-record/record-field/types/guards/isFieldRichText'; import { isFieldRichTextValue } from '@/object-record/record-field/types/guards/isFieldRichTextValue'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import type { PartialBlock } from '@blocknote/core'; import { isNonEmptyString } from '@sniptt/guards'; import { FieldContext } from '../../contexts/FieldContext'; @@ -37,7 +37,7 @@ export const useRichTextField = () => { const { setDraftValue } = useRecordFieldInput(); - const draftValue = useRecoilComponentValueV2( + const draftValue = useRecoilComponentValue( recordFieldInputDraftValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRichTextV2Field.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRichTextV2Field.ts index e420f2cdae..bf5beae22e 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRichTextV2Field.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRichTextV2Field.ts @@ -13,7 +13,7 @@ import { usePersistField } from '@/object-record/record-field/hooks/usePersistFi import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/states/recordFieldInputDraftValueComponentState'; import { isFieldRichTextV2 } from '@/object-record/record-field/types/guards/isFieldRichTextV2'; import { isFieldRichTextV2Value } from '@/object-record/record-field/types/guards/isFieldRichTextValueV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import type { PartialBlock } from '@blocknote/core'; import { isNonEmptyString } from '@sniptt/guards'; import { FieldContext } from '../../contexts/FieldContext'; @@ -42,7 +42,7 @@ export const useRichTextV2Field = () => { const { setDraftValue } = useRecordFieldInput(); - const draftValue = useRecoilComponentValueV2( + const draftValue = useRecoilComponentValue( recordFieldInputDraftValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useSelectField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useSelectField.ts index 36a3a58b06..2d7ffa6f3f 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useSelectField.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useSelectField.ts @@ -7,7 +7,7 @@ import { recordStoreFamilySelector } from '@/object-record/record-store/states/s import { FieldMetadataType } from '~/generated-metadata/graphql'; import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/states/recordFieldInputDraftValueComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { FieldContext } from '../../contexts/FieldContext'; import { FieldSelectValue } from '../../types/FieldMetadata'; import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata'; @@ -33,7 +33,7 @@ export const useSelectField = () => { const { setDraftValue } = useRecordFieldInput(); - const draftValue = useRecoilComponentValueV2( + const draftValue = useRecoilComponentValue( recordFieldInputDraftValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useTextField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useTextField.ts index e197f16efe..3aa76872a8 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useTextField.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useTextField.ts @@ -9,7 +9,7 @@ import { assertFieldMetadata } from '@/object-record/record-field/types/guards/a import { isFieldText } from '@/object-record/record-field/types/guards/isFieldText'; import { isFieldTextValue } from '@/object-record/record-field/types/guards/isFieldTextValue'; import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { FieldMetadataType } from '~/generated-metadata/graphql'; export const useTextField = () => { @@ -29,7 +29,7 @@ export const useTextField = () => { const { setDraftValue } = useRecordFieldInput(); - const draftValue = useRecoilComponentValueV2( + const draftValue = useRecoilComponentValue( recordFieldInputDraftValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/EmailsFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/EmailsFieldInput.tsx index 96ec9bea8f..396673740c 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/EmailsFieldInput.tsx +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/EmailsFieldInput.tsx @@ -2,7 +2,7 @@ import { useEmailsField } from '@/object-record/record-field/meta-types/hooks/us import { EmailsFieldMenuItem } from '@/object-record/record-field/meta-types/input/components/EmailsFieldMenuItem'; import { recordFieldInputIsFieldInErrorComponentState } from '@/object-record/record-field/states/recordFieldInputIsFieldInErrorComponentState'; import { emailSchema } from '@/object-record/record-field/validation-schemas/emailSchema'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { useLingui } from '@lingui/react/macro'; import { useCallback, useMemo } from 'react'; import { isDefined } from 'twenty-shared/utils'; @@ -52,7 +52,7 @@ export const EmailsFieldInput = ({ index === 0 && emails.length > 1; const getShowSetAsPrimaryButton = (index: number) => index > 0; - const setIsFieldInError = useSetRecoilComponentStateV2( + const setIsFieldInError = useSetRecoilComponentState( recordFieldInputIsFieldInErrorComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/LinksFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/LinksFieldInput.tsx index c718bf7e7e..caca0aca63 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/LinksFieldInput.tsx +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/LinksFieldInput.tsx @@ -2,7 +2,7 @@ import { useLinksField } from '@/object-record/record-field/meta-types/hooks/use import { LinksFieldMenuItem } from '@/object-record/record-field/meta-types/input/components/LinksFieldMenuItem'; import { getFieldLinkDefinedLinks } from '@/object-record/record-field/meta-types/input/utils/getFieldLinkDefinedLinks'; import { recordFieldInputIsFieldInErrorComponentState } from '@/object-record/record-field/states/recordFieldInputIsFieldInErrorComponentState'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { useMemo } from 'react'; import { absoluteUrlSchema } from 'twenty-shared/utils'; import { FieldMetadataType } from '~/generated-metadata/graphql'; @@ -40,7 +40,7 @@ export const LinksFieldInput = ({ const getShowPrimaryIcon = (index: number) => index === 0 && links.length > 1; const getShowSetAsPrimaryButton = (index: number) => index > 0; - const setIsFieldInError = useSetRecoilComponentStateV2( + const setIsFieldInError = useSetRecoilComponentState( recordFieldInputIsFieldInErrorComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiItemFieldMenuItem.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiItemFieldMenuItem.tsx index 7e6ecf84c9..27e603f3e6 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiItemFieldMenuItem.tsx +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiItemFieldMenuItem.tsx @@ -3,7 +3,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown'; import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState'; import { MenuItemWithOptionDropdown } from '@/ui/navigation/menu-item/components/MenuItemWithOptionDropdown'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import React, { useState } from 'react'; import { IconBookmark, @@ -41,7 +41,7 @@ export const MultiItemFieldMenuItem = ({ }: MultiItemFieldMenuItemProps) => { const [isHovered, setIsHovered] = useState(false); const { closeDropdown } = useCloseDropdown(); - const isDropdownOpen = useRecoilComponentValueV2( + const isDropdownOpen = useRecoilComponentValue( isDropdownOpenComponentState, dropdownId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/PhonesFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/PhonesFieldInput.tsx index 457bb48cdd..793fd2a392 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/PhonesFieldInput.tsx +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/PhonesFieldInput.tsx @@ -2,7 +2,7 @@ import { usePhonesField } from '@/object-record/record-field/meta-types/hooks/us import { PhonesFieldMenuItem } from '@/object-record/record-field/meta-types/input/components/PhonesFieldMenuItem'; import { recordFieldInputIsFieldInErrorComponentState } from '@/object-record/record-field/states/recordFieldInputIsFieldInErrorComponentState'; import { phoneSchema } from '@/object-record/record-field/validation-schemas/phoneSchema'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import styled from '@emotion/styled'; import { E164Number, parsePhoneNumber } from 'libphonenumber-js'; import ReactPhoneNumberInput from 'react-phone-number-input'; @@ -113,7 +113,7 @@ export const PhonesFieldInput = ({ index === 0 && phones.length > 1; const getShowSetAsPrimaryButton = (index: number) => index > 0; - const setIsFieldInError = useSetRecoilComponentStateV2( + const setIsFieldInError = useSetRecoilComponentState( recordFieldInputIsFieldInErrorComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RelationFromManyFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RelationFromManyFieldInput.tsx index ba1becdd3d..d98bb03e50 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RelationFromManyFieldInput.tsx +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RelationFromManyFieldInput.tsx @@ -19,8 +19,8 @@ import { MultipleRecordPicker } from '@/object-record/record-picker/multiple-rec import { useMultipleRecordPickerPerformSearch } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch'; import { multipleRecordPickerPickableMorphItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useRecoilCallback } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; @@ -87,12 +87,12 @@ export const RelationFromManyFieldInput = ({ recordId, }); - const layoutDirection = useRecoilComponentValueV2( + const layoutDirection = useRecoilComponentValue( recordFieldInputLayoutDirectionComponentState, ); const multipleRecordPickerPickableMorphItemsCallbackState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( multipleRecordPickerPickableMorphItemsComponentState, instanceId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RelationToOneFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RelationToOneFieldInput.tsx index 54a3c67003..178898f82a 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RelationToOneFieldInput.tsx +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/RelationToOneFieldInput.tsx @@ -12,8 +12,8 @@ import { singleRecordPickerSelectedIdComponentState } from '@/object-record/reco import { SingleRecordPickerRecord } from '@/object-record/record-picker/single-record-picker/types/SingleRecordPickerRecord'; import { ObjectRecord } from '@/object-record/types/ObjectRecord'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { isDefined } from 'twenty-shared/utils'; import { IconForbid } from 'twenty-ui/display'; @@ -57,15 +57,15 @@ export const RelationToOneFieldInput = ({ recordId, }); - const layoutDirection = useRecoilComponentValueV2( + const layoutDirection = useRecoilComponentValue( recordFieldInputLayoutDirectionComponentState, ); - const isLoading = useRecoilComponentValueV2( + const isLoading = useRecoilComponentValue( recordFieldInputLayoutDirectionLoadingComponentState, ); - const setSingleRecordPickerSelectedId = useSetRecoilComponentStateV2( + const setSingleRecordPickerSelectedId = useSetRecoilComponentState( singleRecordPickerSelectedIdComponentState, instanceId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationToOneFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationToOneFieldInput.stories.tsx index e7c1219197..9963ed2b06 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationToOneFieldInput.stories.tsx +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationToOneFieldInput.stories.tsx @@ -19,7 +19,7 @@ import { RecordFieldComponentInstanceContext } from '@/object-record/record-fiel import { recordFieldInputLayoutDirectionLoadingComponentState } from '@/object-record/record-field/states/recordFieldInputLayoutDirectionLoadingComponentState'; import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack'; import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { FieldMetadataType } from 'twenty-shared/types'; import { getCanvasElementForDropdownTesting } from 'twenty-ui/testing'; import { @@ -32,11 +32,10 @@ const RelationWorkspaceSetterEffect = () => { const setCurrentWorkspaceMember = useSetRecoilState( currentWorkspaceMemberState, ); - const setRecordFieldInputLayoutDirectionLoading = - useSetRecoilComponentStateV2( - recordFieldInputLayoutDirectionLoadingComponentState, - 'relation-to-one-field-input-123-Relation', - ); + const setRecordFieldInputLayoutDirectionLoading = useSetRecoilComponentState( + recordFieldInputLayoutDirectionLoadingComponentState, + 'relation-to-one-field-input-123-Relation', + ); useEffect(() => { setCurrentWorkspace(mockCurrentWorkspace); diff --git a/packages/twenty-front/src/modules/object-record/record-field/states/contexts/RecordFieldComponentInstanceContext.ts b/packages/twenty-front/src/modules/object-record/record-field/states/contexts/RecordFieldComponentInstanceContext.ts index 555c50fc81..7b3d06bbd1 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/states/contexts/RecordFieldComponentInstanceContext.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/states/contexts/RecordFieldComponentInstanceContext.ts @@ -1,7 +1,7 @@ -import { ComponentStateKeyV2 } from '@/ui/utilities/state/component-state/types/ComponentStateKeyV2'; +import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey'; import { createComponentInstanceContext } from '@/ui/utilities/state/component-state/utils/createComponentInstanceContext'; -type RecordFieldComponentInstanceContextProps = ComponentStateKeyV2; +type RecordFieldComponentInstanceContextProps = ComponentStateKey; export const RecordFieldComponentInstanceContext = createComponentInstanceContext(); diff --git a/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputDraftValueComponentState.ts b/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputDraftValueComponentState.ts index 85047aeae1..280af603dd 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputDraftValueComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputDraftValueComponentState.ts @@ -1,8 +1,8 @@ import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/states/contexts/RecordFieldComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const recordFieldInputDraftValueComponentState = - createComponentStateV2({ + createComponentState({ key: 'recordFieldInputDraftValueComponentState', defaultValue: undefined, componentInstanceContext: RecordFieldComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputIsFieldInErrorComponentState.ts b/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputIsFieldInErrorComponentState.ts index cdcbade0cf..49776d5a04 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputIsFieldInErrorComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputIsFieldInErrorComponentState.ts @@ -1,8 +1,8 @@ import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/states/contexts/RecordFieldComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const recordFieldInputIsFieldInErrorComponentState = - createComponentStateV2({ + createComponentState({ key: 'recordFieldInputIsFieldInErrorComponentState', defaultValue: false, componentInstanceContext: RecordFieldComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputLayoutDirectionComponentState.ts b/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputLayoutDirectionComponentState.ts index a6fa001bc6..1e6fda1bf6 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputLayoutDirectionComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputLayoutDirectionComponentState.ts @@ -1,9 +1,9 @@ import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/states/contexts/RecordFieldComponentInstanceContext'; import { FieldInputLayoutDirection } from '@/object-record/record-field/types/FieldInputLayoutDirection'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const recordFieldInputLayoutDirectionComponentState = - createComponentStateV2({ + createComponentState({ key: 'recordFieldInputLayoutDirectionComponentState', defaultValue: 'upward', componentInstanceContext: RecordFieldComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputLayoutDirectionLoadingComponentState.ts b/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputLayoutDirectionLoadingComponentState.ts index a4299cae5a..253c5fe020 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputLayoutDirectionLoadingComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/states/recordFieldInputLayoutDirectionLoadingComponentState.ts @@ -1,8 +1,8 @@ import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/states/contexts/RecordFieldComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const recordFieldInputLayoutDirectionLoadingComponentState = - createComponentStateV2({ + createComponentState({ key: 'recordFieldInputLayoutDirectionLoadingComponentState', defaultValue: true, componentInstanceContext: RecordFieldComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/__tests__/useRemoveRecordFilterGroup.test.tsx b/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/__tests__/useRemoveRecordFilterGroup.test.tsx index 7a4b9fb174..31c571706f 100644 --- a/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/__tests__/useRemoveRecordFilterGroup.test.tsx +++ b/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/__tests__/useRemoveRecordFilterGroup.test.tsx @@ -3,7 +3,7 @@ import { renderHook } from '@testing-library/react'; import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState'; import { RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup'; import { RecordFilterGroupLogicalOperator } from '@/object-record/record-filter-group/types/RecordFilterGroupLogicalOperator'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { act } from 'react'; import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper'; import { useRemoveRecordFilterGroup } from '../useRemoveRecordFilterGroup'; @@ -17,7 +17,7 @@ describe('useRemoveRecordFilterGroup', () => { it('should remove an existing record filter group', () => { const { result } = renderHook( () => { - const currentRecordFilterGroups = useRecoilComponentValueV2( + const currentRecordFilterGroups = useRecoilComponentValue( currentRecordFilterGroupsComponentState, ); @@ -60,7 +60,7 @@ describe('useRemoveRecordFilterGroup', () => { it('should not modify record filter groups when trying to remove a non-existent record filter group', () => { const { result } = renderHook( () => { - const currentRecordFilterGroups = useRecoilComponentValueV2( + const currentRecordFilterGroups = useRecoilComponentValue( currentRecordFilterGroupsComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/__tests__/useUpsertRecordFilterGroup.test.tsx b/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/__tests__/useUpsertRecordFilterGroup.test.tsx index 36c138d3d9..2c8b2cd77a 100644 --- a/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/__tests__/useUpsertRecordFilterGroup.test.tsx +++ b/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/__tests__/useUpsertRecordFilterGroup.test.tsx @@ -5,7 +5,7 @@ import { useUpsertRecordFilterGroup } from '@/object-record/record-filter-group/ import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState'; import { RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup'; import { RecordFilterGroupLogicalOperator } from '@/object-record/record-filter-group/types/RecordFilterGroupLogicalOperator'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper'; const Wrapper = getJestMetadataAndApolloMocksWrapper({ @@ -16,7 +16,7 @@ describe('useUpsertRecordFilterGroup', () => { it('should add a new record filter group', () => { const { result } = renderHook( () => { - const currentRecordFilterGroups = useRecoilComponentValueV2( + const currentRecordFilterGroups = useRecoilComponentValue( currentRecordFilterGroupsComponentState, ); @@ -48,7 +48,7 @@ describe('useUpsertRecordFilterGroup', () => { it('should update an existing record filter group', () => { const { result } = renderHook( () => { - const currentRecordFilterGroups = useRecoilComponentValueV2( + const currentRecordFilterGroups = useRecoilComponentValue( currentRecordFilterGroupsComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/useRemoveRecordFilterGroup.ts b/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/useRemoveRecordFilterGroup.ts index 21fdba5f07..4376c0a403 100644 --- a/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/useRemoveRecordFilterGroup.ts +++ b/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/useRemoveRecordFilterGroup.ts @@ -1,13 +1,13 @@ import { AdvancedFilterContext } from '@/object-record/advanced-filter/states/context/AdvancedFilterContext'; import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { useContext } from 'react'; import { useRecoilCallback } from 'recoil'; export const useRemoveRecordFilterGroup = () => { const currentRecordFilterGroupsCallbackState = - useRecoilComponentCallbackStateV2(currentRecordFilterGroupsComponentState); + useRecoilComponentCallbackState(currentRecordFilterGroupsComponentState); const { onUpdate } = useContext(AdvancedFilterContext); diff --git a/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/useRemoveRootRecordFilterGroupIfEmpty.ts b/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/useRemoveRootRecordFilterGroupIfEmpty.ts index 18d85c4721..b39970208d 100644 --- a/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/useRemoveRootRecordFilterGroupIfEmpty.ts +++ b/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/useRemoveRootRecordFilterGroupIfEmpty.ts @@ -1,16 +1,16 @@ import { useRemoveRecordFilterGroup } from '@/object-record/record-filter-group/hooks/useRemoveRecordFilterGroup'; import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState'; import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { useRecoilCallback } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; export const useRemoveRootRecordFilterGroupIfEmpty = () => { const currentRecordFilterGroupsCallbackState = - useRecoilComponentCallbackStateV2(currentRecordFilterGroupsComponentState); + useRecoilComponentCallbackState(currentRecordFilterGroupsComponentState); - const currentRecordFiltersCallbackState = useRecoilComponentCallbackStateV2( + const currentRecordFiltersCallbackState = useRecoilComponentCallbackState( currentRecordFiltersComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/useUpsertRecordFilterGroup.ts b/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/useUpsertRecordFilterGroup.ts index a293a4f858..796b116808 100644 --- a/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/useUpsertRecordFilterGroup.ts +++ b/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/useUpsertRecordFilterGroup.ts @@ -1,14 +1,14 @@ import { AdvancedFilterContext } from '@/object-record/advanced-filter/states/context/AdvancedFilterContext'; import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState'; import { RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { useContext } from 'react'; import { useRecoilCallback } from 'recoil'; export const useUpsertRecordFilterGroup = () => { const currentRecordFilterGroupsCallbackState = - useRecoilComponentCallbackStateV2(currentRecordFilterGroupsComponentState); + useRecoilComponentCallbackState(currentRecordFilterGroupsComponentState); const { onUpdate } = useContext(AdvancedFilterContext); const upsertRecordFilterGroupCallback = useRecoilCallback( diff --git a/packages/twenty-front/src/modules/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState.ts index 2cf0560f25..7807c65855 100644 --- a/packages/twenty-front/src/modules/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState.ts @@ -1,8 +1,8 @@ import { RecordFilterGroupsComponentInstanceContext } from '@/object-record/record-filter-group/states/context/RecordFilterGroupsComponentInstanceContext'; import { RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const currentRecordFilterGroupsComponentState = createComponentStateV2< +export const currentRecordFilterGroupsComponentState = createComponentState< RecordFilterGroup[] >({ key: 'currentRecordFilterGroupsComponentState', diff --git a/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useRemoveRecordFilter.test.tsx b/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useRemoveRecordFilter.test.tsx index 6e575a6ba9..0500400ff1 100644 --- a/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useRemoveRecordFilter.test.tsx +++ b/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useRemoveRecordFilter.test.tsx @@ -2,7 +2,7 @@ import { renderHook } from '@testing-library/react'; import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState'; import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { act } from 'react'; import { ViewFilterOperand } from 'twenty-shared/src/types/ViewFilterOperand'; import { FieldMetadataType } from '~/generated-metadata/graphql'; @@ -18,7 +18,7 @@ describe('useRemoveRecordFilter', () => { it('should remove an existing record filter', () => { const { result } = renderHook( () => { - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); @@ -65,7 +65,7 @@ describe('useRemoveRecordFilter', () => { it('should not modify filters when trying to remove a non-existent filter', () => { const { result } = renderHook( () => { - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); const { upsertRecordFilter } = useUpsertRecordFilter(); diff --git a/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useUpsertRecordFilter.test.tsx b/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useUpsertRecordFilter.test.tsx index 7320f990c3..dca75cd91e 100644 --- a/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useUpsertRecordFilter.test.tsx +++ b/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useUpsertRecordFilter.test.tsx @@ -3,7 +3,7 @@ import { act } from 'react'; import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState'; import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { ViewFilterOperand } from 'twenty-shared/src/types/ViewFilterOperand'; import { FieldMetadataType } from '~/generated-metadata/graphql'; import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper'; @@ -17,7 +17,7 @@ describe('useUpsertRecordFilter', () => { it('should add a new filter when record filter id does not exist', () => { const { result } = renderHook( () => { - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); @@ -51,7 +51,7 @@ describe('useUpsertRecordFilter', () => { it('should update an existing filter when record filter id exists', () => { const { result } = renderHook( () => { - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-filter/hooks/useCheckIsSoftDeleteFilter.ts b/packages/twenty-front/src/modules/object-record/record-filter/hooks/useCheckIsSoftDeleteFilter.ts index 691b2d1771..69eda90605 100644 --- a/packages/twenty-front/src/modules/object-record/record-filter/hooks/useCheckIsSoftDeleteFilter.ts +++ b/packages/twenty-front/src/modules/object-record/record-filter/hooks/useCheckIsSoftDeleteFilter.ts @@ -3,13 +3,13 @@ import { SOFT_DELETE_FILTER_FIELD_NAME } from '@/object-record/record-filter/con import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter'; import { RecordFilterOperand } from '@/object-record/record-filter/types/RecordFilterOperand'; import { isSoftDeleteFilterActiveComponentState } from '@/object-record/record-table/states/isSoftDeleteFilterActiveComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; export const useCheckIsSoftDeleteFilter = () => { const { objectMetadataItems } = useObjectMetadataItems(); - const isSoftDeleteFilterActive = useRecoilComponentValueV2( + const isSoftDeleteFilterActive = useRecoilComponentValue( isSoftDeleteFilterActiveComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-filter/hooks/useCreateRecordFilterFromObjectFilterDropdownCurrentStates.ts b/packages/twenty-front/src/modules/object-record/record-filter/hooks/useCreateRecordFilterFromObjectFilterDropdownCurrentStates.ts index 8ab0a78a37..479f54e8e6 100644 --- a/packages/twenty-front/src/modules/object-record/record-filter/hooks/useCreateRecordFilterFromObjectFilterDropdownCurrentStates.ts +++ b/packages/twenty-front/src/modules/object-record/record-filter/hooks/useCreateRecordFilterFromObjectFilterDropdownCurrentStates.ts @@ -3,7 +3,7 @@ import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-recor import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState'; import { subFieldNameUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/subFieldNameUsedInDropdownComponentState'; import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useRecoilCallback } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; import { v4 } from 'uuid'; @@ -11,19 +11,15 @@ import { v4 } from 'uuid'; export const useCreateRecordFilterFromObjectFilterDropdownCurrentStates = () => { const fieldMetadataItemUsedInDropdownCallbackState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( fieldMetadataItemUsedInDropdownComponentSelector, ); const selectedOperandInDropdownCallbackState = - useRecoilComponentCallbackStateV2( - selectedOperandInDropdownComponentState, - ); + useRecoilComponentCallbackState(selectedOperandInDropdownComponentState); const subFieldNameUsedInDropdownCallbackState = - useRecoilComponentCallbackStateV2( - subFieldNameUsedInDropdownComponentState, - ); + useRecoilComponentCallbackState(subFieldNameUsedInDropdownComponentState); const createRecordFilterFromObjectFilterDropdownCurrentStates = useRecoilCallback( diff --git a/packages/twenty-front/src/modules/object-record/record-filter/hooks/useRemoveRecordFilter.ts b/packages/twenty-front/src/modules/object-record/record-filter/hooks/useRemoveRecordFilter.ts index afe364f4e2..a32ef07ed1 100644 --- a/packages/twenty-front/src/modules/object-record/record-filter/hooks/useRemoveRecordFilter.ts +++ b/packages/twenty-front/src/modules/object-record/record-filter/hooks/useRemoveRecordFilter.ts @@ -1,6 +1,6 @@ import { AdvancedFilterContext } from '@/object-record/advanced-filter/states/context/AdvancedFilterContext'; import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { VIEW_BAR_FILTER_DROPDOWN_ID } from '@/views/constants/ViewBarFilterDropdownId'; import { vectorSearchInputComponentState } from '@/views/states/vectorSearchInputComponentState'; @@ -10,7 +10,7 @@ import { useRecoilCallback } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; export const useRemoveRecordFilter = () => { - const currentRecordFiltersCallbackState = useRecoilComponentCallbackStateV2( + const currentRecordFiltersCallbackState = useRecoilComponentCallbackState( currentRecordFiltersComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-filter/hooks/useUpsertRecordFilter.ts b/packages/twenty-front/src/modules/object-record/record-filter/hooks/useUpsertRecordFilter.ts index eff175da0a..81565367de 100644 --- a/packages/twenty-front/src/modules/object-record/record-filter/hooks/useUpsertRecordFilter.ts +++ b/packages/twenty-front/src/modules/object-record/record-filter/hooks/useUpsertRecordFilter.ts @@ -1,13 +1,13 @@ import { AdvancedFilterContext } from '@/object-record/advanced-filter/states/context/AdvancedFilterContext'; import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState'; import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { useContext } from 'react'; import { useRecoilCallback } from 'recoil'; export const useUpsertRecordFilter = () => { - const currentRecordFiltersCallbackState = useRecoilComponentCallbackStateV2( + const currentRecordFiltersCallbackState = useRecoilComponentCallbackState( currentRecordFiltersComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-filter/states/anyFieldFilterValueComponentState.ts b/packages/twenty-front/src/modules/object-record/record-filter/states/anyFieldFilterValueComponentState.ts index 46d33dcbb6..8cce95e819 100644 --- a/packages/twenty-front/src/modules/object-record/record-filter/states/anyFieldFilterValueComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-filter/states/anyFieldFilterValueComponentState.ts @@ -1,10 +1,8 @@ import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const anyFieldFilterValueComponentState = createComponentStateV2( - { - key: 'anyFieldFilterValueComponentState', - defaultValue: '', - componentInstanceContext: RecordFiltersComponentInstanceContext, - }, -); +export const anyFieldFilterValueComponentState = createComponentState({ + key: 'anyFieldFilterValueComponentState', + defaultValue: '', + componentInstanceContext: RecordFiltersComponentInstanceContext, +}); diff --git a/packages/twenty-front/src/modules/object-record/record-filter/states/currentRecordFiltersComponentState.ts b/packages/twenty-front/src/modules/object-record/record-filter/states/currentRecordFiltersComponentState.ts index a2b6d80595..2d0a085c68 100644 --- a/packages/twenty-front/src/modules/object-record/record-filter/states/currentRecordFiltersComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-filter/states/currentRecordFiltersComponentState.ts @@ -1,8 +1,8 @@ import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; import { RecordFilter } from '../../record-filter/types/RecordFilter'; -export const currentRecordFiltersComponentState = createComponentStateV2< +export const currentRecordFiltersComponentState = createComponentState< RecordFilter[] >({ key: 'currentRecordFiltersComponentState', 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.tsx index e774a3403b..276afc8b52 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 @@ -1,7 +1,7 @@ import { RECORD_GROUP_REORDER_CONFIRMATION_MODAL_ID } from '@/object-record/record-group/constants/RecordGroupReorderConfirmationModalId'; import { recordIndexRecordGroupSortComponentState } from '@/object-record/record-index/states/recordIndexRecordGroupSortComponentState'; import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { createPortal } from 'react-dom'; type RecordGroupReorderConfirmationModalProps = { @@ -11,7 +11,7 @@ type RecordGroupReorderConfirmationModalProps = { export const RecordGroupReorderConfirmationModal = ({ onConfirmClick, }: RecordGroupReorderConfirmationModalProps) => { - const recordGroupSort = useRecoilComponentValueV2( + const recordGroupSort = useRecoilComponentValue( recordIndexRecordGroupSortComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupActions.ts b/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupActions.ts index ab3519b604..5ae8dc6e79 100644 --- a/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupActions.ts +++ b/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupActions.ts @@ -9,8 +9,8 @@ import { useRecordIndexContextOrThrow } from '@/object-record/record-index/conte import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag'; import { SettingsPath } from '@/types/SettingsPath'; import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { ViewType } from '@/views/types/ViewType'; import { t } from '@lingui/core/macro'; import { isUndefined } from '@sniptt/guards'; @@ -47,7 +47,7 @@ export const useRecordGroupActions = ({ objectNameSingular, }); - const recordGroupFieldMetadata = useRecoilComponentValueV2( + const recordGroupFieldMetadata = useRecoilComponentValue( recordGroupFieldMetadataComponentState, ); @@ -60,7 +60,7 @@ export const useRecordGroupActions = ({ navigationMemorizedUrlState, ); - const visibleRecordGroupIds = useRecoilComponentFamilyValueV2( + const visibleRecordGroupIds = useRecoilComponentFamilyValue( visibleRecordGroupIdsComponentFamilySelector, viewType, ); 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.ts index 47d5a5614f..5c646fc12c 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 @@ -7,8 +7,8 @@ import { useCloseAnyOpenDropdown } from '@/ui/layout/dropdown/hooks/useCloseAnyO import { useGoBackToPreviousDropdownFocusId } from '@/ui/layout/dropdown/hooks/useGoBackToPreviousDropdownFocusId'; import { useSetActiveDropdownFocusIdAndMemorizePrevious } from '@/ui/layout/dropdown/hooks/useSetFocusedDropdownIdAndMemorizePrevious'; import { useModal } from '@/ui/layout/modal/hooks/useModal'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { ViewType } from '@/views/types/ViewType'; import { OnDragEndResponder } from '@hello-pangea/dnd'; import { useState } from 'react'; @@ -47,11 +47,11 @@ export const useRecordGroupReorderConfirmationModal = ({ toIndex: result.destination.index - 1, }); }; - const isDragableSortRecordGroup = useRecoilComponentValueV2( + const isDragableSortRecordGroup = useRecoilComponentValue( recordIndexRecordGroupIsDraggableSortComponentSelector, ); - const setRecordGroupSort = useSetRecoilComponentStateV2( + const setRecordGroupSort = useSetRecoilComponentState( recordIndexRecordGroupSortComponentState, ); const { closeAnyOpenDropdown } = useCloseAnyOpenDropdown(); diff --git a/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupVisibility.ts b/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupVisibility.ts index ce05f09ba9..132d8c0f4e 100644 --- a/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupVisibility.ts +++ b/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupVisibility.ts @@ -1,7 +1,7 @@ import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/states/recordGroupDefinitionFamilyState'; import { RecordGroupDefinition } from '@/object-record/record-group/types/RecordGroupDefinition'; import { recordIndexRecordGroupHideComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordGroupHideComponentFamilyState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useSaveCurrentViewGroups } from '@/views/hooks/useSaveCurrentViewGroups'; import { ViewType } from '@/views/types/ViewType'; import { recordGroupDefinitionToViewGroup } from '@/views/utils/recordGroupDefinitionToViewGroup'; @@ -15,7 +15,7 @@ export const useRecordGroupVisibility = ({ viewType, }: UseRecordGroupVisibilityParams) => { const objectOptionsDropdownRecordGroupHideFamilyState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( recordIndexRecordGroupHideComponentFamilyState, ); 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.ts index 1d597432cd..eac00450cb 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 @@ -3,7 +3,7 @@ import { useSetRecordGroups } from '@/object-record/record-group/hooks/useSetRec import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/states/recordGroupDefinitionFamilyState'; import { visibleRecordGroupIdsComponentFamilySelector } from '@/object-record/record-group/states/selectors/visibleRecordGroupIdsComponentFamilySelector'; import { RecordGroupDefinition } from '@/object-record/record-group/types/RecordGroupDefinition'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { useSaveCurrentViewGroups } from '@/views/hooks/useSaveCurrentViewGroups'; import { ViewType } from '@/views/types/ViewType'; @@ -30,7 +30,7 @@ export const useReorderRecordGroups = ({ const { setRecordGroups } = useSetRecordGroups(); const { objectMetadataItem } = useContextStoreObjectMetadataItemOrThrow(); - const visibleRecordGroupIdsFamilySelector = useRecoilComponentCallbackStateV2( + const visibleRecordGroupIdsFamilySelector = useRecoilComponentCallbackState( visibleRecordGroupIdsComponentFamilySelector, ); diff --git a/packages/twenty-front/src/modules/object-record/record-group/states/recordGroupFieldMetadataComponentState.ts b/packages/twenty-front/src/modules/object-record/record-group/states/recordGroupFieldMetadataComponentState.ts index 144b47a043..a3749f0745 100644 --- a/packages/twenty-front/src/modules/object-record/record-group/states/recordGroupFieldMetadataComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-group/states/recordGroupFieldMetadataComponentState.ts @@ -1,8 +1,8 @@ import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; -export const recordGroupFieldMetadataComponentState = createComponentStateV2< +export const recordGroupFieldMetadataComponentState = createComponentState< FieldMetadataItem | undefined >({ key: 'recordGroupFieldMetadataComponentState', diff --git a/packages/twenty-front/src/modules/object-record/record-group/states/recordGroupIdsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-group/states/recordGroupIdsComponentState.ts index 6665fb6e44..7dbf75cbc2 100644 --- a/packages/twenty-front/src/modules/object-record/record-group/states/recordGroupIdsComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-group/states/recordGroupIdsComponentState.ts @@ -1,8 +1,8 @@ import { RecordGroupDefinition } from '@/object-record/record-group/types/RecordGroupDefinition'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; -export const recordGroupIdsComponentState = createComponentStateV2< +export const recordGroupIdsComponentState = createComponentState< RecordGroupDefinition['id'][] >({ key: 'recordGroupIdsComponentState', diff --git a/packages/twenty-front/src/modules/object-record/record-group/states/selectors/availableRecordGroupIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-group/states/selectors/availableRecordGroupIdsComponentSelector.ts index dd52ca97ba..e6b9c488c8 100644 --- a/packages/twenty-front/src/modules/object-record/record-group/states/selectors/availableRecordGroupIdsComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-group/states/selectors/availableRecordGroupIdsComponentSelector.ts @@ -5,46 +5,45 @@ import { RecordGroupDefinitionType, } from '@/object-record/record-group/types/RecordGroupDefinition'; import { recordGroupSortedInsert } from '@/object-record/record-group/utils/recordGroupSortedInsert'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; import { isDefined } from 'twenty-shared/utils'; -export const availableRecordGroupIdsComponentSelector = - createComponentSelectorV2({ - key: 'availableRecordGroupIdsComponentSelector', - componentInstanceContext: ViewComponentInstanceContext, - get: - ({ instanceId }) => - ({ get }) => { - const recordGroupIds = get( - recordGroupIdsComponentState.atomFamily({ - instanceId, - }), +export const availableRecordGroupIdsComponentSelector = createComponentSelector< + RecordGroupDefinition['id'][] +>({ + key: 'availableRecordGroupIdsComponentSelector', + componentInstanceContext: ViewComponentInstanceContext, + get: + ({ instanceId }) => + ({ get }) => { + const recordGroupIds = get( + recordGroupIdsComponentState.atomFamily({ + instanceId, + }), + ); + + const result: RecordGroupDefinition[] = []; + + for (const recordGroupId of recordGroupIds) { + const recordGroupDefinition = get( + recordGroupDefinitionFamilyState(recordGroupId), ); - const result: RecordGroupDefinition[] = []; - - for (const recordGroupId of recordGroupIds) { - const recordGroupDefinition = get( - recordGroupDefinitionFamilyState(recordGroupId), - ); - - if (!isDefined(recordGroupDefinition)) { - continue; - } - - if ( - recordGroupDefinition.type === RecordGroupDefinitionType.NoValue - ) { - continue; - } - - recordGroupSortedInsert(result, recordGroupDefinition, (a, b) => - a.title.localeCompare(b.title), - ); + if (!isDefined(recordGroupDefinition)) { + continue; } - return result.map(({ id }) => id); - }, - }); + if (recordGroupDefinition.type === RecordGroupDefinitionType.NoValue) { + continue; + } + + recordGroupSortedInsert(result, recordGroupDefinition, (a, b) => + a.title.localeCompare(b.title), + ); + } + + return result.map(({ id }) => id); + }, +}); diff --git a/packages/twenty-front/src/modules/object-record/record-group/states/selectors/hasRecordGroupsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-group/states/selectors/hasRecordGroupsComponentSelector.ts index 7603240105..f9497e37b1 100644 --- a/packages/twenty-front/src/modules/object-record/record-group/states/selectors/hasRecordGroupsComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-group/states/selectors/hasRecordGroupsComponentSelector.ts @@ -1,10 +1,10 @@ import { recordGroupIdsComponentState } from '@/object-record/record-group/states/recordGroupIdsComponentState'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; export const hasRecordGroupsComponentSelector = - createComponentSelectorV2({ + createComponentSelector({ key: 'hasRecordGroupsComponentSelector', componentInstanceContext: ViewComponentInstanceContext, get: diff --git a/packages/twenty-front/src/modules/object-record/record-group/states/selectors/hiddenRecordGroupIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-group/states/selectors/hiddenRecordGroupIdsComponentSelector.ts index 0d9abad202..ed50caef9f 100644 --- a/packages/twenty-front/src/modules/object-record/record-group/states/selectors/hiddenRecordGroupIdsComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-group/states/selectors/hiddenRecordGroupIdsComponentSelector.ts @@ -2,11 +2,11 @@ import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/s import { recordGroupIdsComponentState } from '@/object-record/record-group/states/recordGroupIdsComponentState'; import { RecordGroupDefinition } from '@/object-record/record-group/types/RecordGroupDefinition'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; import { isDefined } from 'twenty-shared/utils'; -export const hiddenRecordGroupIdsComponentSelector = createComponentSelectorV2< +export const hiddenRecordGroupIdsComponentSelector = createComponentSelector< RecordGroupDefinition['id'][] >({ key: 'hiddenRecordGroupIdsComponentSelector', diff --git a/packages/twenty-front/src/modules/object-record/record-group/states/selectors/recordGroupDefinitionsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-group/states/selectors/recordGroupDefinitionsComponentSelector.ts index 385cae8551..d03586be38 100644 --- a/packages/twenty-front/src/modules/object-record/record-group/states/selectors/recordGroupDefinitionsComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-group/states/selectors/recordGroupDefinitionsComponentSelector.ts @@ -2,36 +2,37 @@ import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/s import { recordGroupIdsComponentState } from '@/object-record/record-group/states/recordGroupIdsComponentState'; import { RecordGroupDefinition } from '@/object-record/record-group/types/RecordGroupDefinition'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; import { isDefined } from 'twenty-shared/utils'; -export const recordGroupDefinitionsComponentSelector = - createComponentSelectorV2({ - key: 'recordGroupDefinitionsComponentSelector', - componentInstanceContext: ViewComponentInstanceContext, - get: - ({ instanceId }) => - ({ get }) => { - const recordGroupIds = get( - recordGroupIdsComponentState.atomFamily({ - instanceId, - }), - ); +export const recordGroupDefinitionsComponentSelector = createComponentSelector< + RecordGroupDefinition[] +>({ + key: 'recordGroupDefinitionsComponentSelector', + componentInstanceContext: ViewComponentInstanceContext, + get: + ({ instanceId }) => + ({ get }) => { + const recordGroupIds = get( + recordGroupIdsComponentState.atomFamily({ + instanceId, + }), + ); - return recordGroupIds.reduce( - (acc, recordGroupId) => { - const recordGroupDefinition = get( - recordGroupDefinitionFamilyState(recordGroupId), - ); + return recordGroupIds.reduce( + (acc, recordGroupId) => { + const recordGroupDefinition = get( + recordGroupDefinitionFamilyState(recordGroupId), + ); - if (!isDefined(recordGroupDefinition)) { - return acc; - } + if (!isDefined(recordGroupDefinition)) { + return acc; + } - return [...acc, recordGroupDefinition]; - }, - [], - ); - }, - }); + return [...acc, recordGroupDefinition]; + }, + [], + ); + }, +}); diff --git a/packages/twenty-front/src/modules/object-record/record-group/states/selectors/visibleRecordGroupIdsComponentFamilySelector.ts b/packages/twenty-front/src/modules/object-record/record-group/states/selectors/visibleRecordGroupIdsComponentFamilySelector.ts index bebdf63111..553b831f03 100644 --- a/packages/twenty-front/src/modules/object-record/record-group/states/selectors/visibleRecordGroupIdsComponentFamilySelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-group/states/selectors/visibleRecordGroupIdsComponentFamilySelector.ts @@ -6,14 +6,14 @@ import { recordGroupSortedInsert } from '@/object-record/record-group/utils/reco import { recordIndexRecordGroupHideComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordGroupHideComponentFamilyState'; import { recordIndexRecordGroupSortComponentState } from '@/object-record/record-index/states/recordIndexRecordGroupSortComponentState'; import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState'; -import { createComponentFamilySelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilySelectorV2'; +import { createComponentFamilySelector } from '@/ui/utilities/state/component-state/utils/createComponentFamilySelector'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; import { ViewType } from '@/views/types/ViewType'; import { isDefined } from 'twenty-shared/utils'; export const visibleRecordGroupIdsComponentFamilySelector = - createComponentFamilySelectorV2({ + createComponentFamilySelector({ key: 'visibleRecordGroupIdsComponentFamilySelector', componentInstanceContext: ViewComponentInstanceContext, get: diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardColumnLoaderEffect.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardColumnLoaderEffect.tsx index 88a70a61c6..42de0239ed 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardColumnLoaderEffect.tsx +++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardColumnLoaderEffect.tsx @@ -6,7 +6,7 @@ import { isRecordBoardFetchingRecordsByColumnFamilyState } from '@/object-record import { recordBoardShouldFetchMoreInColumnComponentFamilyState } from '@/object-record/record-board/states/recordBoardShouldFetchMoreInColumnComponentFamilyState'; import { useLoadRecordIndexBoardColumn } from '@/object-record/record-index/hooks/useLoadRecordIndexBoardColumn'; import { isRecordIndexBoardColumnLoadingFamilyState } from '@/object-record/states/isRecordBoardColumnLoadingFamilyState'; -import { useRecoilComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyStateV2'; +import { useRecoilComponentFamilyState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyState'; export const RecordIndexBoardColumnLoaderEffect = ({ objectNameSingular, @@ -19,7 +19,7 @@ export const RecordIndexBoardColumnLoaderEffect = ({ kanbanFieldMetadataItem: FieldMetadataItem; columnId: string; }) => { - const [shouldFetchMore, setShouldFetchMore] = useRecoilComponentFamilyStateV2( + const [shouldFetchMore, setShouldFetchMore] = useRecoilComponentFamilyState( recordBoardShouldFetchMoreInColumnComponentFamilyState, columnId, recordBoardId, diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardContainer.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardContainer.tsx index ba33b1f9bb..8e8847da6d 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardContainer.tsx +++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardContainer.tsx @@ -13,7 +13,7 @@ import { RecordIndexRemoveSortingModal } from '@/object-record/record-index/comp import { RECORD_INDEX_REMOVE_SORTING_MODAL_ID } from '@/object-record/record-index/constants/RecordIndexRemoveSortingModalId'; import { recordIndexKanbanFieldMetadataIdState } from '@/object-record/record-index/states/recordIndexKanbanFieldMetadataIdState'; import { isModalOpenedComponentState } from '@/ui/layout/modal/states/isModalOpenedComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; type RecordIndexBoardContainerProps = { recordBoardId: string; viewBarId: string; @@ -47,7 +47,7 @@ export const RecordIndexBoardContainer = ({ shouldMatchRootQueryFilter: true, }); - const isRecordIndexRemoveSortingModalOpened = useRecoilComponentValueV2( + const isRecordIndexRemoveSortingModalOpened = useRecoilComponentValue( isModalOpenedComponentState, RECORD_INDEX_REMOVE_SORTING_MODAL_ID, ); diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardDataLoader.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardDataLoader.tsx index 099ab70bce..17fac21aed 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardDataLoader.tsx +++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardDataLoader.tsx @@ -4,7 +4,7 @@ import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadata import { recordGroupIdsComponentState } from '@/object-record/record-group/states/recordGroupIdsComponentState'; import { RecordIndexBoardColumnLoaderEffect } from '@/object-record/record-index/components/RecordIndexBoardColumnLoaderEffect'; import { recordIndexKanbanFieldMetadataIdState } from '@/object-record/record-index/states/recordIndexKanbanFieldMetadataIdState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; type RecordIndexBoardDataLoaderProps = { @@ -20,9 +20,7 @@ export const RecordIndexBoardDataLoader = ({ objectNameSingular, }); - const recordGroupIds = useRecoilComponentValueV2( - recordGroupIdsComponentState, - ); + const recordGroupIds = useRecoilComponentValue(recordGroupIdsComponentState); const recordIndexKanbanFieldMetadataId = useRecoilValue( recordIndexKanbanFieldMetadataIdState, diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardDataLoaderEffect.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardDataLoaderEffect.tsx index 81f64f3f6f..5645c761a1 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardDataLoaderEffect.tsx +++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexBoardDataLoaderEffect.tsx @@ -7,8 +7,8 @@ import { recordBoardFieldDefinitionsComponentState } from '@/object-record/recor import { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector'; import { recordIndexFieldDefinitionsState } from '@/object-record/record-index/states/recordIndexFieldDefinitionsState'; import { recordIndexIsCompactModeActiveState } from '@/object-record/record-index/states/recordIndexIsCompactModeActiveState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; type RecordIndexBoardDataLoaderEffectProps = { recordBoardId: string; @@ -25,17 +25,17 @@ export const RecordIndexBoardDataLoaderEffect = ({ recordIndexIsCompactModeActiveState, ); - const setRecordBoardFieldDefinitions = useSetRecoilComponentStateV2( + const setRecordBoardFieldDefinitions = useSetRecoilComponentState( recordBoardFieldDefinitionsComponentState, recordBoardId, ); - const selectedRecordIds = useRecoilComponentValueV2( + const selectedRecordIds = useRecoilComponentValue( recordBoardSelectedRecordIdsComponentSelector, recordBoardId, ); - const setIsCompactModeActive = useSetRecoilComponentStateV2( + const setIsCompactModeActive = useSetRecoilComponentState( isRecordBoardCompactModeActiveComponentState, recordBoardId, ); @@ -48,7 +48,7 @@ export const RecordIndexBoardDataLoaderEffect = ({ setRecordBoardFieldDefinitions(recordIndexFieldDefinitions); }, [recordIndexFieldDefinitions, setRecordBoardFieldDefinitions]); - const setContextStoreTargetedRecords = useSetRecoilComponentStateV2( + const setContextStoreTargetedRecords = useSetRecoilComponentState( contextStoreTargetedRecordsRuleComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerContextStoreNumberOfSelectedRecordsEffect.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerContextStoreNumberOfSelectedRecordsEffect.tsx index 8b470236dd..077d6c42f4 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerContextStoreNumberOfSelectedRecordsEffect.tsx +++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerContextStoreNumberOfSelectedRecordsEffect.tsx @@ -9,17 +9,17 @@ import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords'; import { useFilterValueDependencies } from '@/object-record/record-filter/hooks/useFilterValueDependencies'; import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext'; import { useFindManyRecordIndexTableParams } from '@/object-record/record-index/hooks/useFindManyRecordIndexTableParams'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { useEffect } from 'react'; export const RecordIndexContainerContextStoreNumberOfSelectedRecordsEffect = () => { - const setContextStoreNumberOfSelectedRecords = useSetRecoilComponentStateV2( + const setContextStoreNumberOfSelectedRecords = useSetRecoilComponentState( contextStoreNumberOfSelectedRecordsComponentState, ); - const contextStoreTargetedRecordsRule = useRecoilComponentValueV2( + const contextStoreTargetedRecordsRule = useRecoilComponentValue( contextStoreTargetedRecordsRuleComponentState, ); @@ -37,11 +37,11 @@ export const RecordIndexContainerContextStoreNumberOfSelectedRecordsEffect = objectMetadataItem?.nameSingular ?? '', ); - const contextStoreFilters = useRecoilComponentValueV2( + const contextStoreFilters = useRecoilComponentValue( contextStoreFiltersComponentState, ); - const contextStoreAnyFieldFilterValue = useRecoilComponentValueV2( + const contextStoreAnyFieldFilterValue = useRecoilComponentValue( contextStoreAnyFieldFilterValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx index fb80ef43b6..58f2208434 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx +++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerGater.tsx @@ -20,7 +20,7 @@ import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/u import { PageBody } from '@/ui/layout/page/components/PageBody'; import { RECORD_INDEX_DRAG_SELECT_BOUNDARY_CLASS } from '@/ui/utilities/drag-select/constants/RecordIndecDragSelectBoundaryClass'; import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; import styled from '@emotion/styled'; import { useRecoilCallback } from 'recoil'; @@ -33,7 +33,7 @@ const StyledIndexContainer = styled.div` `; export const RecordIndexContainerGater = () => { - const contextStoreCurrentViewId = useRecoilComponentValueV2( + const contextStoreCurrentViewId = useRecoilComponentValue( contextStoreCurrentViewIdComponentState, MAIN_CONTEXT_STORE_INSTANCE_ID, ); 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.tsx index a240a9ad68..f7caa718de 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 @@ -9,31 +9,31 @@ import { useRecordIndexContextOrThrow } from '@/object-record/record-index/conte import { hasUserSelectedAllRowsComponentState } from '@/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState'; import { selectedRowIdsComponentSelector } from '@/object-record/record-table/states/selectors/selectedRowIdsComponentSelector'; import { unselectedRowIdsComponentSelector } from '@/object-record/record-table/states/selectors/unselectedRowIdsComponentSelector'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; export const RecordIndexFiltersToContextStoreEffect = () => { const { recordIndexId } = useRecordIndexContextOrThrow(); - const recordIndexFilters = useRecoilComponentValueV2( + const recordIndexFilters = useRecoilComponentValue( currentRecordFiltersComponentState, recordIndexId, ); - const setContextStoreTargetedRecords = useSetRecoilComponentStateV2( + const setContextStoreTargetedRecords = useSetRecoilComponentState( contextStoreTargetedRecordsRuleComponentState, ); - const hasUserSelectedAllRows = useRecoilComponentValueV2( + const hasUserSelectedAllRows = useRecoilComponentValue( hasUserSelectedAllRowsComponentState, recordIndexId, ); - const selectedRowIds = useRecoilComponentValueV2( + const selectedRowIds = useRecoilComponentValue( selectedRowIdsComponentSelector, recordIndexId, ); - const unselectedRowIds = useRecoilComponentValueV2( + const unselectedRowIds = useRecoilComponentValue( unselectedRowIdsComponentSelector, recordIndexId, ); @@ -64,7 +64,7 @@ export const RecordIndexFiltersToContextStoreEffect = () => { unselectedRowIds, ]); - const setContextStoreFilters = useSetRecoilComponentStateV2( + const setContextStoreFilters = useSetRecoilComponentState( contextStoreFiltersComponentState, ); @@ -76,11 +76,11 @@ export const RecordIndexFiltersToContextStoreEffect = () => { }; }, [recordIndexFilters, setContextStoreFilters]); - const setContextStoreAnyFieldFilterValue = useSetRecoilComponentStateV2( + const setContextStoreAnyFieldFilterValue = useSetRecoilComponentState( contextStoreAnyFieldFilterValueComponentState, ); - const anyFieldFilterValue = useRecoilComponentValueV2( + const anyFieldFilterValue = useRecoilComponentValue( anyFieldFilterValueComponentState, recordIndexId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexLoadBaseOnContextStoreEffect.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexLoadBaseOnContextStoreEffect.tsx index 21a28d1562..8575c6b48c 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexLoadBaseOnContextStoreEffect.tsx +++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexLoadBaseOnContextStoreEffect.tsx @@ -2,14 +2,14 @@ import { useContextStoreObjectMetadataItemOrThrow } from '@/context-store/hooks/ import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState'; import { useLoadRecordIndexStates } from '@/object-record/record-index/hooks/useLoadRecordIndexStates'; import { prefetchViewFromViewIdFamilySelector } from '@/prefetch/states/selector/prefetchViewFromViewIdFamilySelector'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useEffect, useState } from 'react'; import { useRecoilValue } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; export const RecordIndexLoadBaseOnContextStoreEffect = () => { const { loadRecordIndexStates } = useLoadRecordIndexStates(); - const contextStoreCurrentViewId = useRecoilComponentValueV2( + const contextStoreCurrentViewId = useRecoilComponentValue( contextStoreCurrentViewIdComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageHeader.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageHeader.tsx index e1c04a9384..94d76f3130 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageHeader.tsx +++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageHeader.tsx @@ -6,7 +6,7 @@ import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilte import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext'; import { PageHeaderToggleCommandMenuButton } from '@/ui/layout/page-header/components/PageHeaderToggleCommandMenuButton'; import { PageHeader } from '@/ui/layout/page/components/PageHeader'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import styled from '@emotion/styled'; import { t } from '@lingui/core/macro'; import { isDefined } from 'twenty-shared/utils'; @@ -32,7 +32,7 @@ export const RecordIndexPageHeader = () => { const { findObjectMetadataItemByNamePlural } = useFilteredObjectMetadataItems(); - const contextStoreNumberOfSelectedRecords = useRecoilComponentValueV2( + const contextStoreNumberOfSelectedRecords = useRecoilComponentValue( contextStoreNumberOfSelectedRecordsComponentState, ); @@ -59,7 +59,7 @@ export const RecordIndexPageHeader = () => { label ); - const contextStoreCurrentViewId = useRecoilComponentValueV2( + const contextStoreCurrentViewId = useRecoilComponentValue( contextStoreCurrentViewIdComponentState, MAIN_CONTEXT_STORE_INSTANCE_ID, ); diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexRemoveSortingModal.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexRemoveSortingModal.tsx index ac666a0600..4a14b63327 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexRemoveSortingModal.tsx +++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexRemoveSortingModal.tsx @@ -2,10 +2,10 @@ import { RECORD_INDEX_REMOVE_SORTING_MODAL_ID } from '@/object-record/record-ind import { useRemoveRecordSort } from '@/object-record/record-sort/hooks/useRemoveRecordSort'; import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState'; import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const RecordIndexRemoveSortingModal = () => { - const currentRecordSorts = useRecoilComponentValueV2( + const currentRecordSorts = useRecoilComponentValue( currentRecordSortsComponentState, ); 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.tsx index 960167afa5..57c47517f5 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 @@ -5,7 +5,7 @@ import { RECORD_INDEX_REMOVE_SORTING_MODAL_ID } from '@/object-record/record-ind import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext'; import { RecordTableWithWrappers } from '@/object-record/record-table/components/RecordTableWithWrappers'; import { isModalOpenedComponentState } from '@/ui/layout/modal/states/isModalOpenedComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; type RecordIndexTableContainerProps = { recordTableId: string; @@ -18,7 +18,7 @@ export const RecordIndexTableContainer = ({ }: RecordIndexTableContainerProps) => { const { objectNameSingular } = useRecordIndexContextOrThrow(); - const isRecordIndexRemoveSortingModalOpened = useRecoilComponentValueV2( + const isRecordIndexRemoveSortingModalOpened = useRecoilComponentValue( isModalOpenedComponentState, RECORD_INDEX_REMOVE_SORTING_MODAL_ID, ); diff --git a/packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useRecordIndexLazyFetchRecords.test.ts b/packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useRecordIndexLazyFetchRecords.test.ts index 04c8be0109..81e185f41c 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useRecordIndexLazyFetchRecords.test.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useRecordIndexLazyFetchRecords.test.ts @@ -9,7 +9,7 @@ import { import { useLazyFetchAllRecords } from '@/object-record/hooks/useLazyFetchAllRecords'; import { useObjectOptionsForBoard } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard'; import { recordGroupFieldMetadataComponentState } from '@/object-record/record-group/states/recordGroupFieldMetadataComponentState'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { ViewType } from '@/views/types/ViewType'; import { expect } from '@storybook/test'; import { getJestMetadataAndApolloMocksAndActionMenuWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksAndActionMenuWrapper'; @@ -161,7 +161,7 @@ describe('useRecordData', () => { const { result } = renderHook( () => { const [recordGroupFieldMetadata, setRecordGroupFieldMetadata] = - useRecoilComponentStateV2( + useRecoilComponentState( recordGroupFieldMetadataComponentState, recordIndexId, ); @@ -254,7 +254,7 @@ describe('useRecordData', () => { const { result } = renderHook( () => { const [recordGroupFieldMetadata, setRecordGroupFieldMetadata] = - useRecoilComponentStateV2( + useRecoilComponentState( recordGroupFieldMetadataComponentState, recordIndexId, ); 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.ts index f8194b861b..5ba355b5dc 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 @@ -14,7 +14,7 @@ import { useFilterValueDependencies } from '@/object-record/record-filter/hooks/ import { recordGroupFieldMetadataComponentState } from '@/object-record/record-group/states/recordGroupFieldMetadataComponentState'; import { useFindManyRecordIndexTableParams } from '@/object-record/record-index/hooks/useFindManyRecordIndexTableParams'; import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { ViewType } from '@/views/types/ViewType'; export const sleep = (ms: number) => @@ -52,7 +52,7 @@ export const useRecordIndexLazyFetchRecords = ({ viewBarId: recordIndexId, }); - const recordGroupFieldMetadata = useRecoilComponentValueV2( + const recordGroupFieldMetadata = useRecoilComponentValue( recordGroupFieldMetadataComponentState, recordIndexId, ); @@ -60,20 +60,20 @@ export const useRecordIndexLazyFetchRecords = ({ const hiddenKanbanFieldColumn = hiddenBoardFields.find( (column) => column.metadata.fieldName === recordGroupFieldMetadata?.name, ); - const columns = useRecoilComponentValueV2( + const columns = useRecoilComponentValue( visibleTableColumnsComponentSelector, recordIndexId, ); - const contextStoreTargetedRecordsRule = useRecoilComponentValueV2( + const contextStoreTargetedRecordsRule = useRecoilComponentValue( contextStoreTargetedRecordsRuleComponentState, ); - const contextStoreFilters = useRecoilComponentValueV2( + const contextStoreFilters = useRecoilComponentValue( contextStoreFiltersComponentState, ); - const contextStoreAnyFieldFilterValue = useRecoilComponentValueV2( + const contextStoreAnyFieldFilterValue = useRecoilComponentValue( contextStoreAnyFieldFilterValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useFindManyRecordIndexTableParams.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useFindManyRecordIndexTableParams.ts index c08fa3bf49..e4b454ef8f 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useFindManyRecordIndexTableParams.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useFindManyRecordIndexTableParams.ts @@ -10,7 +10,7 @@ import { turnAnyFieldFilterIntoRecordGqlFilter } from '@/object-record/record-fi import { useCurrentRecordGroupDefinition } from '@/object-record/record-group/hooks/useCurrentRecordGroupDefinition'; import { useRecordGroupFilter } from '@/object-record/record-group/hooks/useRecordGroupFilter'; import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const useFindManyRecordIndexTableParams = ( objectNameSingular: string, @@ -25,15 +25,15 @@ export const useFindManyRecordIndexTableParams = ( const currentRecordGroupDefinition = useCurrentRecordGroupDefinition(); - const currentRecordFilterGroups = useRecoilComponentValueV2( + const currentRecordFilterGroups = useRecoilComponentValue( currentRecordFilterGroupsComponentState, ); - const currentRecordSorts = useRecoilComponentValueV2( + const currentRecordSorts = useRecoilComponentValue( currentRecordSortsComponentState, ); - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); @@ -46,7 +46,7 @@ export const useFindManyRecordIndexTableParams = ( recordFilters: currentRecordFilters, }); - const anyFieldFilterValue = useRecoilComponentValueV2( + const anyFieldFilterValue = useRecoilComponentValue( anyFieldFilterValueComponentState, ); 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.ts index efb30e4858..8b853a2b88 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 @@ -1,7 +1,7 @@ import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState'; import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem'; import { AppPath } from '@/types/AppPath'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { getAppPath } from '~/utils/navigation/getAppPath'; export const useHandleIndexIdentifierClick = ({ @@ -11,7 +11,7 @@ export const useHandleIndexIdentifierClick = ({ recordIndexId: string; objectMetadataItem: ObjectMetadataItem; }) => { - const currentViewId = useRecoilComponentValueV2( + const currentViewId = useRecoilComponentValue( contextStoreCurrentViewIdComponentState, recordIndexId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleRecordGroupField.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleRecordGroupField.ts index 74cbee039a..73fc956bc6 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleRecordGroupField.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleRecordGroupField.ts @@ -2,7 +2,7 @@ import { useContextStoreObjectMetadataItemOrThrow } from '@/context-store/hooks/ import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState'; import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem'; import { useSetRecordGroups } from '@/object-record/record-group/hooks/useSetRecordGroups'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { usePersistViewGroupRecords } from '@/views/hooks/internal/usePersistViewGroupRecords'; import { useGetViewFromPrefetchState } from '@/views/hooks/useGetViewFromPrefetchState'; import { ViewGroup } from '@/views/types/ViewGroup'; @@ -14,7 +14,7 @@ export const useHandleRecordGroupField = () => { const { createViewGroupRecords, deleteViewGroupRecords } = usePersistViewGroupRecords(); - const currentViewIdCallbackState = useRecoilComponentCallbackStateV2( + const currentViewIdCallbackState = useRecoilComponentCallbackState( contextStoreCurrentViewIdComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts index 9ec07081d1..1ad767b141 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts @@ -7,7 +7,7 @@ import { getFilterTypeFromFieldType } from '@/object-metadata/utils/formatFieldM import { useUpsertRecordFilter } from '@/object-record/record-filter/hooks/useUpsertRecordFilter'; import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter'; import { isSoftDeleteFilterActiveComponentState } from '@/object-record/record-table/states/isSoftDeleteFilterActiveComponentState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useRecoilCallback } from 'recoil'; import { ViewFilterOperand } from 'twenty-shared/src/types/ViewFilterOperand'; @@ -30,7 +30,7 @@ export const useHandleToggleTrashColumnFilter = ({ useColumnDefinitionsFromFieldMetadata(objectMetadataItem); const isSoftDeleteFilterActiveComponentRecoilState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( isSoftDeleteFilterActiveComponentState, viewBarId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexBoardColumn.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexBoardColumn.ts index f49bd607cb..c638938944 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexBoardColumn.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexBoardColumn.ts @@ -19,7 +19,7 @@ import { anyFieldFilterValueComponentState } from '@/object-record/record-filter import { combineFilters } from '@/object-record/record-filter/utils/combineFilters'; import { turnAnyFieldFilterIntoRecordGqlFilter } from '@/object-record/record-filter/utils/turnAnyFieldFilterIntoRecordGqlFilter'; import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; type UseLoadRecordIndexBoardProps = { @@ -45,15 +45,15 @@ export const useLoadRecordIndexBoardColumn = ({ recordGroupDefinitionFamilyState(columnId), ); - const currentRecordFilterGroups = useRecoilComponentValueV2( + const currentRecordFilterGroups = useRecoilComponentValue( currentRecordFilterGroupsComponentState, ); - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); - const currentRecordSorts = useRecoilComponentValueV2( + const currentRecordSorts = useRecoilComponentValue( currentRecordSortsComponentState, ); @@ -66,7 +66,7 @@ export const useLoadRecordIndexBoardColumn = ({ fields: objectMetadataItem.fields, }); - const anyFieldFilterValue = useRecoilComponentValueV2( + const anyFieldFilterValue = useRecoilComponentValue( anyFieldFilterValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexStates.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexStates.ts index ffc9abd8e8..233fe987b8 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexStates.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexStates.ts @@ -17,7 +17,7 @@ import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefin import { convertAggregateOperationToExtendedAggregateOperation } from '@/object-record/utils/convertAggregateOperationToExtendedAggregateOperation'; import { filterAvailableTableColumns } from '@/object-record/utils/filterAvailableTableColumns'; import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { View } from '@/views/types/View'; import { ViewField } from '@/views/types/ViewField'; import { mapViewFieldsToColumnDefinitions } from '@/views/utils/mapViewFieldsToColumnDefinitions'; @@ -28,7 +28,7 @@ import { isDeeplyEqual } from '~/utils/isDeeplyEqual'; export const useLoadRecordIndexStates = () => { const setContextStoreTargetedRecordsRuleComponentState = - useSetRecoilComponentStateV2(contextStoreTargetedRecordsRuleComponentState); + useSetRecoilComponentState(contextStoreTargetedRecordsRuleComponentState); const setRecordIndexIsCompactModeActive = useSetRecoilState( recordIndexIsCompactModeActiveState, diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useOpenRecordFromIndexView.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useOpenRecordFromIndexView.ts index 0144595ced..4f2a60b508 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useOpenRecordFromIndexView.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useOpenRecordFromIndexView.ts @@ -8,7 +8,7 @@ import { recordIndexOpenRecordInState } from '@/object-record/record-index/state import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState'; import { canOpenObjectInSidePanel } from '@/object-record/utils/canOpenObjectInSidePanel'; import { AppPath } from '@/types/AppPath'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { ViewOpenRecordInType } from '@/views/types/ViewOpenRecordInType'; import { useRecoilCallback } from 'recoil'; import { useNavigateApp } from '~/hooks/useNavigateApp'; @@ -21,17 +21,17 @@ export const useOpenRecordFromIndexView = () => { const navigate = useNavigateApp(); const { openRecordInCommandMenu } = useOpenRecordInCommandMenu(); - const currentRecordFilters = useRecoilComponentCallbackStateV2( + const currentRecordFilters = useRecoilComponentCallbackState( currentRecordFiltersComponentState, recordIndexId, ); - const currentRecordSorts = useRecoilComponentCallbackStateV2( + const currentRecordSorts = useRecoilComponentCallbackState( currentRecordSortsComponentState, recordIndexId, ); - const currentRecordFilterGroups = useRecoilComponentCallbackStateV2( + const currentRecordFilterGroups = useRecoilComponentCallbackState( currentRecordFilterGroupsComponentState, recordIndexId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordBoardRecordGqlFields.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordBoardRecordGqlFields.ts index 857350144d..1abc53dc8e 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordBoardRecordGqlFields.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordBoardRecordGqlFields.ts @@ -5,7 +5,7 @@ import { generateDepthOneRecordGqlFields } from '@/object-record/graphql/utils/g import { generateDepthOneWithoutRelationsRecordGqlFields } from '@/object-record/graphql/utils/generateDepthOneWithoutRelationsRecordGqlFields'; import { recordBoardVisibleFieldDefinitionsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardVisibleFieldDefinitionsComponentSelector'; import { recordGroupFieldMetadataComponentState } from '@/object-record/record-group/states/recordGroupFieldMetadataComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; export const useRecordBoardRecordGqlFields = ({ @@ -15,12 +15,12 @@ export const useRecordBoardRecordGqlFields = ({ recordBoardId: string; objectMetadataItem: ObjectMetadataItem; }) => { - const visibleFieldDefinitions = useRecoilComponentValueV2( + const visibleFieldDefinitions = useRecoilComponentValue( recordBoardVisibleFieldDefinitionsComponentSelector, recordBoardId, ); - const recordGroupFieldMetadata = useRecoilComponentValueV2( + const recordGroupFieldMetadata = useRecoilComponentValue( recordGroupFieldMetadataComponentState, recordBoardId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordTableRecordGqlFields.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordTableRecordGqlFields.ts index fc25392e40..49f09d4a98 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordTableRecordGqlFields.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordTableRecordGqlFields.ts @@ -4,14 +4,14 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem'; import { generateDepthOneRecordGqlFields } from '@/object-record/graphql/utils/generateDepthOneRecordGqlFields'; import { generateDepthOneWithoutRelationsRecordGqlFields } from '@/object-record/graphql/utils/generateDepthOneWithoutRelationsRecordGqlFields'; import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const useRecordTableRecordGqlFields = ({ objectMetadataItem, }: { objectMetadataItem: ObjectMetadataItem; }) => { - const visibleTableColumns = useRecoilComponentValueV2( + const visibleTableColumns = useRecoilComponentValue( visibleTableColumnsComponentSelector, ); diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexEntityCountByGroupComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexEntityCountByGroupComponentFamilyState.ts index ebcb707908..17e4d56780 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexEntityCountByGroupComponentFamilyState.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexEntityCountByGroupComponentFamilyState.ts @@ -1,12 +1,10 @@ import { RecordGroupDefinition } from '@/object-record/record-group/types/RecordGroupDefinition'; -import { createComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilyStateV2'; +import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; export const recordIndexEntityCountByGroupComponentFamilyState = - createComponentFamilyStateV2( - { - key: 'recordIndexEntityCountByGroupComponentFamilyState', - defaultValue: undefined, - componentInstanceContext: ViewComponentInstanceContext, - }, - ); + createComponentFamilyState({ + key: 'recordIndexEntityCountByGroupComponentFamilyState', + defaultValue: undefined, + componentInstanceContext: ViewComponentInstanceContext, + }); diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexHasFetchedAllRecordsByGroupComponentState.ts b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexHasFetchedAllRecordsByGroupComponentState.ts index 11add135e2..bcf32e6722 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexHasFetchedAllRecordsByGroupComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexHasFetchedAllRecordsByGroupComponentState.ts @@ -1,9 +1,9 @@ import { RecordGroupDefinition } from '@/object-record/record-group/types/RecordGroupDefinition'; -import { createComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilyStateV2'; +import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; export const recordIndexHasFetchedAllRecordsByGroupComponentState = - createComponentFamilyStateV2({ + createComponentFamilyState({ key: 'recordIndexHasFetchedAllRecordsByGroupComponentState', componentInstanceContext: ViewComponentInstanceContext, defaultValue: false, diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexRecordGroupHideComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexRecordGroupHideComponentFamilyState.ts index 1f75f52f45..88d3b2ae02 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexRecordGroupHideComponentFamilyState.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexRecordGroupHideComponentFamilyState.ts @@ -1,9 +1,9 @@ -import { createComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilyStateV2'; +import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; import { ViewType } from '@/views/types/ViewType'; export const recordIndexRecordGroupHideComponentFamilyState = - createComponentFamilyStateV2({ + createComponentFamilyState({ key: 'recordIndexRecordGroupHideComponentFamilyState', defaultValue: ({ familyKey }) => { switch (familyKey) { diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexRecordGroupSortComponentState.ts b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexRecordGroupSortComponentState.ts index 6f1a1e00eb..8256df8d56 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexRecordGroupSortComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexRecordGroupSortComponentState.ts @@ -1,9 +1,9 @@ import { RecordGroupSort } from '@/object-record/record-group/types/RecordGroupSort'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; export const recordIndexRecordGroupSortComponentState = - createComponentStateV2({ + createComponentState({ key: 'recordIndexRecordGroupSortComponentState', defaultValue: RecordGroupSort.Manual, componentInstanceContext: ViewComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState.ts index e8b1aa1cd0..a5e3e9c72d 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState.ts @@ -1,9 +1,9 @@ import { RecordGroupDefinition } from '@/object-record/record-group/types/RecordGroupDefinition'; -import { createComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilyStateV2'; +import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; export const recordIndexRecordIdsByGroupComponentFamilyState = - createComponentFamilyStateV2({ + createComponentFamilyState({ key: 'recordIndexRecordIdsByGroupComponentFamilyState', defaultValue: [], componentInstanceContext: ViewComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector.ts index eb4239357f..06012d708d 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector.ts @@ -1,7 +1,7 @@ import { recordGroupIdsComponentState } from '@/object-record/record-group/states/recordGroupIdsComponentState'; import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState'; import { ObjectRecord } from '@/object-record/types/ObjectRecord'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; /** @@ -10,50 +10,51 @@ import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewCompon */ const defaultFamilyKey = 'record-group-default-id'; -export const recordIndexAllRecordIdsComponentSelector = - createComponentSelectorV2({ - key: 'recordIndexAllRecordIdsComponentSelector', - componentInstanceContext: ViewComponentInstanceContext, - get: - ({ instanceId }) => - ({ get }) => { - const recordGroupIds = get( - recordGroupIdsComponentState.atomFamily({ - instanceId, - }), - ); +export const recordIndexAllRecordIdsComponentSelector = createComponentSelector< + ObjectRecord['id'][] +>({ + key: 'recordIndexAllRecordIdsComponentSelector', + componentInstanceContext: ViewComponentInstanceContext, + get: + ({ instanceId }) => + ({ get }) => { + const recordGroupIds = get( + recordGroupIdsComponentState.atomFamily({ + instanceId, + }), + ); - if (recordGroupIds.length === 0) { - return get( - recordIndexRecordIdsByGroupComponentFamilyState.atomFamily({ - instanceId, - familyKey: defaultFamilyKey, - }), - ); - } - - return recordGroupIds.reduce( - (acc, recordGroupId) => { - const rowIds = get( - recordIndexRecordIdsByGroupComponentFamilyState.atomFamily({ - instanceId, - familyKey: recordGroupId, - }), - ); - - return [...acc, ...rowIds]; - }, - [], - ); - }, - set: - ({ instanceId }) => - ({ set }, recordIds) => - set( + if (recordGroupIds.length === 0) { + return get( recordIndexRecordIdsByGroupComponentFamilyState.atomFamily({ instanceId, familyKey: defaultFamilyKey, }), - recordIds, - ), - }); + ); + } + + return recordGroupIds.reduce( + (acc, recordGroupId) => { + const rowIds = get( + recordIndexRecordIdsByGroupComponentFamilyState.atomFamily({ + instanceId, + familyKey: recordGroupId, + }), + ); + + return [...acc, ...rowIds]; + }, + [], + ); + }, + set: + ({ instanceId }) => + ({ set }, recordIds) => + set( + recordIndexRecordIdsByGroupComponentFamilyState.atomFamily({ + instanceId, + familyKey: defaultFamilyKey, + }), + recordIds, + ), +}); diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/selectors/recordIndexRecordGroupIsDraggableSortComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-index/states/selectors/recordIndexRecordGroupIsDraggableSortComponentSelector.ts index d1e1606eb7..90c832839c 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/states/selectors/recordIndexRecordGroupIsDraggableSortComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/states/selectors/recordIndexRecordGroupIsDraggableSortComponentSelector.ts @@ -1,10 +1,10 @@ import { RecordGroupSort } from '@/object-record/record-group/types/RecordGroupSort'; import { recordIndexRecordGroupSortComponentState } from '@/object-record/record-index/states/recordIndexRecordGroupSortComponentState'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; export const recordIndexRecordGroupIsDraggableSortComponentSelector = - createComponentSelectorV2({ + createComponentSelector({ key: 'recordIndexRecordGroupIsDraggableSortComponentSelector', componentInstanceContext: ViewComponentInstanceContext, get: 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.tsx index 34aeadb02d..34926e0da8 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 @@ -5,8 +5,8 @@ import { recordFieldInputLayoutDirectionLoadingComponentState } from '@/object-r import { RecordInlineCellContext } from '@/object-record/record-inline-cell/components/RecordInlineCellContext'; import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import styled from '@emotion/styled'; import { MiddlewareState, @@ -42,12 +42,12 @@ export const RecordInlineCellEditMode = ({ RecordFieldComponentInstanceContext, ); - const setFieldInputLayoutDirection = useSetRecoilComponentStateV2( + const setFieldInputLayoutDirection = useSetRecoilComponentState( recordFieldInputLayoutDirectionComponentState, recordFieldComponentInstanceId, ); - const setFieldInputLayoutDirectionLoading = useSetRecoilComponentStateV2( + const setFieldInputLayoutDirectionLoading = useSetRecoilComponentState( recordFieldInputLayoutDirectionLoadingComponentState, recordFieldComponentInstanceId, ); @@ -63,7 +63,7 @@ export const RecordInlineCellEditMode = ({ }, }; - const isFieldInError = useRecoilComponentValueV2( + const isFieldInError = useRecoilComponentValue( recordFieldInputIsFieldInErrorComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/hooks/useInlineCell.ts b/packages/twenty-front/src/modules/object-record/record-inline-cell/hooks/useInlineCell.ts index ed9ce06039..67052b5bbd 100644 --- a/packages/twenty-front/src/modules/object-record/record-inline-cell/hooks/useInlineCell.ts +++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/hooks/useInlineCell.ts @@ -3,7 +3,7 @@ import { useRecoilState } from 'recoil'; import { FieldContext } from '@/object-record/record-field/contexts/FieldContext'; -import { useInitDraftValueV2 } from '@/object-record/record-field/hooks/useInitDraftValueV2'; +import { useInitDraftValue } from '@/object-record/record-field/hooks/useInitDraftValue'; import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/states/contexts/RecordFieldComponentInstanceContext'; import { useRecordInlineCellContext } from '@/object-record/record-inline-cell/components/RecordInlineCellContext'; import { getDropdownFocusIdForRecordField } from '@/object-record/utils/getDropdownFocusIdForRecordField'; @@ -33,7 +33,7 @@ export const useInlineCell = ( const { goBackToPreviousDropdownFocusId } = useGoBackToPreviousDropdownFocusId(); - const initFieldInputDraftValue = useInitDraftValueV2(); + const initFieldInputDraftValue = useInitDraftValue(); const closeInlineCell = () => { onCloseEditMode?.(); diff --git a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContainer.tsx b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContainer.tsx index 844cee1bcb..7188c76632 100644 --- a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContainer.tsx +++ b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContainer.tsx @@ -5,14 +5,14 @@ import { RightDrawerProvider } from '@/ui/layout/right-drawer/contexts/RightDraw import { TabList } from '@/ui/layout/tab-list/components/TabList'; import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState'; import { TabListComponentInstanceContext } from '@/ui/layout/tab-list/states/contexts/TabListComponentInstanceContext'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useMergeRecordsSettings } from '@/object-record/record-merge/hooks/useMergeRecordsSettings'; import { MergeRecordsTabId } from '@/object-record/record-merge/types/MergeRecordsTabId'; import { useMergeRecordsContainerTabs } from '../hooks/useMergeRecordsContainerTabs'; import { MergePreviewTab } from './MergePreviewTab'; -import { MergeRecordsFooter } from './MergeRecordsFooter'; import { MergeRecordTab } from './MergeRecordTab'; +import { MergeRecordsFooter } from './MergeRecordsFooter'; import { MergeSettingsTab } from './MergeSettingsTab'; const StyledShowPageRightContainer = styled.div` @@ -47,7 +47,7 @@ export const MergeRecordsContainer = ({ }: MergeRecordsContainerProps) => { const { selectedRecords } = useMergeRecordsSettings(); - const activeTabId = useRecoilComponentValueV2( + const activeTabId = useRecoilComponentValue( activeTabIdComponentState, componentInstanceId, ); 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.ts index 18183cec85..17bc17451e 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 @@ -1,7 +1,7 @@ import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems'; import { searchRecordStoreComponentFamilyState } from '@/object-record/record-picker/multiple-record-picker/states/searchRecordStoreComponentFamilyState'; import { multipleRecordPickerSinglePickableMorphItemComponentFamilySelector } from '@/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerSinglePickableMorphItemComponentFamilySelector'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; import { isDefined } from 'twenty-shared/utils'; type UseRecordPickerGetRecordAndObjectMetadataItemFromRecordIdProps = { @@ -14,12 +14,12 @@ export const useRecordPickerGetSearchRecordAndObjectMetadataItemFromRecordId = }: UseRecordPickerGetRecordAndObjectMetadataItemFromRecordIdProps) => { const { objectMetadataItems } = useObjectMetadataItems(); - const pickableMorphItem = useRecoilComponentFamilyValueV2( + const pickableMorphItem = useRecoilComponentFamilyValue( multipleRecordPickerSinglePickableMorphItemComponentFamilySelector, recordId, ); - const searchRecord = useRecoilComponentFamilyValueV2( + const searchRecord = useRecoilComponentFamilyValue( searchRecordStoreComponentFamilyState, recordId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker.tsx index 1ef7c6c465..d2e2b3940f 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker.tsx +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker.tsx @@ -13,7 +13,7 @@ import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList'; import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useRef } from 'react'; import { useRecoilCallback } from 'recoil'; import { Key } from 'ts-key-enum'; @@ -46,14 +46,13 @@ export const MultipleRecordPicker = ({ selectableListComponentInstanceId, ); - const multipleRecordPickerSearchFilterState = - useRecoilComponentCallbackStateV2( - multipleRecordPickerSearchFilterComponentState, - componentInstanceId, - ); + const multipleRecordPickerSearchFilterState = useRecoilComponentCallbackState( + multipleRecordPickerSearchFilterComponentState, + componentInstanceId, + ); const multipleRecordPickerPickableMorphItemsState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( multipleRecordPickerPickableMorphItemsComponentState, componentInstanceId, ); 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.tsx index 0c087c7449..ebb976f4bd 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 @@ -10,8 +10,8 @@ import { multipleRecordPickerShouldShowInitialLoadingComponentState } from '@/ob import { multipleRecordPickerShouldShowSkeletonComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerShouldShowSkeletonComponentState'; import { multipleRecordPickerPaginationSelector } from '@/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerPaginationSelector'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import styled from '@emotion/styled'; import { useCallback } from 'react'; import { useInView } from 'react-intersection-observer'; @@ -36,35 +36,32 @@ export const MultipleRecordPickerFetchMoreLoader = () => { const [ multipleRecordPickerIsFetchingMore, setMultipleRecordPickerIsFetchingMore, - ] = useRecoilComponentStateV2( - multipleRecordPickerIsFetchingMoreComponentState, - ); + ] = useRecoilComponentState(multipleRecordPickerIsFetchingMoreComponentState); const componentInstanceId = useAvailableComponentInstanceIdOrThrow( MultipleRecordPickerComponentInstanceContext, ); - const paginationState = useRecoilComponentValueV2( + const paginationState = useRecoilComponentValue( multipleRecordPickerPaginationSelector, componentInstanceId, ); - const isLoading = useRecoilComponentValueV2( + const isLoading = useRecoilComponentValue( multipleRecordPickerIsLoadingComponentState, componentInstanceId, ); - const searchFilter = useRecoilComponentValueV2( + const searchFilter = useRecoilComponentValue( multipleRecordPickerSearchFilterComponentState, componentInstanceId, ); - const multipleRecordPickerShouldShowInitialLoading = - useRecoilComponentValueV2( - multipleRecordPickerShouldShowInitialLoadingComponentState, - ); + const multipleRecordPickerShouldShowInitialLoading = useRecoilComponentValue( + multipleRecordPickerShouldShowInitialLoadingComponentState, + ); - const multipleRecordPickerShouldShowSkeleton = useRecoilComponentValueV2( + const multipleRecordPickerShouldShowSkeleton = useRecoilComponentValue( multipleRecordPickerShouldShowSkeletonComponentState, ); 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.tsx index 22738daf5c..e23be97c33 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 @@ -1,24 +1,24 @@ import { multipleRecordPickerIsFetchingMoreComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerIsFetchingMoreComponentState'; import { multipleRecordPickerIsLoadingComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerIsLoadingComponentState'; import { multipleRecordPickerShouldShowSkeletonComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerShouldShowSkeletonComponentState'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { useEffect, useState } from 'react'; import { useDebouncedCallback } from 'use-debounce'; export const MultipleRecordPickerLoadingEffect = () => { const [previousLoading, setPreviousLoading] = useState(false); - const loading = useRecoilComponentValueV2( + const loading = useRecoilComponentValue( multipleRecordPickerIsLoadingComponentState, ); - const setMultipleRecordPickerShowSkeleton = useSetRecoilComponentStateV2( + const setMultipleRecordPickerShowSkeleton = useSetRecoilComponentState( multipleRecordPickerShouldShowSkeletonComponentState, ); - const [multipleRecordPickerIsFetchingMore] = useRecoilComponentStateV2( + const [multipleRecordPickerIsFetchingMore] = useRecoilComponentState( multipleRecordPickerIsFetchingMoreComponentState, ); 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.tsx index 186fce85b7..1c8cde2e56 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 @@ -9,7 +9,7 @@ import { RecordPickerPickableMorphItem } from '@/object-record/record-picker/typ import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem'; import { isSelectedItemIdComponentFamilySelector } from '@/ui/layout/selectable-list/states/selectors/isSelectedItemIdComponentFamilySelector'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; import { Avatar } from 'twenty-ui/display'; import { MenuItemMultiSelectAvatar } from 'twenty-ui/navigation'; import { SearchRecord } from '~/generated-metadata/graphql'; @@ -37,13 +37,13 @@ export const MultipleRecordPickerMenuItemContent = ({ const selectableListComponentInstanceId = getMultipleRecordPickerSelectableListId(componentInstanceId); - const isSelectedByKeyboard = useRecoilComponentFamilyValueV2( + const isSelectedByKeyboard = useRecoilComponentFamilyValue( isSelectedItemIdComponentFamilySelector, searchRecord.recordId, selectableListComponentInstanceId, ); - const isRecordSelectedWithObjectItem = useRecoilComponentFamilyValueV2( + const isRecordSelectedWithObjectItem = useRecoilComponentFamilyValue( multipleRecordPickerIsSelectedComponentFamilySelector, searchRecord.recordId, componentInstanceId, diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItems.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItems.tsx index 1c515a69be..28d60955f5 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItems.tsx +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItems.tsx @@ -13,8 +13,8 @@ import { RecordPickerPickableMorphItem } from '@/object-record/record-picker/typ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useRecoilCallback } from 'recoil'; type MultipleRecordPickerMenuItemsProps = { @@ -33,13 +33,13 @@ export const MultipleRecordPickerMenuItems = ({ const selectableListComponentInstanceId = getMultipleRecordPickerSelectableListId(componentInstanceId); - const pickableRecordIds = useRecoilComponentValueV2( + const pickableRecordIds = useRecoilComponentValue( multipleRecordPickerPickableRecordIdsMatchingSearchComponentSelector, componentInstanceId, ); const multipleRecordPickerPickableMorphItemsState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( multipleRecordPickerPickableMorphItemsComponentState, componentInstanceId, ); @@ -69,12 +69,11 @@ export const MultipleRecordPickerMenuItems = ({ [multipleRecordPickerPickableMorphItemsState], ); - const multipleRecordPickerShouldShowInitialLoading = - useRecoilComponentValueV2( - multipleRecordPickerShouldShowInitialLoadingComponentState, - ); + const multipleRecordPickerShouldShowInitialLoading = useRecoilComponentValue( + multipleRecordPickerShouldShowInitialLoadingComponentState, + ); - const multipleRecordPickerShouldShowSkeleton = useRecoilComponentValueV2( + const multipleRecordPickerShouldShowSkeleton = useRecoilComponentValue( multipleRecordPickerShouldShowSkeletonComponentState, ); diff --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.tsx index f2c591dfb9..e94dfbef4d 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 @@ -3,7 +3,7 @@ import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/re import { multipleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchFilterComponentState'; import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { useRecoilCallback } from 'recoil'; import { useDebouncedCallback } from 'use-debounce'; @@ -13,7 +13,7 @@ export const MultipleRecordPickerSearchInput = () => { ); const [recordPickerSearchFilter, setRecordPickerSearchFilter] = - useRecoilComponentStateV2(multipleRecordPickerSearchFilterComponentState); + useRecoilComponentState(multipleRecordPickerSearchFilterComponentState); const { performSearch } = useMultipleRecordPickerPerformSearch(); diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext.ts index 845fd9cfb7..1dd5d0061a 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext.ts @@ -1,7 +1,7 @@ -import { ComponentStateKeyV2 } from '@/ui/utilities/state/component-state/types/ComponentStateKeyV2'; +import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey'; import { createComponentInstanceContext } from '@/ui/utilities/state/component-state/utils/createComponentInstanceContext'; -type MultipleRecordPickerComponentInstanceContextProps = ComponentStateKeyV2; +type MultipleRecordPickerComponentInstanceContextProps = ComponentStateKey; export const MultipleRecordPickerComponentInstanceContext = createComponentInstanceContext(); diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerIsFetchingMoreComponentState.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerIsFetchingMoreComponentState.ts index d07837ebe2..e609cea843 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerIsFetchingMoreComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerIsFetchingMoreComponentState.ts @@ -1,8 +1,8 @@ import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const multipleRecordPickerIsFetchingMoreComponentState = - createComponentStateV2({ + createComponentState({ key: 'multipleRecordPickerIsFetchingMoreComponentState', defaultValue: false, componentInstanceContext: MultipleRecordPickerComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerIsLoadingComponentState.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerIsLoadingComponentState.ts index 5effb32679..635360cf2e 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerIsLoadingComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerIsLoadingComponentState.ts @@ -1,8 +1,8 @@ import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const multipleRecordPickerIsLoadingComponentState = - createComponentStateV2({ + createComponentState({ key: 'multipleRecordPickerIsLoadingComponentState', defaultValue: false, componentInstanceContext: MultipleRecordPickerComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPaginationState.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPaginationState.ts index d8f1774ecc..4236e06f1e 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPaginationState.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPaginationState.ts @@ -1,5 +1,5 @@ import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export type MultipleRecordPickerPaginationState = { endCursor: string | null; @@ -7,7 +7,7 @@ export type MultipleRecordPickerPaginationState = { }; export const multipleRecordPickerPaginationState = - createComponentStateV2({ + createComponentState({ key: 'multipleRecordPickerPaginationState', defaultValue: { endCursor: null, diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState.ts index ffe9f89531..8eabdba1f8 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState.ts @@ -1,9 +1,9 @@ import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext'; import { RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const multipleRecordPickerPickableMorphItemsComponentState = - createComponentStateV2({ + createComponentState({ key: 'multipleRecordPickerPickableMorphItemsComponentState', defaultValue: [], componentInstanceContext: MultipleRecordPickerComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchFilterComponentState.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchFilterComponentState.ts index d716d77a88..2ac8c6e9ed 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchFilterComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchFilterComponentState.ts @@ -1,8 +1,8 @@ import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const multipleRecordPickerSearchFilterComponentState = - createComponentStateV2({ + createComponentState({ key: 'multipleRecordPickerSearchFilterComponentState', defaultValue: '', componentInstanceContext: MultipleRecordPickerComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchableObjectMetadataItemsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchableObjectMetadataItemsComponentState.ts index 23b544b1f8..bf3342f428 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchableObjectMetadataItemsComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchableObjectMetadataItemsComponentState.ts @@ -1,9 +1,9 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem'; import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const multipleRecordPickerSearchableObjectMetadataItemsComponentState = - createComponentStateV2({ + createComponentState({ key: 'multipleRecordPickerSearchableObjectMetadataItemsComponentState', defaultValue: [], componentInstanceContext: MultipleRecordPickerComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerShouldShowInitialLoadingComponentState.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerShouldShowInitialLoadingComponentState.ts index e7d2f3a113..05cc1b7738 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerShouldShowInitialLoadingComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerShouldShowInitialLoadingComponentState.ts @@ -1,8 +1,8 @@ import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const multipleRecordPickerShouldShowInitialLoadingComponentState = - createComponentStateV2({ + createComponentState({ key: 'multipleRecordPickerShouldShowInitialLoadingComponentState', defaultValue: false, componentInstanceContext: MultipleRecordPickerComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerShouldShowSkeletonComponentState.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerShouldShowSkeletonComponentState.ts index 431cd5f05c..16360c9ddc 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerShouldShowSkeletonComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerShouldShowSkeletonComponentState.ts @@ -1,8 +1,8 @@ import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const multipleRecordPickerShouldShowSkeletonComponentState = - createComponentStateV2({ + createComponentState({ key: 'multipleRecordPickerShouldShowSkeletonComponentState', defaultValue: false, componentInstanceContext: MultipleRecordPickerComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/searchRecordStoreComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/searchRecordStoreComponentFamilyState.ts index 9253f1a925..9380cdedbb 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/searchRecordStoreComponentFamilyState.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/searchRecordStoreComponentFamilyState.ts @@ -1,14 +1,13 @@ import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext'; import { ObjectRecord } from '@/object-record/types/ObjectRecord'; -import { createComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilyStateV2'; +import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState'; import { SearchRecord } from '~/generated-metadata/graphql'; -export const searchRecordStoreComponentFamilyState = - createComponentFamilyStateV2< - (SearchRecord & { record?: ObjectRecord }) | undefined, - string - >({ - key: 'searchRecordStoreComponentFamilyState', - defaultValue: undefined, - componentInstanceContext: MultipleRecordPickerComponentInstanceContext, - }); +export const searchRecordStoreComponentFamilyState = createComponentFamilyState< + (SearchRecord & { record?: ObjectRecord }) | undefined, + string +>({ + key: 'searchRecordStoreComponentFamilyState', + defaultValue: undefined, + componentInstanceContext: MultipleRecordPickerComponentInstanceContext, +}); diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerIsSelectedComponentFamilySelector.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerIsSelectedComponentFamilySelector.ts index d4bfc760e0..c90664b325 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerIsSelectedComponentFamilySelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerIsSelectedComponentFamilySelector.ts @@ -1,9 +1,9 @@ import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext'; import { multipleRecordPickerPickableMorphItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState'; -import { createComponentFamilySelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilySelectorV2'; +import { createComponentFamilySelector } from '@/ui/utilities/state/component-state/utils/createComponentFamilySelector'; export const multipleRecordPickerIsSelectedComponentFamilySelector = - createComponentFamilySelectorV2({ + createComponentFamilySelector({ key: 'visibleRecordGroupIdsComponentFamilySelector', componentInstanceContext: MultipleRecordPickerComponentInstanceContext, get: diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerPaginationSelector.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerPaginationSelector.ts index 768ff2ac31..3f2fcfe7dc 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerPaginationSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerPaginationSelector.ts @@ -1,19 +1,17 @@ import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext'; import { multipleRecordPickerPaginationState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPaginationState'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; -export const multipleRecordPickerPaginationSelector = createComponentSelectorV2( - { - key: 'multipleRecordPickerPaginationSelector', - componentInstanceContext: MultipleRecordPickerComponentInstanceContext, - get: - ({ instanceId }) => - ({ get }) => { - return get( - multipleRecordPickerPaginationState.atomFamily({ - instanceId, - }), - ); - }, - }, -); +export const multipleRecordPickerPaginationSelector = createComponentSelector({ + key: 'multipleRecordPickerPaginationSelector', + componentInstanceContext: MultipleRecordPickerComponentInstanceContext, + get: + ({ instanceId }) => + ({ get }) => { + return get( + multipleRecordPickerPaginationState.atomFamily({ + instanceId, + }), + ); + }, +}); diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerPickableMorphItemsLengthComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerPickableMorphItemsLengthComponentSelector.ts index 33c0b581c6..f46990122d 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerPickableMorphItemsLengthComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerPickableMorphItemsLengthComponentSelector.ts @@ -1,9 +1,9 @@ import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext'; import { multipleRecordPickerPickableMorphItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; export const multipleRecordPickerPickableMorphItemsLengthComponentSelector = - createComponentSelectorV2({ + createComponentSelector({ key: 'multipleRecordPickerPickableMorphItemsLengthComponentSelector', componentInstanceContext: MultipleRecordPickerComponentInstanceContext, get: diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerPickableRecordIdsMatchingSearchComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerPickableRecordIdsMatchingSearchComponentSelector.ts index 4fdd384ff5..99506ae5a0 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerPickableRecordIdsMatchingSearchComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerPickableRecordIdsMatchingSearchComponentSelector.ts @@ -1,9 +1,9 @@ import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext'; import { multipleRecordPickerPickableMorphItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; export const multipleRecordPickerPickableRecordIdsMatchingSearchComponentSelector = - createComponentSelectorV2({ + createComponentSelector({ key: 'multipleRecordPickerPickableRecordIdsMatchingSearchComponentSelector', componentInstanceContext: MultipleRecordPickerComponentInstanceContext, get: diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerSinglePickableMorphItemComponentFamilySelector.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerSinglePickableMorphItemComponentFamilySelector.ts index 955ded9f32..bb8ddfbdae 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerSinglePickableMorphItemComponentFamilySelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/states/selectors/multipleRecordPickerSinglePickableMorphItemComponentFamilySelector.ts @@ -1,10 +1,10 @@ import { MultipleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/multiple-record-picker/states/contexts/MultipleRecordPickerComponentInstanceContext'; import { multipleRecordPickerPickableMorphItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState'; import { RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem'; -import { createComponentFamilySelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilySelectorV2'; +import { createComponentFamilySelector } from '@/ui/utilities/state/component-state/utils/createComponentFamilySelector'; export const multipleRecordPickerSinglePickableMorphItemComponentFamilySelector = - createComponentFamilySelectorV2< + createComponentFamilySelector< RecordPickerPickableMorphItem | undefined, string >({ 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.tsx index 53e9c58fe0..1d86cf3df0 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 @@ -9,7 +9,7 @@ import { singleRecordPickerSearchFilterComponentState } from '@/object-record/re import { SingleRecordPickerRecord } from '@/object-record/record-picker/single-record-picker/types/SingleRecordPickerRecord'; import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; export const SINGLE_RECORD_PICKER_LISTENER_ID = 'single-record-select'; @@ -33,7 +33,7 @@ export const SingleRecordPicker = ({ }: SingleRecordPickerProps) => { const containerRef = useRef(null); - const setRecordPickerSearchFilter = useSetRecoilComponentStateV2( + const setRecordPickerSearchFilter = useSetRecoilComponentState( singleRecordPickerSearchFilterComponentState, componentInstanceId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerLoadingEffect.tsx b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerLoadingEffect.tsx index ed6256c199..cd5a5c6b4f 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerLoadingEffect.tsx +++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerLoadingEffect.tsx @@ -1,5 +1,5 @@ import { singleRecordPickerShouldShowSkeletonComponentState } from '@/object-record/record-picker/single-record-picker/states/singleRecordPickerShouldShowSkeletonComponentState'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { useEffect, useState } from 'react'; import { useDebouncedCallback } from 'use-debounce'; @@ -10,7 +10,7 @@ export const SingleRecordPickerLoadingEffect = ({ }) => { const [previousLoading, setPreviousLoading] = useState(false); - const setSingleRecordPickerShouldShowSkeleton = useSetRecoilComponentStateV2( + const setSingleRecordPickerShouldShowSkeleton = useSetRecoilComponentState( singleRecordPickerShouldShowSkeletonComponentState, ); 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.tsx index 023347ef36..01edd8e320 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 @@ -6,7 +6,7 @@ import { getSingleRecordPickerSelectableListId } from '@/object-record/record-pi import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem'; import { isSelectedItemIdComponentFamilySelector } from '@/ui/layout/selectable-list/states/selectors/isSelectedItemIdComponentFamilySelector'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; import { Avatar } from 'twenty-ui/display'; import { MenuItemSelectAvatar } from 'twenty-ui/navigation'; @@ -33,7 +33,7 @@ export const SingleRecordPickerMenuItem = ({ const selectableListComponentInstanceId = getSingleRecordPickerSelectableListId(recordPickerComponentInstanceId); - const isSelectedItemId = useRecoilComponentFamilyValueV2( + const isSelectedItemId = useRecoilComponentFamilyValue( isSelectedItemIdComponentFamilySelector, record.id, selectableListComponentInstanceId, 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.tsx index ec40e53f96..8b12bee019 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 @@ -18,9 +18,9 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec import { isSelectedItemIdComponentFamilySelector } from '@/ui/layout/selectable-list/states/selectors/isSelectedItemIdComponentFamilySelector'; import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; import { IconComponent } from 'twenty-ui/display'; import { MenuItemSelect } from 'twenty-ui/navigation'; @@ -63,7 +63,7 @@ export const SingleRecordPickerMenuItems = ({ selectableListComponentInstanceId, ); - const isSelectedSelectNoneButton = useRecoilComponentFamilyValueV2( + const isSelectedSelectNoneButton = useRecoilComponentFamilyValue( isSelectedItemIdComponentFamilySelector, selectableListComponentInstanceId, 'select-none', @@ -80,15 +80,15 @@ export const SingleRecordPickerMenuItems = ({ }); const selectableItemIds = recordsInDropdown.map((entity) => entity.id); - const [selectedRecordId, setSelectedRecordId] = useRecoilComponentStateV2( + const [selectedRecordId, setSelectedRecordId] = useRecoilComponentState( singleRecordPickerSelectedIdComponentState, ); - const singleRecordPickerShouldShowSkeleton = useRecoilComponentValueV2( + const singleRecordPickerShouldShowSkeleton = useRecoilComponentValue( singleRecordPickerShouldShowSkeletonComponentState, ); - const singleRecordPickerShouldShowInitialLoading = useRecoilComponentValueV2( + const singleRecordPickerShouldShowInitialLoading = useRecoilComponentValue( singleRecordPickerShouldShowInitialLoadingComponentState, ); 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.tsx index b419f869c8..e91d826d00 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 @@ -15,7 +15,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput'; import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isDefined } from 'twenty-shared/utils'; import { IconPlus } from 'twenty-ui/display'; @@ -52,7 +52,7 @@ export const SingleRecordPickerMenuItemsWithSearch = ({ SingleRecordPickerComponentInstanceContext, ); - const recordPickerSearchFilter = useRecoilComponentValueV2( + const recordPickerSearchFilter = useRecoilComponentValue( singleRecordPickerSearchFilterComponentState, recordPickerInstanceId, ); 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.tsx index 9b7630f63e..6e68cf5ee4 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 @@ -5,7 +5,7 @@ import { RecoilRoot } from 'recoil'; import { useSingleRecordPickerSearch } from '@/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerSearch'; import { SingleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/single-record-picker/states/contexts/SingleRecordPickerComponentInstanceContext'; import { singleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchFilterComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; const instanceId = 'instanceId'; const Wrapper = ({ children }: { children: React.ReactNode }) => ( @@ -19,7 +19,7 @@ describe('useSingleRecordPickerRecords', () => { const { result } = renderHook( () => { const recordSelectSearchHook = useSingleRecordPickerSearch(instanceId); - const internallyStoredFilter = useRecoilComponentValueV2( + const internallyStoredFilter = useRecoilComponentValue( singleRecordPickerSearchFilterComponentState, instanceId, ); 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.ts index bf19e75cbb..9e25fe0277 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 @@ -1,7 +1,7 @@ import { singleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchFilterComponentState'; import { singleRecordPickerSelectedIdComponentState } from '@/object-record/record-picker/single-record-picker/states/singleRecordPickerSelectedIdComponentState'; import { useFilteredSearchRecordQuery } from '@/search/hooks/useFilteredSearchRecordQuery'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const useSingleRecordPickerRecords = ({ objectNameSingular, @@ -10,11 +10,11 @@ export const useSingleRecordPickerRecords = ({ objectNameSingular: string; excludedRecordIds?: string[]; }) => { - const recordPickerSearchFilter = useRecoilComponentValueV2( + const recordPickerSearchFilter = useRecoilComponentValue( singleRecordPickerSearchFilterComponentState, ); - const selectedRecordId = useRecoilComponentValueV2( + const selectedRecordId = useRecoilComponentValue( singleRecordPickerSelectedIdComponentState, ); 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.ts index dc24e964d0..458d92f7ac 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 @@ -2,7 +2,7 @@ import { SingleRecordPickerComponentInstanceContext } from '@/object-record/reco import { singleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchFilterComponentState'; import { singleRecordPickerSelectedIdComponentState } from '@/object-record/record-picker/single-record-picker/states/singleRecordPickerSelectedIdComponentState'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { useDebouncedCallback } from 'use-debounce'; export const useSingleRecordPickerSearch = ( @@ -14,12 +14,12 @@ export const useSingleRecordPickerSearch = ( recordPickerComponentInstanceIdFromProps, ); - const setRecordPickerSearchFilter = useSetRecoilComponentStateV2( + const setRecordPickerSearchFilter = useSetRecoilComponentState( singleRecordPickerSearchFilterComponentState, recordPickerComponentInstanceId, ); - const setRecordPickerSelectedId = useSetRecoilComponentStateV2( + const setRecordPickerSelectedId = useSetRecoilComponentState( singleRecordPickerSelectedIdComponentState, recordPickerComponentInstanceId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchFilterComponentState.ts b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchFilterComponentState.ts index 03d5090777..c3b92a5332 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchFilterComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchFilterComponentState.ts @@ -1,8 +1,8 @@ import { SingleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/single-record-picker/states/contexts/SingleRecordPickerComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const singleRecordPickerSearchFilterComponentState = - createComponentStateV2({ + createComponentState({ key: 'singleRecordPickerSearchFilterComponentState', defaultValue: '', componentInstanceContext: SingleRecordPickerComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchQueryComponentState.ts b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchQueryComponentState.ts index dc08ed20e0..060a4538ee 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchQueryComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchQueryComponentState.ts @@ -1,9 +1,9 @@ import { SingleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/single-record-picker/states/contexts/SingleRecordPickerComponentInstanceContext'; import { RecordPickerSearchQuery } from '@/object-record/record-picker/single-record-picker/types/SingleRecordPickerSearchQuery'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const singleRecordPickerSearchQueryComponentState = - createComponentStateV2({ + createComponentState({ key: 'singleRecordPickerSearchQueryComponentState', defaultValue: null, componentInstanceContext: SingleRecordPickerComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerSelectedIdComponentState.ts b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerSelectedIdComponentState.ts index 5126dcee30..467fd2bcde 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerSelectedIdComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerSelectedIdComponentState.ts @@ -1,9 +1,10 @@ import { SingleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/single-record-picker/states/contexts/SingleRecordPickerComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const singleRecordPickerSelectedIdComponentState = - createComponentStateV2({ - key: 'singleRecordPickerSelectedIdComponentState', - defaultValue: undefined, - componentInstanceContext: SingleRecordPickerComponentInstanceContext, - }); +export const singleRecordPickerSelectedIdComponentState = createComponentState< + string | undefined +>({ + key: 'singleRecordPickerSelectedIdComponentState', + defaultValue: undefined, + componentInstanceContext: SingleRecordPickerComponentInstanceContext, +}); diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerShouldShowInitialLoadingComponentState.ts b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerShouldShowInitialLoadingComponentState.ts index 81dd2f46e2..677c67753c 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerShouldShowInitialLoadingComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerShouldShowInitialLoadingComponentState.ts @@ -1,8 +1,8 @@ import { SingleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/single-record-picker/states/contexts/SingleRecordPickerComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const singleRecordPickerShouldShowInitialLoadingComponentState = - createComponentStateV2({ + createComponentState({ key: 'singleRecordPickerShouldShowInitialLoadingComponentState', defaultValue: false, componentInstanceContext: SingleRecordPickerComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerShouldShowSkeletonComponentState.ts b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerShouldShowSkeletonComponentState.ts index 073c86517f..24a0218a04 100644 --- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerShouldShowSkeletonComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/states/singleRecordPickerShouldShowSkeletonComponentState.ts @@ -1,8 +1,8 @@ import { SingleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/single-record-picker/states/contexts/SingleRecordPickerComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const singleRecordPickerShouldShowSkeletonComponentState = - createComponentStateV2({ + createComponentState({ key: 'singleRecordPickerShouldShowSkeletonComponentState', defaultValue: false, componentInstanceContext: SingleRecordPickerComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainerContextStoreTargetedRecordsEffect.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainerContextStoreTargetedRecordsEffect.tsx index 176fce2478..ff78722e4f 100644 --- a/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainerContextStoreTargetedRecordsEffect.tsx +++ b/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainerContextStoreTargetedRecordsEffect.tsx @@ -1,6 +1,6 @@ import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState'; import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { useEffect } from 'react'; export const RecordShowContainerContextStoreTargetedRecordsEffect = ({ @@ -8,11 +8,11 @@ export const RecordShowContainerContextStoreTargetedRecordsEffect = ({ }: { recordId: string; }) => { - const setContextStoreTargetedRecordsRule = useSetRecoilComponentStateV2( + const setContextStoreTargetedRecordsRule = useSetRecoilComponentState( contextStoreTargetedRecordsRuleComponentState, ); - const setContextStoreNumberOfSelectedRecords = useSetRecoilComponentStateV2( + const setContextStoreNumberOfSelectedRecords = useSetRecoilComponentState( contextStoreNumberOfSelectedRecordsComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsListItem.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsListItem.tsx index 6f731e04d4..7364985d72 100644 --- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsListItem.tsx +++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsListItem.tsx @@ -38,8 +38,8 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown'; import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState'; import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal'; import { useModal } from '@/ui/layout/modal/hooks/useModal'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { createPortal } from 'react-dom'; import { IconChevronDown, @@ -165,7 +165,7 @@ export const RecordDetailRelationRecordsListItem = ({ const dropdownInstanceId = `record-field-card-menu-${relationFieldMetadataId}-${relationRecord.id}`; const { closeDropdown } = useCloseDropdown(); - const isDropdownOpen = useRecoilComponentValueV2( + const isDropdownOpen = useRecoilComponentValue( isDropdownOpenComponentState, dropdownInstanceId, ); @@ -174,7 +174,7 @@ export const RecordDetailRelationRecordsListItem = ({ fieldDefinition, recordId, }); - const setSingleRecordPickerSelectedId = useSetRecoilComponentStateV2( + const setSingleRecordPickerSelectedId = useSetRecoilComponentState( singleRecordPickerSelectedIdComponentState, dropdownId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx index c071714067..2a227400aa 100644 --- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx +++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx @@ -18,7 +18,7 @@ import { prefetchIndexViewIdFromObjectMetadataItemFamilySelector } from '@/prefe import { AppPath } from '@/types/AppPath'; import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useLingui } from '@lingui/react/macro'; import { ViewFilterOperand } from 'twenty-shared/src/types/ViewFilterOperand'; import { RelationType } from '~/generated-metadata/graphql'; @@ -70,7 +70,7 @@ export const RecordDetailRelationSection = ({ recordId, }); - const isDropdownOpen = useRecoilComponentValueV2( + const isDropdownOpen = useRecoilComponentValue( isDropdownOpenComponentState, dropdownId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSectionDropdownToMany.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSectionDropdownToMany.tsx index f930f13c7a..4e55eef020 100644 --- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSectionDropdownToMany.tsx +++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSectionDropdownToMany.tsx @@ -18,8 +18,8 @@ import { ObjectRecord } from '@/object-record/types/ObjectRecord'; import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown'; import { dropdownPlacementComponentState } from '@/ui/layout/dropdown/states/dropdownPlacementComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { IconPlus } from 'twenty-ui/display'; import { LightIconButton } from 'twenty-ui/input'; @@ -53,24 +53,23 @@ export const RecordDetailRelationSectionDropdownToMany = () => { const { closeDropdown } = useCloseDropdown(); - const dropdownPlacement = useRecoilComponentValueV2( + const dropdownPlacement = useRecoilComponentValue( dropdownPlacementComponentState, dropdownId, ); - const setMultipleRecordPickerSearchFilter = useSetRecoilComponentStateV2( + const setMultipleRecordPickerSearchFilter = useSetRecoilComponentState( multipleRecordPickerSearchFilterComponentState, dropdownId, ); - const setMultipleRecordPickerPickableMorphItems = - useSetRecoilComponentStateV2( - multipleRecordPickerPickableMorphItemsComponentState, - dropdownId, - ); + const setMultipleRecordPickerPickableMorphItems = useSetRecoilComponentState( + multipleRecordPickerPickableMorphItemsComponentState, + dropdownId, + ); const setMultipleRecordPickerSearchableObjectMetadataItems = - useSetRecoilComponentStateV2( + useSetRecoilComponentState( multipleRecordPickerSearchableObjectMetadataItemsComponentState, dropdownId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSectionDropdownToOne.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSectionDropdownToOne.tsx index b69df3a37a..3fc19cedf4 100644 --- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSectionDropdownToOne.tsx +++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSectionDropdownToOne.tsx @@ -18,8 +18,8 @@ import { ObjectRecord } from '@/object-record/types/ObjectRecord'; import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown'; import { dropdownPlacementComponentState } from '@/ui/layout/dropdown/states/dropdownPlacementComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { IconForbid, IconPencil } from 'twenty-ui/display'; import { LightIconButton } from 'twenty-ui/input'; @@ -55,17 +55,17 @@ export const RecordDetailRelationSectionDropdownToOne = () => { const { closeDropdown } = useCloseDropdown(); - const dropdownPlacement = useRecoilComponentValueV2( + const dropdownPlacement = useRecoilComponentValue( dropdownPlacementComponentState, dropdownId, ); - const setSingleRecordPickerSearchFilter = useSetRecoilComponentStateV2( + const setSingleRecordPickerSearchFilter = useSetRecoilComponentState( singleRecordPickerSearchFilterComponentState, dropdownId, ); - const setSingleRecordPickerSelectedId = useSetRecoilComponentStateV2( + const setSingleRecordPickerSelectedId = useSetRecoilComponentState( singleRecordPickerSelectedIdComponentState, dropdownId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-sort/hooks/useRemoveRecordSort.ts b/packages/twenty-front/src/modules/object-record/record-sort/hooks/useRemoveRecordSort.ts index 58d4101325..7a2c516997 100644 --- a/packages/twenty-front/src/modules/object-record/record-sort/hooks/useRemoveRecordSort.ts +++ b/packages/twenty-front/src/modules/object-record/record-sort/hooks/useRemoveRecordSort.ts @@ -1,10 +1,10 @@ import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { useRecoilCallback } from 'recoil'; export const useRemoveRecordSort = () => { - const currentRecordSortsCallbackState = useRecoilComponentCallbackStateV2( + const currentRecordSortsCallbackState = useRecoilComponentCallbackState( currentRecordSortsComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-sort/hooks/useUpsertRecordSort.ts b/packages/twenty-front/src/modules/object-record/record-sort/hooks/useUpsertRecordSort.ts index 95aea458a0..a0bd0c6e79 100644 --- a/packages/twenty-front/src/modules/object-record/record-sort/hooks/useUpsertRecordSort.ts +++ b/packages/twenty-front/src/modules/object-record/record-sort/hooks/useUpsertRecordSort.ts @@ -1,11 +1,11 @@ import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState'; import { RecordSort } from '@/object-record/record-sort/types/RecordSort'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { useRecoilCallback } from 'recoil'; export const useUpsertRecordSort = () => { - const currentRecordSortsCallbackState = useRecoilComponentCallbackStateV2( + const currentRecordSortsCallbackState = useRecoilComponentCallbackState( currentRecordSortsComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-sort/states/currentRecordSortsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-sort/states/currentRecordSortsComponentState.ts index 560e374966..8f8cae6fe5 100644 --- a/packages/twenty-front/src/modules/object-record/record-sort/states/currentRecordSortsComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-sort/states/currentRecordSortsComponentState.ts @@ -1,8 +1,8 @@ import { RecordSortsComponentInstanceContext } from '@/object-record/record-sort/states/context/RecordSortsComponentInstanceContext'; import { RecordSort } from '@/object-record/record-sort/types/RecordSort'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const currentRecordSortsComponentState = createComponentStateV2< +export const currentRecordSortsComponentState = createComponentState< RecordSort[] >({ key: 'currentRecordSortsComponentState', diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx index b807ad97c6..6b257a927b 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx @@ -14,7 +14,7 @@ import { useRecordTableContextOrThrow } from '@/object-record/record-table/conte import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable'; import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState'; import { useClickOutsideListener } from '@/ui/utilities/pointer-event/hooks/useClickOutsideListener'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const RecordTable = () => { const { recordTableId, objectNameSingular, objectMetadataItem } = @@ -30,17 +30,17 @@ export const RecordTable = () => { RECORD_TABLE_CLICK_OUTSIDE_LISTENER_ID, ); - const isRecordTableInitialLoading = useRecoilComponentValueV2( + const isRecordTableInitialLoading = useRecoilComponentValue( isRecordTableInitialLoadingComponentState, recordTableId, ); - const allRecordIds = useRecoilComponentValueV2( + const allRecordIds = useRecoilComponentValue( recordIndexAllRecordIdsComponentSelector, recordTableId, ); - const hasRecordGroups = useRecoilComponentValueV2( + const hasRecordGroups = useRecoilComponentValue( hasRecordGroupsComponentSelector, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContextProvider.tsx index 6311fa8e1c..6861c34f69 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContextProvider.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContextProvider.tsx @@ -5,7 +5,7 @@ import { RecordTableContextProvider as RecordTableContextInternalProvider } from import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject'; import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; type RecordTableContextProviderProps = { viewBarId: string; @@ -28,7 +28,7 @@ export const RecordTableContextProvider = ({ objectMetadataItem.id, ); - const visibleTableColumns = useRecoilComponentValueV2( + const visibleTableColumns = useRecoilComponentValue( visibleTableColumnsComponentSelector, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsx index 339215d6c5..d3af15fa1b 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsx @@ -6,8 +6,8 @@ import { useCloseRecordTableCellNoGroup } from '@/object-record/record-table/rec import { useMoveHoverToCurrentCell } from '@/object-record/record-table/record-table-cell/hooks/useMoveHoverToCurrentCell'; import { OpenTableCellArgs, - useOpenRecordTableCellV2, -} from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCellV2'; + useOpenRecordTableCell, +} from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell'; import { useTriggerActionMenuDropdown } from '@/object-record/record-table/record-table-cell/hooks/useTriggerActionMenuDropdown'; import { MoveFocusDirection } from '@/object-record/record-table/types/MoveFocusDirection'; import { TableCellPosition } from '@/object-record/record-table/types/TableCellPosition'; @@ -22,7 +22,7 @@ export const RecordTableNoRecordGroupBodyContextProvider = ({ }: RecordTableNoRecordGroupBodyContextProviderProps) => { const { recordTableId } = useRecordTableContextOrThrow(); - const { openTableCell } = useOpenRecordTableCellV2(recordTableId); + const { openTableCell } = useOpenRecordTableCell(recordTableId); const handleOpenTableCell = (args: OpenTableCellArgs) => { openTableCell(args); diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupRows.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupRows.tsx index 1feefdd81e..338b12dc2d 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupRows.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupRows.tsx @@ -4,14 +4,14 @@ import { RecordTableBodyFetchMoreLoader } from '@/object-record/record-table/rec import { RecordTableAggregateFooter } from '@/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter'; import { RecordTableRow } from '@/object-record/record-table/record-table-row/components/RecordTableRow'; import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const RecordTableNoRecordGroupRows = () => { - const allRecordIds = useRecoilComponentValueV2( + const allRecordIds = useRecoilComponentValue( recordIndexAllRecordIdsComponentSelector, ); - const isRecordTableInitialLoading = useRecoilComponentValueV2( + const isRecordTableInitialLoading = useRecoilComponentValue( isRecordTableInitialLoadingComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupBodyContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupBodyContextProvider.tsx index b5b020556d..2f3b6614c8 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupBodyContextProvider.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupBodyContextProvider.tsx @@ -6,8 +6,8 @@ import { useCloseRecordTableCellInGroup } from '@/object-record/record-table/rec import { useMoveHoverToCurrentCell } from '@/object-record/record-table/record-table-cell/hooks/useMoveHoverToCurrentCell'; import { OpenTableCellArgs, - useOpenRecordTableCellV2, -} from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCellV2'; + useOpenRecordTableCell, +} from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell'; import { useTriggerActionMenuDropdown } from '@/object-record/record-table/record-table-cell/hooks/useTriggerActionMenuDropdown'; import { MoveFocusDirection } from '@/object-record/record-table/types/MoveFocusDirection'; import { TableCellPosition } from '@/object-record/record-table/types/TableCellPosition'; @@ -23,7 +23,7 @@ export const RecordTableRecordGroupBodyContextProvider = ({ }: RecordTableRecordGroupBodyContextProviderProps) => { const { recordTableId } = useRecordTableContextOrThrow(); - const { openTableCell } = useOpenRecordTableCellV2(recordTableId); + const { openTableCell } = useOpenRecordTableCell(recordTableId); const handleOpenTableCell = (args: OpenTableCellArgs) => { openTableCell(args); 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.tsx index a921110103..db5eb79cfe 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 @@ -7,24 +7,24 @@ import { RecordTableRow } from '@/object-record/record-table/record-table-row/co import { RecordTableRecordGroupSectionAddNew } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew'; import { RecordTableRecordGroupSectionLoadMore } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionLoadMore'; import { isRecordGroupTableSectionToggledComponentState } from '@/object-record/record-table/record-table-section/states/isRecordGroupTableSectionToggledComponentState'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useMemo } from 'react'; import { isDefined } from 'twenty-shared/utils'; export const RecordTableRecordGroupRows = () => { const currentRecordGroupId = useCurrentRecordGroupId(); - const allRecordIds = useRecoilComponentValueV2( + const allRecordIds = useRecoilComponentValue( recordIndexAllRecordIdsComponentSelector, ); - const recordIdsByGroup = useRecoilComponentFamilyValueV2( + const recordIdsByGroup = useRecoilComponentFamilyValue( recordIndexRecordIdsByGroupComponentFamilyState, currentRecordGroupId, ); - const isRecordGroupTableSectionToggled = useRecoilComponentFamilyValueV2( + const isRecordGroupTableSectionToggled = useRecoilComponentFamilyValue( isRecordGroupTableSectionToggledComponentState, currentRecordGroupId, ); 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.tsx index 02a78eca93..d04cdbbc5e 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 @@ -1,19 +1,19 @@ import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext'; import { isRecordTableCellFocusActiveComponentState } from '@/object-record/record-table/states/isRecordTableCellFocusActiveComponentState'; import { recordTableFocusPositionComponentState } from '@/object-record/record-table/states/recordTableFocusPositionComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useEffect } from 'react'; import { isDefined } from 'twenty-shared/utils'; export const RecordTableScrollToFocusedCellEffect = () => { const { recordTableId } = useRecordTableContextOrThrow(); - const isRecordTableCellFocusActive = useRecoilComponentValueV2( + const isRecordTableCellFocusActive = useRecoilComponentValue( isRecordTableCellFocusActiveComponentState, recordTableId, ); - const focusPosition = useRecoilComponentValueV2( + const focusPosition = useRecoilComponentValue( recordTableFocusPositionComponentState, recordTableId, ); 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.tsx index 23643452da..50ab9f0bc1 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 @@ -2,24 +2,24 @@ import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext'; import { focusedRecordTableRowIndexComponentState } from '@/object-record/record-table/states/focusedRecordTableRowIndexComponentState'; import { isRecordTableRowFocusActiveComponentState } from '@/object-record/record-table/states/isRecordTableRowFocusActiveComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useEffect } from 'react'; import { isDefined } from 'twenty-shared/utils'; export const RecordTableScrollToFocusedRowEffect = () => { const { recordTableId } = useRecordTableContextOrThrow(); - const focusedRowIndex = useRecoilComponentValueV2( + const focusedRowIndex = useRecoilComponentValue( focusedRecordTableRowIndexComponentState, recordTableId, ); - const isRowFocusActive = useRecoilComponentValueV2( + const isRowFocusActive = useRecoilComponentValue( isRecordTableRowFocusActiveComponentState, recordTableId, ); - const allRecordIds = useRecoilComponentValueV2( + const allRecordIds = useRecoilComponentValue( recordIndexAllRecordIdsComponentSelector, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableStickyBottomEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableStickyBottomEffect.tsx index d5ff4bb8c5..325e9a4338 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableStickyBottomEffect.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableStickyBottomEffect.tsx @@ -1,10 +1,10 @@ import { useEffect } from 'react'; import { scrollWrapperScrollBottomComponentState } from '@/ui/utilities/scroll/states/scrollWrapperScrollBottomComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const RecordTableStickyBottomEffect = () => { - const scrollBottom = useRecoilComponentValueV2( + const scrollBottom = useRecoilComponentValue( scrollWrapperScrollBottomComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableStickyEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableStickyEffect.tsx index e4a0c684a3..4b9ba847a3 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableStickyEffect.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableStickyEffect.tsx @@ -3,11 +3,11 @@ import { useEffect } from 'react'; import { isRecordTableScrolledLeftComponentState } from '@/object-record/record-table/states/isRecordTableScrolledLeftComponentState'; import { scrollWrapperScrollLeftComponentState } from '@/ui/utilities/scroll/states/scrollWrapperScrollLeftComponentState'; import { scrollWrapperScrollTopComponentState } from '@/ui/utilities/scroll/states/scrollWrapperScrollTopComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; export const RecordTableStickyEffect = () => { - const scrollTop = useRecoilComponentValueV2( + const scrollTop = useRecoilComponentValue( scrollWrapperScrollTopComponentState, ); @@ -23,11 +23,11 @@ export const RecordTableStickyEffect = () => { } }, [scrollTop]); - const scrollLeft = useRecoilComponentValueV2( + const scrollLeft = useRecoilComponentValue( scrollWrapperScrollLeftComponentState, ); - const setIsRecordTableScrolledLeft = useSetRecoilComponentStateV2( + const setIsRecordTableScrolledLeft = useSetRecoilComponentState( isRecordTableScrolledLeftComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableBodyContext.ts b/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableBodyContext.ts index 0b1c2c94f8..7803fbdfd7 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableBodyContext.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableBodyContext.ts @@ -1,7 +1,7 @@ import React from 'react'; import { HandleContainerMouseEnterArgs } from '@/object-record/record-table/hooks/internal/useHandleContainerMouseEnter'; -import { OpenTableCellArgs } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCellV2'; +import { OpenTableCellArgs } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell'; import { MoveFocusDirection } from '@/object-record/record-table/types/MoveFocusDirection'; import { TableCellPosition } from '@/object-record/record-table/types/TableCellPosition'; import { createRequiredContext } from '~/utils/createRequiredContext'; diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyHandler.tsx b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyHandler.tsx index 9913b03285..2ea23f9efa 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyHandler.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyHandler.tsx @@ -1,7 +1,7 @@ import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector'; import { RecordTableEmptyState } from '@/object-record/record-table/empty-state/components/RecordTableEmptyState'; import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; type RecordTableEmptyHandlerProps = { recordTableId: string; @@ -12,12 +12,12 @@ export const RecordTableEmptyHandler = ({ recordTableId, children, }: RecordTableEmptyHandlerProps) => { - const isRecordTableInitialLoading = useRecoilComponentValueV2( + const isRecordTableInitialLoading = useRecoilComponentValue( isRecordTableInitialLoadingComponentState, recordTableId, ); - const allRecordIds = useRecoilComponentValueV2( + const allRecordIds = useRecoilComponentValue( recordIndexAllRecordIdsComponentSelector, recordTableId, ); 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.tsx index 21e95563a2..2b606f3a58 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 @@ -7,7 +7,7 @@ import { RecordTableEmptyStateReadOnly } from '@/object-record/record-table/empt import { RecordTableEmptyStateRemote } from '@/object-record/record-table/empty-state/components/RecordTableEmptyStateRemote'; import { RecordTableEmptyStateSoftDelete } from '@/object-record/record-table/empty-state/components/RecordTableEmptyStateSoftDelete'; import { isSoftDeleteFilterActiveComponentState } from '@/object-record/record-table/states/isSoftDeleteFilterActiveComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const RecordTableEmptyState = () => { const { recordTableId, objectNameSingular, objectMetadataItem } = @@ -18,7 +18,7 @@ export const RecordTableEmptyState = () => { const isRemote = objectMetadataItem.isRemote; - const isSoftDeleteActive = useRecoilComponentValueV2( + const isSoftDeleteActive = useRecoilComponentValue( isSoftDeleteFilterActiveComponentState, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateSoftDelete.tsx b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateSoftDelete.tsx index 3f518cfa46..796182d3a3 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateSoftDelete.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateSoftDelete.tsx @@ -4,7 +4,7 @@ import { useRemoveRecordFilter } from '@/object-record/record-filter/hooks/useRe import { useHandleToggleTrashColumnFilter } from '@/object-record/record-index/hooks/useHandleToggleTrashColumnFilter'; import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext'; import { RecordTableEmptyStateDisplay } from '@/object-record/record-table/empty-state/components/RecordTableEmptyStateDisplay'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState'; import { isDefined } from 'twenty-shared/utils'; @@ -14,7 +14,7 @@ export const RecordTableEmptyStateSoftDelete = () => { const { objectMetadataItem, objectNameSingular, recordTableId } = useRecordTableContextOrThrow(); - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode.ts index 4540b7fc74..54d3a9ca59 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode.ts @@ -4,11 +4,11 @@ import { recordTableCellEditModePositionComponentState } from '@/object-record/r import { useGoBackToPreviousDropdownFocusId } from '@/ui/layout/dropdown/hooks/useGoBackToPreviousDropdownFocusId'; import { useRemoveLastFocusItemFromFocusStackByComponentType } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackByComponentType'; import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; export const useCloseCurrentTableCellInEditMode = (recordTableId?: string) => { const currentTableCellInEditModePositionState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( recordTableCellEditModePositionComponentState, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useHandleContainerMouseEnter.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useHandleContainerMouseEnter.ts index d508256061..b54991d503 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useHandleContainerMouseEnter.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useHandleContainerMouseEnter.ts @@ -3,7 +3,7 @@ import { useRecoilCallback } from 'recoil'; import { useMoveHoverToCurrentCell } from '@/object-record/record-table/record-table-cell/hooks/useMoveHoverToCurrentCell'; import { isSomeCellInEditModeComponentSelector } from '@/object-record/record-table/states/selectors/isSomeCellInEditModeComponentSelector'; import { TableCellPosition } from '@/object-record/record-table/types/TableCellPosition'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; export type HandleContainerMouseEnterArgs = { @@ -17,7 +17,7 @@ export const useHandleContainerMouseEnter = ({ }) => { const { moveHoverToCurrentCell } = useMoveHoverToCurrentCell(recordTableId); - const isSomeCellInEditModeSelector = useRecoilComponentCallbackStateV2( + const isSomeCellInEditModeSelector = useRecoilComponentCallbackState( isSomeCellInEditModeComponentSelector, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useLeaveTableFocus.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useLeaveTableFocus.ts index 6ff315acf6..1e19053dce 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useLeaveTableFocus.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useLeaveTableFocus.ts @@ -6,7 +6,7 @@ import { useUnfocusRecordTableCell } from '@/object-record/record-table/record-t import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; import { recordTableHoverPositionComponentState } from '@/object-record/record-table/states/recordTableHoverPositionComponentState'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; export const useLeaveTableFocus = (recordTableId?: string) => { const recordTableIdFromContext = useAvailableComponentInstanceIdOrThrow( @@ -18,7 +18,7 @@ export const useLeaveTableFocus = (recordTableId?: string) => { recordTableIdFromContext, ); - const setRecordTableHoverPosition = useSetRecoilComponentStateV2( + const setRecordTableHoverPosition = useSetRecoilComponentState( recordTableHoverPositionComponentState, recordTableIdFromContext, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.ts index 331b8d0ce0..8c2bb52cd6 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.ts @@ -8,7 +8,7 @@ import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { lastSelectedRowIndexComponentState } from '../../record-table-row/states/lastSelectedRowIndexComponentState'; @@ -18,23 +18,23 @@ export const useResetTableRowSelection = (recordTableId?: string) => { recordTableId, ); - const recordIndexAllRecordIdsSelector = useRecoilComponentCallbackStateV2( + const recordIndexAllRecordIdsSelector = useRecoilComponentCallbackState( recordIndexAllRecordIdsComponentSelector, recordTableIdFromContext, ); - const isRowSelectedFamilyState = useRecoilComponentCallbackStateV2( + const isRowSelectedFamilyState = useRecoilComponentCallbackState( isRowSelectedComponentFamilyState, recordTableIdFromContext, ); - const hasUserSelectedAllRowsState = useRecoilComponentCallbackStateV2( + const hasUserSelectedAllRowsState = useRecoilComponentCallbackState( hasUserSelectedAllRowsComponentState, recordTableIdFromContext, ); const lastSelectedRowIndexComponentCallbackState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( lastSelectedRowIndexComponentState, recordTableIdFromContext, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSelectAllRows.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSelectAllRows.ts index ed9d7b8d50..7315b3af39 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSelectAllRows.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSelectAllRows.ts @@ -4,19 +4,19 @@ import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection'; import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState'; import { allRowsSelectedStatusComponentSelector } from '@/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; export const useSelectAllRows = (recordTableId?: string) => { - const allRowsSelectedStatusSelector = useRecoilComponentCallbackStateV2( + const allRowsSelectedStatusSelector = useRecoilComponentCallbackState( allRowsSelectedStatusComponentSelector, recordTableId, ); - const isRowSelectedFamilyState = useRecoilComponentCallbackStateV2( + const isRowSelectedFamilyState = useRecoilComponentCallbackState( isRowSelectedComponentFamilyState, recordTableId, ); - const recordIndexAllRecordIdsSelector = useRecoilComponentCallbackStateV2( + const recordIndexAllRecordIdsSelector = useRecoilComponentCallbackState( recordIndexAllRecordIdsComponentSelector, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetAllRowSelectedState.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetAllRowSelectedState.ts index dd1695d9db..859c36f008 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetAllRowSelectedState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetAllRowSelectedState.ts @@ -1,10 +1,10 @@ import { useRecoilCallback } from 'recoil'; import { hasUserSelectedAllRowsComponentState } from '@/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; export const useSetHasUserSelectedAllRows = (recordTableId?: string) => { - const hasUserSelectedAllRowsState = useRecoilComponentCallbackStateV2( + const hasUserSelectedAllRowsState = useRecoilComponentCallbackState( hasUserSelectedAllRowsComponentState, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts index 8757fe4479..4500fdbd2e 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts @@ -10,9 +10,9 @@ import { hasUserSelectedAllRowsComponentState } from '@/object-record/record-tab import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState'; import { recordTableHoverPositionComponentState } from '@/object-record/record-table/states/recordTableHoverPositionComponentState'; import { ObjectRecord } from '@/object-record/types/ObjectRecord'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; -import { useRecoilComponentFamilyCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyCallbackStateV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; +import { useRecoilComponentFamilyCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyCallbackState'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { isDefined } from 'twenty-shared/utils'; import { isDeeplyEqual } from '~/utils/isDeeplyEqual'; @@ -25,27 +25,27 @@ export const useSetRecordTableData = ({ recordTableId, }: useSetRecordTableDataProps) => { const recordIndexRecordIdsByGroupFamilyState = - useRecoilComponentFamilyCallbackStateV2( + useRecoilComponentFamilyCallbackState( recordIndexRecordIdsByGroupComponentFamilyState, recordTableId, ); - const recordIndexAllRecordIdsSelector = useRecoilComponentCallbackStateV2( + const recordIndexAllRecordIdsSelector = useRecoilComponentCallbackState( recordIndexAllRecordIdsComponentSelector, recordTableId, ); - const isRowSelectedFamilyState = useRecoilComponentFamilyCallbackStateV2( + const isRowSelectedFamilyState = useRecoilComponentFamilyCallbackState( isRowSelectedComponentFamilyState, recordTableId, ); - const hasUserSelectedAllRowsState = useRecoilComponentCallbackStateV2( + const hasUserSelectedAllRowsState = useRecoilComponentCallbackState( hasUserSelectedAllRowsComponentState, recordTableId, ); - const setRecordTableHoverPosition = useSetRecoilComponentStateV2( + const setRecordTableHoverPosition = useSetRecoilComponentState( recordTableHoverPositionComponentState, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRowSelectedState.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRowSelectedState.ts index dd70687820..1869fee055 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRowSelectedState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRowSelectedState.ts @@ -1,10 +1,10 @@ import { useRecoilCallback } from 'recoil'; import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; export const useSetRowSelectedState = (recordTableId?: string) => { - const isRowSelectedFamilyState = useRecoilComponentCallbackStateV2( + const isRowSelectedFamilyState = useRecoilComponentCallbackState( isRowSelectedComponentFamilyState, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/useActiveRecordTableRow.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/useActiveRecordTableRow.ts index 9a586a69c7..28b25730fe 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/hooks/useActiveRecordTableRow.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/useActiveRecordTableRow.ts @@ -1,16 +1,16 @@ import { activeRecordTableRowIndexComponentState } from '@/object-record/record-table/states/activeRecordTableRowIndexComponentState'; import { isRecordTableRowActiveComponentFamilyState } from '@/object-record/record-table/states/isRecordTableRowActiveComponentFamilyState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useRecoilCallback } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; export const useActiveRecordTableRow = (recordTableId?: string) => { - const isRowActiveState = useRecoilComponentCallbackStateV2( + const isRowActiveState = useRecoilComponentCallbackState( isRecordTableRowActiveComponentFamilyState, recordTableId, ); - const activeRowIndexState = useRecoilComponentCallbackStateV2( + const activeRowIndexState = useRecoilComponentCallbackState( activeRecordTableRowIndexComponentState, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/useAggregateRecordsForHeader.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/useAggregateRecordsForHeader.ts index 4a328637aa..393d01ffac 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/hooks/useAggregateRecordsForHeader.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/useAggregateRecordsForHeader.ts @@ -9,7 +9,7 @@ import { currentRecordFiltersComponentState } from '@/object-record/record-filte import { computeRecordGqlOperationFilter } from '@/object-record/record-filter/utils/computeRecordGqlOperationFilter'; import { turnAnyFieldFilterIntoRecordGqlFilter } from '@/object-record/record-filter/utils/turnAnyFieldFilterIntoRecordGqlFilter'; import { recordIndexKanbanAggregateOperationState } from '@/object-record/record-index/states/recordIndexKanbanAggregateOperationState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { UserContext } from '@/users/contexts/UserContext'; import { useContext } from 'react'; import { useRecoilValue } from 'recoil'; @@ -26,11 +26,11 @@ export const useAggregateRecordsForHeader = ({ objectMetadataItem, additionalFilters = {}, }: UseAggregateRecordsProps) => { - const currentRecordFilterGroups = useRecoilComponentValueV2( + const currentRecordFilterGroups = useRecoilComponentValue( currentRecordFilterGroupsComponentState, ); - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); @@ -56,7 +56,7 @@ export const useAggregateRecordsForHeader = ({ recordIndexKanbanAggregateOperation, }); - const anyFieldFilterValue = useRecoilComponentValueV2( + const anyFieldFilterValue = useRecoilComponentValue( anyFieldFilterValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/useBuildRecordInputFromFilters.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/useBuildRecordInputFromFilters.ts index 70ba3269c6..6fd1e502b5 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/hooks/useBuildRecordInputFromFilters.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/useBuildRecordInputFromFilters.ts @@ -4,7 +4,7 @@ import { currentRecordFiltersComponentState } from '@/object-record/record-filte import { buildValueFromFilter } from '@/object-record/record-table/utils/buildRecordInputFromFilter'; import { ObjectRecord } from '@/object-record/types/ObjectRecord'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useRecoilValue } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; @@ -14,7 +14,7 @@ export const useBuildRecordInputFromFilters = ({ objectMetadataItem: ObjectMetadataItem; }) => { // we might need to build a recoil callback for better performance - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/useFocusedRecordTableRow.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/useFocusedRecordTableRow.ts index 4272dbe92b..a74968bb27 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/hooks/useFocusedRecordTableRow.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/useFocusedRecordTableRow.ts @@ -10,7 +10,7 @@ import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePush import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById'; import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useRecoilCallback } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; @@ -20,27 +20,27 @@ export const useFocusedRecordTableRow = (recordTableId?: string) => { recordTableId, ); - const isRowFocusedState = useRecoilComponentCallbackStateV2( + const isRowFocusedState = useRecoilComponentCallbackState( isRecordTableRowFocusedComponentFamilyState, recordTableIdFromContext, ); - const focusedRowIndexState = useRecoilComponentCallbackStateV2( + const focusedRowIndexState = useRecoilComponentCallbackState( focusedRecordTableRowIndexComponentState, recordTableIdFromContext, ); - const isRowFocusActiveState = useRecoilComponentCallbackStateV2( + const isRowFocusActiveState = useRecoilComponentCallbackState( isRecordTableRowFocusActiveComponentState, recordTableIdFromContext, ); - const focusedCellPositionState = useRecoilComponentCallbackStateV2( + const focusedCellPositionState = useRecoilComponentCallbackState( recordTableFocusPositionComponentState, recordTableIdFromContext, ); - const isRecordTableCellFocusActiveState = useRecoilComponentCallbackStateV2( + const isRecordTableCellFocusActiveState = useRecoilComponentCallbackState( isRecordTableCellFocusActiveComponentState, recordTableIdFromContext, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTable.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTable.ts index 7852ba5225..33d3519402 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTable.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTable.ts @@ -14,8 +14,8 @@ import { onColumnsChangeComponentState } from '@/object-record/record-table/stat import { onToggleColumnSortComponentState } from '@/object-record/record-table/states/onToggleColumnSortComponentState'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { useLeaveTableFocus } from './internal/useLeaveTableFocus'; import { useResetTableRowSelection } from './internal/useResetTableRowSelection'; import { useSelectAllRows } from './internal/useSelectAllRows'; @@ -30,7 +30,7 @@ export const useRecordTable = (props?: useRecordTableProps) => { props?.recordTableId, ); - const availableTableColumnsState = useRecoilComponentCallbackStateV2( + const availableTableColumnsState = useRecoilComponentCallbackState( availableTableColumnsComponentState, recordTableId, ); @@ -51,22 +51,22 @@ export const useRecordTable = (props?: useRecordTableProps) => { [availableTableColumnsState], ); - const setOnColumnsChange = useSetRecoilComponentStateV2( + const setOnColumnsChange = useSetRecoilComponentState( onColumnsChangeComponentState, recordTableId, ); - const setOnToggleColumnSort = useSetRecoilComponentStateV2( + const setOnToggleColumnSort = useSetRecoilComponentState( onToggleColumnSortComponentState, recordTableId, ); - const setIsRecordTableInitialLoading = useSetRecoilComponentStateV2( + const setIsRecordTableInitialLoading = useSetRecoilComponentState( isRecordTableInitialLoadingComponentState, recordTableId, ); - const onColumnsChangeState = useRecoilComponentCallbackStateV2( + const onColumnsChangeState = useRecoilComponentCallbackState( onColumnsChangeComponentState, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTableMoveFocusedCell.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTableMoveFocusedCell.ts index b2d96e5894..6ea1215c0f 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTableMoveFocusedCell.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTableMoveFocusedCell.ts @@ -7,17 +7,17 @@ import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record import { useFocusRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useFocusRecordTableCell'; import { recordTableFocusPositionComponentState } from '@/object-record/record-table/states/recordTableFocusPositionComponentState'; import { numberOfTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/numberOfTableColumnsComponentSelector'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; export const useRecordTableMoveFocusedCell = (recordTableId?: string) => { const { focusRecordTableCell } = useFocusRecordTableCell(recordTableId); - const focusPositionState = useRecoilComponentCallbackStateV2( + const focusPositionState = useRecoilComponentCallbackState( recordTableFocusPositionComponentState, recordTableId, ); - const recordIndexAllRecordIdsSelector = useRecoilComponentCallbackStateV2( + const recordIndexAllRecordIdsSelector = useRecoilComponentCallbackState( recordIndexAllRecordIdsComponentSelector, recordTableId, ); @@ -64,7 +64,7 @@ export const useRecordTableMoveFocusedCell = (recordTableId?: string) => { [recordIndexAllRecordIdsSelector, focusRecordTableCell, focusPositionState], ); - const numberOfTableColumnsSelector = useRecoilComponentCallbackStateV2( + const numberOfTableColumnsSelector = useRecoilComponentCallbackState( numberOfTableColumnsComponentSelector, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTableMoveFocusedRow.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTableMoveFocusedRow.ts index 3a7bf93ced..38554806ed 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTableMoveFocusedRow.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTableMoveFocusedRow.ts @@ -4,19 +4,19 @@ import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record import { useFocusedRecordTableRow } from '@/object-record/record-table/hooks/useFocusedRecordTableRow'; import { focusedRecordTableRowIndexComponentState } from '@/object-record/record-table/states/focusedRecordTableRowIndexComponentState'; import { MoveFocusDirection } from '@/object-record/record-table/types/MoveFocusDirection'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { isDefined } from 'twenty-shared/utils'; export const useRecordTableMoveFocusedRow = (recordTableId?: string) => { const { focusRecordTableRow } = useFocusedRecordTableRow(recordTableId); - const focusedRowIndexState = useRecoilComponentCallbackStateV2( + const focusedRowIndexState = useRecoilComponentCallbackState( focusedRecordTableRowIndexComponentState, recordTableId, ); - const recordIndexAllRecordIdsSelector = useRecoilComponentCallbackStateV2( + const recordIndexAllRecordIdsSelector = useRecoilComponentCallbackState( recordIndexAllRecordIdsComponentSelector, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/useTableColumns.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/useTableColumns.ts index e27283cf3a..5b2b2d8a59 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/hooks/useTableColumns.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/useTableColumns.ts @@ -11,7 +11,7 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-tabl import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector'; import { tableColumnsComponentState } from '@/object-record/record-table/states/tableColumnsComponentState'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { ColumnDefinition } from '../types/ColumnDefinition'; type useRecordTableProps = { @@ -26,16 +26,16 @@ export const useTableColumns = (props: useRecordTableProps) => { const { setTableColumns } = useSetTableColumns(); - const availableTableColumns = useRecoilComponentValueV2( + const availableTableColumns = useRecoilComponentValue( availableTableColumnsComponentState, props?.recordTableId, ); - const tableColumns = useRecoilComponentValueV2( + const tableColumns = useRecoilComponentValue( tableColumnsComponentState, props?.recordTableId, ); - const visibleTableColumns = useRecoilComponentValueV2( + const visibleTableColumns = useRecoilComponentValue( visibleTableColumnsComponentSelector, props?.recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyDragDropContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyDragDropContextProvider.tsx index f1c1465152..abe6784cd4 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyDragDropContextProvider.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyDragDropContextProvider.tsx @@ -10,8 +10,8 @@ import { currentRecordSortsComponentState } from '@/object-record/record-sort/st import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState'; import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext'; import { useModal } from '@/ui/layout/modal/hooks/useModal'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { isDefined } from 'twenty-shared/utils'; @@ -26,11 +26,11 @@ export const RecordTableBodyDragDropContextProvider = ({ objectNameSingular, }); - const recordIndexAllRecordIdsSelector = useRecoilComponentCallbackStateV2( + const recordIndexAllRecordIdsSelector = useRecoilComponentCallbackState( recordIndexAllRecordIdsComponentSelector, ); - const currentRecordSorts = useRecoilComponentValueV2( + const currentRecordSorts = useRecoilComponentValue( currentRecordSortsComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyDroppable.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyDroppable.tsx index 6407f87402..306ce2bddb 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyDroppable.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyDroppable.tsx @@ -1,7 +1,7 @@ import { RecordTableBody } from '@/object-record/record-table/record-table-body/components/RecordTableBody'; import { RecordTableBodyDroppableContextProvider } from '@/object-record/record-table/record-table-body/contexts/RecordTableBodyDroppableContext'; import { recordTableHoverPositionComponentState } from '@/object-record/record-table/states/recordTableHoverPositionComponentState'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { Droppable } from '@hello-pangea/dnd'; import { ReactNode, useState } from 'react'; import { v4 } from 'uuid'; @@ -20,7 +20,7 @@ export const RecordTableBodyDroppable = ({ const [v4Persistable] = useState(v4()); const recordTableBodyId = `record-table-body${recordGroupId ? '-' + recordGroupId : ''}`; - const setRecordTableHoverPosition = useSetRecoilComponentStateV2( + const setRecordTableHoverPosition = useSetRecoilComponentState( recordTableHoverPositionComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyEscapeHotkeyEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyEscapeHotkeyEffect.tsx index f509e701f5..f4da11f906 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyEscapeHotkeyEffect.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyEscapeHotkeyEffect.tsx @@ -5,7 +5,7 @@ import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTabl import { isAtLeastOneTableRowSelectedSelector } from '@/object-record/record-table/record-table-row/states/isAtLeastOneTableRowSelectedSelector'; import { PageFocusId } from '@/types/PageFocusId'; import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const RecordTableBodyEscapeHotkeyEffect = () => { const { recordTableId } = useRecordTableContextOrThrow(); @@ -14,7 +14,7 @@ export const RecordTableBodyEscapeHotkeyEffect = () => { recordTableId, }); - const isAtLeastOneRecordSelected = useRecoilComponentValueV2( + const isAtLeastOneRecordSelected = useRecoilComponentValue( isAtLeastOneTableRowSelectedSelector, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyFetchMoreLoader.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyFetchMoreLoader.tsx index 5472ca86a6..428856610f 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyFetchMoreLoader.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyFetchMoreLoader.tsx @@ -4,10 +4,10 @@ import { useRecoilState } from 'recoil'; import { useRecordIndexTableFetchMore } from '@/object-record/record-index/hooks/useRecordIndexTableFetchMore'; import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext'; -import { hasRecordTableFetchedAllRecordsComponentStateV2 } from '@/object-record/record-table/states/hasRecordTableFetchedAllRecordsComponentStateV2'; +import { hasRecordTableFetchedAllRecordsComponentState } from '@/object-record/record-table/states/hasRecordTableFetchedAllRecordsComponentState'; import { isFetchingMoreRecordsFamilyState } from '@/object-record/states/isFetchingMoreRecordsFamilyState'; import { useScrollWrapperElement } from '@/ui/utilities/scroll/hooks/useScrollWrapperElement'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { GRAY_SCALE } from 'twenty-ui/theme'; const StyledText = styled.div` @@ -32,8 +32,8 @@ export const RecordTableBodyFetchMoreLoader = () => { const { scrollWrapperHTMLElement } = useScrollWrapperElement(); - const hasRecordTableFetchedAllRecordsComponents = useRecoilComponentValueV2( - hasRecordTableFetchedAllRecordsComponentStateV2, + const hasRecordTableFetchedAllRecordsComponents = useRecoilComponentValue( + hasRecordTableFetchedAllRecordsComponentState, ); const showLoadingMoreRow = !hasRecordTableFetchedAllRecordsComponents; diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyLoading.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyLoading.tsx index bb684e88ff..3a3d4c54a1 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyLoading.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyLoading.tsx @@ -5,10 +5,10 @@ import { RecordTableCellGrip } from '@/object-record/record-table/record-table-c import { RecordTableCellLoading } from '@/object-record/record-table/record-table-cell/components/RecordTableCellLoading'; import { RecordTableTr } from '@/object-record/record-table/record-table-row/components/RecordTableTr'; import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const RecordTableBodyLoading = () => { - const visibleTableColumns = useRecoilComponentValueV2( + const visibleTableColumns = useRecoilComponentValue( visibleTableColumnsComponentSelector, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyRecordGroupDragDropContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyRecordGroupDragDropContextProvider.tsx index f49a6269be..a4524806ad 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyRecordGroupDragDropContextProvider.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyRecordGroupDragDropContextProvider.tsx @@ -11,7 +11,7 @@ import { currentRecordSortsComponentState } from '@/object-record/record-sort/st import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState'; import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext'; import { useModal } from '@/ui/layout/modal/hooks/useModal'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { isDefined } from 'twenty-shared/utils'; @@ -29,11 +29,11 @@ export const RecordTableBodyRecordGroupDragDropContextProvider = ({ const { openModal } = useModal(); - const recordIdsByGroupFamilyState = useRecoilComponentCallbackStateV2( + const recordIdsByGroupFamilyState = useRecoilComponentCallbackState( recordIndexRecordIdsByGroupComponentFamilyState, ); - const currentRecordSortsCallbackState = useRecoilComponentCallbackStateV2( + const currentRecordSortsCallbackState = useRecoilComponentCallbackState( currentRecordSortsComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBody.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBody.tsx index ef9bf5ff21..469ad11008 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBody.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBody.tsx @@ -6,14 +6,14 @@ import { RecordTableBodyDroppable } from '@/object-record/record-table/record-ta import { RecordTableBodyLoading } from '@/object-record/record-table/record-table-body/components/RecordTableBodyLoading'; import { RecordTableCellPortals } from '@/object-record/record-table/record-table-cell/components/RecordTableCellPortals'; import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const RecordTableNoRecordGroupBody = () => { - const allRecordIds = useRecoilComponentValueV2( + const allRecordIds = useRecoilComponentValue( recordIndexAllRecordIdsComponentSelector, ); - const isRecordTableInitialLoading = useRecoilComponentValueV2( + const isRecordTableInitialLoading = useRecoilComponentValue( isRecordTableInitialLoadingComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBodyEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBodyEffect.tsx index 9c08e49660..6974faaea4 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBodyEffect.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBodyEffect.tsx @@ -6,12 +6,12 @@ import { useRecordIndexTableQuery } from '@/object-record/record-index/hooks/use import { ROW_HEIGHT } from '@/object-record/record-table/constants/RowHeight'; import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext'; import { useSetRecordTableData } from '@/object-record/record-table/hooks/internal/useSetRecordTableData'; -import { hasRecordTableFetchedAllRecordsComponentStateV2 } from '@/object-record/record-table/states/hasRecordTableFetchedAllRecordsComponentStateV2'; +import { hasRecordTableFetchedAllRecordsComponentState } from '@/object-record/record-table/states/hasRecordTableFetchedAllRecordsComponentState'; import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState'; import { isFetchingMoreRecordsFamilyState } from '@/object-record/states/isFetchingMoreRecordsFamilyState'; import { useShowAuthModal } from '@/ui/layout/hooks/useShowAuthModal'; import { useScrollToPosition } from '@/ui/utilities/scroll/hooks/useScrollToPosition'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { isNonEmptyString } from '@sniptt/guards'; export const RecordTableNoRecordGroupBodyEffect = () => { @@ -29,10 +29,8 @@ export const RecordTableNoRecordGroupBodyEffect = () => { const [hasInitializedScroll, setHasInitializedScroll] = useState(false); const setHasRecordTableFetchedAllRecordsComponents = - useSetRecoilComponentStateV2( - hasRecordTableFetchedAllRecordsComponentStateV2, - ); - const setIsRecordTableInitialLoading = useSetRecoilComponentStateV2( + useSetRecoilComponentState(hasRecordTableFetchedAllRecordsComponentState); + const setIsRecordTableInitialLoading = useSetRecoilComponentState( isRecordTableInitialLoadingComponentState, ); const isFetchingMoreRecords = useRecoilValue( 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.tsx index d7fa16d657..eb42872cae 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 @@ -10,8 +10,8 @@ import { useRecordTableContextOrThrow } from '@/object-record/record-table/conte import { useSetRecordTableData } from '@/object-record/record-table/hooks/internal/useSetRecordTableData'; import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState'; import { useScrollToPosition } from '@/ui/utilities/scroll/hooks/useScrollToPosition'; -import { useSetRecoilComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentFamilyStateV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useSetRecoilComponentFamilyState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentFamilyState'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { isNonEmptyString } from '@sniptt/guards'; export const RecordTableRecordGroupBodyEffect = () => { @@ -22,7 +22,7 @@ export const RecordTableRecordGroupBodyEffect = () => { recordTableId, }); - const setIsRecordTableInitialLoading = useSetRecoilComponentStateV2( + const setIsRecordTableInitialLoading = useSetRecoilComponentState( isRecordTableInitialLoadingComponentState, ); @@ -32,7 +32,7 @@ export const RecordTableRecordGroupBodyEffect = () => { useRecordIndexTableQuery(objectNameSingular); const setHasRecordFetchedAllRecordsComponents = - useSetRecoilComponentFamilyStateV2( + useSetRecoilComponentFamilyState( recordIndexHasFetchedAllRecordsByGroupComponentState, recordGroupId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffects.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffects.tsx index ee45df94b8..c8e7dd90cc 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffects.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffects.tsx @@ -1,12 +1,10 @@ import { RecordGroupContext } from '@/object-record/record-group/states/context/RecordGroupContext'; import { recordGroupIdsComponentState } from '@/object-record/record-group/states/recordGroupIdsComponentState'; import { RecordTableRecordGroupBodyEffect } from '@/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffect'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const RecordTableRecordGroupBodyEffects = () => { - const recordGroupIds = useRecoilComponentValueV2( - recordGroupIdsComponentState, - ); + const recordGroupIds = useRecoilComponentValue(recordGroupIdsComponentState); return recordGroupIds.map((recordGroupId) => ( diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx index b2d3ffe4b9..270e1bb3c1 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx @@ -9,20 +9,20 @@ import { RecordTableBodyRecordGroupDragDropContextProvider } from '@/object-reco import { RecordTableCellPortals } from '@/object-record/record-table/record-table-cell/components/RecordTableCellPortals'; import { RecordTableRecordGroupSection } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection'; import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { ViewType } from '@/views/types/ViewType'; export const RecordTableRecordGroupsBody = () => { - const allRecordIds = useRecoilComponentValueV2( + const allRecordIds = useRecoilComponentValue( recordIndexAllRecordIdsComponentSelector, ); - const isRecordTableInitialLoading = useRecoilComponentValueV2( + const isRecordTableInitialLoading = useRecoilComponentValue( isRecordTableInitialLoadingComponentState, ); - const visibleRecordGroupIds = useRecoilComponentFamilyValueV2( + const visibleRecordGroupIds = useRecoilComponentFamilyValue( visibleRecordGroupIdsComponentFamilySelector, ViewType.Table, ); 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.tsx index 512915f9ef..ae97f93a2e 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 @@ -8,8 +8,8 @@ import { RecordTableCellContext } from '@/object-record/record-table/contexts/Re import { useFocusRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useFocusRecordTableCell'; import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import styled from '@emotion/styled'; import { MiddlewareState, @@ -47,19 +47,19 @@ export type RecordTableCellEditModeProps = { export const RecordTableCellEditMode = ({ children, }: RecordTableCellEditModeProps) => { - const isFieldInError = useRecoilComponentValueV2( + const isFieldInError = useRecoilComponentValue( recordFieldInputIsFieldInErrorComponentState, ); const recordFieldComponentInstanceId = useAvailableComponentInstanceIdOrThrow( RecordFieldComponentInstanceContext, ); - const setFieldInputLayoutDirection = useSetRecoilComponentStateV2( + const setFieldInputLayoutDirection = useSetRecoilComponentState( recordFieldInputLayoutDirectionComponentState, recordFieldComponentInstanceId, ); - const setFieldInputLayoutDirectionLoading = useSetRecoilComponentStateV2( + const setFieldInputLayoutDirectionLoading = useSetRecoilComponentState( recordFieldInputLayoutDirectionLoadingComponentState, recordFieldComponentInstanceId, ); 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.tsx index 0046a87fbf..ac55d52a4a 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 @@ -1,5 +1,5 @@ import { RecordTableCellPortalWrapper } from '@/object-record/record-table/record-table-cell/components/RecordTableCellPortalWrapper'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { RecordTableCellEditMode } from '@/object-record/record-table/record-table-cell/components/RecordTableCellEditMode'; import { RecordTableCellFieldInput } from '@/object-record/record-table/record-table-cell/components/RecordTableCellFieldInput'; @@ -17,11 +17,11 @@ const StyledRecordTableCellHoveredPortal = styled.div` `; export const RecordTableCellEditModePortal = () => { - const focusedCellPosition = useRecoilComponentValueV2( + const focusedCellPosition = useRecoilComponentValue( recordTableFocusPositionComponentState, ); - const currentTableCellInEditModePosition = useRecoilComponentValueV2( + const currentTableCellInEditModePosition = useRecoilComponentValue( recordTableCellEditModePositionComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextLabelIdentifier.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextLabelIdentifier.tsx index 30f9c4071b..27ea383ac8 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextLabelIdentifier.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextLabelIdentifier.tsx @@ -11,7 +11,7 @@ import { useRecordTableRowContextOrThrow } from '@/object-record/record-table/co import { useActiveRecordTableRow } from '@/object-record/record-table/hooks/useActiveRecordTableRow'; import { useFocusedRecordTableRow } from '@/object-record/record-table/hooks/useFocusedRecordTableRow'; import { isRecordTableScrolledLeftComponentState } from '@/object-record/record-table/states/isRecordTableScrolledLeftComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { ViewOpenRecordInType } from '@/views/types/ViewOpenRecordInType'; import { ReactNode, useContext } from 'react'; import { useRecoilValue } from 'recoil'; @@ -35,7 +35,7 @@ export const RecordTableCellFieldContextLabelIdentifier = ({ const { unfocusRecordTableRow } = useFocusedRecordTableRow(recordTableId); const isMobile = useIsMobile(); - const isRecordTableScrolledLeftComponent = useRecoilComponentValueV2( + const isRecordTableScrolledLeftComponent = useRecoilComponentValue( isRecordTableScrolledLeftComponentState, ); 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.tsx index 7c5eb3a648..d78593f206 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 @@ -1,6 +1,6 @@ import { RecordTableCellPortalWrapper } from '@/object-record/record-table/record-table-cell/components/RecordTableCellPortalWrapper'; import { recordTableHoverPositionComponentState } from '@/object-record/record-table/states/recordTableHoverPositionComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import styled from '@emotion/styled'; import { FieldDisplay } from '@/object-record/record-field/components/FieldDisplay'; @@ -12,7 +12,7 @@ import { RecordTableCellEditButton } from '@/object-record/record-table/record-t import { RecordTableCellEditMode } from '@/object-record/record-table/record-table-cell/components/RecordTableCellEditMode'; import { RecordTableCellFieldInput } from '@/object-record/record-table/record-table-cell/components/RecordTableCellFieldInput'; import { isRecordTableRowActiveComponentFamilyState } from '@/object-record/record-table/states/isRecordTableRowActiveComponentFamilyState'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; import { useContext } from 'react'; import { BORDER_COMMON } from 'twenty-ui/theme'; import { useIsMobile } from 'twenty-ui/utilities'; @@ -45,7 +45,7 @@ const StyledRecordTableCellHoveredPortalContent = styled.div<{ `; const RecordTableCellHoveredPortalContent = () => { - const hoverPosition = useRecoilComponentValueV2( + const hoverPosition = useRecoilComponentValue( recordTableHoverPositionComponentState, ); @@ -62,7 +62,7 @@ const RecordTableCellHoveredPortalContent = () => { const { rowIndex } = useRecordTableRowContextOrThrow(); - const isRowActive = useRecoilComponentFamilyValueV2( + const isRowActive = useRecoilComponentFamilyValue( isRecordTableRowActiveComponentFamilyState, rowIndex, ); @@ -95,7 +95,7 @@ const StyledRecordTableCellHoveredPortal = styled.div` `; export const RecordTableCellHoveredPortal = () => { - const hoverPosition = useRecoilComponentValueV2( + const hoverPosition = useRecoilComponentValue( recordTableHoverPositionComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellPortalWrapper.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellPortalWrapper.tsx index e5d1ef7be9..ca25029182 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellPortalWrapper.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellPortalWrapper.tsx @@ -7,7 +7,7 @@ import { RecordTableRowContextProvider } from '@/object-record/record-table/cont import { RecordTableCellFieldContextWrapper } from '@/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextWrapper'; import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector'; import { TableCellPosition } from '@/object-record/record-table/types/TableCellPosition'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import ReactDOM from 'react-dom'; import { isDefined } from 'twenty-shared/utils'; @@ -22,13 +22,13 @@ export const RecordTableCellPortalWrapper = ({ `#record-table-cell-${position.column}-${position.row}`, ); - const allRecordIds = useRecoilComponentValueV2( + const allRecordIds = useRecoilComponentValue( recordIndexAllRecordIdsComponentSelector, ); const { objectMetadataItem } = useContextStoreObjectMetadataItemOrThrow(); - const visibleTableColumns = useRecoilComponentValueV2( + const visibleTableColumns = useRecoilComponentValue( visibleTableColumnsComponentSelector, ); 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.tsx index 1a98022fba..fa4d31d6e8 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 @@ -3,12 +3,12 @@ import { RecordTableCellArrowKeysEffect } from '@/object-record/record-table/rec import { RecordTableCellEditModePortal } from '@/object-record/record-table/record-table-cell/components/RecordTableCellEditModePortal'; import { RecordTableCellHoveredPortal } from '@/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortal'; import { isRecordTableCellFocusActiveComponentState } from '@/object-record/record-table/states/isRecordTableCellFocusActiveComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const RecordTableCellPortals = () => { const { recordTableId } = useRecordTableContextOrThrow(); - const isRecordTableFocusActive = useRecoilComponentValueV2( + const isRecordTableFocusActive = useRecoilComponentValue( isRecordTableCellFocusActiveComponentState, recordTableId, ); 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.tsx index 6fc41e60cd..339f58151d 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 @@ -18,7 +18,7 @@ import { import { useCloseRecordTableCellInGroup } from '@/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellInGroup'; import { recordTableCellEditModePositionComponentState } from '@/object-record/record-table/states/recordTableCellEditModePositionComponentState'; import { useDragSelect } from '@/ui/utilities/drag-select/hooks/useDragSelect'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems'; const onColumnsChange = jest.fn(); @@ -68,7 +68,7 @@ describe('useCloseRecordTableCellInGroup', () => { it('should work as expected', async () => { const { result } = renderHook( () => { - const currentTableCellInEditModePosition = useRecoilComponentValueV2( + const currentTableCellInEditModePosition = useRecoilComponentValue( recordTableCellEditModePositionComponentState, ); return { 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.tsx index 4ca99221fa..7b6828732f 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 @@ -18,7 +18,7 @@ import { import { useCloseRecordTableCellNoGroup } from '@/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellNoGroup'; import { recordTableCellEditModePositionComponentState } from '@/object-record/record-table/states/recordTableCellEditModePositionComponentState'; import { useDragSelect } from '@/ui/utilities/drag-select/hooks/useDragSelect'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems'; const onColumnsChange = jest.fn(); @@ -68,7 +68,7 @@ describe('useCloseRecordTableCellNoGroup', () => { it('should work as expected', async () => { const { result } = renderHook( () => { - const currentTableCellInEditModePosition = useRecoilComponentValueV2( + const currentTableCellInEditModePosition = useRecoilComponentValue( recordTableCellEditModePositionComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellInGroup.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellInGroup.ts index 6e8bd28d8f..37d44663b9 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellInGroup.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellInGroup.ts @@ -8,7 +8,7 @@ import { useClickOutsideListener } from '@/ui/utilities/pointer-event/hooks/useC import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext'; import { useCloseCurrentTableCellInEditMode } from '@/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode'; import { clickOutsideListenerIsActivatedComponentState } from '@/ui/utilities/pointer-event/states/clickOutsideListenerIsActivatedComponentState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; export const useCloseRecordTableCellInGroup = () => { const { recordTableId } = useRecordTableContextOrThrow(); @@ -22,11 +22,10 @@ export const useCloseRecordTableCellInGroup = () => { const closeCurrentTableCellInEditMode = useCloseCurrentTableCellInEditMode(recordTableId); - const clickOutsideListenerIsActivatedState = - useRecoilComponentCallbackStateV2( - clickOutsideListenerIsActivatedComponentState, - RECORD_TABLE_CLICK_OUTSIDE_LISTENER_ID, - ); + const clickOutsideListenerIsActivatedState = useRecoilComponentCallbackState( + clickOutsideListenerIsActivatedComponentState, + RECORD_TABLE_CLICK_OUTSIDE_LISTENER_ID, + ); const closeTableCellInGroup = useRecoilCallback( ({ set }) => diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellNoGroup.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellNoGroup.ts index 8d67d4d797..b1f78b31c8 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellNoGroup.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellNoGroup.ts @@ -6,7 +6,7 @@ import { RECORD_TABLE_CLICK_OUTSIDE_LISTENER_ID } from '@/object-record/record-t import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext'; import { useCloseCurrentTableCellInEditMode } from '@/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode'; import { clickOutsideListenerIsActivatedComponentState } from '@/ui/utilities/pointer-event/states/clickOutsideListenerIsActivatedComponentState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useRecoilCallback } from 'recoil'; export const useCloseRecordTableCellNoGroup = () => { @@ -21,11 +21,10 @@ export const useCloseRecordTableCellNoGroup = () => { const closeCurrentTableCellInEditMode = useCloseCurrentTableCellInEditMode(recordTableId); - const clickOutsideListenerIsActivatedState = - useRecoilComponentCallbackStateV2( - clickOutsideListenerIsActivatedComponentState, - RECORD_TABLE_CLICK_OUTSIDE_LISTENER_ID, - ); + const clickOutsideListenerIsActivatedState = useRecoilComponentCallbackState( + clickOutsideListenerIsActivatedComponentState, + RECORD_TABLE_CLICK_OUTSIDE_LISTENER_ID, + ); const closeTableCellNoGroup = useRecoilCallback( ({ set }) => 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.ts index 1e798fefeb..b81c2ff455 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 @@ -1,12 +1,12 @@ import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext'; import { getRecordTableCellFocusId } from '@/object-record/record-table/record-table-cell/utils/getRecordTableCellFocusId'; import { recordTableFocusPositionComponentState } from '@/object-record/record-table/states/recordTableFocusPositionComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const useCurrentlyFocusedRecordTableCellFocusId = () => { const { recordTableId } = useRecordTableContextOrThrow(); - const focusPosition = useRecoilComponentValueV2( + const focusPosition = useRecoilComponentValue( recordTableFocusPositionComponentState, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useFocusRecordTableCell.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useFocusRecordTableCell.ts index 60d85df0f3..86e90d7131 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useFocusRecordTableCell.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useFocusRecordTableCell.ts @@ -5,7 +5,7 @@ import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePush import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById'; import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useRecoilCallback } from 'recoil'; import { TableCellPosition } from '../../types/TableCellPosition'; import { useSetIsRecordTableCellFocusActive } from './useSetIsRecordTableCellFocusActive'; @@ -16,7 +16,7 @@ export const useFocusRecordTableCell = (recordTableId?: string) => { recordTableId, ); - const focusPositionState = useRecoilComponentCallbackStateV2( + const focusPositionState = useRecoilComponentCallbackState( recordTableFocusPositionComponentState, recordTableIdFromProps, ); 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.ts index 3a4c1c56bb..f541b06674 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 @@ -5,16 +5,16 @@ import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { recordTableHoverPositionComponentState } from '@/object-record/record-table/states/recordTableHoverPositionComponentState'; import { isSomeCellInEditModeComponentSelector } from '@/object-record/record-table/states/selectors/isSomeCellInEditModeComponentSelector'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; export const useMoveHoverToCurrentCell = (recordTableId: string) => { - const setHoverPosition = useSetRecoilComponentStateV2( + const setHoverPosition = useSetRecoilComponentState( recordTableHoverPositionComponentState, recordTableId, ); - const isSomeCellInEditModeSelector = useRecoilComponentCallbackStateV2( + const isSomeCellInEditModeSelector = useRecoilComponentCallbackState( isSomeCellInEditModeComponentSelector, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCellV2.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell.ts similarity index 91% rename from packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCellV2.ts rename to packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell.ts index bf1d665f23..26a0085771 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCellV2.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell.ts @@ -1,6 +1,6 @@ import { useRecoilCallback, useSetRecoilState } from 'recoil'; -import { useInitDraftValueV2 } from '@/object-record/record-field/hooks/useInitDraftValueV2'; +import { useInitDraftValue } from '@/object-record/record-field/hooks/useInitDraftValue'; import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition'; import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata'; import { isFieldValueEmpty } from '@/object-record/record-field/utils/isFieldValueEmpty'; @@ -29,8 +29,8 @@ import { useFocusedRecordTableRow } from '@/object-record/record-table/hooks/use import { useFocusRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useFocusRecordTableCell'; import { isRecordTableRowFocusActiveComponentState } from '@/object-record/record-table/states/isRecordTableRowFocusActiveComponentState'; import { clickOutsideListenerIsActivatedComponentState } from '@/ui/utilities/pointer-event/states/clickOutsideListenerIsActivatedComponentState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { ViewOpenRecordInType } from '@/views/types/ViewOpenRecordInType'; export type OpenTableCellArgs = { @@ -45,13 +45,12 @@ export type OpenTableCellArgs = { isNavigating: boolean; }; -export const useOpenRecordTableCellV2 = (recordTableId: string) => { - const clickOutsideListenerIsActivatedState = - useRecoilComponentCallbackStateV2( - clickOutsideListenerIsActivatedComponentState, - RECORD_TABLE_CLICK_OUTSIDE_LISTENER_ID, - ); - const setCurrentTableCellInEditModePosition = useSetRecoilComponentStateV2( +export const useOpenRecordTableCell = (recordTableId: string) => { + const clickOutsideListenerIsActivatedState = useRecoilComponentCallbackState( + clickOutsideListenerIsActivatedComponentState, + RECORD_TABLE_CLICK_OUTSIDE_LISTENER_ID, + ); + const setCurrentTableCellInEditModePosition = useSetRecoilComponentState( recordTableCellEditModePositionComponentState, recordTableId, ); @@ -63,7 +62,7 @@ export const useOpenRecordTableCellV2 = (recordTableId: string) => { FOCUS_CLICK_OUTSIDE_LISTENER_ID, ); - const initDraftValue = useInitDraftValueV2(); + const initDraftValue = useInitDraftValue(); const setViewableRecordId = useSetRecoilState(viewableRecordIdState); const setViewableRecordNameSingular = useSetRecoilState( @@ -80,7 +79,7 @@ export const useOpenRecordTableCellV2 = (recordTableId: string) => { const { unfocusRecordTableRow } = useFocusedRecordTableRow(recordTableId); - const setIsRowFocusActive = useSetRecoilComponentStateV2( + const setIsRowFocusActive = useSetRecoilComponentState( isRecordTableRowFocusActiveComponentState, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useSetIsRecordTableCellFocusActive.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useSetIsRecordTableCellFocusActive.ts index 2ee7d7e6af..1f84bef429 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useSetIsRecordTableCellFocusActive.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useSetIsRecordTableCellFocusActive.ts @@ -1,10 +1,10 @@ import { isRecordTableCellFocusActiveComponentState } from '@/object-record/record-table/states/isRecordTableCellFocusActiveComponentState'; import { TableCellPosition } from '@/object-record/record-table/types/TableCellPosition'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useRecoilCallback } from 'recoil'; export const useSetIsRecordTableCellFocusActive = (recordTableId?: string) => { - const isRecordTableFocusActiveState = useRecoilComponentCallbackStateV2( + const isRecordTableFocusActiveState = useRecoilComponentCallbackState( isRecordTableCellFocusActiveComponentState, recordTableId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useTriggerActionMenuDropdown.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useTriggerActionMenuDropdown.ts index 7852e89bf4..73417b813d 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useTriggerActionMenuDropdown.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useTriggerActionMenuDropdown.ts @@ -7,7 +7,7 @@ import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu'; import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState'; import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; export const useTriggerActionMenuDropdown = ({ @@ -19,7 +19,7 @@ export const useTriggerActionMenuDropdown = ({ ActionMenuComponentInstanceContext, ); - const isRowSelectedFamilyState = useRecoilComponentCallbackStateV2( + const isRowSelectedFamilyState = useRecoilComponentCallbackState( isRowSelectedComponentFamilyState, recordTableId, ); @@ -28,7 +28,7 @@ export const useTriggerActionMenuDropdown = ({ getActionMenuDropdownIdFromActionMenuId(actionMenuInstanceId); const recordIndexActionMenuDropdownPositionCallbackState = - useRecoilComponentCallbackStateV2( + useRecoilComponentCallbackState( recordIndexActionMenuDropdownPositionComponentState, actionMenuDropdownId, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useUnfocusRecordTableCell.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useUnfocusRecordTableCell.ts index 5110c8545e..f9fa30d873 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useUnfocusRecordTableCell.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useUnfocusRecordTableCell.ts @@ -5,7 +5,7 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-tabl import { recordTableFocusPositionComponentState } from '@/object-record/record-table/states/recordTableFocusPositionComponentState'; import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById'; import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { useSetIsRecordTableCellFocusActive } from './useSetIsRecordTableCellFocusActive'; export const useUnfocusRecordTableCell = (recordTableId?: string) => { @@ -14,7 +14,7 @@ export const useUnfocusRecordTableCell = (recordTableId?: string) => { recordTableId, ); - const focusPositionState = useRecoilComponentCallbackStateV2( + const focusPositionState = useRecoilComponentCallbackState( recordTableFocusPositionComponentState, recordTableIdFromProps, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter.tsx index 068b4bea39..37620bc9b9 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter.tsx @@ -6,7 +6,7 @@ import { RecordTableColumnAggregateFooterCellContext } from '@/object-record/rec import { FIRST_TH_WIDTH } from '@/object-record/record-table/record-table-header/components/RecordTableHeader'; import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector'; import { useScrollWrapperElement } from '@/ui/utilities/scroll/hooks/useScrollWrapperElement'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isUndefined } from '@sniptt/guards'; import { MOBILE_VIEWPORT } from 'twenty-ui/theme'; @@ -86,7 +86,7 @@ export const RecordTableAggregateFooter = ({ }: { currentRecordGroupId?: string; }) => { - const visibleTableColumns = useRecoilComponentValueV2( + const visibleTableColumns = useRecoilComponentValue( visibleTableColumnsComponentSelector, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooterCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooterCell.tsx index fcb32ab3da..5d21fa47ad 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooterCell.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooterCell.tsx @@ -4,7 +4,7 @@ import { useContext, useMemo } from 'react'; import { RecordTableColumnAggregateFooterCellContext } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterCellContext'; import { RecordTableColumnFooterWithDropdown } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterWithDropdown'; import { tableColumnsComponentState } from '@/object-record/record-table/states/tableColumnsComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { mapArrayToObject } from '~/utils/array/mapArrayToObject'; const COLUMN_MIN_WIDTH = 104; @@ -59,7 +59,7 @@ export const RecordTableAggregateFooterCell = ({ isFirstCell?: boolean; currentRecordGroupId?: string; }) => { - const tableColumns = useRecoilComponentValueV2(tableColumnsComponentState); + const tableColumns = useRecoilComponentValue(tableColumnsComponentState); const tableColumnsByKey = useMemo( () => mapArrayToObject(tableColumns, ({ fieldMetadataId }) => fieldMetadataId), diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValueCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValueCell.tsx index c4c9fc0608..3190ecef13 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValueCell.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValueCell.tsx @@ -4,7 +4,7 @@ import { RecordTableColumnAggregateFooterCellContext } from '@/object-record/rec import { RecordTableColumnAggregateFooterValue } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue'; import { hasAggregateOperationForViewFieldFamilySelector } from '@/object-record/record-table/record-table-footer/states/hasAggregateOperationForViewFieldFamilySelector'; import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; import { useContext, useState } from 'react'; @@ -61,7 +61,7 @@ export const RecordTableColumnAggregateFooterValueCell = ({ }) => { const [isHovered, setIsHovered] = useState(false); - const isDropdownOpen = useRecoilComponentValueV2( + const isDropdownOpen = useRecoilComponentValue( isDropdownOpenComponentState, dropdownId, ); @@ -77,7 +77,7 @@ export const RecordTableColumnAggregateFooterValueCell = ({ }), ); - const hasRecordGroups = useRecoilComponentValueV2( + const hasRecordGroups = useRecoilComponentValue( hasRecordGroupsComponentSelector, ); 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.tsx index 50afe1ffe5..ff69016bf4 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 @@ -13,7 +13,7 @@ import { RecordTableColumnAggregateFooterCellContext } from '@/object-record/rec import { viewFieldAggregateOperationState } from '@/object-record/record-table/record-table-footer/states/viewFieldAggregateOperationState'; import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations'; import { convertAggregateOperationToExtendedAggregateOperation } from '@/object-record/utils/convertAggregateOperationToExtendedAggregateOperation'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { UserContext } from '@/users/contexts/UserContext'; import { useContext } from 'react'; import { useRecoilValue } from 'recoil'; @@ -26,11 +26,11 @@ export const useAggregateRecordsForRecordTableColumnFooter = ( const { objectMetadataItem } = useRecordTableContextOrThrow(); const { recordGroupFilter } = useRecordGroupFilter(objectMetadataItem.fields); - const currentRecordFilterGroups = useRecoilComponentValueV2( + const currentRecordFilterGroups = useRecoilComponentValue( currentRecordFilterGroupsComponentState, ); - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); @@ -87,7 +87,7 @@ export const useAggregateRecordsForRecordTableColumnFooter = ( } : {}; - const anyFieldFilterValue = useRecoilComponentValueV2( + const anyFieldFilterValue = useRecoilComponentValue( anyFieldFilterValueComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHead.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHead.tsx index 7596ed5f0d..f71cf15ce3 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHead.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHead.tsx @@ -4,10 +4,10 @@ import styled from '@emotion/styled'; import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata'; import { isRecordTableScrolledLeftComponentState } from '@/object-record/record-table/states/isRecordTableScrolledLeftComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { ColumnDefinition } from '../../types/ColumnDefinition'; -import { MOBILE_VIEWPORT } from 'twenty-ui/theme'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useIcons } from 'twenty-ui/display'; +import { MOBILE_VIEWPORT } from 'twenty-ui/theme'; +import { ColumnDefinition } from '../../types/ColumnDefinition'; type RecordTableColumnHeadProps = { column: ColumnDefinition; @@ -56,7 +56,7 @@ export const RecordTableColumnHead = ({ const { getIcon } = useIcons(); const Icon = getIcon(column.iconName); - const isRecordTableScrolledLeft = useRecoilComponentValueV2( + const isRecordTableScrolledLeft = useRecoilComponentValue( isRecordTableScrolledLeftComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHeadDropdownMenu.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHeadDropdownMenu.tsx index 4b69c2551a..b2748d3f65 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHeadDropdownMenu.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHeadDropdownMenu.tsx @@ -8,7 +8,7 @@ import { visibleTableColumnsComponentSelector } from '@/object-record/record-tab import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown'; import { useToggleScrollWrapper } from '@/ui/utilities/scroll/hooks/useToggleScrollWrapper'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import styled from '@emotion/styled'; import { useLingui } from '@lingui/react/macro'; import { @@ -40,7 +40,7 @@ export const RecordTableColumnHeadDropdownMenu = ({ const { toggleScrollXWrapper, toggleScrollYWrapper } = useToggleScrollWrapper(); - const visibleTableColumns = useRecoilComponentValueV2( + const visibleTableColumns = useRecoilComponentValue( visibleTableColumnsComponentSelector, ); @@ -86,7 +86,7 @@ export const RecordTableColumnHeadDropdownMenu = ({ handleColumnVisibilityChange(column); }; - const onToggleColumnSort = useRecoilComponentValueV2( + const onToggleColumnSort = useRecoilComponentValue( onToggleColumnSortComponentState, ); 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.tsx index 6fd8a458a7..3dfb85b5a2 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 @@ -17,10 +17,10 @@ import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefin import { useTrackPointer } from '@/ui/utilities/pointer-event/hooks/useTrackPointer'; import { PointerEventListener } from '@/ui/utilities/pointer-event/types/PointerEventListener'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { IconPlus } from 'twenty-ui/display'; import { LightIconButton } from 'twenty-ui/input'; @@ -117,15 +117,15 @@ export const RecordTableHeaderCell = ({ const { objectMetadataItem, objectPermissions } = useRecordTableContextOrThrow(); - const resizeFieldOffsetState = useRecoilComponentCallbackStateV2( + const resizeFieldOffsetState = useRecoilComponentCallbackState( resizeFieldOffsetComponentState, ); - const [resizeFieldOffset, setResizeFieldOffset] = useRecoilComponentStateV2( + const [resizeFieldOffset, setResizeFieldOffset] = useRecoilComponentState( resizeFieldOffsetComponentState, ); - const tableColumns = useRecoilComponentValueV2(tableColumnsComponentState); + const tableColumns = useRecoilComponentValue(tableColumnsComponentState); const tableColumnsByKey = useMemo( () => mapArrayToObject(tableColumns, ({ fieldMetadataId }) => fieldMetadataId), @@ -206,7 +206,7 @@ export const RecordTableHeaderCell = ({ onMouseUp: handleResizeHandlerEnd, }); - const isRecordTableScrolledLeft = useRecoilComponentValueV2( + const isRecordTableScrolledLeft = useRecoilComponentValue( isRecordTableScrolledLeftComponentState, ); @@ -229,12 +229,12 @@ export const RecordTableHeaderCell = ({ const hasObjectUpdatePermissions = objectPermissions.canUpdateObjectRecords; - const isFirstRowActive = useRecoilComponentFamilyValueV2( + const isFirstRowActive = useRecoilComponentFamilyValue( isRecordTableRowActiveComponentFamilyState, 0, ); - const isFirstRowFocused = useRecoilComponentFamilyValueV2( + const isFirstRowFocused = useRecoilComponentFamilyValue( isRecordTableRowFocusedComponentFamilyState, 0, ); diff --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.tsx index e997ed7ef7..365d9b9d51 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 @@ -7,8 +7,8 @@ import { isRecordTableInitialLoadingComponentState } from '@/object-record/recor import { isRecordTableRowActiveComponentFamilyState } from '@/object-record/record-table/states/isRecordTableRowActiveComponentFamilyState'; import { isRecordTableRowFocusedComponentFamilyState } from '@/object-record/record-table/states/isRecordTableRowFocusedComponentFamilyState'; import { allRowsSelectedStatusComponentSelector } from '@/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { Checkbox } from 'twenty-ui/input'; const StyledContainer = styled.div` @@ -34,7 +34,7 @@ const StyledColumnHeaderCell = styled.th<{ `; export const RecordTableHeaderCheckboxColumn = () => { - const allRowsSelectedStatus = useRecoilComponentValueV2( + const allRowsSelectedStatus = useRecoilComponentValue( allRowsSelectedStatusComponentSelector, ); const { selectAllRows, resetTableRowSelection, setHasUserSelectedAllRows } = @@ -45,12 +45,12 @@ export const RecordTableHeaderCheckboxColumn = () => { const { recordTableId } = useRecordTableContextOrThrow(); - const isRecordTableInitialLoading = useRecoilComponentValueV2( + const isRecordTableInitialLoading = useRecoilComponentValue( isRecordTableInitialLoadingComponentState, recordTableId, ); - const allRecordIds = useRecoilComponentValueV2( + const allRecordIds = useRecoilComponentValue( recordIndexAllRecordIdsComponentSelector, recordTableId, ); @@ -68,12 +68,12 @@ export const RecordTableHeaderCheckboxColumn = () => { } }; - const isFirstRowActive = useRecoilComponentFamilyValueV2( + const isFirstRowActive = useRecoilComponentFamilyValue( isRecordTableRowActiveComponentFamilyState, 0, ); - const isFirstRowFocused = useRecoilComponentFamilyValueV2( + const isFirstRowFocused = useRecoilComponentFamilyValue( isRecordTableRowFocusedComponentFamilyState, 0, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLastColumn.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLastColumn.tsx index 4f229c0004..fecf14a307 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLastColumn.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLastColumn.tsx @@ -6,7 +6,7 @@ import { isRecordTableRowActiveComponentFamilyState } from '@/object-record/reco import { isRecordTableRowFocusedComponentFamilyState } from '@/object-record/record-table/states/isRecordTableRowFocusedComponentFamilyState'; import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; import { useScrollWrapperElement } from '@/ui/utilities/scroll/hooks/useScrollWrapperElement'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; import { useTheme } from '@emotion/react'; import { IconPlus } from 'twenty-ui/display'; @@ -59,12 +59,12 @@ export const RecordTableHeaderLastColumn = () => { (scrollWrapperHTMLElement?.clientWidth ?? 0) < (scrollWrapperHTMLElement?.scrollWidth ?? 0); - const isFirstRowActive = useRecoilComponentFamilyValueV2( + const isFirstRowActive = useRecoilComponentFamilyValue( isRecordTableRowActiveComponentFamilyState, 0, ); - const isFirstRowFocused = useRecoilComponentFamilyValueV2( + const isFirstRowFocused = useRecoilComponentFamilyValue( isRecordTableRowFocusedComponentFamilyState, 0, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx index 5e3658e654..4dbe704302 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx @@ -13,7 +13,7 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator'; import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown'; import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useLingui } from '@lingui/react/macro'; import { IconSettings, useIcons } from 'twenty-ui/display'; import { MenuItem, UndecoratedLink } from 'twenty-ui/navigation'; @@ -25,7 +25,7 @@ export const RecordTableHeaderPlusButtonContent = () => { const { closeDropdown } = useCloseDropdown(); - const hiddenTableColumns = useRecoilComponentValueV2( + const hiddenTableColumns = useRecoilComponentValue( hiddenTableColumnsComponentSelector, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useOpenRecordFilterChipFromTableHeader.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useOpenRecordFilterChipFromTableHeader.ts index 720e750c7e..464645c59f 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useOpenRecordFilterChipFromTableHeader.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useOpenRecordFilterChipFromTableHeader.ts @@ -3,7 +3,7 @@ import { useFilterableFieldMetadataItemsInRecordIndexContext } from '@/object-re import { useUpsertRecordFilter } from '@/object-record/record-filter/hooks/useUpsertRecordFilter'; import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState'; import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useSetEditableFilterChipDropdownStates } from '@/views/hooks/useSetEditableFilterChipDropdownStates'; import { isDefined } from 'twenty-shared/utils'; @@ -11,7 +11,7 @@ export const useOpenRecordFilterChipFromTableHeader = () => { const { filterableFieldMetadataItems } = useFilterableFieldMetadataItemsInRecordIndexContext(); - const currentRecordFilters = useRecoilComponentValueV2( + const currentRecordFilters = useRecoilComponentValue( currentRecordFiltersComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableCellsEmpty.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableCellsEmpty.tsx index f9209f0fca..016ff200a8 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableCellsEmpty.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableCellsEmpty.tsx @@ -1,12 +1,12 @@ import { useRecordTableRowContextOrThrow } from '@/object-record/record-table/contexts/RecordTableRowContext'; import { RecordTableTd } from '@/object-record/record-table/record-table-cell/components/RecordTableTd'; import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; export const RecordTableCellsEmpty = () => { const { isSelected } = useRecordTableRowContextOrThrow(); - const visibleTableColumns = useRecoilComponentValueV2( + const visibleTableColumns = useRecoilComponentValue( visibleTableColumnsComponentSelector, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableCellsVisible.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableCellsVisible.tsx index f089e950e7..801d2fe49b 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableCellsVisible.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableCellsVisible.tsx @@ -4,7 +4,7 @@ import { RecordTableCell } from '@/object-record/record-table/record-table-cell/ import { RecordTableCellWrapper } from '@/object-record/record-table/record-table-cell/components/RecordTableCellWrapper'; import { RecordTableTd } from '@/object-record/record-table/record-table-cell/components/RecordTableTd'; import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { isNonEmptyArray } from '~/utils/isNonEmptyArray'; export const RecordTableCellsVisible = () => { @@ -12,7 +12,7 @@ export const RecordTableCellsVisible = () => { const { isDragging } = useRecordTableRowDraggableContextOrThrow(); - const visibleTableColumns = useRecoilComponentValueV2( + const visibleTableColumns = useRecoilComponentValue( visibleTableColumnsComponentSelector, ); 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.tsx index 5e61a54c31..d128c04883 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 @@ -10,8 +10,8 @@ import { isRecordTableRowFocusActiveComponentState } from '@/object-record/recor import { isRecordTableRowFocusedComponentFamilyState } from '@/object-record/record-table/states/isRecordTableRowFocusedComponentFamilyState'; import { ListenRecordUpdatesEffect } from '@/subscription/components/ListenRecordUpdatesEffect'; import { getDefaultRecordFieldsToListen } from '@/subscription/utils/getDefaultRecordFieldsToListen.util'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; type RecordTableRowProps = { recordId: string; @@ -28,11 +28,11 @@ export const RecordTableRow = ({ const listenedFields = getDefaultRecordFieldsToListen({ objectNameSingular, }); - const isFocused = useRecoilComponentFamilyValueV2( + const isFocused = useRecoilComponentFamilyValue( isRecordTableRowFocusedComponentFamilyState, rowIndexForFocus, ); - const isRowFocusActive = useRecoilComponentValueV2( + const isRowFocusActive = useRecoilComponentValue( isRecordTableRowFocusActiveComponentState, ); 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.tsx index a4d1e24891..811551ca13 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 @@ -7,8 +7,8 @@ import { isRowVisibleComponentFamilyState } from '@/object-record/record-table/r import { isRecordTableRowActiveComponentFamilyState } from '@/object-record/record-table/states/isRecordTableRowActiveComponentFamilyState'; import { isRecordTableRowFocusActiveComponentState } from '@/object-record/record-table/states/isRecordTableRowFocusActiveComponentState'; import { isRecordTableRowFocusedComponentFamilyState } from '@/object-record/record-table/states/isRecordTableRowFocusedComponentFamilyState'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import styled from '@emotion/styled'; import { ReactNode, forwardRef } from 'react'; @@ -86,36 +86,36 @@ export const RecordTableTr = forwardRef< >(({ children, recordId, focusIndex, isDragging = false, ...props }, ref) => { const { objectMetadataItem } = useRecordTableContextOrThrow(); - const currentRowSelected = useRecoilComponentFamilyValueV2( + const currentRowSelected = useRecoilComponentFamilyValue( isRowSelectedComponentFamilyState, recordId, ); - const isRowVisible = useRecoilComponentFamilyValueV2( + const isRowVisible = useRecoilComponentFamilyValue( isRowVisibleComponentFamilyState, recordId, ); - const isActive = useRecoilComponentFamilyValueV2( + const isActive = useRecoilComponentFamilyValue( isRecordTableRowActiveComponentFamilyState, focusIndex, ); - const isNextRowActive = useRecoilComponentFamilyValueV2( + const isNextRowActive = useRecoilComponentFamilyValue( isRecordTableRowActiveComponentFamilyState, focusIndex + 1, ); - const isFocused = useRecoilComponentFamilyValueV2( + const isFocused = useRecoilComponentFamilyValue( isRecordTableRowFocusedComponentFamilyState, focusIndex, ); - const isRowFocusActive = useRecoilComponentValueV2( + const isRowFocusActive = useRecoilComponentValue( isRecordTableRowFocusActiveComponentState, ); - const isNextRowFocused = useRecoilComponentFamilyValueV2( + const isNextRowFocused = useRecoilComponentFamilyValue( isRecordTableRowFocusedComponentFamilyState, focusIndex + 1, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableTrEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableTrEffect.tsx index c1d02cc0aa..3ca7bb8d63 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableTrEffect.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableTrEffect.tsx @@ -1,6 +1,6 @@ import { isRowVisibleComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowVisibleComponentFamilyState'; import { useScrollWrapperElement } from '@/ui/utilities/scroll/hooks/useScrollWrapperElement'; -import { useSetRecoilComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentFamilyStateV2'; +import { useSetRecoilComponentFamilyState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentFamilyState'; import { useEffect } from 'react'; type RecordTableTrEffectProps = { @@ -10,7 +10,7 @@ type RecordTableTrEffectProps = { export const RecordTableTrEffect = ({ recordId }: RecordTableTrEffectProps) => { const { scrollWrapperHTMLElement } = useScrollWrapperElement(); - const setIsRowVisible = useSetRecoilComponentFamilyStateV2( + const setIsRowVisible = useSetRecoilComponentFamilyState( isRowVisibleComponentFamilyState, recordId, ); 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.ts index 93777f7f70..52d6fc4c06 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 @@ -12,8 +12,8 @@ import { isRecordTableRowFocusActiveComponentState } from '@/object-record/recor import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack'; import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType'; import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; import { Key } from 'ts-key-enum'; export const useRecordTableRowHotkeys = (focusId: string) => { @@ -26,7 +26,7 @@ export const useRecordTableRowHotkeys = (focusId: string) => { const { activateRecordTableRow } = useActiveRecordTableRow(); - const setIsRowFocusActive = useSetRecoilComponentStateV2( + const setIsRowFocusActive = useSetRecoilComponentState( isRecordTableRowFocusActiveComponentState, ); @@ -87,7 +87,7 @@ export const useRecordTableRowHotkeys = (focusId: string) => { const { unfocusRecordTableRow } = useFocusedRecordTableRow(recordTableId); - const isAtLeastOneRecordSelected = useRecoilComponentValueV2( + const isAtLeastOneRecordSelected = useRecoilComponentValue( isAtLeastOneTableRowSelectedSelector, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useSetCurrentRowSelected.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useSetCurrentRowSelected.ts index 70a0b86a48..f53f60b7b7 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useSetCurrentRowSelected.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useSetCurrentRowSelected.ts @@ -4,22 +4,22 @@ import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record import { useRecordTableRowContextOrThrow } from '@/object-record/record-table/contexts/RecordTableRowContext'; import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState'; import { lastSelectedRowIndexComponentState } from '@/object-record/record-table/record-table-row/states/lastSelectedRowIndexComponentState'; -import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2'; +import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState'; import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue'; import { isDefined } from 'twenty-shared/utils'; export const useSetCurrentRowSelected = () => { const { recordId, rowIndex } = useRecordTableRowContextOrThrow(); - const isRowSelectedFamilyState = useRecoilComponentCallbackStateV2( + const isRowSelectedFamilyState = useRecoilComponentCallbackState( isRowSelectedComponentFamilyState, ); - const recordIndexAllRecordIdsState = useRecoilComponentCallbackStateV2( + const recordIndexAllRecordIdsState = useRecoilComponentCallbackState( recordIndexAllRecordIdsComponentSelector, ); const lastSelectedRowIndexComponentCallbackState = - useRecoilComponentCallbackStateV2(lastSelectedRowIndexComponentState); + useRecoilComponentCallbackState(lastSelectedRowIndexComponentState); const setCurrentRowSelected = useRecoilCallback( ({ set, snapshot }) => diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState.ts index aff1aa0bb6..288493f2df 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState.ts @@ -1,8 +1,8 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const hasUserSelectedAllRowsComponentState = - createComponentStateV2({ + createComponentState({ key: 'hasUserSelectedAllRowsFamilyState', defaultValue: false, componentInstanceContext: RecordTableComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isAtLeastOneTableRowSelectedSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isAtLeastOneTableRowSelectedSelector.ts index 8ed9616eee..b80808cc6d 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isAtLeastOneTableRowSelectedSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isAtLeastOneTableRowSelectedSelector.ts @@ -1,10 +1,10 @@ import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector'; import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState'; import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; export const isAtLeastOneTableRowSelectedSelector = - createComponentSelectorV2({ + createComponentSelector({ key: 'isAtLeastOneTableRowSelectedSelector', componentInstanceContext: RecordTableComponentInstanceContext, get: diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState.ts index d4f48c395e..67f387c5e5 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState.ts @@ -1,7 +1,7 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilyStateV2'; +import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState'; -export const isRowSelectedComponentFamilyState = createComponentFamilyStateV2< +export const isRowSelectedComponentFamilyState = createComponentFamilyState< boolean, string >({ diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowVisibleComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowVisibleComponentFamilyState.ts index ff0e800749..592ee66dd2 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowVisibleComponentFamilyState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowVisibleComponentFamilyState.ts @@ -1,7 +1,7 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilyStateV2'; +import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState'; -export const isRowVisibleComponentFamilyState = createComponentFamilyStateV2< +export const isRowVisibleComponentFamilyState = createComponentFamilyState< boolean, string >({ diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/lastSelectedRowIndexComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/lastSelectedRowIndexComponentState.ts index c4b1f38662..a9cb253418 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/lastSelectedRowIndexComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/lastSelectedRowIndexComponentState.ts @@ -1,7 +1,7 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const lastSelectedRowIndexComponentState = createComponentStateV2< +export const lastSelectedRowIndexComponentState = createComponentState< number | null | undefined >({ key: 'record-table/last-selected-row-index', 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.tsx index 328ae95777..d8f065c6ef 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 @@ -12,13 +12,13 @@ import { RecordTableRecordGroupStickyEffect } from '@/object-record/record-table import { useAggregateRecordsForRecordTableSection } from '@/object-record/record-table/record-table-section/hooks/useAggregateRecordsForRecordTableSection'; import { isRecordGroupTableSectionToggledComponentState } from '@/object-record/record-table/record-table-section/states/isRecordGroupTableSectionToggledComponentState'; import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector'; -import { useRecoilComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyStateV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentFamilyState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyState'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { useRecoilValue } from 'recoil'; import { isDefined } from 'twenty-shared/utils'; -import { AnimatedLightIconButton } from 'twenty-ui/input'; -import { IconChevronDown } from 'twenty-ui/display'; import { Tag } from 'twenty-ui/components'; +import { IconChevronDown } from 'twenty-ui/display'; +import { AnimatedLightIconButton } from 'twenty-ui/input'; const StyledTrContainer = styled.tr` cursor: pointer; @@ -57,7 +57,7 @@ export const RecordTableRecordGroupSection = () => { const currentRecordGroupId = useCurrentRecordGroupId(); - const visibleColumns = useRecoilComponentValueV2( + const visibleColumns = useRecoilComponentValue( visibleTableColumnsComponentSelector, ); @@ -69,7 +69,7 @@ export const RecordTableRecordGroupSection = () => { const [ isRecordGroupTableSectionToggled, setIsRecordGroupTableSectionToggled, - ] = useRecoilComponentFamilyStateV2( + ] = useRecoilComponentFamilyState( isRecordGroupTableSectionToggledComponentState, currentRecordGroupId, ); diff --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.tsx index 2ad8caf0c5..acb4c5a9e2 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 @@ -5,7 +5,7 @@ import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext'; import { useCreateNewIndexRecord } from '@/object-record/record-table/hooks/useCreateNewIndexRecord'; import { RecordTableActionRow } from '@/object-record/record-table/record-table-row/components/RecordTableActionRow'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { t } from '@lingui/core/macro'; import { useRecoilValue } from 'recoil'; import { IconPlus } from 'twenty-ui/display'; @@ -15,7 +15,7 @@ export const RecordTableRecordGroupSectionAddNew = () => { const currentRecordGroupId = useCurrentRecordGroupId(); - const recordIds = useRecoilComponentValueV2( + const recordIds = useRecoilComponentValue( recordIndexAllRecordIdsComponentSelector, ); 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.tsx index b441d0154b..76672c6cd3 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 @@ -4,8 +4,8 @@ import { recordIndexHasFetchedAllRecordsByGroupComponentState } from '@/object-r import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector'; import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext'; import { RecordTableActionRow } from '@/object-record/record-table/record-table-row/components/RecordTableActionRow'; -import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentFamilyValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValue'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { IconArrowDown } from 'twenty-ui/display'; export const RecordTableRecordGroupSectionLoadMore = () => { @@ -16,12 +16,12 @@ export const RecordTableRecordGroupSectionLoadMore = () => { const { fetchMoreRecordsLazy } = useRecordIndexTableFetchMore(objectNameSingular); - const hasFetchedAllRecords = useRecoilComponentFamilyValueV2( + const hasFetchedAllRecords = useRecoilComponentFamilyValue( recordIndexHasFetchedAllRecordsByGroupComponentState, currentRecordGroupId, ); - const recordIds = useRecoilComponentValueV2( + const recordIds = useRecoilComponentValue( recordIndexAllRecordIdsComponentSelector, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupStickyEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupStickyEffect.tsx index 889730417c..afdeb4a746 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupStickyEffect.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupStickyEffect.tsx @@ -3,15 +3,15 @@ import { useEffect } from 'react'; import { useCurrentRecordGroupId } from '@/object-record/record-group/hooks/useCurrentRecordGroupId'; import { isRecordTableScrolledLeftComponentState } from '@/object-record/record-table/states/isRecordTableScrolledLeftComponentState'; import { scrollWrapperScrollLeftComponentState } from '@/ui/utilities/scroll/states/scrollWrapperScrollLeftComponentState'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; -import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; +import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState'; export const RecordTableRecordGroupStickyEffect = () => { - const scrollLeft = useRecoilComponentValueV2( + const scrollLeft = useRecoilComponentValue( scrollWrapperScrollLeftComponentState, ); - const setIsRecordTableScrolledLeft = useSetRecoilComponentStateV2( + const setIsRecordTableScrolledLeft = useSetRecoilComponentState( isRecordTableScrolledLeftComponentState, ); diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/states/isRecordGroupTableSectionToggledComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/states/isRecordGroupTableSectionToggledComponentState.ts index c83dad1de7..cb791427e2 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/states/isRecordGroupTableSectionToggledComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/states/isRecordGroupTableSectionToggledComponentState.ts @@ -1,9 +1,9 @@ import { RecordGroupDefinition } from '@/object-record/record-group/types/RecordGroupDefinition'; -import { createComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilyStateV2'; +import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState'; import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext'; export const isRecordGroupTableSectionToggledComponentState = - createComponentFamilyStateV2({ + createComponentFamilyState({ key: 'isRecordGroupTableSectionToggledComponentState', defaultValue: true, componentInstanceContext: ViewComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/activeRecordTableRowIndexComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/activeRecordTableRowIndexComponentState.ts index 4b5dd9ebc6..701282b052 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/activeRecordTableRowIndexComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/activeRecordTableRowIndexComponentState.ts @@ -1,7 +1,7 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const activeRecordTableRowIndexComponentState = createComponentStateV2< +export const activeRecordTableRowIndexComponentState = createComponentState< number | null >({ key: 'activeRecordTableRowIndexComponentState', diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/availableTableColumnsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/availableTableColumnsComponentState.ts index f0eca841ca..9a38ad2a70 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/availableTableColumnsComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/availableTableColumnsComponentState.ts @@ -1,10 +1,10 @@ import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata'; import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; import { ColumnDefinition } from '../types/ColumnDefinition'; -export const availableTableColumnsComponentState = createComponentStateV2< +export const availableTableColumnsComponentState = createComponentState< ColumnDefinition[] >({ key: 'availableTableColumnsComponentState', diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/context/RecordTableComponentInstanceContext.ts b/packages/twenty-front/src/modules/object-record/record-table/states/context/RecordTableComponentInstanceContext.ts index 6d058637d3..e54e46f9d4 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/context/RecordTableComponentInstanceContext.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/context/RecordTableComponentInstanceContext.ts @@ -1,10 +1,10 @@ import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata'; -import { ComponentStateKeyV2 } from '@/ui/utilities/state/component-state/types/ComponentStateKeyV2'; +import { ComponentStateKey } from '@/ui/utilities/state/component-state/types/ComponentStateKey'; import { createComponentInstanceContext } from '@/ui/utilities/state/component-state/utils/createComponentInstanceContext'; import { ColumnDefinition } from '../../types/ColumnDefinition'; -type RecordTableComponentInstanceContextProps = ComponentStateKeyV2 & { +type RecordTableComponentInstanceContextProps = ComponentStateKey & { onColumnsChange: (columns: ColumnDefinition[]) => void; }; diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/focusedRecordTableRowIndexComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/focusedRecordTableRowIndexComponentState.ts index 2f9b4a862e..b849dce7f9 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/focusedRecordTableRowIndexComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/focusedRecordTableRowIndexComponentState.ts @@ -1,7 +1,7 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const focusedRecordTableRowIndexComponentState = createComponentStateV2< +export const focusedRecordTableRowIndexComponentState = createComponentState< number | null >({ key: 'focusedRecordTableRowIndexComponentState', diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/hasRecordTableFetchedAllRecordsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/hasRecordTableFetchedAllRecordsComponentState.ts new file mode 100644 index 0000000000..f1858dca39 --- /dev/null +++ b/packages/twenty-front/src/modules/object-record/record-table/states/hasRecordTableFetchedAllRecordsComponentState.ts @@ -0,0 +1,9 @@ +import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; + +export const hasRecordTableFetchedAllRecordsComponentState = + createComponentState({ + key: 'hasRecordTableFetchedAllRecordsComponentState', + componentInstanceContext: RecordTableComponentInstanceContext, + defaultValue: false, + }); diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/hasRecordTableFetchedAllRecordsComponentStateV2.ts b/packages/twenty-front/src/modules/object-record/record-table/states/hasRecordTableFetchedAllRecordsComponentStateV2.ts deleted file mode 100644 index 8ce87c3586..0000000000 --- a/packages/twenty-front/src/modules/object-record/record-table/states/hasRecordTableFetchedAllRecordsComponentStateV2.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; - -export const hasRecordTableFetchedAllRecordsComponentStateV2 = - createComponentStateV2({ - key: 'hasRecordTableFetchedAllRecordsComponentStateV2', - componentInstanceContext: RecordTableComponentInstanceContext, - defaultValue: false, - }); diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableCellFocusActiveComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableCellFocusActiveComponentState.ts index f332feb6de..4c8a7cff8d 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableCellFocusActiveComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableCellFocusActiveComponentState.ts @@ -1,8 +1,8 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const isRecordTableCellFocusActiveComponentState = - createComponentStateV2({ + createComponentState({ key: 'isRecordTableCellFocusActiveComponentState', defaultValue: false, componentInstanceContext: RecordTableComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableInitialLoadingComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableInitialLoadingComponentState.ts index 4960f1ead5..b4ab3fd5f6 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableInitialLoadingComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableInitialLoadingComponentState.ts @@ -1,8 +1,8 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const isRecordTableInitialLoadingComponentState = - createComponentStateV2({ + createComponentState({ key: 'isRecordTableInitialLoadingComponentState', defaultValue: true, componentInstanceContext: RecordTableComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableRowActiveComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableRowActiveComponentFamilyState.ts index 21e9288d5d..d84dc0988e 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableRowActiveComponentFamilyState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableRowActiveComponentFamilyState.ts @@ -1,8 +1,8 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilyStateV2'; +import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState'; export const isRecordTableRowActiveComponentFamilyState = - createComponentFamilyStateV2({ + createComponentFamilyState({ key: 'isRecordTableRowActiveComponentFamilyState', defaultValue: false, componentInstanceContext: RecordTableComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableRowFocusActiveComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableRowFocusActiveComponentState.ts index 5752e9c26a..62194b392e 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableRowFocusActiveComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableRowFocusActiveComponentState.ts @@ -1,8 +1,8 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const isRecordTableRowFocusActiveComponentState = - createComponentStateV2({ + createComponentState({ key: 'isRecordTableRowFocusActiveComponentState', defaultValue: false, componentInstanceContext: RecordTableComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableRowFocusedComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableRowFocusedComponentFamilyState.ts index aad8da42ba..c810623248 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableRowFocusedComponentFamilyState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableRowFocusedComponentFamilyState.ts @@ -1,8 +1,8 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilyStateV2'; +import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState'; export const isRecordTableRowFocusedComponentFamilyState = - createComponentFamilyStateV2({ + createComponentFamilyState({ key: 'isRecordTableRowFocusedComponentFamilyState', defaultValue: false, componentInstanceContext: RecordTableComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableScrolledLeftComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableScrolledLeftComponentState.ts index e8bbbe3e02..4dd17e3612 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableScrolledLeftComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/isRecordTableScrolledLeftComponentState.ts @@ -1,8 +1,8 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const isRecordTableScrolledLeftComponentState = - createComponentStateV2({ + createComponentState({ key: 'isRecordTableScrolledLeftComponentState', componentInstanceContext: RecordTableComponentInstanceContext, defaultValue: true, diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/isSoftDeleteFilterActiveComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/isSoftDeleteFilterActiveComponentState.ts index 16e77936f0..7a538ac7b5 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/isSoftDeleteFilterActiveComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/isSoftDeleteFilterActiveComponentState.ts @@ -1,8 +1,8 @@ import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; export const isSoftDeleteFilterActiveComponentState = - createComponentStateV2({ + createComponentState({ key: 'isSoftDeleteFilterActiveComponentState', defaultValue: false, componentInstanceContext: RecordFiltersComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/numberOfTableRowsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/numberOfTableRowsComponentState.ts index d2f6ccc756..7bfbc4c4ca 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/numberOfTableRowsComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/numberOfTableRowsComponentState.ts @@ -1,7 +1,7 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const numberOfTableRowsComponentState = createComponentStateV2({ +export const numberOfTableRowsComponentState = createComponentState({ key: 'numberOfTableRowsComponentState', defaultValue: 0, componentInstanceContext: RecordTableComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/onColumnsChangeComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/onColumnsChangeComponentState.ts index a3635dcc4d..ac4944c498 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/onColumnsChangeComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/onColumnsChangeComponentState.ts @@ -1,9 +1,9 @@ import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata'; import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const onColumnsChangeComponentState = createComponentStateV2< +export const onColumnsChangeComponentState = createComponentState< ((columns: ColumnDefinition[]) => void) | undefined >({ key: 'onColumnsChangeComponentState', diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/onToggleColumnSortComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/onToggleColumnSortComponentState.ts index 50dfe3e98e..c24c754e03 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/onToggleColumnSortComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/onToggleColumnSortComponentState.ts @@ -1,7 +1,7 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const onToggleColumnSortComponentState = createComponentStateV2< +export const onToggleColumnSortComponentState = createComponentState< ((fieldMetadataId: string) => void) | undefined >({ key: 'onToggleColumnSortComponentState', diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/recordTableCellEditModePositionComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/recordTableCellEditModePositionComponentState.ts index 7cccbf1f79..1d0fef13d2 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/recordTableCellEditModePositionComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/recordTableCellEditModePositionComponentState.ts @@ -1,9 +1,9 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; import { TableCellPosition } from '../types/TableCellPosition'; export const recordTableCellEditModePositionComponentState = - createComponentStateV2({ + createComponentState({ key: 'recordTableCellEditModePositionComponentState', defaultValue: null, componentInstanceContext: RecordTableComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/recordTableFocusPositionComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/recordTableFocusPositionComponentState.ts index c479676fe4..6dae3b794b 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/recordTableFocusPositionComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/recordTableFocusPositionComponentState.ts @@ -1,9 +1,9 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; import { TableCellPosition } from '../types/TableCellPosition'; export const recordTableFocusPositionComponentState = - createComponentStateV2({ + createComponentState({ key: 'recordTableFocusPositionComponentState', defaultValue: { row: 0, diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/recordTableHoverPositionComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/recordTableHoverPositionComponentState.ts index f4ab8da5cf..c97adf9569 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/recordTableHoverPositionComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/recordTableHoverPositionComponentState.ts @@ -1,9 +1,9 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; import { TableCellPosition } from '../types/TableCellPosition'; export const recordTableHoverPositionComponentState = - createComponentStateV2({ + createComponentState({ key: 'recordTableHoverPositionComponentState', defaultValue: null, componentInstanceContext: RecordTableComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/resizeFieldOffsetComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/resizeFieldOffsetComponentState.ts index 08edc1cea2..e71629cbfc 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/resizeFieldOffsetComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/resizeFieldOffsetComponentState.ts @@ -1,7 +1,7 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; -export const resizeFieldOffsetComponentState = createComponentStateV2({ +export const resizeFieldOffsetComponentState = createComponentState({ key: 'resizeFieldOffsetComponentState', defaultValue: 0, componentInstanceContext: RecordTableComponentInstanceContext, diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector.ts index 0ff98a92b5..af706caa82 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector.ts @@ -2,11 +2,11 @@ import { selectedRowIdsComponentSelector } from '@/object-record/record-table/st import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector'; import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; import { AllRowsSelectedStatus } from '../../types/AllRowSelectedStatus'; export const allRowsSelectedStatusComponentSelector = - createComponentSelectorV2({ + createComponentSelector({ key: 'allRowsSelectedStatusComponentSelector', componentInstanceContext: RecordTableComponentInstanceContext, get: diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/hiddenTableColumnsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/hiddenTableColumnsComponentSelector.ts index 9afb7ce46e..e688ee07dd 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/hiddenTableColumnsComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/hiddenTableColumnsComponentSelector.ts @@ -1,10 +1,10 @@ import { availableTableColumnsComponentState } from '@/object-record/record-table/states/availableTableColumnsComponentState'; import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; import { tableColumnsComponentState } from '@/object-record/record-table/states/tableColumnsComponentState'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; import { mapArrayToObject } from '~/utils/array/mapArrayToObject'; -export const hiddenTableColumnsComponentSelector = createComponentSelectorV2({ +export const hiddenTableColumnsComponentSelector = createComponentSelector({ key: 'hiddenTableColumnsComponentSelector', componentInstanceContext: RecordTableComponentInstanceContext, get: diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/isSomeCellInEditModeComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/isSomeCellInEditModeComponentSelector.ts index 17ef7c8cbd..450f4855b0 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/isSomeCellInEditModeComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/isSomeCellInEditModeComponentSelector.ts @@ -1,9 +1,9 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; import { recordTableCellEditModePositionComponentState } from '@/object-record/record-table/states/recordTableCellEditModePositionComponentState'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; import { isDefined } from 'twenty-shared/utils'; -export const isSomeCellInEditModeComponentSelector = createComponentSelectorV2({ +export const isSomeCellInEditModeComponentSelector = createComponentSelector({ key: 'isSomeCellInEditModeComponentSelector', componentInstanceContext: RecordTableComponentInstanceContext, get: diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/numberOfTableColumnsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/numberOfTableColumnsComponentSelector.ts index aa65f35ee4..abb426860e 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/numberOfTableColumnsComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/numberOfTableColumnsComponentSelector.ts @@ -1,8 +1,8 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; import { tableColumnsComponentState } from '@/object-record/record-table/states/tableColumnsComponentState'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; -export const numberOfTableColumnsComponentSelector = createComponentSelectorV2({ +export const numberOfTableColumnsComponentSelector = createComponentSelector({ key: 'numberOfTableColumnsComponentSelector', componentInstanceContext: RecordTableComponentInstanceContext, get: diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/selectedRowIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/selectedRowIdsComponentSelector.ts index 865ce83b11..aaccc71392 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/selectedRowIdsComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/selectedRowIdsComponentSelector.ts @@ -1,9 +1,9 @@ import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector'; import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState'; import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; -export const selectedRowIdsComponentSelector = createComponentSelectorV2< +export const selectedRowIdsComponentSelector = createComponentSelector< string[] >({ key: 'selectedRowIdsComponentSelector', diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/unselectedRowIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/unselectedRowIdsComponentSelector.ts index e8b82ec9f2..f24161a6bc 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/unselectedRowIdsComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/unselectedRowIdsComponentSelector.ts @@ -1,9 +1,9 @@ import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector'; import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState'; import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; -export const unselectedRowIdsComponentSelector = createComponentSelectorV2< +export const unselectedRowIdsComponentSelector = createComponentSelector< string[] >({ key: 'unselectedRowIdsComponentSelector', diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector.ts index 8c47eb7e04..0329915585 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector.ts @@ -1,8 +1,8 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; import { tableColumnsComponentState } from '@/object-record/record-table/states/tableColumnsComponentState'; -import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2'; +import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector'; -export const visibleTableColumnsComponentSelector = createComponentSelectorV2({ +export const visibleTableColumnsComponentSelector = createComponentSelector({ key: 'visibleTableColumnsComponentSelector', componentInstanceContext: RecordTableComponentInstanceContext, get: diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/tableColumnsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/tableColumnsComponentState.ts index af7b3c8ef9..3033f38537 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/states/tableColumnsComponentState.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/states/tableColumnsComponentState.ts @@ -1,10 +1,10 @@ import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata'; import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext'; -import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2'; +import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState'; import { ColumnDefinition } from '../types/ColumnDefinition'; -export const tableColumnsComponentState = createComponentStateV2< +export const tableColumnsComponentState = createComponentState< ColumnDefinition[] >({ key: 'tableColumnsComponentState', diff --git a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldInput.tsx index 8354ba0637..b884cf2196 100644 --- a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldInput.tsx +++ b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldInput.tsx @@ -5,7 +5,7 @@ import { FieldInputClickOutsideEvent, FieldInputEvent, } from '@/object-record/record-field/types/FieldInputEvent'; -import { TextInputV2 } from '@/ui/input/components/TextInputV2'; +import { TextInput } from '@/ui/input/components/TextInput'; import { useRef } from 'react'; import { isDefined } from 'twenty-shared/utils'; import { turnIntoUndefinedIfWhitespacesOnly } from '~/utils/string/turnIntoUndefinedIfWhitespacesOnly'; @@ -67,7 +67,7 @@ export const RecordTitleCellTextFieldInput = ({ }; return ( - - - { [goBackToPreviousDropdownFocusId, removeFocusItemFromFocusStackById], ); - const initFieldInputDraftValue = useInitDraftValueV2(); + const initFieldInputDraftValue = useInitDraftValue(); const openRecordTitleCell = useRecoilCallback( ({ set }) => diff --git a/packages/twenty-front/src/modules/object-record/select/components/MultipleSelectDropdown.tsx b/packages/twenty-front/src/modules/object-record/select/components/MultipleSelectDropdown.tsx index 30faad2168..97cd44574c 100644 --- a/packages/twenty-front/src/modules/object-record/select/components/MultipleSelectDropdown.tsx +++ b/packages/twenty-front/src/modules/object-record/select/components/MultipleSelectDropdown.tsx @@ -9,7 +9,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList'; import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState'; import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement'; -import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { Avatar } from 'twenty-ui/display'; import { MenuItem, MenuItemMultiSelectAvatar } from 'twenty-ui/navigation'; @@ -38,7 +38,7 @@ export const MultipleSelectDropdown = ({ const { resetSelectedItem } = useSelectableList(selectableListId); - const selectedItemId = useRecoilComponentValueV2( + const selectedItemId = useRecoilComponentValue( selectedItemIdComponentState, selectableListId, ); diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx index a6d552a64d..9822990a97 100644 --- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx +++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx @@ -5,7 +5,7 @@ import { Controller, useForm } from 'react-hook-form'; import { Key } from 'ts-key-enum'; import { z } from 'zod'; -import { TextInput } from '@/ui/input/components/TextInput'; +import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput'; import { useLingui } from '@lingui/react/macro'; import { isValidHostname } from 'twenty-shared/utils'; import { Button } from 'twenty-ui/input'; @@ -94,7 +94,7 @@ export const SettingsAccountsBlocklistInput = ({ name="emailOrDomain" control={control} render={({ field: { value, onChange }, fieldState: { error } }) => ( - { - const activeTabId = useRecoilComponentValueV2( + const activeTabId = useRecoilComponentValue( activeTabIdComponentState, SETTINGS_ACCOUNT_CALENDAR_CHANNELS_TAB_LIST_COMPONENT_ID, ); diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectionForm.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectionForm.tsx index b29d74d1e1..b95f004c50 100644 --- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectionForm.tsx +++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectionForm.tsx @@ -3,7 +3,7 @@ import { useLingui } from '@lingui/react/macro'; import { Control, Controller } from 'react-hook-form'; import { Select } from '@/ui/input/components/Select'; -import { TextInput } from '@/ui/input/components/TextInput'; +import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput'; import { ConnectionFormData } from '@/settings/accounts/hooks/useImapSmtpCaldavConnectionForm'; import { H2Title } from 'twenty-ui/display'; @@ -89,7 +89,7 @@ export const SettingsAccountsConnectionForm = ({ name="handle" control={control} render={({ field, fieldState }) => ( - ( - ( - ( - ( - ( - ( - ( - ( - ( - { - const activeTabId = useRecoilComponentValueV2( + const activeTabId = useRecoilComponentValue( activeTabIdComponentState, SETTINGS_ACCOUNT_MESSAGE_CHANNELS_TAB_LIST_COMPONENT_ID, ); diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx index 57ddcb1100..e593c19ca6 100644 --- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx +++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx @@ -2,7 +2,7 @@ import { canManageFeatureFlagsState } from '@/client-config/states/canManageFeat import { SettingsAdminWorkspaceContent } from '@/settings/admin-panel/components/SettingsAdminWorkspaceContent'; import { userLookupResultState } from '@/settings/admin-panel/states/userLookupResultState'; import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; -import { TextInput } from '@/ui/input/components/TextInput'; +import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput'; import { TabList } from '@/ui/layout/tab-list/components/TabList'; import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo'; import styled from '@emotion/styled'; @@ -18,7 +18,7 @@ import { SettingsAdminTableCard } from '@/settings/admin-panel/components/Settin import { SettingsAdminVersionContainer } from '@/settings/admin-panel/components/SettingsAdminVersionContainer'; import { SETTINGS_ADMIN_USER_LOOKUP_WORKSPACE_TABS_ID } from '@/settings/admin-panel/constants/SettingsAdminUserLookupWorkspaceTabsId'; import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState'; -import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; +import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState'; import { getImageAbsoluteURI, isDefined } from 'twenty-shared/utils'; import { H2Title, @@ -41,7 +41,7 @@ export const SettingsAdminGeneral = () => { const [userIdentifier, setUserIdentifier] = useState(''); const { enqueueErrorSnackBar } = useSnackBar(); - const [activeTabId, setActiveTabId] = useRecoilComponentStateV2( + const [activeTabId, setActiveTabId] = useRecoilComponentState( activeTabIdComponentState, SETTINGS_ADMIN_USER_LOOKUP_WORKSPACE_TABS_ID, ); @@ -155,7 +155,7 @@ export const SettingsAdminGeneral = () => { /> - { - const activeTabId = useRecoilComponentValueV2( + const activeTabId = useRecoilComponentValue( activeTabIdComponentState, SETTINGS_ADMIN_TABS_ID, ); diff --git a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableDatabaseInput.tsx b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableDatabaseInput.tsx index 76408df679..50dc4f0d8e 100644 --- a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableDatabaseInput.tsx +++ b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableDatabaseInput.tsx @@ -2,7 +2,7 @@ import { CustomError } from '@/error-handler/CustomError'; import { Select } from '@/ui/input/components/Select'; import { SelectControl } from '@/ui/input/components/SelectControl'; import { TextArea } from '@/ui/input/components/TextArea'; -import { TextInputV2 } from '@/ui/input/components/TextInputV2'; +import { TextInput } from '@/ui/input/components/TextInput'; import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; @@ -78,7 +78,7 @@ export const ConfigVariableDatabaseInput = ({ case ConfigVariableType.NUMBER: return ( - { @@ -173,7 +173,7 @@ export const ConfigVariableDatabaseInput = ({ case ConfigVariableType.STRING: return ( - ) : ( - + )} ); diff --git a/packages/twenty-front/src/modules/settings/components/SettingsCounter.tsx b/packages/twenty-front/src/modules/settings/components/SettingsCounter.tsx index d46d6786c2..970ab58ac8 100644 --- a/packages/twenty-front/src/modules/settings/components/SettingsCounter.tsx +++ b/packages/twenty-front/src/modules/settings/components/SettingsCounter.tsx @@ -1,4 +1,4 @@ -import { TextInput } from '@/ui/input/components/TextInput'; +import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput'; import styled from '@emotion/styled'; import { IconMinus, IconPlus } from 'twenty-ui/display'; import { IconButton } from 'twenty-ui/input'; @@ -20,7 +20,7 @@ const StyledCounterContainer = styled.div` width: ${({ theme }) => theme.spacing(30)}; `; -const StyledTextInput = styled(TextInput)` +const StyledTextInput = styled(SettingsTextInput)` width: ${({ theme }) => theme.spacing(16)}; input { width: ${({ theme }) => theme.spacing(16)}; diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx index 99cff8f30a..4bbc397c71 100644 --- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx +++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx @@ -10,7 +10,7 @@ import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsO import { DATABASE_IDENTIFIER_MAXIMUM_LENGTH } from '@/settings/data-model/constants/DatabaseIdentifierMaximumLength'; import { getErrorMessageFromError } from '@/settings/data-model/fields/forms/utils/errorMessages'; import { IconPicker } from '@/ui/input/components/IconPicker'; -import { TextInput } from '@/ui/input/components/TextInput'; +import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput'; import { useTheme } from '@emotion/react'; import { useLingui } from '@lingui/react/macro'; import { FieldMetadataType } from 'twenty-shared/types'; @@ -158,7 +158,7 @@ export const SettingsDataModelFieldIconLabelForm = ({ control={control} defaultValue={fieldMetadataItem?.label} render={({ field: { onChange, value } }) => ( - ( <> - theme.spacing(1)}); `; -const StyledSearchInput = styled(TextInput)` +const StyledSearchInput = styled(SettingsTextInput)` width: 100%; `; diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx index f5a9d0fa4a..4a4e29eb7b 100644 --- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx +++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx @@ -11,7 +11,7 @@ import { useDateSettingsFormInitialValues } from '@/settings/data-model/fields/f import { getDisplayFormatLabel } from '@/settings/data-model/fields/forms/date/utils/getDisplayFormatLabel'; import { getDisplayFormatSelectDescription } from '@/settings/data-model/fields/forms/date/utils/getDisplayFormatSelectDescription'; import { Select } from '@/ui/input/components/Select'; -import { TextInput } from '@/ui/input/components/TextInput'; +import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput'; import styled from '@emotion/styled'; import { useLingui } from '@lingui/react/macro'; import { IconSlash } from 'twenty-ui/display'; @@ -34,7 +34,7 @@ export const settingsDataModelFieldDateFormSchema = z.object({ settings: fieldDateSettings.optional(), }); -const StyledTextInput = styled(TextInput)` +const StyledTextInput = styled(SettingsTextInput)` padding: ${({ theme }) => theme.spacing(4)}; padding-top: 0; `; diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm.tsx index 6c728a5e31..b294a1c184 100644 --- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm.tsx +++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm.tsx @@ -12,7 +12,7 @@ import { RELATION_TYPES } from '@/settings/data-model/constants/RelationTypes'; import { useRelationSettingsFormInitialValues } from '@/settings/data-model/fields/forms/relation/hooks/useRelationSettingsFormInitialValues'; import { IconPicker } from '@/ui/input/components/IconPicker'; import { Select } from '@/ui/input/components/Select'; -import { TextInput } from '@/ui/input/components/TextInput'; +import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; import { useLingui } from '@lingui/react/macro'; import { useIcons } from 'twenty-ui/display'; @@ -186,7 +186,7 @@ export const SettingsDataModelFieldRelationForm = ({ control={control} defaultValue={initialRelationFieldMetadataItem.label} render={({ field: { onChange, value } }) => ( - theme.spacing(3.5)}; `; -const StyledOptionInput = styled(TextInput)` +const StyledOptionInput = styled(SettingsTextInput)` flex-grow: 1; width: 100%; & input { diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx index 7fd5ce83fc..4753e6fd16 100644 --- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx +++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx @@ -4,8 +4,8 @@ import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsO import { OBJECT_NAME_MAXIMUM_LENGTH } from '@/settings/data-model/constants/ObjectNameMaximumLength'; import { SettingsDataModelObjectAboutFormValues } from '@/settings/data-model/validation-schemas/settingsDataModelObjectAboutFormSchema'; import { IconPicker } from '@/ui/input/components/IconPicker'; +import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput'; import { TextArea } from '@/ui/input/components/TextArea'; -import { TextInput } from '@/ui/input/components/TextInput'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; import { useLingui } from '@lingui/react/macro'; @@ -153,7 +153,7 @@ export const SettingsDataModelObjectAboutForm = ({ control={control} defaultValue={objectMetadataItem?.labelSingular ?? ''} render={({ field: { onChange, value }, formState: { errors } }) => ( - ( - ( <> - { return ( - +