Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaced useDispatch with useQuery/request in Treatment Summary and Transfer Patient. #7084

Merged
merged 7 commits into from
Feb 6, 2024
Merged

Replaced useDispatch with useQuery/request in Treatment Summary and Transfer Patient. #7084

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b6a3e36
replace useDispatch with useQuery/request in TreatmentSummary page
sriharsh05 Jan 23, 2024
3c96cee
replace useDispatch with useQuery/request in TransferPatientDialog
sriharsh05 Jan 23, 2024
374c03c
remove unused fire request
sriharsh05 Jan 23, 2024
ed3fd56
Merge branch 'develop' into fix#7036-3
sriharsh05 Jan 23, 2024
4c21afe
Merge branch 'develop' into fix#7036-3
rithviknishad Jan 25, 2024
3c1ab39
Merge branch 'develop' of https://github.com/coronasafe/care_fe into …
sriharsh05 Feb 4, 2024
aed3b18
Merge branch 'develop' into fix#7036-3
sriharsh05 Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions src/Components/Facility/TransferPatientDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import { FieldLabel } from "../Form/FormFields/FormField";
import { OptionsType } from "../../Common/constants";
import { SelectFormField } from "../Form/FormFields/SelectFormField";
import { navigate } from "raviger";
import { transferPatient } from "../../Redux/actions";
import { useDispatch } from "react-redux";
import { dateQueryString } from "../../Utils/utils.js";
import dayjs from "dayjs";
import request from "../../Utils/request/request.js";
import routes from "../../Redux/api.js";

interface Props {
patientList: Array<DupPatientModel>;
Expand Down Expand Up @@ -60,7 +60,6 @@ const patientFormReducer = (state = initialState, action: any) => {

const TransferPatientDialog = (props: Props) => {
const { patientList, handleOk, handleCancel, facilityId } = props;
const dispatchAction: any = useDispatch();
const [isLoading, setIsLoading] = useState(false);
const [state, dispatch] = useReducer(patientFormReducer, initialState);
const patientOptions: Array<OptionsType> = patientList.map((patient) => {
Expand Down Expand Up @@ -114,15 +113,17 @@ const TransferPatientDialog = (props: Props) => {
const validForm = validateForm();
if (validForm) {
setIsLoading(true);
const data = {
date_of_birth: dateQueryString(state.form.date_of_birth),
facility: facilityId,
};
const res = await dispatchAction(
transferPatient(data, { id: state.form.patient })
);
const { res, data } = await request(routes.transferPatient, {
body: {
facility: facilityId,
date_of_birth: dateQueryString(state.form.date_of_birth),
},
pathParams: {
id: state.form.patient,
},
});
setIsLoading(false);
if (res && res.data && res.status === 200) {
if (res?.ok && data) {
dispatch({ type: "set_form", form: initForm });
handleOk();

Expand All @@ -132,10 +133,10 @@ const TransferPatientDialog = (props: Props) => {
msg: `Patient ${patientName} transferred successfully`,
});
const newFacilityId =
res.data && res.data.facility_object && res.data.facility_object.id;
data && data.facility_object && data.facility_object.id;
if (newFacilityId) {
navigate(
`/facility/${newFacilityId}/patient/${res.data.patient}/consultation`
`/facility/${newFacilityId}/patient/${data.patient}/consultation`
);
} else {
navigate("/facility");
Expand Down
Loading
Loading