@openmrs/esm-appointments-app 9.0.1-pre.6388 → 9.0.1-pre.6393

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

@@ -57,9 +57,9 @@
       "entry": false,
       "recorded": false,
       "reason": "split chunk (cache group: default)",
-      "size": 146160,
+      "size": 146337,
       "sizes": {
-        "javascript": 146160
+        "javascript": 146337
       },
       "names": [],
       "idHints": [],
@@ -73,7 +73,7 @@
       "auxiliaryFiles": [
         "525.js.map"
       ],
-      "hash": "36088e87b4dd60b3",
+      "hash": "9d884b24398d5100",
       "childrenByOrder": {}
     },
     {
@@ -326,7 +326,7 @@
       "auxiliaryFiles": [
         "1431.js.map"
       ],
-      "hash": "eb84ecc53381895a",
+      "hash": "4c271c2fffe86927",
       "childrenByOrder": {}
     },
     {
@@ -892,7 +892,7 @@
         "4300.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "17c6228d9e5634dd",
+      "hash": "4a776e3f7fc7b00c",
       "childrenByOrder": {}
     },
     {
@@ -1638,9 +1638,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 24350,
+      "size": 25265,
       "sizes": {
-        "javascript": 24350
+        "javascript": 25265
       },
       "names": [],
       "idHints": [],
@@ -1653,7 +1653,7 @@
       "auxiliaryFiles": [
         "7698.js.map"
       ],
-      "hash": "854ff309093db116",
+      "hash": "6c396bd1ca374a75",
       "childrenByOrder": {}
     },
     {
@@ -1793,10 +1793,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 194914,
+      "size": 195829,
       "sizes": {
         "consume-shared": 168,
-        "javascript": 171378,
+        "javascript": 172293,
         "share-init": 378,
         "runtime": 22990
       },
@@ -1813,7 +1813,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "41547b67e717efc1",
+      "hash": "05e769f7745af43a",
       "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"},"order":2},{"component":"root","name":"clinical-appointments-dashboard","slot":"clinical-appointments-dashboard-slot"},{"name":"appointments-dashboard","slot":"appointments-dashboard-slot","component":"appointmentsDashboard"},{"name":"appointments-calendar-dashboard-link","slot":"calendar-dashboard-slot","component":"appointmentsCalendarDashboardLink"},{"name":"todays-appointments-dashboard","slot":"todays-appointment-slot","component":"homeAppointments"},{"name":"expected-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"checked-in-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"completed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"missed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"cancelled-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"early-appointments-panel","component":"earlyAppointments"},{"name":"patient-appointments-summary-dashboard","component":"patientAppointmentsSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"hideDashboardTitle":true,"path":"Appointments","slot":"patient-chart-appointments-dashboard-slot","title":"Appointments"}},{"name":"appointments-details-widget","component":"patientAppointmentsDetailedSummary","slot":"patient-chart-appointments-dashboard-slot","meta":{"columnSpan":1}},{"name":"patient-upcoming-appointment-widget","component":"patientUpcomingAppointmentsWidget","slot":"visit-form-top-slot"},{"name":"search-patient","component":"searchPatient"},{"name":"home-appointments-tile","slot":"home-metrics-tiles-slot","component":"homeAppointmentsTile"},{"name":"metrics-card-scheduled-appointments","component":"metricsCardScheduledAppointments","slot":"appointments-metrics-slot","order":1},{"name":"metrics-card-highest-volume-service","component":"metricsCardHighestVolumeService","slot":"appointments-metrics-slot","order":2},{"name":"metrics-card-providers-booked","component":"metricsCardProvidersBooked","slot":"appointments-metrics-slot","order":3}],"modals":[{"name":"end-appointment-modal","component":"endAppointmentModal"},{"name":"cancel-appointment-modal","component":"cancelAppointmentModal"}],"workspaces":[{"name":"appointments-form-workspace","component":"appointmentsFormWorkspace","title":"createNewAppointment","type":"form"}],"version":"9.0.1-pre.6388"}
+{"$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"},"order":2},{"component":"root","name":"clinical-appointments-dashboard","slot":"clinical-appointments-dashboard-slot"},{"name":"appointments-dashboard","slot":"appointments-dashboard-slot","component":"appointmentsDashboard"},{"name":"appointments-calendar-dashboard-link","slot":"calendar-dashboard-slot","component":"appointmentsCalendarDashboardLink"},{"name":"todays-appointments-dashboard","slot":"todays-appointment-slot","component":"homeAppointments"},{"name":"expected-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"checked-in-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"completed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"missed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"cancelled-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"early-appointments-panel","component":"earlyAppointments"},{"name":"patient-appointments-summary-dashboard","component":"patientAppointmentsSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"hideDashboardTitle":true,"path":"Appointments","slot":"patient-chart-appointments-dashboard-slot","title":"Appointments"}},{"name":"appointments-details-widget","component":"patientAppointmentsDetailedSummary","slot":"patient-chart-appointments-dashboard-slot","meta":{"columnSpan":1}},{"name":"patient-upcoming-appointment-widget","component":"patientUpcomingAppointmentsWidget","slot":"visit-form-top-slot"},{"name":"search-patient","component":"searchPatient"},{"name":"home-appointments-tile","slot":"home-metrics-tiles-slot","component":"homeAppointmentsTile"},{"name":"metrics-card-scheduled-appointments","component":"metricsCardScheduledAppointments","slot":"appointments-metrics-slot","order":1},{"name":"metrics-card-highest-volume-service","component":"metricsCardHighestVolumeService","slot":"appointments-metrics-slot","order":2},{"name":"metrics-card-providers-booked","component":"metricsCardProvidersBooked","slot":"appointments-metrics-slot","order":3}],"modals":[{"name":"end-appointment-modal","component":"endAppointmentModal"},{"name":"cancel-appointment-modal","component":"cancelAppointmentModal"}],"workspaces":[{"name":"appointments-form-workspace","component":"appointmentsFormWorkspace","title":"createNewAppointment","type":"form"}],"version":"9.0.1-pre.6393"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-appointments-app",
-  "version": "9.0.1-pre.6388",
+  "version": "9.0.1-pre.6393",
   "description": "Appointments front-end module for O3",
   "browser": "dist/openmrs-esm-appointments-app.js",
   "main": "src/index.ts",

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

