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

Fix broken icons, remove showActions from TeamsTable, fix margins for pixel/link overview

Browse source
This commit is contained in:
Francis Cao 2025-09-23 13:55:27 -07:00
parent ee70baaeb7
commit 1a5c7df671
9 changed files with 45 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,16 +1,9 @@
import { ReactNode } from 'react';
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({
showActions,
}: {
allowEdit?: boolean;
showActions?: boolean;
children?: ReactNode;
}) {
export function TeamsDataTable() {
const { user } = useLoginQuery();
const query = useUserTeamsQuery(user.id);
const { pathname } = useNavigation();
@ -27,7 +20,7 @@ export function TeamsDataTable({
return (
<DataGrid query={query}>
{({ data }) => {
return <TeamsTable data={data} showActions={showActions} renderLink={renderLink} />;
return <TeamsTable data={data} renderLink={renderLink} />;
}}
</DataGrid>
);

4
src/app/(main)/teams/TeamsJoinButton.tsx
View file

@ -1,5 +1,5 @@
import { Button, Icon, Modal, DialogTrigger, Dialog, Text, useToast } from '@umami/react-zen';
import { AddUser } from '@/components/icons';
import { AddUserSvg } from '@/components/icons';
import { useMessages, useModified } from '@/components/hooks';
import { TeamJoinForm } from './TeamJoinForm';
@ -17,7 +17,7 @@ export function TeamsJoinButton() {
<DialogTrigger>
<Button>
<Icon>
<AddUser />
<AddUserSvg />
</Icon>
<Text>{formatMessage(labels.joinTeam)}</Text>
</Button>

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>
);
}

6
src/app/(main)/teams/[teamId]/TeamSettings.tsx
View file

@ -2,7 +2,7 @@ import Link from 'next/link';
import { Column, Icon, Text, Row } from '@umami/react-zen';
import { useLoginQuery, useMessages, useNavigation, useTeam } from '@/components/hooks';
import { ROLES } from '@/lib/constants';
import { Users, Arrow } from '@/components/icons';
import { Users, ArrowLeft } from '@/components/icons';
import { TeamLeaveButton } from '@/app/(main)/teams/TeamLeaveButton';
import { TeamManage } from './TeamManage';
import { TeamEditForm } from './TeamEditForm';
@ -34,8 +34,8 @@ export function TeamSettings({ teamId }: { teamId: string }) {
<>
<Link href="/settings/teams">
<Row marginTop="2" alignItems="center" gap>
<Icon rotate={180}>
<Arrow />
<Icon>
<ArrowLeft />
</Icon>
<Text>{formatMessage(labels.teams)}</Text>
</Row>