diff --git a/src/components/Konnector/KonnectorViewerList.tsx b/src/components/Konnector/KonnectorViewerList.tsx index a9d00f9864f3f167785d5e48da6a77f1019519ce..924f0254f10d7091b90f6a17d0abc4f481daf1e5 100644 --- a/src/components/Konnector/KonnectorViewerList.tsx +++ b/src/components/Konnector/KonnectorViewerList.tsx @@ -1,47 +1,21 @@ -import React, { useEffect, useState } from 'react' +import React from 'react' import { useI18n } from 'cozy-ui/transpiled/react/I18n' import { useSelector } from 'react-redux' import { AppStore } from 'store' import './konnectorViewerList.scss' import { FluidStatus } from 'models' -import { FluidState } from 'enum/fluid.enum' import KonnectorViewerCard from 'components/Konnector/KonnectorViewerCard' interface KonnectorViewerListProps { isParam: boolean } -const sortFluid = (fluidStatus: FluidStatus[]) => { - return [...fluidStatus].sort(function(a: FluidStatus, b: FluidStatus) { - if ( - a.status !== FluidState.KONNECTOR_NOT_FOUND && - a.status !== FluidState.NOT_CONNECTED - ) { - return -1 - } else if ( - b.status !== FluidState.KONNECTOR_NOT_FOUND && - b.status !== FluidState.NOT_CONNECTED - ) { - return 1 - } else { - return a.fluidType - b.fluidType - } - }) -} - const KonnectorViewerList: React.FC<KonnectorViewerListProps> = ({ isParam = false, }: KonnectorViewerListProps) => { const { t } = useI18n() const { fluidStatus } = useSelector((state: AppStore) => state.ecolyo.global) - const [fluidStatusSorted, SetFluidStatusSorted] = useState<FluidStatus[]>( - fluidStatus - ) - - useEffect(() => { - SetFluidStatusSorted(sortFluid(fluidStatus)) - }, [fluidStatus]) return ( <div className="kv-root"> @@ -50,17 +24,15 @@ const KonnectorViewerList: React.FC<KonnectorViewerListProps> = ({ {t('KONNECTORCONFIG.TITLE_CONNECTION')} </div> <div> - {fluidStatusSorted.map( - (fluidStatusItem: FluidStatus, index: number) => { - return ( - <KonnectorViewerCard - key={index} - isParam={isParam} - fluidStatus={fluidStatusItem} - /> - ) - } - )} + {fluidStatus.map((fluidStatusItem: FluidStatus, index: number) => { + return ( + <KonnectorViewerCard + key={index} + isParam={isParam} + fluidStatus={fluidStatusItem} + /> + ) + })} </div> </div> </div> diff --git a/src/constants/firstConnectionWaitingText.json b/src/constants/firstConnectionWaitingText.json index e1fd3bfd033423c765c4765d308bbd61ba34ce33..b65d8aba606421da3b294d035115aa19eaa84632 100644 --- a/src/constants/firstConnectionWaitingText.json +++ b/src/constants/firstConnectionWaitingText.json @@ -7,10 +7,6 @@ { "first": "Demain matin, vous aurez l'accès à l'ensemble de vos données (jusqu'à 3 ans d'historique !)." }, - { - "first": "Attente..", - "second": "Cette opération peut être un peu longue la première fois, cela sera plus rapide ensuite" - }, { "first": "Le saviez-vous ?", "second": "Pour acheminer l’eau sur Lyon (Lugdunum !) l’acqueduc de Gier faisait 86 km à l’époque Romaine !"