@cc-openmrs/cc-esm-active-prescriptions 1.0.13 → 1.0.16

package/dist/296.js

@@ -1 +1 @@
-"use strict";(globalThis.webpackChunk_cc_openmrs_cc_esm_active_prescriptions=globalThis.webpackChunk_cc_openmrs_cc_esm_active_prescriptions||[]).push([[296],{4296(e,t,r){r.r(t),r.d(t,{default:()=>a});var n=r(6072),c=r(3335),i=r(5987),o=r(8150),p=r(2076);function s(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}const a=function(e){var t=e.patientUuid,r=(0,p.useTranslation)().t,a=(0,n.useCallback)(function(){t?(0,i.launchWorkspace)("active-prescriptions-workspace",{patientUuid:t}):(0,i.launchWorkspace)("active-prescriptions-workspace")},[t]),u=r("prescriptionsActionMenuItem","Active prescriptions");return n.createElement(o.ED,{getIcon:function(e){return n.createElement(c.KM,(t=function(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{},n=Object.keys(r);"function"==typeof Object.getOwnPropertySymbols&&(n=n.concat(Object.getOwnPropertySymbols(r).filter(function(e){return Object.getOwnPropertyDescriptor(r,e).enumerable}))),n.forEach(function(t){s(e,t,r[t])})}return e}({},e),r=null!=(r={"aria-hidden":"true"})?r:{},Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):function(e){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t.push.apply(t,r)}return t}(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))}),t));var t,r},handler:a,iconDescription:u,label:u,type:"active-prescriptions"})}}}]);
+"use strict";(globalThis.webpackChunk_cc_openmrs_cc_esm_active_prescriptions=globalThis.webpackChunk_cc_openmrs_cc_esm_active_prescriptions||[]).push([[296],{4296(e,t,r){r.r(t),r.d(t,{default:()=>s});var n=r(6072),c=r(3335),i=r(5987),o=r(8150),a=r(2076);function p(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}const s=function(e){var t=e.patientUuid,r=(0,a.useTranslation)().t,s=(0,n.useCallback)(function(){t?(0,i.navigateAndLaunchWorkspace)({targetUrl:"".concat(window.getOpenmrsSpaBase(),"patient/").concat(t,"/chart"),contextKey:"patient-chart",workspaceName:"active-prescriptions-workspace",additionalProps:{patientUuid:t}}):(0,i.launchWorkspace)("active-prescriptions-workspace")},[t]),u=r("prescriptionsActionMenuItem","Active prescriptions");return n.createElement(o.ED,{getIcon:function(e){return n.createElement(c.KM,(t=function(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{},n=Object.keys(r);"function"==typeof Object.getOwnPropertySymbols&&(n=n.concat(Object.getOwnPropertySymbols(r).filter(function(e){return Object.getOwnPropertyDescriptor(r,e).enumerable}))),n.forEach(function(t){p(e,t,r[t])})}return e}({},e),r=null!=(r={"aria-hidden":"true"})?r:{},Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):function(e){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t.push.apply(t,r)}return t}(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))}),t));var t,r},handler:s,iconDescription:u,label:u,type:"active-prescriptions"})}}}]);

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(c,e,t){t.r(e),t.d(e,{default:()=>a});var i=t(6072),s=t(4504),n=t(5987),r=t(2076);const a=function(c){var e=c.patientUuid,t=(0,(0,r.useTranslation)().t)("prescriptionsActionButton","Active prescriptions"),a=(0,i.useCallback)(function(){e?(0,n.launchWorkspace)("active-prescriptions-workspace",{patientUuid:e}):(0,n.launchWorkspace)("active-prescriptions-workspace")},[e]);return i.createElement(s.XSD,{itemText:t,onClick:a})}}}]);
+"use strict";(globalThis.webpackChunk_cc_openmrs_cc_esm_active_prescriptions=globalThis.webpackChunk_cc_openmrs_cc_esm_active_prescriptions||[]).push([[477],{4477(t,e,c){c.r(e),c.d(e,{default:()=>s});var a=c(6072),i=c(4504),n=c(5987),r=c(2076);const s=function(t){var e=t.patientUuid,c=(0,(0,r.useTranslation)().t)("prescriptionsActionButton","Active prescriptions"),s=(0,a.useCallback)(function(){e?(0,n.navigateAndLaunchWorkspace)({targetUrl:"".concat(window.getOpenmrsSpaBase(),"patient/").concat(e,"/chart"),contextKey:"patient-chart",workspaceName:"active-prescriptions-workspace",additionalProps:{patientUuid:e}}):(0,n.launchWorkspace)("active-prescriptions-workspace")},[e]);return a.createElement(i.XSD,{itemText:c,onClick:s})}}}]);

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

@@ -265,9 +265,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 3030,
+      "size": 3310,
       "sizes": {
-        "javascript": 3030
+        "javascript": 3310
       },
       "names": [],
       "idHints": [],
