From 1113c20d89725961e46350608fcae5791058fa2e Mon Sep 17 00:00:00 2001 From: BOHEUS <56270748+BOHEUS@users.noreply.github.com> Date: Tue, 6 Jan 2026 16:00:10 +0000 Subject: [PATCH] Destroy core view (#16868) Solution for #16526 --------- Co-authored-by: prastoin --- .../ObjectOptionsDropdownCustomView.tsx | 6 +++--- .../views/hooks/internal/usePersistView.ts | 18 +++++++++--------- .../components/ViewPickerCreateButton.tsx | 6 +++--- .../components/ViewPickerEditButton.tsx | 6 +++--- .../components/ViewPickerOptionDropdown.tsx | 6 +++--- ...te.ts => useDestroyViewFromCurrentState.ts} | 12 ++++++------ 6 files changed, 27 insertions(+), 27 deletions(-) rename packages/twenty-front/src/modules/views/view-picker/hooks/{useDeleteViewFromCurrentState.ts => useDestroyViewFromCurrentState.ts} (91%) diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx index f67c55ca33..dc997edb0f 100644 --- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx +++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx @@ -16,7 +16,7 @@ import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly'; import { ViewKey } from '@/views/types/ViewKey'; import { ViewType, viewTypeIconMapping } from '@/views/types/ViewType'; -import { useDeleteViewFromCurrentState } from '@/views/view-picker/hooks/useDeleteViewFromCurrentState'; +import { useDestroyViewFromCurrentState } from '@/views/view-picker/hooks/useDestroyViewFromCurrentState'; import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState'; import { useLingui } from '@lingui/react/macro'; import { useRecoilValue } from 'recoil'; @@ -78,7 +78,7 @@ export const ObjectOptionsDropdownCustomView = ({ const visibleFieldsCount = visibleBoardFields.length; - const { deleteViewFromCurrentState } = useDeleteViewFromCurrentState(); + const { destroyViewFromCurrentState } = useDestroyViewFromCurrentState(); const setViewPickerReferenceViewId = useSetRecoilComponentState( viewPickerReferenceViewIdComponentState, ); @@ -88,7 +88,7 @@ export const ObjectOptionsDropdownCustomView = ({ return; } setViewPickerReferenceViewId(customViewData?.id); - deleteViewFromCurrentState(); + destroyViewFromCurrentState(); closeDropdown(); onBackToDefault?.(); }; diff --git a/packages/twenty-front/src/modules/views/hooks/internal/usePersistView.ts b/packages/twenty-front/src/modules/views/hooks/internal/usePersistView.ts index f2c4c6f328..e981650a85 100644 --- a/packages/twenty-front/src/modules/views/hooks/internal/usePersistView.ts +++ b/packages/twenty-front/src/modules/views/hooks/internal/usePersistView.ts @@ -10,10 +10,10 @@ import { isDefined } from 'twenty-shared/utils'; import { v4 } from 'uuid'; import { type CreateCoreViewMutationVariables, - type DeleteCoreViewMutationVariables, + type DestroyCoreViewMutationVariables, type UpdateCoreViewMutationVariables, useCreateCoreViewMutation, - useDeleteCoreViewMutation, + useDestroyCoreViewMutation, useUpdateCoreViewMutation, ViewType, } from '~/generated/graphql'; @@ -21,7 +21,7 @@ import { export const usePersistView = () => { const [createCoreViewMutation] = useCreateCoreViewMutation(); const [updateCoreViewMutation] = useUpdateCoreViewMutation(); - const [deleteCoreViewMutation] = useDeleteCoreViewMutation(); + const [destroyCoreViewMutation] = useDestroyCoreViewMutation(); const { triggerViewGroupOptimisticEffectAtViewCreation } = useViewsSideEffectsOnViewGroups(); @@ -124,14 +124,14 @@ export const usePersistView = () => { [updateCoreViewMutation, handleMetadataError, enqueueErrorSnackBar], ); - const deleteView = useCallback( + const destroyView = useCallback( async ( - variables: DeleteCoreViewMutationVariables, + variables: DestroyCoreViewMutationVariables, ): Promise< - MetadataRequestResult>> + MetadataRequestResult>> > => { try { - const result = await deleteCoreViewMutation({ + const result = await destroyCoreViewMutation({ variables, }); @@ -154,12 +154,12 @@ export const usePersistView = () => { }; } }, - [deleteCoreViewMutation, handleMetadataError, enqueueErrorSnackBar], + [destroyCoreViewMutation, handleMetadataError, enqueueErrorSnackBar], ); return { createView, updateView, - deleteView, + destroyView, }; }; diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateButton.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateButton.tsx index 810145338e..c58949fcf9 100644 --- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateButton.tsx +++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateButton.tsx @@ -1,7 +1,7 @@ import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue'; import { ViewType } from '@/views/types/ViewType'; import { useCreateViewFromCurrentState } from '@/views/view-picker/hooks/useCreateViewFromCurrentState'; -import { useDeleteViewFromCurrentState } from '@/views/view-picker/hooks/useDeleteViewFromCurrentState'; +import { useDestroyViewFromCurrentState } from '@/views/view-picker/hooks/useDestroyViewFromCurrentState'; import { useGetAvailableFieldsForCalendar } from '@/views/view-picker/hooks/useGetAvailableFieldsForCalendar'; import { useGetAvailableFieldsForKanban } from '@/views/view-picker/hooks/useGetAvailableFieldsForKanban'; import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode'; @@ -32,7 +32,7 @@ export const ViewPickerCreateButton = () => { ); const { createViewFromCurrentState } = useCreateViewFromCurrentState(); - const { deleteViewFromCurrentState } = useDeleteViewFromCurrentState(); + const { destroyViewFromCurrentState } = useDestroyViewFromCurrentState(); const handleCreateButtonClick = () => { createViewFromCurrentState(); @@ -42,7 +42,7 @@ export const ViewPickerCreateButton = () => { return (