(fix)03-2426: Closing drug search panel should send user back to orde…

…r basket if they previously had it open

packages/esm-patient-chart-app/src/workspace/workspace-window.component.tsx

@@ -1,6 +1,11 @@
 import React, { useMemo } from 'react';
 import { ExtensionSlot, useBodyScrollLock, useLayoutType, usePatient } from '@openmrs/esm-framework';
-import { type OpenWorkspace, useWorkspaces, updateWorkspaceWindowState } from '@openmrs/esm-patient-common-lib';
+import {
+ type OpenWorkspace,
+ useWorkspaces,
+ updateWorkspaceWindowState,
+ launchPatientWorkspace,
+} from '@openmrs/esm-patient-common-lib';
 import { Header, HeaderGlobalBar, HeaderName, HeaderMenuButton, HeaderGlobalAction, IconButton } from '@carbon/react';
 import { ArrowLeft, ArrowRight, Close, DownToBottom, Maximize, Minimize } from '@carbon/react/icons';
 import { useTranslation } from 'react-i18next';
@@ -47,12 +52,7 @@ const WorkspaceWindow: React.FC<ContextWorkspaceParams> = () => {
  <aside
  className={`${styles.container} ${width === 'narrow' ? styles.narrowWorkspace : styles.widerWorkspace} ${
  maximized ? `${styles.maximized}` : undefined
- } ${
- isWorkspaceWindowOpen
- ? `${styles.show}`
- : `${styles.hide}
- }`
- }`}
+ } ${isWorkspaceWindowOpen ? `${styles.show}` : `${styles.hide}`}`}
  >
  <Header
  aria-label="Workspace Title"
@@ -89,7 +89,10 @@ const WorkspaceWindow: React.FC<ContextWorkspaceParams> = () => {
  <HeaderGlobalAction
  align="bottom-right"
  label={t('close', 'Close')}
- onClick={() => closeWorkspace?.()}
+ onClick={() => {
+ closeWorkspace?.();
+ launchPatientWorkspace('order-basket');
+ }}
  size="lg"
  >
  <Close />

packages/esm-patient-common-lib/src/workspaces/workspaces.ts

@@ -154,12 +154,26 @@ function promptBeforeLaunchingWorkspace(
  * @param name The name of the workspace to launch
  * @param additionalProps Props to pass to the workspace component being launched
  */
-export function launchPatientWorkspace(name: string, additionalProps?: object) {
+
+const myFunction = () => {
+ const orderBasketOpen = true;
+ if (orderBasketOpen) {
+ navigate({ to: '/order-basket' });
+ }
+};
+
+launchPatientWorkspace('drug-search-workspace', {
+ onClosingWorkspace: myFunction,
+});
+
+export function launchPatientWorkspace(name: string, additionalProps?: Record<string, any>) {
  const store = getWorkspaceStore();
  const workspace = getWorkspaceRegistration(name);
  const newWorkspace = {
  ...workspace,
- closeWorkspace: (ignoreChanges = true) => closeWorkspace(name, ignoreChanges),
+ closeWorkspace: (ignoreChanges = true) => {
+ closeWorkspace(name, ignoreChanges, additionalProps?.onClosingWorkspace);
+ },
  promptBeforeClosing: (testFcn) => promptBeforeClosing(name, testFcn),
  additionalProps,
  };
@@ -239,7 +253,7 @@ export function cancelPrompt() {
  store.setState({ ...state, prompt: null });
 }
 
-export function closeWorkspace(name: string, ignoreChanges: boolean) {
+export function closeWorkspace(name: string, ignoreChanges: boolean, onClosingWorkspace: () => void) {
  const store = getWorkspaceStore();
  const promptCheckFcn = getPromptBeforeClosingFcn(name);
  if (!ignoreChanges && promptCheckFcn && promptCheckFcn()) {
@@ -253,13 +267,15 @@ export function closeWorkspace(name: string, ignoreChanges: boolean) {
  onConfirm: () => {
  const state = store.getState();
  store.setState({ ...state, prompt: null, openWorkspaces: state.openWorkspaces.filter((w) => w.name != name) });
+ onClosingWorkspace?.();
  },
  confirmText: translateFrom('@openmrs/esm-patient-chart-app', 'discard', 'Discard'),
  };
  store.setState({ ...store.getState(), prompt });
  } else {
  const state = store.getState();
  store.setState({ ...state, openWorkspaces: state.openWorkspaces.filter((w) => w.name != name) });
+ onClosingWorkspace?.();
  }
 }