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

Fix joining team dupe. Add loading to team member remove. Fix messages.

Browse source
This commit is contained in:
Brian Cao 2023-03-29 16:02:14 -07:00
parent a22d50a597
commit 6d5aeb3bd1
7 changed files with 90 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
components/pages/settings/teams/TeamsTable.js
View file

@ -15,6 +15,7 @@ import {
Text,
} from 'react-basics';
import TeamDeleteForm from './TeamDeleteForm';
import TeamLeaveForm from './TeamLeaveForm';
import useMessages from 'hooks/useMessages';
import useUser from 'hooks/useUser';
import { ROLES } from 'lib/constants';
@ -42,9 +43,10 @@ export default function TeamsTable({ data = [], onDelete }) {
</TableHeader>
<TableBody>
{(row, keys, rowIndex) => {
const { id } = row;
const { id, teamUser } = row;
const owner = row.teamUser.find(({ role }) => role === ROLES.teamOwner);
const showDelete = user.id === owner?.userId;
const teamUserId = teamUser.find(a => a.userId === user.id).id;
const rowData = {
...row,
@ -54,9 +56,9 @@ export default function TeamsTable({ data = [], onDelete }) {
<Link href={`/settings/teams/${id}`}>
<Button>
<Icon>
<Icons.Edit />
<Icons.Show />
</Icon>
<Text>{formatMessage(labels.edit)}</Text>
<Text>{formatMessage(labels.view)}</Text>
</Button>
</Link>
{showDelete && (
@ -79,6 +81,26 @@ export default function TeamsTable({ data = [], onDelete }) {
</Modal>
</ModalTrigger>
)}
{!showDelete && (
<ModalTrigger>
<Button>
<Icon>
<Icons.ArrowRight />
</Icon>
<Text>{formatMessage(labels.leave)}</Text>
</Button>
<Modal title={formatMessage(labels.leaveTeam)}>
{close => (
<TeamLeaveForm
teamUserId={teamUserId}
teamName={row.name}
onSave={onDelete}
onClose={close}
/>
)}
</Modal>
</ModalTrigger>
)}
</Flexbox>
),
};