Structured Response View Cleanup

ohcnetwork · Jan 6, 2025 · 3180a7a · 3180a7a
1 parent 08ae3d8
commit 3180a7a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx b/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx
@@ -10,7 +10,10 @@ import { Card } from "@/components/ui/card";
 import routes from "@/Utils/request/api";
 import { formatDateTime, properCase } from "@/Utils/utils";
 import { Encounter } from "@/types/emr/encounter";
-import { Question } from "@/types/questionnaire/question";
+import {
+  Question,
+  StructuredQuestionType,
+} from "@/types/questionnaire/question";
 import { QuestionnaireResponse } from "@/types/questionnaire/questionnaireResponse";
 
 import { StructuredResponseView } from "./StructuredResponseView";
@@ -263,7 +266,7 @@ export default function QuestionnaireResponsesList({ encounter }: Props) {
                             return (
                               <StructuredResponseView
                                 key={response.id}
-                                type={type}
+                                type={type as StructuredQuestionType}
                                 id={response.id}
                                 patientId={encounter.patient.id}
                                 encounterId={encounter.id}

diff --git a/src/components/Facility/ConsultationDetails/StructuredResponseView.tsx b/src/components/Facility/ConsultationDetails/StructuredResponseView.tsx
@@ -8,20 +8,26 @@ import query from "@/Utils/request/query";
 import allergyApi from "@/types/emr/allergyIntolerance/allergyIntoleranceApi";
 import diagnosisApi from "@/types/emr/diagnosis/diagnosisApi";
 import symptomApi from "@/types/emr/symptom/symptomApi";
+import { StructuredQuestionType } from "@/types/questionnaire/question";
 
-interface Props {
-  type: "symptom" | "diagnosis" | "allergy_intolerance";
+type SupportedType = "symptom" | "diagnosis" | "allergy_intolerance";
+type Props = {
+  type: StructuredQuestionType;
   id: string;
   patientId: string;
   encounterId: string;
-}
+};
 
 export function StructuredResponseView({
   type,
   id,
   patientId,
   encounterId,
 }: Props) {
+  const isSupportedType = (t: StructuredQuestionType): t is SupportedType => {
+    return ["symptom", "diagnosis", "allergy_intolerance"].includes(t);
+  };
+
   const basePathParams = { patientId };
   const queryParams = { encounter: encounterId };
 
@@ -48,6 +54,8 @@ export function StructuredResponseView({
     enabled: type === "allergy_intolerance" && !!id,
   });
 
+  if (!isSupportedType(type)) return null;
+
   const currentQuery = {
     symptom: symptomQuery,
     diagnosis: diagnosisQuery,