diff --git a/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourMonthlyAnalysis.tsx b/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourMonthlyAnalysis.tsx
index 332d2177ccc1fb7d3231789e62c24fcdb6be3e43..40b4223d85a3391a47f9191cf56fe5b16723467e 100644
--- a/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourMonthlyAnalysis.tsx
+++ b/src/components/Analysis/ElecHalfHourMonthlyAnalysis/ElecHalfHourMonthlyAnalysis.tsx
@@ -35,6 +35,7 @@ const ElecHalfHourMonthlyAnalysis = ({
const { t } = useI18n()
const client = useClient()
const { analysisMonth } = useAppSelector(state => state.ecolyo.analysis)
+
const [isWeekend, setIsWeekend] = useState<boolean>(true)
const [isHalfHourActivated, setIsHalfHourActivated] = useState<boolean>(true)
const [isLoading, setIsLoading] = useState<boolean>(true)
@@ -51,19 +52,21 @@ const ElecHalfHourMonthlyAnalysis = ({
setIsWeekend(prev => !prev)
}, [])
- const toggleOpenModal = useCallback(() => {
+ const toggleInfoModal = useCallback(() => {
setOpenInfoModal(prev => !prev)
}, [])
- const isDataFullyComplete = useCallback(monthDataloads => {
- if (
- monthDataloads?.weekend &&
- monthDataloads.week &&
- monthDataloads.weekend[0]?.value !== null &&
- monthDataloads.week[0]?.value !== null
- ) {
- return true
- } else return false
- }, [])
+
+ const isDataFullyComplete = useCallback(
+ (monthDataloads: AggregatedEnedisMonthlyDataloads | undefined) => {
+ return (
+ monthDataloads?.weekend &&
+ monthDataloads.week &&
+ monthDataloads.weekend[0]?.value !== null &&
+ monthDataloads.week[0]?.value !== null
+ )
+ },
+ []
+ )
const getPowerChart = useCallback((): JSX.Element => {
if (monthDataloads && isDataFullyComplete(monthDataloads)) {
@@ -73,9 +76,8 @@ const ElecHalfHourMonthlyAnalysis = ({
isWeekend={isWeekend}
/>
)
- } else {
- return <p className="text-20-bold no_data">{t('analysis.no_data')}</p>
}
+ return <p className="text-20-bold no_data">{t('analysis.no_data')}</p>
}, [isDataFullyComplete, isWeekend, monthDataloads, t])
useEffect(() => {
@@ -279,7 +281,7 @@ const ElecHalfHourMonthlyAnalysis = ({
</div>
</div>
- <Button className="btnText" onClick={toggleOpenModal}>
+ <Button className="btnText" onClick={toggleInfoModal}>
{t('special_elec.showModal')}
</Button>
</div>
@@ -291,7 +293,7 @@ const ElecHalfHourMonthlyAnalysis = ({
<ElecInfoModal
open={openInfoModal}
offPeakHours={offPeakHours}
- handleCloseClick={toggleOpenModal}
+ handleCloseClick={toggleInfoModal}
/>
</div>
)
diff --git a/src/components/Ecogesture/SingleEcogestureView.tsx b/src/components/Ecogesture/SingleEcogestureView.tsx
index ee8465dcb2e964639066d7e48887bb653a2d2fcd..3254cab1b5023afba53c6a495c5b653feb01ec27 100644
--- a/src/components/Ecogesture/SingleEcogestureView.tsx
+++ b/src/components/Ecogesture/SingleEcogestureView.tsx
@@ -45,12 +45,12 @@ const SingleEcogestureView = () => {
const [, setValidExploration] = useExploration()
const updateEcogesture = useCallback(
- async (objective, doing) => {
+ async (objective: boolean, doing: boolean) => {
if (ecogesture) {
const updates: Ecogesture = {
...ecogesture,
- objective: objective,
- doing: doing,
+ objective,
+ doing,
}
const result = await ecogestureService.updateEcogesture(updates)
if (result) {
diff --git a/src/components/Options/ReportOptions/ReportOptions.tsx b/src/components/Options/ReportOptions/ReportOptions.tsx
index 50556fd2878273301c853a6d59c8f64ac540df02..528aa2951bb60a84a90c15d591e1cfd62d166885 100644
--- a/src/components/Options/ReportOptions/ReportOptions.tsx
+++ b/src/components/Options/ReportOptions/ReportOptions.tsx
@@ -1,3 +1,4 @@
+import { OutlinedInput } from '@material-ui/core'
import StyledSwitch from 'components/CommonKit/Switch/StyledSwitch'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
@@ -9,7 +10,6 @@ import ConsumptionDataManager from 'services/consumption.service'
import { useAppDispatch, useAppSelector } from 'store/hooks'
import { updateProfile } from 'store/profile/profile.slice'
import './reportOptions.scss'
-import { TextField } from '@material-ui/core'
const ReportOptions = () => {
const { t } = useI18n()
@@ -37,7 +37,9 @@ const ReportOptions = () => {
fluidStatus[FluidType.WATER].status !== FluidState.KONNECTOR_NOT_FOUND &&
fluidStatus[FluidType.WATER].status !== FluidState.ERROR_LOGIN_FAILED
- const setWaterLimit = (e: React.ChangeEvent<HTMLInputElement>) => {
+ const setWaterLimit = (
+ e: React.FocusEvent<HTMLInputElement | HTMLTextAreaElement, Element>
+ ) => {
if (e.target.value !== null && parseInt(e.target.value) > 0) {
dispatch(
updateProfile({
@@ -134,8 +136,7 @@ const ReportOptions = () => {
{t('profile.report.input_label_alert')}
</div>
<div className="switch-container-alert">
- <TextField
- variant="outlined"
+ <OutlinedInput
className="inputNumber text-18"
type="number"
defaultValue={
@@ -144,7 +145,12 @@ const ReportOptions = () => {
: profile.waterDailyConsumptionLimit
}
onBlur={setWaterLimit}
- label={t('profile.accessibility.input_water_alert_report')}
+ inputProps={{
+ min: 0,
+ }}
+ aria-label={t(
+ 'profile.accessibility.input_water_alert_report'
+ )}
inputMode="numeric"
/>
<span className="switch-label text-16-normal">L</span>
diff --git a/src/components/ProfileType/ProfileTypeFinished/ProfileTypeFinished.tsx b/src/components/ProfileType/ProfileTypeFinished/ProfileTypeFinished.tsx
index c7de430773e7f8036822003100eaa29b1b9ebe8f..f32dd2d9d4b37c8253ddd97169bc1aafa6d39a3a 100644
--- a/src/components/ProfileType/ProfileTypeFinished/ProfileTypeFinished.tsx
+++ b/src/components/ProfileType/ProfileTypeFinished/ProfileTypeFinished.tsx
@@ -53,7 +53,7 @@ const ProfileTypeFinished = ({ profileType }: { profileType: ProfileType }) => {
}),
}
const profileTypeEntityService = new ProfileTypeEntityService(client)
- const myProfileTypes: ProfileType[] | null =
+ const myProfileTypes =
await profileTypeEntityService.getAllProfileTypes(chosenPeriod)
if (myProfileTypes !== null) {
const destroyPT =
diff --git a/src/db/profileTypeData.json b/src/db/profileTypeData.json
index beda4cf31df9df296467c0c40364b27506faf464..63b94873cec67f27366b8d0095e9dd892ac01630 100644
--- a/src/db/profileTypeData.json
+++ b/src/db/profileTypeData.json
@@ -12,7 +12,6 @@
"coldWater": "individual",
"hotWater": "individual",
"individualInsulationWork": ["window_replacement"],
- "facilitiesInstallation": "none",
"hotWaterEquipment": "solar",
"hasInstalledVentilation": "unknown",
"hasReplacedHeater": "unknown",
diff --git a/src/models/account.model.ts b/src/models/account.model.ts
index 73866654512b67c454c39157727466612dc235f3..bb125bcc9db89a4a5485e39a40b12188d19fd36e 100644
--- a/src/models/account.model.ts
+++ b/src/models/account.model.ts
@@ -1,4 +1,12 @@
-/* eslint-disable camelcase */
+export interface AccountAttributes {
+ account_type: string
+ auth?: AccountEGLData | AccountSgeData | AccountGRDFData
+ identifier?: string
+ state?: string | null
+ name?: string
+ data?: SgeAccountData
+}
+
export interface Account extends AccountAttributes {
_id: string
id?: string
@@ -12,17 +20,6 @@ export interface SgeAccountData {
offPeakHours?: string
}
-export interface AccountAttributes {
- account_type: string
- auth?: AccountEGLData | AccountSgeData | AccountGRDFData
- identifier?: string
- state?: string | null
- name?: string
- data?: SgeAccountData
- // TODO remove this ?
- oauth_callback_results?: Record<string, any>
-}
-
export interface AccountEGLData {
login: string
credentials_encrypted?: string
diff --git a/src/services/profileType.service.spec.ts b/src/services/profileType.service.spec.ts
index 3c52e9a655addf1f419ac934f4a33e1436802060..0e8340734d3e1eeab22af776c1cb18c9d63464bc 100644
--- a/src/services/profileType.service.spec.ts
+++ b/src/services/profileType.service.spec.ts
@@ -533,11 +533,10 @@ describe('ProfileType service', () => {
DateTime.fromISO('2021-01-01T00:00:00.000Z', { zone: 'utc' })
)
- const expectedResult = {
+ const expectedResult: ProfileType = {
...mockProfile,
warmingFluid: null,
individualInsulationWork: [],
- facilitiesInstallation: [],
hotWaterFluid: null,
hotWaterEquipment: HotWaterEquipment.OTHER,
}
diff --git a/src/services/profileType.service.ts b/src/services/profileType.service.ts
index 814a340ed146f2527c8dad96544b56c2742961f0..91aa35bbae5ecc30ce5abacd83b6fab504eec262 100644
--- a/src/services/profileType.service.ts
+++ b/src/services/profileType.service.ts
@@ -479,7 +479,6 @@ export default class ProfileTypeService {
if (profileType.heating === IndividualOrCollective.COLLECTIVE) {
profileType.warmingFluid = null
profileType.individualInsulationWork = []
- profileType.facilitiesInstallation = []
}
if (profileType.hotWater === IndividualOrCollective.COLLECTIVE) {
profileType.hotWaterFluid = null
diff --git a/tests/__mocks__/accountsData.mock.ts b/tests/__mocks__/accountsData.mock.ts
index 7775e8b618daa1705c820cedd3c6ce13ca193a9b..911835bf0dfad32f72a0b5622aea9dce6a99ec6c 100644
--- a/tests/__mocks__/accountsData.mock.ts
+++ b/tests/__mocks__/accountsData.mock.ts
@@ -7,23 +7,24 @@ export const accountsData: Account[] = [
_rev: '1-88e68b8450cee09fe2f077610901094d',
account_type: 'enedissgegrandlyon',
name: '',
- oauth: {
- access_token: 'MY_ACCESS_TOKEN',
- expires_at: '2020-10-09T08:00:00.285910671+02:00',
- refresh_token: '',
- token_type: 'Bearer',
- },
- oauth_callback_results: {
- issued_at: '1592232569642',
- refresh_token_issued_at: '1592232569642',
- scope: '/my_enedis_scope',
- usage_points_id: '',
- },
cozyMetadata: {
createdAt: '2020-11-10T16:42:11.132Z',
metadataVersion: 1,
updatedAt: '2020-11-10T16:42:11.132Z',
},
+ auth: {
+ address: '6 Rue Vaillant Couturier',
+ city: 'Vénissieux',
+ firstname: 'Jane',
+ lastname: 'Doe',
+ pointId: '19170766804121',
+ postalCode: '69200',
+ },
+ data: {
+ consentId: 43,
+ expirationDate: '2023-09-26',
+ offPeakHours: '22H00-6H00',
+ },
},
{
_id: '90e68b8450cee09fe2f077610901094d',
@@ -51,16 +52,13 @@ export const accountsData: Account[] = [
_rev: '1-89e68b8450cee09fe2f077610901094d',
account_type: 'grdfgrandlyon',
name: '',
- oauth: {
- access_token: 'MY_ACCESS_TOKEN',
- expires_at: '2020-10-09T08:00:00.285910671+02:00',
- refresh_token: '',
- token_type: 'Bearer',
- },
- oauth_callback_results: {
- id_token: 'MY_ID_TOKEN',
- pce: '12345678987654',
- scope: '/my_grdf_scope',
+ identifier: 'email',
+ auth: {
+ email: 'jane@grandlyon.com',
+ firstname: 'Jane',
+ lastname: 'Doe',
+ pce: '12345678901234',
+ postalCode: '69003',
},
cozyMetadata: {
createdAt: '2020-11-10T16:42:11.132Z',
diff --git a/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts b/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts
index bba9d3cc07c5222e83525b1e029b4752ec3acf3c..e980d11b4023dd69cd3f5a3ef53d46c32c995458 100644
--- a/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts
+++ b/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts
@@ -13,6 +13,7 @@ export const mockEnedisMonthlyAnalysis: EnedisMonthlyAnalysisData = {
year: 2021,
minimumLoad: 3,
maxPower: 2,
+ offPeakHoursRatio: null,
}
export const mockEnedisMonthlyAnalysisArray: EnedisMonthlyAnalysisData[] = [
@@ -23,6 +24,7 @@ export const mockEnedisMonthlyAnalysisArray: EnedisMonthlyAnalysisData[] = [
year: 2021,
minimumLoad: 3,
maxPower: 2,
+ offPeakHoursRatio: null,
},
{
weekDaysHalfHourAverageValues: [0.35, 0.34, 0.33, 0.32, 0.31, 0.3],
@@ -31,6 +33,7 @@ export const mockEnedisMonthlyAnalysisArray: EnedisMonthlyAnalysisData[] = [
year: 2021,
minimumLoad: 3,
maxPower: 2,
+ offPeakHoursRatio: null,
},
{
weekDaysHalfHourAverageValues: [0.35, 0.34, 0.33, 0.32, 0.31, 0.3],
@@ -39,6 +42,7 @@ export const mockEnedisMonthlyAnalysisArray: EnedisMonthlyAnalysisData[] = [
year: 2021,
minimumLoad: 3,
maxPower: 2,
+ offPeakHoursRatio: null,
},
{
weekDaysHalfHourAverageValues: [0.35, 0.34, 0.33, 0.32, 0.31, 0.3],
@@ -47,6 +51,7 @@ export const mockEnedisMonthlyAnalysisArray: EnedisMonthlyAnalysisData[] = [
year: 2021,
minimumLoad: 3,
maxPower: 2,
+ offPeakHoursRatio: null,
},
]
diff --git a/tests/__mocks__/fluidPrice.mock.ts b/tests/__mocks__/fluidPrice.mock.ts
index 63f6b6f5685891810c323a7a27d012aef1357956..b93fac787143fc494cb5e6f1b53dcf392aee787b 100644
--- a/tests/__mocks__/fluidPrice.mock.ts
+++ b/tests/__mocks__/fluidPrice.mock.ts
@@ -7,6 +7,7 @@ export const fluidPrices: FluidPrice[] = [
fluidType: 0,
price: 0.1429,
startDate: '2020-08-01T00:00:00.000Z',
+ UpdatedAt: '',
},
{
_id: '03045ea1afecc7a86e5443a52e00b07d',
@@ -14,6 +15,7 @@ export const fluidPrices: FluidPrice[] = [
fluidType: 0,
price: 0.1529,
startDate: '2021-01-01T00:00:00.000Z',
+ UpdatedAt: '',
},
{
_id: '03045ea1afecc7a86e5443a52e00b07d',
@@ -21,6 +23,7 @@ export const fluidPrices: FluidPrice[] = [
fluidType: 0,
price: 0.1329,
startDate: '2021-10-10T00:00:00.000Z',
+ UpdatedAt: '',
},
{
_id: '03045ea1afecc7a86e5443a52e00b07d',
@@ -28,6 +31,7 @@ export const fluidPrices: FluidPrice[] = [
fluidType: 1,
price: 0.0039,
startDate: '2013-08-01T00:00:00.000Z',
+ UpdatedAt: '',
},
{
_id: '03045ea1afecc7a86e5443a52e00b07d',
@@ -35,6 +39,7 @@ export const fluidPrices: FluidPrice[] = [
fluidType: 2,
price: 1.029,
startDate: '2013-08-01T00:00:00.000Z',
+ UpdatedAt: '',
},
{
_id: '03045ea1afecc7a86e5443a52e00b07d',
@@ -42,6 +47,7 @@ export const fluidPrices: FluidPrice[] = [
fluidType: 2,
price: 1.029,
startDate: '2014-11-01T00:00:00.000Z',
+ UpdatedAt: '',
},
]
@@ -52,6 +58,7 @@ export const allLastFluidPrices: FluidPrice[] = [
fluidType: 0,
price: 0.1329,
startDate: '2021-10-10T00:00:00.000Z',
+ UpdatedAt: '',
},
{
_id: '03045ea1afecc7a86e5443a52e00b07d',
@@ -59,6 +66,7 @@ export const allLastFluidPrices: FluidPrice[] = [
fluidType: 1,
price: 0.0039,
startDate: '2013-08-01T00:00:00.000Z',
+ UpdatedAt: '',
},
{
_id: '03045ea1afecc7a86e5443a52e00b07d',
@@ -66,5 +74,6 @@ export const allLastFluidPrices: FluidPrice[] = [
fluidType: 2,
price: 1.029,
startDate: '2014-11-01T00:00:00.000Z',
+ UpdatedAt: '',
},
]
diff --git a/tests/__mocks__/fluidStatusData.mock.ts b/tests/__mocks__/fluidStatusData.mock.ts
index eb1338c7612ecdcb31a3940c6203fc3dc4b4645a..2943514e3b8487518d8a48a4f1625269c9fdf8ec 100644
--- a/tests/__mocks__/fluidStatusData.mock.ts
+++ b/tests/__mocks__/fluidStatusData.mock.ts
@@ -194,18 +194,6 @@ export const SgeStatusWithAccount: FluidStatus = {
_rev: '1-88e68b8450cee09fe2f077610901094d',
account_type: 'enedissgegrandlyon',
name: '',
- oauth: {
- access_token: 'MY_ACCESS_TOKEN',
- expires_at: '2020-10-09T08:00:00.285910671+02:00',
- refresh_token: '',
- token_type: 'Bearer',
- },
- oauth_callback_results: {
- issued_at: '1592232569642',
- refresh_token_issued_at: '1592232569642',
- scope: '/my_enedis_scope',
- usage_points_id: '',
- },
cozyMetadata: {
createdAt: '2020-11-10T16:42:11.132Z',
metadataVersion: 1,