@openmrs/esm-stock-management-app 1.0.1-pre.489 → 1.0.1-pre.497

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

@@ -85,10 +85,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5389111,
+      "size": 5392020,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 5367161,
+        "javascript": 5370070,
         "share-init": 252,
         "runtime": 21446
       },
@@ -105,7 +105,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "b5f7a57f4ae4fe98",
+      "hash": "c20749fa21bce5ec",
       "childrenByOrder": {}
     },
     {
@@ -273,9 +273,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1720684,
+      "size": 1723593,
       "sizes": {
-        "javascript": 1720474,
+        "javascript": 1723383,
         "consume-shared": 210
       },
       "names": [],
@@ -289,7 +289,7 @@
       "auxiliaryFiles": [
         "647.js.map"
       ],
-      "hash": "95af224be149a64e",
+      "hash": "7200b38ad813355f",
       "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.489"}
+{"$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.497"}

package/package.json

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

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

@@ -34,7 +34,9 @@ const StockItemUnitsEdit: React.FC<StockItemUnitsEditProps> = ({
   return (
     <>
       <DispensingPackageMeasurement
-        dispensingUnitPackagingUoMUuid={stockItem?.purchasePriceUoMUuid}
+        dispensingUnitPackagingUoMUuid={
+          stockItem?.dispensingUnitPackagingUoMUuid
+        }
         name="dispensingUnitPackagingUoMUuid"
         controllerName="dispensingUnitPackagingUoMUuid"
         control={control}
@@ -52,7 +54,9 @@ const StockItemUnitsEdit: React.FC<StockItemUnitsEditProps> = ({
         }
       />
       <DispensingPackageMeasurement
-        dispensingUnitPackagingUoMUuid={stockItem?.purchasePriceUoMUuid}
+        dispensingUnitPackagingUoMUuid={
+          stockItem?.defaultStockOperationsUoMUuid
+        }
         name="defaultStockOperationsUoMUuid"
         controllerName="defaultStockOperationsUoMUuid"
         control={control}

package/src/stock-operations/add-stock-operation/stock-items-addition-row.component.tsx

@@ -194,7 +194,10 @@ const StockItemsAdditionRow: React.FC<StockItemsAdditionRowProps> = ({
                     <BatchNoSelector
                       batchUuid={row?.stockBatchUuid}
                       onBatchNoChanged={(item) => {
-                        setValue(`stockItems.${index}.batchNo`, item?.batchNo);
+                        setValue(
+                          `stockItems.${index}.batchNo`,
+                          item?.batchNo ?? ""
+                        );
                         setValue(
                           `stockItems.${index}.expiration`,
                           item?.expiration
@@ -207,6 +210,7 @@ const StockItemsAdditionRow: React.FC<StockItemsAdditionRowProps> = ({
                       controllerName={`stockItems.${index}.stockBatchUuid`}
                       name={`stockItems.${index}.stockBatchUuid`}
                       stockItemUuid={row.stockItemUuid}
+                      selectedItem={stockItemUuid}
                     />
                   )}
                 {!(

package/src/stock-operations/batch-no-selector/batch-no-selector.component.tsx

@@ -1,10 +1,10 @@
-import React, { ReactNode, useEffect, useMemo } from "react";
+import React, { ReactNode, useEffect, useMemo, useState } from "react";
 import { Control, Controller, FieldValues } from "react-hook-form";
 import { ComboBox, InlineLoading } from "@carbon/react";
 import { useStockItemBatchNos } from "./batch-no-selector.resource";
 import { StockBatchDTO } from "../../core/api/types/stockItem/StockBatchDTO";
 import { useStockItemBatchInformationHook } from "../../stock-items/add-stock-item/batch-information/batch-information.resource";
-import { ResourceRepresentation } from "../../core/api/api";
+import { useTranslation } from "react-i18next";
 
 interface BatchNoSelectorProps<T> {
   placeholder?: string;
@@ -14,6 +14,7 @@ interface BatchNoSelectorProps<T> {
   title?: string;
   invalid?: boolean;
   invalidText?: ReactNode;
+  selectedItem?: string;
 
   // Control
   controllerName: string;
@@ -25,6 +26,12 @@ const BatchNoSelector = <T,>(props: BatchNoSelectorProps<T>) => {
   const { isLoading, stockItemBatchNos } = useStockItemBatchNos(
     props.stockItemUuid
   );
+  const [validationMessage, setValidationMessage] = useState<string | null>(
+    null
+  );
+  const [selectedItem, setSelectedItem] = useState<StockBatchDTO | null>(null);
+  const { t } = useTranslation();
+
   const initialSelectedItem = useMemo(
     () =>
       stockItemBatchNos?.find(
@@ -52,23 +59,31 @@ const BatchNoSelector = <T,>(props: BatchNoSelectorProps<T>) => {
     return item;
   });
 
+  useEffect(() => {
+    if (
+      !isLoading &&
+      stockItemBatchNos &&
+      props.selectedItem &&
+      stockItemBatchNos.length === 0
+    ) {
+      setValidationMessage(
+        "No stock batch numbers defined. Do a initial/receipt stock operation first."
+      );
+    } else {
+      setValidationMessage(null);
+    }
+  }, [isLoading, stockItemBatchNos, props.selectedItem]);
+
   if (isLoading) return <InlineLoading status="active" />;
 
   return (
-    <div
-      style={{
-        display: "flex",
-        flexDirection: "row",
-      }}
-    >
+    <div style={{ display: "flex", flexDirection: "column" }}>
       <Controller
         name={props.controllerName}
         control={props.control}
         render={({ field: { onChange, ref } }) => (
           <ComboBox
-            style={{
-              flexGrow: "1",
-            }}
+            style={{ flexGrow: "1" }}
             titleText={props.title}
             name={props.name}
             control={props.control}
@@ -77,6 +92,7 @@ const BatchNoSelector = <T,>(props: BatchNoSelectorProps<T>) => {
             size={"sm"}
             items={stockItemBatchesInfo || []}
             onChange={(data: { selectedItem?: StockBatchDTO }) => {
+              setSelectedItem(data.selectedItem || null);
               props.onBatchNoChanged?.(data.selectedItem);
               onChange(data.selectedItem?.uuid);
             }}
@@ -92,6 +108,11 @@ const BatchNoSelector = <T,>(props: BatchNoSelectorProps<T>) => {
         )}
       />
       {isLoading && <InlineLoading status="active" />}
+      {validationMessage && (
+        <div style={{ color: "red", marginTop: "8px" }}>
+          {t(validationMessage)}
+        </div>
+      )}
     </div>
   );
 };