Skip to content

Commit a1f17df

Browse files
committed
Make delete account modal common
1 parent 744a4cd commit a1f17df

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

frontend/components/admin-user-management/admin-user-management.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
} from "@/components/ui/table";
1515
import LoadingScreen from "@/components/common/loading-screen";
1616
import AdminEditUserModal from "@/components/admin-user-management/admin-edit-user-modal";
17-
import DeleteAccountModal from "@/components/user-settings/delete-account-modal";
17+
import DeleteAccountModal from "@/components/common/delete-account-modal";
1818
import { PencilIcon, Trash2Icon } from "lucide-react";
1919
import { User, UserArraySchema } from "@/lib/schemas/user-schema";
2020
import { userServiceUri } from "@/lib/api-uri";
@@ -117,6 +117,7 @@ export default function AdminUserManagement() {
117117
handleDeleteAccount={handleDelete}
118118
isDeleteButtonEnabled={isDeleteButtonEnabled}
119119
setShowDeleteModal={setShowDeleteModal}
120+
isAdmin={true}
120121
/>
121122
<Table>
122123
<TableHeader>

frontend/components/user-settings/delete-account-modal.tsx renamed to frontend/components/common/delete-account-modal.tsx

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ interface DeleteAccountModalProps {
1717
handleDeleteAccount: () => void;
1818
isDeleteButtonEnabled: boolean;
1919
setShowDeleteModal: (show: boolean) => void;
20+
isAdmin: boolean;
2021
}
2122

2223
const DeleteAccountModal: React.FC<DeleteAccountModalProps> = ({
@@ -27,6 +28,7 @@ const DeleteAccountModal: React.FC<DeleteAccountModalProps> = ({
2728
handleDeleteAccount,
2829
isDeleteButtonEnabled,
2930
setShowDeleteModal,
31+
isAdmin,
3032
}) => {
3133
return (
3234
<>
@@ -37,10 +39,18 @@ const DeleteAccountModal: React.FC<DeleteAccountModalProps> = ({
3739
<DialogTitle>Confirm Delete Account</DialogTitle>
3840
</DialogHeader>
3941
<div className="space-y-4">
40-
<p>To confirm, please type your username ({originalUsername}):</p>
42+
{isAdmin ? (
43+
<p>
44+
To delete, please confirm the username ({originalUsername}):
45+
</p>
46+
) : (
47+
<p>
48+
To confirm, please type your username ({originalUsername}):
49+
</p>
50+
)}
4151
<Input
4252
type="text"
43-
placeholder="Enter your username"
53+
placeholder="Confirm username"
4454
value={confirmUsername}
4555
onChange={(e) => setConfirmUsername(e.target.value)}
4656
/>

frontend/components/user-settings/user-settings.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
1919
import { AlertCircle } from "lucide-react";
2020
import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
21-
import DeleteAccountModal from "@/components/user-settings/delete-account-modal";
21+
import DeleteAccountModal from "@/components/common/delete-account-modal";
2222
import ProfileTab from "@/components/user-settings/profile-tab";
2323
import LoadingScreen from "@/components/common/loading-screen";
2424
import { useAuth } from "@/app/auth/auth-context";
@@ -461,6 +461,7 @@ export default function UserSettings({ userId }: { userId: string }) {
461461
handleDeleteAccount={handleDeleteAccount}
462462
isDeleteButtonEnabled={isDeleteButtonEnabled}
463463
setShowDeleteModal={setShowDeleteModal}
464+
isAdmin={false}
464465
/>
465466

466467
<Card className="mt-4">

0 commit comments

Comments
 (0)