@openmrs/esm-patient-orders-app 11.3.0 → 11.3.1-patch.9310

package/src/order-cancellation-form/cancel-order-form.component.tsx

@@ -5,20 +5,19 @@ import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Button, TextArea, ButtonSet, Column, Form, InlineNotification, Stack, InlineLoading } from '@carbon/react';
-import { OpenmrsDatePicker, showSnackbar, useLayoutType } from '@openmrs/esm-framework';
-import { type DefaultPatientWorkspaceProps, usePatientOrders, type Order } from '@openmrs/esm-patient-common-lib';
+import { OpenmrsDatePicker, showSnackbar, useLayoutType, Workspace2 } from '@openmrs/esm-framework';
+import { type Order, type PatientWorkspace2DefinitionProps, usePatientOrders } from '@openmrs/esm-patient-common-lib';
 import { cancelOrder } from './cancel-order.resource';
 import styles from './cancel-order-form.scss';
 
-interface OrderCancellationFormProps extends DefaultPatientWorkspaceProps {
+interface OrderCancellationFormProps {
   order: Order;
 }
 
-const OrderCancellationForm: React.FC<OrderCancellationFormProps> = ({
-  order,
-  patientUuid,
+const OrderCancellationForm: React.FC<PatientWorkspace2DefinitionProps<OrderCancellationFormProps, {}>> = ({
+  workspaceProps: { order },
+  groupProps: { patientUuid },
   closeWorkspace,
-  promptBeforeClosing,
 }) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
@@ -57,10 +56,6 @@ const OrderCancellationForm: React.FC<OrderCancellationFormProps> = ({
     }
   }
 
-  useEffect(() => {
-    promptBeforeClosing(() => isDirty);
-  }, [isDirty, promptBeforeClosing]);
-
   const cancelOrderRequest = useCallback(
     (data: CancelOrderFormData) => {
       const formData = data;
@@ -98,82 +93,84 @@ const OrderCancellationForm: React.FC<OrderCancellationFormProps> = ({
   );
 
   return (
-    <Form className={styles.form}>
-      <div className={styles.grid}>
-        <Stack>
-          <section>
-            <h4 className={styles.orderDisplay}>{order?.display}</h4>
-          </section>
-          <section>
-            <Controller
-              name="cancellationDate"
-              control={control}
-              render={({ field, fieldState }) => (
-                <div className={styles.row}>
-                  <OpenmrsDatePicker
-                    {...field}
-                    id="cancellationDate"
-                    minDate={dayjs().startOf('day')}
-                    labelText={t('cancellationDate', 'Cancellation date')}
-                    invalid={Boolean(fieldState?.error?.message)}
-                    invalidText={fieldState?.error?.message}
-                  />
-                </div>
-              )}
-            />
-          </section>
-          <section>
-            <Controller
-              name="reasonForCancellation"
-              control={control}
-              render={({ field: { onChange, value } }) => (
-                <div className={styles.row}>
-                  <TextArea
-                    type="text"
-                    id="reasonForCancellation"
-                    labelText={t('reasonForCancellation', 'Reason for cancellation')}
-                    value={value}
-                    onChange={(evt) => onChange(evt.target.value)}
-                    invalid={!!errors['reasonForCancellation']}
-                    invalidText={!!errors['reasonForCancellation'] && errors['reasonForCancellation'].message}
-                  />
-                </div>
-              )}
-            />
-          </section>
-        </Stack>
-      </div>
+    <Workspace2 title={t('orderCancellation', 'Order cancellation')} hasUnsavedChanges={isDirty}>
+      <Form className={styles.form}>
+        <div className={styles.grid}>
+          <Stack>
+            <section>
+              <h4 className={styles.orderDisplay}>{order?.display}</h4>
+            </section>
+            <section>
+              <Controller
+                name="cancellationDate"
+                control={control}
+                render={({ field, fieldState }) => (
+                  <div className={styles.row}>
+                    <OpenmrsDatePicker
+                      {...field}
+                      id="cancellationDate"
+                      minDate={dayjs().startOf('day')}
+                      labelText={t('cancellationDate', 'Cancellation date')}
+                      invalid={Boolean(fieldState?.error?.message)}
+                      invalidText={fieldState?.error?.message}
+                    />
+                  </div>
+                )}
+              />
+            </section>
+            <section>
+              <Controller
+                name="reasonForCancellation"
+                control={control}
+                render={({ field: { onChange, value } }) => (
+                  <div className={styles.row}>
+                    <TextArea
+                      type="text"
+                      id="reasonForCancellation"
+                      labelText={t('reasonForCancellation', 'Reason for cancellation')}
+                      value={value}
+                      onChange={(evt) => onChange(evt.target.value)}
+                      invalid={!!errors['reasonForCancellation']}
+                      invalidText={!!errors['reasonForCancellation'] && errors['reasonForCancellation'].message}
+                    />
+                  </div>
+                )}
+              />
+            </section>
+          </Stack>
+        </div>
 
-      {showErrorNotification && (
-        <Column className={styles.errorContainer}>
-          <InlineNotification
-            lowContrast
-            title={t('error', 'Error')}
-            subtitle={t('pleaseFillRequiredFields', 'Please fill all the required fields') + '.'}
-            onClose={() => setShowErrorNotification(false)}
-          />
-        </Column>
-      )}
+        {showErrorNotification && (
+          <Column className={styles.errorContainer}>
+            <InlineNotification
+              lowContrast
+              title={t('error', 'Error')}
+              subtitle={t('pleaseFillRequiredFields', 'Please fill all the required fields') + '.'}
+              onClose={() => setShowErrorNotification(false)}
+            />
+          </Column>
+        )}
 
-      <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
-        <Button className={styles.button} kind="secondary" onClick={() => closeWorkspace()}>
-          {t('discard', 'Discard')}
-        </Button>
-        <Button
-          className={styles.button}
-          kind="primary"
-          onClick={handleSubmit(cancelOrderRequest, onError)}
-          disabled={isSubmitting}
-          type="submit"
-        >
-          {isSubmitting ? (
-            <InlineLoading description={t('saving', 'Saving') + '...'} />
-          ) : (
-            t('saveAndClose', 'Save and close')
-          )}
-        </Button>
-      </ButtonSet>
-    </Form>
+        <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
+          <Button className={styles.button} kind="secondary" onClick={() => closeWorkspace()}>
+            {t('discard', 'Discard')}
+          </Button>
+          <Button
+            className={styles.button}
+            kind="primary"
+            onClick={handleSubmit(cancelOrderRequest, onError)}
+            disabled={isSubmitting}
+            type="submit"
+          >
+            {isSubmitting ? (
+              <InlineLoading description={t('saving', 'Saving') + '...'} />
+            ) : (
+              t('saveAndClose', 'Save and close')
+            )}
+          </Button>
+        </ButtonSet>
+      </Form>
+    </Workspace2>
   );
 };
 

package/src/routes.json

@@ -1,11 +1,11 @@
 {
   "$schema": "https://json.openmrs.org/routes.schema.json",
   "backendDependencies": {
-    "webservices.rest": "^2.2.0"
+    "webservices.rest": ">=2.2.0"
   },
   "optionalBackendDependencies": {
     "fhirproxy": "^1.0.0-SNAPSHOT",
-    "stockmanagement": "^1.4.0 || ^2.0.0",
+    "stockmanagement": "^1.4.0 || ^2.0.0 || >=3.0.0-0",
     "billing": "^1.2.0-SNAPSHOT"
   },
   "extensions": [
@@ -21,14 +21,6 @@
       "slot": "order-item-additional-info-slot",
       "order": 1
     },
-    {
-      "name": "order-basket-action-menu",
-      "component": "orderBasketActionMenu",
-      "slots": [
-        "action-menu-patient-chart-items-slot",
-        "action-menu-ward-patient-items-slot"
-      ]
-    },
     {
       "name": "lab-result",
       "component": "labResult",
@@ -63,33 +55,33 @@
       }
     }
   ],
-  "workspaces": [
+  "workspaces2": [
     {
       "name": "order-basket",
-      "title": "orderBasketWorkspaceTitle",
       "component": "orderBasketWorkspace",
-      "type": "order",
-      "canHide": true
-    },
-    {
-      "name": "patient-orders-form-workspace",
-      "title": "orderCancellation",
-      "component": "patientOrdersFormWorkspace",
-      "type": "order",
-      "canHide": false
+      "window": "patient-chart-order-basket"
     },
     {
       "name": "test-results-form-workspace",
-      "title": "enterTestResults",
       "component": "testResultsFormWorkspace",
-      "type": "lab-results",
-      "canHide": false
+      "window": "lab-results"
     },
     {
       "name": "orderable-concept-workspace",
-      "title": "searchOrderables",
-      "component": "orderableConceptSearch",
-      "type": "order"
+      "component": "addGeneralOrderWorkspace",
+      "window": "patient-chart-order-basket"
+    }
+  ],
+  "workspaceWindows2": [
+    {
+      "name": "patient-chart-order-basket",
+      "icon": "ShoppingCartIcon",
+      "group": "patient-chart",
+      "order": 1
+    },
+    {
+      "name": "lab-results",
+      "group": "patient-chart"
     }
   ],
   "modals": [

package/src/utils/index.ts

@@ -1,4 +1,10 @@
-import { type Order, type OrderAction, type OrderBasketItem } from '@openmrs/esm-patient-common-lib';
+import {
+  type DrugOrderBasketItem,
+  type TestOrderBasketItem,
+  type Order,
+  type OrderAction,
+  type OrderBasketItem,
+} from '@openmrs/esm-patient-common-lib';
 import { type ObservationValue } from '../types/encounter';
 
 /**
@@ -24,7 +30,7 @@ export function compare<T>(x?: T, y?: T) {
 /**
  * Builds medication order object from the given order object
  */
-export function buildMedicationOrder(order: Order, action?: OrderAction) {
+export function buildMedicationOrder(order: Order, action?: OrderAction): DrugOrderBasketItem {
   return {
     display: order.drug?.display,
     previousOrder: action !== 'NEW' ? order.uuid : null,
@@ -64,13 +70,15 @@ export function buildMedicationOrder(order: Order, action?: OrderAction) {
       value: order.quantityUnits?.display,
       valueCoded: order.quantityUnits?.uuid,
     },
+    encounterUuid: order.encounter?.uuid,
+    visit: order.encounter.visit,
   };
 }
 
 /**
  * Builds lab order object from the given order object
  */
-export function buildLabOrder(order: Order, action?: OrderAction) {
+export function buildLabOrder(order: Order, action?: OrderAction): TestOrderBasketItem {
   return {
     action: action,
     display: order.display,
@@ -89,6 +97,8 @@ export function buildLabOrder(order: Order, action?: OrderAction) {
     orderType: order.orderType.uuid,
     specimenSource: null,
     scheduledDate: order.scheduledDate ? new Date(order.scheduledDate) : null,
+    encounterUuid: order.encounter?.uuid,
+    visit: order.encounter.visit,
   };
 }
 
@@ -109,6 +119,8 @@ export function buildGeneralOrder(order: Order, action?: OrderAction): OrderBask
     orderNumber: order.orderNumber,
     orderType: order.orderType.uuid,
     scheduledDate: order.scheduledDate ? new Date(order.scheduledDate) : null,
+    encounterUuid: order.encounter?.uuid,
+    visit: order.encounter.visit,
   };
 }
 

package/translations/am.json

@@ -2,6 +2,7 @@
   "actionsMenu": "Actions menu",
   "add": "Add",
   "additionalInstructions": "Additional instructions",
+  "addMedication": "Add medication",
   "addOrderableForOrderType": "Add {{orderTypeDisplay}}",
   "addResults": "Add results",
   "allOrders": "All orders",
@@ -122,5 +123,6 @@
   "tryTo": "Try to",
   "updated": "Updated",
   "usingADifferentTerm": "using a different term",
+  "view": "View",
   "visitRequired": "A visit is required to make orders"
 }

package/translations/ar.json

@@ -2,6 +2,7 @@
   "actionsMenu": "Actions menu",
   "add": "Add",
   "additionalInstructions": "Additional instructions",
+  "addMedication": "Add medication",
   "addOrderableForOrderType": "Add {{orderTypeDisplay}}",
   "addResults": "إضافة النتائج",
   "allOrders": "All orders",
@@ -122,5 +123,6 @@
   "tryTo": "Try to",
   "updated": "Updated",
   "usingADifferentTerm": "using a different term",
+  "view": "View",
   "visitRequired": "A visit is required to make orders"
 }

package/translations/ar_SY.json

@@ -2,6 +2,7 @@
   "actionsMenu": "Actions menu",
   "add": "Add",
   "additionalInstructions": "Additional instructions",
+  "addMedication": "Add medication",
   "addOrderableForOrderType": "Add {{orderTypeDisplay}}",
   "addResults": "Add results",
   "allOrders": "All orders",
@@ -122,5 +123,6 @@
   "tryTo": "Try to",
   "updated": "Updated",
   "usingADifferentTerm": "using a different term",
+  "view": "View",
   "visitRequired": "A visit is required to make orders"
 }

package/translations/bn.json

@@ -2,6 +2,7 @@
   "actionsMenu": "Actions menu",
   "add": "Add",
   "additionalInstructions": "Additional instructions",
+  "addMedication": "Add medication",
   "addOrderableForOrderType": "Add {{orderTypeDisplay}}",
   "addResults": "Add results",
   "allOrders": "All orders",
@@ -122,5 +123,6 @@
   "tryTo": "Try to",
   "updated": "Updated",
   "usingADifferentTerm": "using a different term",
+  "view": "View",
   "visitRequired": "A visit is required to make orders"
 }

package/translations/de.json

@@ -2,6 +2,7 @@
   "actionsMenu": "Actions menu",
   "add": "Add",
   "additionalInstructions": "Additional instructions",
+  "addMedication": "Add medication",
   "addOrderableForOrderType": "Add {{orderTypeDisplay}}",
   "addResults": "Add results",
   "allOrders": "All orders",
@@ -122,5 +123,6 @@
   "tryTo": "Try to",
   "updated": "Updated",
   "usingADifferentTerm": "using a different term",
+  "view": "View",
   "visitRequired": "A visit is required to make orders"
 }

package/translations/en.json

@@ -2,6 +2,7 @@
   "actionsMenu": "Actions menu",
   "add": "Add",
   "additionalInstructions": "Additional instructions",
+  "addMedication": "Add medication",
   "addOrderableForOrderType": "Add {{orderTypeDisplay}}",
   "addResults": "Add results",
   "allOrders": "All orders",
@@ -18,16 +19,17 @@
   "dateRange": "Date range",
   "directlyAddToBasket": "Add to basket",
   "discard": "Discard",
-  "discontinued": "Discontinued",
   "dosage": "Dosage",
   "dose": "Dose",
   "drugOrders": "drug orders",
+  "editOrderableForOrderType": "Edit {{orderTypeDisplay}}",
   "editResults": "Edit results",
   "endDate": "End date",
   "enterTestResults": "Enter test results",
   "error": "Error",
   "errorCancellingOrder": "Error cancelling order",
   "errorFetchingTestTypes": "Error fetching results for \"{{searchTerm}}\"",
+  "errorSavingDrugOrder": "Error saving order",
   "errorSavingLabResults": "Error saving lab results",
   "goToDrugOrderForm": "Order form",
   "indication": "Indication",
@@ -43,7 +45,6 @@
   "loadingTestDetails": "Loading test details",
   "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "medicationIndefiniteDuration": "Indefinite duration",
-  "medications": "Medications",
   "modifyOrder": "Modify order",
   "noIndicationProvided": "No indication provided",
   "noMatchingOrdersToDisplay": "No matching orders to display",
@@ -64,9 +65,7 @@
   "orderBasketWorkspaceTitle": "Order basket",
   "orderCancellation": "Order cancellation",
   "orderCancelled": "Order cancelled",
-  "orderCompleted": "Placed orders",
   "orderDetails": "Order details",
-  "ordered": "Placed order for",
   "orderedBy": "Ordered by",
   "ordererInformation": "Orderer information",
   "orderNumber": "Order number",
@@ -103,24 +102,21 @@
   "scheduledDateRequired": "Scheduled date is required",
   "searchAgain": "search again",
   "searchFieldOrder": "Search for {{orderType}} order",
-  "searchOrderables": "Search orderables",
   "searchResultsMatchesForTerm_one": "{{count}} results for \"{{searchTerm}}\"",
   "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
   "searchTable": "Search table",
   "selectOrderType": "Select order type",
   "signAndClose": "Sign and close",
-  "startAVisitToRecordOrders": "Start a visit to order",
-  "startVisit": "Start visit",
   "status": "Status",
   "successfullyCancelledOrder": "Order {{orderNumber}} has been cancelled successfully",
   "successfullySavedLabResults": "Lab results for {{orderNumber}} have been successfully updated",
+  "successSavingDrugOrder": "Order saved",
   "test": "Test",
   "testOrders": "test orders",
   "testType": "Test type",
   "tryReopeningTheWorkspaceAgain": "Please try launching the workspace again",
   "trySearchingAgain": "Please try searching again",
   "tryTo": "Try to",
-  "updated": "Updated",
   "usingADifferentTerm": "using a different term",
-  "visitRequired": "A visit is required to make orders"
+  "view": "View"
 }

package/translations/en_US.json

@@ -2,6 +2,7 @@
   "actionsMenu": "Actions menu",
   "add": "Add",
   "additionalInstructions": "Additional instructions",
+  "addMedication": "Add medication",
   "addOrderableForOrderType": "Add {{orderTypeDisplay}}",
   "addResults": "Add results",
   "allOrders": "All orders",
@@ -122,5 +123,6 @@
   "tryTo": "Try to",
   "updated": "Updated",
   "usingADifferentTerm": "using a different term",
+  "view": "View",
   "visitRequired": "A visit is required to make orders"
 }

