@openmrs/esm-appointments-app 8.5.1-pre.5634 → 8.5.1-pre.5642

package/.turbo/turbo-build.log

@@ -30,4 +30,4 @@ Assets:
   2164.js (275 KiB)
   5449.js (1.6 MiB)
 
-webpack 5.99.9 compiled with 1 warning in 147939 ms
+webpack 5.99.9 compiled with 1 warning in 135300 ms

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"}],"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":"8.5.1-pre.5634"}
+{"$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"}],"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":"8.5.1-pre.5642"}

package/package.json

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

package/src/admin/appointment-services/appointment-services-hook.ts

@@ -1,31 +0,0 @@
-import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import { type AppointmentService } from '../../types';
-
-const appointmentServiceInitialValue: AppointmentService = {
-  appointmentServiceId: 0,
-  creatorName: '',
-  description: '',
-  durationMins: 0,
-  endTime: '',
-  initialAppointmentStatus: '',
-  location: { uuid: '', display: '' },
-  maxAppointmentsLimit: 0,
-  name: '',
-  startTime: '',
-  uuid: '',
-  color: '',
-  startTimeTimeFormat: new Date().getHours() >= 12 ? 'PM' : 'AM',
-  endTimeTimeFormat: new Date().getHours() >= 12 ? 'PM' : 'AM',
-};
-
-const addNewAppointmentService = (payload) => {
-  return openmrsFetch(`${restBaseUrl}/appointmentService`, {
-    method: 'POST',
-    body: payload,
-    headers: { 'Content-Type': 'application/json' },
-  });
-};
-
-export const useAppointmentServices = () => {
-  return { appointmentServiceInitialValue, addNewAppointmentService };
-};

package/src/admin/appointment-services/appointment-services-validation.ts

@@ -1,17 +0,0 @@
-import * as Yup from 'yup';
-import { OpenmrsResource } from '@openmrs/esm-framework';
-
-export const validationSchema = Yup.object({
-  description: Yup.string().optional(),
-  durationMins: Yup.number().required('durationMinsRequired'),
-  endTime: Yup.string().required('endTimeRequired'),
-  initialAppointmentStatus: Yup.string().optional(),
-  location: Yup.object({ uuid: Yup.string(), display: Yup.string() }).required('locationRequired'),
-  maxAppointmentsLimit: Yup.number().required('maxAppointmentLimitRequired'),
-  name: Yup.string().required('appointmentServiceNameRequired'),
-  specialityUuid: Yup.string().optional(),
-  startTime: Yup.string().required('startTimeRequired'),
-  color: Yup.string().required('colorRequired'),
-  startTimeTimeFormat: Yup.string().required('startTimeFormatRequired'),
-  endTimeTimeFormat: Yup.string().required('endTimeFormatRequired'),
-});

package/src/admin/appointment-services/appointment-services.component.tsx

