Merge branch 'develop' into fix#6134

ohcnetwork · Sep 26, 2023 · 6fb5182 · 6fb5182
2 parents e40b25f + 2973d6e
commit 6fb5182
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 34 deletions.
diff --git a/src/Components/Facility/ConsultationDetails/index.tsx b/src/Components/Facility/ConsultationDetails/index.tsx
@@ -54,10 +54,26 @@ export interface ConsultationTabProps {
   patientData: PatientModel;
 }
 
+const TABS = {
+  UPDATES: ConsultationUpdatesTab,
+  FEED: ConsultationFeedTab,
+  SUMMARY: ConsultationSummaryTab,
+  MEDICINES: ConsultationMedicinesTab,
+  FILES: ConsultationFilesTab,
+  INVESTIGATIONS: ConsultationInvestigationsTab,
+  ABG: ConsultationABGTab,
+  NURSING: ConsultationNursingTab,
+  NEUROLOGICAL_MONITORING: ConsultationNeurologicalMonitoringTab,
+  VENTILATOR: ConsultationVentilatorTab,
+  NUTRITION: ConsultationNursingTab,
+  PRESSURE_SORE: ConsultationPressureSoreTab,
+  DIALYSIS: ConsultationDialysisTab,
+};
+
 export const ConsultationDetails = (props: any) => {
   const { t } = useTranslation();
   const { facilityId, patientId, consultationId } = props;
-  const tab = props.tab.toUpperCase();
+  const tab = props.tab.toUpperCase() as keyof typeof TABS;
   const dispatch: any = useDispatch();
   const [isLoading, setIsLoading] = useState(false);
   const [showDoctors, setShowDoctors] = useState(false);
@@ -156,22 +172,6 @@ export const ConsultationDetails = (props: any) => {
     });
   }, []);
 
-  const TABS = {
-    UPDATES: ConsultationUpdatesTab,
-    FEED: ConsultationFeedTab,
-    SUMMARY: ConsultationSummaryTab,
-    MEDICINES: ConsultationMedicinesTab,
-    FILES: ConsultationFilesTab,
-    INVESTIGATIONS: ConsultationInvestigationsTab,
-    ABG: ConsultationABGTab,
-    NURSING: ConsultationNursingTab,
-    NEUROLOGICAL_MONITORING: ConsultationNeurologicalMonitoringTab,
-    VENTILATOR: ConsultationVentilatorTab,
-    NUTRITION: ConsultationNursingTab,
-    PRESSURE_SORE: ConsultationPressureSoreTab,
-    DIALYSIS: ConsultationDialysisTab,
-  };
-
   const consultationTabProps: ConsultationTabProps = {
     consultationId,
     facilityId,
@@ -422,13 +422,7 @@ export const ConsultationDetails = (props: any) => {
                 <ShowDiagnosis
                   diagnoses={[
                     ...(consultationData?.diagnosis
-                      ? [
-                          {
-                            id: "0",
-                            label: consultationData?.diagnosis,
-                            parentId: null,
-                          },
-                        ]
+                      ? [{ id: "0", label: consultationData?.diagnosis }]
                       : []),
                     ...(consultationData?.icd11_diagnoses_object ?? []),
                   ]}

diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
@@ -223,5 +223,4 @@ export interface CurrentBed {
 export type ICD11DiagnosisModel = {
   id: string;
   label: string;
-  parentId: string | null;
 };
diff --git a/src/Utils/request/request.ts b/src/Utils/request/request.ts
@@ -2,7 +2,7 @@ import handleResponse from "./handleResponse";
 import { RequestOptions, RequestResult, Route } from "./types";
 import { makeHeaders, makeUrl } from "./utils";
 
-interface Options extends RequestOptions {
+interface Options<TData> extends RequestOptions<TData> {
   controller?: AbortController;
 }
 
@@ -16,7 +16,7 @@ export default async function request<TData>(
     onResponse,
     silent,
     reattempts = 3,
-  }: Options = {}
+  }: Options<TData> = {}
 ): Promise<RequestResult<TData>> {
   const signal = controller?.signal;
   const url = makeUrl(path, query, pathParams);

diff --git a/src/Utils/request/useQuery.ts b/src/Utils/request/useQuery.ts
@@ -3,22 +3,22 @@ import { QueryRoute, RequestOptions, RequestResult } from "./types";
 import request from "./request";
 import { mergeRequestOptions } from "./utils";
 
-export interface QueryOptions extends RequestOptions {
+export interface QueryOptions<TData> extends RequestOptions<TData> {
   prefetch?: boolean;
   refetchOnWindowFocus?: boolean;
 }
 
 export default function useQuery<TData>(
   route: QueryRoute<TData>,
-  options?: QueryOptions
+  options?: QueryOptions<TData>
 ) {
   const [response, setResponse] = useState<RequestResult<TData>>();
   const [loading, setLoading] = useState(false);
 
   const controllerRef = useRef<AbortController>();
 
   const runQuery = useCallback(
-    async (overrides?: QueryOptions) => {
+    async (overrides?: QueryOptions<TData>) => {
       controllerRef.current?.abort();
 
       const controller = new AbortController();

diff --git a/src/Utils/request/utils.ts b/src/Utils/request/utils.ts
@@ -69,10 +69,10 @@ export function getAuthorizationHeader() {
   return null;
 }
 
-export function mergeRequestOptions(
-  options: RequestOptions,
-  overrides: RequestOptions
-): RequestOptions {
+export function mergeRequestOptions<TData>(
+  options: RequestOptions<TData>,
+  overrides: RequestOptions<TData>
+): RequestOptions<TData> {
   return {
     ...options,
     ...overrides,