aiden
/
ctk
mirror of https://github.com/ctk-hq/ctk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Formik wrap instead of useFormik

Browse Source
pull/70/head
Artem Golub 3 years ago
parent 653ab5d8bc
commit b4b9966ee8
19 changed files with 509 additions and 474 deletions
Show Stats Download Patch File Download Diff File

3
services/frontend/package.json
Unescape Escape View File

@ -45,7 +45,8 @@
"typescript": "^4.5.5",
"uuid": "^8.3.2",
"web-vitals": "^2.1.4",
"yaml": "^1.10.2"
"yaml": "^1.10.2",
"yup": "^0.32.11"
},
"scripts": {
"start": "react-scripts start",

15
services/frontend/src/components/Canvas/ServiceNode.tsx
Unescape Escape View File

@ -1,4 +1,6 @@
import { useEffect, useState } from "react";
import { ServerIcon } from "@heroicons/react/outline";
import { truncateStr } from "../../utils";
import { IServiceNodeItem, CallbackFunction } from "../../types";
import eventBus from "../../events/eventBus";
import { Popover } from "./Popover";
@ -52,14 +54,21 @@ export default function ServiceNode(props: INodeProps) {
}}
></Popover>
)}
<div className="node-label w-full py-2 px-4">
<div className="relative node-label w-full py-2 px-4">
<>
{node.canvasConfig.service_name && (
<div className="text-sm font-semibold overflow-x-hidden">
{node.canvasConfig.service_name}
{truncateStr(node.canvasConfig.service_name, 12)}
</div>
)}
{node.serviceConfig.container_name && (
<div className="text-xs text-gray-500 overflow-x-hidden">
{node.serviceConfig.container_name}
{truncateStr(node.serviceConfig.container_name, 20)}
</div>
)}
<ServerIcon className="w-3 h-3 text-gray-600 absolute top-2 right-2" />
</>
</div>
</div>

12
services/frontend/src/components/Canvas/VolumeNode.tsx
Unescape Escape View File

@ -1,4 +1,6 @@
import { useEffect, useState } from "react";
import { DatabaseIcon } from "@heroicons/react/outline";
import { truncateStr } from "../../utils";
import { IVolumeNodeItem, CallbackFunction } from "../../types";
import eventBus from "../../events/eventBus";
import { Popover } from "./Popover";
@ -52,11 +54,15 @@ export default function VolumeNode(props: INodeProps) {
}}
></Popover>
)}
<div className="node-label w-full py-2 px-4">
<div className="relative node-label w-full py-2 px-4">
<>
<div className="text-xs text-gray-500 overflow-x-hidden">
{node.volumeConfig.name}
{node.volumeConfig.name && (
<div className="text-sm font-semibold overflow-x-hidden">
{truncateStr(node.volumeConfig.name, 20)}
</div>
)}
<DatabaseIcon className="w-3 h-3 text-gray-600 absolute top-2 right-2" />
</>
</div>
</div>

29
services/frontend/src/components/Modal/Network/General.tsx
Unescape Escape View File

