From 31c7599c820bbec3bb221e5f063d0bac38d6b109 Mon Sep 17 00:00:00 2001 From: corpulent Date: Wed, 24 Aug 2022 12:44:37 +0300 Subject: [PATCH 1/2] fix: add emotion module --- services/frontend/package.json | 2 + services/frontend/yarn.lock | 137 +++++++++++++++++++++++++-------- 2 files changed, 107 insertions(+), 32 deletions(-) diff --git a/services/frontend/package.json b/services/frontend/package.json index a17b799..5759e3e 100644 --- a/services/frontend/package.json +++ b/services/frontend/package.json @@ -18,6 +18,8 @@ "@codemirror/search": "^0.19.0", "@codemirror/stream-parser": "^0.19.9", "@codemirror/view": "^0.19.0", + "@emotion/react": "^11.10.0", + "@emotion/styled": "^11.10.0", "@heroicons/react": "^1.0.5", "@jsplumb/browser-ui": "^5.5.2", "@jsplumb/common": "^5.5.2", diff --git a/services/frontend/yarn.lock b/services/frontend/yarn.lock index 1352e73..c81a34b 100644 --- a/services/frontend/yarn.lock +++ b/services/frontend/yarn.lock @@ -164,7 +164,7 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.18.6": +"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6": "integrity" "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==" "resolved" "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz" "version" "7.18.6" @@ -515,7 +515,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.18.6": +"@babel/plugin-syntax-jsx@^7.17.12", "@babel/plugin-syntax-jsx@^7.18.6": "integrity" "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==" "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz" "version" "7.18.6" @@ -1391,43 +1391,106 @@ "resolved" "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz" "version" "2.0.2" -"@emotion/cache@^11.9.3": - "integrity" "sha512-0dgkI/JKlCXa+lEXviaMtGBL0ynpx4osh7rjOXE71q9bIF8G+XhJgvi+wDu0B0IdCVx37BffiwXlN9I3UuzFvg==" - "resolved" "https://registry.npmjs.org/@emotion/cache/-/cache-11.9.3.tgz" - "version" "11.9.3" +"@emotion/babel-plugin@^11.10.0": + "integrity" "sha512-xNQ57njWTFVfPAc3cjfuaPdsgLp5QOSuRsj9MA6ndEhH/AzuZM86qIQzt6rq+aGBwj3n5/TkLmU5lhAfdRmogA==" + "resolved" "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.2.tgz" + "version" "11.10.2" dependencies: - "@emotion/memoize" "^0.7.4" - "@emotion/sheet" "^1.1.1" - "@emotion/utils" "^1.0.0" - "@emotion/weak-memoize" "^0.2.5" + "@babel/helper-module-imports" "^7.16.7" + "@babel/plugin-syntax-jsx" "^7.17.12" + "@babel/runtime" "^7.18.3" + "@emotion/hash" "^0.9.0" + "@emotion/memoize" "^0.8.0" + "@emotion/serialize" "^1.1.0" + "babel-plugin-macros" "^3.1.0" + "convert-source-map" "^1.5.0" + "escape-string-regexp" "^4.0.0" + "find-root" "^1.1.0" + "source-map" "^0.5.7" "stylis" "4.0.13" -"@emotion/is-prop-valid@^1.1.3": - "integrity" "sha512-RFg04p6C+1uO19uG8N+vqanzKqiM9eeV1LDOG3bmkYmuOj7NbKNlFC/4EZq5gnwAIlcC/jOT24f8Td0iax2SXA==" - "resolved" "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.1.3.tgz" - "version" "1.1.3" +"@emotion/cache@^11.10.0", "@emotion/cache@^11.9.3": + "integrity" "sha512-Psmp/7ovAa8appWh3g51goxu/z3iVms7JXOreq136D8Bbn6dYraPnmL6mdM8GThEx9vwSn92Fz+mGSjBzN8UPQ==" + "resolved" "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.3.tgz" + "version" "11.10.3" dependencies: - "@emotion/memoize" "^0.7.4" + "@emotion/memoize" "^0.8.0" + "@emotion/sheet" "^1.2.0" + "@emotion/utils" "^1.2.0" + "@emotion/weak-memoize" "^0.3.0" + "stylis" "4.0.13" -"@emotion/memoize@^0.7.4": - "integrity" "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==" - "resolved" "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz" - "version" "0.7.5" +"@emotion/hash@^0.9.0": + "integrity" "sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ==" + "resolved" "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz" + "version" "0.9.0" -"@emotion/sheet@^1.1.1": - "integrity" "sha512-J3YPccVRMiTZxYAY0IOq3kd+hUP8idY8Kz6B/Cyo+JuXq52Ek+zbPbSQUrVQp95aJ+lsAW7DPL1P2Z+U1jGkKA==" - "resolved" "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.1.1.tgz" - "version" "1.1.1" +"@emotion/is-prop-valid@^1.1.3", "@emotion/is-prop-valid@^1.2.0": + "integrity" "sha512-3aDpDprjM0AwaxGE09bOPkNxHpBd+kA6jty3RnaEXdweX1DF1U3VQpPYb0g1IStAuK7SVQ1cy+bNBBKp4W3Fjg==" + "resolved" "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.0.tgz" + "version" "1.2.0" + dependencies: + "@emotion/memoize" "^0.8.0" + +"@emotion/memoize@^0.8.0": + "integrity" "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==" + "resolved" "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.0.tgz" + "version" "0.8.0" -"@emotion/utils@^1.0.0": - "integrity" "sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ==" - "resolved" "https://registry.npmjs.org/@emotion/utils/-/utils-1.1.0.tgz" +"@emotion/react@^11.0.0-rc.0", "@emotion/react@^11.10.0", "@emotion/react@^11.4.1", "@emotion/react@^11.5.0": + "integrity" "sha512-K6z9zlHxxBXwN8TcpwBKcEsBsOw4JWCCmR+BeeOWgqp8GIU1yA2Odd41bwdAAr0ssbQrbJbVnndvv7oiv1bZeQ==" + "resolved" "https://registry.npmjs.org/@emotion/react/-/react-11.10.0.tgz" + "version" "11.10.0" + dependencies: + "@babel/runtime" "^7.18.3" + "@emotion/babel-plugin" "^11.10.0" + "@emotion/cache" "^11.10.0" + "@emotion/serialize" "^1.1.0" + "@emotion/utils" "^1.2.0" + "@emotion/weak-memoize" "^0.3.0" + "hoist-non-react-statics" "^3.3.1" + +"@emotion/serialize@^1.1.0": + "integrity" "sha512-F1ZZZW51T/fx+wKbVlwsfchr5q97iW8brAnXmsskz4d0hVB4O3M/SiA3SaeH06x02lSNzkkQv+n3AX3kCXKSFA==" + "resolved" "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.0.tgz" "version" "1.1.0" + dependencies: + "@emotion/hash" "^0.9.0" + "@emotion/memoize" "^0.8.0" + "@emotion/unitless" "^0.8.0" + "@emotion/utils" "^1.2.0" + "csstype" "^3.0.2" -"@emotion/weak-memoize@^0.2.5": - "integrity" "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" - "resolved" "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz" - "version" "0.2.5" +"@emotion/sheet@^1.2.0": + "integrity" "sha512-OiTkRgpxescko+M51tZsMq7Puu/KP55wMT8BgpcXVG2hqXc0Vo0mfymJ/Uj24Hp0i083ji/o0aLddh08UEjq8w==" + "resolved" "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.0.tgz" + "version" "1.2.0" + +"@emotion/styled@^11.10.0", "@emotion/styled@^11.3.0": + "integrity" "sha512-V9oaEH6V4KePeQpgUE83i8ht+4Ri3E8Djp/ZPJ4DQlqWhSKITvgzlR3/YQE2hdfP4Jw3qVRkANJz01LLqK9/TA==" + "resolved" "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.0.tgz" + "version" "11.10.0" + dependencies: + "@babel/runtime" "^7.18.3" + "@emotion/babel-plugin" "^11.10.0" + "@emotion/is-prop-valid" "^1.2.0" + "@emotion/serialize" "^1.1.0" + "@emotion/utils" "^1.2.0" + +"@emotion/unitless@^0.8.0": + "integrity" "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==" + "resolved" "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz" + "version" "0.8.0" + +"@emotion/utils@^1.2.0": + "integrity" "sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw==" + "resolved" "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.0.tgz" + "version" "1.2.0" + +"@emotion/weak-memoize@^0.3.0": + "integrity" "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==" + "resolved" "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz" + "version" "0.3.0" "@eslint/eslintrc@^1.3.0": "integrity" "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==" @@ -3863,7 +3926,7 @@ "resolved" "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz" "version" "1.0.4" -"convert-source-map@^1.4.0", "convert-source-map@^1.6.0", "convert-source-map@^1.7.0": +"convert-source-map@^1.4.0", "convert-source-map@^1.5.0", "convert-source-map@^1.6.0", "convert-source-map@^1.7.0": "integrity" "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==" "resolved" "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz" "version" "1.8.0" @@ -5334,6 +5397,11 @@ "make-dir" "^3.0.2" "pkg-dir" "^4.1.0" +"find-root@^1.1.0": + "integrity" "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==" + "resolved" "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz" + "version" "1.1.0" + "find-up@^2.1.0": "integrity" "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==" "resolved" "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz" @@ -5724,7 +5792,7 @@ dependencies: "@babel/runtime" "^7.7.6" -"hoist-non-react-statics@^3.3.0": +"hoist-non-react-statics@^3.3.0", "hoist-non-react-statics@^3.3.1": "integrity" "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==" "resolved" "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz" "version" "3.3.2" @@ -9059,6 +9127,11 @@ "buffer-from" "^1.0.0" "source-map" "^0.6.0" +"source-map@^0.5.7": + "integrity" "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==" + "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" + "version" "0.5.7" + "source-map@^0.6.0", "source-map@^0.6.1", "source-map@~0.6.0", "source-map@~0.6.1", "source-map@0.6.1": "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" From be65aca4842921847e0a82b2710808f5f4b24514 Mon Sep 17 00:00:00 2001 From: corpulent Date: Wed, 24 Aug 2022 12:57:46 +0300 Subject: [PATCH 2/2] chore: unused variables --- services/frontend/src/App.tsx | 2 +- .../frontend/src/components/Project/index.tsx | 16 ++-------------- .../src/components/Projects/PreviewBlock.tsx | 2 +- .../frontend/src/components/Projects/index.tsx | 2 +- .../modals/docker-compose/network/IPAM.tsx | 8 +++----- .../docker-compose/network/NetworkList.tsx | 2 +- 6 files changed, 9 insertions(+), 23 deletions(-) diff --git a/services/frontend/src/App.tsx b/services/frontend/src/App.tsx index 86abfc3..b7e04ea 100644 --- a/services/frontend/src/App.tsx +++ b/services/frontend/src/App.tsx @@ -80,7 +80,7 @@ export default function App() { } } }) - .catch((err) => { + .catch(() => { localStorage.removeItem(LOCAL_STORAGE); navigate("/login"); }); diff --git a/services/frontend/src/components/Project/index.tsx b/services/frontend/src/components/Project/index.tsx index 2ca72d9..01328d2 100644 --- a/services/frontend/src/components/Project/index.tsx +++ b/services/frontend/src/components/Project/index.tsx @@ -174,14 +174,6 @@ export default function Project(props: IProjectProps) { setCanvasPosition(canvasData.canvas.position); }, [data]); - const debouncedOnCodeChange = useMemo( - () => - debounce((code: string) => { - //formik.setFieldValue("code", e, false); - }, 700), - [] - ); - const debouncedOnGraphUpdate = useMemo( () => debounce((payload) => { @@ -203,10 +195,6 @@ export default function Project(props: IProjectProps) { [] ); - const onCodeUpdate = (code: string) => { - debouncedOnCodeChange(code); - }; - const onGraphUpdate = (graphData: any) => { const data = { ...graphData }; data.version = version; @@ -650,8 +638,8 @@ export default function Project(props: IProjectProps) { { - onCodeUpdate(e); + onChange={() => { + return; }} disabled={true} lineWrapping={false} diff --git a/services/frontend/src/components/Projects/PreviewBlock.tsx b/services/frontend/src/components/Projects/PreviewBlock.tsx index 9421259..9840361 100644 --- a/services/frontend/src/components/Projects/PreviewBlock.tsx +++ b/services/frontend/src/components/Projects/PreviewBlock.tsx @@ -25,7 +25,7 @@ const PreviewBlock = (props: IPreviewBlockProps) => { setIsHovering(false); }; - const handleClick = (e: any) => { + const handleClick = () => { navigate(`/projects/${project.uuid}`); }; diff --git a/services/frontend/src/components/Projects/index.tsx b/services/frontend/src/components/Projects/index.tsx index d62911a..6f8d7ab 100644 --- a/services/frontend/src/components/Projects/index.tsx +++ b/services/frontend/src/components/Projects/index.tsx @@ -31,7 +31,7 @@ const Projects = () => { navigate(`/projects/${resp.name}`); toaster(`Imported!`, "success"); }) - .catch((e: any) => { + .catch(() => { toaster(`Something went wrong!`, "error"); }) .finally(() => { diff --git a/services/frontend/src/components/modals/docker-compose/network/IPAM.tsx b/services/frontend/src/components/modals/docker-compose/network/IPAM.tsx index 7fd4aea..1290a4c 100644 --- a/services/frontend/src/components/modals/docker-compose/network/IPAM.tsx +++ b/services/frontend/src/components/modals/docker-compose/network/IPAM.tsx @@ -1,7 +1,6 @@ import { FunctionComponent, ReactElement } from "react"; import { styled } from "@mui/joy"; import TextField from "../../../global/FormElements/TextField"; -import { IFieldType } from "../../../Record"; import Records from "../../../Records"; const Root = styled("div")` @@ -133,10 +132,9 @@ const IPAM: FunctionComponent = (): ReactElement => { {elements[3]} )} - renderField={( - element: ReactElement, - field: IFieldType - ): ReactElement => {element}} + renderField={(element: ReactElement): ReactElement => ( + {element} + )} renderRemove={(element: ReactElement): ReactElement => ( {element} )} diff --git a/services/frontend/src/components/modals/docker-compose/network/NetworkList.tsx b/services/frontend/src/components/modals/docker-compose/network/NetworkList.tsx index bf20b46..dcb928d 100644 --- a/services/frontend/src/components/modals/docker-compose/network/NetworkList.tsx +++ b/services/frontend/src/components/modals/docker-compose/network/NetworkList.tsx @@ -86,7 +86,7 @@ const NetworkList: FunctionComponent = ( variant="soft" size="sm" color="danger" - onClick={(e) => handleRemove(e, networkUuid)} + onClick={(e: any) => handleRemove(e, networkUuid)} >