Skip to content
Snippets Groups Projects
Commit 0a993e5d authored by Yoan VALLET's avatar Yoan VALLET
Browse files

feat: clean konnector components

parent a1fbf2f2
No related branches found
No related tags found
3 merge requests!28Merge fix from dev,!27Dev,!25Features/us150 review of konnectors
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()
})
}
}
......
......@@ -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()
})
}
}
......
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}
/>
)}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment