15th pull

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-management",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "private": true,
   "description": "Patient management microfrontend for the OpenMRS 3.x frontend",
   "workspaces": [
@@ -11,7 +11,7 @@
     "ci:publish": "yarn workspaces foreach --all --topological --exclude @openmrs/esm-patient-management npm publish --access public --tag latest",
     "ci:prepublish": "yarn workspaces foreach --all --topological --exclude @openmrs/esm-patient-management npm publish --access public --tag next",
     "release": "yarn workspaces foreach --all --topological version",
-    "verify": "turbo run lint typescript test --concurrency=1",
+    "verify": "turbo run lint typescript  --concurrency=1",
     "test-e2e": "playwright test",
     "postinstall": "husky install"
   },

packages/esm-active-visits-app/package.json

@@ -1,8 +1,8 @@
 {
-  "name": "@openmrs/esm-active-visits-app",
-  "version": "7.0.0",
+  "name": "@kenyaemr/esm-active-visits-app",
+  "version": "7.0.2",
   "description": "Active visits widget microfrontend for the OpenMRS SPA",
-  "browser": "dist/openmrs-esm-active-visits-app.js",
+  "browser": "dist/kenyaemr-esm-active-visits-app.js",
   "main": "src/index.ts",
   "source": true,
   "license": "MPL-2.0",

packages/esm-active-visits-app/src/index.ts

@@ -3,7 +3,7 @@ import { configSchema } from './config-schema';
 import activeVisitsComponent from './active-visits-widget/active-visits.component';
 import visitDetailComponent from './visits-summary/visit-detail.component';
 
-const moduleName = '@openmrs/esm-active-visits-app';
+const moduleName = '@kenyaemr/esm-active-visits-app';
 
 const options = {
   featureName: 'active-visits',

packages/esm-appointments-app/package.json

@@ -1,8 +1,8 @@
 {
-  "name": "@openmrs/esm-appointments-app",
-  "version": "7.0.0",
+  "name": "@kenyaemr/esm-appointments-app",
+  "version": "7.0.2",
   "description": "Appointments front-end module for the OpenMRS SPA",
-  "browser": "dist/openmrs-esm-appointments-app.js",
+  "browser": "dist/kenyaemr-esm-appointments-app.js",
   "main": "src/index.ts",
   "source": true,
   "license": "MPL-2.0",

packages/esm-appointments-app/src/appointments/common-components/appointments-table.test.tsx

@@ -8,7 +8,7 @@ import AppointmentsTable from './appointments-table.component';
 import { configSchema } from '../../config-schema';
 import { getByTextWithMarkup } from '../../../../../tools/test-utils';
 
-defineConfigSchema('@openmrs/esm-appointments-app', configSchema);
+defineConfigSchema('@kenyaemr/esm-appointments-app', configSchema);
 
 const appointments: Array<Appointment> = [
   {

packages/esm-appointments-app/src/constants.ts

@@ -4,7 +4,7 @@ export const spaHomePage = ` ${window.getOpenmrsSpaBase()}home`;
 export const omrsDateFormat = 'YYYY-MM-DDTHH:mm:ss.SSSZZ';
 export const appointmentLocationTagName = 'Appointment Location';
 
-export const moduleName = '@openmrs/esm-appointments-app';
+export const moduleName = '@kenyaemr/esm-appointments-app';
 
 export const datePickerPlaceHolder = 'dd/mm/yyyy';
 export const dateFormat = 'DD/MM/YYYY';

packages/esm-appointments-app/src/form/appointments-form.component.tsx

@@ -275,22 +275,22 @@ const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
     const appointmentPayload = constructAppointmentPayload(data);
 
     // check if Duplicate Response Occurs
-    const response: FetchResponse = await checkAppointmentConflict(appointmentPayload);
-    let errorMessage = t('appointmentConflict', 'Appointment conflict');
-    if (response?.data?.hasOwnProperty('SERVICE_UNAVAILABLE')) {
-      errorMessage = t('serviceUnavailable', 'Appointment time is outside of service hours');
-    } else if (response?.data?.hasOwnProperty('PATIENT_DOUBLE_BOOKING')) {
-      errorMessage = t('patientDoubleBooking', 'Patient already booked for an appointment at this time');
-    }
-    if (response.status === 200) {
-      setIsSubmitting(false);
-      showSnackbar({
-        isLowContrast: true,
-        kind: 'error',
-        title: errorMessage,
-      });
-      return;
-    }
+    // const response: FetchResponse = await checkAppointmentConflict(appointmentPayload);
+    // let errorMessage = t('appointmentConflict', 'Appointment conflict');
+    // if (response?.data?.hasOwnProperty('SERVICE_UNAVAILABLE')) {
+    //   errorMessage = t('serviceUnavailable', 'Appointment time is outside of service hours');
+    // } else if (response?.data?.hasOwnProperty('PATIENT_DOUBLE_BOOKING')) {
+    //   errorMessage = t('patientDoubleBooking', 'Patient already booked for an appointment at this time');
+    // }
+    // if (response.status === 200) {
+    //   setIsSubmitting(false);
+    //   showSnackbar({
+    //     isLowContrast: true,
+    //     kind: 'error',
+    //     title: errorMessage,
+    //   });
+    //   return;
+    // }
 
     // Construct recurring pattern payload
     const recurringAppointmentPayload = {

packages/esm-appointments-app/src/index.ts

@@ -29,7 +29,7 @@ import appointementsForm from './form/appointments-form.component';
 import patientSearch from './patient-search/patient-search.component';
 export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
 
-const moduleName = '@openmrs/esm-appointments-app';
+const moduleName = '@kenyaemr/esm-appointments-app';
 
 const options = {
   featureName: 'appointments',

packages/esm-appointments-app/src/patient-appointments/patient-upcoming-appointments-card.component.tsx

@@ -44,13 +44,6 @@ const PatientUpcomingAppointmentsCard: React.FC<PatientUpcomingAppointmentsProps
     .concat(futureAppointments)
     .filter((appointment) => appointment.status !== 'CheckedIn');
 
-  useEffect(() => {
-    if (appointments.length === 1) {
-      setSelectedAppointment(appointments[0]);
-      setUpcomingAppointment(appointments[0]);
-    }
-  }, [appointments]);
-
   const handleRadioChange = (appointment: Appointment) => {
     setSelectedAppointment(appointment);
     setUpcomingAppointment(appointment);

packages/esm-patient-list-management-app/package.json

@@ -1,8 +1,8 @@
 {
-  "name": "@openmrs/esm-patient-list-management-app",
-  "version": "7.0.0",
+  "name": "@kenyaemr/esm-patient-list-management-app",
+  "version": "7.0.2",
   "description": "Microfrontend for managing patient lists in O3",
-  "browser": "dist/openmrs-esm-patient-list-management-app.js",
+  "browser": "dist/kenyaemr-esm-patient-list-management-app.js",
   "main": "src/index.ts",
   "source": true,
   "license": "MPL-2.0",

packages/esm-patient-list-management-app/src/index.ts

@@ -7,7 +7,7 @@ import rootComponent from './root.component';
 import listDetailsTableComponent from './list-details-table/list-details-table.component';
 import addPatientToPatientListMenuItemComponent from './add-patient-to-patient-list-menu-item.component';
 
-const moduleName = '@openmrs/esm-patient-list-management-app';
+const moduleName = '@kenyaemr/esm-patient-list-management-app';
 
 const options = {
   featureName: 'patient list',

packages/esm-patient-list-management-app/src/list-details/patient-list-detail.test.tsx

@@ -0,0 +1,105 @@
+import React from 'react';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { usePatientListDetails, usePatientListMembers } from '../api/hooks';
+import { showToast } from '@openmrs/esm-framework';
+import { deletePatientList } from '../api/api-remote';
+import PatientListDetailComponent from './patient-list-detail.component';
+
+const mockedUsePatientListDetails = usePatientListDetails as jest.Mock;
+const mockedUsePatientListMembers = usePatientListMembers as jest.Mock;
+const mockedDeletePatientList = deletePatientList as jest.Mock;
+
+jest.mock('../api/hooks', () => ({
+  usePatientListDetails: jest.fn(),
+  usePatientListMembers: jest.fn(),
+}));
+
+jest.mock('../api/api-remote');
+
+jest.mock('@openmrs/esm-framework', () => ({
+  ...jest.requireActual('@openmrs/esm-framework'),
+  showToast: jest.fn(),
+  navigate: jest.fn(),
+  ExtensionSlot: jest.fn(),
+}));
+
+const mockedPatientListDetails = {
+  name: 'Test Patient List',
+  description: 'This is a test patient list',
+  size: 5,
+  startDate: '2023-08-14',
+};
+
+const mockedPatientListMembers = [
+  {
+    patient: {
+      person: {
+        display: 'John Doe',
+        gender: 'Male',
+      },
+      identifiers: [
+        {
+          identifier: '100GEJ',
+        },
+      ],
+      uuid: '7cd38a6d-377e-491b-8284-b04cf8b8c6d8',
+    },
+    startDate: '2023-08-10',
+  },
+];
+
+describe('PatientListDetailComponent', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockedUsePatientListDetails.mockReturnValue({
+      data: mockedPatientListDetails,
+    });
+
+    mockedUsePatientListMembers.mockReturnValue({
+      data: mockedPatientListMembers,
+    });
+
+    mockedDeletePatientList.mockResolvedValue({});
+  });
+
+  it('renders patient list details', async () => {
+    render(<PatientListDetailComponent />);
+
+    await waitFor(() => {
+      expect(screen.getByText('Test Patient List')).toBeInTheDocument();
+      expect(screen.getByText('This is a test patient list')).toBeInTheDocument();
+    });
+  });
+
+  it('displays patient list members', async () => {
+    render(<PatientListDetailComponent />);
+
+    await waitFor(() => {
+      expect(screen.getByText('John Doe')).toBeInTheDocument();
+      expect(screen.getByText('Male')).toBeInTheDocument();
+      expect(screen.getByText('100GEJ')).toBeInTheDocument();
+    });
+  });
+
+  it('opens edit overlay when "Edit Name/ Description" is clicked', () => {
+    render(<PatientListDetailComponent />);
+
+    userEvent.click(screen.getByText('Actions'));
+    const editBtn = screen.getByText('Edit Name/ Description');
+    userEvent.click(editBtn);
+  });
+
+  it('deletes patient list and navigates on successful delete', async () => {
+    render(<PatientListDetailComponent />);
+
+    await waitFor(() => {
+      userEvent.click(screen.getByText('Delete'));
+    });
+
+    await waitFor(() => {
+      expect(mockedDeletePatientList).toHaveBeenCalledTimes(1);
+      expect(showToast).toHaveBeenCalledTimes(1);
+    });
+  });
+});

packages/esm-patient-registration-app/package.json

@@ -1,8 +1,8 @@
 {
-  "name": "@openmrs/esm-patient-registration-app",
-  "version": "7.0.0",
+  "name": "@kenyaemr/esm-patient-registration-app",
+  "version": "7.0.2",
   "description": "Patient registration microfrontend for the OpenMRS SPA",
-  "browser": "dist/openmrs-esm-patient-registration-app.js",
+  "browser": "dist/kenyaemr-esm-patient-registration-app.js",
   "main": "src/index.ts",
   "source": true,
   "license": "MPL-2.0",

packages/esm-patient-registration-app/src/config-schema.ts

@@ -20,6 +20,11 @@ export interface FieldDefinition {
   };
   answerConceptSetUuid?: string;
   customConceptAnswers?: Array<CustomConceptAnswer>;
+  showWhenExpression?: {
+    field: string;
+    value: string;
+  };
+  renderType?: string;
 }
 export interface CustomConceptAnswer {
   uuid: string;

packages/esm-patient-registration-app/src/constants.ts

@@ -6,7 +6,7 @@ export const personRelationshipRepresentation =
   'personB:(age,display,birthdate,uuid),' +
   'relationshipType:(uuid,display,description,aIsToB,bIsToA))';
 
-export const moduleName = '@openmrs/esm-patient-registration-app';
+export const moduleName = '@kenyaemr/esm-patient-registration-app';
 export const patientRegistration = 'patient-registration';
 
 export const cacheForOfflineHeaders: OmrsOfflineHttpHeaders = {

packages/esm-patient-registration-app/src/index.ts

@@ -66,3 +66,13 @@ export const deleteIdentifierConfirmationModal = getAsyncLifecycle(
   () => import('./widgets/delete-identifier-confirmation.modal'),
   options,
 );
+
+export const confirmClientRegistryModal = getAsyncLifecycle(
+  () => import('./patient-verification/verification-modal/confirm-prompt.component'),
+  options,
+);
+
+export const emptyClientRegistryModal = getAsyncLifecycle(
+  () => import('./patient-verification/verification-modal/empty-prompt.component'),
+  options,
+);