refactor: enhance notification handling and streamline async logic across various components

This commit is contained in:
Victor Santos
2025-11-03 11:58:44 -03:00
parent 1ed59a7304
commit 3aeee8d552
38 changed files with 653 additions and 1064 deletions
@@ -72,20 +72,12 @@ export const OAuthCallbackPage = () => {
if (!isReady) return; if (!isReady) return;
(async () => { (async () => {
try {
await handleMicrosoftTeams(); await handleMicrosoftTeams();
createNotification({ createNotification({
text: "Successfully created Microsoft Teams workflow integration", text: "Successfully created Microsoft Teams workflow integration",
type: "success" type: "success"
}); });
} catch (err) {
console.error(err);
createNotification({
text: "Failed to create Microsoft Teams workflow integration",
type: "error"
});
}
})(); })();
}, [isReady]); }, [isReady]);
@@ -55,7 +55,6 @@ export const GithubOrgSyncConfigModal = ({
}); });
const onFormSubmit = async ({ githubOrgName, githubOrgAccessToken }: FormData) => { const onFormSubmit = async ({ githubOrgName, githubOrgAccessToken }: FormData) => {
try {
if (isUpdate) { if (isUpdate) {
await updateGithubSyncOrgConfig({ await updateGithubSyncOrgConfig({
githubOrgName, githubOrgName,
@@ -79,16 +78,9 @@ export const GithubOrgSyncConfigModal = ({
}); });
} }
handlePopUpToggle("githubOrgSyncConfig"); handlePopUpToggle("githubOrgSyncConfig");
} catch {
createNotification({
text: "Failed to setup GitHub Organization Sync",
type: "error"
});
}
}; };
const onDelete = async () => { const onDelete = async () => {
try {
await deleteGithubSyncOrgConfig(); await deleteGithubSyncOrgConfig();
handlePopUpToggle("deleteGithubOrgSyncConfig", false); handlePopUpToggle("deleteGithubOrgSyncConfig", false);
@@ -97,13 +89,6 @@ export const GithubOrgSyncConfigModal = ({
text: "Successfully deleted GitHub Organization Sync", text: "Successfully deleted GitHub Organization Sync",
type: "success" type: "success"
}); });
} catch (err) {
console.error(err);
createNotification({
text: "Failed to delete GitHub Organization Sync",
type: "error"
});
}
}; };
return ( return (
@@ -35,7 +35,6 @@ export const OrgGithubSyncSection = () => {
const data = !isPending && !githubOrgSyncConfig?.isError ? githubOrgSyncConfig?.data : undefined; const data = !isPending && !githubOrgSyncConfig?.isError ? githubOrgSyncConfig?.data : undefined;
const handleBulkSync = async () => { const handleBulkSync = async () => {
try {
const result = await syncAllTeamsMutation.mutateAsync(); const result = await syncAllTeamsMutation.mutateAsync();
let message = "Successfully synced teams"; let message = "Successfully synced teams";
@@ -72,28 +71,6 @@ export const OrgGithubSyncSection = () => {
}); });
console.warn("Sync errors:", result.errors); console.warn("Sync errors:", result.errors);
} }
} catch (error) {
const errorMessage =
(error as any)?.response?.data?.message || (error as Error)?.message || "Unknown error";
if (
errorMessage.includes("token") &&
(errorMessage.includes("required") ||
errorMessage.includes("invalid") ||
errorMessage.includes("expired") ||
errorMessage.includes("set a token first"))
) {
createNotification({
text: "Please set a GitHub access token in the configuration modal to continue with the sync",
type: "error"
});
} else {
createNotification({
text: `Failed to sync GitHub teams: ${errorMessage}`,
type: "error"
});
}
}
}; };
return ( return (
@@ -36,7 +36,6 @@ export const OrgScimSection = () => {
}; };
const handleEnableSCIMToggle = async (value: boolean) => { const handleEnableSCIMToggle = async (value: boolean) => {
try {
if (!currentOrg?.id) return; if (!currentOrg?.id) return;
if (!subscription?.scim) { if (!subscription?.scim) {
handlePopUpOpen("upgradePlan", { handlePopUpOpen("upgradePlan", {
@@ -54,12 +53,6 @@ export const OrgScimSection = () => {
text: `Successfully ${value ? "enabled" : "disabled"} SCIM provisioning`, text: `Successfully ${value ? "enabled" : "disabled"} SCIM provisioning`,
type: "success" type: "success"
}); });
} catch (err) {
createNotification({
text: (err as { response: { data: { message: string } } }).response.data.message,
type: "error"
});
}
}; };
return ( return (
@@ -92,7 +92,6 @@ export const ScimTokenModal = ({ popUp, handlePopUpOpen, handlePopUpToggle }: Pr
}, [isScimTokenCopied, isScimUrlCopied]); }, [isScimTokenCopied, isScimUrlCopied]);
const onFormSubmit = async ({ description, ttlDays }: FormData) => { const onFormSubmit = async ({ description, ttlDays }: FormData) => {
try {
if (!currentOrg?.id) return; if (!currentOrg?.id) return;
const { scimToken } = await createScimTokenMutateAsync({ const { scimToken } = await createScimTokenMutateAsync({
@@ -107,17 +106,9 @@ export const ScimTokenModal = ({ popUp, handlePopUpOpen, handlePopUpToggle }: Pr
text: "Successfully created SCIM token", text: "Successfully created SCIM token",
type: "success" type: "success"
}); });
} catch (err) {
console.error(err);
createNotification({
text: "Failed to create SCIM token",
type: "error"
});
}
}; };
const onDeleteScimTokenSubmit = async (scimTokenId: string) => { const onDeleteScimTokenSubmit = async (scimTokenId: string) => {
try {
if (!currentOrg?.id) return; if (!currentOrg?.id) return;
await deleteScimTokenMutateAsync({ await deleteScimTokenMutateAsync({
@@ -131,13 +122,6 @@ export const ScimTokenModal = ({ popUp, handlePopUpOpen, handlePopUpToggle }: Pr
text: "Successfully deleted SCIM token", text: "Successfully deleted SCIM token",
type: "success" type: "success"
}); });
} catch (err) {
console.error(err);
createNotification({
text: "Failed to delete SCIM token",
type: "error"
});
}
}; };
const hasToken = Boolean(token); const hasToken = Boolean(token);
@@ -20,7 +20,6 @@ export const OrgGenericAuthSection = () => {
const { mutateAsync } = useUpdateOrg(); const { mutateAsync } = useUpdateOrg();
const handleEnforceMfaToggle = async (value: boolean) => { const handleEnforceMfaToggle = async (value: boolean) => {
try {
if (!currentOrg?.id) return; if (!currentOrg?.id) return;
if (!subscription?.enforceMfa) { if (!subscription?.enforceMfa) {
handlePopUpOpen("upgradePlan"); handlePopUpOpen("upgradePlan");
@@ -36,17 +35,9 @@ export const OrgGenericAuthSection = () => {
text: `Successfully ${value ? "enforced" : "un-enforced"} MFA`, text: `Successfully ${value ? "enforced" : "un-enforced"} MFA`,
type: "success" type: "success"
}); });
} catch (err) {
console.error(err);
createNotification({
text: (err as { response: { data: { message: string } } }).response.data.message,
type: "error"
});
}
}; };
const handleUpdateSelectedMfa = async (selectedMfaMethod: MfaMethod) => { const handleUpdateSelectedMfa = async (selectedMfaMethod: MfaMethod) => {
try {
if (!currentOrg?.id) return; if (!currentOrg?.id) return;
if (!subscription?.enforceMfa) { if (!subscription?.enforceMfa) {
handlePopUpOpen("upgradePlan"); handlePopUpOpen("upgradePlan");
@@ -62,13 +53,6 @@ export const OrgGenericAuthSection = () => {
text: "Successfully updated selected MFA method", text: "Successfully updated selected MFA method",
type: "success" type: "success"
}); });
} catch (err) {
console.error(err);
createNotification({
text: (err as { response: { data: { message: string } } }).response.data.message,
type: "error"
});
}
}; };
return ( return (
@@ -57,7 +57,6 @@ export const OrgUserAccessTokenLimitSection = () => {
if (!currentOrg) return null; if (!currentOrg) return null;
const handleUserTokenExpirationSubmit = async (formData: TForm) => { const handleUserTokenExpirationSubmit = async (formData: TForm) => {
try {
const userTokenExpiration = formatDuration(formData.expirationValue, formData.expirationUnit); const userTokenExpiration = formatDuration(formData.expirationValue, formData.expirationUnit);
await updateUserTokenExpiration({ await updateUserTokenExpiration({
@@ -69,12 +68,6 @@ export const OrgUserAccessTokenLimitSection = () => {
text: "Successfully updated user token expiration", text: "Successfully updated user token expiration",
type: "success" type: "success"
}); });
} catch {
createNotification({
text: "Failed updating user token expiration",
type: "error"
});
}
}; };
// Units for the dropdown with readable labels // Units for the dropdown with readable labels
@@ -79,7 +79,6 @@ export const LDAPGroupMapModal = ({ popUp, handlePopUpOpen, handlePopUpToggle }:
}); });
const onFormSubmit = async ({ groupSlug, ldapGroupCN }: TFormData) => { const onFormSubmit = async ({ groupSlug, ldapGroupCN }: TFormData) => {
try {
if (!ldapConfig) return; if (!ldapConfig) return;
await createLDAPGroupMapping({ await createLDAPGroupMapping({
@@ -94,13 +93,6 @@ export const LDAPGroupMapModal = ({ popUp, handlePopUpOpen, handlePopUpToggle }:
text: `Successfully added LDAP group mapping for ${ldapGroupCN}`, text: `Successfully added LDAP group mapping for ${ldapGroupCN}`,
type: "success" type: "success"
}); });
} catch (err) {
console.error(err);
createNotification({
text: `Failed to add LDAP group mapping for ${ldapGroupCN}`,
type: "error"
});
}
}; };
const onDeleteGroupMapSubmit = async ({ const onDeleteGroupMapSubmit = async ({
@@ -112,7 +104,6 @@ export const LDAPGroupMapModal = ({ popUp, handlePopUpOpen, handlePopUpToggle }:
ldapGroupMapId: string; ldapGroupMapId: string;
ldapGroupCN: string; ldapGroupCN: string;
}) => { }) => {
try {
await deleteLDAPGroupMapping({ await deleteLDAPGroupMapping({
ldapConfigId, ldapConfigId,
ldapGroupMapId ldapGroupMapId
@@ -124,13 +115,6 @@ export const LDAPGroupMapModal = ({ popUp, handlePopUpOpen, handlePopUpToggle }:
text: `Successfully deleted LDAP group mapping ${ldapGroupCN}`, text: `Successfully deleted LDAP group mapping ${ldapGroupCN}`,
type: "success" type: "success"
}); });
} catch (err) {
console.error(err);
createNotification({
text: `Failed to delete LDAP group mapping ${ldapGroupCN}`,
type: "error"
});
}
}; };
useEffect(() => { useEffect(() => {
@@ -62,7 +62,6 @@ export const LDAPModal = ({ popUp, handlePopUpClose, handlePopUpToggle, hideDele
if (!currentOrg) { if (!currentOrg) {
return; return;
} }
try {
await updateMutateAsync({ await updateMutateAsync({
organizationId: currentOrg.id, organizationId: currentOrg.id,
isActive: false, isActive: false,
@@ -81,12 +80,6 @@ export const LDAPModal = ({ popUp, handlePopUpClose, handlePopUpToggle, hideDele
text: "Successfully deleted OIDC configuration.", text: "Successfully deleted OIDC configuration.",
type: "success" type: "success"
}); });
} catch {
createNotification({
text: "Failed deleting OIDC configuration.",
type: "error"
});
}
}; };
const watchUrl = watch("url"); const watchUrl = watch("url");
@@ -164,33 +157,17 @@ export const LDAPModal = ({ popUp, handlePopUpClose, handlePopUpToggle, hideDele
}; };
const handleTestLDAPConnection = async () => { const handleTestLDAPConnection = async () => {
try { await testLDAPConnection({
const result = await testLDAPConnection({
url: watchUrl, url: watchUrl,
bindDN: watchBindDN, bindDN: watchBindDN,
bindPass: watchBindPass, bindPass: watchBindPass,
caCert: watchCaCert ?? "" caCert: watchCaCert ?? ""
}); });
if (!result) {
createNotification({
text: "Failed to test the LDAP connection: Bind operation was unsuccessful",
type: "error"
});
return;
}
createNotification({ createNotification({
text: "Successfully tested the LDAP connection: Bind operation was successful", text: "Successfully tested the LDAP connection: Bind operation was successful",
type: "success" type: "success"
}); });
} catch (err) {
console.error(err);
createNotification({
text: "Failed to test the LDAP connection",
type: "error"
});
}
}; };
return ( return (
@@ -45,7 +45,6 @@ export const OrgGeneralAuthSection = ({
const logout = useLogoutUser(); const logout = useLogoutUser();
const handleEnforceOrgAuthToggle = async (value: boolean, type: EnforceAuthType) => { const handleEnforceOrgAuthToggle = async (value: boolean, type: EnforceAuthType) => {
try {
if (!currentOrg?.id) return; if (!currentOrg?.id) return;
if (type === EnforceAuthType.SAML) { if (type === EnforceAuthType.SAML) {
@@ -101,13 +100,6 @@ export const OrgGeneralAuthSection = ({
window.close(); window.close();
} }
} catch (err) {
console.error(err);
createNotification({
text: (err as { response: { data: { message: string } } }).response.data.message,
type: "error"
});
}
}; };
const handleEnableBypassOrgAuthToggle = async (value: boolean) => { const handleEnableBypassOrgAuthToggle = async (value: boolean) => {
@@ -31,7 +31,6 @@ export const OrgLDAPSection = (): JSX.Element => {
const { mutateAsync: createMutateAsync } = useCreateLDAPConfig(); const { mutateAsync: createMutateAsync } = useCreateLDAPConfig();
const handleLDAPToggle = async (value: boolean) => { const handleLDAPToggle = async (value: boolean) => {
try {
if (!currentOrg?.id) return; if (!currentOrg?.id) return;
if (!subscription?.ldap) { if (!subscription?.ldap) {
handlePopUpOpen("upgradePlan", { handlePopUpOpen("upgradePlan", {
@@ -49,13 +48,6 @@ export const OrgLDAPSection = (): JSX.Element => {
text: `Successfully ${value ? "enabled" : "disabled"} LDAP`, text: `Successfully ${value ? "enabled" : "disabled"} LDAP`,
type: "success" type: "success"
}); });
} catch (err) {
console.error(err);
createNotification({
text: `Failed to ${value ? "enable" : "disable"} LDAP`,
type: "error"
});
}
}; };
const addLDAPBtnClick = async () => { const addLDAPBtnClick = async () => {
@@ -30,7 +30,6 @@ export const OrgOIDCSection = (): JSX.Element => {
] as const); ] as const);
const handleOIDCToggle = async (value: boolean) => { const handleOIDCToggle = async (value: boolean) => {
try {
if (!currentOrg?.id) return; if (!currentOrg?.id) return;
if (!subscription?.oidcSSO) { if (!subscription?.oidcSSO) {
@@ -47,13 +46,9 @@ export const OrgOIDCSection = (): JSX.Element => {
text: `Successfully ${value ? "enabled" : "disabled"} OIDC SSO`, text: `Successfully ${value ? "enabled" : "disabled"} OIDC SSO`,
type: "success" type: "success"
}); });
} catch (err) {
console.error(err);
}
}; };
const handleOIDCGroupManagement = async (value: boolean) => { const handleOIDCGroupManagement = async (value: boolean) => {
try {
if (!currentOrg?.id) return; if (!currentOrg?.id) return;
if (!subscription?.oidcSSO) { if (!subscription?.oidcSSO) {
@@ -70,9 +65,6 @@ export const OrgOIDCSection = (): JSX.Element => {
text: `Successfully ${value ? "enabled" : "disabled"} OIDC group membership mapping`, text: `Successfully ${value ? "enabled" : "disabled"} OIDC group membership mapping`,
type: "success" type: "success"
}); });
} catch (err) {
console.error(err);
}
}; };
const addOidcButtonClick = async () => { const addOidcButtonClick = async () => {
@@ -34,7 +34,6 @@ export const OrgSSOSection = (): JSX.Element => {
const { mutateAsync: createMutateAsync } = useCreateSSOConfig(); const { mutateAsync: createMutateAsync } = useCreateSSOConfig();
const handleSamlSSOToggle = async (value: boolean) => { const handleSamlSSOToggle = async (value: boolean) => {
try {
if (!currentOrg?.id) return; if (!currentOrg?.id) return;
if (!subscription?.samlSSO) { if (!subscription?.samlSSO) {
@@ -53,24 +52,15 @@ export const OrgSSOSection = (): JSX.Element => {
text: `Successfully ${value ? "enabled" : "disabled"} SAML SSO`, text: `Successfully ${value ? "enabled" : "disabled"} SAML SSO`,
type: "success" type: "success"
}); });
} catch (err) {
console.error(err);
createNotification({
text: `Failed to ${value ? "enable" : "disable"} SAML SSO`,
type: "error"
});
}
}; };
const handleSamlGroupManagement = async (value: boolean) => { const handleSamlGroupManagement = async (value: boolean) => {
try {
if (!currentOrg?.id) return; if (!currentOrg?.id) return;
if (!subscription?.samlSSO || !subscription?.groups) { if (!subscription?.samlSSO || !subscription?.groups) {
handlePopUpOpen("upgradePlan", { handlePopUpOpen("upgradePlan", {
isEnterpriseFeature: true, isEnterpriseFeature: true,
description: description: "You can use SAML group mapping if you switch to Infisical's Enterprise plan."
"You can use SAML group mapping if you switch to Infisical's Enterprise plan."
}); });
return; return;
} }
@@ -84,13 +74,6 @@ export const OrgSSOSection = (): JSX.Element => {
text: `Successfully ${value ? "enabled" : "disabled"} SAML group membership mapping`, text: `Successfully ${value ? "enabled" : "disabled"} SAML group membership mapping`,
type: "success" type: "success"
}); });
} catch (err) {
console.error(err);
createNotification({
text: `Failed to ${value ? "enable" : "disable"} SAML group membership mapping`,
type: "error"
});
}
}; };
const addSSOBtnClick = async () => { const addSSOBtnClick = async () => {
@@ -16,7 +16,6 @@ export const DeleteProjectTemplateModal = ({ isOpen, onOpenChange, template }: P
const { id: templateId, name } = template; const { id: templateId, name } = template;
const handleDeleteProjectTemplate = async () => { const handleDeleteProjectTemplate = async () => {
try {
await deleteTemplate.mutateAsync({ await deleteTemplate.mutateAsync({
templateId templateId
}); });
@@ -27,14 +26,6 @@ export const DeleteProjectTemplateModal = ({ isOpen, onOpenChange, template }: P
}); });
onOpenChange(false); onOpenChange(false);
} catch (err) {
console.error(err);
createNotification({
text: "Failed remove project template",
type: "error"
});
}
}; };
return ( return (
@@ -31,7 +31,6 @@ export const EditProjectTemplate = ({ isInfisicalTemplate, projectTemplate, onBa
const deleteProjectTemplate = useDeleteProjectTemplate(); const deleteProjectTemplate = useDeleteProjectTemplate();
const handleRemoveTemplate = async () => { const handleRemoveTemplate = async () => {
try {
await deleteProjectTemplate.mutateAsync({ await deleteProjectTemplate.mutateAsync({
templateId templateId
}); });
@@ -40,13 +39,6 @@ export const EditProjectTemplate = ({ isInfisicalTemplate, projectTemplate, onBa
type: "success" type: "success"
}); });
onBack(); onBack();
} catch (error) {
console.error(error);
createNotification({
text: "Failed to remove project template",
type: "error"
});
}
handlePopUpClose("removeTemplate"); handlePopUpClose("removeTemplate");
}; };
@@ -57,7 +57,6 @@ export const ProjectTemplateEditRoleForm = ({
const updateProjectTemplate = useUpdateProjectTemplate(); const updateProjectTemplate = useUpdateProjectTemplate();
const onSubmit = async (form: TFormSchema) => { const onSubmit = async (form: TFormSchema) => {
try {
await updateProjectTemplate.mutateAsync({ await updateProjectTemplate.mutateAsync({
templateId: projectTemplate.id, templateId: projectTemplate.id,
roles: [ roles: [
@@ -75,13 +74,6 @@ export const ProjectTemplateEditRoleForm = ({
text: "Template roles successfully updated", text: "Template roles successfully updated",
type: "success" type: "success"
}); });
} catch (e: any) {
console.error(e);
createNotification({
text: "Failed to update template roles",
type: "error"
});
}
}; };
return ( return (
@@ -68,7 +68,6 @@ export const ProjectTemplateEnvironmentsForm = ({
const updateProjectTemplate = useUpdateProjectTemplate(); const updateProjectTemplate = useUpdateProjectTemplate();
const onFormSubmit = async (form: TFormSchema) => { const onFormSubmit = async (form: TFormSchema) => {
try {
const { environments: updatedEnvs } = await updateProjectTemplate.mutateAsync({ const { environments: updatedEnvs } = await updateProjectTemplate.mutateAsync({
environments: form.environments?.map((env, index) => ({ environments: form.environments?.map((env, index) => ({
...env, ...env,
@@ -83,13 +82,6 @@ export const ProjectTemplateEnvironmentsForm = ({
text: "Project template updated successfully", text: "Project template updated successfully",
type: "success" type: "success"
}); });
} catch (e: any) {
console.error(e);
createNotification({
text: e.message ?? "Failed to update project template",
type: "error"
});
}
}; };
const isEnvironmentLimitExceeded = const isEnvironmentLimitExceeded =
@@ -42,7 +42,6 @@ export const ProjectTemplateRolesSection = ({ projectTemplate, isInfisicalTempla
const updateProjectTemplate = useUpdateProjectTemplate(); const updateProjectTemplate = useUpdateProjectTemplate();
const handleRemoveRole = async (slug: string) => { const handleRemoveRole = async (slug: string) => {
try {
await updateProjectTemplate.mutateAsync({ await updateProjectTemplate.mutateAsync({
templateId: projectTemplate.id, templateId: projectTemplate.id,
roles: projectTemplate.roles.filter( roles: projectTemplate.roles.filter(
@@ -55,13 +54,6 @@ export const ProjectTemplateRolesSection = ({ projectTemplate, isInfisicalTempla
type: "success" type: "success"
}); });
handlePopUpClose("removeRole"); handlePopUpClose("removeRole");
} catch (e) {
console.error(e);
createNotification({
text: "Error removing role from template",
type: "error"
});
}
}; };
const editRole = popUp?.editRole?.data as TProjectRole; const editRole = popUp?.editRole?.data as TProjectRole;
@@ -93,7 +93,6 @@ const ProjectTemplateForm = ({ onComplete, projectTemplate }: FormProps) => {
? updateProjectTemplate.mutateAsync({ templateId: projectTemplate.id, ...data }) ? updateProjectTemplate.mutateAsync({ templateId: projectTemplate.id, ...data })
: createProjectTemplate.mutateAsync({ ...data }); : createProjectTemplate.mutateAsync({ ...data });
try {
const template = await mutation; const template = await mutation;
createNotification({ createNotification({
text: `Successfully ${ text: `Successfully ${
@@ -103,15 +102,6 @@ const ProjectTemplateForm = ({ onComplete, projectTemplate }: FormProps) => {
}); });
onComplete(template); onComplete(template);
} catch (err) {
console.error(err);
createNotification({
text: `Failed to ${
projectTemplate ? "update template details" : "create project template"
}`,
type: "error"
});
}
}; };
return ( return (
@@ -87,7 +87,6 @@ export const UserOrgMembershipModal = ({ popUp, handlePopUpOpen, handlePopUpTogg
}, [popUp?.orgMembership?.data, roles]); }, [popUp?.orgMembership?.data, roles]);
const onFormSubmit = async ({ role, metadata }: FormData) => { const onFormSubmit = async ({ role, metadata }: FormData) => {
try {
if (!orgId) return; if (!orgId) return;
await updateOrgMembership({ await updateOrgMembership({
@@ -105,16 +104,6 @@ export const UserOrgMembershipModal = ({ popUp, handlePopUpOpen, handlePopUpTogg
}); });
reset(); reset();
} catch (err) {
console.error(err);
const error = err as any;
const text = error?.response?.data?.message ?? "Failed to update user organization role";
createNotification({
text,
type: "error"
});
}
}; };
return ( return (
@@ -67,7 +67,6 @@ const UserAddToProjectModalChild = ({ membershipId, popUp, handlePopUpToggle }:
}, [workspaces, projectMemberships]); }, [workspaces, projectMemberships]);
const onFormSubmit = async ({ projectId }: FormData) => { const onFormSubmit = async ({ projectId }: FormData) => {
try {
await addUserToWorkspaceNonE2EE({ await addUserToWorkspaceNonE2EE({
projectId, projectId,
usernames: [popupData.username], usernames: [popupData.username],
@@ -81,16 +80,6 @@ const UserAddToProjectModalChild = ({ membershipId, popUp, handlePopUpToggle }:
reset(); reset();
handlePopUpToggle("addUserToProject", false); handlePopUpToggle("addUserToProject", false);
} catch (err) {
console.error(err);
const error = err as any;
const text = error?.response?.data?.message ?? "Failed to add identity to project";
createNotification({
text,
type: "error"
});
}
}; };
return ( return (
@@ -20,7 +20,6 @@ export const UserGroupsSection = ({ orgMembership }: Props) => {
const { mutateAsync: removeUserFromGroup } = useRemoveUserFromGroup(); const { mutateAsync: removeUserFromGroup } = useRemoveUserFromGroup();
const handleRemoveUserFromGroup = useCallback(async (groupId: string, groupSlug: string) => { const handleRemoveUserFromGroup = useCallback(async (groupId: string, groupSlug: string) => {
try {
await removeUserFromGroup({ await removeUserFromGroup({
groupId, groupId,
slug: groupSlug, slug: groupSlug,
@@ -33,12 +32,6 @@ export const UserGroupsSection = ({ orgMembership }: Props) => {
}); });
handlePopUpClose("removeUserFromGroup"); handlePopUpClose("removeUserFromGroup");
} catch {
createNotification({
type: "error",
text: "Failed to remove user from group"
});
}
}, []); }, []);
return ( return (
@@ -62,7 +62,6 @@ const Content = ({ popUp, handlePopUpToggle }: Props) => {
}); });
const onFormSubmit = async ({ group, role }: FormData) => { const onFormSubmit = async ({ group, role }: FormData) => {
try {
await addGroupToWorkspaceMutateAsync({ await addGroupToWorkspaceMutateAsync({
projectId: currentProject?.id || "", projectId: currentProject?.id || "",
groupId: group.id, groupId: group.id,
@@ -76,12 +75,6 @@ const Content = ({ popUp, handlePopUpToggle }: Props) => {
text: "Successfully added group to project", text: "Successfully added group to project",
type: "success" type: "success"
}); });
} catch {
createNotification({
text: "Failed to add group to project",
type: "error"
});
}
}; };
return filteredGroupMembershipOrgs.length ? ( return filteredGroupMembershipOrgs.length ? (
@@ -43,7 +43,6 @@ export const GroupsSection = () => {
}; };
const onRemoveGroupSubmit = async (groupId: string) => { const onRemoveGroupSubmit = async (groupId: string) => {
try {
await deleteMutateAsync({ await deleteMutateAsync({
groupId, groupId,
projectId: currentProject?.id || "" projectId: currentProject?.id || ""
@@ -55,16 +54,6 @@ export const GroupsSection = () => {
}); });
handlePopUpClose("deleteGroup"); handlePopUpClose("deleteGroup");
} catch (err) {
console.error(err);
const error = err as any;
const text = error?.response?.data?.message ?? "Failed to remove group from project";
createNotification({
text,
type: "error"
});
}
}; };
return ( return (
@@ -119,7 +119,6 @@ export const IdentityTab = withProjectPermission(
] as const); ] as const);
const onRemoveIdentitySubmit = async (identityId: string) => { const onRemoveIdentitySubmit = async (identityId: string) => {
try {
await deleteMutateAsync({ await deleteMutateAsync({
identityId, identityId,
projectId projectId
@@ -131,16 +130,6 @@ export const IdentityTab = withProjectPermission(
}); });
handlePopUpClose("deleteIdentity"); handlePopUpClose("deleteIdentity");
} catch (err) {
console.error(err);
const error = err as any;
const text = error?.response?.data?.message ?? "Failed to remove identity from project";
createNotification({
text,
type: "error"
});
}
}; };
const handleSort = (column: ProjectIdentityOrderBy) => { const handleSort = (column: ProjectIdentityOrderBy) => {
@@ -104,7 +104,6 @@ const Content = ({ popUp, handlePopUpToggle }: Props) => {
}); });
const onFormSubmit = async ({ identity, role }: FormData) => { const onFormSubmit = async ({ identity, role }: FormData) => {
try {
await addIdentityToWorkspaceMutateAsync({ await addIdentityToWorkspaceMutateAsync({
projectId, projectId,
identityId: identity.id, identityId: identity.id,
@@ -128,16 +127,6 @@ const Content = ({ popUp, handlePopUpToggle }: Props) => {
} }
}); });
handlePopUpToggle("identity", false); handlePopUpToggle("identity", false);
} catch (err) {
console.error(err);
const error = err as any;
const text = error?.response?.data?.message ?? "Failed to add identity to project";
createNotification({
text,
type: "error"
});
}
}; };
if (isMembershipsLoading || isRolesLoading) if (isMembershipsLoading || isRolesLoading)
@@ -110,7 +110,6 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {
if (!selectedMembers) return; if (!selectedMembers) return;
try {
if (currentProject.version === ProjectVersion.V1) { if (currentProject.version === ProjectVersion.V1) {
createNotification({ createNotification({
type: "error", type: "error",
@@ -161,14 +160,6 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {
text: "Successfully added user to the project", text: "Successfully added user to the project",
type: "success" type: "success"
}); });
} catch (error) {
console.error(error);
createNotification({
text: "Failed to add user to project",
type: "error"
});
return;
}
handlePopUpToggle("addMember", false); handlePopUpToggle("addMember", false);
reset(); reset();
}; };
@@ -182,7 +182,6 @@ export const SpecificPrivilegeSecretForm = ({
} }
if (deleteUserPrivilege.isPending) return; if (deleteUserPrivilege.isPending) return;
try {
await deleteUserPrivilege.mutateAsync({ await deleteUserPrivilege.mutateAsync({
privilegeId: privilege.id, privilegeId: privilege.id,
projectMembershipId: privilege.projectMembershipId projectMembershipId: privilege.projectMembershipId
@@ -191,12 +190,6 @@ export const SpecificPrivilegeSecretForm = ({
type: "success", type: "success",
text: "Successfully deleted privilege" text: "Successfully deleted privilege"
}); });
} catch {
createNotification({
type: "error",
text: "Failed to delete privilege"
});
}
}; };
// This is used for requesting access additional privileges, not directly creating a privilege! // This is used for requesting access additional privileges, not directly creating a privilege!
@@ -35,7 +35,6 @@ export const MembersSection = () => {
if (!currentOrg?.id) return; if (!currentOrg?.id) return;
if (!currentProject?.id) return; if (!currentProject?.id) return;
try {
await removeUserFromWorkspace({ await removeUserFromWorkspace({
projectId: currentProject.id, projectId: currentProject.id,
usernames: [username], usernames: [username],
@@ -45,13 +44,6 @@ export const MembersSection = () => {
text: "Successfully removed user from project", text: "Successfully removed user from project",
type: "success" type: "success"
}); });
} catch (error) {
console.error(error);
createNotification({
text: "Failed to remove user from the project",
type: "error"
});
}
handlePopUpClose("removeMember"); handlePopUpClose("removeMember");
}; };
@@ -6,7 +6,6 @@ import { useTranslation } from "react-i18next";
import { faCheck, faCopy, faPlus, faTrashCan } from "@fortawesome/free-solid-svg-icons"; import { faCheck, faCopy, faPlus, faTrashCan } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { AxiosError } from "axios";
import { z } from "zod"; import { z } from "zod";
import { createNotification } from "@app/components/notifications"; import { createNotification } from "@app/components/notifications";
@@ -110,7 +109,6 @@ const ServiceTokenForm = () => {
}; };
const onFormSubmit = async ({ name, scopes, expiresIn, permissions }: FormData) => { const onFormSubmit = async ({ name, scopes, expiresIn, permissions }: FormData) => {
try {
if (!currentProject?.id) return; if (!currentProject?.id) return;
const randomBytes = crypto.randomBytes(16).toString("hex"); const randomBytes = crypto.randomBytes(16).toString("hex");
@@ -134,21 +132,6 @@ const ServiceTokenForm = () => {
text: "Successfully created a service token", text: "Successfully created a service token",
type: "success" type: "success"
}); });
} catch (err) {
console.error(err);
const axiosError = err as AxiosError;
if (axiosError?.response?.status === 401) {
createNotification({
text: "You do not have access to the selected environment/path",
type: "error"
});
} else {
createNotification({
text: "Failed to create a service token",
type: "error"
});
}
}
}; };
return !hasServiceToken ? ( return !hasServiceToken ? (
@@ -28,8 +28,7 @@ export const ServiceTokenSection = withProjectPermission(
] as const); ] as const);
const onDeleteApproved = async () => { const onDeleteApproved = async () => {
try { await deleteServiceToken.mutateAsync(
deleteServiceToken.mutateAsync(
(popUp?.deleteAPITokenConfirmation?.data as DeleteModalData)?.id (popUp?.deleteAPITokenConfirmation?.data as DeleteModalData)?.id
); );
createNotification({ createNotification({
@@ -38,13 +37,6 @@ export const ServiceTokenSection = withProjectPermission(
}); });
handlePopUpClose("deleteAPITokenConfirmation"); handlePopUpClose("deleteAPITokenConfirmation");
} catch (err) {
console.error(err);
createNotification({
text: "Failed to delete service token",
type: "error"
});
}
}; };
return ( return (
@@ -35,7 +35,6 @@ export const GroupDetailsSection = ({ groupMembership }: Props) => {
const navigate = useNavigate(); const navigate = useNavigate();
const onRemoveGroupSubmit = async () => { const onRemoveGroupSubmit = async () => {
try {
await deleteMutateAsync({ await deleteMutateAsync({
groupId: groupMembership.group.id, groupId: groupMembership.group.id,
projectId: currentProject.id projectId: currentProject.id
@@ -57,16 +56,6 @@ export const GroupDetailsSection = ({ groupMembership }: Props) => {
}); });
handlePopUpClose("deleteGroup"); handlePopUpClose("deleteGroup");
} catch (err) {
console.error(err);
const error = err as any;
const text = error?.response?.data?.message ?? "Failed to remove group from project";
createNotification({
text,
type: "error"
});
}
}; };
return ( return (
@@ -76,7 +76,6 @@ const Page = () => {
}; };
const onRemoveIdentitySubmit = async () => { const onRemoveIdentitySubmit = async () => {
try {
await deleteMutateAsync({ await deleteMutateAsync({
identityId, identityId,
projectId projectId
@@ -95,16 +94,6 @@ const Page = () => {
selectedTab: "identities" selectedTab: "identities"
} }
}); });
} catch (err) {
console.error(err);
const error = err as any;
const text = error?.response?.data?.message ?? "Failed to remove identity from project";
createNotification({
text,
type: "error"
});
}
}; };
if (isMembershipDetailsLoading) { if (isMembershipDetailsLoading) {
@@ -83,7 +83,6 @@ export const Page = () => {
const handleRemoveUser = async () => { const handleRemoveUser = async () => {
if (!currentOrg?.id || !currentProject?.id || !membershipDetails?.user?.username) return; if (!currentOrg?.id || !currentProject?.id || !membershipDetails?.user?.username) return;
try {
await removeUserFromWorkspace({ await removeUserFromWorkspace({
projectId, projectId,
usernames: [membershipDetails?.user?.username], usernames: [membershipDetails?.user?.username],
@@ -99,13 +98,6 @@ export const Page = () => {
projectId: currentProject.id projectId: currentProject.id
} }
}); });
} catch (error) {
console.error(error);
createNotification({
text: "Failed to remove user from the project",
type: "error"
});
}
handlePopUpClose("removeMember"); handlePopUpClose("removeMember");
}; };
@@ -53,7 +53,6 @@ const Page = () => {
] as const); ] as const);
const onDeleteRoleSubmit = async () => { const onDeleteRoleSubmit = async () => {
try {
if (!currentProject?.slug || !data?.id) return; if (!currentProject?.slug || !data?.id) return;
await deleteProjectRole({ await deleteProjectRole({
@@ -75,16 +74,6 @@ const Page = () => {
selectedTab: ProjectAccessControlTabs.Roles selectedTab: ProjectAccessControlTabs.Roles
} }
}); });
} catch (err) {
console.error(err);
const error = err as any;
const text = error?.response?.data?.message ?? "Failed to delete project role";
createNotification({
text,
type: "error"
});
}
}; };
const isCustomRole = !Object.values(ProjectMembershipRole).includes( const isCustomRole = !Object.values(ProjectMembershipRole).includes(
@@ -76,7 +76,6 @@ export const RoleModal = ({ popUp, handlePopUpToggle }: Props) => {
}, [role]); }, [role]);
const onFormSubmit = async ({ name, description, slug }: FormData) => { const onFormSubmit = async ({ name, description, slug }: FormData) => {
try {
if (!projectId) return; if (!projectId) return;
if (role) { if (role) {
@@ -125,14 +124,6 @@ export const RoleModal = ({ popUp, handlePopUpToggle }: Props) => {
}); });
reset(); reset();
} catch {
const text = `Failed to ${popUp?.role?.data ? "update" : "create"} role`;
createNotification({
text,
type: "error"
});
}
}; };
return ( return (
@@ -10,7 +10,6 @@ export const DeleteProjectProtection = () => {
const { mutateAsync } = useUpdateProject(); const { mutateAsync } = useUpdateProject();
const handleToggleDeleteProjectProtection = async (state: boolean) => { const handleToggleDeleteProjectProtection = async (state: boolean) => {
try {
await mutateAsync({ await mutateAsync({
projectId, projectId,
hasDeleteProtection: state hasDeleteProtection: state
@@ -21,13 +20,6 @@ export const DeleteProjectProtection = () => {
text, text,
type: "success" type: "success"
}); });
} catch (err) {
console.error(err);
createNotification({
text: "Failed to update delete protection",
type: "error"
});
}
}; };
return ( return (
@@ -68,12 +68,6 @@ export const DeleteProjectSection = () => {
to: "/organization/projects" to: "/organization/projects"
}); });
handlePopUpClose("deleteWorkspace"); handlePopUpClose("deleteWorkspace");
} catch (err) {
console.error(err);
createNotification({
text: "Failed to delete project",
type: "error"
});
} finally { } finally {
setIsDeleting.off(); setIsDeleting.off();
} }
@@ -118,12 +112,6 @@ export const DeleteProjectSection = () => {
navigate({ navigate({
to: "/organization/projects" to: "/organization/projects"
}); });
} catch (err) {
console.error(err);
createNotification({
text: "Failed to leave project",
type: "error"
});
} finally { } finally {
setIsLeaving.off(); setIsLeaving.off();
} }