From b7b7a93cdd471e87c72b431ab88eda0a3f9ebed1 Mon Sep 17 00:00:00 2001 From: igorrCarvalho Date: Thu, 21 Sep 2023 15:20:36 -0300 Subject: [PATCH] formated code --- .../src/components/ui/select-custom.tsx | 58 +++--- src/frontend/src/components/ui/select.tsx | 25 ++- .../src/modals/EditNodeModal/index.tsx | 197 +++++++----------- .../components/nodeToolbarComponent/index.tsx | 4 +- src/frontend/src/pages/signUpPage/index.tsx | 2 +- 5 files changed, 121 insertions(+), 165 deletions(-) diff --git a/src/frontend/src/components/ui/select-custom.tsx b/src/frontend/src/components/ui/select-custom.tsx index a3069a08e..5ed2fbd45 100644 --- a/src/frontend/src/components/ui/select-custom.tsx +++ b/src/frontend/src/components/ui/select-custom.tsx @@ -1,16 +1,14 @@ -"use client" +"use client"; -import * as React from "react" -import * as SelectPrimitive from "@radix-ui/react-select" -import { Check, ChevronDown } from "lucide-react" -import { cn } from "../../utils/utils" +import * as SelectPrimitive from "@radix-ui/react-select"; +import * as React from "react"; +import { cn } from "../../utils/utils"; +const Select = SelectPrimitive.Root; -const Select = SelectPrimitive.Root +const SelectGroup = SelectPrimitive.Group; -const SelectGroup = SelectPrimitive.Group - -const SelectValue = SelectPrimitive.Value +const SelectValue = SelectPrimitive.Value; const SelectTrigger = React.forwardRef< React.ElementRef, @@ -18,18 +16,14 @@ const SelectTrigger = React.forwardRef< >(({ className, children, ...props }, ref) => ( {children} - - + -)) -SelectTrigger.displayName = SelectPrimitive.Trigger.displayName +)); +SelectTrigger.displayName = SelectPrimitive.Trigger.displayName; const SelectContent = React.forwardRef< React.ElementRef, @@ -58,8 +52,8 @@ const SelectContent = React.forwardRef< -)) -SelectContent.displayName = SelectPrimitive.Content.displayName +)); +SelectContent.displayName = SelectPrimitive.Content.displayName; const SelectLabel = React.forwardRef< React.ElementRef, @@ -70,8 +64,8 @@ const SelectLabel = React.forwardRef< className={cn("py-1.5 pl-8 pr-2 text-sm font-semibold", className)} {...props} /> -)) -SelectLabel.displayName = SelectPrimitive.Label.displayName +)); +SelectLabel.displayName = SelectPrimitive.Label.displayName; const SelectItem = React.forwardRef< React.ElementRef, @@ -80,17 +74,15 @@ const SelectItem = React.forwardRef< - - {children} -)) -SelectItem.displayName = SelectPrimitive.Item.displayName +)); +SelectItem.displayName = SelectPrimitive.Item.displayName; const SelectSeparator = React.forwardRef< React.ElementRef, @@ -101,16 +93,16 @@ const SelectSeparator = React.forwardRef< className={cn("-mx-1 my-1 h-px bg-muted", className)} {...props} /> -)) -SelectSeparator.displayName = SelectPrimitive.Separator.displayName +)); +SelectSeparator.displayName = SelectPrimitive.Separator.displayName; export { Select, - SelectGroup, - SelectValue, - SelectTrigger, SelectContent, - SelectLabel, + SelectGroup, SelectItem, + SelectLabel, SelectSeparator, -} + SelectTrigger, + SelectValue, +}; diff --git a/src/frontend/src/components/ui/select.tsx b/src/frontend/src/components/ui/select.tsx index 6edfff87a..c8586598f 100644 --- a/src/frontend/src/components/ui/select.tsx +++ b/src/frontend/src/components/ui/select.tsx @@ -1,16 +1,15 @@ -"use client" +"use client"; -import * as React from "react" -import * as SelectPrimitive from "@radix-ui/react-select" -import { Check, ChevronDown } from "lucide-react" -import { cn } from "../../utils/utils" +import * as SelectPrimitive from "@radix-ui/react-select"; +import { Check, ChevronDown } from "lucide-react"; +import * as React from "react"; +import { cn } from "../../utils/utils"; +const Select = SelectPrimitive.Root; -const Select = SelectPrimitive.Root +const SelectGroup = SelectPrimitive.Group; -const SelectGroup = SelectPrimitive.Group - -const SelectValue = SelectPrimitive.Value +const SelectValue = SelectPrimitive.Value; const SelectTrigger = React.forwardRef< React.ElementRef, @@ -59,8 +58,8 @@ const SelectContent = React.forwardRef< -)) -SelectContent.displayName = SelectPrimitive.Content.displayName +)); +SelectContent.displayName = SelectPrimitive.Content.displayName; const SelectLabel = React.forwardRef< React.ElementRef, @@ -71,8 +70,8 @@ const SelectLabel = React.forwardRef< className={cn("py-1.5 pl-8 pr-2 text-sm font-semibold", className)} {...props} /> -)) -SelectLabel.displayName = SelectPrimitive.Label.displayName +)); +SelectLabel.displayName = SelectPrimitive.Label.displayName; const SelectItem = React.forwardRef< React.ElementRef, diff --git a/src/frontend/src/modals/EditNodeModal/index.tsx b/src/frontend/src/modals/EditNodeModal/index.tsx index 96b726676..8aeb81818 100644 --- a/src/frontend/src/modals/EditNodeModal/index.tsx +++ b/src/frontend/src/modals/EditNodeModal/index.tsx @@ -1,12 +1,5 @@ import { cloneDeep } from "lodash"; -import { - ReactNode, - forwardRef, - useContext, - useEffect, - useRef, - useState, -} from "react"; +import { ReactNode, forwardRef, useContext, useEffect, useState } from "react"; import CodeAreaComponent from "../../components/codeAreaComponent"; import DictComponent from "../../components/dictComponent"; import Dropdown from "../../components/dropdownComponent"; @@ -50,7 +43,7 @@ const EditNodeModal = forwardRef( nodeLength, children, open, - onClose + onClose, }: { data: NodeDataType; setData: (data: NodeDataType) => void; @@ -61,7 +54,6 @@ const EditNodeModal = forwardRef( }, ref ) => { - const [modalOpen, setModalOpen] = useState(open ?? false); const [myData, setMyData] = useState(data); const { setTabsState, tabId } = useContext(TabsContext); @@ -158,60 +150,53 @@ const EditNodeModal = forwardRef( (templateParam) => templateParam.charAt(0) !== "_" && myData.node?.template[templateParam].show && - (myData.node.template[templateParam] - .type === "str" || - myData.node.template[templateParam] - .type === "bool" || - myData.node.template[templateParam] - .type === "float" || - myData.node.template[templateParam] - .type === "code" || - myData.node.template[templateParam] - .type === "prompt" || - myData.node.template[templateParam] - .type === "file" || - myData.node.template[templateParam] - .type === "int") + (myData.node.template[templateParam].type === + "str" || + myData.node.template[templateParam].type === + "bool" || + myData.node.template[templateParam].type === + "float" || + myData.node.template[templateParam].type === + "code" || + myData.node.template[templateParam].type === + "prompt" || + myData.node.template[templateParam].type === + "file" || + myData.node.template[templateParam].type === + "int") ) .map((templateParam, index) => ( {myData.node?.template[templateParam].name - ? myData.node.template[templateParam] - .name + ? myData.node.template[templateParam].name : myData.node?.template[templateParam] .display_name} - {myData.node?.template[templateParam] - .type === "str" && - !myData.node.template[templateParam] - .options ? ( + {myData.node?.template[templateParam].type === + "str" && + !myData.node.template[templateParam].options ? (
- {myData.node.template[templateParam] - .list ? ( + {myData.node.template[templateParam].list ? ( { handleOnNewValue(value, templateParam); }} /> - ) : myData.node?.template[ - templateParam - ].type === "NestedDict" ? ( + ) : myData.node?.template[templateParam] + .type === "NestedDict" ? (
- ) : myData.node?.template[ - templateParam - ].type === "dict" ? ( + ) : myData.node?.template[templateParam] + .type === "dict" ? (
- ) : myData.node.template[ - templateParam - ].multiline ? ( + ) : myData.node.template[templateParam] + .multiline ? ( { handleOnNewValue(value, templateParam); @@ -279,14 +259,12 @@ const EditNodeModal = forwardRef( editNode={true} disabled={disabled} password={ - myData.node.template[ - templateParam - ].password ?? false + myData.node.template[templateParam] + .password ?? false } value={ - myData.node.template[ - templateParam - ].value ?? "" + myData.node.template[templateParam] + .value ?? "" } onChange={(value) => { handleOnNewValue(value, templateParam); @@ -294,16 +272,14 @@ const EditNodeModal = forwardRef( /> )}
- ) : myData.node?.template[templateParam] - .type === "bool" ? ( + ) : myData.node?.template[templateParam].type === + "bool" ? (
{" "} { handleOnNewValue( @@ -314,84 +290,76 @@ const EditNodeModal = forwardRef( size="small" />
- ) : myData.node?.template[templateParam] - .type === "float" ? ( + ) : myData.node?.template[templateParam].type === + "float" ? (
{ handleOnNewValue(value, templateParam); }} />
- ) : myData.node?.template[templateParam] - .type === "str" && - myData.node.template[templateParam] - .options ? ( + ) : myData.node?.template[templateParam].type === + "str" && + myData.node.template[templateParam].options ? (
handleOnNewValue(value, templateParam) } value={ - myData.node.template[ - templateParam - ].value ?? "Choose an option" + myData.node.template[templateParam] + .value ?? "Choose an option" } >
- ) : myData.node?.template[templateParam] - .type === "int" ? ( + ) : myData.node?.template[templateParam].type === + "int" ? (
{ handleOnNewValue(value, templateParam); }} />
- ) : myData.node?.template[templateParam] - .type === "file" ? ( + ) : myData.node?.template[templateParam].type === + "file" ? (
{ handleOnNewValue(value, templateParam); }} fileTypes={ - myData.node.template[ - templateParam - ].fileTypes + myData.node.template[templateParam] + .fileTypes } suffixes={ - myData.node.template[ - templateParam - ].suffixes + myData.node.template[templateParam] + .suffixes } onFileChange={(filePath: string) => { data.node!.template[ @@ -400,8 +368,8 @@ const EditNodeModal = forwardRef( }} >
- ) : myData.node?.template[templateParam] - .type === "prompt" ? ( + ) : myData.node?.template[templateParam].type === + "prompt" ? (
{ handleOnNewValue(value, templateParam); }} />
- ) : myData.node?.template[templateParam] - .type === "code" ? ( + ) : myData.node?.template[templateParam].type === + "code" ? (
{ handleOnNewValue(value, templateParam); }} />
- ) : myData.node?.template[templateParam] - .type === "Any" ? ( + ) : myData.node?.template[templateParam].type === + "Any" ? ( "-" ) : (
@@ -456,9 +422,8 @@ const EditNodeModal = forwardRef(
changeAdvanced(templateParam) diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx index 8339063cd..5f291626d 100644 --- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx @@ -10,8 +10,8 @@ import { } from "../../../../components/ui/select-custom"; import { TabsContext } from "../../../../contexts/tabsContext"; import EditNodeModal from "../../../../modals/EditNodeModal"; -import { classNames, getRandomKeyByssmm } from "../../../../utils/utils"; import { nodeToolbarPropsType } from "../../../../types/components"; +import { classNames, getRandomKeyByssmm } from "../../../../utils/utils"; export default function NodeToolbarComponent({ data, @@ -145,7 +145,7 @@ export default function NodeToolbarComponent({ )}