@cc-openmrs/cc-esm-active-prescriptions 1.0.30 → 1.0.31

package/dist/477.js

@@ -1 +1 @@
-"use strict";(globalThis.webpackChunk_cc_openmrs_cc_esm_active_prescriptions=globalThis.webpackChunk_cc_openmrs_cc_esm_active_prescriptions||[]).push([[477],{4477(n,t,e){e.r(t),e.d(t,{default:()=>p});var c=e(6072),a=e(4504),o=e(4424),i=e(2076),r="active-prescriptions-workspace",s="[active-prescriptions-action-button]";const p=function(n){var t=n.patientUuid,e=n.closeOverflowMenu,p=(0,(0,i.useTranslation)().t)("prescriptionsActionButton","Active prescriptions"),l=(0,c.useCallback)(function(){var n=window.location.pathname,c=function(n){return/\/patient\/[^/]+\/chart(?:\/|$)/.test(n)}(n);if(console.info("".concat(s," click"),{patientUuid:t,hasCloseOverflowMenu:Boolean(e),pathname:n,inPatientChart:c}),t){try{if(c)console.info("".concat(s," launching workspace in current context"),{workspaceName:r,patientUuid:t}),(0,o.launchWorkspace)(r,{patientUuid:t});else{var a="".concat(window.getOpenmrsSpaBase(),"patient/").concat(t,"/chart"),i="patient/".concat(t);console.info("".concat(s," navigating to patient chart and launching workspace"),{workspaceName:r,patientUuid:t,targetUrl:a,contextKey:i}),(0,o.navigateAndLaunchWorkspace)({targetUrl:a,contextKey:i,workspaceName:r,additionalProps:{patientUuid:t}})}console.info("".concat(s," workspace launch dispatched"))}catch(n){return void console.error("".concat(s," workspace launch failed"),n)}e&&(console.info("".concat(s," closing overflow menu")),e())}else console.warn("".concat(s," patientUuid missing; workspace launch aborted"))},[t,e]);return c.createElement(a.XSD,{itemText:p,onClick:l})}}}]);
+"use strict";(globalThis.webpackChunk_cc_openmrs_cc_esm_active_prescriptions=globalThis.webpackChunk_cc_openmrs_cc_esm_active_prescriptions||[]).push([[477],{4477(c,e,o){o.r(e),o.d(e,{default:()=>l});var n=o(6072),t=o(4504),i=o(4424),a=o(2076),s="active-prescriptions-workspace",r="[active-prescriptions-action-button]";const l=function(c){var e=c.patientUuid,o=c.closeOverflowMenu,l=(0,(0,a.useTranslation)().t)("prescriptionsActionButton","Active prescriptions"),p=(0,n.useCallback)(function(){if(console.info("".concat(r," click"),{patientUuid:e,hasCloseOverflowMenu:Boolean(o)}),e){try{console.info("".concat(r," launching workspace"),{workspaceName:s,patientUuid:e}),(0,i.launchWorkspace)(s,{patientUuid:e}),console.info("".concat(r," workspace launch dispatched"))}catch(c){return void console.error("".concat(r," workspace launch failed"),c)}o&&(console.info("".concat(r," closing overflow menu")),o())}else console.warn("".concat(r," patientUuid missing; workspace launch aborted"))},[e,o]);return n.createElement(t.XSD,{itemText:l,onClick:p})}}}]);

package/dist/openmrs-esm-template-app.js.buildmanifest.json

@@ -337,9 +337,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 3099,
+      "size": 1843,
       "sizes": {
-        "javascript": 3099
+        "javascript": 1843
       },
       "names": [],
       "idHints": [],
@@ -353,7 +353,7 @@
       "auxiliaryFiles": [
         "477.js.map"
       ],
