From ff80d6e7e5edcf7f30955808c908fec495480db6 Mon Sep 17 00:00:00 2001
From: JANGHYUNn <kimjh2369@gmail.com>
Date: Wed, 6 Mar 2024 10:50:53 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B3=B5=ED=86=B5=20modal=20import=20=EC=9C=84?=
 =?UTF-8?q?=EC=B9=98=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EC=98=A4=EB=A5=98?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js                                      | 12 +++++++++++-
 src/containers/cstmrService/faq/FaqContainer.js |  5 +++--
 src/router/hoc/ResolveRoutes.tsx                |  6 ------
 src/router/hoc/authenticationCheck.tsx          |  6 ++++++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/App.js b/src/App.js
index 564f2585..826d9c21 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,9 +1,19 @@
 import '@styles/react/libs/flatpickr/flatpickr.scss';
 import '@styles/react/libs/tables/react-dataTable-component.scss';
 import './assets/css/custom.css';
+import { MessageModal } from '@src/components/message/MessageModal';
+import { MessageErrorModal } from '@src/components/message/MessageErrorModal';
+import { MessageInfoModal } from '@src/components/message/MessageInfoModal';
 // ** Router Import
 import Router from './router';
 if (process.env.NODE_ENV === 'production') console.log = function () {};
-const App = props => <Router />;
+const App = props => (
+  <>
+    <MessageModal />
+    <MessageErrorModal />
+    <MessageInfoModal />
+    <Router />
+  </>
+);
 
 export default App;
diff --git a/src/containers/cstmrService/faq/FaqContainer.js b/src/containers/cstmrService/faq/FaqContainer.js
index 187732c5..b56a4263 100644
--- a/src/containers/cstmrService/faq/FaqContainer.js
+++ b/src/containers/cstmrService/faq/FaqContainer.js
@@ -9,7 +9,8 @@ import FaqTab from '../../../components/cstmrService/faq/FaqTab';
 import { ConfirmModal } from '../../../components/modal/ConfirmModal';
 import {
   CONTENT_INPUT_MESSAGE,
-  TITLE_INPUT_MESSAGE
+  TITLE_INPUT_MESSAGE,
+  VALID_TITLE
 } from '@src/configs/msgConst';
 import { openModal } from '@src/redux/features/comn/message/messageSlice';
 const tabList = [
@@ -177,7 +178,7 @@ export default function FaqContainer() {
     setIsOpenFormModal(false);
     setFormData(initFormData);
     const title = formMode === 'create' ? '등록' : '수정';
-    handlerOpenModal(title, 'title' + '되었습니다.');
+    handlerOpenModal(title, `${title} 되었습니다.`);
   };
 
   // 수정하기 button click handler
diff --git a/src/router/hoc/ResolveRoutes.tsx b/src/router/hoc/ResolveRoutes.tsx
index c3836b1e..cf17eddf 100644
--- a/src/router/hoc/ResolveRoutes.tsx
+++ b/src/router/hoc/ResolveRoutes.tsx
@@ -11,9 +11,6 @@ import { IRoute } from '../routes/type';
 import { Routes } from '../routes';
 import authenticationCheck from './authenticationCheck';
 import { useSelector } from '@src/redux/store';
-import { MessageModal } from '@src/components/message/MessageModal';
-import { MessageErrorModal } from '@src/components/message/MessageErrorModal';
-import { MessageInfoModal } from '@src/components/message/MessageInfoModal';
 
 export default function ResolveRoutes() {
   const [layout, setLayout] = useLayout();
@@ -56,9 +53,6 @@ export default function ResolveRoutes() {
 
     return (
       <Route path={LayoutPaths} key={index}>
-        <MessageModal />
-        <MessageErrorModal />
-        <MessageInfoModal />
         <LayoutTag
           routerProps={routerProps}
           layout={layout}
diff --git a/src/router/hoc/authenticationCheck.tsx b/src/router/hoc/authenticationCheck.tsx
index d2ce6ecd..0a7042a1 100644
--- a/src/router/hoc/authenticationCheck.tsx
+++ b/src/router/hoc/authenticationCheck.tsx
@@ -3,6 +3,7 @@ import { RouteComponentProps } from 'react-router-dom';
 import { useSelector, useDispatch } from '@src/redux/store';
 import { checkToken } from '@src/redux/features/account/auth/authThunk';
 import { ICheckAuthencationRs } from '@src/redux/features/account/auth/authState';
+import { clientDispatchTopMenu } from '@src/redux/features/layout/layoutSlice';
 
 interface IOption {
   authRoute?: boolean;
@@ -35,6 +36,8 @@ export default function (SpecificComponent: ReactNode, option: IOption) {
             }
           } else {
             if (!authRoute) {
+              localStorage.setItem('topMenuCd', '/');
+              dispatch(clientDispatchTopMenu('/'));
               props.history.replace('/main/dashboard');
             }
           }
@@ -43,6 +46,9 @@ export default function (SpecificComponent: ReactNode, option: IOption) {
           // props.history.replace('/account/login');
         }
       });
+      return () => {
+        setIsRender(false);
+      };
     }, []);
 
     return <>{isRender ? <Component {...props} user={user} /> : null}</>;