From b39490518927cbe2ee94e12fc1e64134f8eefecc Mon Sep 17 00:00:00 2001
From: Bastien DUMONT <bdumont@grandlyon.com>
Date: Tue, 22 Aug 2023 07:15:40 +0000
Subject: [PATCH] refactor: use index files for models and enums
---
src/components/Action/ActionCard.tsx | 2 +-
src/components/Action/ActionDone.tsx | 3 +--
src/components/Action/ActionModal.tsx | 2 +-
src/components/Action/ActionOnGoing.spec.tsx | 2 +-
src/components/Action/ActionView.spec.tsx | 2 +-
src/components/Action/ActionView.tsx | 2 +-
src/components/Analysis/AnalysisView.tsx | 3 +--
.../Analysis/Comparison/Comparison.tsx | 3 +--
.../Comparison/FluidPerformanceIndicator.tsx | 2 +-
.../ElecHalfHourChart.tsx | 3 +--
.../ElecHalfHourMonthlyAnalysis.tsx | 8 ++++----
.../MaxConsumptionCard.spec.tsx | 2 +-
.../MaxConsumptionCard/MaxConsumptionCard.tsx | 4 +---
src/components/Analysis/MonthlyAnalysis.tsx | 3 +--
.../ProfileComparator.spec.tsx | 2 +-
.../ProfileComparator/ProfileComparator.tsx | 5 ++---
.../ProfileComparatorRow.spec.tsx | 2 +-
.../ProfileComparatorRow.tsx | 2 +-
.../TotalAnalysisChart/PieChart.spec.tsx | 2 +-
.../TotalAnalysisChart.spec.tsx | 3 +--
.../TotalAnalysisChart/TotalAnalysisChart.tsx | 3 +--
src/components/Challenge/ChallengeCard.tsx | 2 +-
.../Challenge/ChallengeCardDone.tsx | 5 +----
.../Challenge/ChallengeCardOnGoing.tsx | 12 ++++++-----
.../Challenge/ChallengeCardUnlocked.spec.tsx | 2 +-
.../Challenge/ChallengeCardUnlocked.tsx | 3 +--
src/components/Challenge/ChallengeView.tsx | 2 +-
src/components/Charts/AxisBottom.spec.tsx | 2 +-
src/components/Charts/AxisBottom.tsx | 2 +-
src/components/Charts/AxisRight.spec.tsx | 2 +-
src/components/Charts/AxisRight.tsx | 2 +-
src/components/Charts/Bar.spec.tsx | 3 +--
src/components/Charts/Bar.tsx | 3 +--
src/components/Charts/BarChart.tsx | 4 +---
.../CommonKit/Card/StyledCard.spec.tsx | 2 +-
src/components/CommonKit/Card/StyledCard.tsx | 2 +-
.../CommonKit/Switch/StyledSwitch.spec.tsx | 2 +-
.../CommonKit/Switch/StyledSwitch.tsx | 2 +-
src/components/Connection/Connection.tsx | 2 +-
.../Connection/ConnectionResult.tsx | 3 +--
.../Connection/ExpiredConsentModal.spec.tsx | 2 +-
.../Connection/ExpiredConsentModal.tsx | 2 +-
src/components/Connection/FormLogin.tsx | 2 +-
src/components/Connection/FormOAuth.tsx | 2 +-
.../Connection/GRDFConnect/GrdfInit.tsx | 2 +-
.../PartnerConnectModal/EpglConnectModal.tsx | 4 ++--
.../PartnerConnectModal/GrdfConnectModal.tsx | 4 ++--
.../StepContent.interface.ts} | 2 +-
.../SGEConnect/SgeConnectView.spec.tsx | 2 +-
.../Connection/SGEConnect/SgeConnectView.tsx | 4 ++--
.../Connection/SGEConnect/StepAddress.tsx | 2 +-
.../Connection/SGEConnect/StepConsent.tsx | 9 ++-------
.../SGEConnect/StepIdentityAndPdl.tsx | 2 +-
.../ConsumptionVisualizer.tsx | 2 +-
.../DataloadConsumptionVisualizer.spec.tsx | 3 +--
.../DataloadConsumptionVisualizer.tsx | 3 +--
.../DataloadNoValue.spec.tsx | 3 +--
.../ConsumptionVisualizer/DataloadNoValue.tsx | 3 +--
.../DataloadSection.spec.tsx | 3 +--
.../ConsumptionVisualizer/DataloadSection.tsx | 3 +--
.../DataloadSectionDetail.spec.tsx | 3 +--
.../DataloadSectionDetail.tsx | 9 ++++++---
.../DataloadSectionValue.spec.tsx | 3 +--
.../DataloadSectionValue.tsx | 3 +--
.../EstimatedConsumptionModal.tsx | 2 +-
.../InfoDataConsumptionVisualizer.spec.tsx | 3 +--
.../InfoDataConsumptionVisualizer.tsx | 3 +--
src/components/Content/Content.tsx | 2 +-
.../CustomPopup/CustomPopupModal.tsx | 2 +-
.../DateNavigator/DateNavigator.spec.tsx | 2 +-
.../DateNavigator/DateNavigator.tsx | 2 +-
.../DateNavigator/DateNavigatorFormat.tsx | 2 +-
src/components/Duel/DuelBar.tsx | 3 +--
src/components/Duel/DuelChart.tsx | 2 +-
src/components/Duel/DuelOngoing.spec.tsx | 2 +-
src/components/Duel/DuelOngoing.tsx | 6 +++---
src/components/Duel/DuelResultModal.tsx | 2 +-
src/components/Duel/DuelUnlocked.spec.tsx | 3 +--
src/components/Duel/DuelUnlocked.tsx | 3 +--
src/components/Duel/DuelView.spec.tsx | 3 +--
src/components/Duel/DuelView.tsx | 3 +--
src/components/Ecogesture/EcogestureList.tsx | 2 +-
.../Ecogesture/EcogestureView.spec.tsx | 2 +-
src/components/Ecogesture/EcogestureView.tsx | 2 +-
.../EcogestureFormEquipment.tsx | 4 +---
.../EcogestureFormSingleChoice.tsx | 4 ++--
.../EcogestureForm/EcogestureFormView.tsx | 10 ++--------
.../EcogestureForm/EquipmentIcon.spec.tsx | 2 +-
.../Exploration/ExplorationFinished.tsx | 8 +++++---
.../Exploration/ExplorationOngoing.tsx | 6 +++---
.../Exploration/ExplorationView.spec.tsx | 2 +-
.../Exploration/ExplorationView.tsx | 2 +-
src/components/Export/exportLoadingModal.tsx | 3 +--
src/components/Feedback/FeedbackModal.tsx | 2 +-
src/components/FluidChart/FluidChart.tsx | 5 +----
src/components/FluidChart/FluidChartSlide.tsx | 3 +--
src/components/FluidChart/FluidChartSwipe.tsx | 2 +-
.../FormGlobal/FormNavigation.spec.tsx | 2 +-
src/components/FormGlobal/FormNavigation.tsx | 4 +---
src/components/FormGlobal/FormProgress.tsx | 3 +--
src/components/Header/CozyBar.spec.tsx | 2 +-
src/components/Header/CozyBar.tsx | 2 +-
src/components/Header/Header.tsx | 2 +-
.../Home/ConsumptionDetails.spec.tsx | 2 +-
src/components/Home/ConsumptionDetails.tsx | 3 +--
src/components/Home/ConsumptionView.spec.tsx | 3 +--
src/components/Home/ConsumptionView.tsx | 3 +--
src/components/Home/FluidButton.spec.tsx | 2 +-
src/components/Home/FluidButton.tsx | 3 +--
src/components/Home/FluidButtons.spec.tsx | 2 +-
src/components/Home/FluidButtons.tsx | 2 +-
src/components/Hooks/useExploration.spec.tsx | 2 +-
src/components/Hooks/useExploration.tsx | 2 +-
src/components/Hooks/useKonnectorAuth.tsx | 3 +--
.../Konnector/KonnectorModal.spec.tsx | 3 +--
src/components/Konnector/KonnectorModal.tsx | 3 +--
.../Konnector/KonnectorModalFooter.spec.tsx | 3 +--
.../Konnector/KonnectorModalFooter.tsx | 2 +-
.../Konnector/KonnectorViewerCard.tsx | 17 +++++++++-------
.../Konnector/KonnectorViewerList.tsx | 2 +-
src/components/Loader/Loader.spec.tsx | 2 +-
src/components/Loader/Loader.tsx | 2 +-
src/components/Navbar/Navbar.tsx | 2 +-
.../Options/ExportData/ExportData.tsx | 3 +--
.../Options/LegalNotice/LegalNoticeLink.tsx | 2 +-
.../ProfileTypeOptions.spec.tsx | 2 +-
.../ProfileTypeOptions/ProfileTypeOptions.tsx | 6 +++---
.../ReportOptions/ReportOptions.spec.tsx | 2 +-
.../Options/ReportOptions/ReportOptions.tsx | 3 +--
.../PartnerIssue/PartnerIssueModal.tsx | 2 +-
.../ProfileType/ProfileTypeFinished.tsx | 6 ++----
.../ProfileTypeFormDateSelection.tsx | 8 ++------
.../ProfileTypeFormMultiChoice.spec.tsx | 2 +-
.../ProfileTypeFormMultiChoice.tsx | 4 ++--
.../ProfileTypeFormNumber.spec.tsx | 2 +-
.../ProfileType/ProfileTypeFormNumber.tsx | 8 ++------
.../ProfileTypeFormNumberSelection.spec.tsx | 2 +-
.../ProfileTypeFormNumberSelection.tsx | 8 ++------
.../ProfileTypeFormSingleChoice.spec.tsx | 2 +-
.../ProfileTypeFormSingleChoice.tsx | 6 +++---
.../ProfileType/ProfileTypeView.tsx | 4 ++--
src/components/Quiz/QuizBegin.spec.tsx | 2 +-
src/components/Quiz/QuizBegin.tsx | 2 +-
.../Quiz/QuizCustomQuestionContent.tsx | 3 +--
src/components/Quiz/QuizFinish.spec.tsx | 2 +-
src/components/Quiz/QuizFinish.tsx | 2 +-
src/components/Quiz/QuizQuestion.spec.tsx | 2 +-
src/components/Quiz/QuizQuestionContent.tsx | 2 +-
src/components/Quiz/QuizView.spec.tsx | 2 +-
src/components/Quiz/QuizView.tsx | 2 +-
src/components/Routes/Routes.tsx | 2 +-
src/components/Splash/SplashRoot.tsx | 10 +++++-----
src/components/Splash/SplashScreen.tsx | 2 +-
src/components/Splash/SplashScreenError.tsx | 2 +-
.../TimeStepSelector.spec.tsx | 3 +--
.../TimeStepSelector/TimeStepSelector.tsx | 4 +---
.../TotalConsumption.spec.tsx | 3 +--
.../TotalConsumption/TotalConsumption.tsx | 3 +--
src/doctypes/index.ts | 5 +++++
src/enum/konnectorUpdate.enum.ts | 6 ------
src/{enum => enums}/dacc.enum.ts | 0
src/{enum => enums}/dataload.enum.ts | 0
src/{enum => enums}/ecogesture.enum.ts | 0
src/{enum => enums}/ecogestureForm.enum.ts | 0
src/{enum => enums}/fluid.enum.ts | 0
src/{enum => enums}/fluidSlug.enum.ts | 0
src/enums/index.ts | 19 ++++++++++++++++++
src/{enum => enums}/jobState.enum.ts | 0
.../konnectorStatus.enum.ts} | 7 +++++++
src/{enum => enums}/profileType.enum.ts | 0
src/{enum => enums}/screen.enum.ts | 0
src/{enum => enums}/sgeStep.enum.ts | 0
src/{enum => enums}/timeStep.enum.ts | 0
src/{enum => enums}/usageEvent.enum.ts | 0
.../usageEventProperties.enum.ts | 0
src/{enum => enums}/userAction.enum.ts | 0
src/{enum => enums}/userChallenge.enum.ts | 0
src/{enum => enums}/userDuel.enum.ts | 0
src/{enum => enums}/userExploration.enum.ts | 0
src/{enum => enums}/userQuiz.enum.ts | 0
src/migrations/migration.data.ts | 2 +-
src/migrations/migration.service.ts | 6 ++----
src/migrations/migration.ts | 4 ++--
src/migrations/migration.type.ts | 2 +-
src/models/action.model.ts | 2 +-
src/models/challenge.model.ts | 5 +----
src/models/chart.model.ts | 2 +-
src/models/config.model.ts | 2 +-
src/models/dataload.model.ts | 2 +-
src/models/duel.model.ts | 3 +--
src/models/ecogesture.model.ts | 3 +--
src/models/exploration.model.ts | 6 +-----
src/models/fluid.model.ts | 2 +-
src/models/fluidPrice.model.ts | 2 +-
src/models/global.model.ts | 4 +---
src/models/index.ts | 7 +++++++
src/models/modal.model.ts | 2 +-
src/models/profileEcogesture.model.ts | 2 +-
src/models/profileType.model.ts | 6 +++---
src/models/quiz.model.ts | 4 ++--
src/models/usageEvent.model.ts | 2 +-
src/services/action.service.spec.ts | 3 +--
src/services/action.service.ts | 10 ++++++----
src/services/challenge.service.spec.ts | 8 ++++----
src/services/challenge.service.ts | 13 ++++++------
src/services/connection.service.ts | 2 +-
src/services/consumption.service.spec.ts | 4 +---
src/services/consumption.service.ts | 6 ++----
.../consumptionFormatter.service.spec.ts | 4 +---
src/services/consumptionFormatter.service.ts | 4 +---
.../consumptionValidator.service.spec.ts | 3 +--
src/services/consumptionValidator.service.ts | 3 +--
src/services/converter.service.spec.ts | 2 +-
src/services/converter.service.ts | 2 +-
src/services/customPopup.service.ts | 4 ++--
src/services/dateChart.service.spec.ts | 2 +-
src/services/dateChart.service.ts | 3 +--
src/services/duel.service.spec.ts | 3 +--
src/services/duel.service.ts | 6 ++----
src/services/ecogesture.service.spec.ts | 3 +--
src/services/ecogesture.service.ts | 13 +++++++-----
.../enedisMonthlyAnalysisData.service.ts | 5 ++---
src/services/exploration.service.spec.ts | 2 +-
src/services/exploration.service.ts | 4 ++--
src/services/fluid.service.spec.ts | 5 ++---
src/services/fluid.service.ts | 12 ++++++++---
src/services/fluidsPrices.service.spec.ts | 2 +-
src/services/fluidsPrices.service.ts | 2 +-
src/services/initialization.service.spec.ts | 2 +-
src/services/initialization.service.ts | 11 +++++-----
src/services/konnectorStatus.service.ts | 2 +-
src/services/partnersInfo.service.ts | 4 ++--
.../profileEcogesture.service.spec.ts | 2 +-
src/services/profileEcogesture.service.ts | 2 +-
src/services/profileEcogestureForm.service.ts | 9 +++++----
src/services/profileType.service.spec.ts | 2 +-
src/services/profileType.service.ts | 10 +++++-----
src/services/profileTypeForm.service.ts | 6 +++---
src/services/queryRunner.service.spec.ts | 4 +---
src/services/queryRunner.service.ts | 4 +---
src/services/quiz.service.spec.ts | 12 +++++------
src/services/quiz.service.ts | 6 +++---
src/services/timePeriod.service.spec.ts | 3 +--
src/services/timePeriod.service.ts | 3 +--
src/services/usageEvent.service.spec.ts | 2 +-
src/services/usageEvent.service.ts | 2 +-
src/store/challenge/challenge.slice.spec.ts | 3 +--
src/store/challenge/challenge.slice.ts | 2 +-
src/store/chart/chart.slice.spec.ts | 2 +-
src/store/chart/chart.slice.ts | 2 +-
src/store/global/global.slice.spec.ts | 5 +----
src/store/global/global.slice.ts | 9 +++------
.../profileEcogesture.actions.ts | 4 ++--
.../profileEcogesture.reducer.ts | 4 ++--
.../profileType/profileType.slice.spec.ts | 6 +++---
src/store/profileType/profileType.slice.ts | 4 ++--
src/store/store.ts | 4 ++--
src/targets/services/aggregatorUsageEvents.ts | 20 +++++++++++--------
src/targets/services/consumptionAlert.ts | 2 +-
.../services/enedisHalfHourMonthlyAnalysis.ts | 3 +--
src/targets/services/fluidsPrices.ts | 9 +++++----
.../services/monthlyReportNotification.ts | 11 +++-------
src/utils/date.spec.ts | 3 +--
src/utils/date.ts | 3 +--
src/utils/picto.spec.ts | 2 +-
src/utils/picto.ts | 20 +++++++++----------
src/utils/utils.spec.ts | 11 ++++++----
src/utils/utils.ts | 11 ++++++----
tests/__mocks__/actionData.mock.ts | 2 +-
tests/__mocks__/chartData.mock.ts | 4 ++--
tests/__mocks__/customPopup.mock.ts | 2 +-
tests/__mocks__/duelData.mock.ts | 4 ++--
tests/__mocks__/ecogesturesData.mock.ts | 3 +--
.../enedisMonthlyAnalysisData.mock.ts | 4 ++--
tests/__mocks__/explorationData.mock.ts | 5 +----
tests/__mocks__/fluidStatusData.mock.ts | 3 +--
tests/__mocks__/profileEcogesture.mock.ts | 12 +++++------
tests/__mocks__/profileType.mock.ts | 10 +++-------
tests/__mocks__/quizData.mock.ts | 8 ++++----
tests/__mocks__/store/chart.state.mock.ts | 2 +-
tests/__mocks__/store/global.state.mock.ts | 5 +----
.../__mocks__/store/profileType.state.mock.ts | 4 ++--
tests/__mocks__/usageEventsData.mock.ts | 2 +-
tests/__mocks__/userChallengeData.mock.ts | 6 +++---
284 files changed, 475 insertions(+), 560 deletions(-)
rename src/{models/step.model.ts => components/Connection/PartnerConnectModal/StepContent.interface.ts} (71%)
delete mode 100644 src/enum/konnectorUpdate.enum.ts
rename src/{enum => enums}/dacc.enum.ts (100%)
rename src/{enum => enums}/dataload.enum.ts (100%)
rename src/{enum => enums}/ecogesture.enum.ts (100%)
rename src/{enum => enums}/ecogestureForm.enum.ts (100%)
rename src/{enum => enums}/fluid.enum.ts (100%)
rename src/{enum => enums}/fluidSlug.enum.ts (100%)
create mode 100644 src/enums/index.ts
rename src/{enum => enums}/jobState.enum.ts (100%)
rename src/{enum/konnectorError.enum.ts => enums/konnectorStatus.enum.ts} (57%)
rename src/{enum => enums}/profileType.enum.ts (100%)
rename src/{enum => enums}/screen.enum.ts (100%)
rename src/{enum => enums}/sgeStep.enum.ts (100%)
rename src/{enum => enums}/timeStep.enum.ts (100%)
rename src/{enum => enums}/usageEvent.enum.ts (100%)
rename src/{enum => enums}/usageEventProperties.enum.ts (100%)
rename src/{enum => enums}/userAction.enum.ts (100%)
rename src/{enum => enums}/userChallenge.enum.ts (100%)
rename src/{enum => enums}/userDuel.enum.ts (100%)
rename src/{enum => enums}/userExploration.enum.ts (100%)
rename src/{enum => enums}/userQuiz.enum.ts (100%)
diff --git a/src/components/Action/ActionCard.tsx b/src/components/Action/ActionCard.tsx
index 277cc481c..119f04b52 100644
--- a/src/components/Action/ActionCard.tsx
+++ b/src/components/Action/ActionCard.tsx
@@ -3,7 +3,7 @@ import defaultIcon from 'assets/icons/visu/ecogesture/default.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import EcogestureModal from 'components/Ecogesture/EcogestureModal'
import { useClient } from 'cozy-client'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
import { Ecogesture } from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import UsageEventService from 'services/usageEvent.service'
diff --git a/src/components/Action/ActionDone.tsx b/src/components/Action/ActionDone.tsx
index 450868a8e..0fb8bf669 100644
--- a/src/components/Action/ActionDone.tsx
+++ b/src/components/Action/ActionDone.tsx
@@ -3,8 +3,7 @@ import starFilled from 'assets/icons/visu/challenge/starFilled.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UsageEventType, UserChallengeUpdateFlag } from 'enums'
import { UserChallenge } from 'models'
import React, { useCallback } from 'react'
import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Action/ActionModal.tsx b/src/components/Action/ActionModal.tsx
index 01aa9f3ec..65cf21142 100644
--- a/src/components/Action/ActionModal.tsx
+++ b/src/components/Action/ActionModal.tsx
@@ -4,7 +4,7 @@ import chronoMini from 'assets/icons/visu/action/chrono-mini.svg'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UserChallengeUpdateFlag } from 'enums'
import { Ecogesture, UserChallenge } from 'models'
import React, { useCallback } from 'react'
import ChallengeService from 'services/challenge.service'
diff --git a/src/components/Action/ActionOnGoing.spec.tsx b/src/components/Action/ActionOnGoing.spec.tsx
index e4d9d1be1..67d5b6a92 100644
--- a/src/components/Action/ActionOnGoing.spec.tsx
+++ b/src/components/Action/ActionOnGoing.spec.tsx
@@ -1,6 +1,6 @@
import { Button } from '@material-ui/core'
import EcogestureModal from 'components/Ecogesture/EcogestureModal'
-import { UserActionState } from 'enum/userAction.enum'
+import { UserActionState } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import { DateTime } from 'luxon'
diff --git a/src/components/Action/ActionView.spec.tsx b/src/components/Action/ActionView.spec.tsx
index be9251b14..5bf2322c8 100644
--- a/src/components/Action/ActionView.spec.tsx
+++ b/src/components/Action/ActionView.spec.tsx
@@ -1,5 +1,5 @@
import ActionView from 'components/Action/ActionView'
-import { UserActionState } from 'enum/userAction.enum'
+import { UserActionState } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import React from 'react'
diff --git a/src/components/Action/ActionView.tsx b/src/components/Action/ActionView.tsx
index a530002f1..cb38bbb44 100644
--- a/src/components/Action/ActionView.tsx
+++ b/src/components/Action/ActionView.tsx
@@ -4,7 +4,7 @@ import ActionOnGoing from 'components/Action/ActionOnGoing'
import Content from 'components/Content/Content'
import CozyBar from 'components/Header/CozyBar'
import Header from 'components/Header/Header'
-import { UserActionState } from 'enum/userAction.enum'
+import { UserActionState } from 'enums'
import { UserChallenge } from 'models'
import React, { useState } from 'react'
import { useAppSelector } from 'store/hooks'
diff --git a/src/components/Analysis/AnalysisView.tsx b/src/components/Analysis/AnalysisView.tsx
index 650eee647..048a04a54 100644
--- a/src/components/Analysis/AnalysisView.tsx
+++ b/src/components/Analysis/AnalysisView.tsx
@@ -4,8 +4,7 @@ import DateNavigator from 'components/DateNavigator/DateNavigator'
import CozyBar from 'components/Header/CozyBar'
import Header from 'components/Header/Header'
import { useClient } from 'cozy-client'
-import { TimeStep } from 'enum/timeStep.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { TimeStep, UsageEventType } from 'enums'
import { DateTime } from 'luxon'
import React, { useCallback, useEffect, useState } from 'react'
import { useLocation } from 'react-router-dom'
diff --git a/src/components/Analysis/Comparison/Comparison.tsx b/src/components/Analysis/Comparison/Comparison.tsx
index b9bad0ee5..f488816e3 100644
--- a/src/components/Analysis/Comparison/Comparison.tsx
+++ b/src/components/Analysis/Comparison/Comparison.tsx
@@ -2,8 +2,7 @@ import { Button } from '@material-ui/core'
import Loader from 'components/Loader/Loader'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { PerformanceIndicator } from 'models'
import React, { useEffect, useMemo, useState } from 'react'
import ConsumptionService from 'services/consumption.service'
diff --git a/src/components/Analysis/Comparison/FluidPerformanceIndicator.tsx b/src/components/Analysis/Comparison/FluidPerformanceIndicator.tsx
index d5af35ce3..195e7f24f 100644
--- a/src/components/Analysis/Comparison/FluidPerformanceIndicator.tsx
+++ b/src/components/Analysis/Comparison/FluidPerformanceIndicator.tsx
@@ -1,6 +1,6 @@
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { DateTime } from 'luxon'
import { PerformanceIndicator } from 'models'
import React from 'react'
diff --git a/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourChart.tsx b/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourChart.tsx
index b63408d3b..1911da91c 100644
--- a/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourChart.tsx
+++ b/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourChart.tsx
@@ -3,8 +3,7 @@ import AxisRight from 'components/Charts/AxisRight'
import Bar from 'components/Charts/Bar'
import { useChartResize } from 'components/Hooks/useChartResize'
import { scaleBand, ScaleBand, scaleLinear, ScaleLinear } from 'd3-scale'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { Dataload } from 'models'
import React, { useRef } from 'react'
diff --git a/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourMonthlyAnalysis.tsx b/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourMonthlyAnalysis.tsx
index a62f302fa..f447f6807 100644
--- a/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourMonthlyAnalysis.tsx
+++ b/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourMonthlyAnalysis.tsx
@@ -7,13 +7,13 @@ import Loader from 'components/Loader/Loader'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
-import { FluidPrice, PerformanceIndicator } from 'models'
+import { FluidType, TimeStep } from 'enums'
import {
AggregatedEnedisMonthlyDataloads,
EnedisMonthlyAnalysisData,
-} from 'models/enedisMonthlyAnalysis'
+ FluidPrice,
+ PerformanceIndicator,
+} from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import ConsumptionService from 'services/consumption.service'
import EnedisMonthlyAnalysisDataService from 'services/enedisMonthlyAnalysisData.service'
diff --git a/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.spec.tsx b/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.spec.tsx
index d1ef094ee..74b19c9c8 100644
--- a/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.spec.tsx
+++ b/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.spec.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import React from 'react'
diff --git a/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.tsx b/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.tsx
index d0296f384..cbc382550 100644
--- a/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.tsx
+++ b/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.tsx
@@ -10,9 +10,7 @@ import Loader from 'components/Loader/Loader'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { DataloadSectionType } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { DataloadSectionType, FluidType, TimeStep } from 'enums'
import { Datachart, Dataload, TimePeriod } from 'models'
import React, { useEffect, useRef, useState } from 'react'
import ConsumptionDataManager from 'services/consumption.service'
diff --git a/src/components/Analysis/MonthlyAnalysis.tsx b/src/components/Analysis/MonthlyAnalysis.tsx
index 8c9d8828a..a8b4c3065 100644
--- a/src/components/Analysis/MonthlyAnalysis.tsx
+++ b/src/components/Analysis/MonthlyAnalysis.tsx
@@ -1,8 +1,7 @@
import { Fade } from '@material-ui/core'
import Loader from 'components/Loader/Loader'
import { useClient } from 'cozy-client'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { PerformanceIndicator, TimePeriod } from 'models'
import React, { useEffect, useMemo, useState } from 'react'
import ConsumptionService from 'services/consumption.service'
diff --git a/src/components/Analysis/ProfileComparator/ProfileComparator.spec.tsx b/src/components/Analysis/ProfileComparator/ProfileComparator.spec.tsx
index ca8ee2671..be5f00a3b 100644
--- a/src/components/Analysis/ProfileComparator/ProfileComparator.spec.tsx
+++ b/src/components/Analysis/ProfileComparator/ProfileComparator.spec.tsx
@@ -1,7 +1,7 @@
/* eslint-disable react/display-name */
import { Accordion } from '@material-ui/core'
import Button from '@material-ui/core/Button'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { mount } from 'enzyme'
import { PerformanceIndicator } from 'models'
import React from 'react'
diff --git a/src/components/Analysis/ProfileComparator/ProfileComparator.tsx b/src/components/Analysis/ProfileComparator/ProfileComparator.tsx
index dfde6b4ab..c3c0cf07a 100644
--- a/src/components/Analysis/ProfileComparator/ProfileComparator.tsx
+++ b/src/components/Analysis/ProfileComparator/ProfileComparator.tsx
@@ -13,9 +13,8 @@ import Loader from 'components/Loader/Loader'
import { Client, useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
-import { PerformanceIndicator } from 'models'
-import { MonthlyForecast, ProfileType } from 'models/profileType.model'
+import { FluidType } from 'enums'
+import { MonthlyForecast, PerformanceIndicator, ProfileType } from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import { useNavigate } from 'react-router-dom'
import ProfileTypeService from 'services/profileType.service'
diff --git a/src/components/Analysis/ProfileComparator/ProfileComparatorRow.spec.tsx b/src/components/Analysis/ProfileComparator/ProfileComparatorRow.spec.tsx
index 61f3aeac7..39632fd0b 100644
--- a/src/components/Analysis/ProfileComparator/ProfileComparatorRow.spec.tsx
+++ b/src/components/Analysis/ProfileComparator/ProfileComparatorRow.spec.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { mount } from 'enzyme'
import { MonthlyForecast } from 'models'
import React from 'react'
diff --git a/src/components/Analysis/ProfileComparator/ProfileComparatorRow.tsx b/src/components/Analysis/ProfileComparator/ProfileComparatorRow.tsx
index 6091ef854..adea63d2c 100644
--- a/src/components/Analysis/ProfileComparator/ProfileComparatorRow.tsx
+++ b/src/components/Analysis/ProfileComparator/ProfileComparatorRow.tsx
@@ -2,7 +2,7 @@ import EuroIcon from 'assets/icons/ico/euro-icon.svg'
import classNames from 'classnames'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { MonthlyForecast } from 'models'
import React from 'react'
import ConverterService from 'services/converter.service'
diff --git a/src/components/Analysis/TotalAnalysisChart/PieChart.spec.tsx b/src/components/Analysis/TotalAnalysisChart/PieChart.spec.tsx
index 1586ba71b..064408f84 100644
--- a/src/components/Analysis/TotalAnalysisChart/PieChart.spec.tsx
+++ b/src/components/Analysis/TotalAnalysisChart/PieChart.spec.tsx
@@ -1,4 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
+import { DataloadState } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import { DataloadValueDetail } from 'models'
diff --git a/src/components/Analysis/TotalAnalysisChart/TotalAnalysisChart.spec.tsx b/src/components/Analysis/TotalAnalysisChart/TotalAnalysisChart.spec.tsx
index c3b08b9ea..f2481bfaf 100644
--- a/src/components/Analysis/TotalAnalysisChart/TotalAnalysisChart.spec.tsx
+++ b/src/components/Analysis/TotalAnalysisChart/TotalAnalysisChart.spec.tsx
@@ -1,5 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadState, FluidType } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import { DateTime } from 'luxon'
diff --git a/src/components/Analysis/TotalAnalysisChart/TotalAnalysisChart.tsx b/src/components/Analysis/TotalAnalysisChart/TotalAnalysisChart.tsx
index 9d6824018..37dccf554 100644
--- a/src/components/Analysis/TotalAnalysisChart/TotalAnalysisChart.tsx
+++ b/src/components/Analysis/TotalAnalysisChart/TotalAnalysisChart.tsx
@@ -3,8 +3,7 @@ import Loader from 'components/Loader/Loader'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { DataloadValueDetail, TimePeriod } from 'models'
import React, { useEffect, useState } from 'react'
import ConsumptionDataManager from 'services/consumption.service'
diff --git a/src/components/Challenge/ChallengeCard.tsx b/src/components/Challenge/ChallengeCard.tsx
index a6788d190..0f297d85e 100644
--- a/src/components/Challenge/ChallengeCard.tsx
+++ b/src/components/Challenge/ChallengeCard.tsx
@@ -1,4 +1,4 @@
-import { UserChallengeState } from 'enum/userChallenge.enum'
+import { UserChallengeState } from 'enums'
import { UserChallenge } from 'models'
import React from 'react'
import ChallengeCardDone from './ChallengeCardDone'
diff --git a/src/components/Challenge/ChallengeCardDone.tsx b/src/components/Challenge/ChallengeCardDone.tsx
index dc4d294b7..59e2c9e27 100644
--- a/src/components/Challenge/ChallengeCardDone.tsx
+++ b/src/components/Challenge/ChallengeCardDone.tsx
@@ -4,10 +4,7 @@ import classNames from 'classnames'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import {
- UserChallengeSuccess,
- UserChallengeUpdateFlag,
-} from 'enum/userChallenge.enum'
+import { UserChallengeSuccess, UserChallengeUpdateFlag } from 'enums'
import { UserChallenge } from 'models'
import React, { useEffect, useState } from 'react'
import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Challenge/ChallengeCardOnGoing.tsx b/src/components/Challenge/ChallengeCardOnGoing.tsx
index 4157be83e..828ef893f 100644
--- a/src/components/Challenge/ChallengeCardOnGoing.tsx
+++ b/src/components/Challenge/ChallengeCardOnGoing.tsx
@@ -10,11 +10,13 @@ import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import Loader from 'components/Loader/Loader'
import { Client, useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UserActionState } from 'enum/userAction.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
-import { UserExplorationState } from 'enum/userExploration.enum'
-import { UserQuizState } from 'enum/userQuiz.enum'
+import {
+ UserActionState,
+ UserChallengeUpdateFlag,
+ UserDuelState,
+ UserExplorationState,
+ UserQuizState,
+} from 'enums'
import { UserChallenge } from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Challenge/ChallengeCardUnlocked.spec.tsx b/src/components/Challenge/ChallengeCardUnlocked.spec.tsx
index a5f422cda..c65af921d 100644
--- a/src/components/Challenge/ChallengeCardUnlocked.spec.tsx
+++ b/src/components/Challenge/ChallengeCardUnlocked.spec.tsx
@@ -1,6 +1,6 @@
import { Button } from '@material-ui/core'
import defaultIcon from 'assets/icons/visu/challenge/challengeLocked.svg'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
diff --git a/src/components/Challenge/ChallengeCardUnlocked.tsx b/src/components/Challenge/ChallengeCardUnlocked.tsx
index 4276b6d54..cfbda19fd 100644
--- a/src/components/Challenge/ChallengeCardUnlocked.tsx
+++ b/src/components/Challenge/ChallengeCardUnlocked.tsx
@@ -3,8 +3,7 @@ import defaultIcon from 'assets/icons/visu/challenge/challengeLocked.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { Client, useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidState } from 'enum/fluid.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { FluidState, UsageEventType } from 'enums'
import { UserChallenge } from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import ChallengeService from 'services/challenge.service'
diff --git a/src/components/Challenge/ChallengeView.tsx b/src/components/Challenge/ChallengeView.tsx
index 0817c84b3..bf2652648 100644
--- a/src/components/Challenge/ChallengeView.tsx
+++ b/src/components/Challenge/ChallengeView.tsx
@@ -5,7 +5,7 @@ import Content from 'components/Content/Content'
import CozyBar from 'components/Header/CozyBar'
import Header from 'components/Header/Header'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UserChallengeState } from 'enum/userChallenge.enum'
+import { UserChallengeState } from 'enums'
import React, { useCallback, useEffect, useState } from 'react'
import { useAppSelector } from 'store/hooks'
import ChallengeCard from './ChallengeCard'
diff --git a/src/components/Charts/AxisBottom.spec.tsx b/src/components/Charts/AxisBottom.spec.tsx
index 8e1156059..8bde11844 100644
--- a/src/components/Charts/AxisBottom.spec.tsx
+++ b/src/components/Charts/AxisBottom.spec.tsx
@@ -1,5 +1,5 @@
import { scaleBand, ScaleBand } from 'd3-scale'
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
import { mount } from 'enzyme'
import { DateTime } from 'luxon'
import React from 'react'
diff --git a/src/components/Charts/AxisBottom.tsx b/src/components/Charts/AxisBottom.tsx
index 4e69f565b..11a5410ec 100644
--- a/src/components/Charts/AxisBottom.tsx
+++ b/src/components/Charts/AxisBottom.tsx
@@ -1,5 +1,5 @@
import { ScaleBand } from 'd3-scale'
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
import { capitalize } from 'lodash'
import { DateTime } from 'luxon'
import { Dataload } from 'models'
diff --git a/src/components/Charts/AxisRight.spec.tsx b/src/components/Charts/AxisRight.spec.tsx
index 66f7230e2..1e3c9eb39 100644
--- a/src/components/Charts/AxisRight.spec.tsx
+++ b/src/components/Charts/AxisRight.spec.tsx
@@ -1,5 +1,5 @@
import { scaleLinear } from 'd3'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import AxisRight from './AxisRight'
diff --git a/src/components/Charts/AxisRight.tsx b/src/components/Charts/AxisRight.tsx
index 7ba81a2e9..656eb8e82 100644
--- a/src/components/Charts/AxisRight.tsx
+++ b/src/components/Charts/AxisRight.tsx
@@ -2,7 +2,7 @@ import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { axisRight } from 'd3-axis'
import { ScaleLinear } from 'd3-scale'
import { select, selectAll } from 'd3-selection'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import React, { useEffect, useRef } from 'react'
interface AxisRightProps {
diff --git a/src/components/Charts/Bar.spec.tsx b/src/components/Charts/Bar.spec.tsx
index 764fef238..0e7def2e9 100644
--- a/src/components/Charts/Bar.spec.tsx
+++ b/src/components/Charts/Bar.spec.tsx
@@ -1,6 +1,5 @@
import { scaleBand, ScaleBand, scaleLinear } from 'd3'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { mount } from 'enzyme'
import { DateTime } from 'luxon'
import React from 'react'
diff --git a/src/components/Charts/Bar.tsx b/src/components/Charts/Bar.tsx
index 8b8a12f73..8cadcc67f 100644
--- a/src/components/Charts/Bar.tsx
+++ b/src/components/Charts/Bar.tsx
@@ -1,7 +1,6 @@
import { ScaleBand, ScaleLinear } from 'd3-scale'
import { detect } from 'detect-browser'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { Dataload } from 'models'
import React, { useEffect, useState } from 'react'
diff --git a/src/components/Charts/BarChart.tsx b/src/components/Charts/BarChart.tsx
index fb4378fbe..deebbe46e 100644
--- a/src/components/Charts/BarChart.tsx
+++ b/src/components/Charts/BarChart.tsx
@@ -2,9 +2,7 @@ import AxisBottom from 'components/Charts/AxisBottom'
import AxisRight from 'components/Charts/AxisRight'
import Bar from 'components/Charts/Bar'
import { scaleBand, ScaleBand, scaleLinear, ScaleLinear } from 'd3-scale'
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { DataloadState, FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { Datachart } from 'models'
import React from 'react'
diff --git a/src/components/CommonKit/Card/StyledCard.spec.tsx b/src/components/CommonKit/Card/StyledCard.spec.tsx
index e302e4f5c..26d2bc83d 100644
--- a/src/components/CommonKit/Card/StyledCard.spec.tsx
+++ b/src/components/CommonKit/Card/StyledCard.spec.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import StyledCard from './StyledCard'
diff --git a/src/components/CommonKit/Card/StyledCard.tsx b/src/components/CommonKit/Card/StyledCard.tsx
index 39e472c59..562050fb3 100644
--- a/src/components/CommonKit/Card/StyledCard.tsx
+++ b/src/components/CommonKit/Card/StyledCard.tsx
@@ -3,7 +3,7 @@ import CardActionArea, {
} from '@material-ui/core/CardActionArea'
import CardContent from '@material-ui/core/CardContent'
import { withStyles } from '@material-ui/core/styles'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import React, { ReactNode } from 'react'
import { getFluidName } from 'utils/utils'
diff --git a/src/components/CommonKit/Switch/StyledSwitch.spec.tsx b/src/components/CommonKit/Switch/StyledSwitch.spec.tsx
index b3605a86c..8af7bc846 100644
--- a/src/components/CommonKit/Switch/StyledSwitch.spec.tsx
+++ b/src/components/CommonKit/Switch/StyledSwitch.spec.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import StyledSwitch from './StyledSwitch'
diff --git a/src/components/CommonKit/Switch/StyledSwitch.tsx b/src/components/CommonKit/Switch/StyledSwitch.tsx
index 87535cd0b..d8136853e 100644
--- a/src/components/CommonKit/Switch/StyledSwitch.tsx
+++ b/src/components/CommonKit/Switch/StyledSwitch.tsx
@@ -1,6 +1,6 @@
import { withStyles } from '@material-ui/core/styles'
import Switch, { SwitchProps } from '@material-ui/core/Switch'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import React from 'react'
const SwitchBase = withStyles({
diff --git a/src/components/Connection/Connection.tsx b/src/components/Connection/Connection.tsx
index 9a14f999e..7097c8f0c 100644
--- a/src/components/Connection/Connection.tsx
+++ b/src/components/Connection/Connection.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { FluidConnection, FluidStatus } from 'models'
import React, { useCallback } from 'react'
import { updateFluidConnection } from 'store/global/global.slice'
diff --git a/src/components/Connection/ConnectionResult.tsx b/src/components/Connection/ConnectionResult.tsx
index 2c9684851..5c7efaac4 100644
--- a/src/components/Connection/ConnectionResult.tsx
+++ b/src/components/Connection/ConnectionResult.tsx
@@ -4,8 +4,7 @@ import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import Loader from 'components/Loader/Loader'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
-import { KonnectorUpdate } from 'enum/konnectorUpdate.enum'
+import { FluidType, KonnectorUpdate } from 'enums'
import { DateTime } from 'luxon'
import {
Account,
diff --git a/src/components/Connection/ExpiredConsentModal.spec.tsx b/src/components/Connection/ExpiredConsentModal.spec.tsx
index 0e87a5e2b..18f57c69e 100644
--- a/src/components/Connection/ExpiredConsentModal.spec.tsx
+++ b/src/components/Connection/ExpiredConsentModal.spec.tsx
@@ -1,5 +1,5 @@
import { Button } from '@material-ui/core'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import React from 'react'
diff --git a/src/components/Connection/ExpiredConsentModal.tsx b/src/components/Connection/ExpiredConsentModal.tsx
index 872b048a8..5176b5e04 100644
--- a/src/components/Connection/ExpiredConsentModal.tsx
+++ b/src/components/Connection/ExpiredConsentModal.tsx
@@ -5,7 +5,7 @@ import EnedisIcon from 'assets/icons/ico/consent-outdated-enedis.svg'
import GrdfIcon from 'assets/icons/ico/consent-outdated-grdf.svg'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { AccountSgeData } from 'models'
import React, { useCallback } from 'react'
import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Connection/FormLogin.tsx b/src/components/Connection/FormLogin.tsx
index e3c88579c..da3470403 100644
--- a/src/components/Connection/FormLogin.tsx
+++ b/src/components/Connection/FormLogin.tsx
@@ -5,7 +5,7 @@ import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
import useKonnectorAuth from 'components/Hooks/useKonnectorAuth'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { Account, AccountAuthData, FluidStatus } from 'models'
import React, { useEffect, useState } from 'react'
import { getPartnerPicto } from 'utils/picto'
diff --git a/src/components/Connection/FormOAuth.tsx b/src/components/Connection/FormOAuth.tsx
index 471fe2eb9..5bfd9245e 100644
--- a/src/components/Connection/FormOAuth.tsx
+++ b/src/components/Connection/FormOAuth.tsx
@@ -2,7 +2,7 @@ import Button from '@material-ui/core/Button'
import { useClient } from 'cozy-client'
import { OAuthWindow } from 'cozy-harvest-lib/dist/components/OAuthWindow'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
import { FluidStatus, Konnector } from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import UsageEventService from 'services/usageEvent.service'
diff --git a/src/components/Connection/GRDFConnect/GrdfInit.tsx b/src/components/Connection/GRDFConnect/GrdfInit.tsx
index d86b90fca..f6ff3a663 100644
--- a/src/components/Connection/GRDFConnect/GrdfInit.tsx
+++ b/src/components/Connection/GRDFConnect/GrdfInit.tsx
@@ -1,6 +1,6 @@
import GrdfConnectModal from 'components/Connection/PartnerConnectModal/GrdfConnectModal'
import { useClient } from 'cozy-client'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
import { FluidConnection, FluidStatus, Konnector, Trigger } from 'models'
import React, { useCallback, useState } from 'react'
import AccountService from 'services/account.service'
diff --git a/src/components/Connection/PartnerConnectModal/EpglConnectModal.tsx b/src/components/Connection/PartnerConnectModal/EpglConnectModal.tsx
index d9f2fe121..e465daa66 100644
--- a/src/components/Connection/PartnerConnectModal/EpglConnectModal.tsx
+++ b/src/components/Connection/PartnerConnectModal/EpglConnectModal.tsx
@@ -2,11 +2,11 @@ import { Button, Dialog, IconButton } from '@material-ui/core'
import CloseIcon from 'assets/icons/ico/close.svg'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { Step } from 'models/step.model'
import React, { useEffect, useState } from 'react'
import './PartnerConnectModal.scss'
import EpglCreateAccount from './Steps/EpglCreateAccount'
import EpglDoYouHaveAccount from './Steps/EpglDoYouHaveAccount'
+import { StepContent } from './stepContent.interface'
enum StepEnum {
DoYouHaveAccount,
@@ -48,7 +48,7 @@ const EpglConnectModal = ({
handleCloseClick()
}
- const steps: Record<StepEnum, Step> = {
+ const steps: Record<StepEnum, StepContent> = {
[StepEnum.DoYouHaveAccount]: {
content: <EpglDoYouHaveAccount />,
leftButton: (
diff --git a/src/components/Connection/PartnerConnectModal/GrdfConnectModal.tsx b/src/components/Connection/PartnerConnectModal/GrdfConnectModal.tsx
index ee371a713..267225cf9 100644
--- a/src/components/Connection/PartnerConnectModal/GrdfConnectModal.tsx
+++ b/src/components/Connection/PartnerConnectModal/GrdfConnectModal.tsx
@@ -4,12 +4,12 @@ import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import FormOAuth from 'components/Connection/FormOAuth'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { FluidStatus, Konnector } from 'models'
-import { Step } from 'models/step.model'
import React, { useEffect, useState } from 'react'
import './PartnerConnectModal.scss'
import GrdfCreateAccount from './Steps/GrdfCreateAccount'
import GrdfDoYouHaveAccount from './Steps/GrdfDoYouHaveAccount'
import GiveConsent from './Steps/GrdfGiveConsent'
+import { StepContent } from './stepContent.interface'
enum StepEnum {
DoYouHaveAccount,
@@ -57,7 +57,7 @@ const GrdfConnectModal = ({
showForm ? handleCloseClick() : setCurrentStep(StepEnum.DoYouHaveAccount)
}
- const steps: Record<StepEnum, Step> = {
+ const steps: Record<StepEnum, StepContent> = {
[StepEnum.DoYouHaveAccount]: {
content: <GrdfDoYouHaveAccount />,
leftButton: (
diff --git a/src/models/step.model.ts b/src/components/Connection/PartnerConnectModal/StepContent.interface.ts
similarity index 71%
rename from src/models/step.model.ts
rename to src/components/Connection/PartnerConnectModal/StepContent.interface.ts
index f4255471e..636a1283d 100644
--- a/src/models/step.model.ts
+++ b/src/components/Connection/PartnerConnectModal/StepContent.interface.ts
@@ -1,4 +1,4 @@
-export interface Step {
+export interface StepContent {
content: JSX.Element
leftButton: JSX.Element
rightButton: JSX.Element
diff --git a/src/components/Connection/SGEConnect/SgeConnectView.spec.tsx b/src/components/Connection/SGEConnect/SgeConnectView.spec.tsx
index ed87bc98d..9b478d18b 100644
--- a/src/components/Connection/SGEConnect/SgeConnectView.spec.tsx
+++ b/src/components/Connection/SGEConnect/SgeConnectView.spec.tsx
@@ -1,4 +1,4 @@
-import { SgeStep } from 'enum/sgeStep.enum'
+import { SgeStep } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import React from 'react'
diff --git a/src/components/Connection/SGEConnect/SgeConnectView.tsx b/src/components/Connection/SGEConnect/SgeConnectView.tsx
index 2a0377228..4b2363e3b 100644
--- a/src/components/Connection/SGEConnect/SgeConnectView.tsx
+++ b/src/components/Connection/SGEConnect/SgeConnectView.tsx
@@ -3,8 +3,8 @@ import FormNavigation from 'components/FormGlobal/FormNavigation'
import FormProgress from 'components/FormGlobal/FormProgress'
import CozyBar from 'components/Header/CozyBar'
import Header from 'components/Header/Header'
-import { SgeStep } from 'enum/sgeStep.enum'
-import { SgeStore } from 'models/sgeStore.model'
+import { SgeStep } from 'enums'
+import { SgeStore } from 'models'
import React, { useCallback, useState } from 'react'
import { updateSgeStore } from 'store/global/global.slice'
import { useAppDispatch, useAppSelector } from 'store/hooks'
diff --git a/src/components/Connection/SGEConnect/StepAddress.tsx b/src/components/Connection/SGEConnect/StepAddress.tsx
index 8fe99e04d..da040f501 100644
--- a/src/components/Connection/SGEConnect/StepAddress.tsx
+++ b/src/components/Connection/SGEConnect/StepAddress.tsx
@@ -1,5 +1,5 @@
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { SgeStore } from 'models/sgeStore.model'
+import { SgeStore } from 'models'
import React from 'react'
import { SGEKeysForm } from './SgeConnectView'
diff --git a/src/components/Connection/SGEConnect/StepConsent.tsx b/src/components/Connection/SGEConnect/StepConsent.tsx
index 4997b3b81..2dec320d8 100644
--- a/src/components/Connection/SGEConnect/StepConsent.tsx
+++ b/src/components/Connection/SGEConnect/StepConsent.tsx
@@ -1,6 +1,6 @@
import classNames from 'classnames'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { SgeStore } from 'models/sgeStore.model'
+import { SgeStore } from 'models'
import React from 'react'
import { decoreText } from 'utils/decoreText'
import { SGEKeysForm } from './SgeConnectView'
@@ -9,12 +9,7 @@ interface StepConsentProps {
sgeState: SgeStore
onChange: (key: SGEKeysForm, value: boolean) => void
}
-const StepConsent = (
- {
- sgeState,
- onChange
- }: StepConsentProps
-) => {
+const StepConsent = ({ sgeState, onChange }: StepConsentProps) => {
const { t } = useI18n()
return (
diff --git a/src/components/Connection/SGEConnect/StepIdentityAndPdl.tsx b/src/components/Connection/SGEConnect/StepIdentityAndPdl.tsx
index 0012020f7..b0e067d66 100644
--- a/src/components/Connection/SGEConnect/StepIdentityAndPdl.tsx
+++ b/src/components/Connection/SGEConnect/StepIdentityAndPdl.tsx
@@ -1,6 +1,6 @@
import SgeModalHint from 'components/Connection/SGEConnect/SgeModalHint'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { SgeStore } from 'models/sgeStore.model'
+import { SgeStore } from 'models'
import React, { useCallback, useState } from 'react'
import { SGEKeysForm } from './SgeConnectView'
diff --git a/src/components/ConsumptionVisualizer/ConsumptionVisualizer.tsx b/src/components/ConsumptionVisualizer/ConsumptionVisualizer.tsx
index 7fffa7d6a..3abf83ce6 100644
--- a/src/components/ConsumptionVisualizer/ConsumptionVisualizer.tsx
+++ b/src/components/ConsumptionVisualizer/ConsumptionVisualizer.tsx
@@ -1,5 +1,5 @@
import DataloadConsumptionVisualizer from 'components/ConsumptionVisualizer/DataloadConsumptionVisualizer'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { DateTime } from 'luxon'
import { Dataload } from 'models'
import React from 'react'
diff --git a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.spec.tsx b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.spec.tsx
index f3ae34bb9..74d7a4c07 100644
--- a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.spec.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.spec.tsx
@@ -1,5 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadState, FluidType } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import { Dataload } from 'models'
diff --git a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx
index af620801a..837ad0519 100644
--- a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx
@@ -1,5 +1,4 @@
-import { DataloadSectionType, DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadSectionType, DataloadState, FluidType } from 'enums'
import { Dataload } from 'models'
import React, { useCallback, useState } from 'react'
import { useAppSelector } from 'store/hooks'
diff --git a/src/components/ConsumptionVisualizer/DataloadNoValue.spec.tsx b/src/components/ConsumptionVisualizer/DataloadNoValue.spec.tsx
index 2c35790bc..7a332e4dc 100644
--- a/src/components/ConsumptionVisualizer/DataloadNoValue.spec.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadNoValue.spec.tsx
@@ -1,5 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadState, FluidType } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import { Dataload } from 'models'
diff --git a/src/components/ConsumptionVisualizer/DataloadNoValue.tsx b/src/components/ConsumptionVisualizer/DataloadNoValue.tsx
index 65aee657b..d75126664 100644
--- a/src/components/ConsumptionVisualizer/DataloadNoValue.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadNoValue.tsx
@@ -1,7 +1,6 @@
import classNames from 'classnames'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadState, FluidType } from 'enums'
import { Dataload } from 'models'
import React, { useCallback } from 'react'
import './consumptionVisualizer.scss'
diff --git a/src/components/ConsumptionVisualizer/DataloadSection.spec.tsx b/src/components/ConsumptionVisualizer/DataloadSection.spec.tsx
index ebfbc8f31..7a679918a 100644
--- a/src/components/ConsumptionVisualizer/DataloadSection.spec.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSection.spec.tsx
@@ -1,5 +1,4 @@
-import { DataloadSectionType } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadSectionType, FluidType } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import { Dataload } from 'models'
diff --git a/src/components/ConsumptionVisualizer/DataloadSection.tsx b/src/components/ConsumptionVisualizer/DataloadSection.tsx
index 85ddd0648..19d7739bd 100644
--- a/src/components/ConsumptionVisualizer/DataloadSection.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSection.tsx
@@ -1,7 +1,6 @@
import classNames from 'classnames'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { DataloadSectionType } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadSectionType, FluidType } from 'enums'
import { Dataload } from 'models'
import React from 'react'
import { getFluidName } from 'utils/utils'
diff --git a/src/components/ConsumptionVisualizer/DataloadSectionDetail.spec.tsx b/src/components/ConsumptionVisualizer/DataloadSectionDetail.spec.tsx
index 25a3ae337..6cd870e43 100644
--- a/src/components/ConsumptionVisualizer/DataloadSectionDetail.spec.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSectionDetail.spec.tsx
@@ -1,5 +1,4 @@
-import { DataloadSectionType, DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadSectionType, DataloadState, FluidType } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import { Dataload } from 'models'
diff --git a/src/components/ConsumptionVisualizer/DataloadSectionDetail.tsx b/src/components/ConsumptionVisualizer/DataloadSectionDetail.tsx
index 78861f744..18a607e31 100644
--- a/src/components/ConsumptionVisualizer/DataloadSectionDetail.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSectionDetail.tsx
@@ -2,9 +2,12 @@ import classNames from 'classnames'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { DataloadSectionType, DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import {
+ DataloadSectionType,
+ DataloadState,
+ FluidType,
+ UsageEventType,
+} from 'enums'
import { Dataload } from 'models'
import React, { useCallback } from 'react'
import { NavLink } from 'react-router-dom'
diff --git a/src/components/ConsumptionVisualizer/DataloadSectionValue.spec.tsx b/src/components/ConsumptionVisualizer/DataloadSectionValue.spec.tsx
index 58b511e70..c2ea56db0 100644
--- a/src/components/ConsumptionVisualizer/DataloadSectionValue.spec.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSectionValue.spec.tsx
@@ -1,5 +1,4 @@
-import { DataloadSectionType } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadSectionType, FluidType } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import { Dataload } from 'models'
diff --git a/src/components/ConsumptionVisualizer/DataloadSectionValue.tsx b/src/components/ConsumptionVisualizer/DataloadSectionValue.tsx
index 72ed67a78..deff168d6 100644
--- a/src/components/ConsumptionVisualizer/DataloadSectionValue.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSectionValue.tsx
@@ -1,6 +1,5 @@
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { DataloadSectionType } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadSectionType, FluidType } from 'enums'
import { Dataload } from 'models'
import React from 'react'
import { formatNumberValues } from 'utils/utils'
diff --git a/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx b/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx
index 94a30953d..53964d08b 100644
--- a/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx
+++ b/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx
@@ -4,7 +4,7 @@ import CloseIcon from 'assets/icons/ico/close.svg'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { DateTime } from 'luxon'
import { FluidPrice } from 'models'
import React, { useEffect, useState } from 'react'
diff --git a/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.spec.tsx b/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.spec.tsx
index 0c6bffa6d..8f6f4755b 100644
--- a/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.spec.tsx
+++ b/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.spec.tsx
@@ -1,5 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadState, FluidType } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import { DateTime } from 'luxon'
diff --git a/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.tsx b/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.tsx
index 0cb05b332..0ab530ca8 100644
--- a/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.tsx
+++ b/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.tsx
@@ -1,6 +1,5 @@
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DataloadState, FluidType } from 'enums'
import { DateTime } from 'luxon'
import { Dataload } from 'models'
import React, { useCallback, useState } from 'react'
diff --git a/src/components/Content/Content.tsx b/src/components/Content/Content.tsx
index 9597e8229..3a311ac68 100644
--- a/src/components/Content/Content.tsx
+++ b/src/components/Content/Content.tsx
@@ -1,5 +1,5 @@
import FeedbackModal from 'components/Feedback/FeedbackModal'
-import { ScreenType } from 'enum/screen.enum'
+import { ScreenType } from 'enums'
import React, { useEffect } from 'react'
import { changeScreenType } from 'store/global/global.slice'
import { useAppDispatch, useAppSelector } from 'store/hooks'
diff --git a/src/components/CustomPopup/CustomPopupModal.tsx b/src/components/CustomPopup/CustomPopupModal.tsx
index f3e5fb338..c122b125b 100644
--- a/src/components/CustomPopup/CustomPopupModal.tsx
+++ b/src/components/CustomPopup/CustomPopupModal.tsx
@@ -7,7 +7,7 @@ import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
import { DateTime } from 'luxon'
-import { CustomPopup } from 'models/customPopup.model'
+import { CustomPopup } from 'models'
import React from 'react'
import './customPopupModal.scss'
diff --git a/src/components/DateNavigator/DateNavigator.spec.tsx b/src/components/DateNavigator/DateNavigator.spec.tsx
index 8c6691f72..a624d8907 100644
--- a/src/components/DateNavigator/DateNavigator.spec.tsx
+++ b/src/components/DateNavigator/DateNavigator.spec.tsx
@@ -1,5 +1,5 @@
import { IconButton } from '@material-ui/core'
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import { DateTime } from 'luxon'
diff --git a/src/components/DateNavigator/DateNavigator.tsx b/src/components/DateNavigator/DateNavigator.tsx
index 0d207cbe0..b23c9ae51 100644
--- a/src/components/DateNavigator/DateNavigator.tsx
+++ b/src/components/DateNavigator/DateNavigator.tsx
@@ -5,7 +5,7 @@ import classNames from 'classnames'
import DateNavigatorFormat from 'components/DateNavigator/DateNavigatorFormat'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
import { DateTime } from 'luxon'
import React from 'react'
import './datenavigator.scss'
diff --git a/src/components/DateNavigator/DateNavigatorFormat.tsx b/src/components/DateNavigator/DateNavigatorFormat.tsx
index d3052d244..d5c835b35 100644
--- a/src/components/DateNavigator/DateNavigatorFormat.tsx
+++ b/src/components/DateNavigator/DateNavigatorFormat.tsx
@@ -1,4 +1,4 @@
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
import { DateTime } from 'luxon'
import React from 'react'
import './datenavigatorformat.scss'
diff --git a/src/components/Duel/DuelBar.tsx b/src/components/Duel/DuelBar.tsx
index 7e2fb3d65..803dcf478 100644
--- a/src/components/Duel/DuelBar.tsx
+++ b/src/components/Duel/DuelBar.tsx
@@ -3,8 +3,7 @@ import AxisRight from 'components/Charts/AxisRight'
import Bar from 'components/Charts/Bar'
import UncomingBar from 'components/Charts/UncomingBar'
import { scaleBand, ScaleBand, scaleLinear, ScaleLinear } from 'd3-scale'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { Dataload, UserChallenge } from 'models'
import React from 'react'
diff --git a/src/components/Duel/DuelChart.tsx b/src/components/Duel/DuelChart.tsx
index 5e3b76882..538398c5c 100644
--- a/src/components/Duel/DuelChart.tsx
+++ b/src/components/Duel/DuelChart.tsx
@@ -1,5 +1,5 @@
import DuelBar from 'components/Duel/DuelBar'
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
import { Dataload, UserChallenge } from 'models'
import React, { useEffect, useState } from 'react'
import './duelChart.scss'
diff --git a/src/components/Duel/DuelOngoing.spec.tsx b/src/components/Duel/DuelOngoing.spec.tsx
index 10cacec7d..2b1af7138 100644
--- a/src/components/Duel/DuelOngoing.spec.tsx
+++ b/src/components/Duel/DuelOngoing.spec.tsx
@@ -1,5 +1,5 @@
import DuelOngoing from 'components/Duel/DuelOngoing'
-import { UserChallengeState } from 'enum/userChallenge.enum'
+import { UserChallengeState } from 'enums'
import { mount } from 'enzyme'
import { DateTime } from 'luxon'
import { UserChallenge } from 'models'
diff --git a/src/components/Duel/DuelOngoing.tsx b/src/components/Duel/DuelOngoing.tsx
index 179dc70f9..337e45ce4 100644
--- a/src/components/Duel/DuelOngoing.tsx
+++ b/src/components/Duel/DuelOngoing.tsx
@@ -8,12 +8,12 @@ import LastDuelModal from 'components/Duel/lastDuelModal'
import { useChartResize } from 'components/Hooks/useChartResize'
import { Client, useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
import {
+ UsageEventType,
UserChallengeSuccess,
UserChallengeUpdateFlag,
-} from 'enum/userChallenge.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
+ UserDuelState,
+} from 'enums'
import { Dataload, UserChallenge, UserDuel } from 'models'
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Duel/DuelResultModal.tsx b/src/components/Duel/DuelResultModal.tsx
index 509f9628b..0eb992461 100644
--- a/src/components/Duel/DuelResultModal.tsx
+++ b/src/components/Duel/DuelResultModal.tsx
@@ -4,7 +4,7 @@ import challengeWon from 'assets/icons/visu/duelResult/challengeWon.svg'
import defaultIcon from 'assets/icons/visu/duelResult/default.svg'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { UserChallenge } from 'models/challenge.model'
+import { UserChallenge } from 'models'
import React, { useEffect, useState } from 'react'
import { formatNumberValues, importIconById } from 'utils/utils'
import './duelResultModal.scss'
diff --git a/src/components/Duel/DuelUnlocked.spec.tsx b/src/components/Duel/DuelUnlocked.spec.tsx
index ebe4ee5c9..f2643e3c0 100644
--- a/src/components/Duel/DuelUnlocked.spec.tsx
+++ b/src/components/Duel/DuelUnlocked.spec.tsx
@@ -2,8 +2,7 @@ import Button from '@material-ui/core/Button'
import defaultIcon from 'assets/icons/visu/duel/default.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import DuelUnlocked from 'components/Duel/DuelUnlocked'
-import { FluidType } from 'enum/fluid.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { FluidType, UserChallengeUpdateFlag } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
diff --git a/src/components/Duel/DuelUnlocked.tsx b/src/components/Duel/DuelUnlocked.tsx
index 138838de9..cdbb6b726 100644
--- a/src/components/Duel/DuelUnlocked.tsx
+++ b/src/components/Duel/DuelUnlocked.tsx
@@ -4,8 +4,7 @@ import defaultIcon from 'assets/icons/visu/duel/default.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { Client, useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UsageEventType, UserChallengeUpdateFlag } from 'enums'
import { UserChallenge } from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import ChallengeService from 'services/challenge.service'
diff --git a/src/components/Duel/DuelView.spec.tsx b/src/components/Duel/DuelView.spec.tsx
index 2c6a3e193..990383473 100644
--- a/src/components/Duel/DuelView.spec.tsx
+++ b/src/components/Duel/DuelView.spec.tsx
@@ -1,6 +1,5 @@
import DuelView from 'components/Duel/DuelView'
-import { UserChallengeState } from 'enum/userChallenge.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
+import { UserChallengeState, UserDuelState } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
diff --git a/src/components/Duel/DuelView.tsx b/src/components/Duel/DuelView.tsx
index dbf94aeeb..bf19d59d1 100644
--- a/src/components/Duel/DuelView.tsx
+++ b/src/components/Duel/DuelView.tsx
@@ -3,8 +3,7 @@ import DuelError from 'components/Duel/DuelError'
import DuelUnlocked from 'components/Duel/DuelUnlocked'
import CozyBar from 'components/Header/CozyBar'
import Header from 'components/Header/Header'
-import { UserChallengeState } from 'enum/userChallenge.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
+import { UserChallengeState, UserDuelState } from 'enums'
import { UserChallenge } from 'models'
import React, { useState } from 'react'
import { useLocation, useNavigate } from 'react-router-dom'
diff --git a/src/components/Ecogesture/EcogestureList.tsx b/src/components/Ecogesture/EcogestureList.tsx
index 047b325b3..9d651785b 100644
--- a/src/components/Ecogesture/EcogestureList.tsx
+++ b/src/components/Ecogesture/EcogestureList.tsx
@@ -5,7 +5,7 @@ import SortIcon from 'assets/icons/ico/sort.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import EcogestureCard from 'components/Ecogesture/EcogestureCard'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { Usage } from 'enum/ecogesture.enum'
+import { Usage } from 'enums'
import { Ecogesture } from 'models'
import React, { useState } from 'react'
import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Ecogesture/EcogestureView.spec.tsx b/src/components/Ecogesture/EcogestureView.spec.tsx
index b08d1e013..4f0a0bf69 100644
--- a/src/components/Ecogesture/EcogestureView.spec.tsx
+++ b/src/components/Ecogesture/EcogestureView.spec.tsx
@@ -1,6 +1,6 @@
import { IconButton, Tab } from '@material-ui/core'
import EcogestureView from 'components/Ecogesture/EcogestureView'
-import { Season } from 'enum/ecogesture.enum'
+import { Season } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import React from 'react'
diff --git a/src/components/Ecogesture/EcogestureView.tsx b/src/components/Ecogesture/EcogestureView.tsx
index fa44a5f18..115684128 100644
--- a/src/components/Ecogesture/EcogestureView.tsx
+++ b/src/components/Ecogesture/EcogestureView.tsx
@@ -7,7 +7,7 @@ import Header from 'components/Header/Header'
import Loader from 'components/Loader/Loader'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { EcogestureTab } from 'enum/ecogesture.enum'
+import { EcogestureTab } from 'enums'
import { Ecogesture } from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import { useLocation, useNavigate } from 'react-router-dom'
diff --git a/src/components/EcogestureForm/EcogestureFormEquipment.tsx b/src/components/EcogestureForm/EcogestureFormEquipment.tsx
index 44e57d700..1c4ffec4c 100644
--- a/src/components/EcogestureForm/EcogestureFormEquipment.tsx
+++ b/src/components/EcogestureForm/EcogestureFormEquipment.tsx
@@ -1,9 +1,7 @@
import FormNavigation from 'components/FormGlobal/FormNavigation'
import 'components/ProfileType/profileTypeForm.scss'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { EquipmentType } from 'enum/ecogesture.enum'
-import { EcogestureStepForm } from 'enum/ecogestureForm.enum'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
+import { EcogestureStepForm, EquipmentType, ProfileTypeStepForm } from 'enums'
import { ProfileEcogesture, ProfileType } from 'models'
import React, { useCallback, useState } from 'react'
import { useAppSelector } from 'store/hooks'
diff --git a/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx b/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
index 53a744e82..0e62adf37 100644
--- a/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
+++ b/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
@@ -2,12 +2,12 @@ import classNames from 'classnames'
import FormNavigation from 'components/FormGlobal/FormNavigation'
import 'components/ProfileType/profileTypeForm.scss'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { EcogestureStepForm } from 'enum/ecogestureForm.enum'
+import { EcogestureStepForm } from 'enums'
import {
ProfileEcogesture,
ProfileEcogestureAnswer,
ProfileEcogestureValues,
-} from 'models/profileEcogesture.model'
+} from 'models'
import React, { useCallback, useState } from 'react'
import { useAppSelector } from 'store/hooks'
import './ecogestureFormSingleChoice.scss'
diff --git a/src/components/EcogestureForm/EcogestureFormView.tsx b/src/components/EcogestureForm/EcogestureFormView.tsx
index c912471ab..c95e0c33d 100644
--- a/src/components/EcogestureForm/EcogestureFormView.tsx
+++ b/src/components/EcogestureForm/EcogestureFormView.tsx
@@ -4,14 +4,8 @@ import CozyBar from 'components/Header/CozyBar'
import Header from 'components/Header/Header'
import Loader from 'components/Loader/Loader'
import ProfileTypeView from 'components/ProfileType/ProfileTypeView'
-import {
- EcogestureStepForm,
- ProfileEcogestureAnswerType,
-} from 'enum/ecogestureForm.enum'
-import {
- ProfileEcogesture,
- ProfileEcogestureAnswer,
-} from 'models/profileEcogesture.model'
+import { EcogestureStepForm, ProfileEcogestureAnswerType } from 'enums'
+import { ProfileEcogesture, ProfileEcogestureAnswer } from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import { useLocation, useNavigate } from 'react-router-dom'
import ProfileEcogestureFormService from 'services/profileEcogestureForm.service'
diff --git a/src/components/EcogestureForm/EquipmentIcon.spec.tsx b/src/components/EcogestureForm/EquipmentIcon.spec.tsx
index 12bc96af6..e06d80896 100644
--- a/src/components/EcogestureForm/EquipmentIcon.spec.tsx
+++ b/src/components/EcogestureForm/EquipmentIcon.spec.tsx
@@ -1,5 +1,5 @@
/* eslint-disable react/display-name */
-import { EquipmentType } from 'enum/ecogesture.enum'
+import { EquipmentType } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import React from 'react'
diff --git a/src/components/Exploration/ExplorationFinished.tsx b/src/components/Exploration/ExplorationFinished.tsx
index 25750ed88..d17fb5e3c 100644
--- a/src/components/Exploration/ExplorationFinished.tsx
+++ b/src/components/Exploration/ExplorationFinished.tsx
@@ -3,9 +3,11 @@ import starResult from 'assets/icons/visu/quiz/starResult.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { Client, useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
-import { UserExplorationState } from 'enum/userExploration.enum'
+import {
+ UsageEventType,
+ UserChallengeUpdateFlag,
+ UserExplorationState,
+} from 'enums'
import { UserChallenge } from 'models'
import React, { useCallback } from 'react'
import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Exploration/ExplorationOngoing.tsx b/src/components/Exploration/ExplorationOngoing.tsx
index 2132bae32..142e4a660 100644
--- a/src/components/Exploration/ExplorationOngoing.tsx
+++ b/src/components/Exploration/ExplorationOngoing.tsx
@@ -4,12 +4,12 @@ import StarsContainer from 'components/Challenge/StarsContainer'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { Client, useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
import {
+ UsageEventType,
+ UserChallengeUpdateFlag,
UserExplorationState,
UserExplorationType,
-} from 'enum/userExploration.enum'
+} from 'enums'
import { UserChallenge } from 'models'
import React from 'react'
import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Exploration/ExplorationView.spec.tsx b/src/components/Exploration/ExplorationView.spec.tsx
index 137f6105d..7d535b9ad 100644
--- a/src/components/Exploration/ExplorationView.spec.tsx
+++ b/src/components/Exploration/ExplorationView.spec.tsx
@@ -1,4 +1,4 @@
-import { UserExplorationState } from 'enum/userExploration.enum'
+import { UserExplorationState } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
diff --git a/src/components/Exploration/ExplorationView.tsx b/src/components/Exploration/ExplorationView.tsx
index 2d58bc647..9378a2ad0 100644
--- a/src/components/Exploration/ExplorationView.tsx
+++ b/src/components/Exploration/ExplorationView.tsx
@@ -1,7 +1,7 @@
import Content from 'components/Content/Content'
import CozyBar from 'components/Header/CozyBar'
import Header from 'components/Header/Header'
-import { UserExplorationState } from 'enum/userExploration.enum'
+import { UserExplorationState } from 'enums'
import { UserChallenge } from 'models'
import React, { useState } from 'react'
import { useAppSelector } from 'store/hooks'
diff --git a/src/components/Export/exportLoadingModal.tsx b/src/components/Export/exportLoadingModal.tsx
index dfce4d867..9f42e475a 100644
--- a/src/components/Export/exportLoadingModal.tsx
+++ b/src/components/Export/exportLoadingModal.tsx
@@ -9,8 +9,7 @@ import * as XLSX from 'xlsx'
import CloseIcon from 'assets/icons/ico/close.svg'
import Loader from 'components/Loader/Loader'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { Datachart, Dataload, TimePeriod } from 'models'
import ConsumptionDataManager from 'services/consumption.service'
import EnedisMonthlyAnalysisDataService from 'services/enedisMonthlyAnalysisData.service'
diff --git a/src/components/Feedback/FeedbackModal.tsx b/src/components/Feedback/FeedbackModal.tsx
index d067e3351..63daf5313 100644
--- a/src/components/Feedback/FeedbackModal.tsx
+++ b/src/components/Feedback/FeedbackModal.tsx
@@ -9,7 +9,7 @@ import { Client, useClient } from 'cozy-client'
// what is the type ?
import { IuseI18n, useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { UserExplorationID } from 'enum/userExploration.enum'
+import { UserExplorationID } from 'enums'
import React from 'react'
import { useAppDispatch, useAppSelector } from 'store/hooks'
import { openFeedbackModal } from 'store/modal/modal.slice'
diff --git a/src/components/FluidChart/FluidChart.tsx b/src/components/FluidChart/FluidChart.tsx
index 79acccd05..1d824baa4 100644
--- a/src/components/FluidChart/FluidChart.tsx
+++ b/src/components/FluidChart/FluidChart.tsx
@@ -7,10 +7,7 @@ import useExploration from 'components/Hooks/useExploration'
import TimeStepSelector from 'components/TimeStepSelector/TimeStepSelector'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserExplorationID } from 'enum/userExploration.enum'
+import { FluidType, TimeStep, UsageEventType, UserExplorationID } from 'enums'
import React, { useCallback, useEffect, useState } from 'react'
import { useNavigate } from 'react-router-dom'
import ConsumptionService from 'services/consumption.service'
diff --git a/src/components/FluidChart/FluidChartSlide.tsx b/src/components/FluidChart/FluidChartSlide.tsx
index e30314447..0c3f646d5 100644
--- a/src/components/FluidChart/FluidChartSlide.tsx
+++ b/src/components/FluidChart/FluidChartSlide.tsx
@@ -2,8 +2,7 @@ import BarChart from 'components/Charts/BarChart'
import ConsumptionVisualizer from 'components/ConsumptionVisualizer/ConsumptionVisualizer'
import Loader from 'components/Loader/Loader'
import { useClient } from 'cozy-client'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { Datachart } from 'models'
import React, { useEffect, useState } from 'react'
diff --git a/src/components/FluidChart/FluidChartSwipe.tsx b/src/components/FluidChart/FluidChartSwipe.tsx
index 0649c7191..540f98edf 100644
--- a/src/components/FluidChart/FluidChartSwipe.tsx
+++ b/src/components/FluidChart/FluidChartSwipe.tsx
@@ -1,6 +1,6 @@
import FluidChartSlide from 'components/FluidChart/FluidChartSlide'
import { useChartResize } from 'components/Hooks/useChartResize'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { DateTime } from 'luxon'
import React, { useEffect, useRef, useState } from 'react'
import SwipeableViews from 'react-swipeable-views'
diff --git a/src/components/FormGlobal/FormNavigation.spec.tsx b/src/components/FormGlobal/FormNavigation.spec.tsx
index 9e4a166e6..fedd1a5ec 100644
--- a/src/components/FormGlobal/FormNavigation.spec.tsx
+++ b/src/components/FormGlobal/FormNavigation.spec.tsx
@@ -1,5 +1,5 @@
import Button from '@material-ui/core/Button'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
+import { ProfileTypeStepForm } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
diff --git a/src/components/FormGlobal/FormNavigation.tsx b/src/components/FormGlobal/FormNavigation.tsx
index 7fab173bf..edc2b8442 100644
--- a/src/components/FormGlobal/FormNavigation.tsx
+++ b/src/components/FormGlobal/FormNavigation.tsx
@@ -2,9 +2,7 @@ import Button from '@material-ui/core/Button'
import classNames from 'classnames'
import 'components/FormGlobal/formNavigation.scss'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { EcogestureStepForm } from 'enum/ecogestureForm.enum'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
-import { SgeStep } from 'enum/sgeStep.enum'
+import { EcogestureStepForm, ProfileTypeStepForm, SgeStep } from 'enums'
import React, { useCallback } from 'react'
import { useNavigate } from 'react-router-dom'
diff --git a/src/components/FormGlobal/FormProgress.tsx b/src/components/FormGlobal/FormProgress.tsx
index 5971e4307..74249dcc5 100644
--- a/src/components/FormGlobal/FormProgress.tsx
+++ b/src/components/FormGlobal/FormProgress.tsx
@@ -1,6 +1,5 @@
import 'components/FormGlobal/formProgress.scss'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
-import { SgeStep } from 'enum/sgeStep.enum'
+import { ProfileTypeStepForm, SgeStep } from 'enums'
import React from 'react'
interface FormProgressProps {
diff --git a/src/components/Header/CozyBar.spec.tsx b/src/components/Header/CozyBar.spec.tsx
index 8f195ae4b..9b7f32008 100644
--- a/src/components/Header/CozyBar.spec.tsx
+++ b/src/components/Header/CozyBar.spec.tsx
@@ -1,5 +1,5 @@
import CozyBar from 'components/Header/CozyBar'
-import { ScreenType } from 'enum/screen.enum'
+import { ScreenType } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import React from 'react'
diff --git a/src/components/Header/CozyBar.tsx b/src/components/Header/CozyBar.tsx
index 7169d94f8..d0cccb600 100644
--- a/src/components/Header/CozyBar.tsx
+++ b/src/components/Header/CozyBar.tsx
@@ -2,7 +2,7 @@ import BackArrowIcon from 'assets/icons/ico/back-arrow.svg'
import FeedbackIcon from 'assets/icons/ico/feedback.svg'
import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { ScreenType } from 'enum/screen.enum'
+import { ScreenType } from 'enums'
import React, { useCallback } from 'react'
import { useNavigate } from 'react-router-dom'
import { useAppDispatch, useAppSelector } from 'store/hooks'
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index 907185e23..db54fd297 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -3,7 +3,7 @@ import BackArrowIcon from 'assets/icons/ico/back-arrow.svg'
import FeedbackIcon from 'assets/icons/ico/feedback.svg'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { ScreenType } from 'enum/screen.enum'
+import { ScreenType } from 'enums'
import React, { useCallback, useEffect, useRef } from 'react'
import { useNavigate } from 'react-router-dom'
import { useAppDispatch, useAppSelector } from 'store/hooks'
diff --git a/src/components/Home/ConsumptionDetails.spec.tsx b/src/components/Home/ConsumptionDetails.spec.tsx
index dbe7e2e9d..af4167223 100644
--- a/src/components/Home/ConsumptionDetails.spec.tsx
+++ b/src/components/Home/ConsumptionDetails.spec.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import React from 'react'
diff --git a/src/components/Home/ConsumptionDetails.tsx b/src/components/Home/ConsumptionDetails.tsx
index 3781a45da..01c5077ad 100644
--- a/src/components/Home/ConsumptionDetails.tsx
+++ b/src/components/Home/ConsumptionDetails.tsx
@@ -1,7 +1,6 @@
import TotalConsumption from 'components/TotalConsumption/TotalConsumption'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import React from 'react'
import { useAppSelector } from 'store/hooks'
import { convertDateToShortDateString } from 'utils/date'
diff --git a/src/components/Home/ConsumptionView.spec.tsx b/src/components/Home/ConsumptionView.spec.tsx
index 9cf225a57..f02b52e4a 100644
--- a/src/components/Home/ConsumptionView.spec.tsx
+++ b/src/components/Home/ConsumptionView.spec.tsx
@@ -1,6 +1,5 @@
import Loader from 'components/Loader/Loader'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidState, FluidType, TimeStep } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
diff --git a/src/components/Home/ConsumptionView.tsx b/src/components/Home/ConsumptionView.tsx
index d7766c732..10d217683 100644
--- a/src/components/Home/ConsumptionView.tsx
+++ b/src/components/Home/ConsumptionView.tsx
@@ -13,8 +13,7 @@ import KonnectorViewerList from 'components/Konnector/KonnectorViewerList'
import Loader from 'components/Loader/Loader'
import PartnerIssueModal from 'components/PartnerIssue/PartnerIssueModal'
import { useClient } from 'cozy-client'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import React, { useCallback, useEffect, useState } from 'react'
import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Home/FluidButton.spec.tsx b/src/components/Home/FluidButton.spec.tsx
index c7451b9e3..5b2a1c7b5 100644
--- a/src/components/Home/FluidButton.spec.tsx
+++ b/src/components/Home/FluidButton.spec.tsx
@@ -1,4 +1,4 @@
-import { FluidState, FluidType } from 'enum/fluid.enum'
+import { FluidState, FluidType } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import { GlobalState } from 'models'
diff --git a/src/components/Home/FluidButton.tsx b/src/components/Home/FluidButton.tsx
index 9346e264f..43d9ea274 100644
--- a/src/components/Home/FluidButton.tsx
+++ b/src/components/Home/FluidButton.tsx
@@ -3,8 +3,7 @@ import PartnerIssueNotif from 'assets/icons/ico/notif_maintenance.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { FluidState, FluidType, UsageEventType } from 'enums'
import React, { useCallback, useEffect, useState } from 'react'
import { useNavigate } from 'react-router-dom'
import DateChartService from 'services/dateChart.service'
diff --git a/src/components/Home/FluidButtons.spec.tsx b/src/components/Home/FluidButtons.spec.tsx
index 065798c72..a5b287157 100644
--- a/src/components/Home/FluidButtons.spec.tsx
+++ b/src/components/Home/FluidButtons.spec.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import React from 'react'
diff --git a/src/components/Home/FluidButtons.tsx b/src/components/Home/FluidButtons.tsx
index 62bcae8bf..09ec44d26 100644
--- a/src/components/Home/FluidButtons.tsx
+++ b/src/components/Home/FluidButtons.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import React from 'react'
import FluidButton from './FluidButton'
import './fluidButtons.scss'
diff --git a/src/components/Hooks/useExploration.spec.tsx b/src/components/Hooks/useExploration.spec.tsx
index 44f3be563..c5ba00f5f 100644
--- a/src/components/Hooks/useExploration.spec.tsx
+++ b/src/components/Hooks/useExploration.spec.tsx
@@ -1,6 +1,6 @@
import { act, renderHook } from '@testing-library/react-hooks'
import useExploration from 'components/Hooks/useExploration'
-import { UserExplorationID } from 'enum/userExploration.enum'
+import { UserExplorationID } from 'enums'
import React from 'react'
import { Provider } from 'react-redux'
import { createMockEcolyoStore } from '../../../tests/__mocks__/store'
diff --git a/src/components/Hooks/useExploration.tsx b/src/components/Hooks/useExploration.tsx
index cb8dd408b..d661f6fd0 100644
--- a/src/components/Hooks/useExploration.tsx
+++ b/src/components/Hooks/useExploration.tsx
@@ -1,5 +1,5 @@
import { Client, useClient } from 'cozy-client'
-import { UserExplorationState } from 'enum/userExploration.enum'
+import { UserExplorationState } from 'enums'
import { UserExploration } from 'models'
import { Dispatch, SetStateAction, useEffect, useState } from 'react'
import ExplorationService from 'services/exploration.service'
diff --git a/src/components/Hooks/useKonnectorAuth.tsx b/src/components/Hooks/useKonnectorAuth.tsx
index 10ae4f8bc..86692e04b 100644
--- a/src/components/Hooks/useKonnectorAuth.tsx
+++ b/src/components/Hooks/useKonnectorAuth.tsx
@@ -1,8 +1,7 @@
import * as Sentry from '@sentry/react'
import { Client, useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { FluidSlugType, UsageEventType } from 'enums'
import {
AccountAuthData,
AccountSgeData,
diff --git a/src/components/Konnector/KonnectorModal.spec.tsx b/src/components/Konnector/KonnectorModal.spec.tsx
index 695743361..55a545193 100644
--- a/src/components/Konnector/KonnectorModal.spec.tsx
+++ b/src/components/Konnector/KonnectorModal.spec.tsx
@@ -1,6 +1,5 @@
import { Button } from '@material-ui/core'
-import { FluidType } from 'enum/fluid.enum'
-import { KonnectorError } from 'enum/konnectorError.enum'
+import { FluidType, KonnectorError } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import React from 'react'
diff --git a/src/components/Konnector/KonnectorModal.tsx b/src/components/Konnector/KonnectorModal.tsx
index f02c94ea6..766ad2952 100644
--- a/src/components/Konnector/KonnectorModal.tsx
+++ b/src/components/Konnector/KonnectorModal.tsx
@@ -12,8 +12,7 @@ import {
} from 'cozy-harvest-lib/dist/models/flowEvents'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
-import { KonnectorError } from 'enum/konnectorError.enum'
+import { FluidType, KonnectorError } from 'enums'
import { shuffle } from 'lodash'
import { Account } from 'models'
import React, { useCallback, useEffect, useMemo, useState } from 'react'
diff --git a/src/components/Konnector/KonnectorModalFooter.spec.tsx b/src/components/Konnector/KonnectorModalFooter.spec.tsx
index 4845a8b21..12d9c08ec 100644
--- a/src/components/Konnector/KonnectorModalFooter.spec.tsx
+++ b/src/components/Konnector/KonnectorModalFooter.spec.tsx
@@ -1,7 +1,6 @@
import { Button } from '@material-ui/core'
import { ERROR_EVENT } from 'cozy-harvest-lib/dist/models/flowEvents'
-import { FluidType } from 'enum/fluid.enum'
-import { KonnectorError } from 'enum/konnectorError.enum'
+import { FluidType, KonnectorError } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import React from 'react'
diff --git a/src/components/Konnector/KonnectorModalFooter.tsx b/src/components/Konnector/KonnectorModalFooter.tsx
index 7ce01b205..fa8cedb82 100644
--- a/src/components/Konnector/KonnectorModalFooter.tsx
+++ b/src/components/Konnector/KonnectorModalFooter.tsx
@@ -5,7 +5,7 @@ import {
SUCCESS_EVENT,
} from 'cozy-harvest-lib/dist/models/flowEvents'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { KonnectorError } from 'enum/konnectorError.enum'
+import { KonnectorError } from 'enums'
import { Account } from 'models'
import React, { useCallback } from 'react'
import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Konnector/KonnectorViewerCard.tsx b/src/components/Konnector/KonnectorViewerCard.tsx
index cd6355802..aeaddbd9a 100644
--- a/src/components/Konnector/KonnectorViewerCard.tsx
+++ b/src/components/Konnector/KonnectorViewerCard.tsx
@@ -24,12 +24,15 @@ import {
} from 'cozy-harvest-lib/dist/models/flowEvents'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
-import { KonnectorError } from 'enum/konnectorError.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserChallengeState } from 'enum/userChallenge.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
+import {
+ FluidSlugType,
+ FluidState,
+ FluidType,
+ KonnectorError,
+ UsageEventType,
+ UserChallengeState,
+ UserDuelState,
+} from 'enums'
import { DateTime } from 'luxon'
import {
Account,
@@ -37,10 +40,10 @@ import {
FluidConnection,
FluidStatus,
Konnector,
+ PartnersInfo,
Trigger,
UsageEvent,
} from 'models'
-import { PartnersInfo } from 'models/partnersInfo.model'
import React, { useCallback, useEffect, useMemo, useState } from 'react'
import { useNavigate } from 'react-router-dom'
import AccountService from 'services/account.service'
diff --git a/src/components/Konnector/KonnectorViewerList.tsx b/src/components/Konnector/KonnectorViewerList.tsx
index 36e108c24..d0fe22ec7 100644
--- a/src/components/Konnector/KonnectorViewerList.tsx
+++ b/src/components/Konnector/KonnectorViewerList.tsx
@@ -1,7 +1,7 @@
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 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { FluidStatus } from 'models'
import React from 'react'
import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Loader/Loader.spec.tsx b/src/components/Loader/Loader.spec.tsx
index 729e3afb5..7fbb634fe 100644
--- a/src/components/Loader/Loader.spec.tsx
+++ b/src/components/Loader/Loader.spec.tsx
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import Loader from './Loader'
diff --git a/src/components/Loader/Loader.tsx b/src/components/Loader/Loader.tsx
index aafdf086d..838a7c341 100644
--- a/src/components/Loader/Loader.tsx
+++ b/src/components/Loader/Loader.tsx
@@ -1,5 +1,5 @@
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import React from 'react'
import './Loader.scss'
diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx
index 23f01ebda..bf9bf2510 100644
--- a/src/components/Navbar/Navbar.tsx
+++ b/src/components/Navbar/Navbar.tsx
@@ -13,7 +13,7 @@ import logos from 'assets/png/logos_partenaires.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
import React, { useCallback } from 'react'
import { NavLink, useLocation } from 'react-router-dom'
import UsageEventService from 'services/usageEvent.service'
diff --git a/src/components/Options/ExportData/ExportData.tsx b/src/components/Options/ExportData/ExportData.tsx
index 512d627d2..a7195bc97 100644
--- a/src/components/Options/ExportData/ExportData.tsx
+++ b/src/components/Options/ExportData/ExportData.tsx
@@ -13,8 +13,7 @@ import ExportStartModal from 'components/Export/exportStartModal'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { remove } from 'lodash'
import React, { useEffect, useMemo, useState } from 'react'
import ConsumptionDataManager from 'services/consumption.service'
diff --git a/src/components/Options/LegalNotice/LegalNoticeLink.tsx b/src/components/Options/LegalNotice/LegalNoticeLink.tsx
index 5475686d5..cdd71ce70 100644
--- a/src/components/Options/LegalNotice/LegalNoticeLink.tsx
+++ b/src/components/Options/LegalNotice/LegalNoticeLink.tsx
@@ -3,7 +3,7 @@ import LegalNoticeIcon from 'assets/icons/ico/legal-notice.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
import React, { useCallback } from 'react'
import { Link as RouterLink } from 'react-router-dom'
import UsageEventService from 'services/usageEvent.service'
diff --git a/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.spec.tsx b/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.spec.tsx
index cde7d357c..b352abb1e 100644
--- a/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.spec.tsx
+++ b/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.spec.tsx
@@ -7,7 +7,7 @@ import {
IndividualInsulationWork,
IndividualOrCollective,
ThreeChoicesAnswer,
-} from 'enum/profileType.enum'
+} from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
diff --git a/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.tsx b/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.tsx
index 4d18cfef7..1648f83c8 100644
--- a/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.tsx
+++ b/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.tsx
@@ -11,14 +11,14 @@ import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import useExploration from 'components/Hooks/useExploration'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
import {
+ FluidType,
HousingType,
IndividualOrCollective,
OutsideFacingWalls,
ThreeChoicesAnswer,
-} from 'enum/profileType.enum'
-import { UserExplorationID } from 'enum/userExploration.enum'
+ UserExplorationID,
+} from 'enums'
import React, { useState } from 'react'
import { useNavigate } from 'react-router-dom'
import { useAppSelector } from 'store/hooks'
diff --git a/src/components/Options/ReportOptions/ReportOptions.spec.tsx b/src/components/Options/ReportOptions/ReportOptions.spec.tsx
index 646027c01..f4e6f8772 100644
--- a/src/components/Options/ReportOptions/ReportOptions.spec.tsx
+++ b/src/components/Options/ReportOptions/ReportOptions.spec.tsx
@@ -1,7 +1,7 @@
import { Button } from '@material-ui/core'
import StyledSwitch from 'components/CommonKit/Switch/StyledSwitch'
import ReportOptions from 'components/Options/ReportOptions/ReportOptions'
-import { FluidState, FluidType } from 'enum/fluid.enum'
+import { FluidState, FluidType } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
diff --git a/src/components/Options/ReportOptions/ReportOptions.tsx b/src/components/Options/ReportOptions/ReportOptions.tsx
index 5853217c6..9a3af3318 100644
--- a/src/components/Options/ReportOptions/ReportOptions.tsx
+++ b/src/components/Options/ReportOptions/ReportOptions.tsx
@@ -2,8 +2,7 @@ import { Button } from '@material-ui/core'
import StyledSwitch from 'components/CommonKit/Switch/StyledSwitch'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidState, FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { Dataload, TimePeriod } from 'models'
import React, { useCallback, useEffect, useState } from 'react'
diff --git a/src/components/PartnerIssue/PartnerIssueModal.tsx b/src/components/PartnerIssue/PartnerIssueModal.tsx
index 59d4c7842..85c28abf0 100644
--- a/src/components/PartnerIssue/PartnerIssueModal.tsx
+++ b/src/components/PartnerIssue/PartnerIssueModal.tsx
@@ -6,7 +6,7 @@ import OrangeWarn from 'assets/icons/ico/warn-orange.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { FluidStatus } from 'models'
import React from 'react'
import './partnerIssueModal.scss'
diff --git a/src/components/ProfileType/ProfileTypeFinished.tsx b/src/components/ProfileType/ProfileTypeFinished.tsx
index e8a2b8fcf..63cc2babe 100644
--- a/src/components/ProfileType/ProfileTypeFinished.tsx
+++ b/src/components/ProfileType/ProfileTypeFinished.tsx
@@ -7,11 +7,9 @@ import 'components/ProfileType/profileTypeFinished.scss'
import { Client, useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { PROFILETYPE_DOCTYPE } from 'doctypes'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserExplorationID } from 'enum/userExploration.enum'
+import { UsageEventType, UserExplorationID } from 'enums'
import { DateTime } from 'luxon'
-import { TimePeriod } from 'models'
-import { ProfileType } from 'models/profileType.model'
+import { ProfileType, TimePeriod } from 'models'
import React, { useEffect, useState } from 'react'
import { useLocation, useNavigate } from 'react-router-dom'
import ProfileTypeService from 'services/profileType.service'
diff --git a/src/components/ProfileType/ProfileTypeFormDateSelection.tsx b/src/components/ProfileType/ProfileTypeFormDateSelection.tsx
index d9b203f0c..41279cdbb 100644
--- a/src/components/ProfileType/ProfileTypeFormDateSelection.tsx
+++ b/src/components/ProfileType/ProfileTypeFormDateSelection.tsx
@@ -3,13 +3,9 @@ import FormNavigation from 'components/FormGlobal/FormNavigation'
import FormProgress from 'components/FormGlobal/FormProgress'
import 'components/ProfileType/profileTypeForm.scss'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
+import { ProfileTypeStepForm } from 'enums'
import { DateTime } from 'luxon'
-import {
- ProfileType,
- ProfileTypeAnswer,
- ProfileTypeValues,
-} from 'models/profileType.model'
+import { ProfileType, ProfileTypeAnswer, ProfileTypeValues } from 'models'
import React, { useCallback, useState } from 'react'
import { getMonthFullName } from 'utils/utils'
diff --git a/src/components/ProfileType/ProfileTypeFormMultiChoice.spec.tsx b/src/components/ProfileType/ProfileTypeFormMultiChoice.spec.tsx
index 631295947..d1a811b26 100644
--- a/src/components/ProfileType/ProfileTypeFormMultiChoice.spec.tsx
+++ b/src/components/ProfileType/ProfileTypeFormMultiChoice.spec.tsx
@@ -1,4 +1,4 @@
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
+import { ProfileTypeStepForm } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
diff --git a/src/components/ProfileType/ProfileTypeFormMultiChoice.tsx b/src/components/ProfileType/ProfileTypeFormMultiChoice.tsx
index ffa3adc18..008be6979 100644
--- a/src/components/ProfileType/ProfileTypeFormMultiChoice.tsx
+++ b/src/components/ProfileType/ProfileTypeFormMultiChoice.tsx
@@ -3,9 +3,9 @@ import FormNavigation from 'components/FormGlobal/FormNavigation'
import FormProgress from 'components/FormGlobal/FormProgress'
import 'components/ProfileType/profileTypeForm.scss'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
+import { ProfileTypeStepForm } from 'enums'
import { remove } from 'lodash'
-import { ProfileType, ProfileTypeAnswer } from 'models/profileType.model'
+import { ProfileType, ProfileTypeAnswer } from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import { useAppSelector } from 'store/hooks'
diff --git a/src/components/ProfileType/ProfileTypeFormNumber.spec.tsx b/src/components/ProfileType/ProfileTypeFormNumber.spec.tsx
index 34aa9e69e..c5ebae6c7 100644
--- a/src/components/ProfileType/ProfileTypeFormNumber.spec.tsx
+++ b/src/components/ProfileType/ProfileTypeFormNumber.spec.tsx
@@ -1,4 +1,4 @@
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
+import { ProfileTypeStepForm } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
diff --git a/src/components/ProfileType/ProfileTypeFormNumber.tsx b/src/components/ProfileType/ProfileTypeFormNumber.tsx
index bcbee75fd..cb3d4e6a4 100644
--- a/src/components/ProfileType/ProfileTypeFormNumber.tsx
+++ b/src/components/ProfileType/ProfileTypeFormNumber.tsx
@@ -2,12 +2,8 @@ import FormNavigation from 'components/FormGlobal/FormNavigation'
import FormProgress from 'components/FormGlobal/FormProgress'
import 'components/ProfileType/profileTypeForm.scss'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
-import {
- ProfileType,
- ProfileTypeAnswer,
- ProfileTypeValues,
-} from 'models/profileType.model'
+import { ProfileTypeStepForm } from 'enums'
+import { ProfileType, ProfileTypeAnswer, ProfileTypeValues } from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import { useAppSelector } from 'store/hooks'
diff --git a/src/components/ProfileType/ProfileTypeFormNumberSelection.spec.tsx b/src/components/ProfileType/ProfileTypeFormNumberSelection.spec.tsx
index 9214b90f5..10eadf07a 100644
--- a/src/components/ProfileType/ProfileTypeFormNumberSelection.spec.tsx
+++ b/src/components/ProfileType/ProfileTypeFormNumberSelection.spec.tsx
@@ -1,4 +1,4 @@
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
+import { ProfileTypeStepForm } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
diff --git a/src/components/ProfileType/ProfileTypeFormNumberSelection.tsx b/src/components/ProfileType/ProfileTypeFormNumberSelection.tsx
index 16734ea06..2f1905ad1 100644
--- a/src/components/ProfileType/ProfileTypeFormNumberSelection.tsx
+++ b/src/components/ProfileType/ProfileTypeFormNumberSelection.tsx
@@ -3,12 +3,8 @@ import FormNavigation from 'components/FormGlobal/FormNavigation'
import FormProgress from 'components/FormGlobal/FormProgress'
import 'components/ProfileType/profileTypeForm.scss'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
-import {
- ProfileType,
- ProfileTypeAnswer,
- ProfileTypeValues,
-} from 'models/profileType.model'
+import { ProfileTypeStepForm } from 'enums'
+import { ProfileType, ProfileTypeAnswer, ProfileTypeValues } from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import { useAppSelector } from 'store/hooks'
diff --git a/src/components/ProfileType/ProfileTypeFormSingleChoice.spec.tsx b/src/components/ProfileType/ProfileTypeFormSingleChoice.spec.tsx
index 2250e2a47..293e3fa26 100644
--- a/src/components/ProfileType/ProfileTypeFormSingleChoice.spec.tsx
+++ b/src/components/ProfileType/ProfileTypeFormSingleChoice.spec.tsx
@@ -1,4 +1,4 @@
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
+import { ProfileTypeStepForm } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
diff --git a/src/components/ProfileType/ProfileTypeFormSingleChoice.tsx b/src/components/ProfileType/ProfileTypeFormSingleChoice.tsx
index 7487597c3..b7cb5f8fa 100644
--- a/src/components/ProfileType/ProfileTypeFormSingleChoice.tsx
+++ b/src/components/ProfileType/ProfileTypeFormSingleChoice.tsx
@@ -3,13 +3,13 @@ import FormNavigation from 'components/FormGlobal/FormNavigation'
import FormProgress from 'components/FormGlobal/FormProgress'
import 'components/ProfileType/profileTypeForm.scss'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { ProfileTypeStepForm } from 'enum/profileType.enum'
-import { ProfileEcogesture } from 'models'
+import { ProfileTypeStepForm } from 'enums'
import {
+ ProfileEcogesture,
ProfileType,
ProfileTypeAnswer,
ProfileTypeValues,
-} from 'models/profileType.model'
+} from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import { useAppSelector } from 'store/hooks'
diff --git a/src/components/ProfileType/ProfileTypeView.tsx b/src/components/ProfileType/ProfileTypeView.tsx
index 127369ad7..56db7b246 100644
--- a/src/components/ProfileType/ProfileTypeView.tsx
+++ b/src/components/ProfileType/ProfileTypeView.tsx
@@ -9,10 +9,10 @@ import ProfileTypeFormNumber from 'components/ProfileType/ProfileTypeFormNumber'
import ProfileTypeFormNumberSelection from 'components/ProfileType/ProfileTypeFormNumberSelection'
import ProfileTypeFormSingleChoice from 'components/ProfileType/ProfileTypeFormSingleChoice'
import 'components/ProfileType/profileTypeView.scss'
-import { FluidType } from 'enum/fluid.enum'
import {
ConstructionYear,
Floor,
+ FluidType,
HotWaterEquipment,
HotWaterFluid,
HousingType,
@@ -23,7 +23,7 @@ import {
ProfileTypeStepForm,
ThreeChoicesAnswer,
WarmingType,
-} from 'enum/profileType.enum'
+} from 'enums'
import { DateTime } from 'luxon'
import { ProfileType, ProfileTypeAnswer } from 'models'
import React, { useCallback, useEffect, useState } from 'react'
diff --git a/src/components/Quiz/QuizBegin.spec.tsx b/src/components/Quiz/QuizBegin.spec.tsx
index 20df0a706..0bb0dbb7e 100644
--- a/src/components/Quiz/QuizBegin.spec.tsx
+++ b/src/components/Quiz/QuizBegin.spec.tsx
@@ -1,6 +1,6 @@
import Button from '@material-ui/core/Button'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UserChallengeUpdateFlag } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
diff --git a/src/components/Quiz/QuizBegin.tsx b/src/components/Quiz/QuizBegin.tsx
index 634f32421..bf7e52aa4 100644
--- a/src/components/Quiz/QuizBegin.tsx
+++ b/src/components/Quiz/QuizBegin.tsx
@@ -4,7 +4,7 @@ import StarsContainer from 'components/Challenge/StarsContainer'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { Client, useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UserChallengeUpdateFlag } from 'enums'
import { UserChallenge } from 'models'
import React from 'react'
import ChallengeService from 'services/challenge.service'
diff --git a/src/components/Quiz/QuizCustomQuestionContent.tsx b/src/components/Quiz/QuizCustomQuestionContent.tsx
index 40f78e95f..98b8c161c 100644
--- a/src/components/Quiz/QuizCustomQuestionContent.tsx
+++ b/src/components/Quiz/QuizCustomQuestionContent.tsx
@@ -5,8 +5,7 @@ import Loader from 'components/Loader/Loader'
import QuizExplanationModal from 'components/Quiz/QuizExplanationModal'
import { Client, useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UsageEventType, UserChallengeUpdateFlag } from 'enums'
import { Answer, QuestionEntity, UserChallenge, UserQuiz } from 'models'
import React, { useState } from 'react'
import ChallengeService from 'services/challenge.service'
diff --git a/src/components/Quiz/QuizFinish.spec.tsx b/src/components/Quiz/QuizFinish.spec.tsx
index f028d62f9..979763f64 100644
--- a/src/components/Quiz/QuizFinish.spec.tsx
+++ b/src/components/Quiz/QuizFinish.spec.tsx
@@ -1,6 +1,6 @@
import Button from '@material-ui/core/Button'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UserChallengeUpdateFlag } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
diff --git a/src/components/Quiz/QuizFinish.tsx b/src/components/Quiz/QuizFinish.tsx
index 65eac3431..029ee4c52 100644
--- a/src/components/Quiz/QuizFinish.tsx
+++ b/src/components/Quiz/QuizFinish.tsx
@@ -3,7 +3,7 @@ import starResult from 'assets/icons/visu/quiz/starResult.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { Client, useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UserChallengeUpdateFlag } from 'enums'
import { UserChallenge } from 'models'
import React, { useCallback, useMemo } from 'react'
import { useNavigate } from 'react-router-dom'
diff --git a/src/components/Quiz/QuizQuestion.spec.tsx b/src/components/Quiz/QuizQuestion.spec.tsx
index 5f145d4dc..ee64e535a 100644
--- a/src/components/Quiz/QuizQuestion.spec.tsx
+++ b/src/components/Quiz/QuizQuestion.spec.tsx
@@ -1,5 +1,5 @@
/* eslint-disable react/display-name */
-import { UserQuestionState } from 'enum/userQuiz.enum'
+import { UserQuestionState } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
diff --git a/src/components/Quiz/QuizQuestionContent.tsx b/src/components/Quiz/QuizQuestionContent.tsx
index 28842fe8c..93c0ddf20 100644
--- a/src/components/Quiz/QuizQuestionContent.tsx
+++ b/src/components/Quiz/QuizQuestionContent.tsx
@@ -4,7 +4,7 @@ import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
import QuizExplanationModal from 'components/Quiz/QuizExplanationModal'
import { Client, useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UserChallengeUpdateFlag } from 'enums'
import { Answer, UserChallenge, UserQuiz } from 'models'
import React, { Dispatch, SetStateAction, useCallback, useState } from 'react'
import ChallengeService from 'services/challenge.service'
diff --git a/src/components/Quiz/QuizView.spec.tsx b/src/components/Quiz/QuizView.spec.tsx
index afa4acf44..5ba5d28c2 100644
--- a/src/components/Quiz/QuizView.spec.tsx
+++ b/src/components/Quiz/QuizView.spec.tsx
@@ -1,5 +1,5 @@
import QuizView from 'components/Quiz/QuizView'
-import { UserQuizState } from 'enum/userQuiz.enum'
+import { UserQuizState } from 'enums'
import { mount } from 'enzyme'
import { ChallengeState } from 'models'
import React from 'react'
diff --git a/src/components/Quiz/QuizView.tsx b/src/components/Quiz/QuizView.tsx
index 9bb016762..7b1dcd04b 100644
--- a/src/components/Quiz/QuizView.tsx
+++ b/src/components/Quiz/QuizView.tsx
@@ -1,7 +1,7 @@
import Content from 'components/Content/Content'
import CozyBar from 'components/Header/CozyBar'
import Header from 'components/Header/Header'
-import { UserQuizState } from 'enum/userQuiz.enum'
+import { UserQuizState } from 'enums'
import { UserChallenge } from 'models'
import React, { useState } from 'react'
import { useAppSelector } from 'store/hooks'
diff --git a/src/components/Routes/Routes.tsx b/src/components/Routes/Routes.tsx
index f795d67a8..327ed1389 100644
--- a/src/components/Routes/Routes.tsx
+++ b/src/components/Routes/Routes.tsx
@@ -9,7 +9,7 @@ import Loader from 'components/Loader/Loader'
import UnSubscribe from 'components/Options/Unsubscribe/UnSubscribe'
import QuizView from 'components/Quiz/QuizView'
import TermsView from 'components/Terms/TermsView'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { TermsStatus } from 'models'
import React, { lazy, Suspense } from 'react'
import { Navigate, Route, Routes } from 'react-router-dom'
diff --git a/src/components/Splash/SplashRoot.tsx b/src/components/Splash/SplashRoot.tsx
index 13969416d..0cedc5b42 100644
--- a/src/components/Splash/SplashRoot.tsx
+++ b/src/components/Splash/SplashRoot.tsx
@@ -2,14 +2,14 @@ import * as Sentry from '@sentry/react'
import classNames from 'classnames'
import useExploration from 'components/Hooks/useExploration'
import { useClient } from 'cozy-client'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserActionState } from 'enum/userAction.enum'
-import { UserChallengeState } from 'enum/userChallenge.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
import {
+ UsageEventType,
+ UserActionState,
+ UserChallengeState,
+ UserDuelState,
UserExplorationID,
UserExplorationState,
-} from 'enum/userExploration.enum'
+} from 'enums'
import { DateTime } from 'luxon'
import { migrations } from 'migrations/migration.data'
import { MigrationService } from 'migrations/migration.service'
diff --git a/src/components/Splash/SplashScreen.tsx b/src/components/Splash/SplashScreen.tsx
index 468b85b5f..7b068de2e 100644
--- a/src/components/Splash/SplashScreen.tsx
+++ b/src/components/Splash/SplashScreen.tsx
@@ -1,7 +1,7 @@
import logoLoading from 'assets/anims/logoLoading.gif'
import logos from 'assets/png/logos_partenaires.svg'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { InitSteps } from 'models/initialisationSteps.model'
+import { InitSteps } from 'models'
import React from 'react'
import './splashScreen.scss'
diff --git a/src/components/Splash/SplashScreenError.tsx b/src/components/Splash/SplashScreenError.tsx
index 91eaf7dba..1ebaaac2a 100644
--- a/src/components/Splash/SplashScreenError.tsx
+++ b/src/components/Splash/SplashScreenError.tsx
@@ -2,7 +2,7 @@ import Button from '@material-ui/core/Button'
import ecolyoIcon from 'assets/icons/ico/ecolyo.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { InitStepsErrors } from 'models/initialisationSteps.model'
+import { InitStepsErrors } from 'models'
import React from 'react'
import './splashScreen.scss'
diff --git a/src/components/TimeStepSelector/TimeStepSelector.spec.tsx b/src/components/TimeStepSelector/TimeStepSelector.spec.tsx
index 216566537..e7ae42fa7 100644
--- a/src/components/TimeStepSelector/TimeStepSelector.spec.tsx
+++ b/src/components/TimeStepSelector/TimeStepSelector.spec.tsx
@@ -1,7 +1,6 @@
import { Button } from '@material-ui/core'
import TimeStepSelector from 'components/TimeStepSelector/TimeStepSelector'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import { DateTime } from 'luxon'
diff --git a/src/components/TimeStepSelector/TimeStepSelector.tsx b/src/components/TimeStepSelector/TimeStepSelector.tsx
index ff58ddf61..1fc137ce4 100644
--- a/src/components/TimeStepSelector/TimeStepSelector.tsx
+++ b/src/components/TimeStepSelector/TimeStepSelector.tsx
@@ -1,9 +1,7 @@
import { Button } from '@material-ui/core'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { FluidType, TimeStep, UsageEventType } from 'enums'
import { DateTime } from 'luxon'
import React from 'react'
import DateChartService from 'services/dateChart.service'
diff --git a/src/components/TotalConsumption/TotalConsumption.spec.tsx b/src/components/TotalConsumption/TotalConsumption.spec.tsx
index a54492bc2..91f52d6c6 100644
--- a/src/components/TotalConsumption/TotalConsumption.spec.tsx
+++ b/src/components/TotalConsumption/TotalConsumption.spec.tsx
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
diff --git a/src/components/TotalConsumption/TotalConsumption.tsx b/src/components/TotalConsumption/TotalConsumption.tsx
index 6f82323b5..eec9e9ab7 100644
--- a/src/components/TotalConsumption/TotalConsumption.tsx
+++ b/src/components/TotalConsumption/TotalConsumption.tsx
@@ -2,8 +2,7 @@ import Coin from 'assets/icons/ico/coin.svg'
import Coins from 'assets/icons/ico/coins.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { useClient } from 'cozy-client'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { Dataload } from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import ConsumptionService from 'services/consumption.service'
diff --git a/src/doctypes/index.ts b/src/doctypes/index.ts
index 535698232..3eded16b7 100644
--- a/src/doctypes/index.ts
+++ b/src/doctypes/index.ts
@@ -216,3 +216,8 @@ export * from './io-cozy-jobs'
export * from './io-cozy-konnectors'
export * from './io-cozy-terms'
export * from './io-cozy-triggers'
+export * from './remote/org.ecolyo.agent'
+export * from './remote/org.ecolyo.agent.custom.popup'
+export * from './remote/org.ecolyo.agent.partners.info'
+export * from './remote/org.ecolyo.agent.prices'
+export * from './remote/org.ecolyo.dju'
diff --git a/src/enum/konnectorUpdate.enum.ts b/src/enum/konnectorUpdate.enum.ts
deleted file mode 100644
index d9b5dd8d7..000000000
--- a/src/enum/konnectorUpdate.enum.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export enum KonnectorUpdate {
- ERROR_UPDATE = 'error_update',
- ERROR_UPDATE_OAUTH = 'error_update_oauth',
- LOGIN_FAILED = 'login_failed',
- ERROR_CONSENT_FORM_GAS = 'error_consent_form_gas',
-}
diff --git a/src/enum/dacc.enum.ts b/src/enums/dacc.enum.ts
similarity index 100%
rename from src/enum/dacc.enum.ts
rename to src/enums/dacc.enum.ts
diff --git a/src/enum/dataload.enum.ts b/src/enums/dataload.enum.ts
similarity index 100%
rename from src/enum/dataload.enum.ts
rename to src/enums/dataload.enum.ts
diff --git a/src/enum/ecogesture.enum.ts b/src/enums/ecogesture.enum.ts
similarity index 100%
rename from src/enum/ecogesture.enum.ts
rename to src/enums/ecogesture.enum.ts
diff --git a/src/enum/ecogestureForm.enum.ts b/src/enums/ecogestureForm.enum.ts
similarity index 100%
rename from src/enum/ecogestureForm.enum.ts
rename to src/enums/ecogestureForm.enum.ts
diff --git a/src/enum/fluid.enum.ts b/src/enums/fluid.enum.ts
similarity index 100%
rename from src/enum/fluid.enum.ts
rename to src/enums/fluid.enum.ts
diff --git a/src/enum/fluidSlug.enum.ts b/src/enums/fluidSlug.enum.ts
similarity index 100%
rename from src/enum/fluidSlug.enum.ts
rename to src/enums/fluidSlug.enum.ts
diff --git a/src/enums/index.ts b/src/enums/index.ts
new file mode 100644
index 000000000..921ed6776
--- /dev/null
+++ b/src/enums/index.ts
@@ -0,0 +1,19 @@
+export * from './dacc.enum'
+export * from './dataload.enum'
+export * from './ecogesture.enum'
+export * from './ecogestureForm.enum'
+export * from './fluid.enum'
+export * from './fluidSlug.enum'
+export * from './jobState.enum'
+export * from './konnectorStatus.enum'
+export * from './profileType.enum'
+export * from './screen.enum'
+export * from './sgeStep.enum'
+export * from './timeStep.enum'
+export * from './usageEvent.enum'
+export * from './usageEventProperties.enum'
+export * from './userAction.enum'
+export * from './userChallenge.enum'
+export * from './userDuel.enum'
+export * from './userExploration.enum'
+export * from './userQuiz.enum'
diff --git a/src/enum/jobState.enum.ts b/src/enums/jobState.enum.ts
similarity index 100%
rename from src/enum/jobState.enum.ts
rename to src/enums/jobState.enum.ts
diff --git a/src/enum/konnectorError.enum.ts b/src/enums/konnectorStatus.enum.ts
similarity index 57%
rename from src/enum/konnectorError.enum.ts
rename to src/enums/konnectorStatus.enum.ts
index 090a513ca..ae8cba647 100644
--- a/src/enum/konnectorError.enum.ts
+++ b/src/enums/konnectorStatus.enum.ts
@@ -6,3 +6,10 @@ export enum KonnectorError {
UNKNOWN_ERROR = 'UNKNOWN_ERROR',
CRITICAL = 'exit status 1',
}
+
+export enum KonnectorUpdate {
+ ERROR_UPDATE = 'error_update',
+ ERROR_UPDATE_OAUTH = 'error_update_oauth',
+ LOGIN_FAILED = 'login_failed',
+ ERROR_CONSENT_FORM_GAS = 'error_consent_form_gas',
+}
diff --git a/src/enum/profileType.enum.ts b/src/enums/profileType.enum.ts
similarity index 100%
rename from src/enum/profileType.enum.ts
rename to src/enums/profileType.enum.ts
diff --git a/src/enum/screen.enum.ts b/src/enums/screen.enum.ts
similarity index 100%
rename from src/enum/screen.enum.ts
rename to src/enums/screen.enum.ts
diff --git a/src/enum/sgeStep.enum.ts b/src/enums/sgeStep.enum.ts
similarity index 100%
rename from src/enum/sgeStep.enum.ts
rename to src/enums/sgeStep.enum.ts
diff --git a/src/enum/timeStep.enum.ts b/src/enums/timeStep.enum.ts
similarity index 100%
rename from src/enum/timeStep.enum.ts
rename to src/enums/timeStep.enum.ts
diff --git a/src/enum/usageEvent.enum.ts b/src/enums/usageEvent.enum.ts
similarity index 100%
rename from src/enum/usageEvent.enum.ts
rename to src/enums/usageEvent.enum.ts
diff --git a/src/enum/usageEventProperties.enum.ts b/src/enums/usageEventProperties.enum.ts
similarity index 100%
rename from src/enum/usageEventProperties.enum.ts
rename to src/enums/usageEventProperties.enum.ts
diff --git a/src/enum/userAction.enum.ts b/src/enums/userAction.enum.ts
similarity index 100%
rename from src/enum/userAction.enum.ts
rename to src/enums/userAction.enum.ts
diff --git a/src/enum/userChallenge.enum.ts b/src/enums/userChallenge.enum.ts
similarity index 100%
rename from src/enum/userChallenge.enum.ts
rename to src/enums/userChallenge.enum.ts
diff --git a/src/enum/userDuel.enum.ts b/src/enums/userDuel.enum.ts
similarity index 100%
rename from src/enum/userDuel.enum.ts
rename to src/enums/userDuel.enum.ts
diff --git a/src/enum/userExploration.enum.ts b/src/enums/userExploration.enum.ts
similarity index 100%
rename from src/enum/userExploration.enum.ts
rename to src/enums/userExploration.enum.ts
diff --git a/src/enum/userQuiz.enum.ts b/src/enums/userQuiz.enum.ts
similarity index 100%
rename from src/enum/userQuiz.enum.ts
rename to src/enums/userQuiz.enum.ts
diff --git a/src/migrations/migration.data.ts b/src/migrations/migration.data.ts
index ada83c237..abaf259e4 100644
--- a/src/migrations/migration.data.ts
+++ b/src/migrations/migration.data.ts
@@ -15,7 +15,7 @@ import {
PROFILE_DOCTYPE,
USERCHALLENGE_DOCTYPE,
} from 'doctypes'
-import { UserQuizState } from 'enum/userQuiz.enum'
+import { UserQuizState } from 'enums'
import { DateTime } from 'luxon'
import { DataloadEntity, Profile, ProfileType, UserChallenge } from 'models'
import { Migration } from './migration.type'
diff --git a/src/migrations/migration.service.ts b/src/migrations/migration.service.ts
index 2746f1483..757f96447 100644
--- a/src/migrations/migration.service.ts
+++ b/src/migrations/migration.service.ts
@@ -1,9 +1,7 @@
import * as Sentry from '@sentry/react'
import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
-import { SCHEMAS_DOCTYPE } from 'doctypes/com-grandlyon-ecolyo-schemas'
-import { InitStepsErrors } from 'models/initialisationSteps.model'
-import { ReleaseNotes } from 'models/releaseNotes.model'
-import { Schema } from 'models/schema.models'
+import { SCHEMAS_DOCTYPE } from 'doctypes'
+import { InitStepsErrors, ReleaseNotes, Schema } from 'models'
import { logDuration } from 'utils/duration'
import logApp from 'utils/logger'
import { migrate, migrationLog } from './migration'
diff --git a/src/migrations/migration.ts b/src/migrations/migration.ts
index 746e0c0ad..b5e6819cb 100644
--- a/src/migrations/migration.ts
+++ b/src/migrations/migration.ts
@@ -1,7 +1,7 @@
import * as Sentry from '@sentry/react'
import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
-import { SCHEMAS_DOCTYPE } from 'doctypes/com-grandlyon-ecolyo-schemas'
-import { Schema } from 'models/schema.models'
+import { SCHEMAS_DOCTYPE } from 'doctypes'
+import { Schema } from 'models'
import logApp from 'utils/logger'
import {
MIGRATION_RESULT_COMPLETE,
diff --git a/src/migrations/migration.type.ts b/src/migrations/migration.type.ts
index 1ee3c9776..e4b7a93c4 100644
--- a/src/migrations/migration.type.ts
+++ b/src/migrations/migration.type.ts
@@ -1,5 +1,5 @@
import { Client } from 'cozy-client'
-import { Notes } from 'models/releaseNotes.model'
+import { Notes } from 'models'
type SchemaVersion = number
diff --git a/src/models/action.model.ts b/src/models/action.model.ts
index d9c011f5d..dec0f416b 100644
--- a/src/models/action.model.ts
+++ b/src/models/action.model.ts
@@ -1,4 +1,4 @@
-import { UserActionState } from 'enum/userAction.enum'
+import { UserActionState } from 'enums'
import { DateTime } from 'luxon'
import { Ecogesture } from 'models'
diff --git a/src/models/challenge.model.ts b/src/models/challenge.model.ts
index 1e9bee4e1..0b02418fe 100644
--- a/src/models/challenge.model.ts
+++ b/src/models/challenge.model.ts
@@ -1,7 +1,4 @@
-import {
- UserChallengeState,
- UserChallengeSuccess,
-} from 'enum/userChallenge.enum'
+import { UserChallengeState, UserChallengeSuccess } from 'enums'
import { DateTime } from 'luxon'
import {
Dataload,
diff --git a/src/models/chart.model.ts b/src/models/chart.model.ts
index 787ad6861..96fa843eb 100644
--- a/src/models/chart.model.ts
+++ b/src/models/chart.model.ts
@@ -1,4 +1,4 @@
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { Datachart } from 'models'
diff --git a/src/models/config.model.ts b/src/models/config.model.ts
index 121b79ed6..e81248d9a 100644
--- a/src/models/config.model.ts
+++ b/src/models/config.model.ts
@@ -1,4 +1,4 @@
-import { FluidSlugType } from 'enum/fluidSlug.enum'
+import { FluidSlugType } from 'enums'
export interface KonnectorConfig {
name: string
diff --git a/src/models/dataload.model.ts b/src/models/dataload.model.ts
index 3f7f73b01..e40d69dfe 100644
--- a/src/models/dataload.model.ts
+++ b/src/models/dataload.model.ts
@@ -1,4 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
+import { DataloadState } from 'enums'
import { DateTime } from 'luxon'
export interface DataloadValueDetail {
diff --git a/src/models/duel.model.ts b/src/models/duel.model.ts
index 83687f719..43628dbca 100644
--- a/src/models/duel.model.ts
+++ b/src/models/duel.model.ts
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
+import { FluidType, UserDuelState } from 'enums'
import { DateTime, Duration } from 'luxon'
export interface DuelEntity {
diff --git a/src/models/ecogesture.model.ts b/src/models/ecogesture.model.ts
index 79f82d677..d885795ce 100644
--- a/src/models/ecogesture.model.ts
+++ b/src/models/ecogesture.model.ts
@@ -1,5 +1,4 @@
-import { EquipmentType, Room, Season, Usage } from 'enum/ecogesture.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { EquipmentType, FluidType, Room, Season, Usage } from 'enums'
export interface Ecogesture {
id: string
diff --git a/src/models/exploration.model.ts b/src/models/exploration.model.ts
index eccf99be8..792225668 100644
--- a/src/models/exploration.model.ts
+++ b/src/models/exploration.model.ts
@@ -1,9 +1,5 @@
/* eslint-disable camelcase */
-import { FluidType } from 'enum/fluid.enum'
-import {
- UserExplorationState,
- UserExplorationType,
-} from 'enum/userExploration.enum'
+import { FluidType, UserExplorationState, UserExplorationType } from 'enums'
import { DateTime } from 'luxon'
export interface ExplorationEntity {
diff --git a/src/models/fluid.model.ts b/src/models/fluid.model.ts
index 2994de62d..a99af34eb 100644
--- a/src/models/fluid.model.ts
+++ b/src/models/fluid.model.ts
@@ -1,4 +1,4 @@
-import { FluidState, FluidType } from 'enum/fluid.enum'
+import { FluidState, FluidType } from 'enums'
import { DateTime } from 'luxon'
import { Account, Konnector, KonnectorConfig, Trigger } from 'models'
import { TriggerState } from './trigger.model'
diff --git a/src/models/fluidPrice.model.ts b/src/models/fluidPrice.model.ts
index 97bd62279..c38feff39 100644
--- a/src/models/fluidPrice.model.ts
+++ b/src/models/fluidPrice.model.ts
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
export interface FluidPrice {
fluidType: FluidType
diff --git a/src/models/global.model.ts b/src/models/global.model.ts
index e7098fc38..c9ca17dfd 100644
--- a/src/models/global.model.ts
+++ b/src/models/global.model.ts
@@ -1,6 +1,4 @@
-import { Usage } from 'enum/ecogesture.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { ScreenType } from 'enum/screen.enum'
+import { FluidType, ScreenType, Usage } from 'enums'
import { TermsStatus } from 'models'
import { FluidStatus } from './fluid.model'
import { PartnersInfo } from './partnersInfo.model'
diff --git a/src/models/index.ts b/src/models/index.ts
index 09b065bde..99412717d 100644
--- a/src/models/index.ts
+++ b/src/models/index.ts
@@ -7,8 +7,10 @@ export * from './config.model'
export * from './customPopup.model'
export * from './datachart.model'
export * from './dataload.model'
+export * from './dju.model'
export * from './duel.model'
export * from './ecogesture.model'
+export * from './enedisMonthlyAnalysis'
export * from './exploration.model'
export * from './fluid.model'
export * from './fluidPrice.model'
@@ -16,13 +18,18 @@ export * from './global.model'
export * from './indicator.model'
export * from './initialisationSteps.model'
export * from './konnector.model'
+export * from './maxPower.model'
export * from './modal.model'
+export * from './monthlyReport.model'
export * from './partnersInfo.model'
export * from './profile.model'
export * from './profileEcogesture.model'
export * from './profileType.model'
export * from './quiz.model'
export * from './relation.model'
+export * from './releaseNotes.model'
+export * from './schema.models'
+export * from './sgeStore.model'
export * from './term.model'
export * from './timePeriod.model'
export * from './trigger.model'
diff --git a/src/models/modal.model.ts b/src/models/modal.model.ts
index 0dbb67b01..019051d00 100644
--- a/src/models/modal.model.ts
+++ b/src/models/modal.model.ts
@@ -1,4 +1,4 @@
-import { CustomPopup } from 'models/customPopup.model'
+import { CustomPopup } from 'models'
export interface ModalState {
customPopupModal: CustomPopup
diff --git a/src/models/profileEcogesture.model.ts b/src/models/profileEcogesture.model.ts
index 217f67a70..9c1fdd8d7 100644
--- a/src/models/profileEcogesture.model.ts
+++ b/src/models/profileEcogesture.model.ts
@@ -1,4 +1,4 @@
-import { ProfileEcogestureAnswerType } from 'enum/ecogestureForm.enum'
+import { ProfileEcogestureAnswerType } from 'enums'
import { ProfileType } from './profileType.model'
export type ProfileEcogesture = Pick<
diff --git a/src/models/profileType.model.ts b/src/models/profileType.model.ts
index e3184314d..0c62b3844 100644
--- a/src/models/profileType.model.ts
+++ b/src/models/profileType.model.ts
@@ -1,8 +1,8 @@
-import { EquipmentType } from 'enum/ecogesture.enum'
-import { FluidType } from 'enum/fluid.enum'
import {
ConstructionYear,
+ EquipmentType,
Floor,
+ FluidType,
HotWaterEquipment,
HotWaterFluid,
HousingType,
@@ -12,7 +12,7 @@ import {
ProfileTypeFormType,
ThreeChoicesAnswer,
WarmingType,
-} from 'enum/profileType.enum'
+} from 'enums'
import { DateTime } from 'luxon'
export interface ProfileType {
diff --git a/src/models/quiz.model.ts b/src/models/quiz.model.ts
index a03221eb7..b691fbac9 100644
--- a/src/models/quiz.model.ts
+++ b/src/models/quiz.model.ts
@@ -1,9 +1,9 @@
-import { TimeStep } from 'enum/timeStep.enum'
import {
CustomQuestionType,
+ TimeStep,
UserQuestionState,
UserQuizState,
-} from 'enum/userQuiz.enum'
+} from 'enums'
import { DateTime } from 'luxon'
export interface Answer {
diff --git a/src/models/usageEvent.model.ts b/src/models/usageEvent.model.ts
index 210a849f1..d0f04944e 100644
--- a/src/models/usageEvent.model.ts
+++ b/src/models/usageEvent.model.ts
@@ -1,4 +1,4 @@
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
import { DateTime } from 'luxon'
export interface AddEventParams {
diff --git a/src/services/action.service.spec.ts b/src/services/action.service.spec.ts
index 6eea6bfa5..48f0c210f 100644
--- a/src/services/action.service.spec.ts
+++ b/src/services/action.service.spec.ts
@@ -1,5 +1,4 @@
-import { Season } from 'enum/ecogesture.enum'
-import { UserActionState } from 'enum/userAction.enum'
+import { Season, UserActionState } from 'enums'
import { DateTime } from 'luxon'
import { Ecogesture, UserAction } from 'models'
import * as utils from 'utils/utils'
diff --git a/src/services/action.service.ts b/src/services/action.service.ts
index 9441daf63..67a1c41db 100644
--- a/src/services/action.service.ts
+++ b/src/services/action.service.ts
@@ -1,8 +1,10 @@
import { Client } from 'cozy-client'
-import { Season } from 'enum/ecogesture.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { UserActionState } from 'enum/userAction.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import {
+ FluidType,
+ Season,
+ UserActionState,
+ UserChallengeUpdateFlag,
+} from 'enums'
import { orderBy } from 'lodash'
import { DateTime } from 'luxon'
import { Ecogesture, UserAction, UserChallenge } from 'models'
diff --git a/src/services/challenge.service.spec.ts b/src/services/challenge.service.spec.ts
index b05f55465..287719e29 100644
--- a/src/services/challenge.service.spec.ts
+++ b/src/services/challenge.service.spec.ts
@@ -1,13 +1,13 @@
/* eslint-disable camelcase */
import { QueryResult } from 'cozy-client'
-import { DataloadState } from 'enum/dataload.enum'
-import { UserActionState } from 'enum/userAction.enum'
import {
+ DataloadState,
+ UserActionState,
UserChallengeState,
UserChallengeSuccess,
UserChallengeUpdateFlag,
-} from 'enum/userChallenge.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
+ UserDuelState,
+} from 'enums'
import { cloneDeep } from 'lodash'
import { DateTime, Duration } from 'luxon'
import {
diff --git a/src/services/challenge.service.ts b/src/services/challenge.service.ts
index 4373e8a88..e625f4179 100644
--- a/src/services/challenge.service.ts
+++ b/src/services/challenge.service.ts
@@ -2,16 +2,17 @@ import * as Sentry from '@sentry/react'
import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
import logger from 'cozy-logger'
import { CHALLENGE_DOCTYPE, USERCHALLENGE_DOCTYPE } from 'doctypes'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
-import { UserActionState } from 'enum/userAction.enum'
import {
+ FluidState,
+ FluidType,
+ TimeStep,
+ UserActionState,
UserChallengeState,
UserChallengeSuccess,
UserChallengeUpdateFlag,
-} from 'enum/userChallenge.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
-import { UserExplorationState } from 'enum/userExploration.enum'
+ UserDuelState,
+ UserExplorationState,
+} from 'enums'
import { DateTime } from 'luxon'
import {
ChallengeEntity,
diff --git a/src/services/connection.service.ts b/src/services/connection.service.ts
index af9ccea3b..500955376 100644
--- a/src/services/connection.service.ts
+++ b/src/services/connection.service.ts
@@ -6,9 +6,9 @@ import {
AccountAuthData,
AccountSgeData,
Konnector,
+ SgeStore,
Trigger,
} from 'models'
-import { SgeStore } from 'models/sgeStore.model'
import AccountService from 'services/account.service'
import KonnectorService from 'services/konnector.service'
import TriggerService from 'services/triggers.service'
diff --git a/src/services/consumption.service.spec.ts b/src/services/consumption.service.spec.ts
index b848e4c06..3e2c3019a 100644
--- a/src/services/consumption.service.spec.ts
+++ b/src/services/consumption.service.spec.ts
@@ -1,8 +1,6 @@
import { QueryResult } from 'cozy-client'
import { ENEDIS_MINUTE_DOCTYPE } from 'doctypes'
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { DataloadState, FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import {
Datachart,
diff --git a/src/services/consumption.service.ts b/src/services/consumption.service.ts
index 7fce6981f..dc8f51833 100644
--- a/src/services/consumption.service.ts
+++ b/src/services/consumption.service.ts
@@ -1,20 +1,18 @@
import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
import { Doctype } from 'cozy-client/types/types'
import { ENEDIS_MINUTE_DOCTYPE } from 'doctypes'
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { DataloadState, FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import {
Datachart,
Dataload,
DataloadEntity,
DataloadValueDetail,
+ EnedisMonthlyAnalysisData,
FluidStatus,
PerformanceIndicator,
TimePeriod,
} from 'models'
-import { EnedisMonthlyAnalysisData } from 'models/enedisMonthlyAnalysis'
import ConsumptionFormatterService from 'services/consumptionFormatter.service'
import ConsumptionValidatorService from 'services/consumptionValidator.service'
import ConverterService from 'services/converter.service'
diff --git a/src/services/consumptionFormatter.service.spec.ts b/src/services/consumptionFormatter.service.spec.ts
index 1b6e2c2b9..7b1a5db7f 100644
--- a/src/services/consumptionFormatter.service.spec.ts
+++ b/src/services/consumptionFormatter.service.spec.ts
@@ -1,6 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { DataloadState, FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { Dataload, FluidStatus, TimePeriod } from 'models'
import { fluidStatusConnectedData } from '../../tests/__mocks__/fluidStatusData.mock'
diff --git a/src/services/consumptionFormatter.service.ts b/src/services/consumptionFormatter.service.ts
index 36c32a784..cc0520688 100644
--- a/src/services/consumptionFormatter.service.ts
+++ b/src/services/consumptionFormatter.service.ts
@@ -1,6 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { DataloadState, FluidType, TimeStep } from 'enums'
import { DateTime, Interval } from 'luxon'
import { Dataload, FluidStatus, TimePeriod } from 'models'
import DateChartService from 'services/dateChart.service'
diff --git a/src/services/consumptionValidator.service.spec.ts b/src/services/consumptionValidator.service.spec.ts
index dbb3be752..e18a4f5b4 100644
--- a/src/services/consumptionValidator.service.spec.ts
+++ b/src/services/consumptionValidator.service.spec.ts
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { TimePeriod } from 'models'
import ConsumptionValidatorService from './consumptionValidator.service'
diff --git a/src/services/consumptionValidator.service.ts b/src/services/consumptionValidator.service.ts
index 7f3901487..c120459d8 100644
--- a/src/services/consumptionValidator.service.ts
+++ b/src/services/consumptionValidator.service.ts
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { Interval } from 'luxon'
import { TimePeriod } from 'models'
diff --git a/src/services/converter.service.spec.ts b/src/services/converter.service.spec.ts
index da324b069..85868150a 100644
--- a/src/services/converter.service.spec.ts
+++ b/src/services/converter.service.spec.ts
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import ConverterService from './converter.service'
import ConfigService from './fluidConfig.service'
diff --git a/src/services/converter.service.ts b/src/services/converter.service.ts
index c7e45fa56..2b3d0b018 100644
--- a/src/services/converter.service.ts
+++ b/src/services/converter.service.ts
@@ -1,4 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { FluidConfig } from 'models'
import ConfigService from './fluidConfig.service'
diff --git a/src/services/customPopup.service.ts b/src/services/customPopup.service.ts
index 32f87726e..0237970e6 100644
--- a/src/services/customPopup.service.ts
+++ b/src/services/customPopup.service.ts
@@ -4,8 +4,8 @@ import logger from 'cozy-logger'
import {
REMOTE_ORG_ECOLYO_AGENT_CUSTOM_POPUP,
REMOTE_ORG_ECOLYO_AGENT_CUSTOM_POPUP_REC,
-} from 'doctypes/remote/org.ecolyo.agent.custom.popup'
-import { CustomPopup } from 'models/customPopup.model'
+} from 'doctypes'
+import { CustomPopup } from 'models'
import logApp from 'utils/logger'
import EnvironmentService from './environment.service'
diff --git a/src/services/dateChart.service.spec.ts b/src/services/dateChart.service.spec.ts
index 393f02a12..c261baf9e 100644
--- a/src/services/dateChart.service.spec.ts
+++ b/src/services/dateChart.service.spec.ts
@@ -1,4 +1,4 @@
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { TimePeriod } from 'models'
import DateChartService from './dateChart.service'
diff --git a/src/services/dateChart.service.ts b/src/services/dateChart.service.ts
index 199666c05..550252fa2 100644
--- a/src/services/dateChart.service.ts
+++ b/src/services/dateChart.service.ts
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { DateTime, Interval } from 'luxon'
import { FluidConfig, TimePeriod } from 'models'
import ConfigService from './fluidConfig.service'
diff --git a/src/services/duel.service.spec.ts b/src/services/duel.service.spec.ts
index 0a6260c98..3b40046d7 100644
--- a/src/services/duel.service.spec.ts
+++ b/src/services/duel.service.spec.ts
@@ -1,6 +1,5 @@
import { QueryResult } from 'cozy-client'
-import { FluidType } from 'enum/fluid.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
+import { FluidType, UserDuelState } from 'enums'
import { DateTime, Duration } from 'luxon'
import { DuelEntity, UserDuel } from 'models'
import DuelService from 'services/duel.service'
diff --git a/src/services/duel.service.ts b/src/services/duel.service.ts
index d3f010ac5..204e9e708 100644
--- a/src/services/duel.service.ts
+++ b/src/services/duel.service.ts
@@ -1,10 +1,8 @@
import * as Sentry from '@sentry/react'
import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
import logger from 'cozy-logger'
-import { DUEL_DOCTYPE } from 'doctypes/com-grandlyon-ecolyo-duel'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
-import { UserDuelState } from 'enum/userDuel.enum'
+import { DUEL_DOCTYPE } from 'doctypes'
+import { FluidState, FluidType, TimeStep, UserDuelState } from 'enums'
import { DateTime, Duration } from 'luxon'
import {
Datachart,
diff --git a/src/services/ecogesture.service.spec.ts b/src/services/ecogesture.service.spec.ts
index 6e9ebd93f..30cd5ee55 100644
--- a/src/services/ecogesture.service.spec.ts
+++ b/src/services/ecogesture.service.spec.ts
@@ -1,7 +1,6 @@
import { QueryResult } from 'cozy-client'
import ecogestureData from 'db/ecogestureData.json'
-import { EquipmentType } from 'enum/ecogesture.enum'
-import { IndividualOrCollective, WarmingType } from 'enum/profileType.enum'
+import { EquipmentType, IndividualOrCollective, WarmingType } from 'enums'
import { Ecogesture } from 'models'
import { ProfileEcogesture } from 'models/profileEcogesture.model'
import { hashFile } from 'utils/hash'
diff --git a/src/services/ecogesture.service.ts b/src/services/ecogesture.service.ts
index 0420aa509..402795d9e 100644
--- a/src/services/ecogesture.service.ts
+++ b/src/services/ecogesture.service.ts
@@ -3,12 +3,15 @@ import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
import logger from 'cozy-logger'
import ecogestureData from 'db/ecogestureData.json'
import { ECOGESTURE_DOCTYPE } from 'doctypes'
-import { Season, Usage } from 'enum/ecogesture.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { IndividualOrCollective, WarmingType } from 'enum/profileType.enum'
+import {
+ FluidType,
+ IndividualOrCollective,
+ Season,
+ Usage,
+ WarmingType,
+} from 'enums'
import { orderBy } from 'lodash'
-import { Ecogesture } from 'models'
-import { ProfileEcogesture } from 'models/profileEcogesture.model'
+import { Ecogesture, ProfileEcogesture } from 'models'
import { logDuration } from 'utils/duration'
import { hashFile } from 'utils/hash'
import logApp from 'utils/logger'
diff --git a/src/services/enedisMonthlyAnalysisData.service.ts b/src/services/enedisMonthlyAnalysisData.service.ts
index 0eff9590f..7d893b96e 100644
--- a/src/services/enedisMonthlyAnalysisData.service.ts
+++ b/src/services/enedisMonthlyAnalysisData.service.ts
@@ -5,14 +5,13 @@ import {
ENEDIS_MAXPOWER_DOCTYPE,
ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE,
} from 'doctypes'
-import { DataloadState } from 'enum/dataload.enum'
+import { DataloadState } from 'enums'
import { DateTime } from 'luxon'
-import { Dataload } from 'models'
+import { Dataload, MaxPowerEntity } from 'models'
import {
AggregatedEnedisMonthlyDataloads,
EnedisMonthlyAnalysisData,
} from 'models/enedisMonthlyAnalysis'
-import { MaxPowerEntity } from 'models/maxPower.model'
import logApp from 'utils/logger'
const logStack = logger.namespace('enedisMonthlyAnalysisDataService')
diff --git a/src/services/exploration.service.spec.ts b/src/services/exploration.service.spec.ts
index d6d1b092a..f6c84e02e 100644
--- a/src/services/exploration.service.spec.ts
+++ b/src/services/exploration.service.spec.ts
@@ -1,5 +1,5 @@
import { QueryResult } from 'cozy-client'
-import { UserExplorationState } from 'enum/userExploration.enum'
+import { UserExplorationState } from 'enums'
import { ExplorationEntity, UserChallenge, UserExploration } from 'models'
import mockClient from '../../tests/__mocks__/client'
import {
diff --git a/src/services/exploration.service.ts b/src/services/exploration.service.ts
index 8a4db83a6..8e1047938 100644
--- a/src/services/exploration.service.ts
+++ b/src/services/exploration.service.ts
@@ -1,11 +1,11 @@
import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
import { EXPLORATION_DOCTYPE } from 'doctypes'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
import {
+ UserChallengeUpdateFlag,
UserExplorationID,
UserExplorationState,
UserExplorationType,
-} from 'enum/userExploration.enum'
+} from 'enums'
import { DateTime } from 'luxon'
import { ExplorationEntity, UserChallenge, UserExploration } from 'models'
import ChallengeService from './challenge.service'
diff --git a/src/services/fluid.service.spec.ts b/src/services/fluid.service.spec.ts
index 53fe0add5..e5e3694f2 100644
--- a/src/services/fluid.service.spec.ts
+++ b/src/services/fluid.service.spec.ts
@@ -1,13 +1,12 @@
/* eslint-disable camelcase */
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
+import { FluidSlugType, FluidState, FluidType } from 'enums'
import { DateTime } from 'luxon'
import { FluidStatus } from 'models'
import { accountsData } from '../../tests/__mocks__/accountsData.mock'
import mockClient from '../../tests/__mocks__/client'
import { konnectorsData } from '../../tests/__mocks__/konnectorsData.mock'
-import { triggersData } from '../../tests/__mocks__/triggersData.mock'
import { triggerStateData } from '../../tests/__mocks__/triggerStateData.mock'
+import { triggersData } from '../../tests/__mocks__/triggersData.mock'
import FluidService from './fluid.service'
const mockGetAccountByType = jest.fn()
diff --git a/src/services/fluid.service.ts b/src/services/fluid.service.ts
index 3de8f5c45..e6f3443de 100644
--- a/src/services/fluid.service.ts
+++ b/src/services/fluid.service.ts
@@ -1,8 +1,14 @@
import { Client } from 'cozy-client'
-import { FluidState, FluidType } from 'enum/fluid.enum'
+import { FluidState, FluidType } from 'enums'
import { DateTime } from 'luxon'
-import { Account, FluidStatus, Konnector, Trigger, TriggerState } from 'models'
-import { PartnersInfo } from 'models/partnersInfo.model'
+import {
+ Account,
+ FluidStatus,
+ Konnector,
+ PartnersInfo,
+ Trigger,
+ TriggerState,
+} from 'models'
import AccountService from 'services/account.service'
import ConsumptionService from 'services/consumption.service'
import ConfigService from 'services/fluidConfig.service'
diff --git a/src/services/fluidsPrices.service.spec.ts b/src/services/fluidsPrices.service.spec.ts
index f83929e3b..0e2a551a3 100644
--- a/src/services/fluidsPrices.service.spec.ts
+++ b/src/services/fluidsPrices.service.spec.ts
@@ -1,5 +1,5 @@
import { QueryResult } from 'cozy-client'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { DateTime } from 'luxon'
import { FluidPrice } from 'models'
import mockClient from '../../tests/__mocks__/client'
diff --git a/src/services/fluidsPrices.service.ts b/src/services/fluidsPrices.service.ts
index 7ea8c8fb3..64ad119f7 100644
--- a/src/services/fluidsPrices.service.ts
+++ b/src/services/fluidsPrices.service.ts
@@ -2,7 +2,7 @@ import * as Sentry from '@sentry/react'
import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
import logger from 'cozy-logger'
import { FLUIDSPRICES_DOCTYPE } from 'doctypes'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { DateTime } from 'luxon'
import { FluidPrice } from 'models'
import logApp from 'utils/logger'
diff --git a/src/services/initialization.service.spec.ts b/src/services/initialization.service.spec.ts
index 39cf264a0..b8a438127 100644
--- a/src/services/initialization.service.spec.ts
+++ b/src/services/initialization.service.spec.ts
@@ -3,7 +3,7 @@ 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 'enum/fluid.enum'
+import { FluidType } from 'enums'
import { DateTime } from 'luxon'
import { Profile, UserChallenge } from 'models'
import { getActualAnalysisDate } from 'utils/date'
diff --git a/src/services/initialization.service.ts b/src/services/initialization.service.ts
index 56b3b9fc6..a209b48de 100644
--- a/src/services/initialization.service.ts
+++ b/src/services/initialization.service.ts
@@ -12,12 +12,10 @@ import {
EXPLORATION_DOCTYPE,
PROFILE_DOCTYPE,
QUIZ_DOCTYPE,
-} from 'doctypes'
-import {
REMOTE_ORG_ECOLYO_AGENT_PRICES,
REMOTE_ORG_ECOLYO_AGENT_PRICES_REC,
-} from 'doctypes/remote/org.ecolyo.agent.prices'
-import { FluidType } from 'enum/fluid.enum'
+} from 'doctypes'
+import { FluidType } from 'enums'
import { DateTime } from 'luxon'
import { initSchemaDoctype } from 'migrations/migration'
import { migrations } from 'migrations/migration.data'
@@ -25,13 +23,14 @@ import {
Dataload,
FluidPrice,
FluidStatus,
+ InitSteps,
+ InitStepsErrors,
Profile,
+ ProfileEcogesture,
ProfileType,
TermsStatus,
UserChallenge,
} from 'models'
-import { InitSteps, InitStepsErrors } from 'models/initialisationSteps.model'
-import { ProfileEcogesture } from 'models/profileEcogesture.model'
import React from 'react'
import ChallengeService from 'services/challenge.service'
import DuelService from 'services/duel.service'
diff --git a/src/services/konnectorStatus.service.ts b/src/services/konnectorStatus.service.ts
index 10addfe4a..46395d3e1 100644
--- a/src/services/konnectorStatus.service.ts
+++ b/src/services/konnectorStatus.service.ts
@@ -1,5 +1,5 @@
import { Client } from 'cozy-client'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import AccountService from 'services/account.service'
import ConfigService from 'services/fluidConfig.service'
diff --git a/src/services/partnersInfo.service.ts b/src/services/partnersInfo.service.ts
index 26d814d8f..6a39656d9 100644
--- a/src/services/partnersInfo.service.ts
+++ b/src/services/partnersInfo.service.ts
@@ -4,8 +4,8 @@ import logger from 'cozy-logger'
import {
REMOTE_ORG_ECOLYO_AGENT_PARTNERS_INFO,
REMOTE_ORG_ECOLYO_AGENT_PARTNERS_INFO_REC,
-} from 'doctypes/remote/org.ecolyo.agent.partners.info'
-import { PartnersInfo } from 'models/partnersInfo.model'
+} from 'doctypes'
+import { PartnersInfo } from 'models'
import logApp from 'utils/logger'
import EnvironmentService from './environment.service'
diff --git a/src/services/profileEcogesture.service.spec.ts b/src/services/profileEcogesture.service.spec.ts
index 5a6e2ee60..79974fbc4 100644
--- a/src/services/profileEcogesture.service.spec.ts
+++ b/src/services/profileEcogesture.service.spec.ts
@@ -1,5 +1,5 @@
import { QueryResult } from 'cozy-client'
-import { EquipmentType } from 'enum/ecogesture.enum'
+import { EquipmentType } from 'enums'
import { ProfileEcogesture } from 'models/profileEcogesture.model'
import mockClient from '../../tests/__mocks__/client'
import { mockProfileEcogestureUpdated } from '../../tests/__mocks__/profileEcogesture.mock'
diff --git a/src/services/profileEcogesture.service.ts b/src/services/profileEcogesture.service.ts
index d38c43f89..d5a714a47 100644
--- a/src/services/profileEcogesture.service.ts
+++ b/src/services/profileEcogesture.service.ts
@@ -1,6 +1,6 @@
import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
import { PROFILEECOGESTURE_DOCTYPE } from 'doctypes'
-import { ProfileEcogesture } from 'models/profileEcogesture.model'
+import { ProfileEcogesture } from 'models'
export default class ProfileEcogestureService {
private readonly _client: Client
diff --git a/src/services/profileEcogestureForm.service.ts b/src/services/profileEcogestureForm.service.ts
index 0e3aae75a..824e6eeef 100644
--- a/src/services/profileEcogestureForm.service.ts
+++ b/src/services/profileEcogestureForm.service.ts
@@ -1,14 +1,15 @@
-import { EquipmentType } from 'enum/ecogesture.enum'
import {
EcogestureStepForm,
+ EquipmentType,
+ IndividualOrCollective,
ProfileEcogestureAnswerType,
-} from 'enum/ecogestureForm.enum'
-import { IndividualOrCollective, WarmingType } from 'enum/profileType.enum'
+ WarmingType,
+} from 'enums'
import {
ProfileEcogesture,
ProfileEcogestureAnswer,
ProfileEcogestureValues,
-} from 'models/profileEcogesture.model'
+} from 'models'
export default class ProfileEcogestureFormService {
private readonly profileEcogesture: ProfileEcogesture
diff --git a/src/services/profileType.service.spec.ts b/src/services/profileType.service.spec.ts
index 0d58b4f0a..42993963c 100644
--- a/src/services/profileType.service.spec.ts
+++ b/src/services/profileType.service.spec.ts
@@ -7,7 +7,7 @@ import {
ProfileTypeStepForm,
ThreeChoicesAnswer,
WarmingType,
-} from 'enum/profileType.enum'
+} from 'enums'
import { DateTime } from 'luxon'
import { ProfileType } from 'models/profileType.model'
import mockClient from '../../tests/__mocks__/client'
diff --git a/src/services/profileType.service.ts b/src/services/profileType.service.ts
index 2255192a8..a5a2900fc 100644
--- a/src/services/profileType.service.ts
+++ b/src/services/profileType.service.ts
@@ -6,26 +6,26 @@ import elecSpeData from 'constants/consumptionConstants/electricSpecific.json'
import heatingData from 'constants/consumptionConstants/heating.json'
import { Client } from 'cozy-client'
import logger from 'cozy-logger'
-import { REMOTE_ORG_ECOLYO_DJU } from 'doctypes/remote/org.ecolyo.dju'
-import { FluidType } from 'enum/fluid.enum'
+import { REMOTE_ORG_ECOLYO_DJU } from 'doctypes'
import {
ConstructionYear,
Floor,
+ FluidType,
HotWaterEquipment,
HousingType,
IndividualInsulationWork,
IndividualOrCollective,
OutsideFacingWalls,
ThreeChoicesAnswer,
-} from 'enum/profileType.enum'
+} from 'enums'
import { DateTime } from 'luxon'
-import { DjuResult } from 'models/dju.model'
import {
DetailsMonthlyForecast,
+ DjuResult,
FluidForecast,
MonthlyForecast,
ProfileType,
-} from 'models/profileType.model'
+} from 'models'
import logApp from 'utils/logger'
import ConverterService from './converter.service'
diff --git a/src/services/profileTypeForm.service.ts b/src/services/profileTypeForm.service.ts
index 14e2bcd30..b9d990f3b 100644
--- a/src/services/profileTypeForm.service.ts
+++ b/src/services/profileTypeForm.service.ts
@@ -1,8 +1,8 @@
-import { EquipmentType } from 'enum/ecogesture.enum'
-import { FluidType } from 'enum/fluid.enum'
import {
ConstructionYear,
+ EquipmentType,
Floor,
+ FluidType,
HotWaterEquipment,
HotWaterFluid,
HousingType,
@@ -13,7 +13,7 @@ import {
ProfileTypeStepForm,
ThreeChoicesAnswer,
WarmingType,
-} from 'enum/profileType.enum'
+} from 'enums'
import { ProfileType, ProfileTypeAnswer } from 'models'
export default class ProfileTypeFormService {
diff --git a/src/services/queryRunner.service.spec.ts b/src/services/queryRunner.service.spec.ts
index e820301be..79bde6490 100644
--- a/src/services/queryRunner.service.spec.ts
+++ b/src/services/queryRunner.service.spec.ts
@@ -1,7 +1,5 @@
import { QueryResult } from 'cozy-client'
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { DataloadState, FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { Dataload, DataloadEntity } from 'models'
import mockClient from '../../tests/__mocks__/client'
diff --git a/src/services/queryRunner.service.ts b/src/services/queryRunner.service.ts
index dffb788de..3fffee26d 100644
--- a/src/services/queryRunner.service.ts
+++ b/src/services/queryRunner.service.ts
@@ -11,9 +11,7 @@ import {
GRDF_MONTH_DOCTYPE,
GRDF_YEAR_DOCTYPE,
} from 'doctypes'
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { DataloadState, FluidType, TimeStep } from 'enums'
import { DateTime, Interval } from 'luxon'
import { Dataload, TimePeriod } from 'models'
import logApp from 'utils/logger'
diff --git a/src/services/quiz.service.spec.ts b/src/services/quiz.service.spec.ts
index 12462ae47..d9673eb4b 100644
--- a/src/services/quiz.service.spec.ts
+++ b/src/services/quiz.service.spec.ts
@@ -1,11 +1,11 @@
import { QueryResult } from 'cozy-client'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
import {
CustomQuestionType,
+ FluidType,
+ TimeStep,
UserQuestionState,
UserQuizState,
-} from 'enum/userQuiz.enum'
+} from 'enums'
import { DateTime } from 'luxon'
import {
CustomQuestionEntity,
@@ -22,14 +22,14 @@ import {
} from '../../tests/__mocks__/chartData.mock'
import mockClient from '../../tests/__mocks__/client'
import {
+ UserQuizDone,
+ UserQuizReseted,
+ UserQuizStarted,
allQuizEntities,
customQuestionEntity,
quizDefault,
quizEntity,
userQuiz,
- UserQuizDone,
- UserQuizReseted,
- UserQuizStarted,
} from '../../tests/__mocks__/quizData.mock'
import QuizService from './quiz.service'
diff --git a/src/services/quiz.service.ts b/src/services/quiz.service.ts
index c553c7f7d..34a71fc05 100644
--- a/src/services/quiz.service.ts
+++ b/src/services/quiz.service.ts
@@ -1,12 +1,12 @@
import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
import { QUIZ_DOCTYPE } from 'doctypes'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
import {
CustomQuestionType,
+ FluidType,
+ TimeStep,
UserQuestionState,
UserQuizState,
-} from 'enum/userQuiz.enum'
+} from 'enums'
import { shuffle } from 'lodash'
import { DateTime } from 'luxon'
import {
diff --git a/src/services/timePeriod.service.spec.ts b/src/services/timePeriod.service.spec.ts
index 58830ee8c..fe57abc97 100644
--- a/src/services/timePeriod.service.spec.ts
+++ b/src/services/timePeriod.service.spec.ts
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { TimePeriod } from 'models'
import TimePeriodService from './timePeriod.service'
diff --git a/src/services/timePeriod.service.ts b/src/services/timePeriod.service.ts
index 655f8b753..46804b2e5 100644
--- a/src/services/timePeriod.service.ts
+++ b/src/services/timePeriod.service.ts
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { TimePeriod } from 'models'
import ConfigService from 'services/fluidConfig.service'
diff --git a/src/services/usageEvent.service.spec.ts b/src/services/usageEvent.service.spec.ts
index 5fcc3a4cc..3296cd2e5 100644
--- a/src/services/usageEvent.service.spec.ts
+++ b/src/services/usageEvent.service.spec.ts
@@ -1,5 +1,5 @@
import { QueryResult } from 'cozy-client'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
import { DateTime } from 'luxon'
import { AddEventParams, UsageEventEntity } from 'models'
import mockClient from '../../tests/__mocks__/client'
diff --git a/src/services/usageEvent.service.ts b/src/services/usageEvent.service.ts
index 33fb71ea2..32f5c96ca 100644
--- a/src/services/usageEvent.service.ts
+++ b/src/services/usageEvent.service.ts
@@ -8,7 +8,7 @@ import {
} from 'cozy-client'
import logger from 'cozy-logger'
import { USAGEEVENT_DOCTYPE } from 'doctypes'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
import { DateTime } from 'luxon'
import {
AddEventParams,
diff --git a/src/store/challenge/challenge.slice.spec.ts b/src/store/challenge/challenge.slice.spec.ts
index 8f544d473..fe8d9a1ea 100644
--- a/src/store/challenge/challenge.slice.spec.ts
+++ b/src/store/challenge/challenge.slice.spec.ts
@@ -1,5 +1,4 @@
-import { DataloadState } from 'enum/dataload.enum'
-import { UserChallengeState } from 'enum/userChallenge.enum'
+import { DataloadState, UserChallengeState } from 'enums'
import { DateTime } from 'luxon'
import { ChallengeState, Dataload, UserChallenge } from 'models'
import { mockChallengeState } from '../../../tests/__mocks__/store'
diff --git a/src/store/challenge/challenge.slice.ts b/src/store/challenge/challenge.slice.ts
index 3699373ef..9f37d4f90 100644
--- a/src/store/challenge/challenge.slice.ts
+++ b/src/store/challenge/challenge.slice.ts
@@ -1,5 +1,5 @@
import { PayloadAction, createSlice } from '@reduxjs/toolkit'
-import { UserChallengeState } from 'enum/userChallenge.enum'
+import { UserChallengeState } from 'enums'
import { ChallengeState, Dataload, UserChallenge } from 'models'
const initialState: ChallengeState = {
diff --git a/src/store/chart/chart.slice.spec.ts b/src/store/chart/chart.slice.spec.ts
index 48dfa4e9a..3bade62d1 100644
--- a/src/store/chart/chart.slice.spec.ts
+++ b/src/store/chart/chart.slice.spec.ts
@@ -1,4 +1,4 @@
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { graphData } from '../../../tests/__mocks__/chartData.mock'
import { mockChartState } from '../../../tests/__mocks__/store'
diff --git a/src/store/chart/chart.slice.ts b/src/store/chart/chart.slice.ts
index d724d93d0..f5ea8a86f 100644
--- a/src/store/chart/chart.slice.ts
+++ b/src/store/chart/chart.slice.ts
@@ -1,5 +1,5 @@
import { PayloadAction, createSlice } from '@reduxjs/toolkit'
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { ChartState, Datachart } from 'models'
diff --git a/src/store/global/global.slice.spec.ts b/src/store/global/global.slice.spec.ts
index d4a46788e..0d83f40b3 100644
--- a/src/store/global/global.slice.spec.ts
+++ b/src/store/global/global.slice.spec.ts
@@ -1,8 +1,5 @@
/* eslint-disable camelcase */
-import { Usage } from 'enum/ecogesture.enum'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
-import { ScreenType } from 'enum/screen.enum'
+import { FluidSlugType, FluidState, FluidType, ScreenType, Usage } from 'enums'
import { DateTime } from 'luxon'
import { FluidStatus, PartnersInfo, TermsStatus } from 'models'
import { SgeStore } from 'models/sgeStore.model'
diff --git a/src/store/global/global.slice.ts b/src/store/global/global.slice.ts
index 8e12aa8d1..65c387677 100644
--- a/src/store/global/global.slice.ts
+++ b/src/store/global/global.slice.ts
@@ -1,17 +1,14 @@
import { PayloadAction, createSlice } from '@reduxjs/toolkit'
-import { Usage } from 'enum/ecogesture.enum'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
-import { ScreenType } from 'enum/screen.enum'
+import { FluidSlugType, FluidState, FluidType, ScreenType, Usage } from 'enums'
import {
FluidConnection,
FluidStatus,
GlobalState,
+ Notes,
PartnersInfo,
+ SgeStore,
TermsStatus,
} from 'models'
-import { Notes } from 'models/releaseNotes.model'
-import { SgeStore } from 'models/sgeStore.model'
const initialState: GlobalState = {
screenType: ScreenType.MOBILE,
diff --git a/src/store/profileEcogesture/profileEcogesture.actions.ts b/src/store/profileEcogesture/profileEcogesture.actions.ts
index 6c170945f..95cbb3cf7 100644
--- a/src/store/profileEcogesture/profileEcogesture.actions.ts
+++ b/src/store/profileEcogesture/profileEcogesture.actions.ts
@@ -1,6 +1,6 @@
import { Client } from 'cozy-client'
-import { PROFILEECOGESTURE_DOCTYPE } from 'doctypes/com-grandlyon-ecolyo-profileecogesture'
-import { ProfileEcogesture } from 'models/profileEcogesture.model'
+import { PROFILEECOGESTURE_DOCTYPE } from 'doctypes'
+import { ProfileEcogesture } from 'models'
import { Dispatch } from 'react'
import ProfileEcogestureService from 'services/profileEcogesture.service'
import { AppStore, defaultAction } from 'store/store'
diff --git a/src/store/profileEcogesture/profileEcogesture.reducer.ts b/src/store/profileEcogesture/profileEcogesture.reducer.ts
index 511c813a0..9a089edb8 100644
--- a/src/store/profileEcogesture/profileEcogesture.reducer.ts
+++ b/src/store/profileEcogesture/profileEcogesture.reducer.ts
@@ -1,5 +1,5 @@
-import { IndividualOrCollective, WarmingType } from 'enum/profileType.enum'
-import { ProfileEcogesture } from 'models/profileEcogesture.model'
+import { IndividualOrCollective, WarmingType } from 'enums'
+import { ProfileEcogesture } from 'models'
import { Reducer } from 'redux'
import {
CREATE_NEW_PROFILE_ECOGESTURE,
diff --git a/src/store/profileType/profileType.slice.spec.ts b/src/store/profileType/profileType.slice.spec.ts
index 2cd73624b..c23f76d7e 100644
--- a/src/store/profileType/profileType.slice.spec.ts
+++ b/src/store/profileType/profileType.slice.spec.ts
@@ -1,8 +1,8 @@
-import { EquipmentType } from 'enum/ecogesture.enum'
-import { FluidType } from 'enum/fluid.enum'
import {
ConstructionYear,
+ EquipmentType,
Floor,
+ FluidType,
HotWaterEquipment,
HotWaterFluid,
HousingType,
@@ -10,7 +10,7 @@ import {
OutsideFacingWalls,
ThreeChoicesAnswer,
WarmingType,
-} from 'enum/profileType.enum'
+} from 'enums'
import { DateTime } from 'luxon'
import { ProfileType } from 'models'
import { mockProfileTypeState } from '../../../tests/__mocks__/store'
diff --git a/src/store/profileType/profileType.slice.ts b/src/store/profileType/profileType.slice.ts
index e267f6fce..861804a5e 100644
--- a/src/store/profileType/profileType.slice.ts
+++ b/src/store/profileType/profileType.slice.ts
@@ -1,8 +1,8 @@
import { PayloadAction, createSlice } from '@reduxjs/toolkit'
-import { FluidType } from 'enum/fluid.enum'
import {
ConstructionYear,
Floor,
+ FluidType,
HotWaterEquipment,
HotWaterFluid,
HousingType,
@@ -11,7 +11,7 @@ import {
OutsideFacingWalls,
ThreeChoicesAnswer,
WarmingType,
-} from 'enum/profileType.enum'
+} from 'enums'
import { DateTime } from 'luxon'
import { ProfileType } from 'models'
diff --git a/src/store/store.ts b/src/store/store.ts
index 0e40d9fa0..6e8579848 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -3,13 +3,13 @@ import { Client } from 'cozy-client'
import {
AnalysisState,
ChallengeState,
+ ChartState,
GlobalState,
ModalState,
Profile,
+ ProfileEcogesture,
ProfileType,
} from 'models'
-import { ChartState } from 'models/chart.model'
-import { ProfileEcogesture } from 'models/profileEcogesture.model'
import {
Store,
applyMiddleware,
diff --git a/src/targets/services/aggregatorUsageEvents.ts b/src/targets/services/aggregatorUsageEvents.ts
index 782add87b..f02823d20 100644
--- a/src/targets/services/aggregatorUsageEvents.ts
+++ b/src/targets/services/aggregatorUsageEvents.ts
@@ -1,14 +1,18 @@
import * as Sentry from '@sentry/react'
import { Client } from 'cozy-client'
import logger from 'cozy-logger'
-import { DaccEvent } from 'enum/dacc.enum'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
-import { HotWaterFluid, WarmingType } from 'enum/profileType.enum'
-import { TimeStep } from 'enum/timeStep.enum'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UsageEventProperties } from 'enum/usageEventProperties.enum'
-import { UserChallengeState } from 'enum/userChallenge.enum'
+import {
+ DaccEvent,
+ FluidSlugType,
+ FluidState,
+ FluidType,
+ HotWaterFluid,
+ TimeStep,
+ UsageEventProperties,
+ UsageEventType,
+ UserChallengeState,
+ WarmingType,
+} from 'enums'
import { toNumber, uniq } from 'lodash'
import { DateTime } from 'luxon'
import { FluidStatus, PerformanceIndicator, UsageEvent } from 'models'
diff --git a/src/targets/services/consumptionAlert.ts b/src/targets/services/consumptionAlert.ts
index 49d49ae03..496b83c35 100644
--- a/src/targets/services/consumptionAlert.ts
+++ b/src/targets/services/consumptionAlert.ts
@@ -1,6 +1,6 @@
import { Client } from 'cozy-client'
import logger from 'cozy-logger'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import get from 'lodash/get'
import { DateTime } from 'luxon'
import mjml2html from 'mjml'
diff --git a/src/targets/services/enedisHalfHourMonthlyAnalysis.ts b/src/targets/services/enedisHalfHourMonthlyAnalysis.ts
index 980b2cb71..638660c61 100644
--- a/src/targets/services/enedisHalfHourMonthlyAnalysis.ts
+++ b/src/targets/services/enedisHalfHourMonthlyAnalysis.ts
@@ -5,8 +5,7 @@ import {
ENEDIS_MINUTE_DOCTYPE,
ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE,
} from 'doctypes'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { union } from 'lodash'
import { DateTime } from 'luxon'
import { Datachart, DataloadEntity, TimePeriod } from 'models'
diff --git a/src/targets/services/fluidsPrices.ts b/src/targets/services/fluidsPrices.ts
index d6a5f0a6a..e625a3850 100644
--- a/src/targets/services/fluidsPrices.ts
+++ b/src/targets/services/fluidsPrices.ts
@@ -1,13 +1,14 @@
import * as Sentry from '@sentry/react'
import { Client } from 'cozy-client'
import logger from 'cozy-logger'
-import { EGL_DAY_DOCTYPE, ENEDIS_DAY_DOCTYPE, GRDF_DAY_DOCTYPE } from 'doctypes'
import {
+ EGL_DAY_DOCTYPE,
+ ENEDIS_DAY_DOCTYPE,
+ GRDF_DAY_DOCTYPE,
REMOTE_ORG_ECOLYO_AGENT_PRICES,
REMOTE_ORG_ECOLYO_AGENT_PRICES_REC,
-} from 'doctypes/remote/org.ecolyo.agent.prices'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+} from 'doctypes'
+import { FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { DataloadEntity, FluidPrice, TimePeriod } from 'models'
import ConsumptionDataManager from 'services/consumption.service'
diff --git a/src/targets/services/monthlyReportNotification.ts b/src/targets/services/monthlyReportNotification.ts
index 65e4a7c66..352409998 100644
--- a/src/targets/services/monthlyReportNotification.ts
+++ b/src/targets/services/monthlyReportNotification.ts
@@ -1,17 +1,12 @@
import * as Sentry from '@sentry/react'
import { Client } from 'cozy-client'
import logger from 'cozy-logger'
-import {
- REMOTE_ORG_ECOLYO_AGENT,
- REMOTE_ORG_ECOLYO_AGENT_REC,
-} from 'doctypes/remote/org.ecolyo.agent'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { REMOTE_ORG_ECOLYO_AGENT, REMOTE_ORG_ECOLYO_AGENT_REC } from 'doctypes'
+import { FluidType, TimeStep } from 'enums'
import get from 'lodash/get'
import { DateTime, DurationLike } from 'luxon'
import mjml2html from 'mjml'
-import { PerformanceIndicator } from 'models'
-import { MonthlyReport } from 'models/monthlyReport.model'
+import { MonthlyReport, PerformanceIndicator } from 'models'
import ConsumptionService from 'services/consumption.service'
import EnvironmentService from 'services/environment.service'
import MailService from 'services/mail.service'
diff --git a/src/utils/date.spec.ts b/src/utils/date.spec.ts
index a3ab46f2f..9bed97a99 100644
--- a/src/utils/date.spec.ts
+++ b/src/utils/date.spec.ts
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { Dataload } from 'models'
import { graphData } from '../../tests/__mocks__/chartData.mock'
diff --git a/src/utils/date.ts b/src/utils/date.ts
index 805c50a8d..e474fdd49 100644
--- a/src/utils/date.ts
+++ b/src/utils/date.ts
@@ -1,5 +1,4 @@
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
+import { FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { Dataload } from 'models'
import { getMonthNameWithPrep } from './utils'
diff --git a/src/utils/picto.spec.ts b/src/utils/picto.spec.ts
index 422ec60c8..c7ba738b0 100644
--- a/src/utils/picto.spec.ts
+++ b/src/utils/picto.spec.ts
@@ -11,7 +11,7 @@ import iconGrdfWhiteLogo from 'assets/icons/visu/grdf-logo-white.svg'
import iconGrdfLogo from 'assets/icons/visu/grdf-logo.svg'
import MultiIcon from 'assets/icons/visu/multi-icon.svg'
import WaterParamIcon from 'assets/icons/visu/water-param.svg'
-import { FluidType } from 'enum/fluid.enum'
+import { FluidType } from 'enums'
import ElecSmallIcon from '../assets/icons/visu/elec-small.svg'
import ElecIcon from '../assets/icons/visu/elec.svg'
import GasSmallIcon from '../assets/icons/visu/gas-small.svg'
diff --git a/src/utils/picto.ts b/src/utils/picto.ts
index 54058b3d5..0c8ae2830 100644
--- a/src/utils/picto.ts
+++ b/src/utils/picto.ts
@@ -5,26 +5,26 @@ import Disconnected from 'assets/icons/visu/disconnected-grey.svg'
import DisconnectedActive from 'assets/icons/visu/disconnected.svg'
import iconEglWhiteLogo from 'assets/icons/visu/egl-logo-white.svg'
import iconEglLogo from 'assets/icons/visu/egl-logo.svg'
+import ElecUnactive from 'assets/icons/visu/elec-grey.svg'
import ElecParamIcon from 'assets/icons/visu/elec-param.svg'
+import ElecSmallIcon from 'assets/icons/visu/elec-small.svg'
+import ElecIcon from 'assets/icons/visu/elec.svg'
import iconEnedisWhiteLogo from 'assets/icons/visu/enedis-logo-white.svg'
import iconEnedisLogo from 'assets/icons/visu/enedis-logo.svg'
+import GasUnactive from 'assets/icons/visu/gas-grey.svg'
import GasParamIcon from 'assets/icons/visu/gas-param.svg'
+import GasSmallIcon from 'assets/icons/visu/gas-small.svg'
+import GasIcon from 'assets/icons/visu/gas.svg'
import iconGrdfWhiteLogo from 'assets/icons/visu/grdf-logo-white.svg'
import iconGrdfLogo from 'assets/icons/visu/grdf-logo.svg'
import MultiUnactive from 'assets/icons/visu/multi-grey.svg'
import Multi from 'assets/icons/visu/multi.svg'
+import WaterUnactive from 'assets/icons/visu/water-grey.svg'
import WaterParamIcon from 'assets/icons/visu/water-param.svg'
+import WaterSmallIcon from 'assets/icons/visu/water-small.svg'
+import WaterIcon from 'assets/icons/visu/water.svg'
+import { FluidType } from 'enums'
import ConfigService from 'services/fluidConfig.service'
-import ElecUnactive from '../assets/icons/visu/elec-grey.svg'
-import ElecSmallIcon from '../assets/icons/visu/elec-small.svg'
-import ElecIcon from '../assets/icons/visu/elec.svg'
-import GasUnactive from '../assets/icons/visu/gas-grey.svg'
-import GasSmallIcon from '../assets/icons/visu/gas-small.svg'
-import GasIcon from '../assets/icons/visu/gas.svg'
-import WaterUnactive from '../assets/icons/visu/water-grey.svg'
-import WaterSmallIcon from '../assets/icons/visu/water-small.svg'
-import WaterIcon from '../assets/icons/visu/water.svg'
-import { FluidType } from '../enum/fluid.enum'
/**
* Return an icon corresponding to FluidType enum
diff --git a/src/utils/utils.spec.ts b/src/utils/utils.spec.ts
index 70bdbb0e6..0b6e70feb 100644
--- a/src/utils/utils.spec.ts
+++ b/src/utils/utils.spec.ts
@@ -1,7 +1,10 @@
-import { Season } from 'enum/ecogesture.enum'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
-import { KonnectorUpdate } from 'enum/konnectorUpdate.enum'
+import {
+ FluidSlugType,
+ FluidState,
+ FluidType,
+ KonnectorUpdate,
+ Season,
+} from 'enums'
import { DateTime } from 'luxon'
import { FluidStatus } from 'models'
import {
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index dba467798..4b35b19c7 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -1,12 +1,15 @@
import { captureException } from '@sentry/react'
-import { Season } from 'enum/ecogesture.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
+import {
+ FluidSlugType,
+ FluidState,
+ FluidType,
+ KonnectorUpdate,
+ Season,
+} from 'enums'
import get from 'lodash/get'
import { DateTime, Interval } from 'luxon'
import { FluidStatus, GetRelationshipsReturn, Relation } from 'models'
import challengeData from '../db/challengeEntity.json'
-import { FluidState, FluidType } from '../enum/fluid.enum'
-import { KonnectorUpdate } from '../enum/konnectorUpdate.enum'
export function getFluidType(type: string) {
switch (type.toUpperCase()) {
diff --git a/tests/__mocks__/actionData.mock.ts b/tests/__mocks__/actionData.mock.ts
index 5cd2ef51f..c2a5d716c 100644
--- a/tests/__mocks__/actionData.mock.ts
+++ b/tests/__mocks__/actionData.mock.ts
@@ -1,4 +1,4 @@
-import { EquipmentType, Season } from 'enum/ecogesture.enum'
+import { EquipmentType, Season } from 'enums'
import { Ecogesture } from 'models'
export const defaultEcogestureData: Ecogesture[] = [
diff --git a/tests/__mocks__/chartData.mock.ts b/tests/__mocks__/chartData.mock.ts
index 4fd3ddd29..904a31f3e 100644
--- a/tests/__mocks__/chartData.mock.ts
+++ b/tests/__mocks__/chartData.mock.ts
@@ -1,6 +1,6 @@
-import { Datachart, Dataload } from 'models'
+import { DataloadState } from 'enums'
import { DateTime } from 'luxon'
-import { DataloadState } from 'enum/dataload.enum'
+import { Datachart, Dataload } from 'models'
export const graphData: Datachart = {
actualData: [
diff --git a/tests/__mocks__/customPopup.mock.ts b/tests/__mocks__/customPopup.mock.ts
index 6576af638..65c9b9d93 100644
--- a/tests/__mocks__/customPopup.mock.ts
+++ b/tests/__mocks__/customPopup.mock.ts
@@ -1,4 +1,4 @@
-import { CustomPopup } from 'models/customPopup.model'
+import { CustomPopup } from 'models'
export const mockCustomPopup: CustomPopup = {
popupEnabled: true,
diff --git a/tests/__mocks__/duelData.mock.ts b/tests/__mocks__/duelData.mock.ts
index ec44157b8..f429b67a5 100644
--- a/tests/__mocks__/duelData.mock.ts
+++ b/tests/__mocks__/duelData.mock.ts
@@ -1,6 +1,6 @@
+import { UserDuelState } from 'enums'
import { Duration } from 'luxon'
-import { UserDuel, DuelEntity } from 'models'
-import { UserDuelState } from 'enum/userDuel.enum'
+import { DuelEntity, UserDuel } from 'models'
export const duelEntity: DuelEntity = {
id: 'DUEL001',
diff --git a/tests/__mocks__/ecogesturesData.mock.ts b/tests/__mocks__/ecogesturesData.mock.ts
index 827eb511a..e00247dd8 100644
--- a/tests/__mocks__/ecogesturesData.mock.ts
+++ b/tests/__mocks__/ecogesturesData.mock.ts
@@ -1,5 +1,4 @@
-import { EquipmentType, Room, Season, Usage } from 'enum/ecogesture.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { EquipmentType, FluidType, Room, Season, Usage } from 'enums'
import { Ecogesture } from 'models'
export const mockedEcogesturesData: Ecogesture[] = [
diff --git a/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts b/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts
index 76c474dfb..bba9d3cc0 100644
--- a/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts
+++ b/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts
@@ -1,10 +1,10 @@
-import { DataloadState } from 'enum/dataload.enum'
+import { DataloadState } from 'enums'
import { DateTime } from 'luxon'
+import { MaxPowerEntity } from 'models'
import {
AggregatedEnedisMonthlyDataloads,
EnedisMonthlyAnalysisData,
} from 'models/enedisMonthlyAnalysis'
-import { MaxPowerEntity } from 'models/maxPower.model'
export const mockEnedisMonthlyAnalysis: EnedisMonthlyAnalysisData = {
weekDaysHalfHourAverageValues: [0.35, 0.34, 0.33, 0.32, 0.31, 0.3],
diff --git a/tests/__mocks__/explorationData.mock.ts b/tests/__mocks__/explorationData.mock.ts
index a5ea25b2a..baed6c85d 100644
--- a/tests/__mocks__/explorationData.mock.ts
+++ b/tests/__mocks__/explorationData.mock.ts
@@ -1,8 +1,5 @@
/* eslint-disable camelcase */
-import {
- UserExplorationState,
- UserExplorationType,
-} from 'enum/userExploration.enum'
+import { UserExplorationState, UserExplorationType } from 'enums'
import { ExplorationEntity, UserExploration } from 'models'
export const explorationEntity: ExplorationEntity = {
diff --git a/tests/__mocks__/fluidStatusData.mock.ts b/tests/__mocks__/fluidStatusData.mock.ts
index b8c167a61..407671ca6 100644
--- a/tests/__mocks__/fluidStatusData.mock.ts
+++ b/tests/__mocks__/fluidStatusData.mock.ts
@@ -1,6 +1,5 @@
/* eslint-disable camelcase */
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
+import { FluidSlugType, FluidState, FluidType } from 'enums'
import { DateTime } from 'luxon'
import { FluidStatus } from 'models'
diff --git a/tests/__mocks__/profileEcogesture.mock.ts b/tests/__mocks__/profileEcogesture.mock.ts
index 5489fead6..d73e1e654 100644
--- a/tests/__mocks__/profileEcogesture.mock.ts
+++ b/tests/__mocks__/profileEcogesture.mock.ts
@@ -1,10 +1,10 @@
-import { EquipmentType } from 'enum/ecogesture.enum'
-import { ProfileEcogestureAnswerType } from 'enum/ecogestureForm.enum'
-import { IndividualOrCollective, WarmingType } from 'enum/profileType.enum'
import {
- ProfileEcogesture,
- ProfileEcogestureAnswer,
-} from 'models/profileEcogesture.model'
+ EquipmentType,
+ IndividualOrCollective,
+ ProfileEcogestureAnswerType,
+ WarmingType,
+} from 'enums'
+import { ProfileEcogesture, ProfileEcogestureAnswer } from 'models'
export const mockProfileEcogesture: ProfileEcogesture = {
heating: IndividualOrCollective.INDIVIDUAL,
diff --git a/tests/__mocks__/profileType.mock.ts b/tests/__mocks__/profileType.mock.ts
index 7dcd46722..586da4761 100644
--- a/tests/__mocks__/profileType.mock.ts
+++ b/tests/__mocks__/profileType.mock.ts
@@ -1,7 +1,7 @@
-import { FluidType } from 'enum/fluid.enum'
import {
ConstructionYear,
Floor,
+ FluidType,
HotWaterEquipment,
HotWaterFluid,
HousingType,
@@ -11,13 +11,9 @@ import {
ProfileTypeFormType,
ThreeChoicesAnswer,
WarmingType,
-} from 'enum/profileType.enum'
+} from 'enums'
import { DateTime } from 'luxon'
-import {
- MonthlyForecast,
- ProfileType,
- ProfileTypeAnswer,
-} from 'models/profileType.model'
+import { MonthlyForecast, ProfileType, ProfileTypeAnswer } from 'models'
export const profileTypeData: ProfileType = {
_id: 'ed8a160e06431be15c8fdbb428000f6a',
diff --git a/tests/__mocks__/quizData.mock.ts b/tests/__mocks__/quizData.mock.ts
index 0a2124789..d62c0c713 100644
--- a/tests/__mocks__/quizData.mock.ts
+++ b/tests/__mocks__/quizData.mock.ts
@@ -1,14 +1,14 @@
-import { TimeStep } from 'enum/timeStep.enum'
import {
CustomQuestionType,
+ TimeStep,
UserQuestionState,
UserQuizState,
-} from 'enum/userQuiz.enum'
+} from 'enums'
import { DateTime } from 'luxon'
import {
- QuizEntity,
- QuestionEntity,
CustomQuestionEntity,
+ QuestionEntity,
+ QuizEntity,
UserQuiz,
} from 'models'
diff --git a/tests/__mocks__/store/chart.state.mock.ts b/tests/__mocks__/store/chart.state.mock.ts
index 467bf31be..df355ad57 100644
--- a/tests/__mocks__/store/chart.state.mock.ts
+++ b/tests/__mocks__/store/chart.state.mock.ts
@@ -1,4 +1,4 @@
-import { TimeStep } from 'enum/timeStep.enum'
+import { TimeStep } from 'enums'
import { DateTime } from 'luxon'
import { ChartState } from 'models'
diff --git a/tests/__mocks__/store/global.state.mock.ts b/tests/__mocks__/store/global.state.mock.ts
index bc056c2cb..373b81070 100644
--- a/tests/__mocks__/store/global.state.mock.ts
+++ b/tests/__mocks__/store/global.state.mock.ts
@@ -1,8 +1,5 @@
/* eslint-disable camelcase */
-import { Usage } from 'enum/ecogesture.enum'
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
-import { ScreenType } from 'enum/screen.enum'
+import { FluidSlugType, FluidState, FluidType, ScreenType, Usage } from 'enums'
import { GlobalState } from 'models'
export const mockGlobalState: GlobalState = {
diff --git a/tests/__mocks__/store/profileType.state.mock.ts b/tests/__mocks__/store/profileType.state.mock.ts
index 9b8091734..e3a947570 100644
--- a/tests/__mocks__/store/profileType.state.mock.ts
+++ b/tests/__mocks__/store/profileType.state.mock.ts
@@ -1,7 +1,7 @@
-import { FluidType } from 'enum/fluid.enum'
import {
ConstructionYear,
Floor,
+ FluidType,
HotWaterEquipment,
HotWaterFluid,
HousingType,
@@ -10,7 +10,7 @@ import {
OutsideFacingWalls,
ThreeChoicesAnswer,
WarmingType,
-} from 'enum/profileType.enum'
+} from 'enums'
import { DateTime } from 'luxon'
import { ProfileType } from 'models'
diff --git a/tests/__mocks__/usageEventsData.mock.ts b/tests/__mocks__/usageEventsData.mock.ts
index dde061dd2..c53c4ee4f 100644
--- a/tests/__mocks__/usageEventsData.mock.ts
+++ b/tests/__mocks__/usageEventsData.mock.ts
@@ -1,4 +1,4 @@
-import { UsageEventType } from 'enum/usageEvent.enum'
+import { UsageEventType } from 'enums'
import { DateTime } from 'luxon'
import { UsageEvent, UsageEventEntity } from 'models'
diff --git a/tests/__mocks__/userChallengeData.mock.ts b/tests/__mocks__/userChallengeData.mock.ts
index 205338b03..3966c3f0b 100644
--- a/tests/__mocks__/userChallengeData.mock.ts
+++ b/tests/__mocks__/userChallengeData.mock.ts
@@ -1,10 +1,10 @@
/* eslint-disable camelcase */
-import { UserActionState } from 'enum/userAction.enum'
import {
+ UserActionState,
UserChallengeState,
UserChallengeSuccess,
-} from 'enum/userChallenge.enum'
-import { UserExplorationType } from 'enum/userExploration.enum'
+ UserExplorationType,
+} from 'enums'
import { UserChallenge } from 'models'
import { duelData, duelDefault } from './duelData.mock'
import {
--
GitLab