-      "hash": "d03147dd6335beac",
+      "hash": "d77eb5587a305825",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.0"},"extensions":[{"name":"Red box","component":"redBox","slot":"Boxes"},{"name":"Blue box","component":"blueBox","slot":"Boxes"},{"name":"Brand box","component":"brandBox","slot":"Boxes"},{"name":"prescriptions-action","component":"prescriptionsActionButton","slot":"patient-actions-slot","order":50}],"pages":[{"component":"root","route":"root"}],"workspaces":[{"name":"active-prescriptions-workspace","title":"Active prescriptions","type":"active-prescriptions","component":"root","canHide":true,"width":"wider"}],"version":"1.0.30"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.0"},"extensions":[{"name":"Red box","component":"redBox","slot":"Boxes"},{"name":"Blue box","component":"blueBox","slot":"Boxes"},{"name":"Brand box","component":"brandBox","slot":"Boxes"},{"name":"prescriptions-action","component":"prescriptionsActionButton","slot":"patient-chart-actions-slot","order":10,"meta":{"fullWidth":false}}],"pages":[{"component":"root","route":"root"}],"workspaces":[{"name":"active-prescriptions-workspace","title":"Active prescriptions","type":"active-prescriptions","component":"root","canHide":true,"width":"wider"}],"workspaces2":[{"name":"active-prescriptions-workspace","component":"root","window":"active-prescriptions"}],"workspaceWindows2":[{"name":"active-prescriptions","group":"patient-chart"}],"workspaceGroups2":[{"name":"patient-chart","scopePattern":"/patient/([^/]+)/chart"}],"version":"1.0.31"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cc-openmrs/cc-esm-active-prescriptions",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "license": "MPL-2.0",
   "description": "An OpenMRS seed application for building microfrontends",
   "browser": "dist/openmrs-esm-template-app.js",

package/src/prescriptions-actions/prescriptions-action-button.component.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { OverflowMenuItem } from '@carbon/react';
-import { launchWorkspace, navigateAndLaunchWorkspace } from '@openmrs/esm-framework';
+import { launchWorkspace } from '@openmrs/esm-framework';
 import { useTranslation } from 'react-i18next';
 
 interface PrescriptionsActionButtonProps {
@@ -11,8 +11,6 @@ interface PrescriptionsActionButtonProps {
 const workspaceName = 'active-prescriptions-workspace';
 const logPrefix = '[active-prescriptions-action-button]';
 
-const isPatientChartPath = (pathname: string) => /\/patient\/[^/]+\/chart(?:\/|$)/.test(pathname);
-
 const PrescriptionsActionButton: React.FC<PrescriptionsActionButtonProps> = ({
   patientUuid,
   closeOverflowMenu,
@@ -21,14 +19,9 @@ const PrescriptionsActionButton: React.FC<PrescriptionsActionButtonProps> = ({
   const label = t('prescriptionsActionButton', 'Active prescriptions');
 
   const handleClick = useCallback(() => {
-    const pathname = window.location.pathname;
-    const inPatientChart = isPatientChartPath(pathname);
-
     console.info(`${logPrefix} click`, {
       patientUuid,
       hasCloseOverflowMenu: Boolean(closeOverflowMenu),
-      pathname,
-      inPatientChart,
     });
 
     if (!patientUuid) {
@@ -37,32 +30,10 @@ const PrescriptionsActionButton: React.FC<PrescriptionsActionButtonProps> = ({
     }
 
     try {
-      if (inPatientChart) {
-        console.info(`${logPrefix} launching workspace in current context`, { workspaceName, patientUuid });
-        launchWorkspace(workspaceName, {
-          patientUuid,
-        });
-      } else {
-        const targetUrl = `${window.getOpenmrsSpaBase()}patient/${patientUuid}/chart`;
-        const contextKey = `patient/${patientUuid}`;
-
-        console.info(`${logPrefix} navigating to patient chart and launching workspace`, {
-          workspaceName,
-          patientUuid,
-          targetUrl,
-          contextKey,
-        });
-
-        navigateAndLaunchWorkspace({
-          targetUrl,
-          contextKey,
-          workspaceName,
-          additionalProps: {
-            patientUuid,
-          },
-        });
-      }
-
+      console.info(`${logPrefix} launching workspace`, { workspaceName, patientUuid });
+      launchWorkspace(workspaceName, {
+        patientUuid,
+      });
       console.info(`${logPrefix} workspace launch dispatched`);
     } catch (error) {
       console.error(`${logPrefix} workspace launch failed`, error);

package/src/routes.json

@@ -23,8 +23,11 @@
     {
       "name": "prescriptions-action",
       "component": "prescriptionsActionButton",
-      "slot": "patient-actions-slot",
-      "order": 50
+      "slot": "patient-chart-actions-slot",
+      "order": 10,
+      "meta": {
+        "fullWidth": false
+      }
     }
   ],
   "pages": [
@@ -42,5 +45,24 @@
       "canHide": true,
       "width": "wider"
     }
+  ],
+  "workspaces2": [
+    {
+      "name": "active-prescriptions-workspace",
+      "component": "root",
+      "window": "active-prescriptions"
+    }
+  ],
+  "workspaceWindows2": [
+    {
+      "name": "active-prescriptions",
+      "group": "patient-chart"
+    }
+  ],
+  "workspaceGroups2": [
+    {
+      "name": "patient-chart",
+      "scopePattern": "/patient/([^/]+)/chart"
+    }
   ]
 }