package/translations/es.json

@@ -2,6 +2,7 @@
   "actionsMenu": "Menú de acciones",
   "add": "Agregar",
   "additionalInstructions": "Instrucciones adicionales",
+  "addMedication": "Add medication",
   "addOrderableForOrderType": "Agregar {{orderTypeDisplay}}",
   "addResults": "Agregar resultados",
   "allOrders": "Todas las órdenes",
@@ -122,5 +123,6 @@
   "tryTo": "Intente",
   "updated": "Actualizado",
   "usingADifferentTerm": "utilizando un término diferente",
+  "view": "View",
   "visitRequired": "Se requiere una consulta para realizar órdenes"
 }

package/translations/es_MX.json

@@ -2,6 +2,7 @@
   "actionsMenu": "Actions menu",
   "add": "Add",
   "additionalInstructions": "Additional instructions",
+  "addMedication": "Add medication",
   "addOrderableForOrderType": "Add {{orderTypeDisplay}}",
   "addResults": "Add results",
   "allOrders": "All orders",
@@ -122,5 +123,6 @@
   "tryTo": "Try to",
   "updated": "Updated",
   "usingADifferentTerm": "using a different term",
+  "view": "View",
   "visitRequired": "A visit is required to make orders"
 }

package/translations/fr.json

@@ -2,6 +2,7 @@
   "actionsMenu": "Actions",
   "add": "Ajouter",
   "additionalInstructions": "Instructions supplémentaires",
