@openmrs/esm-appointments-app 9.2.1-pre.7296 → 9.2.1-pre.7315

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

@@ -78,9 +78,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 33974,
+      "size": 34002,
       "sizes": {
-        "javascript": 33974
+        "javascript": 34002
       },
       "names": [],
       "idHints": [],
@@ -94,7 +94,7 @@
       "auxiliaryFiles": [
         "449.js.map"
       ],
-      "hash": "587e2d46a9300ffd",
+      "hash": "5fe3dc2fc0b0115c",
       "childrenByOrder": {}
     },
     {
@@ -103,9 +103,9 @@
       "entry": false,
       "recorded": false,
       "reason": "split chunk (cache group: default)",
-      "size": 144021,
+      "size": 139388,
       "sizes": {
-        "javascript": 144021
+        "javascript": 139388
       },
       "names": [],
       "idHints": [],
@@ -119,7 +119,7 @@
       "auxiliaryFiles": [
         "525.js.map"
       ],
-      "hash": "9156c322bd015192",
+      "hash": "80cae7c3ffd1220e",
       "childrenByOrder": {}
     },
     {
@@ -127,9 +127,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 225866,
+      "size": 221336,
       "sizes": {
-        "javascript": 225866
+        "javascript": 221336
       },
       "names": [],
       "idHints": [],
@@ -143,7 +143,7 @@
       "auxiliaryFiles": [
         "592.js.map"
       ],
-      "hash": "fb842db6a9fdab6a",
+      "hash": "58a53032c805f0df",
       "childrenByOrder": {}
     },
     {
@@ -329,9 +329,9 @@
       "entry": false,
       "recorded": false,
       "reason": "reused as split chunk (cache group: default)",
-      "size": 71703,
+      "size": 71188,
       "sizes": {
-        "javascript": 71703
+        "javascript": 71188
       },
       "names": [],
       "idHints": [],
@@ -345,7 +345,7 @@
       "auxiliaryFiles": [
         "1431.js.map"
       ],
-      "hash": "2ae96b7f774a39fc",
+      "hash": "92112eea02a07660",
       "childrenByOrder": {}
     },
     {
@@ -372,7 +372,7 @@
       "auxiliaryFiles": [
         "1559.js.map"
       ],
-      "hash": "9b318d2689231e7d",
+      "hash": "e96e92b0fd4d109c",
       "childrenByOrder": {}
     },
     {
@@ -397,6 +397,30 @@
       "hash": "43a67a283d85b19b",
       "childrenByOrder": {}
     },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "size": 2732,
+      "sizes": {
+        "javascript": 2732
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-appointments-app",
+        "main"
+      ],
+      "files": [
+        "2265.js"
+      ],
+      "auxiliaryFiles": [
+        "2265.js.map"
+      ],
+      "hash": "e2c08bdc66384064",
+      "childrenByOrder": {}
+    },
     {
       "rendered": false,
       "initial": false,
@@ -545,31 +569,6 @@
       "hash": "c8ed3c6f7264277e",
       "childrenByOrder": {}
     },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "reason": "split chunk (cache group: default)",
-      "size": 90978,
-      "sizes": {
-        "javascript": 90978
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-appointments-app",
-        "main"
-      ],
-      "files": [
-        "3092.js"
-      ],
-      "auxiliaryFiles": [
-        "3092.js.map"
-      ],
-      "hash": "8900073c8dc08b13",
-      "childrenByOrder": {}
-    },
     {
       "rendered": true,
       "initial": false,
@@ -718,7 +717,7 @@
       "auxiliaryFiles": [
         "openmrs-esm-appointments-app.js.map"
       ],
-      "hash": "a424e00cb764bd66",
+      "hash": "8ac88a7deb641eaf",
       "childrenByOrder": {}
     },
     {
@@ -770,6 +769,31 @@
       "hash": "2e46cf69bba98ab9",
       "childrenByOrder": {}
     },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "reason": "split chunk (cache group: default)",
+      "size": 65388,
+      "sizes": {
+        "javascript": 65388
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-appointments-app",
+        "main"
+      ],
+      "files": [
+        "4036.js"
+      ],
+      "auxiliaryFiles": [
+        "4036.js.map"
+      ],
+      "hash": "3e2874a818d31268",
+      "childrenByOrder": {}
+    },
     {
       "rendered": true,
       "initial": false,
@@ -903,6 +927,31 @@
       "hash": "e096454144dd4bc6",
       "childrenByOrder": {}
     },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "reason": "split chunk (cache group: default)",
