From 05f30a585fbf3a429e1ddcd3ff47ea4b6eb1545e Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 7 Jul 2023 17:43:57 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20chore(GenericNode):=20optimize?= =?UTF-8?q?=20imports=20and=20remove=20duplicate=20imports=20=F0=9F=94=A7?= =?UTF-8?q?=20chore(ShadTooltipComponent):=20remove=20unused=20import=20an?= =?UTF-8?q?d=20set=20default=20value=20for=20delayDuration=20prop=20?= =?UTF-8?q?=F0=9F=94=A7=20chore(ApiModal):=20optimize=20imports=20and=20re?= =?UTF-8?q?move=20unused=20imports=20=F0=9F=94=A7=20chore(genericModal):?= =?UTF-8?q?=20optimize=20imports=20and=20remove=20unused=20imports?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The changes were made to optimize the imports and remove duplicate and unused imports in the respective files. This improves the codebase by reducing unnecessary dependencies and improving maintainability. --- .../src/CustomNodes/GenericNode/index.tsx | 29 +++---- .../components/ShadTooltipComponent/index.tsx | 13 ++- src/frontend/src/modals/ApiModal/index.tsx | 76 +++++++++--------- .../src/modals/genericModal/index.tsx | 80 +++++++++---------- 4 files changed, 98 insertions(+), 100 deletions(-) diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx index 313be210c..5a727106b 100644 --- a/src/frontend/src/CustomNodes/GenericNode/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx @@ -1,3 +1,15 @@ +import { Zap } from "lucide-react"; +import { useContext, useEffect, useRef, useState } from "react"; +import { NodeToolbar } from "reactflow"; +import ShadTooltip from "../../components/ShadTooltipComponent"; +import Tooltip from "../../components/TooltipComponent"; +import { useSSE } from "../../contexts/SSEContext"; +import { alertContext } from "../../contexts/alertContext"; +import { PopUpContext } from "../../contexts/popUpContext"; +import { typesContext } from "../../contexts/typesContext"; +import NodeModal from "../../modals/NodeModal"; +import NodeToolbarComponent from "../../pages/FlowPage/components/nodeToolbarComponent"; +import { NodeDataType } from "../../types/flow"; import { classNames, nodeColors, @@ -5,18 +17,6 @@ import { toTitleCase, } from "../../utils"; import ParameterComponent from "./components/parameterComponent"; -import { typesContext } from "../../contexts/typesContext"; -import { useContext, useState, useEffect, useRef } from "react"; -import { NodeDataType } from "../../types/flow"; -import { alertContext } from "../../contexts/alertContext"; -import { PopUpContext } from "../../contexts/popUpContext"; -import NodeModal from "../../modals/NodeModal"; -import Tooltip from "../../components/TooltipComponent"; -import { NodeToolbar } from "reactflow"; -import NodeToolbarComponent from "../../pages/FlowPage/components/nodeToolbarComponent"; -import ShadTooltip from "../../components/ShadTooltipComponent"; -import { useSSE } from "../../contexts/SSEContext"; -import { Zap } from "lucide-react"; export default function GenericNode({ data, @@ -94,10 +94,7 @@ export default function GenericNode({ }} />
- +
{data.node.display_name}
diff --git a/src/frontend/src/components/ShadTooltipComponent/index.tsx b/src/frontend/src/components/ShadTooltipComponent/index.tsx index 1a352221e..3fe82afd7 100644 --- a/src/frontend/src/components/ShadTooltipComponent/index.tsx +++ b/src/frontend/src/components/ShadTooltipComponent/index.tsx @@ -1,4 +1,4 @@ -import { RadialProgressType, ShadToolTipType } from "../../types/components"; +import { ShadToolTipType } from "../../types/components"; import { Tooltip, TooltipContent, @@ -11,15 +11,20 @@ export default function ShadTooltip({ side, asChild = true, children, - delayDuration, - style + style, + delayDuration = 500, }: ShadToolTipType) { return ( {children} - + {content} diff --git a/src/frontend/src/modals/ApiModal/index.tsx b/src/frontend/src/modals/ApiModal/index.tsx index 99fd03941..ea802cbad 100644 --- a/src/frontend/src/modals/ApiModal/index.tsx +++ b/src/frontend/src/modals/ApiModal/index.tsx @@ -1,42 +1,15 @@ -import { useContext, useEffect, useRef, useState } from "react"; -import { PopUpContext } from "../../contexts/popUpContext"; +import "ace-builds/src-noconflict/ext-language_tools"; import "ace-builds/src-noconflict/mode-python"; import "ace-builds/src-noconflict/theme-github"; import "ace-builds/src-noconflict/theme-twilight"; -import "ace-builds/src-noconflict/ext-language_tools"; +import { useContext, useEffect, useRef, useState } from "react"; +import { PopUpContext } from "../../contexts/popUpContext"; // import "ace-builds/webpack-resolver"; -import { darkContext } from "../../contexts/darkContext"; +import { Check, Clipboard, Code2 } from "lucide-react"; import { Prism as SyntaxHighlighter } from "react-syntax-highlighter"; import { oneDark } from "react-syntax-highlighter/dist/cjs/styles/prism"; -import { - Dialog, - DialogContent, - DialogDescription, - DialogHeader, - DialogTitle, - DialogTrigger, -} from "../../components/ui/dialog"; -import { FlowType } from "../../types/flow/index"; -import { getCurlCode, getPythonApiCode, getPythonCode } from "../../constants"; -import { EXPORT_CODE_DIALOG } from "../../constants"; -import { - Tabs, - TabsContent, - TabsList, - TabsTrigger, -} from "../../components/ui/tabs"; -import { Check, Clipboard, Code2 } from "lucide-react"; -import { - Table, - TableBody, - TableCaption, - TableCell, - TableHead, - TableHeader, - TableRow, -} from "../../components/ui/table"; -import { buildTweaks, classNames, limitScrollFieldsModal } from "../../utils"; import AccordionComponent from "../../components/AccordionComponent"; +import ShadTooltip from "../../components/ShadTooltipComponent"; import CodeAreaComponent from "../../components/codeAreaComponent"; import Dropdown from "../../components/dropdownComponent"; import FloatComponent from "../../components/floatComponent"; @@ -47,9 +20,38 @@ import IntComponent from "../../components/intComponent"; import PromptAreaComponent from "../../components/promptComponent"; import TextAreaComponent from "../../components/textAreaComponent"; import ToggleShadComponent from "../../components/toggleShadComponent"; -import ShadTooltip from "../../components/ShadTooltipComponent"; -import { cloneDeep, filter } from "lodash"; +import { + Dialog, + DialogContent, + DialogDescription, + DialogHeader, + DialogTitle, + DialogTrigger, +} from "../../components/ui/dialog"; +import { + Table, + TableBody, + TableCell, + TableHead, + TableHeader, + TableRow, +} from "../../components/ui/table"; +import { + Tabs, + TabsContent, + TabsList, + TabsTrigger, +} from "../../components/ui/tabs"; +import { + EXPORT_CODE_DIALOG, + getCurlCode, + getPythonApiCode, + getPythonCode, +} from "../../constants"; +import { darkContext } from "../../contexts/darkContext"; import { TabsContext } from "../../contexts/tabsContext"; +import { FlowType } from "../../types/flow/index"; +import { buildTweaks, classNames } from "../../utils"; export default function ApiModal({ flow }: { flow: FlowType }) { const [open, setOpen] = useState(true); @@ -420,7 +422,6 @@ export default function ApiModal({ flow }: { flow: FlowType }) { ) : t.data.node.template[n] .multiline ? ( ))} - {/* + {/*
diff --git a/src/frontend/src/modals/genericModal/index.tsx b/src/frontend/src/modals/genericModal/index.tsx index b0a0ae315..ba3fb672f 100644 --- a/src/frontend/src/modals/genericModal/index.tsx +++ b/src/frontend/src/modals/genericModal/index.tsx @@ -1,8 +1,9 @@ -import { useContext, useRef, useState, useEffect } from "react"; -import { PopUpContext } from "../../contexts/popUpContext"; -import { darkContext } from "../../contexts/darkContext"; -import { postValidatePrompt } from "../../controllers/API"; -import { alertContext } from "../../contexts/alertContext"; +import DOMPurify from "dompurify"; +import { FileText, Variable } from "lucide-react"; +import { useContext, useEffect, useRef, useState } from "react"; +import ShadTooltip from "../../components/ShadTooltipComponent"; +import { Badge } from "../../components/ui/badge"; +import { Button } from "../../components/ui/button"; import { Dialog, DialogContent, @@ -12,14 +13,16 @@ import { DialogTitle, DialogTrigger, } from "../../components/ui/dialog"; -import { Button } from "../../components/ui/button"; import { Textarea } from "../../components/ui/textarea"; import { HIGHLIGH_CSS, PROMPT_DIALOG_SUBTITLE, TEXT_DIALOG_SUBTITLE, } from "../../constants"; -import { FileText } from "lucide-react"; +import { alertContext } from "../../contexts/alertContext"; +import { darkContext } from "../../contexts/darkContext"; +import { PopUpContext } from "../../contexts/popUpContext"; +import { postValidatePrompt } from "../../controllers/API"; import { APIClassType } from "../../types/api"; import { INVALID_CHARACTERS, @@ -29,10 +32,6 @@ import { regexHighlight, varHighlightHTML, } from "../../utils"; -import { Badge } from "../../components/ui/badge"; -import ShadTooltip from "../../components/ShadTooltipComponent"; -import DOMPurify from "dompurify"; -import { Variable } from "lucide-react"; export default function GenericModal({ field_name = "", @@ -238,39 +237,38 @@ export default function GenericModal({ {type == TypeModal.PROMPT && ( <> -
-
- - - Input Variables: - +
+
+ + + Input Variables: + - {wordsHighlight.map((word, index) => ( - - ( + -
- - {word.replace(/[{}]/g, "").length > 59 - ? word.replace(/[{}]/g, "").slice(0, 56) + "..." - : word.replace(/[{}]/g, "")} - -
- - - ))} + +
+ + {word.replace(/[{}]/g, "").length > 59 + ? word.replace(/[{}]/g, "").slice(0, 56) + "..." + : word.replace(/[{}]/g, "")} + +
+ + + ))} +
-
- + )}