The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Fix delete/destroy/restore record commands on pages without a record index (#22952)
Charles Bochet5588ddf82909
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DeleteRecordsCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DeleteRecordsCommand.tsxindex 9b1b2e83dcc..7ac438e6bff 100644--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DeleteRecordsCommand.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DeleteRecordsCommand.tsx@@ -5,6 +5,7 @@ import { useNavigationMenuItemsData } from '@/navigation-menu-item/display/hooksimport { DEFAULT_QUERY_PAGE_SIZE } from '@/object-record/constants/DefaultQueryPageSize';import { useIncrementalDeleteManyRecords } from '@/object-record/hooks/useIncrementalDeleteManyRecords';import { useRemoveSelectedRecordsFromRecordBoard } from '@/object-record/record-board/hooks/useRemoveSelectedRecordsFromRecordBoard';+import { PLACEHOLDER_RECORD_INDEX_ID } from '@/object-record/record-index/constants/PlaceholderRecordIndexId';import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { type RecordGqlOperationFilter } from 'twenty-shared/types';@@ -14,18 +15,20 @@ export const DeleteRecordsCommand = () => {const { recordIndexId, objectMetadataItem, selectedRecords, graphqlFilter } =useHeadlessCommandContextApi();- if (!isDefined(recordIndexId) || !isDefined(objectMetadataItem)) {- throw new Error(- 'Record index ID and object metadata are required to delete records',- );+ if (!isDefined(objectMetadataItem)) {+ throw new Error('Object metadata is required to delete records');}const recordId = selectedRecords[0]?.id;- const { resetTableRowSelection } = useResetTableRowSelection(recordIndexId);+ const { resetTableRowSelection } = useResetTableRowSelection(+ recordIndexId ?? PLACEHOLDER_RECORD_INDEX_ID,+ );const { removeSelectedRecordsFromRecordBoard } =- useRemoveSelectedRecordsFromRecordBoard(recordIndexId);+ useRemoveSelectedRecordsFromRecordBoard(+ recordIndexId ?? PLACEHOLDER_RECORD_INDEX_ID,+ );const noMatchFilter: RecordGqlOperationFilter = { id: { in: [] } };@@ -45,8 +48,10 @@ export const DeleteRecordsCommand = () => {const { closeSidePanelMenu } = useSidePanelMenu();const handleExecute = async () => {- removeSelectedRecordsFromRecordBoard();- resetTableRowSelection();+ if (isDefined(recordIndexId)) {+ removeSelectedRecordsFromRecordBoard();+ resetTableRowSelection();+ }closeSidePanelMenu();if (isDefined(recordId)) {diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DestroyRecordsCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DestroyRecordsCommand.tsxindex 5a3c8517a48..a6b674b1918 100644--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DestroyRecordsCommand.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DestroyRecordsCommand.tsx@@ -3,6 +3,7 @@ import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-commandimport { DEFAULT_QUERY_PAGE_SIZE } from '@/object-record/constants/DefaultQueryPageSize';import { useIncrementalDestroyManyRecords } from '@/object-record/hooks/useIncrementalDestroyManyRecords';import { useRemoveSelectedRecordsFromRecordBoard } from '@/object-record/record-board/hooks/useRemoveSelectedRecordsFromRecordBoard';+import { PLACEHOLDER_RECORD_INDEX_ID } from '@/object-record/record-index/constants/PlaceholderRecordIndexId';import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { t } from '@lingui/core/macro';@@ -19,10 +20,8 @@ export const DestroyRecordsCommand = () => {isInSidePanel,} = useHeadlessCommandContextApi();- if (!isDefined(recordIndexId) || !isDefined(objectMetadataItem)) {- throw new Error(- 'Record index ID and object metadata are required to destroy records',- );+ if (!isDefined(objectMetadataItem)) {+ throw new Error('Object metadata is required to destroy records');}const isSingleRecord = selectedRecords.length === 1;@@ -30,9 +29,13 @@ export const DestroyRecordsCommand = () => {const navigateApp = useNavigateApp();const { closeSidePanelMenu } = useSidePanelMenu();- const { resetTableRowSelection } = useResetTableRowSelection(recordIndexId);+ const { resetTableRowSelection } = useResetTableRowSelection(+ recordIndexId ?? PLACEHOLDER_RECORD_INDEX_ID,+ );const { removeSelectedRecordsFromRecordBoard } =- useRemoveSelectedRecordsFromRecordBoard(recordIndexId);+ useRemoveSelectedRecordsFromRecordBoard(+ recordIndexId ?? PLACEHOLDER_RECORD_INDEX_ID,+ );const noMatchFilter: RecordGqlOperationFilter = { id: { in: [] } };@@ -53,8 +56,10 @@ export const DestroyRecordsCommand = () => {});const handleExecute = async () => {- removeSelectedRecordsFromRecordBoard();- resetTableRowSelection();+ if (isDefined(recordIndexId)) {+ removeSelectedRecordsFromRecordBoard();+ resetTableRowSelection();+ }if (!isDefined(graphqlFilter)) {throw new Error('Cannot destroy records without a valid filter');diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/RestoreRecordsCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/RestoreRecordsCommand.tsxindex 4734557b04b..a216d01b5cb 100644--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/RestoreRecordsCommand.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/RestoreRecordsCommand.tsx@@ -4,6 +4,7 @@ import { DEFAULT_QUERY_PAGE_SIZE } from '@/object-record/constants/DefaultQueryPimport { useLazyFetchAllRecords } from '@/object-record/hooks/useLazyFetchAllRecords';import { useRestoreManyRecords } from '@/object-record/hooks/useRestoreManyRecords';import { useRemoveSelectedRecordsFromRecordBoard } from '@/object-record/record-board/hooks/useRemoveSelectedRecordsFromRecordBoard';+import { PLACEHOLDER_RECORD_INDEX_ID } from '@/object-record/record-index/constants/PlaceholderRecordIndexId';import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { t } from '@lingui/core/macro';@@ -14,17 +15,19 @@ export const RestoreRecordsCommand = () => {const { recordIndexId, objectMetadataItem, selectedRecords, graphqlFilter } =useHeadlessCommandContextApi();- if (!isDefined(recordIndexId) || !isDefined(objectMetadataItem)) {- throw new Error(- 'Record index ID and object metadata are required to restore records',- );+ if (!isDefined(objectMetadataItem)) {+ throw new Error('Object metadata is required to restore records');}const isSingleRecord = selectedRecords.length === 1;- const { resetTableRowSelection } = useResetTableRowSelection(recordIndexId);+ const { resetTableRowSelection } = useResetTableRowSelection(+ recordIndexId ?? PLACEHOLDER_RECORD_INDEX_ID,+ );const { removeSelectedRecordsFromRecordBoard } =- useRemoveSelectedRecordsFromRecordBoard(recordIndexId);+ useRemoveSelectedRecordsFromRecordBoard(+ recordIndexId ?? PLACEHOLDER_RECORD_INDEX_ID,+ );const { closeSidePanelMenu } = useSidePanelMenu();const { restoreManyRecords } = useRestoreManyRecords({@@ -50,7 +53,9 @@ export const RestoreRecordsCommand = () => {});const handleExecute = async () => {- removeSelectedRecordsFromRecordBoard();+ if (isDefined(recordIndexId)) {+ removeSelectedRecordsFromRecordBoard();+ }closeSidePanelMenu();if (!isDefined(graphqlFilter)) {@@ -60,7 +65,9 @@ export const RestoreRecordsCommand = () => {const recordsToRestore = await fetchAllRecordIds();const recordIdsToRestore = recordsToRestore.map((record) => record.id);- resetTableRowSelection();+ if (isDefined(recordIndexId)) {+ resetTableRowSelection();+ }await restoreManyRecords({idsToRestore: recordIdsToRestore,diff --git a/packages/twenty-front/src/modules/object-record/record-index/constants/PlaceholderRecordIndexId.ts b/packages/twenty-front/src/modules/object-record/record-index/constants/PlaceholderRecordIndexId.tsnew file mode 100644index 00000000000..dc97635b63d--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-index/constants/PlaceholderRecordIndexId.ts@@ -0,0 +1 @@+export const PLACEHOLDER_RECORD_INDEX_ID = 'placeholder-record-index-id';diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useResetRecordIndexSelection.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useResetRecordIndexSelection.tsindex 136916dc85f..a69d694e92a 100644--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useResetRecordIndexSelection.ts+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useResetRecordIndexSelection.ts@@ -3,6 +3,7 @@ import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/import { contextStoreCurrentViewTypeComponentState } from '@/context-store/states/contextStoreCurrentViewTypeComponentState';import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewType';import { useResetRecordBoardSelection } from '@/object-record/record-board/hooks/useResetRecordBoardSelection';+import { PLACEHOLDER_RECORD_INDEX_ID } from '@/object-record/record-index/constants/PlaceholderRecordIndexId';import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';@@ -11,8 +12,6 @@ import { useStore } from 'jotai';import { useCallback } from 'react';import { isDefined } from 'twenty-shared/utils';-const PLACEHOLDER_RECORD_INDEX_ID = 'placeholder-record-index-id';-export const useResetRecordIndexSelection = (contextStoreInstanceId?: string,) => {