+      "size": 90442,
+      "sizes": {
+        "javascript": 90442
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-appointments-app",
+        "main"
+      ],
+      "files": [
+        "4515.js"
+      ],
+      "auxiliaryFiles": [
+        "4515.js.map"
+      ],
+      "hash": "82c2e98d0feb7e83",
+      "childrenByOrder": {}
+    },
     {
       "rendered": false,
       "initial": false,
@@ -997,9 +1046,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 75344,
+      "size": 76373,
       "sizes": {
-        "javascript": 75344
+        "javascript": 76373
       },
       "names": [],
       "idHints": [],
@@ -1013,7 +1062,7 @@
       "auxiliaryFiles": [
         "4745.js.map"
       ],
-      "hash": "2f78c197a3b04bee",
+      "hash": "ea9cc51e48eb5c9e",
       "childrenByOrder": {}
     },
     {
@@ -1021,9 +1070,10 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 285644,
+      "reason": "reused as split chunk (cache group: default)",
+      "size": 288316,
       "sizes": {
-        "javascript": 285644
+        "javascript": 288316
       },
       "names": [],
       "idHints": [],
@@ -1037,7 +1087,7 @@
       "auxiliaryFiles": [
         "4889.js.map"
       ],
-      "hash": "5edbd499ae6da7d7",
+      "hash": "a24feb93b670bd05",
       "childrenByOrder": {}
     },
     {
@@ -1062,31 +1112,6 @@
       "hash": "1bc9d6bbcb5c4e8a",
       "childrenByOrder": {}
     },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "reason": "split chunk (cache group: default)",
-      "size": 58867,
-      "sizes": {
-        "javascript": 58867
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-appointments-app",
-        "main"
-      ],
-      "files": [
-        "5160.js"
-      ],
-      "auxiliaryFiles": [
-        "5160.js.map"
-      ],
-      "hash": "ee27bd0d42a040aa",
-      "childrenByOrder": {}
-    },
     {
       "rendered": true,
       "initial": false,
@@ -1247,7 +1272,7 @@
       "auxiliaryFiles": [
         "5666.js.map"
       ],
-      "hash": "4d55af8c1fce79e0",
+      "hash": "de869446b44f018b",
       "childrenByOrder": {}
     },
     {
@@ -1283,9 +1308,9 @@
       "entry": false,
       "recorded": false,
       "reason": "split chunk (cache group: default)",
-      "size": 77730,
+      "size": 79693,
       "sizes": {
-        "javascript": 77730
+        "javascript": 79693
       },
       "names": [],
       "idHints": [],
@@ -1299,7 +1324,7 @@
       "auxiliaryFiles": [
         "5755.js.map"
       ],
-      "hash": "1281529594df2bab",
+      "hash": "5a50cfe9d803475a",
       "childrenByOrder": {}
     },
     {
@@ -1380,9 +1405,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 36066,
+      "size": 35908,
       "sizes": {
-        "javascript": 36066
+        "javascript": 35908
       },
       "names": [],
       "idHints": [],
@@ -1396,7 +1421,7 @@
       "auxiliaryFiles": [
         "6467.js.map"
       ],
-      "hash": "1739c765583c7171",
+      "hash": "d3b28947b0b2af81",
       "childrenByOrder": {}
     },
     {
@@ -1514,9 +1539,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 25980,
+      "size": 26017,
       "sizes": {
-        "javascript": 25980
+        "javascript": 26017
       },
       "names": [],
       "idHints": [],
@@ -1529,7 +1554,7 @@
       "auxiliaryFiles": [
         "6886.js.map"
       ],
-      "hash": "11c2080658c2b2f7",
+      "hash": "f2deca6f9b3e9b84",
       "childrenByOrder": {}
     },
     {
@@ -1556,30 +1581,6 @@
       "hash": "ad2eea374c0b94fa",
       "childrenByOrder": {}
     },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "size": 19737,
-      "sizes": {
-        "javascript": 19737
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-appointments-app",
-        "main"
-      ],
-      "files": [
-        "7026.js"
-      ],
-      "auxiliaryFiles": [
-        "7026.js.map"
-      ],
-      "hash": "a027520102377b6e",
-      "childrenByOrder": {}
-    },
     {
       "rendered": true,
       "initial": false,
@@ -1629,9 +1630,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 26475,
+      "size": 10274,
       "sizes": {
-        "javascript": 26475
+        "javascript": 10274
       },
       "names": [],
       "idHints": [],
@@ -1640,12 +1641,12 @@
         "main"
       ],
       "files": [
-        "7495.js"
+        "7294.js"
       ],
       "auxiliaryFiles": [
-        "7495.js.map"
+        "7294.js.map"
       ],
-      "hash": "8b006eeaa2b314b6",
+      "hash": "de0fae9237f4cb05",
       "childrenByOrder": {}
     },
     {
@@ -1653,9 +1654,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 11173,
+      "size": 26475,
       "sizes": {
-        "javascript": 11173
+        "javascript": 26475
       },
       "names": [],
       "idHints": [],
@@ -1664,12 +1665,12 @@
         "main"
       ],
       "files": [
-        "7565.js"
+        "7495.js"
       ],
       "auxiliaryFiles": [
-        "7565.js.map"
+        "7495.js.map"
       ],
