(fix) O3-3847 Ward app - hide close button for search patient warning…

… notifications and wording change
openmrs · Jan 9, 2025 · 4bba984 · 4bba984
1 parent 6d586ac
commit 4bba984
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 124 deletions.
diff --git a/packages/esm-service-queues-app/src/queue-table/default-queue-table.test.tsx b/packages/esm-service-queues-app/src/queue-table/default-queue-table.test.tsx
@@ -1,20 +1,19 @@
-import React from 'react';
-import { of } from 'rxjs';
+import { getDefaultsFromConfigSchema, useConfig, useSession } from '@openmrs/esm-framework';
 import { screen } from '@testing-library/react';
-import { useConfig, useSession, getDefaultsFromConfigSchema } from '@openmrs/esm-framework';
 import {
-  mockServices,
-  mockSession,
+  mockLocationSurgery,
+  mockLocationTriage,
   mockQueueEntries,
   mockQueueRooms,
-  mockLocationTriage,
-  mockLocationSurgery,
+  mockServices,
+  mockSession,
 } from '__mocks__';
+import React from 'react';
 import { renderWithSwr } from 'tools';
-import { useQueueEntries } from '../hooks/useQueueEntries';
 import { useQueueRooms } from '../add-provider-queue-room/add-provider-queue-room.resource';
-import { useQueueLocations } from '../create-queue-entry/hooks/useQueueLocations';
 import { type ConfigObject, configSchema } from '../config-schema';
+import { useQueueLocations } from '../create-queue-entry/hooks/useQueueLocations';
+import { useQueueEntries } from '../hooks/useQueueEntries';
 import DefaultQueueTable from '../queue-table/default-queue-table.component';
 
 const mockUseConfig = jest.mocked(useConfig<ConfigObject>);
@@ -44,11 +43,6 @@ jest.mock('../hooks/useQueueEntries', () => ({
   useQueueEntries: jest.fn(),
 }));
 
-jest.mock('../helpers/helpers', () => ({
-  ...jest.requireActual('../helpers/helpers'),
-  getSelectedServiceName: jest.fn().mockReturnValue(of({ serviceName: 'All' })),
-}));
-
 describe('DefaultQueueTable', () => {
   beforeEach(() => {
     mockUseConfig.mockReturnValue({

diff --git a/packages/esm-ward-app/src/ward-workspace/admit-patient-button.component.tsx b/packages/esm-ward-app/src/ward-workspace/admit-patient-button.component.tsx
@@ -80,8 +80,9 @@ const AdmitPatientButton: React.FC<AdmitPatientButtonProps> = ({
   const disabledButton = isLoadingEmrConfiguration || errorFetchingEmrConfiguration || disabled;
   return (
     <Button kind="ghost" renderIcon={ArrowRightIcon} size={responsiveSize} disabled={disabledButton} onClick={onAdmit}>
-      {(dispositionType == 'ADMIT' || disabledButton) && t('admitPatient', 'Admit patient')}
-      {dispositionType == 'TRANSFER' && t('transferPatient', 'Transfer patient')}
+      {dispositionType == 'ADMIT' || disabledButton
+        ? t('admitPatient', 'Admit patient')
+        : t('transferPatient', 'Transfer patient')}
     </Button>
   );
 };

diff --git a/...pp/src/ward-workspace/create-admission-encounter/create-admission-encounter.workspace.tsx b/...pp/src/ward-workspace/create-admission-encounter/create-admission-encounter.workspace.tsx
@@ -96,13 +96,15 @@ const CreateAdmissionEncounterWorkspace: React.FC<CreateAdmissionEncounterWorksp
               <InlineNotification
                 kind="warning"
                 lowContrast={true}
+                hideCloseButton={true}
                 title={t('patientAlreadyAdmittedToCurrentLocation', 'Patient already admitted to current location')}
               />
             )}
             {isAdmittedToOtherLocation && (
               <InlineNotification
                 kind="warning"
                 lowContrast={true}
+                hideCloseButton={true}
                 title={t(
                   'patientCurrentlyAdmittedToOtherLocation',
                   'Patient currently admitted to location {{location}}',
@@ -116,6 +118,7 @@ const CreateAdmissionEncounterWorkspace: React.FC<CreateAdmissionEncounterWorksp
               <InlineNotification
                 kind="warning"
                 lowContrast={true}
+                hideCloseButton={true}
                 title={t(
                   'patientHasPendingAdmissionRequest',
                   'Patient already has a pending admission request to location {{location}}',