@@ -65,34 +65,19 @@ const AppointmentsTable: React.FC<AppointmentsTableProps> = ({
   const { t } = useTranslation();
   const [pageSize, setPageSize] = useState(25);
   const [searchString, setSearchString] = useState('');
+  const config = useConfig<ConfigObject>();
+  const { appointmentsTableColumns } = config;
   const searchResults = useAppointmentSearchResults(appointments, searchString);
   const { results, goTo, currentPage } = usePagination(searchResults, pageSize);
   const { customPatientChartUrl, patientIdentifierType } = useConfig<ConfigObject>();
   const { visits } = useTodaysVisits();
   const layout = useLayoutType();
   const responsiveSize = isDesktop(layout) ? 'sm' : 'lg';
-  const headerData = [
-    {
-      header: t('patientName', 'Patient name'),
-      key: 'patientName',
-    },
-    {
-      header: t('identifier', 'Identifier'),
-      key: 'identifier',
-    },
-    {
-      header: t('location', 'Location'),
-      key: 'location',
-    },
-    {
-      header: t('serviceType', 'Service type'),
-      key: 'serviceType',
-    },
-    {
-      header: t('status', 'Status'),
-      key: 'status',
-    },
-  ];
+
+  const headerData = appointmentsTableColumns.map((columnKey) => ({
+    header: t(columnKey, columnKey),
+    key: columnKey,
+  }));
 
   const rowData = results?.map((appointment) => ({
     id: appointment.uuid,
@@ -106,12 +91,12 @@ const AppointmentsTable: React.FC<AppointmentsTableProps> = ({
     ),
     nextAppointmentDate: '--',
     identifier: patientIdentifierType
-      ? appointment.patient[patientIdentifierType.replaceAll(' ', '')] ?? appointment.patient.identifier
+      ? (appointment.patient[patientIdentifierType.replaceAll(' ', '')] ?? appointment.patient.identifier)
       : appointment.patient.identifier,
     dateTime: formatDatetime(new Date(appointment.startDateTime)),
     serviceType: appointment.service.name,
     location: appointment.location?.name,
-    provider: appointment.provider,
+    provider: appointment.providers?.[0]?.name ?? '--',
     status: <AppointmentActions appointment={appointment} />,
   }));
 

package/src/config-schema.ts

@@ -1,5 +1,24 @@
 import { Type, validators } from '@openmrs/esm-framework';
 
+export const appointmentColumnTypes = [
+  // t('patientName', 'Patient name')
+  'patientName',
+  // t('identifier', 'Identifier')
+  'identifier',
+  // t('location', 'Location')
+  'location',
+  // t('serviceType', 'Service type')
+  'serviceType',
+  // t('status', 'Status')
+  'status',
+  // t('dateTime', 'Date & time')
+  'dateTime',
+  // t('provider', 'Provider')
+  'provider',
+] as const;
+
+type AppointmentColumnType = (typeof appointmentColumnTypes)[number];
+
 export const configSchema = {
   allowAllDayAppointments: {
     _type: Type.Boolean,
@@ -77,12 +96,23 @@ export const configSchema = {
     _description:
       'Whether to show the Unscheduled Appointments tab. Note that configuring this to true requires a custom unscheduledAppointment endpoint not currently available',
   },
+  appointmentsTableColumns: {
+    _type: Type.Array,
+    _description:
+      'Columns to display in the appointment table. Available options: ' + appointmentColumnTypes.join(', '),
+    _default: ['patientName', 'identifier', 'location', 'serviceType', 'status'],
+    _elements: {
+      _type: Type.String,
+      _validators: [validators.oneOf(appointmentColumnTypes)],
+    },
+  },
 };
 
 export interface ConfigObject {
   allowAllDayAppointments: boolean;
   appointmentStatuses: Array<string>;
   appointmentTypes: Array<string>;
+  appointmentsTableColumns: Array<string>;
   checkInButton: {
     enabled: boolean;
     showIfActiveVisit: boolean;
@@ -97,3 +127,8 @@ export interface ConfigObject {
   patientIdentifierType: string;
   showUnscheduledAppointmentsTab: boolean;
 }
+
+export type AppointmentTableColumn = {
+  header: string;
+  key: string;
+};

package/translations/en.json

@@ -86,8 +86,8 @@
   "gender": "Gender",
   "highestServiceVolume": "Highest volume service: {{time}}",
   "highestServiceVolumeCardTitle": "Highest volume service",
-  "identifier": "Identifier",
   "invalidNumber": "Number is not valid",
+  "identifier": "Identifier",
   "isRecurringAppointment": "Is this a recurring appointment?",
   "itemsPerPage": "Items per page",
   "loading": "Loading",
@@ -140,8 +140,8 @@
   "selectProvider": "Select a provider",
   "selectService": "Select a service",
   "service": "Service",
+  "serviceType":"Service type",
   "serviceName": "Service name",
-  "serviceType": "Service Type",
   "serviceUnavailable": "Appointment time is outside of service hours",
   "status": "Status",
   "SUN": "SUN",