From c917eeec4ab2a9ac17e617d44778aaa573fa625d Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Sun, 3 Mar 2024 17:05:48 -0300 Subject: [PATCH 01/10] Refactor GenericNode component --- .../src/CustomNodes/GenericNode/index.tsx | 88 +++++++++++-------- 1 file changed, 52 insertions(+), 36 deletions(-) diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx index c9844a47d..1f5a168f8 100644 --- a/src/frontend/src/CustomNodes/GenericNode/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx @@ -138,9 +138,8 @@ export default function GenericNode({ const iconColor = nodeColors[types[data.type]]; const iconName = iconElement || (data.node?.flow ? "group_components" : name); - const iconClassName = `generic-node-icon ${ - !showNode ? " absolute inset-x-6 h-12 w-12 " : "" - }`; + const iconClassName = `generic-node-icon ${!showNode ? " absolute inset-x-6 h-12 w-12 " : "" + }`; if (iconElement && isEmoji) { return nodeIconFragment(iconElement); } else { @@ -268,7 +267,7 @@ export default function GenericNode({ numberOfHandles={handles} showNode={showNode} openAdvancedModal={false} - onCloseAdvancedModal={() => {}} + onCloseAdvancedModal={() => { }} selected={selected} > @@ -390,13 +389,28 @@ export default function GenericNode({ })} data={data} color={ - nodeColors[ - types[data.node?.template[templateField].type!] - ] ?? - nodeColors[ + data.node?.template[templateField].input_types && + data.node?.template[templateField].input_types! + .length > 0 + ? nodeColors[ + data.node?.template[templateField] + .input_types![data.node?.template[templateField] + .input_types!.length - 1] + ] ?? + nodeColors[ + types[ + data.node?.template[templateField] + .input_types![data.node?.template[templateField] + .input_types!.length - 1] + ] + ] + : nodeColors[ data.node?.template[templateField].type! - ] ?? - nodeColors.unknown + ] ?? + nodeColors[ + types[data.node?.template[templateField].type!] + ] ?? + nodeColors.unknown } title={getFieldTitle( data.node?.template!, @@ -440,7 +454,7 @@ export default function GenericNode({ color={nodeColors[types[data.type]] ?? nodeColors.unknown} title={ data.node?.output_types && - data.node.output_types.length > 0 + data.node.output_types.length > 0 ? data.node.output_types.join(" | ") : data.type } @@ -479,10 +493,10 @@ export default function GenericNode({
{typeof validationStatus.params === "string" ? `${durationString}\n${validationStatus.params}` - .split("\n") - .map((line, index) => ( -
{line}
- )) + .split("\n") + .map((line, index) => ( +
{line}
+ )) : durationString}
) @@ -569,7 +583,7 @@ export default function GenericNode({ }} > {(data.node?.description === "" || !data.node?.description) && - nameEditable + nameEditable ? "Double Click to Edit Description" : data.node?.description} @@ -590,7 +604,7 @@ export default function GenericNode({ .map((templateField: string, idx) => (
{data.node!.template[templateField].show && - !data.node!.template[templateField].advanced ? ( + !data.node!.template[templateField].advanced ? ( 0 + data.node?.template[templateField].input_types! + .length > 0 ? nodeColors[ - data.node?.template[templateField] - .input_types![0] - ] ?? - nodeColors[ - types[ - data.node?.template[templateField] - .input_types![0] - ] - ] + data.node?.template[templateField] + .input_types![data.node?.template[templateField] + .input_types!.length - 1] + ] ?? + nodeColors[ + types[ + data.node?.template[templateField] + .input_types![data.node?.template[templateField] + .input_types!.length - 1] + ] + ] : nodeColors[ - data.node?.template[templateField].type! - ] ?? - nodeColors[ - types[data.node?.template[templateField].type!] - ] ?? - nodeColors.unknown + data.node?.template[templateField].type! + ] ?? + nodeColors[ + types[data.node?.template[templateField].type!] + ] ?? + nodeColors.unknown } title={getFieldTitle( data.node?.template!, @@ -674,9 +690,9 @@ export default function GenericNode({ data={data} color={ (data.node?.output_types && - data.node.output_types.length > 0 + data.node.output_types.length > 0 ? nodeColors[data.node.output_types[0]] ?? - nodeColors[types[data.node.output_types[0]]] + nodeColors[types[data.node.output_types[0]]] : nodeColors[types[data.type]]) ?? nodeColors.unknown } title={ From 4e63f2a6ca60f63ea549fd25786b236138cb0d00 Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Sun, 3 Mar 2024 17:36:43 -0300 Subject: [PATCH 02/10] Refactor getFieldTitle function in utils.ts --- src/frontend/src/utils/utils.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/frontend/src/utils/utils.ts b/src/frontend/src/utils/utils.ts index d6ebff378..22fe93185 100644 --- a/src/frontend/src/utils/utils.ts +++ b/src/frontend/src/utils/utils.ts @@ -640,7 +640,5 @@ export function getFieldTitle( ): string { return template[templateField].display_name ? template[templateField].display_name! - : template[templateField].name - ? toTitleCase(template[templateField].name!, true) - : toTitleCase(templateField, true); + : template[templateField].name ?? templateField; } From 05d53c54283c632d7ae0d36f7009a8d062bd0f0d Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Sun, 3 Mar 2024 17:42:34 -0300 Subject: [PATCH 03/10] Fix build button running on text selection --- .../src/CustomNodes/GenericNode/index.tsx | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx index 1f5a168f8..8e95946f0 100644 --- a/src/frontend/src/CustomNodes/GenericNode/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx @@ -395,13 +395,13 @@ export default function GenericNode({ ? nodeColors[ data.node?.template[templateField] .input_types![data.node?.template[templateField] - .input_types!.length - 1] + .input_types!.length - 1] ] ?? nodeColors[ types[ data.node?.template[templateField] .input_types![data.node?.template[templateField] - .input_types!.length - 1] + .input_types!.length - 1] ] ] : nodeColors[ @@ -475,12 +475,6 @@ export default function GenericNode({