@openmrs/esm-appointments-app 5.2.2-pre.2391 → 5.2.2-pre.2397

package/dist/openmrs-esm-appointments-app.js.buildmanifest.json

@@ -80,10 +80,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4551848,
+      "size": 4552544,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4530926,
+        "javascript": 4531622,
         "share-init": 252,
         "runtime": 20418
       },
@@ -100,7 +100,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "2dcc694bd98844c6",
+      "hash": "1c2d5a027511cd78",
       "childrenByOrder": {}
     },
     {
@@ -395,9 +395,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 493401,
+      "size": 494097,
       "sizes": {
-        "javascript": 493233,
+        "javascript": 493929,
         "consume-shared": 168
       },
       "names": [],
@@ -411,7 +411,7 @@
       "auxiliaryFiles": [
         "690.js.map"
       ],
-      "hash": "511dd7ecdb92ac31",
+      "hash": "ec0c95ee2d6e6c0e",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0"},"extensions":[{"name":"home-appointments","slot":"homepage-widgets-slot","component":"homeAppointments","order":1},{"name":"clinical-appointments-dashboard-link","slot":"homepage-dashboard-slot","component":"appointmentsDashboardLink","meta":{"name":"appointments","slot":"clinical-appointments-dashboard-slot","title":"Appointments"}},{"component":"root","name":"clinical-appointments-dashboard","slot":"clinical-appointments-dashboard-slot"},{"name":"appointments-calendar-dashboard-link","slot":"calendar-dashboard-slot","component":"appointmentsCalendarDashboardLink"},{"name":"check-in-appointment-modal","slot":"todays-appointment-slot","component":"checkInModal"},{"name":"todays-appointments-dashboard","slot":"todays-appointment-slot","component":"homeAppointments"},{"name":"expected-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"checked-in-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"completed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"missed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"cancelled-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"early-appointments-panel","component":"earlyAppointments"}],"version":"5.2.2-pre.2391"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0"},"extensions":[{"name":"home-appointments","slot":"homepage-widgets-slot","component":"homeAppointments","order":1},{"name":"clinical-appointments-dashboard-link","slot":"homepage-dashboard-slot","component":"appointmentsDashboardLink","meta":{"name":"appointments","slot":"clinical-appointments-dashboard-slot","title":"Appointments"}},{"component":"root","name":"clinical-appointments-dashboard","slot":"clinical-appointments-dashboard-slot"},{"name":"appointments-calendar-dashboard-link","slot":"calendar-dashboard-slot","component":"appointmentsCalendarDashboardLink"},{"name":"check-in-appointment-modal","slot":"todays-appointment-slot","component":"checkInModal"},{"name":"todays-appointments-dashboard","slot":"todays-appointment-slot","component":"homeAppointments"},{"name":"expected-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"checked-in-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"completed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"missed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"cancelled-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"early-appointments-panel","component":"earlyAppointments"}],"version":"5.2.2-pre.2397"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-appointments-app",
-  "version": "5.2.2-pre.2391",
+  "version": "5.2.2-pre.2397",
   "description": "Appointments front-end module for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-appointments-app.js",
   "main": "src/index.ts",

package/src/appointments/common-components/appointments-table.component.tsx

@@ -19,7 +19,7 @@ import {
   TableToolbarSearch,
   Button,
 } from '@carbon/react';
-import { ConfigurableLink, formatDatetime, usePagination, formatDate } from '@openmrs/esm-framework';
+import { ConfigurableLink, formatDatetime, usePagination, formatDate, useConfig } from '@openmrs/esm-framework';
 import startCase from 'lodash-es/startCase';
 import { Download } from '@carbon/react/icons';
 import AppointmentDetails from '../details/appointment-details.component';
@@ -31,6 +31,7 @@ import { MappedAppointment } from '../../types';
 import { getPageSizes, useSearchResults } from '../utils';
 import AppointmentActions from './appointments-actions.component';
 import styles from './appointments-table.scss';
