Skip to content

Add delete buttons in sidebar #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Manas-Kenge merged 4 commits into from
Aug 30, 2025
Merged

Add delete buttons in sidebar #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27a6d18
Added delete buttons for state and transitions
Manas-Kenge Aug 28, 2025
2b291d0
use widget
Manas-Kenge Aug 29, 2025
492558d
fix: add the delete icon inside the blocksdataform for state and tran…
Tishasoumya-02 Aug 29, 2025
c9e0394
remove widget, change toast
Manas-Kenge Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion frontend/packages/volto-workflow-manager/src/components/States/State.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
Item,
ProgressCircle,
} from '@adobe/react-spectrum';
import { listStates } from '../../actions/state';
import { listStates, deleteState } from '../../actions/state';
import { listTransitions } from '../../actions/transition';
import PropertiesTab from './Tabs/PropertiesTab';
import TransitionsTab from './Tabs/TransitionsTab';
Expand Down Expand Up @@ -137,6 +137,17 @@ const State: React.FC<StateProps> = ({
});
}, []);

const handleDeleteState = useCallback(
(stateId: string) => {
dispatch(deleteState(workflowId, stateId));
setSelectedStateId(null);
setLocalStateData(null);
setInitialStateData(null);
onDataChange(null);
},
[dispatch, workflowId, onDataChange],
);

