Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
teammate leave and remove
Aashish-Upadhyay-101a35d3dff6e6c
diff --git a/components/teams/add-team-member-modal.tsx b/components/teams/add-team-member-modal.tsxindex e8dc6871..3787c9a3 100644--- a/components/teams/add-team-member-modal.tsx+++ b/components/teams/add-team-member-modal.tsx@@ -14,6 +14,7 @@ import { useTeam } from "@/context/team-context";import { useRouter } from "next/router";import { useState } from "react";import { toast } from "sonner";+import { mutate } from "swr";export function AddTeamMembers({open,@@ -28,8 +29,6 @@ export function AddTeamMembers({const [loading, setLoading] = useState<boolean>(false);const teamInfo = useTeam();- console.log(teamInfo?.currentTeam);-const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {event.preventDefault();event.stopPropagation();@@ -58,6 +57,8 @@ export function AddTeamMembers({return;}+ await mutate(`/api/teams/${teamInfo?.currentTeam?.id}`);+toast.success("An invitation email has been sent!");setOpen(false);setLoading(false);diff --git a/components/teams/add-team-modal.tsx b/components/teams/add-team-modal.tsxindex 330e57b6..5bb7fe65 100644--- a/components/teams/add-team-modal.tsx+++ b/components/teams/add-team-modal.tsx@@ -45,9 +45,8 @@ export function AddTeamModal({ children }: { children: React.ReactNode }) {return;}- const team = await response.json();toast.success("Team created successfully!");- router.push(`/teams/${team?.id}`);+ router.push("/documents");setLoading(false);};diff --git a/context/team-context.tsx b/context/team-context.tsxindex 452e3e6f..498a8c4e 100644--- a/context/team-context.tsx+++ b/context/team-context.tsx@@ -1,6 +1,8 @@+import { useGetTeam } from "@/lib/swr/use-team";import { useTeams } from "@/lib/swr/use-teams";-import { Team } from "@/lib/types";-import { createContext, useContext, useMemo, useState } from "react";+import { CustomUser, Team } from "@/lib/types";+import { useSession } from "next-auth/react";+import { createContext, useContext, useEffect, useMemo, useState } from "react";interface TeamContextProps {children: React.ReactNode;diff --git a/lib/swr/use-team.ts b/lib/swr/use-team.tsindex cbd64a7a..46386f11 100644--- a/lib/swr/use-team.ts+++ b/lib/swr/use-team.ts@@ -6,12 +6,15 @@ import { TeamDetail } from "@/lib/types";export function useGetTeam() {const teamInfo = useTeam();+ if (!teamInfo?.currentTeam?.id) {+ return;+ }+const { data: team, error } = useSWR<TeamDetail>(`/api/teams/${teamInfo?.currentTeam?.id}`,fetcher,{- revalidateOnFocus: false,- dedupingInterval: 20000,+ dedupingInterval: 10000,});diff --git a/lib/swr/use-teams.ts b/lib/swr/use-teams.tsindex b51b7049..f77576c8 100644--- a/lib/swr/use-teams.ts+++ b/lib/swr/use-teams.ts@@ -10,8 +10,7 @@ export function useTeams() {router.isReady && "/api/teams",fetcher,{- revalidateOnFocus: false,- dedupingInterval: 30000,+ dedupingInterval: 20000,});diff --git a/lib/types.ts b/lib/types.tsindex cd262cf9..ac6c21a2 100644--- a/lib/types.ts+++ b/lib/types.ts@@ -151,7 +151,7 @@ export type AnalyticsEvents =export interface Team {id: string;- name: string;+ name?: string;}export interface TeamDetail {diff --git a/pages/api/teams/[teamId]/remove-teammate.ts b/pages/api/teams/[teamId]/remove-teammate.tsindex 2ed14737..7bc848b3 100644--- a/pages/api/teams/[teamId]/remove-teammate.ts+++ b/pages/api/teams/[teamId]/remove-teammate.ts@@ -28,7 +28,11 @@ export default async function handle(},});- if (userTeam?.role === "ADMIN") {+ if (!userTeam) {+ return res.status(401).json("The teammate isn't the part of this team");+ }++ if (userTeam?.role === "ADMIN" && userTeam.userId === userToBeDeleted) {return res.status(401).json("You can't remove the Admin");}@@ -40,7 +44,7 @@ export default async function handle(},},});- return res.status(204);+ return res.status(204).json("Member removed successfully!");} catch (error) {errorHanlder(error, res);}diff --git a/pages/settings/people.tsx b/pages/settings/people.tsxindex 9c9f7080..36bd57c5 100644--- a/pages/settings/people.tsx+++ b/pages/settings/people.tsx@@ -16,13 +16,23 @@ import {} from "@/components/ui/dropdown-menu";import { useSession } from "next-auth/react";import { CustomUser } from "@/lib/types";+import { toast } from "sonner";+import { mutate } from "swr";+import { useRouter } from "next/router";+import { useTeam } from "@/context/team-context";+import { useTeams } from "@/lib/swr/use-teams";export default function Billing() {const [isTeamMemberInviteModalOpen, setTeamMemberInviteModalOpen] =useState<boolean>(false);+ const [leavingUserId, setLeavingUserId] = useState<string>("");const { data: session } = useSession();- const { team, loading } = useGetTeam();+ const { team, loading } = useGetTeam()!;+ const teaminfo = useTeam();+ const { teams } = useTeams();++ const router = useRouter();const getUserDocumentCount = (userId: string) => {const documents = team?.documents.filter(@@ -46,6 +56,37 @@ export default function Billing() {);};+ const removeTeammate = async (teamId: string, userId: string) => {+ setLeavingUserId(userId);+ const response = await fetch(`/api/teams/${teamId}/remove-teammate`, {+ method: "DELETE",+ headers: {+ "Content-Type": "application/json",+ },+ body: JSON.stringify({+ userToBeDeleted: userId,+ }),+ });++ if (response.status !== 204) {+ const error = await response.json();+ toast.error(error);+ setLeavingUserId("");+ return;+ }++ await mutate(`/api/teams/${teamId}`);+ setLeavingUserId("");+ if (isCurrentUser(userId)) {+ toast.success(`Successfully leaved team ${teaminfo?.currentTeam?.name}`);+ teaminfo?.setCurrentTeam({ id: teams![0].id });+ router.push("/documents");+ return;+ }++ toast.success("Teammate removed successfully!");+ };+return (<AppLayout><Navbar current="People" />@@ -117,33 +158,45 @@ export default function Billing() {<span className="text-sm text-foreground capitalize">{member.role.toLowerCase()}</span>- <DropdownMenu>- <DropdownMenuTrigger asChild>- <Button variant="ghost" className="h-8 w-8 p-0">- <span className="sr-only">Open menu</span>- <MoreVertical className="h-4 w-4" />- </Button>- </DropdownMenuTrigger>- <DropdownMenuContent align="end">- <DropdownMenuLabel>Actions</DropdownMenuLabel>- {isCurrentUser(member.userId) && (- <DropdownMenuItem className="text-red-500 focus:bg-destructive focus:text-destructive-foreground">- Leave team- </DropdownMenuItem>- )}- {isCurrentUserAdmin() && !isCurrentUser(member.userId) ? (- <DropdownMenuItem className="text-red-500 focus:bg-destructive focus:text-destructive-foreground">- Remove teammate- </DropdownMenuItem>- ) : (- <DropdownMenuItem- disabled- className="text-red-500 focus:bg-destructive focus:text-destructive-foreground">- Remove teammate- </DropdownMenuItem>- )}- </DropdownMenuContent>- </DropdownMenu>+ {leavingUserId === member.userId ? (+ <span className="text-xs">leaving...</span>+ ) : (+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button variant="ghost" className="h-8 w-8 p-0">+ <span className="sr-only">Open menu</span>+ <MoreVertical className="h-4 w-4" />+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end">+ <DropdownMenuLabel>Actions</DropdownMenuLabel>+ {isCurrentUser(member.userId) && (+ <DropdownMenuItem+ onClick={() =>+ removeTeammate(member.teamId, member.userId)+ }+ className="text-red-500 focus:bg-destructive focus:text-destructive-foreground hover:cursor-pointer">+ Leave team+ </DropdownMenuItem>+ )}+ {isCurrentUserAdmin() && !isCurrentUser(member.userId) ? (+ <DropdownMenuItem+ onClick={() =>+ removeTeammate(member.teamId, member.userId)+ }+ className="text-red-500 focus:bg-destructive focus:text-destructive-foreground hover:cursor-pointer">+ Remove teammate+ </DropdownMenuItem>+ ) : (+ <DropdownMenuItem+ disabled+ className="text-red-500 focus:bg-destructive focus:text-destructive-foreground">+ Remove teammate+ </DropdownMenuItem>+ )}+ </DropdownMenuContent>+ </DropdownMenu>+ )}</div></li>))}