From 7c8cb85f7413b48df48149999d31afdd0a57f109 Mon Sep 17 00:00:00 2001
From: Romain CREY <ext.sopra.rcrey@grandlyon.com>
Date: Wed, 10 Jun 2020 18:10:40 +0200
Subject: [PATCH] fix: konnector error
---
.../ContentComponents/Konnector/KonnectorLaunch.tsx | 11 ++++++-----
.../KonnectorViewer/KonnectorViewerCard.tsx | 6 +++++-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/components/ContentComponents/Konnector/KonnectorLaunch.tsx b/src/components/ContentComponents/Konnector/KonnectorLaunch.tsx
index 4d8a9ca20..b74aa5ca1 100644
--- a/src/components/ContentComponents/Konnector/KonnectorLaunch.tsx
+++ b/src/components/ContentComponents/Konnector/KonnectorLaunch.tsx
@@ -48,11 +48,8 @@ const KonnectorLaunch: React.FC<KonnectorLaunchProps> = ({
setState(_state)
}
- const handleClick = () => {
- handleKonnectorLaunch()
- }
-
const handleCloseClick = () => {
+ handleKonnectorLaunch()
setOpenModal(false)
}
@@ -113,7 +110,11 @@ const KonnectorLaunch: React.FC<KonnectorLaunchProps> = ({
{t('KONNECTORCONFIG.SUCCESS_DATA')}
</div>
)}
- <StyledButton type="button" color="primary" onClick={handleClick}>
+ <StyledButton
+ type="button"
+ color="primary"
+ onClick={handleCloseClick}
+ >
<div>{t('KONNECTORCONFIG.OK')}</div>
</StyledButton>
</div>
diff --git a/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx b/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx
index 8ea145a2b..0f40480ba 100644
--- a/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx
+++ b/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx
@@ -61,7 +61,9 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
const loginFailed: boolean =
triggerState != null &&
triggerState.last_error != undefined &&
- triggerState.last_error === 'LOGIN_FAILED'
+ triggerState.last_error === 'LOGIN_FAILED' &&
+ triggerState.status != undefined &&
+ triggerState.status === 'errored'
const toggleAccordion = () => {
setActiveState(setActive === '' ? 'active' : '')
@@ -85,6 +87,7 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
const updateState = async (trigger: Trigger) => {
const triggerState = await TriggerService.fetchTriggerState(client, trigger)
+ console.log('triggerState', triggerState)
if (triggerState) {
setTriggerState(triggerState)
}
@@ -168,6 +171,7 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
style={{ maxHeight: `${setHeight}` }}
className={`accordion-content ${setActive}`}
>
+ {console.log('loginFailed', loginFailed)}
{!konnector ? (
<KonnectorNotFound
konnectorSlug={fluidConfig.konnectorConfig.slug}
--
GitLab