Merge pull request #480 from mozzy11/2.8

fix build failure
I-TECH-UW · Jul 12, 2023 · fea344f · fea344f
2 parents c7e1041 + dc0d9cb
commit fea344f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/react-ui/src/components/addOrder/PatientInfo.js b/react-ui/src/components/addOrder/PatientInfo.js
@@ -1,6 +1,5 @@
 import React, {useEffect, useRef, useState} from 'react';
 import {Button, Stack} from "@carbon/react";
-import "./../admin/reflexTests/ReflexRule"
 import SearchPatientForm from "../common/SearchPatientForm";
 import CreatePatientForm from "../common/CreatePatientForm";
 

diff --git a/react-ui/src/components/admin/calculatedValue/CalculatedValueForm.tsx b/react-ui/src/components/admin/calculatedValue/CalculatedValueForm.tsx
@@ -28,6 +28,17 @@ interface IdValue {
   id: number
   value: string
 }
+interface NotificationContextType {
+  notificationVisible: boolean;
+  setNotificationVisible: (visible: boolean) => void;
+  setNotificationBody: (body: NotificationBody) => void;
+}
+
+interface NotificationBody {
+  kind: any
+  title: string
+  message: string
+}
 
 var TestListObj: SampleTestListInterface = {
   "TEST_RESULT": {}, "FINAL_RESULT": {}
@@ -45,7 +56,7 @@ const CalculatedValue: React.FC<CalculatedValueProps> = () => {
   const [sampleList, setSampleList] = useState([]);
   const [sampleTestList, setSampleTestList] = useState(TestListObj);
   const [loaded, setLoaded] = useState(false);
-  const { notificationVisible, setNotificationVisible, setNotificationBody } = useContext(NotificationContext);
+  const { notificationVisible, setNotificationVisible, setNotificationBody } = useContext<NotificationContextType>(NotificationContext);
   const [mathFunctions, setMathFunctions] = useState([mathFunction]);
 
   useEffect(() => {
@@ -241,7 +252,7 @@ const CalculatedValue: React.FC<CalculatedValueProps> = () => {
   const handleCalculationSubmited = (status, index) => {
     setNotificationVisible(true);
     if (status == "200") {
-      const element = document.getElementById("submit_" + index)
+      const element = document.getElementById("submit_" + index) as HTMLInputElement;
       element.disabled = true;
       setNotificationBody({ kind: NotificationKinds.success, title: "Notification Message", message: "Succesfuly saved" });
     } else {

diff --git a/react-ui/src/components/common/CreatePatientForm.js b/react-ui/src/components/common/CreatePatientForm.js
@@ -233,13 +233,13 @@ class CreatePatientForm extends React.Component {
                                             <Field name="patientContact.person.lastName"
                                             >
                                                 {({ field }) =>
-                                                    <TextInput value={values.patientContact.person.lastName} name={field.name} labelText="Contact Last Name" id={field.name} className="inputText" />
+                                                    <TextInput value={values.patientContact?.person.lastName} name={field.name} labelText="Contact Last Name" id={field.name} className="inputText" />
                                                 }
                                             </Field>
                                             <Field name="patientContact.person.firstName"
                                             >
                                                 {({ field }) =>
-                                                    <TextInput value={values.patientContact.person.firstName} name={field.name} labelText="Contact First Name" id={field.name} className="inputText" />
+                                                    <TextInput value={values.patientContact?.person.firstName} name={field.name} labelText="Contact First Name" id={field.name} className="inputText" />
                                                 }
                                             </Field>
                                         </div>
@@ -248,13 +248,13 @@ class CreatePatientForm extends React.Component {
                                             <Field name="patientContact.person.email"
                                             >
                                                 {({ field }) =>
-                                                    <TextInput value={values.patientContact.person.email} name={field.name} labelText="Contact Email" id={field.name} className="inputText" />
+                                                    <TextInput value={values.patientContact?.person.email} name={field.name} labelText="Contact Email" id={field.name} className="inputText" />
                                                 }
                                             </Field>
                                             <Field name="patientContact.person.primaryPhone"
                                             >
                                                 {({ field }) =>
-                                                    <TextInput value={values.patientContact.person.primaryPhone} name={field.name} labelText="Contact Phone" id={field.name} className="inputText" />
+                                                    <TextInput value={values.patientContact?.person.primaryPhone} name={field.name} labelText="Contact Phone" id={field.name} className="inputText" />
                                                 }
                                             </Field>
                                             <div className="error">