@cc-openmrs/cc-esm-active-prescriptions 1.0.63 → 1.0.65

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":"blueBox","slot":"Boxes"},{"name":"prescriptions-action-menu","component":"prescriptionsActionButton","slot":"action-menu-patient-chart-items-slot"}],"workspaces":[{"name":"active-prescriptions","title":"activePrescriptionsWorkspaceTitle","component":"root","type":"active-prescriptions","canHide":false,"width":"wider"}],"version":"1.0.63"}
+{"$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":"blueBox","slot":"Boxes"},{"name":"prescriptions-action-menu","component":"prescriptionsActionButton","slot":"action-menu-patient-chart-items-slot"}],"workspaces":[{"name":"active-prescriptions","title":"activePrescriptionsWorkspaceTitle","component":"root","type":"active-prescriptions","canHide":false,"width":"wider"}],"version":"1.0.65"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cc-openmrs/cc-esm-active-prescriptions",
-  "version": "1.0.63",
+  "version": "1.0.65",
   "license": "MPL-2.0",
   "description": "An OpenMRS seed application for building microfrontends",
   "browser": "dist/openmrs-esm-template-app.js",
@@ -43,73 +43,52 @@
     "frontendModuleName": "@cc-openmrs/cc-esm-active-prescriptions",
     "routes": "src/routes.json"
   },
-  "dependencies": {
-    "@carbon/react": "^1.83.0",
-    "classnames": "^2.5.1",
-    "lodash-es": "^4.17.21",
-    "react-to-print": "^2.14.13"
-  },
   "peerDependencies": {
+    "@carbon/react": "^1.x",
     "@openmrs/esm-framework": "9.x",
-    "dayjs": "1.x",
+    "@openmrs/esm-styleguide": "9.x",
     "react": "18.x",
     "react-dom": "18.x",
     "react-i18next": "16.x",
-    "rxjs": "6.x",
     "swr": "2.x"
   },
   "devDependencies": {
-    "@openmrs/esm-framework": "next",
+    "@carbon/react": "^1.83.0",
+    "@openmrs/esm-framework": "9.x",
+    "@openmrs/esm-styleguide": "9.x",
     "@playwright/test": "^1.52.0",
-    "@swc/cli": "^0.3.12",
-    "@swc/core": "^1.7.14",
+    "@swc/core": "^1.3.68",
     "@swc/jest": "^0.2.36",
-    "@testing-library/dom": "^8.20.1",
-    "@testing-library/jest-dom": "^5.17.0",
-    "@testing-library/react": "^13.4.0",
-    "@testing-library/user-event": "^14.5.2",
-    "@types/jest": "^28.1.4",
+    "@testing-library/jest-dom": "^6.4.5",
+    "@testing-library/react": "^15.0.6",
+    "@types/jest": "^29.5.12",
     "@types/react": "^18.3.21",
     "@types/react-dom": "^18.3.0",
-    "@types/react-router": "^5.1.20",
-    "@types/react-router-dom": "^5.1.7",
-    "@types/webpack-env": "^1.16.0",
-    "@typescript-eslint/eslint-plugin": "^8.54.0",
-    "@typescript-eslint/parser": "^8.54.0",
-    "css-loader": "^6.8.1",
-    "dayjs": "^1.11.13",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.57.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jest-dom": "^5.4.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-react-hooks": "^5.0.0",
-    "eslint-plugin-unused-imports": "^4.3.0",
-    "husky": "^6.0.0",
+    "@types/webpack-env": "^1.18.1",
+    "@typescript-eslint/eslint-plugin": "^7.8.0",
+    "@typescript-eslint/parser": "^7.8.0",
+    "dayjs": "^1.x",
+    "dotenv": "^16.0.3",
+    "eslint": "^8.50.0",
+    "eslint-plugin-react-hooks": "^4.6.2",
+    "husky": "^8.0.3",
     "i18next": "^25.0.0",
     "i18next-parser": "^9.3.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^28.1.3",
-    "jest-cli": "^28.1.3",
-    "jest-environment-jsdom": "^28.1.3",
-    "lint-staged": "^15.2.9",
-    "openmrs": "next",
-    "prettier": "^3.2.5",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "lint-staged": "^15.2.2",
+    "openmrs": "9.x",
+    "prettier": "^3.3.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-i18next": "^16.0.0",
-    "react-router-dom": "^6.3.0",
-    "rxjs": "^6.6.7",
-    "swr": "^2.2.5",
-    "swc-loader": "^0.2.3",
+    "swr": "^2.3.3",
     "turbo": "^2.5.2",
-    "typescript": "^5.0.0",
-    "webpack": "^5.99.9",
-    "webpack-cli": "^6.0.1"
+    "typescript": "^5.0.0"
   },
   "lint-staged": {
-    "*.{ts,tsx}": "eslint --cache --fix --max-warnings 0",
+    "packages/**/src/**/*.{ts,tsx}": "eslint --cache --fix --max-warnings 0",
     "*.{css,scss,ts,tsx}": "prettier --write --list-different"
   },
   "packageManager": "yarn@4.10.3"

package/src/carbon-react.d.ts

@@ -0,0 +1,9 @@
+import '@carbon/react';
+
+declare module '@carbon/react' {
+  interface SideNavProps {
+    inert?: boolean;
+  }
+}
+
+export {};

package/src/index.ts

@@ -4,11 +4,7 @@
  * connects the app shell to the React application(s) that make up this
  * microfrontend.
  */
-import React, { type ComponentType } from 'react';
-import ReactDOM from 'react-dom';
-import { defineConfigSchema } from '@openmrs/esm-framework';
-import { openmrsComponentDecorator } from '../node_modules/@openmrs/esm-react-utils/dist/openmrsComponentDecorator.js';
-import singleSpaReact from 'single-spa-react';
+import { getAsyncLifecycle, defineConfigSchema, getSyncLifecycle } from '@openmrs/esm-framework';
 import { configSchema } from './config-schema';
 
 import prescriptionsActionButtonComponent from './prescriptions-actions/prescriptions-action-button.component';
@@ -20,26 +16,6 @@ const options = {
   moduleName,
 };
 
-function getCompatibleLifecycle<T>(Component: ComponentType<T>, lifecycleOptions: typeof options) {
-  return singleSpaReact({
-    React,
-    ReactDOM,
-    renderType: 'render',
-    rootComponent: openmrsComponentDecorator(lifecycleOptions)(Component as any) as any,
-  });
-}
-
-function getCompatibleAsyncLifecycle<T>(
-  lazy: () => Promise<{ default: ComponentType<T> }>,
-  lifecycleOptions: typeof options,
-) {
-  return () => lazy().then(({ default: Component }) => getCompatibleLifecycle(Component, lifecycleOptions));
-}
-
-function getCompatibleSyncLifecycle<T>(Component: ComponentType<T>, lifecycleOptions: typeof options) {
-  return () => Promise.resolve(getCompatibleLifecycle(Component, lifecycleOptions));
-}
-
 /**
  * This tells the app shell how to obtain translation files: that they
  * are JSON files in the directory `../translations` (which you should
@@ -60,11 +36,11 @@ export function startupApp() {
 /**
  * The following are named exports for the extensions defined in this frontend modules. See the `routes.json` file to see how these are used.
  */
-export const redBox = getCompatibleAsyncLifecycle(() => import('./boxes/extensions/red-box.component'), options);
-export const blueBox = getCompatibleAsyncLifecycle(() => import('./boxes/extensions/blue-box.component'), options);
-export const brandBox = getCompatibleAsyncLifecycle(() => import('./boxes/extensions/brand-box.component'), options);
+export const redBox = getAsyncLifecycle(() => import('./boxes/extensions/red-box.component'), options);
+export const blueBox = getAsyncLifecycle(() => import('./boxes/extensions/blue-box.component'), options);
+export const brandBox = getAsyncLifecycle(() => import('./boxes/extensions/brand-box.component'), options);
 
-export const prescriptionsActionButton = getCompatibleSyncLifecycle(prescriptionsActionButtonComponent, options);
+export const prescriptionsActionButton = getSyncLifecycle(prescriptionsActionButtonComponent, options);
 
 /**
  * This named export tells the app shell that the default export of `root.component.tsx`
@@ -72,4 +48,4 @@ export const prescriptionsActionButton = getCompatibleSyncLifecycle(prescription
  * will be `openmrsSpaBase() + 'root'`, which is usually
  * `/openmrs/spa/root`.
  */
-export const root = getCompatibleAsyncLifecycle(() => import('./root.component'), options);
+export const root = getAsyncLifecycle(() => import('./root.component'), options);

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

@@ -1,10 +1,12 @@
-import React from 'react';
-import { ActionMenuButton, launchWorkspace } from '@openmrs/esm-framework';
-import { Events } from '@carbon/react/icons';
+import React, { useCallback } from 'react';
+import { launchWorkspace2 } from '@openmrs/esm-framework';
+import { ChevronRight } from '@carbon/icons-react';
+import { ActionMenuButton } from '@openmrs/esm-styleguide';
 import { useTranslation } from 'react-i18next';
 
-const handleClick = () => launchWorkspace('active-prescriptions');
-const getEventsIcon = (props: object) => <Events {...props} />;
+const handleClick = () => {
+  void launchWorkspace2('active-prescriptions');
+};
 
 const PrescriptionsActionButton: React.FC = () => {
   const { t } = useTranslation();
@@ -12,10 +14,10 @@ const PrescriptionsActionButton: React.FC = () => {
 
   return (
     <ActionMenuButton
-      getIcon={getEventsIcon}
-      handler={handleClick}
-      iconDescription={label}
+      getIcon={(props) => <ChevronRight {...props} />}
       label={label}
+      iconDescription={label}
+      handler={handleClick}
       type="active-prescriptions"
     />
   );