Merge pull request #2548 from umami-software/analytics

v2.10.1
This commit is contained in:
Mike Cao 2024-02-29 14:10:46 -08:00 committed by GitHub
commit 2795d0ecea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 25 additions and 38 deletions

View File

@ -33,7 +33,6 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:
return ( return (
<> <>
{process.env.cloudMode && (
<ActionForm <ActionForm
label={formatMessage(labels.transferWebsite)} label={formatMessage(labels.transferWebsite)}
description={formatMessage(messages.transferWebsite)} description={formatMessage(messages.transferWebsite)}
@ -49,7 +48,6 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:
</Modal> </Modal>
</ModalTrigger> </ModalTrigger>
</ActionForm> </ActionForm>
)}
<ActionForm <ActionForm
label={formatMessage(labels.resetWebsite)} label={formatMessage(labels.resetWebsite)}
description={formatMessage(messages.resetWebsiteWarning)} description={formatMessage(messages.resetWebsiteWarning)}

View File

@ -263,6 +263,13 @@ export function getOffsetDateRange(dateRange: DateRange, increment: number) {
const { unit: originalUnit } = parseDateValue(value) || {}; const { unit: originalUnit } = parseDateValue(value) || {};
switch (originalUnit) { switch (originalUnit) {
case 'day':
return {
...dateRange,
startDate: addDays(startDate, increment),
endDate: addDays(endDate, increment),
offset: offset + increment,
};
case 'week': case 'week':
return { return {
...dateRange, ...dateRange,

View File

@ -44,8 +44,6 @@ export default async (
return unauthorized(res); return unauthorized(res);
} }
const { query, page, pageSize } = req.query;
const users = await getTeamUsers( const users = await getTeamUsers(
{ {
where: { where: {
@ -63,11 +61,7 @@ export default async (
}, },
}, },
}, },
{ req.query,
query,
page,
pageSize,
},
); );
return ok(res, users); return ok(res, users);

View File

@ -43,13 +43,7 @@ export default async (
return unauthorized(res); return unauthorized(res);
} }
const { page, query, pageSize } = req.query; const websites = await getTeamWebsites(teamId, req.query);
const websites = await getTeamWebsites(teamId, {
page,
query,
pageSize,
});
return ok(res, websites); return ok(res, websites);
} }

View File

@ -39,13 +39,7 @@ export default async (
return unauthorized(res); return unauthorized(res);
} }
const { page, query, pageSize } = req.query; const teams = await getUserTeams(userId as string, req.query);
const teams = await getUserTeams(userId as string, {
query,
page,
pageSize,
});
return ok(res, teams); return ok(res, teams);
} }