Skip to content
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

fix(FLowsList): Evaluate action confirmation when deleting a Flow #1662

Merged
merged 1 commit into from
Nov 26, 2024
Merged

fix(FLowsList): Evaluate action confirmation when deleting a Flow #1662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 52 additions & 3 deletions packages/ui/src/components/Visualization/ContextToolbar/Flows/FlowsList.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ import { act, fireEvent, render } from '@testing-library/react';
import { CamelRouteResource } from '../../../../models/camel';
import { EntityType } from '../../../../models/camel/entities';
import { VisualFlowsApi } from '../../../../models/visualization/flows/support/flows-visibility';
import {
ActionConfirmationModalContext,
ActionConfirmationModalContextProvider,
} from '../../../../providers/action-confirmation-modal.provider';
import { VisibleFLowsContextResult } from '../../../../providers/visible-flows.provider';
import { TestProvidersWrapper } from '../../../../stubs';
import { FlowsList } from './FlowsList';
import { ActionConfirmationModalContext } from '../../../../providers/action-confirmation-modal.provider';

describe('FlowsList.tsx', () => {
let camelResource: CamelRouteResource;
Expand Down Expand Up @@ -117,7 +120,7 @@ describe('FlowsList.tsx', () => {
</Provider>,
);

act(() => {
await act(async () => {
fireEvent.click(wrapper.getByTestId('delete-btn-route-1234'));
});

Expand All @@ -127,6 +130,52 @@ describe('FlowsList.tsx', () => {
});
});

it('should delete a flow when clicking the delete icon and then clicking delete', async () => {
const { Provider } = TestProvidersWrapper({ camelResource });
const wrapper = render(
<Provider>
<ActionConfirmationModalContextProvider>
<FlowsList />
</ActionConfirmationModalContextProvider>
</Provider>,
);

await act(async () => {
const deleteBtn = wrapper.getByTestId('delete-btn-route-1234');
fireEvent.click(deleteBtn);
});

await act(async () => {
const actionConfirmationModalBtnConfirm = wrapper.getByTestId('action-confirmation-modal-btn-confirm');
fireEvent.click(actionConfirmationModalBtnConfirm);
});

expect(camelResource.getVisualEntities()).toHaveLength(1);
});

it('should not delete a flow when clicking the delete icon and then clicking cancel', async () => {
const { Provider } = TestProvidersWrapper({ camelResource });
const wrapper = render(
<Provider>
<ActionConfirmationModalContextProvider>
<FlowsList />
</ActionConfirmationModalContextProvider>
</Provider>,
);

await act(async () => {
const deleteBtn = wrapper.getByTestId('delete-btn-route-1234');
fireEvent.click(deleteBtn);
});

await act(async () => {
const actionConfirmationModalBtnCancel = wrapper.getByTestId('action-confirmation-modal-btn-cancel');
fireEvent.click(actionConfirmationModalBtnCancel);
});

expect(camelResource.getVisualEntities()).toHaveLength(2);
});

it('should toggle the visibility of a flow clicking on the Eye icon', async () => {
let resId = '';
const visualFlowsApi = new VisualFlowsApi(jest.fn);
Expand All @@ -148,7 +197,7 @@ describe('FlowsList.tsx', () => {

const toggleFlowId = await wrapper.findByTestId('toggle-btn-route-1234');

act(() => {
await act(async () => {
fireEvent.click(toggleFlowId);
});

Expand Down
11 changes: 7 additions & 4 deletions packages/ui/src/components/Visualization/ContextToolbar/Flows/FlowsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@ import { Button, Icon } from '@patternfly/react-core';
import { EyeIcon, EyeSlashIcon, TrashIcon } from '@patternfly/react-icons';
import { Table, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
import { FunctionComponent, useCallback, useContext, useRef } from 'react';
import { ValidationResult } from '../../../../models';
import { BaseVisualCamelEntity } from '../../../../models/visualization/base-visual-entity';
import {
ACTION_ID_CONFIRM,
ActionConfirmationModalContext,
} from '../../../../providers/action-confirmation-modal.provider';
import { EntitiesContext } from '../../../../providers/entities.provider';
import { ActionConfirmationModalContext } from '../../../../providers/action-confirmation-modal.provider';
import { VisibleFlowsContext } from '../../../../providers/visible-flows.provider';
import { InlineEdit } from '../../../InlineEdit';
import { RouteIdValidator } from '../../../InlineEdit/routeIdValidator';
import './FlowsList.scss';
import { FlowsListEmptyState } from './FlowsListEmptyState';
import { RouteIdValidator } from '../../../InlineEdit/routeIdValidator';
import { ValidationResult } from '../../../../models';

interface IFlowsList {
onClose?: () => void;
Expand Down Expand Up @@ -110,7 +113,7 @@ export const FlowsList: FunctionComponent<IFlowsList> = (props) => {
text: 'All steps will be lost.',
});

if (!isDeleteConfirmed) return;
if (isDeleteConfirmed !== ACTION_ID_CONFIRM) return;

camelResource.removeEntity(flow.id);
updateEntitiesFromCamelResource();
Expand Down
Loading