From f7f0c3a2ae1e14e7f8083e546572b4c7646ffc6c Mon Sep 17 00:00:00 2001
From: Romain CREY <ext.sopra.rcrey@grandlyon.com>
Date: Mon, 25 May 2020 15:21:43 +0200
Subject: [PATCH] fix: order of konnectors
---
docker/cozy-app-dev-with-app.sh | 24 +++++++++----------
.../IndicatorContainerSwitcher.tsx | 6 ++++-
...AvailableChallengeDetailsViewContainer.tsx | 2 --
.../KonnectorViewer/KonnectorViewerList.tsx | 11 +++++++--
4 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/docker/cozy-app-dev-with-app.sh b/docker/cozy-app-dev-with-app.sh
index 0a5efd959..af12c6b95 100644
--- a/docker/cozy-app-dev-with-app.sh
+++ b/docker/cozy-app-dev-with-app.sh
@@ -204,21 +204,21 @@ do_install_app() {
echo "App succesfully installed"
echo "Installing konnectors"
- if cozy-stack konnectors ls | grep 'enedis-konnector'; then
- echo "Removing enedis-konnector..."
- cozy-stack konnectors uninstall enedis-konnector
+ if cozy-stack konnectors ls | grep 'enedis'; then
+ echo "Removing enedis..."
+ cozy-stack konnectors uninstall enedis
fi
- if cozy-stack konnectors ls | grep 'grdf-konnector'; then
- echo "Removing grdf-konnector..."
- cozy-stack konnectors uninstall grdf-konnector
+ if cozy-stack konnectors ls | grep 'grdf'; then
+ echo "Removing grdf..."
+ cozy-stack konnectors uninstall grdf
fi
- if cozy-stack konnectors ls | grep 'egl-konnector'; then
- echo "Removing egl-konnector..."
- cozy-stack konnectors uninstall egl-konnector
+ if cozy-stack konnectors ls | grep 'egl'; then
+ echo "Removing egl..."
+ cozy-stack konnectors uninstall egl
fi
- cozy-stack konnectors install enedis-konnector file:///data/cozy_konnectors/enedis-konnector-build
- cozy-stack konnectors install grdf-konnector file:///data/cozy_konnectors/grdf-konnector-build
- cozy-stack konnectors install egl-konnector file:///data/cozy_konnectors/egl-konnector-build
+ cozy-stack konnectors install enedis file:///data/cozy_konnectors/enedis-konnector-build
+ cozy-stack konnectors install grdf file:///data/cozy_konnectors/grdf-konnector-build
+ cozy-stack konnectors install egl file:///data/cozy_konnectors/egl-konnector-build
}
wait_for() {
diff --git a/src/components/ContainerComponents/IndicatorsContainer/IndicatorContainerSwitcher.tsx b/src/components/ContainerComponents/IndicatorsContainer/IndicatorContainerSwitcher.tsx
index db0cab397..1c742ebe5 100644
--- a/src/components/ContainerComponents/IndicatorsContainer/IndicatorContainerSwitcher.tsx
+++ b/src/components/ContainerComponents/IndicatorsContainer/IndicatorContainerSwitcher.tsx
@@ -24,6 +24,7 @@ const IndicatorContainerSwitcher: React.FC<IndicatorContainerSwitcherProps> = ({
const appContext = useContext(AppContext)
const allConfiguredFluidTypes = appContext.fluidTypes
const fluidConfig = new FluidConfigService().getFluidConfig()
+
return (
<div>
{fluidConfig.map((fluid, index) => {
@@ -37,7 +38,10 @@ const IndicatorContainerSwitcher: React.FC<IndicatorContainerSwitcherProps> = ({
timeStep
)}
/>
- ) : (
+ ) : null
+ })}
+ {fluidConfig.map((fluid, index) => {
+ return allConfiguredFluidTypes.includes(fluid.fluidTypeId) ? null : (
<KonnectorViewer key={index} fluidConfig={fluid} />
)
})}
diff --git a/src/components/ContainerComponents/ViewContainer/AvailableChallengeDetailsViewContainer.tsx b/src/components/ContainerComponents/ViewContainer/AvailableChallengeDetailsViewContainer.tsx
index 6197d6774..4167ee49f 100644
--- a/src/components/ContainerComponents/ViewContainer/AvailableChallengeDetailsViewContainer.tsx
+++ b/src/components/ContainerComponents/ViewContainer/AvailableChallengeDetailsViewContainer.tsx
@@ -10,8 +10,6 @@ import { Redirect } from 'react-router-dom'
import StyledSpinner from 'components/CommonKit/Spinner/StyledSpinner'
import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
import AvailableChallengeIcon from 'assets/icons/badges/available-big.svg'
-import EcogestureModal from 'components/ContentComponents/EcogestureModal/EcogestureModal'
-import EcogestureCard from 'components/ContentComponents/EcogestureCard/EcogestureCard'
import ChallengeManager from 'services/challengeDataManagerService'
import { Client, withClient } from 'cozy-client'
import StyledButtonValid from 'components/CommonKit/Button/StyledButtonValid'
diff --git a/src/components/ContentComponents/KonnectorViewer/KonnectorViewerList.tsx b/src/components/ContentComponents/KonnectorViewer/KonnectorViewerList.tsx
index 749f19b18..d6b486250 100644
--- a/src/components/ContentComponents/KonnectorViewer/KonnectorViewerList.tsx
+++ b/src/components/ContentComponents/KonnectorViewer/KonnectorViewerList.tsx
@@ -1,6 +1,7 @@
-import React from 'react'
+import React, { useContext } from 'react'
import KonnectorViewer from 'components/ContentComponents/KonnectorViewer/KonnectorViewer'
import IFluidConfig from 'services/IFluidConfig'
+import { AppContext } from 'components/Contexts/AppContextProvider'
export interface KonnectorViewerListProps {
isParam: boolean
@@ -11,10 +12,16 @@ const KonnectorViewerList: React.FC<KonnectorViewerListProps> = ({
isParam = false,
fluidConfigs,
}: KonnectorViewerListProps) => {
+ const { fluidTypes } = useContext(AppContext)
return (
<div>
{fluidConfigs.map((item: IFluidConfig, index: number) => {
- return (
+ return fluidTypes.includes(item.fluidTypeId) ? (
+ <KonnectorViewer isParam={isParam} key={index} fluidConfig={item} />
+ ) : null
+ })}
+ {fluidConfigs.map((item: IFluidConfig, index: number) => {
+ return fluidTypes.includes(item.fluidTypeId) ? null : (
<KonnectorViewer isParam={isParam} key={index} fluidConfig={item} />
)
})}
--
GitLab