From 92668daf1994f218ee9dc1d3704c38ea4db27214 Mon Sep 17 00:00:00 2001 From: Cristhian Zanforlin Lousa Date: Mon, 29 May 2023 22:11:03 -0300 Subject: [PATCH 01/12] UI Improvements: tooltip, classes icons e icons --- src/frontend/package-lock.json | 32 +++++++++++ src/frontend/package.json | 3 +- .../src/CustomNodes/GenericNode/index.tsx | 48 +++++++++-------- .../ReactTooltipComponent/index.tsx | 54 +++++++++++++++++++ .../extraSidebarComponent/index.tsx | 14 +++-- 5 files changed, 125 insertions(+), 26 deletions(-) create mode 100644 src/frontend/src/components/ReactTooltipComponent/index.tsx diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json index 607f4946c..b4a889fcc 100644 --- a/src/frontend/package-lock.json +++ b/src/frontend/package-lock.json @@ -32,6 +32,7 @@ "react-router-dom": "^6.8.1", "react-syntax-highlighter": "^15.5.0", "react-tabs": "^6.0.0", + "react-tooltip": "^5.13.1", "reactflow": "^11.5.5", "rehype-mathjax": "^4.0.2", "remark-gfm": "^3.0.1", @@ -953,6 +954,19 @@ "node": ">=12" } }, + "node_modules/@floating-ui/core": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.6.tgz", + "integrity": "sha512-EvYTiXet5XqweYGClEmpu3BoxmsQ4hkj3QaYA6qEnigCWffTP3vNRwBReTdrwDwo7OoJ3wM8Uoe9Uk4n+d4hfg==" + }, + "node_modules/@floating-ui/dom": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.2.9.tgz", + "integrity": "sha512-sosQxsqgxMNkV3C+3UqTS6LxP7isRLwX8WMepp843Rb3/b0Wz8+MdUkxJksByip3C2WwLugLHN1b4ibn//zKwQ==", + "dependencies": { + "@floating-ui/core": "^1.2.6" + } + }, "node_modules/@headlessui/react": { "version": "1.7.10", "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.7.10.tgz", @@ -2731,6 +2745,11 @@ "resolved": "https://registry.npmjs.org/classcat/-/classcat-5.0.4.tgz", "integrity": "sha512-sbpkOw6z413p+HDGcBENe498WM9woqWHiJxCq7nvmxe9WmrUmqfAcxpIwAiMtM5Q3AhYkzXcNQHqsWq0mND51g==" }, + "node_modules/classnames": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", + "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" + }, "node_modules/client-only": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", @@ -6048,6 +6067,19 @@ "react": "^18.0.0" } }, + "node_modules/react-tooltip": { + "version": "5.13.1", + "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.13.1.tgz", + "integrity": "sha512-9NstDFdjyy6cIH9zjeT70zXTHlW/TIGCOWQmhkAyqLFeQioLg1FXvb9ec7AxSpn0zyFUkFSLdFYxZRuewti3Aw==", + "dependencies": { + "@floating-ui/dom": "^1.0.0", + "classnames": "^2.3.0" + }, + "peerDependencies": { + "react": ">=16.14.0", + "react-dom": ">=16.14.0" + } + }, "node_modules/react-transition-group": { "version": "4.4.5", "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", diff --git a/src/frontend/package.json b/src/frontend/package.json index 20c62c11d..5b31a177f 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -27,6 +27,7 @@ "react-router-dom": "^6.8.1", "react-syntax-highlighter": "^15.5.0", "react-tabs": "^6.0.0", + "react-tooltip": "^5.13.1", "reactflow": "^11.5.5", "rehype-mathjax": "^4.0.2", "remark-gfm": "^3.0.1", @@ -78,4 +79,4 @@ "typescript": "^5.0.2", "vite": "^4.3.5" } -} \ No newline at end of file +} diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx index 572210728..096cdb32c 100644 --- a/src/frontend/src/CustomNodes/GenericNode/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx @@ -28,6 +28,7 @@ import NodeModal from "../../modals/NodeModal"; import { useCallback } from "react"; import { TabsContext } from "../../contexts/tabsContext"; import { debounce } from "../../utils"; +import TooltipReact from "../../components/ReactTooltipComponent"; import Tooltip from "../../components/TooltipComponent"; export default function GenericNode({ data, @@ -111,9 +112,17 @@ export default function GenericNode({ color: nodeColors[types[data.type]] ?? nodeColors.unknown, }} /> - -
{data.type}
- +
+ +
{data.type}
+ +
+
-
- +
-
+
-
+
+ >
@@ -182,7 +188,7 @@ export default function GenericNode({ ) ? "" : "hidden", - "w-6 h-6 dark:text-gray-300 hover:animate-spin-once" + "w-6 h-6 dark:text-gray-300" )} > @@ -191,7 +197,7 @@ export default function GenericNode({ deleteNode(data.id); }} > - + diff --git a/src/frontend/src/components/ReactTooltipComponent/index.tsx b/src/frontend/src/components/ReactTooltipComponent/index.tsx new file mode 100644 index 000000000..87a7508d2 --- /dev/null +++ b/src/frontend/src/components/ReactTooltipComponent/index.tsx @@ -0,0 +1,54 @@ +"use client"; +import type { FC } from "react"; +import React from "react"; +import { Tooltip as ReactTooltip } from "react-tooltip"; +import "react-tooltip/dist/react-tooltip.css"; +import { classNames } from "../../utils"; + +type TooltipProps = { + selector: string; + content?: string; + disabled?: boolean; + htmlContent?: React.ReactNode; + className?: string; // This should use !impornant to override the default styles eg: '!bg-white' + position?: "top" | "right" | "bottom" | "left"; + clickable?: boolean; + children: React.ReactNode; + delayShow?: number; +}; + +const TooltipReact: FC = ({ + selector, + content, + disabled, + position = "top", + children, + htmlContent, + className, + clickable, + delayShow, +}) => { + return ( +
+ {React.cloneElement(children as React.ReactElement, { + "data-tooltip-id": selector, + })} + + {htmlContent && htmlContent} + +
+ ); +}; + +export default TooltipReact; diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx index 1a9e721f7..e698e481a 100644 --- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx @@ -4,7 +4,7 @@ import { nodeColors, nodeIcons, nodeNames } from "../../../../utils"; import { useContext, useEffect, useState } from "react"; import { typesContext } from "../../../../contexts/typesContext"; import { APIClassType, APIObjectType } from "../../../../types/api"; -import Tooltip from "../../../../components/TooltipComponent"; +import TooltipReact from "../../../../components/ReactTooltipComponent"; export default function ExtraSidebar() { const { data } = useContext(typesContext); @@ -34,8 +34,14 @@ export default function ExtraSidebar() { {Object.keys(data[d]) .sort() .map((t: string, k) => ( - 21 ? t : ""} placement="right"> -
+ +
- + ))} {Object.keys(data[d]).length === 0 && (
Coming soon
From 95eab00a5e42f4780c37ad2050f11b3427b3f765 Mon Sep 17 00:00:00 2001 From: Cristhian Zanforlin Lousa Date: Mon, 29 May 2023 22:56:26 -0300 Subject: [PATCH 02/12] Removing trash icon --- .../src/CustomNodes/GenericNode/index.tsx | 91 +++++++++---------- .../ReactTooltipComponent/index.tsx | 2 +- 2 files changed, 45 insertions(+), 48 deletions(-) diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx index e2576bd08..5c0248ae4 100644 --- a/src/frontend/src/CustomNodes/GenericNode/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx @@ -123,46 +123,6 @@ export default function GenericNode({
{data.type}
- -
- - {validationStatus.params.split("\n").map((line, index) => ( -
{line}
- ))} -
- ) - } - > -
-
-
-
-
- -
- + +
+ + {validationStatus.params.split("\n").map((line, index) => ( +
{line}
+ ))} +
+ ) + } + > +
+ + + +
+ +
+ diff --git a/src/frontend/src/components/ReactTooltipComponent/index.tsx b/src/frontend/src/components/ReactTooltipComponent/index.tsx index 87a7508d2..aa736c212 100644 --- a/src/frontend/src/components/ReactTooltipComponent/index.tsx +++ b/src/frontend/src/components/ReactTooltipComponent/index.tsx @@ -37,7 +37,7 @@ const TooltipReact: FC = ({ id={selector} content={content} className={classNames( - "!bg-white !text-xs !font-normal !text-gray-700 !shadow-lg !opacity-100 z-10", + "!bg-white !text-xs !font-normal !text-gray-700 !shadow-md !opacity-100 z-20", className )} place={position} From 9f27a3e1cc2d04c08362a6e275739b007a30cc56 Mon Sep 17 00:00:00 2001 From: Cristhian Zanforlin Lousa Date: Mon, 29 May 2023 23:45:02 -0300 Subject: [PATCH 03/12] Changing edge colors dark mode --- src/frontend/src/CustomNodes/GenericNode/index.tsx | 7 +++---- src/frontend/src/components/floatComponent/index.tsx | 6 +++++- src/frontend/src/components/intComponent/index.tsx | 7 ++++--- src/frontend/src/contexts/tabsContext.tsx | 4 ++-- .../FlowPage/components/extraSidebarComponent/index.tsx | 8 ++++++-- src/frontend/src/pages/FlowPage/index.tsx | 2 +- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx index 5c0248ae4..94e1ee6bd 100644 --- a/src/frontend/src/CustomNodes/GenericNode/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx @@ -174,7 +174,7 @@ export default function GenericNode({ validationStatus && validationStatus.valid ? "w-4 h-4 rounded-full bg-green-500 opacity-100" : "w-4 h-4 rounded-full bg-gray-500 opacity-0 hidden animate-spin", - "absolute w-4 hover:text-gray-500 hover:dark:text-gray-300 transition-all ease-in-out duration-200" + "absolute w-4 hover:text-gray-500 hover:dark:text-gray-300 transition-all ease-in-out duration-200" )} > - diff --git a/src/frontend/src/components/floatComponent/index.tsx b/src/frontend/src/components/floatComponent/index.tsx index 4c4d0ad9a..c6b1befe3 100644 --- a/src/frontend/src/components/floatComponent/index.tsx +++ b/src/frontend/src/components/floatComponent/index.tsx @@ -15,7 +15,11 @@ export default function FloatComponent({ } }, [disabled, onChange]); return ( -
+
{ diff --git a/src/frontend/src/contexts/tabsContext.tsx b/src/frontend/src/contexts/tabsContext.tsx index 480a154f8..f8015a21e 100644 --- a/src/frontend/src/contexts/tabsContext.tsx +++ b/src/frontend/src/contexts/tabsContext.tsx @@ -89,7 +89,7 @@ export function TabsProvider({ children }: { children: ReactNode }) { cookieObject.flows.forEach((flow) => { flow.data.edges.forEach((edge) => { edge.className = ""; - edge.style = { stroke: "#222222" }; + edge.style = { stroke: "#555555" }; }); flow.data.nodes.forEach((node) => { if (Object.keys(templates[node.data.type]["template"]).length > 0) { @@ -295,7 +295,7 @@ export function TabsProvider({ children }: { children: ReactNode }) { if (data) { data.edges.forEach((edge) => { edge.className = ""; - edge.style = { stroke: "#222222" }; + edge.style = { stroke: "#555555" }; }); data.nodes.forEach((node) => { if (Object.keys(templates[node.data.type]["template"]).length > 0) { diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx index eb2581225..b88e13586 100644 --- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx @@ -15,7 +15,9 @@ export default function ExtraSidebar() { ) { //start drag event var crt = event.currentTarget.cloneNode(true); - crt.style.position = "absolute"; crt.style.top = "-500px"; crt.style.right = "-500px"; + crt.style.position = "absolute"; + crt.style.top = "-500px"; + crt.style.right = "-500px"; crt.classList.add("cursor-grabbing"); document.body.appendChild(crt); event.dataTransfer.setDragImage(crt, 0, 0); @@ -60,7 +62,9 @@ export default function ExtraSidebar() { } onDragEnd={() => { document.body.removeChild( - document.getElementsByClassName("cursor-grabbing")[0] + document.getElementsByClassName( + "cursor-grabbing" + )[0] ); }} > diff --git a/src/frontend/src/pages/FlowPage/index.tsx b/src/frontend/src/pages/FlowPage/index.tsx index d8112410d..3216b44e4 100644 --- a/src/frontend/src/pages/FlowPage/index.tsx +++ b/src/frontend/src/pages/FlowPage/index.tsx @@ -154,7 +154,7 @@ export default function FlowPage({ flow }: { flow: FlowType }) { style: params.targetHandle.split("|")[0] === "Text" ? { stroke: "#333333", strokeWidth: 2 } - : { stroke: "#222222" }, + : { stroke: "#555555" }, animated: params.targetHandle.split("|")[0] === "Text", }, eds From c9403b6433fba97dc50f3ba713c026230cfc74f3 Mon Sep 17 00:00:00 2001 From: Cristhian Zanforlin Lousa Date: Tue, 30 May 2023 00:03:27 -0300 Subject: [PATCH 04/12] Adding the trash icon and height icons --- src/frontend/src/CustomNodes/GenericNode/index.tsx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx index 94e1ee6bd..83806455b 100644 --- a/src/frontend/src/CustomNodes/GenericNode/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx @@ -149,11 +149,19 @@ export default function GenericNode({ ) ? "" : "hidden", - "w-6 h-6 dark:text-gray-300" + "w-5 h-5 dark:text-gray-300" )} > + +
-
+
Date: Tue, 30 May 2023 10:16:20 -0300 Subject: [PATCH 05/12] Fixed stroke color on dark mode --- src/frontend/src/pages/FlowPage/index.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/frontend/src/pages/FlowPage/index.tsx b/src/frontend/src/pages/FlowPage/index.tsx index 3216b44e4..69fa6eb08 100644 --- a/src/frontend/src/pages/FlowPage/index.tsx +++ b/src/frontend/src/pages/FlowPage/index.tsx @@ -151,10 +151,11 @@ export default function FlowPage({ flow }: { flow: FlowType }) { addEdge( { ...params, - style: + style: { stroke: "inherit" }, + className: params.targetHandle.split("|")[0] === "Text" - ? { stroke: "#333333", strokeWidth: 2 } - : { stroke: "#555555" }, + ? "stroke-gray-800 dark:stroke-gray-300" + : "stroke-gray-900 dark:stroke-gray-200", animated: params.targetHandle.split("|")[0] === "Text", }, eds From 6ac4e427ee734a20d26d139a00922405533dc7aa Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 30 May 2023 10:21:26 -0300 Subject: [PATCH 06/12] Added stroke fix on Paste and Add Flow --- src/frontend/src/contexts/tabsContext.tsx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/frontend/src/contexts/tabsContext.tsx b/src/frontend/src/contexts/tabsContext.tsx index f8015a21e..172bc9ff4 100644 --- a/src/frontend/src/contexts/tabsContext.tsx +++ b/src/frontend/src/contexts/tabsContext.tsx @@ -278,7 +278,12 @@ export function TabsProvider({ children }: { children: ReactNode }) { sourceHandle, targetHandle, id, - className: "animate-pulse", + style: { stroke: "inherit" }, + className: + targetHandle.split("|")[0] === "Text" + ? "stroke-gray-800 dark:stroke-gray-300" + : "stroke-gray-900 dark:stroke-gray-200", + animated: targetHandle.split("|")[0] === "Text", selected: false, }, edges.map((e) => ({ ...e, selected: false })) @@ -294,8 +299,12 @@ export function TabsProvider({ children }: { children: ReactNode }) { const description = flow?.description ? flow.description : ""; if (data) { data.edges.forEach((edge) => { - edge.className = ""; - edge.style = { stroke: "#555555" }; + edge.style = { stroke: "inherit" }; + edge.className = + edge.targetHandle.split("|")[0] === "Text" + ? "stroke-gray-800 dark:stroke-gray-300" + : "stroke-gray-900 dark:stroke-gray-200"; + edge.animated = edge.targetHandle.split("|")[0] === "Text"; }); data.nodes.forEach((node) => { if (Object.keys(templates[node.data.type]["template"]).length > 0) { From 6fa08264df99d5c982330654cc55738c227d2456 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 30 May 2023 10:36:56 -0300 Subject: [PATCH 07/12] Fixed copy paste on int and float parameters --- .../components/parameterComponent/index.tsx | 2 ++ .../src/components/floatComponent/index.tsx | 9 +++++++++ .../src/components/intComponent/index.tsx | 16 ++++++++++++++++ src/frontend/src/types/components/index.ts | 1 + 4 files changed, 28 insertions(+) diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx index 5668b5430..653248763 100644 --- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx @@ -144,6 +144,7 @@ export default function ParameterComponent({ ) : left === true && type === "float" ? ( { data.node.template[name].value = t; @@ -184,6 +185,7 @@ export default function ParameterComponent({ ) : left === true && type === "int" ? ( { data.node.template[name].value = t; diff --git a/src/frontend/src/components/floatComponent/index.tsx b/src/frontend/src/components/floatComponent/index.tsx index c6b1befe3..1fe3e3f76 100644 --- a/src/frontend/src/components/floatComponent/index.tsx +++ b/src/frontend/src/components/floatComponent/index.tsx @@ -5,9 +5,12 @@ import { TabsContext } from "../../contexts/tabsContext"; export default function FloatComponent({ value, onChange, + disableCopyPaste = false, disabled, }: FloatComponentType) { const [myValue, setMyValue] = useState(value ?? ""); + const { setDisableCopyPaste } = useContext(TabsContext); + useEffect(() => { if (disabled) { setMyValue(""); @@ -21,6 +24,12 @@ export default function FloatComponent({ } > { + if (disableCopyPaste) setDisableCopyPaste(true); + }} + onBlur={() => { + if (disableCopyPaste) setDisableCopyPaste(false); + }} type="number" value={myValue} className={ diff --git a/src/frontend/src/components/intComponent/index.tsx b/src/frontend/src/components/intComponent/index.tsx index 6353dff60..5ca68c5ce 100644 --- a/src/frontend/src/components/intComponent/index.tsx +++ b/src/frontend/src/components/intComponent/index.tsx @@ -5,9 +5,12 @@ import { TabsContext } from "../../contexts/tabsContext"; export default function IntComponent({ value, onChange, + disableCopyPaste = false, disabled, }: FloatComponentType) { const [myValue, setMyValue] = useState(value ?? ""); + const { setDisableCopyPaste } = useContext(TabsContext); + useEffect(() => { if (disabled) { setMyValue(""); @@ -22,13 +25,26 @@ export default function IntComponent({ } > { + if (disableCopyPaste) setDisableCopyPaste(true); + }} + onBlur={() => { + if (disableCopyPaste) setDisableCopyPaste(false); + }} onKeyDown={(event) => { + console.log(event); if ( event.key !== "Backspace" && event.key !== "Enter" && event.key !== "Delete" && event.key !== "ArrowLeft" && event.key !== "ArrowRight" && + event.key !== "Control" && + event.key !== "Meta" && + event.key !== "Shift" && + event.key !== "c" && + event.key !== "v" && + event.key !== "a" && !/^[-]?\d*$/.test(event.key) ) { event.preventDefault(); diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts index e660e1c4d..e7559023a 100644 --- a/src/frontend/src/types/components/index.ts +++ b/src/frontend/src/types/components/index.ts @@ -69,6 +69,7 @@ export type DisclosureComponentType = { export type FloatComponentType = { value: string; disabled?: boolean; + disableCopyPaste?: boolean; onChange: (value: string) => void; }; From 9c8bd4b0a515c76ae95c3d7769b2d79bc69c5f0b Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 30 May 2023 10:38:59 -0300 Subject: [PATCH 08/12] Fixed node moving when selecting with arrow --- src/frontend/src/pages/FlowPage/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/frontend/src/pages/FlowPage/index.tsx b/src/frontend/src/pages/FlowPage/index.tsx index 69fa6eb08..9d66f06fe 100644 --- a/src/frontend/src/pages/FlowPage/index.tsx +++ b/src/frontend/src/pages/FlowPage/index.tsx @@ -324,6 +324,7 @@ export default function FlowPage({ flow }: { flow: FlowType }) { onNodesChange={onNodesChange} onEdgesChange={onEdgesChangeMod} onConnect={onConnect} + disableKeyboardA11y={true} onLoad={setReactFlowInstance} onInit={setReactFlowInstance} nodeTypes={nodeTypes} From 7d014f0372a8430b4f3d8b3d932a096ec818b619 Mon Sep 17 00:00:00 2001 From: Gabriel Almeida Date: Tue, 30 May 2023 10:44:10 -0300 Subject: [PATCH 09/12] =?UTF-8?q?=F0=9F=8E=A8=20style(modals):=20simplify?= =?UTF-8?q?=20modal=20titles=20The=20modal=20titles=20were=20simplified=20?= =?UTF-8?q?to=20remove=20the=20unnecessary=20"as"=20preposition=20and=20to?= =?UTF-8?q?=20make=20them=20more=20concise.=20The=20"Export=20as"=20and=20?= =?UTF-8?q?"Import=20from"=20titles=20were=20changed=20to=20"Export"=20and?= =?UTF-8?q?=20"Import"=20respectively.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/src/modals/exportModal/index.tsx | 2 +- src/frontend/src/modals/importModal/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/modals/exportModal/index.tsx b/src/frontend/src/modals/exportModal/index.tsx index 6bcedc60c..8aff12586 100644 --- a/src/frontend/src/modals/exportModal/index.tsx +++ b/src/frontend/src/modals/exportModal/index.tsx @@ -84,7 +84,7 @@ export default function ExportModal() { as="h3" className="text-lg font-medium dark:text-white leading-10 text-gray-900" > - Export as + Export
diff --git a/src/frontend/src/modals/importModal/index.tsx b/src/frontend/src/modals/importModal/index.tsx index aa25e058b..d0808c541 100644 --- a/src/frontend/src/modals/importModal/index.tsx +++ b/src/frontend/src/modals/importModal/index.tsx @@ -124,7 +124,7 @@ export default function ImportModal() { as="h3" className="text-lg font-medium dark:text-white leading-10 text-gray-900" > - {showExamples ? "Select an example" : "Import from"} + {showExamples ? "Select an example" : "Import"}
From bc198bd2375bd07720e88037792c512a747e452c Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 30 May 2023 10:44:47 -0300 Subject: [PATCH 10/12] Removed Markdown from user message on chat --- src/frontend/src/modals/chatModal/chatMessage/index.tsx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/frontend/src/modals/chatModal/chatMessage/index.tsx b/src/frontend/src/modals/chatModal/chatMessage/index.tsx index 5e0f3e051..c456ad6a9 100644 --- a/src/frontend/src/modals/chatModal/chatMessage/index.tsx +++ b/src/frontend/src/modals/chatModal/chatMessage/index.tsx @@ -151,13 +151,7 @@ export default function ChatMessage({ ) : (
- - {message} - +
{message}
)} From f6fac380bbcf743493038071cb80250e0cf6bef2 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 30 May 2023 10:50:29 -0300 Subject: [PATCH 11/12] Fixed node moving when trying to select text --- src/frontend/src/pages/FlowPage/index.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/frontend/src/pages/FlowPage/index.tsx b/src/frontend/src/pages/FlowPage/index.tsx index 9d66f06fe..caaddfe0d 100644 --- a/src/frontend/src/pages/FlowPage/index.tsx +++ b/src/frontend/src/pages/FlowPage/index.tsx @@ -341,6 +341,8 @@ export default function FlowPage({ flow }: { flow: FlowType }) { onDrop={onDrop} onNodesDelete={onDelete} onSelectionChange={onSelectionChange} + nodesDraggable={!disableCopyPaste} + panOnDrag={!disableCopyPaste} selectNodesOnDrag={false} > From a0996e3420920d943573d78879fe1ccb2cb7b182 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 30 May 2023 11:06:20 -0300 Subject: [PATCH 12/12] Fixed line breaks not appearing on messages --- src/frontend/src/modals/chatModal/chatMessage/index.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/frontend/src/modals/chatModal/chatMessage/index.tsx b/src/frontend/src/modals/chatModal/chatMessage/index.tsx index c456ad6a9..2db84adbc 100644 --- a/src/frontend/src/modals/chatModal/chatMessage/index.tsx +++ b/src/frontend/src/modals/chatModal/chatMessage/index.tsx @@ -151,7 +151,12 @@ export default function ChatMessage({ ) : (
-
{message}
+ "), + }} + >
)}