Merge branch 'main' into feature/slack-secret-sync-error-notification

frontend/src/pages/admin/AccessManagementPage/components/AddServerAdminModal.tsx

@@ -65,20 +65,13 @@ const Content = ({ onClose }: ContentProps) => {
   const users = usersData.filter((user) => !user.superAdmin);
 
   const onSubmit = async ({ user }: FormData) => {
-    try {
-      await grantAdmin.mutateAsync(user.id);
+    await grantAdmin.mutateAsync(user.id);
 
-      createNotification({
-        type: "success",
-        text: "Successfully granted server admin status"
-      });
-      onClose();
-    } catch {
-      createNotification({
-        text: "Failed to grant server admin status",
-        type: "error"
-      });
-    }
+    createNotification({
+      type: "success",
+      text: "Successfully granted server admin status"
+    });
+    onClose();
   };
 
   return (

frontend/src/pages/admin/AccessManagementPage/components/ServerAdminsTable.tsx

@@ -303,18 +303,11 @@ export const ServerAdminsTable = () => {
   const handleRemoveUser = async () => {
     const { id } = popUp?.removeUser?.data as { id: string; username: string };
 
-    try {
-      await deleteUser(id);
-      createNotification({
-        type: "success",
-        text: "Successfully deleted user"
-      });
-    } catch {
-      createNotification({
-        type: "error",
-        text: "Error deleting user"
-      });
-    }
+    await deleteUser(id);
+    createNotification({
+      type: "success",
+      text: "Successfully deleted user"
+    });
 
     handlePopUpClose("removeUser");
   };
@@ -322,39 +315,25 @@ export const ServerAdminsTable = () => {
   const handleRemoveServerAdminAccess = async () => {
     const { id } = popUp?.removeServerAdmin?.data as { id: string; username: string };
 
-    try {
-      await removeAdminAccess(id);
-      createNotification({
-        type: "success",
-        text: "Successfully removed server admin access from user"
-      });
-    } catch {
-      createNotification({
-        type: "error",
-        text: "Error removing server admin access from user"
-      });
-    }
+    await removeAdminAccess(id);
+    createNotification({
+      type: "success",
+      text: "Successfully removed server admin access from user"
+    });
 
     handlePopUpClose("removeServerAdmin");
   };
 
   const handleRemoveUsers = async () => {
-    try {
-      await deleteUsers(selectedUsers.map((user) => user.id));
+    await deleteUsers(selectedUsers.map((user) => user.id));
 
-      createNotification({
-        text: "Successfully removed users",
-        type: "success"
-      });
+    createNotification({
+      text: "Successfully removed users",
+      type: "success"
+    });
 
-      setSelectedUsers([]);
-      handlePopUpClose("removeUsers");
-    } catch {
-      createNotification({
-        text: "Failed to remove users",
-        type: "error"
-      });
-    }
+    setSelectedUsers([]);
+    handlePopUpClose("removeUsers");
   };
 
   return (

frontend/src/pages/admin/AuthenticationPage/components/AuthenticationPageForm.tsx

@@ -54,59 +54,51 @@ export const AuthenticationPageForm = () => {
   });
 
   const onAuthFormSubmit = async (formData: TAuthForm) => {
-    try {
-      const enabledMethods: LoginMethod[] = [];
-      if (formData.isEmailEnabled) {
-        enabledMethods.push(LoginMethod.EMAIL);
-      }
+    const enabledMethods: LoginMethod[] = [];
+    if (formData.isEmailEnabled) {
+      enabledMethods.push(LoginMethod.EMAIL);
+    }
 
-      if (formData.isGoogleEnabled) {
-        enabledMethods.push(LoginMethod.GOOGLE);
-      }
+    if (formData.isGoogleEnabled) {
+      enabledMethods.push(LoginMethod.GOOGLE);
+    }
 
-      if (formData.isGithubEnabled) {
-        enabledMethods.push(LoginMethod.GITHUB);
-      }
+    if (formData.isGithubEnabled) {
+      enabledMethods.push(LoginMethod.GITHUB);
+    }
 
-      if (formData.isGitlabEnabled) {
-        enabledMethods.push(LoginMethod.GITLAB);
-      }
+    if (formData.isGitlabEnabled) {
+      enabledMethods.push(LoginMethod.GITLAB);
+    }
 
-      if (formData.isSamlEnabled) {
-        enabledMethods.push(LoginMethod.SAML);
-      }
+    if (formData.isSamlEnabled) {
+      enabledMethods.push(LoginMethod.SAML);
+    }
 
-      if (formData.isLdapEnabled) {
-        enabledMethods.push(LoginMethod.LDAP);
-      }
+    if (formData.isLdapEnabled) {
+      enabledMethods.push(LoginMethod.LDAP);
+    }
 
-      if (formData.isOidcEnabled) {
-        enabledMethods.push(LoginMethod.OIDC);
-      }
+    if (formData.isOidcEnabled) {
+      enabledMethods.push(LoginMethod.OIDC);
+    }
 
-      if (!enabledMethods.length) {
-        createNotification({
-          type: "error",
-          text: "At least one login method should be enabled."
-        });
-        return;
-      }
-
-      await updateServerConfig({
-        enabledLoginMethods: enabledMethods
-      });
-
-      createNotification({
-        text: "Login methods have been successfully updated.",
-        type: "success"
-      });
-    } catch (e) {
-      console.error(e);
+    if (!enabledMethods.length) {
       createNotification({
         type: "error",
-        text: "Failed to update login methods."
+        text: "At least one login method should be enabled."
       });
+      return;
     }
+
+    await updateServerConfig({
+      enabledLoginMethods: enabledMethods
+    });
+
+    createNotification({
+      text: "Login methods have been successfully updated.",
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/admin/CachingPage/components/CachingPageForm.tsx

@@ -31,15 +31,10 @@ export const CachingPageForm = () => {
   const handleInvalidateCacheSubmit = async () => {
     if (!type || isInvalidating) return;
 
-    try {
-      await invalidateCache({ type });
-      createNotification({ text: `Began invalidating ${type} cache`, type: "success" });
-      setShouldPoll(true);
-      handlePopUpClose("invalidateCache");
-    } catch (err) {
-      console.error(err);
-      createNotification({ text: `Failed to invalidate ${type} cache`, type: "error" });
-    }
+    await invalidateCache({ type });
+    createNotification({ text: `Began invalidating ${type} cache`, type: "success" });
+    setShouldPoll(true);
+    handlePopUpClose("invalidateCache");
   };
 
   useEffect(() => {

frontend/src/pages/admin/EncryptionPage/components/EncryptionPageForm.tsx

@@ -60,19 +60,12 @@ export const EncryptionPageForm = () => {
       return;
     }
 
-    try {
-      await updateEncryptionStrategy(formData.encryptionStrategy);
+    await updateEncryptionStrategy(formData.encryptionStrategy);
 
-      createNotification({
-        type: "success",
-        text: "Encryption strategy updated successfully"
-      });
-    } catch {
-      createNotification({
-        type: "error",
-        text: "Failed to update encryption strategy"
-      });
-    }
+    createNotification({
+      type: "success",
+      text: "Encryption strategy updated successfully"
+    });
   }, []);
 
   return (

frontend/src/pages/admin/EnvironmentPage/components/EnvironmentPageForm.tsx

@@ -176,31 +176,19 @@ export const EnvironmentPageForm = () => {
 
   const onSubmit = useCallback(
     async (formData: TForm) => {
-      try {
-        const filteredFormData = Object.fromEntries(
-          Object.entries(formData).filter(([, value]) => value !== "")
-        );
-        await updateServerConfig({
-          envOverrides: filteredFormData
-        });
+      const filteredFormData = Object.fromEntries(
+        Object.entries(formData).filter(([, value]) => value !== "")
+      );
+      await updateServerConfig({
+        envOverrides: filteredFormData
+      });
 
-        createNotification({
-          type: "success",
-          text: "Environment overrides updated successfully. It can take up to 5 minutes to take effect."
-        });
+      createNotification({
+        type: "success",
+        text: "Environment overrides updated successfully. It can take up to 5 minutes to take effect."
+      });
 
-        reset(formData);
-      } catch (error) {
-        const errorMessage =
-          (error as any)?.response?.data?.message ||
-          (error as any)?.message ||
-          "An unknown error occurred";
-        createNotification({
-          type: "error",
-          title: "Failed to update environment overrides",
-          text: errorMessage
-        });
-      }
+      reset(formData);
     },
     [reset, updateServerConfig]
   );

frontend/src/pages/admin/GeneralPage/components/GeneralPageForm.tsx

@@ -68,37 +68,29 @@ export const GeneralPageForm = () => {
   const organizations = useGetOrganizations();
 
   const onFormSubmit = async (formData: TDashboardForm) => {
-    try {
-      const {
-        allowedSignUpDomain,
-        trustSamlEmails,
-        trustLdapEmails,
-        trustOidcEmails,
-        authConsentContent,
-        pageFrameContent
-      } = formData;
+    const {
+      allowedSignUpDomain,
+      trustSamlEmails,
+      trustLdapEmails,
+      trustOidcEmails,
+      authConsentContent,
+      pageFrameContent
+    } = formData;
 
-      await updateServerConfig({
-        defaultAuthOrgId: defaultAuthOrgId || null,
-        allowSignUp: signUpMode !== SignUpModes.Disabled,
-        allowedSignUpDomain: signUpMode === SignUpModes.Anyone ? allowedSignUpDomain : null,
-        trustSamlEmails,
-        trustLdapEmails,
-        trustOidcEmails,
-        authConsentContent,
-        pageFrameContent
-      });
-      createNotification({
-        text: "Successfully changed sign up setting.",
-        type: "success"
-      });
-    } catch (e) {
-      console.error(e);
-      createNotification({
-        type: "error",
-        text: "Failed to update sign up setting."
-      });
-    }
+    await updateServerConfig({
+      defaultAuthOrgId: defaultAuthOrgId || null,
+      allowSignUp: signUpMode !== SignUpModes.Disabled,
+      allowedSignUpDomain: signUpMode === SignUpModes.Anyone ? allowedSignUpDomain : null,
+      trustSamlEmails,
+      trustLdapEmails,
+      trustOidcEmails,
+      authConsentContent,
+      pageFrameContent
+    });
+    createNotification({
+      text: "Successfully changed sign up setting.",
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/admin/GeneralPage/components/UsageReportSection.tsx

@@ -10,23 +10,15 @@ export const UsageReportSection = () => {
   const generateUsageReport = useGenerateUsageReport();
 
   const handleGenerateReport = async () => {
-    try {
-      const response = await generateUsageReport.mutateAsync();
-      const { csvContent, filename } = response;
+    const response = await generateUsageReport.mutateAsync();
+    const { csvContent, filename } = response;
 
-      downloadFile(csvContent, filename, "text/csv");
+    downloadFile(csvContent, filename, "text/csv");
 
-      createNotification({
-        text: `Usage report downloaded: "${filename}"`,
-        type: "success"
-      });
-    } catch (error) {
-      console.error("Failed to generate usage report:", error);
-      createNotification({
-        text: "Failed to generate usage report. Please try again.",
-        type: "error"
-      });
-    }
+    createNotification({
+      text: `Usage report downloaded: "${filename}"`,
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/admin/ResourceOverviewPage/components/AddOrganizationModal.tsx

@@ -81,25 +81,18 @@ const Content = ({ onClose }: ContentProps) => {
   const { users = [] } = data ?? {};
 
   const onSubmit = async ({ name, invitees }: FormData) => {
-    try {
-      await createOrg.mutateAsync({
-        name,
-        inviteAdminEmails: invitees
-          .filter((user) => Boolean(user.email))
-          .map((user) => user.email) as string[]
-      });
+    await createOrg.mutateAsync({
+      name,
+      inviteAdminEmails: invitees
+        .filter((user) => Boolean(user.email))
+        .map((user) => user.email) as string[]
+    });
 
-      createNotification({
-        type: "success",
-        text: "Successfully created organization"
-      });
-      onClose();
-    } catch {
-      createNotification({
-        text: "Failed to create organization",
-        type: "error"
-      });
-    }
+    createNotification({
+      type: "success",
+      text: "Successfully created organization"
+    });
+    onClose();
   };
 
   const { append } = useFieldArray<FormData>({ control, name: "invitees" });

frontend/src/pages/admin/ResourceOverviewPage/components/MachineIdentitiesTable.tsx

@@ -185,18 +185,11 @@ export const MachineIdentitiesTable = () => {
   const handleRemoveServerAdmin = async () => {
     const { id } = popUp?.removeServerAdmin?.data as { id: string; name: string };
 
-    try {
-      await deleteIdentitySuperAdminAccess(id);
-      createNotification({
-        type: "success",
-        text: "Successfully removed server admin permissions"
-      });
-    } catch {
-      createNotification({
-        type: "error",
-        text: "Error removing server admin permissions"
-      });
-    }
+    await deleteIdentitySuperAdminAccess(id);
+    createNotification({
+      type: "success",
+      text: "Successfully removed server admin permissions"
+    });
 
     handlePopUpClose("removeServerAdmin");
   };

frontend/src/pages/admin/ResourceOverviewPage/components/OrganizationsTable.tsx

@@ -179,12 +179,6 @@ const ViewMembersModalContent = ({
         text: "Successfully resent org invitation",
         type: "success"
       });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to resend org invitation",
-        type: "error"
-      });
     } finally {
       setResendInviteId(null);
     }
@@ -479,26 +473,19 @@ const OrganizationsPanelTable = ({
   const { mutateAsync: accessOrganization } = useServerAdminAccessOrg();
 
   const handleAccessOrg = async (orgId: string) => {
-    try {
-      await accessOrganization(orgId);
+    await accessOrganization(orgId);
 
-      navigate({
-        to: "/login/select-organization",
-        search: {
-          org_id: orgId
-        }
-      });
+    navigate({
+      to: "/login/select-organization",
+      search: {
+        org_id: orgId
+      }
+    });
 
-      createNotification({
-        text: "Successfully joined organization",
-        type: "success"
-      });
-    } catch {
-      createNotification({
-        text: "Failed to join organization",
-        type: "error"
-      });
-    }
+    createNotification({
+      text: "Successfully joined organization",
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/admin/ResourceOverviewPage/components/UserIdentitiesTable.tsx

@@ -364,18 +364,11 @@ export const UserIdentitiesTable = () => {
   const handleRemoveUser = async () => {
     const { id } = popUp?.removeUser?.data as { id: string; username: string };
 
-    try {
-      await deleteUser(id);
-      createNotification({
-        type: "success",
-        text: "Successfully deleted user"
-      });
-    } catch {
-      createNotification({
-        type: "error",
-        text: "Error deleting user"
-      });
-    }
+    await deleteUser(id);
+    createNotification({
+      type: "success",
+      text: "Successfully deleted user"
+    });
 
     handlePopUpClose("removeUser");
   };
@@ -383,18 +376,11 @@ export const UserIdentitiesTable = () => {
   const handleGrantServerAdminAccess = async () => {
     const { id } = popUp?.upgradeToServerAdmin?.data as { id: string; username: string };
 
-    try {
-      await grantAdminAccess(id);
-      createNotification({
-        type: "success",
-        text: "Successfully granted server admin access to user"
-      });
-    } catch {
-      createNotification({
-        type: "error",
-        text: "Error granting server admin access to user"
-      });
-    }
+    await grantAdminAccess(id);
+    createNotification({
+      type: "success",
+      text: "Successfully granted server admin access to user"
+    });
 
     handlePopUpClose("upgradeToServerAdmin");
   };
@@ -402,39 +388,25 @@ export const UserIdentitiesTable = () => {
   const handleRemoveServerAdminAccess = async () => {
     const { id } = popUp?.removeServerAdmin?.data as { id: string; username: string };
 
-    try {
-      await removeAdminAccess(id);
-      createNotification({
-        type: "success",
-        text: "Successfully removed server admin access from user"
-      });
-    } catch {
-      createNotification({
-        type: "error",
-        text: "Error removing server admin access from user"
-      });
-    }
+    await removeAdminAccess(id);
+    createNotification({
+      type: "success",
+      text: "Successfully removed server admin access from user"
+    });
 
     handlePopUpClose("removeServerAdmin");
   };
 
   const handleRemoveUsers = async () => {
-    try {
-      await deleteUsers(selectedUsers.map((user) => user.id));
+    await deleteUsers(selectedUsers.map((user) => user.id));
 
-      createNotification({
-        text: "Successfully removed users",
-        type: "success"
-      });
+    createNotification({
+      text: "Successfully removed users",
+      type: "success"
+    });
 
-      setSelectedUsers([]);
-      handlePopUpClose("removeUsers");
-    } catch {
-      createNotification({
-        text: "Failed to remove users",
-        type: "error"
-      });
-    }
+    setSelectedUsers([]);
+    handlePopUpClose("removeUsers");
   };
 
   return (

frontend/src/pages/admin/SignUpPage/SignUpPage.tsx

@@ -6,7 +6,6 @@ import { useNavigate } from "@tanstack/react-router";
 import { AnimatePresence, motion } from "framer-motion";
 import { z } from "zod";
 
-import { createNotification } from "@app/components/notifications";
 // TODO(akhilmhdh): rewrite this into module functions in lib
 import SecurityClient from "@app/components/utilities/SecurityClient";
 import { Button, ContentLoader, FormControl, Input } from "@app/components/v2";
@@ -46,29 +45,21 @@ export const SignUpPage = () => {
   const handleFormSubmit = async ({ email, password, firstName, lastName }: TFormSchema) => {
     // avoid multi submission
     if (isSubmitting) return;
-    try {
-      const res = await createAdminUser({
-        email,
-        password,
-        firstName,
-        lastName
-      });
+    const res = await createAdminUser({
+      email,
+      password,
+      firstName,
+      lastName
+    });
 
-      SecurityClient.setToken(res.token);
-      await selectOrganization({ organizationId: res.organization.id });
+    SecurityClient.setToken(res.token);
+    await selectOrganization({ organizationId: res.organization.id });
 
-      // TODO(akhilmhdh): This is such a confusing pattern and too unreliable
-      // Will be refactored in next iteration to make it url based rather than local storage ones
-      // Part of migration to nextjs 14
-      localStorage.setItem("orgData.id", res.organization.id);
-      navigate({ to: "/admin" });
-    } catch (err) {
-      console.log(err);
-      createNotification({
-        type: "error",
-        text: "Failed to create admin"
-      });
-    }
+    // TODO(akhilmhdh): This is such a confusing pattern and too unreliable
+    // Will be refactored in next iteration to make it url based rather than local storage ones
+    // Part of migration to nextjs 14
+    localStorage.setItem("orgData.id", res.organization.id);
+    navigate({ to: "/admin" });
   };
 
   if (config?.initialized) return <ContentLoader text="Redirecting to admin page..." />;

frontend/src/pages/auth/PasswordSetupPage/PasswordSetupPage.tsx

@@ -75,11 +75,7 @@ export const PasswordSetupPage = () => {
         setTimeout(() => {
           window.location.href = "/login";
         }, 3000);
-      } catch (error) {
-        createNotification({
-          type: "error",
-          text: (error as Error).message ?? "Error setting password"
-        });
+      } catch {
         navigate({ to: "/personal-settings" });
       }
     }

frontend/src/pages/auth/SignUpSsoPage/components/EmailConfirmationStep/EmailConfirmationStep.tsx

@@ -73,67 +73,53 @@ export const EmailConfirmationStep = ({
   const { mutateAsync: verifyEmailVerificationCode } = useVerifyEmailVerificationCode();
 
   const checkCode = async () => {
-    try {
-      await verifyEmailVerificationCode({ username, code });
-      setCodeError(false);
+    await verifyEmailVerificationCode({ username, code });
+    setCodeError(false);
 
-      createNotification({
-        text: "Successfully verified code",
-        type: "success"
-      });
+    createNotification({
+      text: "Successfully verified code",
+      type: "success"
+    });
 
-      switch (authType) {
-        case UserAliasType.SAML: {
-          window.open(`/api/v1/sso/redirect/saml2/organizations/${organizationSlug}`);
-          window.close();
-          break;
-        }
-        case UserAliasType.LDAP: {
-          navigate({ to: "/login/ldap", search: { organizationSlug } });
-          break;
-        }
-        case UserAliasType.OIDC: {
-          window.open(`/api/v1/sso/oidc/login?orgSlug=${organizationSlug}`);
-          window.close();
-          break;
-        }
-        default: {
-          setStep(1);
-          break;
-        }
+    switch (authType) {
+      case UserAliasType.SAML: {
+        window.open(`/api/v1/sso/redirect/saml2/organizations/${organizationSlug}`);
+        window.close();
+        break;
+      }
+      case UserAliasType.LDAP: {
+        navigate({ to: "/login/ldap", search: { organizationSlug } });
+        break;
+      }
+      case UserAliasType.OIDC: {
+        window.open(`/api/v1/sso/oidc/login?orgSlug=${organizationSlug}`);
+        window.close();
+        break;
+      }
+      default: {
+        setStep(1);
+        break;
       }
-    } catch {
-      createNotification({
-        text: "Failed to verify code",
-        type: "error"
-      });
     }
 
     setCode("");
   };
 
   const resendCode = async () => {
-    try {
-      const queryParams = new URLSearchParams(window.location.search);
-      const token = queryParams.get("token");
-      if (!token) {
-        createNotification({
-          text: "Failed to resend code, no token found",
-          type: "error"
-        });
-        return;
-      }
-      await sendEmailVerificationCode(token);
+    const queryParams = new URLSearchParams(window.location.search);
+    const token = queryParams.get("token");
+    if (!token) {
       createNotification({
-        text: "Successfully resent code",
-        type: "success"
-      });
-    } catch {
-      createNotification({
-        text: "Failed to resend code",
+        text: "Failed to resend code, no token found",
         type: "error"
       });
+      return;
     }
+    await sendEmailVerificationCode(token);
+    createNotification({
+      text: "Successfully resent code",
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/cert-manager/AlertingPage/components/PkiAlertModal.tsx

@@ -113,52 +113,44 @@ export const PkiAlertModal = ({ popUp, handlePopUpToggle }: Props) => {
     alertUnit,
     emails
   }: FormData) => {
-    try {
-      if (!projectId) return;
+    if (!projectId) return;
 
-      const emailArray = emails
-        .split(",")
-        .map((email) => email.trim())
-        .filter((email) => email.length > 0);
+    const emailArray = emails
+      .split(",")
+      .map((email) => email.trim())
+      .filter((email) => email.length > 0);
 
-      const alertBeforeDays = convertToDays(alertUnit, Number(alertBefore));
+    const alertBeforeDays = convertToDays(alertUnit, Number(alertBefore));
 
-      if (alert) {
-        // update
-        await updatePkiAlert({
-          alertId: alert.id,
-          pkiCollectionId,
-          name,
-          projectId,
-          alertBeforeDays,
-          emails: emailArray
-        });
-      } else {
-        // create
-        await createPkiAlert({
-          name,
-          projectId,
-          pkiCollectionId,
-          alertBeforeDays,
-          emails: emailArray
-        });
-      }
-
-      handlePopUpToggle("pkiAlert", false);
-
-      reset();
-
-      createNotification({
-        text: `Successfully ${alert ? "updated" : "created"} alert`,
-        type: "success"
+    if (alert) {
+      // update
+      await updatePkiAlert({
+        alertId: alert.id,
+        pkiCollectionId,
+        name,
+        projectId,
+        alertBeforeDays,
+        emails: emailArray
       });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: `Failed to ${alert ? "updated" : "created"} alert`,
-        type: "error"
+    } else {
+      // create
+      await createPkiAlert({
+        name,
+        projectId,
+        pkiCollectionId,
+        alertBeforeDays,
+        emails: emailArray
       });
     }
+
+    handlePopUpToggle("pkiAlert", false);
+
+    reset();
+
+    createNotification({
+      text: `Successfully ${alert ? "updated" : "created"} alert`,
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/cert-manager/AlertingPage/components/PkiAlertsSection.tsx

@@ -22,27 +22,19 @@ export const PkiAlertsSection = () => {
   ] as const);
 
   const onRemoveAlertSubmit = async (alertId: string) => {
-    try {
-      if (!projectId) return;
+    if (!projectId) return;
 
-      await deletePkiAlert({
-        alertId,
-        projectId
-      });
+    await deletePkiAlert({
+      alertId,
+      projectId
+    });
 
-      createNotification({
-        text: "Successfully deleted alert",
-        type: "success"
-      });
+    createNotification({
+      text: "Successfully deleted alert",
+      type: "success"
+    });
 
-      handlePopUpClose("deletePkiAlert");
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to delete alert",
-        type: "error"
-      });
-    }
+    handlePopUpClose("deletePkiAlert");
   };
 
   return (

frontend/src/pages/cert-manager/AlertingPage/components/PkiCollectionModal.tsx

@@ -62,49 +62,41 @@ export const PkiCollectionModal = ({ popUp, handlePopUpToggle }: Props) => {
   }, [pkiCollection]);
 
   const onFormSubmit = async ({ name, description }: FormData) => {
-    try {
-      if (!projectId) return;
+    if (!projectId) return;
 
-      if (pkiCollection) {
-        // update
-        await updatePkiCollection({
-          collectionId: pkiCollection.id,
-          name,
-          description,
-          projectId
-        });
-      } else {
-        // create
-        const { id: collectionId } = await createPkiCollection({
-          name,
-          description,
-          projectId
-        });
-
-        navigate({
-          to: "/projects/cert-management/$projectId/pki-collections/$collectionId",
-          params: {
-            projectId,
-            collectionId
-          }
-        });
-      }
-
-      handlePopUpToggle("pkiCollection", false);
-
-      reset();
-
-      createNotification({
-        text: `Successfully ${pkiCollection ? "updated" : "created"} PKI collection`,
-        type: "success"
+    if (pkiCollection) {
+      // update
+      await updatePkiCollection({
+        collectionId: pkiCollection.id,
+        name,
+        description,
+        projectId
       });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: `Failed to ${pkiCollection ? "updated" : "created"} PKI collection`,
-        type: "error"
+    } else {
+      // create
+      const { id: collectionId } = await createPkiCollection({
+        name,
+        description,
+        projectId
+      });
+
+      navigate({
+        to: "/projects/cert-management/$projectId/pki-collections/$collectionId",
+        params: {
+          projectId,
+          collectionId
+        }
       });
     }
+
+    handlePopUpToggle("pkiCollection", false);
+
+    reset();
+
+    createNotification({
+      text: `Successfully ${pkiCollection ? "updated" : "created"} PKI collection`,
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/cert-manager/AlertingPage/components/PkiCollectionSection.tsx

@@ -22,27 +22,19 @@ export const PkiCollectionSection = () => {
   ] as const);
 
   const onRemovePkiCollectionSubmit = async (collectionId: string) => {
-    try {
-      if (!projectId) return;
+    if (!projectId) return;
 
-      await deletePkiCollection({
-        collectionId,
-        projectId
-      });
+    await deletePkiCollection({
+      collectionId,
+      projectId
+    });
 
-      createNotification({
-        text: "Successfully deleted PKI collection",
-        type: "success"
-      });
+    createNotification({
+      text: "Successfully deleted PKI collection",
+      type: "success"
+    });
 
-      handlePopUpClose("deletePkiCollection");
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to delete PKI collection",
-        type: "error"
-      });
-    }
+    handlePopUpClose("deletePkiCollection");
   };
 
   return (

frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx

@@ -57,33 +57,26 @@ const Page = () => {
   ] as const);
 
   const onRemoveCaSubmit = async () => {
-    try {
-      if (!currentProject?.slug) return;
+    if (!currentProject?.slug) return;
 
-      await deleteCa({
-        caName,
-        projectId: currentProject.id,
-        type: CaType.INTERNAL
-      });
+    await deleteCa({
+      caName,
+      projectId: currentProject.id,
+      type: CaType.INTERNAL
+    });
 
-      createNotification({
-        text: "Successfully deleted CA",
-        type: "success"
-      });
+    createNotification({
+      text: "Successfully deleted CA",
+      type: "success"
+    });
 
-      handlePopUpClose("deleteCa");
-      navigate({
-        to: "/projects/cert-management/$projectId/certificate-authorities",
-        params: {
-          projectId
-        }
-      });
-    } catch {
-      createNotification({
-        text: "Failed to delete CA",
-        type: "error"
-      });
-    }
+    handlePopUpClose("deleteCa");
+    navigate({
+      to: "/projects/cert-management/$projectId/certificate-authorities",
+      params: {
+        projectId
+      }
+    });
   };
 
   return (

frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/components/CaRenewalModal.tsx

@@ -84,27 +84,23 @@ export const CaRenewalModal = ({ popUp, handlePopUpToggle }: Props) => {
   //   }, [ca, parentCa]);
 
   const onFormSubmit = async ({ type, notAfter }: FormData) => {
-    try {
-      if (!projectSlug || !popUpData.caId) return;
+    if (!projectSlug || !popUpData.caId) return;
 
-      await renewCa({
-        projectSlug,
-        caId: popUpData.caId,
-        notAfter,
-        type
-      });
+    await renewCa({
+      projectSlug,
+      caId: popUpData.caId,
+      notAfter,
+      type
+    });
 
-      handlePopUpToggle("renewCa", false);
+    handlePopUpToggle("renewCa", false);
 
-      createNotification({
-        text: "Successfully renewed CA",
-        type: "success"
-      });
+    createNotification({
+      text: "Successfully renewed CA",
+      type: "success"
+    });
 
-      reset();
-    } catch (err) {
-      console.error(err);
-    }
+    reset();
   };
 
   return (

frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/CaInstallCertModal/ExternalCaInstallForm.tsx

@@ -48,29 +48,22 @@ export const ExternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {
   }, []);
 
   const onFormSubmit = async ({ certificate, certificateChain }: FormData) => {
-    try {
-      if (!csr || !caId || !currentProject?.slug) return;
+    if (!csr || !caId || !currentProject?.slug) return;
 
-      await importCaCertificate({
-        caId,
-        projectSlug: currentProject?.slug,
-        certificate,
-        certificateChain
-      });
+    await importCaCertificate({
+      caId,
+      projectSlug: currentProject?.slug,
+      certificate,
+      certificateChain
+    });
 
-      reset();
+    reset();
 
-      createNotification({
-        text: "Successfully installed certificate for CA",
-        type: "success"
-      });
-      handlePopUpToggle("installCaCert", false);
-    } catch {
-      createNotification({
-        text: "Failed to install certificate for CA",
-        type: "error"
-      });
-    }
+    createNotification({
+      text: "Successfully installed certificate for CA",
+      type: "success"
+    });
+    handlePopUpToggle("installCaCert", false);
   };
 
   const downloadTxtFile = (filename: string, content: string) => {

frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/CaInstallCertModal/InternalCaInstallForm.tsx

@@ -101,37 +101,30 @@ export const InternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {
   }, [parentCa]);
 
   const onFormSubmit = async ({ notAfter, maxPathLength }: FormData) => {
-    try {
-      if (!csr || !caId || !currentProject?.slug) return;
+    if (!csr || !caId || !currentProject?.slug) return;
 
-      const { certificate, certificateChain } = await signIntermediate({
-        caId: parentCaId,
-        csr,
-        maxPathLength: Number(maxPathLength),
-        notAfter,
-        notBefore: new Date().toISOString()
-      });
+    const { certificate, certificateChain } = await signIntermediate({
+      caId: parentCaId,
+      csr,
+      maxPathLength: Number(maxPathLength),
+      notAfter,
+      notBefore: new Date().toISOString()
+    });
 
-      await importCaCertificate({
-        caId,
-        projectSlug: currentProject?.slug,
-        certificate,
-        certificateChain
-      });
+    await importCaCertificate({
+      caId,
+      projectSlug: currentProject?.slug,
+      certificate,
+      certificateChain
+    });
 
-      reset();
+    reset();
 
-      createNotification({
-        text: "Successfully installed certificate for CA",
-        type: "success"
-      });
-      handlePopUpToggle("installCaCert", false);
-    } catch {
-      createNotification({
-        text: "Failed to install certificate for CA",
-        type: "error"
-      });
-    }
+    createNotification({
+      text: "Successfully installed certificate for CA",
+      type: "success"
+    });
+    handlePopUpToggle("installCaCert", false);
   };
 
   function generatePathLengthOpts(parentCaMaxPathLength: number): number[] {

frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/CaModal.tsx

@@ -175,48 +175,40 @@ export const CaModal = ({ popUp, handlePopUpToggle }: Props) => {
     status,
     configuration
   }: FormData) => {
-    try {
-      if (!currentProject?.slug) return;
+    if (!currentProject?.slug) return;
 
-      if (ca) {
-        // update
-        await updateMutateAsync({
-          caName: ca.name,
-          projectId: currentProject.id,
-          name,
-          type: CaType.INTERNAL,
-          status,
-          enableDirectIssuance
-        });
-      } else {
-        // create
-        await createMutateAsync({
-          projectId: currentProject.id,
-          name,
-          type,
-          status,
-          enableDirectIssuance,
-          configuration: {
-            ...configuration,
-            maxPathLength: Number(configuration.maxPathLength)
-          }
-        });
-      }
-
-      reset();
-      handlePopUpToggle("ca", false);
-
-      createNotification({
-        text: `Successfully ${ca ? "updated" : "created"} CA`,
-        type: "success"
+    if (ca) {
+      // update
+      await updateMutateAsync({
+        caName: ca.name,
+        projectId: currentProject.id,
+        name,
+        type: CaType.INTERNAL,
+        status,
+        enableDirectIssuance
       });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to create CA",
-        type: "error"
+    } else {
+      // create
+      await createMutateAsync({
+        projectId: currentProject.id,
+        name,
+        type,
+        status,
+        enableDirectIssuance,
+        configuration: {
+          ...configuration,
+          maxPathLength: Number(configuration.maxPathLength)
+        }
       });
     }
+
+    reset();
+    handlePopUpToggle("ca", false);
+
+    createNotification({
+      text: `Successfully ${ca ? "updated" : "created"} CA`,
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/CaSection.tsx

@@ -27,44 +27,29 @@ export const CaSection = () => {
   ] as const);
 
   const onRemoveCaSubmit = async (caName: string) => {
-    try {
-      if (!currentProject?.slug) return;
+    if (!currentProject?.slug) return;
 
-      await deleteCa({ caName, projectId: currentProject.id, type: CaType.INTERNAL });
+    await deleteCa({ caName, projectId: currentProject.id, type: CaType.INTERNAL });
 
-      createNotification({
-        text: "Successfully deleted CA",
-        type: "success"
-      });
+    createNotification({
+      text: "Successfully deleted CA",
+      type: "success"
+    });
 
-      handlePopUpClose("deleteCa");
-    } catch {
-      createNotification({
-        text: "Failed to delete CA",
-        type: "error"
-      });
-    }
+    handlePopUpClose("deleteCa");
   };
 
   const onUpdateCaStatus = async ({ caName, status }: { caName: string; status: CaStatus }) => {
-    try {
-      if (!currentProject?.slug) return;
+    if (!currentProject?.slug) return;
 
-      await updateCa({ caName, projectId: currentProject.id, type: CaType.INTERNAL, status });
+    await updateCa({ caName, projectId: currentProject.id, type: CaType.INTERNAL, status });
 
-      createNotification({
-        text: `Successfully ${status === CaStatus.ACTIVE ? "enabled" : "disabled"} CA`,
-        type: "success"
-      });
+    createNotification({
+      text: `Successfully ${status === CaStatus.ACTIVE ? "enabled" : "disabled"} CA`,
+      type: "success"
+    });
 
-      handlePopUpClose("caStatus");
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: `Failed to ${status === CaStatus.ACTIVE ? "enabled" : "disabled"} CA`,
-        type: "error"
-      });
-    }
+    handlePopUpClose("caStatus");
   };
 
   return (

frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/ExternalCaModal.tsx

@@ -297,63 +297,55 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
     status,
     configuration: formConfiguration
   }: FormData) => {
-    try {
-      if (!currentProject?.slug) return;
+    if (!currentProject?.slug) return;
 
-      let configPayload: any;
+    let configPayload: any;
 
-      if (type === CaType.ACME && "dnsAppConnection" in formConfiguration) {
-        configPayload = {
-          dnsProviderConfig: formConfiguration.dnsProviderConfig,
-          directoryUrl: formConfiguration.directoryUrl,
-          accountEmail: formConfiguration.accountEmail,
-          dnsAppConnectionId: formConfiguration.dnsAppConnection.id,
-          eabKid: formConfiguration.eabKid,
-          eabHmacKey: formConfiguration.eabHmacKey
-        };
-      } else if (type === CaType.AZURE_AD_CS && "azureAdcsConnection" in formConfiguration) {
-        configPayload = {
-          azureAdcsConnectionId: formConfiguration.azureAdcsConnection.id
-        };
-      } else {
-        throw new Error("Invalid certificate authority configuration");
-      }
+    if (type === CaType.ACME && "dnsAppConnection" in formConfiguration) {
+      configPayload = {
+        dnsProviderConfig: formConfiguration.dnsProviderConfig,
+        directoryUrl: formConfiguration.directoryUrl,
+        accountEmail: formConfiguration.accountEmail,
+        dnsAppConnectionId: formConfiguration.dnsAppConnection.id,
+        eabKid: formConfiguration.eabKid,
+        eabHmacKey: formConfiguration.eabHmacKey
+      };
+    } else if (type === CaType.AZURE_AD_CS && "azureAdcsConnection" in formConfiguration) {
+      configPayload = {
+        azureAdcsConnectionId: formConfiguration.azureAdcsConnection.id
+      };
+    } else {
+      throw new Error("Invalid certificate authority configuration");
+    }
 
-      if (ca) {
-        await updateMutateAsync({
-          caName: ca.name,
-          projectId: currentProject.id,
-          name,
-          type,
-          status,
-          enableDirectIssuance: type === CaType.AZURE_AD_CS ? false : enableDirectIssuance,
-          configuration: configPayload
-        });
-      } else {
-        await createMutateAsync({
-          projectId: currentProject.id,
-          name,
-          type,
-          status,
-          enableDirectIssuance: type === CaType.AZURE_AD_CS ? false : enableDirectIssuance,
-          configuration: configPayload
-        });
-      }
-
-      reset();
-      handlePopUpToggle("ca", false);
-
-      createNotification({
-        text: `Successfully ${ca ? "updated" : "created"} CA`,
-        type: "success"
+    if (ca) {
+      await updateMutateAsync({
+        caName: ca.name,
+        projectId: currentProject.id,
+        name,
+        type,
+        status,
+        enableDirectIssuance: type === CaType.AZURE_AD_CS ? false : enableDirectIssuance,
+        configuration: configPayload
       });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to create CA",
-        type: "error"
+    } else {
+      await createMutateAsync({
+        projectId: currentProject.id,
+        name,
+        type,
+        status,
+        enableDirectIssuance: type === CaType.AZURE_AD_CS ? false : enableDirectIssuance,
+        configuration: configPayload
       });
     }
+
+    reset();
+    handlePopUpToggle("ca", false);
+
+    createNotification({
+      text: `Successfully ${ca ? "updated" : "created"} CA`,
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/ExternalCaSection.tsx

@@ -23,23 +23,16 @@ export const ExternalCaSection = () => {
   ] as const);
 
   const onRemoveCaSubmit = async (caName: string, type: CaType) => {
-    try {
-      if (!currentProject?.id) return;
+    if (!currentProject?.id) return;
 
-      await deleteCa({ caName, type, projectId: currentProject.id });
+    await deleteCa({ caName, type, projectId: currentProject.id });
 
-      createNotification({
-        text: "Successfully deleted CA",
-        type: "success"
-      });
+    createNotification({
+      text: "Successfully deleted CA",
+      type: "success"
+    });
 
-      handlePopUpClose("deleteCa");
-    } catch {
-      createNotification({
-        text: "Failed to delete CA",
-        type: "error"
-      });
-    }
+    handlePopUpClose("deleteCa");
   };
 
   const onUpdateCaStatus = async ({
@@ -51,24 +44,16 @@ export const ExternalCaSection = () => {
     type: CaType;
     status: CaStatus;
   }) => {
-    try {
-      if (!currentProject?.slug) return;
+    if (!currentProject?.slug) return;
 
-      await updateCa({ caName: name, type, status, projectId: currentProject.id });
+    await updateCa({ caName: name, type, status, projectId: currentProject.id });
 
-      createNotification({
-        text: `Successfully ${status === CaStatus.ACTIVE ? "enabled" : "disabled"} CA`,
-        type: "success"
-      });
+    createNotification({
+      text: `Successfully ${status === CaStatus.ACTIVE ? "enabled" : "disabled"} CA`,
+      type: "success"
+    });
 
-      handlePopUpClose("caStatus");
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: `Failed to ${status === CaStatus.ACTIVE ? "enable" : "disable"} CA`,
-        type: "error"
-      });
-    }
+    handlePopUpClose("caStatus");
   };
 
   return (

frontend/src/pages/cert-manager/CertificatesPage/components/CertificateImportModal.tsx

@@ -71,38 +71,30 @@ export const CertificateImportModal = ({ popUp, handlePopUpToggle }: Props) => {
     chainPem,
     collectionId
   }: FormData) => {
-    try {
-      if (!currentProject?.slug) return;
+    if (!currentProject?.slug) return;
 
-      const { serialNumber, certificate, certificateChain, privateKey } = await importCertificate({
-        projectSlug: currentProject.slug,
+    const { serialNumber, certificate, certificateChain, privateKey } = await importCertificate({
+      projectSlug: currentProject.slug,
 
-        certificatePem,
-        privateKeyPem,
-        chainPem,
-        pkiCollectionId: collectionId
-      });
+      certificatePem,
+      privateKeyPem,
+      chainPem,
+      pkiCollectionId: collectionId
+    });
 
-      reset();
+    reset();
 
-      setCertificateDetails({
-        serialNumber,
-        certificate,
-        certificateChain,
-        privateKey
-      });
+    setCertificateDetails({
+      serialNumber,
+      certificate,
+      certificateChain,
+      privateKey
+    });
 
-      createNotification({
-        text: "Successfully imported certificate",
-        type: "success"
-      });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to import certificate",
-        type: "error"
-      });
-    }
+    createNotification({
+      text: "Successfully imported certificate",
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/cert-manager/CertificatesPage/components/CertificateIssuanceModal.tsx

@@ -94,9 +94,9 @@ const createSchema = (shouldShowSubjectSection: boolean) => {
 export type FormData = z.infer<ReturnType<typeof createSchema>>;
 
 type Props = {
-  popUp: UsePopUpState<["certificateIssuance"]>;
+  popUp: UsePopUpState<["issueCertificate"]>;
   handlePopUpToggle: (
-    popUpName: keyof UsePopUpState<["certificateIssuance"]>,
+    popUpName: keyof UsePopUpState<["issueCertificate"]>,
     state?: boolean
   ) => void;
   profileId?: string;
@@ -115,7 +115,7 @@ export const CertificateIssuanceModal = ({ popUp, handlePopUpToggle, profileId }
   const { currentProject } = useProject();
 
   const inputSerialNumber =
-    (popUp?.certificateIssuance?.data as { serialNumber: string })?.serialNumber || "";
+    (popUp?.issueCertificate?.data as { serialNumber: string })?.serialNumber || "";
   const sanitizedSerialNumber = inputSerialNumber.replace(/[^a-fA-F0-9:]/g, "");
 
   const { data: cert } = useGetCert(sanitizedSerialNumber);
@@ -181,7 +181,7 @@ export const CertificateIssuanceModal = ({ popUp, handlePopUpToggle, profileId }
   } = useCertificateTemplate(
     templateData,
     actualSelectedProfile,
-    popUp?.certificateIssuance?.isOpen || false,
+    popUp?.issueCertificate?.isOpen || false,
     setValue,
     watch
   );
@@ -227,10 +227,10 @@ export const CertificateIssuanceModal = ({ popUp, handlePopUpToggle, profileId }
   }, [cert, reset]);
 
   useEffect(() => {
-    if (popUp?.certificateIssuance?.isOpen && profileId && !cert) {
+    if (popUp?.issueCertificate?.isOpen && profileId && !cert) {
       setValue("profileId", profileId);
     }
-  }, [popUp?.certificateIssuance?.isOpen, profileId, cert, setValue]);
+  }, [popUp?.issueCertificate?.isOpen, profileId, cert, setValue]);
 
   const onFormSubmit = useCallback(
     async ({
@@ -243,84 +243,72 @@ export const CertificateIssuanceModal = ({ popUp, handlePopUpToggle, profileId }
       keyUsages,
       extendedKeyUsages
     }: FormData) => {
-      try {
-        if (!currentProject?.slug) {
-          createNotification({
-            text: "Project not found. Please refresh and try again.",
-            type: "error"
-          });
-          return;
-        }
-
-        if (!formProfileId) {
-          createNotification({
-            text: "Please select a certificate profile.",
-            type: "error"
-          });
-          return;
-        }
-
-        let commonName = "";
-        if (
-          constraints.shouldShowSubjectSection &&
-          subjectAttributes &&
-          subjectAttributes.length > 0
-        ) {
-          commonName = getAttributeValue(subjectAttributes, "common_name");
-          if (!commonName.trim()) {
-            createNotification({
-              text: "Common name is required.",
-              type: "error"
-            });
-            return;
-          }
-        }
-
-        const certificateRequest: any = {
-          profileId: formProfileId,
-          projectSlug: currentProject.slug,
-          ttl,
-          signatureAlgorithm,
-          keyAlgorithm,
-          keyUsages: filterUsages(keyUsages) as CertKeyUsage[],
-          extendedKeyUsages: filterUsages(extendedKeyUsages) as CertExtendedKeyUsage[]
-        };
-
-        if (constraints.shouldShowSubjectSection && commonName) {
-          certificateRequest.commonName = commonName;
-        }
-        if (constraints.shouldShowSanSection && subjectAltNames && subjectAltNames.length > 0) {
-          const formattedSans = formatSubjectAltNames(subjectAltNames);
-          if (formattedSans && formattedSans.length > 0) {
-            certificateRequest.altNames = formattedSans;
-          }
-        }
-
-        const { serialNumber, certificate, certificateChain, privateKey } =
-          await createCertificate(certificateRequest);
-
-        setCertificateDetails({
-          serialNumber,
-          certificate,
-          certificateChain,
-          privateKey
-        });
-
+      if (!currentProject?.slug) {
         createNotification({
-          text: "Successfully created certificate",
-          type: "success"
-        });
-      } catch (err) {
-        console.error("Certificate creation failed:", err);
-        const errorMessage =
-          err instanceof Error
-            ? err.message
-            : "An unexpected error occurred while creating the certificate";
-        createNotification({
-          text: `Failed to create certificate: ${errorMessage}`,
+          text: "Project not found. Please refresh and try again.",
           type: "error"
         });
+        return;
       }
+
+      if (!formProfileId) {
+        createNotification({
+          text: "Please select a certificate profile.",
+          type: "error"
+        });
+        return;
+      }
+
+      let commonName = "";
+      if (
+        constraints.shouldShowSubjectSection &&
+        subjectAttributes &&
+        subjectAttributes.length > 0
+      ) {
+        commonName = getAttributeValue(subjectAttributes, "common_name");
+        if (!commonName.trim()) {
+          createNotification({
+            text: "Common name is required.",
+            type: "error"
+          });
+          return;
+        }
+      }
+
+      const certificateRequest: any = {
+        profileId: formProfileId,
+        projectSlug: currentProject.slug,
+        ttl,
+        signatureAlgorithm,
+        keyAlgorithm,
+        keyUsages: filterUsages(keyUsages) as CertKeyUsage[],
+        extendedKeyUsages: filterUsages(extendedKeyUsages) as CertExtendedKeyUsage[]
+      };
+
+      if (constraints.shouldShowSubjectSection && commonName) {
+        certificateRequest.commonName = commonName;
+      }
+      if (constraints.shouldShowSanSection && subjectAltNames && subjectAltNames.length > 0) {
+        const formattedSans = formatSubjectAltNames(subjectAltNames);
+        if (formattedSans && formattedSans.length > 0) {
+          certificateRequest.altNames = formattedSans;
+        }
+      }
+
+      const { serialNumber, certificate, certificateChain, privateKey } =
+        await createCertificate(certificateRequest);
+
+      setCertificateDetails({
+        serialNumber,
+        certificate,
+        certificateChain,
+        privateKey
+      });
+
+      createNotification({
+        text: "Successfully created certificate",
+        type: "success"
+      });
     },
     [
       currentProject?.slug,
@@ -344,9 +332,9 @@ export const CertificateIssuanceModal = ({ popUp, handlePopUpToggle, profileId }
 
   return (
     <Modal
-      isOpen={popUp?.certificateIssuance?.isOpen}
+      isOpen={popUp?.issueCertificate?.isOpen}
       onOpenChange={(isOpen) => {
-        handlePopUpToggle("certificateIssuance", isOpen);
+        handlePopUpToggle("issueCertificate", isOpen);
         if (!isOpen) {
           resetAllState();
         }
@@ -515,7 +503,7 @@ export const CertificateIssuanceModal = ({ popUp, handlePopUpToggle, profileId }
                 colorSchema="secondary"
                 variant="plain"
                 onClick={() => {
-                  handlePopUpToggle("certificateIssuance", false);
+                  handlePopUpToggle("issueCertificate", false);
                 }}
               >
                 Cancel

frontend/src/pages/cert-manager/CertificatesPage/components/CertificateManageRenewalModal.tsx

@@ -163,38 +163,28 @@ export const CertificateManageRenewalModal = ({ popUp, handlePopUpToggle }: Prop
   }, [popUp.manageRenewal.isOpen, defaultRenewalDays, reset]);
 
   const onUpdateRenewal = async (data: FormData) => {
-    try {
-      if (!currentProject?.slug) {
-        createNotification({
-          text: "Unable to update auto-renewal: Project not found. Please refresh the page and try again.",
-          type: "error"
-        });
-        return;
-      }
-
-      await updateRenewalConfig({
-        certificateId: certificateData.certificateId,
-        renewBeforeDays: data.renewBeforeDays,
-        projectSlug: currentProject.slug
-      });
-
+    if (!currentProject?.slug) {
       createNotification({
-        text: isAutoRenewalEnabled
-          ? "Auto-renewal configuration updated successfully"
-          : "Auto-renewal enabled successfully",
-        type: "success"
-      });
-
-      handlePopUpToggle("manageRenewal", false);
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: isAutoRenewalEnabled
-          ? "Failed to update auto-renewal configuration. Please check your inputs and try again."
-          : "Failed to enable auto-renewal. Please check your inputs and try again.",
+        text: "Unable to update auto-renewal: Project not found. Please refresh the page and try again.",
         type: "error"
       });
+      return;
     }
+
+    await updateRenewalConfig({
+      certificateId: certificateData.certificateId,
+      renewBeforeDays: data.renewBeforeDays,
+      projectSlug: currentProject.slug
+    });
+
+    createNotification({
+      text: isAutoRenewalEnabled
+        ? "Auto-renewal configuration updated successfully"
+        : "Auto-renewal enabled successfully",
+      type: "success"
+    });
+
+    handlePopUpToggle("manageRenewal", false);
   };
 
   const getModalTitle = () => {

frontend/src/pages/cert-manager/CertificatesPage/components/CertificateModal.tsx

@@ -75,6 +75,7 @@ export type FormData = z.infer<typeof schema>;
 type Props = {
   popUp: UsePopUpState<["certificate"]>;
   handlePopUpToggle: (popUpName: keyof UsePopUpState<["certificate"]>, state?: boolean) => void;
+  preselectedTemplate?: { id: string; name: string };
 };
 
 type TCertificateDetails = {
@@ -86,7 +87,7 @@ type TCertificateDetails = {
 
 const CERT_TEMPLATE_NONE_VALUE = "none";
 
-export const CertificateModal = ({ popUp, handlePopUpToggle }: Props) => {
+export const CertificateModal = ({ popUp, handlePopUpToggle, preselectedTemplate }: Props) => {
   const [certificateDetails, setCertificateDetails] = useState<TCertificateDetails | null>(null);
   const { currentProject } = useProject();
   const { data: cert } = useGetCert(
@@ -147,13 +148,15 @@ export const CertificateModal = ({ popUp, handlePopUpToggle }: Props) => {
           (cert.extendedKeyUsages || []).map((name) => [name, true])
         )
       });
-    } else {
+    } else if (popUp?.certificate?.isOpen) {
+      const templateId = preselectedTemplate?.id || CERT_TEMPLATE_NONE_VALUE;
+
       reset({
         caId: "",
         commonName: "",
         subjectAltNames: "",
         ttl: "",
-        certificateTemplateId: CERT_TEMPLATE_NONE_VALUE,
+        certificateTemplateId: templateId,
         keyUsages: {
           [CertKeyUsage.DIGITAL_SIGNATURE]: true,
           [CertKeyUsage.KEY_ENCIPHERMENT]: true
@@ -161,7 +164,7 @@ export const CertificateModal = ({ popUp, handlePopUpToggle }: Props) => {
         extendedKeyUsages: {}
       });
     }
-  }, [cert]);
+  }, [cert, preselectedTemplate, popUp?.certificate?.isOpen]);
 
   useEffect(() => {
     if (!cert && selectedCertTemplate) {
@@ -186,45 +189,41 @@ export const CertificateModal = ({ popUp, handlePopUpToggle }: Props) => {
     keyUsages,
     extendedKeyUsages
   }: FormData) => {
-    try {
-      if (!currentProject?.slug) return;
+    if (!currentProject?.slug) return;
 
-      const { serialNumber, certificate, certificateChain, privateKey } = await createCertificate({
-        caId: !selectedCertTemplate ? caId : undefined,
-        certificateTemplateId: selectedCertTemplate ? selectedCertTemplateId : undefined,
-        projectSlug: currentProject.slug,
-        pkiCollectionId: collectionId,
-        commonName,
-        subjectAltNames,
-        ttl,
-        keyUsages: Object.entries(keyUsages)
-          .filter(([, value]) => value)
-          .map(([key]) => key as CertKeyUsage),
-        extendedKeyUsages: Object.entries(extendedKeyUsages)
-          .filter(([, value]) => value)
-          .map(([key]) => key as CertExtendedKeyUsage)
-      });
+    const { serialNumber, certificate, certificateChain, privateKey } = await createCertificate({
+      caId: !selectedCertTemplate ? caId : undefined,
+      certificateTemplateId: selectedCertTemplate ? selectedCertTemplateId : undefined,
+      projectSlug: currentProject.slug,
+      pkiCollectionId: collectionId,
+      commonName,
+      subjectAltNames,
+      ttl,
+      keyUsages: Object.entries(keyUsages)
+        .filter(([, value]) => value)
+        .map(([key]) =>
+          key === CertKeyUsage.CRL_SIGN
+            ? "cRLSign"
+            : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
+        ),
+      extendedKeyUsages: Object.entries(extendedKeyUsages)
+        .filter(([, value]) => value)
+        .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()))
+    });
 
-      reset();
+    reset();
 
-      setCertificateDetails({
-        serialNumber,
-        certificate,
-        certificateChain,
-        privateKey
-      });
+    setCertificateDetails({
+      serialNumber,
+      certificate,
+      certificateChain,
+      privateKey
+    });
 
-      createNotification({
-        text: "Successfully created certificate",
-        type: "success"
-      });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to create certificate",
-        type: "error"
-      });
-    }
+    createNotification({
+      text: "Successfully created certificate",
+      type: "success"
+    });
   };
 
   useEffect(() => {
@@ -277,15 +276,25 @@ export const CertificateModal = ({ popUp, handlePopUpToggle }: Props) => {
                   isRequired
                 >
                   <Select
-                    defaultValue={field.value}
-                    {...field}
+                    value={field.value}
                     onValueChange={(e) => onChange(e)}
                     className="w-full"
-                    isDisabled={Boolean(cert)}
+                    isDisabled={Boolean(cert) || Boolean(preselectedTemplate)}
                   >
                     <SelectItem value={CERT_TEMPLATE_NONE_VALUE} key="cert-template-none">
                       None
                     </SelectItem>
+                    {preselectedTemplate &&
+                      !templatesData?.certificateTemplates?.find(
+                        (t) => t.id === preselectedTemplate.id
+                      ) && (
+                        <SelectItem
+                          value={preselectedTemplate.id}
+                          key={`cert-template-preselected-${preselectedTemplate.id}`}
+                        >
+                          {preselectedTemplate.name}
+                        </SelectItem>
+                      )}
                     {(templatesData?.certificateTemplates || []).map(({ id, name }) => (
                       <SelectItem value={id} key={`cert-template-${id}`}>
                         {name}

frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalConfigModal.tsx

@@ -61,34 +61,26 @@ export const CertificateRenewalConfigModal = ({ popUp, handlePopUpToggle }: Prop
   const renewBeforeDays = watch("renewBeforeDays");
 
   const onSubmit = async (data: FormData) => {
-    try {
-      if (!currentProject?.slug) {
-        createNotification({
-          text: "Project not found",
-          type: "error"
-        });
-        return;
-      }
-
-      await updateRenewalConfig({
-        certificateId: certificateData.certificateId,
-        renewBeforeDays: data.renewBeforeDays,
-        projectSlug: currentProject.slug
-      });
-
+    if (!currentProject?.slug) {
       createNotification({
-        text: "Successfully updated auto-renewal configuration",
-        type: "success"
-      });
-
-      handlePopUpToggle("configureRenewal", false);
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to update auto-renewal configuration",
+        text: "Project not found",
         type: "error"
       });
+      return;
     }
+
+    await updateRenewalConfig({
+      certificateId: certificateData.certificateId,
+      renewBeforeDays: data.renewBeforeDays,
+      projectSlug: currentProject.slug
+    });
+
+    createNotification({
+      text: "Successfully updated auto-renewal configuration",
+      type: "success"
+    });
+
+    handlePopUpToggle("configureRenewal", false);
   };
 
   return (

frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalDisableModal.tsx

@@ -19,34 +19,26 @@ export const CertificateRenewalDisableModal = ({ popUp, handlePopUpToggle }: Pro
   };
 
   const onDisableConfirm = async () => {
-    try {
-      if (!currentProject?.slug) {
-        createNotification({
-          text: "Project not found",
-          type: "error"
-        });
-        return;
-      }
-
-      await updateRenewalConfig({
-        certificateId: certificateData.certificateId,
-        projectSlug: currentProject.slug,
-        enableAutoRenewal: false
-      });
-
+    if (!currentProject?.slug) {
       createNotification({
-        text: "Successfully disabled auto-renewal",
-        type: "success"
-      });
-
-      handlePopUpToggle("disableRenewal", false);
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to disable auto-renewal",
+        text: "Project not found",
         type: "error"
       });
+      return;
     }
+
+    await updateRenewalConfig({
+      certificateId: certificateData.certificateId,
+      projectSlug: currentProject.slug,
+      enableAutoRenewal: false
+    });
+
+    createNotification({
+      text: "Successfully disabled auto-renewal",
+      type: "success"
+    });
+
+    handlePopUpToggle("disableRenewal", false);
   };
 
   return (

frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalModal.tsx

@@ -18,22 +18,18 @@ export const CertificateRenewalModal = ({ popUp, handlePopUpToggle }: Props) =>
   const { mutateAsync: renewCertificate, isPending: isRenewing } = useRenewCertificate();
 
   const onRenewConfirm = async () => {
-    try {
-      const { certificateId } = popUp.renewCertificate.data as { certificateId: string };
+    const { certificateId } = popUp.renewCertificate.data as { certificateId: string };
 
-      await renewCertificate({
-        certificateId
-      });
+    await renewCertificate({
+      certificateId
+    });
 
-      createNotification({
-        text: "Certificate renewed successfully",
-        type: "success"
-      });
+    createNotification({
+      text: "Certificate renewed successfully",
+      type: "success"
+    });
 
-      handlePopUpToggle("renewCertificate", false);
-    } catch (err) {
-      console.error(err);
-    }
+    handlePopUpToggle("renewCertificate", false);
   };
 
   const certificateData = popUp.renewCertificate.data as {

frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRevocationModal.tsx

@@ -48,31 +48,23 @@ export const CertificateRevocationModal = ({ popUp, handlePopUpToggle }: Props)
   });
 
   const onFormSubmit = async ({ revocationReason }: FormData) => {
-    try {
-      if (!currentProject?.slug) return;
+    if (!currentProject?.slug) return;
 
-      const { serialNumber } = popUp.revokeCertificate.data as { serialNumber: string };
+    const { serialNumber } = popUp.revokeCertificate.data as { serialNumber: string };
 
-      await revokeCertificate({
-        projectSlug: currentProject.slug,
-        serialNumber,
-        revocationReason
-      });
+    await revokeCertificate({
+      projectSlug: currentProject.slug,
+      serialNumber,
+      revocationReason
+    });
 
-      reset();
-      handlePopUpToggle("revokeCertificate", false);
+    reset();
+    handlePopUpToggle("revokeCertificate", false);
 
-      createNotification({
-        text: "Successfully revoked certificate",
-        type: "success"
-      });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to revoke certificate",
-        type: "error"
-      });
-    }
+    createNotification({
+      text: "Successfully revoked certificate",
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/cert-manager/CertificatesPage/components/CertificateTemplateModal.tsx

@@ -159,69 +159,61 @@ export const CertificateTemplateModal = ({ popUp, handlePopUpToggle, caId }: Pro
       return;
     }
 
-    try {
-      if (certTemplate) {
-        await updateCertTemplate({
-          id: certTemplate.id,
-          projectId: currentProject.id,
-          pkiCollectionId: collectionId,
-          caId,
-          name,
-          commonName,
-          subjectAlternativeName,
-          ttl,
-          keyUsages: Object.entries(keyUsages)
-            .filter(([, value]) => value)
-            .map(([key]) =>
-              key === CertKeyUsage.CRL_SIGN
-                ? "cRLSign"
-                : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
-            ),
-          extendedKeyUsages: Object.entries(extendedKeyUsages)
-            .filter(([, value]) => value)
-            .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()))
-        });
+    if (certTemplate) {
+      await updateCertTemplate({
+        id: certTemplate.id,
+        projectId: currentProject.id,
+        pkiCollectionId: collectionId,
+        caId,
+        name,
+        commonName,
+        subjectAlternativeName,
+        ttl,
+        keyUsages: Object.entries(keyUsages)
+          .filter(([, value]) => value)
+          .map(([key]) =>
+            key === CertKeyUsage.CRL_SIGN
+              ? "cRLSign"
+              : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
+          ),
+        extendedKeyUsages: Object.entries(extendedKeyUsages)
+          .filter(([, value]) => value)
+          .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()))
+      });
 
-        createNotification({
-          text: "Successfully updated certificate template",
-          type: "success"
-        });
-      } else {
-        await createCertTemplate({
-          projectId: currentProject.id,
-          pkiCollectionId: collectionId,
-          caId,
-          name,
-          commonName,
-          subjectAlternativeName,
-          ttl,
-          keyUsages: Object.entries(keyUsages)
-            .filter(([, value]) => value)
-            .map(([key]) =>
-              key === CertKeyUsage.CRL_SIGN
-                ? "cRLSign"
-                : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
-            ),
-          extendedKeyUsages: Object.entries(extendedKeyUsages)
-            .filter(([, value]) => value)
-            .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()))
-        });
-
-        createNotification({
-          text: "Successfully created certificate template",
-          type: "success"
-        });
-      }
-
-      reset();
-      handlePopUpToggle("certificateTemplate", false);
-    } catch (err) {
-      console.error(err);
       createNotification({
-        text: "Failed to save changes",
-        type: "error"
+        text: "Successfully updated certificate template",
+        type: "success"
+      });
+    } else {
+      await createCertTemplate({
+        projectId: currentProject.id,
+        pkiCollectionId: collectionId,
+        caId,
+        name,
+        commonName,
+        subjectAlternativeName,
+        ttl,
+        keyUsages: Object.entries(keyUsages)
+          .filter(([, value]) => value)
+          .map(([key]) =>
+            key === CertKeyUsage.CRL_SIGN
+              ? "cRLSign"
+              : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
+          ),
+        extendedKeyUsages: Object.entries(extendedKeyUsages)
+          .filter(([, value]) => value)
+          .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()))
+      });
+
+      createNotification({
+        text: "Successfully created certificate template",
+        type: "success"
       });
     }
+
+    reset();
+    handlePopUpToggle("certificateTemplate", false);
   };
 
   return (

frontend/src/pages/cert-manager/CertificatesPage/components/CertificateTemplatesSection.tsx

@@ -41,25 +41,17 @@ export const CertificateTemplatesSection = ({ caId }: Props) => {
       return;
     }
 
-    try {
-      await deleteCertTemplate({
-        id,
-        projectId: currentProject.id
-      });
+    await deleteCertTemplate({
+      id,
+      projectId: currentProject.id
+    });
 
-      createNotification({
-        text: "Successfully deleted certificate template",
-        type: "success"
-      });
+    createNotification({
+      text: "Successfully deleted certificate template",
+      type: "success"
+    });
 
-      handlePopUpClose("deleteCertificateTemplate");
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to delete certificate template",
-        type: "error"
-      });
-    }
+    handlePopUpClose("deleteCertificateTemplate");
   };
 
   return (

frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsx

@@ -17,7 +17,6 @@ import { CertificateImportModal } from "./CertificateImportModal";
 import { CertificateIssuanceModal } from "./CertificateIssuanceModal";
 import { CertificateManagePkiSyncsModal } from "./CertificateManagePkiSyncsModal";
 import { CertificateManageRenewalModal } from "./CertificateManageRenewalModal";
-import { CertificateModal } from "./CertificateModal";
 import { CertificateRenewalModal } from "./CertificateRenewalModal";
 import { CertificateRevocationModal } from "./CertificateRevocationModal";
 import { CertificatesTable } from "./CertificatesTable";
@@ -26,12 +25,8 @@ export const CertificatesSection = () => {
   const { currentProject } = useProject();
   const { mutateAsync: deleteCert } = useDeleteCert();
 
-  // TODO: Use subscription.pkiLegacyTemplates to block legacy templates creation
-  const isLegacyTemplatesEnabled = true;
-
   const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([
-    "certificateIssuance",
-    "certificate",
+    "issueCertificate",
     "certificateImport",
     "certificateCert",
     "deleteCertificate",
@@ -42,24 +37,16 @@ export const CertificatesSection = () => {
   ] as const);
 
   const onRemoveCertificateSubmit = async (serialNumber: string) => {
-    try {
-      if (!currentProject?.slug) return;
+    if (!currentProject?.slug) return;
 
-      await deleteCert({ serialNumber, projectSlug: currentProject.slug });
+    await deleteCert({ serialNumber, projectSlug: currentProject.slug });
 
-      createNotification({
-        text: "Successfully deleted certificate",
-        type: "success"
-      });
+    createNotification({
+      text: "Successfully deleted certificate",
+      type: "success"
+    });
 
-      handlePopUpClose("deleteCertificate");
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to delete certificate",
-        type: "error"
-      });
-    }
+    handlePopUpClose("deleteCertificate");
   };
 
   return (
@@ -84,9 +71,7 @@ export const CertificatesSection = () => {
                 colorSchema="primary"
                 type="submit"
                 leftIcon={<FontAwesomeIcon icon={faPlus} />}
-                onClick={() =>
-                  handlePopUpOpen(isLegacyTemplatesEnabled ? "certificate" : "certificateIssuance")
-                }
+                onClick={() => handlePopUpOpen("issueCertificate")}
                 isDisabled={!isAllowed}
               >
                 Issue
@@ -96,11 +81,7 @@ export const CertificatesSection = () => {
         </ProjectPermissionCan>
       </div>
       <CertificatesTable handlePopUpOpen={handlePopUpOpen} />
-      {isLegacyTemplatesEnabled ? (
-        <CertificateModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
-      ) : (
-        <CertificateIssuanceModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
-      )}
+      <CertificateIssuanceModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
       <CertificateImportModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
       <CertificateCertModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
       <CertificateManageRenewalModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />

frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesTable.tsx

@@ -64,7 +64,7 @@ type Props = {
   handlePopUpOpen: (
     popUpName: keyof UsePopUpState<
       [
-        "certificate",
+        "issueCertificate",
         "deleteCertificate",
         "revokeCertificate",
         "certificateCert",
@@ -118,32 +118,24 @@ export const CertificatesTable = ({ handlePopUpOpen }: Props) => {
   }, [caData]);
 
   const handleDisableAutoRenewal = async (certificateId: string, commonName: string) => {
-    try {
-      if (!currentProject?.slug) {
-        createNotification({
-          text: "Unable to disable auto-renewal: Project not found. Please refresh the page and try again.",
-          type: "error"
-        });
-        return;
-      }
-
-      await updateRenewalConfig({
-        certificateId,
-        projectSlug: currentProject.slug,
-        enableAutoRenewal: false
-      });
-
+    if (!currentProject?.slug) {
       createNotification({
-        text: `Auto-renewal disabled for ${commonName}`,
-        type: "success"
-      });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to disable auto-renewal. Please try again or contact support if the issue persists.",
+        text: "Unable to disable auto-renewal: Project not found. Please refresh the page and try again.",
         type: "error"
       });
+      return;
     }
+
+    await updateRenewalConfig({
+      certificateId,
+      projectSlug: currentProject.slug,
+      enableAutoRenewal: false
+    });
+
+    createNotification({
+      text: `Auto-renewal disabled for ${commonName}`,
+      type: "success"
+    });
   };
 
   return (
@@ -305,7 +297,7 @@ export const CertificatesTable = ({ handlePopUpOpen }: Props) => {
                                   !isAllowed && "pointer-events-none cursor-not-allowed opacity-50"
                                 )}
                                 onClick={async () =>
-                                  handlePopUpOpen("certificate", {
+                                  handlePopUpOpen("issueCertificate", {
                                     serialNumber: certificate.serialNumber
                                   })
                                 }

frontend/src/pages/cert-manager/IntegrationsListPage/components/PkiSyncsTab/PkiSyncTable/PkiSyncsTable.tsx

@@ -217,46 +217,32 @@ export const PkiSyncsTable = ({ pkiSyncs }: Props) => {
 
     const isAutoSyncEnabled = !pkiSync.isAutoSyncEnabled;
 
-    try {
-      await updateSync.mutateAsync({
-        syncId: pkiSync.id,
-        projectId: pkiSync.projectId,
-        destination: pkiSync.destination,
-        isAutoSyncEnabled
-      });
+    await updateSync.mutateAsync({
+      syncId: pkiSync.id,
+      projectId: pkiSync.projectId,
+      destination: pkiSync.destination,
+      isAutoSyncEnabled
+    });
 
-      createNotification({
-        text: `Successfully ${isAutoSyncEnabled ? "enabled" : "disabled"} auto-sync for ${destinationName} Sync`,
-        type: "success"
-      });
-    } catch {
-      createNotification({
-        text: `Failed to ${isAutoSyncEnabled ? "enable" : "disable"} auto-sync for ${destinationName} Sync`,
-        type: "error"
-      });
-    }
+    createNotification({
+      text: `Successfully ${isAutoSyncEnabled ? "enabled" : "disabled"} auto-sync for ${destinationName} Sync`,
+      type: "success"
+    });
   };
 
   const handleTriggerSync = async (pkiSync: TPkiSync) => {
     const destinationName = PKI_SYNC_MAP[pkiSync.destination].name;
 
-    try {
-      await triggerSync.mutateAsync({
-        syncId: pkiSync.id,
-        destination: pkiSync.destination,
-        projectId: pkiSync.projectId
-      });
+    await triggerSync.mutateAsync({
+      syncId: pkiSync.id,
+      destination: pkiSync.destination,
+      projectId: pkiSync.projectId
+    });
 
-      createNotification({
-        text: `Successfully triggered ${destinationName} Sync`,
-        type: "success"
-      });
-    } catch {
-      createNotification({
-        text: `Failed to trigger ${destinationName} Sync`,
-        type: "error"
-      });
-    }
+    createNotification({
+      text: `Successfully triggered ${destinationName} Sync`,
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx

@@ -45,31 +45,24 @@ export const PkiCollectionPage = () => {
   ] as const);
 
   const onDeletePkiCollectionSubmit = async (collectionIdToDelete: string) => {
-    try {
-      if (!projectId) return;
+    if (!projectId) return;
 
-      await deletePkiCollection({
-        projectId,
-        collectionId: collectionIdToDelete
-      });
+    await deletePkiCollection({
+      projectId,
+      collectionId: collectionIdToDelete
+    });
 
-      createNotification({
-        text: "Successfully deleted PKI collection",
-        type: "success"
-      });
-      handlePopUpClose("deletePkiCollection");
-      navigate({
-        to: "/projects/cert-management/$projectId/policies",
-        params: {
-          projectId: params.projectId
-        }
-      });
-    } catch {
-      createNotification({
-        text: "Failed to delete PKI collection",
-        type: "error"
-      });
-    }
+    createNotification({
+      text: "Successfully deleted PKI collection",
+      type: "success"
+    });
+    handlePopUpClose("deletePkiCollection");
+    navigate({
+      to: "/projects/cert-management/$projectId/policies",
+      params: {
+        projectId: params.projectId
+      }
+    });
   };
 
   return (

frontend/src/pages/cert-manager/PkiSubscriberDetailsByIDPage/PkiSubscriberDetailsByIDPage.tsx

@@ -51,30 +51,22 @@ const Page = () => {
   ] as const);
 
   const onRemoveSubscriberSubmit = async (subscriberNameToDelete: string) => {
-    try {
-      if (!projectId) return;
+    if (!projectId) return;
 
-      await deletePkiSubscriber({ subscriberName: subscriberNameToDelete, projectId });
+    await deletePkiSubscriber({ subscriberName: subscriberNameToDelete, projectId });
 
-      createNotification({
-        text: "Successfully deleted subscriber",
-        type: "success"
-      });
+    createNotification({
+      text: "Successfully deleted subscriber",
+      type: "success"
+    });
 
-      handlePopUpClose("deletePkiSubscriber");
-      navigate({
-        to: "/projects/cert-management/$projectId/subscribers",
-        params: {
-          projectId
-        }
-      });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to delete subscriber",
-        type: "error"
-      });
-    }
+    handlePopUpClose("deletePkiSubscriber");
+    navigate({
+      to: "/projects/cert-management/$projectId/subscribers",
+      params: {
+        projectId
+      }
+    });
   };
 
   return (

frontend/src/pages/cert-manager/PkiSubscriberDetailsByIDPage/components/PkiSubscriberDetailsSection.tsx

@@ -70,36 +70,28 @@ export const PkiSubscriberDetailsSection = ({ subscriberName, handlePopUpOpen }:
     useOrderPkiSubscriberCert();
 
   const onIssuePkiSubscriberCert = async () => {
-    try {
-      if (pkiSubscriber?.supportsImmediateCertIssuance) {
-        const response = await issuePkiSubscriberCert({ subscriberName, projectId });
+    if (pkiSubscriber?.supportsImmediateCertIssuance) {
+      const response = await issuePkiSubscriberCert({ subscriberName, projectId });
 
-        setCertificateDetails({
-          serialNumber: response.serialNumber,
-          certificate: response.certificate,
-          certificateChain: response.certificateChain,
-          privateKey: response.privateKey
-        });
+      setCertificateDetails({
+        serialNumber: response.serialNumber,
+        certificate: response.certificate,
+        certificateChain: response.certificateChain,
+        privateKey: response.privateKey
+      });
 
-        setIsModalOpen(true);
+      setIsModalOpen(true);
 
-        createNotification({
-          text: "Successfully issued certificate",
-          type: "success"
-        });
-      } else {
-        await orderPkiSubscriberCert({ subscriberName, projectId });
-
-        createNotification({
-          text: "Successfully ordered certificate. It will be issued after CA processing which could take a few minutes.",
-          type: "info"
-        });
-      }
-    } catch (err) {
-      console.error(err);
       createNotification({
-        text: "Failed to issue certificate",
-        type: "error"
+        text: "Successfully issued certificate",
+        type: "success"
+      });
+    } else {
+      await orderPkiSubscriberCert({ subscriberName, projectId });
+
+      createNotification({
+        text: "Successfully ordered certificate. It will be issued after CA processing which could take a few minutes.",
+        type: "info"
       });
     }
   };

frontend/src/pages/cert-manager/PkiSubscribersPage/components/PkiSubscriberModal.tsx

@@ -276,129 +276,121 @@ export const PkiSubscriberModal = ({ popUp, handlePopUpToggle }: Props) => {
     locality,
     emailAddress
   }: FormData) => {
-    try {
-      if (!projectId) return;
-
-      if (!caId) {
-        createNotification({
-          text: "Please select an Issuing CA",
-          type: "error"
-        });
-        return;
-      }
-
-      // Check if there is already a different subscriber with the same name
-      const existingNames =
-        subscribers?.filter((s) => s.id !== pkiSubscriber?.id).map((s) => s.name) || [];
-
-      if (existingNames.includes(name.trim())) {
-        createNotification({
-          text: "A subscriber with this name already exists.",
-          type: "error"
-        });
-        return;
-      }
-
-      // Validate Azure template for Azure ADCS CA
-      if (selectedCa?.type === CaType.AZURE_AD_CS && !azureTemplateType) {
-        createNotification({
-          text: "Please select an Azure certificate template",
-          type: "error"
-        });
-        return;
-      }
-
-      const keyUsagesList =
-        selectedCa?.type === CaType.AZURE_AD_CS
-          ? []
-          : Object.entries(keyUsages)
-              .filter(([, value]) => value)
-              .map(([key]) => key as CertKeyUsage);
-
-      const extendedKeyUsagesList =
-        selectedCa?.type === CaType.AZURE_AD_CS
-          ? []
-          : Object.entries(extendedKeyUsages)
-              .filter(([, value]) => value)
-              .map(([key]) => key as CertExtendedKeyUsage);
-
-      const subjectAlternativeNamesList = subjectAlternativeNames
-        .split(",")
-        .map((san) => san.trim())
-        .filter(Boolean);
-
-      const autoRenewalPeriodInDays = enableAutoRenewal
-        ? convertTimeUnitValueToDays(renewalUnit, renewalBefore)
-        : undefined;
-
-      // Build properties object
-      const properties = {
-        ...(selectedCa?.type === CaType.AZURE_AD_CS && azureTemplateType && { azureTemplateType }),
-        ...(organization && { organization }),
-        ...(organizationalUnit && { organizationalUnit }),
-        ...(country && { country }),
-        ...(state && { state }),
-        ...(locality && { locality }),
-        ...(emailAddress && { emailAddress })
-      };
-
-      if (pkiSubscriber) {
-        await updateMutateAsync({
-          subscriberName: pkiSubscriber.name,
-          projectId,
-          name,
-          caId,
-          commonName,
-          subjectAlternativeNames: subjectAlternativeNamesList,
-          ttl,
-          keyUsages: keyUsagesList.map((key) =>
-            key === CertKeyUsage.CRL_SIGN
-              ? "cRLSign"
-              : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
-          ),
-          extendedKeyUsages: extendedKeyUsagesList.map((key) =>
-            key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
-          ),
-          enableAutoRenewal,
-          autoRenewalPeriodInDays,
-          properties: Object.keys(properties).length > 0 ? properties : undefined
-        });
-      } else {
-        await createMutateAsync({
-          projectId,
-          name,
-          caId,
-          commonName,
-          subjectAlternativeNames: subjectAlternativeNamesList,
-          ttl,
-          keyUsages: keyUsagesList.map((key) =>
-            key === CertKeyUsage.CRL_SIGN
-              ? "cRLSign"
-              : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
-          ),
-          extendedKeyUsages: extendedKeyUsagesList.map((key) =>
-            key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
-          ),
-          enableAutoRenewal,
-          autoRenewalPeriodInDays,
-          properties: Object.keys(properties).length > 0 ? properties : undefined
-        });
-      }
-
-      reset();
-      handlePopUpToggle("pkiSubscriber", false);
+    if (!projectId) return;
 
+    if (!caId) {
       createNotification({
-        text: `Successfully ${pkiSubscriber ? "updated" : "added"} PKI subscriber`,
-        type: "success"
-      });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: `Failed to ${pkiSubscriber ? "update" : "add"} PKI subscriber`,
+        text: "Please select an Issuing CA",
         type: "error"
       });
+      return;
     }
+
+    // Check if there is already a different subscriber with the same name
+    const existingNames =
+      subscribers?.filter((s) => s.id !== pkiSubscriber?.id).map((s) => s.name) || [];
+
+    if (existingNames.includes(name.trim())) {
+      createNotification({
+        text: "A subscriber with this name already exists.",
+        type: "error"
+      });
+      return;
+    }
+
+    // Validate Azure template for Azure ADCS CA
+    if (selectedCa?.type === CaType.AZURE_AD_CS && !azureTemplateType) {
+      createNotification({
+        text: "Please select an Azure certificate template",
+        type: "error"
+      });
+      return;
+    }
+
+    const keyUsagesList =
+      selectedCa?.type === CaType.AZURE_AD_CS
+        ? []
+        : Object.entries(keyUsages)
+            .filter(([, value]) => value)
+            .map(([key]) => key as CertKeyUsage);
+
+    const extendedKeyUsagesList =
+      selectedCa?.type === CaType.AZURE_AD_CS
+        ? []
+        : Object.entries(extendedKeyUsages)
+            .filter(([, value]) => value)
+            .map(([key]) => key as CertExtendedKeyUsage);
+
+    const subjectAlternativeNamesList = subjectAlternativeNames
+      .split(",")
+      .map((san) => san.trim())
+      .filter(Boolean);
+
+    const autoRenewalPeriodInDays = enableAutoRenewal
+      ? convertTimeUnitValueToDays(renewalUnit, renewalBefore)
+      : undefined;
+
+    // Build properties object
+    const properties = {
+      ...(selectedCa?.type === CaType.AZURE_AD_CS && azureTemplateType && { azureTemplateType }),
+      ...(organization && { organization }),
+      ...(organizationalUnit && { organizationalUnit }),
+      ...(country && { country }),
+      ...(state && { state }),
+      ...(locality && { locality }),
+      ...(emailAddress && { emailAddress })
+    };
+
+    if (pkiSubscriber) {
+      await updateMutateAsync({
+        subscriberName: pkiSubscriber.name,
+        projectId,
+        name,
+        caId,
+        commonName,
+        subjectAlternativeNames: subjectAlternativeNamesList,
+        ttl,
+        keyUsages: keyUsagesList.map((key) =>
+          key === CertKeyUsage.CRL_SIGN
+            ? "cRLSign"
+            : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
+        ),
+        extendedKeyUsages: extendedKeyUsagesList.map((key) =>
+          key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
+        ),
+        enableAutoRenewal,
+        autoRenewalPeriodInDays,
+        properties: Object.keys(properties).length > 0 ? properties : undefined
+      });
+    } else {
+      await createMutateAsync({
+        projectId,
+        name,
+        caId,
+        commonName,
+        subjectAlternativeNames: subjectAlternativeNamesList,
+        ttl,
+        keyUsages: keyUsagesList.map((key) =>
+          key === CertKeyUsage.CRL_SIGN
+            ? "cRLSign"
+            : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
+        ),
+        extendedKeyUsages: extendedKeyUsagesList.map((key) =>
+          key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
+        ),
+        enableAutoRenewal,
+        autoRenewalPeriodInDays,
+        properties: Object.keys(properties).length > 0 ? properties : undefined
+      });
+    }
+
+    reset();
+    handlePopUpToggle("pkiSubscriber", false);
+
+    createNotification({
+      text: `Successfully ${pkiSubscriber ? "updated" : "added"} PKI subscriber`,
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/cert-manager/PkiSubscribersPage/components/PkiSubscriberSection.tsx

@@ -32,22 +32,14 @@ export const PkiSubscriberSection = () => {
   ] as const);
 
   const onRemovePkiSubscriberSubmit = async (subscriberName: string) => {
-    try {
-      const subscriber = await deletePkiSubscriber({ subscriberName, projectId });
+    const subscriber = await deletePkiSubscriber({ subscriberName, projectId });
 
-      createNotification({
-        text: `Successfully deleted PKI subscriber: ${subscriber.name}`,
-        type: "success"
-      });
+    createNotification({
+      text: `Successfully deleted PKI subscriber: ${subscriber.name}`,
+      type: "success"
+    });
 
-      handlePopUpClose("deletePkiSubscriber");
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to delete PKI subscriber",
-        type: "error"
-      });
-    }
+    handlePopUpClose("deletePkiSubscriber");
   };
 
   const onUpdatePkiSubscriberStatus = async ({
@@ -57,24 +49,16 @@ export const PkiSubscriberSection = () => {
     subscriberName: string;
     status: PkiSubscriberStatus;
   }) => {
-    try {
-      if (!currentProject?.slug) return;
+    if (!currentProject?.slug) return;
 
-      await updatePkiSubscriber({ subscriberName, projectId, status });
+    await updatePkiSubscriber({ subscriberName, projectId, status });
 
-      createNotification({
-        text: `Successfully ${status === PkiSubscriberStatus.ACTIVE ? "enabled" : "disabled"} subscriber`,
-        type: "success"
-      });
+    createNotification({
+      text: `Successfully ${status === PkiSubscriberStatus.ACTIVE ? "enabled" : "disabled"} subscriber`,
+      type: "success"
+    });
 
-      handlePopUpClose("pkiSubscriberStatus");
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: `Failed to ${status === PkiSubscriberStatus.ACTIVE ? "enable" : "disable"} subscriber`,
-        type: "error"
-      });
-    }
+    handlePopUpClose("pkiSubscriberStatus");
   };
 
   const subscriberStatusData = popUp?.pkiSubscriberStatus?.data as {

frontend/src/pages/cert-manager/PkiSyncDetailsByIDPage/components/PkiSyncActionTriggers.tsx

@@ -86,44 +86,28 @@ export const PkiSyncActionTriggers = ({ pkiSync }: Props) => {
   }, [pkiSync.id, setIsIdCopied]);
 
   const handleTriggerSync = useCallback(async () => {
-    try {
-      await triggerSyncMutation.mutateAsync({
-        syncId: id,
-        destination,
-        projectId
-      });
-      createNotification({
-        text: "PKI sync job queued successfully",
-        type: "success"
-      });
-    } catch (error) {
-      console.error("Failed to trigger sync:", error);
-      createNotification({
-        text: "Failed to trigger PKI sync",
-        type: "error"
-      });
-    }
+    await triggerSyncMutation.mutateAsync({
+      syncId: id,
+      destination,
+      projectId
+    });
+    createNotification({
+      text: "PKI sync job queued successfully",
+      type: "success"
+    });
   }, [triggerSyncMutation, id, destination, projectId]);
 
   const handleToggleAutoSync = useCallback(async () => {
-    try {
-      await updatePkiSyncMutation.mutateAsync({
-        syncId: id,
-        projectId,
-        destination,
-        isAutoSyncEnabled: !pkiSync.isAutoSyncEnabled
-      });
-      createNotification({
-        text: `Auto-sync ${pkiSync.isAutoSyncEnabled ? "disabled" : "enabled"} successfully`,
-        type: "success"
-      });
-    } catch (error) {
-      console.error("Failed to toggle auto-sync:", error);
-      createNotification({
-        text: "Failed to toggle auto-sync",
-        type: "error"
-      });
-    }
+    await updatePkiSyncMutation.mutateAsync({
+      syncId: id,
+      projectId,
+      destination,
+      isAutoSyncEnabled: !pkiSync.isAutoSyncEnabled
+    });
+    createNotification({
+      text: `Auto-sync ${pkiSync.isAutoSyncEnabled ? "disabled" : "enabled"} successfully`,
+      type: "success"
+    });
   }, [updatePkiSyncMutation, id, projectId, pkiSync.isAutoSyncEnabled]);
 
   const permissionSubject = subject(ProjectPermissionSub.PkiSyncs, {

frontend/src/pages/cert-manager/PkiTemplateListPage/PkiTemplateListPage.tsx

@@ -5,6 +5,7 @@ import {
   faCertificate,
   faCog,
   faEllipsis,
+  faFileContract,
   faPencil,
   faPlus,
   faTrash
@@ -40,6 +41,7 @@ import {
   Tr
 } from "@app/components/v2";
 import {
+  ProjectPermissionCertificateActions,
   ProjectPermissionPkiTemplateActions,
   ProjectPermissionSub,
   useProject,
@@ -50,6 +52,7 @@ import { useDeleteCertTemplateV2 } from "@app/hooks/api";
 import { useListCertificateTemplates } from "@app/hooks/api/certificateTemplates/queries";
 import { ProjectType } from "@app/hooks/api/projects/types";
 
+import { CertificateModal } from "../CertificatesPage/components/CertificateModal";
 import { CertificateTemplateEnrollmentModal } from "../CertificatesPage/components/CertificateTemplateEnrollmentModal";
 import { PkiTemplateForm } from "./components/PkiTemplateForm";
 
@@ -64,7 +67,8 @@ export const PkiTemplateListPage = () => {
     "certificateTemplate",
     "deleteTemplate",
     "enrollmentOptions",
-    "estUpgradePlan"
+    "estUpgradePlan",
+    "certificateFromTemplate"
   ] as const);
 
   const { subscription } = useSubscription();
@@ -78,25 +82,17 @@ export const PkiTemplateListPage = () => {
   const deleteCertTemplate = useDeleteCertTemplateV2();
 
   const onRemovePkiSubscriberSubmit = async () => {
-    try {
-      const pkiTemplate = await deleteCertTemplate.mutateAsync({
-        projectId: currentProject.id,
-        templateName: popUp?.deleteTemplate?.data?.name
-      });
+    const pkiTemplate = await deleteCertTemplate.mutateAsync({
+      projectId: currentProject.id,
+      templateName: popUp?.deleteTemplate?.data?.name
+    });
 
-      createNotification({
-        text: `Successfully deleted PKI template: ${pkiTemplate.name}`,
-        type: "success"
-      });
+    createNotification({
+      text: `Successfully deleted PKI template: ${pkiTemplate.name}`,
+      type: "success"
+    });
 
-      handlePopUpClose("deleteTemplate");
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to delete PKI subscriber",
-        type: "error"
-      });
-    }
+    handlePopUpClose("deleteTemplate");
   };
 
   return (
@@ -168,6 +164,27 @@ export const PkiTemplateListPage = () => {
                                 </div>
                               </DropdownMenuTrigger>
                               <DropdownMenuContent align="start" className="p-1">
+                                <ProjectPermissionCan
+                                  I={ProjectPermissionCertificateActions.Create}
+                                  a={ProjectPermissionSub.Certificates}
+                                >
+                                  {(isAllowed) => (
+                                    <DropdownMenuItem
+                                      className={twMerge(
+                                        !isAllowed &&
+                                          "pointer-events-none cursor-not-allowed opacity-50"
+                                      )}
+                                      onClick={(e) => {
+                                        e.stopPropagation();
+                                        handlePopUpOpen("certificateFromTemplate", template);
+                                      }}
+                                      disabled={!isAllowed}
+                                      icon={<FontAwesomeIcon icon={faFileContract} />}
+                                    >
+                                      Issue Certificate
+                                    </DropdownMenuItem>
+                                  )}
+                                </ProjectPermissionCan>
                                 <ProjectPermissionCan
                                   I={ProjectPermissionPkiTemplateActions.Edit}
                                   a={ProjectPermissionSub.CertificateTemplates}
@@ -292,6 +309,16 @@ export const PkiTemplateListPage = () => {
           </ModalContent>
         </Modal>
         <CertificateTemplateEnrollmentModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
+        <CertificateModal
+          popUp={{
+            certificate: {
+              isOpen: popUp.certificateFromTemplate.isOpen,
+              data: popUp.certificateFromTemplate.data
+            }
+          }}
+          handlePopUpToggle={(_, state) => handlePopUpToggle("certificateFromTemplate", state)}
+          preselectedTemplate={popUp.certificateFromTemplate.data}
+        />
       </div>
       <UpgradePlanModal
         isOpen={popUp.estUpgradePlan.isOpen}

frontend/src/pages/cert-manager/PkiTemplateListPage/components/PkiTemplateForm.tsx

@@ -128,67 +128,59 @@ export const PkiTemplateForm = ({ certTemplate, handlePopUpToggle }: Props) => {
       return;
     }
 
-    try {
-      if (certTemplate) {
-        await updateCertTemplate({
-          templateName: certTemplate.name,
-          projectId: currentProject.id,
-          caName: ca.name,
-          name,
-          commonName,
-          subjectAlternativeName,
-          ttl,
-          keyUsages: Object.entries(keyUsages)
-            .filter(([, value]) => value)
-            .map(([key]) =>
-              key === CertKeyUsage.CRL_SIGN
-                ? "cRLSign"
-                : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
-            ),
-          extendedKeyUsages: Object.entries(extendedKeyUsages)
-            .filter(([, value]) => value)
-            .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()))
-        });
+    if (certTemplate) {
+      await updateCertTemplate({
+        templateName: certTemplate.name,
+        projectId: currentProject.id,
+        caName: ca.name,
+        name,
+        commonName,
+        subjectAlternativeName,
+        ttl,
+        keyUsages: Object.entries(keyUsages)
+          .filter(([, value]) => value)
+          .map(([key]) =>
+            key === CertKeyUsage.CRL_SIGN
+              ? "cRLSign"
+              : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
+          ),
+        extendedKeyUsages: Object.entries(extendedKeyUsages)
+          .filter(([, value]) => value)
+          .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()))
+      });
 
-        createNotification({
-          text: "Successfully updated certificate template",
-          type: "success"
-        });
-      } else {
-        await createCertTemplate({
-          projectId: currentProject.id,
-          caName: ca.name,
-          name,
-          commonName,
-          subjectAlternativeName,
-          ttl,
-          keyUsages: Object.entries(keyUsages)
-            .filter(([, value]) => value)
-            .map(([key]) =>
-              key === CertKeyUsage.CRL_SIGN
-                ? "cRLSign"
-                : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
-            ),
-          extendedKeyUsages: Object.entries(extendedKeyUsages)
-            .filter(([, value]) => value)
-            .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()))
-        });
-
-        createNotification({
-          text: "Successfully created certificate template",
-          type: "success"
-        });
-      }
-
-      reset();
-      handlePopUpToggle(false);
-    } catch (err) {
-      console.error(err);
       createNotification({
-        text: "Failed to save changes",
-        type: "error"
+        text: "Successfully updated certificate template",
+        type: "success"
+      });
+    } else {
+      await createCertTemplate({
+        projectId: currentProject.id,
+        caName: ca.name,
+        name,
+        commonName,
+        subjectAlternativeName,
+        ttl,
+        keyUsages: Object.entries(keyUsages)
+          .filter(([, value]) => value)
+          .map(([key]) =>
+            key === CertKeyUsage.CRL_SIGN
+              ? "cRLSign"
+              : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())
+          ),
+        extendedKeyUsages: Object.entries(extendedKeyUsages)
+          .filter(([, value]) => value)
+          .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()))
+      });
+
+      createNotification({
+        text: "Successfully created certificate template",
+        type: "success"
       });
     }
+
+    reset();
+    handlePopUpToggle(false);
   };
 
   return (

frontend/src/pages/cert-manager/PoliciesPage/components/CertificateProfilesTab/CertificateProfilesTab.tsx

@@ -51,22 +51,15 @@ export const CertificateProfilesTab = () => {
   const handleDeleteConfirm = async () => {
     if (!selectedProfile) return;
 
-    try {
-      await deleteProfile.mutateAsync({
-        profileId: selectedProfile.id
-      });
-      setIsDeleteModalOpen(false);
-      setSelectedProfile(null);
-      createNotification({
-        text: `Certificate profile "${selectedProfile.slug}" deleted successfully`,
-        type: "success"
-      });
-    } catch (error) {
-      console.error(
-        `Failed to delete profile "${selectedProfile.slug}" (ID: ${selectedProfile.id}):`,
-        error
-      );
-    }
+    await deleteProfile.mutateAsync({
+      profileId: selectedProfile.id
+    });
+    setIsDeleteModalOpen(false);
+    setSelectedProfile(null);
+    createNotification({
+      text: `Certificate profile "${selectedProfile.slug}" deleted successfully`,
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/cert-manager/PoliciesPage/components/CertificateProfilesTab/CreateProfileModal.tsx

@@ -236,64 +236,56 @@ export const CreateProfileModal = ({ isOpen, onClose, profile, mode = "create" }
   }, [isEdit, profile, reset]);
 
   const onFormSubmit = async (data: FormData) => {
-    try {
-      if (!currentProject?.id && !isEdit) return;
+    if (!currentProject?.id && !isEdit) return;
 
-      if (isEdit) {
-        const updateData: TUpdateCertificateProfileDTO = {
-          profileId: profile.id,
-          slug: data.slug,
-          description: data.description
-        };
+    if (isEdit) {
+      const updateData: TUpdateCertificateProfileDTO = {
+        profileId: profile.id,
+        slug: data.slug,
+        description: data.description
+      };
 
-        if (data.enrollmentType === "est" && data.estConfig) {
-          updateData.estConfig = data.estConfig;
-        } else if (data.enrollmentType === "api" && data.apiConfig) {
-          updateData.apiConfig = data.apiConfig;
-        }
-
-        await updateProfile.mutateAsync(updateData);
-      } else {
-        if (!currentProject?.id) {
-          throw new Error("Project ID is required for creating a profile");
-        }
-
-        const createData: TCreateCertificateProfileDTO = {
-          projectId: currentProject.id,
-          slug: data.slug,
-          description: data.description,
-          enrollmentType: data.enrollmentType,
-          caId: data.certificateAuthorityId,
-          certificateTemplateId: data.certificateTemplateId
-        };
-
-        if (data.enrollmentType === "est" && data.estConfig) {
-          createData.estConfig = {
-            passphrase: data.estConfig.passphrase,
-            caChain: data.estConfig.caChain || undefined,
-            disableBootstrapCaValidation: data.estConfig.disableBootstrapCaValidation
-          };
-        } else if (data.enrollmentType === "api" && data.apiConfig) {
-          createData.apiConfig = data.apiConfig;
-        }
-
-        await createProfile.mutateAsync(createData);
+      if (data.enrollmentType === "est" && data.estConfig) {
+        updateData.estConfig = data.estConfig;
+      } else if (data.enrollmentType === "api" && data.apiConfig) {
+        updateData.apiConfig = data.apiConfig;
       }
 
-      createNotification({
-        text: `Certificate profile ${isEdit ? "updated" : "created"} successfully`,
-        type: "success"
-      });
+      await updateProfile.mutateAsync(updateData);
+    } else {
+      if (!currentProject?.id) {
+        throw new Error("Project ID is required for creating a profile");
+      }
 
-      reset();
-      onClose();
-    } catch (error) {
-      console.error(`Error ${isEdit ? "updating" : "creating"} profile:`, error);
-      createNotification({
-        text: `Failed to ${isEdit ? "update" : "create"} certificate profile`,
-        type: "error"
-      });
+      const createData: TCreateCertificateProfileDTO = {
+        projectId: currentProject.id,
+        slug: data.slug,
+        description: data.description,
+        enrollmentType: data.enrollmentType,
+        caId: data.certificateAuthorityId,
+        certificateTemplateId: data.certificateTemplateId
+      };
+
+      if (data.enrollmentType === "est" && data.estConfig) {
+        createData.estConfig = {
+          passphrase: data.estConfig.passphrase,
+          caChain: data.estConfig.caChain || undefined,
+          disableBootstrapCaValidation: data.estConfig.disableBootstrapCaValidation
+        };
+      } else if (data.enrollmentType === "api" && data.apiConfig) {
+        createData.apiConfig = data.apiConfig;
+      }
+
+      await createProfile.mutateAsync(createData);
     }
+
+    createNotification({
+      text: `Certificate profile ${isEdit ? "updated" : "created"} successfully`,
+      type: "success"
+    });
+
+    reset();
+    onClose();
   };
 
   return (

frontend/src/pages/cert-manager/PoliciesPage/components/CertificateProfilesTab/ProfileRow.tsx

@@ -44,7 +44,7 @@ export const ProfileRow = ({ profile, onEditProfile, onDeleteProfile }: Props) =
 
   const { data: caData } = useGetCaById(profile.caId);
 
-  const { popUp, handlePopUpToggle } = usePopUp(["certificateIssuance"] as const);
+  const { popUp, handlePopUpToggle } = usePopUp(["issueCertificate"] as const);
 
   const [isIdCopied, setIsIdCopied] = useToggle(false);
 
@@ -147,7 +147,7 @@ export const ProfileRow = ({ profile, onEditProfile, onDeleteProfile }: Props) =
               <DropdownMenuItem
                 onClick={(e) => {
                   e.stopPropagation();
-                  handlePopUpToggle("certificateIssuance");
+                  handlePopUpToggle("issueCertificate");
                 }}
                 icon={<FontAwesomeIcon icon={faPlus} />}
               >

frontend/src/pages/cert-manager/PoliciesPage/components/CertificateTemplatesV2Tab/CertificateTemplatesV2Tab.tsx

@@ -48,23 +48,15 @@ export const CertificateTemplatesV2Tab = () => {
   const handleDeleteConfirm = async () => {
     if (!selectedTemplate) return;
 
-    try {
-      await deleteTemplateV2.mutateAsync({
-        templateId: selectedTemplate.id
-      });
-      setIsDeleteModalOpen(false);
-      setSelectedTemplate(null);
-      createNotification({
-        text: `Certificate template "${selectedTemplate.name}" deleted successfully`,
-        type: "success"
-      });
-    } catch (error) {
-      console.error("Failed to delete template:", error);
-      createNotification({
-        text: "Failed to delete certificate template",
-        type: "error"
-      });
-    }
+    await deleteTemplateV2.mutateAsync({
+      templateId: selectedTemplate.id
+    });
+    setIsDeleteModalOpen(false);
+    setSelectedTemplate(null);
+    createNotification({
+      text: `Certificate template "${selectedTemplate.name}" deleted successfully`,
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/cert-manager/PoliciesPage/components/CertificateTemplatesV2Tab/CreateTemplateModal.tsx

@@ -251,7 +251,10 @@ export const CreateTemplateModal = ({ isOpen, onClose, template, mode = "create"
 
   const { control, handleSubmit, reset, watch, setValue, formState } = useForm<FormData>({
     resolver: zodResolver(templateSchema),
-    defaultValues: getDefaultValues()
+    defaultValues: getDefaultValues(),
+    mode: "onChange",
+    reValidateMode: "onChange",
+    criteriaMode: "all"
   });
 
   useEffect(() => {
@@ -407,59 +410,51 @@ export const CreateTemplateModal = ({ isOpen, onClose, template, mode = "create"
   };
 
   const onFormSubmit = async (data: FormData) => {
-    try {
-      if (!currentProject?.id && !isEdit) return;
+    if (!currentProject?.id && !isEdit) return;
 
-      const hasEmptyAttributeValues = data.attributes?.some(
-        (attr) => !attr.value || attr.value.length === 0 || attr.value.some((v) => !v.trim())
-      );
+    const hasEmptyAttributeValues = data.attributes?.some(
+      (attr) => !attr.value || attr.value.length === 0 || attr.value.some((v) => !v.trim())
+    );
 
-      const hasEmptySanValues = data.subjectAlternativeNames?.some(
-        (san) => !san.value || san.value.length === 0 || san.value.some((v) => !v.trim())
-      );
-
-      if (hasEmptyAttributeValues || hasEmptySanValues) {
-        createNotification({
-          text: "All values must be non-empty. Use wildcards (*) if needed.",
-          type: "error"
-        });
-        return;
-      }
-
-      const transformedData = transformToApiFormat(data);
-
-      if (isEdit) {
-        const updateData = {
-          templateId: template.id,
-          ...transformedData
-        };
-        await updateTemplate.mutateAsync(updateData);
-      } else {
-        if (!currentProject?.id) {
-          throw new Error("Project ID is required for creating a template");
-        }
-
-        const createData = {
-          projectId: currentProject.id,
-          ...transformedData
-        };
-        await createTemplate.mutateAsync(createData);
-      }
+    const hasEmptySanValues = data.subjectAlternativeNames?.some(
+      (san) => !san.value || san.value.length === 0 || san.value.some((v) => !v.trim())
+    );
 
+    if (hasEmptyAttributeValues || hasEmptySanValues) {
       createNotification({
-        text: `Certificate template ${isEdit ? "updated" : "created"} successfully`,
-        type: "success"
-      });
-
-      reset();
-      onClose();
-    } catch (error) {
-      console.error(`Error ${isEdit ? "updating" : "creating"} template:`, error);
-      createNotification({
-        text: `Failed to ${isEdit ? "update" : "create"} certificate template`,
+        text: "All values must be non-empty. Use wildcards (*) if needed.",
         type: "error"
       });
+      return;
     }
+
+    const transformedData = transformToApiFormat(data);
+
+    if (isEdit) {
+      const updateData = {
+        templateId: template.id,
+        ...transformedData
+      };
+      await updateTemplate.mutateAsync(updateData);
+    } else {
+      if (!currentProject?.id) {
+        throw new Error("Project ID is required for creating a template");
+      }
+
+      const createData = {
+        projectId: currentProject.id,
+        ...transformedData
+      };
+      await createTemplate.mutateAsync(createData);
+    }
+
+    createNotification({
+      text: `Certificate template ${isEdit ? "updated" : "created"} successfully`,
+      type: "success"
+    });
+
+    reset();
+    onClose();
   };
 
   const addAttribute = () => {

frontend/src/pages/kms/KmipPage/components/DeleteKmipClientModal.tsx

@@ -17,28 +17,17 @@ export const DeleteKmipClientModal = ({ isOpen, onOpenChange, kmipClient }: Prop
   const { id, projectId, name } = kmipClient;
 
   const handleDeleteKmipClient = async () => {
-    try {
-      await deleteKmipClients.mutateAsync({
-        id,
-        projectId
-      });
+    await deleteKmipClients.mutateAsync({
+      id,
+      projectId
+    });
 
-      createNotification({
-        text: "KMIP client successfully deleted",
-        type: "success"
-      });
+    createNotification({
+      text: "KMIP client successfully deleted",
+      type: "success"
+    });
 
-      onOpenChange(false);
-    } catch (err) {
-      console.error(err);
-      const error = err as any;
-      const text = error?.response?.data?.message ?? "Failed to delete KMIP client";
-
-      createNotification({
-        text,
-        type: "error"
-      });
-    }
+    onOpenChange(false);
   };
 
   return (

frontend/src/pages/kms/KmipPage/components/KmipClientModal.tsx

@@ -98,20 +98,12 @@ const KmipClientForm = ({ onComplete, kmipClient }: FormProps) => {
             .map(([key]) => key as KmipPermission)
         });
 
-    try {
-      await mutation;
-      createNotification({
-        text: `Successfully ${isUpdate ? "updated" : "added"} KMIP client`,
-        type: "success"
-      });
-      onComplete();
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: `Failed to ${isUpdate ? "update" : "add"} KMIP client`,
-        type: "error"
-      });
-    }
+    await mutation;
+    createNotification({
+      text: `Successfully ${isUpdate ? "updated" : "added"} KMIP client`,
+      type: "success"
+    });
+    onComplete();
   };
 
   return (

frontend/src/pages/kms/OverviewPage/components/CmekDecryptModal.tsx

@@ -52,23 +52,15 @@ const DecryptForm = ({ cmek }: FormProps) => {
   });
 
   const handleDecryptData = async (formData: FormData) => {
-    try {
-      const data = await cmekDecrypt.mutateAsync({ ...formData, keyId: cmek.id });
-      createNotification({
-        text: "Successfully decrypted data",
-        type: "success"
-      });
+    const data = await cmekDecrypt.mutateAsync({ ...formData, keyId: cmek.id });
+    createNotification({
+      text: "Successfully decrypted data",
+      type: "success"
+    });
 
-      setPlaintext(
-        shouldDecode ? Buffer.from(decodeBase64(data.plaintext)).toString("utf8") : data.plaintext
-      );
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to decrypt data",
-        type: "error"
-      });
-    }
+    setPlaintext(
+      shouldDecode ? Buffer.from(decodeBase64(data.plaintext)).toString("utf8") : data.plaintext
+    );
   };
 
   useEffect(() => {

frontend/src/pages/kms/OverviewPage/components/CmekEncryptModal.tsx

@@ -53,19 +53,11 @@ const EncryptForm = ({ cmek }: FormProps) => {
   });
 
   const handleEncryptData = async (formData: FormData) => {
-    try {
-      await cmekEncrypt.mutateAsync({ ...formData, keyId: cmek.id });
-      createNotification({
-        text: "Successfully encrypted data",
-        type: "success"
-      });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to encrypt data",
-        type: "error"
-      });
-    }
+    await cmekEncrypt.mutateAsync({ ...formData, keyId: cmek.id });
+    createNotification({
+      text: "Successfully encrypted data",
+      type: "success"
+    });
   };
 
   const ciphertext = cmekEncrypt.data?.ciphertext;

frontend/src/pages/kms/OverviewPage/components/CmekModal.tsx

@@ -86,20 +86,12 @@ const CmekForm = ({ onComplete, cmek }: FormProps) => {
           encryptionAlgorithm: encryptionAlgorithm as AsymmetricKeyAlgorithm | SymmetricKeyAlgorithm
         });
 
-    try {
-      await mutation;
-      createNotification({
-        text: `Successfully ${isUpdate ? "updated" : "added"} key`,
-        type: "success"
-      });
-      onComplete();
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: `Failed to ${isUpdate ? "update" : "add"} key`,
-        type: "error"
-      });
-    }
+    await mutation;
+    createNotification({
+      text: `Successfully ${isUpdate ? "updated" : "added"} key`,
+      type: "success"
+    });
+    onComplete();
   };
 
   const selectedKeyUsage = watch("keyUsage");

frontend/src/pages/kms/OverviewPage/components/CmekSignModal.tsx

@@ -59,19 +59,11 @@ const SignForm = ({ cmek }: FormProps) => {
   });
 
   const handleSignData = async (formData: FormData) => {
-    try {
-      await cmekSign.mutateAsync({ ...formData, keyId: cmek.id });
-      createNotification({
-        text: "Successfully signed data",
-        type: "success"
-      });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to sign data",
-        type: "error"
-      });
-    }
+    await cmekSign.mutateAsync({ ...formData, keyId: cmek.id });
+    createNotification({
+      text: "Successfully signed data",
+      type: "success"
+    });
   };
 
   const signature = cmekSign.data?.signature;

frontend/src/pages/kms/OverviewPage/components/CmekTable.tsx

@@ -152,28 +152,16 @@ export const CmekTable = () => {
   const updateCmek = useUpdateCmek();
 
   const handleDisableCmek = async ({ id: keyId, isDisabled }: TCmek) => {
-    try {
-      await updateCmek.mutateAsync({
-        keyId,
-        projectId,
-        isDisabled: !isDisabled
-      });
+    await updateCmek.mutateAsync({
+      keyId,
+      projectId,
+      isDisabled: !isDisabled
+    });
 
-      createNotification({
-        text: `Key successfully ${isDisabled ? "enabled" : "disabled"}`,
-        type: "success"
-      });
-    } catch (err) {
-      console.error(err);
-      const error = err as any;
-      const text =
-        error?.response?.data?.message ?? `Failed to ${isDisabled ? "enable" : "disable"} key`;
-
-      createNotification({
-        text,
-        type: "error"
-      });
-    }
+    createNotification({
+      text: `Key successfully ${isDisabled ? "enabled" : "disabled"}`,
+      type: "success"
+    });
   };
 
   const cannotEditKey = permission.cannot(

frontend/src/pages/kms/OverviewPage/components/CmekVerifyModal.tsx

@@ -69,25 +69,17 @@ const VerifyForm = ({ cmek }: FormProps) => {
   });
 
   const handleVerifyData = async (formData: FormData) => {
-    try {
-      const result = await cmekVerify.mutateAsync({ ...formData, keyId: cmek.id });
+    const result = await cmekVerify.mutateAsync({ ...formData, keyId: cmek.id });
 
-      if (result.signatureValid) {
-        createNotification({
-          text: "Successfully verified signature",
-          type: "success"
-        });
-      } else {
-        createNotification({
-          title: "Signature Verification Failed",
-          text: "The signature is invalid. The signature was not created using the same signing algorithm and key as the one used to sign the data. The data and signature may have been tampered with.",
-          type: "error"
-        });
-      }
-    } catch (err) {
-      console.error(err);
+    if (result.signatureValid) {
       createNotification({
-        text: "Failed to sign data",
+        text: "Successfully verified signature",
+        type: "success"
+      });
+    } else {
+      createNotification({
+        title: "Signature Verification Failed",
+        text: "The signature is invalid. The signature was not created using the same signing algorithm and key as the one used to sign the data. The data and signature may have been tampered with.",
         type: "error"
       });
     }

frontend/src/pages/kms/OverviewPage/components/DeleteCmekModal.tsx

@@ -16,28 +16,17 @@ export const DeleteCmekModal = ({ isOpen, onOpenChange, cmek }: Props) => {
   const { id: keyId, projectId, name } = cmek;
 
   const handleDeleteCmek = async () => {
-    try {
-      await deleteCmek.mutateAsync({
-        keyId,
-        projectId
-      });
+    await deleteCmek.mutateAsync({
+      keyId,
+      projectId
+    });
 
-      createNotification({
-        text: "Key successfully deleted",
-        type: "success"
-      });
+    createNotification({
+      text: "Key successfully deleted",
+      type: "success"
+    });
 
-      onOpenChange(false);
-    } catch (err) {
-      console.error(err);
-      const error = err as any;
-      const text = error?.response?.data?.message ?? "Failed to delete key";
-
-      createNotification({
-        text,
-        type: "error"
-      });
-    }
+    onOpenChange(false);
   };
 
   return (

frontend/src/pages/organization/AccessManagementPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupModal.tsx

@@ -74,43 +74,36 @@ export const OrgGroupModal = ({ popUp, handlePopUpClose, handlePopUpToggle }: Pr
   }, [popUp?.group?.data, roles]);
 
   const onGroupModalSubmit = async ({ name, slug, role }: TGroupFormData) => {
-    try {
-      if (!currentOrg?.id) return;
+    if (!currentOrg?.id) return;
 
-      const group = popUp?.group?.data as {
-        groupId: string;
-        name: string;
-        slug: string;
-      };
+    const group = popUp?.group?.data as {
+      groupId: string;
+      name: string;
+      slug: string;
+    };
 
-      if (group) {
-        await updateMutateAsync({
-          id: group.groupId,
-          name,
-          slug,
-          role: role.slug || undefined
-        });
-      } else {
-        await createMutateAsync({
-          name,
-          slug,
-          organizationId: currentOrg.id,
-          role: role.slug || undefined
-        });
-      }
-      handlePopUpToggle("group", false);
-      reset();
-
-      createNotification({
-        text: `Successfully ${popUp?.group?.data ? "updated" : "created"} group`,
-        type: "success"
+    if (group) {
+      await updateMutateAsync({
+        id: group.groupId,
+        name,
+        slug,
+        role: role.slug || undefined
       });
-    } catch {
-      createNotification({
-        text: `Failed to ${popUp?.group?.data ? "updated" : "created"} group`,
-        type: "error"
+    } else {
+      await createMutateAsync({
+        name,
+        slug,
+        organizationId: currentOrg.id,
+        role: role.slug || undefined
       });
     }
+    handlePopUpToggle("group", false);
+    reset();
+
+    createNotification({
+      text: `Successfully ${popUp?.group?.data ? "updated" : "created"} group`,
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/organization/AccessManagementPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx

@@ -36,21 +36,13 @@ export const OrgGroupsSection = () => {
   };
 
   const onDeleteGroupSubmit = async ({ name, groupId }: { name: string; groupId: string }) => {
-    try {
-      await deleteMutateAsync({
-        id: groupId
-      });
-      createNotification({
-        text: `Successfully deleted the group named ${name}`,
-        type: "success"
-      });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: `Failed to delete the group named ${name}`,
-        type: "error"
-      });
-    }
+    await deleteMutateAsync({
+      id: groupId
+    });
+    createNotification({
+      text: `Successfully deleted the group named ${name}`,
+      type: "success"
+    });
 
     handlePopUpClose("deleteGroup");
   };

frontend/src/pages/organization/AccessManagementPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx

@@ -79,23 +79,15 @@ export const OrgGroupsTable = ({ handlePopUpOpen }: Props) => {
   const { data: roles } = useGetOrgRoles(orgId);
 
   const handleChangeRole = async ({ id, role }: { id: string; role: string }) => {
-    try {
-      await updateMutateAsync({
-        id,
-        role
-      });
+    await updateMutateAsync({
+      id,
+      role
+    });
 
-      createNotification({
-        text: "Successfully updated group role",
-        type: "success"
-      });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to update group role",
-        type: "error"
-      });
-    }
+    createNotification({
+      text: "Successfully updated group role",
+      type: "success"
+    });
   };
 
   const {

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAliCloudAuthForm.tsx

@@ -140,45 +140,38 @@ export const IdentityAliCloudAuthForm = ({
     accessTokenNumUsesLimit,
     accessTokenTrustedIps
   }: FormData) => {
-    try {
-      if (!identityId) return;
+    if (!identityId) return;
 
-      if (data) {
-        await updateMutateAsync({
-          organizationId: orgId,
-          allowedArns,
-          identityId,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      } else {
-        await addMutateAsync({
-          organizationId: orgId,
-          identityId,
-          allowedArns,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      }
-
-      handlePopUpToggle("identityAuthMethod", false);
-
-      createNotification({
-        text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
-        type: "success"
+    if (data) {
+      await updateMutateAsync({
+        organizationId: orgId,
+        allowedArns,
+        identityId,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
-
-      reset();
-    } catch {
-      createNotification({
-        text: `Failed to ${isUpdate ? "update" : "configure"} identity`,
-        type: "error"
+    } else {
+      await addMutateAsync({
+        organizationId: orgId,
+        identityId,
+        allowedArns,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
     }
+
+    handlePopUpToggle("identityAuthMethod", false);
+
+    createNotification({
+      text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
+      type: "success"
+    });
+
+    reset();
   };
 
   return (

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAuthTemplateModal.tsx

@@ -103,56 +103,44 @@ export const IdentityAuthTemplateModal = ({ popUp, handlePopUpToggle }: Props) =
   const selectedMethod = watch("method");
 
   const onFormSubmit = async (data: FormData) => {
-    try {
-      if (isEdit && template) {
-        await updateTemplate({
-          templateId: template.id,
-          organizationId: orgId,
-          name: data.name,
-          templateFields: {
-            url: data.url,
-            bindDN: data.bindDN,
-            bindPass: data.bindPass,
-            searchBase: data.searchBase,
-            ldapCaCertificate: data.ldapCaCertificate
-          }
-        });
-        createNotification({
-          text: "Successfully updated auth template",
-          type: "success"
-        });
-      } else {
-        await createTemplate({
-          organizationId: orgId,
-          name: data.name,
-          authMethod: data.method,
-          templateFields: {
-            url: data.url,
-            bindDN: data.bindDN,
-            bindPass: data.bindPass,
-            searchBase: data.searchBase,
-            ldapCaCertificate: data.ldapCaCertificate
-          }
-        });
-        createNotification({
-          text: "Successfully created auth template",
-          type: "success"
-        });
-      }
-
-      handlePopUpToggle(isEdit ? "editTemplate" : "createTemplate", false);
-      reset();
-    } catch (err) {
-      console.error(err);
-      const error = err as any;
-      const text =
-        error?.response?.data?.message ?? `Failed to ${isEdit ? "update" : "create"} auth template`;
-
+    if (isEdit && template) {
+      await updateTemplate({
+        templateId: template.id,
+        organizationId: orgId,
+        name: data.name,
+        templateFields: {
+          url: data.url,
+          bindDN: data.bindDN,
+          bindPass: data.bindPass,
+          searchBase: data.searchBase,
+          ldapCaCertificate: data.ldapCaCertificate
+        }
+      });
       createNotification({
-        text,
-        type: "error"
+        text: "Successfully updated auth template",
+        type: "success"
+      });
+    } else {
+      await createTemplate({
+        organizationId: orgId,
+        name: data.name,
+        authMethod: data.method,
+        templateFields: {
+          url: data.url,
+          bindDN: data.bindDN,
+          bindPass: data.bindPass,
+          searchBase: data.searchBase,
+          ldapCaCertificate: data.ldapCaCertificate
+        }
+      });
+      createNotification({
+        text: "Successfully created auth template",
+        type: "success"
       });
     }
+
+    handlePopUpToggle(isEdit ? "editTemplate" : "createTemplate", false);
+    reset();
   };
 
   const handleClose = () => {

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAwsAuthForm.tsx

@@ -150,49 +150,42 @@ export const IdentityAwsAuthForm = ({
     accessTokenNumUsesLimit,
     accessTokenTrustedIps
   }: FormData) => {
-    try {
-      if (!identityId) return;
+    if (!identityId) return;
 
-      if (data) {
-        await updateMutateAsync({
-          organizationId: orgId,
-          stsEndpoint,
-          allowedPrincipalArns,
-          allowedAccountIds,
-          identityId,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      } else {
-        await addMutateAsync({
-          organizationId: orgId,
-          identityId,
-          stsEndpoint: stsEndpoint || "",
-          allowedPrincipalArns: allowedPrincipalArns || "",
-          allowedAccountIds: allowedAccountIds || "",
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      }
-
-      handlePopUpToggle("identityAuthMethod", false);
-
-      createNotification({
-        text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
-        type: "success"
+    if (data) {
+      await updateMutateAsync({
+        organizationId: orgId,
+        stsEndpoint,
+        allowedPrincipalArns,
+        allowedAccountIds,
+        identityId,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
-
-      reset();
-    } catch {
-      createNotification({
-        text: `Failed to ${isUpdate ? "update" : "configure"} identity`,
-        type: "error"
+    } else {
+      await addMutateAsync({
+        organizationId: orgId,
+        identityId,
+        stsEndpoint: stsEndpoint || "",
+        allowedPrincipalArns: allowedPrincipalArns || "",
+        allowedAccountIds: allowedAccountIds || "",
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
     }
+
+    handlePopUpToggle("identityAuthMethod", false);
+
+    createNotification({
+      text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
+      type: "success"
+    });
+
+    reset();
   };
 
   return (

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAzureAuthForm.tsx

@@ -146,49 +146,42 @@ export const IdentityAzureAuthForm = ({
     accessTokenNumUsesLimit,
     accessTokenTrustedIps
   }: FormData) => {
-    try {
-      if (!identityId) return;
+    if (!identityId) return;
 
-      if (data) {
-        await updateMutateAsync({
-          organizationId: orgId,
-          identityId,
-          tenantId,
-          resource,
-          allowedServicePrincipalIds,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      } else {
-        await addMutateAsync({
-          organizationId: orgId,
-          identityId,
-          tenantId: tenantId || "",
-          resource: resource || "",
-          allowedServicePrincipalIds: allowedServicePrincipalIds || "",
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      }
-
-      handlePopUpToggle("identityAuthMethod", false);
-
-      createNotification({
-        text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
-        type: "success"
+    if (data) {
+      await updateMutateAsync({
+        organizationId: orgId,
+        identityId,
+        tenantId,
+        resource,
+        allowedServicePrincipalIds,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
-
-      reset();
-    } catch {
-      createNotification({
-        text: `Failed to ${isUpdate ? "update" : "configure"} identity`,
-        type: "error"
+    } else {
+      await addMutateAsync({
+        organizationId: orgId,
+        identityId,
+        tenantId: tenantId || "",
+        resource: resource || "",
+        allowedServicePrincipalIds: allowedServicePrincipalIds || "",
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
     }
+
+    handlePopUpToggle("identityAuthMethod", false);
+
+    createNotification({
+      text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
+      type: "success"
+    });
+
+    reset();
   };
 
   return (

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityGcpAuthForm.tsx

@@ -155,51 +155,44 @@ export const IdentityGcpAuthForm = ({
     accessTokenNumUsesLimit,
     accessTokenTrustedIps
   }: FormData) => {
-    try {
-      if (!identityId) return;
+    if (!identityId) return;
 
-      if (data) {
-        await updateMutateAsync({
-          identityId,
-          organizationId: orgId,
-          type,
-          allowedServiceAccounts,
-          allowedProjects,
-          allowedZones,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      } else {
-        await addMutateAsync({
-          identityId,
-          organizationId: orgId,
-          type,
-          allowedServiceAccounts: allowedServiceAccounts || "",
-          allowedProjects: allowedProjects || "",
-          allowedZones: allowedZones || "",
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      }
-
-      handlePopUpToggle("identityAuthMethod", false);
-
-      createNotification({
-        text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
-        type: "success"
+    if (data) {
+      await updateMutateAsync({
+        identityId,
+        organizationId: orgId,
+        type,
+        allowedServiceAccounts,
+        allowedProjects,
+        allowedZones,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
-
-      reset();
-    } catch {
-      createNotification({
-        text: `Failed to ${isUpdate ? "update" : "configure"} identity`,
-        type: "error"
+    } else {
+      await addMutateAsync({
+        identityId,
+        organizationId: orgId,
+        type,
+        allowedServiceAccounts: allowedServiceAccounts || "",
+        allowedProjects: allowedProjects || "",
+        allowedZones: allowedZones || "",
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
     }
+
+    handlePopUpToggle("identityAuthMethod", false);
+
+    createNotification({
+      text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
+      type: "success"
+    });
+
+    reset();
   };
 
   return (

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityJwtAuthForm.tsx

@@ -220,61 +220,54 @@ export const IdentityJwtAuthForm = ({
     boundClaims,
     boundSubject
   }: FormData) => {
-    try {
-      if (!identityId) {
-        return;
-      }
+    if (!identityId) {
+      return;
+    }
 
-      if (data) {
-        await updateMutateAsync({
-          identityId,
-          organizationId: orgId,
-          configurationType,
-          jwksUrl,
-          jwksCaCert,
-          publicKeys: publicKeys?.map((field) => field.value).filter(Boolean),
-          boundIssuer,
-          boundAudiences,
-          boundClaims: Object.fromEntries(boundClaims.map((entry) => [entry.key, entry.value])),
-          boundSubject,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      } else {
-        await addMutateAsync({
-          identityId,
-          configurationType,
-          jwksUrl,
-          jwksCaCert,
-          publicKeys: publicKeys?.map((field) => field.value).filter(Boolean),
-          boundIssuer,
-          boundAudiences,
-          boundClaims: Object.fromEntries(boundClaims.map((entry) => [entry.key, entry.value])),
-          boundSubject,
-          organizationId: orgId,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      }
-
-      handlePopUpToggle("identityAuthMethod", false);
-
-      createNotification({
-        text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
-        type: "success"
+    if (data) {
+      await updateMutateAsync({
+        identityId,
+        organizationId: orgId,
+        configurationType,
+        jwksUrl,
+        jwksCaCert,
+        publicKeys: publicKeys?.map((field) => field.value).filter(Boolean),
+        boundIssuer,
+        boundAudiences,
+        boundClaims: Object.fromEntries(boundClaims.map((entry) => [entry.key, entry.value])),
+        boundSubject,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
-
-      reset();
-    } catch {
-      createNotification({
-        text: `Failed to ${isUpdate ? "update" : "configure"} identity`,
-        type: "error"
+    } else {
+      await addMutateAsync({
+        identityId,
+        configurationType,
+        jwksUrl,
+        jwksCaCert,
+        publicKeys: publicKeys?.map((field) => field.value).filter(Boolean),
+        boundIssuer,
+        boundAudiences,
+        boundClaims: Object.fromEntries(boundClaims.map((entry) => [entry.key, entry.value])),
+        boundSubject,
+        organizationId: orgId,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
     }
+
+    handlePopUpToggle("identityAuthMethod", false);
+
+    createNotification({
+      text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
+      type: "success"
+    });
+
+    reset();
   };
 
   return (

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityKubernetesAuthForm.tsx

@@ -314,71 +314,64 @@ export const IdentityKubernetesAuthForm = ({
     tokenReviewMode,
     accessTokenTrustedIps
   }: FormData) => {
-    try {
-      if (!identityId) return;
+    if (!identityId) return;
 
-      if (data) {
-        await updateMutateAsync({
-          organizationId: orgId,
-          ...(tokenReviewMode === IdentityKubernetesAuthTokenReviewMode.Api
-            ? {
-                kubernetesHost: kubernetesHost || ""
-              }
-            : {
-                kubernetesHost: null
-              }),
-          tokenReviewerJwt: tokenReviewerJwt || null,
-          allowedNames,
-          allowedNamespaces,
-          allowedAudience,
-          caCert,
-          identityId,
-          gatewayId: gatewayId || null,
-          tokenReviewMode,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      } else {
-        await addMutateAsync({
-          organizationId: orgId,
-          identityId,
-          ...(tokenReviewMode === IdentityKubernetesAuthTokenReviewMode.Api
-            ? {
-                kubernetesHost: kubernetesHost || ""
-              }
-            : {
-                kubernetesHost: null
-              }),
-          tokenReviewerJwt: tokenReviewerJwt || undefined,
-          allowedNames: allowedNames || "",
-          allowedNamespaces: allowedNamespaces || "",
-          allowedAudience: allowedAudience || "",
-          gatewayId: gatewayId || null,
-          caCert: caCert || "",
-          tokenReviewMode,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      }
-
-      handlePopUpToggle("identityAuthMethod", false);
-
-      createNotification({
-        text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
-        type: "success"
+    if (data) {
+      await updateMutateAsync({
+        organizationId: orgId,
+        ...(tokenReviewMode === IdentityKubernetesAuthTokenReviewMode.Api
+          ? {
+              kubernetesHost: kubernetesHost || ""
+            }
+          : {
+              kubernetesHost: null
+            }),
+        tokenReviewerJwt: tokenReviewerJwt || null,
+        allowedNames,
+        allowedNamespaces,
+        allowedAudience,
+        caCert,
+        identityId,
+        gatewayId: gatewayId || null,
+        tokenReviewMode,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
-
-      reset();
-    } catch {
-      createNotification({
-        text: `Failed to ${isUpdate ? "update" : "configure"} identity`,
-        type: "error"
+    } else {
+      await addMutateAsync({
+        organizationId: orgId,
+        identityId,
+        ...(tokenReviewMode === IdentityKubernetesAuthTokenReviewMode.Api
+          ? {
+              kubernetesHost: kubernetesHost || ""
+            }
+          : {
+              kubernetesHost: null
+            }),
+        tokenReviewerJwt: tokenReviewerJwt || undefined,
+        allowedNames: allowedNames || "",
+        allowedNamespaces: allowedNamespaces || "",
+        allowedAudience: allowedAudience || "",
+        gatewayId: gatewayId || null,
+        caCert: caCert || "",
+        tokenReviewMode,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
     }
+
+    handlePopUpToggle("identityAuthMethod", false);
+
+    createNotification({
+      text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
+      type: "success"
+    });
+
+    reset();
   };
 
   const tokenReviewMode = watch("tokenReviewMode");

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityLdapAuthForm.tsx

@@ -316,83 +316,76 @@ export const IdentityLdapAuthForm = ({
   }, [subscription, handlePopUpOpen, handlePopUpToggle]);
 
   const onFormSubmit = async (formData: FormData) => {
-    try {
-      if (!identityId) return;
+    if (!identityId) return;
 
-      const {
-        scope: submissionScope,
-        templateId: submissionTemplateId,
-        url: submissionUrl,
-        bindDN: submissionBindDN,
-        bindPass: submissionBindPass,
-        searchBase: submissionSearchBase,
-        searchFilter,
-        ldapCaCertificate,
-        allowedFields,
-        accessTokenTTL,
-        accessTokenMaxTTL,
-        accessTokenNumUsesLimit,
-        accessTokenTrustedIps,
-        lockoutEnabled,
-        lockoutThreshold,
-        lockoutDurationValue,
-        lockoutDurationUnit,
-        lockoutCounterResetValue,
-        lockoutCounterResetUnit
-      } = formData;
+    const {
+      scope: submissionScope,
+      templateId: submissionTemplateId,
+      url: submissionUrl,
+      bindDN: submissionBindDN,
+      bindPass: submissionBindPass,
+      searchBase: submissionSearchBase,
+      searchFilter,
+      ldapCaCertificate,
+      allowedFields,
+      accessTokenTTL,
+      accessTokenMaxTTL,
+      accessTokenNumUsesLimit,
+      accessTokenTrustedIps,
+      lockoutEnabled,
+      lockoutThreshold,
+      lockoutDurationValue,
+      lockoutDurationUnit,
+      lockoutCounterResetValue,
+      lockoutCounterResetUnit
+    } = formData;
 
-      const lockoutDurationSeconds = ms(`${lockoutDurationValue}${lockoutDurationUnit}`) / 1000;
-      const lockoutCounterResetSeconds =
-        ms(`${lockoutCounterResetValue}${lockoutCounterResetUnit}`) / 1000;
+    const lockoutDurationSeconds = ms(`${lockoutDurationValue}${lockoutDurationUnit}`) / 1000;
+    const lockoutCounterResetSeconds =
+      ms(`${lockoutCounterResetValue}${lockoutCounterResetUnit}`) / 1000;
 
-      const basePayload = {
-        organizationId: orgId,
-        identityId,
-        searchFilter,
-        ldapCaCertificate,
-        allowedFields,
-        accessTokenTTL: Number(accessTokenTTL),
-        accessTokenMaxTTL: Number(accessTokenMaxTTL),
-        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-        accessTokenTrustedIps,
-        lockoutEnabled,
-        lockoutThreshold: Number(lockoutThreshold),
-        lockoutDurationSeconds,
-        lockoutCounterResetSeconds
-      };
+    const basePayload = {
+      organizationId: orgId,
+      identityId,
+      searchFilter,
+      ldapCaCertificate,
+      allowedFields,
+      accessTokenTTL: Number(accessTokenTTL),
+      accessTokenMaxTTL: Number(accessTokenMaxTTL),
+      accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+      accessTokenTrustedIps,
+      lockoutEnabled,
+      lockoutThreshold: Number(lockoutThreshold),
+      lockoutDurationSeconds,
+      lockoutCounterResetSeconds
+    };
 
-      // Add scope-specific fields
-      const payload =
-        submissionScope === "template"
-          ? { ...basePayload, templateId: submissionTemplateId }
-          : {
-              ...basePayload,
-              url: submissionUrl,
-              bindDN: submissionBindDN,
-              bindPass: submissionBindPass,
-              searchBase: submissionSearchBase
-            };
+    // Add scope-specific fields
+    const payload =
+      submissionScope === "template"
+        ? { ...basePayload, templateId: submissionTemplateId }
+        : {
+            ...basePayload,
+            url: submissionUrl,
+            bindDN: submissionBindDN,
+            bindPass: submissionBindPass,
+            searchBase: submissionSearchBase
+          };
 
-      if (data) {
-        await updateMutateAsync(payload);
-      } else {
-        await addMutateAsync(payload);
-      }
-
-      handlePopUpToggle("identityAuthMethod", false);
-
-      createNotification({
-        text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
-        type: "success"
-      });
-
-      reset();
-    } catch {
-      createNotification({
-        text: `Failed to ${isUpdate ? "update" : "configure"} identity`,
-        type: "error"
-      });
+    if (data) {
+      await updateMutateAsync(payload);
+    } else {
+      await addMutateAsync(payload);
     }
+
+    handlePopUpToggle("identityAuthMethod", false);
+
+    createNotification({
+      text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
+      type: "success"
+    });
+
+    reset();
   };
 
   return (

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityLinkForm.tsx

@@ -42,31 +42,20 @@ export const IdentityLinkForm = ({ onClose }: Props) => {
   });
 
   const onFormSubmit = async ({ identity, role }: FormData) => {
-    try {
-      await createMutateAsync({
-        identityId: identity.id,
-        roles: [{ role: role.slug, isTemporary: false }]
-      });
-      createNotification({
-        text: "Successfully linked identity",
-        type: "success"
-      });
-      navigate({
-        to: "/organization/identities/$identityId",
-        params: {
-          identityId: identity.id
-        }
-      });
-    } catch (err) {
-      console.error(err);
-      const error = err as any;
-      const text = error?.response?.data?.message ?? "Failed to link identity";
-
-      createNotification({
-        text,
-        type: "error"
-      });
-    }
+    await createMutateAsync({
+      identityId: identity.id,
+      roles: [{ role: role.slug, isTemporary: false }]
+    });
+    createNotification({
+      text: "Successfully linked identity",
+      type: "success"
+    });
+    navigate({
+      to: "/organization/identities/$identityId",
+      params: {
+        identityId: identity.id
+      }
+    });
   };
 
   return (

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityModal.tsx

@@ -108,81 +108,68 @@ export const IdentityModal = ({ popUp, handlePopUpToggle }: Props) => {
   }, [popUp?.identity?.data, roles]);
 
   const onFormSubmit = async ({ name, role, metadata, hasDeleteProtection }: FormData) => {
-    try {
-      const identity = popUp?.identity?.data as {
-        identityId: string;
-        name: string;
-        role: string;
-        hasDeleteProtection: boolean;
-        orgId: string;
-      };
+    const identity = popUp?.identity?.data as {
+      identityId: string;
+      name: string;
+      role: string;
+      hasDeleteProtection: boolean;
+      orgId: string;
+    };
 
-      if (identity) {
-        // update
+    if (identity) {
+      // update
 
-        await updateMutateAsync({
-          identityId: identity.identityId,
-          name,
-          role: role.slug || undefined,
-          hasDeleteProtection,
-          organizationId: orgId,
-          metadata
-        });
-
-        handlePopUpToggle("identity", false);
-      } else {
-        // create
-
-        const { id: createdId } = await createMutateAsync({
-          name,
-          role: role.slug || undefined,
-          hasDeleteProtection,
-          organizationId: orgId,
-          metadata
-        });
-
-        await addMutateAsync({
-          organizationId: orgId,
-          identityId: createdId,
-          clientSecretTrustedIps: [{ ipAddress: "0.0.0.0/0" }, { ipAddress: "::/0" }],
-          accessTokenTrustedIps: [{ ipAddress: "0.0.0.0/0" }, { ipAddress: "::/0" }],
-          accessTokenTTL: 2592000,
-          accessTokenMaxTTL: 2592000,
-          accessTokenNumUsesLimit: 0,
-          accessTokenPeriod: 0,
-          lockoutEnabled: true,
-          lockoutThreshold: 3,
-          lockoutDurationSeconds: 300,
-          lockoutCounterResetSeconds: 30
-        });
-
-        handlePopUpToggle("identity", false);
-        navigate({
-          to: "/organization/identities/$identityId",
-          params: {
-            identityId: createdId
-          }
-        });
-      }
-
-      createNotification({
-        text: `Successfully ${popUp?.identity?.data ? "updated" : "created"} identity`,
-        type: "success"
+      await updateMutateAsync({
+        identityId: identity.identityId,
+        name,
+        role: role.slug || undefined,
+        hasDeleteProtection,
+        organizationId: orgId,
+        metadata
       });
 
-      reset();
-    } catch (err) {
-      console.error(err);
-      const error = err as any;
-      const text =
-        error?.response?.data?.message ??
-        `Failed to ${popUp?.identity?.data ? "update" : "create"} identity`;
+      handlePopUpToggle("identity", false);
+    } else {
+      // create
 
-      createNotification({
-        text,
-        type: "error"
+      const { id: createdId } = await createMutateAsync({
+        name,
+        role: role.slug || undefined,
+        hasDeleteProtection,
+        organizationId: orgId,
+        metadata
+      });
+
+      await addMutateAsync({
+        organizationId: orgId,
+        identityId: createdId,
+        clientSecretTrustedIps: [{ ipAddress: "0.0.0.0/0" }, { ipAddress: "::/0" }],
+        accessTokenTrustedIps: [{ ipAddress: "0.0.0.0/0" }, { ipAddress: "::/0" }],
+        accessTokenTTL: 2592000,
+        accessTokenMaxTTL: 2592000,
+        accessTokenNumUsesLimit: 0,
+        accessTokenPeriod: 0,
+        lockoutEnabled: true,
+        lockoutThreshold: 3,
+        lockoutDurationSeconds: 300,
+        lockoutCounterResetSeconds: 30
+      });
+
+      handlePopUpToggle("identity", false);
+      navigate({
+        to: "/organization/identities/$identityId",
+        params: {
+          identityId: createdId
+        }
       });
     }
+
+    createNotification({
+      text: `Successfully ${popUp?.identity?.data ? "updated" : "created"} identity`,
+      type: "success"
+    });
+
+    reset();
   };
 
   return (

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityOciAuthForm.tsx

@@ -152,47 +152,40 @@ export const IdentityOciAuthForm = ({
     accessTokenNumUsesLimit,
     accessTokenTrustedIps
   }: FormData) => {
-    try {
-      if (!identityId) return;
+    if (!identityId) return;
 
-      if (data) {
-        await updateMutateAsync({
-          organizationId: orgId,
-          tenancyOcid,
-          allowedUsernames,
-          identityId,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      } else {
-        await addMutateAsync({
-          organizationId: orgId,
-          identityId,
-          tenancyOcid,
-          allowedUsernames: allowedUsernames || undefined,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      }
-
-      handlePopUpToggle("identityAuthMethod", false);
-
-      createNotification({
-        text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
-        type: "success"
+    if (data) {
+      await updateMutateAsync({
+        organizationId: orgId,
+        tenancyOcid,
+        allowedUsernames,
+        identityId,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
-
-      reset();
-    } catch {
-      createNotification({
-        text: `Failed to ${isUpdate ? "update" : "configure"} identity`,
-        type: "error"
+    } else {
+      await addMutateAsync({
+        organizationId: orgId,
+        identityId,
+        tenancyOcid,
+        allowedUsernames: allowedUsernames || undefined,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
     }
+
+    handlePopUpToggle("identityAuthMethod", false);
+
+    createNotification({
+      text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
+      type: "success"
+    });
+
+    reset();
   };
 
   return (

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityOidcAuthForm.tsx

@@ -204,63 +204,56 @@ export const IdentityOidcAuthForm = ({
     claimMetadataMapping,
     boundSubject
   }: FormData) => {
-    try {
-      if (!identityId) {
-        return;
-      }
+    if (!identityId) {
+      return;
+    }
 
-      if (data) {
-        await updateMutateAsync({
-          identityId,
-          organizationId: orgId,
-          oidcDiscoveryUrl,
-          caCert,
-          boundIssuer,
-          boundAudiences,
-          boundClaims: Object.fromEntries(boundClaims.map((entry) => [entry.key, entry.value])),
-          claimMetadataMapping: claimMetadataMapping
-            ? Object.fromEntries(claimMetadataMapping.map((entry) => [entry.key, entry.value]))
-            : undefined,
-          boundSubject,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      } else {
-        await addMutateAsync({
-          identityId,
-          oidcDiscoveryUrl,
-          caCert,
-          boundIssuer,
-          boundAudiences,
-          boundClaims: Object.fromEntries(boundClaims.map((entry) => [entry.key, entry.value])),
-          claimMetadataMapping: claimMetadataMapping
-            ? Object.fromEntries(claimMetadataMapping.map((entry) => [entry.key, entry.value]))
-            : undefined,
-          boundSubject,
-          organizationId: orgId,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      }
-
-      handlePopUpToggle("identityAuthMethod", false);
-
-      createNotification({
-        text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
-        type: "success"
+    if (data) {
+      await updateMutateAsync({
+        identityId,
+        organizationId: orgId,
+        oidcDiscoveryUrl,
+        caCert,
+        boundIssuer,
+        boundAudiences,
+        boundClaims: Object.fromEntries(boundClaims.map((entry) => [entry.key, entry.value])),
+        claimMetadataMapping: claimMetadataMapping
+          ? Object.fromEntries(claimMetadataMapping.map((entry) => [entry.key, entry.value]))
+          : undefined,
+        boundSubject,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
-
-      reset();
-    } catch {
-      createNotification({
-        text: `Failed to ${isUpdate ? "update" : "configure"} identity`,
-        type: "error"
+    } else {
+      await addMutateAsync({
+        identityId,
+        oidcDiscoveryUrl,
+        caCert,
+        boundIssuer,
+        boundAudiences,
+        boundClaims: Object.fromEntries(boundClaims.map((entry) => [entry.key, entry.value])),
+        claimMetadataMapping: claimMetadataMapping
+          ? Object.fromEntries(claimMetadataMapping.map((entry) => [entry.key, entry.value]))
+          : undefined,
+        boundSubject,
+        organizationId: orgId,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
     }
+
+    handlePopUpToggle("identityAuthMethod", false);
+
+    createNotification({
+      text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
+      type: "success"
+    });
+
+    reset();
   };
 
   return (

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx

@@ -56,53 +56,31 @@ export const IdentitySection = withPermission(
     const isEnterprise = subscription?.slug === "enterprise";
 
     const onDeleteIdentitySubmit = async (identityId: string) => {
-      try {
-        await deleteMutateAsync({
-          identityId,
-          organizationId: orgId
-        });
+      await deleteMutateAsync({
+        identityId,
+        organizationId: orgId
+      });
 
-        createNotification({
-          text: "Successfully deleted identity",
-          type: "success"
-        });
+      createNotification({
+        text: "Successfully deleted identity",
+        type: "success"
+      });
 
-        handlePopUpClose("deleteIdentity");
-      } catch (err) {
-        console.error(err);
-        const error = err as any;
-        const text = error?.response?.data?.message ?? "Failed to delete identity";
-
-        createNotification({
-          text,
-          type: "error"
-        });
-      }
+      handlePopUpClose("deleteIdentity");
     };
 
     const onDeleteTemplateSubmit = async (templateId: string) => {
-      try {
-        await deleteTemplateMutateAsync({
-          templateId,
-          organizationId: orgId
-        });
+      await deleteTemplateMutateAsync({
+        templateId,
+        organizationId: orgId
+      });
 
-        createNotification({
-          text: "Successfully deleted template",
-          type: "success"
-        });
+      createNotification({
+        text: "Successfully deleted template",
+        type: "success"
+      });
 
-        handlePopUpClose("deleteTemplate");
-      } catch (err) {
-        console.error(err);
-        const error = err as any;
-        const text = error?.response?.data?.message ?? "Failed to delete template";
-
-        createNotification({
-          text,
-          type: "error"
-        });
-      }
+      handlePopUpClose("deleteTemplate");
     };
 
     return (

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityTable.tsx

@@ -145,27 +145,16 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
   };
 
   const handleChangeRole = async ({ identityId, role }: { identityId: string; role: string }) => {
-    try {
-      await updateMutateAsync({
-        identityId,
-        role,
-        organizationId
-      });
+    await updateMutateAsync({
+      identityId,
+      role,
+      organizationId
+    });
 
-      createNotification({
-        text: "Successfully updated identity role",
-        type: "success"
-      });
-    } catch (err) {
-      console.error(err);
-      const error = err as any;
-      const text = error?.response?.data?.message ?? "Failed to update identity role";
-
-      createNotification({
-        text,
-        type: "error"
-      });
-    }
+    createNotification({
+      text: "Successfully updated identity role",
+      type: "success"
+    });
   };
 
   const handleRoleToggle = useCallback(

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityTlsCertAuthForm.tsx

@@ -137,47 +137,40 @@ export const IdentityTlsCertAuthForm = ({
     accessTokenNumUsesLimit,
     accessTokenTrustedIps
   }: FormData) => {
-    try {
-      if (!identityId) return;
+    if (!identityId) return;
 
-      if (data) {
-        await updateMutateAsync({
-          organizationId: orgId,
-          caCertificate,
-          allowedCommonNames: allowedCommonNames || null,
-          identityId,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      } else {
-        await addMutateAsync({
-          organizationId: orgId,
-          identityId,
-          caCertificate,
-          allowedCommonNames: allowedCommonNames || undefined,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      }
-
-      handlePopUpToggle("identityAuthMethod", false);
-
-      createNotification({
-        text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
-        type: "success"
+    if (data) {
+      await updateMutateAsync({
+        organizationId: orgId,
+        caCertificate,
+        allowedCommonNames: allowedCommonNames || null,
+        identityId,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
-
-      reset();
-    } catch {
-      createNotification({
-        text: `Failed to ${isUpdate ? "update" : "configure"} identity`,
-        type: "error"
+    } else {
+      await addMutateAsync({
+        organizationId: orgId,
+        identityId,
+        caCertificate,
+        allowedCommonNames: allowedCommonNames || undefined,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
     }
+
+    handlePopUpToggle("identityAuthMethod", false);
+
+    createNotification({
+      text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
+      type: "success"
+    });
+
+    reset();
   };
 
   return (

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthForm.tsx

@@ -130,43 +130,36 @@ export const IdentityTokenAuthForm = ({
     accessTokenNumUsesLimit,
     accessTokenTrustedIps
   }: FormData) => {
-    try {
-      if (!identityId) return;
+    if (!identityId) return;
 
-      if (data) {
-        await updateMutateAsync({
-          organizationId: orgId,
-          identityId,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      } else {
-        await addMutateAsync({
-          organizationId: orgId,
-          identityId,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      }
-
-      handlePopUpToggle("identityAuthMethod", false);
-
-      createNotification({
-        text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
-        type: "success"
+    if (data) {
+      await updateMutateAsync({
+        organizationId: orgId,
+        identityId,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
-
-      reset();
-    } catch {
-      createNotification({
-        text: `Failed to ${isUpdate ? "update" : "configure"} identity`,
-        type: "error"
+    } else {
+      await addMutateAsync({
+        organizationId: orgId,
+        identityId,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps
       });
     }
+
+    handlePopUpToggle("identityAuthMethod", false);
+
+    createNotification({
+      text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
+      type: "success"
+    });
+
+    reset();
   };
 
   return (

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthForm.tsx

@@ -223,64 +223,55 @@ export const IdentityUniversalAuthForm = ({
     lockoutCounterResetValue,
     lockoutCounterResetUnit
   }: FormData) => {
-    try {
-      if (!identityId) return;
+    if (!identityId) return;
 
-      const lockoutDurationSeconds = ms(`${lockoutDurationValue}${lockoutDurationUnit}`) / 1000;
-      const lockoutCounterResetSeconds =
-        ms(`${lockoutCounterResetValue}${lockoutCounterResetUnit}`) / 1000;
+    const lockoutDurationSeconds = ms(`${lockoutDurationValue}${lockoutDurationUnit}`) / 1000;
+    const lockoutCounterResetSeconds =
+      ms(`${lockoutCounterResetValue}${lockoutCounterResetUnit}`) / 1000;
 
-      if (data) {
-        // update universal auth configuration
-        await updateMutateAsync({
-          organizationId: orgId,
-          identityId,
-          clientSecretTrustedIps,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps,
-          accessTokenPeriod: Number(accessTokenPeriod),
-          lockoutEnabled,
-          lockoutThreshold: Number(lockoutThreshold),
-          lockoutDurationSeconds,
-          lockoutCounterResetSeconds
-        });
-      } else {
-        // create new universal auth configuration
-
-        await addMutateAsync({
-          organizationId: orgId,
-          identityId,
-          clientSecretTrustedIps,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps,
-          accessTokenPeriod: Number(accessTokenPeriod),
-          lockoutEnabled,
-          lockoutThreshold: Number(lockoutThreshold),
-          lockoutDurationSeconds: Number(lockoutDurationSeconds),
-          lockoutCounterResetSeconds: Number(lockoutCounterResetSeconds)
-        });
-      }
-
-      handlePopUpToggle("identityAuthMethod", false);
-
-      createNotification({
-        text: `Successfully ${isUpdate ? "updated" : "created"} auth method`,
-        type: "success"
+    if (data) {
+      // update universal auth configuration
+      await updateMutateAsync({
+        organizationId: orgId,
+        identityId,
+        clientSecretTrustedIps,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps,
+        accessTokenPeriod: Number(accessTokenPeriod),
+        lockoutEnabled,
+        lockoutThreshold: Number(lockoutThreshold),
+        lockoutDurationSeconds,
+        lockoutCounterResetSeconds
       });
+    } else {
+      // create new universal auth configuration
 
-      reset();
-    } catch {
-      const text = `Failed to ${isUpdate ? "update" : "configure"} identity`;
-
-      createNotification({
-        text,
-        type: "error"
+      await addMutateAsync({
+        organizationId: orgId,
+        identityId,
+        clientSecretTrustedIps,
+        accessTokenTTL: Number(accessTokenTTL),
+        accessTokenMaxTTL: Number(accessTokenMaxTTL),
+        accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
+        accessTokenTrustedIps,
+        accessTokenPeriod: Number(accessTokenPeriod),
+        lockoutEnabled,
+        lockoutThreshold: Number(lockoutThreshold),
+        lockoutDurationSeconds: Number(lockoutDurationSeconds),
+        lockoutCounterResetSeconds: Number(lockoutCounterResetSeconds)
       });
     }
+
+    handlePopUpToggle("identityAuthMethod", false);
+
+    createNotification({
+      text: `Successfully ${isUpdate ? "updated" : "created"} auth method`,
+      type: "success"
+    });
+
+    reset();
   };
 
   return (

frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/AddOrgMemberModal.tsx

@@ -122,64 +122,55 @@ export const AddOrgMemberModal = ({
       }
     }
 
-    try {
-      const parsedEmails = emails
-        .replace(/\s/g, "")
-        .split(",")
-        .map((email) => {
-          if (EmailSchema.safeParse(email).success) {
-            return email.trim();
-          }
+    const parsedEmails = emails
+      .replace(/\s/g, "")
+      .split(",")
+      .map((email) => {
+        if (EmailSchema.safeParse(email).success) {
+          return email.trim();
+        }
 
-          return null;
-        });
-
-      if (parsedEmails.includes(null)) {
-        createNotification({
-          text: "Invalid email addresses provided.",
-          type: "error"
-        });
-        return;
-      }
-
-      const usernames = emails.split(",").map((email) => email.trim());
-      const { data } = await addUsersMutateAsync({
-        organizationId: currentOrg?.id,
-        inviteeEmails: usernames,
-        organizationRoleSlug: organizationRole.slug
+        return null;
       });
 
-      await Promise.allSettled(
-        selectedProjects.map((el) =>
-          addUserToProject({
-            orgId: currentOrg.id,
-            projectId: el.id,
-            roleSlugs: [projectRoleSlug],
-            usernames
-          })
-        )
-      );
-
-      setCompleteInviteLinks(data?.completeInviteLinks ?? null);
-
-      // only show this notification when email is configured.
-      // A [completeInviteLink] will not be sent if smtp is configured
-
-      if (!data.completeInviteLinks) {
-        createNotification({
-          text: "Successfully invited user to the organization.",
-          type: "success"
-        });
-      }
-    } catch (error) {
-      console.error(error);
+    if (parsedEmails.includes(null)) {
       createNotification({
-        text: "Failed to invite user to org",
+        text: "Invalid email addresses provided.",
         type: "error"
       });
       return;
     }
 
+    const usernames = emails.split(",").map((email) => email.trim());
+    const { data } = await addUsersMutateAsync({
+      organizationId: currentOrg?.id,
+      inviteeEmails: usernames,
+      organizationRoleSlug: organizationRole.slug
+    });
+
+    await Promise.allSettled(
+      selectedProjects.map((el) =>
+        addUserToProject({
+          orgId: currentOrg.id,
+          projectId: el.id,
+          roleSlugs: [projectRoleSlug],
+          usernames
+        })
+      )
+    );
+
+    setCompleteInviteLinks(data?.completeInviteLinks ?? null);
+
+    // only show this notification when email is configured.
+    // A [completeInviteLink] will not be sent if smtp is configured
+
+    if (!data.completeInviteLinks) {
+      createNotification({
+        text: "Successfully invited user to the organization.",
+        type: "success"
+      });
+    }
+
     if (serverDetails?.emailConfigured) {
       handlePopUpToggle("addMember", false);
     }

frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/AddSubOrgMemberModal.tsx

@@ -106,32 +106,24 @@ export const AddSubOrgMemberModal = ({ onClose }: Props) => {
       }
     }
 
-    try {
-      const usernames = users.map((el) => el.username);
-      await addUsersMutateAsync({
-        organizationId: currentOrg?.id,
-        inviteeEmails: usernames,
-        organizationRoleSlug: organizationRole.slug
-      });
+    const usernames = users.map((el) => el.username);
+    await addUsersMutateAsync({
+      organizationId: currentOrg?.id,
+      inviteeEmails: usernames,
+      organizationRoleSlug: organizationRole.slug
+    });
 
-      await Promise.allSettled(
-        selectedProjects.map((el) =>
-          addUserToProject({
-            orgId: currentOrg.id,
-            projectId: el.id,
-            roleSlugs: [projectRoleSlug],
-            usernames
-          })
-        )
-      );
-      onClose();
-    } catch (error) {
-      console.error(error);
-      createNotification({
-        text: "Failed to add user to suborganization",
-        type: "error"
-      });
-    }
+    await Promise.allSettled(
+      selectedProjects.map((el) =>
+        addUserToProject({
+          orgId: currentOrg.id,
+          projectId: el.id,
+          roleSlugs: [projectRoleSlug],
+          usernames
+        })
+      )
+    );
+    onClose();
   };
 
   const getGroupHeaderLabel = (type: ProjectType) => {

frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx

@@ -85,46 +85,30 @@ export const OrgMembersSection = () => {
   };
 
   const onDeactivateMemberSubmit = async (orgMembershipId: string) => {
-    try {
-      await updateOrgMembership({
-        organizationId: orgId,
-        membershipId: orgMembershipId,
-        isActive: false
-      });
+    await updateOrgMembership({
+      organizationId: orgId,
+      membershipId: orgMembershipId,
+      isActive: false
+    });
 
-      createNotification({
-        text: "Successfully deactivated user in organization",
-        type: "success"
-      });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to deactivate user in organization",
-        type: "error"
-      });
-    }
+    createNotification({
+      text: "Successfully deactivated user in organization",
+      type: "success"
+    });
 
     handlePopUpClose("deactivateMember");
   };
 
   const onRemoveMemberSubmit = async (orgMembershipId: string) => {
-    try {
-      await deleteMutateAsync({
-        orgId,
-        membershipId: orgMembershipId
-      });
+    await deleteMutateAsync({
+      orgId,
+      membershipId: orgMembershipId
+    });
 
-      createNotification({
-        text: "Successfully removed user from org",
-        type: "success"
-      });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to remove user from the organization",
-        type: "error"
-      });
-    }
+    createNotification({
+      text: "Successfully removed user from org",
+      type: "success"
+    });
 
     handlePopUpClose("removeMember");
   };
@@ -132,27 +116,20 @@ export const OrgMembersSection = () => {
   const { data: members = [] } = useGetOrgUsers(orgId);
 
   const handleRemoveMembers = async (selectedMembers: OrgUser[]) => {
-    try {
-      await deleteBatchMutateAsync({
-        orgId,
-        membershipIds: selectedMembers
-          .filter((member) => member.user.id !== userId)
-          .map((member) => member.id)
-      });
+    await deleteBatchMutateAsync({
+      orgId,
+      membershipIds: selectedMembers
+        .filter((member) => member.user.id !== userId)
+        .map((member) => member.id)
+    });
 
-      createNotification({
-        text: "Successfully removed users from organization",
-        type: "success"
-      });
+    createNotification({
+      text: "Successfully removed users from organization",
+      type: "success"
+    });
 
-      setSelectedMemberIds([]);
-      handlePopUpClose("removeMembers");
-    } catch {
-      createNotification({
-        text: "Failed to remove users from the organization",
-        type: "error"
-      });
-    }
+    setSelectedMemberIds([]);
+    handlePopUpClose("removeMembers");
   };
 
   return (

frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx

@@ -127,34 +127,26 @@ export const OrgMembersTable = ({
   const onRoleChange = async (membershipId: string, role: string) => {
     if (!currentOrg?.id) return;
 
-    try {
-      // TODO: replace hardcoding default role
-      const isCustomRole = !["admin", "member", "no-access"].includes(role);
+    // TODO: replace hardcoding default role
+    const isCustomRole = !["admin", "member", "no-access"].includes(role);
 
-      if (isCustomRole && subscription && !subscription?.rbac) {
-        handlePopUpOpen("upgradePlan", {
-          text: "Your current plan does not include access to assigning custom roles to members. To unlock this feature, please upgrade to Infisical Pro plan."
-        });
-        return;
-      }
-
-      await updateOrgMembership({
-        organizationId: currentOrg?.id,
-        membershipId,
-        role
-      });
-
-      createNotification({
-        text: "Successfully updated user role",
-        type: "success"
-      });
-    } catch (error) {
-      console.error(error);
-      createNotification({
-        text: "Failed to update user role",
-        type: "error"
+    if (isCustomRole && subscription && !subscription?.rbac) {
+      handlePopUpOpen("upgradePlan", {
+        text: "Your current plan does not include access to assigning custom roles to members. To unlock this feature, please upgrade to Infisical Pro plan."
       });
+      return;
     }
+
+    await updateOrgMembership({
+      organizationId: currentOrg?.id,
+      membershipId,
+      role
+    });
+
+    createNotification({
+      text: "Successfully updated user role",
+      type: "success"
+    });
   };
 
   const onResendInvite = async (membershipId: string) => {
@@ -173,12 +165,6 @@ export const OrgMembersTable = ({
         text: "Successfully resent org invitation",
         type: "success"
       });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to resend org invitation",
-        type: "error"
-      });
     } finally {
       setResendInviteId(null);
     }

frontend/src/pages/organization/AccessManagementPage/components/OrgRoleTabSection/OrgRoleTable.tsx

@@ -86,17 +86,12 @@ export const OrgRoleTable = () => {
 
   const handleRoleDelete = async () => {
     const { id } = popUp?.deleteRole?.data as TOrgRole;
-    try {
-      await deleteRole({
-        orgId,
-        id
-      });
-      createNotification({ type: "success", text: "Successfully removed the role" });
-      handlePopUpClose("deleteRole");
-    } catch (err) {
-      console.log(err);
-      createNotification({ type: "error", text: "Failed to delete role" });
-    }
+    await deleteRole({
+      orgId,
+      id
+    });
+    createNotification({ type: "success", text: "Successfully removed the role" });
+    handlePopUpClose("deleteRole");
   };
 
   const handleSetRoleAsDefault = async (defaultMembershipRoleSlug: string) => {
@@ -109,17 +104,12 @@ export const OrgRoleTable = () => {
       return;
     }
 
-    try {
-      await updateOrg({
-        orgId,
-        defaultMembershipRoleSlug
-      });
-      createNotification({ type: "success", text: "Successfully updated default membership role" });
-      handlePopUpClose("deleteRole");
-    } catch (err) {
-      console.log(err);
-      createNotification({ type: "error", text: "Failed to update default membership role" });
-    }
+    await updateOrg({
+      orgId,
+      defaultMembershipRoleSlug
+    });
+    createNotification({ type: "success", text: "Successfully updated default membership role" });
+    handlePopUpClose("deleteRole");
   };
 
   const {

frontend/src/pages/organization/AccessManagementPage/components/UpgradePrivilegeSystemModal/UpgradePrivilegeSystemModal.tsx

@@ -44,21 +44,14 @@ export const UpgradePrivilegeSystemModal = ({ isOpen, onOpenChange }: Props) =>
     acknowledgesPermanentChange;
 
   const handlePrivilegeSystemUpgrade = async () => {
-    try {
-      await upgradePrivilegeSystem();
+    await upgradePrivilegeSystem();
 
-      createNotification({
-        text: "Privilege system upgrade completed",
-        type: "success"
-      });
+    createNotification({
+      text: "Privilege system upgrade completed",
+      type: "success"
+    });
 
-      onOpenChange(false);
-    } catch {
-      createNotification({
-        text: "Failed to upgrade privilege system",
-        type: "error"
-      });
-    }
+    onOpenChange(false);
   };
 
   const handleClose = () => {

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AppConnectionForm.tsx

@@ -74,24 +74,15 @@ const CreateForm = ({ app, onComplete, projectId }: CreateFormProps) => {
       "method" | "name" | "app" | "credentials" | "isPlatformManagedCredentials"
     >
   ) => {
-    try {
-      const connection = await createAppConnection.mutateAsync({
-        ...formData,
-        projectId
-      });
-      createNotification({
-        text: `Successfully added ${appName} Connection`,
-        type: "success"
-      });
-      onComplete(connection);
-    } catch (err: any) {
-      console.error(err);
-      createNotification({
-        title: `Failed to add ${appName} Connection`,
-        text: err.message,
-        type: "error"
-      });
-    }
+    const connection = await createAppConnection.mutateAsync({
+      ...formData,
+      projectId
+    });
+    createNotification({
+      text: `Successfully added ${appName} Connection`,
+      type: "success"
+    });
+    onComplete(connection);
   };
 
   switch (app) {
@@ -194,24 +185,15 @@ const UpdateForm = ({ appConnection, onComplete }: UpdateFormProps) => {
       "method" | "name" | "app" | "credentials" | "isPlatformManagedCredentials"
     >
   ) => {
-    try {
-      const connection = await updateAppConnection.mutateAsync({
-        connectionId: appConnection.id,
-        ...formData
-      });
-      createNotification({
-        text: `Successfully updated ${appName} Connection`,
-        type: "success"
-      });
-      onComplete(connection);
-    } catch (err: any) {
-      console.error(err);
-      createNotification({
-        title: `Failed to update ${appName} Connection`,
-        text: err.message,
-        type: "error"
-      });
-    }
+    const connection = await updateAppConnection.mutateAsync({
+      connectionId: appConnection.id,
+      ...formData
+    });
+    createNotification({
+      text: `Successfully updated ${appName} Connection`,
+      type: "success"
+    });
+    onComplete(connection);
   };
 
   switch (appConnection.app) {

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/DeleteAppConnectionModal.tsx

@@ -18,26 +18,17 @@ export const DeleteAppConnectionModal = ({ isOpen, onOpenChange, appConnection }
   const { id: connectionId, name, app } = appConnection;
 
   const handleDeleteAppConnection = async () => {
-    try {
-      await deleteAppConnection.mutateAsync({
-        connectionId,
-        app
-      });
+    await deleteAppConnection.mutateAsync({
+      connectionId,
+      app
+    });
 
-      createNotification({
-        text: `Successfully removed ${APP_CONNECTION_MAP[app].name} connection`,
-        type: "success"
-      });
+    createNotification({
+      text: `Successfully removed ${APP_CONNECTION_MAP[app].name} connection`,
+      type: "success"
+    });
 
-      onOpenChange(false);
-    } catch (err) {
-      console.error(err);
-
-      createNotification({
-        text: `Failed to remove ${APP_CONNECTION_MAP[app].name} connection`,
-        type: "error"
-      });
-    }
+    onOpenChange(false);
   };
 
   return (

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/EditAppConnectionDetailsModal.tsx

@@ -43,24 +43,15 @@ const Content = ({ appConnection, onComplete }: ContentProps) => {
   } = form;
 
   const onSubmit = async (formData: FormData) => {
-    try {
-      await updateAppConnection.mutateAsync({
-        connectionId: appConnection.id,
-        ...formData
-      });
-      createNotification({
-        text: `Successfully updated ${appName} Connection`,
-        type: "success"
-      });
-      onComplete();
-    } catch (err: any) {
-      console.error(err);
-      createNotification({
-        title: `Failed to update ${appName} Connection`,
-        text: err.message,
-        type: "error"
-      });
-    }
+    await updateAppConnection.mutateAsync({
+      connectionId: appConnection.id,
+      ...formData
+    });
+    createNotification({
+      text: `Successfully updated ${appName} Connection`,
+      type: "success"
+    });
+    onComplete();
   };
 
   return (

frontend/src/pages/organization/AppConnections/OauthCallbackPage/OauthCallbackPage.tsx

@@ -127,12 +127,7 @@ export const OAuthCallbackPage = () => {
         projectId,
         connection
       };
-    } catch (err: any) {
-      createNotification({
-        title: `Failed to ${connectionId ? "update" : "add"} GitLab Connection`,
-        text: err?.message,
-        type: "error"
-      });
+    } catch {
       navigate({
         to: returnUrl,
         params: {
@@ -176,12 +171,7 @@ export const OAuthCallbackPage = () => {
           }
         });
       }
-    } catch (err: any) {
-      createNotification({
-        title: `Failed to ${connectionId ? "update" : "add"} Azure Key Vault Connection`,
-        text: err?.message,
-        type: "error"
-      });
+    } catch {
       navigate({
         to: returnUrl,
         params: {
@@ -233,12 +223,7 @@ export const OAuthCallbackPage = () => {
           }
         });
       }
-    } catch (err: any) {
-      createNotification({
-        title: `Failed to ${connectionId ? "update" : "add"} Azure App Configuration Connection`,
-        text: err?.message,
-        type: "error"
-      });
+    } catch {
       navigate({
         to: returnUrl,
         params: {
@@ -290,12 +275,7 @@ export const OAuthCallbackPage = () => {
           }
         });
       }
-    } catch (err: any) {
-      createNotification({
-        title: `Failed to ${connectionId ? "update" : "add"} Azure Client Secrets Connection`,
-        text: err?.message,
-        type: "error"
-      });
+    } catch {
       navigate({
         to: returnUrl,
         params: {
@@ -353,12 +333,7 @@ export const OAuthCallbackPage = () => {
           }
         });
       }
-    } catch (err: any) {
-      createNotification({
-        title: `Failed to ${connectionId ? "update" : "add"} Azure DevOps Connection`,
-        text: err?.message,
-        type: "error"
-      });
+    } catch {
       navigate({
         to: returnUrl,
         params: {
@@ -441,12 +416,7 @@ export const OAuthCallbackPage = () => {
               })
         });
       }
-    } catch (e: any) {
-      createNotification({
-        title: `Failed to ${connectionId ? "update" : "add"} GitHub Connection`,
-        text: e.message,
-        type: "error"
-      });
+    } catch {
       navigate({
         to: returnUrl,
         params: {
@@ -498,12 +468,7 @@ export const OAuthCallbackPage = () => {
           }
         });
       }
-    } catch (e: any) {
-      createNotification({
-        title: `Failed to ${connectionId ? "update" : "add"} GitHub Radar Connection`,
-        text: e.message,
-        type: "error"
-      });
+    } catch {
       navigate({
         to: returnUrl,
         params: {
@@ -553,12 +518,7 @@ export const OAuthCallbackPage = () => {
           }
         });
       }
-    } catch (e: any) {
-      createNotification({
-        title: `Failed to ${connectionId ? "update" : "add"} Heroku Connection`,
-        text: e.message,
-        type: "error"
-      });
+    } catch {
       navigate({
         to: returnUrl,
         params: {

frontend/src/pages/organization/AuditLogsPage/components/LogsFilter.tsx

@@ -1,7 +1,8 @@
 /* eslint-disable no-nested-ternary */
 import { useMemo } from "react";
 import { Controller, useForm } from "react-hook-form";
-import { faCaretDown, faCheckCircle, faFilterCircleXmark } from "@fortawesome/free-solid-svg-icons";
+import { MultiValue, SingleValue } from "react-select";
+import { faFilterCircleXmark } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { AnimatePresence, motion } from "framer-motion";
@@ -11,13 +12,10 @@ import {
   Button,
   DropdownMenu,
   DropdownMenuContent,
-  DropdownMenuItem,
   DropdownMenuTrigger,
   FilterableSelect,
   FormControl,
-  Input,
-  Select,
-  SelectItem
+  Input
 } from "@app/components/v2";
 import { Badge } from "@app/components/v3";
 import { useOrganization } from "@app/context";
@@ -132,7 +130,7 @@ export const LogsFilter = ({ presets, setFilter, filter, project }: Props) => {
       </DropdownMenuTrigger>
       <DropdownMenuContent align="end" className="mt-4 overflow-visible py-4">
         <form onSubmit={handleSubmit(setFilter)}>
-          <div className="flex min-w-64 flex-col font-inter">
+          <div className="flex max-w-96 min-w-96 flex-col font-inter">
             <div className="mb-3 flex items-center border-b border-b-mineshaft-500 px-3 pb-2">
               <div className="flex w-full items-center justify-between">
                 <div className="flex items-center gap-2">
@@ -165,7 +163,7 @@ export const LogsFilter = ({ presets, setFilter, filter, project }: Props) => {
               <LogFilterItem
                 label="Events"
                 onClear={() => {
-                  resetField("eventType");
+                  setValue("eventType", [], { shouldDirty: true });
                 }}
               >
                 <Controller
@@ -173,76 +171,24 @@ export const LogsFilter = ({ presets, setFilter, filter, project }: Props) => {
                   name="eventType"
                   render={({ field }) => (
                     <FormControl>
-                      <DropdownMenu>
-                        <DropdownMenuTrigger asChild>
-                          <div className="inline-flex thin-scrollbar w-full cursor-pointer items-center justify-between rounded-md border border-mineshaft-500 bg-mineshaft-700 px-3 py-2 font-inter text-sm font-normal whitespace-nowrap text-bunker-200 outline-hidden data-placeholder:text-mineshaft-200">
-                            {selectedEventTypes?.length === 1
-                              ? filteredEventTypes.find(
-                                  (eventType) => eventType.value === selectedEventTypes[0]
-                                )?.label
-                              : selectedEventTypes?.length === 0
-                                ? "All events"
-                                : `${selectedEventTypes?.length} events selected`}
-                            <FontAwesomeIcon icon={faCaretDown} className="ml-2 text-xs" />
-                          </div>
-                        </DropdownMenuTrigger>
-                        <DropdownMenuContent
-                          align="end"
-                          sideOffset={2}
-                          className="z-100 max-h-80 thin-scrollbar overflow-hidden"
-                        >
-                          <div className="max-h-80 overflow-y-auto">
-                            {filteredEventTypes.length > 0 ? (
-                              filteredEventTypes.map((eventType) => {
-                                const isSelected = selectedEventTypes?.includes(
-                                  eventType.value as EventType
-                                );
-
-                                return (
-                                  <DropdownMenuItem
-                                    onSelect={(event) =>
-                                      filteredEventTypes.length > 1 && event.preventDefault()
-                                    }
-                                    onClick={() => {
-                                      if (
-                                        selectedEventTypes?.includes(eventType.value as EventType)
-                                      ) {
-                                        field.onChange(
-                                          selectedEventTypes?.filter(
-                                            (e: string) => e !== eventType.value
-                                          )
-                                        );
-                                      } else {
-                                        field.onChange([
-                                          ...(selectedEventTypes || []),
-                                          eventType.value
-                                        ]);
-                                      }
-                                    }}
-                                    key={`event-type-${eventType.value}`}
-                                    icon={
-                                      isSelected ? (
-                                        <FontAwesomeIcon
-                                          icon={faCheckCircle}
-                                          className="pr-0.5 text-primary"
-                                        />
-                                      ) : (
-                                        <div className="pl-[1.01rem]" />
-                                      )
-                                    }
-                                    iconPos="left"
-                                    className="w-[28.4rem] text-sm"
-                                  >
-                                    {eventType.label}
-                                  </DropdownMenuItem>
-                                );
-                              })
-                            ) : (
-                              <div />
-                            )}
-                          </div>
-                        </DropdownMenuContent>
-                      </DropdownMenu>
+                      <FilterableSelect
+                        value={filteredEventTypes.filter((eventType) =>
+                          field.value.includes(eventType.value as EventType)
+                        )}
+                        isMulti
+                        isClearable
+                        onChange={(options) =>
+                          field.onChange(
+                            (options as MultiValue<(typeof filteredEventTypes)[number]>).map(
+                              (option) => option.value
+                            )
+                          )
+                        }
+                        placeholder="All events"
+                        options={filteredEventTypes}
+                        getOptionValue={(option) => option.value}
+                        getOptionLabel={(option) => option.label}
+                      />
                     </FormControl>
                   )}
                 />
@@ -250,37 +196,33 @@ export const LogsFilter = ({ presets, setFilter, filter, project }: Props) => {
               <LogFilterItem
                 label="Source"
                 onClear={() => {
-                  resetField("userAgentType");
+                  setValue("userAgentType", undefined, { shouldDirty: true });
                 }}
               >
                 <Controller
                   control={control}
                   name="userAgentType"
-                  render={({ field: { onChange, value, ...field }, fieldState: { error } }) => (
+                  render={({ field: { onChange, value }, fieldState: { error } }) => (
                     <FormControl
                       errorText={error?.message}
                       isError={Boolean(error)}
                       className="w-full"
                     >
-                      <Select
-                        {...field}
-                        value={value === undefined ? "all" : value}
-                        onValueChange={(e) => {
-                          if (e === "all") onChange(undefined);
-                          else setValue("userAgentType", e as UserAgentType, { shouldDirty: true });
-                        }}
-                        className={twMerge("w-full border border-mineshaft-500 bg-mineshaft-700")}
-                        position="popper"
-                      >
-                        <SelectItem value="all" key="all">
-                          All sources
-                        </SelectItem>
-                        {userAgentTypes.map(({ label, value: userAgent }) => (
-                          <SelectItem value={userAgent} key={label}>
-                            {label}
-                          </SelectItem>
-                        ))}
-                      </Select>
+                      <FilterableSelect
+                        value={
+                          userAgentTypes.find(
+                            (userAgentType) => value === (userAgentType.value as UserAgentType)
+                          ) ?? null
+                        }
+                        isClearable
+                        onChange={(option) =>
+                          onChange((option as SingleValue<(typeof userAgentTypes)[number]>)?.value)
+                        }
+                        placeholder="All sources"
+                        options={userAgentTypes}
+                        getOptionValue={(option) => option.value}
+                        getOptionLabel={(option) => option.label}
+                      />
                     </FormControl>
                   )}
                 />
@@ -289,10 +231,10 @@ export const LogsFilter = ({ presets, setFilter, filter, project }: Props) => {
                 <LogFilterItem
                   label="Project"
                   onClear={() => {
-                    resetField("project");
-                    resetField("environment");
-                    setValue("secretPath", "");
-                    setValue("secretKey", "");
+                    setValue("project", null, { shouldDirty: true });
+                    setValue("environment", undefined, { shouldDirty: true });
+                    setValue("secretPath", "", { shouldDirty: true });
+                    setValue("secretKey", "", { shouldDirty: true });
                   }}
                 >
                   <Controller
@@ -350,7 +292,7 @@ export const LogsFilter = ({ presets, setFilter, filter, project }: Props) => {
                       }
                       className={twMerge(!selectedProject && "opacity-50")}
                       onClear={() => {
-                        resetField("environment");
+                        setValue("environment", undefined, { shouldDirty: true });
                       }}
                     >
                       <Controller
@@ -391,7 +333,7 @@ export const LogsFilter = ({ presets, setFilter, filter, project }: Props) => {
                       }
                       className={twMerge(!selectedProject && "opacity-50")}
                       onClear={() => {
-                        setValue("secretPath", "");
+                        setValue("secretPath", "", { shouldDirty: true });
                       }}
                     >
                       <Controller
@@ -422,7 +364,7 @@ export const LogsFilter = ({ presets, setFilter, filter, project }: Props) => {
                       className={twMerge(!selectedProject && "opacity-50")}
                       label="Secret Key"
                       onClear={() => {
-                        setValue("secretKey", "");
+                        setValue("secretKey", "", { shouldDirty: true });
                       }}
                     >
                       <Controller

frontend/src/pages/organization/BillingPage/components/BillingDetailsTab/CompanyNameSection.tsx

@@ -35,25 +35,17 @@ export const CompanyNameSection = () => {
   }, [data]);
 
   const onFormSubmit = async ({ name }: { name: string }) => {
-    try {
-      if (!currentOrg?.id) return;
-      if (name === "") return;
-      await mutateAsync({
-        name,
-        organizationId: currentOrg.id
-      });
+    if (!currentOrg?.id) return;
+    if (name === "") return;
+    await mutateAsync({
+      name,
+      organizationId: currentOrg.id
+    });
 
-      createNotification({
-        text: "Successfully updated business name",
-        type: "success"
-      });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to update business name",
-        type: "error"
-      });
-    }
+    createNotification({
+      text: "Successfully updated business name",
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/organization/BillingPage/components/BillingDetailsTab/InvoiceEmailSection.tsx

@@ -35,26 +35,18 @@ export const InvoiceEmailSection = () => {
   }, [data]);
 
   const onFormSubmit = async ({ email }: { email: string }) => {
-    try {
-      if (!currentOrg?.id) return;
-      if (email === "") return;
+    if (!currentOrg?.id) return;
+    if (email === "") return;
 
-      await mutateAsync({
-        email,
-        organizationId: currentOrg.id
-      });
+    await mutateAsync({
+      email,
+      organizationId: currentOrg.id
+    });
 
-      createNotification({
-        text: "Successfully updated invoice email recipient",
-        type: "success"
-      });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to update invoice email recipient",
-        type: "error"
-      });
-    }
+    createNotification({
+      text: "Successfully updated invoice email recipient",
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/organization/BillingPage/components/BillingDetailsTab/PmtMethodsTable.tsx

@@ -39,22 +39,15 @@ export const PmtMethodsTable = () => {
       });
       return;
     }
-    try {
-      await deleteOrgPmtMethod.mutateAsync({
-        organizationId: currentOrg.id,
-        pmtMethodId: pmtMethodToRemove.id
-      });
-      createNotification({
-        type: "success",
-        text: "Successfully removed payment method"
-      });
-      handlePopUpClose("removeCard");
-    } catch (error: any) {
-      createNotification({
-        type: "error",
-        text: error.message ?? "Error removing payment method"
-      });
-    }
+    await deleteOrgPmtMethod.mutateAsync({
+      organizationId: currentOrg.id,
+      pmtMethodId: pmtMethodToRemove.id
+    });
+    createNotification({
+      type: "success",
+      text: "Successfully removed payment method"
+    });
+    handlePopUpClose("removeCard");
   };
 
   return (

frontend/src/pages/organization/BillingPage/components/BillingDetailsTab/TaxIDModal.tsx

@@ -98,26 +98,18 @@ export const TaxIDModal = ({ popUp, handlePopUpClose, handlePopUpToggle }: Props
   });
 
   const onTaxIDModalSubmit = async ({ type, value }: AddTaxIDFormData) => {
-    try {
-      if (!currentOrg?.id) return;
-      await addOrgTaxId.mutateAsync({
-        organizationId: currentOrg.id,
-        type,
-        value
-      });
+    if (!currentOrg?.id) return;
+    await addOrgTaxId.mutateAsync({
+      organizationId: currentOrg.id,
+      type,
+      value
+    });
 
-      createNotification({
-        text: "Successfully added Tax ID",
-        type: "success"
-      });
-      handlePopUpClose("addTaxID");
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to add Tax ID",
-        type: "error"
-      });
-    }
+    createNotification({
+      text: "Successfully added Tax ID",
+      type: "success"
+    });
+    handlePopUpClose("addTaxID");
   };
 
   return (

frontend/src/pages/organization/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx

@@ -54,27 +54,19 @@ const Page = () => {
   ] as const);
 
   const onDeleteGroupSubmit = async ({ name, id }: { name: string; id: string }) => {
-    try {
-      await deleteMutateAsync({
-        id
-      });
-      createNotification({
-        text: `Successfully deleted the ${name} group`,
-        type: "success"
-      });
-      navigate({
-        to: "/organization/access-management" as const,
-        search: {
-          selectedTab: TabSections.Groups
-        }
-      });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: `Failed to delete the ${name} group`,
-        type: "error"
-      });
-    }
+    await deleteMutateAsync({
+      id
+    });
+    createNotification({
+      text: `Successfully deleted the ${name} group`,
+      type: "success"
+    });
+    navigate({
+      to: "/organization/access-management" as const,
+      search: {
+        selectedTab: TabSections.Groups
+      }
+    });
 
     handlePopUpClose("deleteGroup");
   };

frontend/src/pages/organization/GroupDetailsByIDPage/components/AddGroupMemberModal.tsx

@@ -63,31 +63,24 @@ export const AddGroupMembersModal = ({ popUp, handlePopUpToggle }: Props) => {
   const { mutateAsync: addUserToGroupMutateAsync } = useAddUserToGroup();
 
   const handleAddMember = async (username: string) => {
-    try {
-      if (!popUpData?.slug) {
-        createNotification({
-          text: "Some data is missing, please refresh the page and try again",
-          type: "error"
-        });
-        return;
-      }
-
-      await addUserToGroupMutateAsync({
-        groupId: popUpData.groupId,
-        username,
-        slug: popUpData.slug
-      });
-
+    if (!popUpData?.slug) {
       createNotification({
-        text: "Successfully assigned user to the group",
-        type: "success"
-      });
-    } catch {
-      createNotification({
-        text: "Failed to assign user to the group",
+        text: "Some data is missing, please refresh the page and try again",
         type: "error"
       });
+      return;
     }
+
+    await addUserToGroupMutateAsync({
+      groupId: popUpData.groupId,
+      username,
+      slug: popUpData.slug
+    });
+
+    createNotification({
+      text: "Successfully assigned user to the group",
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/organization/GroupDetailsByIDPage/components/GroupCreateUpdateModal.tsx

@@ -77,43 +77,36 @@ export const GroupCreateUpdateModal = ({ popUp, handlePopUpClose, handlePopUpTog
   }, [popUp?.groupCreateUpdate?.data, roles]);
 
   const onGroupModalSubmit = async ({ name, slug, role }: TGroupFormData) => {
-    try {
-      if (!currentOrg?.id) return;
+    if (!currentOrg?.id) return;
 
-      const group = popUp?.groupCreateUpdate?.data as {
-        groupId: string;
-        name: string;
-        slug: string;
-      };
+    const group = popUp?.groupCreateUpdate?.data as {
+      groupId: string;
+      name: string;
+      slug: string;
+    };
 
-      if (group) {
-        await updateMutateAsync({
-          id: group.groupId,
-          name,
-          slug,
-          role: role.slug || undefined
-        });
-      } else {
-        await createMutateAsync({
-          name,
-          slug,
-          organizationId: currentOrg.id,
-          role: role.slug || undefined
-        });
-      }
-      handlePopUpToggle("groupCreateUpdate", false);
-      reset();
-
-      createNotification({
-        text: `Successfully ${popUp?.groupCreateUpdate?.data ? "updated" : "created"} group`,
-        type: "success"
+    if (group) {
+      await updateMutateAsync({
+        id: group.groupId,
+        name,
+        slug,
+        role: role.slug || undefined
       });
-    } catch {
-      createNotification({
-        text: `Failed to ${popUp?.groupCreateUpdate?.data ? "updated" : "created"} group`,
-        type: "error"
+    } else {
+      await createMutateAsync({
+        name,
+        slug,
+        organizationId: currentOrg.id,
+        role: role.slug || undefined
       });
     }
+    handlePopUpToggle("groupCreateUpdate", false);
+    reset();
+
+    createNotification({
+      text: `Successfully ${popUp?.groupCreateUpdate?.data ? "updated" : "created"} group`,
+      type: "success"
+    });
   };
 
   return (