From 2c827282c5f56dce769bf8d9c7b3247c86f978a3 Mon Sep 17 00:00:00 2001 From: Bastien DUMONT <bdumont@grandlyon.com> Date: Tue, 24 Jan 2023 14:10:16 +0000 Subject: [PATCH] chore: remove isBuilding prop --- src/components/Action/ActionBegin.spec.tsx | 18 +++++------ src/components/Action/ActionCard.spec.tsx | 12 +++---- src/components/Action/ActionChoose.spec.tsx | 8 ++--- src/components/Action/ActionDone.spec.tsx | 16 +++++----- src/components/Action/ActionList.spec.tsx | 12 +++---- src/components/Action/ActionModal.spec.tsx | 18 +++++------ src/components/Action/ActionOnGoing.spec.tsx | 20 ++++++------ src/components/Action/ActionView.spec.tsx | 14 ++++---- src/components/Action/ActionView.tsx | 22 ++++++------- .../Analysis/AnalysisConsumption.spec.tsx | 18 +++++------ .../Analysis/AnalysisError.spec.tsx | 12 +++---- src/components/Analysis/AnalysisView.spec.tsx | 10 +++--- src/components/Duel/DuelResultModal.spec.tsx | 6 ++-- src/components/Duel/DuelView.tsx | 23 ++++++------- .../Ecogesture/EcogestureEmptyList.spec.tsx | 10 +++--- .../Exploration/ExplorationView.tsx | 16 ++++------ .../Onboarding/WelcomeModal.spec.tsx | 10 +++--- .../ProfileTypeOptions.spec.tsx | 16 +++++----- src/components/Quiz/QuizView.tsx | 18 ++++------- .../Terms/DataShareConsentContent.spec.tsx | 8 ++--- src/components/Terms/TermsView.spec.tsx | 14 ++++---- src/db/profileData.json | 22 ------------- src/db/profileData.ts | 32 +++++++++++++++++++ src/migrations/migration.spec.ts | 4 +-- src/services/initialization.service.spec.ts | 24 +++++++------- src/services/initialization.service.ts | 4 +-- src/services/profile.service.spec.ts | 2 +- src/services/profile.service.ts | 15 +++------ src/store/profile/profile.action.spec.ts | 4 +-- src/store/profile/profile.reducer.spec.ts | 6 ++-- src/styles/base/_typography.scss | 5 --- .../{profile.mock.ts => profileData.mock.ts} | 0 32 files changed, 201 insertions(+), 218 deletions(-) delete mode 100644 src/db/profileData.json create mode 100644 src/db/profileData.ts rename tests/__mocks__/{profile.mock.ts => profileData.mock.ts} (100%) diff --git a/src/components/Action/ActionBegin.spec.tsx b/src/components/Action/ActionBegin.spec.tsx index d3294a161..5193fdc06 100644 --- a/src/components/Action/ActionBegin.spec.tsx +++ b/src/components/Action/ActionBegin.spec.tsx @@ -1,19 +1,19 @@ -import React from 'react' +import { Button } from '@material-ui/core' import { mount } from 'enzyme' +import React from 'react' +import { act } from 'react-dom/test-utils' import { Provider } from 'react-redux' -import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' -import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock' -import ActionModal from './ActionModal' +import configureStore from 'redux-mock-store' import { AllEcogestureData, defaultEcogestureData, } from '../../../tests/__mocks__/actionData.mock' -import { profileData } from '../../../tests/__mocks__/profile.mock' -import configureStore from 'redux-mock-store' -import { Button } from '@material-ui/core' -import ActionBegin from './ActionBegin' -import { act } from 'react-dom/test-utils' import { ecogesturesData } from '../../../tests/__mocks__/ecogesturesData.mock' +import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' +import { profileData } from '../../../tests/__mocks__/profileData.mock' +import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock' +import ActionBegin from './ActionBegin' +import ActionModal from './ActionModal' jest.mock('cozy-ui/transpiled/react/I18n', () => { return { diff --git a/src/components/Action/ActionCard.spec.tsx b/src/components/Action/ActionCard.spec.tsx index afc9734f1..39f844c42 100644 --- a/src/components/Action/ActionCard.spec.tsx +++ b/src/components/Action/ActionCard.spec.tsx @@ -1,14 +1,14 @@ -import React from 'react' +import { Button } from '@material-ui/core' +import EcogestureModal from 'components/Ecogesture/EcogestureModal' import { mount } from 'enzyme' +import React from 'react' import { Provider } from 'react-redux' +import configureStore from 'redux-mock-store' +import { defaultEcogestureData } from '../../../tests/__mocks__/actionData.mock' import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' +import { profileData } from '../../../tests/__mocks__/profileData.mock' import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock' import ActionCard from './ActionCard' -import { profileData } from '../../../tests/__mocks__/profile.mock' -import configureStore from 'redux-mock-store' -import { defaultEcogestureData } from '../../../tests/__mocks__/actionData.mock' -import { Button } from '@material-ui/core' -import EcogestureModal from 'components/Ecogesture/EcogestureModal' const mockStore = configureStore([]) diff --git a/src/components/Action/ActionChoose.spec.tsx b/src/components/Action/ActionChoose.spec.tsx index b1b44ff94..d1c67697b 100644 --- a/src/components/Action/ActionChoose.spec.tsx +++ b/src/components/Action/ActionChoose.spec.tsx @@ -1,12 +1,12 @@ -import React from 'react' import { mount } from 'enzyme' +import React from 'react' import { Provider } from 'react-redux' +import configureStore from 'redux-mock-store' import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' +import { profileData } from '../../../tests/__mocks__/profileData.mock' import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock' -import { profileData } from '../../../tests/__mocks__/profile.mock' -import configureStore from 'redux-mock-store' -import ActionChoose from './ActionChoose' import ActionBegin from './ActionBegin' +import ActionChoose from './ActionChoose' jest.mock('cozy-ui/transpiled/react/I18n', () => { return { diff --git a/src/components/Action/ActionDone.spec.tsx b/src/components/Action/ActionDone.spec.tsx index 748320be9..b22aad89d 100644 --- a/src/components/Action/ActionDone.spec.tsx +++ b/src/components/Action/ActionDone.spec.tsx @@ -1,16 +1,16 @@ -import React from 'react' +import { Button } from '@material-ui/core' import { mount } from 'enzyme' -import configureStore from 'redux-mock-store' +import React from 'react' +import { act } from 'react-dom/test-utils' +import * as reactRedux from 'react-redux' import { Provider } from 'react-redux' +import configureStore from 'redux-mock-store' +import UsageEventService from 'services/usageEvent.service' +import * as challengeActions from 'store/challenge/challenge.actions' import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' +import { profileData } from '../../../tests/__mocks__/profileData.mock' import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock' -import { profileData } from '../../../tests/__mocks__/profile.mock' import ActionDone from './ActionDone' -import { Button } from '@material-ui/core' -import * as reactRedux from 'react-redux' -import * as challengeActions from 'store/challenge/challenge.actions' -import { act } from 'react-dom/test-utils' -import UsageEventService from 'services/usageEvent.service' const mockStore = configureStore([]) jest.mock('cozy-ui/transpiled/react/I18n', () => { diff --git a/src/components/Action/ActionList.spec.tsx b/src/components/Action/ActionList.spec.tsx index 34af07b69..038cc7e91 100644 --- a/src/components/Action/ActionList.spec.tsx +++ b/src/components/Action/ActionList.spec.tsx @@ -1,13 +1,13 @@ -import React from 'react' import { mount } from 'enzyme' -import configureStore from 'redux-mock-store' +import React from 'react' import { Provider } from 'react-redux' +import configureStore from 'redux-mock-store' +import { defaultEcogestureData } from '../../../tests/__mocks__/actionData.mock' import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' -import ActionList from './ActionList' -import ActionCard from './ActionCard' +import { profileData } from '../../../tests/__mocks__/profileData.mock' import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock' -import { profileData } from '../../../tests/__mocks__/profile.mock' -import { defaultEcogestureData } from '../../../tests/__mocks__/actionData.mock' +import ActionCard from './ActionCard' +import ActionList from './ActionList' const mockStore = configureStore([]) diff --git a/src/components/Action/ActionModal.spec.tsx b/src/components/Action/ActionModal.spec.tsx index 29c27a23a..7c9fb2e01 100644 --- a/src/components/Action/ActionModal.spec.tsx +++ b/src/components/Action/ActionModal.spec.tsx @@ -1,17 +1,17 @@ -import React from 'react' +import { Button } from '@material-ui/core' import { mount } from 'enzyme' +import React from 'react' +import { act } from 'react-dom/test-utils' +import * as reactRedux from 'react-redux' import { Provider } from 'react-redux' +import configureStore from 'redux-mock-store' +import UsageEventService from 'services/usageEvent.service' +import * as challengeActions from 'store/challenge/challenge.actions' +import { defaultEcogestureData } from '../../../tests/__mocks__/actionData.mock' import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' +import { profileData } from '../../../tests/__mocks__/profileData.mock' import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock' import ActionModal from './ActionModal' -import { defaultEcogestureData } from '../../../tests/__mocks__/actionData.mock' -import { profileData } from '../../../tests/__mocks__/profile.mock' -import configureStore from 'redux-mock-store' -import { Button } from '@material-ui/core' -import * as reactRedux from 'react-redux' -import * as challengeActions from 'store/challenge/challenge.actions' -import { act } from 'react-dom/test-utils' -import UsageEventService from 'services/usageEvent.service' jest.mock('cozy-ui/transpiled/react/I18n', () => { return { diff --git a/src/components/Action/ActionOnGoing.spec.tsx b/src/components/Action/ActionOnGoing.spec.tsx index ddf95e7df..7b2d03478 100644 --- a/src/components/Action/ActionOnGoing.spec.tsx +++ b/src/components/Action/ActionOnGoing.spec.tsx @@ -1,18 +1,18 @@ -import React from 'react' -import { mount } from 'enzyme' -import { Provider } from 'react-redux' -import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' -import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock' -import { defaultEcogestureData } from '../../../tests/__mocks__/actionData.mock' -import { profileData } from '../../../tests/__mocks__/profile.mock' -import configureStore from 'redux-mock-store' import { Button } from '@material-ui/core' -import ActionOnGoing from './ActionOnGoing' +import EcogestureModal from 'components/Ecogesture/EcogestureModal' import { UserActionState } from 'enum/userAction.enum' +import { mount } from 'enzyme' import { DateTime } from 'luxon' -import EcogestureModal from 'components/Ecogesture/EcogestureModal' import { UserAction } from 'models' +import React from 'react' import { act } from 'react-dom/test-utils' +import { Provider } from 'react-redux' +import configureStore from 'redux-mock-store' +import { defaultEcogestureData } from '../../../tests/__mocks__/actionData.mock' +import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' +import { profileData } from '../../../tests/__mocks__/profileData.mock' +import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock' +import ActionOnGoing from './ActionOnGoing' jest.mock('cozy-ui/transpiled/react/I18n', () => { return { diff --git a/src/components/Action/ActionView.spec.tsx b/src/components/Action/ActionView.spec.tsx index 736802cd2..50040a437 100644 --- a/src/components/Action/ActionView.spec.tsx +++ b/src/components/Action/ActionView.spec.tsx @@ -1,16 +1,16 @@ -import React from 'react' +import ActionView from 'components/Action/ActionView' +import { UserActionState } from 'enum/userAction.enum' import { mount } from 'enzyme' +import React from 'react' import { Provider } from 'react-redux' +import configureStore from 'redux-mock-store' import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' +import { modalStateData } from '../../../tests/__mocks__/modalStateData.mock' +import { profileData } from '../../../tests/__mocks__/profileData.mock' import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock' -import ActionView from 'components/Action/ActionView' -import configureStore from 'redux-mock-store' -import { UserActionState } from 'enum/userAction.enum' import ActionChoose from './ActionChoose' -import ActionOnGoing from './ActionOnGoing' import ActionDone from './ActionDone' -import { profileData } from '../../../tests/__mocks__/profile.mock' -import { modalStateData } from '../../../tests/__mocks__/modalStateData.mock' +import ActionOnGoing from './ActionOnGoing' jest.mock('cozy-ui/transpiled/react/I18n', () => { return { diff --git a/src/components/Action/ActionView.tsx b/src/components/Action/ActionView.tsx index 030400c33..1b6a65dfa 100644 --- a/src/components/Action/ActionView.tsx +++ b/src/components/Action/ActionView.tsx @@ -1,14 +1,14 @@ -import React, { useCallback, useState } from 'react' -import { useSelector } from 'react-redux' -import { AppStore } from 'store' -import CozyBar from 'components/Header/CozyBar' +import ActionChoose from 'components/Action/ActionChoose' +import ActionDone from 'components/Action/ActionDone' +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 { UserChallenge } from 'models' -import ActionChoose from 'components/Action/ActionChoose' import { UserActionState } from 'enum/userAction.enum' -import ActionOnGoing from 'components/Action/ActionOnGoing' -import ActionDone from 'components/Action/ActionDone' +import { UserChallenge } from 'models' +import React, { useCallback, useState } from 'react' +import { useSelector } from 'react-redux' +import { AppStore } from 'store' const ActionView: React.FC = () => { const [headerHeight, setHeaderHeight] = useState<number>(0) @@ -34,11 +34,7 @@ const ActionView: React.FC = () => { return ( <> - <CozyBar - titleKey={'common.title_action'} - displayBackArrow={true} - isBuilding={true} - /> + <CozyBar titleKey={'common.title_action'} displayBackArrow={true} /> <Header setHeaderHeight={defineHeaderHeight} desktopTitleKey={'common.title_action'} diff --git a/src/components/Analysis/AnalysisConsumption.spec.tsx b/src/components/Analysis/AnalysisConsumption.spec.tsx index a080095b3..0366bc27e 100644 --- a/src/components/Analysis/AnalysisConsumption.spec.tsx +++ b/src/components/Analysis/AnalysisConsumption.spec.tsx @@ -1,21 +1,21 @@ /* eslint-disable react/display-name */ -import React from 'react' +import { Accordion } from '@material-ui/core' +import Button from '@material-ui/core/Button' +import AnalysisConsumption from 'components/Analysis/AnalysisConsumption' +import { FluidType } from 'enum/fluid.enum' import { mount } from 'enzyme' +import { DateTime } from 'luxon' +import { PerformanceIndicator } from 'models' +import React from 'react' +import { act } from 'react-dom/test-utils' import { Provider } from 'react-redux' import configureStore from 'redux-mock-store' -import { profileData } from '../../../tests/__mocks__/profile.mock' -import AnalysisConsumption from 'components/Analysis/AnalysisConsumption' -import { act } from 'react-dom/test-utils' -import Button from '@material-ui/core/Button' import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' +import { profileData } from '../../../tests/__mocks__/profileData.mock' import { mockMonthlyForecastJanuaryTestProfile1, profileTypeData, } from '../../../tests/__mocks__/profileType.mock' -import { FluidType } from 'enum/fluid.enum' -import { PerformanceIndicator } from 'models' -import { DateTime } from 'luxon' -import { Accordion } from '@material-ui/core' jest.mock('cozy-ui/transpiled/react/I18n', () => { return { diff --git a/src/components/Analysis/AnalysisError.spec.tsx b/src/components/Analysis/AnalysisError.spec.tsx index efd240911..b612c1422 100644 --- a/src/components/Analysis/AnalysisError.spec.tsx +++ b/src/components/Analysis/AnalysisError.spec.tsx @@ -1,12 +1,12 @@ -import React from 'react' -import { mount } from 'enzyme' +import Button from '@material-ui/core/Button' +import Dialog from '@material-ui/core/Dialog' import AnalysisErrorModal from 'components/Analysis/AnalysisErrorModal' +import { mount } from 'enzyme' +import React from 'react' +import { Provider } from 'react-redux' import configureStore from 'redux-mock-store' -import { profileData } from '../../../tests/__mocks__/profile.mock' import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' -import { Provider } from 'react-redux' -import Dialog from '@material-ui/core/Dialog' -import Button from '@material-ui/core/Button' +import { profileData } from '../../../tests/__mocks__/profileData.mock' jest.mock('cozy-ui/transpiled/react/I18n', () => { return { diff --git a/src/components/Analysis/AnalysisView.spec.tsx b/src/components/Analysis/AnalysisView.spec.tsx index e3c5062d5..32c67dbd8 100644 --- a/src/components/Analysis/AnalysisView.spec.tsx +++ b/src/components/Analysis/AnalysisView.spec.tsx @@ -1,16 +1,16 @@ -import React from 'react' +import AnalysisView from 'components/Analysis/AnalysisView' import { mount } from 'enzyme' +import React from 'react' import * as reactRedux from 'react-redux' import { Provider } from 'react-redux' -import AnalysisView from 'components/Analysis/AnalysisView' +import * as globalActions from 'store/global/global.actions' +import * as profileActions from 'store/profile/profile.actions' import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' -import { profileData } from '../../../tests/__mocks__/profile.mock' +import { profileData } from '../../../tests/__mocks__/profileData.mock' import { createMockStore, mockInitialEcolyoState, } from '../../../tests/__mocks__/store' -import * as globalActions from 'store/global/global.actions' -import * as profileActions from 'store/profile/profile.actions' jest.mock('cozy-ui/transpiled/react/I18n', () => { return { diff --git a/src/components/Duel/DuelResultModal.spec.tsx b/src/components/Duel/DuelResultModal.spec.tsx index 4970dbcfa..7afeda42d 100644 --- a/src/components/Duel/DuelResultModal.spec.tsx +++ b/src/components/Duel/DuelResultModal.spec.tsx @@ -1,10 +1,10 @@ -import React from 'react' import { mount } from 'enzyme' +import React from 'react' import { Provider } from 'react-redux' +import configureStore from 'redux-mock-store' import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' +import { profileData } from '../../../tests/__mocks__/profileData.mock' import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock' -import { profileData } from '../../../tests/__mocks__/profile.mock' -import configureStore from 'redux-mock-store' import { act } from 'react-dom/test-utils' import DuelResultModal from './DuelResultModal' diff --git a/src/components/Duel/DuelView.tsx b/src/components/Duel/DuelView.tsx index 731659e94..2e968b018 100644 --- a/src/components/Duel/DuelView.tsx +++ b/src/components/Duel/DuelView.tsx @@ -1,18 +1,17 @@ -import React, { useCallback, useState } from 'react' -import { useSelector } from 'react-redux' -import { AppStore } from 'store' -import CozyBar from 'components/Header/CozyBar' import Content from 'components/Content/Content' -import Header from 'components/Header/Header' -import { UserChallengeState } from 'enum/userChallenge.enum' - 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 { UserChallenge } from 'models' -import DuelOngoing from './DuelOngoing' -import DuelEmptyValueModal from './DuelEmptyValueModal' +import React, { useCallback, useState } from 'react' +import { useSelector } from 'react-redux' import { useHistory, useLocation } from 'react-router-dom' +import { AppStore } from 'store' +import DuelEmptyValueModal from './DuelEmptyValueModal' +import DuelOngoing from './DuelOngoing' const DuelView: React.FC = () => { const [headerHeight, setHeaderHeight] = useState<number>(0) @@ -53,11 +52,7 @@ const DuelView: React.FC = () => { return ( <> - <CozyBar - titleKey={'common.title_duel'} - displayBackArrow={true} - isBuilding={true} - /> + <CozyBar titleKey={'common.title_duel'} displayBackArrow={true} /> <Header setHeaderHeight={defineHeaderHeight} desktopTitleKey={'common.title_duel'} diff --git a/src/components/Ecogesture/EcogestureEmptyList.spec.tsx b/src/components/Ecogesture/EcogestureEmptyList.spec.tsx index c6318f0fc..01d6a11cd 100644 --- a/src/components/Ecogesture/EcogestureEmptyList.spec.tsx +++ b/src/components/Ecogesture/EcogestureEmptyList.spec.tsx @@ -1,12 +1,12 @@ -import React from 'react' +import Button from '@material-ui/core/Button' import { mount } from 'enzyme' +import toJson from 'enzyme-to-json' +import React from 'react' +import { Provider } from 'react-redux' import configureStore from 'redux-mock-store' -import { profileData } from '../../../tests/__mocks__/profile.mock' import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' -import { Provider } from 'react-redux' -import Button from '@material-ui/core/Button' +import { profileData } from '../../../tests/__mocks__/profileData.mock' import EcogestureEmptyList from './EcogestureEmptyList' -import toJson from 'enzyme-to-json' jest.mock('cozy-ui/transpiled/react/I18n', () => { return { diff --git a/src/components/Exploration/ExplorationView.tsx b/src/components/Exploration/ExplorationView.tsx index 1f7a9c21b..587bc84f5 100644 --- a/src/components/Exploration/ExplorationView.tsx +++ b/src/components/Exploration/ExplorationView.tsx @@ -1,14 +1,14 @@ -import React, { useCallback, useState } from 'react' -import { useSelector } from 'react-redux' -import { AppStore } from 'store' -import CozyBar from 'components/Header/CozyBar' 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 { UserChallenge } from 'models' -import ExplorationOngoing from './ExplorationOngoing' +import React, { useCallback, useState } from 'react' +import { useSelector } from 'react-redux' +import { AppStore } from 'store' import ExplorationError from './ExplorationError' import ExplorationFinished from './ExplorationFinished' +import ExplorationOngoing from './ExplorationOngoing' const ExplorationView: React.FC = () => { const [headerHeight, setHeaderHeight] = useState<number>(0) @@ -35,11 +35,7 @@ const ExplorationView: React.FC = () => { return ( <> - <CozyBar - titleKey={'common.title_exploration'} - displayBackArrow={true} - isBuilding={true} - /> + <CozyBar titleKey={'common.title_exploration'} displayBackArrow={true} /> <Header setHeaderHeight={defineHeaderHeight} desktopTitleKey={'common.title_exploration'} diff --git a/src/components/Onboarding/WelcomeModal.spec.tsx b/src/components/Onboarding/WelcomeModal.spec.tsx index 1d6e8a48b..32a154314 100644 --- a/src/components/Onboarding/WelcomeModal.spec.tsx +++ b/src/components/Onboarding/WelcomeModal.spec.tsx @@ -1,13 +1,13 @@ -import React from 'react' +import { Button, IconButton } from '@material-ui/core' import { mount } from 'enzyme' import toJson from 'enzyme-to-json' -import WelcomeModal from './WelcomeModal' -import { profileData } from '../../../tests/__mocks__/profile.mock' -import configureStore from 'redux-mock-store' +import React from 'react' import { Provider } from 'react-redux' +import configureStore from 'redux-mock-store' import * as profileActions from 'store/profile/profile.actions' -import { Button, IconButton } from '@material-ui/core' import mockClient from '../../../tests/__mocks__/client' +import { profileData } from '../../../tests/__mocks__/profileData.mock' +import WelcomeModal from './WelcomeModal' jest.mock('cozy-ui/transpiled/react/I18n', () => { return { diff --git a/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.spec.tsx b/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.spec.tsx index fed0a9870..700aecb5d 100644 --- a/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.spec.tsx +++ b/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.spec.tsx @@ -1,19 +1,19 @@ -import React from 'react' -import { mount } from 'enzyme' -import { Provider } from 'react-redux' -import configureStore from 'redux-mock-store' -import ProfileTypeOptions from 'components/Options/ProfileTypeOptions/ProfileTypeOptions' -import { profileData } from '../../../../tests/__mocks__/profile.mock' -import { mockProfileType } from '../../../../tests/__mocks__/profileType.mock' +import profileIcon from 'assets/icons/ico/profile.svg' import StyledCard from 'components/CommonKit/Card/StyledCard' import StyledIcon from 'components/CommonKit/Icon/StyledIcon' -import profileIcon from 'assets/icons/ico/profile.svg' +import ProfileTypeOptions from 'components/Options/ProfileTypeOptions/ProfileTypeOptions' import { HousingType, IndividualInsulationWork, IndividualOrCollective, ThreeChoicesAnswer, } from 'enum/profileType.enum' +import { mount } from 'enzyme' +import React from 'react' +import { Provider } from 'react-redux' +import configureStore from 'redux-mock-store' +import { profileData } from '../../../../tests/__mocks__/profileData.mock' +import { mockProfileType } from '../../../../tests/__mocks__/profileType.mock' import { mockInitialChallengeState } from '../../../../tests/__mocks__/store' jest.mock('cozy-ui/transpiled/react/I18n', () => { diff --git a/src/components/Quiz/QuizView.tsx b/src/components/Quiz/QuizView.tsx index c35b591ea..695104385 100644 --- a/src/components/Quiz/QuizView.tsx +++ b/src/components/Quiz/QuizView.tsx @@ -1,14 +1,14 @@ -import React, { useCallback, useState } from 'react' -import { useSelector } from 'react-redux' -import { AppStore } from 'store' -import CozyBar from 'components/Header/CozyBar' 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 QuizBegin from './QuizBegin' import { UserChallenge } from 'models' -import QuizQuestion from './QuizQuestion' +import React, { useCallback, useState } from 'react' +import { useSelector } from 'react-redux' +import { AppStore } from 'store' +import QuizBegin from './QuizBegin' import QuizFinish from './QuizFinish' +import QuizQuestion from './QuizQuestion' const QuizView: React.FC = () => { const [headerHeight, setHeaderHeight] = useState<number>(0) @@ -35,11 +35,7 @@ const QuizView: React.FC = () => { return ( <> - <CozyBar - titleKey={'common.title_quiz'} - displayBackArrow={true} - isBuilding={true} - /> + <CozyBar titleKey={'common.title_quiz'} displayBackArrow={true} /> <Header setHeaderHeight={defineHeaderHeight} desktopTitleKey={'common.title_quiz'} diff --git a/src/components/Terms/DataShareConsentContent.spec.tsx b/src/components/Terms/DataShareConsentContent.spec.tsx index 0eb642b96..43865afb1 100644 --- a/src/components/Terms/DataShareConsentContent.spec.tsx +++ b/src/components/Terms/DataShareConsentContent.spec.tsx @@ -1,10 +1,10 @@ -import React from 'react' import { mount } from 'enzyme' import toJson from 'enzyme-to-json' -import DataShareConsentContent from './DataShareConsentContent' -import { profileData } from '../../../tests/__mocks__/profile.mock' -import configureStore from 'redux-mock-store' +import React from 'react' import { Provider } from 'react-redux' +import configureStore from 'redux-mock-store' +import { profileData } from '../../../tests/__mocks__/profileData.mock' +import DataShareConsentContent from './DataShareConsentContent' jest.mock('cozy-ui/transpiled/react/I18n', () => { return { diff --git a/src/components/Terms/TermsView.spec.tsx b/src/components/Terms/TermsView.spec.tsx index d3bcf1fa2..6aa034395 100644 --- a/src/components/Terms/TermsView.spec.tsx +++ b/src/components/Terms/TermsView.spec.tsx @@ -1,14 +1,14 @@ -import React from 'react' -import { mount } from 'enzyme' -import TermsView from './TermsView' -import { profileData } from '../../../tests/__mocks__/profile.mock' -import configureStore from 'redux-mock-store' -import { Provider } from 'react-redux' import { Button } from '@material-ui/core' +import { mount } from 'enzyme' import toJson from 'enzyme-to-json' +import React from 'react' import * as reactRedux from 'react-redux' -import { mockUpToDateTerm } from '../../../tests/__mocks__/termsData.mock' +import { Provider } from 'react-redux' +import configureStore from 'redux-mock-store' import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' +import { profileData } from '../../../tests/__mocks__/profileData.mock' +import { mockUpToDateTerm } from '../../../tests/__mocks__/termsData.mock' +import TermsView from './TermsView' jest.mock('cozy-ui/transpiled/react/I18n', () => { return { diff --git a/src/db/profileData.json b/src/db/profileData.json deleted file mode 100644 index c8007e374..000000000 --- a/src/db/profileData.json +++ /dev/null @@ -1,22 +0,0 @@ -[ - { - "ecogestureHash": "", - "challengeHash": "", - "mailToken": "", - "duelHash": "", - "quizHash": "", - "isFirstConnection": true, - "lastConnectionDate": "0000-01-01T00:00:00.000Z", - "haveSeenLastAnalysis": true, - "sendAnalysisNotification": true, - "monthlyAnalysisDate": "0000-01-01T00:00:00.000Z", - "sendConsumptionAlert": false, - "waterDailyConsumptionLimit": 0, - "isProfileTypeCompleted": false, - "isProfileEcogestureCompleted": false, - "onboarding": { - "isWelcomeSeen": false - }, - "haveSeenEcogestureModal": false - } -] diff --git a/src/db/profileData.ts b/src/db/profileData.ts new file mode 100644 index 000000000..e6b02f585 --- /dev/null +++ b/src/db/profileData.ts @@ -0,0 +1,32 @@ +import { ProfileEntity } from 'models' + +const profileData: Omit<ProfileEntity, 'id'> = { + activateHalfHourDate: '0000-01-01T00:00:00.000Z', + challengeHash: '', + customPopupDate: '0000-01-01T00:00:00.000Z', + duelHash: '', + ecogestureHash: '', + explorationHash: '', + haveSeenEcogestureModal: false, + haveSeenLastAnalysis: true, + isFirstConnection: true, + isProfileEcogestureCompleted: false, + isProfileTypeCompleted: false, + lastConnectionDate: '0000-01-01T00:00:00.000Z', + mailToken: '', + monthlyAnalysisDate: '0000-01-01T00:00:00.000Z', + partnersIssueSeenDate: { + enedis: '0000-01-01T00:00:00.000Z', + egl: '0000-01-01T00:00:00.000Z', + grdf: '0000-01-01T00:00:00.000Z', + }, + quizHash: '', + onboarding: { + isWelcomeSeen: false, + }, + sendAnalysisNotification: true, + sendConsumptionAlert: false, + waterDailyConsumptionLimit: 0, +} + +export default profileData diff --git a/src/migrations/migration.spec.ts b/src/migrations/migration.spec.ts index 69e6de6dd..01adb4cda 100644 --- a/src/migrations/migration.spec.ts +++ b/src/migrations/migration.spec.ts @@ -3,12 +3,12 @@ import { FLUIDPRICES_DOCTYPE, PROFILE_DOCTYPE } from 'doctypes' import { FluidPrice, Profile } from 'models' import { Schema } from 'models/schema.models' import mockClient from '../../tests/__mocks__/client' -import { profileData } from '../../tests/__mocks__/profile.mock' +import { profileData } from '../../tests/__mocks__/profileData.mock' import { migrate, migrationLog } from './migration' import { - MIGRATION_RESULT_NOOP, MIGRATION_RESULT_COMPLETE, MIGRATION_RESULT_FAILED, + MIGRATION_RESULT_NOOP, } from './migration.data' import { Migration, MigrationResult } from './migration.type' diff --git a/src/services/initialization.service.spec.ts b/src/services/initialization.service.spec.ts index ba4cc3537..74f7a6074 100644 --- a/src/services/initialization.service.spec.ts +++ b/src/services/initialization.service.spec.ts @@ -1,32 +1,32 @@ import { QueryResult } from 'cozy-client' import { DateTime } from 'luxon' import { UserChallenge } from 'models' -import InitializationService from './initialization.service' import mockClient from '../../tests/__mocks__/client' +import InitializationService from './initialization.service' -import ecogestureData from 'db/ecogestureData.json' import challengeEntityData from 'db/challengeEntity.json' import duelEntityData from 'db/duelEntity.json' -import quizEntityData from 'db/quizEntity.json' +import ecogestureData from 'db/ecogestureData.json' import explorationEntityData from 'db/explorationEntity.json' +import quizEntityData from 'db/quizEntity.json' -import { hashFile } from 'utils/hash' -import { getActualAnalysisDate } from 'utils/date' import { FluidType } from 'enum/fluid.enum' -import { ecogesturesData } from '../../tests/__mocks__/ecogesturesData.mock' -import { profileData } from '../../tests/__mocks__/profile.mock' -import { fluidStatusData } from '../../tests/__mocks__/fluidStatusData.mock' -import { userChallengeData } from '../../tests/__mocks__/userChallengeData.mock' -import { graphData } from '../../tests/__mocks__/datachartData.mock' +import { getActualAnalysisDate } from 'utils/date' +import { hashFile } from 'utils/hash' import { allChallengeEntityData } from '../../tests/__mocks__/challengeEntity.mock' +import { graphData } from '../../tests/__mocks__/datachartData.mock' import { allDuelEntity } from '../../tests/__mocks__/duelData.mock' -import { allQuizEntities } from '../../tests/__mocks__/quizData.mock' +import { ecogesturesData } from '../../tests/__mocks__/ecogesturesData.mock' import { allExplorationEntities } from '../../tests/__mocks__/explorationData.mock' +import { fluidPrices } from '../../tests/__mocks__/fluidPrice.mock' +import { fluidStatusData } from '../../tests/__mocks__/fluidStatusData.mock' +import { profileData } from '../../tests/__mocks__/profileData.mock' +import { allQuizEntities } from '../../tests/__mocks__/quizData.mock' import { mockOutdatedTerm, mockUpToDateTerm, } from '../../tests/__mocks__/termsData.mock' -import { fluidPrices } from '../../tests/__mocks__/fluidPrice.mock' +import { userChallengeData } from '../../tests/__mocks__/userChallengeData.mock' const mockCreateIndexKonnector = jest.fn() jest.mock('./konnector.service', () => { diff --git a/src/services/initialization.service.ts b/src/services/initialization.service.ts index 2ff22d6ed..fa41bf5e1 100644 --- a/src/services/initialization.service.ts +++ b/src/services/initialization.service.ts @@ -5,7 +5,7 @@ import challengeEntityData from 'db/challengeEntity.json' import duelEntityData from 'db/duelEntity.json' import ecogestureData from 'db/ecogestureData.json' import explorationEntityData from 'db/explorationEntity.json' -import profileData from 'db/profileData.json' +import profileData from 'db/profileData' import quizEntityData from 'db/quizEntity.json' import { CHALLENGE_DOCTYPE, @@ -86,7 +86,7 @@ export default class InitializationService { // Population with the data const { data: newProfile } = await this._client.create( PROFILE_DOCTYPE, - profileData[0] + profileData ) if (newProfile) { logApp.info('[Initialization] Profile created') diff --git a/src/services/profile.service.spec.ts b/src/services/profile.service.spec.ts index 8b63298aa..af34c70da 100644 --- a/src/services/profile.service.spec.ts +++ b/src/services/profile.service.spec.ts @@ -2,7 +2,7 @@ import { QueryResult } from 'cozy-client' import { DateTime } from 'luxon' import { Profile } from 'models' import mockClient from '../../tests/__mocks__/client' -import { profileData } from '../../tests/__mocks__/profile.mock' +import { profileData } from '../../tests/__mocks__/profileData.mock' import ProfileService from './profile.service' describe('UserProfile service', () => { diff --git a/src/services/profile.service.ts b/src/services/profile.service.ts index 04fd21fbb..06f7d644e 100644 --- a/src/services/profile.service.ts +++ b/src/services/profile.service.ts @@ -22,15 +22,6 @@ export default class ProfileService { * @returns {Profile} */ private parseProfileEntityToProfile(profileEntity: ProfileEntity): Profile { - const yesterday: DateTime = DateTime.local() - .minus({ day: 1 }) - .startOf('day') - const partnersIssueSeenDate = { - enedis: yesterday, - egl: yesterday, - grdf: yesterday, - } - const profile: Profile = { ...profileEntity, monthlyAnalysisDate: @@ -38,7 +29,11 @@ export default class ProfileService { ? this.getDate(profileEntity.monthlyAnalysisDate) : profileEntity.monthlyAnalysisDate, lastConnectionDate: this.getDate(profileEntity.lastConnectionDate), - partnersIssueSeenDate: partnersIssueSeenDate, + partnersIssueSeenDate: { + enedis: this.getDate(profileEntity.partnersIssueSeenDate.enedis), + egl: this.getDate(profileEntity.partnersIssueSeenDate.egl), + grdf: this.getDate(profileEntity.partnersIssueSeenDate.grdf), + }, activateHalfHourDate: this.getDate(profileEntity.activateHalfHourDate), customPopupDate: this.getDate(profileEntity.customPopupDate), } diff --git a/src/store/profile/profile.action.spec.ts b/src/store/profile/profile.action.spec.ts index a1b52ed7a..a9d3d73f8 100644 --- a/src/store/profile/profile.action.spec.ts +++ b/src/store/profile/profile.action.spec.ts @@ -1,9 +1,9 @@ -import { UPDATE_PROFILE, updateProfile } from './profile.actions' -import { profileData } from '../../../tests/__mocks__/profile.mock' +import { profileData } from '../../../tests/__mocks__/profileData.mock' import { createMockStore, mockInitialEcolyoState, } from '../../../tests/__mocks__/store' +import { updateProfile, UPDATE_PROFILE } from './profile.actions' const mockUpdateProfile = jest.fn() jest.mock('services/profile.service', () => { diff --git a/src/store/profile/profile.reducer.spec.ts b/src/store/profile/profile.reducer.spec.ts index e547bfc13..b1764154b 100644 --- a/src/store/profile/profile.reducer.spec.ts +++ b/src/store/profile/profile.reducer.spec.ts @@ -1,7 +1,7 @@ -import { profileReducer } from './profile.reducer' -import { UPDATE_PROFILE } from './profile.actions' +import { profileData } from '../../../tests/__mocks__/profileData.mock' import { mockInitialProfileState } from '../../../tests/__mocks__/store' -import { profileData } from '../../../tests/__mocks__/profile.mock' +import { UPDATE_PROFILE } from './profile.actions' +import { profileReducer } from './profile.reducer' describe('profile reducer', () => { it('should return the initial state', () => { diff --git a/src/styles/base/_typography.scss b/src/styles/base/_typography.scss index e47762845..ed8a7ac92 100644 --- a/src/styles/base/_typography.scss +++ b/src/styles/base/_typography.scss @@ -38,11 +38,6 @@ p { color: $grey-bright; text-shadow: 0px -1px 0px #060609, 0px 1px 0px rgba(255, 255, 255, 0.07); } -.isBuilding { - color: $gold-shadow; - margin-left:.8rem; - margin-right: .8rem; -} @each $name, $size in $text-size { .text-#{$name} { diff --git a/tests/__mocks__/profile.mock.ts b/tests/__mocks__/profileData.mock.ts similarity index 100% rename from tests/__mocks__/profile.mock.ts rename to tests/__mocks__/profileData.mock.ts -- GitLab