-      "hash": "9360fc434c3d9ce8",
+      "hash": "8b006eeaa2b314b6",
       "childrenByOrder": {}
     },
     {
@@ -1907,10 +1908,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 49525,
+      "size": 49562,
       "sizes": {
         "consume-shared": 126,
-        "javascript": 25980,
+        "javascript": 26017,
         "share-init": 378,
         "runtime": 23041
       },
@@ -1927,7 +1928,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "178e83c62325e670",
+      "hash": "9e8e62fdfa51964e",
       "childrenByOrder": {}
     },
     {
@@ -2001,9 +2002,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 25747,
+      "size": 26776,
       "sizes": {
-        "javascript": 25747
+        "javascript": 26776
       },
       "names": [],
       "idHints": [],
@@ -2017,7 +2018,7 @@
       "auxiliaryFiles": [
         "9712.js.map"
       ],
-      "hash": "6236058b22e19235",
+      "hash": "e873e500da70e859",
       "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"}],"workspaces2":[{"name":"appointments-form-workspace","component":"appointmentsFormWorkspace","window":"appointments-form-window"}],"workspaceWindows2":[{"name":"appointments-form-window","group":"appointmentsFormWorkspaceGroup"}],"workspaceGroups2":[{"name":"appointmentsFormWorkspaceGroup","overlay":false}],"version":"9.2.1-pre.7296"}
+{"$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":"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"}],"workspaceGroups2":[{"name":"appointments-group"}],"workspaceWindows2":[{"name":"appointments-window","group":"appointments-group"}],"workspaces2":[{"name":"appointments-form-workspace","component":"appointmentsFormWorkspace","window":"appointments-window"},{"name":"appointments-patient-search-workspace","component":"@openmrs/esm-patient-search-app#patientSearchWorkspace2","window":"appointments-window"},{"name":"appointments-patient-search-start-visit-workspace","component":"@openmrs/esm-patient-chart-app#exportedVisitForm","window":"appointments-window"}],"version":"9.2.1-pre.7315"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-appointments-app",
-  "version": "9.2.1-pre.7296",
+  "version": "9.2.1-pre.7315",
   "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

@@ -30,11 +30,10 @@ import {
   formatDate,
   formatDatetime,
   isDesktop,
-  launchWorkspace,
-  launchWorkspace2,
   parseDate,
   useConfig,
   useLayoutType,
+  launchWorkspace2,
   usePagination,
 } from '@openmrs/esm-framework';
 import { EmptyState } from '../../empty-state/empty-state.component';
@@ -46,6 +45,7 @@ import { getPageSizes, useAppointmentSearchResults } from '../utils';
 import AppointmentActions from './appointments-actions.component';
 import AppointmentDetails from '../details/appointment-details.component';
 import styles from './appointments-table.scss';
+import { launchCreateAppointmentForm } from '../../helpers';
 
 dayjs.extend(utc);
 dayjs.extend(isToday);
@@ -129,8 +129,7 @@ const AppointmentsTable: React.FC<AppointmentsTableProps> = ({
             ? t('appointmentsScheduledForToday', 'appointments scheduled for today')
             : `${t(tableHeading)} ${t('appointments_lower', 'appointments')}`
         }
-        // TODO @brandones: Make this a workspace, not an extension
-        launchForm={() => launchWorkspace('search-patient')}
+        launchForm={() => launchCreateAppointmentForm(t)}
       />
     );
   }
@@ -227,7 +226,6 @@ const AppointmentsTable: React.FC<AppointmentsTableProps> = ({
                                     launchWorkspace2('appointments-form-workspace', {
                                       patientUuid: matchingAppointment.patient.uuid,
                                       appointment: matchingAppointment,
-                                      context: 'editing',
                                     })
                                   }
                                 />

package/src/constants.ts

@@ -5,6 +5,7 @@ export const omrsDateFormat = 'YYYY-MM-DDTHH:mm:ss.SSSZZ';
 export const appointmentLocationTagName = 'Appointment Location';
 
 export const moduleName = '@openmrs/esm-appointments-app';
+export const appointmentsFormWorkspace = 'appointments-form-workspace';
 
 export const datePickerPlaceHolder = 'dd/mm/yyyy';
 export const dateFormat = 'DD/MM/YYYY';

package/src/form/appointments-form.resource.ts

@@ -159,6 +159,7 @@ export const checkAppointmentConflict = async (appointmentPayload: AppointmentPa
       providers: [],
       locationUuid: appointmentPayload.locationUuid,
       appointmentKind: appointmentPayload.appointmentKind,
+      ...(appointmentPayload.uuid && { uuid: appointmentPayload.uuid }),
     },
     headers: { 'Content-Type': 'application/json' },
   });