@@ -1,182 +0,0 @@
-import React from 'react';
-import { Button, ButtonSet, Dropdown, Layer, SelectItem, TextInput, TimePicker, TimePickerSelect } from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import { Form, Formik, type FormikHelpers } from 'formik';
-import { validationSchema } from './appointment-services-validation';
-import { useAppointmentServices } from './appointment-services-hook';
-import { showSnackbar, useLocations } from '@openmrs/esm-framework';
-import type { AppointmentService } from '../../types';
-import { closeOverlay } from '../../hooks/useOverlay';
-import styles from './appointment-services.scss';
-import { appointmentLocationTagName } from '../../constants';
-
-interface AppointmentServicesProps {}
-
-const AppointmentServices: React.FC<AppointmentServicesProps> = () => {
-  const { t } = useTranslation();
-  const { appointmentServiceInitialValue, addNewAppointmentService } = useAppointmentServices();
-
-  const locations = useLocations(appointmentLocationTagName);
-  const handleSubmit = async (values: AppointmentService, helpers: FormikHelpers<AppointmentService>) => {
-    const payload = {
-      name: values.name,
-      startTime: values.startTime.concat(':00'),
-      endTime: values.endTime.concat(':00'),
-      durationMins: values.durationMins,
-      color: values.color,
-      locationUuid: values.location.uuid,
-    };
-    addNewAppointmentService(payload).then(
-      ({ status }) => {
-        if (status === 200) {
-          showSnackbar({
-            isLowContrast: true,
-            kind: 'success',
-            subtitle: t('appointmentServiceCreate', 'Appointment service created successfully'),
-            title: t('appointmentService', 'Appointment service'),
-          });
-          closeOverlay();
-        }
-      },
-      (error) => {
-        showSnackbar({
-          title: t('errorCreatingAppointmentService', 'Error creating appointment service'),
-          kind: 'error',
-          subtitle: error?.message,
-        });
-      },
-    );
-  };
-  return (
-    <Formik
-      onSubmit={handleSubmit}
-      isInitialValid={false}
-      validationSchema={validationSchema}
-      initialValues={appointmentServiceInitialValue}>
-      {(props) => {
-        return (
-          <Form onSubmit={props.handleSubmit} className={styles.appointmentServiceContainer}>
-            <p className={styles.formTitle}>{t('createAppointmentService', 'Create appointment service')}</p>
-            <Layer>
-              <TextInput
-                id="name"
-                invalidText={t(props.errors.name)}
-                labelText={t('appointmentServiceName', 'Appointment service name')}
-                placeholder={t('appointmentServiceName', 'Appointment service name')}
-                invalid={!!(props.touched && props.errors.name)}
-                onChange={props.handleChange}
-                value={props.values.name}
-                name="name"
-                onBlue={props.handleBlur}
-              />
-            </Layer>
-            <Layer>
-              <TimePicker
-                className={styles.timePickerInput}
-                invalid={!!(props.touched && props.errors.startTime)}
-                pattern="([\d]+:[\d]{2})"
-                name="startTime"
-                value={props.values.startTime}
-                onChange={props.handleChange}
-                labelText={t('startTime', 'Start Time')}
-                id="start-time-picker">
-                <TimePickerSelect
-                  name="startTimeTimeFormat"
-                  onChange={props.handleChange}
-                  value={props.values.startTimeTimeFormat}
-                  invalid={!!(props.touched && props.errors.startTimeTimeFormat)}
-                  id="start-time-picker"
-                  labelText={t('time', 'Time')}
-                  aria-label={t('time', 'Time')}>
-                  <SelectItem value="AM" text="AM" />
-                  <SelectItem value="PM" text="PM" />
-                </TimePickerSelect>
-              </TimePicker>
-            </Layer>
-
-            <Layer>
-              <TimePicker
-                invalid={!!(props.touched && props.errors.endTime)}
-                className={styles.timePickerInput}
-                pattern="([\d]+:[\d]{2})"
-                value={props.values.endTime}
-                name="endTime"
-                onChange={props.handleChange}
-                labelText={t('endTime', 'End Time')}
-                id="end-time-picker">
-                <TimePickerSelect
-                  name="endTimeTimeFormat"
-                  onChange={props.handleChange}
-                  id="end-time-picker"
-                  value={props.values.endTimeTimeFormat}
-                  labelText={t('time', 'Time')}
-                  aria-label={t('time', 'Time')}>
-                  <SelectItem value="AM" text="AM" />
-                  <SelectItem value="PM" text="PM" />
-                </TimePickerSelect>
-              </TimePicker>
-            </Layer>
-
-            <Layer>
-              <TextInput
-                id="durationMins"
-                invalidText={props.errors.durationMins}
-                labelText={t('durationMins', 'Duration min')}
-                placeholder={t('durationMins', 'Duration min')}
-                invalid={!!(props.touched && props.errors.durationMins)}
-                onChange={props.handleChange}
-                value={props.values.durationMins}
-                name="durationMins"
-              />
-            </Layer>
-
-            <Layer>
-              <Dropdown
-                id="default"
-                titleText={t('selectLocation', 'Select location')}
-                label={t('selectLocation', 'Select location')}
-                items={locations}
-                itemToString={(item) => (item ? item.display : '')}
-                selectedItem={props.values.location}
-                invalid={!!(props.touched && props.errors.location?.uuid)}
-                name="location"
-                onChange={({ selectedItem }) => props.setValues({ ...props.values, location: selectedItem })}
-              />
-            </Layer>
-
-            <Layer>
-              <TextInput
-                invalid={!!(props.touched && props.errors.color)}
-                onChange={props.handleChange}
-                invalidText={props.errors.color}
-                labelText={t('appointmentColor', 'Appointment color')}
-                type="color"
-                name="color"
-              />
-            </Layer>
-
-            <ButtonSet className={styles.buttonSet}>
-              <Button
-                onClick={closeOverlay}
-                style={{ maxWidth: 'none', width: '50%' }}
-                className={styles.button}
-                kind="secondary">
-                {t('discard', 'Discard')}
-              </Button>
-              <Button
-                disabled={!props.isValid}
-                style={{ maxWidth: 'none', width: '50%' }}
-                className={styles.button}
-                kind="primary"
-                type="submit">
-                {t('save', 'Save')}
-              </Button>
-            </ButtonSet>
-          </Form>
-        );
-      }}
-    </Formik>
-  );
-};
-
-export default AppointmentServices;

package/src/admin/appointment-services/appointment-services.scss

@@ -1,25 +0,0 @@
-@use '@carbon/layout';
-
-.appointmentServiceContainer {
-  margin: layout.$spacing-05 layout.$spacing-05;
-
-  & > div {
-    padding: layout.$spacing-03 0;
-  }
-}
-
-.buttonSet {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  margin: 0 layout.$spacing-05;
-}
-
-.button {
-  height: layout.$spacing-10;
-  display: flex;
-  align-content: flex-start;
-  align-items: baseline;
-  width: auto;
-}

package/src/hooks/useOverlay.tsx

@@ -1,45 +0,0 @@
-import { getGlobalStore } from '@openmrs/esm-framework';
-import { useCallback, useEffect, useState } from 'react';
-
-export interface OverlayStore {
-  isOverlayOpen: boolean;
-  component?: any;
-  header: string;
-}
-
-const initialState: OverlayStore = { isOverlayOpen: false, header: '' };
-
-const getOverlayStore = () => {
-  return getGlobalStore('appointment-store', initialState);
-};
-
-export const launchOverlay = (headerTitle: string, componentToRender: any) => {
-  const store = getOverlayStore();
-  store.setState({ isOverlayOpen: true, component: componentToRender, header: headerTitle });
-};
-
-export const closeOverlay = (): void => {
-  const store = getOverlayStore();
-  store.setState({ component: null, isOverlayOpen: false });
-};
-
-export const useOverlay = () => {
-  const [overlay, setOverlay] = useState<OverlayStore>();
-
-  const update = useCallback((state: OverlayStore) => {
-    setOverlay(state);
-  }, []);
-
-  useEffect(() => {
-    update(getOverlayStore().getState());
-    getOverlayStore().subscribe(update);
-  }, [update]);
-
-  const { isOverlayOpen, component, header } = overlay ?? {};
-
-  return {
-    isOverlayOpen,
-    component,
-    header,
-  };
-};