From 3884967dee65f6a08e962044fedd9bc8e40c2b7f Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Tue, 21 Dec 2021 11:43:20 +0700
Subject: [PATCH] handling error

---
 src/pages/Config/Commission.js       | 7 ++++++-
 src/pages/Config/Partner.js          | 7 ++++++-
 src/pages/Config/Supplier.js         | 5 +++++
 src/pages/Login/Login.js             | 4 ++--
 src/pages/Membership/Membership.js   | 5 +++++
 src/pages/Payback/Payback.js         | 5 +++++
 src/pages/Payback/PaybackFromUser.js | 5 +++++
 src/pages/Payback/PaybackModal.js    | 7 +++++--
 src/pages/Product/Category.js        | 7 ++++++-
 src/pages/Product/Product.js         | 7 ++++++-
 src/pages/Product/Subcategory.js     | 7 ++++++-
 src/pages/Transaction/Product.js     | 5 +++++
 src/pages/Transaction/Transaction.js | 7 ++++++-
 13 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/src/pages/Config/Commission.js b/src/pages/Config/Commission.js
index b7388bc..baa91c9 100644
--- a/src/pages/Config/Commission.js
+++ b/src/pages/Config/Commission.js
@@ -1,5 +1,5 @@
 import React, {useContext, useEffect, useState} from "react";
-import { Button, Card, Col, Input, Row, Tabs } from "antd";
+import { Button, Card, Col, Input, Row, Tabs ,message} from "antd";
 import { FilterOutlined, PlusSquareOutlined } from "@ant-design/icons";
 import { BreadcumbComponent } from "../../component/BreadcumbComponent";
 import { useStore } from "../../utils/useStore";
@@ -24,6 +24,11 @@ export const Commission = observer(() => {
         modalLoader.setLoading(false);
       } catch (e) {
         modalLoader.setLoading(false);
+        if (e.response?.body?.message) {
+          message.error(e.response.body.message);
+          return;
+        }
+        message.error(e.message);
       }
     };
 
diff --git a/src/pages/Config/Partner.js b/src/pages/Config/Partner.js
index 6b5e6c4..e1e8b41 100644
--- a/src/pages/Config/Partner.js
+++ b/src/pages/Config/Partner.js
@@ -1,5 +1,5 @@
 import React, {useContext, useEffect, useState} from "react";
-import {Button, Card, Col, Input, Row, Tabs} from "antd";
+import {Button, Card, Col, Input, Row, Tabs,message} from "antd";
 import {FilterOutlined, PlusSquareOutlined,} from "@ant-design/icons";
 import {BreadcumbComponent} from "../../component/BreadcumbComponent";
 import {useStore} from "../../utils/useStore";
@@ -22,6 +22,11 @@ export const Partner = observer(() => {
         modalLoader.setLoading(false);
       } catch (e) {
         modalLoader.setLoading(false);
+        if (e.response?.body?.message) {
+          message.error(e.response.body.message);
+          return;
+        }
+        message.error(e.message);
       }
     };
 
diff --git a/src/pages/Config/Supplier.js b/src/pages/Config/Supplier.js
index 9c42792..5c6d60a 100644
--- a/src/pages/Config/Supplier.js
+++ b/src/pages/Config/Supplier.js
@@ -37,6 +37,11 @@ export const Supplier = observer(() => {
         modalLoader.setLoading(false);
       } catch (e) {
         modalLoader.setLoading(false);
+        if (e.response?.body?.message) {
+          message.error(e.response.body.message);
+          return;
+        }
+        message.error(e.message);
       }
     };
 
