This reverts commit c97e418515.
This commit is contained in:
parent
d61b157929
commit
6129e8e53b
15 changed files with 51 additions and 85 deletions
|
|
@ -14,8 +14,6 @@ import { useUserPermissions } from "@/hooks/store/user";
|
|||
import { MemberListFiltersDropdown } from "./dropdowns/filters/member-list";
|
||||
import { ProjectMemberListItem } from "./member-list-item";
|
||||
import { SendProjectInvitationModal } from "./send-project-invitation-modal";
|
||||
// plane web components
|
||||
import { ProjectMembersActivityButton } from "@/plane-web/components/projects/members/members-activity-button";
|
||||
|
||||
type TProjectMemberListProps = {
|
||||
projectId: string;
|
||||
|
|
@ -86,7 +84,6 @@ export const ProjectMemberList = observer(function ProjectMemberList(props: TPro
|
|||
className="w-full max-w-[234px] border-none bg-transparent text-13 focus:outline-none placeholder:text-placeholder"
|
||||
placeholder="Search"
|
||||
value={searchQuery}
|
||||
// eslint-disable-next-line jsx-a11y/no-autofocus
|
||||
autoFocus
|
||||
onChange={(e) => setSearchQuery(e.target.value)}
|
||||
/>
|
||||
|
|
@ -96,11 +93,9 @@ export const ProjectMemberList = observer(function ProjectMemberList(props: TPro
|
|||
handleUpdate={handleRoleFilterUpdate}
|
||||
memberType="project"
|
||||
/>
|
||||
{isAdmin && <ProjectMembersActivityButton workspaceSlug={workspaceSlug} projectId={projectId} />}
|
||||
{isAdmin && (
|
||||
<Button
|
||||
variant="primary"
|
||||
size="lg"
|
||||
onClick={() => {
|
||||
setInviteModal(true);
|
||||
}}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import { ConfirmWorkspaceMemberRemove } from "@/components/workspace/confirm-wor
|
|||
// hooks
|
||||
import { useMember } from "@/hooks/store/use-member";
|
||||
import { useUserPermissions } from "@/hooks/store/user";
|
||||
import { useWorkspace } from "@/hooks/store/use-workspace";
|
||||
|
||||
type Props = {
|
||||
invitationId: string;
|
||||
|
|
@ -29,6 +30,7 @@ export const WorkspaceInvitationsListItem = observer(function WorkspaceInvitatio
|
|||
const { t } = useTranslation();
|
||||
// store hooks
|
||||
const { allowPermissions, workspaceInfoBySlug } = useUserPermissions();
|
||||
const { mutateWorkspaceMembersActivity } = useWorkspace();
|
||||
const {
|
||||
workspace: { updateMemberInvitation, deleteMemberInvitation, getWorkspaceInvitationDetails },
|
||||
} = useMember();
|
||||
|
|
@ -57,6 +59,7 @@ export const WorkspaceInvitationsListItem = observer(function WorkspaceInvitatio
|
|||
title: "Success!",
|
||||
message: "Invitation removed successfully.",
|
||||
});
|
||||
void mutateWorkspaceMembersActivity(workspaceSlug);
|
||||
} catch (err: unknown) {
|
||||
const error = err as { error?: string };
|
||||
setToast({
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import { getFileURL } from "@plane/utils";
|
|||
// hooks
|
||||
import { useMember } from "@/hooks/store/use-member";
|
||||
import { useUser, useUserPermissions } from "@/hooks/store/user";
|
||||
import { useWorkspace } from "@/hooks/store/use-workspace";
|
||||
// plane web constants
|
||||
|
||||
export interface RowData {
|
||||
|
|
@ -120,6 +121,7 @@ export const AccountTypeColumn = observer(function AccountTypeColumn(props: Acco
|
|||
const {
|
||||
workspace: { updateMember },
|
||||
} = useMember();
|
||||
const { mutateWorkspaceMembersActivity } = useWorkspace();
|
||||
const { data: currentUser } = useUser();
|
||||
|
||||
// derived values
|
||||
|
|
@ -154,6 +156,7 @@ export const AccountTypeColumn = observer(function AccountTypeColumn(props: Acco
|
|||
await updateMember(workspaceSlug.toString(), rowData.member.id, {
|
||||
role: value as unknown as EUserPermissions,
|
||||
});
|
||||
void mutateWorkspaceMembersActivity(workspaceSlug);
|
||||
} catch (err: unknown) {
|
||||
const error = err as { error?: string | string[] };
|
||||
const errorString = Array.isArray(error?.error) ? error.error[0] : error?.error;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ export const WorkspaceMembersListItem = observer(function WorkspaceMembersListIt
|
|||
workspace: { removeMemberFromWorkspace },
|
||||
} = useMember();
|
||||
const { leaveWorkspace } = useUserPermissions();
|
||||
const { getWorkspaceRedirectionUrl } = useWorkspace();
|
||||
const { getWorkspaceRedirectionUrl, mutateWorkspaceMembersActivity } = useWorkspace();
|
||||
const { fetchCurrentUserSettings } = useUserSettings();
|
||||
const { t } = useTranslation();
|
||||
// derived values
|
||||
|
|
@ -59,6 +59,7 @@ export const WorkspaceMembersListItem = observer(function WorkspaceMembersListIt
|
|||
|
||||
try {
|
||||
await removeMemberFromWorkspace(workspaceSlug.toString(), memberId);
|
||||
void mutateWorkspaceMembersActivity(workspaceSlug);
|
||||
} catch (err: unknown) {
|
||||
const error = err as { error?: string };
|
||||
setToast({
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue