From e91050c803063420a5e8ffcf9c93097291f521f1 Mon Sep 17 00:00:00 2001
From: Steven <stevenlgtm@gmail.com>
Date: Tue, 22 Aug 2023 23:02:14 +0800
Subject: [PATCH] chore: add delete user button

---
 api/v2/user_service.go                        |  2 +-
 .../components/setting/AccessTokenSection.tsx |  6 ++--
 web/src/components/setting/MemberSection.tsx  | 35 +++++++++++++++----
 web/src/helpers/api.ts                        |  4 +--
 web/src/stores/v1/user.ts                     |  7 ++++
 5 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/api/v2/user_service.go b/api/v2/user_service.go
index 527ecf8..c413921 100644
--- a/api/v2/user_service.go
+++ b/api/v2/user_service.go
@@ -89,7 +89,7 @@ func (s *UserService) CreateUser(ctx context.Context, request *apiv2pb.CreateUse
 func (s *UserService) DeleteUser(ctx context.Context, request *apiv2pb.DeleteUserRequest) (*apiv2pb.DeleteUserResponse, error) {
 	userID := ctx.Value(UserIDContextKey).(int32)
 	if userID == request.Id {
-		return nil, status.Errorf(codes.InvalidArgument, "cannot delete self")
+		return nil, status.Errorf(codes.InvalidArgument, "cannot delete yourself")
 	}
 
 	err := s.Store.DeleteUser(ctx, &store.DeleteUser{
diff --git a/web/src/components/setting/AccessTokenSection.tsx b/web/src/components/setting/AccessTokenSection.tsx
index 61578d4..b18422b 100644
--- a/web/src/components/setting/AccessTokenSection.tsx
+++ b/web/src/components/setting/AccessTokenSection.tsx
@@ -1,4 +1,4 @@
-import { Button } from "@mui/joy";
+import { Button, IconButton } from "@mui/joy";
 import axios from "axios";
 import copy from "copy-to-clipboard";
 import { useEffect, useState } from "react";
@@ -110,7 +110,7 @@ const AccessTokenSection = () => {
                           {String(userAccessToken.expiresAt ?? "Never")}
                         </td>
                         <td className="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm">
-                          <Button
+                          <IconButton
                             color="danger"
                             variant="plain"
                             size="sm"
@@ -119,7 +119,7 @@ const AccessTokenSection = () => {
                             }}
                           >
                             <Icon.Trash className="w-4 h-auto" />
-                          </Button>
+                          </IconButton>
                         </td>
                       </tr>
                     ))}
diff --git a/web/src/components/setting/MemberSection.tsx b/web/src/components/setting/MemberSection.tsx
index 527f570..1032cda 100644
--- a/web/src/components/setting/MemberSection.tsx
+++ b/web/src/components/setting/MemberSection.tsx
@@ -1,7 +1,10 @@
-import { Button } from "@mui/joy";
+import { Button, IconButton } from "@mui/joy";
 import { useEffect, useState } from "react";
+import toast from "react-hot-toast";
 import useUserStore from "../../stores/v1/user";
+import { showCommonDialog } from "../Alert";
 import CreateUserDialog from "../CreateUserDialog";
+import Icon from "../Icon";
 
 const MemberSection = () => {
   const userStore = useUserStore();
@@ -18,6 +21,22 @@ const MemberSection = () => {
     setCurrentEditingUser(undefined);
   };
 
+  const handleDeleteUser = async (user: User) => {
+    showCommonDialog({
+      title: "Delete User",
+      content: `Are you sure to delete user \`${user.nickname}\`? You cannot undo this action.`,
+      style: "danger",
+      onConfirm: async () => {
+        try {
+          await userStore.deleteUser(user.id);
+          toast.success(`User \`${user.nickname}\` deleted successfully`);
+        } catch (error: any) {
+          toast.error(`Failed to delete user \`${user.nickname}\`: ${error.response.data.message}`);
+        }
+      },
+    });
+  };
+
   return (
     <>
       <div className="w-full flex flex-col justify-start items-start space-y-4">
@@ -68,16 +87,20 @@ const MemberSection = () => {
                         <td className="whitespace-nowrap py-4 pl-4 pr-3 text-sm text-gray-900">{user.nickname}</td>
                         <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">{user.email}</td>
                         <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">{user.role}</td>
-                        <td className="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium">
-                          <button
-                            className="text-indigo-600 hover:text-indigo-900"
+                        <td className="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm">
+                          <IconButton
+                            size="sm"
+                            variant="plain"
                             onClick={() => {
                               setCurrentEditingUser(user);
                               setShowCreateUserDialog(true);
                             }}
                           >
-                            Edit
-                          </button>
+                            <Icon.PenBox className="w-4 h-auto" />
+                          </IconButton>
+                          <IconButton size="sm" color="danger" variant="plain" onClick={() => handleDeleteUser(user)}>
+                            <Icon.Trash className="w-4 h-auto" />
+                          </IconButton>
                         </td>
                       </tr>
                     ))}
diff --git a/web/src/helpers/api.ts b/web/src/helpers/api.ts
index db5fae9..a25b4d7 100644
--- a/web/src/helpers/api.ts
+++ b/web/src/helpers/api.ts
@@ -43,8 +43,8 @@ export function patchUser(userPatch: UserPatch) {
   return axios.patch<User>(`/api/v1/user/${userPatch.id}`, userPatch);
 }
 
-export function deleteUser(userDelete: UserDelete) {
-  return axios.delete(`/api/v1/user/${userDelete.id}`);
+export function deleteUser(userId: UserId) {
+  return axios.delete(`/api/v2/users/${userId}`);
 }
 
 export function getShortcutList(shortcutFind?: ShortcutFind) {
diff --git a/web/src/stores/v1/user.ts b/web/src/stores/v1/user.ts
index 7f17abd..2fbc2b6 100644
--- a/web/src/stores/v1/user.ts
+++ b/web/src/stores/v1/user.ts
@@ -19,6 +19,7 @@ interface UserState {
   getCurrentUser: () => User;
   createUser: (userCreate: UserCreate) => Promise<User>;
   patchUser: (userPatch: UserPatch) => Promise<void>;
+  deleteUser: (id: UserId) => Promise<void>;
 }
 
 const useUserStore = create<UserState>()((set, get) => ({
@@ -67,6 +68,12 @@ const useUserStore = create<UserState>()((set, get) => ({
     userMap[user.id] = user;
     set(userMap);
   },
+  deleteUser: async (userId: UserId) => {
+    await api.deleteUser(userId);
+    const userMap = get().userMapById;
+    delete userMap[userId];
+    set(userMap);
+  },
   getUserById: (id: UserId) => {
     const userMap = get().userMapById;
     return userMap[id] as User;