mirror/formbricks-formbricks
1
0
Fork 0
mirror of https://github.com/formbricks/formbricks.git synced 2026-05-08 06:41:45 -05:00
Code Issues Packages Projects Releases 100 Wiki Activity

fix: check serverError before showing success toast (#7185)

Browse Source 
Co-authored-by: Andres Cruciani <AndresAIFR@users.noreply.github.com>
Co-authored-by: pandeymangg <anshuman.pandey9999@gmail.com>
This commit is contained in:
AndresAIFR
2026-02-08 23:49:36 -05:00
committed by GitHub
parent 04220902b4
commit 76b25476b3
13 changed files with 142 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/modules/ee/contacts/segments/components/segment-settings.tsx
+7 -1
View File
@@ -109,7 +109,13 @@ export function SegmentSettings({
const handleDeleteSegment = async () => {
try {
setIsDeletingSegment(true);
await deleteSegmentAction({ segmentId: segment.id });
const result = await deleteSegmentAction({ segmentId: segment.id });
if (result?.serverError) {
toast.error(getFormattedErrorMessage(result));
setIsDeletingSegment(false);
return;
}
setIsDeletingSegment(false);
toast.success(t("environments.segments.segment_deleted_successfully"));
apps/web/modules/ee/contacts/segments/components/targeting-card.tsx
+6 -1
View File
@@ -17,6 +17,7 @@ import type {
import type { TSurvey } from "@formbricks/types/surveys/types";
import { cn } from "@/lib/cn";
import { structuredClone } from "@/lib/pollyfills/structuredClone";
import { getFormattedErrorMessage } from "@/lib/utils/helper";
import {
cloneSegmentAction,
createSegmentAction,
@@ -135,7 +136,11 @@ export function TargetingCard({
const handleSaveSegment = async (data: TSegmentUpdateInput) => {
try {
if (!segment) throw new Error(t("environments.segments.invalid_segment"));
await updateSegmentAction({ segmentId: segment.id, environmentId, data });
const result = await updateSegmentAction({ segmentId: segment.id, environmentId, data });
if (result?.serverError) {
toast.error(getFormattedErrorMessage(result));
return;
}
toast.success(t("environments.segments.segment_saved_successfully"));
setIsSegmentEditorOpen(false);
apps/web/modules/ee/multi-language-surveys/components/edit-language.tsx
+13 -3
View File
@@ -154,7 +154,12 @@ export function EditLanguage({
const performLanguageDeletion = async (languageId: string) => {
try {
await deleteLanguageAction({ languageId, projectId: project.id });
const result = await deleteLanguageAction({ languageId, projectId: project.id });
if (result?.serverError) {
toast.error(getFormattedErrorMessage(result));
setConfirmationModal((prev) => ({ ...prev, isOpen: false }));
return;
}
setLanguages((prev) => prev.filter((lang) => lang.id !== languageId));
toast.success(t("environments.workspace.languages.language_deleted_successfully"));
// Close the modal after deletion
@@ -187,7 +192,7 @@ export function EditLanguage({
const handleSaveChanges = async () => {
if (!validateLanguages(languages, t)) return;
await Promise.all(
const results = await Promise.all(
languages.map((lang) => {
return lang.id === "new"
? createLanguageAction({
@@ -201,6 +206,11 @@ export function EditLanguage({
});
})
);
const errorResult = results.find((result) => result?.serverError);
if (errorResult) {
toast.error(getFormattedErrorMessage(errorResult));
return;
}
toast.success(t("environments.workspace.languages.languages_updated_successfully"));
router.refresh();
setIsEditing(false);
@@ -239,7 +249,7 @@ export function EditLanguage({
))}
</>
) : (
<p className="text-sm text-slate-500 italic">
<p className="text-sm italic text-slate-500">
{t("environments.workspace.languages.no_language_found")}
</p>
)}
apps/web/modules/ee/teams/team-list/components/team-settings/delete-team.tsx
+7
View File
@@ -4,6 +4,7 @@ import { useRouter } from "next/navigation";
import { useState } from "react";
import toast from "react-hot-toast";
import { useTranslation } from "react-i18next";
import { getFormattedErrorMessage } from "@/lib/utils/helper";
import { deleteTeamAction } from "@/modules/ee/teams/team-list/actions";
import { TTeam } from "@/modules/ee/teams/team-list/types/team";
import { Button } from "@/modules/ui/components/button";
@@ -27,6 +28,12 @@ export const DeleteTeam = ({ teamId, onDelete, isOwnerOrManager }: DeleteTeamPro
setIsDeleting(true);
const deleteTeamActionResponse = await deleteTeamAction({ teamId });
if (deleteTeamActionResponse?.serverError) {
toast.error(getFormattedErrorMessage(deleteTeamActionResponse));
setIsDeleteDialogOpen(false);
setIsDeleting(false);
return;
}
if (deleteTeamActionResponse?.data) {
toast.success(t("environments.settings.teams.team_deleted_successfully"));
onDelete?.();
apps/web/modules/organization/settings/teams/components/edit-memberships/member-actions.tsx
+15 -2
View File
@@ -42,14 +42,27 @@ export const MemberActions = ({ organization, member, invite, showDeleteButton }
if (!member && invite) {
// This is an invite
await deleteInviteAction({ inviteId: invite?.id, organizationId: organization.id });
const result = await deleteInviteAction({ inviteId: invite?.id, organizationId: organization.id });
if (result?.serverError) {
toast.error(getFormattedErrorMessage(result));
setIsDeleting(false);
return;
}
toast.success(t("environments.settings.general.invite_deleted_successfully"));
}
if (member && !invite) {
// This is a member
await deleteMembershipAction({ userId: member.userId, organizationId: organization.id });
const result = await deleteMembershipAction({
userId: member.userId,
organizationId: organization.id,
});
if (result?.serverError) {
toast.error(getFormattedErrorMessage(result));
setIsDeleting(false);
return;
}
toast.success(t("environments.settings.general.member_deleted_successfully"));
}
apps/web/modules/organization/settings/teams/components/edit-memberships/organization-actions.tsx
+6 -1
View File
@@ -71,7 +71,12 @@ export const OrganizationActions = ({
const handleLeaveOrganization = async () => {
setLoading(true);
try {
await leaveOrganizationAction({ organizationId: organization.id });
const result = await leaveOrganizationAction({ organizationId: organization.id });
if (result?.serverError) {
toast.error(getFormattedErrorMessage(result));
setLoading(false);
return;
}
toast.success(t("environments.settings.general.member_deleted_successfully"));
router.refresh();
setLoading(false);
apps/web/modules/projects/settings/(setup)/components/ActionSettingsTab.tsx
+11 -2
View File
@@ -8,6 +8,7 @@ import { FormProvider, useForm } from "react-hook-form";
import { toast } from "react-hot-toast";
import { useTranslation } from "react-i18next";
import { TActionClass, TActionClassInput } from "@formbricks/types/action-classes";
import { getFormattedErrorMessage } from "@/lib/utils/helper";
import {
deleteActionClassAction,
updateActionClassAction,
@@ -92,10 +93,14 @@ export const ActionSettingsTab = ({
validatePermissions(isReadOnly, t);
const updatedAction = buildActionObject(data, actionClass.environmentId, t);
await updateActionClassAction({
const result = await updateActionClassAction({
actionClassId: actionClass.id,
updatedAction: updatedAction,
});
if (result?.serverError) {
toast.error(getFormattedErrorMessage(result));
return;
}
setOpen(false);
router.refresh();
toast.success(t("environments.actions.action_updated_successfully"));
@@ -109,7 +114,11 @@ export const ActionSettingsTab = ({
const handleDeleteAction = async () => {
try {
setIsDeletingAction(true);
await deleteActionClassAction({ actionClassId: actionClass.id });
const result = await deleteActionClassAction({ actionClassId: actionClass.id });
if (result?.serverError) {
toast.error(getFormattedErrorMessage(result));
return;
}
router.refresh();
toast.success(t("environments.actions.action_deleted_successfully"));
setOpen(false);
apps/web/modules/survey/list/components/survey-dropdown-menu.tsx
+5 -1
View File
@@ -69,7 +69,11 @@ export const SurveyDropDownMenu = ({
const handleDeleteSurvey = async (surveyId: string) => {
setLoading(true);
try {
await deleteSurveyAction({ surveyId });
const result = await deleteSurveyAction({ surveyId });
if (result?.serverError) {
toast.error(getFormattedErrorMessage(result));
return;
}
deleteSurvey(surveyId);
toast.success(t("environments.surveys.survey_deleted_successfully"));
} catch (error) {