(fix) O3-4183: Improve visit queue number attribute UUID handling in queue table

__mocks__/wards.mock.ts

@@ -78,6 +78,6 @@ export const mockInpatientAdmissions: InpatientAdmission[] = [
     encounterAssigningToCurrentInpatientLocation: null,
     currentInpatientRequest: null,
     firstAdmissionOrTransferEncounter: null,
-    currentInpatientLocation: mockLocationInpatientWard
+    currentInpatientLocation: mockLocationInpatientWard,
   },
 ];

packages/esm-bed-management-app/src/bed-administration/bed-administration-form.component.tsx

@@ -86,7 +86,7 @@ const BedAdministrationForm: React.FC<BedAdministrationFormProps> = ({
     handleSubmit,
     control,
     formState: { isDirty },
-    setValue
+    setValue,
   } = useForm<BedAdministrationData>({
     mode: 'all',
     resolver: zodResolver(BedAdministrationSchema),

packages/esm-service-queues-app/src/queue-table/cells/queue-table-visit-attribute-queue-number-cell.component.tsx

@@ -1,32 +1,25 @@
 import React from 'react';
 import { type VisitAttributeQueueNumberColumnConfig } from '../../config-schema';
-import { type QueueTableColumnFunction, type QueueEntry, type QueueTableCellComponentProps } from '../../types';
-import { InlineNotification } from '@carbon/react';
-import { useTranslation } from 'react-i18next';
+import { type QueueTableColumnFunction, type QueueEntry } from '../../types';
 
 export const queueTableVisitAttributeQueueNumberColumn: QueueTableColumnFunction = (
   key,
   header,
   { visitQueueNumberAttributeUuid }: VisitAttributeQueueNumberColumnConfig,
 ) => {
+  if (!visitQueueNumberAttributeUuid) {
+    console.error(
+      'No visit queue number attribute is configured, but the queue is configured to display the queue number.',
+    );
+    return null;
+  }
+
   function getVisitQueueNumber(queueEntry: QueueEntry) {
     return queueEntry.visit?.attributes?.find((e) => e?.attributeType?.uuid === visitQueueNumberAttributeUuid)?.value;
   }
 
-  const QueueTableVisitAttributeQueueNumberCell = ({ queueEntry }: QueueTableCellComponentProps) => {
-    const { t } = useTranslation();
-
-    return (
-      <>
-        {visitQueueNumberAttributeUuid ? (
-          <span>{getVisitQueueNumber(queueEntry)}</span>
-        ) : (
-          <InlineNotification lowContrast hideCloseButton>
-            {t('visitQueueNumberAttributeUuid not configured', 'visitQueueNumberAttributeUuid not configured')}
-          </InlineNotification>
-        )}
-      </>
-    );
+  const QueueTableVisitAttributeQueueNumberCell = ({ queueEntry }: { queueEntry: QueueEntry }) => {
+    return <span>{getVisitQueueNumber(queueEntry)}</span>;
   };
 
   return {

packages/esm-ward-app/src/hooks/useRestPatient.ts

@@ -2,7 +2,6 @@ import { openmrsFetch, restBaseUrl, type FetchResponse, type Patient } from '@op
 import { useMemo } from 'react';
 import useSWRImmutable from 'swr/immutable';
 
-
 // prettier-ignore
 const defaultRep =
   'custom:(' +

packages/esm-ward-app/src/ward-view-header/admission-requests-bar.component.tsx

@@ -1,6 +1,13 @@
 import { Button, InlineNotification } from '@carbon/react';
 import { Movement } from '@carbon/react/icons';
-import { ArrowRightIcon, isDesktop, launchWorkspace, launchWorkspaceGroup, useAppContext, useLayoutType } from '@openmrs/esm-framework';
+import {
+  ArrowRightIcon,
+  isDesktop,
+  launchWorkspace,
+  launchWorkspaceGroup,
+  useAppContext,
+  useLayoutType,
+} from '@openmrs/esm-framework';
 import React, { type ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
 import { type WardViewContext } from '../types';
@@ -11,7 +18,7 @@ interface AdmissionRequestsBarProps {
 }
 
 const AdmissionRequestsBar: React.FC<AdmissionRequestsBarProps> = ({ wardPendingPatients }) => {
-  const {wardPatientGroupDetails} = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
   const { inpatientRequests, isLoading, error } = wardPatientGroupDetails?.inpatientRequestResponse ?? {};
   const { t } = useTranslation();
   const layout = useLayoutType();
@@ -31,9 +38,10 @@ const AdmissionRequestsBar: React.FC<AdmissionRequestsBarProps> = ({ wardPending
   }
 
   return (
-    <div className={`${styles.admissionRequestsContainer} ${
-      inpatientRequests?.length ? styles.blackBackground : styles.lightBlueBackground
-    }`}>
+    <div
+      className={`${styles.admissionRequestsContainer} ${
+        inpatientRequests?.length ? styles.blackBackground : styles.lightBlueBackground
+      }`}>
       <Movement className={styles.movementIcon} size="24" />
       <span className={styles.content}>
         {t('admissionRequestsCount', '{{count}} admission request', {
@@ -43,7 +51,7 @@ const AdmissionRequestsBar: React.FC<AdmissionRequestsBarProps> = ({ wardPending
       <Button
         onClick={() => {
           launchWorkspaceGroup('ward-patient-admission-requests', {
-            state: {wardPendingPatients},
+            state: { wardPendingPatients },
             workspaceToLaunch: {
               name: 'admission-requests-workspace',
             },

packages/esm-ward-app/src/ward-workspace/create-admission-encounter/create-admission-encounter-action-button.extension.tsx

@@ -6,7 +6,7 @@ import { type CreateAdmissionEncounterWorkspaceProps } from './create-admission-
 function CreateAdmissionRequestActionButton() {
   const { t } = useTranslation();
 
-  // TODO: this is an attempt to save the previous search term for the 
+  // TODO: this is an attempt to save the previous search term for the
   // "Back to patient search" button, but it doesn't work. See:
   // https://openmrs.atlassian.net/browse/O3-4300
   const [searchTerm, setSearchTerm] = useState<string>('');

packages/esm-ward-app/src/ward-workspace/patient-discharge/patient-discharge.workspace.tsx

@@ -48,14 +48,7 @@ export default function PatientDischargeWorkspace(props: WardPatientWorkspacePro
         closeWorkspaceWithSavedChanges();
         wardPatientGroupDetails.mutate();
       });
-  }, [
-    createEncounter,
-    wardPatient,
-    emrConfiguration,
-    t,
-    closeWorkspaceWithSavedChanges,
-    wardPatientGroupDetails,
-  ]);
+  }, [createEncounter, wardPatient, emrConfiguration, t, closeWorkspaceWithSavedChanges, wardPatientGroupDetails]);
 
   if (!wardPatientGroupDetails) return <></>;
   return (

packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-transfer-request-form.component.tsx

@@ -156,7 +156,11 @@ export default function PatientTransferForm({
             hideCloseButton
           />
         </div>
-        <AdmitPatientButton wardPatient={wardPatient} dispositionType={'ADMIT'} onAdmitPatientSuccess={closeWorkspaceWithSavedChanges} />
+        <AdmitPatientButton
+          wardPatient={wardPatient}
+          dispositionType={'ADMIT'}
+          onAdmitPatientSuccess={closeWorkspaceWithSavedChanges}
+        />
       </div>
     );
   }