@@ -281,7 +281,7 @@
       "auxiliaryFiles": [
         "296.js.map"
       ],
-      "hash": "0596876aa46d42b1",
+      "hash": "83e9a7f23e03e55d",
       "childrenByOrder": {}
     },
     {
@@ -464,9 +464,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 915,
+      "size": 1195,
       "sizes": {
-        "javascript": 915
+        "javascript": 1195
       },
       "names": [],
       "idHints": [],
@@ -480,7 +480,7 @@
       "auxiliaryFiles": [
         "477.js.map"
       ],
-      "hash": "04b0eab0a53e3865",
+      "hash": "17859c70c53fecaa",
       "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 banner action","component":"prescriptionsActionButton","slot":"patient-actions-slot","order":50,"meta":{"label":"Active prescriptions","icon":"certificate"}},{"name":"Prescriptions action","component":"prescriptionsActionMenuItem","slot":"action-menu-patient-chart-items-slot","order":50,"meta":{"label":"Prescriptions","icon":"pill"}}],"pages":[{"component":"root","route":"root"}],"workspaces":[{"name":"active-prescriptions-workspace","title":"activePrescriptionsWorkspaceTitle","component":"root","type":"active-prescriptions","canHide":true,"width":"wider"}],"version":"1.0.13"}
+{"$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 2","component":"prescriptionsActionMenuItem","slot":"action-menu-patient-chart-items-slot","order":4,"meta":{"label":"Prescriptions 2","icon":"pill"}},{"name":"Prescriptions action","component":"prescriptionsActionButton","slot":"patient-actions-slot","order":50}],"pages":[{"component":"root","route":"root"}],"workspaces":[{"name":"active-prescriptions-workspace","title":"activePrescriptionsWorkspaceTitle","component":"root","type":"active-prescriptions","canHide":true,"width":"wider"}],"version":"1.0.16"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cc-openmrs/cc-esm-active-prescriptions",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "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 } from '@openmrs/esm-framework';
+import { launchWorkspace, navigateAndLaunchWorkspace } from '@openmrs/esm-framework';
 import { useTranslation } from 'react-i18next';
 
 interface PrescriptionsActionButtonProps {
@@ -13,7 +13,12 @@ const PrescriptionsActionButton: React.FC<PrescriptionsActionButtonProps> = ({ p
 
   const handleClick = useCallback(() => {
     if (patientUuid) {
-      launchWorkspace('active-prescriptions-workspace', { patientUuid });
+      navigateAndLaunchWorkspace({
+        targetUrl: `${window.getOpenmrsSpaBase()}patient/${patientUuid}/chart`,
+        contextKey: 'patient-chart',
+        workspaceName: 'active-prescriptions-workspace',
+        additionalProps: { patientUuid },
+      });
     } else {
       launchWorkspace('active-prescriptions-workspace');
     }

package/src/prescriptions-actions/prescriptions-action-menu-item.component.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { CertificateCheck } from '@carbon/react/icons';
-import { launchWorkspace } from '@openmrs/esm-framework';
+import { launchWorkspace, navigateAndLaunchWorkspace } from '@openmrs/esm-framework';
 import { ActionMenuButton } from '@openmrs/esm-styleguide';
 import { useTranslation } from 'react-i18next';
 
@@ -13,7 +13,12 @@ const PrescriptionsActionMenuItem: React.FC<PrescriptionsActionMenuItemProps> =
 
   const handleClick = useCallback(() => {
     if (patientUuid) {
-      launchWorkspace('active-prescriptions-workspace', { patientUuid });
+      navigateAndLaunchWorkspace({
+        targetUrl: `${window.getOpenmrsSpaBase()}patient/${patientUuid}/chart`,
+        contextKey: 'patient-chart',
+        workspaceName: 'active-prescriptions-workspace',
+        additionalProps: { patientUuid },
+      });
     } else {
       launchWorkspace('active-prescriptions-workspace');
     }

package/src/routes.json

@@ -21,24 +21,20 @@
       "slot": "Boxes"
     },
     {
-      "name": "Prescriptions banner action",
-      "component": "prescriptionsActionButton",
-      "slot": "patient-actions-slot",
-      "order": 50,
-      "meta": {
-        "label": "Active prescriptions",
-        "icon": "certificate"
-      }
-    },
-    {
-      "name": "Prescriptions action",
+      "name": "Prescriptions action 2",
       "component": "prescriptionsActionMenuItem",
       "slot": "action-menu-patient-chart-items-slot",
-      "order": 50,
+      "order": 4,
       "meta": {
-        "label": "Prescriptions",
+        "label": "Prescriptions 2",
         "icon": "pill"
       }
+    },
+    {
+      "name": "Prescriptions action",
+      "component": "prescriptionsActionButton",
+      "slot": "patient-actions-slot",
+      "order": 50
     }
   ],
   "pages": [