diff --git a/src/Common/hooks/useIsInitialRender.ts b/src/Common/hooks/useIsInitialRender.ts deleted file mode 100644 index cfbfe71734d..00000000000 --- a/src/Common/hooks/useIsInitialRender.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { useEffect, useRef } from "react"; - -export default function useIsInitialRender() { - const isInitialRender = useRef(true); - useEffect(() => { - isInitialRender.current = false; - }, []); - return isInitialRender.current; -} diff --git a/src/Components/Common/NavTabs.tsx b/src/Components/Common/NavTabs.tsx deleted file mode 100644 index 1b913d888ce..00000000000 --- a/src/Components/Common/NavTabs.tsx +++ /dev/null @@ -1,52 +0,0 @@ -interface TabValue { - value: number; - label: string; -} -interface TabChange { - (value: number): void; -} -interface NavTabsProps { - active?: number; - options?: TabValue[]; - onChange: TabChange; -} - -export default function NavTabs(props: NavTabsProps) { - const { active, options, onChange } = props; - return ( -
-
- -
-
-
- -
-
-
- ); -} diff --git a/src/Components/Common/WardAutocompleteFormField.tsx b/src/Components/Common/WardAutocompleteFormField.tsx deleted file mode 100644 index 47298dd27b2..00000000000 --- a/src/Components/Common/WardAutocompleteFormField.tsx +++ /dev/null @@ -1,52 +0,0 @@ -import { useDispatch } from "react-redux"; -import { FormFieldBaseProps } from "../Form/FormFields/Utils"; -import AutocompleteFormField from "../Form/FormFields/Autocomplete"; -import { statusType, useAbortableEffect } from "../../Common/utils"; -import { useCallback, useState } from "react"; -import { getWardByLocalBody } from "../../Redux/actions"; -import { ILocalBody } from "./LocalBodyAutocompleteFormField"; - -export type IWard = { - id: number; - name: string; -}; - -type Props = FormFieldBaseProps & { - placeholder?: string; - local_body?: ILocalBody["id"]; -}; - -export default function WardAutocompleteFormField(props: Props) { - const dispatch = useDispatch(); - const [Ward, setWard] = useState(); - - const fetchWard = useCallback( - async (status: any) => { - setWard(undefined); - if (!props.local_body) { - return; - } - const res = await dispatch(getWardByLocalBody({ id: props.local_body })); - if (!status.aborted && res.data) { - setWard(res.data); - } - }, - [dispatch, props.local_body] - ); - - useAbortableEffect( - (status: statusType) => fetchWard(status), - [props.local_body] - ); - - return ( - option.name} - optionValue={(option) => option.id} - isLoading={!!(props.local_body && Ward === undefined)} - disabled={!props.local_body} - /> - ); -} diff --git a/src/Redux/actions.tsx b/src/Redux/actions.tsx index 2395c9ad163..32af9609263 100644 --- a/src/Redux/actions.tsx +++ b/src/Redux/actions.tsx @@ -1,43 +1,6 @@ import { HCXClaimModel, HCXPolicyModel } from "../Components/HCX/models"; import { MedibaseMedicine } from "../Components/Medicine/models"; -import { fireRequest, fireRequestForFiles } from "./fireRequest"; - -export const getConfig = () => { - return fireRequestForFiles("config"); -}; -// User -export const postLogin = (params: object) => { - return fireRequest("login", [], params); -}; -export const getCurrentUser = () => { - return fireRequest("currentUser"); -}; -export const signupUser = (params: object) => { - return fireRequest("createUser", [], params); -}; -export const deleteUser = (username: string) => { - return fireRequest("deleteUser", [], {}, { username }); -}; - -export const checkResetToken = (params: object) => { - return fireRequest("checkResetToken", [], params); -}; - -export const postResetPassword = (form: object) => { - return fireRequest("resetPassword", [], form); -}; - -export const postForgotPassword = (form: object) => { - return fireRequest("forgotPassword", [], form); -}; - -export const getUserPnconfig = (pathParams: object) => { - return fireRequest("getUserPnconfig", [], {}, pathParams); -}; - -export const updateUserPnconfig = (params: object, pathParams: object) => { - return fireRequest("updateUserPnconfig", [], params, pathParams); -}; +import { fireRequest } from "./fireRequest"; // Facility export const createFacility = (params: object) => { @@ -46,39 +9,12 @@ export const createFacility = (params: object) => { export const updateFacility = (id: string, params: object) => { return fireRequest("updateFacility", [id], params); }; -export const partialUpdateFacility = (id: string, params: object) => { - return fireRequest("partialUpdateFacility", [id], params); -}; export const deleteFacilityCoverImage = (id: string) => { return fireRequest("deleteFacilityCoverImage", [], {}, { id }); }; export const getUserList = (params: object, key?: string) => { return fireRequest("userList", [], params, null, key); }; -export const getUserListFacility = (pathParam: object) => { - return fireRequest("userListFacility", [], {}, pathParam); -}; - -export const addUserSkill = (username: string, skill: string) => { - return fireRequest("addUserSkill", [], { skill }, { username }); -}; - -export const addUserFacility = (username: string, facility: string) => { - return fireRequest("addUserFacility", [], { facility }, { username }); -}; - -export const deleteUserSkill = (username: string, id: string) => { - return fireRequest("deleteUserSkill", [], {}, { username, id }); -}; - -export const deleteUserFacility = (username: string, facility: string) => { - return fireRequest( - "deleteUserFacility", - [], - { data: { facility } }, - { username } - ); -}; export const getPermittedFacilities = (params: object) => { return fireRequest("getPermittedFacilities", [], params); @@ -108,9 +44,6 @@ export const getFacilityUsers = (id: string, params?: object) => { { facility_id: id } ); }; -export const getOnlineDoctors = () => { - return fireRequest("getOnlineDoctors", [], {}, {}); -}; export const listFacilityAssetLocation = (params: object, pathParam: object) => fireRequest("listFacilityAssetLocation", [], params, pathParam); @@ -140,15 +73,6 @@ export const updateFacilityAssetLocation = ( facility_external_id, external_id, }); -export const partialUpdateFacilityAssetLocation = ( - params: object, - facility_external_id: string, - external_id: string -) => - fireRequest("partialUpdateFacilityAssetLocation", [], params, { - facility_external_id, - external_id, - }); // asset bed export const listAssetBeds = (params: object, altKey?: string) => @@ -165,17 +89,6 @@ export const createAssetBed = ( {} ); -export const getAssetBed = ( - asset_external_id: string, - bed_id: string, - external_id: string -) => - fireRequest( - "getAssetBed", - [], - { asset: asset_external_id, bed: bed_id }, - { external_id } - ); export const partialUpdateAssetBed = (params: object, asset_id: string) => fireRequest( "partialUpdateAssetBed", @@ -186,21 +99,6 @@ export const partialUpdateAssetBed = (params: object, asset_id: string) => } ); -export const updateAssetBed = ( - params: object, - asset_external_id: string, - external_id: string, - bed_id: string -) => - fireRequest( - "updateAssetBed", - [], - { ...params, asset: asset_external_id, bed: bed_id }, - { - external_id, - } - ); - export const deleteAssetBed = (asset_id: string) => fireRequest( "deleteAssetBed", @@ -260,47 +158,6 @@ export const deleteFacilityBed = (external_id: string) => { return fireRequest("deleteFacilityBed", [], {}, { external_id }); }; -// Consultation Beds -export const listConsultationBeds = (params: object) => - fireRequest("listConsultationBeds", [], params, {}); -export const createConsultationBed = ( - params: object, - consultation_id: string, - bed_id: string -) => - fireRequest( - "createConsultationBed", - [], - { ...params, consultation: consultation_id, bed: bed_id }, - {} - ); - -export const getConsultationBed = ( - consultation_external_id: string, - bed_id: string, - external_id: string -) => - fireRequest( - "getConsultationBed", - [], - { consultation: consultation_external_id, bed: bed_id }, - { external_id } - ); -export const updateConsultationBed = ( - params: object, - consultation_external_id: string, - external_id: string, - bed_id: string -) => - fireRequest( - "updateConsultationBed", - [], - { ...params, consultation: consultation_external_id, bed: bed_id }, - { - external_id, - } - ); - // Download Actions export const downloadFacility = () => { return fireRequest("downloadFacility"); @@ -318,9 +175,6 @@ export const downloadFacilityTriage = () => { return fireRequest("downloadFacilityTriage"); }; -export const downloadPatients = () => { - return fireRequest("downloadPatients"); -}; // Capacity/Triage/Doctor export const createCapacity = ( id: number | undefined, @@ -377,9 +231,6 @@ export const deleteCapacity = (pathParam: object) => { export const searchPatient = (params: object) => { return fireRequest("searchPatient", [], params); }; -export const searchUser = (params: object) => { - return fireRequest("searchUser", [], params); -}; export const getAllPatient = (params: object, altKey: string) => { return fireRequest("patientList", [], params, null, altKey); }; @@ -398,23 +249,9 @@ export const patchPatient = (params: object, pathParam: object) => { export const transferPatient = (params: object, pathParam: object) => { return fireRequest("transferPatient", [], params, pathParam); }; -export const getPatientNotes = ( - patientId: string, - limit: number, - offset: number -) => { - return fireRequest("getPatientNotes", [], { limit, offset }, { patientId }); -}; -export const addPatientNote = (patientId: string, params: object) => { - return fireRequest("addPatientNote", [], params, { patientId }); -}; - export const getStates = () => { return fireRequest("statesList", []); }; -export const getStatesByText = (params: object) => { - return fireRequest("statesList", [], params); -}; export const getState = (id: number) => { return fireRequest("getState", [], {}, { id: id }); }; @@ -433,20 +270,10 @@ export const getDistrict = (id: number, key?: string) => { export const getLocalbodyByDistrict = (pathParam: object) => { return fireRequest("getLocalbodyByDistrict", [], {}, pathParam); }; -export const getLocalbodyByName = (params: object) => { - return fireRequest("getLocalbodyByName", [], params, null); -}; export const getWardByLocalBody = (pathParam: object) => { return fireRequest("getWardByLocalBody", [], {}, pathParam); }; -export const getWards = (params: object) => { - return fireRequest("getWards", [], params); -}; - -export const getAllLocalBodyByDistrict = (pathParam: object) => { - return fireRequest("getAllLocalBodyByDistrict", [], {}, pathParam); -}; // Local Body export const getLocalBody = (pathParam: object) => { @@ -460,10 +287,6 @@ export const getAllLocalBody = (params: object) => { export const getSampleTestList = (params: object, pathParam: object) => { return fireRequest("sampleTestList", [], params, pathParam); }; - -export const sampleSearch = (params: object) => { - return fireRequest("getTestSampleList", [], params); -}; export const createSampleTest = (params: object, pathParam: object) => { return fireRequest("createSampleTest", [], params, pathParam); }; @@ -497,9 +320,6 @@ export const getDailyReport = (params: object, pathParam: object) => { export const getConsultationDailyRoundsDetails = (pathParam: object) => { return fireRequest("getDailyReport", [], {}, pathParam); }; -export const dailyRoundsAnalyse = (params: object, pathParam: object) => { - return fireRequest("dailyRoundsAnalyse", [], params, pathParam); -}; // Consultation export const createConsultation = (params: object) => { @@ -552,10 +372,6 @@ export const getInventorySummary = (facilityId: number, params: object) => { params ); }; -export const getItemName = (id: number) => { - return fireRequest("getItemName", [id], {}); -}; - export const flagInventoryItem = (params: object) => { return fireRequest("flagInventoryItem", [], {}, params); }; @@ -584,12 +400,6 @@ export const dischargePatient = (params: object, pathParams: object) => { return fireRequest("dischargePatient", [], params, pathParams); }; -//Profile - -export const updateUserDetails = (username: string, data: object) => { - return fireRequest("updateUserDetails", [username], data); -}; - //Shift export const createShift = (params: object) => { return fireRequest("createShift", [], params); @@ -615,36 +425,6 @@ export const externalResult = (pathParam: object) => { return fireRequest("externalResult", [], {}, pathParam); }; -export const updateExternalResult = (id: number, params: object) => { - return fireRequest("updateExternalResult", [], params, { id }); -}; - -export const partialUpdateExternalResult = (id: number, params: object) => { - return fireRequest("partialUpdateExternalResult", [], params, { id }); -}; - -// Notifications -export const getNotifications = (params: object, altKey?: string) => { - return fireRequest("getNotifications", [], params, {}, altKey); -}; - -export const getNotificationData = (pathParam: object) => { - return fireRequest("getNotificationData", [], {}, pathParam); -}; - -export const markNotificationAsRead = (id: string) => { - return fireRequest( - "markNotificationAsRead", - [], - { read_at: new Date() }, - { id } - ); -}; - -export const getPublicKey = () => { - return fireRequest("getPublicKey", [], {}, {}); -}; - // FileUpload export const createUpload = (params: object) => { @@ -659,10 +439,6 @@ export const retrieveUpload = (params: object, fileId: string) => { return fireRequest("retrieveUpload", [], params, { fileId: fileId }); }; -export const retrieveUploadFilesURL = (params: object, fileId: string) => { - return fireRequestForFiles("retrieveUpload", [], params, { fileId: fileId }); -}; - export const editUpload = ( params: object, fileId: string, @@ -757,47 +533,13 @@ export const createAsset = (params: object) => fireRequest("createAsset", [], params); export const getAsset = (id: string) => fireRequest("getAsset", [], {}, { external_id: id }); -export const deleteAsset = (id: string) => - fireRequest("deleteAsset", [], {}, { external_id: id }); export const updateAsset = (id: string, params: object) => fireRequest("updateAsset", [], params, { external_id: id }); export const operateAsset = (id: string, params: object) => fireRequest("operateAsset", [], params, { external_id: id }); -// ABDM related - -export const resentAadhaarOtp = (txnId: string) => - fireRequest("resendAadhaarOtp", [], { txnId }); - -export const generateMobileOtp = (txnId: string, mobile: string) => - fireRequest("generateMobileOtp", [], { txnId, mobile }); - -export const linkCareContext = ( - consultationId: string, - data: { name?: string; gender?: "M" | "F" | "O"; dob?: string } -) => { - return fireRequest("linkCareContext", [], { - consultation: consultationId, - ...data, - }); -}; - -export const healthFacilityActions = { - list: (params: object) => { - return fireRequest("listHealthFacilities", [], params); - }, - - update: (id: string, data: object) => { - return fireRequest("updateHealthFacility", [], data, { - facility_id: id, - }); - }, -}; - export const listAssetAvailability = (params: object) => fireRequest("listAssetAvailability", [], params); -export const getAssetAvailability = (id: string) => - fireRequest("getAssetAvailability", [], {}, { id }); export const listPMJYPackages = (query?: string) => fireRequest("listPMJYPackages", [], { query }); diff --git a/src/Redux/fireRequest.tsx b/src/Redux/fireRequest.tsx index 876877799d8..6c3aee7c12a 100644 --- a/src/Redux/fireRequest.tsx +++ b/src/Redux/fireRequest.tsx @@ -274,105 +274,3 @@ export const fireRequestV2 = ( } }); }; - -export const fireRequestForFiles = ( - key: string, - path: any = [], - params: any = {}, - pathParam?: any, - altKey?: string -) => { - return (dispatch: any) => { - // cancel previous api call - if (isRunning[altKey ? altKey : key]) { - isRunning[altKey ? altKey : key].cancel(); - } - isRunning[altKey ? altKey : key] = axios.CancelToken.source(); - // get api url / method - const request = Object.assign({}, requestMap[key]); - if (path.length > 0) { - request.path += "/" + path.join("/"); - } - if (request.method === undefined || request.method === "GET") { - request.method = "GET"; - const qs = new URLSearchParams(omitBy(params, isEmpty)).toString(); - if (qs !== "") { - request.path += `?${qs}`; - } - } - // set dynamic params in the URL - if (pathParam) { - Object.keys(pathParam).forEach((param: any) => { - request.path = request.path.replace(`{${param}}`, pathParam[param]); - }); - } - - // set authorization header in the request header - const config: any = { - headers: { - "Content-type": "application/pdf", - "Content-disposition": "inline", - }, - }; - // Content-Type: application/pdf - // Content-Disposition: inline; filename="filename.pdf" - if (!request.noAuth && localStorage.getItem(LocalStorageKeys.accessToken)) { - config.headers["Authorization"] = - "Bearer " + localStorage.getItem(LocalStorageKeys.accessToken); - } - const axiosApiCall: any = axios.create(config); - - dispatch(fetchDataRequest(key)); - return axiosApiCall[request.method.toLowerCase()](request.path, { - ...params, - cancelToken: isRunning[altKey ? altKey : key].token, - }) - .then((response: any) => { - dispatch(fetchResponseSuccess(key, response.data)); - return response; - }) - .catch((error: any) => { - dispatch(fetchDataRequestError(key, error)); - - if (error.response) { - // temporarily don't show invalid phone number error on duplicate patient check - if (error.response.status === 400 && key === "searchPatient") { - return; - } - - // currentUser is ignored because on the first page load - // 403 error is displayed for invalid credential. - if (error.response.status === 403 && key === "currentUser") { - if (localStorage.getItem(LocalStorageKeys.accessToken)) { - localStorage.removeItem(LocalStorageKeys.accessToken); - } - return; - } - - // 400 Bad Request Error - if (error.response.status === 400 || error.response.status === 406) { - Notification.BadRequest({ - errs: error.response.data, - }); - return error.response; - } - - // 4xx Errors - if (error.response.status > 400 && error.response.status < 600) { - if (error.response.status === 429) { - return error.response; - } else if (error.response.data && error.response.data.detail) { - Notification.Error({ - msg: error.response.data.detail, - }); - } else { - Notification.Error({ - msg: "Something went wrong...!", - }); - } - return; - } - } - }); - }; -};