chore: organize service and volume nodes

pull/67/head
Artem Golub 3 years ago
parent 75e5dbdfef
commit e0c8c3be17

@ -5,12 +5,12 @@ import { Popover } from "./Popover";
interface INodeProps { interface INodeProps {
node: IServiceNodeItem; node: IServiceNodeItem;
setNodeForEdit: CallbackFunction; setServiceToEdit: CallbackFunction;
setNodeForDelete: CallableFunction; setServiceToDelete: CallableFunction;
} }
export default function Node(props: INodeProps) { export default function ServiceNode(props: INodeProps) {
const { node, setNodeForEdit, setNodeForDelete } = props; const { node, setServiceToEdit, setServiceToDelete } = props;
const [nodeDragging, setNodeDragging] = useState<string | null>(); const [nodeDragging, setNodeDragging] = useState<string | null>();
const [nodeHovering, setNodeHovering] = useState<string | null>(); const [nodeHovering, setNodeHovering] = useState<string | null>();
@ -45,20 +45,22 @@ export default function Node(props: INodeProps) {
{nodeHovering === node.key && nodeDragging !== node.key && ( {nodeHovering === node.key && nodeDragging !== node.key && (
<Popover <Popover
onEditClick={() => { onEditClick={() => {
setNodeForEdit(node); setServiceToEdit(node);
}} }}
onDeleteClick={() => { onDeleteClick={() => {
setNodeForDelete(node); setServiceToDelete(node);
}} }}
></Popover> ></Popover>
)} )}
<div className="node-label w-full py-2 px-4"> <div className="node-label w-full py-2 px-4">
<div className="text-sm font-semibold overflow-x-hidden"> <>
{node.canvasConfig.service_name} <div className="text-sm font-semibold overflow-x-hidden">
</div> {node.canvasConfig.service_name}
<div className="text-xs text-gray-500 overflow-x-hidden"> </div>
{node.serviceConfig?.container_name} <div className="text-xs text-gray-500 overflow-x-hidden">
</div> {node.serviceConfig.container_name}
</div>
</>
</div> </div>
</div> </div>
); );

@ -0,0 +1,64 @@
import { useEffect, useState } from "react";
import { IVolumeNodeItem, CallbackFunction } from "../../types";
import eventBus from "../../events/eventBus";
import { Popover } from "./Popover";
interface INodeProps {
node: IVolumeNodeItem;
setVolumeToEdit: CallbackFunction;
setVolumeToDelete: CallableFunction;
}
export default function VolumeNode(props: INodeProps) {
const { node, setVolumeToEdit, setVolumeToDelete } = props;
const [nodeDragging, setNodeDragging] = useState<string | null>();
const [nodeHovering, setNodeHovering] = useState<string | null>();
useEffect(() => {
eventBus.on("EVENT_DRAG_START", (data: any) => {
setNodeDragging(data.detail.message.id);
});
eventBus.on("EVENT_DRAG_STOP", () => {
setNodeDragging(null);
});
return () => {
eventBus.remove("EVENT_DRAG_START", () => undefined);
eventBus.remove("EVENT_DRAG_STOP", () => undefined);
};
}, []);
return (
<div
key={node.key}
className={"node-item cursor-pointer shadow flex flex-col group"}
id={node.key}
style={{ top: node.position.top, left: node.position.left }}
onMouseEnter={() => setNodeHovering(node.key)}
onMouseLeave={() => {
if (nodeHovering === node.key) {
setNodeHovering(null);
}
}}
>
{nodeHovering === node.key && nodeDragging !== node.key && (
<Popover
onEditClick={() => {
setVolumeToEdit(node);
}}
onDeleteClick={() => {
setVolumeToDelete(node);
}}
></Popover>
)}
<div className="node-label w-full py-2 px-4">
<>
<div className="text-xs text-gray-500 overflow-x-hidden">
{node.volumeConfig.name}
</div>
</>
</div>
</div>
);
}

@ -2,14 +2,20 @@ import { FC, useState, useEffect } from "react";
import { Dictionary, values } from "lodash"; import { Dictionary, values } from "lodash";
import { v4 as uuidv4 } from "uuid"; import { v4 as uuidv4 } from "uuid";
import eventBus from "../../events/eventBus"; import eventBus from "../../events/eventBus";
import { IGraphData, CallbackFunction, IServiceNodeItem } from "../../types"; import {
IGraphData,
CallbackFunction,
IServiceNodeItem,
IVolumeNodeItem
} from "../../types";
import { useJsPlumb } from "../useJsPlumb"; import { useJsPlumb } from "../useJsPlumb";
import Node from "./node"; import ServiceNode from "./ServiceNode";
import VolumeNode from "./VolumeNode";
const CANVAS_ID: string = "canvas-container-" + uuidv4(); const CANVAS_ID: string = "canvas-container-" + uuidv4();
interface ICanvasProps { interface ICanvasProps {
nodes: Dictionary<IServiceNodeItem>; nodes: Dictionary<IServiceNodeItem | IVolumeNodeItem>;
connections: any; connections: any;
canvasPosition: any; canvasPosition: any;
onNodeUpdate: CallbackFunction; onNodeUpdate: CallbackFunction;
@ -17,8 +23,10 @@ interface ICanvasProps {
onCanvasUpdate: CallbackFunction; onCanvasUpdate: CallbackFunction;
onConnectionAttached: CallbackFunction; onConnectionAttached: CallbackFunction;
onConnectionDetached: CallbackFunction; onConnectionDetached: CallbackFunction;
setNodeForEdit: CallbackFunction; setServiceToEdit: CallbackFunction;
setNodeForDelete: CallbackFunction; setServiceToDelete: CallbackFunction;
setVolumeToEdit: CallbackFunction;
setVolumeToDelete: CallbackFunction;
} }
export const Canvas: FC<ICanvasProps> = (props) => { export const Canvas: FC<ICanvasProps> = (props) => {
@ -31,8 +39,10 @@ export const Canvas: FC<ICanvasProps> = (props) => {
onCanvasUpdate, onCanvasUpdate,
onConnectionAttached, onConnectionAttached,
onConnectionDetached, onConnectionDetached,
setNodeForEdit, setServiceToEdit,
setNodeForDelete setServiceToDelete,
setVolumeToEdit,
setVolumeToDelete
} = props; } = props;
const [dragging, setDragging] = useState(false); const [dragging, setDragging] = useState(false);
const [scale, setScale] = useState(1); const [scale, setScale] = useState(1);
@ -162,14 +172,31 @@ export const Canvas: FC<ICanvasProps> = (props) => {
transform: `translate(${translateWidth}px, ${translateHeight}px) scale(${_scale})` transform: `translate(${translateWidth}px, ${translateHeight}px) scale(${_scale})`
}} }}
> >
{values(nodes).map((x) => ( {values(nodes).map((x) => {
<Node if (x.type === "SERVICE") {
key={x.key} x = x as IServiceNodeItem;
node={x} return (
setNodeForEdit={setNodeForEdit} <ServiceNode
setNodeForDelete={setNodeForDelete} key={x.key}
/> node={x}
))} setServiceToEdit={setServiceToEdit}
setServiceToDelete={setServiceToDelete}
/>
);
}
if (x.type === "VOLUME") {
x = x as IVolumeNodeItem;
return (
<VolumeNode
key={x.key}
node={x}
setVolumeToEdit={setVolumeToEdit}
setVolumeToDelete={setVolumeToDelete}
/>
);
}
})}
</div> </div>
</div> </div>
)} )}