+import { ConfigObject } from '../../config-schema';
 
 interface AppointmentsTableProps {
   appointments: Array<MappedAppointment>;
@@ -53,6 +54,7 @@ const AppointmentsTable: React.FC<AppointmentsTableProps> = ({
   const [searchString, setSearchString] = useState('');
   const searchResults = useSearchResults(appointments, searchString);
   const { results, goTo, currentPage } = usePagination(searchResults, pageSize);
+  const { customPatientChartUrl } = useConfig<ConfigObject>();
 
   const headerData = [
     {
@@ -79,7 +81,8 @@ const AppointmentsTable: React.FC<AppointmentsTableProps> = ({
     patientName: (
       <ConfigurableLink
         style={{ textDecoration: 'none', maxWidth: '50%' }}
-        to={`\${openmrsSpaBase}/patient/${appointment.patientUuid}/chart`}>
+        to={customPatientChartUrl}
+        templateParams={{ patientUuid: appointment.patientUuid }}>
         {appointment.name}
       </ConfigurableLink>
     ),

package/src/appointments/common-components/appointments-table.test.tsx

@@ -44,6 +44,9 @@ jest.mock('@openmrs/esm-framework', () => {
   return {
     ...originalModule,
     openmrsFetch: jest.fn(),
+    useConfig: jest.fn(() => ({
+      customPatientChartUrl: 'someUrl',
+    })),
   };
 });
 
@@ -80,12 +83,14 @@ describe('AppointmentsBaseTable', () => {
     });
 
     render(<AppointmentsTable {...props} appointments={appointments} />);
-    waitFor(() => {
+    await waitFor(() => {
       expect(screen.getByText('Patient name')).toBeInTheDocument();
       expect(screen.getByText('Identifier')).toBeInTheDocument();
       expect(screen.getByText('Service Type')).toBeInTheDocument();
       expect(screen.getByText('Actions')).toBeInTheDocument();
-      expect(screen.getByText('John Smith')).toBeInTheDocument();
+      const patient = screen.getByText('John Smith');
+      expect(patient).toBeInTheDocument();
+      expect(patient).toHaveAttribute('href', 'someUrl');
       expect(screen.getByText('12345')).toBeInTheDocument();
       expect(screen.getByText('Service')).toBeInTheDocument();
     });

package/src/appointments/unscheduled/unscheduled-appointments.component.tsx

@@ -1,6 +1,5 @@
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import isEmpty from 'lodash-es/isEmpty';
 import {
   DataTable,
   TableContainer,
@@ -18,11 +17,12 @@ import {
   Button,
 } from '@carbon/react';
 import { Download } from '@carbon/react/icons';
-import { ConfigurableLink, usePagination } from '@openmrs/esm-framework';
+import { ConfigurableLink, useConfig, usePagination } from '@openmrs/esm-framework';
 import { useUnscheduledAppointments } from '../../hooks/useUnscheduledAppointments';
 import { downloadUnscheduledAppointments } from '../../helpers/excel';
 import { EmptyState } from '../../empty-state/empty-state.component';
 import { getPageSizes, useSearchResults } from '../utils';
+import { ConfigObject } from '../../config-schema';
 
 const UnscheduledAppointments: React.FC = () => {
   const { t } = useTranslation();
@@ -31,6 +31,8 @@ const UnscheduledAppointments: React.FC = () => {
   const [searchString, setSearchString] = useState('');
   const { data: unscheduledAppointments, isLoading, error } = useUnscheduledAppointments();
   const searchResults = useSearchResults(unscheduledAppointments, searchString);
+  const { customPatientChartUrl } = useConfig<ConfigObject>();
+
   const headerData = [
     {
       header: 'Patient Name',
@@ -55,7 +57,10 @@ const UnscheduledAppointments: React.FC = () => {
   const rowData = results?.map((visit) => ({
     id: `${visit.uuid}`,
     name: (
-      <ConfigurableLink style={{ textDecoration: 'none' }} to={`\${openmrsSpaBase}/patient/${visit.uuid}/chart`}>
+      <ConfigurableLink
+        style={{ textDecoration: 'none' }}
+        to={customPatientChartUrl}
+        templateParams={{ patientUuid: visit.uuid }}>
         {visit.name}
       </ConfigurableLink>
     ),

package/src/appointments/unscheduled/unscheduled-appointments.test.tsx

@@ -19,6 +19,9 @@ jest.mock('@openmrs/esm-framework', () => {
   return {
     ...originalModule,
     openmrsFetch: jest.fn(),
+    useConfig: jest.fn(() => ({
+      customPatientChartUrl: 'someUrl',
+    })),
   };
 });
 
@@ -62,6 +65,7 @@ describe('UnscheduledAppointments component', () => {
 
     const patientName = await screen.findByText('Test Patient');
     expect(patientName).toBeInTheDocument();
+    expect(patientName).toHaveAttribute('href', 'someUrl');
 
     const identifier = screen.getByText('1234-56-78');
     expect(identifier).toBeInTheDocument();

package/src/config-schema.ts

@@ -66,6 +66,12 @@ export const configSchema = {
     _default: '/ws/rest/v1/kenyaemr/default-facility',
     _description: 'Custom URL to load default facility if it is not in the session',
   },
+  customPatientChartUrl: {
+    _type: Type.String,
+    _description:
+      'Template URL that will be used when clicking on the patient name in the appointment list. Available argument: patientUuid',
+    _default: '${openmrsSpaBase}/patient/${patientUuid}/chart',
+  },
   patientIdentifierType: {
     _type: Type.String,
     _description: 'The name of the patient identifier type to be used for the patient identifier field',
@@ -87,5 +93,6 @@ export interface ConfigObject {
   hiddenFormFields: Array<string>;
   showServiceQueueFields: boolean;
   defaultFacilityUrl: string;
+  customPatientChartUrl: string;
   patientIdentifierType: string;
 }

package/src/home-appointments/appointments-list.component.tsx

@@ -34,6 +34,7 @@ import { SeeAllAppointmentsLink, AddAppointmentLink, ViewCalendarLink } from './
 import { Appointment, MappedHomeAppointment } from '../types';
 import { useTodaysAppointments } from './appointments-table.resource';
 import styles from './appointments-list.scss';
+import { ConfigObject } from '../config-schema';
 
 interface PaginationData {
   goTo: (page: number) => void;
@@ -103,6 +104,7 @@ const AppointmentsBaseTable = () => {
   const { appointments, isLoading, mutate } = useTodaysAppointments();
 
   const fullView = userHasAccess(fullViewPrivilege, user) || !useFullViewPrivilege;
+  const { customPatientChartUrl } = useConfig<ConfigObject>();
 
   const filteredAppointments = !fullView
     ? appointments.filter((appointment) => appointment.status === 'Scheduled')
@@ -173,7 +175,7 @@ const AppointmentsBaseTable = () => {
     name: {
       content: (
         <div className={styles.nameContainer}>
-          <ConfigurableLink to={`\${openmrsSpaBase}/patient/${appointment.patientUuid}/chart`}>
+          <ConfigurableLink to={customPatientChartUrl} templateParams={{ patientUuid: appointment.patientUuid }}>
             {appointment.name}
           </ConfigurableLink>
         </div>

package/src/home-appointments/appointments-list.test.tsx

@@ -17,6 +17,7 @@ jest.mock('@openmrs/esm-framework', () => ({
     useBahmniAppointmentsUI: false,
     useFullViewPrivilege: false,
     fullViewPrivilege: 'somePrivilege',
+    customPatientChartUrl: 'someUrl',
   })),
   userHasAccess: jest.fn(() => true),
 }));
@@ -58,6 +59,7 @@ describe('AppointmentsBaseTable', () => {
           serviceColor: 'blue',
           serviceType: 'Checkup',
           status: 'Scheduled',
+          patientUuid: 'some-uuid',
         },
       ],
       isLoading: false,
@@ -76,6 +78,7 @@ describe('AppointmentsBaseTable', () => {
           serviceColor: 'blue',
           serviceType: 'Checkup',
           status: 'Scheduled',
+          patientUuid: 'some-uuid',
         },
       ],
     }));
@@ -83,7 +86,9 @@ describe('AppointmentsBaseTable', () => {
 
     // Assert that appointment data is displayed
     expect(screen.getByText('2023-08-18 10:00 AM')).toBeInTheDocument();
-    expect(screen.getByText('John Doe')).toBeInTheDocument();
+    const patient = screen.getByText('John Doe');
+    expect(patient).toBeInTheDocument();
+    expect(patient).toHaveAttribute('href', 'someUrl');
     expect(screen.getByText('JD123')).toBeInTheDocument();
     expect(screen.getByText('Clinic A')).toBeInTheDocument();
     expect(screen.getByText('Checkup')).toBeInTheDocument();