mirror of
https://github.com/umami-software/umami.git
synced 2025-12-08 05:12:36 +01:00
Added "columns" to query options. Added events count to event data metrics.
This commit is contained in:
parent
9d86385f5c
commit
7da7f58cbe
7 changed files with 45 additions and 65 deletions
|
|
@ -11,6 +11,7 @@ export interface EventDataFieldsRequestBody {
|
|||
startDate: string;
|
||||
endDate: string;
|
||||
};
|
||||
field?: string;
|
||||
}
|
||||
|
||||
export default async (
|
||||
|
|
@ -27,7 +28,10 @@ export default async (
|
|||
return unauthorized(res);
|
||||
}
|
||||
|
||||
const data = await getEventDataFields(websiteId, new Date(+startAt), new Date(+endAt), field);
|
||||
const startDate = new Date(+startAt);
|
||||
const endDate = new Date(+endAt);
|
||||
|
||||
const data = await getEventDataFields(websiteId, { startDate, endDate, field });
|
||||
|
||||
return ok(res, data);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,16 +32,18 @@ export default async (
|
|||
const endDate = new Date(+endAt);
|
||||
|
||||
const results = await getEventDataFields(websiteId, { startDate, endDate });
|
||||
const events = new Set();
|
||||
|
||||
const data = results.reduce(
|
||||
(obj, row) => {
|
||||
events.add(row.fieldName);
|
||||
obj.records += Number(row.total);
|
||||
return obj;
|
||||
},
|
||||
{ fields: results.length, records: 0 },
|
||||
);
|
||||
|
||||
return ok(res, data);
|
||||
return ok(res, { ...data, events: events.size });
|
||||
}
|
||||
|
||||
return methodNotAllowed(res);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue