From 7c953978edbb58782e594c25a72110aff8d71a88 Mon Sep 17 00:00:00 2001 From: gorkem-bwl Date: Fri, 6 Mar 2026 14:31:59 -0500 Subject: [PATCH] refactor: simplify EditUser imports and canDeleteUser logic - Merge duplicate react-router-dom imports into one - Replace useIsAdmin + useIsSuperAdmin + useSelector with single useSelector - Remove redundant !includes("superadmin") check from canDeleteUser --- client/src/Pages/Account/EditUser/index.tsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/client/src/Pages/Account/EditUser/index.tsx b/client/src/Pages/Account/EditUser/index.tsx index 482a2f7bb..d31722dcf 100644 --- a/client/src/Pages/Account/EditUser/index.tsx +++ b/client/src/Pages/Account/EditUser/index.tsx @@ -11,15 +11,13 @@ import { ConfigBox, BasePage } from "@/Components/design-elements"; import { UserRoles } from "@/Types/User"; import { useTranslation } from "react-i18next"; import type { UserRole, User } from "@/Types/User"; -import { useParams } from "react-router-dom"; +import { useParams, useNavigate } from "react-router-dom"; import { useTheme } from "@mui/material"; import { useEditUserForm } from "@/Hooks/useEditUserForm"; import { useGet, usePatch, useDelete } from "@/Hooks/UseApi"; import type { EditUserFormData } from "@/Validation/editUser"; import { useEffect, useState } from "react"; -import { useNavigate } from "react-router-dom"; import { DialogInput } from "@/Components/inputs/Dialog"; -import { useIsAdmin, useIsSuperAdmin } from "@/Hooks/useIsAdmin"; import { useSelector } from "react-redux"; import type { RootState } from "@/Types/state"; @@ -37,9 +35,9 @@ const EditUserPage = () => { const { deleteFn, loading: isDeleting } = useDelete(); const navigate = useNavigate(); const [showDeleteDialog, setShowDeleteDialog] = useState(false); - const isAdmin = useIsAdmin(); - const isSuperAdmin = useIsSuperAdmin(); const currentUser = useSelector((state: RootState) => state.auth.user); + const isSuperAdmin = currentUser?.role?.includes("superadmin") ?? false; + const isAdmin = isSuperAdmin || (currentUser?.role?.includes("admin") ?? false); const { data: user, isLoading } = useGet(`/auth/users/${userId}`); @@ -74,7 +72,6 @@ const EditUserPage = () => { const canDeleteUser = isAdmin && userId !== currentUser?.id && - !user?.role?.includes("superadmin") && !user?.role?.includes("demo") && (isSuperAdmin || user?.role?.every((r) => r !== "admin" && r !== "superadmin"));