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
Improve team admin screen workflow for team/members. Closes #2767
Francis Cao7f43a0d41a1b
diff --git a/src/app/(main)/admin/teams/AdminTeamsPage.tsx b/src/app/(main)/admin/teams/AdminTeamsPage.tsxindex 41e6f4afb..7905f7f63 100644--- a/src/app/(main)/admin/teams/AdminTeamsPage.tsx+++ b/src/app/(main)/admin/teams/AdminTeamsPage.tsx@@ -3,14 +3,19 @@ import { Column } from '@umami/react-zen';import { PageHeader } from '@/components/common/PageHeader';import { Panel } from '@/components/common/Panel';import { useMessages } from '@/components/hooks';+import { TeamsAddButton } from '../../teams/TeamsAddButton';import { AdminTeamsDataTable } from './AdminTeamsDataTable';export function AdminTeamsPage() {const { formatMessage, labels } = useMessages();+ const handleSave = () => {};+return (<Column gap="6" margin="2">- <PageHeader title={formatMessage(labels.teams)} />+ <PageHeader title={formatMessage(labels.teams)}>+ <TeamsAddButton onSave={handleSave} isAdmin={true} />+ </PageHeader><Panel><AdminTeamsDataTable /></Panel>diff --git a/src/app/(main)/teams/TeamAddForm.tsx b/src/app/(main)/teams/TeamAddForm.tsxindex c95259f47..3b827776b 100644--- a/src/app/(main)/teams/TeamAddForm.tsx+++ b/src/app/(main)/teams/TeamAddForm.tsx@@ -7,8 +7,17 @@ import {TextField,} from '@umami/react-zen';import { useMessages, useUpdateQuery } from '@/components/hooks';+import { UserSelect } from '@/components/input/UserSelect';-export function TeamAddForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {+export function TeamAddForm({+ onSave,+ onClose,+ isAdmin,+}: {+ onSave: () => void;+ onClose: () => void;+ isAdmin: boolean;+}) {const { formatMessage, labels, getErrorMessage } = useMessages();const { mutateAsync, error, isPending } = useUpdateQuery('/teams');@@ -26,6 +35,11 @@ export function TeamAddForm({ onSave, onClose }: { onSave: () => void; onClose:<FormField name="name" label={formatMessage(labels.name)}><TextField autoComplete="off" /></FormField>+ {isAdmin && (+ <FormField name="ownerId" label={formatMessage(labels.teamOwner)}>+ <UserSelect buttonProps={{ style: { outline: 'none' } }} />+ </FormField>+ )}<FormButtons><Button isDisabled={isPending} onPress={onClose}>{formatMessage(labels.cancel)}diff --git a/src/app/(main)/teams/TeamMemberAddForm.tsx b/src/app/(main)/teams/TeamMemberAddForm.tsxnew file mode 100644index 000000000..9ea2ae0dd--- /dev/null+++ b/src/app/(main)/teams/TeamMemberAddForm.tsx@@ -0,0 +1,76 @@+import {+ Button,+ Form,+ FormButtons,+ FormField,+ FormSubmitButton,+ ListItem,+ Select,+} from '@umami/react-zen';+import { useMessages, useUpdateQuery } from '@/components/hooks';+import { UserSelect } from '@/components/input/UserSelect';+import { ROLES } from '@/lib/constants';++const roles = [ROLES.teamManager, ROLES.teamMember, ROLES.teamViewOnly];++export function TeamMemberAddForm({+ teamId,+ onSave,+ onClose,+}: {+ teamId: string;+ onSave?: () => void;+ onClose?: () => void;+}) {+ const { formatMessage, labels, getErrorMessage } = useMessages();+ const { mutateAsync, error, isPending } = useUpdateQuery(`/teams/${teamId}/users`);++ const handleSubmit = async (data: any) => {+ await mutateAsync(data, {+ onSuccess: async () => {+ onSave?.();+ onClose?.();+ },+ });+ };++ const renderRole = role => {+ switch (role) {+ case ROLES.teamManager:+ return formatMessage(labels.manager);+ case ROLES.teamMember:+ return formatMessage(labels.member);+ case ROLES.teamViewOnly:+ return formatMessage(labels.viewOnly);+ }+ };++ return (+ <Form onSubmit={handleSubmit} error={getErrorMessage(error)}>+ <FormField+ name="userId"+ label={formatMessage(labels.username)}+ rules={{ required: 'Required' }}+ >+ <UserSelect teamId={teamId} />+ </FormField>+ <FormField name="role" label={formatMessage(labels.role)} rules={{ required: 'Required' }}>+ <Select items={roles} renderValue={value => renderRole(value as any)}>+ {roles.map(value => (+ <ListItem key={value} id={value}>+ {renderRole(value)}+ </ListItem>+ ))}+ </Select>+ </FormField>+ <FormButtons>+ <Button isDisabled={isPending} onPress={onClose}>+ {formatMessage(labels.cancel)}+ </Button>+ <FormSubmitButton variant="primary" isDisabled={isPending}>+ {formatMessage(labels.save)}+ </FormSubmitButton>+ </FormButtons>+ </Form>+ );+}diff --git a/src/app/(main)/teams/TeamsAddButton.tsx b/src/app/(main)/teams/TeamsAddButton.tsxindex 578a273a1..138730887 100644--- a/src/app/(main)/teams/TeamsAddButton.tsx+++ b/src/app/(main)/teams/TeamsAddButton.tsx@@ -4,7 +4,13 @@ import { Plus } from '@/components/icons';import { messages } from '@/components/messages';import { TeamAddForm } from './TeamAddForm';-export function TeamsAddButton({ onSave }: { onSave?: () => void }) {+export function TeamsAddButton({+ onSave,+ isAdmin = false,+}: {+ onSave?: () => void;+ isAdmin?: boolean;+}) {const { formatMessage, labels } = useMessages();const { toast } = useToast();const { touch } = useModified();@@ -25,7 +31,7 @@ export function TeamsAddButton({ onSave }: { onSave?: () => void }) {</Button><Modal><Dialog title={formatMessage(labels.createTeam)} style={{ width: 400 }}>- {({ close }) => <TeamAddForm onSave={handleSave} onClose={close} />}+ {({ close }) => <TeamAddForm onSave={handleSave} onClose={close} isAdmin={isAdmin} />}</Dialog></Modal></DialogTrigger>diff --git a/src/app/(main)/teams/TeamsMemberAddButton.tsx b/src/app/(main)/teams/TeamsMemberAddButton.tsxnew file mode 100644index 000000000..f1bbf2586--- /dev/null+++ b/src/app/(main)/teams/TeamsMemberAddButton.tsx@@ -0,0 +1,40 @@+import { Button, Dialog, DialogTrigger, Icon, Modal, Text, useToast } from '@umami/react-zen';+import { useMessages, useModified } from '@/components/hooks';+import { Plus } from '@/components/icons';+import { messages } from '@/components/messages';+import { TeamMemberAddForm } from './TeamMemberAddForm';++export function TeamsMemberAddButton({+ teamId,+ onSave,+}: {+ teamId: string;+ onSave?: () => void;+ isAdmin?: boolean;+}) {+ const { formatMessage, labels } = useMessages();+ const { toast } = useToast();+ const { touch } = useModified();++ const handleSave = async () => {+ toast(formatMessage(messages.saved));+ touch('teams:members');+ onSave?.();+ };++ return (+ <DialogTrigger>+ <Button>+ <Icon>+ <Plus />+ </Icon>+ <Text>{formatMessage(labels.addMember)}</Text>+ </Button>+ <Modal>+ <Dialog title={formatMessage(labels.addMember)} style={{ width: 400 }}>+ {({ close }) => <TeamMemberAddForm teamId={teamId} onSave={handleSave} onClose={close} />}+ </Dialog>+ </Modal>+ </DialogTrigger>+ );+}diff --git a/src/app/(main)/teams/[teamId]/TeamSettings.tsx b/src/app/(main)/teams/[teamId]/TeamSettings.tsxindex 3ddbe000b..4bbb8905a 100644--- a/src/app/(main)/teams/[teamId]/TeamSettings.tsx+++ b/src/app/(main)/teams/[teamId]/TeamSettings.tsx@@ -1,10 +1,12 @@-import { Column } from '@umami/react-zen';+import { Column, Heading, Row } from '@umami/react-zen';import { TeamLeaveButton } from '@/app/(main)/teams/TeamLeaveButton';import { PageHeader } from '@/components/common/PageHeader';import { Panel } from '@/components/common/Panel';-import { useLoginQuery, useNavigation, useTeam } from '@/components/hooks';+import { useLoginQuery, useMessages, useNavigation, useTeam } from '@/components/hooks';import { Users } from '@/components/icons';+import { labels } from '@/components/messages';import { ROLES } from '@/lib/constants';+import { TeamsMemberAddButton } from '../TeamsMemberAddButton';import { TeamEditForm } from './TeamEditForm';import { TeamManage } from './TeamManage';import { TeamMembersDataTable } from './TeamMembersDataTable';@@ -13,6 +15,7 @@ export function TeamSettings({ teamId }: { teamId: string }) {const team: any = useTeam();const { user } = useLoginQuery();const { pathname } = useNavigation();+ const { formatMessage } = useMessages();const isAdmin = pathname.includes('/admin');@@ -37,6 +40,10 @@ export function TeamSettings({ teamId }: { teamId: string }) {<TeamEditForm teamId={teamId} allowEdit={canEdit} showAccessCode={canEdit} /></Panel><Panel>+ <Row alignItems="center" justifyContent="space-between">+ <Heading size="2">{formatMessage(labels.members)}</Heading>+ {isAdmin && <TeamsMemberAddButton teamId={teamId} />}+ </Row><TeamMembersDataTable teamId={teamId} allowEdit={canEdit} /></Panel>{isTeamOwner && (diff --git a/src/app/api/teams/route.ts b/src/app/api/teams/route.tsindex 53ef59239..c571f4055 100644--- a/src/app/api/teams/route.ts+++ b/src/app/api/teams/route.ts@@ -28,6 +28,7 @@ export async function GET(request: Request) {export async function POST(request: Request) {const schema = z.object({name: z.string().max(50),+ ownerId: z.uuid().optional(),});const { auth, body, error } = await parseRequest(request, schema);@@ -40,7 +41,7 @@ export async function POST(request: Request) {return unauthorized();}- const { name } = body;+ const { name, ownerId } = body;const team = await createTeam({@@ -48,7 +49,7 @@ export async function POST(request: Request) {name,accessCode: `team_${getRandomChars(16)}`,},- auth.user.id,+ ownerId ?? auth.user.id,);return json(team);diff --git a/src/components/input/UserSelect.tsx b/src/components/input/UserSelect.tsxnew file mode 100644index 000000000..ccb3d4325--- /dev/null+++ b/src/components/input/UserSelect.tsx@@ -0,0 +1,71 @@+import { ListItem, Row, Select, type SelectProps, Text } from '@umami/react-zen';+import { useMemo, useState } from 'react';+import { Empty } from '@/components/common/Empty';+import { useMessages, useTeamMembersQuery, useUsersQuery } from '@/components/hooks';++export function UserSelect({+ teamId,+ onChange,+ ...props+}: {+ teamId?: string;+} & SelectProps) {+ const { formatMessage, messages } = useMessages();+ const { data: users, isLoading: usersLoading } = useUsersQuery();+ const { data: teamMembers, isLoading: teamMembersLoading } = useTeamMembersQuery(teamId);+ const [username, setUsername] = useState<string>();+ const [search, setSearch] = useState('');++ const listItems = useMemo(() => {+ if (!users) {+ return [];+ }+ if (!teamId || !teamMembers) {+ return users.data;+ }+ const teamMemberIds = teamMembers.data.map(({ userId }) => userId);+ return users.data.filter(({ id }) => !teamMemberIds.includes(id));+ }, [users, teamMembers, teamId]);++ const handleSearch = (value: string) => {+ setSearch(value);+ };++ const handleOpenChange = () => {+ setSearch('');+ };++ const handleChange = (id: string) => {+ setUsername(listItems.find(item => item.id === id)?.username);+ onChange(id);+ };++ const renderValue = () => {+ return (+ <Row maxWidth="160px">+ <Text truncate>{username}</Text>+ </Row>+ );+ };++ return (+ <Select+ {...props}+ items={listItems}+ value={username}+ isLoading={usersLoading || (teamId && teamMembersLoading)}+ allowSearch={true}+ searchValue={search}+ onSearch={handleSearch}+ onChange={handleChange}+ onOpenChange={handleOpenChange}+ renderValue={renderValue}+ listProps={{+ renderEmptyState: () => <Empty message={formatMessage(messages.noResultsFound)} />,+ style: { maxHeight: 'calc(42vh - 65px)' },+ }}+ >+ {({ id, username }: any) => <ListItem key={id}>{username}</ListItem>}+ </Select>+ );+}diff --git a/src/index.ts b/src/index.tsindex 907c5623b..df164b9d0 100644--- a/src/index.ts+++ b/src/index.ts@@ -19,11 +19,13 @@ export * from '@/app/(main)/teams/TeamAddForm';export * from '@/app/(main)/teams/TeamJoinForm';export * from '@/app/(main)/teams/TeamLeaveButton';export * from '@/app/(main)/teams/TeamLeaveForm';+export * from '@/app/(main)/teams/TeamMemberAddForm';export * from '@/app/(main)/teams/TeamProvider';export * from '@/app/(main)/teams/TeamsAddButton';export * from '@/app/(main)/teams/TeamsDataTable';export * from '@/app/(main)/teams/TeamsHeader';export * from '@/app/(main)/teams/TeamsJoinButton';+export * from '@/app/(main)/teams/TeamsMemberAddButton';export * from '@/app/(main)/teams/TeamsTable';export * from '@/app/(main)/websites/[websiteId]/settings/WebsiteData';export * from '@/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm';