Skip to content

The open alternative to Salesforce, designed for AI.

Confirm before deleting core workflows (#27360)

Thomas Trompettebffaa823c02d
diff --git a/packages/twenty-front/src/modules/object-core/commands/components/CoreObjectsCommands.tsx b/packages/twenty-front/src/modules/object-core/commands/components/CoreObjectsCommands.tsx
index ce263b1f39b..4db8786a343 100644
--- a/packages/twenty-front/src/modules/object-core/commands/components/CoreObjectsCommands.tsx
+++ b/packages/twenty-front/src/modules/object-core/commands/components/CoreObjectsCommands.tsx
@@ -1,12 +1,17 @@
import { IconFilter, IconTrash } from 'twenty-ui/icon';
import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';
+import { CoreWorkflowsDeleteConfirmationDialogCleanupEffect } from '@/object-core/commands/components/CoreWorkflowsDeleteConfirmationDialogCleanupEffect';
import { CORE_WORKFLOWS_DELETE_COMMAND_ID } from '@/object-core/commands/constants/CoreWorkflowsDeleteCommandId';
+import { CORE_WORKFLOWS_DELETE_CONFIRMATION_DIALOG_ID } from '@/object-core/commands/constants/CoreWorkflowsDeleteConfirmationDialogId';
import { CORE_WORKFLOW_FILTERS_COMMAND_ID } from '@/object-core/commands/constants/CoreWorkflowFiltersCommandId';
import { useCoreObjectsCommands } from '@/object-core/commands/hooks/useCoreObjectsCommands';
import { useDeleteSelectedCoreWorkflows } from '@/object-core/workflows/hooks/useDeleteSelectedCoreWorkflows';
import { useOpenCoreWorkflowFiltersSidePanel } from '@/object-core/workflows/hooks/useOpenCoreWorkflowFiltersSidePanel';
+import { getDeleteCoreWorkflowsConfirmationContent } from '@/object-core/workflows/utils/getDeleteCoreWorkflowsConfirmationContent';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
+import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
+import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
type CoreObjectsCommandsProps = {
@@ -24,15 +29,26 @@ export const CoreObjectsCommands = ({ section }: CoreObjectsCommandsProps) => {
const { openCoreWorkflowFiltersSidePanel } =
useOpenCoreWorkflowFiltersSidePanel();
- const { deleteSelectedCoreWorkflows } = useDeleteSelectedCoreWorkflows();
+ const { deleteSelectedCoreWorkflows, selectedCoreWorkflowIds } =
+ useDeleteSelectedCoreWorkflows();
const { closeSidePanelMenu } = useSidePanelMenu();
- const handleDeleteSelectedCoreWorkflows = () => {
+ const { openDialog } = useDialog();
+
+ const openDeleteConfirmationDialog = () => {
+ openDialog(CORE_WORKFLOWS_DELETE_CONFIRMATION_DIALOG_ID);
+ };
+
+ const handleConfirmDeleteSelectedCoreWorkflows = () => {
closeSidePanelMenu();
void deleteSelectedCoreWorkflows();
};
+ const deleteConfirmationContent = getDeleteCoreWorkflowsConfirmationContent(
+ selectedCoreWorkflowIds.length,
+ );
+
return (
<>
{section === 'THIS_OBJECT' && shouldDisplayCoreWorkflowFiltersCommand && (
@@ -49,17 +65,27 @@ export const CoreObjectsCommands = ({ section }: CoreObjectsCommandsProps) => {
</SelectableListItem>
)}
{section === 'SELECTION' && shouldDisplayCoreWorkflowsDeleteCommand && (
- <SelectableListItem
- itemId={CORE_WORKFLOWS_DELETE_COMMAND_ID}
- onEnter={handleDeleteSelectedCoreWorkflows}
- >
- <CommandMenuItem
- id={CORE_WORKFLOWS_DELETE_COMMAND_ID}
- label={coreWorkflowsDeleteCommandLabel}
- Icon={IconTrash}
- onClick={handleDeleteSelectedCoreWorkflows}
+ <>
+ <SelectableListItem
+ itemId={CORE_WORKFLOWS_DELETE_COMMAND_ID}
+ onEnter={openDeleteConfirmationDialog}
+ >
+ <CommandMenuItem
+ id={CORE_WORKFLOWS_DELETE_COMMAND_ID}
+ label={coreWorkflowsDeleteCommandLabel}
+ Icon={IconTrash}
+ onClick={openDeleteConfirmationDialog}
+ />
+ </SelectableListItem>
+ <ConfirmationDialog
+ dialogId={CORE_WORKFLOWS_DELETE_CONFIRMATION_DIALOG_ID}
+ title={deleteConfirmationContent.title}
+ subtitle={deleteConfirmationContent.subtitle}
+ confirmButtonText={deleteConfirmationContent.confirmButtonText}
+ onConfirmClick={handleConfirmDeleteSelectedCoreWorkflows}
/>
- </SelectableListItem>
+ <CoreWorkflowsDeleteConfirmationDialogCleanupEffect />
+ </>
)}
</>
);
diff --git a/packages/twenty-front/src/modules/object-core/commands/components/CoreWorkflowsDeleteConfirmationDialogCleanupEffect.tsx b/packages/twenty-front/src/modules/object-core/commands/components/CoreWorkflowsDeleteConfirmationDialogCleanupEffect.tsx
new file mode 100644
index 00000000000..3144336c4b2
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-core/commands/components/CoreWorkflowsDeleteConfirmationDialogCleanupEffect.tsx
@@ -0,0 +1,15 @@
+import { useEffect } from 'react';
+
+import { CORE_WORKFLOWS_DELETE_CONFIRMATION_DIALOG_ID } from '@/object-core/commands/constants/CoreWorkflowsDeleteConfirmationDialogId';
+import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
+
+export const CoreWorkflowsDeleteConfirmationDialogCleanupEffect = () => {
+ const { closeDialog } = useDialog();
+
+ useEffect(
+ () => () => closeDialog(CORE_WORKFLOWS_DELETE_CONFIRMATION_DIALOG_ID),
+ [closeDialog],
+ );
+
+ return null;
+};
diff --git a/packages/twenty-front/src/modules/object-core/commands/components/__tests__/CoreObjectsCommands.test.tsx b/packages/twenty-front/src/modules/object-core/commands/components/__tests__/CoreObjectsCommands.test.tsx
new file mode 100644
index 00000000000..d2d1b71c84d
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-core/commands/components/__tests__/CoreObjectsCommands.test.tsx
@@ -0,0 +1,151 @@
+import { i18n } from '@lingui/core';
+import { I18nProvider } from '@lingui/react';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { type ReactNode } from 'react';
+import { MemoryRouter } from 'react-router-dom';
+
+import { CoreObjectsCommands } from '@/object-core/commands/components/CoreObjectsCommands';
+import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
+import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
+
+const mockDeleteSelectedCoreWorkflows = jest.fn();
+const mockCloseSidePanelMenu = jest.fn();
+let mockSelectedCoreWorkflowIds: string[] = [];
+
+jest.mock('@/object-core/commands/hooks/useCoreObjectsCommands', () => ({
+ useCoreObjectsCommands: () => ({
+ coreWorkflowFiltersCommandLabel: 'Filter workflows',
+ shouldDisplayCoreWorkflowFiltersCommand: false,
+ coreWorkflowsDeleteCommandLabel: 'Delete Workflows',
+ shouldDisplayCoreWorkflowsDeleteCommand: true,
+ }),
+}));
+
+jest.mock(
+ '@/object-core/workflows/hooks/useDeleteSelectedCoreWorkflows',
+ () => ({
+ useDeleteSelectedCoreWorkflows: () => ({
+ deleteSelectedCoreWorkflows: mockDeleteSelectedCoreWorkflows,
+ selectedCoreWorkflowIds: mockSelectedCoreWorkflowIds,
+ }),
+ }),
+);
+
+jest.mock(
+ '@/object-core/workflows/hooks/useOpenCoreWorkflowFiltersSidePanel',
+ () => ({
+ useOpenCoreWorkflowFiltersSidePanel: () => ({
+ openCoreWorkflowFiltersSidePanel: jest.fn(),
+ }),
+ }),
+);
+
+jest.mock('@/side-panel/hooks/useSidePanelMenu', () => ({
+ useSidePanelMenu: () => ({ closeSidePanelMenu: mockCloseSidePanelMenu }),
+}));
+
+const renderSelectionCommands = () => {
+ const Wrapper = getJestMetadataAndApolloMocksWrapper({ apolloMocks: [] });
+
+ return render(<CoreObjectsCommands section="SELECTION" />, {
+ wrapper: ({ children }: { children: ReactNode }) => (
+ <Wrapper>
+ <I18nProvider i18n={i18n}>
+ <MemoryRouter>
+ <SelectableList
+ selectableListInstanceId="core-objects-commands-test"
+ selectableItemIdArray={[]}
+ focusId="core-objects-commands-test"
+ >
+ {children}
+ </SelectableList>
+ </MemoryRouter>
+ </I18nProvider>
+ </Wrapper>
+ ),
+ });
+};
+
+beforeEach(() => {
+ jest.clearAllMocks();
+ mockSelectedCoreWorkflowIds = ['workflow-1'];
+ mockDeleteSelectedCoreWorkflows.mockResolvedValue(true);
+});
+
+it('asks for confirmation before deleting the selected workflow', async () => {
+ renderSelectionCommands();
+
+ await userEvent.click(screen.getByText('Delete Workflows'));
+
+ expect(await screen.findByText('Delete workflow?')).toBeInTheDocument();
+ expect(
+ screen.getByText(
+ 'This permanently deletes this workflow and all its run history. This action cannot be undone.',
+ ),
+ ).toBeInTheDocument();
+ expect(
+ screen.getByRole('button', { name: 'Delete workflow' }),
+ ).toBeInTheDocument();
+ expect(mockDeleteSelectedCoreWorkflows).not.toHaveBeenCalled();
+ expect(mockCloseSidePanelMenu).not.toHaveBeenCalled();
+});
+
+it('shows the selected workflow count when several workflows are selected', async () => {
+ mockSelectedCoreWorkflowIds = ['workflow-1', 'workflow-2', 'workflow-3'];
+
+ renderSelectionCommands();
+
+ await userEvent.click(screen.getByText('Delete Workflows'));
+
+ expect(await screen.findByText('Delete 3 workflows?')).toBeInTheDocument();
+ expect(
+ screen.getByText(
+ 'This permanently deletes these 3 workflows and all their run history. This action cannot be undone.',
+ ),
+ ).toBeInTheDocument();
+ expect(
+ screen.getByRole('button', { name: 'Delete workflows' }),
+ ).toBeInTheDocument();
+});
+
+it('deletes nothing and keeps the side panel open when cancelled', async () => {
+ renderSelectionCommands();
+
+ await userEvent.click(screen.getByText('Delete Workflows'));
+ await userEvent.click(await screen.findByRole('button', { name: 'Cancel' }));
+
+ await waitFor(() =>
+ expect(screen.queryByText('Delete workflow?')).not.toBeInTheDocument(),
+ );
+ expect(mockDeleteSelectedCoreWorkflows).not.toHaveBeenCalled();
+ expect(mockCloseSidePanelMenu).not.toHaveBeenCalled();
+});
+
+it('closes the side panel and deletes the selection once confirmed', async () => {
+ mockSelectedCoreWorkflowIds = ['workflow-1', 'workflow-2'];
+
+ renderSelectionCommands();
+
+ await userEvent.click(screen.getByText('Delete Workflows'));
+ await userEvent.click(
+ await screen.findByRole('button', { name: 'Delete workflows' }),
+ );
+
+ expect(mockCloseSidePanelMenu).toHaveBeenCalledTimes(1);
+ expect(mockDeleteSelectedCoreWorkflows).toHaveBeenCalledTimes(1);
+ expect(mockDeleteSelectedCoreWorkflows).toHaveBeenCalledWith();
+});
+
+it('does not reopen the confirmation when the side panel closes while it is open', async () => {
+ const { rerender } = renderSelectionCommands();
+
+ await userEvent.click(screen.getByText('Delete Workflows'));
+ expect(await screen.findByText('Delete workflow?')).toBeInTheDocument();
+
+ rerender(<></>);
+ rerender(<CoreObjectsCommands section="SELECTION" />);
+
+ expect(await screen.findByText('Delete Workflows')).toBeInTheDocument();
+ expect(screen.queryByText('Delete workflow?')).not.toBeInTheDocument();
+});
diff --git a/packages/twenty-front/src/modules/object-core/commands/constants/CoreWorkflowsDeleteConfirmationDialogId.ts b/packages/twenty-front/src/modules/object-core/commands/constants/CoreWorkflowsDeleteConfirmationDialogId.ts
new file mode 100644
index 00000000000..150aebb2828
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-core/commands/constants/CoreWorkflowsDeleteConfirmationDialogId.ts
@@ -0,0 +1,2 @@
+export const CORE_WORKFLOWS_DELETE_CONFIRMATION_DIALOG_ID =
+ 'core-workflows-delete-confirmation';
diff --git a/packages/twenty-front/src/modules/object-core/workflows/components/DeleteCoreWorkflowsCommand.tsx b/packages/twenty-front/src/modules/object-core/workflows/components/DeleteCoreWorkflowsCommand.tsx
index 3a24911d771..44113abf714 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/components/DeleteCoreWorkflowsCommand.tsx
+++ b/packages/twenty-front/src/modules/object-core/workflows/components/DeleteCoreWorkflowsCommand.tsx
@@ -1,8 +1,9 @@
import { AppPath } from 'twenty-shared/types';
import { isNonEmptyArray } from 'twenty-shared/utils';
-import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';
+import { HeadlessConfirmationModalEngineCommandEffect } from '@/command-menu-item/engine-command/components/HeadlessConfirmationModalEngineCommandEffect';
import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command/hooks/useHeadlessCommandContextApi';
import { useDeleteSelectedCoreWorkflows } from '@/object-core/workflows/hooks/useDeleteSelectedCoreWorkflows';
+import { getDeleteCoreWorkflowsConfirmationContent } from '@/object-core/workflows/utils/getDeleteCoreWorkflowsConfirmationContent';
import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
import { useNavigateApp } from '~/hooks/useNavigateApp';
@@ -29,5 +30,15 @@ export const DeleteCoreWorkflowsCommand = () => {
});
};
- return <HeadlessEngineCommandWrapperEffect execute={execute} />;
+ const { title, subtitle, confirmButtonText } =
+ getDeleteCoreWorkflowsConfirmationContent(selectedRecords.length);
+
+ return (
+ <HeadlessConfirmationModalEngineCommandEffect
+ title={title}
+ subtitle={subtitle}
+ confirmButtonText={confirmButtonText}
+ execute={execute}
+ />
+ );
};
diff --git a/packages/twenty-front/src/modules/object-core/workflows/utils/getDeleteCoreWorkflowsConfirmationContent.ts b/packages/twenty-front/src/modules/object-core/workflows/utils/getDeleteCoreWorkflowsConfirmationContent.ts
new file mode 100644
index 00000000000..5c2fdc558da
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-core/workflows/utils/getDeleteCoreWorkflowsConfirmationContent.ts
@@ -0,0 +1,16 @@
+import { t } from '@lingui/core/macro';
+
+export const getDeleteCoreWorkflowsConfirmationContent = (
+ numberOfCoreWorkflows: number,
+) =>
+ numberOfCoreWorkflows === 1
+ ? {
+ title: t`Delete workflow?`,
+ subtitle: t`This permanently deletes this workflow and all its run history. This action cannot be undone.`,
+ confirmButtonText: t`Delete workflow`,
+ }
+ : {
+ title: t`Delete ${numberOfCoreWorkflows} workflows?`,
+ subtitle: t`This permanently deletes these ${numberOfCoreWorkflows} workflows and all their run history. This action cannot be undone.`,
+ confirmButtonText: t`Delete workflows`,
+ };