feat(web): common error handler (#1040)

labring · Apr 18, 2023 · a099568 · a099568
1 parent 0e7d812
commit a099568
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 28 deletions.
diff --git a/web/src/pages/app/database/mods/AddRulesModal/index.tsx b/web/src/pages/app/database/mods/AddRulesModal/index.tsx
@@ -59,11 +59,10 @@ const AddRulesModal = (props: {
     }
     try {
       const res = await createRulesMutation.mutateAsync(data);
-      if (res.error) {
-        throw new Error(res?.error);
+      if (!res.error) {
+        props.onSuccessSubmit(res.data);
+        onClose();
       }
-      props.onSuccessSubmit(res.data);
-      onClose();
     } catch (errors) {
       setError(errors?.toString());
       return;

diff --git a/web/src/pages/auth/signin/mods/LoginByPhonePanel/index.tsx b/web/src/pages/auth/signin/mods/LoginByPhonePanel/index.tsx
@@ -77,8 +77,6 @@ export default function LoginByPhonePanel({
 
     if (res?.data === "success") {
       showSuccess(t("AuthPanel.SmsCodeSendSuccess"));
-    } else {
-      showError(res.error);
     }
   };
 

diff --git a/web/src/pages/home/mods/CreateAppModal/index.tsx b/web/src/pages/home/mods/CreateAppModal/index.tsx
@@ -124,7 +124,7 @@ const CreateAppModal = (props: {
 
   const currentSubscription = currentBundle.subscriptionOptions[0];
 
-  const { showSuccess, showError } = useGlobalStore();
+  const { showSuccess } = useGlobalStore();
 
   const totalPrice = subscriptionOption.specialPrice;
 
@@ -168,8 +168,6 @@ const CreateAppModal = (props: {
       setTimeout(() => {
         queryClient.invalidateQueries(APP_LIST_QUERY_KEY);
       }, 2000);
-    } else {
-      showError(res.error);
     }
   };
 
@@ -257,11 +255,9 @@ const CreateAppModal = (props: {
                           {(bundles || []).map((bundle: TBundle) => {
                             return (
                               <BundleItem
-                                durationIndex={bundle.subscriptionOptions.findIndex(
-                                  (vale, index) => {
-                                    return vale.displayName === subscriptionOption.displayName;
-                                  },
-                                )}
+                                durationIndex={bundle.subscriptionOptions.findIndex((vale) => {
+                                  return vale.displayName === subscriptionOption.displayName;
+                                })}
                                 onChange={onChange}
                                 bundle={bundle}
                                 isActive={bundle.id === value}

diff --git a/web/src/pages/home/mods/List/index.tsx b/web/src/pages/home/mods/List/index.tsx
@@ -172,21 +172,22 @@ function List(props: { appListQuery: any; setShouldRefetch: any }) {
                           </MenuItem>
                         </CreateAppModal>
 
-                        <MenuItem minH="40px" display={"block"}>
-                          <span
-                            className="text-primary block"
-                            onClick={async (event) => {
-                              event?.preventDefault();
-                              await updateAppMutation.mutateAsync({
-                                appid: item.appid,
-                                name: item.name,
-                                state: APP_PHASE_STATUS.Restarting,
-                              });
+                        <MenuItem
+                          minH="40px"
+                          display={"block"}
+                          onClick={async (event) => {
+                            event?.preventDefault();
+                            const res = await updateAppMutation.mutateAsync({
+                              appid: item.appid,
+                              name: item.name,
+                              state: APP_PHASE_STATUS.Restarting,
+                            });
+                            if (!res.error) {
                               setShouldRefetch(true);
-                            }}
-                          >
-                            {t("SettingPanel.Restart")}
-                          </span>
+                            }
+                          }}
+                        >
+                          <span className="text-primary block">{t("SettingPanel.Restart")}</span>
                         </MenuItem>
 
                         <MenuItem

diff --git a/web/src/utils/request.ts b/web/src/utils/request.ts
@@ -41,6 +41,15 @@ request.interceptors.request.use(
 request.interceptors.response.use(
   (response: AxiosResponse) => {
     const { data } = response;
+    if (data?.error) {
+      toast({
+        title: data?.error,
+        position: "top",
+        status: "error",
+        duration: 1500,
+      });
+    }
+
     return data;
   },
   (error) => {