From 0a993e5df9549de8a01f8248b4ac78d66e938595 Mon Sep 17 00:00:00 2001
From: Yoan VALLET <ext.sopra.yvallet@grandlyon.com>
Date: Wed, 3 Jun 2020 19:46:44 +0200
Subject: [PATCH] feat: clean konnector components
---
.../Konnector/KonnectorLoading.tsx | 14 +++++++-------
.../Konnector/KonnectorResult.tsx | 13 ++++++-------
.../KonnectorViewer/KonnectorViewerCard.tsx | 6 ++----
3 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/src/components/ContentComponents/Konnector/KonnectorLoading.tsx b/src/components/ContentComponents/Konnector/KonnectorLoading.tsx
index 55b52201c..a0a3ea348 100644
--- a/src/components/ContentComponents/Konnector/KonnectorLoading.tsx
+++ b/src/components/ContentComponents/Konnector/KonnectorLoading.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useEffect } from 'react'
import { withClient, Client } from 'cozy-client'
import { translate } from 'cozy-ui/react/I18n'
@@ -36,24 +36,24 @@ const KonnectorLoading: React.FC<KonnectorLoadingProps> = ({
client,
t,
}: KonnectorLoadingProps) => {
- const callbackResponse = (state: string) => {
- handleKonnectorLoading(state)
+ const callbackResponse = () => {
+ handleKonnectorLoading()
}
useEffect(() => {
let subscribed = true
async function getData() {
- if (!isKonnectorRunning(trigger)) {
+ if (subscribed && !isKonnectorRunning(trigger)) {
const konnectorJob = new KonnectorJob(client, trigger)
await konnectorJob.launch()
konnectorJob.jobWatcher.on(ERROR_EVENT, () => {
- callbackResponse(ERROR_EVENT)
+ callbackResponse()
})
konnectorJob.jobWatcher.on(LOGIN_SUCCESS_EVENT, () => {
- callbackResponse(LOGIN_SUCCESS_EVENT)
+ callbackResponse()
})
konnectorJob.jobWatcher.on(SUCCESS_EVENT, () => {
- callbackResponse(SUCCESS_EVENT)
+ callbackResponse()
})
}
}
diff --git a/src/components/ContentComponents/Konnector/KonnectorResult.tsx b/src/components/ContentComponents/Konnector/KonnectorResult.tsx
index 320e62197..4da3b219c 100644
--- a/src/components/ContentComponents/Konnector/KonnectorResult.tsx
+++ b/src/components/ContentComponents/Konnector/KonnectorResult.tsx
@@ -7,7 +7,7 @@ import { AppContext } from 'components/Contexts/AppContextProvider'
import StyledButton from 'components/CommonKit/Button/StyledButton'
import StyledBlackSpinner from 'components/CommonKit/Spinner/StyledBlackSpinner'
-import { Account, Konnector, Trigger } from 'doctypes'
+import { Account, Trigger } from 'doctypes'
import { TriggerService } from 'services/triggersService'
import { AccountService } from 'services/accountService'
@@ -21,7 +21,6 @@ import {
interface KonnectorResultProps {
account: Account
- konnector: Konnector
handleJobState: Function
client: Client
t: Function
@@ -29,7 +28,6 @@ interface KonnectorResultProps {
const KonnectorResult: React.FC<KonnectorResultProps> = ({
account,
- konnector,
handleJobState,
client,
t,
@@ -45,6 +43,7 @@ const KonnectorResult: React.FC<KonnectorResultProps> = ({
const triggerState = await TriggerService.fetchTriggerState(client, trigger)
if (triggerState) {
// TODO - format date
+ console.log('triggerState', triggerState)
setLastExecutionDate(new Date(triggerState.last_execution).toDateString())
setStatus(triggerState.status)
handleJobState(triggerState.status)
@@ -52,7 +51,7 @@ const KonnectorResult: React.FC<KonnectorResultProps> = ({
}
}
- const callbackResponse = async (state: string) => {
+ const callbackResponse = async () => {
if (trigger) {
await updateState(trigger)
}
@@ -70,13 +69,13 @@ const KonnectorResult: React.FC<KonnectorResultProps> = ({
const konnectorJob = new KonnectorJob(client, trigger)
await konnectorJob.launch()
konnectorJob.jobWatcher.on(ERROR_EVENT, () => {
- callbackResponse(ERROR_EVENT)
+ callbackResponse()
})
konnectorJob.jobWatcher.on(LOGIN_SUCCESS_EVENT, () => {
- callbackResponse(LOGIN_SUCCESS_EVENT)
+ callbackResponse()
})
konnectorJob.jobWatcher.on(SUCCESS_EVENT, () => {
- callbackResponse(SUCCESS_EVENT)
+ callbackResponse()
})
}
}
diff --git a/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx b/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx
index 36fefa9e1..8074ff68e 100644
--- a/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx
+++ b/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx
@@ -1,7 +1,6 @@
import React, { useState, useEffect, useRef } from 'react'
import { AccountService } from 'services/accountService'
-import { JobService, JobState } from 'services/jobsService'
import { FluidType } from 'enum/fluid.enum'
import { withClient, Client } from 'cozy-client'
@@ -21,7 +20,8 @@ import KonnectorNotFound from 'components/ContentComponents/Konnector/KonnectorN
import KonnectorForm from 'components/ContentComponents/Konnector/KonnectorForm'
import KonnectorResult from 'components/ContentComponents/Konnector/KonnectorResult'
-import { Konnector, Trigger } from 'doctypes'
+import { Konnector } from 'doctypes'
+import { JobState } from 'services/jobsService'
interface KonnectorViewerCardProps {
fluidConfig: IFluidConfig
@@ -43,7 +43,6 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
const [setActive, setActiveState] = useState('')
const [setHeight, setHeightState] = useState('0px')
- const [error, setError] = useState<string>('')
const [jobState, setJobState] = useState<string>('')
const content: React.MutableRefObject<null> = useRef<null>(null)
@@ -144,7 +143,6 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
) : (
<KonnectorResult
account={account}
- konnector={konnector}
handleJobState={handleJobState}
/>
)}
--
GitLab