@digihmis/esm-triage-app 1.0.2 → 1.0.3

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.24.0"},"extensions":[{"name":"triage-dashboard-header","slot":"triage-sidebar-slot","component":"triageDashboardHeader","order":0,"online":true,"offline":true},{"name":"triage-db-link","slot":"triage-dashboard-slot","component":"leftPanelLink","meta":{"name":"triage","slot":"triage-homepage-dashboard-slot","title":"Triage Queue"},"order":1,"online":true,"offline":true},{"name":"triage-queue-dashboard","slot":"triage-homepage-dashboard-slot","component":"triageQueueDashboard"},{"name":"patient-vitals-link","slot":"triage-dashboard-slot","component":"patientVitalsLink","meta":{"name":"triage/:patientUuid/vitals","slot":"triage-vitals-dashboard-slot","title":"Patient Vitals","showOnlyOnRoute":"/vitals"},"order":2,"online":true,"offline":true},{"name":"patient-vitals-history","slot":"triage-vitals-dashboard-slot","component":"patientVitalsHistory"},{"name":"vitals-header","slot":"patient-vitals-header-slot","component":"vitalsHeader","online":true,"offline":true}],"workspaces":[{"name":"record-vitals-workspace","component":"recordVitalsWorkspace","title":"Record Vitals","type":"other-form","canMaximize":true,"width":"extra-wide"}],"version":"1.0.2"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.24.0"},"extensions":[{"name":"triage-dashboard-header","slot":"triage-sidebar-slot","component":"triageDashboardHeader","order":0,"online":true,"offline":true},{"name":"triage-db-link","slot":"triage-dashboard-slot","component":"leftPanelLink","meta":{"name":"triage","slot":"triage-homepage-dashboard-slot","title":"Triage Queue"},"order":1,"online":true,"offline":true},{"name":"triage-queue-dashboard","slot":"triage-homepage-dashboard-slot","component":"triageQueueDashboard"},{"name":"patient-vitals-link","slot":"triage-dashboard-slot","component":"patientVitalsLink","meta":{"name":"triage/:patientUuid/vitals","slot":"triage-vitals-dashboard-slot","title":"Patient Vitals","showOnlyOnRoute":"/vitals"},"order":2,"online":true,"offline":true},{"name":"patient-vitals-history","slot":"triage-vitals-dashboard-slot","component":"patientVitalsHistory"},{"name":"vitals-header","slot":"patient-vitals-header-slot","component":"vitalsHeader","online":true,"offline":true}],"workspaces":[{"name":"record-vitals-workspace","component":"recordVitalsWorkspace","title":"Record Vitals","type":"other-form","canMaximize":true,"width":"extra-wide"}],"version":"1.0.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digihmis/esm-triage-app",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Triage microfrontend for the OpenMRS SPA",
   "browser": "dist/digihmis-esm-triage-app.js",
   "main": "src/index.ts",

package/src/past-vitals/action-menu/vitals-anthropometrics.component.tsx

