From 845b05f8ce2dfa8ce91cb52b1c7fe638d6bc7387 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Wed, 24 Jan 2024 11:44:33 +0530
Subject: [PATCH 01/39] Updated the workspaces.ts to accomodate proper checks
 when closing workspaces

---
 .../src/workspaces/workspaces.ts              | 176 +++++++++++++-----
 1 file changed, 132 insertions(+), 44 deletions(-)

diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
index 516725394e..411d8fccc9 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
@@ -21,10 +21,17 @@ export interface WorkspaceStoreState {
   workspaceWindowState: WorkspaceWindowState;
 }
 
+interface CloseWorkspaceOptions {
+  workspaceTitle?: string;
+  ignoreChanges?: boolean;
+  onWorkspaceClose?: () => void;
+  confirmBeforeClosing?: boolean;
+}
+
 export interface OpenWorkspace extends WorkspaceRegistration {
   additionalProps: object;
-  closeWorkspace(promptBeforeClosing?: boolean): void;
-  closeWorkspace(): void;
+  closeWorkspace(closeWorkspaceOptions?: CloseWorkspaceOptions): boolean;
+  closeWorkspace(): boolean;
   promptBeforeClosing(testFcn: () => boolean): void;
 }
 
@@ -103,40 +110,28 @@ function getTitleFromExtension(ext: ExtensionRegistration) {
   return ext.name;
 }
 
