(chore) Bump @carbon/react to v1.71.0

openmrs · Nov 27, 2024 · c738b6c · c738b6c
1 parent 4d7f15d
commit c738b6c
Show file tree

Hide file tree

Showing 24 changed files with 569 additions and 137 deletions.
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.11.6",
-    "@carbon/react": "~1.37.0",
+    "@carbon/react": "^1.71.0",
     "@openmrs/esm-framework": "next",
     "@openmrs/esm-patient-common-lib": "next",
     "@playwright/test": "1.48.2",

diff --git a/packages/esm-active-visits-app/package.json b/packages/esm-active-visits-app/package.json
@@ -37,7 +37,7 @@
     "url": "https://github.com/openmrs/openmrs-esm-patient-management/issues"
   },
   "dependencies": {
-    "@carbon/react": "~1.37.0",
+    "@carbon/react": "^1.71.0",
     "lodash-es": "^4.17.15"
   },
   "peerDependencies": {

diff --git a/packages/esm-appointments-app/package.json b/packages/esm-appointments-app/package.json
@@ -37,7 +37,7 @@
     "url": "https://github.com/openmrs/openmrs-esm-patient-management/issues"
   },
   "dependencies": {
-    "@carbon/react": "~1.37.0",
+    "@carbon/react": "^1.71.0",
     "formik": "^2.2.9",
     "lodash-es": "^4.17.15",
     "yup": "^0.32.11"

diff --git a/packages/esm-appointments-app/src/appointments.test.tsx b/packages/esm-appointments-app/src/appointments.test.tsx
@@ -9,7 +9,9 @@ describe('Appointments', () => {
     await screen.findByText(/^appointments$/i);
     expect(screen.getByRole('button', { name: /appointments calendar/i })).toBeInTheDocument();
     expect(screen.getByPlaceholderText(/dd-mmm-yyyy/i)).toBeInTheDocument();
-    expect(screen.getByRole('combobox', { name: /view/i })).toBeInTheDocument();
+    screen.getByRole('combobox', {
+      name: /select service type/i,
+    });
     expect(screen.getByText(/appointment metrics/i)).toBeInTheDocument();
   });
 });
diff --git a/packages/esm-appointments-app/src/form/appointments-form.component.tsx b/packages/esm-appointments-app/src/form/appointments-form.component.tsx
@@ -354,7 +354,9 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
       appointmentRequest: appointmentPayload,
       recurringPattern: constructRecurringPattern(data),
     };
+
     const abortController = new AbortController();
+
     (isRecurringAppointment
       ? saveRecurringAppointments(recurringAppointmentPayload, abortController)
       : saveAppointment(appointmentPayload, abortController)

diff --git a/packages/esm-appointments-app/src/form/appointments-form.test.tsx b/packages/esm-appointments-app/src/form/appointments-form.test.tsx
@@ -20,6 +20,8 @@ const defaultProps = {
   closeWorkspace: jest.fn(),
   patientUuid: mockPatient.id,
   promptBeforeClosing: jest.fn(),
+  closeWorkspaceWithSavedChanges: jest.fn(),
+  setTitle: jest.fn(),
 };
 
 const mockCreateAppointment = jest.mocked(saveAppointment);
@@ -206,6 +208,7 @@ describe('AppointmentForm', () => {
     await user.selectOptions(timeFormat, 'AM');
     await user.selectOptions(serviceSelect, ['Outpatient']);
     await user.selectOptions(appointmentTypeSelect, ['Scheduled']);
+    // TODO: Fix the `Error: Not implemented: HTMLFormElement.prototype.requestSubmit` error shown after the form is submitted
     await user.click(saveButton);
   });
 });
diff --git a/packages/esm-bed-management-app/package.json b/packages/esm-bed-management-app/package.json
@@ -37,7 +37,7 @@
     "url": "https://github.com/openmrs/openmrs-esm-patient-management/issues"
   },
   "dependencies": {
-    "@carbon/react": "~1.37.0",
+    "@carbon/react": "^1.71.0",
     "lodash-es": "^4.17.15"
   },
   "peerDependencies": {

diff --git a/packages/esm-patient-list-management-app/package.json b/packages/esm-patient-list-management-app/package.json
@@ -37,7 +37,7 @@
     "url": "https://github.com/openmrs/openmrs-esm-patient-management/issues"
   },
   "dependencies": {
-    "@carbon/react": "~1.37.0",
+    "@carbon/react": "^1.71.0",
     "dexie": "^3.0.3",
     "fuzzy": "^0.1.3",
     "lodash-es": "^4.17.15"

diff --git a/packages/esm-patient-registration-app/package.json b/packages/esm-patient-registration-app/package.json
@@ -37,7 +37,7 @@
     "url": "https://github.com/openmrs/openmrs-esm-patient-management/issues"
   },
   "dependencies": {
-    "@carbon/react": "~1.37.0",
+    "@carbon/react": "^1.71.0",
     "formik": "^2.1.5",
     "lodash-es": "^4.17.15",
     "uuid": "^8.3.2",

diff --git a/...patient-registration-app/src/patient-registration/field/gender/gender-field.component.tsx b/...patient-registration-app/src/patient-registration/field/gender/gender-field.component.tsx
@@ -30,8 +30,12 @@ export const GenderField: React.FC = () => {
     <div className={styles.halfWidthInDesktopView}>
       <h4 className={styles.productiveHeading02Light}>{t('sexFieldLabelText', 'Sex')}</h4>
       <div className={styles.sexField}>
-        <p className="cds--label">{t('genderLabelText', 'Sex')}</p>
-        <RadioButtonGroup name="gender" orientation="vertical" onChange={setGender} valueSelected={field.value}>
+        <RadioButtonGroup
+          name="gender"
+          legendText={t('genderLabelText', 'Sex')}
+          orientation="vertical"
+          onChange={setGender}
+          valueSelected={field.value}>
           {fieldConfigs.map((option) => (
             <RadioButton
               key={option.label ?? option.value}