From 6fc9b653f83e4332e9daa30e8d6e2aa39eb4040c Mon Sep 17 00:00:00 2001 From: Cristhian Zanforlin Lousa Date: Wed, 14 Jun 2023 14:51:46 -0300 Subject: [PATCH 1/5] adjust border colors and removing old save --- .../components/codeAreaComponent/index.tsx | 6 +++--- .../components/inputFileComponent/index.tsx | 2 +- src/frontend/src/contexts/tabsContext.tsx | 3 ++- .../src/modals/EditNodeModal/index.tsx | 19 +++++++++---------- .../NodeModal/components/ModalField/index.tsx | 19 +++++++++---------- 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/frontend/src/components/codeAreaComponent/index.tsx b/src/frontend/src/components/codeAreaComponent/index.tsx index 137e0917e..f668c5cdd 100644 --- a/src/frontend/src/components/codeAreaComponent/index.tsx +++ b/src/frontend/src/components/codeAreaComponent/index.tsx @@ -26,7 +26,7 @@ export default function CodeAreaComponent({ disabled ? "pointer-events-none cursor-not-allowed w-full" : "w-full" } > -
+
{ openPopUp( @@ -41,7 +41,7 @@ export default function CodeAreaComponent({ }} className={ editNode - ? "truncate cursor-pointer placeholder:text-center text-gray-500 border-0 block w-full pt-0.5 pb-0.5 form-input dark:bg-gray-900 dark:text-gray-300 dark:border-gray-600 rounded-md border-gray-300 shadow-sm sm:text-sm" + + ? "truncate cursor-pointer placeholder:text-center text-gray-500 block w-full pt-0.5 pb-0.5 form-input dark:bg-gray-900 dark:text-gray-300 dark:border-gray-600 rounded-md border-gray-300 border-1 shadow-sm sm:text-sm" + INPUT_STYLE : "truncate block w-full text-gray-500 px-3 py-2 rounded-md border border-gray-300 dark:border-gray-700 shadow-sm sm:text-sm" + INPUT_STYLE + @@ -64,7 +64,7 @@ export default function CodeAreaComponent({ }} > {!editNode && ( - + )}
diff --git a/src/frontend/src/components/inputFileComponent/index.tsx b/src/frontend/src/components/inputFileComponent/index.tsx index 01613d28e..9f801138f 100644 --- a/src/frontend/src/components/inputFileComponent/index.tsx +++ b/src/frontend/src/components/inputFileComponent/index.tsx @@ -78,7 +78,7 @@ export default function InputFileComponent({ onClick={handleButtonClick} className={ editNode - ? "truncate placeholder:text-center text-gray-500 border-0 block w-full pt-0.5 pb-0.5 form-input dark:bg-gray-900 dark:text-gray-300 dark:border-gray-600 rounded-md border-gray-300 shadow-sm sm:text-sm" + + ? "truncate placeholder:text-center text-gray-500 block w-full pt-0.5 pb-0.5 form-input dark:bg-gray-900 dark:text-gray-300 dark:border-gray-600 rounded-md border-gray-300 shadow-sm sm:text-sm border-1" + INPUT_STYLE : "truncate block w-full text-gray-500 dark:text-gray-300 px-3 py-2 rounded-md border border-gray-300 dark:border-gray-700 shadow-sm sm:text-sm" + INPUT_STYLE + diff --git a/src/frontend/src/contexts/tabsContext.tsx b/src/frontend/src/contexts/tabsContext.tsx index 37ac6d707..779a72b50 100644 --- a/src/frontend/src/contexts/tabsContext.tsx +++ b/src/frontend/src/contexts/tabsContext.tsx @@ -21,6 +21,7 @@ import { downloadFlowsFromDatabase, uploadFlowsToDatabase, } from "../controllers/API"; +import _ from "lodash"; const TabsContextInitialValue: TabsContextType = { tabId: "", @@ -548,7 +549,7 @@ export function TabsProvider({ children }: { children: ReactNode }) { uploadFlows, uploadFlow, getNodeId, - paste, + paste }} > {children} diff --git a/src/frontend/src/modals/EditNodeModal/index.tsx b/src/frontend/src/modals/EditNodeModal/index.tsx index d0f4c368d..402c959eb 100644 --- a/src/frontend/src/modals/EditNodeModal/index.tsx +++ b/src/frontend/src/modals/EditNodeModal/index.tsx @@ -64,7 +64,6 @@ export default function EditNodeModal({ data }: { data: NodeDataType }) { const { closePopUp } = useContext(PopUpContext); const { types } = useContext(typesContext); const ref = useRef(); - const { save } = useContext(TabsContext); const [enabled, setEnabled] = useState(null); if (nodeLength == 0) { closePopUp(); @@ -172,7 +171,7 @@ export default function EditNodeModal({ data }: { data: NodeDataType }) { } onChange={(t: string[]) => { data.node.template[n].value = t; - save(); + }} /> ) : data.node.template[n].multiline ? ( @@ -182,7 +181,7 @@ export default function EditNodeModal({ data }: { data: NodeDataType }) { value={data.node.template[n].value ?? ""} onChange={(t: string) => { data.node.template[n].value = t; - save(); + }} /> ) : ( @@ -195,7 +194,7 @@ export default function EditNodeModal({ data }: { data: NodeDataType }) { value={data.node.template[n].value ?? ""} onChange={(t) => { data.node.template[n].value = t; - save(); + }} /> )} @@ -208,7 +207,7 @@ export default function EditNodeModal({ data }: { data: NodeDataType }) { setEnabled={(e) => { data.node.template[n].value = e; setEnabled(e); - save(); + }} disabled={false} /> @@ -221,7 +220,7 @@ export default function EditNodeModal({ data }: { data: NodeDataType }) { value={data.node.template[n].value ?? ""} onChange={(t) => { data.node.template[n].value = t; - save(); + }} />
@@ -249,7 +248,7 @@ export default function EditNodeModal({ data }: { data: NodeDataType }) { value={data.node.template[n].value ?? ""} onChange={(t) => { data.node.template[n].value = t; - save(); + }} /> @@ -266,7 +265,7 @@ export default function EditNodeModal({ data }: { data: NodeDataType }) { suffixes={data.node.template[n].suffixes} onFileChange={(t: string) => { data.node.template[n].content = t; - save(); + }} > @@ -278,7 +277,7 @@ export default function EditNodeModal({ data }: { data: NodeDataType }) { value={data.node.template[n].value ?? ""} onChange={(t: string) => { data.node.template[n].value = t; - save(); + }} /> @@ -290,7 +289,7 @@ export default function EditNodeModal({ data }: { data: NodeDataType }) { value={data.node.template[n].value ?? ""} onChange={(t: string) => { data.node.template[n].value = t; - save(); + }} /> diff --git a/src/frontend/src/modals/NodeModal/components/ModalField/index.tsx b/src/frontend/src/modals/NodeModal/components/ModalField/index.tsx index 0890b25a1..e8ae74aec 100644 --- a/src/frontend/src/modals/NodeModal/components/ModalField/index.tsx +++ b/src/frontend/src/modals/NodeModal/components/ModalField/index.tsx @@ -21,7 +21,6 @@ export default function ModalField({ type, index, }) { - const { save } = useContext(TabsContext); const [enabled, setEnabled] = useState( data.node.template[name]?.value ?? false ); @@ -71,7 +70,7 @@ export default function ModalField({ } onChange={(t: string[]) => { data.node.template[name].value = t; - save(); + }} /> ) : data.node.template[name].multiline ? ( @@ -80,7 +79,7 @@ export default function ModalField({ value={data.node.template[name].value ?? ""} onChange={(t: string) => { data.node.template[name].value = t; - save(); + }} /> ) : ( @@ -90,7 +89,7 @@ export default function ModalField({ value={data.node.template[name].value ?? ""} onChange={(t) => { data.node.template[name].value = t; - save(); + }} /> )} @@ -104,7 +103,7 @@ export default function ModalField({ setEnabled={(t) => { data.node.template[name].value = t; setEnabled(t); - save(); + }} /> @@ -115,7 +114,7 @@ export default function ModalField({ value={data.node.template[name].value ?? ""} onChange={(t) => { data.node.template[name].value = t; - save(); + }} /> @@ -134,7 +133,7 @@ export default function ModalField({ value={data.node.template[name].value ?? ""} onChange={(t) => { data.node.template[name].value = t; - save(); + }} /> @@ -150,7 +149,7 @@ export default function ModalField({ suffixes={data.node.template[name].suffixes} onFileChange={(t: string) => { data.node.template[name].content = t; - save(); + }} > @@ -161,7 +160,7 @@ export default function ModalField({ value={data.node.template[name].value ?? ""} onChange={(t: string) => { data.node.template[name].value = t; - save(); + }} /> @@ -172,7 +171,7 @@ export default function ModalField({ value={data.node.template[name].value ?? ""} onChange={(t: string) => { data.node.template[name].value = t; - save(); + }} /> From e0ec58bc751b435a7059ae0f235a3bb984efbb81 Mon Sep 17 00:00:00 2001 From: Cristhian Zanforlin Lousa Date: Wed, 14 Jun 2023 18:52:51 -0300 Subject: [PATCH 2/5] general css adjusts --- src/frontend/src/components/ui/button.tsx | 4 +- src/frontend/src/index.css | 122 +++++++++++----------- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/frontend/src/components/ui/button.tsx b/src/frontend/src/components/ui/button.tsx index 7fd7f022c..d63b48ce5 100644 --- a/src/frontend/src/components/ui/button.tsx +++ b/src/frontend/src/components/ui/button.tsx @@ -14,9 +14,9 @@ const buttonVariants = cva( outline: "border border-input hover:bg-accent hover:text-accent-foreground", primary: - "bg-background text-secondary-foreground hover:bg-background/80", + "border bg-background text-secondary-foreground hover:bg-background/80 hover:shadow-sm", secondary: - "bg-secondary text-secondary-foreground hover:bg-secondary/80", + "bg-muted text-secondary-foreground hover:bg-secondary/80", ghost: "hover:bg-accent hover:text-accent-foreground", link: "underline-offset-4 hover:underline text-primary", }, diff --git a/src/frontend/src/index.css b/src/frontend/src/index.css index 2c00dbc22..4578a7c9b 100644 --- a/src/frontend/src/index.css +++ b/src/frontend/src/index.css @@ -3,90 +3,90 @@ @tailwind utilities; @layer base { - :root { - --background: 0 0% 100%; - --foreground: 222.2 47.4% 11.2%; + :root { + --background: 0 0% 100%; + --foreground: 222.2 47.4% 11.2%; - --muted: 210 40% 96.1%; - --muted-foreground: 215.4 16.3% 46.9%; + --muted: 210 40% 96.1%; + --muted-foreground: 215.4 16.3% 46.9%; - --popover: 0 0% 100%; - --popover-foreground: 222.2 47.4% 11.2%; + --popover: 0 0% 100%; + --popover-foreground: 222.2 47.4% 11.2%; - --card: 0 0% 100%; - --card-foreground: 222.2 47.4% 11.2%; + --card: 0 0% 100%; + --card-foreground: 222.2 47.4% 11.2%; - --border: 214.3 31.8% 91.4%; - --input: 214.3 31.8% 91.4%; + --border: 214.3 31.8% 91.4%; + --input: 214.3 31.8% 91.4%; - --primary: 222.2 47.4% 11.2%; - --primary-foreground: 210 40% 98%; + --primary: 222.2 47.4% 11.2%; + --primary-foreground: 210 40% 98%; - --secondary: 210 40% 96.1%; - --secondary-foreground: 222.2 47.4% 11.2%; + --secondary: 210 40% 96.1%; + --secondary-foreground: 222.2 47.4% 11.2%; - --accent: 210 40% 96.1%; - --accent-foreground: 222.2 47.4% 11.2%; + --accent: 210 40% 96.1%; + --accent-foreground: 222.2 47.4% 11.2%; - --destructive: 0 100% 50%; - --destructive-foreground: 210 40% 98%; + --destructive: 0 100% 50%; + --destructive-foreground: 210 40% 98%; - --ring: 215 20.2% 65.1%; + --ring: 215 20.2% 65.1%; - --radius: 0.5rem; - } - - .dark { - --background: 224 71% 4%; - --foreground: 213 31% 91%; - - --muted: 223 47% 11%; - --muted-foreground: 215.4 16.3% 56.9%; - - --popover: 224 71% 4%; - --popover-foreground: 215 20.2% 65.1%; - - --card: 224 71% 4%; - --card-foreground: 213 31% 91%; - - --border: 216 34% 17%; - --input: 216 34% 17%; - - --primary: 210 40% 98%; - --primary-foreground: 222.2 47.4% 1.2%; - - --secondary: 222.2 47.4% 11.2%; - --secondary-foreground: 210 40% 98%; - - --accent: 216 34% 17%; - --accent-foreground: 210 40% 98%; - - --destructive: 0 63% 31%; - --destructive-foreground: 210 40% 98%; - - --ring: 216 34% 17%; - - --radius: 0.5rem; - } + --radius: 0.5rem; } + .dark { + --background: 224 71% 4%; + --foreground: 213 31% 91%; + + --muted: 223 47% 11%; + --muted-foreground: 215.4 16.3% 56.9%; + + --popover: 224 71% 4%; + --popover-foreground: 215 20.2% 65.1%; + + --card: 224 71% 4%; + --card-foreground: 213 31% 91%; + + --border: 216 34% 17%; + --input: 216 34% 17%; + + --primary: 210 40% 98%; + --primary-foreground: 222.2 47.4% 1.2%; + + --secondary: 222.2 47.4% 11.2%; + --secondary-foreground: 210 40% 98%; + + --accent: 216 34% 17%; + --accent-foreground: 210 40% 98%; + + --destructive: 0 63% 31%; + --destructive-foreground: 210 40% 98%; + + --ring: 216 34% 17%; + + --radius: 0.5rem; + } +} + :root { --background: 0 0% 100%; --foreground: 222.2 47.4% 11.2%; - --muted: 210 40% 98%; + --muted: 210 30% 98.5%; --muted-foreground: 215.4 16.3% 46.9%; --popover: 0 0% 100%; --popover-foreground: 222.2 47.4% 11.2%; --card: 0 0% 100%; --card-foreground: 222.2 47.4% 11.2%; - --border: 214.3 31.8% 91.4%; + --border: 214.3 31.8% 93.4%; --input: 214.3 31.8% 91.4%; - --primary: 222.2 47.4% 18%; + --primary: 222.2 37.4% 18%; --primary-foreground: 210 40% 98%; - --secondary: 210 40% 96.1%; + --secondary: 210 30% 96.1%; --secondary-foreground: 222.2 47.4% 11.2%; - --accent: 210 40% 96.1%; - --accent-foreground: 222.2 47.4% 11.2%; + --accent: 210 30% 96.1%; + --accent-foreground: 222.2 37.4% 11.2%; --destructive: 0 100% 50%; --destructive-foreground: 210 40% 98%; --ring: 215 20.2% 65.1%; From 339ed2060ee6110c7cc6bc002027ba5821eece7d Mon Sep 17 00:00:00 2001 From: Cristhian Zanforlin Lousa Date: Wed, 14 Jun 2023 19:58:35 -0300 Subject: [PATCH 3/5] tooltip showing --- .../components/parameterComponent/index.tsx | 5 +++-- src/frontend/src/CustomNodes/GenericNode/index.tsx | 5 ++++- .../src/components/ShadTooltipComponent/index.tsx | 4 ++-- .../src/components/dropdownComponent/index.tsx | 11 ++++++----- src/frontend/src/modals/ApiModal/index.tsx | 2 +- src/frontend/src/modals/EditNodeModal/index.tsx | 6 +++--- src/frontend/src/modals/importModal/index.tsx | 7 +++---- 7 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx index ae2c144a0..972082c76 100644 --- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx @@ -58,7 +58,9 @@ export default function ParameterComponent({ data.node.template[name]?.value ?? false ); - useEffect(() => {}, [closePopUp, data.node.template]); + useEffect(() => { + + }, [closePopUp, data.node.template]); const { reactFlowInstance } = useContext(typesContext); let disabled = @@ -232,7 +234,6 @@ export default function ParameterComponent({ value={data.node.template[name].value ?? ""} onChange={(t: string) => { data.node.template[name].value = t; - }} /> ) : left === true && type === "file" ? ( diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx index 83d287101..396c22f63 100644 --- a/src/frontend/src/CustomNodes/GenericNode/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx @@ -59,7 +59,10 @@ export default function GenericNode({ } }, []); - useEffect(() => {}, [closePopUp]); + useEffect(() => { + console.log(data.node.template); + + }, [closePopUp, data.node.template]); const validateNode = useCallback( debounce(async () => { diff --git a/src/frontend/src/components/ShadTooltipComponent/index.tsx b/src/frontend/src/components/ShadTooltipComponent/index.tsx index 6dfde8f8f..fa0b73ba1 100644 --- a/src/frontend/src/components/ShadTooltipComponent/index.tsx +++ b/src/frontend/src/components/ShadTooltipComponent/index.tsx @@ -10,7 +10,7 @@ const ShadTooltip = (props) => { {props.children} - {props.open && ( + { > {props.content} - )} + ); diff --git a/src/frontend/src/components/dropdownComponent/index.tsx b/src/frontend/src/components/dropdownComponent/index.tsx index 6e4325a1b..d132da14a 100644 --- a/src/frontend/src/components/dropdownComponent/index.tsx +++ b/src/frontend/src/components/dropdownComponent/index.tsx @@ -29,20 +29,21 @@ export default function Dropdown({ <>
+ {internalValue} diff --git a/src/frontend/src/modals/ApiModal/index.tsx b/src/frontend/src/modals/ApiModal/index.tsx index c34cb4afb..552da7409 100644 --- a/src/frontend/src/modals/ApiModal/index.tsx +++ b/src/frontend/src/modals/ApiModal/index.tsx @@ -24,7 +24,7 @@ import { DialogTrigger, } from "../../components/ui/dialog"; import { Button } from "../../components/ui/button"; -import { FlowType } from "src/types/flow"; +import { FlowType } from "../../types/flow"; import { getCurlCode, getPythonApiCode, getPythonCode } from "../../constants"; import { EXPORT_CODE_DIALOG } from "../../constants"; diff --git a/src/frontend/src/modals/EditNodeModal/index.tsx b/src/frontend/src/modals/EditNodeModal/index.tsx index 402c959eb..28175682e 100644 --- a/src/frontend/src/modals/EditNodeModal/index.tsx +++ b/src/frontend/src/modals/EditNodeModal/index.tsx @@ -43,6 +43,7 @@ import { } from "../../components/ui/dialog"; import { Button } from "../../components/ui/button"; import { EDIT_DIALOG_SUBTITLE } from "../../constants"; +import { Edit } from "lucide-react"; export default function EditNodeModal({ data }: { data: NodeDataType }) { const [open, setOpen] = useState(true); @@ -95,8 +96,8 @@ export default function EditNodeModal({ data }: { data: NodeDataType }) { Edit Node - @@ -289,7 +290,6 @@ export default function EditNodeModal({ data }: { data: NodeDataType }) { value={data.node.template[n].value ?? ""} onChange={(t: string) => { data.node.template[n].value = t; - }} />
diff --git a/src/frontend/src/modals/importModal/index.tsx b/src/frontend/src/modals/importModal/index.tsx index b95b84d4e..00f17c959 100644 --- a/src/frontend/src/modals/importModal/index.tsx +++ b/src/frontend/src/modals/importModal/index.tsx @@ -79,14 +79,13 @@ export default function ImportModal() {
@@ -98,7 +97,7 @@ export default function ImportModal() { {showExamples ? "Select an example" : "Import"}