+function getWhetherWorkspaceCanBeClosed(name: string, ignoreChanges: boolean = false) {
+  const promptBeforeFn = getPromptBeforeClosingFcn(name);
+  return ignoreChanges || !promptBeforeFn || !promptBeforeFn();
+}
+
 function promptBeforeLaunchingWorkspace(
   workspace: OpenWorkspace,
   newWorkspaceDetails: { name: string; additionalProps?: object },
 ) {
-  const store = getWorkspaceStore();
   const { name, additionalProps } = newWorkspaceDetails;
-  const promptCheckFcn = getPromptBeforeClosingFcn(workspace.name);
 
   const proceed = () => {
-    workspace.closeWorkspace();
-    // Calling the launchPatientWorkspace again, since one of the `if` case
-    // might resolve, but we need to check all the cases before launching the form.
-    launchPatientWorkspace(name, additionalProps);
+    workspace.closeWorkspace({
+      onWorkspaceClose: () => launchPatientWorkspace(name, additionalProps),
+    });
   };
 
-  if (!promptCheckFcn || promptCheckFcn()) {
-    const currentName = workspace.title ?? workspace.name;
-    const prompt: Prompt = {
-      title: translateFrom('@openmrs/esm-patient-chart-app', 'unsavedChanges', 'You have unsaved changes'),
-      body: translateFrom(
-        '@openmrs/esm-patient-chart-app',
-        'unsavedChangesInForm',
-        'There are unsaved changes in {{formName}}. Please save them before opening another form.',
-        { formName: currentName },
-      ),
-      onConfirm: () => {
-        store.setState({
-          prompt: null,
-        });
-        proceed();
-      },
-      confirmText: translateFrom('@openmrs/esm-patient-chart-app', 'openAnyway', 'Open anyway'),
-    };
-    store.setState((state) => ({ ...state, prompt }));
+  // Calling the launchPatientWorkspace again, since one of the `if` case
+  // might resolve, but we need to check all the cases before launching the form.
+
+  if (!getWhetherWorkspaceCanBeClosed(workspace.name)) {
+    showWorkspacePrompts('closing-workspace-launching-new-workspace', proceed, workspace.title ?? workspace.name);
   } else {
     proceed();
   }
@@ -166,7 +161,11 @@ export function launchPatientWorkspace(name: string, additionalProps?: object) {
   const workspace = getWorkspaceRegistration(name);
   const newWorkspace = {
     ...workspace,
-    closeWorkspace: (ignoreChanges = true) => closeWorkspace(name, ignoreChanges),
+    closeWorkspace: (options: CloseWorkspaceOptions = {}) =>
+      closeWorkspace(name, {
+        workspaceTitle: workspace.title,
+        ...options,
+      }),
     promptBeforeClosing: (testFcn) => promptBeforeClosing(name, testFcn),
     additionalProps,
   };
@@ -244,9 +243,14 @@ export function cancelPrompt() {
   store.setState({ ...state, prompt: null });
 }
 
-export function closeWorkspace(name: string, ignoreChanges: boolean) {
+export function closeWorkspace(
+  name: string,
+  options: CloseWorkspaceOptions = {
+    ignoreChanges: false,
+    onWorkspaceClose: () => {},
+  },
+): boolean {
   const store = getWorkspaceStore();
-  const promptCheckFcn = getPromptBeforeClosingFcn(name);
 
   const updateStoreWithClosedWorkspace = () => {
     const state = store.getState();
@@ -258,24 +262,17 @@ export function closeWorkspace(name: string, ignoreChanges: boolean) {
       openWorkspaces: newOpenWorkspaces,
       workspaceWindowState: getUpdatedWorkspaceWindowState(newOpenWorkspaces?.[0]),
     });
+
+    options?.onWorkspaceClose?.();
   };
 
-  if (!ignoreChanges && promptCheckFcn && promptCheckFcn()) {
-    const prompt: Prompt = {
-      title: translateFrom('@openmrs/esm-patient-chart-app', 'unsavedChangesTitleText', 'Unsaved Changes'),
-      body: translateFrom(
-        '@openmrs/esm-patient-chart-app',
-        'unsavedChangeText',
-        `You have unsaved changes in the side panel. Do you want to discard these changes?`,
-      ),
-      onConfirm: () => {
-        updateStoreWithClosedWorkspace();
-      },
-      confirmText: translateFrom('@openmrs/esm-patient-chart-app', 'discard', 'Discard'),
-    };
-    store.setState({ ...store.getState(), prompt });
+  if (!getWhetherWorkspaceCanBeClosed(name, options?.ignoreChanges)) {
+    const currentName = options?.workspaceTitle ?? name;
+    showWorkspacePrompts('closing-workspace', updateStoreWithClosedWorkspace, currentName);
+    return false;
   } else {
     updateStoreWithClosedWorkspace();
+    return true;
   }
 }
 
@@ -325,3 +322,94 @@ function getUpdatedWorkspaceWindowState(workspaceAtTop: OpenWorkspace) {
 export function resetWorkspaceStore() {
   getWorkspaceStore().setState(initialState);
 }
+
+type PromptType = 'closing-workspace' | 'closing-all-workspaces' | 'closing-workspace-launching-new-workspace';
+
+export function showWorkspacePrompts(
+  promptType: PromptType,
+  onConfirmation: () => void = () => {},
+  workspaceTitle: string = '',
+) {
+  const store = getWorkspaceStore();
+
+  switch (promptType) {
+    case 'closing-workspace': {
+      const prompt: Prompt = {
+        title: translateFrom('@openmrs/esm-patient-chart-app', 'unsavedChanges', 'You have unsaved changes'),
+        body: translateFrom(
+          '@openmrs/esm-patient-chart-app',
+          'unsavedChangesInForm',
+          'There are unsaved changes in {{formName}}. Please save them before opening another form.',
+          { formName: workspaceTitle },
+        ),
+        onConfirm: () => {
+          onConfirmation?.();
+        },
+        confirmText: translateFrom('@openmrs/esm-patient-chart-app', 'openAnyway', 'Open anyway'),
+      };
+      store.setState((prevState) => ({ ...prevState, prompt }));
+      return;
+    }
+
+    case 'closing-all-workspaces': {
+      const workspacesNotClosed = store
+        .getState()
+        .openWorkspaces.filter(({ name }) => !getWhetherWorkspaceCanBeClosed(name))
+        .map(({ title }, indx) => `${indx + 1}. ${title}`);
+
+      const prompt: Prompt = {
+        title: translateFrom('@openmrs/esm-patient-chart-app', 'unsavedChanges', 'You have unsaved changes'),
+        body: translateFrom(
+          '@openmrs/esm-patient-chart-app',
+          'unsavedChangesInForms',
+          `There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}`,
+          {
+            workspaceNames: workspacesNotClosed.join(' '),
+          },
+        ),
+        onConfirm: () => {
+          onConfirmation?.();
+        },
+        confirmText: translateFrom(
+          '@openmrs/esm-patient-chart-app',
+          'closeWorkspaces',
+          'Discard changes in {{count}} workspaces',
+          { count: workspacesNotClosed.length },
+        ),
+      };
+      store.setState((prevState) => ({
+        ...prevState,
+        prompt,
+      }));
+      return;
+    }
+    case 'closing-workspace-launching-new-workspace': {
+      const prompt: Prompt = {
+        title: translateFrom('@openmrs/esm-patient-chart-app', 'unsavedChanges', 'You have unsaved changes'),
+        body: translateFrom(
+          '@openmrs/esm-patient-chart-app',
+          'unsavedChangesInForm',
+          'There are unsaved changes in {{formName}}. Please save them before opening another form.',
+          { formName: workspaceTitle },
+        ),
+        onConfirm: () => {
+          store.setState((prevState) => ({
+            ...prevState,
+            prompt: null,
+          }));
+          onConfirmation?.();
+        },
+        confirmText: translateFrom('@openmrs/esm-patient-chart-app', 'openAnyway', 'Open anyway'),
+      };
+      store.setState((prevState) => ({
+        ...prevState,
+        prompt,
+      }));
+      return;
+    }
+    default: {
+      onConfirmation?.();
+      return;
+    }
+  }
+}

From af5f69d0acdd6e53aa4ceba9b1924664b9abbc1a Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Wed, 24 Jan 2024 11:54:06 +0530
Subject: [PATCH 02/39] Allergies workspace registered correctly with register
 workspace

---
 .../esm-patient-allergies-app/src/index.ts    | 20 +++++++++++++++----
 .../esm-patient-allergies-app/src/routes.json | 12 -----------
 .../translations/am.json                      |  1 +
 .../translations/ar.json                      |  1 +
 .../translations/en.json                      |  1 +
 .../translations/es.json                      |  1 +
 .../translations/fr.json                      |  1 +
 .../translations/he.json                      |  1 +
 .../translations/km.json                      |  1 +
 .../translations/zh.json                      |  1 +
 .../translations/zh_CN.json                   |  1 +
 11 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/packages/esm-patient-allergies-app/src/index.ts b/packages/esm-patient-allergies-app/src/index.ts
index 3eb5bed821..8a98a4b544 100644
--- a/packages/esm-patient-allergies-app/src/index.ts
+++ b/packages/esm-patient-allergies-app/src/index.ts
@@ -1,9 +1,15 @@
-import { defineConfigSchema, fhirBaseUrl, getSyncLifecycle, messageOmrsServiceWorker } from '@openmrs/esm-framework';
-import { createDashboardLink } from '@openmrs/esm-patient-common-lib';
+import {
+  defineConfigSchema,
+  fhirBaseUrl,
+  getAsyncLifecycle,
+  getSyncLifecycle,
+  messageOmrsServiceWorker,
+  translateFrom,
+} from '@openmrs/esm-framework';
+import { createDashboardLink, registerWorkspace } from '@openmrs/esm-patient-common-lib';
 import { configSchema } from './config-schema';
 import { dashboardMeta } from './dashboard.meta';
 import allergiesDetailedSummaryComponent from './allergies/allergies-detailed-summary.component';
-import allergyFormComponent from './allergies/allergies-form/allergy-form.component';
 import allergyTileComponent from './allergies/allergies-tile.component';
 
 const moduleName = '@openmrs/esm-patient-allergies-app';
@@ -45,6 +51,12 @@ export const allergiesDashboardLink = getSyncLifecycle(
   options,
 );
 
-export const allergiesForm = getSyncLifecycle(allergyFormComponent, options);
+// t('recordNewAllergy', "Record a new allergy")
+registerWorkspace({
+  name: 'patient-allergy-form-workspace',
+  title: translateFrom(moduleName, 'recordNewAllergy', 'Record a new allergy'),
+  load: getAsyncLifecycle(() => import('./allergies/allergies-form/allergy-form.component'), options),
+  type: 'form',
+});
 
 export const allergyTile = getSyncLifecycle(allergyTileComponent, options);
diff --git a/packages/esm-patient-allergies-app/src/routes.json b/packages/esm-patient-allergies-app/src/routes.json
index 36a40340a8..a3a331da81 100644
--- a/packages/esm-patient-allergies-app/src/routes.json
+++ b/packages/esm-patient-allergies-app/src/routes.json
@@ -23,18 +23,6 @@
         "columnSpan": 1
       }
     },
-    {
-      "name": "patient-allergy-form-workspace",
-      "component": "allergiesForm",
-      "online": true,
-      "offline": true,
-      "meta": {
-        "title": {
-          "key": "recordNewAllergy",
-          "default": "Record a new allergy"
-        }
-      }
-    },
     {
       "name": "allergies-summary-dashboard",
       "component": "allergiesDashboardLink",
diff --git a/packages/esm-patient-allergies-app/translations/am.json b/packages/esm-patient-allergies-app/translations/am.json
index 14d79b2cc0..ec63e9f016 100644
--- a/packages/esm-patient-allergies-app/translations/am.json
+++ b/packages/esm-patient-allergies-app/translations/am.json
@@ -22,6 +22,7 @@
   "otherNonCodedAllergicReaction": "Other non-coded allergic reaction",
   "reaction": "Reaction",
   "reactions": "Reactions",
+  "recordNewAllergy": "Record a new allergy",
   "saveAndClose": "Save and close",
   "seeAll": "See all",
   "selectAllergen": "Select the allergen",
diff --git a/packages/esm-patient-allergies-app/translations/ar.json b/packages/esm-patient-allergies-app/translations/ar.json
index 74ba4cdf2f..57e1436377 100644
--- a/packages/esm-patient-allergies-app/translations/ar.json
+++ b/packages/esm-patient-allergies-app/translations/ar.json
@@ -22,6 +22,7 @@
   "otherNonCodedAllergicReaction": "رد فعل حساسية غير مشفر آخر",
   "reaction": "رد الفعل",
   "reactions": "ردود الفعل",
+  "recordNewAllergy": "Record a new allergy",
   "saveAndClose": "حفظ وإغلاق",
   "seeAll": "عرض الكل",
   "selectAllergen": "اختر المواد المسببة للحساسية",
diff --git a/packages/esm-patient-allergies-app/translations/en.json b/packages/esm-patient-allergies-app/translations/en.json
index 14d79b2cc0..ec63e9f016 100644
--- a/packages/esm-patient-allergies-app/translations/en.json
+++ b/packages/esm-patient-allergies-app/translations/en.json
@@ -22,6 +22,7 @@
   "otherNonCodedAllergicReaction": "Other non-coded allergic reaction",
   "reaction": "Reaction",
   "reactions": "Reactions",
+  "recordNewAllergy": "Record a new allergy",
   "saveAndClose": "Save and close",
   "seeAll": "See all",
   "selectAllergen": "Select the allergen",
diff --git a/packages/esm-patient-allergies-app/translations/es.json b/packages/esm-patient-allergies-app/translations/es.json
index 838c42e670..178dcac59d 100644
--- a/packages/esm-patient-allergies-app/translations/es.json
+++ b/packages/esm-patient-allergies-app/translations/es.json
@@ -22,6 +22,7 @@
   "otherNonCodedAllergicReaction": "Otra reacción alérgica no codificada",
   "reaction": "Reacción",
   "reactions": "Reacciones",
+  "recordNewAllergy": "Record a new allergy",
   "saveAndClose": "Guardar y cerrar",
   "seeAll": "Ver todo",
   "selectAllergen": "Seleccione el alérgeno",
diff --git a/packages/esm-patient-allergies-app/translations/fr.json b/packages/esm-patient-allergies-app/translations/fr.json
index 619106f274..2ad3915026 100644
--- a/packages/esm-patient-allergies-app/translations/fr.json
+++ b/packages/esm-patient-allergies-app/translations/fr.json
@@ -22,6 +22,7 @@
   "otherNonCodedAllergicReaction": "Autre réaction allergique non-codée",
   "reaction": "Reaction",
   "reactions": "Réactions",
+  "recordNewAllergy": "Record a new allergy",
   "saveAndClose": "Sauvegarder et fermer",
   "seeAll": "Voir tout",
   "selectAllergen": "Sélectionnez l'allergène",
diff --git a/packages/esm-patient-allergies-app/translations/he.json b/packages/esm-patient-allergies-app/translations/he.json
index c26a7e1445..18c33d5a76 100644
--- a/packages/esm-patient-allergies-app/translations/he.json
+++ b/packages/esm-patient-allergies-app/translations/he.json
@@ -22,6 +22,7 @@
   "otherNonCodedAllergicReaction": "תגובה אלרגנית אחרת לא מקודדת",
   "reaction": "תגובה",
   "reactions": "תגובות",
+  "recordNewAllergy": "Record a new allergy",
   "saveAndClose": "שמירה וסגירה",
   "seeAll": "הצג הכל",
   "selectAllergen": "בחר את האלרגן",
diff --git a/packages/esm-patient-allergies-app/translations/km.json b/packages/esm-patient-allergies-app/translations/km.json
index 91435f2164..13998be873 100644
--- a/packages/esm-patient-allergies-app/translations/km.json
+++ b/packages/esm-patient-allergies-app/translations/km.json
@@ -22,6 +22,7 @@
   "otherNonCodedAllergicReaction": "ប្រតិកម្មអាលែហ្សីដែលមិនមានលេខកូដផ្សេងទៀត។",
   "reaction": "Reaction",
   "reactions": "ប្រតិកម្ម",
+  "recordNewAllergy": "Record a new allergy",
   "saveAndClose": "រក្សាទុក និងបិទ",
   "seeAll": "មើលឃើញទាំងអស់",
   "selectAllergen": "ជ្រើសរើសអាឡែរហ្សី",
diff --git a/packages/esm-patient-allergies-app/translations/zh.json b/packages/esm-patient-allergies-app/translations/zh.json
index 6bf67400cd..f3d8397f04 100644
--- a/packages/esm-patient-allergies-app/translations/zh.json
+++ b/packages/esm-patient-allergies-app/translations/zh.json
@@ -22,6 +22,7 @@
   "otherNonCodedAllergicReaction": "其他非编码过敏反应",
   "reaction": "反应",
   "reactions": "反应",
+  "recordNewAllergy": "Record a new allergy",
   "saveAndClose": "保存并关闭",
   "seeAll": "查看全部",
   "selectAllergen": "选择过敏原",
diff --git a/packages/esm-patient-allergies-app/translations/zh_CN.json b/packages/esm-patient-allergies-app/translations/zh_CN.json
index 6bf67400cd..f3d8397f04 100644
--- a/packages/esm-patient-allergies-app/translations/zh_CN.json
+++ b/packages/esm-patient-allergies-app/translations/zh_CN.json
@@ -22,6 +22,7 @@
   "otherNonCodedAllergicReaction": "其他非编码过敏反应",
   "reaction": "反应",
   "reactions": "反应",
+  "recordNewAllergy": "Record a new allergy",
   "saveAndClose": "保存并关闭",
   "seeAll": "查看全部",
   "selectAllergen": "选择过敏原",

From c753397b199c4d4549f9a1c6cc9e2d75c6b94c37 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Wed, 24 Jan 2024 12:24:11 +0530
Subject: [PATCH 03/39] Fixed the closing workspace prompt

---
 .../src/workspaces/workspaces.ts                       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
index 411d8fccc9..8eecdcf27c 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
@@ -335,18 +335,18 @@ export function showWorkspacePrompts(
   switch (promptType) {
     case 'closing-workspace': {
       const prompt: Prompt = {
-        title: translateFrom('@openmrs/esm-patient-chart-app', 'unsavedChanges', 'You have unsaved changes'),
+        title: translateFrom('@openmrs/esm-patient-chart-app', 'unsavedChangesTitleText', 'Unsaved Changes'),
         body: translateFrom(
           '@openmrs/esm-patient-chart-app',
-          'unsavedChangesInForm',
-          'There are unsaved changes in {{formName}}. Please save them before opening another form.',
-          { formName: workspaceTitle },
+          'unsavedChangeText',
+          `You have unsaved changes in the side panel. Do you want to discard these changes?`,
         ),
         onConfirm: () => {
           onConfirmation?.();
         },
-        confirmText: translateFrom('@openmrs/esm-patient-chart-app', 'openAnyway', 'Open anyway'),
+        confirmText: translateFrom('@openmrs/esm-patient-chart-app', 'discard', 'Discard'),
       };
+      store.setState({ ...store.getState(), prompt });
       store.setState((prevState) => ({ ...prevState, prompt }));
       return;
     }

From a77418da2c8ba9f044c2038e8767760b11644397 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Wed, 24 Jan 2024 12:24:39 +0530
Subject: [PATCH 04/39] Added the promptBeforeClosing in the Appointments form

---
 .../appointments-base.component.tsx           |  5 +----
 .../appointments-form.component.tsx           | 22 ++++++++++++++-----
 .../esm-patient-appointments-app/src/index.ts | 16 ++++++++------
 .../src/routes.json                           |  4 ----
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-base.component.tsx b/packages/esm-patient-appointments-app/src/appointments/appointments-base.component.tsx
index 39d710bfb5..5f8d62b138 100644
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-base.component.tsx
+++ b/packages/esm-patient-appointments-app/src/appointments/appointments-base.component.tsx
@@ -36,10 +36,7 @@ const AppointmentsBase: React.FC<AppointmentsBaseProps> = ({ patientUuid }) => {
     isValidating,
   } = useAppointments(patientUuid, startDate, new AbortController());
 
-  const launchAppointmentsForm = () =>
-    launchPatientWorkspace('appointments-form-workspace', {
-      workspaceTitle: t('scheduleAppointment', 'Schedule appointment'),
-    });
+  const launchAppointmentsForm = () => launchPatientWorkspace('appointments-form-workspace');
 
   if (isLoading) return <DataTableSkeleton role="progressbar" compact={!isTablet} zebra />;
   if (isError) {
diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.component.tsx b/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.component.tsx
index 1ac162152e..5b5c768dc5 100644
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.component.tsx
+++ b/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.component.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import dayjs from 'dayjs';
 import {
@@ -25,7 +25,7 @@ import { Controller, useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
 import { useLocations, useSession, showSnackbar, useLayoutType } from '@openmrs/esm-framework';
-import { convertTime12to24 } from '@openmrs/esm-patient-common-lib';
+import { type DefaultWorkspaceProps, convertTime12to24 } from '@openmrs/esm-patient-common-lib';
 import {
   saveAppointment,
   saveRecurringAppointments,
@@ -60,12 +60,10 @@ const appointmentsFormSchema = z.object({
 
 type AppointmentFormData = z.infer<typeof appointmentsFormSchema>;
 
-interface AppointmentsFormProps {
+interface AppointmentsFormProps extends DefaultWorkspaceProps {
   appointment?: Appointment;
   recurringPattern?: RecurringPattern;
-  patientUuid?: string;
   context?: string;
-  closeWorkspace: () => void;
 }
 
 const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
@@ -74,6 +72,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
   patientUuid,
   context,
   closeWorkspace,
+  promptBeforeClosing,
 }) => {
   const editedAppointmentTimeFormat = new Date(appointment?.startDateTime).getHours() >= 12 ? 'PM' : 'AM';
   const defaultTimeFormat = appointment?.startDateTime
@@ -109,7 +108,14 @@ const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
     ? dayjs(new Date(appointment?.startDateTime)).format('hh:mm')
     : dayjs(new Date()).format('hh:mm');
 
-  const { control, getValues, setValue, watch, handleSubmit } = useForm<AppointmentFormData>({
+  const {
+    control,
+    getValues,
+    setValue,
+    watch,
+    handleSubmit,
+    formState: { isDirty },
+  } = useForm<AppointmentFormData>({
     mode: 'all',
     resolver: zodResolver(appointmentsFormSchema),
     defaultValues: {
@@ -131,6 +137,10 @@ const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
     },
   });
 
+  useEffect(() => {
+    promptBeforeClosing(() => isDirty);
+  }, [isDirty]);
+
   const handleMultiselectChange = (e) => {
     setValue(
       'selectedDaysOfWeekText',
diff --git a/packages/esm-patient-appointments-app/src/index.ts b/packages/esm-patient-appointments-app/src/index.ts
index 485ef2982a..98f2d4ad3d 100644
--- a/packages/esm-patient-appointments-app/src/index.ts
+++ b/packages/esm-patient-appointments-app/src/index.ts
@@ -1,5 +1,5 @@
-import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
-import { createDashboardLink } from '@openmrs/esm-patient-common-lib';
+import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle, translateFrom } from '@openmrs/esm-framework';
+import { createDashboardLink, registerWorkspace } from '@openmrs/esm-patient-common-lib';
 import { dashboardMeta } from './dashboard.meta';
 import appointmentsOverviewComponent from './appointments/appointments-overview.component';
 import appointmentsDetailedSummaryComponent from './appointments/appointments-detailed-summary.component';
@@ -28,14 +28,16 @@ export const appointmentsSummaryDashboardLink = getSyncLifecycle(
   options,
 );
 
-export const appointmentsFormWorkspace = getAsyncLifecycle(
-  () => import('./appointments/appointments-form/appointments-form.component'),
-  options,
-);
-
 export const appointmentsCancelConfirmationDialog = getAsyncLifecycle(
   () => import('./appointments/appointments-cancel-modal.component'),
   options,
 );
 
 export const upcomingAppointmentsWidget = getSyncLifecycle(upcomingAppointmentsWidgetComponent, options);
+
+// t('scheduleAppointment', 'Schedule appointment');
+registerWorkspace({
+  name: 'appointments-form-workspace',
+  load: getAsyncLifecycle(() => import('./appointments/appointments-form/appointments-form.component'), options),
+  title: translateFrom(moduleName, 'scheduleAppointment', 'Schedule appointment'),
+});
diff --git a/packages/esm-patient-appointments-app/src/routes.json b/packages/esm-patient-appointments-app/src/routes.json
index f68be1a304..02760d5df9 100644
--- a/packages/esm-patient-appointments-app/src/routes.json
+++ b/packages/esm-patient-appointments-app/src/routes.json
@@ -33,10 +33,6 @@
         "path": "Appointments"
       }
     },
-    {
-      "name": "appointments-form-workspace",
-      "component": "appointmentsFormWorkspace"
-    },
     {
       "name": "appointment-cancel-confirmation-dialog",
       "component": "appointmentsCancelConfirmationDialog"

From 7b949cd146af17f89c1d4f06c55be95156b951c3 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Wed, 24 Jan 2024 12:26:09 +0530
Subject: [PATCH 05/39] Added the isDirty check in allergies form

---
 .../allergies-form/allergy-form.component.tsx     | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.component.tsx b/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.component.tsx
index dac996df9f..10ad6fc467 100644
--- a/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.component.tsx
+++ b/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.component.tsx
@@ -66,7 +66,7 @@ type AllergyFormData = {
   comment: string;
 };
 
-function AllergyForm({ closeWorkspace, patientUuid }: DefaultWorkspaceProps) {
+function AllergyForm({ closeWorkspace, patientUuid, promptBeforeClosing }: DefaultWorkspaceProps) {
   const { t } = useTranslation();
   const { concepts } = useConfig();
   const isTablet = useLayoutType() === 'tablet';
@@ -82,7 +82,14 @@ function AllergyForm({ closeWorkspace, patientUuid }: DefaultWorkspaceProps) {
   const [isDisabled, setIsDisabled] = useState(true);
   const { mutate } = useAllergies(patientUuid);
 
-  const { control, handleSubmit, watch, getValues, setValue } = useForm<AllergyFormData>({
+  const {
+    control,
+    handleSubmit,
+    watch,
+    getValues,
+    setValue,
+    formState: { isDirty },
+  } = useForm<AllergyFormData>({
     mode: 'all',
     resolver: zodResolver(allergyFormSchema),
     defaultValues: {
@@ -95,6 +102,10 @@ function AllergyForm({ closeWorkspace, patientUuid }: DefaultWorkspaceProps) {
     },
   });
 
+  useEffect(() => {
+    promptBeforeClosing(() => isDirty);
+  }, [isDirty]);
+
   const selectedAllergen = watch('allergen');
   const selectedAllergicReactions = watch('allergicReactions');
   const selectedSeverityOfWorstReaction = watch('severityOfWorstReaction');

From b7443a9b8c9c52257a3476c3f2e3ef2af9b30e83 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Wed, 24 Jan 2024 12:27:14 +0530
Subject: [PATCH 06/39] Removed extra translations

---
 packages/esm-patient-biometrics-app/translations/zh.json    | 1 -
 packages/esm-patient-biometrics-app/translations/zh_CN.json | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 packages/esm-patient-biometrics-app/translations/zh.json
 delete mode 100644 packages/esm-patient-biometrics-app/translations/zh_CN.json

diff --git a/packages/esm-patient-biometrics-app/translations/zh.json b/packages/esm-patient-biometrics-app/translations/zh.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/packages/esm-patient-biometrics-app/translations/zh.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/packages/esm-patient-biometrics-app/translations/zh_CN.json b/packages/esm-patient-biometrics-app/translations/zh_CN.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/packages/esm-patient-biometrics-app/translations/zh_CN.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file

From 4b598827ac8575a9552f59ab44eb127497689cb0 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Wed, 24 Jan 2024 12:44:39 +0530
Subject: [PATCH 07/39] Added the isDirty check in conditions workspace

---
 .../src/types/workspace.ts                    |  9 +++++++-
 .../src/workspaces/workspaces.ts              |  9 +-------
 .../conditions-detailed-summary.component.tsx |  5 +---
 .../conditions/conditions-form.component.tsx  | 23 +++++++++++++++----
 .../src/conditions/conditions-form.test.tsx   |  2 +-
 .../conditions-overview.component.tsx         |  5 +---
 .../conditions-widget.component.tsx           |  3 ++-
 .../esm-patient-conditions-app/src/index.ts   | 16 +++++++------
 .../src/routes.json                           |  4 ----
 .../translations/am.json                      |  1 +
 .../translations/ar.json                      |  1 +
 .../translations/en.json                      |  1 +
 .../translations/es.json                      |  1 +
 .../translations/fr.json                      |  1 +
 .../translations/he.json                      |  1 +
 .../translations/km.json                      |  1 +
 .../translations/zh.json                      |  1 +
 .../translations/zh_CN.json                   |  1 +
 18 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/packages/esm-patient-common-lib/src/types/workspace.ts b/packages/esm-patient-common-lib/src/types/workspace.ts
index 4aed8d04f0..ca465b8223 100644
--- a/packages/esm-patient-common-lib/src/types/workspace.ts
+++ b/packages/esm-patient-common-lib/src/types/workspace.ts
@@ -1,6 +1,13 @@
 /* The possible states a workspace window can be opened in. */
 export type WorkspaceWindowState = 'maximized' | 'hidden' | 'normal';
 
+export interface CloseWorkspaceOptions {
+  workspaceTitle?: string;
+  ignoreChanges?: boolean;
+  onWorkspaceClose?: () => void;
+  confirmBeforeClosing?: boolean;
+}
+
 /** The default parameters received by all workspaces */
 export interface DefaultWorkspaceProps {
   /**
@@ -8,7 +15,7 @@ export interface DefaultWorkspaceProps {
    * prompted to save changes before closing, even if the `testFcn` passed to `promptBeforeClosing`
    * returns `true`.
    */
-  closeWorkspace(ignoreChanges?: boolean): void;
+  closeWorkspace(closeWorkspaceOptions?: CloseWorkspaceOptions): void;
   /**
    * Call this with a no-args function that returns true if the user should be prompted before
    * this workspace is closed; e.g. if there is unsaved data.
diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
index 8eecdcf27c..e6829bcc47 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
@@ -2,7 +2,7 @@ import { type ExtensionRegistration, getGlobalStore, navigate, translateFrom } f
 // FIXME We should not rely on internals here
 import { getExtensionRegistration } from '@openmrs/esm-framework/src/internal';
 import _i18n from 'i18next';
-import { type WorkspaceWindowState } from '../types/workspace';
+import { type WorkspaceWindowState, type CloseWorkspaceOptions } from '../types/workspace';
 
 export interface Prompt {
   title: string;
@@ -21,13 +21,6 @@ export interface WorkspaceStoreState {
   workspaceWindowState: WorkspaceWindowState;
 }
 
-interface CloseWorkspaceOptions {
-  workspaceTitle?: string;
-  ignoreChanges?: boolean;
-  onWorkspaceClose?: () => void;
-  confirmBeforeClosing?: boolean;
-}
-
 export interface OpenWorkspace extends WorkspaceRegistration {
   additionalProps: object;
   closeWorkspace(closeWorkspaceOptions?: CloseWorkspaceOptions): boolean;
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.component.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.component.tsx
index d683cc397a..4b1bdad552 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.component.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.component.tsx
@@ -88,10 +88,7 @@ function ConditionsDetailedSummary({ patient }) {
       : compare(cellA.sortKey, cellB.sortKey);
   };
 
-  const launchConditionsForm = useCallback(
-    () => launchPatientWorkspace('conditions-form-workspace', { workspaceTitle: 'Record a Condition' }),
-    [],
-  );
+  const launchConditionsForm = useCallback(() => launchPatientWorkspace('conditions-form-workspace'), []);
 
   const handleConditionStatusChange = ({ selectedItem }) => setFilter(selectedItem);
 
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx
index 8e2b0877bf..705d3c883e 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useForm, FormProvider } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
@@ -8,12 +8,11 @@ import { useLayoutType } from '@openmrs/esm-framework';
 import { type ConditionDataTableRow, useConditions } from './conditions.resource';
 import ConditionsWidget from './conditions-widget.component';
 import styles from './conditions-form.scss';
+import { type DefaultWorkspaceProps } from '@openmrs/esm-patient-common-lib';
 
-interface ConditionFormProps {
-  closeWorkspace: () => void;
+interface ConditionFormProps extends DefaultWorkspaceProps {
   condition?: ConditionDataTableRow;
   formContext: 'creating' | 'editing';
-  patientUuid?: string;
 }
 
 const conditionSchema = z.object({
@@ -25,7 +24,13 @@ const conditionSchema = z.object({
 
 export type ConditionFormData = z.infer<typeof conditionSchema>;
 
-const ConditionsForm: React.FC<ConditionFormProps> = ({ closeWorkspace, condition, formContext, patientUuid }) => {
+const ConditionsForm: React.FC<ConditionFormProps> = ({
+  closeWorkspace,
+  condition,
+  formContext,
+  patientUuid,
+  promptBeforeClosing,
+}) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const { conditions } = useConditions(patientUuid);
@@ -50,6 +55,14 @@ const ConditionsForm: React.FC<ConditionFormProps> = ({ closeWorkspace, conditio
     },
   });
 
+  const {
+    formState: { isDirty },
+  } = methods;
+
+  useEffect(() => {
+    promptBeforeClosing(() => isDirty);
+  }, [isDirty]);
+
   const onSubmit = (data) => {
     setIsSubmittingForm(true);
   };
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx
index 6a92b0c378..bfcfa0dfbf 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx
@@ -202,5 +202,5 @@ describe('Conditions Form', () => {
 });
 
 function renderConditionsForm() {
-  render(<ConditionsForm {...testProps} />);
+  render(<ConditionsForm promptBeforeClosing={() => {}} {...testProps} />);
 }
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-overview.component.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-overview.component.tsx
index 09d0c1b280..36dd5b4f00 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-overview.component.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-overview.component.tsx
@@ -54,10 +54,7 @@ const ConditionsOverview: React.FC<ConditionsOverviewProps> = ({ patientUuid })
 
   const { conditions, isError, isLoading, isValidating } = useConditions(patientUuid);
   const [filter, setFilter] = useState<'All' | 'Active' | 'Inactive'>('Active');
-  const launchConditionsForm = useCallback(
-    () => launchPatientWorkspace('conditions-form-workspace', { workspaceTitle: 'Record a Condition' }),
-    [],
-  );
+  const launchConditionsForm = useCallback(() => launchPatientWorkspace('conditions-form-workspace'), []);
 
   const filteredConditions = useMemo(() => {
     if (!filter || filter == 'All') {
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-widget.component.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-widget.component.tsx
index 69790bda9d..494183b13a 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-widget.component.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-widget.component.tsx
@@ -29,9 +29,10 @@ import {
 } from './conditions.resource';
 import { type ConditionFormData } from './conditions-form.component';
 import styles from './conditions-form.scss';
+import { type DefaultWorkspaceProps } from '@openmrs/esm-patient-common-lib';
 
 interface ConditionsWidgetProps {
-  closeWorkspace?: () => void;
+  closeWorkspace?: DefaultWorkspaceProps['closeWorkspace'];
   conditionToEdit?: ConditionDataTableRow;
   editing?: boolean;
   patientUuid: string;
diff --git a/packages/esm-patient-conditions-app/src/index.ts b/packages/esm-patient-conditions-app/src/index.ts
index 2854e92427..ebd3401854 100644
--- a/packages/esm-patient-conditions-app/src/index.ts
+++ b/packages/esm-patient-conditions-app/src/index.ts
@@ -1,5 +1,5 @@
-import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
-import { createDashboardLink } from '@openmrs/esm-patient-common-lib';
+import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle, translateFrom } from '@openmrs/esm-framework';
+import { createDashboardLink, registerWorkspace } from '@openmrs/esm-patient-common-lib';
 import { configSchema } from './config-schema';
 import { dashboardMeta } from './dashboard.meta';
 import conditionsOverviewComponent from './conditions/conditions-overview.component';
@@ -34,12 +34,14 @@ export const conditionsDashboardLink =
     options,
   );
 
-export const conditionsFormWorkspace = getAsyncLifecycle(
-  () => import('./conditions/conditions-form.component'),
-  options,
-);
-
 export const conditionDeleteConfirmationDialog = getAsyncLifecycle(
   () => import('./conditions/delete-condition-modal.component'),
   options,
 );
+
+// t('recordCondition', 'Record a Condition')
+registerWorkspace({
+  name: 'conditions-form-workspace',
+  load: getAsyncLifecycle(() => import('./conditions/conditions-form.component'), options),
+  title: translateFrom(moduleName, 'recordCondition', 'Record a Condition'),
+});
diff --git a/packages/esm-patient-conditions-app/src/routes.json b/packages/esm-patient-conditions-app/src/routes.json
index 747fd5c5d2..e022adfb6f 100644
--- a/packages/esm-patient-conditions-app/src/routes.json
+++ b/packages/esm-patient-conditions-app/src/routes.json
@@ -37,10 +37,6 @@
       "name": "conditions-widget",
       "component": "conditionsWidget"
     },
-    {
-      "name": "conditions-form-workspace",
-      "component": "conditionsFormWorkspace"
-    },
     {
       "name": "condition-delete-confirmation-dialog",
       "component": "conditionDeleteConfirmationDialog"
diff --git a/packages/esm-patient-conditions-app/translations/am.json b/packages/esm-patient-conditions-app/translations/am.json
index 173d5d5eff..271dafcc3b 100644
--- a/packages/esm-patient-conditions-app/translations/am.json
+++ b/packages/esm-patient-conditions-app/translations/am.json
@@ -25,6 +25,7 @@
   "noConditionsToDisplay": "No conditions to display",
   "noResultsFor": "No results for",
   "onsetDate": "Onset date",
+  "recordCondition": "Record a Condition",
   "saveAndClose": "Save & close",
   "saving": "Saving",
   "searchConditions": "Search conditions",
diff --git a/packages/esm-patient-conditions-app/translations/ar.json b/packages/esm-patient-conditions-app/translations/ar.json
index 9444cb08f1..05e6b95b6a 100644
--- a/packages/esm-patient-conditions-app/translations/ar.json
+++ b/packages/esm-patient-conditions-app/translations/ar.json
@@ -25,6 +25,7 @@
   "noConditionsToDisplay": "لا توجد حالات لعرضها",
   "noResultsFor": "لا توجد نتائج لـ",
   "onsetDate": "تاريخ البداية",
+  "recordCondition": "Record a Condition",
   "saveAndClose": "حفظ وإغلاق",
   "saving": "جاري الحفظ",
   "searchConditions": "بحث عن حالة",
diff --git a/packages/esm-patient-conditions-app/translations/en.json b/packages/esm-patient-conditions-app/translations/en.json
index 7dff1cfedf..bc28c2b21d 100644
--- a/packages/esm-patient-conditions-app/translations/en.json
+++ b/packages/esm-patient-conditions-app/translations/en.json
@@ -25,6 +25,7 @@
   "noConditionsToDisplay": "No conditions to display",
   "noResultsFor": "No results for",
   "onsetDate": "Onset date",
+  "recordCondition": "Record a Condition",
   "saveAndClose": "Save & close",
   "saving": "Saving",
   "searchConditions": "Search conditions",
diff --git a/packages/esm-patient-conditions-app/translations/es.json b/packages/esm-patient-conditions-app/translations/es.json
index 7ac3432f79..ff2e746900 100644
--- a/packages/esm-patient-conditions-app/translations/es.json
+++ b/packages/esm-patient-conditions-app/translations/es.json
@@ -25,6 +25,7 @@
   "noConditionsToDisplay": "No hay condiciones para mostrar",
   "noResultsFor": "Sin resultados para",
   "onsetDate": "Fecha de aparición",
+  "recordCondition": "Record a Condition",
   "saveAndClose": "Guardar y cerrar",
   "saving": "Guardando",
   "searchConditions": "Buscar condiciones",
diff --git a/packages/esm-patient-conditions-app/translations/fr.json b/packages/esm-patient-conditions-app/translations/fr.json
index 9b4bef646d..7d104a7252 100644
--- a/packages/esm-patient-conditions-app/translations/fr.json
+++ b/packages/esm-patient-conditions-app/translations/fr.json
@@ -25,6 +25,7 @@
   "noConditionsToDisplay": "Aucune condition à afficher",
   "noResultsFor": "Pas de résultat pour",
   "onsetDate": "Date de début",
+  "recordCondition": "Record a Condition",
   "saveAndClose": "Sauvegarder et fermer",
   "saving": "Saving",
   "searchConditions": "Conditions de recherche",
diff --git a/packages/esm-patient-conditions-app/translations/he.json b/packages/esm-patient-conditions-app/translations/he.json
index 4e5a9726d9..fa5dd7c3f9 100644
--- a/packages/esm-patient-conditions-app/translations/he.json
+++ b/packages/esm-patient-conditions-app/translations/he.json
@@ -25,6 +25,7 @@
   "noConditionsToDisplay": "אין מצבים להצגה",
   "noResultsFor": "אין תוצאות עבור",
   "onsetDate": "תאריך התחלה",
+  "recordCondition": "Record a Condition",
   "saveAndClose": "שמירה וסגירה",
   "saving": "שמור",
   "searchConditions": "חיפוש מצבים",
diff --git a/packages/esm-patient-conditions-app/translations/km.json b/packages/esm-patient-conditions-app/translations/km.json
index 34ed247fc4..fef4f4fa4d 100644
--- a/packages/esm-patient-conditions-app/translations/km.json
+++ b/packages/esm-patient-conditions-app/translations/km.json
@@ -25,6 +25,7 @@
   "noConditionsToDisplay": "No conditions to display",
   "noResultsFor": "គ្មានលទ្ធផលសម្រាប់",
   "onsetDate": "កាលបរិច្ឆេទចាប់ផ្តើម",
+  "recordCondition": "Record a Condition",
   "saveAndClose": "រក្សាទុក និងបិទ",
   "saving": "Saving",
   "searchConditions": "លក្ខខណ្ឌស្វែងរក",
diff --git a/packages/esm-patient-conditions-app/translations/zh.json b/packages/esm-patient-conditions-app/translations/zh.json
index a48d39a8a4..cba9674ad5 100644
--- a/packages/esm-patient-conditions-app/translations/zh.json
+++ b/packages/esm-patient-conditions-app/translations/zh.json
@@ -25,6 +25,7 @@
   "noConditionsToDisplay": "没有可显示的病情",
   "noResultsFor": "No results for",
   "onsetDate": "Onset date",
+  "recordCondition": "Record a Condition",
   "saveAndClose": "保存并关闭",
   "saving": "Saving",
   "searchConditions": "搜索病情",
diff --git a/packages/esm-patient-conditions-app/translations/zh_CN.json b/packages/esm-patient-conditions-app/translations/zh_CN.json
index a48d39a8a4..cba9674ad5 100644
--- a/packages/esm-patient-conditions-app/translations/zh_CN.json
+++ b/packages/esm-patient-conditions-app/translations/zh_CN.json
@@ -25,6 +25,7 @@
   "noConditionsToDisplay": "没有可显示的病情",
   "noResultsFor": "No results for",
   "onsetDate": "Onset date",
+  "recordCondition": "Record a Condition",
   "saveAndClose": "保存并关闭",
   "saving": "Saving",
   "searchConditions": "搜索病情",

From 7694a339ef4f830e43c05380ef5c6d64a8b30e4b Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 29 Jan 2024 16:58:34 +0530
Subject: [PATCH 08/39] Added the isDirty check in start-visit workspace

---
 .../visit/visit-form/visit-form.component.tsx   | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
index 4470fc8c44..51e895c669 100644
--- a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
@@ -83,8 +83,6 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
   const { mutateVisits } = useVisits(patientUuid);
   const allVisitTypes = isOnline ? useVisitTypes() : useOfflineVisitType();
   const { mutate } = useVisit(patientUuid);
-  const { mutate: mutateVisit } = useVisit(patientUuid);
-  const [ignoreChanges, setIgnoreChanges] = useState(true);
   const [errorFetchingResources, setErrorFetchingResources] = useState<{
     blockSavingForm: boolean;
   }>(null);
@@ -179,10 +177,14 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
     handleSubmit,
     control,
     getValues,
-    formState: { errors },
+    formState: { errors, isDirty },
     setError,
   } = methods;
 
+  useEffect(() => {
+    promptBeforeClosing(() => isDirty);
+  }, [isDirty]);
+
   const validateVisitStartStopDatetime = useCallback(() => {
     let visitStartDate = getValues('visitStartDate');
     const visitStartTime = getValues('visitStartTime');
@@ -479,11 +481,6 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
     ],
   );
 
-  const handleOnChange = () => {
-    setIgnoreChanges((prevState) => !prevState);
-    promptBeforeClosing(() => true);
-  };
-
   let [maxVisitStartDatetime, minVisitStopDatetime] = useMemo(() => {
     if (!visitToEdit?.encounters?.length) {
       return [null, null];
@@ -510,7 +507,7 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
 
   return (
     <FormProvider {...methods}>
-      <Form className={styles.form} onChange={handleOnChange} onSubmit={handleSubmit(onSubmit)}>
+      <Form className={styles.form} onSubmit={handleSubmit(onSubmit)}>
         {errorFetchingResources && (
           <InlineNotification
             kind={errorFetchingResources?.blockSavingForm ? 'error' : 'warning'}
@@ -664,7 +661,7 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
           </Stack>
         </div>
         <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
-          <Button className={styles.button} kind="secondary" onClick={() => closeWorkspace(ignoreChanges)}>
+          <Button className={styles.button} kind="secondary" onClick={() => closeWorkspace()}>
             {t('discard', 'Discard')}
           </Button>
           <Button

From fc217a5e114907c6d7194b73b6fe255f378d37a2 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 29 Jan 2024 17:03:20 +0530
Subject: [PATCH 09/39] Updated the workspaces implementation in the forms app

---
 .../src/forms/forms-dashboard.component.tsx   | 33 ++++++++++---------
 .../src/forms/forms-workspace.component.tsx   |  5 +--
 packages/esm-patient-forms-app/src/index.ts   |  4 +--
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/packages/esm-patient-forms-app/src/forms/forms-dashboard.component.tsx b/packages/esm-patient-forms-app/src/forms/forms-dashboard.component.tsx
index 7d8b89acad..19c2a33019 100644
--- a/packages/esm-patient-forms-app/src/forms/forms-dashboard.component.tsx
+++ b/packages/esm-patient-forms-app/src/forms/forms-dashboard.component.tsx
@@ -2,8 +2,8 @@ import React, { useCallback, useMemo } from 'react';
 import { Layer, Tile } from '@carbon/react';
 import { useConfig, useConnectivity, usePatient } from '@openmrs/esm-framework';
 import {
+  type DefaultWorkspaceProps,
   EmptyDataIllustration,
-  closeWorkspace,
   launchFormEntryOrHtmlForms,
   useVisitOrOfflineVisit,
 } from '@openmrs/esm-patient-common-lib';
@@ -13,7 +13,7 @@ import styles from './forms-dashboard.scss';
 import { useForms } from '../hooks/use-forms';
 import { useTranslation } from 'react-i18next';
 
-const FormsDashboard = () => {
+const FormsDashboard: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace }) => {
   const { t } = useTranslation();
   const config = useConfig<ConfigObject>();
   const isOnline = useConnectivity();
@@ -28,19 +28,22 @@ const FormsDashboard = () => {
 
   const handleFormOpen = useCallback(
     (formUuid: string, encounterUuid: string, formName: string) => {
-      closeWorkspace('clinical-forms-workspace', true);
-      launchFormEntryOrHtmlForms(
-        htmlFormEntryForms,
-        patientUuid,
-        formUuid,
-        currentVisit.uuid,
-        encounterUuid,
-        formName,
-        currentVisit.visitType.uuid,
-        currentVisit.startDatetime,
-        currentVisit.stopDatetime,
-        mutateForms,
-      );
+      closeWorkspace({
+        onWorkspaceClose: () => {
+          launchFormEntryOrHtmlForms(
+            htmlFormEntryForms,
+            patientUuid,
+            formUuid,
+            currentVisit.uuid,
+            encounterUuid,
+            formName,
+            currentVisit.visitType.uuid,
+            currentVisit.startDatetime,
+            currentVisit.stopDatetime,
+            mutateForms,
+          );
+        },
+      });
     },
     [currentVisit, htmlFormEntryForms, patient, mutateForms],
   );
diff --git a/packages/esm-patient-forms-app/src/forms/forms-workspace.component.tsx b/packages/esm-patient-forms-app/src/forms/forms-workspace.component.tsx
index 6cd05995d6..886fa0a2d7 100644
--- a/packages/esm-patient-forms-app/src/forms/forms-workspace.component.tsx
+++ b/packages/esm-patient-forms-app/src/forms/forms-workspace.component.tsx
@@ -1,11 +1,12 @@
 import React from 'react';
 import FormsDashboard from './forms-dashboard.component';
 import styles from './forms-workspace.scss';
+import { type DefaultWorkspaceProps } from '@openmrs/esm-patient-common-lib';
 
-export default function FormsWorkspace() {
+export default function FormsWorkspace(props: DefaultWorkspaceProps) {
   return (
     <div className={styles.container}>
-      <FormsDashboard />
+      <FormsDashboard {...props} />
     </div>
   );
 }
diff --git a/packages/esm-patient-forms-app/src/index.ts b/packages/esm-patient-forms-app/src/index.ts
index bfa62ce2a0..e02373623e 100644
--- a/packages/esm-patient-forms-app/src/index.ts
+++ b/packages/esm-patient-forms-app/src/index.ts
@@ -42,7 +42,7 @@ export function startupApp() {
   // t('clinicalForm', 'Clinical Form')
   registerWorkspace({
     name: 'patient-form-entry-workspace',
-    title: translateFrom('@openmrs/esm-patient-forms-app', 'clinicalForm', 'Clinical Form'),
+    title: translateFrom(moduleName, 'clinicalForm', 'Clinical Form'),
     load: getAsyncLifecycle(() => import('./forms/form-entry.component'), options),
     canMaximize: true,
     canHide: true,
@@ -53,7 +53,7 @@ export function startupApp() {
   // t('clinicalForms', 'Clinical Forms')
   registerWorkspace({
     name: 'clinical-forms-workspace',
-    title: translateFrom('@openmrs/esm-patient-forms-app', 'clinicalForms', 'Clinical Forms'),
+    title: translateFrom(moduleName, 'clinicalForms', 'Clinical Forms'),
     load: getAsyncLifecycle(() => import('./forms/forms-workspace.component'), options),
     type: 'clinical-form',
     canMaximize: true,

From ce0f30c2276e8de1aa4688744849af36eb08f97a Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 29 Jan 2024 17:08:52 +0530
Subject: [PATCH 10/39] Updated the workspace title and implementation in the
 immunization app

---
 .../immunizations-form.component.tsx              | 15 +++++++--------
 .../esm-patient-immunizations-app/src/index.ts    | 14 ++++++++------
 .../esm-patient-immunizations-app/src/routes.json |  7 -------
 .../translations/am.json                          |  1 +
 .../translations/ar.json                          |  1 +
 .../translations/en.json                          |  1 +
 .../translations/es.json                          |  1 +
 .../translations/fr.json                          |  1 +
 .../translations/he.json                          |  1 +
 .../translations/km.json                          |  1 +
 .../translations/zh.json                          |  1 +
 .../translations/zh_CN.json                       |  1 +
 12 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.component.tsx b/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.component.tsx
index 41d3f427bf..235e1ebda2 100644
--- a/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.component.tsx
+++ b/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.component.tsx
@@ -102,6 +102,10 @@ const ImmunizationsForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, close
     watch,
   } = formProps;
 
+  useEffect(() => {
+    promptBeforeClosing(() => isDirty);
+  }, [isDirty]);
+
   const vaccineUuid = watch('vaccineUuid');
 
   useEffect(() => {
@@ -214,12 +218,7 @@ const ImmunizationsForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, close
 
   return (
     <FormProvider {...formProps}>
-      <Form
-        className={styles.form}
-        onChange={() => promptBeforeClosing(() => true)}
-        onSubmit={handleSubmit(onSubmit)}
-        data-testid="immunization-form"
-      >
+      <Form className={styles.form} onSubmit={handleSubmit(onSubmit)} data-testid="immunization-form">
         <Stack gap={1} className={styles.container}>
           <section className={` ${styles.row}`}>
             <div className={styles.dateTimeSection}>
@@ -402,10 +401,10 @@ const ImmunizationsForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, close
           </section>
         </Stack>
         <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
-          <Button className={styles.button} kind="secondary" onClick={() => closeWorkspace(!isDirty)}>
+          <Button className={styles.button} kind="secondary" onClick={() => closeWorkspace()}>
             {t('cancel', 'Cancel')}
           </Button>
-          <Button className={styles.button} kind="primary" disabled={isSubmitting || !isDirty} type="submit">
+          <Button className={styles.button} kind="primary" disabled={isSubmitting} type="submit">
             {t('save', 'Save')}
           </Button>
         </ButtonSet>
diff --git a/packages/esm-patient-immunizations-app/src/index.ts b/packages/esm-patient-immunizations-app/src/index.ts
index d1e972f2d8..686342b4d9 100644
--- a/packages/esm-patient-immunizations-app/src/index.ts
+++ b/packages/esm-patient-immunizations-app/src/index.ts
@@ -1,5 +1,5 @@
-import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
-import { createDashboardLink } from '@openmrs/esm-patient-common-lib';
+import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle, translateFrom } from '@openmrs/esm-framework';
+import { createDashboardLink, registerWorkspace } from '@openmrs/esm-patient-common-lib';
 import { configSchema } from './config-schema';
 import { dashboardMeta } from './dashboard.meta';
 import immunizationsOverviewComponent from './immunizations/immunizations-overview.component';
@@ -32,7 +32,9 @@ export const immunizationsDashboardLink =
     options,
   );
 
-export const immunizationsForm = getAsyncLifecycle(
-  () => import('./immunizations/immunizations-form.component'),
-  options,
-);
+// t('immunizationWorkspaceTitle', 'Immunization Form')
+export const immunizationsForm = registerWorkspace({
+  name: 'immunization-form-workspace',
+  load: getAsyncLifecycle(() => import('./immunizations/immunizations-form.component'), options),
+  title: translateFrom(moduleName, 'immunizationWorkspaceTitle', 'Immunization Form'),
+});
diff --git a/packages/esm-patient-immunizations-app/src/routes.json b/packages/esm-patient-immunizations-app/src/routes.json
index e503acd87b..f0cada49d6 100644
--- a/packages/esm-patient-immunizations-app/src/routes.json
+++ b/packages/esm-patient-immunizations-app/src/routes.json
@@ -30,13 +30,6 @@
         "path": "Immunizations"
       },
       "order": 8
-    },
-    {
-      "name": "immunization-form-workspace",
-      "component": "immunizationsForm",
-      "meta": {
-        "title": "Immunization Form"
-      }
     }
   ],
   "pages": []
diff --git a/packages/esm-patient-immunizations-app/translations/am.json b/packages/esm-patient-immunizations-app/translations/am.json
index bd85a7b15e..56d5fd459b 100644
--- a/packages/esm-patient-immunizations-app/translations/am.json
+++ b/packages/esm-patient-immunizations-app/translations/am.json
@@ -10,6 +10,7 @@
   "immunization": "Immunization",
   "immunizations": "Immunizations",
   "Immunizations": "Immunizations",
+  "immunizationWorkspaceTitle": "Immunization Form",
   "lotNumber": "Lot Number",
   "manufacturer": "Manufacturer",
   "pleaseSelect": "Please select",
diff --git a/packages/esm-patient-immunizations-app/translations/ar.json b/packages/esm-patient-immunizations-app/translations/ar.json
index 950ea2073d..9effb15d83 100644
--- a/packages/esm-patient-immunizations-app/translations/ar.json
+++ b/packages/esm-patient-immunizations-app/translations/ar.json
@@ -10,6 +10,7 @@
   "immunization": "Immunization",
   "immunizations": "التطعيمات",
   "Immunizations": "التطعيمات",
+  "immunizationWorkspaceTitle": "Immunization Form",
   "lotNumber": "رقم الدفعة",
   "manufacturer": "المصنع",
   "pleaseSelect": "يرجى الاختيار",
diff --git a/packages/esm-patient-immunizations-app/translations/en.json b/packages/esm-patient-immunizations-app/translations/en.json
index 2474b95098..aea19556d2 100644
--- a/packages/esm-patient-immunizations-app/translations/en.json
+++ b/packages/esm-patient-immunizations-app/translations/en.json
@@ -10,6 +10,7 @@
   "immunization": "Immunization",
   "immunizations": "Immunizations",
   "Immunizations": "Immunizations",
+  "immunizationWorkspaceTitle": "Immunization Form",
   "lotNumber": "Lot Number",
   "manufacturer": "Manufacturer",
   "pleaseSelect": "Please select",
diff --git a/packages/esm-patient-immunizations-app/translations/es.json b/packages/esm-patient-immunizations-app/translations/es.json
index 4b551549b5..02fe34e196 100644
--- a/packages/esm-patient-immunizations-app/translations/es.json
+++ b/packages/esm-patient-immunizations-app/translations/es.json
@@ -10,6 +10,7 @@
   "immunization": "Immunization",
   "immunizations": "Inmunizaciones",
   "Immunizations": "Inmunizaciones",
+  "immunizationWorkspaceTitle": "Immunization Form",
   "lotNumber": "Número de lote",
   "manufacturer": "Fabricante",
   "pleaseSelect": "Por favor, seleccione",
diff --git a/packages/esm-patient-immunizations-app/translations/fr.json b/packages/esm-patient-immunizations-app/translations/fr.json
index bd85a7b15e..56d5fd459b 100644
--- a/packages/esm-patient-immunizations-app/translations/fr.json
+++ b/packages/esm-patient-immunizations-app/translations/fr.json
@@ -10,6 +10,7 @@
   "immunization": "Immunization",
   "immunizations": "Immunizations",
   "Immunizations": "Immunizations",
+  "immunizationWorkspaceTitle": "Immunization Form",
   "lotNumber": "Lot Number",
   "manufacturer": "Manufacturer",
   "pleaseSelect": "Please select",
diff --git a/packages/esm-patient-immunizations-app/translations/he.json b/packages/esm-patient-immunizations-app/translations/he.json
index 93872010be..6d03dc2e4e 100644
--- a/packages/esm-patient-immunizations-app/translations/he.json
+++ b/packages/esm-patient-immunizations-app/translations/he.json
@@ -10,6 +10,7 @@
   "immunization": "Immunization",
   "immunizations": "חיסונים",
   "Immunizations": "חיסונים",
+  "immunizationWorkspaceTitle": "Immunization Form",
   "lotNumber": "מספר לוט",
   "manufacturer": "יצרן",
   "pleaseSelect": "בחר בבקשה",
diff --git a/packages/esm-patient-immunizations-app/translations/km.json b/packages/esm-patient-immunizations-app/translations/km.json
index 977688a35f..ee819cd1d2 100644
--- a/packages/esm-patient-immunizations-app/translations/km.json
+++ b/packages/esm-patient-immunizations-app/translations/km.json
@@ -10,6 +10,7 @@
   "immunization": "Immunization",
   "immunizations": "ការចាក់ថ្នាំបង្ការរោគ",
   "Immunizations": "ការចាក់ថ្នាំបង្ការរោគ",
+  "immunizationWorkspaceTitle": "Immunization Form",
   "lotNumber": "Lot Number",
   "manufacturer": "Manufacturer",
   "pleaseSelect": "Please select",
diff --git a/packages/esm-patient-immunizations-app/translations/zh.json b/packages/esm-patient-immunizations-app/translations/zh.json
index bd85a7b15e..56d5fd459b 100644
--- a/packages/esm-patient-immunizations-app/translations/zh.json
+++ b/packages/esm-patient-immunizations-app/translations/zh.json
@@ -10,6 +10,7 @@
   "immunization": "Immunization",
   "immunizations": "Immunizations",
   "Immunizations": "Immunizations",
+  "immunizationWorkspaceTitle": "Immunization Form",
   "lotNumber": "Lot Number",
   "manufacturer": "Manufacturer",
   "pleaseSelect": "Please select",
diff --git a/packages/esm-patient-immunizations-app/translations/zh_CN.json b/packages/esm-patient-immunizations-app/translations/zh_CN.json
index bd85a7b15e..56d5fd459b 100644
--- a/packages/esm-patient-immunizations-app/translations/zh_CN.json
+++ b/packages/esm-patient-immunizations-app/translations/zh_CN.json
@@ -10,6 +10,7 @@
   "immunization": "Immunization",
   "immunizations": "Immunizations",
   "Immunizations": "Immunizations",
+  "immunizationWorkspaceTitle": "Immunization Form",
   "lotNumber": "Lot Number",
   "manufacturer": "Manufacturer",
   "pleaseSelect": "Please select",

From f08149f65475376c1f04c186a9e3b1d7b0b124f6 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 29 Jan 2024 17:40:52 +0530
Subject: [PATCH 11/39] Updated the workspace title and workspace
 implementation in the patient lists

---
 packages/esm-patient-lists-app/src/index.ts         | 13 +++++--------
 .../workspaces/patient-list-details.workspace.tsx   | 10 +++++-----
 .../src/workspaces/patient-lists.workspace.tsx      | 13 +++++++++----
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/packages/esm-patient-lists-app/src/index.ts b/packages/esm-patient-lists-app/src/index.ts
index a396465b33..c127305d0f 100644
--- a/packages/esm-patient-lists-app/src/index.ts
+++ b/packages/esm-patient-lists-app/src/index.ts
@@ -1,4 +1,4 @@
-import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
+import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle, translateFrom } from '@openmrs/esm-framework';
 import { registerWorkspace } from '@openmrs/esm-patient-common-lib';
 import { configSchema } from './config-schema';
 
@@ -15,18 +15,20 @@ export const importTranslation = require.context('../translations', false, /.jso
 export function startupApp() {
   defineConfigSchema(moduleName, configSchema);
 
+  // t('patientListsWorkspaceTitle', 'Patient Lists')
   registerWorkspace({
     name: 'patient-lists',
-    title: 'Patient Lists',
+    title: translateFrom(moduleName, 'patientListsWorkspaceTitle', 'Patient Lists'),
     load: getAsyncLifecycle(() => import('./workspaces/patient-lists.workspace'), options),
     type: 'patient-lists',
     canHide: false,
     width: 'wider',
   });
 
+  // t('patientListDetailWorkspaceTitle', 'Patient List Details')
   registerWorkspace({
     name: 'patient-list-details',
-    title: 'Patient List Details',
+    title: translateFrom(moduleName, 'patientListDetailWorkspaceTitle', 'Patient List Details'),
     load: getAsyncLifecycle(() => import('./workspaces/patient-list-details.workspace'), options),
     type: 'patient-lists',
     canHide: false,
@@ -35,8 +37,3 @@ export function startupApp() {
 }
 
 export const patientListsActionMenu = getSyncLifecycle(patientListsActionButtonComponent, options);
-
-export const patientListDetailsWorkspace = getAsyncLifecycle(
-  () => import('./workspaces/patient-list-details.workspace'),
-  options,
-);
diff --git a/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.tsx b/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.tsx
index 02621cdce4..ccd983f0cb 100644
--- a/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.tsx
+++ b/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.tsx
@@ -2,14 +2,13 @@ import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button } from '@carbon/react';
 import { ArrowLeft } from '@carbon/react/icons';
-import { launchPatientWorkspace } from '@openmrs/esm-patient-common-lib';
+import { type DefaultWorkspaceProps, launchPatientWorkspace } from '@openmrs/esm-patient-common-lib';
 import { formatDate, parseDate } from '@openmrs/esm-framework';
 import { type MappedList, usePatientListMembers } from '../patient-lists.resource';
 import PatientListDetailsTable from './patient-list-details-table.component';
 import styles from './patient-list-details.scss';
 
-interface PatientListDetailsWorkspaceProps {
-  closeWorkspace: () => void;
+interface PatientListDetailsWorkspaceProps extends DefaultWorkspaceProps {
   list: MappedList;
 }
 
@@ -18,8 +17,9 @@ function PatientListDetailsWorkspace({ closeWorkspace, list }: PatientListDetail
   const { listMembers, isLoading } = usePatientListMembers(list.id);
 
   const closeListDetailsWorkspace = useCallback(() => {
-    closeWorkspace();
-    launchPatientWorkspace('patient-lists');
+    closeWorkspace({
+      onWorkspaceClose: () => launchPatientWorkspace('patient-lists'),
+    });
   }, []);
 
   return (
diff --git a/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.tsx b/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.tsx
index 8eef02b9e9..80ae5fb2e8 100644
--- a/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.tsx
+++ b/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.tsx
@@ -20,12 +20,16 @@ import {
   TableToolbarSearch,
   Tile,
 } from '@carbon/react';
-import { closeWorkspace, launchPatientWorkspace, EmptyDataIllustration } from '@openmrs/esm-patient-common-lib';
+import {
+  launchPatientWorkspace,
+  EmptyDataIllustration,
+  type DefaultWorkspaceProps,
+} from '@openmrs/esm-patient-common-lib';
 import { useDebounce, useLayoutType } from '@openmrs/esm-framework';
 import { usePatientLists } from '../patient-lists.resource';
 import styles from './patient-lists.scss';
 
-function PatientListsWorkspace() {
+function PatientListsWorkspace({ closeWorkspace }: DefaultWorkspaceProps) {
   const { t } = useTranslation();
   const layout = useLayoutType();
   const responsiveSize = layout === 'tablet' ? 'lg' : 'sm';
@@ -34,8 +38,9 @@ function PatientListsWorkspace() {
   const { patientLists, isLoading } = usePatientLists();
 
   const launchListDetailsWorkspace = useCallback((list) => {
-    closeWorkspace('patient-lists', true);
-    launchPatientWorkspace('patient-list-details', { list, workspaceTitle: list.name });
+    closeWorkspace({
+      onWorkspaceClose: () => launchPatientWorkspace('patient-list-details', { list, workspaceTitle: list.name }),
+    });
   }, []);
 
   const tableHeaders: Array<typeof DataTableHeader> = [

From ee58d587c2f2c76c508e70ea9a023b02e24c6082 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 29 Jan 2024 17:58:34 +0530
Subject: [PATCH 12/39] Updated the workspace title and workspace
 implementation in the medications app

---
 .../add-drug-order.workspace.tsx              | 27 ++++++++---
 .../drug-order-form.component.tsx             | 17 +++++--
 .../drug-search/drug-search.component.tsx     | 45 ++++++++++---------
 .../order-basket-search-results.component.tsx |  6 ++-
 .../esm-patient-medications-app/src/index.ts  |  5 ++-
 .../translations/am.json                      |  1 +
 .../translations/ar.json                      |  1 +
 .../translations/en.json                      |  1 +
 .../translations/es.json                      |  1 +
 .../translations/fr.json                      |  1 +
 .../translations/he.json                      |  1 +
 .../translations/km.json                      |  1 +
 .../translations/zh.json                      |  1 +
 .../translations/zh_CN.json                   |  1 +
 14 files changed, 74 insertions(+), 35 deletions(-)

diff --git a/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.workspace.tsx b/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.workspace.tsx
index dd74154355..8c6ce3aacd 100644
--- a/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.workspace.tsx
+++ b/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.workspace.tsx
@@ -13,14 +13,19 @@ export interface AddDrugOrderWorkspaceAdditionalProps {
 
 export interface AddDrugOrderWorkspace extends DefaultWorkspaceProps, AddDrugOrderWorkspaceAdditionalProps {}
 
-export default function AddDrugOrderWorkspace({ order: initialOrder, closeWorkspace }: AddDrugOrderWorkspace) {
+export default function AddDrugOrderWorkspace({
+  order: initialOrder,
+  closeWorkspace,
+  promptBeforeClosing,
+}: AddDrugOrderWorkspace) {
   const { orders, setOrders } = useOrderBasket<DrugOrderBasketItem>('medications', prepMedicationOrderPostData);
   const [currentOrder, setCurrentOrder] = useState(initialOrder);
   const session = useSession();
 
   const cancelDrugOrder = useCallback(() => {
-    closeWorkspace();
-    launchPatientWorkspace('order-basket');
+    closeWorkspace({
+      onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
+    });
   }, [closeWorkspace, currentOrder, orders, setOrders]);
 
   const openOrderForm = useCallback(
@@ -51,15 +56,23 @@ export default function AddDrugOrderWorkspace({ order: initialOrder, closeWorksp
         newOrders.push(finalizedOrder);
       }
       setOrders(newOrders);
-      closeWorkspace();
-      launchPatientWorkspace('order-basket');
+      closeWorkspace({
+        onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
+      });
     },
     [orders, setOrders, closeWorkspace, session.currentProvider.uuid],
   );
 
   if (!currentOrder) {
-    return <DrugSearch openOrderForm={openOrderForm} />;
+    return <DrugSearch openOrderForm={openOrderForm} promptBeforeClosing={promptBeforeClosing} />;
   } else {
-    return <DrugOrderForm initialOrderBasketItem={currentOrder} onSave={saveDrugOrder} onCancel={cancelDrugOrder} />;
+    return (
+      <DrugOrderForm
+        initialOrderBasketItem={currentOrder}
+        onSave={saveDrugOrder}
+        onCancel={cancelDrugOrder}
+        promptBeforeClosing={promptBeforeClosing}
+      />
+    );
   }
 }
diff --git a/packages/esm-patient-medications-app/src/add-drug-order/drug-order-form.component.tsx b/packages/esm-patient-medications-app/src/add-drug-order/drug-order-form.component.tsx
index 343610da63..133e981170 100644
--- a/packages/esm-patient-medications-app/src/add-drug-order/drug-order-form.component.tsx
+++ b/packages/esm-patient-medications-app/src/add-drug-order/drug-order-form.component.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import capitalize from 'lodash-es/capitalize';
@@ -42,6 +42,7 @@ export interface DrugOrderFormProps {
   initialOrderBasketItem: DrugOrderBasketItem;
   onSave: (finalizedOrder: DrugOrderBasketItem) => void;
   onCancel: () => void;
+  promptBeforeClosing: (testFcn: () => boolean) => void;
 }
 
 const comboSchema = {
@@ -131,7 +132,7 @@ function InputWrapper({ children }) {
   );
 }
 
-export function DrugOrderForm({ initialOrderBasketItem, onSave, onCancel }: DrugOrderFormProps) {
+export function DrugOrderForm({ initialOrderBasketItem, onSave, onCancel, promptBeforeClosing }: DrugOrderFormProps) {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const { orderConfigObject, error: errorFetchingOrderConfig } = useOrderConfig();
@@ -143,7 +144,13 @@ export function DrugOrderForm({ initialOrderBasketItem, onSave, onCancel }: Drug
     return initialOrderBasketItem?.startDate as Date;
   }, [initialOrderBasketItem?.startDate]);
 
-  const { handleSubmit, control, watch, setValue } = useForm<MedicationOrderFormData>({
+  const {
+    handleSubmit,
+    control,
+    watch,
+    setValue,
+    formState: { isDirty },
+  } = useForm<MedicationOrderFormData>({
     mode: 'all',
     resolver: zodResolver(medicationOrderFormSchema),
     defaultValues: {
@@ -166,6 +173,10 @@ export function DrugOrderForm({ initialOrderBasketItem, onSave, onCancel }: Drug
     },
   });
 
+  useEffect(() => {
+    promptBeforeClosing(() => isDirty);
+  }, [isDirty]);
+
   const routeValue = watch('route')?.value;
   const unitValue = watch('unit')?.value;
   const dosage = watch('dosage');
diff --git a/packages/esm-patient-medications-app/src/add-drug-order/drug-search/drug-search.component.tsx b/packages/esm-patient-medications-app/src/add-drug-order/drug-search/drug-search.component.tsx
index 7636a24cc1..9d0db25567 100644
--- a/packages/esm-patient-medications-app/src/add-drug-order/drug-search/drug-search.component.tsx
+++ b/packages/esm-patient-medications-app/src/add-drug-order/drug-search/drug-search.component.tsx
@@ -1,4 +1,4 @@
-import React, { useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Layer, Search } from '@carbon/react';
 import { useDebounce, useLayoutType } from '@openmrs/esm-framework';
@@ -8,15 +8,20 @@ import styles from './order-basket-search.scss';
 
 export interface DrugSearchProps {
   openOrderForm: (searchResult: DrugOrderBasketItem) => void;
+  promptBeforeClosing: (testFcn: () => boolean) => void;
 }
 
-export default function DrugSearch({ openOrderForm }: DrugSearchProps) {
+export default function DrugSearch({ openOrderForm, promptBeforeClosing }: DrugSearchProps) {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const [searchTerm, setSearchTerm] = useState('');
   const debouncedSearchTerm = useDebounce(searchTerm);
   const searchInputRef = useRef(null);
 
+  useEffect(() => {
+    promptBeforeClosing(() => !!searchTerm);
+  }, [searchTerm]);
+
   const focusAndClearSearchInput = () => {
     setSearchTerm('');
     searchInputRef.current?.focus();
@@ -27,26 +32,24 @@ export default function DrugSearch({ openOrderForm }: DrugSearchProps) {
   };
 
   return (
-    <>
-      <div className={styles.searchPopupContainer}>
-        <ResponsiveWrapper isTablet={isTablet}>
-          <Search
-            autoFocus
-            size="lg"
-            placeholder={t('searchFieldPlaceholder', 'Search for a drug or orderset (e.g. "Aspirin")')}
-            labelText={t('searchFieldPlaceholder', 'Search for a drug or orderset (e.g. "Aspirin")')}
-            onChange={handleSearchTermChange}
-            ref={searchInputRef}
-            value={searchTerm}
-          />
-        </ResponsiveWrapper>
-        <OrderBasketSearchResults
-          searchTerm={debouncedSearchTerm}
-          openOrderForm={openOrderForm}
-          focusAndClearSearchInput={focusAndClearSearchInput}
+    <div className={styles.searchPopupContainer}>
+      <ResponsiveWrapper isTablet={isTablet}>
+        <Search
+          autoFocus
+          size="lg"
+          placeholder={t('searchFieldPlaceholder', 'Search for a drug or orderset (e.g. "Aspirin")')}
+          labelText={t('searchFieldPlaceholder', 'Search for a drug or orderset (e.g. "Aspirin")')}
+          onChange={handleSearchTermChange}
+          ref={searchInputRef}
+          value={searchTerm}
         />
-      </div>
-    </>
+      </ResponsiveWrapper>
+      <OrderBasketSearchResults
+        searchTerm={debouncedSearchTerm}
+        openOrderForm={openOrderForm}
+        focusAndClearSearchInput={focusAndClearSearchInput}
+      />
+    </div>
   );
 }
 
diff --git a/packages/esm-patient-medications-app/src/add-drug-order/drug-search/order-basket-search-results.component.tsx b/packages/esm-patient-medications-app/src/add-drug-order/drug-search/order-basket-search-results.component.tsx
index d1bf6105c8..6d1f8491e1 100644
--- a/packages/esm-patient-medications-app/src/add-drug-order/drug-search/order-basket-search-results.component.tsx
+++ b/packages/esm-patient-medications-app/src/add-drug-order/drug-search/order-basket-search-results.component.tsx
@@ -141,8 +141,10 @@ const DrugSearchResultItem: React.FC<DrugSearchResultItemProps> = ({ drug, openO
       // Directly adding the order to basket should be marked as incomplete
       searchResult.isOrderIncomplete = true;
       setOrders([...orders, searchResult]);
-      closeWorkspace('add-drug-order', true);
-      launchPatientWorkspace('order-basket');
+      closeWorkspace('add-drug-order', {
+        ignoreChanges: true,
+        onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
+      });
     },
     [orders, setOrders],
   );
diff --git a/packages/esm-patient-medications-app/src/index.ts b/packages/esm-patient-medications-app/src/index.ts
index ce579a3bf7..960c5aca13 100644
--- a/packages/esm-patient-medications-app/src/index.ts
+++ b/packages/esm-patient-medications-app/src/index.ts
@@ -1,4 +1,4 @@
-import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
+import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle, translateFrom } from '@openmrs/esm-framework';
 import { createDashboardLink, registerWorkspace } from '@openmrs/esm-patient-common-lib';
 import { configSchema } from './config-schema';
 import { dashboardMeta } from './dashboard.meta';
@@ -37,9 +37,10 @@ export const medicationsDashboardLink =
     options,
   );
 
+// t('addDrugOrderWorkspaceTitle', 'Add drug order')
 registerWorkspace({
   name: 'add-drug-order',
   type: 'order',
-  title: 'Add drug order',
+  title: translateFrom(moduleName, 'addDrugOrderWorkspaceTitle', 'Add drug order'),
   load: getAsyncLifecycle(() => import('./add-drug-order/add-drug-order.workspace'), options),
 });
diff --git a/packages/esm-patient-medications-app/translations/am.json b/packages/esm-patient-medications-app/translations/am.json
index 0317265b52..ea0e4ecfe3 100644
--- a/packages/esm-patient-medications-app/translations/am.json
+++ b/packages/esm-patient-medications-app/translations/am.json
@@ -3,6 +3,7 @@
   "activeMedicationsHeaderTitle": "active medications",
   "activeMedicationsTableTitle": "Active Medications",
   "add": "Add",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
   "backToOrderBasket": "Back to order basket",
   "clearSearchResults": "Clear Results",
   "decrement": "Decrement",
diff --git a/packages/esm-patient-medications-app/translations/ar.json b/packages/esm-patient-medications-app/translations/ar.json
index 50cee60f7b..87da2d6c12 100644
--- a/packages/esm-patient-medications-app/translations/ar.json
+++ b/packages/esm-patient-medications-app/translations/ar.json
@@ -3,6 +3,7 @@
   "activeMedicationsHeaderTitle": "الأدوية النشطة",
   "activeMedicationsTableTitle": "الأدوية النشطة",
   "add": "أضف",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
   "backToOrderBasket": "العودة إلى سلة الطلب",
   "clearSearchResults": "مسح النتائج",
   "decrement": "تقليل",
diff --git a/packages/esm-patient-medications-app/translations/en.json b/packages/esm-patient-medications-app/translations/en.json
index 0317265b52..ea0e4ecfe3 100644
--- a/packages/esm-patient-medications-app/translations/en.json
+++ b/packages/esm-patient-medications-app/translations/en.json
@@ -3,6 +3,7 @@
   "activeMedicationsHeaderTitle": "active medications",
   "activeMedicationsTableTitle": "Active Medications",
   "add": "Add",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
   "backToOrderBasket": "Back to order basket",
   "clearSearchResults": "Clear Results",
   "decrement": "Decrement",
diff --git a/packages/esm-patient-medications-app/translations/es.json b/packages/esm-patient-medications-app/translations/es.json
index ff3c2904b8..43270cceb7 100644
--- a/packages/esm-patient-medications-app/translations/es.json
+++ b/packages/esm-patient-medications-app/translations/es.json
@@ -3,6 +3,7 @@
   "activeMedicationsHeaderTitle": "Medicamentos activos",
   "activeMedicationsTableTitle": "Medicamentos Activos",
   "add": "Añadir",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
   "backToOrderBasket": "Volver a la cesta de pedidos",
   "clearSearchResults": "Borrar resultados",
   "decrement": "Decremento",
diff --git a/packages/esm-patient-medications-app/translations/fr.json b/packages/esm-patient-medications-app/translations/fr.json
index 2e8345134b..d18b5b0869 100644
--- a/packages/esm-patient-medications-app/translations/fr.json
+++ b/packages/esm-patient-medications-app/translations/fr.json
@@ -3,6 +3,7 @@
   "activeMedicationsHeaderTitle": "active medications",
   "activeMedicationsTableTitle": "Active Medications",
   "add": "Add",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
   "backToOrderBasket": "Back to order basket",
   "clearSearchResults": "Clear Results",
   "decrement": "Decrement",
diff --git a/packages/esm-patient-medications-app/translations/he.json b/packages/esm-patient-medications-app/translations/he.json
index 6b5130873a..d01a09db25 100644
--- a/packages/esm-patient-medications-app/translations/he.json
+++ b/packages/esm-patient-medications-app/translations/he.json
@@ -3,6 +3,7 @@
   "activeMedicationsHeaderTitle": "תרופות פעילות",
   "activeMedicationsTableTitle": "תרופות פעילות",
   "add": "הוסף",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
   "backToOrderBasket": "חזור לסל ההזמנות",
   "clearSearchResults": "נקה תוצאות חיפוש",
   "decrement": "הפחתה",
diff --git a/packages/esm-patient-medications-app/translations/km.json b/packages/esm-patient-medications-app/translations/km.json
index 53789581fe..03da38317d 100644
--- a/packages/esm-patient-medications-app/translations/km.json
+++ b/packages/esm-patient-medications-app/translations/km.json
@@ -3,6 +3,7 @@
   "activeMedicationsHeaderTitle": "កំពង់ប្រើប្រាស់ឱសថ",
   "activeMedicationsTableTitle": "កំពង់ប្រើប្រាស់ឱសថ",
   "add": "បន្ថែម",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
   "backToOrderBasket": "ត្រឡប់ទៅប្រអប់តម្រៀបតាមលំដាប់លំដោយវិញ",
   "clearSearchResults": "លទ្ធផលច្បាស់លាស់",
   "decrement": "បន្ថយ",
diff --git a/packages/esm-patient-medications-app/translations/zh.json b/packages/esm-patient-medications-app/translations/zh.json
index 99de0d0ec9..c0206aa46f 100644
--- a/packages/esm-patient-medications-app/translations/zh.json
+++ b/packages/esm-patient-medications-app/translations/zh.json
@@ -3,6 +3,7 @@
   "activeMedicationsHeaderTitle": "active medications",
   "activeMedicationsTableTitle": "Active Medications",
   "add": "添加",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
   "backToOrderBasket": "Back to order basket",
   "clearSearchResults": "清除结果",
   "decrement": "Decrement",
diff --git a/packages/esm-patient-medications-app/translations/zh_CN.json b/packages/esm-patient-medications-app/translations/zh_CN.json
index 9457035c60..d1b4d46a6f 100644
--- a/packages/esm-patient-medications-app/translations/zh_CN.json
+++ b/packages/esm-patient-medications-app/translations/zh_CN.json
@@ -3,6 +3,7 @@
   "activeMedicationsHeaderTitle": "active medications",
   "activeMedicationsTableTitle": "Active Medications",
   "add": "添加",
+  "addDrugOrderWorkspaceTitle": "Add drug order",
   "backToOrderBasket": "Back to order basket",
   "clearSearchResults": "清除结果",
   "decrement": "Decrement",

From b32fa2e75c5a07d007dade37180759b51d72cbb6 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 29 Jan 2024 18:06:06 +0530
Subject: [PATCH 13/39] Updated the workspace title and workspace
 implementation in the note app

---
 packages/esm-patient-notes-app/src/index.ts          | 11 ++++++++++-
 .../src/notes/visit-notes-form.component.tsx         | 10 ++++++++--
 packages/esm-patient-notes-app/src/routes.json       | 12 ------------
 packages/esm-patient-notes-app/translations/am.json  |  3 ++-
 packages/esm-patient-notes-app/translations/ar.json  |  3 ++-
 packages/esm-patient-notes-app/translations/en.json  |  3 ++-
 packages/esm-patient-notes-app/translations/es.json  |  3 ++-
 packages/esm-patient-notes-app/translations/fr.json  |  3 ++-
 packages/esm-patient-notes-app/translations/he.json  |  3 ++-
 packages/esm-patient-notes-app/translations/km.json  |  3 ++-
 packages/esm-patient-notes-app/translations/zh.json  |  3 ++-
 .../esm-patient-notes-app/translations/zh_CN.json    |  3 ++-
 12 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/packages/esm-patient-notes-app/src/index.ts b/packages/esm-patient-notes-app/src/index.ts
index 9dfd30d042..b3a2ed698e 100644
--- a/packages/esm-patient-notes-app/src/index.ts
+++ b/packages/esm-patient-notes-app/src/index.ts
@@ -3,10 +3,12 @@ import {
   getAsyncLifecycle,
   getSyncLifecycle,
   messageOmrsServiceWorker,
+  translateFrom,
 } from '@openmrs/esm-framework';
 import { configSchema } from './config-schema';
 import notesOverviewComponent from './notes/notes-overview.component';
 import visitNotesActionButtonComponent from './visit-note-action-button.component';
+import { registerWorkspace } from '@openmrs/esm-patient-common-lib';
 
 const moduleName = '@openmrs/esm-patient-notes-app';
 
@@ -30,4 +32,11 @@ export const notesOverview = getSyncLifecycle(notesOverviewComponent, options);
 
 export const visitNotesActionButton = getSyncLifecycle(visitNotesActionButtonComponent, options);
 
-export const visitNotesForm = getAsyncLifecycle(() => import('./notes/visit-notes-form.component'), options);
+// t('visitNoteWorkspaceTitle', 'Visit Note')
+export const visitNotesForm = registerWorkspace({
+  name: 'visit-notes-form-workspace',
+  load: getAsyncLifecycle(() => import('./notes/visit-notes-form.component'), options),
+  title: translateFrom(moduleName, 'visitNoteWorkspaceTitle', 'Visit Note'),
+  type: 'visit-note',
+  canHide: true,
+});
diff --git a/packages/esm-patient-notes-app/src/notes/visit-notes-form.component.tsx b/packages/esm-patient-notes-app/src/notes/visit-notes-form.component.tsx
index c666d6c18f..93370d15c6 100644
--- a/packages/esm-patient-notes-app/src/notes/visit-notes-form.component.tsx
+++ b/packages/esm-patient-notes-app/src/notes/visit-notes-form.component.tsx
@@ -62,7 +62,7 @@ interface DiagnosisSearchProps {
 
 type VisitNotesFormData = z.infer<typeof visitNoteFormSchema>;
 
-const VisitNotesForm: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace, patientUuid }) => {
+const VisitNotesForm: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace, patientUuid, promptBeforeClosing }) => {
   const searchTimeoutInMs = 500;
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
@@ -89,6 +89,12 @@ const VisitNotesForm: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace, patie
     },
   });
 
+  const { isDirty } = formState;
+
+  useEffect(() => {
+    promptBeforeClosing(() => isDirty);
+  }, [isDirty]);
+
   const { mutateVisitNotes } = useVisitNotes(patientUuid);
   const locationUuid = session?.sessionLocation?.uuid;
   const providerUuid = session?.currentProvider?.uuid;
@@ -520,7 +526,7 @@ const VisitNotesForm: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace, patie
         </Row>
       </Stack>
       <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
-        <Button className={styles.button} kind="secondary" onClick={() => closeWorkspace()}>
+        <Button className={styles.button} kind="secondary" onClick={closeWorkspace}>
           {t('discard', 'Discard')}
         </Button>
         <Button
diff --git a/packages/esm-patient-notes-app/src/routes.json b/packages/esm-patient-notes-app/src/routes.json
index 972a5acb8a..3c023ae078 100644
--- a/packages/esm-patient-notes-app/src/routes.json
+++ b/packages/esm-patient-notes-app/src/routes.json
@@ -18,18 +18,6 @@
       "component": "visitNotesActionButton",
       "slot": "action-menu-chart-items-slot",
       "order": 1
-    },
-    {
-      "name": "visit-notes-form-workspace",
-      "component": "visitNotesForm",
-      "meta": {
-        "title": {
-          "key": "visitNote",
-          "default": "Visit Note"
-        },
-        "type": "visit-note",
-        "canHide": true
-      }
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/esm-patient-notes-app/translations/am.json b/packages/esm-patient-notes-app/translations/am.json
index c0eb679274..1e025fece0 100644
--- a/packages/esm-patient-notes-app/translations/am.json
+++ b/packages/esm-patient-notes-app/translations/am.json
@@ -29,5 +29,6 @@
   "visitNoteNowVisible": "It is now visible on the Encounters page",
   "visitNotes": "Visit notes",
   "visitNoteSaved": "Visit note saved",
-  "visitNoteSaveError": "Error saving visit note"
+  "visitNoteSaveError": "Error saving visit note",
+  "visitNoteWorkspaceTitle": "Visit Note"
 }
diff --git a/packages/esm-patient-notes-app/translations/ar.json b/packages/esm-patient-notes-app/translations/ar.json
index 8850abef4d..26e3bb8013 100644
--- a/packages/esm-patient-notes-app/translations/ar.json
+++ b/packages/esm-patient-notes-app/translations/ar.json
@@ -29,5 +29,6 @@
   "visitNoteNowVisible": "أصبحت مرئية الآن في صفحة اللقاءات",
   "visitNotes": "ملاحظات الزيارة",
   "visitNoteSaved": "تم حفظ ملاحظة الزيارة",
-  "visitNoteSaveError": "خطأ في حفظ ملاحظة الزيارة"
+  "visitNoteSaveError": "خطأ في حفظ ملاحظة الزيارة",
+  "visitNoteWorkspaceTitle": "ملاحظة الزيارة"
 }
diff --git a/packages/esm-patient-notes-app/translations/en.json b/packages/esm-patient-notes-app/translations/en.json
index 997134bc5c..e791d9c1da 100644
--- a/packages/esm-patient-notes-app/translations/en.json
+++ b/packages/esm-patient-notes-app/translations/en.json
@@ -29,5 +29,6 @@
   "visitNoteNowVisible": "It is now visible on the Encounters page",
   "visitNotes": "Visit notes",
   "visitNoteSaved": "Visit note saved",
-  "visitNoteSaveError": "Error saving visit note"
+  "visitNoteSaveError": "Error saving visit note",
+  "visitNoteWorkspaceTitle": "Visit Note"
 }
diff --git a/packages/esm-patient-notes-app/translations/es.json b/packages/esm-patient-notes-app/translations/es.json
index 5264938dd7..f7abb4d0c2 100644
--- a/packages/esm-patient-notes-app/translations/es.json
+++ b/packages/esm-patient-notes-app/translations/es.json
@@ -29,5 +29,6 @@
   "visitNoteNowVisible": "Ahora es visible en la página de Encuentros",
   "visitNotes": "Notas de visita",
   "visitNoteSaved": "Nota de visita guardada",
-  "visitNoteSaveError": "Error al guardar la nota de visita"
+  "visitNoteSaveError": "Error al guardar la nota de visita",
+  "visitNoteWorkspaceTitle": "Nota de visita"
 }
diff --git a/packages/esm-patient-notes-app/translations/fr.json b/packages/esm-patient-notes-app/translations/fr.json
index 15203f1603..fadffbfd5e 100644
--- a/packages/esm-patient-notes-app/translations/fr.json
+++ b/packages/esm-patient-notes-app/translations/fr.json
@@ -29,5 +29,6 @@
   "visitNoteNowVisible": "C'est maintenant visible sur la page Rencontres",
   "visitNotes": "Notes de la visite",
   "visitNoteSaved": "Note de la visite enregistrée avec succès",
-  "visitNoteSaveError": "Erreur en sauvegardant la note de visite"
+  "visitNoteSaveError": "Erreur en sauvegardant la note de visite",
+  "visitNoteWorkspaceTitle": "Note de visite"
 }
diff --git a/packages/esm-patient-notes-app/translations/he.json b/packages/esm-patient-notes-app/translations/he.json
index 1a95a9d568..c60b005ced 100644
--- a/packages/esm-patient-notes-app/translations/he.json
+++ b/packages/esm-patient-notes-app/translations/he.json
@@ -29,5 +29,6 @@
   "visitNoteNowVisible": "הערה כעת נראית בעמוד הפגישות",
   "visitNotes": "הערות ביקור",
   "visitNoteSaved": "הערת הביקור נשמרה בהצלחה",
-  "visitNoteSaveError": "שגיאה בשמירת הערת הביקור"
+  "visitNoteSaveError": "שגיאה בשמירת הערת הביקור",
+  "visitNoteWorkspaceTitle": "הערת ביקור"
 }
diff --git a/packages/esm-patient-notes-app/translations/km.json b/packages/esm-patient-notes-app/translations/km.json
index d389549309..abc7cefd2e 100644
--- a/packages/esm-patient-notes-app/translations/km.json
+++ b/packages/esm-patient-notes-app/translations/km.json
@@ -29,5 +29,6 @@
   "visitNoteNowVisible": "ឥឡូវនេះវាអាចមើលឃើញនៅលើទំព័រមកជួបពិនិត្យ",
   "visitNotes": "កំណត់សម្គាល់នៃរាល់ការមកពិនិត្យ",
   "visitNoteSaved": "បានរក្សាទុកកំណត់សម្គាល់នៃការមកពិនិត្យដោយជោគជ័យ",
-  "visitNoteSaveError": "កំហុសក្នុងការរក្សាទុកកំណត់សម្គាល់នៃការមកពិនិត្យ"
+  "visitNoteSaveError": "កំហុសក្នុងការរក្សាទុកកំណត់សម្គាល់នៃការមកពិនិត្យ",
+  "visitNoteWorkspaceTitle": "កំណត់សម្គាល់នៃការមកពិនិត្យ"
 }
diff --git a/packages/esm-patient-notes-app/translations/zh.json b/packages/esm-patient-notes-app/translations/zh.json
index a16d2ea664..ce7109d21b 100644
--- a/packages/esm-patient-notes-app/translations/zh.json
+++ b/packages/esm-patient-notes-app/translations/zh.json
@@ -29,5 +29,6 @@
   "visitNoteNowVisible": "It is now visible on the Encounters page",
   "visitNotes": "Visit notes",
   "visitNoteSaved": "Visit note saved successfully",
-  "visitNoteSaveError": "Error saving visit note"
+  "visitNoteSaveError": "Error saving visit note",
+  "visitNoteWorkspaceTitle": "Visit Note"
 }
diff --git a/packages/esm-patient-notes-app/translations/zh_CN.json b/packages/esm-patient-notes-app/translations/zh_CN.json
index a16d2ea664..ce7109d21b 100644
--- a/packages/esm-patient-notes-app/translations/zh_CN.json
+++ b/packages/esm-patient-notes-app/translations/zh_CN.json
@@ -29,5 +29,6 @@
   "visitNoteNowVisible": "It is now visible on the Encounters page",
   "visitNotes": "Visit notes",
   "visitNoteSaved": "Visit note saved successfully",
-  "visitNoteSaveError": "Error saving visit note"
+  "visitNoteSaveError": "Error saving visit note",
+  "visitNoteWorkspaceTitle": "Visit Note"
 }

From 7571d1fdba245822b35dfa0b6cf56d8adc03f19b Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 29 Jan 2024 18:13:04 +0530
Subject: [PATCH 14/39] Updated the workspace title and workspace
 implementation in the orders app

---
 packages/esm-patient-orders-app/src/index.ts          | 11 +++++++++--
 .../src/order-basket/order-basket.workspace.tsx       |  4 ++--
 packages/esm-patient-orders-app/translations/am.json  |  1 +
 packages/esm-patient-orders-app/translations/ar.json  |  1 +
 packages/esm-patient-orders-app/translations/en.json  |  1 +
 packages/esm-patient-orders-app/translations/es.json  |  1 +
 packages/esm-patient-orders-app/translations/fr.json  |  1 +
 packages/esm-patient-orders-app/translations/he.json  |  1 +
 packages/esm-patient-orders-app/translations/km.json  |  1 +
 packages/esm-patient-orders-app/translations/zh.json  |  1 +
 .../esm-patient-orders-app/translations/zh_CN.json    |  1 +
 11 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/esm-patient-orders-app/src/index.ts b/packages/esm-patient-orders-app/src/index.ts
index ed67c723da..01a62fb8d1 100644
--- a/packages/esm-patient-orders-app/src/index.ts
+++ b/packages/esm-patient-orders-app/src/index.ts
@@ -1,4 +1,10 @@
-import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle, registerFeatureFlag } from '@openmrs/esm-framework';
+import {
+  defineConfigSchema,
+  getAsyncLifecycle,
+  getSyncLifecycle,
+  registerFeatureFlag,
+  translateFrom,
+} from '@openmrs/esm-framework';
 import { createDashboardLink, registerWorkspace } from '@openmrs/esm-patient-common-lib';
 import { configSchema } from './config-schema';
 import orderBasketActionMenuComponent from './order-basket-action-button/order-basket-action-button.extension';
@@ -18,9 +24,10 @@ export function startupApp() {
   defineConfigSchema(moduleName, configSchema);
 }
 
+// t('orderBasketWorkspaceTitle', 'Order Basket')
 registerWorkspace({
   name: 'order-basket',
-  title: 'Order Basket',
+  title: translateFrom(moduleName, 'orderBasketWorkspaceTitle', 'Order Basket'),
   load: getAsyncLifecycle(() => import('./order-basket/order-basket.workspace'), options),
   type: 'order',
   canHide: true,
diff --git a/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx b/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx
index cbd26b290d..6f77d15fd6 100644
--- a/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx
+++ b/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx
@@ -32,8 +32,8 @@ const OrderBasket: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWorksp
   const { mutate: mutateOrders } = useMutatePatientOrders(patientUuid);
 
   useEffect(() => {
-    promptBeforeClosing(() => false);
-  }, [promptBeforeClosing]);
+    promptBeforeClosing(() => !!orders.length);
+  }, [orders]);
 
   const openStartVisitDialog = useCallback(() => {
     const dispose = showModal('start-visit-dialog', {
diff --git a/packages/esm-patient-orders-app/translations/am.json b/packages/esm-patient-orders-app/translations/am.json
index d5114a2f88..4d26f8ac51 100644
--- a/packages/esm-patient-orders-app/translations/am.json
+++ b/packages/esm-patient-orders-app/translations/am.json
@@ -7,6 +7,7 @@
   "male": "Male",
   "onDate": "on",
   "order": "Order",
+  "orderBasketWorkspaceTitle": "Order Basket",
   "orderedBy": "Ordered By",
   "orderId": "Order ID",
   "orders": "Orders",
diff --git a/packages/esm-patient-orders-app/translations/ar.json b/packages/esm-patient-orders-app/translations/ar.json
index d5114a2f88..4d26f8ac51 100644
--- a/packages/esm-patient-orders-app/translations/ar.json
+++ b/packages/esm-patient-orders-app/translations/ar.json
@@ -7,6 +7,7 @@
   "male": "Male",
   "onDate": "on",
   "order": "Order",
+  "orderBasketWorkspaceTitle": "Order Basket",
   "orderedBy": "Ordered By",
   "orderId": "Order ID",
   "orders": "Orders",
diff --git a/packages/esm-patient-orders-app/translations/en.json b/packages/esm-patient-orders-app/translations/en.json
index d5114a2f88..4d26f8ac51 100644
--- a/packages/esm-patient-orders-app/translations/en.json
+++ b/packages/esm-patient-orders-app/translations/en.json
@@ -7,6 +7,7 @@
   "male": "Male",
   "onDate": "on",
   "order": "Order",
+  "orderBasketWorkspaceTitle": "Order Basket",
   "orderedBy": "Ordered By",
   "orderId": "Order ID",
   "orders": "Orders",
diff --git a/packages/esm-patient-orders-app/translations/es.json b/packages/esm-patient-orders-app/translations/es.json
index d5114a2f88..4d26f8ac51 100644
--- a/packages/esm-patient-orders-app/translations/es.json
+++ b/packages/esm-patient-orders-app/translations/es.json
@@ -7,6 +7,7 @@
   "male": "Male",
   "onDate": "on",
   "order": "Order",
+  "orderBasketWorkspaceTitle": "Order Basket",
   "orderedBy": "Ordered By",
   "orderId": "Order ID",
   "orders": "Orders",
diff --git a/packages/esm-patient-orders-app/translations/fr.json b/packages/esm-patient-orders-app/translations/fr.json
index d5114a2f88..4d26f8ac51 100644
--- a/packages/esm-patient-orders-app/translations/fr.json
+++ b/packages/esm-patient-orders-app/translations/fr.json
@@ -7,6 +7,7 @@
   "male": "Male",
   "onDate": "on",
   "order": "Order",
+  "orderBasketWorkspaceTitle": "Order Basket",
   "orderedBy": "Ordered By",
   "orderId": "Order ID",
   "orders": "Orders",
diff --git a/packages/esm-patient-orders-app/translations/he.json b/packages/esm-patient-orders-app/translations/he.json
index d5114a2f88..4d26f8ac51 100644
--- a/packages/esm-patient-orders-app/translations/he.json
+++ b/packages/esm-patient-orders-app/translations/he.json
@@ -7,6 +7,7 @@
   "male": "Male",
   "onDate": "on",
   "order": "Order",
+  "orderBasketWorkspaceTitle": "Order Basket",
   "orderedBy": "Ordered By",
   "orderId": "Order ID",
   "orders": "Orders",
diff --git a/packages/esm-patient-orders-app/translations/km.json b/packages/esm-patient-orders-app/translations/km.json
index d5114a2f88..4d26f8ac51 100644
--- a/packages/esm-patient-orders-app/translations/km.json
+++ b/packages/esm-patient-orders-app/translations/km.json
@@ -7,6 +7,7 @@
   "male": "Male",
   "onDate": "on",
   "order": "Order",
+  "orderBasketWorkspaceTitle": "Order Basket",
   "orderedBy": "Ordered By",
   "orderId": "Order ID",
   "orders": "Orders",
diff --git a/packages/esm-patient-orders-app/translations/zh.json b/packages/esm-patient-orders-app/translations/zh.json
index c841d2072f..1524f58589 100644
--- a/packages/esm-patient-orders-app/translations/zh.json
+++ b/packages/esm-patient-orders-app/translations/zh.json
@@ -7,6 +7,7 @@
   "male": "Male",
   "onDate": "on",
   "order": "Order",
+  "orderBasketWorkspaceTitle": "Order Basket",
   "orderedBy": "Ordered by",
   "orderId": "Order ID",
   "orders": "Orders",
diff --git a/packages/esm-patient-orders-app/translations/zh_CN.json b/packages/esm-patient-orders-app/translations/zh_CN.json
index c841d2072f..1524f58589 100644
--- a/packages/esm-patient-orders-app/translations/zh_CN.json
+++ b/packages/esm-patient-orders-app/translations/zh_CN.json
@@ -7,6 +7,7 @@
   "male": "Male",
   "onDate": "on",
   "order": "Order",
+  "orderBasketWorkspaceTitle": "Order Basket",
   "orderedBy": "Ordered by",
   "orderId": "Order ID",
   "orders": "Orders",

From 5dc2ad11f72f9b676c7a5202156282584a38a586 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 29 Jan 2024 18:37:17 +0530
Subject: [PATCH 15/39] Updated the workspace title and workspace
 implementation in the programs app

---
 .../esm-patient-programs-app/src/index.ts     | 11 +++++++---
 .../src/programs/programs-form.component.tsx  | 20 ++++++++++++++++---
 .../esm-patient-programs-app/src/routes.json  |  7 -------
 .../translations/am.json                      |  1 +
 .../translations/ar.json                      |  1 +
 .../translations/en.json                      |  1 +
 .../translations/es.json                      |  1 +
 .../translations/fr.json                      |  1 +
 .../translations/he.json                      |  1 +
 .../translations/km.json                      |  1 +
 .../translations/zh.json                      |  1 +
 .../translations/zh_CN.json                   |  1 +
 12 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/packages/esm-patient-programs-app/src/index.ts b/packages/esm-patient-programs-app/src/index.ts
index acafabe66a..c316b2804b 100644
--- a/packages/esm-patient-programs-app/src/index.ts
+++ b/packages/esm-patient-programs-app/src/index.ts
@@ -1,5 +1,5 @@
-import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
-import { createDashboardLink } from '@openmrs/esm-patient-common-lib';
+import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle, translateFrom } from '@openmrs/esm-framework';
+import { createDashboardLink, registerWorkspace } from '@openmrs/esm-patient-common-lib';
 import { configSchema } from './config-schema';
 import { dashboardMeta } from './dashboard.meta';
 import programsOverviewComponent from './programs/programs-overview.component';
@@ -32,4 +32,9 @@ export const programsDashboardLink =
     options,
   );
 
-export const programsForm = getAsyncLifecycle(() => import('./programs/programs-form.component'), options);
+// t('programEnrollmentWorkspaceTitle', 'Record program enrollment')
+export const programsForm = registerWorkspace({
+  name: 'programs-form-workspace',
+  load: getAsyncLifecycle(() => import('./programs/programs-form.component'), options),
+  title: translateFrom(moduleName, 'programEnrollmentWorkspaceTitle', 'Record program enrollment'),
+});
diff --git a/packages/esm-patient-programs-app/src/programs/programs-form.component.tsx b/packages/esm-patient-programs-app/src/programs/programs-form.component.tsx
index 2ab24e4173..e0f2f01c59 100644
--- a/packages/esm-patient-programs-app/src/programs/programs-form.component.tsx
+++ b/packages/esm-patient-programs-app/src/programs/programs-form.component.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import dayjs from 'dayjs';
 import filter from 'lodash-es/filter';
@@ -50,7 +50,12 @@ const programsFormSchema = z.object({
 
 export type ProgramsFormData = z.infer<typeof programsFormSchema>;
 
-const ProgramsForm: React.FC<ProgramsFormProps> = ({ closeWorkspace, patientUuid, programEnrollmentId }) => {
+const ProgramsForm: React.FC<ProgramsFormProps> = ({
+  closeWorkspace,
+  patientUuid,
+  programEnrollmentId,
+  promptBeforeClosing,
+}) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const session = useSession();
@@ -77,7 +82,12 @@ const ProgramsForm: React.FC<ProgramsFormProps> = ({ closeWorkspace, patientUuid
     return currentEnrollment?.location.uuid ?? null;
   };
 
-  const { control, handleSubmit, watch } = useForm<ProgramsFormData>({
+  const {
+    control,
+    handleSubmit,
+    watch,
+    formState: { isDirty },
+  } = useForm<ProgramsFormData>({
     mode: 'all',
     resolver: zodResolver(programsFormSchema),
     defaultValues: {
@@ -88,6 +98,10 @@ const ProgramsForm: React.FC<ProgramsFormProps> = ({ closeWorkspace, patientUuid
     },
   });
 
+  useEffect(() => {
+    promptBeforeClosing(() => isDirty);
+  }, [isDirty]);
+
   const onSubmit = React.useCallback(
     (data: ProgramsFormData) => {
       const { selectedProgram, enrollmentDate, completionDate, enrollmentLocation } = data;
diff --git a/packages/esm-patient-programs-app/src/routes.json b/packages/esm-patient-programs-app/src/routes.json
index 8c5a3c8882..aee0d3844f 100644
--- a/packages/esm-patient-programs-app/src/routes.json
+++ b/packages/esm-patient-programs-app/src/routes.json
@@ -31,13 +31,6 @@
         "path": "Programs"  
       },
       "order": 10
-    },
-    {
-      "name": "programs-form-workspace",
-      "component": "programsForm",
-      "meta": {
-        "title": "Record program enrollment"
-      }
     }
   ],
   "pages": []
diff --git a/packages/esm-patient-programs-app/translations/am.json b/packages/esm-patient-programs-app/translations/am.json
index ff11f52fda..5a5ea2da76 100644
--- a/packages/esm-patient-programs-app/translations/am.json
+++ b/packages/esm-patient-programs-app/translations/am.json
@@ -22,6 +22,7 @@
   "noProgramsConfigured": "No programs configured",
   "programEnrollments": "Program enrollments",
   "programEnrollmentSaveError": "Error saving program enrollment",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
   "programName": "Program name",
   "programs": "Program enrollments",
   "Programs": "Programs",
diff --git a/packages/esm-patient-programs-app/translations/ar.json b/packages/esm-patient-programs-app/translations/ar.json
index 54c6c6bb19..c2c138c587 100644
--- a/packages/esm-patient-programs-app/translations/ar.json
+++ b/packages/esm-patient-programs-app/translations/ar.json
@@ -22,6 +22,7 @@
   "noProgramsConfigured": "لم يتم تكوين أي برامج",
   "programEnrollments": "تسجيلات البرنامج",
   "programEnrollmentSaveError": "خطأ في حفظ التسجيل في البرنامج",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
   "programName": "اسم البرنامج",
   "programs": "تسجيلات البرنامج",
   "Programs": "البرامج",
diff --git a/packages/esm-patient-programs-app/translations/en.json b/packages/esm-patient-programs-app/translations/en.json
index ff11f52fda..5a5ea2da76 100644
--- a/packages/esm-patient-programs-app/translations/en.json
+++ b/packages/esm-patient-programs-app/translations/en.json
@@ -22,6 +22,7 @@
   "noProgramsConfigured": "No programs configured",
   "programEnrollments": "Program enrollments",
   "programEnrollmentSaveError": "Error saving program enrollment",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
   "programName": "Program name",
   "programs": "Program enrollments",
   "Programs": "Programs",
diff --git a/packages/esm-patient-programs-app/translations/es.json b/packages/esm-patient-programs-app/translations/es.json
index cbd7492c15..3dd4e60f2a 100644
--- a/packages/esm-patient-programs-app/translations/es.json
+++ b/packages/esm-patient-programs-app/translations/es.json
@@ -22,6 +22,7 @@
   "noProgramsConfigured": "No hay programas configurados",
   "programEnrollments": "Inscripciones en programa",
   "programEnrollmentSaveError": "Error al guardar inscripción en programa",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
   "programName": "Nombre de programa",
   "programs": "Programas",
   "Programs": "Programas",
diff --git a/packages/esm-patient-programs-app/translations/fr.json b/packages/esm-patient-programs-app/translations/fr.json
index f94b65c4c8..cbc757aca0 100644
--- a/packages/esm-patient-programs-app/translations/fr.json
+++ b/packages/esm-patient-programs-app/translations/fr.json
@@ -22,6 +22,7 @@
   "noProgramsConfigured": "Aucun programme configuré",
   "programEnrollments": "Enregistrement dans les programmes",
   "programEnrollmentSaveError": "Erreur d'enregistrement dans le programme",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
   "programName": "Nom du programme",
   "programs": "programmes",
   "Programs": "Programs",
diff --git a/packages/esm-patient-programs-app/translations/he.json b/packages/esm-patient-programs-app/translations/he.json
index e332f0b7b3..b8e12c6563 100644
--- a/packages/esm-patient-programs-app/translations/he.json
+++ b/packages/esm-patient-programs-app/translations/he.json
@@ -22,6 +22,7 @@
   "noProgramsConfigured": "לא מוגדרות תוכניות",
   "programEnrollments": "הרשמות לתוכניות",
   "programEnrollmentSaveError": "שגיאה בשמירת הרשמת התוכנית",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
   "programName": "שם התוכנית",
   "programs": "תוכניות",
   "Programs": "תוכניות",
diff --git a/packages/esm-patient-programs-app/translations/km.json b/packages/esm-patient-programs-app/translations/km.json
index bf7c2880b7..4bfde488cd 100644
--- a/packages/esm-patient-programs-app/translations/km.json
+++ b/packages/esm-patient-programs-app/translations/km.json
@@ -22,6 +22,7 @@
   "noProgramsConfigured": "មិនមានកម្មវិធីដែលបានកំណត់រចនាសម្ព័ន្ធទេ",
   "programEnrollments": "ការចុះឈ្មោះកម្មវិធី",
   "programEnrollmentSaveError": "កំហុសក្នុងការរក្សាទុកការចុះឈ្មោះកម្មវិធី",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
   "programName": "ឈ្មោះកម្មវិធី",
   "programs": "កម្មវិធី",
   "Programs": "កម្មវិធី",
diff --git a/packages/esm-patient-programs-app/translations/zh.json b/packages/esm-patient-programs-app/translations/zh.json
index 7e84f1b7f1..7d4f1b3957 100644
--- a/packages/esm-patient-programs-app/translations/zh.json
+++ b/packages/esm-patient-programs-app/translations/zh.json
@@ -22,6 +22,7 @@
   "noProgramsConfigured": "No programs configured",
   "programEnrollments": "Program enrollments",
   "programEnrollmentSaveError": "Error saving program enrollment",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
   "programName": "Program name",
   "programs": "programs",
   "Programs": "Programs",
diff --git a/packages/esm-patient-programs-app/translations/zh_CN.json b/packages/esm-patient-programs-app/translations/zh_CN.json
index 7e84f1b7f1..7d4f1b3957 100644
--- a/packages/esm-patient-programs-app/translations/zh_CN.json
+++ b/packages/esm-patient-programs-app/translations/zh_CN.json
@@ -22,6 +22,7 @@
   "noProgramsConfigured": "No programs configured",
   "programEnrollments": "Program enrollments",
   "programEnrollmentSaveError": "Error saving program enrollment",
+  "programEnrollmentWorkspaceTitle": "Record program enrollment",
   "programName": "Program name",
   "programs": "programs",
   "Programs": "Programs",

From 4c725195f483b07213a10dd74f5229f5c40bdb6f Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Thu, 1 Feb 2024 19:15:50 +0530
Subject: [PATCH 16/39] Updated the workspace title and workspace
 implementation in the vitals app

---
 packages/esm-patient-vitals-app/src/index.ts  | 15 ++++++++------
 .../esm-patient-vitals-app/src/routes.json    | 10 ----------
 .../vitals-biometrics-form.component.tsx      | 20 ++++++++++++++++---
 .../translations/am.json                      |  1 +
 .../translations/ar.json                      |  1 +
 .../translations/en.json                      |  1 +
 .../translations/es.json                      |  1 +
 .../translations/fr.json                      |  1 +
 .../translations/he.json                      |  1 +
 .../translations/km.json                      |  1 +
 .../translations/zh.json                      |  1 +
 .../translations/zh_CN.json                   |  1 +
 12 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/packages/esm-patient-vitals-app/src/index.ts b/packages/esm-patient-vitals-app/src/index.ts
index 4a57ed3e29..3995418a3b 100644
--- a/packages/esm-patient-vitals-app/src/index.ts
+++ b/packages/esm-patient-vitals-app/src/index.ts
@@ -4,8 +4,9 @@ import {
   getAsyncLifecycle,
   getSyncLifecycle,
   messageOmrsServiceWorker,
+  translateFrom,
 } from '@openmrs/esm-framework';
-import { createDashboardLink } from '@openmrs/esm-patient-common-lib';
+import { createDashboardLink, registerWorkspace } from '@openmrs/esm-patient-common-lib';
 import dashboardMeta from './dashboard.meta';
 import { configSchema } from './config-schema';
 import vitalsSummaryComponent from './vitals/vitals-summary.component';
@@ -47,11 +48,6 @@ export const biometricsOverview = getSyncLifecycle(biometricsOverviewComponent,
 
 export const biometricsDetailedSummary = getSyncLifecycle(biometricsDetailedSummaryComponent, options);
 
-export const vitalsAndBiometricsForm = getAsyncLifecycle(
-  () => import('./vitals-biometrics-form/vitals-biometrics-form.component'),
-  options,
-);
-
 export const vitalsAndBiometricsDashboardLink =
   // t('Vitals & Biometrics', 'Vitals & Biometrics')
   getSyncLifecycle(
@@ -63,3 +59,10 @@ export const vitalsAndBiometricsDashboardLink =
   );
 
 export const weightTile = getAsyncLifecycle(() => import('./weight-tile/weight-tile.component'), options);
+
+// t('recordVitalsAndBiometrics', 'Record Vitals and Biometrics')
+registerWorkspace({
+  name: 'patient-vitals-biometrics-form-workspace',
+  load: getAsyncLifecycle(() => import('./vitals-biometrics-form/vitals-biometrics-form.component'), options),
+  title: translateFrom(moduleName, 'recordVitalsAndBiometrics', 'Record Vitals and Biometrics'),
+});
diff --git a/packages/esm-patient-vitals-app/src/routes.json b/packages/esm-patient-vitals-app/src/routes.json
index 810459a601..5dfdcf863d 100644
--- a/packages/esm-patient-vitals-app/src/routes.json
+++ b/packages/esm-patient-vitals-app/src/routes.json
@@ -47,16 +47,6 @@
         "title": "Biometrics"
       }
     },
-    {
-      "name": "patient-vitals-biometrics-form-workspace",
-      "component": "vitalsAndBiometricsForm",
-      "meta": {
-        "title": {
-          "key": "recordVitalsAndBiometrics",
-          "default": "Record Vitals and Biometrics"
-        }
-      }
-    },
     {
       "name": "results-summary-dashboard",
       "component": "vitalsAndBiometricsDashboardLink",
diff --git a/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.component.tsx b/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.component.tsx
index 0213a463a7..f92b54ddd3 100644
--- a/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.component.tsx
+++ b/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.component.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import { z } from 'zod';
+import { isDirty, z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
 import {
   Button,
@@ -70,7 +70,11 @@ const VitalsAndBiometricFormSchema = z
 
 export type VitalsBiometricsFormData = z.infer<typeof VitalsAndBiometricFormSchema>;
 
-const VitalsAndBiometricsForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWorkspace }) => {
+const VitalsAndBiometricsForm: React.FC<DefaultWorkspaceProps> = ({
+  patientUuid,
+  closeWorkspace,
+  promptBeforeClosing,
+}) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const config = useConfig<ConfigObject>();
@@ -87,11 +91,21 @@ const VitalsAndBiometricsForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid,
   const [showErrorNotification, setShowErrorNotification] = useState(false);
   const [showErrorMessage, setShowErrorMessage] = useState(false);
 
-  const { control, handleSubmit, watch, setValue } = useForm<VitalsBiometricsFormData>({
+  const {
+    control,
+    handleSubmit,
+    watch,
+    setValue,
+    formState: { isDirty },
+  } = useForm<VitalsBiometricsFormData>({
     mode: 'all',
     resolver: zodResolver(VitalsAndBiometricFormSchema),
   });
 
+  useEffect(() => {
+    promptBeforeClosing(() => isDirty);
+  }, [isDirty]);
+
   const encounterUuid = currentVisit?.encounters?.find((encounter) => encounter?.form?.uuid === config.vitals.formUuid)
     ?.uuid;
 
diff --git a/packages/esm-patient-vitals-app/translations/am.json b/packages/esm-patient-vitals-app/translations/am.json
index 3d8ef362bb..a1fc8d57ec 100644
--- a/packages/esm-patient-vitals-app/translations/am.json
+++ b/packages/esm-patient-vitals-app/translations/am.json
@@ -33,6 +33,7 @@
   "pulse": "Pulse",
   "recordBiometrics": "Record biometrics",
   "recordVitals": "Record vitals",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
   "respirationRate": "Respiration rate",
   "respiratoryRate": "R. rate",
   "saveAndClose": "Save and close",
diff --git a/packages/esm-patient-vitals-app/translations/ar.json b/packages/esm-patient-vitals-app/translations/ar.json
index 53e26a23b0..78169edec1 100644
--- a/packages/esm-patient-vitals-app/translations/ar.json
+++ b/packages/esm-patient-vitals-app/translations/ar.json
@@ -33,6 +33,7 @@
   "pulse": "نبض",
   "recordBiometrics": "تسجيل القياسات البيومترية",
   "recordVitals": "تسجيل العلامات الحيوية",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
   "respirationRate": "معدل التنفس",
   "respiratoryRate": "معدل التنفس",
   "saveAndClose": "حفظ وإغلاق",
diff --git a/packages/esm-patient-vitals-app/translations/en.json b/packages/esm-patient-vitals-app/translations/en.json
index d4c402cfb0..89898a99e8 100644
--- a/packages/esm-patient-vitals-app/translations/en.json
+++ b/packages/esm-patient-vitals-app/translations/en.json
@@ -33,6 +33,7 @@
   "pulse": "Pulse",
   "recordBiometrics": "Record biometrics",
   "recordVitals": "Record vitals",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
   "respirationRate": "Respiration rate",
   "respiratoryRate": "R. rate",
   "saveAndClose": "Save and close",
diff --git a/packages/esm-patient-vitals-app/translations/es.json b/packages/esm-patient-vitals-app/translations/es.json
index edf5186f61..0f4c97b50a 100644
--- a/packages/esm-patient-vitals-app/translations/es.json
+++ b/packages/esm-patient-vitals-app/translations/es.json
@@ -33,6 +33,7 @@
   "pulse": "Pulso",
   "recordBiometrics": "Registrar datos biométricos",
   "recordVitals": "Registrar signos vitales",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
   "respirationRate": "Frecuencia respiratoria",
   "respiratoryRate": "FR",
   "saveAndClose": "Guardar y cerrar",
diff --git a/packages/esm-patient-vitals-app/translations/fr.json b/packages/esm-patient-vitals-app/translations/fr.json
index 864ad1b51b..34b8fea8d8 100644
--- a/packages/esm-patient-vitals-app/translations/fr.json
+++ b/packages/esm-patient-vitals-app/translations/fr.json
@@ -33,6 +33,7 @@
   "pulse": "Battement",
   "recordBiometrics": "Enregistrer la biométrie",
   "recordVitals": "Enregistrer les signes vitaux",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
   "respirationRate": "Taux de respiration",
   "respiratoryRate": "Taux R.",
   "saveAndClose": "Sauvegarder et fermer",
diff --git a/packages/esm-patient-vitals-app/translations/he.json b/packages/esm-patient-vitals-app/translations/he.json
index aa681b626c..f0d77d1782 100644
--- a/packages/esm-patient-vitals-app/translations/he.json
+++ b/packages/esm-patient-vitals-app/translations/he.json
@@ -33,6 +33,7 @@
   "pulse": "דופק",
   "recordBiometrics": "רשום מדדים ביומטריים",
   "recordVitals": "רשום מדדים חיוניים",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
   "respirationRate": "קצב נשימה",
   "respiratoryRate": "קצב נשימה",
   "saveAndClose": "שמור וסגור",
diff --git a/packages/esm-patient-vitals-app/translations/km.json b/packages/esm-patient-vitals-app/translations/km.json
index 9e0c2a646d..f56291047e 100644
--- a/packages/esm-patient-vitals-app/translations/km.json
+++ b/packages/esm-patient-vitals-app/translations/km.json
@@ -33,6 +33,7 @@
   "pulse": "ជីពចរ",
   "recordBiometrics": "កត់ត្រាជីវមាត្រ",
   "recordVitals": "កត់ត្រាសញ្ញាជីវិត",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
   "respirationRate": "ចង្វាក់ដង្ហើម",
   "respiratoryRate": "ចង្វាក់ដង្ហើម",
   "saveAndClose": "រក្សាទុក និងបិទ",
diff --git a/packages/esm-patient-vitals-app/translations/zh.json b/packages/esm-patient-vitals-app/translations/zh.json
index b2c9043d3a..92e3e67745 100644
--- a/packages/esm-patient-vitals-app/translations/zh.json
+++ b/packages/esm-patient-vitals-app/translations/zh.json
@@ -33,6 +33,7 @@
   "pulse": "脉搏",
   "recordBiometrics": "记录生物特征",
   "recordVitals": "记录生命体征",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
   "respirationRate": "呼吸频率",
   "respiratoryRate": "呼吸频率",
   "saveAndClose": "保存并关闭",
diff --git a/packages/esm-patient-vitals-app/translations/zh_CN.json b/packages/esm-patient-vitals-app/translations/zh_CN.json
index b2c9043d3a..92e3e67745 100644
--- a/packages/esm-patient-vitals-app/translations/zh_CN.json
+++ b/packages/esm-patient-vitals-app/translations/zh_CN.json
@@ -33,6 +33,7 @@
   "pulse": "脉搏",
   "recordBiometrics": "记录生物特征",
   "recordVitals": "记录生命体征",
+  "recordVitalsAndBiometrics": "Record Vitals and Biometrics",
   "respirationRate": "呼吸频率",
   "respiratoryRate": "呼吸频率",
   "saveAndClose": "保存并关闭",

From 033fc97e24d235f6908d2722c4954970d635f14d Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Thu, 1 Feb 2024 19:16:31 +0530
Subject: [PATCH 17/39] Added JSDoc in the workspaces.ts

---
 .../src/types/workspace.ts                    | 27 +++++++++++++++----
 .../src/workspaces/workspaces.ts              |  4 +--
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/packages/esm-patient-common-lib/src/types/workspace.ts b/packages/esm-patient-common-lib/src/types/workspace.ts
index ca465b8223..6f22c1a74d 100644
--- a/packages/esm-patient-common-lib/src/types/workspace.ts
+++ b/packages/esm-patient-common-lib/src/types/workspace.ts
@@ -1,19 +1,36 @@
+import { closeWorkspace } from '../workspaces';
+
 /* The possible states a workspace window can be opened in. */
 export type WorkspaceWindowState = 'maximized' | 'hidden' | 'normal';
 
 export interface CloseWorkspaceOptions {
-  workspaceTitle?: string;
+  /**
+   * Whether to close the workspace ignoring all the changes present in the workspace.
+   *
+   * If ignoreChanges is true, the user will not be prompted to save changes before closing
+   * even if the `testFcn` passed to `promptBeforeClosing` returns `true`.
+   */
   ignoreChanges?: boolean;
+  /**
+   * If you want to take an action after the workspace is closed, you can pass your function as
+   * `onWorkspaceClose`. This function will be called only after the workspace is closed, given
+   * that the user might be shown a prompt.
+   * @returns void
+   */
   onWorkspaceClose?: () => void;
-  confirmBeforeClosing?: boolean;
 }
 
 /** The default parameters received by all workspaces */
 export interface DefaultWorkspaceProps {
   /**
-   * Call this function to close the workspace. If ignoreChanges is true, the user will not be
-   * prompted to save changes before closing, even if the `testFcn` passed to `promptBeforeClosing`
-   * returns `true`.
+   * Call this function to close the workspace.
+   *
+   * Whenever we close the workspace with `workspace.closeWorkspace()`, the `ignoreChanges`
+   * is set to true by default.
+   *
+   * Whenever you close the opened workspace outside the workspace window, always close the workspace as
+   * `closeWorkspace({ ignoreChanges: false })`, taking care to prompting the user if there
+   * are any pending changes in the workspace.
    */
   closeWorkspace(closeWorkspaceOptions?: CloseWorkspaceOptions): void;
   /**
diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
index e6829bcc47..3c41d10526 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
@@ -156,7 +156,7 @@ export function launchPatientWorkspace(name: string, additionalProps?: object) {
     ...workspace,
     closeWorkspace: (options: CloseWorkspaceOptions = {}) =>
       closeWorkspace(name, {
-        workspaceTitle: workspace.title,
+        ignoreChanges: true,
         ...options,
       }),
     promptBeforeClosing: (testFcn) => promptBeforeClosing(name, testFcn),
@@ -260,7 +260,7 @@ export function closeWorkspace(
   };
 
   if (!getWhetherWorkspaceCanBeClosed(name, options?.ignoreChanges)) {
-    const currentName = options?.workspaceTitle ?? name;
+    const currentName = getWorkspaceRegistration(name).title ?? name;
     showWorkspacePrompts('closing-workspace', updateStoreWithClosedWorkspace, currentName);
     return false;
   } else {

From cb67ac6a0ed36c89b851241a9cc9d840052ba049 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Fri, 2 Feb 2024 18:17:52 +0530
Subject: [PATCH 18/39] Removed duplicate functions from workspaces.ts

---
 .../src/workspaces/workspaces.ts              | 66 +++----------------
 1 file changed, 8 insertions(+), 58 deletions(-)

diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
index 3e82b246b5..cf9d5e08ed 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
@@ -321,64 +321,6 @@ export function closeAllWorkspaces(onClosingWorkspaces: () => void = () => {}) {
   }
 }
 
-export function getWhetherWorkspaceCanBeClosed(name: string, ignoreChanges = false) {
-  const promptCheckFcn = getPromptBeforeClosingFcn(name);
-  return ignoreChanges || !promptCheckFcn || !promptCheckFcn();
-}
-
-type PromptType = 'closing-workspace' | 'closing-all-workspaces' | 'closing-workspace-launching-new-workspace';
-
-export function showWorkspacePrompts(promptType: PromptType, onConfirmation: () => void = () => {}) {
-  const store = getWorkspaceStore();
-
-  switch (promptType) {
-    case 'closing-all-workspaces': {
-      const workspacesNotClosed = store
-        .getState()
-        .openWorkspaces.filter(({ name }) => !getWhetherWorkspaceCanBeClosed(name))
-        .map(({ title }, indx) => `${indx + 1}. ${title}`);
-
-      const prompt: Prompt = {
-        title: translateFrom('@openmrs/esm-patient-chart-app', 'unsavedChanges', 'You have unsaved changes'),
-        body: translateFrom(
-          '@openmrs/esm-patient-chart-app',
-          'unsavedChangesInForms',
-          `There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}`,
-          {
-            workspaceNames: workspacesNotClosed.join(' '),
-          },
-        ),
-        onConfirm: () => {
-          onConfirmation?.();
-        },
-        confirmText: translateFrom(
-          '@openmrs/esm-patient-chart-app',
-          'closeWorkspaces',
-          'Discard changes in {{count}} workspaces',
-          { count: workspacesNotClosed.length },
-        ),
-      };
-      store.setState((prevState) => ({
-        ...prevState,
-        prompt,
-      }));
-      return;
-    }
-    default: {
-      onConfirmation?.();
-      return;
-    }
-  }
-}
-
-/**
- * @internal
- * Just for testing.
- */
-export function resetWorkspaceStore() {
-  getWorkspaceStore().setState(initialState);
-}
-
 type PromptType = 'closing-workspace' | 'closing-all-workspaces' | 'closing-workspace-launching-new-workspace';
 
 export function showWorkspacePrompts(
@@ -469,3 +411,11 @@ export function showWorkspacePrompts(
     }
   }
 }
+
+/**
+ * @internal
+ * Just for testing.
+ */
+export function resetWorkspaceStore() {
+  getWorkspaceStore().setState(initialState);
+}

From d71829e754bf6655ac78e077d260cc3b30658d38 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Fri, 2 Feb 2024 18:20:47 +0530
Subject: [PATCH 19/39] Exported getWhetherWorkspaceCanBeClosed from common-lib

---
 packages/esm-patient-common-lib/src/workspaces/workspaces.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
index cf9d5e08ed..1b5dd32ade 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
@@ -103,7 +103,7 @@ function getTitleFromExtension(ext: ExtensionRegistration) {
   return ext.name;
 }
 
-function getWhetherWorkspaceCanBeClosed(name: string, ignoreChanges: boolean = false) {
+export function getWhetherWorkspaceCanBeClosed(name: string, ignoreChanges: boolean = false) {
   const promptBeforeFn = getPromptBeforeClosingFcn(name);
   return ignoreChanges || !promptBeforeFn || !promptBeforeFn();
 }

From 3c0d6e5d137dde9179d93df12b8fc1cc032087fe Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 5 Feb 2024 14:41:28 +0530
Subject: [PATCH 20/39] Updated workspaces.ts with JS Doc

---
 .../workspace/workspace-window.component.tsx  |  4 +--
 .../src/workspaces/workspaces.ts              | 31 ++++++++++++++++---
 .../vitals-biometrics-form.component.tsx      |  2 +-
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/packages/esm-patient-chart-app/src/workspace/workspace-window.component.tsx b/packages/esm-patient-chart-app/src/workspace/workspace-window.component.tsx
index 60d87af717..1af7a98ec5 100644
--- a/packages/esm-patient-chart-app/src/workspace/workspace-window.component.tsx
+++ b/packages/esm-patient-chart-app/src/workspace/workspace-window.component.tsx
@@ -56,7 +56,7 @@ const WorkspaceWindow: React.FC<ContextWorkspaceParams> = () => {
     canHide = false,
     canMaximize = false,
     width = 'narrow',
-    closeWorkspace = () => {},
+    closeWorkspace,
   } = useMemo(() => workspaces?.[0] ?? ({} as OpenWorkspace), [workspaces]);
 
   useEffect(() => {
@@ -141,7 +141,7 @@ const WorkspaceWindow: React.FC<ContextWorkspaceParams> = () => {
                 <HeaderGlobalAction
                   align="bottom-right"
                   label={t('close', 'Close')}
-                  onClick={() => closeWorkspace?.()}
+                  onClick={() => closeWorkspace?.({ ignoreChanges: false })}
                   size="lg"
                 >
                   <Close />
diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
index 1b5dd32ade..7a8c63b8b1 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
@@ -24,7 +24,6 @@ export interface WorkspaceStoreState {
 export interface OpenWorkspace extends WorkspaceRegistration {
   additionalProps: object;
   closeWorkspace(closeWorkspaceOptions?: CloseWorkspaceOptions): boolean;
-  closeWorkspace(): boolean;
   promptBeforeClosing(testFcn: () => boolean): void;
 }
 
@@ -103,9 +102,18 @@ function getTitleFromExtension(ext: ExtensionRegistration) {
   return ext.name;
 }
 
+/**
+ *
+ * @param name Name of the workspace
+ * @param ignoreChanges Whether to forcefully ignore changes in the workspace
+ * @returns true if the workspace can be closed.
+ */
 export function getWhetherWorkspaceCanBeClosed(name: string, ignoreChanges: boolean = false) {
+  if (ignoreChanges) {
+    return true;
+  }
   const promptBeforeFn = getPromptBeforeClosingFcn(name);
-  return ignoreChanges || !promptBeforeFn || !promptBeforeFn();
+  return !promptBeforeFn || !promptBeforeFn();
 }
 
 function promptBeforeLaunchingWorkspace(
@@ -116,13 +124,12 @@ function promptBeforeLaunchingWorkspace(
 
   const proceed = () => {
     workspace.closeWorkspace({
+      // Calling the launchPatientWorkspace again, since one of the `if` case
+      // might resolve, but we need to check all the cases before launching the form.
       onWorkspaceClose: () => launchPatientWorkspace(name, additionalProps),
     });
   };
 
-  // Calling the launchPatientWorkspace again, since one of the `if` case
-  // might resolve, but we need to check all the cases before launching the form.
-
   if (!getWhetherWorkspaceCanBeClosed(workspace.name)) {
     showWorkspacePrompts('closing-workspace-launching-new-workspace', proceed, workspace.title ?? workspace.name);
   } else {
@@ -236,6 +243,12 @@ export function cancelPrompt() {
   store.setState({ ...state, prompt: null });
 }
 
+/**
+ * Function to close an opened workspace
+ * @param name Workspace registration name
+ * @param options Options to close workspace
+ * @returns
+ */
 export function closeWorkspace(
   name: string,
   options: CloseWorkspaceOptions = {
@@ -323,6 +336,14 @@ export function closeAllWorkspaces(onClosingWorkspaces: () => void = () => {}) {
 
 type PromptType = 'closing-workspace' | 'closing-all-workspaces' | 'closing-workspace-launching-new-workspace';
 
+/**
+ * Which type of prompt should be shown to the user.
+ * @param promptType 'closing-workspace' | 'closing-all-workspaces' | 'closing-workspace-launching-new-workspace'
+ * @param onConfirmation Function to be called after the user confirms to close the workspace
+ * @param workspaceTitle Workspace title to be shown in the prompt
+ * @returns
+ */
+
 export function showWorkspacePrompts(
   promptType: PromptType,
   onConfirmation: () => void = () => {},
diff --git a/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.component.tsx b/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.component.tsx
index f92b54ddd3..79b716a760 100644
--- a/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.component.tsx
+++ b/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.component.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import { isDirty, z } from 'zod';
+import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
 import {
   Button,

From c5eb5ef28483b0c90930a6cdcfbdc75b6165bb00 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 5 Feb 2024 14:41:47 +0530
Subject: [PATCH 21/39] Updated and fixed failing tests

---
 .../src/workspaces/workspaces.test.ts            | 16 +++++++++++-----
 .../conditions-detailed-summary.test.tsx         |  4 +---
 .../src/conditions/conditions-overview.test.tsx  |  4 +---
 .../src/order-basket/order-basket.workspace.tsx  |  3 +--
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts
index 2100104a98..c4de5ac7d1 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts
@@ -70,11 +70,13 @@ describe('workspace system', () => {
       expect(store.getState().openWorkspaces.length).toEqual(0);
     });
 
-    it('should show a modal when a workspace is already open and it cannot hide', () => {
+    it('should show a modal when a workspace is already open (with changes) and it cannot hide', () => {
       const store = getWorkspaceStore();
       registerWorkspace({ name: 'allergies', title: 'Allergies', load: jest.fn() });
       launchPatientWorkspace('allergies', { foo: true });
       expect(store.getState().openWorkspaces.length).toEqual(1);
+      const allergies = store.getState().openWorkspaces?.[0];
+      allergies.promptBeforeClosing(() => true);
       registerWorkspace({ name: 'conditions', title: 'Conditions', load: jest.fn() });
       launchPatientWorkspace('conditions', { foo: true });
       const prompt = store.getState().prompt;
@@ -223,6 +225,8 @@ describe('workspace system', () => {
       launchPatientWorkspace('conditions');
       expect(store.getState().openWorkspaces.length).toEqual(3);
       expect(store.getState().openWorkspaces.map((w) => w.name)).toEqual(['conditions', 'attachments', 'allergies']);
+      const conditionsWorkspace = store.getState().openWorkspaces?.[0];
+      conditionsWorkspace.promptBeforeClosing(() => true);
       launchPatientWorkspace('vitals');
       expect(store.getState().openWorkspaces.length).toEqual(3);
       expect(store.getState().openWorkspaces[0].name).toBe('conditions');
@@ -280,11 +284,11 @@ describe('workspace system', () => {
       launchPatientWorkspace('conditions');
       expect(store.getState().openWorkspaces.length).toBe(3);
       expect(store.getState().workspaceWindowState).toBe('maximized');
-      store.getState().openWorkspaces[0].closeWorkspace(false);
+      store.getState().openWorkspaces[0].closeWorkspace();
       expect(store.getState().workspaceWindowState).toBe('normal');
-      store.getState().openWorkspaces[0].closeWorkspace(false);
+      store.getState().openWorkspaces[0].closeWorkspace();
       expect(store.getState().workspaceWindowState).toBe('maximized');
-      store.getState().openWorkspaces[0].closeWorkspace(false);
+      store.getState().openWorkspaces[0].closeWorkspace();
       expect(store.getState().workspaceWindowState).toBe('normal');
     });
   });
@@ -321,6 +325,8 @@ describe('workspace system', () => {
     expect(store.getState().openWorkspaces.length).toEqual(2);
     expect(store.getState().openWorkspaces[0].name).toBe('order-meds');
     expect(store.getState().openWorkspaces[1].name).toBe('form-entry');
+    const formEntryWorkspace = store.getState().openWorkspaces[1];
+    formEntryWorkspace.promptBeforeClosing(() => true);
     // Test going through confirmation flow while order-meds is open
     // Changing the form workspace shouldn't destroy the order-meds workspace
     launchPatientWorkspace('conditions');
@@ -389,7 +395,7 @@ describe('workspace system', () => {
     registerWorkspace({ name: 'hiv', title: 'HIV', load: jest.fn() });
     launchPatientWorkspace('hiv');
     store.getState().openWorkspaces[0].promptBeforeClosing(() => true);
-    store.getState().openWorkspaces[0].closeWorkspace(false);
+    store.getState().openWorkspaces[0].closeWorkspace({ ignoreChanges: false });
     expect(store.getState().prompt.title).toBe('Unsaved Changes');
     expect(store.getState().prompt.body).toBe(
       'You have unsaved changes in the side panel. Do you want to discard these changes?',
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.test.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.test.tsx
index 19ed1ad636..125d75ad10 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.test.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.test.tsx
@@ -92,9 +92,7 @@ it('clicking the Add button or Record Conditions link launches the conditions fo
   await user.click(recordConditionsLink);
 
   expect(launchPatientWorkspace).toHaveBeenCalledTimes(1);
-  expect(launchPatientWorkspace).toHaveBeenCalledWith('conditions-form-workspace', {
-    workspaceTitle: 'Record a Condition',
-  });
+  expect(launchPatientWorkspace).toHaveBeenCalledWith('conditions-form-workspace');
 });
 
 function renderConditionsDetailedSummary() {
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-overview.test.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-overview.test.tsx
index a8579d431e..f9340eb68a 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-overview.test.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-overview.test.tsx
@@ -117,9 +117,7 @@ describe('ConditionsOverview: ', () => {
     await user.click(recordConditionsLink);
 
     expect(launchPatientWorkspace).toHaveBeenCalledTimes(1);
-    expect(launchPatientWorkspace).toHaveBeenCalledWith('conditions-form-workspace', {
-      workspaceTitle: 'Record a Condition',
-    });
+    expect(launchPatientWorkspace).toHaveBeenCalledWith('conditions-form-workspace');
   });
 });
 
diff --git a/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx b/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx
index 6f77d15fd6..a59d69260f 100644
--- a/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx
+++ b/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx
@@ -91,8 +91,7 @@ const OrderBasket: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWorksp
   ]);
 
   const handleCancel = useCallback(() => {
-    clearOrders();
-    closeWorkspace();
+    closeWorkspace({ onWorkspaceClose: clearOrders });
   }, [clearOrders, closeWorkspace]);
 
   return (

From 09c599a0026ada6713dc74a059035ab8a06eb8c6 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 5 Feb 2024 14:49:59 +0530
Subject: [PATCH 22/39] Fixed TS errors

---
 .../src/forms/forms-dashboard.test.tsx                      | 2 +-
 .../src/lab-orders/add-lab-order/test-type-search.tsx       | 6 ++++--
 .../src/workspaces/patient-list-details.workspace.test.tsx  | 2 ++
 .../src/workspaces/patient-lists.workspace.test.tsx         | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/esm-patient-forms-app/src/forms/forms-dashboard.test.tsx b/packages/esm-patient-forms-app/src/forms/forms-dashboard.test.tsx
index d998842a00..a794b49b33 100644
--- a/packages/esm-patient-forms-app/src/forms/forms-dashboard.test.tsx
+++ b/packages/esm-patient-forms-app/src/forms/forms-dashboard.test.tsx
@@ -52,5 +52,5 @@ describe('FormsDashboard', () => {
 });
 
 function renderFormDashboard() {
-  render(<FormsDashboard />);
+  render(<FormsDashboard promptBeforeClosing={jest.fn()} closeWorkspace={jest.fn()} patientUuid="" />);
 }
diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/test-type-search.tsx b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/test-type-search.tsx
index 438a1b252d..ee14f1ec82 100644
--- a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/test-type-search.tsx
+++ b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/test-type-search.tsx
@@ -161,8 +161,10 @@ const TestTypeSearchResultItem: React.FC<TestTypeSearchResultItemProps> = ({ tes
     const labOrder = createLabOrder(testType);
     labOrder.isOrderIncomplete = true;
     setOrders([...orders, labOrder]);
-    closeWorkspace('add-lab-order', true);
-    launchPatientWorkspace('order-basket');
+    closeWorkspace('add-lab-order', {
+      ignoreChanges: true,
+      onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
+    });
   }, [orders, setOrders, createLabOrder, testType]);
 
   const removeFromBasket = useCallback(() => {
diff --git a/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.test.tsx b/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.test.tsx
index 21eca8412b..da5ef7eade 100644
--- a/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.test.tsx
+++ b/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.test.tsx
@@ -6,6 +6,8 @@ import PatientListDetailsWorkspace from './patient-list-details.workspace';
 const mockedOpenmrsFetch = openmrsFetch as jest.Mock;
 
 const testProps = {
+  patientUuid: '',
+  promptBeforeClosing: jest.fn(),
   closeWorkspace: jest.fn(),
   list: {
     attributes: [],
diff --git a/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.test.tsx b/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.test.tsx
index e59df05941..97765a05b2 100644
--- a/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.test.tsx
+++ b/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.test.tsx
@@ -73,5 +73,5 @@ it('renders a tabular overview of the available patient lists', async () => {
 });
 
 function renderPatientListsWorkspace() {
-  render(<PatientListsWorkspace />);
+  render(<PatientListsWorkspace promptBeforeClosing={jest.fn()} closeWorkspace={jest.fn()} patientUuid="" />);
 }

From 8eee039ed60d59d6003d1c03c812b40844362d54 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 5 Feb 2024 15:02:25 +0530
Subject: [PATCH 23/39] Updated keys and values of translations

---
 .../src/root.component.tsx                    | 11 +++++++--
 .../translations/en.json                      |  9 ++++---
 .../src/workspaces/workspaces.ts              | 24 +++++++++++--------
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/packages/esm-patient-chart-app/src/root.component.tsx b/packages/esm-patient-chart-app/src/root.component.tsx
index 637116f53a..7ab06f8a6c 100644
--- a/packages/esm-patient-chart-app/src/root.component.tsx
+++ b/packages/esm-patient-chart-app/src/root.component.tsx
@@ -44,6 +44,13 @@ export default function Root() {
  * t('error', 'Error')
  * t('seeAll', 'See all')
  * t('paginationItemsCount', `{{pageItemsCount}} / {{count}} items`, { count: totalItems, pageItemsCount });
- * t('unsavedChangesInForms', 'There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}')
- * t('closeWorkspaces', 'Discard changes in {{count}} workspaces', {count})
+
+ * t('unsavedChangesInOpenedWorkspace', 'You have unsaved changes in the opened workspace. Do you want to discard these changes?')
+ * t('unsavedChangesTitleText', 'Unsaved Changes')
+ * t('discard','Discard')
+ * t('closingAllWorkspacesPromptTitle','You have unsaved changes')
+ * t('closingAllWorkspacesPromptBody', 'There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}')
+ * t('closeAllOpenedWorkspaces', 'Discard changes in {{count}} workspaces')
+ * t('unsavedChangesInWorkspace', 'There are unsaved changes in {{formName}}. Please save them before opening another workspace.')
+ * t('openAnyway', 'Open anyway')
  */
diff --git a/packages/esm-patient-chart-app/translations/en.json b/packages/esm-patient-chart-app/translations/en.json
index d824d21c17..70073d8111 100644
--- a/packages/esm-patient-chart-app/translations/en.json
+++ b/packages/esm-patient-chart-app/translations/en.json
@@ -18,8 +18,9 @@
   "causeOfDeath_title": "Cause of Death",
   "checkFilters": "Check the filters above",
   "close": "Close",
-  "closeWorkspaces_one": "Discard changes in {{count}} workspaces",
-  "closeWorkspaces_other": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces": "Discard changes in {{count}} workspaces",
+  "closingAllWorkspacesPromptBody": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "closingAllWorkspacesPromptTitle": "You have unsaved changes",
   "Conditions dashboard": "Conditions dashboard",
   "confirm": "Confirm",
   "confirmDeceased": "Confirm Deceased",
@@ -162,7 +163,9 @@
   "unknown": "Unknown",
   "unsavedChanges": "You have unsaved changes",
   "unsavedChangesInForm": "There are unsaved changes in {{formName}}. Please save them before opening another form.",
-  "unsavedChangesInForms": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "unsavedChangesInOpenedWorkspace": "You have unsaved changes in the opened workspace. Do you want to discard these changes?",
+  "unsavedChangesInWorkspace": "There are unsaved changes in {{formName}}. Please save them before opening another workspace.",
+  "unsavedChangesTitleText": "Unsaved Changes",
   "updateError": "Error updating upcoming appointment",
   "updateVisitDetails": "Update visit details",
   "visit": "Visit",
diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
index 7a8c63b8b1..f8928c2b24 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
@@ -357,8 +357,8 @@ export function showWorkspacePrompts(
         title: translateFrom('@openmrs/esm-patient-chart-app', 'unsavedChangesTitleText', 'Unsaved Changes'),
         body: translateFrom(
           '@openmrs/esm-patient-chart-app',
-          'unsavedChangeText',
-          `You have unsaved changes in the side panel. Do you want to discard these changes?`,
+          'unsavedChangesInOpenedWorkspace',
+          `You have unsaved changes in the opened workspace. Do you want to discard these changes?`,
         ),
         onConfirm: () => {
           onConfirmation?.();
@@ -377,13 +377,17 @@ export function showWorkspacePrompts(
         .map(({ title }, indx) => `${indx + 1}. ${title}`);
 
       const prompt: Prompt = {
-        title: translateFrom('@openmrs/esm-patient-chart-app', 'unsavedChanges', 'You have unsaved changes'),
+        title: translateFrom(
+          '@openmrs/esm-patient-chart-app',
+          'closingAllWorkspacesPromptTitle',
+          'You have unsaved changes',
+        ),
         body: translateFrom(
           '@openmrs/esm-patient-chart-app',
-          'unsavedChangesInForms',
-          `There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}`,
+          'closingAllWorkspacesPromptBody',
+          'There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}',
           {
-            workspaceNames: workspacesNotClosed.join(' '),
+            workspaceNames: workspacesNotClosed.join(','),
           },
         ),
         onConfirm: () => {
@@ -391,7 +395,7 @@ export function showWorkspacePrompts(
         },
         confirmText: translateFrom(
           '@openmrs/esm-patient-chart-app',
-          'closeWorkspaces',
+          'closeAllOpenedWorkspaces',
           'Discard changes in {{count}} workspaces',
           { count: workspacesNotClosed.length },
         ),
@@ -404,11 +408,11 @@ export function showWorkspacePrompts(
     }
     case 'closing-workspace-launching-new-workspace': {
       const prompt: Prompt = {
-        title: translateFrom('@openmrs/esm-patient-chart-app', 'unsavedChanges', 'You have unsaved changes'),
+        title: translateFrom('@openmrs/esm-patient-chart-app', 'unsavedChangesTitleText', 'Unsaved Changes'),
         body: translateFrom(
           '@openmrs/esm-patient-chart-app',
-          'unsavedChangesInForm',
-          'There are unsaved changes in {{formName}}. Please save them before opening another form.',
+          'unsavedChangesInWorkspace',
+          'There are unsaved changes in {{formName}}. Please save them before opening another workspace.',
           { formName: workspaceTitle },
         ),
         onConfirm: () => {

From 31e596afdc6847b5bf73f56c504c08946154e697 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 5 Feb 2024 15:33:45 +0530
Subject: [PATCH 24/39] Final changes

---
 packages/esm-patient-chart-app/src/root.component.tsx         | 2 +-
 .../src/workspace/workspace-notification.component.tsx        | 4 ----
 packages/esm-patient-common-lib/src/workspaces/workspaces.ts  | 4 ++--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/esm-patient-chart-app/src/root.component.tsx b/packages/esm-patient-chart-app/src/root.component.tsx
index 7ab06f8a6c..8687e9483d 100644
--- a/packages/esm-patient-chart-app/src/root.component.tsx
+++ b/packages/esm-patient-chart-app/src/root.component.tsx
@@ -51,6 +51,6 @@ export default function Root() {
  * t('closingAllWorkspacesPromptTitle','You have unsaved changes')
  * t('closingAllWorkspacesPromptBody', 'There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}')
  * t('closeAllOpenedWorkspaces', 'Discard changes in {{count}} workspaces')
- * t('unsavedChangesInWorkspace', 'There are unsaved changes in {{formName}}. Please save them before opening another workspace.')
+ * t('unsavedChangesInWorkspace', 'There are unsaved changes in {{workspaceName}}. Please save them before opening another workspace.')
  * t('openAnyway', 'Open anyway')
  */
diff --git a/packages/esm-patient-chart-app/src/workspace/workspace-notification.component.tsx b/packages/esm-patient-chart-app/src/workspace/workspace-notification.component.tsx
index b202279c0a..1d35f4cb78 100644
--- a/packages/esm-patient-chart-app/src/workspace/workspace-notification.component.tsx
+++ b/packages/esm-patient-chart-app/src/workspace/workspace-notification.component.tsx
@@ -4,10 +4,6 @@ import { Button, ComposedModal, ModalBody, ModalFooter, ModalHeader } from '@car
 import { useTranslation } from 'react-i18next';
 import styles from './workspace-notification.scss';
 
-// t('unsavedChanges', 'You have unsaved changes')
-// t('unsavedChangesInForm', 'There are unsaved changes in {{formName}}. Please save them before opening another form.')
-// t('openAnyway', 'Open anyway')
-
 const WorkspaceNotification: React.FC = () => {
   const { t } = useTranslation();
   const { prompt } = useWorkspaces();
diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
index f8928c2b24..3488e781d4 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
@@ -412,8 +412,8 @@ export function showWorkspacePrompts(
         body: translateFrom(
           '@openmrs/esm-patient-chart-app',
           'unsavedChangesInWorkspace',
-          'There are unsaved changes in {{formName}}. Please save them before opening another workspace.',
-          { formName: workspaceTitle },
+          'There are unsaved changes in {{workspaceName}}. Please save them before opening another workspace.',
+          { workspaceName: workspaceTitle },
         ),
         onConfirm: () => {
           store.setState((prevState) => ({

From 67d97b51c2edd4a0e31f017bb53cfadead201f82 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 5 Feb 2024 15:34:50 +0530
Subject: [PATCH 25/39] Updated translations

---
 packages/esm-patient-chart-app/translations/en.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/esm-patient-chart-app/translations/en.json b/packages/esm-patient-chart-app/translations/en.json
index 70073d8111..19bd181cf4 100644
--- a/packages/esm-patient-chart-app/translations/en.json
+++ b/packages/esm-patient-chart-app/translations/en.json
@@ -161,8 +161,6 @@
   "type": "Type",
   "undo": "Undo",
   "unknown": "Unknown",
-  "unsavedChanges": "You have unsaved changes",
-  "unsavedChangesInForm": "There are unsaved changes in {{formName}}. Please save them before opening another form.",
   "unsavedChangesInOpenedWorkspace": "You have unsaved changes in the opened workspace. Do you want to discard these changes?",
   "unsavedChangesInWorkspace": "There are unsaved changes in {{formName}}. Please save them before opening another workspace.",
   "unsavedChangesTitleText": "Unsaved Changes",

From fe52f88ba8d2ad850f6bff258a69af8026789816 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 5 Feb 2024 15:43:53 +0530
Subject: [PATCH 26/39] Updated tests with text

---
 .../src/workspaces/workspaces.test.ts         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts
index c4de5ac7d1..b8b6442668 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts
@@ -81,9 +81,9 @@ describe('workspace system', () => {
       launchPatientWorkspace('conditions', { foo: true });
       const prompt = store.getState().prompt;
       expect(prompt).toBeTruthy();
-      expect(prompt.title).toMatch('You have unsaved changes');
+      expect(prompt.title).toMatch('Unsaved Changes');
       expect(prompt.body).toMatch(
-        'There are unsaved changes in Allergies. Please save them before opening another form.',
+        'There are unsaved changes in Allergies. Please save them before opening another workspace.',
       );
       expect(prompt.confirmText).toMatch('Open anyway');
       prompt.onConfirm();
@@ -145,9 +145,9 @@ describe('workspace system', () => {
       expect(store.getState().openWorkspaces[1].name).toBe('conditions');
       const prompt = store.getState().prompt;
       expect(prompt).toBeTruthy();
-      expect(prompt.title).toMatch('You have unsaved changes');
+      expect(prompt.title).toMatch('Unsaved Changes');
       expect(prompt.body).toMatch(
-        'There are unsaved changes in Allergies. Please save them before opening another form.',
+        'There are unsaved changes in Allergies. Please save them before opening another workspace.',
       );
       expect(prompt.confirmText).toMatch('Open anyway');
       prompt.onConfirm();
@@ -233,7 +233,7 @@ describe('workspace system', () => {
       const prompt = store.getState().prompt;
       expect(prompt).toBeTruthy();
       expect(prompt.body).toMatch(
-        'There are unsaved changes in Conditions. Please save them before opening another form.',
+        'There are unsaved changes in Conditions. Please save them before opening another workspace.',
       );
       // Closing the conditions workspace because it cannot be hidden
       prompt.onConfirm();
@@ -243,7 +243,7 @@ describe('workspace system', () => {
       const prompt2 = store.getState().prompt;
       expect(prompt2).toBeTruthy();
       expect(prompt2.body).toMatch(
-        'There are unsaved changes in Allergies. Please save them before opening another form.',
+        'There are unsaved changes in Allergies. Please save them before opening another workspace.',
       );
       prompt2.onConfirm();
       expect(store.getState().openWorkspaces.length).toEqual(2);
@@ -314,7 +314,7 @@ describe('workspace system', () => {
     launchPatientWorkspace('form-entry', { foo: true });
     expect(store.getState().openWorkspaces.length).toEqual(1);
     expect(store.getState().openWorkspaces[0].name).toBe('conditions');
-    expect(store.getState().prompt.title).toMatch('You have unsaved changes');
+    expect(store.getState().prompt.title).toMatch('Unsaved Changes');
     store.getState().prompt.onConfirm();
     expect(store.getState().prompt).toBeNull();
     expect(store.getState().openWorkspaces.length).toEqual(1);
@@ -333,7 +333,7 @@ describe('workspace system', () => {
     expect(store.getState().openWorkspaces.length).toEqual(2);
     expect(store.getState().openWorkspaces[0].name).toBe('form-entry');
     expect(store.getState().openWorkspaces[1].name).toBe('order-meds');
-    expect(store.getState().prompt.title).toMatch('You have unsaved changes');
+    expect(store.getState().prompt.title).toMatch('Unsaved Changes');
     cancelPrompt(); // should leave same workspaces intact
     expect(store.getState().openWorkspaces.length).toEqual(2);
     expect(store.getState().openWorkspaces[0].name).toBe('form-entry');
@@ -361,7 +361,7 @@ describe('workspace system', () => {
     store.getState().openWorkspaces[0].promptBeforeClosing(() => true);
     launchPatientWorkspace('hiv');
     expect(store.getState().openWorkspaces[0].name).toBe('diabetes');
-    expect(store.getState().prompt.title).toBe('You have unsaved changes');
+    expect(store.getState().prompt.title).toBe('Unsaved Changes');
     store.getState().prompt.onConfirm();
     expect(store.getState().openWorkspaces[0].name).toBe('hiv');
   });
@@ -398,7 +398,7 @@ describe('workspace system', () => {
     store.getState().openWorkspaces[0].closeWorkspace({ ignoreChanges: false });
     expect(store.getState().prompt.title).toBe('Unsaved Changes');
     expect(store.getState().prompt.body).toBe(
-      'You have unsaved changes in the side panel. Do you want to discard these changes?',
+      'You have unsaved changes in the opened workspace. Do you want to discard these changes?',
     );
     expect(store.getState().prompt.confirmText).toBe('Discard');
     store.getState().prompt.onConfirm();

From a6a489b3dfd340e499a8bae657d48281c7d77196 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 5 Feb 2024 18:31:23 +0530
Subject: [PATCH 27/39] Switching between order workspaces should not prompt
 the users to close order basket

---
 .../lab-order-basket-panel.extension.tsx        | 17 ++++++++++++++---
 .../drug-order-basket-panel.extension.tsx       | 12 +++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.extension.tsx b/packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.extension.tsx
index cad9a8abfd..11ac78ba16 100644
--- a/packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.extension.tsx
+++ b/packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.extension.tsx
@@ -4,7 +4,12 @@ import { useTranslation } from 'react-i18next';
 import { Button, Tile } from '@carbon/react';
 import { Add, ChevronDown, ChevronUp } from '@carbon/react/icons';
 import { useLayoutType } from '@openmrs/esm-framework';
-import { launchPatientWorkspace, type OrderBasketItem, useOrderBasket } from '@openmrs/esm-patient-common-lib';
+import {
+  launchPatientWorkspace,
+  type OrderBasketItem,
+  useOrderBasket,
+  closeWorkspace,
+} from '@openmrs/esm-patient-common-lib';
 import { LabOrderBasketItemTile } from './lab-order-basket-item-tile.component';
 import { prepLabOrderPostData } from '../api';
 import LabIcon from './lab-icon.component';
@@ -20,11 +25,17 @@ export default function LabOrderBasketPanelExtension() {
   const [isExpanded, setIsExpanded] = useState(orders.length > 0);
 
   const openNewLabForm = useCallback(() => {
-    launchPatientWorkspace('add-lab-order');
+    closeWorkspace('order-basket', {
+      ignoreChanges: true,
+      onWorkspaceClose: () => launchPatientWorkspace('add-lab-order'),
+    });
   }, []);
 
   const openEditLabForm = useCallback((order: OrderBasketItem) => {
-    launchPatientWorkspace('add-lab-order', { order });
+    closeWorkspace('order-basket', {
+      ignoreChanges: true,
+      onWorkspaceClose: () => launchPatientWorkspace('add-lab-order', { order }),
+    });
   }, []);
 
   const removeOrder = useCallback(
diff --git a/packages/esm-patient-medications-app/src/drug-order-basket-panel/drug-order-basket-panel.extension.tsx b/packages/esm-patient-medications-app/src/drug-order-basket-panel/drug-order-basket-panel.extension.tsx
index 7b12ad2f9b..825f764580 100644
--- a/packages/esm-patient-medications-app/src/drug-order-basket-panel/drug-order-basket-panel.extension.tsx
+++ b/packages/esm-patient-medications-app/src/drug-order-basket-panel/drug-order-basket-panel.extension.tsx
@@ -4,7 +4,7 @@ import classNames from 'classnames';
 import { Button, Tile } from '@carbon/react';
 import { Add, ChevronDown, ChevronUp } from '@carbon/react/icons';
 import { useLayoutType } from '@openmrs/esm-framework';
-import { launchPatientWorkspace, useOrderBasket } from '@openmrs/esm-patient-common-lib';
+import { closeWorkspace, launchPatientWorkspace, useOrderBasket } from '@openmrs/esm-patient-common-lib';
 import { prepMedicationOrderPostData } from '../api/api';
 import type { DrugOrderBasketItem } from '../types';
 import OrderBasketItemTile from './order-basket-item-tile.component';
@@ -56,11 +56,17 @@ export default function DrugOrderBasketPanelExtension() {
   }, [orders]);
 
   const openDrugSearch = () => {
-    launchPatientWorkspace('add-drug-order');
+    closeWorkspace('order-basket', {
+      ignoreChanges: true,
+      onWorkspaceClose: () => launchPatientWorkspace('add-drug-order'),
+    });
   };
 
   const openDrugForm = (order: DrugOrderBasketItem) => {
-    launchPatientWorkspace('add-drug-order', { order });
+    closeWorkspace('order-basket', {
+      ignoreChanges: true,
+      onWorkspaceClose: () => launchPatientWorkspace('add-drug-order', { order }),
+    });
   };
 
   const removeMedication = useCallback(

From f7b3e67e5e8c9afdaa85b390af6877f624c9be14 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 5 Feb 2024 18:37:58 +0530
Subject: [PATCH 28/39] Updated translations

---
 .../src/root.component.tsx                    |  2 +-
 .../translations/am.json                      | 12 ++++++-----
 .../translations/ar.json                      | 20 ++++++++++---------
 .../translations/en.json                      |  5 +++--
 .../translations/es.json                      | 14 +++++++------
 .../translations/fr.json                      | 14 +++++++------
 .../translations/he.json                      | 14 +++++++------
 .../translations/km.json                      | 10 ++++++----
 .../translations/zh.json                      | 10 ++++++----
 .../translations/zh_CN.json                   |  8 +++++---
 10 files changed, 63 insertions(+), 46 deletions(-)

diff --git a/packages/esm-patient-chart-app/src/root.component.tsx b/packages/esm-patient-chart-app/src/root.component.tsx
index 8687e9483d..0315e16b3c 100644
--- a/packages/esm-patient-chart-app/src/root.component.tsx
+++ b/packages/esm-patient-chart-app/src/root.component.tsx
@@ -50,7 +50,7 @@ export default function Root() {
  * t('discard','Discard')
  * t('closingAllWorkspacesPromptTitle','You have unsaved changes')
  * t('closingAllWorkspacesPromptBody', 'There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}')
- * t('closeAllOpenedWorkspaces', 'Discard changes in {{count}} workspaces')
+ * t('closeAllOpenedWorkspaces', 'Discard changes in {{count}} workspaces', {count})
  * t('unsavedChangesInWorkspace', 'There are unsaved changes in {{workspaceName}}. Please save them before opening another workspace.')
  * t('openAnyway', 'Open anyway')
  */
diff --git a/packages/esm-patient-chart-app/translations/am.json b/packages/esm-patient-chart-app/translations/am.json
index b6ebb4b0d1..998955fd7b 100644
--- a/packages/esm-patient-chart-app/translations/am.json
+++ b/packages/esm-patient-chart-app/translations/am.json
@@ -18,8 +18,10 @@
   "causeOfDeath_title": "Cause of Death",
   "checkFilters": "Check the filters above",
   "close": "Close",
-  "closeWorkspaces_one": "Discard changes in {{count}} workspaces",
-  "closeWorkspaces_other": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_one": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_other": "Discard changes in {{count}} workspaces",
+  "closingAllWorkspacesPromptBody": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "closingAllWorkspacesPromptTitle": "You have unsaved changes",
   "Conditions dashboard": "Conditions dashboard",
   "confirm": "Confirm",
   "confirmDeceased": "Confirm Deceased",
@@ -160,9 +162,9 @@
   "type": "Type",
   "undo": "Undo",
   "unknown": "Unknown",
-  "unsavedChanges": "You have unsaved changes",
-  "unsavedChangesInForm": "There are unsaved changes in {{formName}}. Please save them before opening another form.",
-  "unsavedChangesInForms": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "unsavedChangesInOpenedWorkspace": "You have unsaved changes in the opened workspace. Do you want to discard these changes?",
+  "unsavedChangesInWorkspace": "There are unsaved changes in {{workspaceName}}. Please save them before opening another workspace.",
+  "unsavedChangesTitleText": "Unsaved Changes",
   "updateError": "Error updating upcoming appointment",
   "updateVisitDetails": "Update visit details",
   "visit": "Visit",
diff --git a/packages/esm-patient-chart-app/translations/ar.json b/packages/esm-patient-chart-app/translations/ar.json
index 375cf5d7e7..9989a75e4c 100644
--- a/packages/esm-patient-chart-app/translations/ar.json
+++ b/packages/esm-patient-chart-app/translations/ar.json
@@ -18,12 +18,14 @@
   "causeOfDeath_title": "سبب الوفاة",
   "checkFilters": "تحقق من الفلاتر أعلاه",
   "close": "إغلاق",
-  "closeWorkspaces_zero": "Discard changes in {{count}} workspaces",
-  "closeWorkspaces_one": "Discard changes in {{count}} workspaces",
-  "closeWorkspaces_two": "Discard changes in {{count}} workspaces",
-  "closeWorkspaces_few": "Discard changes in {{count}} workspaces",
-  "closeWorkspaces_many": "Discard changes in {{count}} workspaces",
-  "closeWorkspaces_other": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_zero": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_one": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_two": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_few": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_many": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_other": "Discard changes in {{count}} workspaces",
+  "closingAllWorkspacesPromptBody": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "closingAllWorkspacesPromptTitle": "You have unsaved changes",
   "Conditions dashboard": "لوحة الحالات",
   "confirm": "تأكيد",
   "confirmDeceased": "تأكيد الوفاة",
@@ -172,9 +174,9 @@
   "type": "النوع",
   "undo": "Undo",
   "unknown": "غير معروف",
-  "unsavedChanges": "لديك تغييرات غير محفوظة",
-  "unsavedChangesInForm": "هناك تغييرات غير محفوظة في {{formName}}. الرجاء حفظها قبل فتح نموذج آخر.",
-  "unsavedChangesInForms": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "unsavedChangesInOpenedWorkspace": "You have unsaved changes in the opened workspace. Do you want to discard these changes?",
+  "unsavedChangesInWorkspace": "There are unsaved changes in {{workspaceName}}. Please save them before opening another workspace.",
+  "unsavedChangesTitleText": "Unsaved Changes",
   "updateError": "خطأ في تحديث الموعد القادم",
   "updateVisitDetails": "Update visit details",
   "visit": "زيارة",
diff --git a/packages/esm-patient-chart-app/translations/en.json b/packages/esm-patient-chart-app/translations/en.json
index 19bd181cf4..8003a5b7c3 100644
--- a/packages/esm-patient-chart-app/translations/en.json
+++ b/packages/esm-patient-chart-app/translations/en.json
@@ -18,7 +18,8 @@
   "causeOfDeath_title": "Cause of Death",
   "checkFilters": "Check the filters above",
   "close": "Close",
-  "closeAllOpenedWorkspaces": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_one": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_other": "Discard changes in {{count}} workspaces",
   "closingAllWorkspacesPromptBody": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
   "closingAllWorkspacesPromptTitle": "You have unsaved changes",
   "Conditions dashboard": "Conditions dashboard",
@@ -162,7 +163,7 @@
   "undo": "Undo",
   "unknown": "Unknown",
   "unsavedChangesInOpenedWorkspace": "You have unsaved changes in the opened workspace. Do you want to discard these changes?",
-  "unsavedChangesInWorkspace": "There are unsaved changes in {{formName}}. Please save them before opening another workspace.",
+  "unsavedChangesInWorkspace": "There are unsaved changes in {{workspaceName}}. Please save them before opening another workspace.",
   "unsavedChangesTitleText": "Unsaved Changes",
   "updateError": "Error updating upcoming appointment",
   "updateVisitDetails": "Update visit details",
diff --git a/packages/esm-patient-chart-app/translations/es.json b/packages/esm-patient-chart-app/translations/es.json
index 492d0c148f..99ec637af9 100644
--- a/packages/esm-patient-chart-app/translations/es.json
+++ b/packages/esm-patient-chart-app/translations/es.json
@@ -18,9 +18,11 @@
   "causeOfDeath_title": "Causa de Muerte",
   "checkFilters": "Comprobar los filtros anteriores",
   "close": "Cerrar",
-  "closeWorkspaces_one": "Discard changes in {{count}} workspaces",
-  "closeWorkspaces_many": "Discard changes in {{count}} workspaces",
-  "closeWorkspaces_other": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_one": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_many": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_other": "Discard changes in {{count}} workspaces",
+  "closingAllWorkspacesPromptBody": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "closingAllWorkspacesPromptTitle": "You have unsaved changes",
   "Conditions dashboard": "Panel de Condiciones",
   "confirm": "Confirmar",
   "confirmDeceased": "Confirmar fallecido",
@@ -163,9 +165,9 @@
   "type": "Tipo",
   "undo": "Undo",
   "unknown": "Desconocido",
-  "unsavedChanges": "Tienes cambios sin guardar",
-  "unsavedChangesInForm": "Hay cambios sin guardar en {{formName}}. Por favor, guárdalos antes de abrir otro formulario.",
-  "unsavedChangesInForms": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "unsavedChangesInOpenedWorkspace": "You have unsaved changes in the opened workspace. Do you want to discard these changes?",
+  "unsavedChangesInWorkspace": "There are unsaved changes in {{workspaceName}}. Please save them before opening another workspace.",
+  "unsavedChangesTitleText": "Unsaved Changes",
   "updateError": "Error al actualizar la cita próxima",
   "updateVisitDetails": "Update visit details",
   "visit": "Visita",
diff --git a/packages/esm-patient-chart-app/translations/fr.json b/packages/esm-patient-chart-app/translations/fr.json
index 6e1c5b3bd4..ee999ecc16 100644
--- a/packages/esm-patient-chart-app/translations/fr.json
+++ b/packages/esm-patient-chart-app/translations/fr.json
@@ -18,9 +18,11 @@
   "causeOfDeath_title": "Cause of Death",
   "checkFilters": "Vérifiez les filtres ci-dessus",
   "close": "Fermer",
-  "closeWorkspaces_one": "Discard changes in {{count}} workspaces",
-  "closeWorkspaces_many": "Discard changes in {{count}} workspaces",
-  "closeWorkspaces_other": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_one": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_many": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_other": "Discard changes in {{count}} workspaces",
+  "closingAllWorkspacesPromptBody": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "closingAllWorkspacesPromptTitle": "You have unsaved changes",
   "Conditions dashboard": "Tableau de bord des conditions",
   "confirm": "Confirmer",
   "confirmDeceased": "Confirmer le décès",
@@ -163,9 +165,9 @@
   "type": "Type",
   "undo": "Undo",
   "unknown": "Inconnu",
-  "unsavedChanges": "Vous avez des changements non enregistrés",
-  "unsavedChangesInForm": "Il existe des modifications non enregistrées dans {{formName}}. Veuillez les enregistrer avant d'ouvrir un autre formulaire.",
-  "unsavedChangesInForms": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "unsavedChangesInOpenedWorkspace": "You have unsaved changes in the opened workspace. Do you want to discard these changes?",
+  "unsavedChangesInWorkspace": "There are unsaved changes in {{workspaceName}}. Please save them before opening another workspace.",
+  "unsavedChangesTitleText": "Unsaved Changes",
   "updateError": "Error updating upcoming appointment",
   "updateVisitDetails": "Update visit details",
   "visit": "Visite",
diff --git a/packages/esm-patient-chart-app/translations/he.json b/packages/esm-patient-chart-app/translations/he.json
index bea33b0fd5..14d28c9ca8 100644
--- a/packages/esm-patient-chart-app/translations/he.json
+++ b/packages/esm-patient-chart-app/translations/he.json
@@ -18,9 +18,11 @@
   "causeOfDeath_title": "סיבת המוות",
   "checkFilters": "נא לבדוק את המסננים למעלה",
   "close": "סגור",
-  "closeWorkspaces_one": "Discard changes in {{count}} workspaces",
-  "closeWorkspaces_two": "Discard changes in {{count}} workspaces",
-  "closeWorkspaces_other": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_one": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_two": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_other": "Discard changes in {{count}} workspaces",
+  "closingAllWorkspacesPromptBody": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "closingAllWorkspacesPromptTitle": "You have unsaved changes",
   "Conditions dashboard": "לוח מצבים",
   "confirm": "אישור",
   "confirmDeceased": "אישור מצב פטירה",
@@ -165,9 +167,9 @@
   "type": "סוג",
   "undo": "לבטל",
   "unknown": "לא ידוע",
-  "unsavedChanges": "יש לך שינויים שלא נשמרו",
-  "unsavedChangesInForm": "ישנם שינויים שלא נשמרו ב {{formName}}. נא לשמור אותם לפני פתיחת טופס נוסף.",
-  "unsavedChangesInForms": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "unsavedChangesInOpenedWorkspace": "You have unsaved changes in the opened workspace. Do you want to discard these changes?",
+  "unsavedChangesInWorkspace": "There are unsaved changes in {{workspaceName}}. Please save them before opening another workspace.",
+  "unsavedChangesTitleText": "Unsaved Changes",
   "updateError": "שגיאה בעדכון התור הקרוב",
   "updateVisitDetails": "עדכן את פרטי הביקור",
   "visit": "ביקור",
diff --git a/packages/esm-patient-chart-app/translations/km.json b/packages/esm-patient-chart-app/translations/km.json
index 7834d30e37..35b3ace94f 100644
--- a/packages/esm-patient-chart-app/translations/km.json
+++ b/packages/esm-patient-chart-app/translations/km.json
@@ -18,7 +18,9 @@
   "causeOfDeath_title": "មូលហេតុនៃការស្លាប់",
   "checkFilters": "ពិនិត្យតម្រងខាងលើ",
   "close": "បិទ",
-  "closeWorkspaces_other": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_other": "Discard changes in {{count}} workspaces",
+  "closingAllWorkspacesPromptBody": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "closingAllWorkspacesPromptTitle": "You have unsaved changes",
   "Conditions dashboard": "ផ្ទាំងគ្រប់គ្រងលក្ខខណ្ឌ",
   "confirm": "បញ្ជាក់",
   "confirmDeceased": "បញ្ជាក់ថាបានស្លាប់",
@@ -157,9 +159,9 @@
   "type": "ប្រភេទ",
   "undo": "ហៅឱ្យត្រឡប់មកវិញ",
   "unknown": "មិនដឹង",
-  "unsavedChanges": "អ្នកមានការផ្លាស់ប្ដូរដែលមិនបានរក្សាទុក",
-  "unsavedChangesInForm": "មានការផ្លាស់ប្តូរដែលមិនបានរក្សាទុកនៅក្នុង {{formName}} ។ សូមរក្សាទុកពួកវាមុនពេលបើកទម្រង់ផ្សេងទៀត។",
-  "unsavedChangesInForms": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "unsavedChangesInOpenedWorkspace": "You have unsaved changes in the opened workspace. Do you want to discard these changes?",
+  "unsavedChangesInWorkspace": "There are unsaved changes in {{workspaceName}}. Please save them before opening another workspace.",
+  "unsavedChangesTitleText": "Unsaved Changes",
   "updateError": "ការធ្វើបច្ចុប្បន្នភាពការណាត់ជួបនាពេលខាងមុខមិនដំណើរការ",
   "updateVisitDetails": "ធ្វើបច្ចុប្បន្នភាពព័ត៌មានលម្អិតអំពីការពិនិត្យជំងឺ",
   "visit": "ការមកពិនិត្យជំងឺ",
diff --git a/packages/esm-patient-chart-app/translations/zh.json b/packages/esm-patient-chart-app/translations/zh.json
index 9b11178650..31fb5d0ad7 100644
--- a/packages/esm-patient-chart-app/translations/zh.json
+++ b/packages/esm-patient-chart-app/translations/zh.json
@@ -18,7 +18,9 @@
   "causeOfDeath_title": "Cause of Death",
   "checkFilters": "检查上方的筛选条件",
   "close": "关闭",
-  "closeWorkspaces_other": "Discard changes in {{count}} workspaces",
+  "closeAllOpenedWorkspaces_other": "Discard changes in {{count}} workspaces",
+  "closingAllWorkspacesPromptBody": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "closingAllWorkspacesPromptTitle": "You have unsaved changes",
   "Conditions dashboard": "Conditions dashboard",
   "confirm": "确认",
   "confirmDeceased": "确认已故",
@@ -157,9 +159,9 @@
   "type": "类型",
   "undo": "Undo",
   "unknown": "未知",
-  "unsavedChanges": "You have unsaved changes",
-  "unsavedChangesInForm": "There are unsaved changes in {{formName}}. Please save them before opening another form.",
-  "unsavedChangesInForms": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "unsavedChangesInOpenedWorkspace": "You have unsaved changes in the opened workspace. Do you want to discard these changes?",
+  "unsavedChangesInWorkspace": "There are unsaved changes in {{workspaceName}}. Please save them before opening another workspace.",
+  "unsavedChangesTitleText": "Unsaved Changes",
   "updateError": "Error updating upcoming appointment",
   "updateVisitDetails": "Update visit details",
   "visit": "就诊",
diff --git a/packages/esm-patient-chart-app/translations/zh_CN.json b/packages/esm-patient-chart-app/translations/zh_CN.json
index 1624e38546..f04c663880 100644
--- a/packages/esm-patient-chart-app/translations/zh_CN.json
+++ b/packages/esm-patient-chart-app/translations/zh_CN.json
@@ -18,6 +18,8 @@
   "causeOfDeath_title": "Cause of Death",
   "checkFilters": "检查上方的筛选条件",
   "close": "关闭",
+  "closingAllWorkspacesPromptBody": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "closingAllWorkspacesPromptTitle": "You have unsaved changes",
   "Conditions dashboard": "Conditions dashboard",
   "confirm": "确认",
   "confirmDeceased": "确认已故",
@@ -154,9 +156,9 @@
   "type": "类型",
   "undo": "Undo",
   "unknown": "未知",
-  "unsavedChanges": "You have unsaved changes",
-  "unsavedChangesInForm": "There are unsaved changes in {{formName}}. Please save them before opening another form.",
-  "unsavedChangesInForms": "There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}",
+  "unsavedChangesInOpenedWorkspace": "You have unsaved changes in the opened workspace. Do you want to discard these changes?",
+  "unsavedChangesInWorkspace": "There are unsaved changes in {{workspaceName}}. Please save them before opening another workspace.",
+  "unsavedChangesTitleText": "Unsaved Changes",
   "updateError": "Error updating upcoming appointment",
   "updateVisitDetails": "Update visit details",
   "visit": "就诊",

From a69e6dc591f18c2df278f365aa8f5a92fcddd6f3 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Wed, 7 Feb 2024 13:13:37 +0530
Subject: [PATCH 29/39] Updated `ignoreChanges` description

Co-authored-by: Brandon Istenes <bistenes@gmail.com>
---
 packages/esm-patient-common-lib/src/workspaces/workspaces.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
index 3488e781d4..7f791d396e 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
@@ -105,7 +105,7 @@ function getTitleFromExtension(ext: ExtensionRegistration) {
 /**
  *
  * @param name Name of the workspace
- * @param ignoreChanges Whether to forcefully ignore changes in the workspace
+ * @param ignoreChanges If set to true, the "unsaved changes" modal will never be shown, even if the `promptBeforeClosing` function returns true. The user will not be prompted before closing.
  * @returns true if the workspace can be closed.
  */
 export function getWhetherWorkspaceCanBeClosed(name: string, ignoreChanges: boolean = false) {

From d21f49b4922668b33ca2332cf385989bf263487f Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Wed, 7 Feb 2024 13:25:14 +0530
Subject: [PATCH 30/39] Review changes

---
 .../src/workspaces/patient-lists.workspace.tsx              | 6 ++----
 .../add-drug-order/drug-search/drug-search.component.tsx    | 4 ----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.tsx b/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.tsx
index 80ae5fb2e8..ed03fb633c 100644
--- a/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.tsx
+++ b/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.tsx
@@ -29,7 +29,7 @@ import { useDebounce, useLayoutType } from '@openmrs/esm-framework';
 import { usePatientLists } from '../patient-lists.resource';
 import styles from './patient-lists.scss';
 
-function PatientListsWorkspace({ closeWorkspace }: DefaultWorkspaceProps) {
+function PatientListsWorkspace() {
   const { t } = useTranslation();
   const layout = useLayoutType();
   const responsiveSize = layout === 'tablet' ? 'lg' : 'sm';
@@ -38,9 +38,7 @@ function PatientListsWorkspace({ closeWorkspace }: DefaultWorkspaceProps) {
   const { patientLists, isLoading } = usePatientLists();
 
   const launchListDetailsWorkspace = useCallback((list) => {
-    closeWorkspace({
-      onWorkspaceClose: () => launchPatientWorkspace('patient-list-details', { list, workspaceTitle: list.name }),
-    });
+    launchPatientWorkspace('patient-list-details', { list, workspaceTitle: list.name });
   }, []);
 
   const tableHeaders: Array<typeof DataTableHeader> = [
diff --git a/packages/esm-patient-medications-app/src/add-drug-order/drug-search/drug-search.component.tsx b/packages/esm-patient-medications-app/src/add-drug-order/drug-search/drug-search.component.tsx
index 9d0db25567..23705a579b 100644
--- a/packages/esm-patient-medications-app/src/add-drug-order/drug-search/drug-search.component.tsx
+++ b/packages/esm-patient-medications-app/src/add-drug-order/drug-search/drug-search.component.tsx
@@ -18,10 +18,6 @@ export default function DrugSearch({ openOrderForm, promptBeforeClosing }: DrugS
   const debouncedSearchTerm = useDebounce(searchTerm);
   const searchInputRef = useRef(null);
 
-  useEffect(() => {
-    promptBeforeClosing(() => !!searchTerm);
-  }, [searchTerm]);
-
   const focusAndClearSearchInput = () => {
     setSearchTerm('');
     searchInputRef.current?.focus();

From 378061734343daed72e0bc2ec0f7da77a5420a26 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Wed, 7 Feb 2024 19:51:57 +0530
Subject: [PATCH 31/39] Introduced new function
 'discardChangesAndCloseWorkspace' to close workspaces and keeping the
 closeWorkspace default behaviour intact

---
 .../form-renderer/form-renderer.component.tsx | 18 +++++++----
 .../src/form-renderer/form-renderer.test.tsx  |  2 ++
 .../allergies-form/allergy-form.component.tsx |  9 +++---
 .../allergies-form/allergy-form.test.tsx      |  1 +
 .../appointments-form.component.tsx           |  6 ++--
 .../appointments-form.test.tsx                |  3 +-
 .../src/visit/past-visit-overview.test.tsx    |  1 +
 .../visit/visit-form/visit-form.component.tsx | 10 +++----
 .../src/visit/visit-form/visit-form.test.tsx  |  4 ++-
 .../workspace-renderer.component.tsx          |  1 +
 .../src/types/workspace.ts                    | 16 +++++-----
 .../src/workspaces/workspaces.test.ts         | 12 ++++----
 .../src/workspaces/workspaces.ts              |  8 +++--
 .../conditions/conditions-form.component.tsx  |  6 ++--
 .../src/conditions/conditions-form.test.tsx   |  3 +-
 .../conditions-widget.component.tsx           | 12 ++++----
 .../src/flags/flags-list.test.tsx             |  9 +++++-
 .../src/forms/form-entry.component.tsx        | 11 +++++--
 .../src/forms/form-entry.test.tsx             |  1 +
 .../src/forms/forms-dashboard.component.tsx   | 30 ++++++++-----------
 .../src/forms/forms-dashboard.test.tsx        |  9 +++++-
 .../immunizations-form.component.tsx          | 12 +++++---
 .../immunizations/immunizations-form.test.tsx |  2 ++
 .../src/index.ts                              |  2 +-
 .../add-lab-order/add-lab-order.test.tsx      | 24 ++++++++-------
 .../add-lab-order/add-lab-order.workspace.tsx | 17 +++++++----
 .../lab-order-form.component.tsx              | 20 +++++++------
 .../patient-list-details.workspace.test.tsx   |  1 +
 .../patient-list-details.workspace.tsx        |  6 ++--
 .../patient-lists.workspace.test.tsx          |  2 +-
 .../workspaces/patient-lists.workspace.tsx    |  6 +---
 .../add-drug-order/add-drug-order.test.tsx    |  1 +
 .../add-drug-order.workspace.tsx              | 12 ++++----
 .../drug-search/drug-search.component.tsx     |  3 +-
 .../src/notes/visit-notes-form.test.tsx       |  1 +
 .../order-basket/order-basket.workspace.tsx   | 14 +++++----
 .../src/programs/programs-form.test.tsx       |  1 +
 .../vitals-biometrics-form.test.tsx           |  1 +
 38 files changed, 178 insertions(+), 119 deletions(-)

diff --git a/packages/esm-form-engine-app/src/form-renderer/form-renderer.component.tsx b/packages/esm-form-engine-app/src/form-renderer/form-renderer.component.tsx
index 79ecdd9051..5ee9d9337a 100644
--- a/packages/esm-form-engine-app/src/form-renderer/form-renderer.component.tsx
+++ b/packages/esm-form-engine-app/src/form-renderer/form-renderer.component.tsx
@@ -6,16 +6,22 @@ import { type Visit } from '@openmrs/esm-framework';
 import useFormSchema from '../hooks/useFormSchema';
 import FormError from './form-error.component';
 import styles from './form-renderer.scss';
+import { type DefaultWorkspaceProps } from '@openmrs/esm-patient-common-lib';
 
-interface FormRendererProps {
+interface FormRendererProps extends DefaultWorkspaceProps {
   formUuid: string;
   patientUuid: string;
   visit?: Visit;
-  closeWorkspace: () => void;
   encounterUuid?: string;
 }
 
-const FormRenderer: React.FC<FormRendererProps> = ({ formUuid, patientUuid, visit, closeWorkspace, encounterUuid }) => {
+const FormRenderer: React.FC<FormRendererProps> = ({
+  formUuid,
+  patientUuid,
+  visit,
+  discardChangesAndCloseWorkspace,
+  encounterUuid,
+}) => {
   const { t } = useTranslation();
   const { schema, error, isLoading } = useFormSchema(formUuid);
 
@@ -30,7 +36,7 @@ const FormRenderer: React.FC<FormRendererProps> = ({ formUuid, patientUuid, visi
   if (error) {
     return (
       <div className={styles.errorContainer}>
-        <FormError closeWorkspace={closeWorkspace} />
+        <FormError closeWorkspace={discardChangesAndCloseWorkspace} />
       </div>
     );
   }
@@ -43,8 +49,8 @@ const FormRenderer: React.FC<FormRendererProps> = ({ formUuid, patientUuid, visi
           patientUUID={patientUuid}
           visit={visit}
           formJson={schema}
-          handleClose={closeWorkspace}
-          onSubmit={() => closeWorkspace()}
+          handleClose={discardChangesAndCloseWorkspace}
+          onSubmit={discardChangesAndCloseWorkspace}
         />
       )}
     </>
diff --git a/packages/esm-form-engine-app/src/form-renderer/form-renderer.test.tsx b/packages/esm-form-engine-app/src/form-renderer/form-renderer.test.tsx
index 969472aeff..13fbc196a0 100644
--- a/packages/esm-form-engine-app/src/form-renderer/form-renderer.test.tsx
+++ b/packages/esm-form-engine-app/src/form-renderer/form-renderer.test.tsx
@@ -21,6 +21,8 @@ describe('FormRenderer', () => {
     formUuid: 'test-form-uuid',
     patientUuid: 'test-patient-uuid',
     closeWorkspace: jest.fn(),
+    discardChangesAndCloseWorkspace: jest.fn(),
+    promptBeforeClosing: jest.fn(),
   };
 
   test('renders FormError component when there is an error', () => {
diff --git a/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.component.tsx b/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.component.tsx
index e3eaeeba71..18b0c89d23 100644
--- a/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.component.tsx
+++ b/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.component.tsx
@@ -66,7 +66,8 @@ type AllergyFormData = {
   comment: string;
 };
 
-function AllergyForm({ closeWorkspace, patientUuid, promptBeforeClosing }: DefaultWorkspaceProps) {
+function AllergyForm(props: DefaultWorkspaceProps) {
+  const { discardChangesAndCloseWorkspace, patientUuid, promptBeforeClosing } = props;
   const { t } = useTranslation();
   const { concepts } = useConfig();
   const isTablet = useLayoutType() === 'tablet';
@@ -165,7 +166,7 @@ function AllergyForm({ closeWorkspace, patientUuid, promptBeforeClosing }: Defau
           (response: FetchResponse) => {
             if (response.status === 201) {
               mutate();
-              closeWorkspace();
+              discardChangesAndCloseWorkspace();
               showSnackbar({
                 isLowContrast: true,
                 kind: 'success',
@@ -185,7 +186,7 @@ function AllergyForm({ closeWorkspace, patientUuid, promptBeforeClosing }: Defau
         )
         .finally(() => abortController.abort());
     },
-    [otherConceptUuid, patientUuid, closeWorkspace, t, mutate],
+    [otherConceptUuid, patientUuid, discardChangesAndCloseWorkspace, t, mutate],
   );
 
   return (
@@ -344,7 +345,7 @@ function AllergyForm({ closeWorkspace, patientUuid, promptBeforeClosing }: Defau
         <ButtonSet
           className={classNames(isTablet ? styles.tabletButtons : styles.desktopButtons, styles.actionButtons)}
         >
-          <Button className={styles.button} onClick={closeWorkspace} kind="secondary">
+          <Button className={styles.button} onClick={discardChangesAndCloseWorkspace} kind="secondary">
             {t('discard', 'Discard')}
           </Button>
           <Button
diff --git a/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx b/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx
index ab6a4de607..d275c386aa 100644
--- a/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx
+++ b/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx
@@ -274,6 +274,7 @@ describe('AllergyForm ', () => {
 function renderAllergyForm() {
   const testProps = {
     closeWorkspace: () => {},
+    discardChangesAndCloseWorkspace: () => {},
     promptBeforeClosing: () => {},
     patient: mockPatient,
     patientUuid: mockPatient.id,
diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.component.tsx b/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.component.tsx
index 5b5c768dc5..75d10bfe0e 100644
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.component.tsx
+++ b/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.component.tsx
@@ -71,7 +71,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
   recurringPattern,
   patientUuid,
   context,
-  closeWorkspace,
+  discardChangesAndCloseWorkspace,
   promptBeforeClosing,
 }) => {
   const editedAppointmentTimeFormat = new Date(appointment?.startDateTime).getHours() >= 12 ? 'PM' : 'AM';
@@ -198,7 +198,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
       ({ status }) => {
         if (status === 200) {
           setIsSubmitting(false);
-          closeWorkspace();
+          discardChangesAndCloseWorkspace();
           mutate();
 
           showSnackbar({
@@ -591,7 +591,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
         </section>
       </Stack>
       <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
-        <Button className={styles.button} onClick={closeWorkspace} kind="secondary">
+        <Button className={styles.button} onClick={discardChangesAndCloseWorkspace} kind="secondary">
           {t('discard', 'Discard')}
         </Button>
         <Button className={styles.button} disabled={isSubmitting} onClick={handleSubmit(handleSaveAppointment)}>
diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.test.tsx b/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.test.tsx
index 05ce0a88b5..9c596e0f47 100644
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.test.tsx
+++ b/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.test.tsx
@@ -12,6 +12,7 @@ const testProps = {
   closeWorkspace: jest.fn(),
   patientUuid: mockPatient.id,
   promptBeforeClosing: jest.fn(),
+  discardChangesAndCloseWorkspace: jest.fn(),
 };
 
 const mockCreateAppointment = saveAppointment as jest.Mock;
@@ -129,7 +130,7 @@ describe('AppointmentForm', () => {
     const cancelButton = screen.getByRole('button', { name: /Discard/i });
     await user.click(cancelButton);
 
-    expect(testProps.closeWorkspace).toHaveBeenCalledTimes(1);
+    expect(testProps.discardChangesAndCloseWorkspace).toHaveBeenCalledTimes(1);
   });
 
   it('renders a success snackbar  upon successfully scheduling an appointment', async () => {
diff --git a/packages/esm-patient-chart-app/src/visit/past-visit-overview.test.tsx b/packages/esm-patient-chart-app/src/visit/past-visit-overview.test.tsx
index 723b1014ba..8349bd546e 100644
--- a/packages/esm-patient-chart-app/src/visit/past-visit-overview.test.tsx
+++ b/packages/esm-patient-chart-app/src/visit/past-visit-overview.test.tsx
@@ -7,6 +7,7 @@ import PastVisitOverview from './past-visit-overview.component';
 
 const testProps = {
   closeWorkspace: jest.fn(),
+  discardChangesAndCloseWorkspace: jest.fn(),
   patientUuid: mockPatient.id,
   promptBeforeClosing: jest.fn(),
 };
diff --git a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
index 51e895c669..a0ddc2774c 100644
--- a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
@@ -63,7 +63,7 @@ interface StartVisitFormProps extends DefaultWorkspaceProps {
 
 const StartVisitForm: React.FC<StartVisitFormProps> = ({
   patientUuid,
-  closeWorkspace,
+  discardChangesAndCloseWorkspace,
   promptBeforeClosing,
   visitToEdit,
   showVisitEndDateTimeFields,
@@ -405,7 +405,7 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
               }
               mutateCurrentVisit();
               mutateVisits();
-              closeWorkspace();
+              discardChangesAndCloseWorkspace();
 
               showSnackbar({
                 isLowContrast: true,
@@ -444,7 +444,7 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
           (offlineVisit) => {
             //setCurrentVisit(patientUuid, offlineVisit.uuid);
             mutate();
-            closeWorkspace();
+            discardChangesAndCloseWorkspace();
             showSnackbar({
               isLowContrast: true,
               kind: 'success',
@@ -467,7 +467,7 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
       }
     },
     [
-      closeWorkspace,
+      discardChangesAndCloseWorkspace,
       config.showServiceQueueFields,
       config.showUpcomingAppointments,
       visitQueueNumberAttributeUuid,
@@ -661,7 +661,7 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
           </Stack>
         </div>
         <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
-          <Button className={styles.button} kind="secondary" onClick={() => closeWorkspace()}>
+          <Button className={styles.button} kind="secondary" onClick={() => discardChangesAndCloseWorkspace()}>
             {t('discard', 'Discard')}
           </Button>
           <Button
diff --git a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx
index fae42a8e8f..468af5899c 100644
--- a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx
@@ -9,11 +9,13 @@ import { useVisitAttributeType } from '../hooks/useVisitAttributeType';
 import StartVisitForm from './visit-form.component';
 
 const mockCloseWorkspace = jest.fn();
+const mockDiscardChangesAndCloseWorkspace = jest.fn();
 const mockPromptBeforeClosing = jest.fn();
 
 const testProps = {
   patientUuid: mockPatient.id,
   closeWorkspace: mockCloseWorkspace,
+  discardChangesAndCloseWorkspace: mockDiscardChangesAndCloseWorkspace,
   promptBeforeClosing: mockPromptBeforeClosing,
   visitToEdit: undefined,
   showVisitEndDateTimeFields: false,
@@ -268,7 +270,7 @@ describe('Visit Form', () => {
 
     await user.click(closeButton);
 
-    expect(mockCloseWorkspace).toHaveBeenCalled();
+    expect(mockDiscardChangesAndCloseWorkspace).toHaveBeenCalled();
   });
 
   it('should not submit the form if the visit attributes type is required and throw the error', async () => {
diff --git a/packages/esm-patient-chart-app/src/workspace/workspace-renderer.component.tsx b/packages/esm-patient-chart-app/src/workspace/workspace-renderer.component.tsx
index 493ec7e118..a8b6016d13 100644
--- a/packages/esm-patient-chart-app/src/workspace/workspace-renderer.component.tsx
+++ b/packages/esm-patient-chart-app/src/workspace/workspace-renderer.component.tsx
@@ -34,6 +34,7 @@ export function WorkspaceRenderer({ workspace, patientUuid, active }: WorkspaceR
   const props = useMemo(
     () =>
       workspace && {
+        discardChangesAndCloseWorkspace: workspace.discardChangesAndCloseWorkspace,
         closeWorkspace: workspace.closeWorkspace,
         promptBeforeClosing: workspace.promptBeforeClosing,
         patientUuid,
diff --git a/packages/esm-patient-common-lib/src/types/workspace.ts b/packages/esm-patient-common-lib/src/types/workspace.ts
index 6f22c1a74d..71f0068dec 100644
--- a/packages/esm-patient-common-lib/src/types/workspace.ts
+++ b/packages/esm-patient-common-lib/src/types/workspace.ts
@@ -23,16 +23,18 @@ export interface CloseWorkspaceOptions {
 /** The default parameters received by all workspaces */
 export interface DefaultWorkspaceProps {
   /**
-   * Call this function to close the workspace.
+   * Call this function to close the workspace. This function will prompt the user
+   * if there are any unsaved changes to workspace.
    *
-   * Whenever we close the workspace with `workspace.closeWorkspace()`, the `ignoreChanges`
-   * is set to true by default.
-   *
-   * Whenever you close the opened workspace outside the workspace window, always close the workspace as
-   * `closeWorkspace({ ignoreChanges: false })`, taking care to prompting the user if there
-   * are any pending changes in the workspace.
+   * You can pass `onWorkspaceClose` function to be called when the workspace is finally
+   * closed, given the user forcefully closes the workspace.
    */
   closeWorkspace(closeWorkspaceOptions?: CloseWorkspaceOptions): void;
+  /**
+   * Call this function to discard the changes in the workspace form
+   * and close the workspace.
+   */
+  discardChangesAndCloseWorkspace(closeWorkspaceOptions?: CloseWorkspaceOptions): void;
   /**
    * Call this with a no-args function that returns true if the user should be prompted before
    * this workspace is closed; e.g. if there is unsaved data.
diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts
index b8b6442668..90c5f751ba 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts
@@ -34,7 +34,7 @@ describe('workspace system', () => {
     const allergies = store.getState().openWorkspaces[0];
     expect(allergies.name).toBe('allergies');
     expect(allergies.additionalProps['foo']).toBe(true);
-    allergies.closeWorkspace();
+    allergies.discardChangesAndCloseWorkspace();
     expect(store.getState().openWorkspaces.length).toEqual(0);
   });
 
@@ -65,7 +65,7 @@ describe('workspace system', () => {
       expect(POCHIVForm.additionalProps['workspaceTitle']).toBe('POC HIV Form Updated');
       expect(store.getState().openWorkspaces.length).toEqual(1);
 
-      POCHIVForm.closeWorkspace();
+      POCHIVForm.discardChangesAndCloseWorkspace();
 
       expect(store.getState().openWorkspaces.length).toEqual(0);
     });
@@ -284,11 +284,11 @@ describe('workspace system', () => {
       launchPatientWorkspace('conditions');
       expect(store.getState().openWorkspaces.length).toBe(3);
       expect(store.getState().workspaceWindowState).toBe('maximized');
-      store.getState().openWorkspaces[0].closeWorkspace();
+      store.getState().openWorkspaces[0].discardChangesAndCloseWorkspace();
       expect(store.getState().workspaceWindowState).toBe('normal');
-      store.getState().openWorkspaces[0].closeWorkspace();
+      store.getState().openWorkspaces[0].discardChangesAndCloseWorkspace();
       expect(store.getState().workspaceWindowState).toBe('maximized');
-      store.getState().openWorkspaces[0].closeWorkspace();
+      store.getState().openWorkspaces[0].discardChangesAndCloseWorkspace();
       expect(store.getState().workspaceWindowState).toBe('normal');
     });
   });
@@ -344,7 +344,7 @@ describe('workspace system', () => {
     expect(store.getState().openWorkspaces.length).toEqual(2);
     expect(store.getState().openWorkspaces[0].name).toBe('conditions');
     expect(store.getState().openWorkspaces[1].name).toBe('order-meds');
-    store.getState().openWorkspaces[0].closeWorkspace();
+    store.getState().openWorkspaces[0].discardChangesAndCloseWorkspace();
     expect(store.getState().openWorkspaces.length).toEqual(1);
     expect(store.getState().openWorkspaces[0].name).toBe('order-meds');
   });
diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
index 7f791d396e..df513eded9 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
@@ -24,6 +24,7 @@ export interface WorkspaceStoreState {
 export interface OpenWorkspace extends WorkspaceRegistration {
   additionalProps: object;
   closeWorkspace(closeWorkspaceOptions?: CloseWorkspaceOptions): boolean;
+  discardChangesAndCloseWorkspace(closeWorkspaceOptions?: CloseWorkspaceOptions): void;
   promptBeforeClosing(testFcn: () => boolean): void;
 }
 
@@ -124,6 +125,7 @@ function promptBeforeLaunchingWorkspace(
 
   const proceed = () => {
     workspace.closeWorkspace({
+      ignoreChanges: true,
       // Calling the launchPatientWorkspace again, since one of the `if` case
       // might resolve, but we need to check all the cases before launching the form.
       onWorkspaceClose: () => launchPatientWorkspace(name, additionalProps),
@@ -161,11 +163,13 @@ export function launchPatientWorkspace(name: string, additionalProps?: object) {
   const workspace = getWorkspaceRegistration(name);
   const newWorkspace = {
     ...workspace,
-    closeWorkspace: (options: CloseWorkspaceOptions = {}) =>
+    closeWorkspace: (options: CloseWorkspaceOptions = {}) => closeWorkspace(name, options),
+    discardChangesAndCloseWorkspace: (options: CloseWorkspaceOptions = {}) => {
       closeWorkspace(name, {
         ignoreChanges: true,
         ...options,
-      }),
+      });
+    },
     promptBeforeClosing: (testFcn) => promptBeforeClosing(name, testFcn),
     additionalProps,
   };
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx
index 705d3c883e..3127e7b07d 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx
@@ -25,7 +25,7 @@ const conditionSchema = z.object({
 export type ConditionFormData = z.infer<typeof conditionSchema>;
 
 const ConditionsForm: React.FC<ConditionFormProps> = ({
-  closeWorkspace,
+  discardChangesAndCloseWorkspace,
   condition,
   formContext,
   patientUuid,
@@ -77,7 +77,7 @@ const ConditionsForm: React.FC<ConditionFormProps> = ({
       <Form className={styles.form} onSubmit={methods.handleSubmit(onSubmit, onError)}>
         <ConditionsWidget
           patientUuid={patientUuid}
-          closeWorkspace={closeWorkspace}
+          discardChangesAndCloseWorkspace={discardChangesAndCloseWorkspace}
           conditionToEdit={condition}
           editing={formContext === 'editing'}
           setErrorCreating={setErrorCreating}
@@ -111,7 +111,7 @@ const ConditionsForm: React.FC<ConditionFormProps> = ({
             </div>
           ) : null}
           <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
-            <Button className={styles.button} kind="secondary" onClick={() => closeWorkspace()}>
+            <Button className={styles.button} kind="secondary" onClick={discardChangesAndCloseWorkspace}>
               {t('cancel', 'Cancel')}
             </Button>
             <Button className={styles.button} disabled={isSubmittingForm} kind="primary" type="submit">
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx
index bfcfa0dfbf..15bdeed13f 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx
@@ -32,6 +32,7 @@ const testProps = {
   closeWorkspace: jest.fn(),
   patientUuid: mockPatient.id,
   formContext: 'creating' as const,
+  discardChangesAndCloseWorkspace: jest.fn(),
 };
 
 const mockCreateCondition = createCondition as jest.Mock;
@@ -93,7 +94,7 @@ describe('Conditions Form', () => {
 
     await user.click(cancelButton);
 
-    expect(testProps.closeWorkspace).toHaveBeenCalledTimes(1);
+    expect(testProps.discardChangesAndCloseWorkspace).toHaveBeenCalledTimes(1);
   });
 
   it('setting the status of a condition to "inactive" reveals an input for recording the end date', async () => {
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-widget.component.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-widget.component.tsx
index 494183b13a..ae7113c7ee 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-widget.component.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-widget.component.tsx
@@ -32,7 +32,7 @@ import styles from './conditions-form.scss';
 import { type DefaultWorkspaceProps } from '@openmrs/esm-patient-common-lib';
 
 interface ConditionsWidgetProps {
-  closeWorkspace?: DefaultWorkspaceProps['closeWorkspace'];
+  discardChangesAndCloseWorkspace?: DefaultWorkspaceProps['discardChangesAndCloseWorkspace'];
   conditionToEdit?: ConditionDataTableRow;
   editing?: boolean;
   patientUuid: string;
@@ -44,7 +44,7 @@ interface ConditionsWidgetProps {
 }
 
 const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
-  closeWorkspace,
+  discardChangesAndCloseWorkspace,
   conditionToEdit,
   editing,
   patientUuid,
@@ -115,14 +115,14 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
           title: t('conditionSaved', 'Condition saved'),
         });
 
-        closeWorkspace?.();
+        discardChangesAndCloseWorkspace?.();
       }
     } catch (error) {
       setIsSubmittingForm(false);
       setErrorCreating(error);
     }
   }, [
-    closeWorkspace,
+    discardChangesAndCloseWorkspace,
     getValues,
     mutate,
     patientUuid,
@@ -157,14 +157,14 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
           title: t('conditionUpdated', 'Condition updated'),
         });
 
-        closeWorkspace();
+        discardChangesAndCloseWorkspace();
       }
     } catch (error) {
       setIsSubmittingForm(false);
       setErrorUpdating(error);
     }
   }, [
-    closeWorkspace,
+    discardChangesAndCloseWorkspace,
     conditionToEdit?.id,
     displayName,
     editableClinicalStatus,
diff --git a/packages/esm-patient-flags-app/src/flags/flags-list.test.tsx b/packages/esm-patient-flags-app/src/flags/flags-list.test.tsx
index 36065d1d80..a14524a274 100644
--- a/packages/esm-patient-flags-app/src/flags/flags-list.test.tsx
+++ b/packages/esm-patient-flags-app/src/flags/flags-list.test.tsx
@@ -40,5 +40,12 @@ it('renders an Edit form that enables users to toggle flags on or off', async ()
 });
 
 function renderFlagsList() {
-  return render(<FlagsList closeWorkspace={jest.fn()} patientUuid={mockPatient.id} promptBeforeClosing={jest.fn()} />);
+  return render(
+    <FlagsList
+      closeWorkspace={jest.fn()}
+      patientUuid={mockPatient.id}
+      promptBeforeClosing={jest.fn()}
+      discardChangesAndCloseWorkspace={jest.fn()}
+    />,
+  );
 }
diff --git a/packages/esm-patient-forms-app/src/forms/form-entry.component.tsx b/packages/esm-patient-forms-app/src/forms/form-entry.component.tsx
index 8e0567fc23..85f9e26ec1 100644
--- a/packages/esm-patient-forms-app/src/forms/form-entry.component.tsx
+++ b/packages/esm-patient-forms-app/src/forms/form-entry.component.tsx
@@ -11,7 +11,12 @@ interface FormEntryComponentProps extends DefaultWorkspaceProps {
   formInfo: FormEntryProps;
 }
 
-const FormEntry: React.FC<FormEntryComponentProps> = ({ patientUuid, closeWorkspace, mutateForm, formInfo }) => {
+const FormEntry: React.FC<FormEntryComponentProps> = ({
+  patientUuid,
+  discardChangesAndCloseWorkspace,
+  mutateForm,
+  formInfo,
+}) => {
   const { encounterUuid, formUuid, visitStartDatetime, visitStopDatetime, visitTypeUuid, visitUuid, additionalProps } =
     formInfo || {};
   const { patient } = usePatient(patientUuid);
@@ -32,7 +37,7 @@ const FormEntry: React.FC<FormEntryComponentProps> = ({ patientUuid, closeWorksp
       encounterUuid: encounterUuid ?? null,
       closeWorkspace: () => {
         typeof mutateForm === 'function' && mutateForm();
-        closeWorkspace();
+        discardChangesAndCloseWorkspace();
       },
       additionalProps,
     }),
@@ -51,7 +56,7 @@ const FormEntry: React.FC<FormEntryComponentProps> = ({ patientUuid, closeWorksp
       patient,
       isOnline,
       mutateForm,
-      closeWorkspace,
+      discardChangesAndCloseWorkspace,
     ],
   );
 
diff --git a/packages/esm-patient-forms-app/src/forms/form-entry.test.tsx b/packages/esm-patient-forms-app/src/forms/form-entry.test.tsx
index d9d16f081f..d3d07e4209 100644
--- a/packages/esm-patient-forms-app/src/forms/form-entry.test.tsx
+++ b/packages/esm-patient-forms-app/src/forms/form-entry.test.tsx
@@ -58,6 +58,7 @@ describe('FormEntry', () => {
 function renderFormEntry() {
   const testProps = {
     closeWorkspace: jest.fn(),
+    discardChangesAndCloseWorkspace: jest.fn(),
     promptBeforeClosing: jest.fn(),
     patientUuid: mockPatient.id,
     formInfo: { formUuid: 'some-form-uuid' },
diff --git a/packages/esm-patient-forms-app/src/forms/forms-dashboard.component.tsx b/packages/esm-patient-forms-app/src/forms/forms-dashboard.component.tsx
index 19c2a33019..5eacae0b38 100644
--- a/packages/esm-patient-forms-app/src/forms/forms-dashboard.component.tsx
+++ b/packages/esm-patient-forms-app/src/forms/forms-dashboard.component.tsx
@@ -13,7 +13,7 @@ import styles from './forms-dashboard.scss';
 import { useForms } from '../hooks/use-forms';
 import { useTranslation } from 'react-i18next';
 
-const FormsDashboard: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace }) => {
+const FormsDashboard: React.FC<DefaultWorkspaceProps> = ({ discardChangesAndCloseWorkspace }) => {
   const { t } = useTranslation();
   const config = useConfig<ConfigObject>();
   const isOnline = useConnectivity();
@@ -28,22 +28,18 @@ const FormsDashboard: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace }) =>
 
   const handleFormOpen = useCallback(
     (formUuid: string, encounterUuid: string, formName: string) => {
-      closeWorkspace({
-        onWorkspaceClose: () => {
-          launchFormEntryOrHtmlForms(
-            htmlFormEntryForms,
-            patientUuid,
-            formUuid,
-            currentVisit.uuid,
-            encounterUuid,
-            formName,
-            currentVisit.visitType.uuid,
-            currentVisit.startDatetime,
-            currentVisit.stopDatetime,
-            mutateForms,
-          );
-        },
-      });
+      launchFormEntryOrHtmlForms(
+        htmlFormEntryForms,
+        patientUuid,
+        formUuid,
+        currentVisit.uuid,
+        encounterUuid,
+        formName,
+        currentVisit.visitType.uuid,
+        currentVisit.startDatetime,
+        currentVisit.stopDatetime,
+        mutateForms,
+      );
     },
     [currentVisit, htmlFormEntryForms, patient, mutateForms],
   );
diff --git a/packages/esm-patient-forms-app/src/forms/forms-dashboard.test.tsx b/packages/esm-patient-forms-app/src/forms/forms-dashboard.test.tsx
index a794b49b33..f2739e126e 100644
--- a/packages/esm-patient-forms-app/src/forms/forms-dashboard.test.tsx
+++ b/packages/esm-patient-forms-app/src/forms/forms-dashboard.test.tsx
@@ -52,5 +52,12 @@ describe('FormsDashboard', () => {
 });
 
 function renderFormDashboard() {
-  render(<FormsDashboard promptBeforeClosing={jest.fn()} closeWorkspace={jest.fn()} patientUuid="" />);
+  render(
+    <FormsDashboard
+      discardChangesAndCloseWorkspace={jest.fn()}
+      promptBeforeClosing={jest.fn()}
+      closeWorkspace={jest.fn()}
+      patientUuid=""
+    />,
+  );
 }
diff --git a/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.component.tsx b/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.component.tsx
index 235e1ebda2..2bde25c5fd 100644
--- a/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.component.tsx
+++ b/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.component.tsx
@@ -46,7 +46,11 @@ interface ResponsiveWrapperProps {
 
 const datePickerFormat = 'd/m/Y';
 
-const ImmunizationsForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWorkspace, promptBeforeClosing }) => {
+const ImmunizationsForm: React.FC<DefaultWorkspaceProps> = ({
+  patientUuid,
+  discardChangesAndCloseWorkspace,
+  promptBeforeClosing,
+}) => {
   const { t } = useTranslation();
   const [isSubmitting, setIsSubmitting] = useState(false);
   const { immunizationsConfig } = useConfig() as ConfigObject;
@@ -184,7 +188,7 @@ const ImmunizationsForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, close
       ).then(
         () => {
           setIsSubmitting(false);
-          closeWorkspace();
+          discardChangesAndCloseWorkspace();
           mutate();
           showSnackbar({
             kind: 'success',
@@ -211,7 +215,7 @@ const ImmunizationsForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, close
       currentVisit?.uuid,
       immunizationToEditMeta,
       immunizationsConceptSet,
-      closeWorkspace,
+      discardChangesAndCloseWorkspace,
       t,
     ],
   );
@@ -401,7 +405,7 @@ const ImmunizationsForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, close
           </section>
         </Stack>
         <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
-          <Button className={styles.button} kind="secondary" onClick={() => closeWorkspace()}>
+          <Button className={styles.button} kind="secondary" onClick={discardChangesAndCloseWorkspace}>
             {t('cancel', 'Cancel')}
           </Button>
           <Button className={styles.button} kind="primary" disabled={isSubmitting} type="submit">
diff --git a/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.test.tsx b/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.test.tsx
index 493d544bae..8f64e20ca8 100644
--- a/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.test.tsx
+++ b/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.test.tsx
@@ -8,6 +8,7 @@ import { immunizationFormSub } from './utils';
 import { showSnackbar } from '@openmrs/esm-framework';
 
 const mockCloseWorkspace = jest.fn();
+const mockDiscardAndCloseWorkspace = jest.fn();
 const mockPromptBeforeClosing = jest.fn();
 const mockSavePatientImmunization = savePatientImmunization as jest.Mock;
 
@@ -83,6 +84,7 @@ jest.mock('./immunizations.resource', () => ({
 const testProps = {
   patientUuid: mockPatient.id,
   closeWorkspace: mockCloseWorkspace,
+  discardChangesAndCloseWorkspace: mockDiscardAndCloseWorkspace,
   promptBeforeClosing: mockPromptBeforeClosing,
 };
 
diff --git a/packages/esm-patient-immunizations-app/src/index.ts b/packages/esm-patient-immunizations-app/src/index.ts
index 686342b4d9..082f5dacb4 100644
--- a/packages/esm-patient-immunizations-app/src/index.ts
+++ b/packages/esm-patient-immunizations-app/src/index.ts
@@ -33,7 +33,7 @@ export const immunizationsDashboardLink =
   );
 
 // t('immunizationWorkspaceTitle', 'Immunization Form')
-export const immunizationsForm = registerWorkspace({
+registerWorkspace({
   name: 'immunization-form-workspace',
   load: getAsyncLifecycle(() => import('./immunizations/immunizations-form.component'), options),
   title: translateFrom(moduleName, 'immunizationWorkspaceTitle', 'Immunization Form'),
diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx
index efa5a9cd82..f025908c7c 100644
--- a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx
+++ b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, renderHook, screen, within } from '@testing-library/react';
+import { render, renderHook, screen, waitFor, within } from '@testing-library/react';
 import AddLabOrderWorkspace from './add-lab-order.workspace';
 import userEvent from '@testing-library/user-event';
 import { _resetOrderBasketStore, orderBasketStore } from '@openmrs/esm-patient-common-lib/src/orders/store';
@@ -35,11 +35,11 @@ jest.mock('./useTestTypes', () => ({
   useTestTypes: () => mockUseTestTypes(),
 }));
 
-const mockCloseWorkspace = jest.fn();
+const mockDiscardChangesAndCloseWorkspace = jest.fn();
 const mockLaunchPatientWorkspace = jest.fn();
 jest.mock('@openmrs/esm-patient-common-lib', () => ({
   ...jest.requireActual('@openmrs/esm-patient-common-lib'),
-  closeWorkspace: (...args) => mockCloseWorkspace(...args),
+  closeWorkspace: (...args) => mockDiscardChangesAndCloseWorkspace(...args),
   launchPatientWorkspace: (...args) => mockLaunchPatientWorkspace(...args),
 }));
 
@@ -49,15 +49,19 @@ jest.mock('@openmrs/esm-patient-common-lib/src/get-patient-uuid-from-url', () =>
 
 function renderAddLabOrderWorkspace() {
   const mockCloseWorkspace = jest.fn();
+  const mockDiscardChangesAndCloseWorkspace = jest.fn().mockImplementation(({ onWorkspaceClose }) => {
+    onWorkspaceClose();
+  });
   const mockPromptBeforeClosing = jest.fn();
   const renderResult = render(
     <AddLabOrderWorkspace
-      closeWorkspace={mockCloseWorkspace}
+      closeWorkspace={mockDiscardChangesAndCloseWorkspace}
+      discardChangesAndCloseWorkspace={mockDiscardChangesAndCloseWorkspace}
       promptBeforeClosing={mockPromptBeforeClosing}
       patientUuid={ptUuid}
     />,
   );
-  return { mockCloseWorkspace, mockPromptBeforeClosing, ...renderResult };
+  return { mockCloseWorkspace, mockPromptBeforeClosing, mockDiscardChangesAndCloseWorkspace, ...renderResult };
 }
 
 describe('AddLabOrder', () => {
@@ -88,7 +92,7 @@ describe('AddLabOrder', () => {
   });
 
   test('happy path fill and submit form', async () => {
-    const { mockCloseWorkspace } = renderAddLabOrderWorkspace();
+    const { mockDiscardChangesAndCloseWorkspace } = renderAddLabOrderWorkspace();
     await userEvent.type(screen.getByRole('searchbox'), 'cd4');
     const cd4 = screen.getByText('CD4 COUNT');
     expect(cd4).toBeInTheDocument();
@@ -114,7 +118,7 @@ describe('AddLabOrder', () => {
     expect(labsOrderBasket[0].testType.conceptUuid).toBe('test-lab-uuid-2');
     expect(labsOrderBasket[0].urgency).toBe('STAT');
     expect(labsOrderBasket[0].instructions).toBe('plz do it thx');
-    expect(mockCloseWorkspace).toHaveBeenCalled();
+    expect(mockDiscardChangesAndCloseWorkspace).toHaveBeenCalled();
     expect(mockLaunchPatientWorkspace).toHaveBeenCalledWith('order-basket');
   });
 
@@ -132,16 +136,16 @@ describe('AddLabOrder', () => {
       { ...createEmptyLabOrder(mockTestTypes[1], 'test-provider-uuid'), isOrderIncomplete: true },
     ]);
 
-    expect(mockCloseWorkspace).toHaveBeenCalled();
+    expect(mockDiscardChangesAndCloseWorkspace).toHaveBeenCalled();
     expect(mockLaunchPatientWorkspace).toHaveBeenCalledWith('order-basket');
   });
   test('back to order basket', async () => {
     const user = userEvent.setup();
-    const { mockCloseWorkspace } = renderAddLabOrderWorkspace();
+    const { mockDiscardChangesAndCloseWorkspace } = renderAddLabOrderWorkspace();
     const back = screen.getByText('Back to order basket');
     expect(back).toBeInTheDocument();
     await user.click(back);
-    expect(mockCloseWorkspace).toHaveBeenCalled();
+    expect(mockDiscardChangesAndCloseWorkspace).toHaveBeenCalled();
     expect(mockLaunchPatientWorkspace).toHaveBeenCalledWith('order-basket');
   });
 
diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx
index d6d58ab4d3..6538cfbd63 100644
--- a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx
+++ b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx
@@ -22,7 +22,10 @@ export interface AddLabOrderWorkspaceAdditionalProps {
 export interface AddLabOrderWorkspace extends DefaultWorkspaceProps, AddLabOrderWorkspaceAdditionalProps {}
 
 // Design: https://app.zeplin.io/project/60d5947dd636aebbd63dce4c/screen/640b06c440ee3f7af8747620
-export default function AddLabOrderWorkspace({ order: initialOrder, closeWorkspace }: AddLabOrderWorkspace) {
+export default function AddLabOrderWorkspace({
+  order: initialOrder,
+  discardChangesAndCloseWorkspace,
+}: AddLabOrderWorkspace) {
   const { t } = useTranslation();
 
   const { patient, isLoading: isLoadingPatient } = usePatient();
@@ -33,9 +36,10 @@ export default function AddLabOrderWorkspace({ order: initialOrder, closeWorkspa
   const patientName = `${patient?.name?.[0]?.given?.join(' ')} ${patient?.name?.[0].family}`;
 
   const cancelOrder = useCallback(() => {
-    closeWorkspace();
-    launchPatientWorkspace('order-basket');
-  }, [closeWorkspace]);
+    discardChangesAndCloseWorkspace({
+      onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
+    });
+  }, [discardChangesAndCloseWorkspace]);
 
   return (
     <div className={styles.container}>
@@ -64,7 +68,10 @@ export default function AddLabOrderWorkspace({ order: initialOrder, closeWorkspa
       {!currentLabOrder ? (
         <TestTypeSearch openLabForm={setCurrentLabOrder} />
       ) : (
-        <LabOrderForm initialOrder={currentLabOrder} closeWorkspace={closeWorkspace} />
+        <LabOrderForm
+          initialOrder={currentLabOrder}
+          discardChangesAndCloseWorkspace={discardChangesAndCloseWorkspace}
+        />
       )}
     </div>
   );
diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx
index f8e306f80b..9c93849264 100644
--- a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx
+++ b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useState } from 'react';
 import classNames from 'classnames';
-import { launchPatientWorkspace, useOrderBasket } from '@openmrs/esm-patient-common-lib';
+import { type DefaultWorkspaceProps, launchPatientWorkspace, useOrderBasket } from '@openmrs/esm-patient-common-lib';
 import { useLayoutType, useSession } from '@openmrs/esm-framework';
 import { type LabOrderBasketItem, careSettingUuid, prepLabOrderPostData } from '../api';
 import { Button, ButtonSet, Column, ComboBox, Form, Layer, Grid, InlineNotification, TextInput } from '@carbon/react';
@@ -11,13 +11,13 @@ import styles from './lab-order-form.scss';
 
 export interface LabOrderFormProps {
   initialOrder: LabOrderBasketItem;
-  closeWorkspace: () => void;
+  discardChangesAndCloseWorkspace: DefaultWorkspaceProps['discardChangesAndCloseWorkspace'];
 }
 
 // Designs:
 //   https://app.zeplin.io/project/60d5947dd636aebbd63dce4c/screen/640b06c440ee3f7af8747620
 //   https://app.zeplin.io/project/60d5947dd636aebbd63dce4c/screen/640b06d286e0aa7b0316db4a
-export function LabOrderForm({ initialOrder, closeWorkspace }: LabOrderFormProps) {
+export function LabOrderForm({ initialOrder, discardChangesAndCloseWorkspace }: LabOrderFormProps) {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const session = useSession();
@@ -37,17 +37,19 @@ export function LabOrderForm({ initialOrder, closeWorkspace }: LabOrderFormProps
       const orderIndex = existingOrder ? orders.indexOf(existingOrder) : orders.length;
       newOrders[orderIndex] = inProgressLabOrder;
       setOrders(newOrders);
-      closeWorkspace();
-      launchPatientWorkspace('order-basket');
+      discardChangesAndCloseWorkspace({
+        onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
+      });
     },
-    [orders, setOrders, closeWorkspace, session?.currentProvider?.uuid, inProgressLabOrder],
+    [orders, setOrders, discardChangesAndCloseWorkspace, session?.currentProvider?.uuid, inProgressLabOrder],
   );
 
   const cancelOrder = useCallback(() => {
     setOrders(orders.filter((order) => order.testType.conceptUuid !== inProgressLabOrder.testType.conceptUuid));
-    closeWorkspace();
-    launchPatientWorkspace('order-basket');
-  }, [closeWorkspace, inProgressLabOrder?.testType?.conceptUuid, orders, setOrders]);
+    discardChangesAndCloseWorkspace({
+      onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
+    });
+  }, [discardChangesAndCloseWorkspace, inProgressLabOrder?.testType?.conceptUuid, orders, setOrders]);
 
   return (
     <>
diff --git a/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.test.tsx b/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.test.tsx
index da5ef7eade..3ae7f2f3aa 100644
--- a/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.test.tsx
+++ b/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.test.tsx
@@ -8,6 +8,7 @@ const mockedOpenmrsFetch = openmrsFetch as jest.Mock;
 const testProps = {
   patientUuid: '',
   promptBeforeClosing: jest.fn(),
+  discardChangesAndCloseWorkspace: jest.fn(),
   closeWorkspace: jest.fn(),
   list: {
     attributes: [],
diff --git a/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.tsx b/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.tsx
index ccd983f0cb..ba458bc062 100644
--- a/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.tsx
+++ b/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.tsx
@@ -12,14 +12,12 @@ interface PatientListDetailsWorkspaceProps extends DefaultWorkspaceProps {
   list: MappedList;
 }
 
-function PatientListDetailsWorkspace({ closeWorkspace, list }: PatientListDetailsWorkspaceProps) {
+function PatientListDetailsWorkspace({ list }: PatientListDetailsWorkspaceProps) {
   const { t } = useTranslation();
   const { listMembers, isLoading } = usePatientListMembers(list.id);
 
   const closeListDetailsWorkspace = useCallback(() => {
-    closeWorkspace({
-      onWorkspaceClose: () => launchPatientWorkspace('patient-lists'),
-    });
+    launchPatientWorkspace('patient-lists');
   }, []);
 
   return (
diff --git a/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.test.tsx b/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.test.tsx
index 97765a05b2..e59df05941 100644
--- a/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.test.tsx
+++ b/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.test.tsx
@@ -73,5 +73,5 @@ it('renders a tabular overview of the available patient lists', async () => {
 });
 
 function renderPatientListsWorkspace() {
-  render(<PatientListsWorkspace promptBeforeClosing={jest.fn()} closeWorkspace={jest.fn()} patientUuid="" />);
+  render(<PatientListsWorkspace />);
 }
diff --git a/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.tsx b/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.tsx
index ed03fb633c..3c7a7ebd1e 100644
--- a/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.tsx
+++ b/packages/esm-patient-lists-app/src/workspaces/patient-lists.workspace.tsx
@@ -20,11 +20,7 @@ import {
   TableToolbarSearch,
   Tile,
 } from '@carbon/react';
-import {
-  launchPatientWorkspace,
-  EmptyDataIllustration,
-  type DefaultWorkspaceProps,
-} from '@openmrs/esm-patient-common-lib';
+import { launchPatientWorkspace, EmptyDataIllustration } from '@openmrs/esm-patient-common-lib';
 import { useDebounce, useLayoutType } from '@openmrs/esm-framework';
 import { usePatientLists } from '../patient-lists.resource';
 import styles from './patient-lists.scss';
diff --git a/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.test.tsx b/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.test.tsx
index 0296cd5124..9a61d117aa 100644
--- a/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.test.tsx
+++ b/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.test.tsx
@@ -49,6 +49,7 @@ function renderDrugSearch() {
     <AddDrugOrderWorkspace
       order={undefined as any}
       closeWorkspace={jest.fn()}
+      discardChangesAndCloseWorkspace={jest.fn()}
       promptBeforeClosing={() => false}
       patientUuid={'mock-patient-uuid'}
     />,
diff --git a/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.workspace.tsx b/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.workspace.tsx
index 8c6ce3aacd..ffe07d0ba1 100644
--- a/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.workspace.tsx
+++ b/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.workspace.tsx
@@ -15,7 +15,7 @@ export interface AddDrugOrderWorkspace extends DefaultWorkspaceProps, AddDrugOrd
 
 export default function AddDrugOrderWorkspace({
   order: initialOrder,
-  closeWorkspace,
+  discardChangesAndCloseWorkspace,
   promptBeforeClosing,
 }: AddDrugOrderWorkspace) {
   const { orders, setOrders } = useOrderBasket<DrugOrderBasketItem>('medications', prepMedicationOrderPostData);
@@ -23,10 +23,10 @@ export default function AddDrugOrderWorkspace({
   const session = useSession();
 
   const cancelDrugOrder = useCallback(() => {
-    closeWorkspace({
+    discardChangesAndCloseWorkspace({
       onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
     });
-  }, [closeWorkspace, currentOrder, orders, setOrders]);
+  }, [discardChangesAndCloseWorkspace, currentOrder, orders, setOrders]);
 
   const openOrderForm = useCallback(
     (searchResult: DrugOrderBasketItem) => {
@@ -56,15 +56,15 @@ export default function AddDrugOrderWorkspace({
         newOrders.push(finalizedOrder);
       }
       setOrders(newOrders);
-      closeWorkspace({
+      discardChangesAndCloseWorkspace({
         onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
       });
     },
-    [orders, setOrders, closeWorkspace, session.currentProvider.uuid],
+    [orders, setOrders, discardChangesAndCloseWorkspace, session.currentProvider.uuid],
   );
 
   if (!currentOrder) {
-    return <DrugSearch openOrderForm={openOrderForm} promptBeforeClosing={promptBeforeClosing} />;
+    return <DrugSearch openOrderForm={openOrderForm} />;
   } else {
     return (
       <DrugOrderForm
diff --git a/packages/esm-patient-medications-app/src/add-drug-order/drug-search/drug-search.component.tsx b/packages/esm-patient-medications-app/src/add-drug-order/drug-search/drug-search.component.tsx
index 23705a579b..9e900bcaa3 100644
--- a/packages/esm-patient-medications-app/src/add-drug-order/drug-search/drug-search.component.tsx
+++ b/packages/esm-patient-medications-app/src/add-drug-order/drug-search/drug-search.component.tsx
@@ -8,10 +8,9 @@ import styles from './order-basket-search.scss';
 
 export interface DrugSearchProps {
   openOrderForm: (searchResult: DrugOrderBasketItem) => void;
-  promptBeforeClosing: (testFcn: () => boolean) => void;
 }
 
-export default function DrugSearch({ openOrderForm, promptBeforeClosing }: DrugSearchProps) {
+export default function DrugSearch({ openOrderForm }: DrugSearchProps) {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const [searchTerm, setSearchTerm] = useState('');
diff --git a/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx b/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx
index ad4841d0d4..37903e99bf 100644
--- a/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx
+++ b/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx
@@ -18,6 +18,7 @@ const testProps = {
   patientUuid: mockPatient.id,
   closeWorkspace: jest.fn(),
   promptBeforeClosing: jest.fn(),
+  discardChangesAndCloseWorkspace: jest.fn(),
 };
 
 const mockFetchConceptDiagnosisByName = fetchConceptDiagnosisByName as jest.Mock;
diff --git a/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx b/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx
index a59d69260f..4b2273e279 100644
--- a/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx
+++ b/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx
@@ -14,7 +14,11 @@ import { type ConfigObject } from '../config-schema';
 import { createEmptyEncounter, useOrderEncounter, useMutatePatientOrders } from '../api/api';
 import styles from './order-basket.scss';
 
-const OrderBasket: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWorkspace, promptBeforeClosing }) => {
+const OrderBasket: React.FC<DefaultWorkspaceProps> = ({
+  patientUuid,
+  discardChangesAndCloseWorkspace,
+  promptBeforeClosing,
+}) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const config = useConfig<ConfigObject>();
@@ -68,7 +72,7 @@ const OrderBasket: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWorksp
     clearOrders({ exceptThoseMatching: (item) => erroredItems.map((e) => e.display).includes(item.display) });
     mutateOrders();
     if (erroredItems.length == 0) {
-      closeWorkspace();
+      discardChangesAndCloseWorkspace();
       showOrderSuccessToast(t, orders);
     } else {
       showOrderFailureToast(t);
@@ -79,7 +83,7 @@ const OrderBasket: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWorksp
     activeVisit,
     activeVisitRequired,
     clearOrders,
-    closeWorkspace,
+    discardChangesAndCloseWorkspace,
     config,
     encounterUuid,
     mutateEncounterUuid,
@@ -91,8 +95,8 @@ const OrderBasket: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWorksp
   ]);
 
   const handleCancel = useCallback(() => {
-    closeWorkspace({ onWorkspaceClose: clearOrders });
-  }, [clearOrders, closeWorkspace]);
+    discardChangesAndCloseWorkspace({ onWorkspaceClose: clearOrders });
+  }, [clearOrders, discardChangesAndCloseWorkspace]);
 
   return (
     <>
diff --git a/packages/esm-patient-programs-app/src/programs/programs-form.test.tsx b/packages/esm-patient-programs-app/src/programs/programs-form.test.tsx
index 6e438ca719..a1cbbbc89f 100644
--- a/packages/esm-patient-programs-app/src/programs/programs-form.test.tsx
+++ b/packages/esm-patient-programs-app/src/programs/programs-form.test.tsx
@@ -13,6 +13,7 @@ const testProps = {
   closeWorkspace: jest.fn(),
   patientUuid: mockPatient.id,
   promptBeforeClosing: jest.fn(),
+  discardChangesAndCloseWorkspace: jest.fn(),
 };
 
 const mockCreateErrorHandler = createErrorHandler as jest.Mock;
diff --git a/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.test.tsx b/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.test.tsx
index d73bc9eac8..8b950a305c 100644
--- a/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.test.tsx
+++ b/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.test.tsx
@@ -9,6 +9,7 @@ import VitalsAndBiometricsForm from './vitals-biometrics-form.component';
 
 const testProps = {
   closeWorkspace: () => {},
+  discardChangesAndCloseWorkspace: () => {},
   patientUuid: mockPatient.id,
   promptBeforeClosing: () => {},
 };

From cc55902e7174bd4077575adfbffbc60a88d3e8f2 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Mon, 12 Feb 2024 12:34:21 +0530
Subject: [PATCH 32/39] Updated text

Co-authored-by: Dennis Kigen <kigen.work@gmail.com>
---
 packages/esm-patient-chart-app/src/root.component.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/esm-patient-chart-app/src/root.component.tsx b/packages/esm-patient-chart-app/src/root.component.tsx
index 0315e16b3c..a046102d27 100644
--- a/packages/esm-patient-chart-app/src/root.component.tsx
+++ b/packages/esm-patient-chart-app/src/root.component.tsx
@@ -46,7 +46,7 @@ export default function Root() {
  * t('paginationItemsCount', `{{pageItemsCount}} / {{count}} items`, { count: totalItems, pageItemsCount });
 
  * t('unsavedChangesInOpenedWorkspace', 'You have unsaved changes in the opened workspace. Do you want to discard these changes?')
- * t('unsavedChangesTitleText', 'Unsaved Changes')
+ * t('unsavedChangesTitleText', 'Unsaved changes')
  * t('discard','Discard')
  * t('closingAllWorkspacesPromptTitle','You have unsaved changes')
  * t('closingAllWorkspacesPromptBody', 'There are unsaved changes in the following workspaces. Do you want to discard changes in the following workspaces? {{workspaceNames}}')

From f5c71d0ff1cc833a8964f4dca4e1e02d87e7be8e Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Fri, 16 Feb 2024 18:17:37 +0530
Subject: [PATCH 33/39] Reverted the implementation of
 discardChangesAndCloseWorkspace

---
 .../form-renderer/form-renderer.component.tsx | 14 ++++--------
 .../src/form-renderer/form-renderer.test.tsx  |  1 -
 .../allergies-form/allergy-form.component.tsx |  8 +++----
 .../allergies-form/allergy-form.test.tsx      |  1 -
 .../appointments-form.component.tsx           |  6 ++---
 .../appointments-form.test.tsx                |  3 +--
 .../src/visit/past-visit-overview.test.tsx    |  1 -
 .../visit/visit-form/visit-form.component.tsx | 10 ++++-----
 .../src/visit/visit-form/visit-form.test.tsx  |  4 +---
 .../workspace-renderer.component.tsx          |  1 -
 .../workspace/workspace-window.component.tsx  |  2 +-
 .../src/types/workspace.ts                    |  5 -----
 .../src/workspaces/workspaces.test.ts         | 12 +++++-----
 .../src/workspaces/workspaces.ts              |  7 ------
 .../conditions/conditions-form.component.tsx  |  6 ++---
 .../src/conditions/conditions-form.test.tsx   |  3 +--
 .../conditions-widget.component.tsx           | 12 +++++-----
 .../src/flags/flags-list.test.tsx             |  9 +-------
 .../src/forms/form-entry.component.tsx        | 11 +++-------
 .../src/forms/form-entry.test.tsx             |  1 -
 .../src/forms/forms-dashboard.component.tsx   |  2 +-
 .../src/forms/forms-dashboard.test.tsx        |  9 +-------
 .../immunizations-form.component.tsx          | 12 ++++------
 .../immunizations/immunizations-form.test.tsx |  1 -
 .../add-lab-order/add-lab-order.test.tsx      | 22 +++++++++----------
 .../add-lab-order/add-lab-order.workspace.tsx | 15 +++++--------
 .../lab-order-form.component.tsx              | 13 ++++++-----
 .../patient-list-details.workspace.test.tsx   |  1 -
 .../add-drug-order/add-drug-order.test.tsx    |  1 -
 .../add-drug-order.workspace.tsx              | 11 +++++-----
 .../src/notes/visit-notes-form.test.tsx       |  1 -
 .../order-basket/order-basket.workspace.tsx   | 14 +++++-------
 .../src/programs/programs-form.test.tsx       |  1 -
 .../vitals-biometrics-form.test.tsx           |  1 -
 34 files changed, 78 insertions(+), 143 deletions(-)

diff --git a/packages/esm-form-engine-app/src/form-renderer/form-renderer.component.tsx b/packages/esm-form-engine-app/src/form-renderer/form-renderer.component.tsx
index 5ee9d9337a..d15d02d78c 100644
--- a/packages/esm-form-engine-app/src/form-renderer/form-renderer.component.tsx
+++ b/packages/esm-form-engine-app/src/form-renderer/form-renderer.component.tsx
@@ -15,13 +15,7 @@ interface FormRendererProps extends DefaultWorkspaceProps {
   encounterUuid?: string;
 }
 
-const FormRenderer: React.FC<FormRendererProps> = ({
-  formUuid,
-  patientUuid,
-  visit,
-  discardChangesAndCloseWorkspace,
-  encounterUuid,
-}) => {
+const FormRenderer: React.FC<FormRendererProps> = ({ formUuid, patientUuid, visit, closeWorkspace, encounterUuid }) => {
   const { t } = useTranslation();
   const { schema, error, isLoading } = useFormSchema(formUuid);
 
@@ -36,7 +30,7 @@ const FormRenderer: React.FC<FormRendererProps> = ({
   if (error) {
     return (
       <div className={styles.errorContainer}>
-        <FormError closeWorkspace={discardChangesAndCloseWorkspace} />
+        <FormError closeWorkspace={closeWorkspace} />
       </div>
     );
   }
@@ -49,8 +43,8 @@ const FormRenderer: React.FC<FormRendererProps> = ({
           patientUUID={patientUuid}
           visit={visit}
           formJson={schema}
-          handleClose={discardChangesAndCloseWorkspace}
-          onSubmit={discardChangesAndCloseWorkspace}
+          handleClose={closeWorkspace}
+          onSubmit={() => closeWorkspace({ ignoreChanges: true })}
         />
       )}
     </>
diff --git a/packages/esm-form-engine-app/src/form-renderer/form-renderer.test.tsx b/packages/esm-form-engine-app/src/form-renderer/form-renderer.test.tsx
index 13fbc196a0..4be3efca78 100644
--- a/packages/esm-form-engine-app/src/form-renderer/form-renderer.test.tsx
+++ b/packages/esm-form-engine-app/src/form-renderer/form-renderer.test.tsx
@@ -21,7 +21,6 @@ describe('FormRenderer', () => {
     formUuid: 'test-form-uuid',
     patientUuid: 'test-patient-uuid',
     closeWorkspace: jest.fn(),
-    discardChangesAndCloseWorkspace: jest.fn(),
     promptBeforeClosing: jest.fn(),
   };
 
diff --git a/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.component.tsx b/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.component.tsx
index 18b0c89d23..67e6aeff9c 100644
--- a/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.component.tsx
+++ b/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.component.tsx
@@ -67,7 +67,7 @@ type AllergyFormData = {
 };
 
 function AllergyForm(props: DefaultWorkspaceProps) {
-  const { discardChangesAndCloseWorkspace, patientUuid, promptBeforeClosing } = props;
+  const { closeWorkspace, patientUuid, promptBeforeClosing } = props;
   const { t } = useTranslation();
   const { concepts } = useConfig();
   const isTablet = useLayoutType() === 'tablet';
@@ -166,7 +166,7 @@ function AllergyForm(props: DefaultWorkspaceProps) {
           (response: FetchResponse) => {
             if (response.status === 201) {
               mutate();
-              discardChangesAndCloseWorkspace();
+              closeWorkspace({ ignoreChanges: true });
               showSnackbar({
                 isLowContrast: true,
                 kind: 'success',
@@ -186,7 +186,7 @@ function AllergyForm(props: DefaultWorkspaceProps) {
         )
         .finally(() => abortController.abort());
     },
-    [otherConceptUuid, patientUuid, discardChangesAndCloseWorkspace, t, mutate],
+    [otherConceptUuid, patientUuid, closeWorkspace, t, mutate],
   );
 
   return (
@@ -345,7 +345,7 @@ function AllergyForm(props: DefaultWorkspaceProps) {
         <ButtonSet
           className={classNames(isTablet ? styles.tabletButtons : styles.desktopButtons, styles.actionButtons)}
         >
-          <Button className={styles.button} onClick={discardChangesAndCloseWorkspace} kind="secondary">
+          <Button className={styles.button} onClick={closeWorkspace} kind="secondary">
             {t('discard', 'Discard')}
           </Button>
           <Button
diff --git a/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx b/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx
index d275c386aa..ab6a4de607 100644
--- a/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx
+++ b/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx
@@ -274,7 +274,6 @@ describe('AllergyForm ', () => {
 function renderAllergyForm() {
   const testProps = {
     closeWorkspace: () => {},
-    discardChangesAndCloseWorkspace: () => {},
     promptBeforeClosing: () => {},
     patient: mockPatient,
     patientUuid: mockPatient.id,
diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.component.tsx b/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.component.tsx
index 75d10bfe0e..93c6041083 100644
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.component.tsx
+++ b/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.component.tsx
@@ -71,7 +71,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
   recurringPattern,
   patientUuid,
   context,
-  discardChangesAndCloseWorkspace,
+  closeWorkspace,
   promptBeforeClosing,
 }) => {
   const editedAppointmentTimeFormat = new Date(appointment?.startDateTime).getHours() >= 12 ? 'PM' : 'AM';
@@ -198,7 +198,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
       ({ status }) => {
         if (status === 200) {
           setIsSubmitting(false);
-          discardChangesAndCloseWorkspace();
+          closeWorkspace({ ignoreChanges: true });
           mutate();
 
           showSnackbar({
@@ -591,7 +591,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
         </section>
       </Stack>
       <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
-        <Button className={styles.button} onClick={discardChangesAndCloseWorkspace} kind="secondary">
+        <Button className={styles.button} onClick={closeWorkspace} kind="secondary">
           {t('discard', 'Discard')}
         </Button>
         <Button className={styles.button} disabled={isSubmitting} onClick={handleSubmit(handleSaveAppointment)}>
diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.test.tsx b/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.test.tsx
index 9c596e0f47..05ce0a88b5 100644
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.test.tsx
+++ b/packages/esm-patient-appointments-app/src/appointments/appointments-form/appointments-form.test.tsx
@@ -12,7 +12,6 @@ const testProps = {
   closeWorkspace: jest.fn(),
   patientUuid: mockPatient.id,
   promptBeforeClosing: jest.fn(),
-  discardChangesAndCloseWorkspace: jest.fn(),
 };
 
 const mockCreateAppointment = saveAppointment as jest.Mock;
@@ -130,7 +129,7 @@ describe('AppointmentForm', () => {
     const cancelButton = screen.getByRole('button', { name: /Discard/i });
     await user.click(cancelButton);
 
-    expect(testProps.discardChangesAndCloseWorkspace).toHaveBeenCalledTimes(1);
+    expect(testProps.closeWorkspace).toHaveBeenCalledTimes(1);
   });
 
   it('renders a success snackbar  upon successfully scheduling an appointment', async () => {
diff --git a/packages/esm-patient-chart-app/src/visit/past-visit-overview.test.tsx b/packages/esm-patient-chart-app/src/visit/past-visit-overview.test.tsx
index 8349bd546e..723b1014ba 100644
--- a/packages/esm-patient-chart-app/src/visit/past-visit-overview.test.tsx
+++ b/packages/esm-patient-chart-app/src/visit/past-visit-overview.test.tsx
@@ -7,7 +7,6 @@ import PastVisitOverview from './past-visit-overview.component';
 
 const testProps = {
   closeWorkspace: jest.fn(),
-  discardChangesAndCloseWorkspace: jest.fn(),
   patientUuid: mockPatient.id,
   promptBeforeClosing: jest.fn(),
 };
diff --git a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
index a0ddc2774c..75ee0315f8 100644
--- a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
@@ -63,7 +63,7 @@ interface StartVisitFormProps extends DefaultWorkspaceProps {
 
 const StartVisitForm: React.FC<StartVisitFormProps> = ({
   patientUuid,
-  discardChangesAndCloseWorkspace,
+  closeWorkspace,
   promptBeforeClosing,
   visitToEdit,
   showVisitEndDateTimeFields,
@@ -405,7 +405,7 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
               }
               mutateCurrentVisit();
               mutateVisits();
-              discardChangesAndCloseWorkspace();
+              closeWorkspace({ ignoreChanges: true });
 
               showSnackbar({
                 isLowContrast: true,
@@ -444,7 +444,7 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
           (offlineVisit) => {
             //setCurrentVisit(patientUuid, offlineVisit.uuid);
             mutate();
-            discardChangesAndCloseWorkspace();
+            closeWorkspace({ ignoreChanges: true });
             showSnackbar({
               isLowContrast: true,
               kind: 'success',
@@ -467,7 +467,7 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
       }
     },
     [
-      discardChangesAndCloseWorkspace,
+      closeWorkspace,
       config.showServiceQueueFields,
       config.showUpcomingAppointments,
       visitQueueNumberAttributeUuid,
@@ -661,7 +661,7 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
           </Stack>
         </div>
         <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
-          <Button className={styles.button} kind="secondary" onClick={() => discardChangesAndCloseWorkspace()}>
+          <Button className={styles.button} kind="secondary" onClick={closeWorkspace}>
             {t('discard', 'Discard')}
           </Button>
           <Button
diff --git a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx
index 468af5899c..fae42a8e8f 100644
--- a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx
@@ -9,13 +9,11 @@ import { useVisitAttributeType } from '../hooks/useVisitAttributeType';
 import StartVisitForm from './visit-form.component';
 
 const mockCloseWorkspace = jest.fn();
-const mockDiscardChangesAndCloseWorkspace = jest.fn();
 const mockPromptBeforeClosing = jest.fn();
 
 const testProps = {
   patientUuid: mockPatient.id,
   closeWorkspace: mockCloseWorkspace,
-  discardChangesAndCloseWorkspace: mockDiscardChangesAndCloseWorkspace,
   promptBeforeClosing: mockPromptBeforeClosing,
   visitToEdit: undefined,
   showVisitEndDateTimeFields: false,
@@ -270,7 +268,7 @@ describe('Visit Form', () => {
 
     await user.click(closeButton);
 
-    expect(mockDiscardChangesAndCloseWorkspace).toHaveBeenCalled();
+    expect(mockCloseWorkspace).toHaveBeenCalled();
   });
 
   it('should not submit the form if the visit attributes type is required and throw the error', async () => {
diff --git a/packages/esm-patient-chart-app/src/workspace/workspace-renderer.component.tsx b/packages/esm-patient-chart-app/src/workspace/workspace-renderer.component.tsx
index a8b6016d13..493ec7e118 100644
--- a/packages/esm-patient-chart-app/src/workspace/workspace-renderer.component.tsx
+++ b/packages/esm-patient-chart-app/src/workspace/workspace-renderer.component.tsx
@@ -34,7 +34,6 @@ export function WorkspaceRenderer({ workspace, patientUuid, active }: WorkspaceR
   const props = useMemo(
     () =>
       workspace && {
-        discardChangesAndCloseWorkspace: workspace.discardChangesAndCloseWorkspace,
         closeWorkspace: workspace.closeWorkspace,
         promptBeforeClosing: workspace.promptBeforeClosing,
         patientUuid,
diff --git a/packages/esm-patient-chart-app/src/workspace/workspace-window.component.tsx b/packages/esm-patient-chart-app/src/workspace/workspace-window.component.tsx
index 1af7a98ec5..f11256ed37 100644
--- a/packages/esm-patient-chart-app/src/workspace/workspace-window.component.tsx
+++ b/packages/esm-patient-chart-app/src/workspace/workspace-window.component.tsx
@@ -141,7 +141,7 @@ const WorkspaceWindow: React.FC<ContextWorkspaceParams> = () => {
                 <HeaderGlobalAction
                   align="bottom-right"
                   label={t('close', 'Close')}
-                  onClick={() => closeWorkspace?.({ ignoreChanges: false })}
+                  onClick={() => closeWorkspace?.()}
                   size="lg"
                 >
                   <Close />
diff --git a/packages/esm-patient-common-lib/src/types/workspace.ts b/packages/esm-patient-common-lib/src/types/workspace.ts
index 71f0068dec..d662f665e1 100644
--- a/packages/esm-patient-common-lib/src/types/workspace.ts
+++ b/packages/esm-patient-common-lib/src/types/workspace.ts
@@ -30,11 +30,6 @@ export interface DefaultWorkspaceProps {
    * closed, given the user forcefully closes the workspace.
    */
   closeWorkspace(closeWorkspaceOptions?: CloseWorkspaceOptions): void;
-  /**
-   * Call this function to discard the changes in the workspace form
-   * and close the workspace.
-   */
-  discardChangesAndCloseWorkspace(closeWorkspaceOptions?: CloseWorkspaceOptions): void;
   /**
    * Call this with a no-args function that returns true if the user should be prompted before
    * this workspace is closed; e.g. if there is unsaved data.
diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts
index 90c5f751ba..d251063dae 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts
@@ -34,7 +34,7 @@ describe('workspace system', () => {
     const allergies = store.getState().openWorkspaces[0];
     expect(allergies.name).toBe('allergies');
     expect(allergies.additionalProps['foo']).toBe(true);
-    allergies.discardChangesAndCloseWorkspace();
+    allergies.closeWorkspace();
     expect(store.getState().openWorkspaces.length).toEqual(0);
   });
 
@@ -65,7 +65,7 @@ describe('workspace system', () => {
       expect(POCHIVForm.additionalProps['workspaceTitle']).toBe('POC HIV Form Updated');
       expect(store.getState().openWorkspaces.length).toEqual(1);
 
-      POCHIVForm.discardChangesAndCloseWorkspace();
+      POCHIVForm.closeWorkspace();
 
       expect(store.getState().openWorkspaces.length).toEqual(0);
     });
@@ -284,11 +284,11 @@ describe('workspace system', () => {
       launchPatientWorkspace('conditions');
       expect(store.getState().openWorkspaces.length).toBe(3);
       expect(store.getState().workspaceWindowState).toBe('maximized');
-      store.getState().openWorkspaces[0].discardChangesAndCloseWorkspace();
+      store.getState().openWorkspaces[0].closeWorkspace({ ignoreChanges: true });
       expect(store.getState().workspaceWindowState).toBe('normal');
-      store.getState().openWorkspaces[0].discardChangesAndCloseWorkspace();
+      store.getState().openWorkspaces[0].closeWorkspace();
       expect(store.getState().workspaceWindowState).toBe('maximized');
-      store.getState().openWorkspaces[0].discardChangesAndCloseWorkspace();
+      store.getState().openWorkspaces[0].closeWorkspace({ ignoreChanges: true });
       expect(store.getState().workspaceWindowState).toBe('normal');
     });
   });
@@ -344,7 +344,7 @@ describe('workspace system', () => {
     expect(store.getState().openWorkspaces.length).toEqual(2);
     expect(store.getState().openWorkspaces[0].name).toBe('conditions');
     expect(store.getState().openWorkspaces[1].name).toBe('order-meds');
-    store.getState().openWorkspaces[0].discardChangesAndCloseWorkspace();
+    store.getState().openWorkspaces[0].closeWorkspace({ ignoreChanges: true });
     expect(store.getState().openWorkspaces.length).toEqual(1);
     expect(store.getState().openWorkspaces[0].name).toBe('order-meds');
   });
diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
index df513eded9..3edcc17e14 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
@@ -24,7 +24,6 @@ export interface WorkspaceStoreState {
 export interface OpenWorkspace extends WorkspaceRegistration {
   additionalProps: object;
   closeWorkspace(closeWorkspaceOptions?: CloseWorkspaceOptions): boolean;
-  discardChangesAndCloseWorkspace(closeWorkspaceOptions?: CloseWorkspaceOptions): void;
   promptBeforeClosing(testFcn: () => boolean): void;
 }
 
@@ -164,12 +163,6 @@ export function launchPatientWorkspace(name: string, additionalProps?: object) {
   const newWorkspace = {
     ...workspace,
     closeWorkspace: (options: CloseWorkspaceOptions = {}) => closeWorkspace(name, options),
-    discardChangesAndCloseWorkspace: (options: CloseWorkspaceOptions = {}) => {
-      closeWorkspace(name, {
-        ignoreChanges: true,
-        ...options,
-      });
-    },
     promptBeforeClosing: (testFcn) => promptBeforeClosing(name, testFcn),
     additionalProps,
   };
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx
index 3127e7b07d..945337f380 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx
@@ -25,7 +25,7 @@ const conditionSchema = z.object({
 export type ConditionFormData = z.infer<typeof conditionSchema>;
 
 const ConditionsForm: React.FC<ConditionFormProps> = ({
-  discardChangesAndCloseWorkspace,
+  closeWorkspace,
   condition,
   formContext,
   patientUuid,
@@ -77,7 +77,7 @@ const ConditionsForm: React.FC<ConditionFormProps> = ({
       <Form className={styles.form} onSubmit={methods.handleSubmit(onSubmit, onError)}>
         <ConditionsWidget
           patientUuid={patientUuid}
-          discardChangesAndCloseWorkspace={discardChangesAndCloseWorkspace}
+          closeWorkspace={closeWorkspace}
           conditionToEdit={condition}
           editing={formContext === 'editing'}
           setErrorCreating={setErrorCreating}
@@ -111,7 +111,7 @@ const ConditionsForm: React.FC<ConditionFormProps> = ({
             </div>
           ) : null}
           <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
-            <Button className={styles.button} kind="secondary" onClick={discardChangesAndCloseWorkspace}>
+            <Button className={styles.button} kind="secondary" onClick={closeWorkspace}>
               {t('cancel', 'Cancel')}
             </Button>
             <Button className={styles.button} disabled={isSubmittingForm} kind="primary" type="submit">
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx
index 15bdeed13f..bfcfa0dfbf 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx
@@ -32,7 +32,6 @@ const testProps = {
   closeWorkspace: jest.fn(),
   patientUuid: mockPatient.id,
   formContext: 'creating' as const,
-  discardChangesAndCloseWorkspace: jest.fn(),
 };
 
 const mockCreateCondition = createCondition as jest.Mock;
@@ -94,7 +93,7 @@ describe('Conditions Form', () => {
 
     await user.click(cancelButton);
 
-    expect(testProps.discardChangesAndCloseWorkspace).toHaveBeenCalledTimes(1);
+    expect(testProps.closeWorkspace).toHaveBeenCalledTimes(1);
   });
 
   it('setting the status of a condition to "inactive" reveals an input for recording the end date', async () => {
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-widget.component.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-widget.component.tsx
index ae7113c7ee..d9aae4a183 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-widget.component.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-widget.component.tsx
@@ -32,7 +32,7 @@ import styles from './conditions-form.scss';
 import { type DefaultWorkspaceProps } from '@openmrs/esm-patient-common-lib';
 
 interface ConditionsWidgetProps {
-  discardChangesAndCloseWorkspace?: DefaultWorkspaceProps['discardChangesAndCloseWorkspace'];
+  closeWorkspace?: DefaultWorkspaceProps['closeWorkspace'];
   conditionToEdit?: ConditionDataTableRow;
   editing?: boolean;
   patientUuid: string;
@@ -44,7 +44,7 @@ interface ConditionsWidgetProps {
 }
 
 const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
-  discardChangesAndCloseWorkspace,
+  closeWorkspace,
   conditionToEdit,
   editing,
   patientUuid,
@@ -115,14 +115,14 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
           title: t('conditionSaved', 'Condition saved'),
         });
 
-        discardChangesAndCloseWorkspace?.();
+        closeWorkspace?.({ ignoreChanges: true });
       }
     } catch (error) {
       setIsSubmittingForm(false);
       setErrorCreating(error);
     }
   }, [
-    discardChangesAndCloseWorkspace,
+    closeWorkspace,
     getValues,
     mutate,
     patientUuid,
@@ -157,14 +157,14 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
           title: t('conditionUpdated', 'Condition updated'),
         });
 
-        discardChangesAndCloseWorkspace();
+        closeWorkspace({ ignoreChanges: true });
       }
     } catch (error) {
       setIsSubmittingForm(false);
       setErrorUpdating(error);
     }
   }, [
-    discardChangesAndCloseWorkspace,
+    closeWorkspace,
     conditionToEdit?.id,
     displayName,
     editableClinicalStatus,
diff --git a/packages/esm-patient-flags-app/src/flags/flags-list.test.tsx b/packages/esm-patient-flags-app/src/flags/flags-list.test.tsx
index a14524a274..36065d1d80 100644
--- a/packages/esm-patient-flags-app/src/flags/flags-list.test.tsx
+++ b/packages/esm-patient-flags-app/src/flags/flags-list.test.tsx
@@ -40,12 +40,5 @@ it('renders an Edit form that enables users to toggle flags on or off', async ()
 });
 
 function renderFlagsList() {
-  return render(
-    <FlagsList
-      closeWorkspace={jest.fn()}
-      patientUuid={mockPatient.id}
-      promptBeforeClosing={jest.fn()}
-      discardChangesAndCloseWorkspace={jest.fn()}
-    />,
-  );
+  return render(<FlagsList closeWorkspace={jest.fn()} patientUuid={mockPatient.id} promptBeforeClosing={jest.fn()} />);
 }
diff --git a/packages/esm-patient-forms-app/src/forms/form-entry.component.tsx b/packages/esm-patient-forms-app/src/forms/form-entry.component.tsx
index 85f9e26ec1..d510a28fa9 100644
--- a/packages/esm-patient-forms-app/src/forms/form-entry.component.tsx
+++ b/packages/esm-patient-forms-app/src/forms/form-entry.component.tsx
@@ -11,12 +11,7 @@ interface FormEntryComponentProps extends DefaultWorkspaceProps {
   formInfo: FormEntryProps;
 }
 
-const FormEntry: React.FC<FormEntryComponentProps> = ({
-  patientUuid,
-  discardChangesAndCloseWorkspace,
-  mutateForm,
-  formInfo,
-}) => {
+const FormEntry: React.FC<FormEntryComponentProps> = ({ patientUuid, closeWorkspace, mutateForm, formInfo }) => {
   const { encounterUuid, formUuid, visitStartDatetime, visitStopDatetime, visitTypeUuid, visitUuid, additionalProps } =
     formInfo || {};
   const { patient } = usePatient(patientUuid);
@@ -37,7 +32,7 @@ const FormEntry: React.FC<FormEntryComponentProps> = ({
       encounterUuid: encounterUuid ?? null,
       closeWorkspace: () => {
         typeof mutateForm === 'function' && mutateForm();
-        discardChangesAndCloseWorkspace();
+        closeWorkspace({ ignoreChanges: true });
       },
       additionalProps,
     }),
@@ -56,7 +51,7 @@ const FormEntry: React.FC<FormEntryComponentProps> = ({
       patient,
       isOnline,
       mutateForm,
-      discardChangesAndCloseWorkspace,
+      closeWorkspace,
     ],
   );
 
diff --git a/packages/esm-patient-forms-app/src/forms/form-entry.test.tsx b/packages/esm-patient-forms-app/src/forms/form-entry.test.tsx
index d3d07e4209..d9d16f081f 100644
--- a/packages/esm-patient-forms-app/src/forms/form-entry.test.tsx
+++ b/packages/esm-patient-forms-app/src/forms/form-entry.test.tsx
@@ -58,7 +58,6 @@ describe('FormEntry', () => {
 function renderFormEntry() {
   const testProps = {
     closeWorkspace: jest.fn(),
-    discardChangesAndCloseWorkspace: jest.fn(),
     promptBeforeClosing: jest.fn(),
     patientUuid: mockPatient.id,
     formInfo: { formUuid: 'some-form-uuid' },
diff --git a/packages/esm-patient-forms-app/src/forms/forms-dashboard.component.tsx b/packages/esm-patient-forms-app/src/forms/forms-dashboard.component.tsx
index 5eacae0b38..651ea00095 100644
--- a/packages/esm-patient-forms-app/src/forms/forms-dashboard.component.tsx
+++ b/packages/esm-patient-forms-app/src/forms/forms-dashboard.component.tsx
@@ -13,7 +13,7 @@ import styles from './forms-dashboard.scss';
 import { useForms } from '../hooks/use-forms';
 import { useTranslation } from 'react-i18next';
 
-const FormsDashboard: React.FC<DefaultWorkspaceProps> = ({ discardChangesAndCloseWorkspace }) => {
+const FormsDashboard: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace }) => {
   const { t } = useTranslation();
   const config = useConfig<ConfigObject>();
   const isOnline = useConnectivity();
diff --git a/packages/esm-patient-forms-app/src/forms/forms-dashboard.test.tsx b/packages/esm-patient-forms-app/src/forms/forms-dashboard.test.tsx
index f2739e126e..a794b49b33 100644
--- a/packages/esm-patient-forms-app/src/forms/forms-dashboard.test.tsx
+++ b/packages/esm-patient-forms-app/src/forms/forms-dashboard.test.tsx
@@ -52,12 +52,5 @@ describe('FormsDashboard', () => {
 });
 
 function renderFormDashboard() {
-  render(
-    <FormsDashboard
-      discardChangesAndCloseWorkspace={jest.fn()}
-      promptBeforeClosing={jest.fn()}
-      closeWorkspace={jest.fn()}
-      patientUuid=""
-    />,
-  );
+  render(<FormsDashboard promptBeforeClosing={jest.fn()} closeWorkspace={jest.fn()} patientUuid="" />);
 }
diff --git a/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.component.tsx b/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.component.tsx
index 2bde25c5fd..ee57d70d3a 100644
--- a/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.component.tsx
+++ b/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.component.tsx
@@ -46,11 +46,7 @@ interface ResponsiveWrapperProps {
 
 const datePickerFormat = 'd/m/Y';
 
-const ImmunizationsForm: React.FC<DefaultWorkspaceProps> = ({
-  patientUuid,
-  discardChangesAndCloseWorkspace,
-  promptBeforeClosing,
-}) => {
+const ImmunizationsForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWorkspace, promptBeforeClosing }) => {
   const { t } = useTranslation();
   const [isSubmitting, setIsSubmitting] = useState(false);
   const { immunizationsConfig } = useConfig() as ConfigObject;
@@ -188,7 +184,7 @@ const ImmunizationsForm: React.FC<DefaultWorkspaceProps> = ({
       ).then(
         () => {
           setIsSubmitting(false);
-          discardChangesAndCloseWorkspace();
+          closeWorkspace({ ignoreChanges: true });
           mutate();
           showSnackbar({
             kind: 'success',
@@ -215,7 +211,7 @@ const ImmunizationsForm: React.FC<DefaultWorkspaceProps> = ({
       currentVisit?.uuid,
       immunizationToEditMeta,
       immunizationsConceptSet,
-      discardChangesAndCloseWorkspace,
+      closeWorkspace,
       t,
     ],
   );
@@ -405,7 +401,7 @@ const ImmunizationsForm: React.FC<DefaultWorkspaceProps> = ({
           </section>
         </Stack>
         <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
-          <Button className={styles.button} kind="secondary" onClick={discardChangesAndCloseWorkspace}>
+          <Button className={styles.button} kind="secondary" onClick={closeWorkspace}>
             {t('cancel', 'Cancel')}
           </Button>
           <Button className={styles.button} kind="primary" disabled={isSubmitting} type="submit">
diff --git a/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.test.tsx b/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.test.tsx
index 8f64e20ca8..642fca906b 100644
--- a/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.test.tsx
+++ b/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.test.tsx
@@ -84,7 +84,6 @@ jest.mock('./immunizations.resource', () => ({
 const testProps = {
   patientUuid: mockPatient.id,
   closeWorkspace: mockCloseWorkspace,
-  discardChangesAndCloseWorkspace: mockDiscardAndCloseWorkspace,
   promptBeforeClosing: mockPromptBeforeClosing,
 };
 
diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx
index f025908c7c..bdd6f807fa 100644
--- a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx
+++ b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx
@@ -35,11 +35,11 @@ jest.mock('./useTestTypes', () => ({
   useTestTypes: () => mockUseTestTypes(),
 }));
 
-const mockDiscardChangesAndCloseWorkspace = jest.fn();
+const mockCloseWorkspace = jest.fn();
 const mockLaunchPatientWorkspace = jest.fn();
 jest.mock('@openmrs/esm-patient-common-lib', () => ({
   ...jest.requireActual('@openmrs/esm-patient-common-lib'),
-  closeWorkspace: (...args) => mockDiscardChangesAndCloseWorkspace(...args),
+  closeWorkspace: (...args) => mockCloseWorkspace(...args),
   launchPatientWorkspace: (...args) => mockLaunchPatientWorkspace(...args),
 }));
 
@@ -48,20 +48,18 @@ jest.mock('@openmrs/esm-patient-common-lib/src/get-patient-uuid-from-url', () =>
 }));
 
 function renderAddLabOrderWorkspace() {
-  const mockCloseWorkspace = jest.fn();
-  const mockDiscardChangesAndCloseWorkspace = jest.fn().mockImplementation(({ onWorkspaceClose }) => {
+  const mockCloseWorkspace = jest.fn().mockImplementation(({ onWorkspaceClose }) => {
     onWorkspaceClose();
   });
   const mockPromptBeforeClosing = jest.fn();
   const renderResult = render(
     <AddLabOrderWorkspace
-      closeWorkspace={mockDiscardChangesAndCloseWorkspace}
-      discardChangesAndCloseWorkspace={mockDiscardChangesAndCloseWorkspace}
+      closeWorkspace={mockCloseWorkspace}
       promptBeforeClosing={mockPromptBeforeClosing}
       patientUuid={ptUuid}
     />,
   );
-  return { mockCloseWorkspace, mockPromptBeforeClosing, mockDiscardChangesAndCloseWorkspace, ...renderResult };
+  return { mockCloseWorkspace, mockPromptBeforeClosing, ...renderResult };
 }
 
 describe('AddLabOrder', () => {
@@ -92,7 +90,7 @@ describe('AddLabOrder', () => {
   });
 
   test('happy path fill and submit form', async () => {
-    const { mockDiscardChangesAndCloseWorkspace } = renderAddLabOrderWorkspace();
+    const { mockCloseWorkspace } = renderAddLabOrderWorkspace();
     await userEvent.type(screen.getByRole('searchbox'), 'cd4');
     const cd4 = screen.getByText('CD4 COUNT');
     expect(cd4).toBeInTheDocument();
@@ -118,7 +116,7 @@ describe('AddLabOrder', () => {
     expect(labsOrderBasket[0].testType.conceptUuid).toBe('test-lab-uuid-2');
     expect(labsOrderBasket[0].urgency).toBe('STAT');
     expect(labsOrderBasket[0].instructions).toBe('plz do it thx');
-    expect(mockDiscardChangesAndCloseWorkspace).toHaveBeenCalled();
+    expect(mockCloseWorkspace).toHaveBeenCalled();
     expect(mockLaunchPatientWorkspace).toHaveBeenCalledWith('order-basket');
   });
 
@@ -136,16 +134,16 @@ describe('AddLabOrder', () => {
       { ...createEmptyLabOrder(mockTestTypes[1], 'test-provider-uuid'), isOrderIncomplete: true },
     ]);
 
-    expect(mockDiscardChangesAndCloseWorkspace).toHaveBeenCalled();
+    expect(mockCloseWorkspace).toHaveBeenCalled();
     expect(mockLaunchPatientWorkspace).toHaveBeenCalledWith('order-basket');
   });
   test('back to order basket', async () => {
     const user = userEvent.setup();
-    const { mockDiscardChangesAndCloseWorkspace } = renderAddLabOrderWorkspace();
+    const { mockCloseWorkspace } = renderAddLabOrderWorkspace();
     const back = screen.getByText('Back to order basket');
     expect(back).toBeInTheDocument();
     await user.click(back);
-    expect(mockDiscardChangesAndCloseWorkspace).toHaveBeenCalled();
+    expect(mockCloseWorkspace).toHaveBeenCalled();
     expect(mockLaunchPatientWorkspace).toHaveBeenCalledWith('order-basket');
   });
 
diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx
index 6538cfbd63..5be3475c0a 100644
--- a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx
+++ b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx
@@ -22,10 +22,7 @@ export interface AddLabOrderWorkspaceAdditionalProps {
 export interface AddLabOrderWorkspace extends DefaultWorkspaceProps, AddLabOrderWorkspaceAdditionalProps {}
 
 // Design: https://app.zeplin.io/project/60d5947dd636aebbd63dce4c/screen/640b06c440ee3f7af8747620
-export default function AddLabOrderWorkspace({
-  order: initialOrder,
-  discardChangesAndCloseWorkspace,
-}: AddLabOrderWorkspace) {
+export default function AddLabOrderWorkspace({ order: initialOrder, closeWorkspace }: AddLabOrderWorkspace) {
   const { t } = useTranslation();
 
   const { patient, isLoading: isLoadingPatient } = usePatient();
@@ -36,10 +33,11 @@ export default function AddLabOrderWorkspace({
   const patientName = `${patient?.name?.[0]?.given?.join(' ')} ${patient?.name?.[0].family}`;
 
   const cancelOrder = useCallback(() => {
-    discardChangesAndCloseWorkspace({
+    closeWorkspace({
+      ignoreChanges: true,
       onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
     });
-  }, [discardChangesAndCloseWorkspace]);
+  }, [closeWorkspace]);
 
   return (
     <div className={styles.container}>
@@ -68,10 +66,7 @@ export default function AddLabOrderWorkspace({
       {!currentLabOrder ? (
         <TestTypeSearch openLabForm={setCurrentLabOrder} />
       ) : (
-        <LabOrderForm
-          initialOrder={currentLabOrder}
-          discardChangesAndCloseWorkspace={discardChangesAndCloseWorkspace}
-        />
+        <LabOrderForm initialOrder={currentLabOrder} closeWorkspace={closeWorkspace} />
       )}
     </div>
   );
diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx
index 9c93849264..137ec1d8ab 100644
--- a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx
+++ b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx
@@ -11,13 +11,13 @@ import styles from './lab-order-form.scss';
 
 export interface LabOrderFormProps {
   initialOrder: LabOrderBasketItem;
-  discardChangesAndCloseWorkspace: DefaultWorkspaceProps['discardChangesAndCloseWorkspace'];
+  closeWorkspace: DefaultWorkspaceProps['closeWorkspace'];
 }
 
 // Designs:
 //   https://app.zeplin.io/project/60d5947dd636aebbd63dce4c/screen/640b06c440ee3f7af8747620
 //   https://app.zeplin.io/project/60d5947dd636aebbd63dce4c/screen/640b06d286e0aa7b0316db4a
-export function LabOrderForm({ initialOrder, discardChangesAndCloseWorkspace }: LabOrderFormProps) {
+export function LabOrderForm({ initialOrder, closeWorkspace }: LabOrderFormProps) {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const session = useSession();
@@ -37,19 +37,20 @@ export function LabOrderForm({ initialOrder, discardChangesAndCloseWorkspace }:
       const orderIndex = existingOrder ? orders.indexOf(existingOrder) : orders.length;
       newOrders[orderIndex] = inProgressLabOrder;
       setOrders(newOrders);
-      discardChangesAndCloseWorkspace({
+      closeWorkspace({
+        ignoreChanges: true,
         onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
       });
     },
-    [orders, setOrders, discardChangesAndCloseWorkspace, session?.currentProvider?.uuid, inProgressLabOrder],
+    [orders, setOrders, closeWorkspace, session?.currentProvider?.uuid, inProgressLabOrder],
   );
 
   const cancelOrder = useCallback(() => {
     setOrders(orders.filter((order) => order.testType.conceptUuid !== inProgressLabOrder.testType.conceptUuid));
-    discardChangesAndCloseWorkspace({
+    closeWorkspace({
       onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
     });
-  }, [discardChangesAndCloseWorkspace, inProgressLabOrder?.testType?.conceptUuid, orders, setOrders]);
+  }, [closeWorkspace, inProgressLabOrder?.testType?.conceptUuid, orders, setOrders]);
 
   return (
     <>
diff --git a/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.test.tsx b/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.test.tsx
index 3ae7f2f3aa..da5ef7eade 100644
--- a/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.test.tsx
+++ b/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.test.tsx
@@ -8,7 +8,6 @@ const mockedOpenmrsFetch = openmrsFetch as jest.Mock;
 const testProps = {
   patientUuid: '',
   promptBeforeClosing: jest.fn(),
-  discardChangesAndCloseWorkspace: jest.fn(),
   closeWorkspace: jest.fn(),
   list: {
     attributes: [],
diff --git a/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.test.tsx b/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.test.tsx
index 9a61d117aa..0296cd5124 100644
--- a/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.test.tsx
+++ b/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.test.tsx
@@ -49,7 +49,6 @@ function renderDrugSearch() {
     <AddDrugOrderWorkspace
       order={undefined as any}
       closeWorkspace={jest.fn()}
-      discardChangesAndCloseWorkspace={jest.fn()}
       promptBeforeClosing={() => false}
       patientUuid={'mock-patient-uuid'}
     />,
diff --git a/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.workspace.tsx b/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.workspace.tsx
index ffe07d0ba1..024b9e98fe 100644
--- a/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.workspace.tsx
+++ b/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.workspace.tsx
@@ -15,7 +15,7 @@ export interface AddDrugOrderWorkspace extends DefaultWorkspaceProps, AddDrugOrd
 
 export default function AddDrugOrderWorkspace({
   order: initialOrder,
-  discardChangesAndCloseWorkspace,
+  closeWorkspace,
   promptBeforeClosing,
 }: AddDrugOrderWorkspace) {
   const { orders, setOrders } = useOrderBasket<DrugOrderBasketItem>('medications', prepMedicationOrderPostData);
@@ -23,10 +23,10 @@ export default function AddDrugOrderWorkspace({
   const session = useSession();
 
   const cancelDrugOrder = useCallback(() => {
-    discardChangesAndCloseWorkspace({
+    closeWorkspace({
       onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
     });
-  }, [discardChangesAndCloseWorkspace, currentOrder, orders, setOrders]);
+  }, [closeWorkspace, currentOrder, orders, setOrders]);
 
   const openOrderForm = useCallback(
     (searchResult: DrugOrderBasketItem) => {
@@ -56,11 +56,12 @@ export default function AddDrugOrderWorkspace({
         newOrders.push(finalizedOrder);
       }
       setOrders(newOrders);
-      discardChangesAndCloseWorkspace({
+      closeWorkspace({
+        ignoreChanges: true,
         onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
       });
     },
-    [orders, setOrders, discardChangesAndCloseWorkspace, session.currentProvider.uuid],
+    [orders, setOrders, closeWorkspace, session.currentProvider.uuid],
   );
 
   if (!currentOrder) {
diff --git a/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx b/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx
index 37903e99bf..ad4841d0d4 100644
--- a/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx
+++ b/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx
@@ -18,7 +18,6 @@ const testProps = {
   patientUuid: mockPatient.id,
   closeWorkspace: jest.fn(),
   promptBeforeClosing: jest.fn(),
-  discardChangesAndCloseWorkspace: jest.fn(),
 };
 
 const mockFetchConceptDiagnosisByName = fetchConceptDiagnosisByName as jest.Mock;
diff --git a/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx b/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx
index 4b2273e279..ecc10875db 100644
--- a/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx
+++ b/packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx
@@ -14,11 +14,7 @@ import { type ConfigObject } from '../config-schema';
 import { createEmptyEncounter, useOrderEncounter, useMutatePatientOrders } from '../api/api';
 import styles from './order-basket.scss';
 
-const OrderBasket: React.FC<DefaultWorkspaceProps> = ({
-  patientUuid,
-  discardChangesAndCloseWorkspace,
-  promptBeforeClosing,
-}) => {
+const OrderBasket: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWorkspace, promptBeforeClosing }) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const config = useConfig<ConfigObject>();
@@ -72,7 +68,7 @@ const OrderBasket: React.FC<DefaultWorkspaceProps> = ({
     clearOrders({ exceptThoseMatching: (item) => erroredItems.map((e) => e.display).includes(item.display) });
     mutateOrders();
     if (erroredItems.length == 0) {
-      discardChangesAndCloseWorkspace();
+      closeWorkspace({ ignoreChanges: true });
       showOrderSuccessToast(t, orders);
     } else {
       showOrderFailureToast(t);
@@ -83,7 +79,7 @@ const OrderBasket: React.FC<DefaultWorkspaceProps> = ({
     activeVisit,
     activeVisitRequired,
     clearOrders,
-    discardChangesAndCloseWorkspace,
+    closeWorkspace,
     config,
     encounterUuid,
     mutateEncounterUuid,
@@ -95,8 +91,8 @@ const OrderBasket: React.FC<DefaultWorkspaceProps> = ({
   ]);
 
   const handleCancel = useCallback(() => {
-    discardChangesAndCloseWorkspace({ onWorkspaceClose: clearOrders });
-  }, [clearOrders, discardChangesAndCloseWorkspace]);
+    closeWorkspace({ onWorkspaceClose: clearOrders });
+  }, [clearOrders, closeWorkspace]);
 
   return (
     <>
diff --git a/packages/esm-patient-programs-app/src/programs/programs-form.test.tsx b/packages/esm-patient-programs-app/src/programs/programs-form.test.tsx
index a1cbbbc89f..6e438ca719 100644
--- a/packages/esm-patient-programs-app/src/programs/programs-form.test.tsx
+++ b/packages/esm-patient-programs-app/src/programs/programs-form.test.tsx
@@ -13,7 +13,6 @@ const testProps = {
   closeWorkspace: jest.fn(),
   patientUuid: mockPatient.id,
   promptBeforeClosing: jest.fn(),
-  discardChangesAndCloseWorkspace: jest.fn(),
 };
 
 const mockCreateErrorHandler = createErrorHandler as jest.Mock;
diff --git a/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.test.tsx b/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.test.tsx
index 8b950a305c..d73bc9eac8 100644
--- a/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.test.tsx
+++ b/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.test.tsx
@@ -9,7 +9,6 @@ import VitalsAndBiometricsForm from './vitals-biometrics-form.component';
 
 const testProps = {
   closeWorkspace: () => {},
-  discardChangesAndCloseWorkspace: () => {},
   patientUuid: mockPatient.id,
   promptBeforeClosing: () => {},
 };

From ef9e258a8383a721afed74f18a1577eb2f102feb Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Fri, 16 Feb 2024 18:20:18 +0530
Subject: [PATCH 34/39] Prompt function should be removed if the workspace is
 closed

---
 packages/esm-patient-common-lib/src/workspaces/workspaces.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
index 3edcc17e14..887a00228b 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
@@ -259,6 +259,8 @@ export function closeWorkspace(
     const state = store.getState();
     const newOpenWorkspaces = state.openWorkspaces.filter((w) => w.name != name);
 
+    // promptBeforeClosing function should be removed if the workspace is closed.
+    promptBeforeClosing(name, null);
     store.setState({
       ...state,
       prompt: null,

From ac8b76f4a3d1c5572fd79e99ade1830c61f52f9e Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Fri, 16 Feb 2024 18:29:36 +0530
Subject: [PATCH 35/39] Fixed failing test

---
 .../src/workspaces/workspaces.test.ts                       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts
index d251063dae..b83e4393f6 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.test.ts
@@ -139,6 +139,8 @@ describe('workspace system', () => {
       expect(store.getState().openWorkspaces.length).toEqual(2);
       expect(store.getState().openWorkspaces[0].name).toBe('conditions');
       expect(store.getState().openWorkspaces[1].name).toBe('allergies');
+      const allergies = store.getState().openWorkspaces[1];
+      allergies.promptBeforeClosing(() => true);
       launchPatientWorkspace('vitals');
       expect(store.getState().openWorkspaces.length).toEqual(2);
       expect(store.getState().openWorkspaces[0].name).toBe('allergies');
@@ -226,7 +228,9 @@ describe('workspace system', () => {
       expect(store.getState().openWorkspaces.length).toEqual(3);
       expect(store.getState().openWorkspaces.map((w) => w.name)).toEqual(['conditions', 'attachments', 'allergies']);
       const conditionsWorkspace = store.getState().openWorkspaces?.[0];
+      const allergiesWorkspace = store.getState().openWorkspaces?.[2];
       conditionsWorkspace.promptBeforeClosing(() => true);
+      allergiesWorkspace.promptBeforeClosing(() => true);
       launchPatientWorkspace('vitals');
       expect(store.getState().openWorkspaces.length).toEqual(3);
       expect(store.getState().openWorkspaces[0].name).toBe('conditions');
@@ -310,6 +314,8 @@ describe('workspace system', () => {
     launchPatientWorkspace('conditions');
     launchPatientWorkspace('conditions');
     expect(store.getState().openWorkspaces.length).toEqual(1);
+    const conditionsWorkspace = store.getState().openWorkspaces[0];
+    conditionsWorkspace.promptBeforeClosing(() => true);
     // Test opening a workspace of the same type--should require confirmation and then replace
     launchPatientWorkspace('form-entry', { foo: true });
     expect(store.getState().openWorkspaces.length).toEqual(1);

From 17615cf7d1ab5831d258f3bccb25a1e0210096ee Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Fri, 16 Feb 2024 18:34:02 +0530
Subject: [PATCH 36/39] Fixed TS issues

---
 .../lab-orders/add-lab-order/add-lab-order.test.tsx  |  4 +++-
 .../add-lab-order/add-lab-order.workspace.tsx        | 12 ++++++++++--
 .../add-lab-order/lab-order-form.component.tsx       |  4 +++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx
index 318fed02f6..aa362d66db 100644
--- a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx
+++ b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx
@@ -35,7 +35,9 @@ jest.mock('./useTestTypes', () => ({
   useTestTypes: () => mockUseTestTypes(),
 }));
 
-const mockCloseWorkspace = jest.fn();
+const mockCloseWorkspace = jest.fn().mockImplementation(({ onWorkspaceClose }) => {
+  onWorkspaceClose?.();
+});
 const mockLaunchPatientWorkspace = jest.fn();
 jest.mock('@openmrs/esm-patient-common-lib', () => ({
   ...jest.requireActual('@openmrs/esm-patient-common-lib'),
diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx
index 5be3475c0a..f7a974cee8 100644
--- a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx
+++ b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx
@@ -22,7 +22,11 @@ export interface AddLabOrderWorkspaceAdditionalProps {
 export interface AddLabOrderWorkspace extends DefaultWorkspaceProps, AddLabOrderWorkspaceAdditionalProps {}
 
 // Design: https://app.zeplin.io/project/60d5947dd636aebbd63dce4c/screen/640b06c440ee3f7af8747620
-export default function AddLabOrderWorkspace({ order: initialOrder, closeWorkspace }: AddLabOrderWorkspace) {
+export default function AddLabOrderWorkspace({
+  order: initialOrder,
+  closeWorkspace,
+  promptBeforeClosing,
+}: AddLabOrderWorkspace) {
   const { t } = useTranslation();
 
   const { patient, isLoading: isLoadingPatient } = usePatient();
@@ -66,7 +70,11 @@ export default function AddLabOrderWorkspace({ order: initialOrder, closeWorkspa
       {!currentLabOrder ? (
         <TestTypeSearch openLabForm={setCurrentLabOrder} />
       ) : (
-        <LabOrderForm initialOrder={currentLabOrder} closeWorkspace={closeWorkspace} />
+        <LabOrderForm
+          initialOrder={currentLabOrder}
+          closeWorkspace={closeWorkspace}
+          promptBeforeClosing={promptBeforeClosing}
+        />
       )}
     </div>
   );
diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx
index 99ccb204f1..cc7320431e 100644
--- a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx
+++ b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx
@@ -25,8 +25,10 @@ import { moduleName } from '@openmrs/esm-patient-chart-app/src/constants';
 import { type ConfigObject } from '../../config-schema';
 import styles from './lab-order-form.scss';
 
-export interface LabOrderFormProps extends DefaultWorkspaceProps {
+export interface LabOrderFormProps {
   initialOrder: LabOrderBasketItem;
+  closeWorkspace: DefaultWorkspaceProps['closeWorkspace'];
+  promptBeforeClosing: DefaultWorkspaceProps['promptBeforeClosing'];
 }
 
 const labOrderFormSchema = z.object({

From dc8b294487b2563ad7611d7458371ec5b3e1cb6b Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Fri, 16 Feb 2024 18:39:55 +0530
Subject: [PATCH 37/39] Review changes

---
 .../src/visit/visit-form/visit-form.component.tsx      |  1 -
 .../src/workspace/workspace-window.component.tsx       |  4 ++--
 .../src/workspaces/workspaces.ts                       | 10 +++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
index 65f58030dd..c8b61bf455 100644
--- a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
@@ -442,7 +442,6 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
           payload.startDatetime,
         ).then(
           (offlineVisit) => {
-            //setCurrentVisit(patientUuid, offlineVisit.uuid);
             mutate();
             closeWorkspace({ ignoreChanges: true });
             showSnackbar({
diff --git a/packages/esm-patient-chart-app/src/workspace/workspace-window.component.tsx b/packages/esm-patient-chart-app/src/workspace/workspace-window.component.tsx
index f11256ed37..23ce2f2b00 100644
--- a/packages/esm-patient-chart-app/src/workspace/workspace-window.component.tsx
+++ b/packages/esm-patient-chart-app/src/workspace/workspace-window.component.tsx
@@ -13,7 +13,7 @@ import {
   useWorkspaces,
   updateWorkspaceWindowState,
   closeAllWorkspaces,
-  getWhetherWorkspaceCanBeClosed,
+  canCloseWorkspaceWithoutPrompting,
   getWorkspaceStore,
   resetWorkspaceStore,
 } from '@openmrs/esm-patient-common-lib';
@@ -70,7 +70,7 @@ const WorkspaceWindow: React.FC<ContextWorkspaceParams> = () => {
       const canCloseAllWorkspaces = getWorkspaceStore()
         .getState()
         .openWorkspaces.every(({ name }) => {
-          const canCloseWorkspace = getWhetherWorkspaceCanBeClosed(name);
+          const canCloseWorkspace = canCloseWorkspaceWithoutPrompting(name);
           return canCloseWorkspace;
         });
 
diff --git a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
index 887a00228b..acb85c9bf0 100644
--- a/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
+++ b/packages/esm-patient-common-lib/src/workspaces/workspaces.ts
@@ -108,7 +108,7 @@ function getTitleFromExtension(ext: ExtensionRegistration) {
  * @param ignoreChanges If set to true, the "unsaved changes" modal will never be shown, even if the `promptBeforeClosing` function returns true. The user will not be prompted before closing.
  * @returns true if the workspace can be closed.
  */
-export function getWhetherWorkspaceCanBeClosed(name: string, ignoreChanges: boolean = false) {
+export function canCloseWorkspaceWithoutPrompting(name: string, ignoreChanges: boolean = false) {
   if (ignoreChanges) {
     return true;
   }
@@ -131,7 +131,7 @@ function promptBeforeLaunchingWorkspace(
     });
   };
 
-  if (!getWhetherWorkspaceCanBeClosed(workspace.name)) {
+  if (!canCloseWorkspaceWithoutPrompting(workspace.name)) {
     showWorkspacePrompts('closing-workspace-launching-new-workspace', proceed, workspace.title ?? workspace.name);
   } else {
     proceed();
@@ -271,7 +271,7 @@ export function closeWorkspace(
     options?.onWorkspaceClose?.();
   };
 
-  if (!getWhetherWorkspaceCanBeClosed(name, options?.ignoreChanges)) {
+  if (!canCloseWorkspaceWithoutPrompting(name, options?.ignoreChanges)) {
     const currentName = getWorkspaceRegistration(name).title ?? name;
     showWorkspacePrompts('closing-workspace', updateStoreWithClosedWorkspace, currentName);
     return false;
@@ -317,7 +317,7 @@ export function closeAllWorkspaces(onClosingWorkspaces: () => void = () => {}) {
   const store = getWorkspaceStore();
 
   const canCloseAllWorkspaces = store.getState().openWorkspaces.every(({ name }) => {
-    const canCloseWorkspace = getWhetherWorkspaceCanBeClosed(name);
+    const canCloseWorkspace = canCloseWorkspaceWithoutPrompting(name);
     return canCloseWorkspace;
   });
 
@@ -372,7 +372,7 @@ export function showWorkspacePrompts(
     case 'closing-all-workspaces': {
       const workspacesNotClosed = store
         .getState()
-        .openWorkspaces.filter(({ name }) => !getWhetherWorkspaceCanBeClosed(name))
+        .openWorkspaces.filter(({ name }) => !canCloseWorkspaceWithoutPrompting(name))
         .map(({ title }, indx) => `${indx + 1}. ${title}`);
 
       const prompt: Prompt = {

From a4c5e3fcf608c59f360cd978263a2598a3515f17 Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Wed, 21 Feb 2024 12:23:54 +0530
Subject: [PATCH 38/39] Removed appointments workspace

---
 packages/esm-patient-appointments-app/src/index.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/esm-patient-appointments-app/src/index.ts b/packages/esm-patient-appointments-app/src/index.ts
index 98f2d4ad3d..aa147fcbab 100644
--- a/packages/esm-patient-appointments-app/src/index.ts
+++ b/packages/esm-patient-appointments-app/src/index.ts
@@ -34,10 +34,3 @@ export const appointmentsCancelConfirmationDialog = getAsyncLifecycle(
 );
 
 export const upcomingAppointmentsWidget = getSyncLifecycle(upcomingAppointmentsWidgetComponent, options);
-
-// t('scheduleAppointment', 'Schedule appointment');
-registerWorkspace({
-  name: 'appointments-form-workspace',
-  load: getAsyncLifecycle(() => import('./appointments/appointments-form/appointments-form.component'), options),
-  title: translateFrom(moduleName, 'scheduleAppointment', 'Schedule appointment'),
-});

From a16a39b67416912ca3ffa14ee54cdcbfe3c9feba Mon Sep 17 00:00:00 2001
From: Vineet Sharma <sharmava05@gmail.com>
Date: Wed, 21 Feb 2024 12:24:15 +0530
Subject: [PATCH 39/39] Updated translation

---
 packages/esm-patient-appointments-app/translations/en.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/esm-patient-appointments-app/translations/en.json b/packages/esm-patient-appointments-app/translations/en.json
index 74a84b6703..b2488a10c6 100644
--- a/packages/esm-patient-appointments-app/translations/en.json
+++ b/packages/esm-patient-appointments-app/translations/en.json
@@ -23,7 +23,6 @@
   "noUpcomingAppointments": "No upcoming appointments found",
   "noUpcomingAppointmentsForPatient": "There are no upcoming appointments to display for this patient",
   "past": "Past",
-  "scheduleAppointment": "Schedule appointment",
   "service": "Service",
   "status": "Status",
   "today": "Today",