From d064eb5f9ef1088a4cb2aafec4b9db3290b0474d Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 6 Sep 2020 10:22:21 +0200 Subject: [PATCH] Fixed inconsistent type --- src/visits/VisitsStats.tsx | 2 +- src/visits/helpers/LineChartCard.tsx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/visits/VisitsStats.tsx b/src/visits/VisitsStats.tsx index 67f5b0ee..b31cd5fc 100644 --- a/src/visits/VisitsStats.tsx +++ b/src/visits/VisitsStats.tsx @@ -125,7 +125,7 @@ const VisitsStats: FC = (
diff --git a/src/visits/helpers/LineChartCard.tsx b/src/visits/helpers/LineChartCard.tsx index 0eadf798..a600d364 100644 --- a/src/visits/helpers/LineChartCard.tsx +++ b/src/visits/helpers/LineChartCard.tsx @@ -12,7 +12,7 @@ import { Line } from 'react-chartjs-2'; import { always, cond, reverse } from 'ramda'; import moment from 'moment'; import { ChartData, ChartDataSets } from 'chart.js'; -import { NormalizedVisit, Stats, Visit } from '../types'; +import { NormalizedVisit, Stats } from '../types'; import { fillTheGaps } from '../../utils/helpers/visits'; import { useToggle } from '../../utils/helpers/hooks'; import { rangeOf } from '../../utils/utils'; @@ -22,7 +22,7 @@ import './LineChartCard.scss'; interface LineChartCardProps { title: string; highlightedLabel?: string; - visits: Visit[]; + visits: NormalizedVisit[]; highlightedVisits: NormalizedVisit[]; } @@ -66,7 +66,7 @@ const determineInitialStep = (oldestVisitDate: string): Step => { return matcher() ?? 'monthly'; }; -const groupVisitsByStep = (step: Step, visits: (Visit | NormalizedVisit)[]): Stats => visits.reduce( +const groupVisitsByStep = (step: Step, visits: NormalizedVisit[]): Stats => visits.reduce( (acc, visit) => { const key = STEP_TO_DATE_FORMAT[step](visit.date); @@ -77,7 +77,7 @@ const groupVisitsByStep = (step: Step, visits: (Visit | NormalizedVisit)[]): Sta {}, ); -const generateLabels = (step: Step, visits: Visit[]): string[] => { +const generateLabels = (step: Step, visits: NormalizedVisit[]): string[] => { const unit = STEP_TO_DATE_UNIT_MAP[step]; const formatter = STEP_TO_DATE_FORMAT[step]; const newerDate = moment(visits[0].date); @@ -91,7 +91,7 @@ const generateLabels = (step: Step, visits: Visit[]): string[] => { }; const generateLabelsAndGroupedVisits = ( - visits: Visit[], + visits: NormalizedVisit[], groupedVisitsWithGaps: Stats, step: Step, skipNoElements: boolean,