From 515b281248a0adea97c0d28dc9cdba56c29d3963 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Sun, 25 Feb 2024 18:56:19 -0300 Subject: [PATCH] Fix build status class issue in GenericNode component --- .../src/CustomNodes/GenericNode/index.tsx | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx index 0e4812c90..5091e09c1 100644 --- a/src/frontend/src/CustomNodes/GenericNode/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx @@ -170,7 +170,6 @@ export default function GenericNode({ validationStatus: validationStatusType | null ) => { const isValid = validationStatus && validationStatus.valid; - if (isValid) { return "green-status"; } else if (!isValid && buildStatus === BuildStatus.INACTIVE) { @@ -181,8 +180,10 @@ export default function GenericNode({ return "red-status"; } else if (!validationStatus) { return "yellow-status"; - } else { + } else if (buildStatus === BuildStatus.BUILDING) { return "status-build-animation"; + } else { + return "green-status"; } }; @@ -203,6 +204,7 @@ export default function GenericNode({ validationStatus: validationStatusType | null ) => { let isInvalid = validationStatus && !validationStatus.valid; + if (buildStatus === BuildStatus.INACTIVE && isInvalid) { // INACTIVE should have its own class return "inactive-status"; @@ -222,11 +224,17 @@ export default function GenericNode({ buildStatus: BuildStatus | undefined, validationStatus: validationStatusType | null ) => { + const specificClassFromBuildStatus = getSpecificClassFromBuildStatus( + buildStatus, + validationStatus + ); + const baseBorderClass = getBaseBorderClass(selected); + const nodeSizeClass = getNodeSizeClass(showNode); return classNames( - getBaseBorderClass(selected), - getNodeSizeClass(showNode), + baseBorderClass, + nodeSizeClass, "generic-node-div", - getSpecificClassFromBuildStatus(buildStatus, validationStatus) + specificClassFromBuildStatus ); }; @@ -479,6 +487,7 @@ export default function GenericNode({ isBuilding ) return; + buildFlow(data.id); }} >