Skip to content

Commit

Permalink
fix(Consumption): Adding node name to props to account for change (#4286
Browse files Browse the repository at this point in the history
)

adding node name to delete node modal props to account for change
  • Loading branch information
valentina-vallalta committed Mar 1, 2024
1 parent 4a2332e commit e61a878
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
7 changes: 3 additions & 4 deletions libs/designer-ui/src/lib/modals/DeleteNodeModal.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { Modal } from '@fluentui/react';
import { Button, Spinner } from '@fluentui/react-components';
import type { WorkflowNodeType } from '@microsoft/logic-apps-shared';
import { idDisplayCase, WORKFLOW_NODE_TYPES } from '@microsoft/logic-apps-shared';
import { WORKFLOW_NODE_TYPES } from '@microsoft/logic-apps-shared';
import { useIntl } from 'react-intl';

export interface DeleteNodeModalProps {
nodeId: string;
nodeName: string;
nodeType?: WorkflowNodeType;
isOpen: boolean;
isLoading?: boolean;
Expand All @@ -14,12 +15,10 @@ export interface DeleteNodeModalProps {
}

export const DeleteNodeModal = (props: DeleteNodeModalProps) => {
const { nodeId, nodeType, isOpen, onDismiss, onConfirm } = props;
const { nodeId, nodeName, nodeType, isOpen, onDismiss, onConfirm } = props;

const intl = useIntl();

const nodeName = idDisplayCase(nodeId);

const operationNodeTitle = intl.formatMessage({
defaultMessage: 'Delete Workflow Action',
description: 'Title for operation node',
Expand Down
12 changes: 10 additions & 2 deletions libs/designer/src/lib/ui/common/DeleteModal/DeleteModal.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { AppDispatch } from '../../../core';
import { useSelectedNodeId, useNodeMetadata } from '../../../core';
import { useSelectedNodeId, useNodeMetadata, useNodeDisplayName } from '../../../core';
import { deleteOperation, deleteGraphNode } from '../../../core/actions/bjsworkflow/delete';
import { useShowDeleteModal } from '../../../core/state/designerView/designerViewSelectors';
import { setShowDeleteModal } from '../../../core/state/designerView/designerViewSlice';
Expand All @@ -14,6 +14,7 @@ const DeleteModal = () => {
const dispatch = useDispatch<AppDispatch>();

const nodeId = removeIdTag(useSelectedNodeId()) ?? '';
const nodeName = useNodeDisplayName(nodeId);
const nodeData = useWorkflowNode(nodeId);
const metadata = useNodeMetadata(nodeId);
const graphId = useMemo(() => metadata?.graphId ?? '', [metadata]);
Expand Down Expand Up @@ -55,7 +56,14 @@ const DeleteModal = () => {
}, [nodeData, dispatch, nodeId, isTrigger, graphId, onDismiss]);

return (
<DeleteNodeModal nodeId={nodeId} nodeType={nodeData?.type} isOpen={showDeleteModal} onDismiss={onDismiss} onConfirm={handleDelete} />
<DeleteNodeModal
nodeId={nodeId}
nodeName={nodeName}
nodeType={nodeData?.type}
isOpen={showDeleteModal}
onDismiss={onDismiss}
onConfirm={handleDelete}
/>
);
};

Expand Down

0 comments on commit e61a878

Please sign in to comment.