Merge pull request #68 from PLADI-ALM/feat/PDW-54-manager-resource-2

[PDW-54/Fix] 에러처리
PLADI-ALM · Oct 11, 2023 · 78a0bf1 · 78a0bf1
2 parents 294e406 + 6f48b3f
commit 78a0bf1
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/src/pages/booking/selectOffice/SelectOffice.js b/src/pages/booking/selectOffice/SelectOffice.js
@@ -4,6 +4,7 @@ import OfficeInfo from "components/officeInfo/OfficeInfo";
 import { RightContainer, WhiteContainer, TitleText } from "components/rightContainer/RightContainer";
 import { OfficesAxios } from "api/AxiosApi";
 import { useState } from "react";
+import { basicError } from 'utils/ErrorHandlerUtil';
 
 function SelectOffice(props) {
 
@@ -15,7 +16,7 @@ function SelectOffice(props) {
     const getOfficeList = () => {
         OfficesAxios.get()
             .then((Response) => { setOffices(Response.data.data.content) })
-            .catch((Error) => { alert(Error) })
+            .catch((error) => {basicError(error)})
     };
 
 
@@ -34,7 +35,7 @@ function SelectOffice(props) {
     const searchOffice = () => {
         OfficesAxios.get(`?date=${date}&startTime=${startTime}&endTime=${endTime}`)
             .then((Response) => { setOffices(Response.data.data.content) })
-            .catch((Error) => { alert(Error.response.data.message) })
+            .catch((error) => {basicError(error)})
     }
 
     useEffect(() => {

diff --git a/src/pages/booking/selectResource/SelectResource.js b/src/pages/booking/selectResource/SelectResource.js
@@ -6,6 +6,7 @@ import styled from "styled-components";
 import ResourceInfo from "components/resourceInfo/ResourceInfo";
 import { ResourcesAxios } from "api/AxiosApi";
 import { useNavigate } from "react-router-dom";
+import { basicError } from 'utils/ErrorHandlerUtil';
 
 
 export const SearchTitleContainer = styled.div`
@@ -72,7 +73,7 @@ function SelectResource(props) {
     const getResourceList = () => {
         ResourcesAxios.get()
             .then((Response) => { setResourceList(Response.data.data.content) })
-            .catch((Error) => { alert(Error) })
+            .catch((error) => {basicError(error)})
     };
 
 
@@ -95,7 +96,7 @@ function SelectResource(props) {
     const searchResource = () => {
         ResourcesAxios.get(`?resourceName=${resourceName}&startDate=${startDate}&endDate=${endDate}`)
             .then((Response) => { setResourceList(Response.data.data.content) })
-            .catch((Error) => { alert(Error.response.data.message) })
+            .catch((error) => {basicError(error)})
     }
 
 

diff --git a/src/pages/manager/officeBookingManage/OfficeBookingManage.js b/src/pages/manager/officeBookingManage/OfficeBookingManage.js
@@ -7,6 +7,7 @@ import { AdminBookingAxios } from "api/AxiosApi";
 import styled from "styled-components";
 import RangeImage from "../../../assets/images/RangeArrow.svg"
 import { getToken } from "utils/IsLoginUtil";
+import { basicError } from 'utils/ErrorHandlerUtil';
 
 
 const RangeImg = styled.img`
@@ -31,7 +32,7 @@ function OfficeBookingManage(props) {
             }
         })
         .then((Response) => { SetBookingOffices(Response.data.data.content) })
-        .catch((Error) => { alert(Error.response.data.message) })
+        .catch((error) => {basicError(error)})
     }
 
     const chnageRange = () => {

diff --git a/src/pages/manager/officeBookingManage/OfficeBookingManageCell.js b/src/pages/manager/officeBookingManage/OfficeBookingManageCell.js
@@ -5,7 +5,7 @@ import { USING, findStatus, BOOKED } from 'constants/BookingStatus';
 import { AdminBookingAxios } from 'api/AxiosApi';
 import styled from 'styled-components';
 import { getToken } from 'utils/IsLoginUtil';
-import { Link } from 'react-router-dom';
+import { basicError } from 'utils/ErrorHandlerUtil';
 
 const SettingButtonContainer = styled.div`
     display: flex;
@@ -41,7 +41,7 @@ function OfficeBookingManageCell(props) {
                 alert(Response.data.message)
                 window.location.reload()
              })
-            .catch((Error) => { alert(Error.response.data.message) })
+             .catch((error) => {basicError(error)})
         }
         else
         {

diff --git a/src/pages/manager/resourceBookingManage/ResourceBookingManage.js b/src/pages/manager/resourceBookingManage/ResourceBookingManage.js
@@ -7,6 +7,7 @@ import ManageSearchBar from "components/searchBar/ManageSearchBar";
 import ResourceBookingManageCell from "./ResourceBookingManageCell";
 import { AdminBookingAxios } from "api/AxiosApi";
 import { getToken } from "utils/IsLoginUtil";
+import { basicError } from "utils/ErrorHandlerUtil";
 
 
 function ResourceBookingManage(props) {
@@ -24,7 +25,7 @@ function ResourceBookingManage(props) {
             }
         })
         .then((Response) => { SetBookingResources(Response.data.data.content) })
-        .catch((Error) => { alert (Error.response.data.message) })
+        .catch((error) => {basicError(error)})
     }
 
 

diff --git a/src/pages/manager/resourceBookingManage/ResourceBookingManageCell.js b/src/pages/manager/resourceBookingManage/ResourceBookingManageCell.js
@@ -6,6 +6,7 @@ import { CANCELED, USING, WAITING, findStatus } from 'constants/BookingStatus';
 import { AdminBookingAxios } from 'api/AxiosApi';
 import styled from 'styled-components';
 import { getToken } from 'utils/IsLoginUtil';
+import { basicError } from 'utils/ErrorHandlerUtil';
 
 const SettingButtonContainer = styled.div`
     display: flex;
@@ -40,7 +41,7 @@ function ResourceBookingManageCell(props) {
                 alert(Response.data.message)
                 window.location.reload()
              })
-            .catch((Error) => { alert(Error.response.data.message) })
+             .catch((error) => {basicError(error)})
 
             props.refresh()
         }
@@ -64,7 +65,7 @@ function ResourceBookingManageCell(props) {
                 alert(Response.data.message)
                 window.location.reload()
              })
-            .catch((Error) => { alert(Error.response.data.message) })
+             .catch((error) => {basicError(error)})
 
             props.refresh()
         }
@@ -86,7 +87,7 @@ function ResourceBookingManageCell(props) {
                 alert(Response.data.message)
                 window.location.reload()
              })
-            .catch((Error) => { alert(Error.response.data.message) })
+             .catch((error) => {basicError(error)})
 
             props.refresh()
         }

diff --git a/src/utils/ErrorHandlerUtil.js b/src/utils/ErrorHandlerUtil.js
@@ -20,4 +20,4 @@ export function basicError(error) {
     } catch (error) {
         console.log(error)
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,4 @@ export function basicError(error) { @@
         } catch (error) {
             console.log(error)
         }
-    }
+    }