watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-15 01:55:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

New schema for pixels and links.

Browse source
This commit is contained in:
Mike Cao 2025-08-13 20:27:54 -07:00
parent c60e8b3d23
commit 88639dfe83
67 changed files with 993 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/app/(main)/settings/teams/TeamsTable.tsx
View file

@ -21,13 +21,13 @@ export function TeamsTable({
{(row: any) => <Link href={`/settings/teams/${row.id}`}>{row.name}</Link>}
</DataColumn>
<DataColumn id="owner" label={formatMessage(labels.owner)}>
{(row: any) => row.teamUser.find(({ role }) => role === ROLES.teamOwner)?.user?.username}
{(row: any) => row.users.find(({ role }) => role === ROLES.teamOwner)?.user?.username}
</DataColumn>
<DataColumn id="websites" label={formatMessage(labels.websites)}>
{(row: any) => row._count.website}
<DataColumn id="websites" label={formatMessage(labels.websites)} align="end">
{(row: any) => row._count.websites}
</DataColumn>
<DataColumn id="members" label={formatMessage(labels.members)}>
{(row: any) => row._count.teamUser}
<DataColumn id="members" label={formatMessage(labels.members)} align="end">
{(row: any) => row._count.users}
</DataColumn>
{showActions ? (
<DataColumn id="action" label=" " align="end">

8
src/app/(main)/settings/teams/[teamId]/TeamMembersPage.tsx
View file

@ -1,19 +1,17 @@
'use client';
import { TeamContext } from '@/app/(main)/teams/[teamId]/TeamProvider';
import { TeamMembersDataTable } from './TeamMembersDataTable';
import { SectionHeader } from '@/components/common/SectionHeader';
import { useLoginQuery, useMessages } from '@/components/hooks';
import { useLoginQuery, useMessages, useTeam } from '@/components/hooks';
import { ROLES } from '@/lib/constants';
import { useContext } from 'react';
import { Column } from '@umami/react-zen';
export function TeamMembersPage({ teamId }: { teamId: string }) {
const team = useContext(TeamContext);
const team = useTeam();
const { user } = useLoginQuery();
const { formatMessage, labels } = useMessages();
const canEdit =
team?.teamUser?.find(
team?.members?.find(
({ userId, role }) =>
(role === ROLES.teamOwner || role === ROLES.teamManager) && userId === user.id,
) && user.role !== ROLES.viewOnly;

2
src/app/(main)/settings/websites/WebsitesTable.tsx
View file

@ -57,7 +57,7 @@ export function WebsitesTable({
</MenuItem>
)}
{allowEdit && (
<MenuItem href={renderUrl(`/settings/websites/${websiteId}`)}>
<MenuItem href={renderUrl(`/websites/${websiteId}/settings`)}>
<Row alignItems="center" gap>
<Icon data-test="link-button-edit">
<SquarePen />