@openmrs/esm-stock-management-app 1.0.1-pre.575 → 1.0.1-pre.581

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

@@ -85,10 +85,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5455010,
+      "size": 5462033,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 5433060,
+        "javascript": 5440083,
         "share-init": 252,
         "runtime": 21446
       },
@@ -105,7 +105,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "a6543a485c11a757",
+      "hash": "be3e73b29e57c5a8",
       "childrenByOrder": {}
     },
     {
@@ -367,9 +367,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1786583,
+      "size": 1793606,
       "sizes": {
-        "javascript": 1786373,
+        "javascript": 1793396,
         "consume-shared": 210
       },
       "names": [],
@@ -383,7 +383,7 @@
       "auxiliaryFiles": [
         "769.js.map"
       ],
-      "hash": "7b4f5169d581d958",
+      "hash": "e2537e91c7068592",
       "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.575"}
+{"$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.581"}

package/package.json

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

package/src/core/api/types/stockItem/StockItemInventory.ts

@@ -8,4 +8,5 @@ export interface StockItemInventory {
   quantityUoM: string;
   quantityFactor: string;
   expiration: Date;
+  quantityUoMUuid?: string;
 }

package/src/stock-operations/add-stock-operation/add-stock-operation.component.tsx

@@ -64,7 +64,11 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
     ) {
       setRequisition(props.model?.uuid);
     }
-  }, [currentStockOperationType, props.model?.operationType]);
+  }, [
+    currentStockOperationType,
+    props.model?.operationType,
+    props.model?.uuid,
+  ]);
 
   useEffect(() => {
     if (
@@ -79,7 +83,7 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
         setOperationLinks(resp.data?.results);
       });
     }
-  }, [currentStockOperationType, requisition, props.model?.uuid]);
+  }, [currentStockOperationType, requisition, props.model?.uuid, isEditing]);
 
   const [selectedIndex, setSelectedIndex] = useState(0);
   const [canDisplayReceivedItems, setCanDisplayReceivedItems] = useState(false);

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

@@ -12,6 +12,7 @@ import {
 } from "@carbon/react";
 import { TrashCan } from "@carbon/react/icons";
 import { StockOperationItemFormData } from "../validation-schema";
