github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/app/(main)/teams/TeamsDataTable.tsx
#	src/app/(main)/teams/TeamsJoinButton.tsx
#	src/app/(main)/teams/[teamId]/TeamSettings.tsx
This commit is contained in:
Mike Cao
2025-09-23 23:10:05 -07:00
parent 83a014e884 8c703eff93
commit 8115709a8b
10 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/(main)/teams/TeamsDataTable.tsx
View File

@@ -1,7 +1,7 @@
import Link from 'next/link';
import { DataGrid } from '@/components/common/DataGrid';
import { TeamsTable } from './TeamsTable';
import { useLoginQuery, useNavigation, useUserTeamsQuery } from '@/components/hooks';
import Link from 'next/link';
import { TeamsTable } from './TeamsTable';
export function TeamsDataTable() {
const { user } = useLoginQuery();

6
src/app/(main)/teams/TeamsTable.tsx
View File

@@ -20,12 +20,12 @@ export function TeamsTable({
<DataColumn id="owner" label={formatMessage(labels.owner)}>
{(row: any) => row?.members?.find(({ role }) => role === ROLES.teamOwner)?.user?.username}
</DataColumn>
<DataColumn id="websites" label={formatMessage(labels.websites)} align="end">
{(row: any) => row?._count?.websites}
</DataColumn>
<DataColumn id="members" label={formatMessage(labels.members)} align="end">
{(row: any) => row?._count?.members}
</DataColumn>
<DataColumn id="websites" label={formatMessage(labels.websites)} align="end">
{(row: any) => row?._count?.websites}
</DataColumn>
</DataTable>
);
}