From 13dd2901d1f73fee40748136e17820441847958c Mon Sep 17 00:00:00 2001 From: Bastien Dumont <bdumont@grandlyon.com> Date: Wed, 27 Mar 2024 14:51:46 +0100 Subject: [PATCH] rename few things and add comments --- src/components/Konnector/KonnectorViewerCard.tsx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/components/Konnector/KonnectorViewerCard.tsx b/src/components/Konnector/KonnectorViewerCard.tsx index e7eb4d22f..27012b98a 100644 --- a/src/components/Konnector/KonnectorViewerCard.tsx +++ b/src/components/Konnector/KonnectorViewerCard.tsx @@ -249,11 +249,13 @@ const KonnectorViewerCard = ({ </Button> ) } + if (fluidState === FluidState.KONNECTOR_NOT_FOUND && !isUpdating) { return <ConnectionNotFound konnectorSlug={fluidSlug} /> } + // Handle login failed for EGL - else if ( + if ( (fluidType === FluidType.WATER && fluidState === FluidState.LOGIN_FAILED) || (account && currentFluidStatus.status !== FluidState.NOT_CONNECTED) @@ -262,12 +264,11 @@ const KonnectorViewerCard = ({ <ConnectionResult handleAccountDeletion={handleAccountDeletion} fluidType={fluidType} - key={lastDataDate} /> ) - } else { - return <Connection fluidType={currentFluidStatus.fluidType} /> } + + return <Connection fluidType={currentFluidStatus.fluidType} /> }, [ account, currentFluidStatus.fluidType, @@ -277,7 +278,6 @@ const KonnectorViewerCard = ({ fluidType, handleAccountDeletion, isUpdating, - lastDataDate, showOfflineData, t, toggleModalConnection, @@ -312,7 +312,8 @@ const KonnectorViewerCard = ({ ] ) - const getIconForStatus = ( + /** Return maintenance, error or warning status icon */ + const getStatusIcon = ( status: FluidState, maintenance: boolean, connection: FluidConnection, @@ -359,7 +360,7 @@ const KonnectorViewerCard = ({ icon={currentFluidStatus.connection.account ? iconType : OfflinePicto} size={49} /> - {getIconForStatus( + {getStatusIcon( currentFluidStatus.status, currentFluidStatus.maintenance, currentFluidStatus.connection, -- GitLab