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

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

19
components/pages/settings/teams/TeamMembersTable.js
View file

@ -5,7 +5,7 @@ import {
TableRow,
TableCell,
TableColumn,
Button,
LoadingButton,
Icon,
Icons,
Flexbox,
@ -15,12 +15,14 @@ import { ROLES } from 'lib/constants';
import useUser from 'hooks/useUser';
import useApi from 'hooks/useApi';
import useMessages from 'hooks/useMessages';
import { useState } from 'react';
export default function TeamMembersTable({ data = [], onSave, readOnly }) {
const { formatMessage, labels } = useMessages();
const { user } = useUser();
const { del, useMutation } = useApi();
const { mutate } = useMutation(data => del(`/teamUsers/${data.teamUserId}`));
const { mutate, isLoading } = useMutation(data => del(`/teamUsers/${data.teamUserId}`));
const [loadingIds, setLoadingIds] = useState([]);
const columns = [
{ name: 'username', label: formatMessage(labels.username), style: { flex: 2 } },
@ -29,12 +31,18 @@ export default function TeamMembersTable({ data = [], onSave, readOnly }) {
];
const handleRemoveTeamMember = teamUserId => {
setLoadingIds(prev => [...prev, teamUserId]);
mutate(
{ teamUserId },
{
onSuccess: async () => {
onSuccess: () => {
setLoadingIds(loadingIds.filter(a => a !== teamUserId));
onSave();
},
onError: () => {
setLoadingIds(loadingIds.filter(a => a !== teamUserId));
},
},
);
};
@ -59,15 +67,16 @@ export default function TeamMembersTable({ data = [], onSave, readOnly }) {
),
action: !readOnly && (
<Flexbox flex={1} justifyContent="end">
<Button
<LoadingButton
onClick={() => handleRemoveTeamMember(row.id)}
disabled={user.id === row?.user?.id || row.role === ROLES.teamOwner}
loading={isLoading && loadingIds.some(a => a === row.id)}
>
<Icon>
<Icons.Close />
</Icon>
<Text>{formatMessage(labels.remove)}</Text>
</Button>
</LoadingButton>
</Flexbox>
),
};