m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-06 01:15:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Mike Cao 2024-08-08 12:00:51 -07:00
commit 4703ba61ad
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/(main)/reports/create/ReportTemplates.tsx
View File

@ -4,7 +4,6 @@ import Magnet from 'assets/magnet.svg';
import Path from 'assets/path.svg'; import Path from 'assets/path.svg';
import Tag from 'assets/tag.svg'; import Tag from 'assets/tag.svg';
import Target from 'assets/target.svg'; import Target from 'assets/target.svg';
import Money from 'assets/money.svg';
import { useMessages, useTeamUrl } from 'components/hooks'; import { useMessages, useTeamUrl } from 'components/hooks';
import PageHeader from 'components/layout/PageHeader'; import PageHeader from 'components/layout/PageHeader';
import Link from 'next/link'; import Link from 'next/link';
@ -52,12 +51,12 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
url: renderTeamUrl('/reports/journey'), url: renderTeamUrl('/reports/journey'),
icon: <Path />, icon: <Path />,
}, },
{ // {
title: formatMessage(labels.revenue), // title: formatMessage(labels.revenue),
description: formatMessage(labels.revenueDescription), // description: formatMessage(labels.revenueDescription),
url: renderTeamUrl('/reports/revenue'), // url: renderTeamUrl('/reports/revenue'),
icon: <Money />, // icon: <Money />,
}, // },
]; ];
return ( return (

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

@ -13,11 +13,18 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:
const { teamId, renderTeamUrl } = useTeamUrl(); const { teamId, renderTeamUrl } = useTeamUrl();
const router = useRouter(); const router = useRouter();
const { result } = useTeams(user.id); const { result } = useTeams(user.id);
const hasTeams = result?.data?.length > 0; const canTransferWebsite =
const isTeamOwner = (
(!teamId && hasTeams) || !teamId &&
(hasTeams && result.data.filter(({ teamUser }) =>
result?.data teamUser.find(
({ role, userId }) =>
[ROLES.teamOwner, ROLES.teamManager].includes(role) && userId === user.id,
),
)
).length > 0 ||
(teamId &&
!!result?.data
?.find(({ id }) => id === teamId) ?.find(({ id }) => id === teamId)
?.teamUser.find(({ role, userId }) => role === ROLES.teamOwner && userId === user.id)); ?.teamUser.find(({ role, userId }) => role === ROLES.teamOwner && userId === user.id));
@ -37,8 +44,8 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:
label={formatMessage(labels.transferWebsite)} label={formatMessage(labels.transferWebsite)}
description={formatMessage(messages.transferWebsite)} description={formatMessage(messages.transferWebsite)}
> >
<ModalTrigger disabled={!isTeamOwner}> <ModalTrigger disabled={!canTransferWebsite}>
<Button variant="secondary" disabled={!isTeamOwner}> <Button variant="secondary" disabled={!canTransferWebsite}>
{formatMessage(labels.transfer)} {formatMessage(labels.transfer)}
</Button> </Button>
<Modal title={formatMessage(labels.transferWebsite)}> <Modal title={formatMessage(labels.transferWebsite)}>