diff --git a/.vscode/settings.json b/.vscode/settings.json
index 15141b2b1109d66af939735e2bd715e2e0aa28bc..3ca992d4a63289a6bf16276fae1483b76f17790c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -143,6 +143,7 @@
"Tétris",
"timestep",
"TIMESTEP",
+ "UNCOMING",
"Unstarted",
"UNSTARTED",
"usageevent",
diff --git a/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourChart.tsx b/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourChart.tsx
index 1911da91c9b913697383a83c73f6b13aab9b21cb..51fb203428079b883f30e49696061b6077779e78 100644
--- a/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourChart.tsx
+++ b/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourChart.tsx
@@ -56,7 +56,7 @@ const ElecHalfHourChart = ({ dataLoad, isWeekend }: ElecHalfHourChartProps) => {
<g transform={`translate(${10},${0})`}>
{dataLoad.map((value, index) => (
<Bar
- key={index}
+ key={value.date.toISO()}
index={index}
dataload={value}
compareDataload={null}
diff --git a/src/components/Analysis/ProfileComparator/ProfileComparator.tsx b/src/components/Analysis/ProfileComparator/ProfileComparator.tsx
index 638f38b08de144e8a56400a3141ae0cd3d23574b..7635f1ede663a2c653ed98ec146e17210f4671a7 100644
--- a/src/components/Analysis/ProfileComparator/ProfileComparator.tsx
+++ b/src/components/Analysis/ProfileComparator/ProfileComparator.tsx
@@ -179,7 +179,7 @@ const ProfileComparator = ({
(indicator, index) =>
indicator.value && (
<ProfileComparatorRow
- key={index}
+ key={FluidType[index]}
fluid={index}
userPriceConsumption={userPriceConsumption}
homePriceConsumption={homePriceConsumption}
diff --git a/src/components/Charts/AxisBottom.tsx b/src/components/Charts/AxisBottom.tsx
index 66724b1de05cd7b9e818e6e51b566c6c8ed9a440..86cb03e3e4f8e3646c697cb9e396c470e02a9ee3 100644
--- a/src/components/Charts/AxisBottom.tsx
+++ b/src/components/Charts/AxisBottom.tsx
@@ -149,7 +149,7 @@ const AxisBottom = ({
>
{data.map((d, index) => (
<g
- key={index}
+ key={d.date.toISO()}
className="tick"
opacity="1"
transform={`translate(${xScale(
diff --git a/src/components/Charts/AxisRight.tsx b/src/components/Charts/AxisRight.tsx
index d7257ec00b3f5989849258748324968c858a8e12..71b7dac5e957d07822b173b39ec51f0656aa850e 100644
--- a/src/components/Charts/AxisRight.tsx
+++ b/src/components/Charts/AxisRight.tsx
@@ -1,4 +1,5 @@
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { NumberValue } from 'd3'
import { axisRight } from 'd3-axis'
import { ScaleLinear } from 'd3-scale'
import { select, selectAll } from 'd3-selection'
@@ -25,10 +26,26 @@ const AxisRight = ({
const { t } = useI18n()
const fluidStyle =
fluidType === FluidType.MULTIFLUID ? 'MULTIFLUID' : FluidType[fluidType]
+ const isMultiFluid = fluidStyle !== 'MULTIFLUID'
const yAxisRef = useRef<SVGGElement>(null)
const newMarginRight =
fluidType === FluidType.MULTIFLUID ? marginRight - 10 : marginRight
+ const formatFluidValue = (value: NumberValue, unit: 'UNIT' | 'MEGAUNIT') => {
+ const fluidUnit = t(`FLUID.${fluidStyle}.${unit}`)
+ return `${value.valueOf()} ${fluidUnit}`
+ }
+
+ const formatSingleFluidValue = (value: NumberValue) => {
+ return value === 0 ? '0' : formatFluidValue(value, 'UNIT')
+ }
+
+ const formatMultiFluidValue = (value: NumberValue) => {
+ return typeof value === 'number'
+ ? formatFluidValue(value / 1000, 'MEGAUNIT')
+ : formatFluidValue(value.valueOf() / 1000, 'MEGAUNIT')
+ }
+
const drawYAxis = () => {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
select(yAxisRef.current!).call(
@@ -37,13 +54,9 @@ const AxisRight = ({
.tickSize(-width)
.tickSizeOuter(0)
.tickFormat(d =>
- Number(d) >= 1000 && fluidStyle !== 'MULTIFLUID'
- ? typeof d === 'number'
- ? `${d / 1000} ${t(`FLUID.${fluidStyle}.MEGAUNIT`)}`
- : `${d.valueOf() / 1000} ${t(`FLUID.${fluidStyle}.MEGAUNIT`)}`
- : d === 0
- ? `${d}`
- : `${d} ${t(`FLUID.${fluidStyle}.UNIT`)}`
+ Number(d) >= 1000 && isMultiFluid
+ ? formatMultiFluidValue(d)
+ : formatSingleFluidValue(d)
)
)
selectAll('.tick text').attr('class', 'chart-ticks-y-text')
diff --git a/src/components/Charts/UncomingBar.tsx b/src/components/Charts/UncomingBar.tsx
index 7f0380b878bdfcfd61fdbfc062d1fb5f15589860..32dcb3c1544e50f9764f8ac90f9ed4632136451e 100644
--- a/src/components/Charts/UncomingBar.tsx
+++ b/src/components/Charts/UncomingBar.tsx
@@ -27,15 +27,12 @@ const UncomingBar = ({
setAnimationEnded(true)
}
- const barClass = `bar-UNCOMING ${
- animationEnded
- ? ''
- : `bounce-${browser?.name !== 'edge' ? '1' : '3'} delay--${index % 13}`
- }`
-
- const getBandWidth = (): number => {
- return xScale.bandwidth()
+ let animationClass = ''
+ if (!animationEnded) {
+ animationClass = browser?.name !== 'edge' ? 'bounce-1' : 'bounce-3'
+ animationClass += ` delay--${index % 13}`
}
+ const barClass = `bar-UNCOMING ${animationClass}`
const topRoundedRectDashedLine = (
x: number,
@@ -85,7 +82,7 @@ const UncomingBar = ({
<rect
x="0"
y="0"
- width={getBandWidth()}
+ width={xScale.bandwidth()}
height={height + 40}
className="background-false"
fill="#E0E0E0"
@@ -102,7 +99,7 @@ const UncomingBar = ({
d={topRoundedRectDashedLine(
0,
0,
- getBandWidth(),
+ xScale.bandwidth(),
height - yScale(average)
)}
fill="url(#gradient)"
diff --git a/src/components/ConsumptionVisualizer/DataloadSectionDetail.tsx b/src/components/ConsumptionVisualizer/DataloadSectionDetail.tsx
index 2075e217f6ef454570f56c894264caa1ae9b4ea8..91ad2308e6373f01ab92e4b54bf6bec977856b1b 100644
--- a/src/components/ConsumptionVisualizer/DataloadSectionDetail.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSectionDetail.tsx
@@ -81,7 +81,7 @@ const DataloadSectionDetail = ({
const isMissing = value.state === DataloadState.MISSING
return (
<NavLink
- key={index}
+ key={FluidType[index]}
to={`/consumption/${FluidType[index].toLowerCase()}`}
className="dataloadvisualizer-euro-link"
onClick={() => emitNavEvent(FluidType[index].toLowerCase())}
diff --git a/src/components/Duel/DuelChart/DuelBar.tsx b/src/components/Duel/DuelChart/DuelBar.tsx
index 70485c60aeef70cab163f8c3b1ed1b9486d91ff4..a23d20f574bc89df850b1a9ed20f4cdca8e53a2b 100644
--- a/src/components/Duel/DuelChart/DuelBar.tsx
+++ b/src/components/Duel/DuelChart/DuelBar.tsx
@@ -96,11 +96,11 @@ const DuelBar = ({
marginTop={marginTop}
/>
<g transform={`translate(${marginLeft},${marginTop})`}>
- {dataload.map((d: Dataload, index: number) => {
+ {dataload.map((d, index) => {
if (!isUpcoming(d)) {
return (
<Bar
- key={index}
+ key={d.date.toISO()}
index={index}
dataload={d}
compareDataload={null}
@@ -117,7 +117,7 @@ const DuelBar = ({
} else {
return (
<UncomingBar
- key={index}
+ key={d.date.toISO()}
index={index}
dataload={d}
xScale={xScale}
diff --git a/src/components/Ecogesture/EcogestureList/EcogestureList.tsx b/src/components/Ecogesture/EcogestureList/EcogestureList.tsx
index 6769246697e82e644baca131428fd276e767d943..e10a47045e4087edd48b148c669e7ebfb55f9f13 100644
--- a/src/components/Ecogesture/EcogestureList/EcogestureList.tsx
+++ b/src/components/Ecogesture/EcogestureList/EcogestureList.tsx
@@ -35,17 +35,15 @@ const EcogestureList = ({
const [openDropDown, setOpenDropDown] = useState<boolean>(false)
const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null)
- const toggleDropDown = () => {
- setOpenDropDown(prev => !prev)
- }
-
const toggleMenu = (event: React.MouseEvent<HTMLButtonElement>) => {
setAnchorEl(event.currentTarget)
+ setOpenDropDown(true)
}
const closeMenu = (usage?: Usage) => {
usage !== undefined && dispatch(updateEcogestureFilter(usage))
setAnchorEl(null)
+ setOpenDropDown(false)
}
const renderEcogestureContent = () => {
@@ -100,15 +98,15 @@ const EcogestureList = ({
variant="menu"
MenuListProps={{ className: 'filter-menu-list' }}
>
- {Object.values(Usage).map((usage, key) => {
+ {Object.values(Usage).map(usage => {
const active = usage === ecogestureFilter
return (
typeof usage === 'number' && (
<MenuItem
+ key={usage}
classes={{
root: `${active ? 'item-active' : ''}`,
}}
- key={key}
selected={active}
onClick={() => closeMenu(usage)}
>
diff --git a/src/components/Ecogesture/EcogestureList/__snapshots__/EcogestureList.spec.tsx.snap b/src/components/Ecogesture/EcogestureList/__snapshots__/EcogestureList.spec.tsx.snap
index ea409fa020bb3ae9e80654762abbcfeb1ee3f3a3..f5da3ffbcbde4deb8ca85cd977576cc7c7fdf192 100644
--- a/src/components/Ecogesture/EcogestureList/__snapshots__/EcogestureList.spec.tsx.snap
+++ b/src/components/Ecogesture/EcogestureList/__snapshots__/EcogestureList.spec.tsx.snap
@@ -762,7 +762,7 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
"root": "item-active",
}
}
- key=".$.$7"
+ key=".$.$0"
onClick={[Function]}
selected={true}
>
@@ -956,7 +956,7 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
"root": "",
}
}
- key=".$.$8"
+ key=".$.$1"
onClick={[Function]}
selected={false}
>
@@ -1097,7 +1097,7 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
"root": "",
}
}
- key=".$.$9"
+ key=".$.$2"
onClick={[Function]}
selected={false}
>
@@ -1238,7 +1238,7 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
"root": "",
}
}
- key=".$.$10"
+ key=".$.$3"
onClick={[Function]}
selected={false}
>
@@ -1379,7 +1379,7 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
"root": "",
}
}
- key=".$.$11"
+ key=".$.$4"
onClick={[Function]}
selected={false}
>
@@ -1520,7 +1520,7 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
"root": "",
}
}
- key=".$.$12"
+ key=".$.$5"
onClick={[Function]}
selected={false}
>
@@ -1661,7 +1661,7 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
"root": "",
}
}
- key=".$.$13"
+ key=".$.$6"
onClick={[Function]}
selected={false}
>
diff --git a/src/components/Ecogesture/EcogestureModal/EcogestureModal.tsx b/src/components/Ecogesture/EcogestureModal/EcogestureModal.tsx
index 940625a44899912b023b9fee13c3eb663665cc5e..ab7b5595c206e7bb4616f34ab170f7847df91e7c 100644
--- a/src/components/Ecogesture/EcogestureModal/EcogestureModal.tsx
+++ b/src/components/Ecogesture/EcogestureModal/EcogestureModal.tsx
@@ -95,14 +95,13 @@ const EcogestureModal = ({
<EfficiencyRating result={Math.round(ecogesture.efficiency)} />
</div>
<div className="em-picto-flow">
- {ecogesture.fluidTypes.map((fluid, index) => (
- <div key={index}>
- <StyledIcon
- className="em-pic-content"
- icon={getPicto(fluid)}
- size={25}
- />
- </div>
+ {ecogesture.fluidTypes.map(fluid => (
+ <StyledIcon
+ key={fluid}
+ className="em-pic-content"
+ icon={getPicto(fluid)}
+ size={25}
+ />
))}
</div>
</div>
diff --git a/src/components/FluidChart/FluidChart.tsx b/src/components/FluidChart/FluidChart.tsx
index 5f6ef62010de8307d6d036165e0695149c821167..4c3f73954fe1fffcacc64cafa8a3dcdfb7a84e0d 100644
--- a/src/components/FluidChart/FluidChart.tsx
+++ b/src/components/FluidChart/FluidChart.tsx
@@ -141,7 +141,7 @@ const FluidChart = ({ fluidType, setActive }: FluidChartProps) => {
}
}
- const LastDataValid = () => (
+ const LastDataValid = fluidType !== FluidType.MULTIFLUID && (
<div className="lastValidData">
<span className="text-16-bold date" onClick={moveToDate}>
{t('consumption_visualizer.last_valid_data', {
@@ -157,7 +157,7 @@ const FluidChart = ({ fluidType, setActive }: FluidChartProps) => {
return (
<div className="fluidchart-root">
- {!isFluidConnected && <LastDataValid />}
+ {!isFluidConnected && LastDataValid}
{currentTimeStep === TimeStep.HALF_AN_HOUR && !containsHalfHourData ? (
<HalfHourNoData />
) : (
diff --git a/src/components/Konnector/KonnectorViewerList.tsx b/src/components/Konnector/KonnectorViewerList.tsx
index 58fc207425d78446bcb6801b2abe404adc0423bb..7865473a25658a37d73e444dea7c78d4736d2069 100644
--- a/src/components/Konnector/KonnectorViewerList.tsx
+++ b/src/components/Konnector/KonnectorViewerList.tsx
@@ -2,7 +2,6 @@ import StyledCard from 'components/CommonKit/Card/StyledCard'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
import { FluidType } from 'enums'
-import { FluidStatus } from 'models'
import React from 'react'
import { useNavigate } from 'react-router-dom'
import { useAppSelector } from 'store/hooks'
@@ -20,9 +19,9 @@ const KonnectorViewerList = () => {
return (
<div className="konnectorsList">
- {fluidStatus.map((fluidStatusItem: FluidStatus, key: number) => (
+ {fluidStatus.map(fluidStatusItem => (
<StyledCard
- key={key}
+ key={fluidStatusItem.fluidType}
className="connection-card"
onClick={() => goToFluid(fluidStatusItem.fluidType)}
fluidType={fluidStatusItem.fluidType}
diff --git a/src/components/Options/ExportData/ExportData.tsx b/src/components/Options/ExportData/ExportData.tsx
index 73c4ef2f5a9352d4bbbc6e3be30cd7d787788134..5127480c547af8ada1f7bc66b8f6b3e3ce970038 100644
--- a/src/components/Options/ExportData/ExportData.tsx
+++ b/src/components/Options/ExportData/ExportData.tsx
@@ -71,8 +71,8 @@ const ExportData = () => {
}, [consumptionService])
const fluidCheckbox = () =>
- exportableFluids.map((fluidType, key) => (
- <label key={key}>
+ exportableFluids.map(fluidType => (
+ <label key={fluidType}>
<input
type="checkbox"
className="inputCheckbox"
diff --git a/src/services/consumption.service.spec.ts b/src/services/consumption.service.spec.ts
index bd5f44bccffefe409e8a0641b0b4757c8e983a6a..ca2d8e95b09bbf47ca5c6ba09717109840ad0865 100644
--- a/src/services/consumption.service.spec.ts
+++ b/src/services/consumption.service.spec.ts
@@ -18,6 +18,7 @@ import {
import { fluidPrices } from 'tests/__mocks__/fluidPrice.mock'
import { fluidStatusConnectedData } from 'tests/__mocks__/fluidStatusData.mock'
import { loadDayData } from 'tests/__mocks__/loadDayData.mock'
+import { allFluids } from 'utils/utils'
import ConsumptionDataManager from './consumption.service'
const mockFetchFluidData = jest.fn()
@@ -145,13 +146,8 @@ describe('Consumption service', () => {
})
it('should return a mapped data for multiple fluid', async () => {
- const fluidTypes: FluidType[] = [
- FluidType.ELECTRICITY,
- FluidType.WATER,
- FluidType.GAS,
- ]
-
- for (let i = 0; i < fluidTypes.length; i++) {
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ for (const _fluid of allFluids) {
mockFetchFluidData.mockResolvedValueOnce(mockFetchDataActual)
mockFetchFluidData.mockResolvedValueOnce(mockFetchDataComparison)
}
@@ -217,7 +213,7 @@ describe('Consumption service', () => {
const result = await consumptionDataManager.getGraphData(
mockTimePeriod,
TimeStep.DAY,
- fluidTypes,
+ allFluids,
fluidStatus,
mockTimePeriodComparison,
true
@@ -225,11 +221,6 @@ describe('Consumption service', () => {
expect(result).toEqual(mockResult)
})
it('should return a mapped data for multi fluid without comparison date', async () => {
- const fluidTypes: FluidType[] = [
- FluidType.ELECTRICITY,
- FluidType.WATER,
- FluidType.GAS,
- ]
const mockResult: Datachart = {
actualData: [
{
@@ -265,7 +256,7 @@ describe('Consumption service', () => {
const result = await consumptionDataManager.getGraphData(
mockTimePeriod,
TimeStep.DAY,
- fluidTypes,
+ allFluids,
fluidStatus
)
expect(result).toEqual(mockResult)
@@ -302,13 +293,8 @@ describe('Consumption service', () => {
describe('getMaxLoad method', () => {
it('should return the maxed value for a time period for the home', async () => {
- const fluidTypes: FluidType[] = [
- FluidType.ELECTRICITY,
- FluidType.WATER,
- FluidType.GAS,
- ]
-
- for (let i = 0; i < fluidTypes.length; i++) {
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ for (const _fluid of allFluids) {
mockFetchFluidData.mockResolvedValueOnce(mockFetchDataActual)
mockFetchFluidData.mockResolvedValueOnce(mockFetchDataComparison)
}
@@ -316,7 +302,7 @@ describe('Consumption service', () => {
const result = await consumptionDataManager.getMaxLoad(
mockTimePeriod,
TimeStep.DAY,
- fluidTypes,
+ allFluids,
mockTimePeriodComparison,
true
)
@@ -339,11 +325,6 @@ describe('Consumption service', () => {
describe('getPerformanceIndicators method', () => {
it('should return the performance indicator', async () => {
- const fluidTypes: FluidType[] = [
- FluidType.ELECTRICITY,
- FluidType.WATER,
- FluidType.GAS,
- ]
mockFetchFluidData.mockResolvedValueOnce(mockFetchDataActual)
mockFetchFluidData.mockResolvedValueOnce(mockFetchDataComparison)
mockFetchFluidData.mockResolvedValueOnce(mockFetchDataActual)
@@ -393,7 +374,7 @@ describe('Consumption service', () => {
const result = await consumptionDataManager.getPerformanceIndicators(
mockTimePeriodComplete,
TimeStep.DAY,
- fluidTypes,
+ allFluids,
mockTimePeriodComparisonComplete
)
expect(result).toEqual(expectedResult)
@@ -402,16 +383,11 @@ describe('Consumption service', () => {
describe('getFluidsWithData method', () => {
it('should return the array of fluidTypes that have entries', async () => {
- const fluidTypes: FluidType[] = [
- FluidType.ELECTRICITY,
- FluidType.WATER,
- FluidType.GAS,
- ]
mockGetEntries.mockResolvedValueOnce({ data: [1] })
mockGetEntries.mockResolvedValueOnce({ data: [] })
mockGetEntries.mockResolvedValueOnce({ data: [1] })
const result = await consumptionDataManager.getFluidsWithData(
- fluidTypes,
+ allFluids,
TimeStep.MONTH
)
expect(result).toStrictEqual([FluidType.ELECTRICITY, FluidType.GAS])
@@ -430,11 +406,6 @@ describe('Consumption service', () => {
expect(result).toEqual(expectedResult)
})
it('should return the latest date data of All fluid', async () => {
- const fluidTypes: FluidType[] = [
- FluidType.ELECTRICITY,
- FluidType.WATER,
- FluidType.GAS,
- ]
mockGetFirstDateData.mockResolvedValueOnce(
DateTime.fromISO('2020-09-02T23:59:59.999Z')
)
@@ -450,7 +421,7 @@ describe('Consumption service', () => {
DateTime.fromISO('2020-09-01T23:59:59.999Z'),
]
const result =
- await consumptionDataManager.fetchAllFirstDateData(fluidTypes)
+ await consumptionDataManager.fetchAllFirstDateData(allFluids)
expect(result).toEqual(expectedResult)
})
})
@@ -467,11 +438,6 @@ describe('Consumption service', () => {
expect(result).toEqual(expectedResult)
})
it('should return the latest date data of All fluid', async () => {
- const fluidTypes: FluidType[] = [
- FluidType.ELECTRICITY,
- FluidType.WATER,
- FluidType.GAS,
- ]
mockGetLastDateData.mockResolvedValueOnce(
DateTime.fromISO('2020-09-02T23:59:59.999Z')
)
@@ -487,7 +453,7 @@ describe('Consumption service', () => {
DateTime.fromISO('2020-09-01T23:59:59.999Z'),
]
const result =
- await consumptionDataManager.fetchAllLastDateData(fluidTypes)
+ await consumptionDataManager.fetchAllLastDateData(allFluids)
expect(result).toEqual(expectedResult)
})
})
diff --git a/src/services/fluid.service.ts b/src/services/fluid.service.ts
index a25af857cd7ba141a30710ad61771d68587551f3..b8a31df14e9814b17769180832839cb597619955 100644
--- a/src/services/fluid.service.ts
+++ b/src/services/fluid.service.ts
@@ -1,6 +1,5 @@
import { Client } from 'cozy-client'
import { FluidState, FluidType } from 'enums'
-import { DateTime } from 'luxon'
import {
Account,
FluidStatus,
@@ -14,6 +13,7 @@ import ConsumptionService from 'services/consumption.service'
import ConfigService from 'services/fluidConfig.service'
import KonnectorService from 'services/konnector.service'
import TriggerService from 'services/triggers.service'
+import { allFluids } from 'utils/utils'
export default class FluidService {
private _client: Client
@@ -106,18 +106,10 @@ export default class FluidService {
waterTrigger ? triggerService.fetchTriggerState(waterTrigger) : null,
gasTrigger ? triggerService.fetchTriggerState(gasTrigger) : null,
])
- const firstDataDates: (DateTime | null)[] =
- await consumptionService.fetchAllFirstDateData([
- FluidType.ELECTRICITY,
- FluidType.WATER,
- FluidType.GAS,
- ])
- const lastDataDates: (DateTime | null)[] =
- await consumptionService.fetchAllLastDateData([
- FluidType.ELECTRICITY,
- FluidType.WATER,
- FluidType.GAS,
- ])
+ const firstDataDates =
+ await consumptionService.fetchAllFirstDateData(allFluids)
+ const lastDataDates =
+ await consumptionService.fetchAllLastDateData(allFluids)
const result: FluidStatus[] = [
{
diff --git a/src/services/initialization.service.spec.ts b/src/services/initialization.service.spec.ts
index ca938be0ebeec56c08baff1e0f74c6f9516b4f7d..db73da151c8d89785cd6f1ce3b942864e3c76c6a 100644
--- a/src/services/initialization.service.spec.ts
+++ b/src/services/initialization.service.spec.ts
@@ -3,7 +3,6 @@ import challengeEntityData from 'db/challengeEntity.json'
import duelEntityData from 'db/duelEntity.json'
import explorationEntityData from 'db/explorationEntity.json'
import quizEntityData from 'db/quizEntity.json'
-import { FluidType } from 'enums'
import { DateTime } from 'luxon'
import { Profile, Trigger, UserChallenge } from 'models'
import { allChallengeEntityData } from 'tests/__mocks__/challengeEntity.mock'
@@ -21,6 +20,7 @@ import {
import { userChallengeData } from 'tests/__mocks__/userChallengeData.mock'
import { getActualAnalysisDate } from 'utils/date'
import { hashFile } from 'utils/hash'
+import { allFluids } from 'utils/utils'
import InitializationService from './initialization.service'
const mockCreateIndexKonnector = jest.fn()
@@ -651,16 +651,10 @@ describe('Initialization service', () => {
describe('initFluidType method', () => {
it('should return all fluid types', async () => {
- mockGetKonnectorAccountStatus.mockResolvedValueOnce([
- FluidType.ELECTRICITY,
- FluidType.WATER,
- FluidType.GAS,
- ])
- await expect(initializationService.initFluidTypes()).resolves.toEqual([
- FluidType.ELECTRICITY,
- FluidType.WATER,
- FluidType.GAS,
- ])
+ mockGetKonnectorAccountStatus.mockResolvedValueOnce(allFluids)
+ await expect(initializationService.initFluidTypes()).resolves.toEqual(
+ allFluids
+ )
})
it('should throw an error when null is retrieved as fluid types', async () => {
mockGetKonnectorAccountStatus.mockResolvedValueOnce(null)
diff --git a/src/services/initialization.service.ts b/src/services/initialization.service.ts
index 4f9a8dddab1525aa6fc53bd0b712e354d992e28f..b30bb683aa36206da0c133acd1404a47d2c643d6 100644
--- a/src/services/initialization.service.ts
+++ b/src/services/initialization.service.ts
@@ -523,10 +523,10 @@ export default class InitializationService {
const startTime = performance.now()
const kss = new KonnectorStatusService(this._client)
try {
- const fluidtypes = await kss.getKonnectorAccountStatus()
- if (fluidtypes) {
+ const fluidTypes = await kss.getKonnectorAccountStatus()
+ if (fluidTypes) {
logDuration('[Initialization] Fluid Types loaded', startTime)
- return fluidtypes
+ return fluidTypes
} else {
this._setInitStepError(InitStepsErrors.CONSOS_ERROR)
throw new Error('initFluidTypes: FluidTypes not found')