+import QtyUomSelector from "../qty-uom-selector/qty-uom-selector.component";
 import StockItemSelector from "../stock-item-selector/stock-item-selector.component";
 import {
   Control,
@@ -33,8 +34,11 @@ import { StockItemPackagingUOMDTO } from "../../core/api/types/stockItem/StockIt
 import { StockItemInventory } from "../../core/api/types/stockItem/StockItemInventory";
 import { StockOperationItemDTO } from "../../core/api/types/stockOperation/StockOperationItemDTO";
 import { StockItemDTO } from "../../core/api/types/stockItem/StockItem";
-import QtyUomSelector from "../qty-uom-selector/qty-uom-selector.component";
 import BatchNoSelector from "../batch-no-selector/batch-no-selector.component";
+import {
+  getStockItemInventory,
+  StockItemInventoryFilter,
+} from "../stock-operations.resource";
 
 import styles from "./stock-items-addition-row.scss";
 
@@ -46,6 +50,8 @@ interface StockItemsAdditionRowProps {
   requiresBatchUuid?: boolean;
   canUpdateBatchInformation?: boolean;
   canCapturePurchasePrice?: boolean;
+  stockOperationUuid?: string;
+  locationUuid?: string;
   batchNos?: {
     [key: string]: StockBatchDTO[];
   };
@@ -86,19 +92,26 @@ const StockItemsAdditionRow: React.FC<StockItemsAdditionRowProps> = ({
   requiresBatchUuid,
   canUpdateBatchInformation,
   canCapturePurchasePrice,
-  batchBalance,
   control,
   setValue,
   errors,
   remove,
   fields,
+  stockOperationUuid,
+  locationUuid,
 }) => {
   const [stockItemUuid, setStockItemUuid] = useState<
     string | null | undefined
   >();
-  const [stockItemExpiry, setStockItemExpiy] = useState<
-    Date | null | undefined
-  >();
+
+  const [batchBalances, setBatchBalances] = useState<{ [key: number]: any }>(
+    {}
+  );
+  const [stockItemExpiries, setStockItemExpiries] = useState<{
+    [key: number]: Date | null | undefined;
+  }>({});
+
+  const [qtyInputErrors, setQtyErrors] = useState({});
 
   const handleStockItemChange = (index: number, data?: StockItemDTO) => {
     if (!data) return;
@@ -125,16 +138,99 @@ const StockItemsAdditionRow: React.FC<StockItemsAdditionRowProps> = ({
       item.stockItemPackagingUOMName = null;
 
       item.stockBatchUuid = null;
-      if (requiresBatchUuid) {
-        // handleStockBatchSearch(row, "", data.selectedItem?.uuid);
-      }
+
+      setValue(`stockItems.${index}.stockItemUuid`, item?.stockItemUuid);
+      setValue(`stockItems.${index}.stockItemName`, item?.stockItemName);
+    }
+  };
+
+  const handleFetchBatchBalance = ({
+    stockItemUuid,
+    stockBatchUuid,
+    index,
+    excludeExpired = true,
+  }) => {
+    const filters: StockItemInventoryFilter = {
+      stockBatchUuid,
+      stockItemUuid,
+      stockOperationUuid,
+      excludeExpired,
+      locationUuid,
+      groupBy: "LocationStockItemBatchNo",
+    };
+    if (stockBatchUuid) {
+      getStockItemInventory(filters)
+        .then(({ data }) => data)
+        .then((res: any) => {
+          if ((res as any).error) {
+            return;
+          }
+          const inventory: StockItemInventory = (
+            res?.results as StockItemInventory[]
+          )?.[0];
+
+          const newBatchBalance = inventory
+            ? {
+                quantity: inventory.quantity,
+                quantityUoM: inventory.quantityUoM,
+                quantityUoMUuid: inventory.quantityUoMUuid,
+              }
+            : { quantity: 0, quantityUoM: null };
+
+          setBatchBalances((prevBalances) => ({
+            ...prevBalances,
+            [index]: newBatchBalance,
+          }));
+
+          setValue(
+            `stockItems.${index}.stockItemPackagingUOMUuid`,
+            inventory.quantityUoMUuid
+          );
+
+          setValue(
+            `stockItems.${index}.stockItemPackagingUOMName`,
+            inventory.quantityUoM
+          );
+        })
+        .catch((error: any) => {
+          if ((error as any).error) {
+            return;
+          }
+          return;
+        });
+    } else {
+      setBatchBalances((prevBalances) => ({
+        ...prevBalances,
+        [index]: null,
+      }));
     }
   };
 
+  const handleInputChange = (e: any, index: number) => {
+    const inputValue = e?.target?.value;
+    const maxQuantity = Number(batchBalances[index]?.quantity);
+
+    if (inputValue > maxQuantity) {
+      setQtyErrors((prevErrors) => ({
+        ...prevErrors,
+        [`stockItems.${index}.quantity`]: `Quantity cannot exceed ${maxQuantity}`,
+      }));
+    } else {
+      setQtyErrors((prevErrors) => {
+        const newErrors = { ...prevErrors };
+        delete newErrors[`stockItems.${index}.quantity`];
+        return newErrors;
+      });
+    }
+    setValue(`stockItems.${index}.quantity`, inputValue);
+  };
+
   return (
     <>
       {fields?.map((row, index) => {
         const stockItemId = `stockItems.${index}.stockItemUuid`;
+        const currentBatchBalance = batchBalances[index];
+        const currentStockItemExpiry = stockItemExpiries[index];
         return (
           <TableRow
             className={isDesktop ? styles.desktopRow : styles.tabletRow}
@@ -198,11 +294,27 @@ const StockItemsAdditionRow: React.FC<StockItemsAdditionRowProps> = ({
                           `stockItems.${index}.batchNo`,
                           item?.batchNo ?? ""
                         );
+
                         setValue(
                           `stockItems.${index}.expiration`,
                           item?.expiration
                         );
-                        setStockItemExpiy(item?.expiration);
+
+                        setValue(
+                          `stockItems.${index}.hasExpiration`,
+                          item?.expiration ? true : false
+                        );
+
+                        setStockItemExpiries((prevExpiries) => ({
+                          ...prevExpiries,
+                          [index]: item?.expiration ?? null,
+                        }));
+
+                        handleFetchBatchBalance({
+                          stockItemUuid: row?.stockItemUuid,
+                          stockBatchUuid: item?.uuid,
+                          index,
+                        });
                       }}
                       placeholder={"Filter..."}
                       invalid={!!errors?.stockItems?.[index]?.stockBatchUuid}
@@ -243,7 +355,9 @@ const StockItemsAdditionRow: React.FC<StockItemsAdditionRowProps> = ({
                         id={`expiration-input-${row.uuid}`}
                         name="operationDate"
                         placeholder={DATE_PICKER_FORMAT}
-                        defaultValue={formatForDatePicker(row?.expiration)}
+                        defaultValue={formatForDatePicker(
+                          currentStockItemExpiry || row?.expiration
+                        )}
                         invalid={!!errors?.stockItems?.[index]?.expiration}
                       />
                     </DatePicker>
@@ -254,7 +368,7 @@ const StockItemsAdditionRow: React.FC<StockItemsAdditionRowProps> = ({
                 ) &&
                   !canEdit) ||
                   requiresBatchUuid) &&
-                  formatForDatePicker(row.expiration)}
+                  formatForDatePicker(currentStockItemExpiry || row.expiration)}
               </TableCell>
             )}
             <TableCell>
@@ -263,33 +377,36 @@ const StockItemsAdditionRow: React.FC<StockItemsAdditionRowProps> = ({
                   className="small-placeholder-text"
                   size="sm"
                   id={`qty-${row?.uuid}`}
+                  min={1}
+                  max={Number(currentBatchBalance?.quantity)}
                   hideSteppers={true}
                   allowEmpty={true}
-                  onChange={(e: any) =>
-                    setValue(`stockItems.${index}.quantity`, e?.target?.value)
-                  }
+                  onChange={(e: any) => handleInputChange(e, index)}
                   value={row?.quantity ?? ""}
-                  invalidText={errors?.stockItems?.[index]?.quantity?.message}
+                  invalidText={
+                    errors?.stockItems?.[index]?.quantity?.message ||
+                    qtyInputErrors[`stockItems.${index}.quantity`]
+                  }
                   placeholder={
                     requiresBatchUuid &&
                     !requiresActualBatchInformation &&
-                    row?.stockBatchUuid in batchBalance
+                    currentBatchBalance
                       ? `Bal: ${
-                          batchBalance[
-                            row?.stockBatchUuid
-                          ]?.quantity?.toLocaleString() ?? ""
-                        } ${
-                          batchBalance[row?.stockBatchUuid]?.quantityUoM ?? ""
-                        }`
+                          currentBatchBalance?.quantity?.toLocaleString() ?? ""
+                        } ${currentBatchBalance?.quantityUoM ?? ""}`
                       : ""
                   }
-                  invalid={!!errors?.stockItems?.[index]?.quantity}
+                  invalid={
+                    !!errors?.stockItems?.[index]?.quantity ||
+                    !!qtyInputErrors[`stockItems.${index}.quantity`]
+                  }
                 />
               )}
               {!canEdit && row?.quantity?.toLocaleString()}
             </TableCell>
+            {/* Qty UoM Cell (Non-editable) */}
             <TableCell>
-              {canEdit && (
+              {canEdit && !currentBatchBalance?.quantityUoM ? (
                 <QtyUomSelector
                   stockItemUuid={row.stockItemUuid}
                   onStockPackageChanged={(selectedItem) => {
@@ -306,10 +423,15 @@ const StockItemsAdditionRow: React.FC<StockItemsAdditionRowProps> = ({
                   controllerName={`stockItems.${index}.stockItemPackagingUOMUuid`}
                   name={`stockItems.${index}.stockItemPackagingUOMUuid`}
                 />
+              ) : currentBatchBalance?.quantityUoM ? (
+                currentBatchBalance.quantityUoM
+              ) : (
+                row?.stockItemPackagingUOMName
               )}
+
               {!canEdit && row?.stockItemPackagingUOMName}
             </TableCell>
-            {canCapturePurchasePrice && (
+            {canCapturePurchasePrice ? (
               <TableCell>
                 {canEdit && (
                   <NumberInput
@@ -330,6 +452,8 @@ const StockItemsAdditionRow: React.FC<StockItemsAdditionRowProps> = ({
                 )}
                 {!canEdit && row?.purchasePrice?.toLocaleString()}
               </TableCell>
+            ) : (
+              setValue(`stockItems.${index}.purchasePrice`, null)
             )}
             {canEdit && (
               <TableCell>

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

@@ -241,6 +241,8 @@ const StockItemsAddition: React.FC<StockItemsAdditionProps> = ({
                         { uuid: `new-item-1`, id: `new-item-1` },
                       ]
                     }
+                    stockOperationUuid={model.uuid ?? ""}
+                    locationUuid={model.atLocationUuid ?? ""}
                     batchBalance={batchBalance}
                     batchNos={batchNos}
                     control={control}

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

@@ -59,12 +59,16 @@ const BatchNoSelector = <T,>(props: BatchNoSelectorProps<T>) => {
     return item;
   });
 
+  const filteredBatches = stockItemBatchesInfo?.filter(
+    (s) => s.quantity !== undefined && s.quantity !== 0
+  );
+
   useEffect(() => {
     if (
       !isLoading &&
       stockItemBatchNos &&
       props.selectedItem &&
-      stockItemBatchNos.length === 0
+      (stockItemBatchNos.length === 0 || filteredBatches.length === 0)
     ) {
       setValidationMessage(
         "No stock batch numbers defined. Do a initial/receipt stock operation first."
@@ -72,7 +76,7 @@ const BatchNoSelector = <T,>(props: BatchNoSelectorProps<T>) => {
     } else {
       setValidationMessage(null);
     }
-  }, [isLoading, stockItemBatchNos, props.selectedItem]);
+  }, [isLoading, stockItemBatchNos, props.selectedItem, filteredBatches]);
 
   if (isLoading) return <InlineLoading status="active" />;
 
@@ -90,7 +94,7 @@ const BatchNoSelector = <T,>(props: BatchNoSelectorProps<T>) => {
             controllerName={props.controllerName}
             id={props.name}
             size={"sm"}
-            items={stockItemBatchesInfo || []}
+            items={filteredBatches || []}
             onChange={(data: { selectedItem?: StockBatchDTO }) => {
               setSelectedItem(data.selectedItem || null);
               props.onBatchNoChanged?.(data.selectedItem);
@@ -98,7 +102,7 @@ const BatchNoSelector = <T,>(props: BatchNoSelectorProps<T>) => {
             }}
             initialSelectedItem={initialSelectedItem}
             itemToString={(s: StockBatchDTO) =>
-              s?.batchNo ? `${s?.batchNo} | Qty: ${s?.quantity ?? ""}` : ""
+              s?.batchNo ? `${s?.batchNo}` : ""
             }
             placeholder={props.placeholder}
             invalid={props.invalid}

package/src/stock-operations/stock-item-selector/stock-item-selector.component.tsx

@@ -68,7 +68,7 @@ const StockItemSelector = <T,>(props: StockItemSelectorProps<T>) => {
 };
 
 function stockItemName(item: StockItemDTO): string {
-  return item.drugName || item.conceptName;
+  return item?.drugName || item?.conceptName;
 }
 
 export default StockItemSelector;

package/src/stock-operations/stock-operations.resource.ts

@@ -210,7 +210,7 @@ export function getStockOperationItemsCost(filter: StockOperationFilter) {
 export function getStockItemInventory(filter: StockItemInventoryFilter) {
   const apiUrl = `${restBaseUrl}/stockmanagement/stockiteminventory${toQueryParams(
     filter
-  )}`;
+  )}&v=default`;
   const abortController = new AbortController();
   return openmrsFetch(apiUrl, {
     method: "GET",