+  "addMedication": "Ajouter un traitement",
   "addOrderableForOrderType": "{{orderTypeDisplay}}",
   "addResults": "Entrer des résultats",
   "allOrders": "Toutes les prescriptions",
@@ -21,7 +22,7 @@
   "discontinued": "Arrêté",
   "dosage": "Posologie",
   "dose": "Dose",
-  "drugOrders": "drug orders",
+  "drugOrders": "Prescriptions",
   "editResults": "Modifier les résultats",
   "endDate": "Date de fin",
   "enterTestResults": "Saisir des résultats d'examens",
@@ -49,7 +50,7 @@
   "noMatchingOrdersToDisplay": "Aucune prescription à afficher",
   "noResultsForTestTypeSearch": "Aucun résultat pour \"{{searchTerm}}\"",
   "normalRange": "Plage normale",
-  "notApplicable": "N/A",
+  "notApplicable": "Non disponible",
   "noTestData": "Aucune donnée d’analyse disponible.",
   "onDate": "on",
   "or": "ou",
@@ -72,7 +73,7 @@
   "orderNumber": "Numéro de référence",
   "orders": "Ordonnances",
   "Orders": "Ordonnances",
-  "ordersLower": "orders",
+  "ordersLower": "ordonnances",
   "orderType": "Type d'ordre",
   "outOfStock": "En rupture de stock",
   "pleaseFillField": "Veuillez remplir au moins un champ",
