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

Fixed uuid references in schemas.
Some checks are pending
Node.js CI / build (postgresql, 18.18) (push) Waiting to run
Details

Browse source
This commit is contained in:
Mike Cao 2025-09-08 15:28:01 -07:00
parent f40e1b44f3
commit 303947fe9b
16 changed files with 36 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/(main)/settings/teams/TeamsSettingsPage.tsx
View file

@ -9,7 +9,7 @@ export function TeamsSettingsPage() {
<Column gap="6">
<TeamsHeader />
<Panel>
<TeamsDataTable />
<TeamsDataTable showActions={true} />
</Panel>
</Column>
);

6
src/app/(main)/teams/TeamsDataTable.tsx
View file

@ -2,7 +2,7 @@ import { ReactNode } from 'react';
import Link from 'next/link';
import { DataGrid } from '@/components/common/DataGrid';
import { TeamsTable } from './TeamsTable';
import { useLoginQuery, useUserTeamsQuery } from '@/components/hooks';
import { useLoginQuery, useNavigation, useUserTeamsQuery } from '@/components/hooks';
export function TeamsDataTable({
showActions,
@ -13,10 +13,12 @@ export function TeamsDataTable({
}) {
const { user } = useLoginQuery();
const query = useUserTeamsQuery(user.id);
const { pathname } = useNavigation();
const isSettings = pathname.includes('/settings');
const renderLink = (row: any) => {
return (
<Link key={row.id} href={`/teams/${row.id}`}>
<Link key={row.id} href={`${isSettings ? '/settings' : ''}/teams/${row.id}`}>
{row.name}
</Link>
);