From 330f8b55df6675dda266f28cc89c1a78e6f5a584 Mon Sep 17 00:00:00 2001 From: dididy Date: Mon, 28 Mar 2022 21:13:36 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Fix:=20=EC=B5=9C=EC=A2=85=20=ED=95=A9?= =?UTF-8?q?=EA=B2=A9=EC=9D=B4=20=EB=82=98=EC=98=A4=EB=8F=84=EB=A1=9D=20Sel?= =?UTF-8?q?ect=20option=EC=9D=98=20slice=20=EB=B2=94=EC=9C=84=EB=A5=BC=20?= =?UTF-8?q?=ED=99=95=EC=9E=A5=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApplicationPanel/ApplicationPanel.component.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ApplicationDetail/ApplicationPanel/ApplicationPanel.component.tsx b/src/components/ApplicationDetail/ApplicationPanel/ApplicationPanel.component.tsx index c9eb98b4..57677a1d 100644 --- a/src/components/ApplicationDetail/ApplicationPanel/ApplicationPanel.component.tsx +++ b/src/components/ApplicationDetail/ApplicationPanel/ApplicationPanel.component.tsx @@ -129,7 +129,7 @@ const ControlArea = ({ confirmationStatus, resultStatus, interviewDate }: Contro ); if (isScreeningPassed) { - return resultOption.slice(1, 6); + return resultOption.slice(1, resultOption.length); } return resultOption.slice(0, 4); From 4e014446252015d678493c7fea00bad024beef91 Mon Sep 17 00:00:00 2001 From: dididy Date: Tue, 29 Mar 2022 08:31:40 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Fix:=20=ED=95=A9=EA=B2=A9=EC=97=AC=EB=B6=80?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=EC=8B=9C=20$applications=EB=A5=BC=20refre?= =?UTF-8?q?sh=20=EB=90=98=EB=8F=84=EB=A1=9D=20=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApplicationPanel/ApplicationPanel.component.tsx | 6 +++++- src/components/common/Table/Table.component.tsx | 6 ++++-- src/pages/ApplicationList/ApplicationList.page.tsx | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/ApplicationDetail/ApplicationPanel/ApplicationPanel.component.tsx b/src/components/ApplicationDetail/ApplicationPanel/ApplicationPanel.component.tsx index 57677a1d..4918dc0b 100644 --- a/src/components/ApplicationDetail/ApplicationPanel/ApplicationPanel.component.tsx +++ b/src/components/ApplicationDetail/ApplicationPanel/ApplicationPanel.component.tsx @@ -3,6 +3,7 @@ import { FormProvider, useForm, useFormContext } from 'react-hook-form'; import dayjs, { Dayjs } from 'dayjs'; import { useRecoilCallback } from 'recoil'; import utc from 'dayjs/plugin/utc'; +import { useLocation } from 'react-router-dom'; import { Button, DatePicker, Select, SelectField } from '@/components'; import * as Styled from './ApplicationPanel.styled'; import { ButtonShape, ButtonSize } from '@/components/common/Button/Button.component'; @@ -26,10 +27,11 @@ import { rangeArray, request } from '@/utils'; import * as api from '@/api'; import { ApplicationConfirmationStatusInDto, + ApplicationRequest, ApplicationResultStatusInDto, ApplicationUpdateResultByIdRequest, } from '@/types'; -import { $applicationById } from '@/store'; +import { $applicationById, $applications } from '@/store'; import { ToastType } from '@/styles'; dayjs.extend(utc); @@ -246,6 +248,7 @@ const ApplicationPanel = ({ applicationId, ...restProps }: ApplicationPanelProps) => { + const { state } = useLocation(); const { handleAddToast } = useToast(); const methods = useForm({ defaultValues: { @@ -297,6 +300,7 @@ const ApplicationPanel = ({ errorHandler: handleAddToast, onSuccess: async () => { await refresh($applicationById({ applicationId })); + await refresh($applications(state as ApplicationRequest)); methods.setValue('isEdit', false); handleAddToast({ type: ToastType.success, diff --git a/src/components/common/Table/Table.component.tsx b/src/components/common/Table/Table.component.tsx index 8c911dff..9c989f4f 100644 --- a/src/components/common/Table/Table.component.tsx +++ b/src/components/common/Table/Table.component.tsx @@ -8,7 +8,7 @@ import React, { MouseEventHandler, } from 'react'; import { useNavigate } from 'react-router-dom'; -import { NestedKeyOf, ValueOf } from '@/types'; +import { ApplicationRequest, NestedKeyOf, ValueOf } from '@/types'; import { getOwnValueByKey, isArray, isSameObject, request } from '@/utils'; import { colors } from '@/styles'; import QuestionFile from '@/assets/svg/question-file-72.svg'; @@ -65,6 +65,7 @@ export interface TableProps { buttons?: ReactNode[]; }; pagination?: ReactNode; + applicationParams?: ApplicationRequest; } interface TableSupportBarProps { @@ -249,6 +250,7 @@ const Table = ({ sortOptions, supportBar: { totalCount, totalSummaryText, selectedSummaryText, buttons: supportButtons }, pagination, + applicationParams, }: TableProps) => { const navigate = useNavigate(); const { handleAddToast } = useToast(); @@ -378,7 +380,7 @@ const Table = ({ }); }, onSuccess: async () => { - navigate(`${PATH.APPLICATION}/${id}`); + navigate(`${PATH.APPLICATION}/${id}`, { state: applicationParams }); }, }); }; diff --git a/src/pages/ApplicationList/ApplicationList.page.tsx b/src/pages/ApplicationList/ApplicationList.page.tsx index e8053d8e..79d78cd1 100644 --- a/src/pages/ApplicationList/ApplicationList.page.tsx +++ b/src/pages/ApplicationList/ApplicationList.page.tsx @@ -354,6 +354,7 @@ const ApplicationList = () => { handleChangePage={handleChangePage} /> } + applicationParams={applicationParams} /> Date: Tue, 29 Mar 2022 08:53:35 +0900 Subject: [PATCH 3/3] =?UTF-8?q?Fix:=20SMS=20=EA=B4=80=EB=A0=A8=20=EB=AA=A8?= =?UTF-8?q?=EB=8B=AC=20dimmed=20=ED=81=B4=EB=A6=AD=EC=8B=9C=20=EB=8B=AB?= =?UTF-8?q?=ED=9E=88=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/SmsSendModalDialog/SmsSendModalDialog.component.tsx | 1 + .../SmsSendDetailInfoModalDialog.component.tsx | 1 + .../SmsSendDetailListModalDialog.component.tsx | 1 + 3 files changed, 3 insertions(+) diff --git a/src/components/common/SmsSendModalDialog/SmsSendModalDialog.component.tsx b/src/components/common/SmsSendModalDialog/SmsSendModalDialog.component.tsx index 38032d26..29c5f7bf 100644 --- a/src/components/common/SmsSendModalDialog/SmsSendModalDialog.component.tsx +++ b/src/components/common/SmsSendModalDialog/SmsSendModalDialog.component.tsx @@ -125,6 +125,7 @@ const SmsSendModalDialog = ({ }, }, handleCloseModal: handleRemoveCurrentModal, + closeOnClickOverlay: false, }; return ( diff --git a/src/components/modal/SmsSendDetailInfoModalDialog/SmsSendDetailInfoModalDialog.component.tsx b/src/components/modal/SmsSendDetailInfoModalDialog/SmsSendDetailInfoModalDialog.component.tsx index b84fb453..f8728ef1 100644 --- a/src/components/modal/SmsSendDetailInfoModalDialog/SmsSendDetailInfoModalDialog.component.tsx +++ b/src/components/modal/SmsSendDetailInfoModalDialog/SmsSendDetailInfoModalDialog.component.tsx @@ -107,6 +107,7 @@ const SmsSendDetailInfoModalDialog = ({ sms }: SmsSendDetailInfoModalDialogProps }, handleCloseModal: handleRemoveCurrentModal, isContentScroll: false, + closeOnClickOverlay: false, }; return ( diff --git a/src/components/modal/SmsSendDetailListModalDialog/SmsSendDetailListModalDialog.component.tsx b/src/components/modal/SmsSendDetailListModalDialog/SmsSendDetailListModalDialog.component.tsx index 02db8a9d..eef11262 100644 --- a/src/components/modal/SmsSendDetailListModalDialog/SmsSendDetailListModalDialog.component.tsx +++ b/src/components/modal/SmsSendDetailListModalDialog/SmsSendDetailListModalDialog.component.tsx @@ -71,6 +71,7 @@ const SmsSendDetailListModalDialog = ({ }, handleCloseModal: handleRemoveCurrentModal, isContentScroll: false, + closeOnClickOverlay: false, }; return (