From 663c5b1c4ed5d83a44e4c8cbb5482456b0ab37f7 Mon Sep 17 00:00:00 2001 From: Cristhian Zanforlin Lousa Date: Fri, 14 Jul 2023 11:11:47 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20refactor(ApiModal/index.tsx):=20?= =?UTF-8?q?import=20PopUpContext=20from=20correct=20file=20path=20to=20fix?= =?UTF-8?q?=20module=20import=20error=20=E2=9C=A8=20feat(ApiModal/index.ts?= =?UTF-8?q?x):=20add=20closeEdit=20and=20setCloseEdit=20functions=20to=20P?= =?UTF-8?q?opUpContext=20to=20handle=20closing=20of=20edit=20modal=20?= =?UTF-8?q?=F0=9F=94=A8=20refactor(ApiModal/index.tsx):=20remove=20unused?= =?UTF-8?q?=20imports=20and=20variables=20to=20improve=20code=20readabilit?= =?UTF-8?q?y=20=F0=9F=94=A8=20refactor(ApiModal/index.tsx):=20remove=20com?= =?UTF-8?q?mented=20out=20code=20to=20clean=20up=20codebase=20=F0=9F=94=A8?= =?UTF-8?q?=20refactor(ApiModal/index.tsx):=20remove=20unused=20useEffect?= =?UTF-8?q?=20dependencies=20to=20improve=20code=20readability=20?= =?UTF-8?q?=F0=9F=94=A8=20refactor(ApiModal/index.tsx):=20remove=20unused?= =?UTF-8?q?=20setOpen=20function=20parameter=20to=20clean=20up=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/src/modals/ApiModal/index.tsx | 52 +++++++++++++++++----- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/src/frontend/src/modals/ApiModal/index.tsx b/src/frontend/src/modals/ApiModal/index.tsx index aed56e02c..b42eda101 100644 --- a/src/frontend/src/modals/ApiModal/index.tsx +++ b/src/frontend/src/modals/ApiModal/index.tsx @@ -50,6 +50,7 @@ import { TabsContext } from "../../contexts/tabsContext"; import { FlowType } from "../../types/flow/index"; import { buildTweaks, classNames } from "../../utils"; import BaseModal from "../baseModal"; +import { PopUpContext } from "../../contexts/popUpContext"; const ApiModal = forwardRef( ( @@ -62,12 +63,14 @@ const ApiModal = forwardRef( }, ref ) => { + const { closeEdit, setCloseEdit } = useContext(PopUpContext); const [activeTab, setActiveTab] = useState("0"); const [isCopied, setIsCopied] = useState(false); const [openAccordion, setOpenAccordion] = useState([]); const tweak = useRef([]); const tweaksList = useRef([]); const { setTweak, getTweak, tabsState } = useContext(TabsContext); + const copyToClipboard = () => { if (!navigator.clipboard || !navigator.clipboard.writeText) { return; @@ -108,25 +111,45 @@ const ApiModal = forwardRef( ]; useEffect(() => { - - if(flow["data"]["nodes"].length == 0){ - tweak.current = []; - setTweak(tweak.current); - - } - - else{ + if (closeEdit !== "") { + tweak.current = getTweak; if (tweak.current.length > 0) { - tweak.current = getTweak; - + setActiveTab("3"); + openAccordions(); } else { startTweaks(); } + } else { + if (tweak?.current) { + startTweaks(); + } } + }, [closeEdit]); + + useEffect(() => { + filterNodes(); + }, []); + + // useEffect(() => { + + // if(flow["data"]["nodes"].length == 0){ + // tweak.current = []; + // setTweak(tweak.current); + + // } + + // else{ + // if (tweak.current.length > 0) { + // tweak.current = getTweak; + + // } else { + // startTweaks(); + // } + // } - }, [flow["data"]["nodes"]]); + // }, [flow["data"]["nodes"]]); function startTweaks() { const t = buildTweaks(flow); @@ -265,8 +288,13 @@ const ApiModal = forwardRef( }); } + const setOpen = (x: boolean) => { + setCloseEdit(""); + }; + + return ( - + {children} Code