@openmrs/esm-stock-management-app 1.0.1-pre.465 → 1.0.1-pre.469

package/dist/openmrs-esm-stock-management-app.js.buildmanifest.json

@@ -86,10 +86,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4763249,
+      "size": 4770073,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4741300,
+        "javascript": 4748124,
         "share-init": 252,
         "runtime": 21445
       },
@@ -106,7 +106,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "5d839fdaf40b5606",
+      "hash": "4584f840c7b06eb6",
       "childrenByOrder": {}
     },
     {
@@ -138,9 +138,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1091537,
+      "size": 1098361,
       "sizes": {
-        "javascript": 1091327,
+        "javascript": 1098151,
         "consume-shared": 210
       },
       "names": [],
@@ -154,7 +154,7 @@
       "auxiliaryFiles": [
         "474.js.map"
       ],
-      "hash": "b28b8afd088ec2c1",
+      "hash": "3d31f10ff5724cc8",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-nav-menu","slot":"stock-sidebar-slot","component":"stockNavMenu","online":true,"offline":true},{"name":"overview-db-link","slot":"stock-page-dashboard-slot","component":"stockOverviewLink","meta":{"name":"overview","slot":"overview-dashboard-slot","title":"overview"},"order":0,"online":true,"offline":true},{"name":"stock-overview-db","slot":"overview-dashboard-slot","component":"stockOverview"},{"name":"operations-db-link","slot":"stock-page-dashboard-slot","component":"stockOperationsLink","meta":{"name":"operations","slot":"operations-dashboard-slot","title":"operations"},"order":2,"online":true,"offline":true},{"name":"stock-operations-db","slot":"operations-dashboard-slot","component":"stockOperations"},{"name":"items-db-link","slot":"stock-page-dashboard-slot","component":"stockItemsLink","meta":{"name":"items","slot":"items-dashboard-slot","title":"items"},"order":1,"online":true,"offline":true},{"name":"stock-items-db","slot":"items-dashboard-slot","component":"stockItems"},{"name":"user-scopes-db-link","slot":"stock-page-dashboard-slot","component":"stockUserScopesLink","meta":{"name":"user-scopes","slot":"user-scopes-dashboard-slot","title":"user-scopes"},"order":3,"online":true,"offline":true},{"name":"stock-user-scopes-db","slot":"user-scopes-dashboard-slot","component":"stockUserScopes"},{"name":"sources-db-link","slot":"stock-page-dashboard-slot","component":"stockSourcesLink","meta":{"name":"sources","slot":"sources-dashboard-slot","title":"Sources"},"order":2,"online":true,"offline":true},{"name":"stock-sources-db","slot":"sources-dashboard-slot","component":"stockSources"},{"name":"locations-db-link","slot":"stock-page-dashboard-slot","component":"stockLocationsLink","meta":{"name":"locations","slot":"locations-dashboard-slot","title":"Locations"},"order":4,"online":true,"offline":true},{"name":"stock-locations-db","slot":"locations-dashboard-slot","component":"stockLocations"},{"name":"reports-db-link","slot":"stock-page-dashboard-slot","component":"stockReportsLink","meta":{"name":"reports","slot":"reports-dashboard-slot","title":"Reports"},"order":5,"online":true,"offline":true},{"name":"stock-reports-db","slot":"reports-dashboard-slot","component":"stockReports"},{"name":"settings-db-link","slot":"stock-page-dashboard-slot","component":"stockSettingsLink","meta":{"name":"settings","slot":"settings-dashboard-slot","title":"Settings"},"order":6,"online":true,"offline":true},{"name":"stock-settings-db","slot":"settings-dashboard-slot","component":"stockSettings"},{"name":"stock-management-admin-card-link","slot":"system-admin-page-card-link-slot","component":"stockManagementAdminCardLink"},{"name":"stock-operation-dialog","component":"stockOperationDialog"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsDialog"},{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"stock-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"pages":[{"component":"root","route":"stock-management"}],"version":"1.0.1-pre.465"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-nav-menu","slot":"stock-sidebar-slot","component":"stockNavMenu","online":true,"offline":true},{"name":"overview-db-link","slot":"stock-page-dashboard-slot","component":"stockOverviewLink","meta":{"name":"overview","slot":"overview-dashboard-slot","title":"overview"},"order":0,"online":true,"offline":true},{"name":"stock-overview-db","slot":"overview-dashboard-slot","component":"stockOverview"},{"name":"operations-db-link","slot":"stock-page-dashboard-slot","component":"stockOperationsLink","meta":{"name":"operations","slot":"operations-dashboard-slot","title":"operations"},"order":2,"online":true,"offline":true},{"name":"stock-operations-db","slot":"operations-dashboard-slot","component":"stockOperations"},{"name":"items-db-link","slot":"stock-page-dashboard-slot","component":"stockItemsLink","meta":{"name":"items","slot":"items-dashboard-slot","title":"items"},"order":1,"online":true,"offline":true},{"name":"stock-items-db","slot":"items-dashboard-slot","component":"stockItems"},{"name":"user-scopes-db-link","slot":"stock-page-dashboard-slot","component":"stockUserScopesLink","meta":{"name":"user-scopes","slot":"user-scopes-dashboard-slot","title":"user-scopes"},"order":3,"online":true,"offline":true},{"name":"stock-user-scopes-db","slot":"user-scopes-dashboard-slot","component":"stockUserScopes"},{"name":"sources-db-link","slot":"stock-page-dashboard-slot","component":"stockSourcesLink","meta":{"name":"sources","slot":"sources-dashboard-slot","title":"Sources"},"order":2,"online":true,"offline":true},{"name":"stock-sources-db","slot":"sources-dashboard-slot","component":"stockSources"},{"name":"locations-db-link","slot":"stock-page-dashboard-slot","component":"stockLocationsLink","meta":{"name":"locations","slot":"locations-dashboard-slot","title":"Locations"},"order":4,"online":true,"offline":true},{"name":"stock-locations-db","slot":"locations-dashboard-slot","component":"stockLocations"},{"name":"reports-db-link","slot":"stock-page-dashboard-slot","component":"stockReportsLink","meta":{"name":"reports","slot":"reports-dashboard-slot","title":"Reports"},"order":5,"online":true,"offline":true},{"name":"stock-reports-db","slot":"reports-dashboard-slot","component":"stockReports"},{"name":"settings-db-link","slot":"stock-page-dashboard-slot","component":"stockSettingsLink","meta":{"name":"settings","slot":"settings-dashboard-slot","title":"Settings"},"order":6,"online":true,"offline":true},{"name":"stock-settings-db","slot":"settings-dashboard-slot","component":"stockSettings"},{"name":"stock-management-admin-card-link","slot":"system-admin-page-card-link-slot","component":"stockManagementAdminCardLink"},{"name":"stock-operation-dialog","component":"stockOperationDialog"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsDialog"},{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"stock-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"pages":[{"component":"root","route":"stock-management"}],"version":"1.0.1-pre.469"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-stock-management-app",
-  "version": "1.0.1-pre.465",
+  "version": "1.0.1-pre.469",
   "license": "MPL-2.0",
   "description": "Stock management microfrontend for OpenMRS 3.x",
   "browser": "dist/openmrs-esm-stock-management-app.js",

package/src/config-schema.ts

@@ -35,6 +35,23 @@ export const configSchema = {
     _description: "UUID for the stock item category",
     _default: "6d24eb6e-b42f-4706-ab2d-ae4472161f6a",
   },
+  logo: {
+    src: {
+      _type: Type.String,
+      _default: null,
+      _description: "A path or URL to an image.",
+    },
+    alt: {
+      _type: Type.String,
+      _default: "Logo",
+      _description: "Alt text, shown on hover",
+    },
+    name: {
+      _type: Type.String,
+      _default: null,
+      _description: "The organization name displayed when image is absent",
+    },
+  },
 };
 
 export type ConfigObject = {
@@ -45,4 +62,9 @@ export type ConfigObject = {
   stockSourceTypeUUID: string;
   dispensingUnitsUUID: string;
   stockItemCategoryUUID: string;
+  logo: {
+    src: string;
+    alt: string;
+    name: string;
+  };
 };

package/src/core/print/PrintTemplate.ts

@@ -1,6 +1,7 @@
 import { PrintCss } from "./PrintStyles";
-import { PRINT_LOGO_TEXT, PRINT_LOGO } from "../../constants";
+import { PRINT_LOGO } from "../../constants";
 import { GetPrintLogo, PrintLogoData } from "../utils/imageUtils";
+import { getConfig } from "@openmrs/esm-framework";
 
 export const GetPrintTemplate = (
   body: string,
@@ -27,6 +28,8 @@ ${PrintCss}
 };
 
 export const GetLogoSection = async () => {
+  const config = await getConfig("@openmrs/esm-stock-management-app");
+  const logoText = config?.logo?.name;
   let printLogoData: PrintLogoData | null = null;
   if (PRINT_LOGO) {
     try {
@@ -35,7 +38,7 @@ export const GetLogoSection = async () => {
       console.info(e);
     }
   }
-  return printLogoData || PRINT_LOGO_TEXT
+  return printLogoData || logoText
     ? `
 <div class="logo" >
     ${
@@ -45,11 +48,7 @@ export const GetLogoSection = async () => {
           : `<img alt='' src='${printLogoData.image}' />`
         : ""
     }
-    ${
-      PRINT_LOGO_TEXT
-        ? `<span class='logo-text text'>${PRINT_LOGO_TEXT}</span>`
-        : ""
-    }
+    ${logoText ? `<span class='logo-text text'>${logoText}</span>` : ""}
 </div>    
     `
     : "";

package/src/core/utils/imageUtils.ts

@@ -1,12 +1,12 @@
-import { URL_PRINT_LOGO } from "../../constants";
-
+import { getConfig } from "@openmrs/esm-framework";
 export interface PrintLogoData {
   image: string;
   isSvg: boolean;
 }
 
-export const GetPrintLogo = (): Promise<PrintLogoData | null> => {
-  const printLogoUrl: string = URL_PRINT_LOGO();
+export const GetPrintLogo = async (): Promise<PrintLogoData | null> => {
+  const config = await getConfig("@openmrs/esm-stock-management-app");
+  const printLogoUrl = config?.logo?.src;
   return new Promise((resolve, reject) => {
     if (!printLogoUrl) {
       resolve(null);

package/src/stock-items/add-stock-item/packaging-units/packaging-units.component.tsx

@@ -29,6 +29,7 @@ import DeleteModalButton from "./packaging-units-delete-modal-button.component";
 import { handleMutate } from "../../../utils";
 
 import styles from "./packaging-units.scss";
+import { closeOverlay } from "../../../core/components/overlay/hook";
 
 interface PackagingUnitsProps {
   isEditing?: boolean;
@@ -177,7 +178,9 @@ const PackagingUnits: React.FC<PackagingUnitsProps> = ({
       handleTabChange(0);
     });
   };
-
+  const handleCancelPackagingUnits = () => {
+    handleTabChange(0);
+  };
   const handleNewUnitFactorChange = (value: string | number) => {
     setNewUnit({
       ...newUnit,
@@ -269,6 +272,9 @@ const PackagingUnits: React.FC<PackagingUnitsProps> = ({
         )}
       />
       <div className={styles.packageUnitsBtn}>
+        <Button kind="secondary" onClick={handleCancelPackagingUnits}>
+          {t("cancel", "Cancel")}
+        </Button>
         <Button
           name="save"
           type="submit"

package/src/stock-operations/stock-operations-dialog/stock-operations-print-button.component.tsx

@@ -1,7 +1,6 @@
 import React from "react";
 
 import { Button } from "@carbon/react";
-import { useConfig } from "@openmrs/esm-framework";
 import { useTranslation } from "react-i18next";
 import { Printer } from "@carbon/react/icons";
 import { StockOperationDTO } from "../../core/api/types/stockOperation/StockOperationDTO";
@@ -29,11 +28,6 @@ const StockOperationPrintButton: React.FC<StockOperationCancelButtonProps> = ({
 }) => {
   const { t } = useTranslation();
 
-  const { config } = useConfig();
-
-  // const { printItemCost, printBalanceOnHand } = config;
-
-  // on print stock operation
   const onPrintStockOperation = async () => {
     try {
       let parentOperation: StockOperationDTO | null | undefined;
@@ -152,7 +146,7 @@ const StockOperationPrintButton: React.FC<StockOperationCancelButtonProps> = ({
       kind="tertiary"
       renderIcon={(props) => <Printer size={16} {...props} />}
     >
-      {t("print", "Print ")}
+      {t("print", "Print")}
     </Button>
   );
 };

package/src/stock-operations/stock-operations-table.component.tsx

@@ -59,7 +59,6 @@ import {
   StockFilters,
 } from "../constants";
 import { handleMutate } from "../utils";
-
 interface StockOperationsTableProps {
   status?: string;
 }