Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replaced useDispatch with useQuery and request. (#6344)
Browse files Browse the repository at this point in the history
* Replaced useDispatch with useQuery and request.

* Removed all relevant no longer used actions from actions.tsx

* Replaced Res to Type

* Added TBody.

* used abha in place of JSON.parse(value).

* Fixed mobile otp issue

* Replaced Rdata with Rerror

* Fixed link care context

---------

Co-authored-by: Khavin Shankar <khavinshankar@gmail.com>
2 people authored and Ashesh3 committed Oct 20, 2023
1 parent d6ae596 commit 2d8b7bc
Showing 9 changed files with 445 additions and 324 deletions.
19 changes: 11 additions & 8 deletions src/Components/ABDM/ABHAProfileModal.tsx
Original file line number Diff line number Diff line change
@@ -5,9 +5,9 @@ import CareIcon from "../../CAREUI/icons/CareIcon";
import DialogModal from "../Common/Dialog";
import QRCode from "qrcode.react";
import { formatDateTime } from "../../Utils/utils";
import { getAbhaCard } from "../../Redux/actions";
import { useDispatch } from "react-redux";
import { useRef } from "react";
import request from "../../Utils/request/request";
import routes from "../../Redux/api";

interface IProps {
patientId?: string;
@@ -18,21 +18,24 @@ interface IProps {

const ABHAProfileModal = ({ patientId, show, onClose, abha }: IProps) => {
const printRef = useRef(null);
const dispatch = useDispatch<any>();

const downloadAbhaCard = async (type: "pdf" | "png") => {
if (!patientId) return;
const response = await dispatch(getAbhaCard(patientId, type));
const { res, data } = await request(routes.abha.getAbhaCard, {
body: {
patient: patientId,
type: type,
},
});

if (response.status === 200 && response.data) {
if (res?.status === 200 && data) {
if (type === "png") {
const downloadLink = document.createElement("a");
downloadLink.href =
"data:application/octet-stream;base64," + response.data;
downloadLink.href = "data:application/octet-stream;base64," + data;
downloadLink.download = "abha.png";
downloadLink.click();
} else {
const htmlPopup = `<embed width=100% height=100%" type='application/pdf' src='data:application/pdf;base64,${response.data}'></embed>`;
const htmlPopup = `<embed width=100% height=100%" type='application/pdf' src='data:application/pdf;base64,${data}'></embed>`;

const printWindow = window.open("", "PDF");
printWindow?.document.write(htmlPopup);
98 changes: 57 additions & 41 deletions src/Components/ABDM/ConfigureHealthFacility.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { lazy, useCallback, useEffect, useReducer, useState } from "react";
import { useDispatch } from "react-redux";

import { healthFacilityActions } from "../../Redux/actions";
import { lazy, useEffect, useReducer, useState } from "react";
import * as Notification from "../../Utils/Notifications.js";
import { navigate } from "raviger";
import { Cancel, Submit } from "../Common/components/ButtonV2";
import TextFormField from "../Form/FormFields/TextFormField";
import { classNames } from "../../Utils/utils";
import useQuery from "../../Utils/request/useQuery";
import routes from "../../Redux/api";
import request from "../../Utils/request/request";
const Loading = lazy(() => import("../Common/Loading"));

const initForm = {
@@ -40,30 +40,28 @@ const FormReducer = (state = initialState, action: any) => {
export const ConfigureHealthFacility = (props: any) => {
const [state, dispatch] = useReducer(FormReducer, initialState);
const { facilityId } = props;
const dispatchAction: any = useDispatch();
const [isLoading, setIsLoading] = useState(false);

const fetchData = useCallback(async () => {
if (facilityId) {
setIsLoading(true);
const res = await dispatchAction(healthFacilityActions.read(facilityId));

if (res?.status === 200 && res?.data) {
const formData = {
...state.form,
hf_id: res.data.hf_id,
health_facility: res.data,
};
dispatch({ type: "set_form", form: formData });
}
const {
data: health_facility,
loading,
refetch,
} = useQuery(routes.abha.getHealthFacility, {
pathParams: { facility__external_id: facilityId },
});

setIsLoading(false);
}
}, [dispatchAction, facilityId]);
useEffect(() => {
const formData = {
...state.form,
hf_id: health_facility?.hf_id,
health_facility: health_facility,
};
dispatch({ type: "set_form", form: formData });
}, [health_facility]);

useEffect(() => {
fetchData();
}, [dispatch, fetchData]);
refetch();
}, [dispatch, refetch]);

const handleSubmit = async (e: any) => {
e.preventDefault();
@@ -78,27 +76,43 @@ export const ConfigureHealthFacility = (props: any) => {
return;
}

let res = null;
let response = null;
let responseData = null;
if (state.form.health_facility) {
res = await dispatchAction(
healthFacilityActions.partialUpdate(facilityId, {
hf_id: state.form.hf_id,
})
const { res, data } = await request(
routes.abha.partialUpdateHealthFacility,
{
pathParams: {
facility__external_id: facilityId,
},
body: {
hf_id: state.form.hf_id,
},
}
);
response = res;
responseData = data;
} else if (state.form.hf_id === state.form.health_facility?.hf_id) {
res = await dispatchAction(
healthFacilityActions.registerService(facilityId)
const { res, data } = await request(
routes.abha.registerHealthFacilityAsService,
{
pathParams: {
facility__external_id: facilityId,
},
}
);
response = res;
responseData = data;

if (res?.status === 200 && res?.data) {
if (res.data?.registered) {
if (response?.status === 200 && responseData) {
if (responseData?.registered) {
dispatch({
type: "set_form",
form: {
...state.form,
health_facility: {
...state.form?.health_facility,
registered: res.data.registered,
registered: responseData.registered,
},
},
});
@@ -112,24 +126,26 @@ export const ConfigureHealthFacility = (props: any) => {
});
return;
} else {
res = await dispatchAction(
healthFacilityActions.create({
const { res, data } = await request(routes.abha.createHealthFacility, {
body: {
facility: facilityId,
hf_id: state.form.hf_id,
})
);
},
});
response = res;
responseData = data;
}

setIsLoading(false);
if (res && res.data) {
if (response && responseData) {
Notification.Success({
msg: "Health Facility config updated successfully",
});
navigate(`/facility/${facilityId}`);
} else {
if (res?.data)
if (responseData)
Notification.Error({
msg: "Something went wrong: " + (res.data.detail || ""),
msg: "Something went wrong: " + (responseData.detail || ""),
});
}
setIsLoading(false);
@@ -142,7 +158,7 @@ export const ConfigureHealthFacility = (props: any) => {
});
};

if (isLoading) {
if (loading || isLoading) {
return <Loading />;
}

Loading

0 comments on commit 2d8b7bc

Please sign in to comment.