@openmrs/esm-patient-chart-app 11.3.1-patch.9064 → 11.3.1-patch.9310

package/src/visit/visit-form/visit-attribute-type.component.tsx

@@ -115,7 +115,8 @@ const AttributeTypeField: React.FC<AttributeTypeFieldProps> = ({
   } = useConceptAnswersForVisitAttributeType(data?.datatypeConfig);
   const { t } = useTranslation();
   const baseId = useId();
-  const labelText = !required ? `${data?.display} (${t('optional', 'optional')})` : data?.display;
+  const displayText = data?.display?.trim() || data?.name?.trim() || '--';
+  const labelText = !required ? `${displayText} (${t('optional', 'optional')})` : displayText;
 
   const {
     formState: { errors },

package/src/visit/visit-form/visit-form.resource.ts

@@ -1,5 +1,6 @@
 import { useMemo, useState } from 'react';
-import { useTranslation, type TFunction } from 'react-i18next';
+import { useTranslation } from 'react-i18next';
+import type { TFunction } from 'i18next';
 import dayjs from 'dayjs';
 import { z } from 'zod';
 import {

package/src/visit/visit-form/visit-form.test.tsx

@@ -11,7 +11,6 @@ import {
   useConfig,
   useEmrConfiguration,
   useLocations,
-  useVisitContextStore,
   useVisitTypes,
   type Visit,
 } from '@openmrs/esm-framework';
@@ -27,10 +26,8 @@ import {
   useVisitFormCallbacks,
   useVisitFormSchemaAndDefaultValues,
 } from './visit-form.resource';
-import VisitForm from './visit-form.workspace';
-
-// Fixed reference time used in time-dependent tests
-const FIXED_NOW = new Date('2023-01-01T08:00:00.000Z');
+import VisitForm, { type VisitFormProps } from './visit-form.workspace';
+import { type PatientWorkspace2DefinitionProps } from '@openmrs/esm-patient-common-lib/src';
 
 const visitUuid = 'test_visit_uuid';
 const visitAttributes = {
@@ -57,17 +54,23 @@ const visitAttributes = {
 };
 
 const mockCloseWorkspace = jest.fn();
-const mockPromptBeforeClosing = jest.fn();
-const mockSetTitle = jest.fn();
-
-const testProps = {
-  openedFrom: 'test',
-  patientUuid: mockPatient.id,
-  patient: mockPatient,
+const mockMutateVisitContext = jest.fn();
+const defaultProps: PatientWorkspace2DefinitionProps<VisitFormProps, {}> = {
   closeWorkspace: mockCloseWorkspace,
-  closeWorkspaceWithSavedChanges: mockCloseWorkspace,
-  promptBeforeClosing: mockPromptBeforeClosing,
-  setTitle: mockSetTitle,
+  workspaceProps: {
+    openedFrom: 'test',
+  },
+  windowProps: {},
+  groupProps: {
+    patientUuid: mockPatient.id,
+    patient: mockPatient,
+    visitContext: null,
+    mutateVisitContext: mockMutateVisitContext,
+  },
+  workspaceName: '',
+  launchChildWorkspace: jest.fn(),
+  windowName: '',
+  isRootWorkspace: false,
 };
 
 const mockSaveVisit = jest.mocked(saveVisit);
@@ -153,9 +156,10 @@ jest.mock('../hooks/useDefaultFacilityLocation', () => {
 
   return {
     ...requireActual,
-    useDefaultLoginLocation: jest.fn(() => ({
+    useDefaultFacilityLocation: jest.fn(() => ({
       defaultFacility: null,
       isLoading: false,
+      error: null,
     })),
   };
 });
@@ -181,14 +185,6 @@ mockSaveVisit.mockResolvedValue({
   },
 } as unknown as FetchResponse<Visit>);
 
-jest.mocked(useVisitContextStore).mockReturnValue({
-  manuallySetVisitUuid: null,
-  patientUuid: null,
-  setVisitContext: jest.fn(),
-  mutateVisitCallbacks: {},
-  mutateVisit: jest.fn(),
-});
-
 describe('Visit form', () => {
   beforeEach(() => {
     mockUseConfig.mockReturnValue({
@@ -873,5 +869,12 @@ describe('useVisitFormSchemaAndDefaultValues', () => {
 });
 
 function renderVisitForm(visitToEdit?: Visit) {
-  return render(<VisitForm {...{ ...testProps, visitToEdit }} />);
+  const props: PatientWorkspace2DefinitionProps<VisitFormProps, {}> = {
+    ...defaultProps,
+    groupProps: {
+      ...defaultProps.groupProps,
+      visitContext: visitToEdit ?? null,
+    },
+  };
+  return render(<VisitForm {...props} />);
 }