diff --git a/src/components/metrics/PageviewsChart.tsx b/src/components/metrics/PageviewsChart.tsx index 59c3ad05..8e713bb0 100644 --- a/src/components/metrics/PageviewsChart.tsx +++ b/src/components/metrics/PageviewsChart.tsx @@ -31,7 +31,7 @@ export function PageviewsChart({ data, unit, minDate, maxDate, ...props }: Pagev __id: new Date().getTime(), datasets: [ { - type: data.compare ? 'line' : 'bar', + type: 'bar', label: formatMessage(labels.visitors), data: generateTimeSeries(data.sessions, minDate, maxDate, unit, dateLocale), borderWidth: 1, @@ -41,7 +41,7 @@ export function PageviewsChart({ data, unit, minDate, maxDate, ...props }: Pagev order: 3, }, { - type: data.compare ? 'line' : 'bar', + type: 'bar', label: formatMessage(labels.views), data: generateTimeSeries(data.pageviews, minDate, maxDate, unit, dateLocale), barPercentage: 0.9, diff --git a/src/lib/date.ts b/src/lib/date.ts index cc422313..7fd376b7 100644 --- a/src/lib/date.ts +++ b/src/lib/date.ts @@ -325,7 +325,7 @@ export function formatDate( } export function generateTimeSeries( - data: { x: string; y: number }[], + data: { x: string; y: number; d?: string }[], minDate: Date, maxDate: Date, unit: string, @@ -345,12 +345,12 @@ export function generateTimeSeries( current = add(current, 1); } - const lookup = new Map(data.map(({ x, y }) => [formatDate(x, fmt, locale), { x, y }])); + const lookup = new Map(data.map(({ x, y, d }) => [formatDate(x, fmt, locale), { x, y, d }])); return timeseries.map(t => { - const { x, y } = lookup.get(t) || {}; + const { x, y, d } = lookup.get(t) || {}; - return { x: t, d: x, y: y ?? null }; + return { x: t, d: d || x, y: y ?? null }; }); }