@@ -11,7 +11,7 @@ interface VitalsAndBiometricsActionMenuProps {
 
 export const VitalsAndBiometricsActionMenu = ({ encounterUuid, patient }: VitalsAndBiometricsActionMenuProps) => {
   const { t } = useTranslation();
-  const patientUuid = patient.id;
+  const patientUuid = patient?.id;
   const isTablet = useLayoutType() === 'tablet';
 
   const handleLaunchVitalsAndBiometricsForm = useCallback(() => {

package/src/past-vitals/patient-vitals-history.component.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { showModal, useConfig, useLayoutType, usePatient } from '@openmrs/esm-framework';
+import { launchWorkspace, showModal, showSnackbar, useConfig, useLayoutType, usePatient } from '@openmrs/esm-framework';
 import styles from './patient-vitals-history.scss';
 import { getPatientUuidFromUrl } from './utils';
 import PatientBanner from './patient-banner/patient-banner.component';
@@ -9,9 +9,12 @@ import { Tab, Button, Tabs, TabList, TabPanels, TabPanel } from '@carbon/react';
 import VitalsOverview from './triage-vitals/triage-vitals-history.component';
 import BiometricsBase from './triage-anthropometrics/triage-antropometrics.component';
 import NotesSummary from './triage-notes/triage-notes.component';
-import { AssetMovement } from '@carbon/react/icons';
+import { AssetMovement, CheckmarkFilled } from '@carbon/react/icons';
 import { useCurrentQueueEntry } from './patient-vitals-history.resource';
 import { ConfigObject } from '../config-schema';
+import { useQueueActions } from '../queue-room-table/useQueueActions';
+import { QueueEntry } from '../queue-room-table/type';
+import { mutate } from 'swr';
 const openmrsSpaBase = window['getOpenmrsSpaBase']();
 
 const PatientVitalsHistory: React.FC = () => {
@@ -21,6 +24,10 @@ const PatientVitalsHistory: React.FC = () => {
   const { patient, isLoading, error } = usePatient(patientUuid);
   const { currentQueueEntry, isLoading: isLoadingQueueEntry } = useCurrentQueueEntry(patientUuid);
   const [selectedTabIndex, setSelectedTabIndex] = useState(0);
+  const [processingUuid, setProcessingUuid] = useState<string | null>(null);
+  const { servePatient, completeService } = useQueueActions();
+  const isProcessing = processingUuid !== null;
+
   const config = useConfig<ConfigObject>();
 
   const handleMovePatientToQueue = (patientUuid: string) => {
@@ -34,6 +41,50 @@ const PatientVitalsHistory: React.FC = () => {
 
   const isInServiceStatus = currentQueueEntry?.status?.uuid === config.concepts.inServiceStatusUuid;
 
+    const handleServePatient = async (entry: QueueEntry) => {
+      setProcessingUuid(entry.uuid);
+  
+      try {  
+  
+        launchWorkspace('record-vitals-workspace', {
+          workspaceTitle: t('recordVitals', 'Record Vitals'),
+          patientUuid: entry?.patient?.uuid,
+          queueEntryUuid: entry.uuid,
+          completeServiceCallback: async () => {
+            try {
+              await completeService(entry.uuid);
+  
+              showSnackbar({
+                title: t('serviceCompleted', 'Service Completed'),
+                subtitle: t('serviceCompletedMessage', `Service completed for ${entry.patient.display}`),
+                kind: 'success',
+                timeoutInMs: 3000,
+              });
+  
+              mutate((key) => typeof key === 'string' && key.includes('/queue-entry'));
+            } catch (error) {
+              console.error('Error completing service:', error);
+              showSnackbar({
+                title: t('error', 'Error'),
+                subtitle: t('completeServiceError', 'Failed to complete service'),
+                kind: 'error',
+                timeoutInMs: 5000,
+              });
+            }
+          },
+        });
+      } catch (error) {  
+        showSnackbar({
+          title: t('error', 'Error'),
+          subtitle: t('servePatientError', 'Failed to serve patient. Please try again.'),
+          kind: 'error',
+          timeoutInMs: 5000,
+        });
+      } finally {
+        setProcessingUuid(null);
+      }
+    };
+
   return (
     <div>
       <div className={styles.header}>{t('patientVitalsHistory', 'Patient Vitals History')}</div>
@@ -48,6 +99,16 @@ const PatientVitalsHistory: React.FC = () => {
               <Tab>{t('vitalSigns', 'Vital Signs')}</Tab>
               <Tab>{t('anthropometrics', 'Anthropometrics')}</Tab>
             </TabList>
+            {!isLoadingQueueEntry && currentQueueEntry && (
+              <Button
+                kind="secondary"
+                size="sm"
+                renderIcon={CheckmarkFilled}
+                onClick={() => currentQueueEntry && handleServePatient(currentQueueEntry)}
+                disabled={isProcessing}>
+                {isProcessing ? t('recordVitals', 'Record Vitals...') : t('recordVitals', 'Record Vitals')}
+              </Button>
+            )}
             {!isLoadingQueueEntry && isInServiceStatus && (
               <Button
                 size="sm"

package/src/past-vitals/patient-vitals-history.scss

@@ -28,7 +28,7 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  gap: layout.$spacing-05;
+  margin-right: 0.51rem;
 
   :global(.omrs-breakpoint-lt-desktop) & {
     gap: layout.$spacing-03;
@@ -40,8 +40,6 @@
 }
 
 .buttonNotesTab {
-  margin-right: layout.$spacing-03;
-
   :global(.omrs-breakpoint-lt-tablet) & {
     padding: layout.$spacing-02 layout.$spacing-03;
     white-space: nowrap;

package/src/queue-room-table/queue-room-table.component.tsx

@@ -84,7 +84,7 @@ export const QueueRoomTable: React.FC<QueueRoomTableProps> = ({ queueRoomUuid, q
     return 'gray';
   };
 
-  const handleServePatient = async (entry: QueueEntry) => {
+  const handleViewPastVitals = async (patientUuid: string, entry: QueueEntry) => {
     setProcessingUuid(entry.uuid);
 
     try {
@@ -96,40 +96,11 @@ export const QueueRoomTable: React.FC<QueueRoomTableProps> = ({ queueRoomUuid, q
         kind: 'success',
         timeoutInMs: 3000,
       });
-
-      mutate();
-
-      launchWorkspace('record-vitals-workspace', {
-        workspaceTitle: t('recordVitals', 'Record Vitals'),
-        patientUuid: entry?.patient?.uuid,
-        queueEntryUuid: entry.uuid,
-        completeServiceCallback: async () => {
-          // This callback will be executed after vitals are saved and room transition is complete
-          try {
-            await completeService(entry.uuid);
-
-            showSnackbar({
-              title: t('serviceCompleted', 'Service Completed'),
-              subtitle: t('serviceCompletedMessage', `Service completed for ${entry.patient.display}`),
-              kind: 'success',
-              timeoutInMs: 3000,
-            });
-
-            mutate();
-          } catch (error) {
-            console.error('Error completing service:', error);
-            showSnackbar({
-              title: t('error', 'Error'),
-              subtitle: t('completeServiceError', 'Failed to complete service'),
-              kind: 'error',
-              timeoutInMs: 5000,
-            });
-          }
-        },
+      navigate({
+        to: `${window.spaBase}/home/triage/patient/${patientUuid}/vitals`,
       });
+      mutate();
     } catch (error) {
-      console.error('Error serving patient:', error);
-
       showSnackbar({
         title: t('error', 'Error'),
         subtitle: t('servePatientError', 'Failed to serve patient. Please try again.'),
@@ -141,39 +112,33 @@ export const QueueRoomTable: React.FC<QueueRoomTableProps> = ({ queueRoomUuid, q
     }
   };
 
-  const handleViewPastVitals = (patientUuid: string) => {
-    navigate({
-      to: `${window.spaBase}/home/triage/patient/${patientUuid}/vitals`,
-    });
-  };
-
-  const handleCompleteService = async (entry: QueueEntry) => {
-    setProcessingUuid(entry.uuid);
-
-    try {
-      await completeService(entry.uuid);
-
-      showSnackbar({
-        title: t('serviceCompleted', 'Service Completed'),
-        subtitle: t('patientServedMessage', `${entry?.patient?.person?.display} is now being served`),
-        kind: 'success',
-        timeoutInMs: 3000,
-      });
-
-      mutate();
-    } catch (error) {
-      console.error('Error completing service:', error);
-
-      showSnackbar({
-        title: t('error', 'Error'),
-        subtitle: t('completeServiceError', 'Failed to complete service. Please try again.'),
-        kind: 'error',
-        timeoutInMs: 5000,
-      });
-    } finally {
-      setProcessingUuid(null);
-    }
-  };
+  // const handleCompleteService = async (entry: QueueEntry) => {
+  //   setProcessingUuid(entry.uuid);
+
+  //   try {
+  //     await completeService(entry.uuid);
+
+  //     showSnackbar({
+  //       title: t('serviceCompleted', 'Service Completed'),
+  //       subtitle: t('patientServedMessage', `${entry?.patient?.person?.display} is now being served`),
+  //       kind: 'success',
+  //       timeoutInMs: 3000,
+  //     });
+
+  //     mutate();
+  //   } catch (error) {
+  //     console.error('Error completing service:', error);
+
+  //     showSnackbar({
+  //       title: t('error', 'Error'),
+  //       subtitle: t('completeServiceError', 'Failed to complete service. Please try again.'),
+  //       kind: 'error',
+  //       timeoutInMs: 5000,
+  //     });
+  //   } finally {
+  //     setProcessingUuid(null);
+  //   }
+  // };
 
   const headers = [
     { key: 'position', header: '#' },
@@ -320,35 +285,13 @@ export const QueueRoomTable: React.FC<QueueRoomTableProps> = ({ queueRoomUuid, q
                         return (
                           <TableCell key={cell.id}>
                             <div className={styles.actions}>
-                              {(isWaiting || isInService) && (
-                                <Button
-                                  kind="primary"
-                                  size="sm"
-                                  renderIcon={CheckmarkFilled}
-                                  onClick={() => handleServePatient(entry)}
-                                  disabled={isProcessing}>
-                                  {isProcessing
-                                    ? t('recordVitals', 'Record Vitals...')
-                                    : t('recordVitals', 'Record Vitals')}
-                                </Button>
-                              )}
-                              {/* {isInService && (
-                                <Button
-                                  kind="tertiary"
-                                  size="sm"
-                                  renderIcon={CheckmarkFilled}
-                                  onClick={() => handleCompleteService(entry)}
-                                  disabled={isProcessing}>
-                                  {isProcessing ? t('completing', 'Completing...') : t('complete', 'Complete')}
-                                </Button>
-                              )} */}
                               <Button
                                 kind="secondary"
                                 size="sm"
-                                renderIcon={Activity}
-                                onClick={() => handleViewPastVitals(patientUuid)}
+                                renderIcon={CheckmarkFilled}
+                                onClick={() => handleViewPastVitals(patientUuid, entry)}
                                 disabled={isProcessing}>
-                                {isProcessing ? t('pastVitals', 'Past Vitals...') : t('pastVitals', 'Past Vitals')}
+                                {isProcessing ? t('serving', 'Serving...') : t('servePatient', 'Serve Patient')}
                               </Button>
                             </div>
                           </TableCell>