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

feat(canvas): Add additional node's interactions #827

Merged
merged 1 commit into from
Feb 12, 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,6 +1,6 @@
import { MinusIcon } from '@patternfly/react-icons';
import { ContextMenuItem, ElementContext, ElementModel, GraphElement } from '@patternfly/react-topology';
import { FunctionComponent, useCallback, useContext } from 'react';
import { FunctionComponent, useCallback, useContext, useMemo } from 'react';
import { IDataTestID } from '../../../models';
import { EntitiesContext } from '../../../providers/entities.provider';
import { CanvasNode } from '../Canvas/canvas.models';
Expand All @@ -9,15 +9,16 @@ export const ItemRemoveNode: FunctionComponent<IDataTestID> = (props) => {
const entitiesContext = useContext(EntitiesContext);
const element: GraphElement<ElementModel, CanvasNode['data']> = useContext(ElementContext);
const vizNode = element.getData()?.vizNode;
const shouldRender = useMemo(() => vizNode?.getNodeInteraction()?.canRemoveStep ?? false, [vizNode]);

const onRemoveNode = useCallback(() => {
vizNode?.removeChild();
entitiesContext?.updateEntitiesFromCamelResource();
}, [entitiesContext, vizNode]);

return (
return shouldRender ? (
<ContextMenuItem onClick={onRemoveNode} data-testid={props['data-testid']}>
<MinusIcon /> Remove {vizNode?.id} node
</ContextMenuItem>
);
) : null;
};
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { AngleRightIcon } from '@patternfly/react-icons';
import { ContextMenuItem, ElementContext, ElementModel, GraphElement } from '@patternfly/react-topology';
import { FunctionComponent, useCallback, useContext } from 'react';
import { FunctionComponent, useCallback, useContext, useMemo } from 'react';
import { IDataTestID } from '../../../models';
import { AddStepMode } from '../../../models/visualization/base-visual-entity';
import { CatalogModalContext } from '../../../providers/catalog-modal.provider';
Expand All @@ -12,6 +12,7 @@ export const ItemReplaceNode: FunctionComponent<IDataTestID> = (props) => {
const catalogModalContext = useContext(CatalogModalContext);
const element: GraphElement<ElementModel, CanvasNode['data']> = useContext(ElementContext);
const vizNode = element.getData()?.vizNode;
const shouldRender = useMemo(() => vizNode?.getNodeInteraction()?.canReplaceStep ?? false, [vizNode]);

const onReplaceNode = useCallback(async () => {
if (!vizNode || !entitiesContext) return;
Expand All @@ -30,9 +31,9 @@ export const ItemReplaceNode: FunctionComponent<IDataTestID> = (props) => {
entitiesContext.updateEntitiesFromCamelResource();
}, [catalogModalContext, entitiesContext, vizNode]);

return (
return shouldRender ? (
<ContextMenuItem onClick={onReplaceNode} data-testid={props['data-testid']}>
<AngleRightIcon /> Replace {vizNode?.id} node
</ContextMenuItem>
);
) : null;
};
2 changes: 2 additions & 0 deletions packages/ui/src/models/visualization/base-visual-entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,6 @@ export interface NodeInteraction {
canHaveNextStep: boolean;
canHaveChildren: boolean;
canHaveSpecialChildren: boolean;
canReplaceStep: boolean;
canRemoveStep: boolean;
}
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ export abstract class AbstractCamelVisualEntity implements BaseVisualCamelEntity
canHaveNextStep: canHavePreviousStep,
canHaveChildren,
canHaveSpecialChildren,
canReplaceStep: true,
canRemoveStep: true,
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ import { CamelComponentDefaultService } from './support/camel-component-default.
export class CamelOnExceptionVisualEntity implements BaseVisualCamelEntity {
id: string;
readonly type = EntityType.ErrorHandler;
private static readonly ROOT_PATH = 'onException';

constructor(public onExceptionDef: { onException: OnException }) {
const id = onExceptionDef.onException.id ?? getCamelRandomId('onException');
const id = onExceptionDef.onException.id ?? getCamelRandomId(CamelOnExceptionVisualEntity.ROOT_PATH);
this.id = id;
onExceptionDef.onException.id = id;
}
Expand All @@ -36,7 +37,7 @@ export class CamelOnExceptionVisualEntity implements BaseVisualCamelEntity {
const objectKeys = Object.keys(onExceptionDef!);

return (
objectKeys.length === 1 && 'onException' in onExceptionDef! && typeof onExceptionDef.onException === 'object'
objectKeys.length === 1 && this.ROOT_PATH in onExceptionDef! && typeof onExceptionDef.onException === 'object'
);
}

Expand Down Expand Up @@ -209,12 +210,16 @@ export class CamelOnExceptionVisualEntity implements BaseVisualCamelEntity {
);
const canHaveChildren = stepsProperties.find((property) => property.type === 'branch') !== undefined;
const canHaveSpecialChildren = Object.keys(stepsProperties).length > 1;
const canReplaceStep = data.path !== CamelOnExceptionVisualEntity.ROOT_PATH;
const canRemoveStep = data.path !== CamelOnExceptionVisualEntity.ROOT_PATH;

return {
canHavePreviousStep,
canHaveNextStep: canHavePreviousStep,
canHaveChildren,
canHaveSpecialChildren,
canReplaceStep,
canRemoveStep,
};
}

Expand All @@ -227,8 +232,8 @@ export class CamelOnExceptionVisualEntity implements BaseVisualCamelEntity {

toVizNode(): IVisualizationNode<IVisualizationNodeData> {
const onExceptionGroupNode = CamelStepsService.getVizNodeFromProcessor(
'onException',
{ processorName: 'onException' as keyof ProcessorDefinition },
CamelOnExceptionVisualEntity.ROOT_PATH,
{ processorName: CamelOnExceptionVisualEntity.ROOT_PATH as keyof ProcessorDefinition },
this.onExceptionDef,
);
onExceptionGroupNode.data.entity = this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ export class PipeVisualEntity implements BaseVisualCamelEntity {
canHaveNextStep: data.path !== 'sink',
canHaveChildren: false,
canHaveSpecialChildren: false,
canReplaceStep: true,
canRemoveStep: true,
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { IKameletDefinition } from '../../../kamelets-catalog';
import { ICamelComponentDefinition } from '../../../camel-components-catalog';

export class CamelComponentSchemaService {
static DISABLED_SIBLING_STEPS = ['from', 'onWhen', 'when', 'otherwise', 'doCatch', 'doFinally'];
static DISABLED_SIBLING_STEPS = ['from', 'onWhen', 'when', 'otherwise', 'doCatch', 'doFinally', 'onException'];

// eslint-disable-next-line @typescript-eslint/no-explicit-any
static getVisualComponentSchema(path: string, definition: any): VisualComponentSchema | undefined {
Expand Down
2 changes: 2 additions & 0 deletions packages/ui/src/models/visualization/visualization-node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ class VisualizationNode<T extends IVisualizationNodeData = IVisualizationNodeDat
canHaveNextStep: false,
canHaveChildren: false,
canHaveSpecialChildren: false,
canReplaceStep: false,
canRemoveStep: false,
}
);
}
Expand Down
Loading