Skip to content
Snippets Groups Projects
Commit dbdc61d0 authored by Bastien DUMONT's avatar Bastien DUMONT :angel:
Browse files

Merge branch 'refactor/sonar-smells' into 'dev'

sonar smells

See merge request web-et-numerique/llle_project/ecolyo!745
parents 8fc71c23 642332fd
No related branches found
No related tags found
2 merge requests!777Update master to V2.0,!745sonar smells
import React from 'react'
import StyledSpinner from 'components/CommonKit/Spinner/StyledSpinner'
import { FluidState, FluidType } from 'enum/fluid.enum'
import { TimeStep } from 'enum/timeStep.enum'
import { mount } from 'enzyme'
import { Provider } from 'react-redux'
import { FluidStatus } from 'models'
import React from 'react'
import * as reactRedux from 'react-redux'
import { Provider } from 'react-redux'
import * as chartActions from 'store/chart/chart.actions'
import { mockTestProfile1 } from '../../../tests/__mocks__/profileType.mock'
import {
createMockStore,
mockExpiredElec,
mockExpiredGas,
mockInitialEcolyoState,
} from '../../../tests/__mocks__/store'
import * as chartActions from 'store/chart/chart.actions'
import { FluidState, FluidType } from 'enum/fluid.enum'
import { TimeStep } from 'enum/timeStep.enum'
import StyledSpinner from 'components/CommonKit/Spinner/StyledSpinner'
import ConsumptionView from './ConsumptionView'
import { FluidStatus } from 'models'
import { mockTestProfile1 } from '../../../tests/__mocks__/profileType.mock'
import {
mockCustomPopup,
mockCustomPopupOff,
} from '../../../tests/__mocks__/customPopup.mock'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
......
......@@ -5,7 +5,6 @@ import { DateTime, Interval } from 'luxon'
import { Dataload, FluidStatus, TimePeriod } from 'models'
import DateChartService from 'services/dateChart.service'
import { compareDates } from 'utils/date'
import log from 'utils/logger'
import ConfigService from './fluidConfig.service'
export default class ConsumptionFormatterService {
......
......@@ -9,7 +9,7 @@ export default class ConsumptionValidatorService {
timeStep: TimeStep,
fluidTypes: FluidType[],
compareTimePeriod?: TimePeriod,
isExport?: Boolean
isExport?: boolean
): boolean {
if (fluidTypes.length === 0) return false
if (!this.ValidateTimePeriod(timePeriod)) return false
......
......@@ -42,14 +42,12 @@ const getConsumptionValue = async (
endDate: analysisDate.minus({ month: 2 }).endOf('month'),
},
}
const fetchedPerformanceIndicators =
await consumptionService.getPerformanceIndicators(
periods.timePeriod,
TimeStep.MONTH,
fluidType,
periods.comparisonTimePeriod
)
return fetchedPerformanceIndicators
return consumptionService.getPerformanceIndicators(
periods.timePeriod,
TimeStep.MONTH,
fluidType,
periods.comparisonTimePeriod
)
}
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment