watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-14 01:25:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

correct date labeling for previous pageviews/sessions

Browse source
This commit is contained in:
Francis Cao 2025-09-24 11:04:22 -07:00
parent 9d49eaebac
commit b777441788
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/metrics/PageviewsChart.tsx
View file

@ -31,7 +31,7 @@ export function PageviewsChart({ data, unit, minDate, maxDate, ...props }: Pagev
__id: new Date().getTime(), __id: new Date().getTime(),
datasets: [ datasets: [
{ {
type: data.compare ? 'line' : 'bar', type: 'bar',
label: formatMessage(labels.visitors), label: formatMessage(labels.visitors),
data: generateTimeSeries(data.sessions, minDate, maxDate, unit, dateLocale), data: generateTimeSeries(data.sessions, minDate, maxDate, unit, dateLocale),
borderWidth: 1, borderWidth: 1,
@ -41,7 +41,7 @@ export function PageviewsChart({ data, unit, minDate, maxDate, ...props }: Pagev
order: 3, order: 3,
}, },
{ {
type: data.compare ? 'line' : 'bar', type: 'bar',
label: formatMessage(labels.views), label: formatMessage(labels.views),
data: generateTimeSeries(data.pageviews, minDate, maxDate, unit, dateLocale), data: generateTimeSeries(data.pageviews, minDate, maxDate, unit, dateLocale),
barPercentage: 0.9, barPercentage: 0.9,

8
src/lib/date.ts
View file

@ -325,7 +325,7 @@ export function formatDate(
} }
export function generateTimeSeries( export function generateTimeSeries(
data: { x: string; y: number }[], data: { x: string; y: number; d?: string }[],
minDate: Date, minDate: Date,
maxDate: Date, maxDate: Date,
unit: string, unit: string,
@ -345,12 +345,12 @@ export function generateTimeSeries(
current = add(current, 1); 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 => { 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 };
}); });
} }