From 537337ed7fe65e16ff551d84c428b8fcfa083b19 Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Mon, 4 Mar 2024 12:58:12 -0300 Subject: [PATCH] Refactor code for parameterComponent and nodeToolbarComponent --- .../components/parameterComponent/index.tsx | 54 ++++++++++--------- .../components/nodeToolbarComponent/index.tsx | 7 +-- src/frontend/src/stores/flowStore.ts | 4 +- src/frontend/src/utils/styleUtils.ts | 2 + 4 files changed, 38 insertions(+), 29 deletions(-) diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx index 9d9d747af..43181ae24 100644 --- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx @@ -253,15 +253,15 @@ export default function ParameterComponent({ {item.display_name === "" ? "" : " - "} {item.display_name.split(", ").length > 2 ? item.display_name.split(", ").map((el, index) => ( - - - {index === + + + {index === item.display_name.split(", ").length - 1 - ? el - : (el += `, `)} - - - )) + ? el + : (el += `, `)} + + + )) : item.display_name} ) : ( @@ -270,14 +270,14 @@ export default function ParameterComponent({ {item.type === "" ? "" : " - "} {item.type.split(", ").length > 2 ? item.type.split(", ").map((el, index) => ( - - - {index === item.type.split(", ").length - 1 - ? el - : (el += `, `)} - - - )) + + + {index === item.type.split(", ").length - 1 + ? el + : (el += `, `)} + + + )) : item.type} )} @@ -346,7 +346,7 @@ export default function ParameterComponent({ className={ "relative mt-1 flex w-full flex-wrap items-center justify-between bg-muted px-5 py-2" + ((name === "code" && type === "code") || - (name.includes("code") && proxy) + (name.includes("code") && proxy) ? " hidden " : "") } @@ -355,10 +355,14 @@ export default function ParameterComponent({
+ {!left && data.node?.pinned && +
+ +
} {proxy ? ( {proxy.id}}> {title} @@ -427,8 +431,8 @@ export default function ParameterComponent({ )} {left === true && - type === "str" && - !data.node?.template[name].options ? ( + type === "str" && + !data.node?.template[name].options ? (
{data.node?.template[name].list ? (
@@ -436,7 +440,7 @@ export default function ParameterComponent({ disabled={disabled} value={ !data.node.template[name].value || - data.node.template[name].value === "" + data.node.template[name].value === "" ? [""] : data.node.template[name].value } @@ -599,10 +603,10 @@ export default function ParameterComponent({ editNode={false} value={ !data.node!.template[name].value || - data.node!.template[name].value?.toString() === "{}" + data.node!.template[name].value?.toString() === "{}" ? { - yourkey: "value", - } + yourkey: "value", + } : data.node!.template[name].value } onChange={handleOnNewValue} @@ -616,7 +620,7 @@ export default function ParameterComponent({ editNode={false} value={ data.node!.template[name].value?.length === 0 || - !data.node!.template[name].value + !data.node!.template[name].value ? [{ "": "" }] : convertObjToArray(data.node!.template[name].value) } diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx index 789de30a0..c2040696d 100644 --- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx @@ -267,7 +267,7 @@ export default function NodeToolbarComponent({ - + diff --git a/src/frontend/src/stores/flowStore.ts b/src/frontend/src/stores/flowStore.ts index 44aade7bd..5ec2ee3a2 100644 --- a/src/frontend/src/stores/flowStore.ts +++ b/src/frontend/src/stores/flowStore.ts @@ -187,10 +187,12 @@ const useFlowStore = create((set, get) => ({ typeof change === "function" ? change(get().nodes.find((node) => node.id === id)!) : change; - get().setNodes((oldNodes) => oldNodes.map((node) => { if (node.id === id) { + if((node.data as NodeDataType).node?.pinned){ + (newChange.data as NodeDataType).node!.pinned = false; + } return newChange; } return node; diff --git a/src/frontend/src/utils/styleUtils.ts b/src/frontend/src/utils/styleUtils.ts index 7d84772b8..969173513 100644 --- a/src/frontend/src/utils/styleUtils.ts +++ b/src/frontend/src/utils/styleUtils.ts @@ -6,6 +6,7 @@ import { BookMarked, BookmarkPlus, Bot, + Snowflake, Boxes, Braces, Cable, @@ -383,6 +384,7 @@ export const nodeIconsLucide: iconsType = { Clipboard, Code2, Variable, + Snowflake, Store, Download, Eraser,