@ -1,32 +1,11 @@
const General = (props: any) => {
const { formik } = props;
import TextField from "../../global/FormElements/InputField";
const General = () => {
return (
<>
<div className="relative pb-3 flex-auto">
<div className="grid grid-cols-6 gap-4">
<div className="col-span-3">
<label
htmlFor="name"
className="block text-xs font-medium text-gray-700"
>
Name
</label>
<div className="mt-1">
<input
id="name"
name="name"
type="text"
autoComplete="none"
className="input-util"
onChange={formik.handleChange}
value={formik.values.name}
/>
</div>
</div>
</div>
</div>
<TextField label="Name" name="name" />
</>
);
};
export default General;

5
services/frontend/src/components/Modal/Network/IPam.tsx
Unescape Escape View File

@ -1,6 +1,5 @@
const IPam = (props: any) => {
const { formik } = props;
const IPam = () => {
return <></>;
};
export default IPam;

5
services/frontend/src/components/Modal/Network/Labels.tsx
Unescape Escape View File

@ -1,6 +1,5 @@
const Labels = (props: any) => {
const { formik } = props;
const Labels = () => {
return <></>;
};
export default Labels;

49
services/frontend/src/components/Modal/Network/index.tsx
Unescape Escape View File

@ -1,5 +1,6 @@
import { useState } from "react";
import { useFormik } from "formik";
import { Formik } from "formik";
import * as yup from "yup";
import { XIcon } from "@heroicons/react/outline";
import General from "./General";
import IPam from "./IPam";
@ -14,12 +15,14 @@ interface IModalNetworkProps {
const ModalNetwork = (props: IModalNetworkProps) => {
const { onHide } = props;
const [openTab, setOpenTab] = useState("General");
const formik = useFormik({
initialValues: {
...topLevelNetworkConfigInitialValues()
},
onSubmit: () => undefined
const handleCreate = (values: any, formik: any) => {
formik.resetForm();
};
const validationSchema = yup.object({
name: yup
.string()
.max(256, "name should be 256 characters or less")
.required("name is required")
});
const tabs = [
{
@ -66,7 +69,23 @@ const ModalNetwork = (props: IModalNetworkProps) => {
</button>
</div>
<div>
<Formik
initialValues={{
...topLevelNetworkConfigInitialValues(),
key: "volume",
type: "VOLUME",
inputs: [],
outputs: [],
config: {}
}}
enableReinitialize={true}
onSubmit={(values, formik) => {
handleCreate(values, formik);
}}
validationSchema={validationSchema}
>
{(formik) => (
<>
<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">
@ -95,12 +114,9 @@ const ModalNetwork = (props: IModalNetworkProps) => {
</div>
<div className="relative px-4 py-3 flex-auto">
<form onSubmit={formik.handleSubmit}>
{openTab === "General" && <General formik={formik} />}
{openTab === "IPam" && <IPam formik={formik} />}
{openTab === "Labels" && <Labels formik={formik} />}
</form>
</div>
{openTab === "General" && <General />}
{openTab === "IPam" && <IPam />}
{openTab === "Labels" && <Labels />}
</div>
<div className="flex items-center justify-end px-4 py-3 border-t border-solid border-blueGray-200 rounded-b">
@ -108,12 +124,15 @@ const ModalNetwork = (props: IModalNetworkProps) => {
className="btn-util"
type="button"
onClick={() => {
formik.resetForm();
formik.submitForm();
}}
>
Add
</button>
</div>
</>
)}
</Formik>
</div>
</div>
</div>

73
services/frontend/src/components/Modal/Service/Create.tsx
Unescape Escape View File

@ -1,5 +1,6 @@
import { useState } from "react";
import { useFormik } from "formik";
import { Formik } from "formik";
import * as yup from "yup";
import { XIcon } from "@heroicons/react/outline";
import General from "./General";
import Environment from "./Environment";
@ -16,22 +17,23 @@ interface IModalServiceProps {
const ModalServiceCreate = (props: IModalServiceProps) => {
const { onHide, onAddEndpoint } = props;
const [openTab, setOpenTab] = useState("General");
const formik = useFormik({
initialValues: {
canvasConfig: {
...serviceConfigCanvasInitialValues()
},
serviceConfig: {
container_name: ""
},
key: "service",
type: "SERVICE",
inputs: ["op_source"],
outputs: [],
config: {}
},
onSubmit: () => undefined
const handleCreate = (values: any, formik: any) => {
onAddEndpoint(values);
formik.resetForm();
};
const validationSchema = yup.object({
canvasConfig: yup.object({
service_name: yup
.string()
.max(256, "service name should be 256 characters or less")
.required("service name is required")
}),
serviceConfig: yup.object({
container_name: yup
.string()
.max(256, "container name should be 256 characters or less")
.required("container name is required")
})
});
const tabs = [
{
@ -84,7 +86,28 @@ const ModalServiceCreate = (props: IModalServiceProps) => {
</button>
</div>
<div>
<Formik
initialValues={{
canvasConfig: {
...serviceConfigCanvasInitialValues()
},
serviceConfig: {
container_name: ""
},
key: "service",
type: "SERVICE",
inputs: ["op_source"],
outputs: [],
config: {}
}}
enableReinitialize={true}
onSubmit={(values, formik) => {
handleCreate(values, formik);
}}
validationSchema={validationSchema}
>
{(formik) => (
<>
<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">
@ -113,13 +136,10 @@ const ModalServiceCreate = (props: IModalServiceProps) => {
</div>
<div className="relative px-4 py-3 flex-auto">
<form onSubmit={formik.handleSubmit}>
{openTab === "General" && <General formik={formik} />}
{openTab === "Environment" && <Environment formik={formik} />}
{openTab === "Volumes" && <Volumes formik={formik} />}
{openTab === "Labels" && <Labels formik={formik} />}
</form>
</div>
{openTab === "General" && <General />}
{openTab === "Environment" && <Environment />}
{openTab === "Volumes" && <Volumes />}
{openTab === "Labels" && <Labels />}
</div>
<div className="flex items-center justify-end px-4 py-3 border-t border-solid border-blueGray-200 rounded-b">
@ -134,6 +154,9 @@ const ModalServiceCreate = (props: IModalServiceProps) => {
Add
</button>
</div>
</>
)}
</Formik>
</div>
</div>
</div>

104
services/frontend/src/components/Modal/Service/Edit.tsx
Unescape Escape View File

@ -1,17 +1,12 @@
import { useState, useEffect } from "react";
import { useFormik } from "formik";
import { Formik } from "formik";
import * as yup from "yup";
import { XIcon } from "@heroicons/react/outline";
import General from "./General";
import Environment from "./Environment";
import Volumes from "./Volumes";
import Labels from "./Labels";
import { serviceConfigCanvasInitialValues } from "../../../utils";
import {
CallbackFunction,
ICanvasConfig,
IServiceNodeItem,
IService
} from "../../../types";
import { CallbackFunction, IServiceNodeItem } from "../../../types";
interface IModalServiceProps {
node: IServiceNodeItem;
@ -23,16 +18,26 @@ const ModalServiceEdit = (props: IModalServiceProps) => {
const { node, onHide, onUpdateEndpoint } = props;
const [openTab, setOpenTab] = useState("General");
const [selectedNode, setSelectedNode] = useState<IServiceNodeItem>();
const formik = useFormik({
initialValues: {
canvasConfig: {
...serviceConfigCanvasInitialValues()
},
serviceConfig: {
container_name: ""
}
},
onSubmit: () => undefined
const handleUpdate = (values: any) => {
const updated = { ...selectedNode };
updated.canvasConfig = values.canvasConfig;
updated.serviceConfig = values.serviceConfig;
onUpdateEndpoint(updated);
};
const validationSchema = yup.object({
canvasConfig: yup.object({
service_name: yup
.string()
.max(256, "service name should be 256 characters or less")
.required("service name is required")
}),
serviceConfig: yup.object({
container_name: yup
.string()
.max(256, "container name should be 256 characters or less")
.required("container name is required")
})
});
const tabs = [
{
@ -70,25 +75,6 @@ const ModalServiceEdit = (props: IModalServiceProps) => {
}
}, [node]);
useEffect(() => {
formik.resetForm();
if (selectedNode) {
formik.initialValues.canvasConfig = {
...selectedNode.canvasConfig
} as ICanvasConfig;
formik.initialValues.serviceConfig = {
...selectedNode.serviceConfig
} as IService;
}
}, [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">
@ -110,10 +96,30 @@ const ModalServiceEdit = (props: IModalServiceProps) => {
</button>
</div>
<div>
{selectedNode && (
<Formik
initialValues={{
canvasConfig: {
...selectedNode.canvasConfig
},
serviceConfig: {
...selectedNode.serviceConfig
}
}}
enableReinitialize={true}
onSubmit={(values) => {
handleUpdate(values);
}}
validationSchema={validationSchema}
>
{(formik) => (
<>
<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">
<nav
className="-mb-px flex space-x-8"
aria-label="Tabs"
>
{tabs.map((tab) => (
<a
key={tab.name}
@ -139,13 +145,10 @@ const ModalServiceEdit = (props: IModalServiceProps) => {
</div>
<div className="relative px-4 py-3 flex-auto">
<form onSubmit={formik.handleSubmit}>
{openTab === "General" && <General formik={formik} />}
{openTab === "Environment" && <Environment formik={formik} />}
{openTab === "Volumes" && <Volumes formik={formik} />}
{openTab === "Labels" && <Labels formik={formik} />}
</form>
</div>
{openTab === "General" && <General />}
{openTab === "Environment" && <Environment />}
{openTab === "Volumes" && <Volumes />}
{openTab === "Labels" && <Labels />}
</div>
<div className="flex items-center justify-end px-4 py-3 border-t border-solid border-blueGray-200 rounded-b">
@ -153,15 +156,16 @@ const ModalServiceEdit = (props: IModalServiceProps) => {
className="btn-util"
type="button"
onClick={() => {
const updated = { ...selectedNode };
updated.canvasConfig = formik.values.canvasConfig;
updated.serviceConfig = formik.values.serviceConfig;
onUpdateEndpoint(updated);
formik.submitForm();
}}
>
Update
</button>
</div>
</>
)}
</Formik>
)}
</div>
</div>
</div>

5
services/frontend/src/components/Modal/Service/Environment.tsx
Unescape Escape View File

@ -1,6 +1,5 @@
const Environment = (props: any) => {
const { formik } = props;
const Environment = () => {
return <></>;
};
export default Environment;

54
services/frontend/src/components/Modal/Service/General.tsx
Unescape Escape View File

@ -1,56 +1,12 @@
const General = (props: any) => {
const { formik } = props;
import TextField from "../../global/FormElements/InputField";
const General = () => {
return (
<>
<div className="relative pb-3 flex-auto">
<div className="grid grid-cols-6 gap-4">
<div className="col-span-3">
<label
htmlFor="service_name"
className="block text-xs font-medium text-gray-700"
>
Service name
</label>
<div className="mt-1">
<input
id="service_name"
name="canvasConfig.service_name"
type="text"
autoComplete="none"
className="input-util"
onChange={formik.handleChange}
value={formik.values.canvasConfig.service_name}
/>
</div>
</div>
</div>
</div>
<div className="relative pb-3 flex-auto">
<div className="grid grid-cols-6 gap-4">
<div className="col-span-3">
<label
htmlFor="container_name"
className="block text-xs font-medium text-gray-700"
>
Container name
</label>
<div className="mt-1">
<input
id="container_name"
name="serviceConfig.container_name"
type="text"
autoComplete="none"
className="input-util"
onChange={formik.handleChange}
value={formik.values.serviceConfig.container_name}
/>
</div>
</div>
</div>
</div>
<TextField label="Service name" name="canvasConfig.service_name" />
<TextField label="Container name" name="serviceConfig.container_name" />
</>
);
};
export default General;

5
services/frontend/src/components/Modal/Service/Labels.tsx
Unescape Escape View File

@ -1,6 +1,5 @@
const Labels = (props: any) => {
const { formik } = props;
const Labels = () => {
return <></>;
};
export default Labels;

5
services/frontend/src/components/Modal/Service/Volumes.tsx
Unescape Escape View File

@ -1,6 +1,5 @@
const Volumes = (props: any) => {
const { formik } = props;
const Volumes = () => {
return <></>;
};
export default Volumes;

60
services/frontend/src/components/Modal/Volume/Create.tsx
Unescape Escape View File

@ -1,5 +1,6 @@
import { useState } from "react";
import { useFormik } from "formik";
import { Formik } from "formik";
import * as yup from "yup";
import { XIcon } from "@heroicons/react/outline";
import General from "./General";
import Labels from "./Labels";
@ -14,19 +15,17 @@ interface IModalVolumeCreate {
const ModalVolumeCreate = (props: IModalVolumeCreate) => {
const { onHide, onAddEndpoint } = props;
const [openTab, setOpenTab] = useState("General");
const formik = useFormik({
initialValues: {
volumeConfig: {
...topLevelVolumeConfigInitialValues()
},
key: "volume",
type: "VOLUME",
inputs: [],
outputs: [],
config: {}
},
onSubmit: () => undefined
const handleCreate = (values: any, formik: any) => {
onAddEndpoint(values);
formik.resetForm();
};
const validationSchema = yup.object({
volumeConfig: yup.object({
name: yup
.string()
.max(256, "name should be 256 characters or less")
.required("name is required")
})
});
const tabs = [
{
@ -67,7 +66,25 @@ const ModalVolumeCreate = (props: IModalVolumeCreate) => {
</button>
</div>
<div>
<Formik
initialValues={{
volumeConfig: {
...topLevelVolumeConfigInitialValues()
},
key: "volume",
type: "VOLUME",
inputs: [],
outputs: [],
config: {}
}}
enableReinitialize={true}
onSubmit={(values, formik) => {
handleCreate(values, formik);
}}
validationSchema={validationSchema}
>
{(formik) => (
<>
<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">
@ -96,11 +113,8 @@ const ModalVolumeCreate = (props: IModalVolumeCreate) => {
</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>
{openTab === "General" && <General />}
{openTab === "Labels" && <Labels />}
</div>
<div className="flex items-center justify-end px-4 py-3 border-t border-solid border-blueGray-200 rounded-b">
@ -108,13 +122,15 @@ const ModalVolumeCreate = (props: IModalVolumeCreate) => {
className="btn-util"
type="button"
onClick={() => {
onAddEndpoint(formik.values);
formik.resetForm();
formik.submitForm();
}}
>
Add
</button>
</div>
</>
)}
</Formik>
</div>
</div>
</div>

82
services/frontend/src/components/Modal/Volume/Edit.tsx
Unescape Escape View File

@ -1,14 +1,10 @@
import { useEffect, useState } from "react";
import { useFormik } from "formik";
import { Formik } from "formik";
import * as yup from "yup";
import { XIcon } from "@heroicons/react/outline";
import General from "./General";
import Labels from "./Labels";
import { topLevelVolumeConfigInitialValues } from "../../../utils";
import {
CallbackFunction,
IVolumeNodeItem,
IVolumeTopLevel
} from "../../../types";
import { CallbackFunction, IVolumeNodeItem } from "../../../types";
interface IModalVolumeEdit {
node: IVolumeNodeItem;
@ -20,14 +16,18 @@ 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 handleUpdate = (values: any) => {
const updated = { ...selectedNode };
updated.volumeConfig = values.volumeConfig;
onUpdateEndpoint(updated);
};
const validationSchema = yup.object({
volumeConfig: yup.object({
name: yup
.string()
.max(256, "name should be 256 characters or less")
.required("name is required")
})
});
const tabs = [
{
@ -53,22 +53,6 @@ const ModalVolumeEdit = (props: IModalVolumeEdit) => {
}
}, [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">
@ -92,10 +76,27 @@ const ModalVolumeEdit = (props: IModalVolumeEdit) => {
</button>
</div>
<div>
{selectedNode && (
<Formik
initialValues={{
volumeConfig: {
...selectedNode.volumeConfig
}
}}
enableReinitialize={true}
onSubmit={(values) => {
handleUpdate(values);
}}
validationSchema={validationSchema}
>
{(formik) => (
<>
<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">
<nav
className="-mb-px flex space-x-8"
aria-label="Tabs"
>
{tabs.map((tab) => (
<a
key={tab.name}
@ -121,11 +122,8 @@ const ModalVolumeEdit = (props: IModalVolumeEdit) => {
</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>
{openTab === "General" && <General />}
{openTab === "Labels" && <Labels />}
</div>
<div className="flex items-center justify-end px-4 py-3 border-t border-solid border-blueGray-200 rounded-b">
@ -133,14 +131,16 @@ const ModalVolumeEdit = (props: IModalVolumeEdit) => {
className="btn-util"
type="button"
onClick={() => {
const updated = { ...selectedNode };
updated.volumeConfig = formik.values.volumeConfig;
onUpdateEndpoint(updated);
formik.submitForm();
}}
>
Update
</button>
</div>
</>
)}
</Formik>
)}
</div>
</div>
</div>

29
services/frontend/src/components/Modal/Volume/General.tsx
Unescape Escape View File

@ -1,32 +1,11 @@
const General = (props: any) => {
const { formik } = props;
import TextField from "../../global/FormElements/InputField";
const General = () => {
return (
<>
<div className="relative pb-3 flex-auto">
<div className="grid grid-cols-6 gap-4">
<div className="col-span-3">
<label
htmlFor="name"
className="block text-xs font-medium text-gray-700"
>
Name
</label>
<div className="mt-1">
<input
id="name"
name="volumeConfig.name"
type="text"
autoComplete="none"
className="input-util"
onChange={formik.handleChange}
value={formik.values.volumeConfig.name}
/>
</div>
</div>
</div>
</div>
<TextField label="Name" name="volumeConfig.name" />
</>
);
};
export default General;

4
services/frontend/src/components/Modal/Volume/Labels.tsx
Unescape Escape View File

@ -1,6 +1,4 @@
const Labels = (props: any) => {
const { formik } = props;
const Labels = () => {
return <></>;
};
export default Labels;

4
services/frontend/src/components/Project/index.tsx
Unescape Escape View File

@ -245,9 +245,9 @@ export default function Project() {
if (existingIndex !== -1) {
_connections.splice(existingIndex, 1);
}
setConnections(_connections);
stateConnectionsRef.current = _connections;
}
};
const onConnectionAttached = (data: any) => {

50
services/frontend/src/components/global/FormElements/InputField.tsx
Unescape Escape View File

@ -0,0 +1,50 @@
import _ from "lodash";
import { useFormikContext } from "formik";
interface Props {
name: string;
help?: string;
[key: string]: any;
}
const TextField = (props: Props) => {
const { label, name, help, ...otherProps } = props;
const formik = useFormikContext();
const error = _.get(formik.touched, name) && _.get(formik.errors, name);
return (
<div className="relative pb-3 flex-auto">
<div className="grid grid-cols-6 gap-4">
<div className="col-span-3">
<label
htmlFor={name}
className="block text-xs font-medium text-gray-700"
>
{label}
</label>
<div className="mt-1">
<input
id={name}
name={name}
type="text"
autoComplete="none"
className="input-util"
onBlur={formik.handleBlur}
onChange={formik.handleChange}
{...otherProps}
value={_.get(formik.values, name)}
/>
{
<div className="mt-1 text-xs text-red-600">
{error && <div className="caption">{error}</div>}
{!error && help}
</div>
}
</div>
</div>
</div>
</div>
);
};
export default TextField;
Write Preview
Loading…
Cancel
Save