Skip to content

ROX-13432: Cleaning up unused code copied/pasted from topology demo #3750

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
alwayshooin merged 1 commit into from
Nov 10, 2022
Merged

ROX-13432: Cleaning up unused code copied/pasted from topology demo #3750

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
89 changes: 0 additions & 89 deletions ui/apps/platform/src/Containers/NetworkGraph/components/DefaultEdge.tsx
View file
Open in desktop

This file was deleted.

99 changes: 0 additions & 99 deletions ui/apps/platform/src/Containers/NetworkGraph/components/DefaultGroup.tsx
View file
Open in desktop

This file was deleted.

79 changes: 0 additions & 79 deletions ui/apps/platform/src/Containers/NetworkGraph/components/DemoDefaultNode.tsx
View file
Open in desktop

This file was deleted.

27 changes: 4 additions & 23 deletions ui/apps/platform/src/Containers/NetworkGraph/components/StyleEdge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,13 @@
/* eslint-disable @typescript-eslint/no-unsafe-return */
import * as React from 'react';
import { observer } from 'mobx-react';
import {
DefaultEdge,
Edge,
WithContextMenuProps,
WithSelectionProps,
} from '@patternfly/react-topology';
import { Edge, DefaultEdge } from '@patternfly/react-topology';

type StyleEdgeProps = {
element: Edge;
} & WithContextMenuProps &
WithSelectionProps;
};

const StyleEdge: React.FunctionComponent<StyleEdgeProps> = ({
element,
onContextMenu,
contextMenuOpen,
...rest
}) => {
const StyleEdge: React.FunctionComponent<StyleEdgeProps> = ({ element, ...rest }) => {
const data = element.getData();

const passedData = React.useMemo(() => {
Expand All @@ -31,15 +20,7 @@ const StyleEdge: React.FunctionComponent<StyleEdgeProps> = ({
return newData;
}, [data]);

return (
<DefaultEdge
element={element}
{...rest}
{...passedData}
onContextMenu={data?.showContextMenu ? onContextMenu : undefined}
contextMenuOpen={contextMenuOpen}
/>
);
return <DefaultEdge element={element} {...rest} {...passedData} />;
};

export default observer(StyleEdge);
8 changes: 1 addition & 7 deletions ui/apps/platform/src/Containers/NetworkGraph/components/StyleGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
observer,
ScaleDetailsLevel,
ShapeProps,
WithContextMenuProps,
WithDragNodeProps,
WithSelectionProps,
} from '@patternfly/react-topology';
Expand All @@ -29,14 +28,11 @@ type StyleGroupProps = {
onCollapseChange?: (group: Node, collapsed: boolean) => void;
getCollapsedShape?: (node: Node) => React.FunctionComponent<ShapeProps>;
collapsedShadowOffset?: number; // defaults to 10
} & WithContextMenuProps &
WithDragNodeProps &
} & WithDragNodeProps &
WithSelectionProps;

const StyleGroup: React.FunctionComponent<StyleGroupProps> = ({
element,
onContextMenu,
contextMenuOpen,
collapsedWidth = 75,
collapsedHeight = 75,
...rest
Expand Down Expand Up @@ -80,8 +76,6 @@ const StyleGroup: React.FunctionComponent<StyleGroupProps> = ({

return (
<DefaultGroup
onContextMenu={data.showContextMenu ? onContextMenu : undefined}
contextMenuOpen={contextMenuOpen}
element={element}
collapsedWidth={collapsedWidth}
collapsedHeight={collapsedHeight}
Expand Down
12 changes: 6 additions & 6 deletions ui/apps/platform/src/Containers/NetworkGraph/components/defaultComponentFactory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,32 @@ import {
ModelKind,
GraphComponent,
DefaultNode,
DefaultEdge,
DefaultGroup,
} from '@patternfly/react-topology';
import Edge from './DefaultEdge';
import Group from './DefaultGroup';

// @ts-expect-error TODO: raise type error issue with patternfly/react-topology team
const defaultComponentFactory: ComponentFactory = (
kind: ModelKind,
type: string
):
| ComponentType<{ element: GraphElement }>
| typeof Group
| typeof DefaultGroup
| typeof GraphComponent
| typeof DefaultNode
| typeof Edge
| typeof DefaultEdge
| typeof undefined => {
switch (type) {
case 'group':
return Group;
return DefaultGroup;
default:
switch (kind) {
case ModelKind.graph:
return GraphComponent;
case ModelKind.node:
return DefaultNode;
case ModelKind.edge:
return Edge;
return DefaultEdge;
default:
return undefined;
}
Expand Down
Loading