CRM/Frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CFE-6 bug fix toast and make better flow for remove and add toast in page

Browse Source
This commit is contained in:
Mohammad Jalali
2023-10-31 15:11:53 +03:30
parent 73ca237817
commit cd90adee01
10 changed files with 59 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/core/utils/errorHandler.js
View File

@@ -1,50 +1,48 @@
import {toast} from "react-toastify";
import Notifications from "@/core/components/notifications";
export const errorSetting = (t, notification) => {
export const errorSetting = (dismissToastList, t, notification) => {
if (notification) {
toast.dismiss()
dismissToastList(["pending", "warning", "error", "success"])
}
}
export const errorRequest = (dismissToastList, t, notification) => {
if (notification) {
dismissToastList(["pending", "warning", "error", "success"])
}
}
export const errorRequest = (t, notification) => {
export const errorResponse = (pushToastList, dismissToastList, response, clearToken, t, notification) => {
if (notification) {
toast.dismiss()
}
}
export const errorResponse = (response, clearToken, t, notification) => {
if (notification) {
toast.dismiss()
dismissToastList(["pending", "warning", "error", "success"])
}
if (isServerError(response.status)) {
errorServer(response, t, notification)
errorServer(pushToastList, response, t, notification)
} else if (isClientError(response.status)) {
errorClient(response, clearToken, t, notification)
errorClient(pushToastList, response, clearToken, t, notification)
}
}
const errorServer = (response, t, notification) => {
if (notification) Notifications("warning", t, response.status);
const errorServer = (pushToastList, response, t, notification) => {
if (notification) Notifications(pushToastList, "warning", t, response.status);
}
const errorClient = (response, clearToken, t, notification) => {
const errorClient = (pushToastList, response, clearToken, t, notification) => {
switch (response.status) {
case 401:
clearToken()
if (notification) Notifications("error", t, response.status);
if (notification) Notifications(pushToastList, "error", t, response.status);
break;
case 422:
if ('type' in response.data) {
errorLogic(response, t, notification)
errorLogic(pushToastList, response, t, notification)
break;
}
errorValidation(response, t, notification)
errorValidation(pushToastList, response, t, notification)
break;
case 429:
if (notification) Notifications("error", t, response.status);
if (notification) Notifications(pushToastList, "error", t, response.status);
break
default:
if (notification) Notifications("error", t, response.status);
if (notification) Notifications(pushToastList, "error", t, response.status);
break
}
}
@@ -52,16 +50,16 @@ const errorClient = (response, clearToken, t, notification) => {
const isServerError = status => status >= 500 && status <= 599;
const isClientError = status => status >= 400 && status <= 499;
const errorLogic = (response, t, notification) => {
if (notification) Notifications("error", t, response.status, response.data.message);
const errorLogic = (pushToastList, response, t, notification) => {
if (notification) Notifications(pushToastList, "error", t, response.status, response.data.message);
}
const errorValidation = (response, t, notification) => {
const errorValidation = (pushToastList, response, t, notification) => {
if (notification) {
const errorsMap = Object.keys(response.data.errors)
const errorsArray = response.data.errors
errorsMap.map((item, index) => {
Notifications("error", t, errorsArray[item][0], response.data.message);
Notifications(pushToastList, "error", t, errorsArray[item][0], response.data.message);
})
}
}