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.

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

chore(Canvas): Extract onAddStep hook #1621

Merged
merged 1 commit into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,53 +1,19 @@
import { ContextMenuItem } from '@patternfly/react-topology';
import { FunctionComponent, PropsWithChildren, useCallback, useContext } from 'react';
import { FunctionComponent, PropsWithChildren } from 'react';
import { IDataTestID } from '../../../../models';
import {
AddStepMode,
IVisualizationNode,
IVisualizationNodeData,
} from '../../../../models/visualization/base-visual-entity';
import { CatalogModalContext } from '../../../../providers/catalog-modal.provider';
import { EntitiesContext } from '../../../../providers/entities.provider';
import { EntitiesContextResult } from '../../../../hooks';
import { AddStepMode, IVisualizationNode } from '../../../../models/visualization/base-visual-entity';
import { useAddStep } from '../hooks/add-step.hook';

interface ItemAddStepProps extends PropsWithChildren<IDataTestID> {
mode: AddStepMode.PrependStep | AddStepMode.AppendStep;
vizNode: IVisualizationNode;
}

export const addNode = async (
// eslint-disable-next-line @typescript-eslint/no-explicit-any
catalogModalContext: any,
entitiesContext: EntitiesContextResult | null,
vizNode: IVisualizationNode<IVisualizationNodeData>,
mode: AddStepMode = AddStepMode.AppendStep,
) => {
if (!vizNode || !entitiesContext) return;

/** Get compatible nodes and the location where can be introduced */
const compatibleNodes = entitiesContext.camelResource.getCompatibleComponents(mode, vizNode.data);

/** Open Catalog modal, filtering the compatible nodes */
const definedComponent = await catalogModalContext?.getNewComponent(compatibleNodes);
if (!definedComponent) return;

/** Add new node to the entities */
vizNode.addBaseEntityStep(definedComponent, mode);

/** Update entity */
entitiesContext.updateEntitiesFromCamelResource();
};

export const ItemAddStep: FunctionComponent<ItemAddStepProps> = (props) => {
const entitiesContext = useContext(EntitiesContext);
const catalogModalContext = useContext(CatalogModalContext);

const onAddNode = useCallback(async () => {
addNode(catalogModalContext, entitiesContext, props.vizNode, props.mode);
}, [catalogModalContext, entitiesContext, props.mode, props.vizNode]);
const { onAddStep } = useAddStep(props.vizNode, props.mode);

return (
<ContextMenuItem onClick={onAddNode} data-testid={props['data-testid']}>
<ContextMenuItem onClick={onAddStep} data-testid={props['data-testid']}>
{props.children}
</ContextMenuItem>
);
Expand Down
13 changes: 4 additions & 9 deletions packages/ui/src/components/Visualization/Custom/Edge/EdgeEnd.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ import {
isEdge,
observer,
} from '@patternfly/react-topology';
import { FunctionComponent, useCallback, useContext } from 'react';
import { FunctionComponent } from 'react';
import { IVisualizationNode } from '../../../../models';
import { CatalogModalContext, EntitiesContext } from '../../../../providers';
import { addNode } from '../ContextMenu/ItemAddStep';
import { LayoutType } from '../../Canvas';
import { useAddStep } from '../hooks/add-step.hook';

type DefaultEdgeProps = Parameters<typeof DefaultEdge>[0];
interface EdgeEndProps extends DefaultEdgeProps {
Expand All @@ -24,15 +23,11 @@ export const EdgeEndWithButton: FunctionComponent<EdgeEndProps> = observer(({ el
if (!isEdge(element)) {
throw new Error('EdgeEndWithButton must be used only on Edge elements');
}
const entitiesContext = useContext(EntitiesContext);
const catalogModalContext = useContext(CatalogModalContext);
const vizNode: IVisualizationNode = element.getSource().getData()?.vizNode;
const isHorizontal = element.getGraph().getLayout() === LayoutType.DagreHorizontal;
const endPoint = element.getEndPoint();

const onAdd = useCallback(() => {
addNode(catalogModalContext, entitiesContext, vizNode);
}, [catalogModalContext, entitiesContext, vizNode]);
const { onAddStep } = useAddStep(vizNode);

let x = endPoint.x;
let y = endPoint.y;
Expand All @@ -50,7 +45,7 @@ export const EdgeEndWithButton: FunctionComponent<EdgeEndProps> = observer(({ el
{...rest}
>
<g data-testid={`custom-edge__${element?.getId()}`}>
<Decorator showBackground radius={14} x={x} y={y} icon={<PlusIcon />} onClick={onAdd} />
<Decorator showBackground radius={14} x={x} y={y} icon={<PlusIcon />} onClick={onAddStep} />
</g>
</DefaultEdge>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { useCallback, useContext, useMemo } from 'react';
import { AddStepMode, IVisualizationNode } from '../../../../models/visualization/base-visual-entity';
import { CatalogModalContext } from '../../../../providers';
import { EntitiesContext } from '../../../../providers/entities.provider';

export const useAddStep = (
vizNode: IVisualizationNode,
mode: AddStepMode.PrependStep | AddStepMode.AppendStep = AddStepMode.AppendStep,
) => {
const entitiesContext = useContext(EntitiesContext);
const catalogModalContext = useContext(CatalogModalContext);

const onAddStep = useCallback(async () => {
if (!vizNode || !entitiesContext) return;

/** Get compatible nodes and the location where can be introduced */
const compatibleNodes = entitiesContext.camelResource.getCompatibleComponents(mode, vizNode.data);

Check warning on line 17 in packages/ui/src/components/Visualization/Custom/hooks/add-step.hook.tsx

View check run for this annotation

Codecov / codecov/patch

packages/ui/src/components/Visualization/Custom/hooks/add-step.hook.tsx#L17

Added line #L17 was not covered by tests

/** Open Catalog modal, filtering the compatible nodes */
const definedComponent = await catalogModalContext?.getNewComponent(compatibleNodes);

Check warning on line 20 in packages/ui/src/components/Visualization/Custom/hooks/add-step.hook.tsx

View check run for this annotation

Codecov / codecov/patch

packages/ui/src/components/Visualization/Custom/hooks/add-step.hook.tsx#L20

Added line #L20 was not covered by tests
if (!definedComponent) return;

/** Add new node to the entities */
vizNode.addBaseEntityStep(definedComponent, mode);

Check warning on line 24 in packages/ui/src/components/Visualization/Custom/hooks/add-step.hook.tsx

View check run for this annotation

Codecov / codecov/patch

packages/ui/src/components/Visualization/Custom/hooks/add-step.hook.tsx#L24

Added line #L24 was not covered by tests

/** Update entity */
entitiesContext.updateEntitiesFromCamelResource();

Check warning on line 27 in packages/ui/src/components/Visualization/Custom/hooks/add-step.hook.tsx

View check run for this annotation

Codecov / codecov/patch

packages/ui/src/components/Visualization/Custom/hooks/add-step.hook.tsx#L27

Added line #L27 was not covered by tests
}, [catalogModalContext, entitiesContext, mode, vizNode]);

const value = useMemo(
() => ({
onAddStep,
}),
[onAddStep],
);

return value;
};
Loading