if (isLoadingData && !statesInfo.loaded) {
return <ProgressCircle isIndeterminate />;
}
Expand Down Expand Up @@ -175,6 +186,8 @@ const State: React.FC<StateProps> = ({
<PropertiesTab
key={`properties-${selectedStateId}`}
data={localStateData?.properties}
handleDeleteState={handleDeleteState}
selectedStateId={selectedStateId}
schema={propertiesSchema}
onChange={(properties) => handleStateChange({ properties })}
isDisabled={areTabsDisabled}
Expand Down
39 changes: 33 additions & 6 deletions frontend/packages/volto-workflow-manager/src/components/States/Tabs/PropertiesTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
import React, { useCallback } from 'react';
import { View, Text } from '@adobe/react-spectrum';
import Form from '@plone/volto/components/manage/Form/Form';
import {
View,
Text,
Flex,
DialogTrigger,
AlertDialog,
Button,
} from '@adobe/react-spectrum';
import { BlockDataForm } from '@plone/volto/components/manage/Form';
import Icon from '@plone/volto/components/theme/Icon/Icon';
import deleteIcon from '@plone/volto/icons/delete.svg';

import type { PropertiesTabProps } from '../../../types/state';

const PropertiesTab: React.FC<PropertiesTabProps> = ({
data,
schema,
onChange,
handleDeleteState,
selectedStateId,
isDisabled,
}) => {
const handleChangeField = useCallback(
Expand All @@ -25,12 +37,27 @@ const PropertiesTab: React.FC<PropertiesTabProps> = ({

return (
<View>
<Form
key={JSON.stringify(data)} // Force re-render when data changes
schema={schema}
<Flex justifyContent="end" margin="size-100">
<DialogTrigger>
<Button variant="negative" isDisabled={isDisabled}>
<Icon name={deleteIcon} size="20px" />
</Button>
<AlertDialog
title="Delete State"
variant="destructive"
primaryActionLabel="Delete"
cancelLabel="Cancel"
onPrimaryAction={() => handleDeleteState(selectedStateId)}
>
Are you sure you want to delete '{data.title}' state? This action
cannot be undone.
</AlertDialog>
</DialogTrigger>
</Flex>
<BlockDataForm
formData={data}
schema={schema}
onChangeField={handleChangeField}
hideActions
/>
</View>
);
Expand Down
41 changes: 34 additions & 7 deletions frontend/packages/volto-workflow-manager/src/components/Transitions/Tabs/PropertiesTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
import React, { useCallback } from 'react';
import { View, Text } from '@adobe/react-spectrum';
import Form from '@plone/volto/components/manage/Form/Form';

import type { PropertiesTabProps } from '../../../types/transition';
import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
import {
View,
Text,
Flex,
DialogTrigger,
AlertDialog,
Button,
} from '@adobe/react-spectrum';

import Icon from '@plone/volto/components/theme/Icon/Icon';
import deleteIcon from '@plone/volto/icons/delete.svg';

const PropertiesTab: React.FC<PropertiesTabProps> = ({
data,
schema,
onChange,
isDisabled,
handleDeleteTransition,
selectedTransitionId,
}) => {
const handleChangeField = useCallback(
(id: string, value: any) => {
Expand All @@ -25,13 +38,27 @@ const PropertiesTab: React.FC<PropertiesTabProps> = ({

return (
<View>
<Form
key={JSON.stringify(data)}
schema={schema}
<Flex justifyContent="end" margin="size-100">
<DialogTrigger>
<Button variant="negative" isDisabled={isDisabled}>
<Icon name={deleteIcon} size="20px" />
</Button>
<AlertDialog
title="Delete State"
variant="destructive"
primaryActionLabel="Delete"
cancelLabel="Cancel"
onPrimaryAction={() => handleDeleteTransition(selectedTransitionId)}
>
Are you sure you want to delete '{data.title}' transition? This
action cannot be undone.
</AlertDialog>
</DialogTrigger>
</Flex>
<BlockDataForm
formData={data}
schema={schema}
onChangeField={handleChangeField}
editable={!isDisabled}
hideActions
/>
</View>
);
Expand Down
15 changes: 14 additions & 1 deletion frontend/packages/volto-workflow-manager/src/components/Transitions/Transition.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
Heading,
ProgressCircle,
} from '@adobe/react-spectrum';
import { listTransitions } from '../../actions/transition';
import { listTransitions, deleteTransition } from '../../actions/transition';
import { listStates } from '../../actions/state';
import PropertiesTab from './Tabs/PropertiesTab';
import GuardsTab from './Tabs/GuardsTab';
Expand Down Expand Up @@ -144,6 +144,17 @@ const Transition: React.FC<TransitionProps> = ({
setSelectedTransitionId(key as string);
};

const handleDeleteTransition = useCallback(
(transitionId: string) => {
dispatch(deleteTransition(workflowId, transitionId));
setSelectedTransitionId(null);
setLocalTransitionData(null);
setInitialTransitionData(null);
onDataChange(null);
},
[dispatch, workflowId, onDataChange],
);

const propertiesSchema = useMemo(
() => ({
title: 'Transition Properties',
Expand Down Expand Up @@ -215,6 +226,8 @@ const Transition: React.FC<TransitionProps> = ({
key={`properties-${selectedTransitionId}`}
data={localTransitionData?.properties}
schema={propertiesSchema}
handleDeleteTransition={handleDeleteTransition}
selectedTransitionId={selectedTransitionId}
onChange={(properties) =>
handleTransitionChange({ properties })
}
Expand Down
6 changes: 2 additions & 4 deletions frontend/packages/volto-workflow-manager/src/components/Workflow/WorkflowTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState, useEffect, useCallback } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { View, ProgressCircle } from '@adobe/react-spectrum';
import Form from '@plone/volto/components/manage/Form/Form';
import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
import { getWorkflow } from '../../actions/workflow';
import type { GlobalRootState } from '../../types';
import type { WorkflowTabProps } from '../../types/workflow';
Expand Down Expand Up @@ -84,13 +84,11 @@ const WorkflowTab: React.FC<WorkflowTabProps> = ({

return (
<View padding="size-200">
<Form
<BlockDataForm
key={workflowId}
schema={workflowSchema}
formData={formData}
onChangeField={handleChangeField}
editable={!isDisabled}
hideActions
/>
</View>
);
Expand Down
37 changes: 36 additions & 1 deletion frontend/packages/volto-workflow-manager/src/components/Workflow/WorkflowView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,21 @@ const WorkflowView: React.FC<WorkflowViewProps> = ({
const isSavingWorkflow = useAppSelector(
(state) => state.workflow.operation.loading,
);
const isDeletingState = useAppSelector(
(state) => state.state.delete?.loading || false,
);
const isDeletingTransition = useAppSelector(
(state) => state.transition.delete?.loading || false,
);

const isSaving = isSavingState || isSavingTransition || isSavingWorkflow;
const isDeleting = isDeletingState || isDeletingTransition;

const prevIsSaving = useRef(isSaving);
const prevIsDeleting = useRef(isDeleting);
const prevIsDeletingState = useRef(isDeletingState);
const prevIsDeletingTransition = useRef(isDeletingTransition);

useEffect(() => {
if (prevIsSaving.current && !isSaving) {
toast.success(<Toast success title="Success" content="Changes saved." />);
Expand All @@ -69,6 +80,30 @@ const WorkflowView: React.FC<WorkflowViewProps> = ({
prevIsSaving.current = isSaving;
}, [isSaving, dispatch, workflowId]);

useEffect(() => {
if (prevIsDeleting.current && !isDeleting) {
const stateDeleteSuccess =
!isDeletingState && prevIsDeletingState.current;
const transitionDeleteSuccess =
!isDeletingTransition && prevIsDeletingTransition.current;

if (stateDeleteSuccess) {
toast.success(
<Toast success title="Success" content="State deleted." />,
);
} else if (transitionDeleteSuccess) {
toast.success(
<Toast success title="Success" content="Transition deleted." />,
);
}

dispatch(getWorkflow(workflowId));
}
prevIsDeleting.current = isDeleting;
prevIsDeletingState.current = isDeletingState;
prevIsDeletingTransition.current = isDeletingTransition;
}, [isDeleting, isDeletingState, isDeletingTransition, dispatch, workflowId]);

const handleDataChange = useCallback(
(payload: any | null, kind: 'workflow' | 'state' | 'transition') => {
if (payload) {
Expand Down Expand Up @@ -171,7 +206,7 @@ const WorkflowView: React.FC<WorkflowViewProps> = ({
<WorkflowSidebar
currentWorkflow={workflow}
onDataChange={handleDataChange}
isDisabled={isSaving}
isDisabled={isSaving || isDeleting}
/>
</div>
</View>
Expand Down
6 changes: 2 additions & 4 deletions frontend/packages/volto-workflow-manager/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import WorkflowControlPanel from './components/Controlpanel/WorkflowPanel';
import { workflow, state, transition } from './reducers';
import './theme/main.scss';

const applyConfig = (config) => {
config.settings.isMultilingual = false;
config.settings.supportedLanguages = ['en'];
Expand Down Expand Up @@ -28,10 +29,7 @@ const applyConfig = (config) => {
state,
transition,
};
config.views = {
...config.views,
contentTypesViews: {},
};

return config;
};

Expand Down
2 changes: 2 additions & 0 deletions frontend/packages/volto-workflow-manager/src/types/state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ export interface PropertiesTabProps {
schema: any;
onChange: (newData: PropertiesData) => void;
isDisabled: boolean;
handleDeleteState: (stateId: string) => void;
selectedStateId: string | null;
}

export interface TransitionsData {
Expand Down
2 changes: 2 additions & 0 deletions frontend/packages/volto-workflow-manager/src/types/transition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ export interface PropertiesTabProps {
schema: any;
onChange: (newData: PropertiesData) => void;
isDisabled: boolean;
handleDeleteTransition: (transitionId: string | null) => void;
selectedTransitionId: string | null;
}

export interface SourceStatesData {
Expand Down
Loading