From 962b7ce8f0af3b7ee8deba41f5e7a5ca068473cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kimjh=28=EA=B9=80=EC=9E=A5=ED=98=84=29?= Date: Fri, 14 Oct 2022 14:37:23 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9D=B4=EB=A0=A5=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=EB=A1=9C=EA=B7=B8=20=EB=A1=A4=EB=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../history/AnalysisHistoryDetailContainer.js | 1 - src/containers/main/dash/MainDashContainer.js | 11 +++++++---- src/modules/account/login/sagas/authSaga.ts | 8 ++++---- .../analysis/history/actions/analysisHistoryAction.ts | 2 +- .../analysis/history/apis/annalysisHistoryApi.ts | 4 ++-- .../analysis/history/sagas/analysisHistorySaga.ts | 6 +++--- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/containers/analysis/history/AnalysisHistoryDetailContainer.js b/src/containers/analysis/history/AnalysisHistoryDetailContainer.js index b41cd67..ff52503 100644 --- a/src/containers/analysis/history/AnalysisHistoryDetailContainer.js +++ b/src/containers/analysis/history/AnalysisHistoryDetailContainer.js @@ -21,7 +21,6 @@ export const AnalysisHistoryDetailContainer = () => { const handlerSearch = () => { dispatch(Actions.detail.request(id)); - dispatch(Actions.log.request({ id, page: 1 })); }; const handlerInput = (type, val) => { diff --git a/src/containers/main/dash/MainDashContainer.js b/src/containers/main/dash/MainDashContainer.js index 53f9272..bf0c1a8 100644 --- a/src/containers/main/dash/MainDashContainer.js +++ b/src/containers/main/dash/MainDashContainer.js @@ -9,6 +9,7 @@ import { DashboardMenu } from '../../../components/dashboard/DashboardMenu'; import { DashboardStcsArea } from '../../../components/dashboard/DashboardStcsArea'; import { DashboardStcsDay } from '../../../components/dashboard/DashboardStcsDay'; import * as Actions from '../../../modules/main/dash/actions/mainDashAction'; +import { store } from '../../../redux/storeConfig/store'; export const MainDashContainer = () => { const dispatch = useDispatch(); @@ -18,7 +19,7 @@ export const MainDashContainer = () => { const history = useHistory(); - const { user } = useSelector(state => state.authState, shallowEqual); + const { user, isLogin } = useSelector(state => state.authState, shallowEqual); const [dayStartDate, setDayStartDate] = useState(new Date()); @@ -84,8 +85,7 @@ export const MainDashContainer = () => { handlerDronSearch(); }, []); - useEffect(() => { - }, [stcsDayList]); + useEffect(() => {}, [stcsDayList]); return (
@@ -112,7 +112,10 @@ export const MainDashContainer = () => {
- + diff --git a/src/modules/account/login/sagas/authSaga.ts b/src/modules/account/login/sagas/authSaga.ts index 401ba2e..ab51aee 100644 --- a/src/modules/account/login/sagas/authSaga.ts +++ b/src/modules/account/login/sagas/authSaga.ts @@ -115,15 +115,15 @@ function* userLogoutSaga() { const decodedToken = decode(accessToken); const res = yield call(authAPI.usersLogout, decodedToken.cstmrSno); - if (res.data == 'SUCCESS') { - location.href = '/account/login'; - } + // if (res.data == 'SUCCESS') { + // location.href = '/account/login'; + // } } // yield put(Actions.logout.success()); cookieStorage.removeCookie(COOKIE_ACCESS_TOKEN); cookieStorage.removeCookie(COOKIE_REFRESH_TOKEN); - yield put(replace('/')); + yield put(Actions.logout.success()); } catch (error) { yield put(Actions.logout.failure(error)); } diff --git a/src/modules/analysis/history/actions/analysisHistoryAction.ts b/src/modules/analysis/history/actions/analysisHistoryAction.ts index d659f5d..144a9b7 100644 --- a/src/modules/analysis/history/actions/analysisHistoryAction.ts +++ b/src/modules/analysis/history/actions/analysisHistoryAction.ts @@ -32,7 +32,7 @@ export const list = createAsyncAction(LIST_REQUEST, LIST_SUCCESS, LIST_FAILURE)< >(); export const log = createAsyncAction(LOG_REQUEST, LOG_SUCCESS, LOG_FAILURE)< - { id: string; page: number }, + string, { log: AnalysisHistoryLogData[] }, AxiosError >(); diff --git a/src/modules/analysis/history/apis/annalysisHistoryApi.ts b/src/modules/analysis/history/apis/annalysisHistoryApi.ts index 32bab45..c315b34 100644 --- a/src/modules/analysis/history/apis/annalysisHistoryApi.ts +++ b/src/modules/analysis/history/apis/annalysisHistoryApi.ts @@ -17,8 +17,8 @@ export const analysisHistory = { return await axios.get(`/api/anls/hstry/detail/${id}`); }, - log: async (id: string, page: number) => { - return await axios.get(`/api/anls/hstry/log?id=${id}&page=${page}`); + log: async (id: string) => { + return await axios.get(`/api/anls/hstry/log/${id}`); } // getHistory: async (id: string) => { // if (!id) { diff --git a/src/modules/analysis/history/sagas/analysisHistorySaga.ts b/src/modules/analysis/history/sagas/analysisHistorySaga.ts index 1d14f8f..43a2257 100644 --- a/src/modules/analysis/history/sagas/analysisHistorySaga.ts +++ b/src/modules/analysis/history/sagas/analysisHistorySaga.ts @@ -37,7 +37,7 @@ function* detailSaga(action: ActionType) { try { const id = action.payload; const res = yield call(Apis.analysisHistory.detail, id); - + yield put(Actions.log.request(id)); const { data } = res; yield put( Actions.detail.success({ @@ -51,8 +51,8 @@ function* detailSaga(action: ActionType) { function* logSaga(action: ActionType) { try { - const { id, page } = action.payload; - const res = yield call(Apis.analysisHistory.log, id, page); + const id = action.payload; + const res = yield call(Apis.analysisHistory.log, id); const { data } = res; yield put(