From 37f61e8b83521bfeec1d90cce0c64db3a947cf23 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Mon, 17 Jun 2024 20:54:13 -0300 Subject: [PATCH] Fixed display and conditions of minimized node --- .../src/CustomNodes/GenericNode/index.tsx | 30 +++---------------- .../src/CustomNodes/helpers/count-handles.ts | 6 +++- .../components/nodeToolbarComponent/index.tsx | 3 +- src/frontend/src/types/components/index.ts | 1 + 4 files changed, 12 insertions(+), 28 deletions(-) diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx index 3e3da2c65..7dc730fa7 100644 --- a/src/frontend/src/CustomNodes/GenericNode/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx @@ -324,6 +324,7 @@ export default function GenericNode({ }} setShowState={setShowNode} numberOfHandles={handles} + numberOfOutputHandles={shownOutputs.length ?? 0} showNode={showNode} openAdvancedModal={false} onCloseAdvancedModal={() => {}} @@ -511,32 +512,9 @@ export default function GenericNode({ /> ), )} - {/* 0 - ? data.node.output_types.join(" | ") - : data.type - } - tooltipTitle={data.node?.base_classes.join("\n")} - id={{ - baseClasses: data.node!.base_classes, - id: data.id, - dataType: data.type, - idx: 0, - }} - type={data.node?.base_classes.join("|")} - left={false} - showNode={showNode} - /> */} + {shownOutputs && + shownOutputs.length > 0 && + renderOutputParameter(shownOutputs[0], 0)} )} diff --git a/src/frontend/src/CustomNodes/helpers/count-handles.ts b/src/frontend/src/CustomNodes/helpers/count-handles.ts index a7c8697ce..f529d21dc 100644 --- a/src/frontend/src/CustomNodes/helpers/count-handles.ts +++ b/src/frontend/src/CustomNodes/helpers/count-handles.ts @@ -2,7 +2,11 @@ import { NodeDataType } from "../../types/flow"; export function countHandlesFn(data: NodeDataType): number { let count = Object.keys(data.node!.template) - .filter((templateField) => templateField.charAt(0) !== "_") + .filter( + (templateField) => + templateField.charAt(0) !== "_" && + !data.node!.template[templateField].advanced, + ) .map((templateCamp) => { const { template } = data.node!; if (template[templateCamp]?.input_types) return true; diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx index 8460fe64c..981858071 100644 --- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx @@ -38,6 +38,7 @@ export default function NodeToolbarComponent({ deleteNode, setShowNode, numberOfHandles, + numberOfOutputHandles, showNode, name = "code", selected, @@ -187,7 +188,7 @@ export default function NodeToolbarComponent({ useHotkeys(download, handleDownloadWShortcut, { preventDefault }); useHotkeys(freeze, handleFreeze, { preventDefault }); - const isMinimal = numberOfHandles <= 1; + const isMinimal = numberOfHandles <= 1 && numberOfOutputHandles <= 1; const isGroup = data.node?.flow ? true : false; const frozen = data.node?.frozen ?? false; diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts index b197b8591..41944616b 100644 --- a/src/frontend/src/types/components/index.ts +++ b/src/frontend/src/types/components/index.ts @@ -557,6 +557,7 @@ export type nodeToolbarPropsType = { deleteNode: (idx: string) => void; setShowNode: (boolean: any) => void; numberOfHandles: number; + numberOfOutputHandles: number; showNode: boolean; name?: string; openAdvancedModal?: boolean;