@@ -122,5 +123,6 @@
   "tryTo": "Essayez de",
   "updated": "Modifié",
   "usingADifferentTerm": "en utilisant un terme différent",
+  "view": "Afficher",
   "visitRequired": "Une visite est requise pour passer des prescriptions"
 }

package/translations/he.json

@@ -2,6 +2,7 @@
   "actionsMenu": "Actions menu",
   "add": "Add",
   "additionalInstructions": "Additional instructions",
+  "addMedication": "Add medication",
   "addOrderableForOrderType": "Add {{orderTypeDisplay}}",
   "addResults": "Add results",
   "allOrders": "All orders",
@@ -122,5 +123,6 @@
   "tryTo": "Try to",
   "updated": "Updated",
   "usingADifferentTerm": "using a different term",
+  "view": "View",
   "visitRequired": "A visit is required to make orders"
 }

package/translations/hi.json

@@ -2,6 +2,7 @@
   "actionsMenu": "Actions menu",
   "add": "Add",
   "additionalInstructions": "Additional instructions",
+  "addMedication": "Add medication",
   "addOrderableForOrderType": "Add {{orderTypeDisplay}}",
   "addResults": "Add results",
   "allOrders": "All orders",
@@ -122,5 +123,6 @@
   "tryTo": "Try to",
   "updated": "Updated",
   "usingADifferentTerm": "using a different term",
