m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-11-22 09:57:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2548 from umami-software/analytics

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx
View File

@ -33,23 +33,21 @@ 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)} >
> <ModalTrigger disabled={!isTeamOwner}>
<ModalTrigger disabled={!isTeamOwner}> <Button variant="secondary" disabled={!isTeamOwner}>
<Button variant="secondary" disabled={!isTeamOwner}> {formatMessage(labels.transfer)}
{formatMessage(labels.transfer)} </Button>
</Button> <Modal title={formatMessage(labels.transferWebsite)}>
<Modal title={formatMessage(labels.transferWebsite)}> {(close: () => void) => (
{(close: () => void) => ( <WebsiteTransferForm websiteId={websiteId} onSave={handleSave} onClose={close} />
<WebsiteTransferForm websiteId={websiteId} onSave={handleSave} onClose={close} /> )}
)} </Modal>
</Modal> </ModalTrigger>
</ModalTrigger> </ActionForm>
</ActionForm>
)}
<ActionForm <ActionForm
label={formatMessage(labels.resetWebsite)} label={formatMessage(labels.resetWebsite)}
description={formatMessage(messages.resetWebsiteWarning)} description={formatMessage(messages.resetWebsiteWarning)}

7
src/lib/date.ts
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,

8
src/pages/api/teams/[teamId]/users/index.ts
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);

8
src/pages/api/teams/[teamId]/websites/index.ts
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);
} }

8
src/pages/api/users/[userId]/teams.ts
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);
} }