+
{pages}
diff --git a/src/Routers/SessionRouter.tsx b/src/Routers/SessionRouter.tsx
index 4e546d51b6c..f6556b38c39 100644
--- a/src/Routers/SessionRouter.tsx
+++ b/src/Routers/SessionRouter.tsx
@@ -1,7 +1,8 @@
-import { Login, ResetPassword } from "../Components/Auth";
+import { Login, ResetPassword } from "@/components/Auth";
import { useRoutes } from "raviger";
-import SessionExpired from "../Components/ErrorPages/SessionExpired";
-import InvalidReset from "../Components/ErrorPages/InvalidReset";
+import SessionExpired from "@/components/ErrorPages/SessionExpired";
+import InvalidReset from "@/components/ErrorPages/InvalidReset";
+import LicensesPage from "@/components/Licenses/LicensesPage";
const routes = {
"/": () =>
,
@@ -9,6 +10,7 @@ const routes = {
"/forgot-password": () =>
,
"/password_reset/:token": ({ token }: any) =>
,
"/session-expired": () =>
,
+ "/licenses": () =>
,
"/invalid-reset": () =>
,
};
diff --git a/src/Routers/routes/AssetRoutes.tsx b/src/Routers/routes/AssetRoutes.tsx
index d3bd96ca437..4c32df55069 100644
--- a/src/Routers/routes/AssetRoutes.tsx
+++ b/src/Routers/routes/AssetRoutes.tsx
@@ -1,21 +1,24 @@
-import AssetConfigure from "../../Components/Assets/AssetConfigure";
-import AssetManage from "../../Components/Assets/AssetManage";
-import AssetsList from "../../Components/Assets/AssetsList";
-import AssetCreate from "../../Components/Facility/AssetCreate";
+import AssetConfigure from "@/components/Assets/AssetConfigure";
+import AssetManage from "@/components/Assets/AssetManage";
+import AssetsList from "@/components/Assets/AssetsList";
+import AssetCreate from "@/components/Facility/AssetCreate";
+import { AppRoutes } from "../AppRouter";
-export default {
+const AssetRoutes: AppRoutes = {
"/assets": () =>
,
-
- "/facility/:facilityId/assets/new": (params: any) => (
-
- ),
- "/facility/:facilityId/assets/:assetId/update": (params: any) => (
-
+ "/facility/:facilityId/assets/new": ({ facilityId }) => (
+
),
- "/facility/:facilityId/assets/:assetId": (params: any) => (
-
+ "/facility/:facilityId/assets/:assetId/update": ({ facilityId, assetId }) => (
+
),
- "/facility/:facilityId/assets/:assetId/configure": (params: any) => (
-
+ "/facility/:facilityId/assets/:assetId": ({ facilityId, assetId }) => (
+
),
+ "/facility/:facilityId/assets/:assetId/configure": ({
+ facilityId,
+ assetId,
+ }) =>
,
};
+
+export default AssetRoutes;
diff --git a/src/Routers/routes/ConsultationRoutes.tsx b/src/Routers/routes/ConsultationRoutes.tsx
index 598fd06adc3..bb804bd7613 100644
--- a/src/Routers/routes/ConsultationRoutes.tsx
+++ b/src/Routers/routes/ConsultationRoutes.tsx
@@ -1,34 +1,34 @@
-import { ConsultationForm } from "../../Components/Facility/ConsultationForm";
-import Investigation from "../../Components/Facility/Investigations";
-import ShowInvestigation from "../../Components/Facility/Investigations/ShowInvestigation";
-import ManagePrescriptions from "../../Components/Medicine/ManagePrescriptions";
-import { DailyRoundListDetails } from "../../Components/Patient/DailyRoundListDetails";
-import { DailyRounds } from "../../Components/Patient/DailyRounds";
-import { ConsultationDetails } from "../../Components/Facility/ConsultationDetails";
-import TreatmentSummary, {
- ITreatmentSummaryProps,
-} from "../../Components/Facility/TreatmentSummary";
-import ConsultationDoctorNotes from "../../Components/Facility/ConsultationDoctorNotes";
-import PatientConsentRecords from "../../Components/Patient/PatientConsentRecords";
-import CriticalCareEditor from "../../Components/LogUpdate/CriticalCareEditor";
-import PrescriptionsPrintPreview from "../../Components/Medicine/PrintPreview";
-import CriticalCarePreview from "../../Components/LogUpdate/CriticalCarePreview";
-import FileUploadPage from "../../Components/Patient/FileUploadPage";
+import { ConsultationForm } from "@/components/Facility/ConsultationForm";
+import Investigation from "@/components/Facility/Investigations";
+import ShowInvestigation from "@/components/Facility/Investigations/ShowInvestigation";
+import ManagePrescriptions from "@/components/Medicine/ManagePrescriptions";
+import { DailyRoundListDetails } from "@/components/Patient/DailyRoundListDetails";
+import { DailyRounds } from "@/components/Patient/DailyRounds";
+import { ConsultationDetails } from "@/components/Facility/ConsultationDetails";
+import TreatmentSummary from "@/components/Facility/TreatmentSummary";
+import ConsultationDoctorNotes from "@/components/Facility/ConsultationDoctorNotes";
+import PatientConsentRecords from "@/components/Patient/PatientConsentRecords";
+import CriticalCareEditor from "@/components/LogUpdate/CriticalCareEditor";
+import PrescriptionsPrintPreview from "@/components/Medicine/PrintPreview";
+import CriticalCarePreview from "@/components/LogUpdate/CriticalCarePreview";
+import FileUploadPage from "@/components/Patient/FileUploadPage";
+import InvestigationPrintPreview from "@/components/Facility/Investigations/InvestigationsPrintPreview";
+import { AppRoutes } from "../AppRouter";
-export default {
+const consultationRoutes: AppRoutes = {
"/facility/:facilityId/patient/:patientId/consultation": ({
facilityId,
patientId,
- }: any) =>
,
+ }) =>
,
"/facility/:facilityId/patient/:patientId/consultation/:id/update": ({
facilityId,
patientId,
id,
- }: any) => (
+ }) => (
),
"/facility/:facilityId/patient/:patientId/consultation/:id/consent-records":
- ({ facilityId, patientId, id }: any) => (
+ ({ facilityId, patientId, id }) => (
(
+ }) => (
-
),
};
+
+export default FacilityLocationRoutes;
diff --git a/src/Routers/routes/FacilityRoutes.tsx b/src/Routers/routes/FacilityRoutes.tsx
index 2c711cf48cb..e3b787abd9f 100644
--- a/src/Routers/routes/FacilityRoutes.tsx
+++ b/src/Routers/routes/FacilityRoutes.tsx
@@ -1,49 +1,48 @@
-import { FacilityConfigure } from "../../Components/Facility/FacilityConfigure";
-import { FacilityCreate } from "../../Components/Facility/FacilityCreate";
-import { FacilityHome } from "../../Components/Facility/FacilityHome";
-import FacilityUsers from "../../Components/Facility/FacilityUsers";
-import { HospitalList } from "../../Components/Facility/HospitalList";
-import { TriageForm } from "../../Components/Facility/TriageForm";
-import ResourceCreate from "../../Components/Resource/ResourceCreate";
-import CentralNursingStation from "../../Components/Facility/CentralNursingStation";
+import { FacilityConfigure } from "@/components/Facility/FacilityConfigure";
+import { FacilityCreate } from "@/components/Facility/FacilityCreate";
+import { FacilityHome } from "@/components/Facility/FacilityHome";
+import FacilityUsers from "@/components/Facility/FacilityUsers";
+import { FacilityList } from "@/components/Facility/FacilityList";
+import { TriageForm } from "@/components/Facility/TriageForm";
+import ResourceCreate from "@/components/Resource/ResourceCreate";
+import CentralNursingStation from "@/components/Facility/CentralNursingStation";
import FacilityLocationRoutes from "./FacilityLocationRoutes";
import FacilityInventoryRoutes from "./FacilityInventoryRoutes";
-import DischargedPatientsList from "../../Components/Facility/DischargedPatientsList";
+import DischargedPatientsList from "@/components/Facility/DischargedPatientsList";
+import { AppRoutes } from "../AppRouter";
-export default {
- "/facility": () =>
-
- ),
+ "/resource/board": () =>
-
- ),
+ "/shifting/board": () => (res: Response): Promise {
}
const isJson = res.headers.get("content-type")?.includes("application/json");
+ const isImage = res.headers.get("content-type")?.includes("image");
+
+ if (isImage) {
+ return (await res.blob()) as TData;
+ }
if (!isJson) {
return (await res.text()) as TData;
diff --git a/src/Utils/request/uploadFile.ts b/src/Utils/request/uploadFile.ts
index c527878e283..ca62672f642 100644
--- a/src/Utils/request/uploadFile.ts
+++ b/src/Utils/request/uploadFile.ts
@@ -1,6 +1,6 @@
import { Dispatch, SetStateAction } from "react";
import { handleUploadPercentage } from "./utils";
-import * as Notification from "../../Utils/Notifications.js";
+import * as Notification from "../../Utils/Notifications";
const uploadFile = (
url: string,
diff --git a/src/Utils/request/useMutation.ts b/src/Utils/request/useMutation.ts
new file mode 100644
index 00000000000..737b32a2237
--- /dev/null
+++ b/src/Utils/request/useMutation.ts
@@ -0,0 +1,41 @@
+import request from "@/Utils/request/request";
+import {
+ MutationRoute,
+ RequestOptions,
+ RequestResult,
+} from "@/Utils/request/types";
+import { mergeRequestOptions } from "@/Utils/request/utils";
+import React from "react";
+
+export default function useMutation(
+ route: MutationRoute,
+ options: RequestOptions,
+) {
+ const [response, setResponse] = React.useState>();
+ const [isProcessing, setIsProcessing] = React.useState(false);
+
+ const controllerRef = React.useRef();
+
+ const runQuery = React.useCallback(
+ async (overrides?: RequestOptions) => {
+ controllerRef.current?.abort();
+
+ const controller = new AbortController();
+ controllerRef.current = controller;
+
+ const resolvedOptions =
+ options && overrides
+ ? mergeRequestOptions(options, overrides)
+ : (overrides ?? options);
+
+ setIsProcessing(true);
+ const response = await request(route, { ...resolvedOptions, controller });
+ setResponse(response);
+ setIsProcessing(false);
+ return response;
+ },
+ [route, JSON.stringify(options)],
+ );
+
+ return { ...response, isProcessing, mutate: runQuery };
+}
diff --git a/src/Utils/request/utils.ts b/src/Utils/request/utils.ts
index bf5f609c175..2734625e196 100644
--- a/src/Utils/request/utils.ts
+++ b/src/Utils/request/utils.ts
@@ -1,5 +1,5 @@
import { Dispatch, SetStateAction } from "react";
-import { LocalStorageKeys } from "../../Common/constants";
+import { LocalStorageKeys } from "@/common/constants";
import * as Notification from "../Notifications";
import { QueryParams, RequestOptions } from "./types";
diff --git a/src/Utils/transformUtils.ts b/src/Utils/transformUtils.ts
index 0050a0bcbb6..662af2ed3c6 100644
--- a/src/Utils/transformUtils.ts
+++ b/src/Utils/transformUtils.ts
@@ -1,16 +1,23 @@
-import { AssetData } from "../Components/Assets/AssetTypes";
+import { AssetData } from "@/components/Assets/AssetTypes";
-export const getCameraConfig = (asset: AssetData) => {
- const { meta } = asset;
+export const getCameraConfig = (meta: AssetData["meta"]) => {
return {
middleware_hostname: meta?.middleware_hostname,
- id: asset?.id,
hostname: meta?.local_ip_address,
username: meta?.camera_access_key?.split(":")[0],
password: meta?.camera_access_key?.split(":")[1],
accessKey: meta?.camera_access_key?.split(":")[2],
port: 80,
- location_id: asset?.location_object?.id,
- facility_id: asset?.location_object?.facility?.id,
};
};
+
+export const makeAccessKey = (
+ attrs: Pick<
+ ReturnType,
+ "username" | "password" | "accessKey"
+ >,
+) => {
+ return [attrs.username, attrs.password, attrs.accessKey]
+ .map((a) => a ?? "")
+ .join(":");
+};
diff --git a/src/Utils/types.ts b/src/Utils/types.ts
index 519ede36ffc..71ddd41330e 100644
--- a/src/Utils/types.ts
+++ b/src/Utils/types.ts
@@ -1,11 +1,11 @@
-import { PerformedByModel } from "../Components/HCX/misc";
+import { UserBareMinimum } from "@/components/Users/models";
export interface BaseModel {
readonly id: string;
readonly modified_date: string;
readonly created_date: string;
- readonly created_by: PerformedByModel;
- readonly updated_by: PerformedByModel;
+ readonly created_by: UserBareMinimum;
+ readonly updated_by: UserBareMinimum;
}
export type Writable = {
diff --git a/src/Utils/useFileManager.tsx b/src/Utils/useFileManager.tsx
index 93ddd3ad479..ef935446689 100644
--- a/src/Utils/useFileManager.tsx
+++ b/src/Utils/useFileManager.tsx
@@ -1,20 +1,20 @@
import { useState } from "react";
-import FilePreviewDialog from "../Components/Common/FilePreviewDialog";
-import { FileUploadModel } from "../Components/Patient/models";
-import { StateInterface } from "../Components/Files/FileUpload";
+import FilePreviewDialog from "@/components/Common/FilePreviewDialog";
+import { FileUploadModel } from "@/components/Patient/models";
+import { StateInterface } from "@/components/Files/FileUpload";
import request from "./request/request";
import routes from "../Redux/api";
-import DialogModal from "../Components/Common/Dialog";
+import DialogModal from "@/components/Common/Dialog";
import CareIcon from "../CAREUI/icons/CareIcon";
-import TextAreaFormField from "../Components/Form/FormFields/TextAreaFormField";
-import { Cancel, Submit } from "../Components/Common/components/ButtonV2";
+import TextAreaFormField from "@/components/Form/FormFields/TextAreaFormField";
+import { Cancel, Submit } from "@/components/Common/components/ButtonV2";
import { formatDateTime } from "./utils";
-import * as Notification from "./Notifications.js";
-import TextFormField from "../Components/Form/FormFields/TextFormField";
+import * as Notification from "./Notifications";
+import TextFormField from "@/components/Form/FormFields/TextFormField";
import {
FILE_EXTENSIONS,
PREVIEWABLE_FILE_EXTENSIONS,
-} from "../Common/constants";
+} from "@/common/constants";
export interface FileManagerOptions {
type: string;
diff --git a/src/Utils/useFileUpload.tsx b/src/Utils/useFileUpload.tsx
index a0888643414..3181abad9b9 100644
--- a/src/Utils/useFileUpload.tsx
+++ b/src/Utils/useFileUpload.tsx
@@ -9,15 +9,15 @@ import {
CreateFileResponse,
FileCategory,
FileUploadModel,
-} from "../Components/Patient/models";
+} from "@/components/Patient/models";
import request from "./request/request";
import routes from "../Redux/api";
import uploadFile from "./request/uploadFile";
-import * as Notification from "./Notifications.js";
+import * as Notification from "./Notifications";
import imageCompression from "browser-image-compression";
-import { DEFAULT_ALLOWED_EXTENSIONS } from "../Common/constants";
-import CameraCaptureDialog from "../Components/Files/CameraCaptureDialog";
-import AudioCaptureDialog from "../Components/Files/AudioCaptureDialog";
+import { DEFAULT_ALLOWED_EXTENSIONS } from "@/common/constants";
+import CameraCaptureDialog from "@/components/Files/CameraCaptureDialog";
+import AudioCaptureDialog from "@/components/Files/AudioCaptureDialog";
import { t } from "i18next";
export type FileUploadOptions = {
diff --git a/src/Utils/useRecorder.js b/src/Utils/useRecorder.js
index 446f824259f..8ad90ebe8cb 100644
--- a/src/Utils/useRecorder.js
+++ b/src/Utils/useRecorder.js
@@ -2,13 +2,14 @@
import { useEffect, useState } from "react";
import { Error } from "./Notifications";
+import { useTranslation } from "react-i18next";
const useRecorder = (handleMicPermission) => {
const [audioURL, setAudioURL] = useState("");
const [isRecording, setIsRecording] = useState(false);
const [recorder, setRecorder] = useState(null);
const [newBlob, setNewBlob] = useState(null);
-
+ const { t } = useTranslation();
useEffect(() => {
if (!isRecording && recorder && audioURL) {
setRecorder(null);
@@ -26,7 +27,7 @@ const useRecorder = (handleMicPermission) => {
},
() => {
Error({
- msg: "Please grant microphone permission to record audio.",
+ msg: t("audio__permission_message"),
});
setIsRecording(false);
handleMicPermission(false);
diff --git a/src/Utils/useSegmentedRecorder.ts b/src/Utils/useSegmentedRecorder.ts
index 9434ea8383c..fe38afb3b06 100644
--- a/src/Utils/useSegmentedRecorder.ts
+++ b/src/Utils/useSegmentedRecorder.ts
@@ -1,11 +1,13 @@
import { useState, useEffect } from "react";
import * as Notify from "./Notifications";
+import { useTranslation } from "react-i18next";
const useSegmentedRecording = () => {
const [isRecording, setIsRecording] = useState(false);
const [recorder, setRecorder] = useState(null);
const [audioBlobs, setAudioBlobs] = useState([]);
const [restart, setRestart] = useState(false);
+ const { t } = useTranslation();
const bufferInterval = 1 * 1000;
const splitSizeLimit = 20 * 1000000; // 20MB
@@ -28,7 +30,7 @@ const useSegmentedRecording = () => {
},
() => {
Notify.Error({
- msg: "Please grant microphone permission to record audio.",
+ msg: t("audio__permission_message"),
});
setIsRecording(false);
},
diff --git a/src/Utils/useTimer.tsx b/src/Utils/useTimer.tsx
index 6a8d8320c5e..f7a03ffefa0 100644
--- a/src/Utils/useTimer.tsx
+++ b/src/Utils/useTimer.tsx
@@ -27,7 +27,7 @@ export const useTimer = (autoStart = false) => {
const [time, setTime] = useState(0);
useEffect(() => {
- let interval: number;
+ let interval: ReturnType;
if (running) {
interval = setInterval(() => {
setTime((prevTime) => prevTime + 1);
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
index e4e0b983368..4ba10746d61 100644
--- a/src/Utils/utils.ts
+++ b/src/Utils/utils.ts
@@ -1,7 +1,7 @@
-import { AREACODES, IN_LANDLINE_AREA_CODES } from "../Common/constants";
-import phoneCodesJson from "../Common/static/countryPhoneAndFlags.json";
+import { AREACODES, IN_LANDLINE_AREA_CODES } from "@/common/constants";
+import phoneCodesJson from "@/common/static/countryPhoneAndFlags.json";
import dayjs from "./dayjs";
-import { PatientModel } from "../Components/Patient/models";
+import { PatientModel } from "@/components/Patient/models";
interface ApacheParams {
age: number;
diff --git a/src/Common/constants.tsx b/src/common/constants.tsx
similarity index 97%
rename from src/Common/constants.tsx
rename to src/common/constants.tsx
index d46473bfd2d..87432fcaadb 100644
--- a/src/Common/constants.tsx
+++ b/src/common/constants.tsx
@@ -1,16 +1,13 @@
import {
PatientCategory,
SpokeRelationship,
-} from "../Components/Facility/models";
-import { SortOption } from "../Components/Common/SortDropdown";
+} from "@/components/Facility/models";
+import { SortOption } from "@/components/Common/SortDropdown";
import { dateQueryString } from "../Utils/utils";
import { IconName } from "../CAREUI/icons/CareIcon";
-import { PhoneNumberValidator } from "../Components/Form/FieldValidators";
+import { PhoneNumberValidator } from "@/components/Form/FieldValidators";
import { SchemaType } from "./schemaParser";
-import {
- ConsentHIType,
- ConsentPurpose,
-} from "../Components/ABDM/types/consent";
+import { ConsentHIType, ConsentPurpose } from "@/components/ABDM/types/consent";
export const RESULTS_PER_PAGE_LIMIT = 14;
export const PAGINATION_LIMIT = 36;
@@ -239,7 +236,7 @@ export const DOCTOR_SPECIALIZATION: Array = [
{ id: 16, text: "General Surgeon" },
{ id: 17, text: "Geriatrician" },
{ id: 18, text: "Hematologist" },
- { id: 29, text: "Immunologist" },
+ { id: 19, text: "Immunologist" },
{ id: 20, text: "Infectious Disease Specialist" },
{ id: 21, text: "MBBS doctor" },
{ id: 22, text: "Medical Officer" },
@@ -839,20 +836,6 @@ export const LOCATION_BED_TYPES = [
{ id: "REGULAR", name: "Regular" },
] as const;
-export const ASSET_META_TYPE = [
- { id: "CAMERA", text: "Camera(ONVIF)" },
- { id: "HL7MONITOR", text: "Vitals Monitor(HL7)" },
-];
-
-export const CAMERA_TYPE = [
- { id: "HIKVISION", text: "ONVIF Camera (HIKVISION)" },
-];
-
-export const GENDER: { [key: number]: string } = GENDER_TYPES.reduce(
- (acc, curr) => ({ ...acc, [curr.id]: curr.text }),
- {},
-);
-
export type CameraPTZ = {
icon?: IconName;
label: string;
@@ -1158,23 +1141,23 @@ export const AssetImportSchema: SchemaType = {
// ABDM
export const ABDM_CONSENT_PURPOSE = [
- { value: "CAREMGT", label: "Care Management" },
- { value: "BTG", label: "Break The Glass" },
- { value: "PUBHLTH", label: "Public Health" },
- { value: "HPAYMT", label: "Healthcare Payment" },
- { value: "DSRCH", label: "Disease Specific Healthcare Research" },
- { value: "PATRQT", label: "Self Requested" },
-] as { value: ConsentPurpose; label: string }[];
+ "CAREMGT",
+ "BTG",
+ "PUBHLTH",
+ "HPAYMT",
+ "DSRCH",
+ "PATRQT",
+] as ConsentPurpose[];
export const ABDM_HI_TYPE = [
- { value: "Prescription", label: "Prescription" },
- { value: "DiagnosticReport", label: "Diagnostic Report" },
- { value: "OPConsultation", label: "Op Consultation" },
- { value: "DischargeSummary", label: "Discharge Summary" },
- { value: "ImmunizationRecord", label: "Immunization Record" },
- { value: "HealthDocumentRecord", label: "Record Artifact" },
- { value: "WellnessRecord", label: "Wellness Record" },
-] as { value: ConsentHIType; label: string }[];
+ "Prescription",
+ "DiagnosticReport",
+ "OPConsultation",
+ "DischargeSummary",
+ "ImmunizationRecord",
+ "HealthDocumentRecord",
+ "WellnessRecord",
+] as ConsentHIType[];
export const USER_TYPES_MAP = {
Pharmacist: "Pharmacist",
diff --git a/src/Common/hooks/useActiveLink.ts b/src/common/hooks/useActiveLink.ts
similarity index 100%
rename from src/Common/hooks/useActiveLink.ts
rename to src/common/hooks/useActiveLink.ts
diff --git a/src/Common/hooks/useAppHistory.ts b/src/common/hooks/useAppHistory.ts
similarity index 100%
rename from src/Common/hooks/useAppHistory.ts
rename to src/common/hooks/useAppHistory.ts
diff --git a/src/Common/hooks/useAuthUser.ts b/src/common/hooks/useAuthUser.ts
similarity index 88%
rename from src/Common/hooks/useAuthUser.ts
rename to src/common/hooks/useAuthUser.ts
index 78bf93fa8f8..2b492c23a54 100644
--- a/src/Common/hooks/useAuthUser.ts
+++ b/src/common/hooks/useAuthUser.ts
@@ -1,5 +1,5 @@
import { createContext, useContext } from "react";
-import { UserModel } from "../../Components/Users/models";
+import { UserModel } from "@/components/Users/models";
import { RequestResult } from "../../Utils/request/types";
import { JwtTokenObtainPair, LoginCredentials } from "../../Redux/api";
@@ -9,6 +9,7 @@ type AuthContextType = {
user: UserModel | undefined;
signIn: (creds: LoginCredentials) => Promise;
signOut: () => Promise;
+ refetchUser: () => Promise>;
};
export const AuthUserContext = createContext(null);
diff --git a/src/Common/hooks/useBreakpoints.ts b/src/common/hooks/useBreakpoints.ts
similarity index 100%
rename from src/Common/hooks/useBreakpoints.ts
rename to src/common/hooks/useBreakpoints.ts
diff --git a/src/Common/hooks/useCanvas.ts b/src/common/hooks/useCanvas.ts
similarity index 100%
rename from src/Common/hooks/useCanvas.ts
rename to src/common/hooks/useCanvas.ts
diff --git a/src/common/hooks/useCareApps.ts b/src/common/hooks/useCareApps.ts
new file mode 100644
index 00000000000..758a4ac4349
--- /dev/null
+++ b/src/common/hooks/useCareApps.ts
@@ -0,0 +1,35 @@
+import { createContext, useContext } from "react";
+import { PluginManifest } from "@/pluginTypes";
+import { INavItem } from "@/components/Common/Sidebar/Sidebar";
+
+export const CareAppsContext = createContext([]);
+
+export const useCareApps = () => {
+ const ctx = useContext(CareAppsContext);
+ if (!ctx) {
+ throw new Error(
+ "'useCareApps' must be used within 'CareAppsProvider' only",
+ );
+ }
+ return ctx;
+};
+
+export const useCareAppNavItems = () => {
+ const careApps = useCareApps();
+ const navItems = careApps.reduce((acc, plugin) => {
+ return [...acc, ...(plugin.navItems || [])];
+ }, []);
+ return navItems;
+};
+
+// If required; Reduce plugin.routes to a single pluginRoutes object of type Record JSX.Element>
+export function usePluginRoutes() {
+ const careApps = useCareApps();
+ const routes = careApps.reduce((acc, plugin) => {
+ return { ...acc, ...plugin.routes };
+ }, {});
+ if (!routes) {
+ throw new Error("'usePluginRoutes' must be used within 'AppRouter' only");
+ }
+ return routes;
+}
diff --git a/src/Common/hooks/useConfirmedAction.ts b/src/common/hooks/useConfirmedAction.ts
similarity index 100%
rename from src/Common/hooks/useConfirmedAction.ts
rename to src/common/hooks/useConfirmedAction.ts
diff --git a/src/Common/hooks/useExport.tsx b/src/common/hooks/useExport.tsx
similarity index 100%
rename from src/Common/hooks/useExport.tsx
rename to src/common/hooks/useExport.tsx
diff --git a/src/Common/hooks/useFilters.tsx b/src/common/hooks/useFilters.tsx
similarity index 99%
rename from src/Common/hooks/useFilters.tsx
rename to src/common/hooks/useFilters.tsx
index a6974a5a43b..49e1d9fe0e2 100644
--- a/src/Common/hooks/useFilters.tsx
+++ b/src/common/hooks/useFilters.tsx
@@ -2,7 +2,7 @@ import { QueryParam, setQueryParamsOptions, useQueryParams } from "raviger";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import GenericFilterBadge from "../../CAREUI/display/FilterBadge";
-import PaginationComponent from "../../Components/Common/Pagination";
+import PaginationComponent from "@/components/Common/Pagination";
import { classNames, humanizeStrings } from "../../Utils/utils";
import FiltersCache from "../../Utils/FiltersCache";
import careConfig from "@careConfig";
diff --git a/src/Common/hooks/useFullscreen.ts b/src/common/hooks/useFullscreen.ts
similarity index 100%
rename from src/Common/hooks/useFullscreen.ts
rename to src/common/hooks/useFullscreen.ts
diff --git a/src/Common/hooks/useIsAuthorized.ts b/src/common/hooks/useIsAuthorized.ts
similarity index 100%
rename from src/Common/hooks/useIsAuthorized.ts
rename to src/common/hooks/useIsAuthorized.ts
diff --git a/src/Common/hooks/useMergeState.js b/src/common/hooks/useMergeState.js
similarity index 100%
rename from src/Common/hooks/useMergeState.js
rename to src/common/hooks/useMergeState.js
diff --git a/src/Common/hooks/useMessageListener.ts b/src/common/hooks/useMessageListener.ts
similarity index 100%
rename from src/Common/hooks/useMessageListener.ts
rename to src/common/hooks/useMessageListener.ts
diff --git a/src/Common/hooks/useNotificationSubscriptionState.ts b/src/common/hooks/useNotificationSubscriptionState.ts
similarity index 100%
rename from src/Common/hooks/useNotificationSubscriptionState.ts
rename to src/common/hooks/useNotificationSubscriptionState.ts
diff --git a/src/Common/hooks/useRangePagination.ts b/src/common/hooks/useRangePagination.ts
similarity index 100%
rename from src/Common/hooks/useRangePagination.ts
rename to src/common/hooks/useRangePagination.ts
diff --git a/src/Common/hooks/useSlug.ts b/src/common/hooks/useSlug.ts
similarity index 100%
rename from src/Common/hooks/useSlug.ts
rename to src/common/hooks/useSlug.ts
diff --git a/src/Common/hooks/useWindowDimensions.ts b/src/common/hooks/useWindowDimensions.ts
similarity index 100%
rename from src/Common/hooks/useWindowDimensions.ts
rename to src/common/hooks/useWindowDimensions.ts
diff --git a/src/Common/schemaParser.ts b/src/common/schemaParser.ts
similarity index 100%
rename from src/Common/schemaParser.ts
rename to src/common/schemaParser.ts
diff --git a/src/Common/static/countries.json b/src/common/static/countries.json
similarity index 100%
rename from src/Common/static/countries.json
rename to src/common/static/countries.json
diff --git a/src/Common/static/countryPhoneAndFlags.json b/src/common/static/countryPhoneAndFlags.json
similarity index 100%
rename from src/Common/static/countryPhoneAndFlags.json
rename to src/common/static/countryPhoneAndFlags.json
diff --git a/src/Common/static/states.json b/src/common/static/states.json
similarity index 100%
rename from src/Common/static/states.json
rename to src/common/static/states.json
diff --git a/src/Common/utils.tsx b/src/common/utils.tsx
similarity index 100%
rename from src/Common/utils.tsx
rename to src/common/utils.tsx
diff --git a/src/Common/validation.tsx b/src/common/validation.tsx
similarity index 100%
rename from src/Common/validation.tsx
rename to src/common/validation.tsx
diff --git a/src/Components/ABDM/ABDMFacilityRecords.tsx b/src/components/ABDM/ABDMFacilityRecords.tsx
similarity index 59%
rename from src/Components/ABDM/ABDMFacilityRecords.tsx
rename to src/components/ABDM/ABDMFacilityRecords.tsx
index a37fc0d4932..3e23e82fc8f 100644
--- a/src/Components/ABDM/ABDMFacilityRecords.tsx
+++ b/src/components/ABDM/ABDMFacilityRecords.tsx
@@ -1,33 +1,35 @@
import { Link } from "raviger";
import routes from "../../Redux/api";
import useQuery from "../../Utils/request/useQuery";
-import { formatDateTime } from "../../Utils/utils";
-import Loading from "../Common/Loading";
-import Page from "../Common/components/Page";
+import { classNames, formatDateTime } from "../../Utils/utils";
+import Loading from "@/components/Common/Loading";
+import Page from "@/components/Common/components/Page";
import CareIcon from "../../CAREUI/icons/CareIcon";
-import ButtonV2 from "../Common/components/ButtonV2";
+import ButtonV2 from "@/components/Common/components/ButtonV2";
+import { useTranslation } from "react-i18next";
interface IProps {
facilityId: string;
}
const TableHeads = [
- "Patient",
- "Status",
- "Created On",
- "Consent Granted On",
- // "Requested By",
- "Health Information Range",
- "Expires On",
- "HI Profiles",
+ "consent__patient",
+ "consent__status",
+ "created_on",
+ "updated_on",
+ "consent__hi_range",
+ "expires_on",
+ "consent__hi_types",
];
export default function ABDMFacilityRecords({ facilityId }: IProps) {
+ const { t } = useTranslation();
+
const {
data: consentsResult,
loading,
refetch,
- } = useQuery(routes.abha.listConsents, {
+ } = useQuery(routes.abdm.consent.list, {
query: { facility: facilityId, ordering: "-created_date" },
});
@@ -36,7 +38,7 @@ export default function ABDMFacilityRecords({ facilityId }: IProps) {
}
return (
-
+
@@ -51,7 +53,7 @@ export default function ABDMFacilityRecords({ facilityId }: IProps) {
scope="col"
className="px-3 py-3.5 text-center text-sm font-semibold text-secondary-900"
>
- {head}
+ {t(head)}
))}
- View
+ {t("view")}
@@ -84,9 +86,13 @@ export default function ABDMFacilityRecords({ facilityId }: IProps) {
consent.consent_artefacts?.[0]?.expiry ??
consent.expiry,
) < new Date()
- ? "EXPIRED"
- : (consent.consent_artefacts?.[0]?.status ??
- consent.status)}
+ ? t("consent__status__EXPIRED")
+ : t(
+ `consent__status__${
+ consent.consent_artefacts?.[0]?.status ??
+ consent.status
+ }`,
+ )}
@@ -94,11 +100,30 @@ export default function ABDMFacilityRecords({ facilityId }: IProps) {
- {consent.consent_artefacts.length
- ? formatDateTime(
- consent.consent_artefacts[0].created_date,
- )
- : "-"}
+ {consent.status === "EXPIRED" ||
+ new Date(
+ consent.consent_artefacts?.[0]?.expiry ??
+ consent.expiry,
+ ) < new Date() ? (
+
+ {formatDateTime(
+ consent.consent_artefacts?.[0]?.expiry ??
+ consent.expiry,
+ )}
+
+ {t("expired_on")}
+
+
+ ) : consent.status === "REQUESTED" ? (
+ "-"
+ ) : (
+
+ {formatDateTime(consent.modified_date)}
+
+ {t(`${consent.status.toLowerCase()}_on`)}
+
+
+ )}
@@ -127,7 +152,7 @@ export default function ABDMFacilityRecords({ facilityId }: IProps) {
consent.hi_types
)?.map((hiType) => (
- {hiType}
+ {t(`consent__hi_type__${hiType}`)}
))}
@@ -135,26 +160,22 @@ export default function ABDMFacilityRecords({ facilityId }: IProps) {
- {(consent.consent_artefacts?.[0]?.status ??
- consent.status) === "GRANTED" &&
- new Date(
- consent.consent_artefacts?.[0]?.expiry ??
- consent.expiry,
- ) > new Date() ? (
-
- View
-
- ) : (
-
- View
-
- )}
+
new Date()
+ ? "cursor-pointer text-primary-600 hover:text-primary-900"
+ : "pointer-events-none cursor-not-allowed text-secondary-600 opacity-70",
+ )}
+ >
+ {t("view")}
+
diff --git a/src/Components/ABDM/ABDMRecordsTab.tsx b/src/components/ABDM/ABDMRecordsTab.tsx
similarity index 77%
rename from src/Components/ABDM/ABDMRecordsTab.tsx
rename to src/components/ABDM/ABDMRecordsTab.tsx
index 37ae1a629db..d97edbb0cc2 100644
--- a/src/Components/ABDM/ABDMRecordsTab.tsx
+++ b/src/components/ABDM/ABDMRecordsTab.tsx
@@ -1,21 +1,23 @@
import { ConsentArtefactModel, ConsentRequestModel } from "./types/consent";
import dayjs from "dayjs";
-import { ABDM_CONSENT_PURPOSE } from "../../Common/constants";
import CareIcon from "../../CAREUI/icons/CareIcon";
-import ButtonV2 from "../Common/components/ButtonV2";
-import * as Notification from "../../Utils/Notifications.js";
-import Loading from "../Common/Loading";
+import ButtonV2 from "@/components/Common/components/ButtonV2";
+import * as Notification from "../../Utils/Notifications";
+import Loading from "@/components/Common/Loading";
import { classNames, formatName } from "../../Utils/utils";
import { Link } from "raviger";
import routes from "../../Redux/api";
import request from "../../Utils/request/request";
import useQuery from "../../Utils/request/useQuery";
+import { useTranslation } from "react-i18next";
interface IConsentArtefactCardProps {
artefact: ConsentArtefactModel;
}
function ConsentArtefactCard({ artefact }: IConsentArtefactCardProps) {
+ const { t } = useTranslation();
+
return (
- created {dayjs(artefact.created_date).fromNow()}
+ {t("created_on")} {dayjs(artefact.created_date).fromNow()}
@@ -39,7 +41,7 @@ function ConsentArtefactCard({ artefact }: IConsentArtefactCardProps) {
{dayjs(artefact.to_time).format("MMM DD YYYY")}
- expires in {dayjs(artefact.expiry).fromNow()}
+ {t("expires_on")} {dayjs(artefact.expiry).fromNow()}
@@ -50,7 +52,7 @@ function ConsentArtefactCard({ artefact }: IConsentArtefactCardProps) {
key={hiType}
className="flex items-center justify-center rounded-full bg-secondary-600 px-4 py-1.5 text-xs font-medium text-white"
>
- {hiType}
+ {t(`consent__hi_type__${hiType}`)}
+ 