Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
fix create website / teams permissions
Francis Cao490bb11771eb
diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsx b/src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsxindex a81598918..3c1668260 100644--- a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsx+++ b/src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsx@@ -11,9 +11,9 @@ export function TeamMembersPage({ teamId }: { teamId: string }) {const { user } = useLogin();const { formatMessage, labels } = useMessages();- const canEdit = team?.teamUser?.find(- ({ userId, role }) => role === ROLES.teamOwner && userId === user.id,- );+ const canEdit =+ team?.teamUser?.find(({ userId, role }) => role === ROLES.teamOwner && userId === user.id) &&+ user.role !== ROLES.viewOnly;return (<>diff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsx b/src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsxindex 0ce43fecc..9d8ea5297 100644--- a/src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsx+++ b/src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsx@@ -15,9 +15,9 @@ export function TeamDetails({ teamId }: { teamId: string }) {const { user } = useLogin();const [tab, setTab] = useState('details');- const canEdit = !!team?.teamUser?.find(- ({ userId, role }) => role === ROLES.teamOwner && userId === user.id,- );+ const canEdit =+ !!team?.teamUser?.find(({ userId, role }) => role === ROLES.teamOwner && userId === user.id) &&+ user.role !== ROLES.viewOnly;return (<Flexbox direction="column">diff --git a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsx b/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsxindex c5092c8b7..882ef8ecc 100644--- a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsx+++ b/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsx@@ -12,16 +12,17 @@ export function TeamWebsitesPage({ teamId }: { teamId: string }) {const { formatMessage, labels } = useMessages();const { user } = useLogin();- const allowEdit = !!team?.teamUser?.find(- ({ userId, role }) => userId === user.id && role !== ROLES.teamViewOnly,- );+ const canEdit =+ !!team?.teamUser?.find(+ ({ userId, role }) => userId === user.id && role !== ROLES.teamViewOnly,+ ) && user.role !== ROLES.viewOnly;return (<><PageHeader title={formatMessage(labels.websites)}>- {allowEdit && <WebsiteAddButton teamId={teamId} />}+ {canEdit && <WebsiteAddButton teamId={teamId} />}</PageHeader>- <TeamWebsitesDataTable teamId={teamId} allowEdit={allowEdit} />+ <TeamWebsitesDataTable teamId={teamId} allowEdit={canEdit} /></>);}diff --git a/src/app/(main)/settings/websites/WebsitesSettingsPage.tsx b/src/app/(main)/settings/websites/WebsitesSettingsPage.tsxindex 14411da10..ff0938d11 100644--- a/src/app/(main)/settings/websites/WebsitesSettingsPage.tsx+++ b/src/app/(main)/settings/websites/WebsitesSettingsPage.tsx@@ -1,11 +1,16 @@'use client';+import { useLogin } from 'components/hooks';import WebsitesDataTable from './WebsitesDataTable';import WebsitesHeader from './WebsitesHeader';+import { ROLES } from 'lib/constants';export default function WebsitesSettingsPage({ teamId }: { teamId: string }) {+ const { user } = useLogin();+ const canCreate = user.role !== ROLES.viewOnly;+return (<>- <WebsitesHeader teamId={teamId} />+ <WebsitesHeader teamId={teamId} allowCreate={canCreate} /><WebsitesDataTable teamId={teamId} /></>);diff --git a/src/app/(main)/websites/WebsitesPage.tsx b/src/app/(main)/websites/WebsitesPage.tsxindex 75776c4cf..8d8ee2e26 100644--- a/src/app/(main)/websites/WebsitesPage.tsx+++ b/src/app/(main)/websites/WebsitesPage.tsx@@ -1,14 +1,11 @@'use client';import WebsitesHeader from 'app/(main)/settings/websites/WebsitesHeader';import WebsitesDataTable from 'app/(main)/settings/websites/WebsitesDataTable';-import { useLogin } from 'components/hooks';--export default function WebsitesPage({ teamId }: { teamId: string; userId: string }) {- const { user } = useLogin();+export default function WebsitesPage({ teamId }: { teamId: string }) {return (<>- <WebsitesHeader teamId={teamId} allowCreate={user.role !== 'view-only'} />+ <WebsitesHeader teamId={teamId} allowCreate={false} /><WebsitesDataTable teamId={teamId} allowEdit={false} /></>);