@openmrs/esm-patient-tests-app 11.3.1-patch.9310 → 11.3.1-patch.9508

package/src/test-orders/add-test-order/test-order-form.component.tsx

@@ -19,35 +19,35 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
 import { useTranslation } from 'react-i18next';
 import {
+  type DefaultPatientWorkspaceProps,
+  type Order,
   type OrderUrgency,
   priorityOptions,
   useOrderBasket,
   useOrderType,
-  type TestOrderBasketItem,
-  postOrder,
-  useMutatePatientOrders,
-  showOrderSuccessToast,
 } from '@openmrs/esm-patient-common-lib';
 import {
   ExtensionSlot,
+  launchWorkspace,
   OpenmrsDatePicker,
-  showSnackbar,
   useConfig,
   useLayoutType,
   useSession,
-  type Workspace2DefinitionProps,
 } from '@openmrs/esm-framework';
 import { prepTestOrderPostData, useOrderReasons } from '../api';
 import { ordersEqual } from './test-order';
 import { type ConfigObject } from '../../config-schema';
+import { type TestOrderBasketItem } from '../../types';
+import { WORKSPACES } from '../lab-order-basket-panel/lab-order-basket-panel.extension';
 import styles from './test-order-form.scss';
 
-export interface LabOrderFormProps {
-  closeWorkspace: Workspace2DefinitionProps['closeWorkspace'];
+export interface LabOrderFormProps extends DefaultPatientWorkspaceProps {
   initialOrder: TestOrderBasketItem;
   orderTypeUuid: string;
   orderableConceptSets: Array<string>;
-  setHasUnsavedChanges: (hasUnsavedChanges: boolean) => void;
+  prevWorkSpace: string;
+  isWorkSpaceType: (value: string) => boolean;
+  prevOrder: Order;
   patient: fhir.Patient;
 }
 
@@ -57,22 +57,25 @@ export interface LabOrderFormProps {
 export function LabOrderForm({
   initialOrder,
   closeWorkspace,
+  closeWorkspaceWithSavedChanges,
+  promptBeforeClosing,
   orderTypeUuid,
-  setHasUnsavedChanges,
+  orderableConceptSets,
+  prevWorkSpace,
+  isWorkSpaceType,
+  prevOrder,
+  patientUuid,
   patient,
 }: LabOrderFormProps) {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const session = useSession();
-  const { orders, setOrders, clearOrders } = useOrderBasket<TestOrderBasketItem>(
-    patient,
-    orderTypeUuid,
-    prepTestOrderPostData,
-  );
+  const isEditing = useMemo(() => initialOrder && initialOrder.action === 'REVISE', [initialOrder]);
+  const { orders, setOrders } = useOrderBasket<TestOrderBasketItem>(patient, orderTypeUuid, prepTestOrderPostData);
   const [showErrorNotification, setShowErrorNotification] = useState(false);
   const config = useConfig<ConfigObject>();
-  const { orderType } = useOrderType(orderTypeUuid);
-  const { mutate: mutateOrders } = useMutatePatientOrders(patient.id);
+  const { orderType, isLoadingOrderType } = useOrderType(orderTypeUuid);
+
   const orderReasonRequired = useMemo(
     () =>
       (config.labTestsWithOrderReasons?.find((c) => c.labTestUuid === initialOrder?.testType?.conceptUuid) || {})
@@ -144,7 +147,7 @@ export function LabOrderForm({
     return itemDisplay?.includes(inputValue);
   }, []);
 
-  const saveLabOrderToBasket = useCallback(
+  const handleFormSubmission = useCallback(
     (data: TestOrderBasketItem) => {
       const finalizedOrder: TestOrderBasketItem = {
         ...initialOrder,
@@ -167,46 +170,40 @@ export function LabOrderForm({
 
       setOrders(newOrders);
 
-      closeWorkspace({ discardUnsavedChanges: true });
+      closeWorkspaceWithSavedChanges({
+        onWorkspaceClose: () =>
+          typeof isWorkSpaceType === 'function' &&
+          isWorkSpaceType(prevWorkSpace) &&
+          prevWorkSpace === WORKSPACES.TEST_RESULTS_FORM
+            ? launchWorkspace(prevWorkSpace, { order: prevOrder })
+            : launchWorkspace(WORKSPACES.ORDER_BASKET),
+        closeWorkspaceGroup: false,
+      });
     },
-    [orders, setOrders, session?.currentProvider?.uuid, closeWorkspace, initialOrder],
-  );
-
-  const submitLabOrderToServer = useCallback(
-    (data: TestOrderBasketItem) => {
-      const finalizedOrder: TestOrderBasketItem = {
-        ...initialOrder,
-        ...data,
-      };
-      finalizedOrder.orderer = session.currentProvider.uuid;
-      postOrder(prepTestOrderPostData(finalizedOrder, patient.id, finalizedOrder?.encounterUuid))
-        .then(() => {
-          clearOrders();
-          mutateOrders();
-          showOrderSuccessToast(t, [finalizedOrder]);
-          closeWorkspace({ discardUnsavedChanges: true });
-        })
-        .catch((error) => {
-          showSnackbar({
-            isLowContrast: false,
-            kind: 'error',
-            title: t('errorSavingLabOrder', 'Error saving lab order'),
-            subtitle: error.message,
-          });
-        });
-    },
-    [clearOrders, closeWorkspace, initialOrder, mutateOrders, patient.id, session.currentProvider.uuid, t],
+    [
+      orders,
+      setOrders,
+      session?.currentProvider?.uuid,
+      closeWorkspaceWithSavedChanges,
+      initialOrder,
+      isWorkSpaceType,
+      prevOrder,
+      prevWorkSpace,
+    ],
   );
 
   const cancelOrder = useCallback(() => {
     setOrders(orders.filter((order) => order.testType.conceptUuid !== defaultValues.testType.conceptUuid));
-    closeWorkspace();
-  }, [closeWorkspace, orders, setOrders, defaultValues]);
-
-  const closeModifyOrderWorkspace = useCallback(() => {
-    clearOrders();
-    closeWorkspace();
-  }, [clearOrders, closeWorkspace]);
+    closeWorkspace({
+      onWorkspaceClose: () =>
+        typeof isWorkSpaceType === 'function' &&
+        isWorkSpaceType(prevWorkSpace) &&
+        prevWorkSpace === WORKSPACES.TEST_RESULTS_FORM
+          ? launchWorkspace(prevWorkSpace, { order: prevOrder })
+          : launchWorkspace(WORKSPACES.ORDER_BASKET),
+      closeWorkspaceGroup: false,
+    });
+  }, [closeWorkspace, orders, setOrders, defaultValues, isWorkSpaceType, prevOrder, prevWorkSpace]);
 
   const onError = (errors: FieldErrors<TestOrderBasketItem>) => {
     if (errors) {
@@ -228,23 +225,19 @@ export function LabOrderForm({
   );
 
   useEffect(() => {
-    setHasUnsavedChanges(isDirty);
-  }, [isDirty, setHasUnsavedChanges]);
+    promptBeforeClosing(() => isDirty);
+  }, [isDirty, promptBeforeClosing]);
 
   const responsiveSize = isTablet ? 'lg' : 'sm';
 
   return (
-    <Form
-      className={styles.orderForm}
-      onSubmit={handleSubmit(initialOrder?.action == 'REVISE' ? submitLabOrderToServer : saveLabOrderToBasket, onError)}
-      id="drugOrderForm"
-    >
+    <Form className={styles.orderForm} onSubmit={handleSubmit(handleFormSubmission, onError)} id="drugOrderForm">
       <div className={styles.form}>
         <ExtensionSlot name="top-of-lab-order-form-slot" state={{ order: initialOrder }} />
         <Grid className={styles.gridRow}>
           <Column lg={16} md={8} sm={4}>
             <InputWrapper>
-              <label className={styles.testTypeLabel}>{t('testType', 'Test type')}</label>
+              <span className={styles.testTypeLabel}>{t('testType', 'Test type')}</span>
               <p className={styles.testType}>{initialOrder?.testType?.label}</p>
             </InputWrapper>
           </Column>
@@ -388,16 +381,15 @@ export function LabOrderForm({
         <ButtonSet
           className={classNames(styles.buttonSet, isTablet ? styles.tabletButtonSet : styles.desktopButtonSet)}
         >
-          <Button
-            className={styles.button}
-            kind="secondary"
-            onClick={initialOrder?.action == 'REVISE' ? closeModifyOrderWorkspace : cancelOrder}
-            size="xl"
-          >
+          <Button className={styles.button} kind="secondary" onClick={cancelOrder} size="xl">
             {t('discard', 'Discard')}
           </Button>
           <Button className={styles.button} kind="primary" size="xl" type="submit">
-            {t('saveOrder', 'Save order')}
+            {typeof isWorkSpaceType === 'function' &&
+            isWorkSpaceType(prevWorkSpace) &&
+            prevWorkSpace === WORKSPACES.TEST_RESULTS_FORM
+              ? t('saveTest', 'Save test')
+              : t('saveOrder', 'Save order')}
           </Button>
         </ButtonSet>
       </div>

package/src/test-orders/add-test-order/test-order.ts

@@ -1,16 +1,16 @@
-import { priorityOptions, type OrderUrgency, type TestOrderBasketItem } from '@openmrs/esm-patient-common-lib';
+import { priorityOptions, type OrderUrgency } from '@openmrs/esm-patient-common-lib';
 import { type TestType } from './useTestTypes';
+import type { TestOrderBasketItem } from '../../types';
 
 type LabOrderRequest = Pick<TestOrderBasketItem, 'action' | 'testType'>;
 
-export function createEmptyLabOrder(testType: TestType, orderer: string, visit): TestOrderBasketItem {
+export function createEmptyLabOrder(testType: TestType, orderer: string): TestOrderBasketItem {
   return {
     action: 'NEW',
     urgency: priorityOptions[0].value as OrderUrgency,
     display: testType.label,
     testType,
     orderer,
-    visit,
   };
 }
 

package/src/test-orders/add-test-order/test-type-search.component.tsx

@@ -5,30 +5,34 @@ import { Button, ButtonSkeleton, Search, SkeletonText, Tile } from '@carbon/reac
 import { ShoppingCartArrowUp } from '@carbon/react/icons';
 import {
   ArrowRightIcon,
+  closeWorkspace,
+  launchWorkspace,
   ResponsiveWrapper,
   ShoppingCartArrowDownIcon,
   useDebounce,
   useLayoutType,
   useSession,
-  type Visit,
-  type Workspace2DefinitionProps,
 } from '@openmrs/esm-framework';
-import { useOrderBasket, type TestOrderBasketItem } from '@openmrs/esm-patient-common-lib';
+import { useOrderBasket, type Order } from '@openmrs/esm-patient-common-lib';
+import type { TestOrderBasketItem } from '../../types';
 import { prepTestOrderPostData } from '../api';
 import { createEmptyLabOrder } from './test-order';
 import { useTestTypes, type TestType } from './useTestTypes';
+import { WORKSPACES } from '../lab-order-basket-panel/lab-order-basket-panel.extension';
 import styles from './test-type-search.scss';
 
 export interface TestTypeSearchProps {
   openLabForm: (searchResult: TestOrderBasketItem) => void;
   orderTypeUuid: string;
   orderableConceptSets: Array<string>;
-  closeWorkspace: Workspace2DefinitionProps['closeWorkspace'];
+  prevWorkSpace: string;
+  isWorkSpaceType: (value: string) => boolean;
+  prevOrder: Order;
   patient: fhir.Patient;
-  visit: Visit;
 }
 
 interface TestTypeSearchResultsProps extends TestTypeSearchProps {
+  cancelOrder: () => void;
   searchTerm: string;
   focusAndClearSearchInput: () => void;
   patient: fhir.Patient;
@@ -38,18 +42,20 @@ interface TestTypeSearchResultItemProps {
   orderTypeUuid: string;
   testType: TestType;
   openOrderForm: (searchResult: TestOrderBasketItem) => void;
+  prevWorkSpace: string;
+  isWorkSpaceType: (value: string) => boolean;
+  prevOrder: Order;
   patient: fhir.Patient;
-  visit: Visit;
-  closeWorkspace: Workspace2DefinitionProps['closeWorkspace'];
 }
 
 export function TestTypeSearch({
-  patient,
-  visit,
   openLabForm,
   orderTypeUuid,
   orderableConceptSets,
-  closeWorkspace,
+  prevWorkSpace,
+  isWorkSpaceType,
+  prevOrder,
+  patient,
 }: TestTypeSearchProps) {
   const { t } = useTranslation();
   const [searchTerm, setSearchTerm] = useState('');
@@ -61,6 +67,18 @@ export function TestTypeSearch({
     searchInputRef.current?.focus();
   }, [setSearchTerm]);
 
+  const cancelOrder = useCallback(() => {
+    closeWorkspace('add-lab-order', {
+      ignoreChanges: true,
+      onWorkspaceClose: () =>
+        typeof isWorkSpaceType === 'function' &&
+        isWorkSpaceType(prevWorkSpace) &&
+        prevWorkSpace === WORKSPACES.TEST_RESULTS_FORM
+          ? launchWorkspace(prevWorkSpace, { order: prevOrder })
+          : launchWorkspace(WORKSPACES.ORDER_BASKET),
+    });
+  }, [isWorkSpaceType, prevOrder, prevWorkSpace]);
+
   const handleSearchTermChange = useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
       setSearchTerm(event.target.value ?? '');
@@ -82,28 +100,32 @@ export function TestTypeSearch({
         />
       </ResponsiveWrapper>
       <TestTypeSearchResults
-        closeWorkspace={closeWorkspace}
+        cancelOrder={cancelOrder}
         orderTypeUuid={orderTypeUuid}
         orderableConceptSets={orderableConceptSets}
         focusAndClearSearchInput={focusAndClearSearchInput}
         openLabForm={openLabForm}
         searchTerm={debouncedSearchTerm}
+        prevWorkSpace={prevWorkSpace}
+        isWorkSpaceType={isWorkSpaceType}
+        prevOrder={prevOrder}
         patient={patient}
-        visit={visit}
       />
     </>
   );
 }
 
 function TestTypeSearchResults({
-  closeWorkspace,
+  cancelOrder,
   searchTerm,
   orderTypeUuid,
   orderableConceptSets,
   openLabForm,
   focusAndClearSearchInput,
+  prevWorkSpace,
+  isWorkSpaceType,
+  prevOrder,
   patient,
-  visit,
 }: TestTypeSearchResultsProps) {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
@@ -154,9 +176,10 @@ function TestTypeSearchResults({
                 orderTypeUuid={orderTypeUuid}
                 openOrderForm={openLabForm}
                 testType={testType}
-                closeWorkspace={closeWorkspace}
+                prevWorkSpace={prevWorkSpace}
+                isWorkSpaceType={isWorkSpaceType}
+                prevOrder={prevOrder}
                 patient={patient}
-                visit={visit}
               />
             ))}
           </div>
@@ -164,12 +187,12 @@ function TestTypeSearchResults({
         {isTablet && (
           <div className={styles.separatorContainer}>
             <p className={styles.separator}>{t('or', 'or')}</p>
-            <Button
-              iconDescription="Return to order basket"
-              kind="ghost"
-              onClick={() => closeWorkspace({ discardUnsavedChanges: true })}
-            >
-              {t('returnToOrderBasket', 'Return to order basket')}
+            <Button iconDescription="Return to order basket" kind="ghost" onClick={cancelOrder}>
+              {typeof isWorkSpaceType === 'function' &&
+              isWorkSpaceType(prevWorkSpace) &&
+              prevWorkSpace === WORKSPACES.TEST_RESULTS_FORM
+                ? t('backToTestResults', 'Back to test Results')
+                : t('backToOrderBasket', 'Back to order basket')}
             </Button>
           </div>
         )}
@@ -201,9 +224,10 @@ const TestTypeSearchResultItem: React.FC<TestTypeSearchResultItemProps> = ({
   testType,
   openOrderForm,
   orderTypeUuid,
-  closeWorkspace,
+  prevWorkSpace,
+  isWorkSpaceType,
+  prevOrder,
   patient,
-  visit,
 }) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
@@ -217,17 +241,25 @@ const TestTypeSearchResultItem: React.FC<TestTypeSearchResultItemProps> = ({
 
   const createLabOrder = useCallback(
     (orderableConcept: TestType) => {
-      return createEmptyLabOrder(orderableConcept, session.currentProvider?.uuid, visit);
+      return createEmptyLabOrder(orderableConcept, session.currentProvider?.uuid);
     },
-    [session.currentProvider.uuid, visit],
+    [session.currentProvider.uuid],
   );
 
   const addToBasket = useCallback(() => {
     const labOrder = createLabOrder(testType);
     labOrder.isOrderIncomplete = true;
     setOrders([...orders, labOrder]);
-    closeWorkspace({ discardUnsavedChanges: true });
-  }, [orders, setOrders, createLabOrder, testType, closeWorkspace]);
+    closeWorkspace('add-lab-order', {
+      ignoreChanges: true,
+      onWorkspaceClose: () =>
+        typeof isWorkSpaceType === 'function' &&
+        isWorkSpaceType(prevWorkSpace) &&
+        prevWorkSpace === WORKSPACES.TEST_RESULTS_FORM
+          ? launchWorkspace(prevWorkSpace, { order: prevOrder })
+          : launchWorkspace(WORKSPACES.ORDER_BASKET),
+    });
+  }, [orders, setOrders, createLabOrder, testType, isWorkSpaceType, prevOrder, prevWorkSpace]);
 
   const removeFromBasket = useCallback(() => {
     setOrders(orders.filter((order) => order.testType.conceptUuid !== testType.conceptUuid));

package/src/test-orders/api.ts

@@ -2,12 +2,7 @@ import { useCallback, useMemo } from 'react';
 import { chunk } from 'lodash-es';
 import useSWR, { useSWRConfig } from 'swr';
 import useSWRImmutable from 'swr/immutable';
-import type {
-  OrderPost,
-  PatientOrderFetchResponse,
-  TestOrderBasketItem,
-  TestOrderPost,
-} from '@openmrs/esm-patient-common-lib';
+import type { OrderPost, PatientOrderFetchResponse, TestOrderPost } from '@openmrs/esm-patient-common-lib';
 import {
   type FetchResponse,
   openmrsFetch,
@@ -17,6 +12,7 @@ import {
   useConfig,
 } from '@openmrs/esm-framework';
 import { type ConfigObject } from '../config-schema';
+import type { TestOrderBasketItem } from '../types';
 
 export const careSettingUuid = '6f0c9a92-6f24-11e3-af88-005056821db0';
 

package/src/test-orders/lab-order-basket-panel/lab-icon.component.tsx

@@ -0,0 +1,27 @@
+import React from 'react';
+
+interface LabIconProps {
+  isTablet: boolean;
+}
+
+function LabIcon({ isTablet }: LabIconProps) {
+  const size = isTablet ? 40 : 24;
+  return (
+    <svg width={size} height={size} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <g clipPath="url(#clip0_lab_icon)">
+        <path d="M24 0H0V24H24V0Z" fill="#E8DAFF" />
+        <path
+          d="M17.6157 15.8091L14 10.8374V6H15V5H9V6H10V10.8374L6.3843 15.8091C5.9398 16.4203 5.87585 17.2292 6.2188 17.9026C6.56175 18.576 7.25358 19 8.0093 19H15.9907C16.7464 19 17.4383 18.576 17.7812 17.9026C18.1242 17.2292 18.0602 16.4203 17.6157 15.8091ZM11 11.1626V6H13V11.1626L14.3364 13H9.6636L11 11.1626ZM15.9907 18H8.0093C7.62971 17.9999 7.28226 17.7868 7.10998 17.4486C6.93771 17.1103 6.96973 16.704 7.19285 16.3969L8.9363 14H15.0637L16.8072 16.3969C17.0303 16.704 17.0623 17.1103 16.89 17.4486C16.7178 17.7868 16.3703 17.9999 15.9907 18Z"
+          fill="#6929C4"
+        />
+      </g>
+      <defs>
+        <clipPath id="clip0_lab_icon">
+          <rect width={size} height={size} fill="white" />
+        </clipPath>
+      </defs>
+    </svg>
+  );
+}
+
+export default LabIcon;

package/src/test-orders/lab-order-basket-panel/lab-order-basket-item-tile.component.tsx

@@ -3,7 +3,7 @@ import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { ClickableTile, IconButton, Tile } from '@carbon/react';
 import { ExtensionSlot, TrashCanIcon, useLayoutType, WarningIcon } from '@openmrs/esm-framework';
-import type { TestOrderBasketItem } from '@openmrs/esm-patient-common-lib';
+import type { TestOrderBasketItem } from '../../types';
 import styles from './lab-order-basket-item-tile.scss';
 
 export interface OrderBasketItemTileProps {