Add middleware address to AssetLocationObject and (ohcnetwork#6778)

update HL7 and ventilator middleware
Bhavik-ag · Dec 1, 2023 · b49247c · b49247c
1 parent 4ed48a9
commit b49247c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Components/Assets/AssetTypes.tsx b/src/Components/Assets/AssetTypes.tsx
@@ -8,6 +8,7 @@ export interface AssetLocationObject {
   description: string;
   created_date?: string;
   modified_date?: string;
+  middleware_address?: string;
   facility: {
     id: string;
     name: string;

diff --git a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
@@ -60,7 +60,10 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
       setMonitorBedData(monitorBedData);
       const assetDataForMonitor = monitorBedData?.asset_object;
       const hl7Meta = assetDataForMonitor?.meta;
-      const hl7Middleware = hl7Meta?.middleware_hostname || middleware_address;
+      const hl7Middleware =
+        hl7Meta?.middleware_hostname ||
+        assetDataForMonitor?.location_object?.middleware_address ||
+        middleware_address;
       if (hl7Middleware && hl7Meta?.local_ip_address) {
         setHL7SocketUrl(
           `wss://${hl7Middleware}/observations/${hl7Meta.local_ip_address}`
@@ -85,7 +88,9 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
       setVentilatorBedData(ventilatorBedData);
       const ventilatorMeta = ventilatorBedData?.asset_object?.meta;
       const ventilatorMiddleware =
-        ventilatorMeta?.middleware_hostname || middleware_address;
+        ventilatorMeta?.middleware_hostname ||
+        consultationBedVentilator?.location_object.middleware_address ||
+        middleware_address;
       if (ventilatorMiddleware && ventilatorMeta?.local_ip_address) {
         setVentilatorSocketUrl(
           `wss://${ventilatorMiddleware}/observations/${ventilatorMeta?.local_ip_address}`