@openmrs/esm-appointments-app 5.2.2-pre.2638 → 5.2.2-pre.2640

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

@@ -80,10 +80,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4545133,
+      "size": 4544644,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4524209,
+        "javascript": 4523720,
         "share-init": 252,
         "runtime": 20420
       },
@@ -100,7 +100,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "8ca36fc7fce574c4",
+      "hash": "0026283adf5b433a",
       "childrenByOrder": {}
     },
     {
@@ -396,9 +396,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 480840,
+      "size": 480351,
       "sizes": {
-        "javascript": 480672,
+        "javascript": 480183,
         "consume-shared": 168
       },
       "names": [],
@@ -412,7 +412,7 @@
       "auxiliaryFiles": [
         "636.js.map"
       ],
-      "hash": "29e81b62ef741b77",
+      "hash": "f379799e709c4e77",
       "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.2638"}
+{"$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.2640"}

package/package.json

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

package/src/helpers/functions.ts

@@ -1,6 +1,6 @@
-import { AppointmentSummary, Appointment } from '../types';
-import { formatDate, parseDate, formatDatetime } from '@openmrs/esm-framework';
-import dayjs, { Dayjs } from 'dayjs';
+import dayjs, { type Dayjs } from 'dayjs';
+import { formatDate, parseDate } from '@openmrs/esm-framework';
+import { type AppointmentSummary, type Appointment } from '../types';
 import { configSchema } from '../config-schema';
 
 export const getHighestAppointmentServiceLoad = (appointmentSummary: Array<any> = []) => {
@@ -29,18 +29,18 @@ export const getServiceCountByAppointmentType = (
 
 function getAppointmentDuration(startTime = 0, endTime = 0) {
   const diff = endTime - startTime;
-  var minutes = Math.floor(diff / 60000);
+  const minutes = Math.floor(diff / 60000);
   return minutes + 'min';
 }
 
 function formatAMPM(date) {
-  var hours = date.getHours();
-  var minutes = date.getMinutes();
-  var ampm = hours >= 12 ? 'PM' : 'AM';
+  let hours = date.getHours();
+  let minutes = date.getMinutes();
+  let ampm = hours >= 12 ? 'PM' : 'AM';
   hours = hours % 12;
   hours = hours ? hours : 12; // the hour '0' should be '12'
   minutes = minutes < 10 ? '0' + minutes : minutes;
-  var strTime = hours + ':' + minutes + ' ' + ampm;
+  const strTime = hours + ':' + minutes + ' ' + ampm;
   return strTime;
 }
 
@@ -64,9 +64,11 @@ export const mapAppointmentProperties = (appointment: Appointment, t?: Function)
     comments: appointment.comments ? appointment.comments : '--',
     appointmentNumber: appointment.appointmentNumber,
     color: appointment?.service?.color ?? '',
-    identifier: appointment?.patient?.identifiers?.find(
-      (identifier) => identifier.identifierName === configSchema.patientIdentifierType._default,
-    ).identifier,
+    identifier: appointment?.patient?.identifiers?.length
+      ? appointment.patient.identifiers.find(
+          (identifier) => identifier.identifierName === configSchema.patientIdentifierType._default,
+        ).identifier
+      : appointment.patient?.identifier,
     duration: appointment.service?.durationMins
       ? appointment?.service?.durationMins + t('minutes', 'min')
       : getAppointmentDuration(appointment.startDateTime, appointment.endDateTime),

package/src/home-appointments/appointment-actions.component.tsx

@@ -96,7 +96,8 @@ export const ActionsMenu = ({ appointment, useBahmniUI }: ActionMenuProps) => {
   return (
     <Layer>
       <OverflowMenu
-        aria-label="Edit appointment"
+        align="left"
+        aria-label="Options"
         selectorPrimaryFocus={'#editPatientDetails'}
         size={isDesktop ? 'sm' : 'lg'}
         flipped>

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

@@ -32,9 +32,9 @@ import { EmptyDataIllustration } from './empty-data-illustration.component';
 import { launchCheckInAppointmentModal, handleComplete } from './common';
 import { SeeAllAppointmentsLink, AddAppointmentLink, ViewCalendarLink } from './links.component';
 import { type Appointment, type MappedHomeAppointment } from '../types';
+import { type ConfigObject } from '../config-schema';
 import { useTodaysAppointments } from './appointments-table.resource';
 import styles from './appointments-list.scss';
-import { type ConfigObject } from '../config-schema';
 
 interface PaginationData {
   goTo: (page: number) => void;
@@ -78,7 +78,7 @@ const RenderStatus = ({ status, t, appointmentUuid, mutate }: RenderStatusProps)
       );
     case 'CheckedIn':
       return (
-        <Button kind="ghost" className={styles.actionButton} onClick={() => handleComplete(appointmentUuid, mutate, t)}>
+        <Button kind="ghost" onClick={() => handleComplete(appointmentUuid, mutate, t)}>
           {t('complete', 'Complete')}
         </Button>
       );
@@ -87,7 +87,6 @@ const RenderStatus = ({ status, t, appointmentUuid, mutate }: RenderStatusProps)
         <Button
           size="sm"
           kind="ghost"
-          className={styles.actionButton}
           disabled={status === 'CheckedIn'}
           onClick={() => launchCheckInAppointmentModal(appointmentUuid)}>
           {t('checkIn', 'Check In')}
@@ -185,7 +184,7 @@ const AppointmentsBaseTable = () => {
     identifier: {
       content: (
         <div className={styles.nameContainer}>
-          <span className={styles.identifier}>{appointment.identifier}</span>
+          <span>{appointment.identifier}</span>
         </div>
       ),
       sortKey: appointment.identifier,
@@ -205,7 +204,7 @@ const AppointmentsBaseTable = () => {
     },
     actionButton: {
       content: (
-        <span className={styles.serviceContainer}>
+        <span>
           <RenderStatus status={appointment.status} appointmentUuid={appointment.id} t={t} mutate={mutate} />
         </span>
       ),
@@ -286,7 +285,7 @@ const AppointmentsBaseTable = () => {
           sortRow={handleSorting}
           overflowMenuOnHover={isDesktop(layout)}
           rows={tableRows}
-          size={isDesktop(layout) ? 'md' : 'lg'}
+          size={isDesktop(layout) ? 'lg' : 'sm'}
           useZebraStyles={true}>
           {({ rows, headers, getHeaderProps, getTableProps, getRowProps }) => {
             return (

package/src/home-appointments/appointments-list.scss

@@ -84,15 +84,6 @@
   width: max-content;
 }
 
-.identifier {
-  font-weight: 700;
-}
-
-.actionButton {
-  position: static;
-  padding: layout.$spacing-03 layout.$spacing-05 layout.$spacing-03 0;
-}
-
 .serviceColor {
   border-radius: 50%;
   margin-right: layout.$spacing-03;
@@ -135,7 +126,6 @@
 .missedIcon,
 .cancelIcon {
   width: 8rem;
-  padding: layout.$spacing-03 layout.$spacing-05 layout.$spacing-03 0;
   display: flex;
   align-items: center;
   height: layout.$spacing-09;

package/src/home-appointments/appointments-table.resource.ts

@@ -3,9 +3,9 @@ import useSWR from 'swr';
 import dayjs from 'dayjs';
 import { useTranslation } from 'react-i18next';
 import { openmrsFetch } from '@openmrs/esm-framework';
-import { AppointmentService, Appointment } from '../types';
 import { useAppointmentDate, mapAppointmentProperties } from '../helpers';
 import { omrsDateFormat } from '../constants';
+import type { AppointmentService, Appointment } from '../types';
 
 export function useTodaysAppointments() {
   const { t } = useTranslation();

package/src/types/index.ts

@@ -1,5 +1,5 @@
-import { OpenmrsResource } from '@openmrs/esm-framework';
-import { amPm } from '../helpers';
+import { type OpenmrsResource } from '@openmrs/esm-framework';
+import { type amPm } from '../helpers';
 
 export enum SearchTypes {
   BASIC = 'basic',
@@ -15,6 +15,7 @@ export interface Appointment {
   endDateTime: Date | number | any;
   location: OpenmrsResource;
   patient: {
+    identifier: string;
     identifiers: Array<Identifier>;
     name: string;
     uuid: string;