+  "view": "View",
   "visitRequired": "A visit is required to make orders"
 }

package/translations/hi_IN.json

@@ -2,6 +2,7 @@
   "actionsMenu": "Actions menu",
   "add": "Add",
   "additionalInstructions": "Additional instructions",
+  "addMedication": "Add medication",
   "addOrderableForOrderType": "Add {{orderTypeDisplay}}",
   "addResults": "Add results",
   "allOrders": "All orders",
@@ -122,5 +123,6 @@
   "tryTo": "Try to",
   "updated": "Updated",
   "usingADifferentTerm": "using a different term",
+  "view": "View",
   "visitRequired": "A visit is required to make orders"
 }

package/translations/id.json

@@ -2,6 +2,7 @@
   "actionsMenu": "Menu tindakan",
   "add": "Tambah",
   "additionalInstructions": "Instruksi tambahan",
+  "addMedication": "Add medication",
   "addOrderableForOrderType": "Tambahkan {{orderTypeDisplay}}",
   "addResults": "Tambahkan hasil",
   "allOrders": "Semua pesanan",
@@ -122,5 +123,6 @@
   "tryTo": "Coba",
   "updated": "Diperbarui",
   "usingADifferentTerm": "menggunakan istilah yang berbeda",
+  "view": "View",
   "visitRequired": "Kunjungan diperlukan untuk membuat pesanan"
 }