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

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:()=>p});var n=o(6072),t=o(4504),a=o(4424),i=o(2076),s="active-prescriptions-workspace",r="[active-prescriptions-action-button]";const p=function(c){var e=c.patientUuid,o=c.closeMenu,p=(0,(0,i.useTranslation)().t)("prescriptionsActionButton","Active prescriptions"),l=(0,n.useCallback)(function(){if(console.info("".concat(r," click"),{patientUuid:e,hasCloseMenu:Boolean(o),workspaceName:s}),e){try{console.info("".concat(r," launching workspace (v1)"),{workspaceName:s,patientUuid:e}),(0,a.launchWorkspace)(s,{patientUuid:e,openedFrom:"patient-actions-slot"}),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:p,onClick:l})}}}]);

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

@@ -337,9 +337,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 3099,
+      "size": 2105,
       "sizes": {
-        "javascript": 3099
+        "javascript": 2105
       },
       "names": [],
       "idHints": [],
@@ -353,7 +353,7 @@
       "auxiliaryFiles": [
         "477.js.map"
       ],
-      "hash": "d03147dd6335beac",
+      "hash": "5fe86c5947905ede",
       "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-actions-slot","order":50,"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"}],"version":"1.0.33"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cc-openmrs/cc-esm-active-prescriptions",
-  "version": "1.0.30",
+  "version": "1.0.33",
   "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,34 +1,33 @@
 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 {
+  /**
+   * In patient-chart actions, this is typically provided by the slot context.
+   */
   patientUuid?: string;
-  closeOverflowMenu?: () => void; // Importante para fechar o menu
+
+  /**
+   * The patient actions overflow menu commonly provides this callback as `closeMenu`.
+   * (Using `closeMenu` aligns with core implementations.)
+   */
+  closeMenu?: () => void;
 }
 
 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,
-}) => {
+const PrescriptionsActionButton: React.FC<PrescriptionsActionButtonProps> = ({ patientUuid, closeMenu }) => {
   const { t } = useTranslation();
   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,
+      hasCloseMenu: Boolean(closeMenu),
+      workspaceName,
     });
 
     if (!patientUuid) {
@@ -37,43 +36,27 @@ 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,
-        });
+      // IMPORTANT:
+      // - Your current @openmrs/esm-framework does NOT export launchWorkspace2 (TS error).
+      // - So we use v1: launchWorkspace + routes.json "workspaces" (not "workspaces2").
+      console.info(`${logPrefix} launching workspace (v1)`, { workspaceName, patientUuid });
 
-        navigateAndLaunchWorkspace({
-          targetUrl,
-          contextKey,
-          workspaceName,
-          additionalProps: {
-            patientUuid,
-          },
-        });
-      }
+      launchWorkspace(workspaceName, {
+        patientUuid,
+        openedFrom: 'patient-actions-slot',
+      });
 
       console.info(`${logPrefix} workspace launch dispatched`);
-    } catch (error) {
+    } catch (error: any) {
       console.error(`${logPrefix} workspace launch failed`, error);
       return;
     }
 
-    if (closeOverflowMenu) {
+    if (closeMenu) {
       console.info(`${logPrefix} closing overflow menu`);
-      closeOverflowMenu();
+      closeMenu();
     }
-  }, [patientUuid, closeOverflowMenu]);
+  }, [patientUuid, closeMenu]);
 
   return <OverflowMenuItem itemText={label} onClick={handleClick} />;
 };

package/src/routes.json

@@ -24,7 +24,10 @@
       "name": "prescriptions-action",
       "component": "prescriptionsActionButton",
       "slot": "patient-actions-slot",
-      "order": 50
+      "order": 50,
+      "meta": {
+        "fullWidth": false
+      }
     }
   ],
   "pages": [