@ -5,7 +5,7 @@ import General from "./General";
import Environment from "./Environment"; import Environment from "./Environment";
import Volumes from "./Volumes"; import Volumes from "./Volumes";
import Labels from "./Labels"; import Labels from "./Labels";
import { canvasConfigInitialValues } from "../../../utils"; import { serviceConfigCanvasInitialValues } from "../../../utils";
import { CallbackFunction } from "../../../types"; import { CallbackFunction } from "../../../types";
interface IModalServiceProps { interface IModalServiceProps {
@ -20,7 +20,7 @@ const ModalServiceCreate = (props: IModalServiceProps) => {
const formik = useFormik({ const formik = useFormik({
initialValues: { initialValues: {
canvasConfig: { canvasConfig: {
...canvasConfigInitialValues() ...serviceConfigCanvasInitialValues()
}, },
serviceConfig: { serviceConfig: {
container_name: "" container_name: ""

@ -5,7 +5,7 @@ import General from "./General";
import Environment from "./Environment"; import Environment from "./Environment";
import Volumes from "./Volumes"; import Volumes from "./Volumes";
import Labels from "./Labels"; import Labels from "./Labels";
import { canvasConfigInitialValues } from "../../../utils"; import { serviceConfigCanvasInitialValues } from "../../../utils";
import { import {
CallbackFunction, CallbackFunction,
ICanvasConfig, ICanvasConfig,
@ -14,7 +14,7 @@ import {
} from "../../../types"; } from "../../../types";
interface IModalServiceProps { interface IModalServiceProps {
node: any; node: IServiceNodeItem;
onHide: CallbackFunction; onHide: CallbackFunction;
onUpdateEndpoint: CallbackFunction; onUpdateEndpoint: CallbackFunction;
} }
@ -26,7 +26,7 @@ const ModalServiceEdit = (props: IModalServiceProps) => {
const formik = useFormik({ const formik = useFormik({
initialValues: { initialValues: {
canvasConfig: { canvasConfig: {
...canvasConfigInitialValues() ...serviceConfigCanvasInitialValues()
}, },
serviceConfig: { serviceConfig: {
container_name: "" container_name: ""

@ -6,17 +6,25 @@ import Labels from "./Labels";
import { topLevelVolumeConfigInitialValues } from "../../../utils"; import { topLevelVolumeConfigInitialValues } from "../../../utils";
import { CallbackFunction } from "../../../types"; import { CallbackFunction } from "../../../types";
interface IModalVolume { interface IModalVolumeCreate {
onHide: CallbackFunction; onHide: CallbackFunction;
onAddEndpoint: CallbackFunction;
} }
const ModalVolume = (props: IModalVolume) => { const ModalVolumeCreate = (props: IModalVolumeCreate) => {
const { onHide } = props; const { onHide, onAddEndpoint } = props;
const [openTab, setOpenTab] = useState("General"); const [openTab, setOpenTab] = useState("General");
const formik = useFormik({ const formik = useFormik({
initialValues: { initialValues: {
...topLevelVolumeConfigInitialValues() volumeConfig: {
...topLevelVolumeConfigInitialValues()
},
key: "volume",
type: "VOLUME",
inputs: [],
outputs: [],
config: {}
}, },
onSubmit: () => undefined onSubmit: () => undefined
}); });
@ -48,7 +56,7 @@ const ModalVolume = (props: IModalVolume) => {
<div className="relative w-auto my-6 mx-auto max-w-5xl z-50"> <div className="relative w-auto my-6 mx-auto max-w-5xl z-50">
<div className="border-0 rounded-lg shadow-lg relative flex flex-col w-full bg-white outline-none focus:outline-none"> <div className="border-0 rounded-lg shadow-lg relative flex flex-col w-full bg-white outline-none focus:outline-none">
<div className="flex items-center justify-between px-4 py-3 border-b border-solid border-blueGray-200 rounded-t"> <div className="flex items-center justify-between px-4 py-3 border-b border-solid border-blueGray-200 rounded-t">
<h3 className="text-sm font-semibold">Top level volumes</h3> <h3 className="text-sm font-semibold">Create top level volume</h3>
<button <button
className="p-1 ml-auto text-black float-right outline-none focus:outline-none" className="p-1 ml-auto text-black float-right outline-none focus:outline-none"
onClick={onHide} onClick={onHide}
@ -100,6 +108,7 @@ const ModalVolume = (props: IModalVolume) => {
className="btn-util" className="btn-util"
type="button" type="button"
onClick={() => { onClick={() => {
onAddEndpoint(formik.values);
formik.resetForm(); formik.resetForm();
}} }}
> >
@ -113,4 +122,4 @@ const ModalVolume = (props: IModalVolume) => {
); );
}; };
export default ModalVolume; export default ModalVolumeCreate;

@ -0,0 +1,151 @@
import { useEffect, useState } from "react";
import { useFormik } from "formik";
import { XIcon } from "@heroicons/react/outline";
import General from "./General";
import Labels from "./Labels";
import { topLevelVolumeConfigInitialValues } from "../../../utils";
import {
CallbackFunction,
IVolumeNodeItem,
IVolumeTopLevel
} from "../../../types";
interface IModalVolumeEdit {
node: IVolumeNodeItem;
onHide: CallbackFunction;
onUpdateEndpoint: CallbackFunction;
}
const ModalVolumeEdit = (props: IModalVolumeEdit) => {
const { node, onHide, onUpdateEndpoint } = props;
const [openTab, setOpenTab] = useState("General");
const [selectedNode, setSelectedNode] = useState<IVolumeNodeItem>();
const formik = useFormik({
initialValues: {
volumeConfig: {
...topLevelVolumeConfigInitialValues()
}
},
onSubmit: () => undefined
});
const tabs = [
{
name: "General",
href: "#",
current: true,
hidden: false
},
{
name: "Labels",
href: "#",
current: false,
hidden: false
}
];
const classNames = (...classes: string[]) => {
return classes.filter(Boolean).join(" ");
};
useEffect(() => {
if (node) {
setSelectedNode(node);
}
}, [node]);
useEffect(() => {
formik.resetForm();
if (selectedNode) {
formik.initialValues.volumeConfig = {
...selectedNode.volumeConfig
} as IVolumeTopLevel;
}
}, [selectedNode]);
useEffect(() => {
return () => {
formik.resetForm();
};
}, []);
return (
<div className="fixed z-50 inset-0 overflow-y-auto">
<div className="justify-center items-center flex overflow-x-hidden overflow-y-auto fixed inset-0 outline-none focus:outline-none">
<div
onClick={onHide}
className="opacity-25 fixed inset-0 z-40 bg-black"
></div>
<div className="relative w-auto my-6 mx-auto max-w-5xl z-50">
<div className="border-0 rounded-lg shadow-lg relative flex flex-col w-full bg-white outline-none focus:outline-none">
<div className="flex items-center justify-between px-4 py-3 border-b border-solid border-blueGray-200 rounded-t">
<h3 className="text-sm font-semibold">
Update top level volumes
</h3>
<button
className="p-1 ml-auto text-black float-right outline-none focus:outline-none"
onClick={onHide}
>
<span className="block outline-none focus:outline-none">
<XIcon className="w-4" />
</span>
</button>
</div>
<div>
<div className="hidden sm:block">
<div className="border-b border-gray-200 px-8">
<nav className="-mb-px flex space-x-8" aria-label="Tabs">
{tabs.map((tab) => (
<a
key={tab.name}
href={tab.href}
className={classNames(
tab.name === openTab
? "border-indigo-500 text-indigo-600"
: "border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300",
"whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm",
tab.hidden ? "hidden" : ""
)}
aria-current={tab.current ? "page" : undefined}
onClick={(e) => {
e.preventDefault();
setOpenTab(tab.name);
}}
>
{tab.name}
</a>
))}
</nav>
</div>
</div>
<div className="relative px-4 py-3 flex-auto">
<form onSubmit={formik.handleSubmit}>
{openTab === "General" && <General formik={formik} />}
{openTab === "Labels" && <Labels formik={formik} />}
</form>
</div>
</div>
<div className="flex items-center justify-end px-4 py-3 border-t border-solid border-blueGray-200 rounded-b">
<button
className="btn-util"
type="button"
onClick={() => {
const updated = { ...selectedNode };
updated.volumeConfig = formik.values.volumeConfig;
onUpdateEndpoint(updated);
}}
>
Update
</button>
</div>
</div>
</div>
</div>
</div>
);
};
export default ModalVolumeEdit;

@ -15,12 +15,12 @@ const General = (props: any) => {
<div className="mt-1"> <div className="mt-1">
<input <input
id="name" id="name"
name="name" name="volumeConfig.name"
type="text" type="text"
autoComplete="none" autoComplete="none"
className="input-util" className="input-util"
onChange={formik.handleChange} onChange={formik.handleChange}
value={formik.values.name} value={formik.values.volumeConfig.name}
/> />
</div> </div>
</div> </div>

@ -6,6 +6,7 @@ import { PlusIcon } from "@heroicons/react/solid";
import { import {
IProjectPayload, IProjectPayload,
IServiceNodeItem, IServiceNodeItem,
IVolumeNodeItem,
IServiceNodePosition, IServiceNodePosition,
IProject IProject
} from "../../types"; } from "../../types";
@ -34,14 +35,16 @@ import ModalConfirmDelete from "../Modal/ConfirmDelete";
import ModalServiceCreate from "../Modal/Service/Create"; import ModalServiceCreate from "../Modal/Service/Create";
import ModalServiceEdit from "../Modal/Service/Edit"; import ModalServiceEdit from "../Modal/Service/Edit";
import ModalNetwork from "../Modal/Network"; import ModalNetwork from "../Modal/Network";
import ModalVolume from "../Modal/Volume"; import ModalVolumeCreate from "../Modal/Volume/Create";
import ModalVolumeEdit from "../Modal/Volume/Edit";
import CodeEditor from "../CodeEditor"; import CodeEditor from "../CodeEditor";
export default function Project() { export default function Project() {
const { uuid } = useParams<{ uuid: string }>(); const { uuid } = useParams<{ uuid: string }>();
const { height } = useWindowDimensions(); const { height } = useWindowDimensions();
const { data, error, isFetching } = useProject(uuid); const { data, error, isFetching } = useProject(uuid);
const stateNodesRef = useRef<Dictionary<IServiceNodeItem>>(); const stateNodesRef =
useRef<Dictionary<IServiceNodeItem | IVolumeNodeItem>>();
const stateConnectionsRef = useRef<[[string, string]] | []>(); const stateConnectionsRef = useRef<[[string, string]] | []>();
const [generatedCode, setGeneratedCode] = useState<string>(); const [generatedCode, setGeneratedCode] = useState<string>();
@ -49,8 +52,15 @@ export default function Project() {
const [showModalCreateService, setShowModalCreateService] = useState(false); const [showModalCreateService, setShowModalCreateService] = useState(false);
const [showVolumesModal, setShowVolumesModal] = useState(false); const [showVolumesModal, setShowVolumesModal] = useState(false);
const [showNetworksModal, setShowNetworksModal] = useState(false); const [showNetworksModal, setShowNetworksModal] = useState(false);
const [nodeForEdit, setNodeForEdit] = useState<IServiceNodeItem | null>(null); const [serviceToEdit, setServiceToEdit] = useState<IServiceNodeItem | null>(
const [nodeForDelete, setNodeForDelete] = useState<IServiceNodeItem | null>( null
);
const [serviceToDelete, setServiceToDelete] =
useState<IServiceNodeItem | null>(null);
const [volumeToEdit, setVolumeToEdit] = useState<IVolumeNodeItem | null>(
null
);
const [volumeToDelete, setVolumeToDelete] = useState<IVolumeNodeItem | null>(
null null
); );
const [language, setLanguage] = useState("yaml"); const [language, setLanguage] = useState("yaml");
@ -255,7 +265,7 @@ export default function Project() {
} }
}; };
const onRemoveEndpoint = (node: IServiceNodeItem) => { const onRemoveEndpoint = (node: IServiceNodeItem | IVolumeNodeItem) => {
setNodes({ ...omit(nodes, node.key) }); setNodes({ ...omit(nodes, node.key) });
eventBus.dispatch("NODE_DELETED", { message: { node: node } }); eventBus.dispatch("NODE_DELETED", { message: { node: node } });
}; };
@ -283,7 +293,10 @@ export default function Project() {
) : null} ) : null}
{showVolumesModal ? ( {showVolumesModal ? (
<ModalVolume onHide={() => setShowVolumesModal(false)} /> <ModalVolumeCreate
onHide={() => setShowVolumesModal(false)}
onAddEndpoint={(values: any) => onAddEndpoint(values)}
/>
) : null} ) : null}
{showModalCreateService ? ( {showModalCreateService ? (
@ -293,20 +306,38 @@ export default function Project() {
/> />
) : null} ) : null}
{nodeForEdit ? ( {serviceToEdit ? (
<ModalServiceEdit <ModalServiceEdit
node={nodeForEdit} node={serviceToEdit}
onHide={() => setNodeForEdit(null)} onHide={() => setServiceToEdit(null)}
onUpdateEndpoint={(values: any) => onUpdateEndpoint(values)} onUpdateEndpoint={(values: any) => onUpdateEndpoint(values)}
/> />
) : null} ) : null}
{nodeForDelete ? ( {serviceToDelete ? (
<ModalConfirmDelete <ModalConfirmDelete
onHide={() => setNodeForDelete(null)} onHide={() => setServiceToDelete(null)}
onConfirm={() => { onConfirm={() => {
onRemoveEndpoint(nodeForDelete); onRemoveEndpoint(serviceToDelete);
setNodeForDelete(null); setServiceToDelete(null);
}}
/>
) : null}
{volumeToEdit ? (
<ModalVolumeEdit
node={volumeToEdit}
onHide={() => setVolumeToEdit(null)}
onUpdateEndpoint={(values: any) => onUpdateEndpoint(values)}
/>
) : null}
{volumeToDelete ? (
<ModalConfirmDelete
onHide={() => setServiceToDelete(null)}
onConfirm={() => {
onRemoveEndpoint(volumeToDelete);
setVolumeToDelete(null);
}} }}
/> />
) : null} ) : null}
@ -411,8 +442,7 @@ export default function Project() {
type="button" type="button"
onClick={() => setShowNetworksModal(true)} onClick={() => setShowNetworksModal(true)}
> >
<PlusIcon className="w-3" /> <span>Networks</span>
<span>Network</span>
</button> </button>
</div> </div>
</div> </div>
@ -434,11 +464,17 @@ export default function Project() {
onConnectionDetached={(connectionData: any) => onConnectionDetached={(connectionData: any) =>
onConnectionDetached(connectionData) onConnectionDetached(connectionData)
} }
setNodeForEdit={(node: IServiceNodeItem) => setServiceToEdit={(node: IServiceNodeItem) =>
setNodeForEdit(node) setServiceToEdit(node)
}
setServiceToDelete={(node: IServiceNodeItem) =>
setServiceToDelete(node)
}
setVolumeToEdit={(node: IVolumeNodeItem) =>
setVolumeToEdit(node)
} }
setNodeForDelete={(node: IServiceNodeItem) => setVolumeToDelete={(node: IVolumeNodeItem) =>
setNodeForDelete(node) setVolumeToDelete(node)
} }
/> />
</div> </div>

@ -188,7 +188,7 @@ export const topLevelNetworkConfigInitialValues =
}; };
}; };
export const canvasConfigInitialValues = (): ICanvasConfig => { export const serviceConfigCanvasInitialValues = (): ICanvasConfig => {
return { return {
service_name: "unnamed" service_name: "unnamed"
}; };

Loading…
Cancel
Save