Browse Source

비행이력 상세 로그 롤백

ctrlDraw
김장현 2 years ago
parent
commit
962b7ce8f0
  1. 1
      src/containers/analysis/history/AnalysisHistoryDetailContainer.js
  2. 11
      src/containers/main/dash/MainDashContainer.js
  3. 8
      src/modules/account/login/sagas/authSaga.ts
  4. 2
      src/modules/analysis/history/actions/analysisHistoryAction.ts
  5. 4
      src/modules/analysis/history/apis/annalysisHistoryApi.ts
  6. 6
      src/modules/analysis/history/sagas/analysisHistorySaga.ts

1
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) => {

11
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 (
<div className='main-dashboard'>
@ -112,7 +112,10 @@ export const MainDashContainer = () => {
<div className='dashboard-section'>
<Row>
<Col md={6}>
<DashboardGroupList data={groupList} pageMove={handlerGroupDetail} />
<DashboardGroupList
data={groupList}
pageMove={handlerGroupDetail}
/>
</Col>
<Col md={6}>
<DashboardDronList data={dronList} pageMove={handlerDronDetail} />

8
src/modules/account/login/sagas/authSaga.ts

@ -115,15 +115,15 @@ function* userLogoutSaga() {
const decodedToken = decode<LoginData>(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));
}

2
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
>();

4
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) {

6
src/modules/analysis/history/sagas/analysisHistorySaga.ts

@ -37,7 +37,7 @@ function* detailSaga(action: ActionType<typeof Actions.detail.request>) {
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<typeof Actions.detail.request>) {
function* logSaga(action: ActionType<typeof Actions.log.request>) {
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(

Loading…
Cancel
Save