diff --git a/src/pages/Login/Login.js b/src/pages/Login/Login.js
index b71b999..6ec5bc9 100644
--- a/src/pages/Login/Login.js
+++ b/src/pages/Login/Login.js
@@ -14,12 +14,12 @@ export const Login = observer(() => {
 
   const handleLogin = async (params) => {
     try {
-      modalLoader.setLoading(true);
+      //modalLoader.setLoading(true);
       await store.authentication.login({
         username: params.username,
         password: params.password,
       });
-      modalLoader.setLoading(false);
+      //modalLoader.setLoading(false);
       history.push(LINKS.HOME);
     } catch (e) {
       modalLoader.setLoading(true);
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index 0908976..93d6d33 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -53,6 +53,11 @@ export const Membership = observer(() => {
       } catch (e) {
         console.error(e);
         modalLoader.setLoading(false);
+        if (e.response?.body?.message) {
+          message.error(e.response.body.message);
+          return;
+        }
+        message.error(e.message);
       }
     };
 
diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js
index ba1a29f..8ade44a 100644
--- a/src/pages/Payback/Payback.js
+++ b/src/pages/Payback/Payback.js
@@ -39,6 +39,11 @@ export const Payback = observer(() => {
         modalLoader.setLoading(false);
       } catch (e) {
         modalLoader.setLoading(false);
+        if (e.response?.body?.message) {
+          message.error(e.response.body.message);
+          return;
+        }
+        message.error(e.message);
       }
     };
 
diff --git a/src/pages/Payback/PaybackFromUser.js b/src/pages/Payback/PaybackFromUser.js
index 1e66284..8f359f4 100644
--- a/src/pages/Payback/PaybackFromUser.js
+++ b/src/pages/Payback/PaybackFromUser.js
@@ -42,6 +42,11 @@ export const PaybackFromUser = observer(() => {
         modalLoader.setLoading(false);
       } catch (e) {
         modalLoader.setLoading(false);
+        if (e.response?.body?.message) {
+          message.error(e.response.body.message);
+          return;
+        }
+        message.error(e.message);
       }
     };
 
diff --git a/src/pages/Payback/PaybackModal.js b/src/pages/Payback/PaybackModal.js
index e87f74d..a6bf6de 100644
--- a/src/pages/Payback/PaybackModal.js
+++ b/src/pages/Payback/PaybackModal.js
@@ -85,8 +85,11 @@ export const PaybackModal = ({visible, onCreate, onCancel, initialData}) => {
       await store.payback.getData();
     } catch (e) {
       modalLoader.setLoading(false);
-      console.log(e, "apa errornya");
-      message.error("Failed Add Member");
+      if (e.response?.body?.message) {
+        message.error(e.response.body.message);
+        return;
+      }
+      message.error(e.message);
     }
     form.resetFields();
   };
diff --git a/src/pages/Product/Category.js b/src/pages/Product/Category.js
index fee1dba..67728e8 100644
--- a/src/pages/Product/Category.js
+++ b/src/pages/Product/Category.js
@@ -1,5 +1,5 @@
 import React, {useContext, useEffect, useState} from "react";
-import {Button, Card, Col, Input, Row, Tabs} from "antd";
+import {Button, Card, Col, Input, Row, Tabs,message} from "antd";
 import {FilterOutlined, PlusSquareOutlined} from "@ant-design/icons";
 import {BreadcumbComponent} from "../../component/BreadcumbComponent";
 import {useStore} from "../../utils/useStore";
@@ -23,6 +23,11 @@ export const Category = observer(() => {
         modalLoader.setLoading(false);
       } catch (e) {
         modalLoader.setLoading(false);
+        if (e.response?.body?.message) {
+          message.error(e.response.body.message);
+          return;
+        }
+        message.error(e.message);
       }
     };
 
diff --git a/src/pages/Product/Product.js b/src/pages/Product/Product.js
index 1c5dc03..c4806ff 100644
--- a/src/pages/Product/Product.js
+++ b/src/pages/Product/Product.js
@@ -1,5 +1,5 @@
 import React, {useContext, useEffect} from "react";
-import {Button, Card, Col, Input, Row, Upload} from "antd";
+import {Button, Card, Col, Input, Row, Upload,message} from "antd";
 import {FilterOutlined, PlusSquareOutlined, UploadOutlined,} from "@ant-design/icons";
 import {BreadcumbComponent} from "../../component/BreadcumbComponent";
 import {useStore} from "../../utils/useStore";
@@ -27,6 +27,11 @@ export const Product = observer(() => {
         modalLoader.setLoading(false);
       } catch (e) {
         modalLoader.setLoading(false);
+        if (e.response?.body?.message) {
+          message.error(e.response.body.message);
+          return;
+        }
+        message.error(e.message);
       }
     };
 
diff --git a/src/pages/Product/Subcategory.js b/src/pages/Product/Subcategory.js
index edfa0ae..402ab7f 100644
--- a/src/pages/Product/Subcategory.js
+++ b/src/pages/Product/Subcategory.js
@@ -1,5 +1,5 @@
 import React, {useContext, useEffect, useState} from "react";
-import {Button, Card, Col, Input, Row} from "antd";
+import {Button, Card, Col, Input, Row,message} from "antd";
 import {PlusSquareOutlined} from "@ant-design/icons";
 import {BreadcumbComponent} from "../../component/BreadcumbComponent";
 import {useStore} from "../../utils/useStore";
@@ -22,6 +22,11 @@ export const Subcategory = observer(() => {
         modalLoader.setLoading(false);
       } catch (e) {
         modalLoader.setLoading(false);
+        if (e.response?.body?.message) {
+          message.error(e.response.body.message);
+          return;
+        }
+        message.error(e.message);
       }
     };
 
diff --git a/src/pages/Transaction/Product.js b/src/pages/Transaction/Product.js
index 6e5f103..5e23868 100644
--- a/src/pages/Transaction/Product.js
+++ b/src/pages/Transaction/Product.js
@@ -25,6 +25,11 @@ export const Product = observer(() => {
         modalLoader.setLoading(false);
       } catch (e) {
         modalLoader.setLoading(false);
+        if (e.response?.body?.message) {
+          message.error(e.response.body.message);
+          return;
+        }
+        message.error(e.message);
       }
     };
 
diff --git a/src/pages/Transaction/Transaction.js b/src/pages/Transaction/Transaction.js
index 978d6b9..441a30a 100644
--- a/src/pages/Transaction/Transaction.js
+++ b/src/pages/Transaction/Transaction.js
@@ -1,4 +1,4 @@
-import React, {useContext, useEffect, useState} from "react";
+import React, {useContext, useEffect, useState,message} from "react";
 import {useStore} from "../../utils/useStore";
 import {Card, Tabs} from "antd";
 import {BreadcumbComponent} from "../../component/BreadcumbComponent";
@@ -23,6 +23,11 @@ export const Transaction = observer(() => {
         modalLoader.setLoading(false);
       } catch (e) {
         modalLoader.setLoading(false);
+        if (e.response?.body?.message) {
+          message.error(e.response.body.message);
+          return;
+        }
+        message.error(e.message);
       }
     };