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

Fixed issue with removing team members.

Browse source
This commit is contained in:
Mike Cao 2023-10-15 02:08:29 -07:00
parent 096484ebe4
commit 1351e6f14a
10 changed files with 51 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/(main)/settings/teams/TeamLeaveForm.js
View file

@ -1,6 +1,7 @@
import { Button, Form, FormButtons, SubmitButton } from 'react-basics';
import useApi from 'components/hooks/useApi';
import useMessages from 'components/hooks/useMessages';
import { setValue } from 'store/cache';
export function TeamLeaveForm({ teamId, userId, teamName, onSave, onClose }) {
const { formatMessage, labels, messages, FormattedMessage } = useMessages();
@ -12,6 +13,7 @@ export function TeamLeaveForm({ teamId, userId, teamName, onSave, onClose }) {
{},
{
onSuccess: async () => {
setValue('team:members', Date.now());
onSave();
onClose();
},

2
src/app/(main)/settings/teams/[id]/TeamMembers.js
View file

@ -20,7 +20,7 @@ export function TeamMembers({ teamId, readOnly }) {
return (
<>
<DataTable queryResult={queryResult}>
{({ data }) => <TeamMembersTable data={data} readOnly={readOnly} />}
{({ data }) => <TeamMembersTable data={data} teamId={teamId} readOnly={readOnly} />}
</DataTable>
</>
);

5
src/app/(main)/settings/teams/[id]/TeamMembersTable.js
View file

@ -1,4 +1,4 @@
import { GridColumn, GridTable } from 'react-basics';
import { GridColumn, GridTable, useBreakpoint } from 'react-basics';
import useMessages from 'components/hooks/useMessages';
import useUser from 'components/hooks/useUser';
import { ROLES } from 'lib/constants';
@ -7,6 +7,7 @@ import TeamMemberRemoveButton from './TeamMemberRemoveButton';
export function TeamMembersTable({ data = [], teamId, readOnly }) {
const { formatMessage, labels } = useMessages();
const { user } = useUser();
const breakpoint = useBreakpoint();
const roles = {
[ROLES.teamOwner]: formatMessage(labels.teamOwner),
@ -14,7 +15,7 @@ export function TeamMembersTable({ data = [], teamId, readOnly }) {
};
return (
<GridTable data={data}>
<GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
<GridColumn name="username" label={formatMessage(labels.username)} />
<GridColumn name="role" label={formatMessage(labels.role)}>
{row => roles[row?.teamUser?.[0]?.role]}

2
src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.js
View file

@ -33,7 +33,7 @@ export function TeamWebsiteAddForm({ teamId, onSave, onClose }) {
return (
<>
{isLoading && !hasData && <Loading />}
{isLoading && !hasData && <Loading icon="dots" position="center" />}
{!isLoading && !hasData && <Empty />}
{hasData && (
<Form onSubmit={handleSubmit} error={error}>