From 2149c0a9d1676f3cd91d93845823590b825577a6 Mon Sep 17 00:00:00 2001
From: Sheen Capadngan <sheensantoscapadngan@gmail.com>
Date: Fri, 14 Mar 2025 03:50:17 +0800
Subject: [PATCH] misc: added neat check all condition

---
 .../UpgradePrivilegeSystemModal.tsx                 | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/organization/AccessManagementPage/components/UpgradePrivilegeSystemModal/UpgradePrivilegeSystemModal.tsx b/frontend/src/pages/organization/AccessManagementPage/components/UpgradePrivilegeSystemModal/UpgradePrivilegeSystemModal.tsx
index aa505965b..05deb45d0 100644
--- a/frontend/src/pages/organization/AccessManagementPage/components/UpgradePrivilegeSystemModal/UpgradePrivilegeSystemModal.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/UpgradePrivilegeSystemModal/UpgradePrivilegeSystemModal.tsx
@@ -32,10 +32,21 @@ export const UpgradePrivilegeSystemModal = ({ isOpen, onOpenChange }: Props) =>
   const {
     handleSubmit,
     control,
+    watch,
     formState: { isSubmitting }
   } = useForm({ resolver: zodResolver(formSchema) });
   const { mutateAsync: upgradePrivilegeSystem } = useUpgradePrivilegeSystem();
 
+  const isProjectPrivilegesUpdated = watch("isProjectPrivilegesUpdated");
+  const isOrgPrivilegesUpdated = watch("isOrgPrivilegesUpdated");
+  const isInfrastructureUpdated = watch("isInfrastructureUpdated");
+  const acknowledgesPermanentChange = watch("acknowledgesPermanentChange");
+  const isAllChecksCompleted =
+    isProjectPrivilegesUpdated &&
+    isOrgPrivilegesUpdated &&
+    isInfrastructureUpdated &&
+    acknowledgesPermanentChange;
+
   const handlePrivilegeSystemUpgrade = async () => {
     try {
       await upgradePrivilegeSystem();
@@ -231,7 +242,7 @@ export const UpgradePrivilegeSystemModal = ({ isOpen, onOpenChange }: Props) =>
             </div>
             <Button
               type="submit"
-              isDisabled={!isAdmin}
+              isDisabled={!isAdmin || !isAllChecksCompleted}
               isLoading={isSubmitting}
               className="mt-5 w-full"
             >