@openmrs/esm-stock-management-app 3.1.1-pre.987 → 3.1.1-pre.991

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

@@ -895,9 +895,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1193640,
+      "size": 1194726,
       "sizes": {
-        "javascript": 1193640
+        "javascript": 1194726
       },
       "names": [],
       "idHints": [],
@@ -910,7 +910,7 @@
       "auxiliaryFiles": [
         "5125.js.map"
       ],
-      "hash": "208cdc75a033cb08",
+      "hash": "c7ede212e13afcf6",
       "childrenByOrder": {}
     },
     {
@@ -962,9 +962,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 334993,
+      "size": 336072,
       "sizes": {
-        "javascript": 334993
+        "javascript": 336072
       },
       "names": [],
       "idHints": [],
@@ -978,7 +978,7 @@
       "auxiliaryFiles": [
         "5333.js.map"
       ],
-      "hash": "131480481d40bf8e",
+      "hash": "bf2aedda0f392192",
       "childrenByOrder": {}
     },
     {
@@ -1539,10 +1539,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5542284,
+      "size": 5543370,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 5520049,
+        "javascript": 5521135,
         "share-init": 336,
         "runtime": 21689
       },
@@ -1559,7 +1559,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "75bd8aca6005378b",
+      "hash": "48c2a1c503274239",
       "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":"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-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"modals":[{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"expired-stock-modal","component":"expiredStockModal"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsModal"},{"name":"receiving-stock-modal","component":"receivingStockModal"},{"name":"stock-operations-modal","component":"stockOperationsModal"},{"name":"transactions-print-bincard-preview-modal","component":"transactionBincardPrintPreviewModal"},{"name":"transactions-print-stockcard-preview-modal","component":"transactionStockcardPrintPreviewModal"}],"workspaces":[{"name":"stock-operation-form-workspace","component":"stockOperationFormWorkspace","title":"Stock Operation","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-item-rules-form-workspace","component":"stockItemRulesFormWorkspace","title":"Stock Item Rules","type":"form"},{"name":"stock-item-form-workspace","component":"stockItemFormWorkspace","title":"Stock Items","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-sources-form-workspace","component":"stockSourcesFormWorkspace","title":"Stock Sources","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-location-form-workspace","component":"stockLocationsFormWorkspace","title":"Stock Locations","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-user-role-scopes-form-workspace","component":"stockUserScopesFormWorkspace","title":"User Role Scopes","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-reports-form-workspace","component":"stockReportsFormWorkspace","title":"Reports","type":"form","canMaximize":true,"width":"extra-wide"}],"pages":[{"component":"root","route":"stock-management"}],"version":"3.1.1-pre.987"}
+{"$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":"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-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"modals":[{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"expired-stock-modal","component":"expiredStockModal"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsModal"},{"name":"receiving-stock-modal","component":"receivingStockModal"},{"name":"stock-operations-modal","component":"stockOperationsModal"},{"name":"transactions-print-bincard-preview-modal","component":"transactionBincardPrintPreviewModal"},{"name":"transactions-print-stockcard-preview-modal","component":"transactionStockcardPrintPreviewModal"}],"workspaces":[{"name":"stock-operation-form-workspace","component":"stockOperationFormWorkspace","title":"Stock Operation","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-item-rules-form-workspace","component":"stockItemRulesFormWorkspace","title":"Stock Item Rules","type":"form"},{"name":"stock-item-form-workspace","component":"stockItemFormWorkspace","title":"Stock Items","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-sources-form-workspace","component":"stockSourcesFormWorkspace","title":"Stock Sources","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-location-form-workspace","component":"stockLocationsFormWorkspace","title":"Stock Locations","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-user-role-scopes-form-workspace","component":"stockUserScopesFormWorkspace","title":"User Role Scopes","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-reports-form-workspace","component":"stockReportsFormWorkspace","title":"Reports","type":"form","canMaximize":true,"width":"extra-wide"}],"pages":[{"component":"root","route":"stock-management"}],"version":"3.1.1-pre.991"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-stock-management-app",
-  "version": "3.1.1-pre.987",
+  "version": "3.1.1-pre.991",
   "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/StockBatchDTO.ts

@@ -6,3 +6,12 @@ export interface StockBatchDTO {
   quantity: string;
   voided: boolean;
 }
+
+export interface StockBatchWithUoM extends StockBatchDTO {
+  quantityUoM?: string;
+  quantityFactor?: string;
+  quantityUoMUuid?: string;
+  partyName?: string;
+  locationUuid?: string;
+  partyUuid?: string;
+}

package/src/stock-home/stock-home-metrics.component.tsx

@@ -6,15 +6,15 @@ import { useDisposalList } from './useDisposalList';
 import { useStockInventory } from './stock-home-inventory-expiry.resource';
 import { useStockInventoryItems } from './stock-home-inventory-items.resource';
 import { type StockOperationFilter } from '../stock-operations/stock-operations.resource';
-import useStockList from './useStockList';
+import useStockList, { useOutOfStockList } from './useStockList';
 import MetricsCard from '../core/components/card/metrics-card-component';
 import styles from './stock-home.scss';
 
 const StockManagementMetrics: React.FC = (filter: StockOperationFilter) => {
   const { t } = useTranslation();
-  const { stockList: allStocks, error } = useStockList();
   const { items: expiryItems } = useStockInventory();
   const { items: stockItems } = useStockInventoryItems();
+  const { totalOutOfStock, error: outOfStockError } = useOutOfStockList();
 
   const currentDate = new Date();
 
@@ -39,8 +39,8 @@ const StockManagementMetrics: React.FC = (filter: StockOperationFilter) => {
     totalCount: true,
   });
 
-  if (error) {
-    return <ErrorState headerTitle={t('errorStockMetric', 'Error fetching stock metrics')} error={error} />;
+  if (outOfStockError) {
+    return <ErrorState headerTitle={t('errorStockMetric', 'Error fetching stock metrics')} error={outOfStockError} />;
   }
 
   const filteredItems =
@@ -64,7 +64,7 @@ const StockManagementMetrics: React.FC = (filter: StockOperationFilter) => {
           itemsBelowMin: [],
           itemsAboveMax: [],
         }}
-        value={allStocks?.length}
+        value={totalOutOfStock}
       />
       <MetricsCard
         disposedCount={{

package/src/stock-home/useStockList.tsx

@@ -1,5 +1,6 @@
 import useSWR from 'swr';
-import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
+import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
+import { type OutofStockListResponse } from '../types';
 
 interface StockList {
   uuid: string;
@@ -31,3 +32,18 @@ const useStockList = () => {
 };
 
 export default useStockList;
+
+export const useOutOfStockList = () => {
+  const url = `${restBaseUrl}/stockmanagement/metrics/outofstockitemstotal`;
+  const { data, error, isLoading, mutate } = useSWR<FetchResponse<OutofStockListResponse>>(url, openmrsFetch);
+
+  const totalOutOfStock = data?.data.results?.reduce((total, item) => total + item.outOfStock, 0) ?? 0;
+
+  return {
+    outOfStockItemsList: data?.data.results ?? [],
+    totalOutOfStock,
+    isLoading,
+    error,
+    mutate,
+  };
+};

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

@@ -1,7 +1,7 @@
-import React, { useEffect, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ComboBox, SelectSkeleton } from '@carbon/react';
-import { type StockBatchDTO } from '../../../core/api/types/stockItem/StockBatchDTO';
+import { type StockBatchWithUoM } from '../../../core/api/types/stockItem/StockBatchDTO';
 import { formatForDatePicker } from '../../../constants';
 import { useStockItemBatchInformationHook } from '../../../stock-items/add-stock-item/batch-information/batch-information.resource';
 import { useStockItemBatchNumbers } from '../hooks/useStockItemBatchNumbers';
@@ -16,7 +16,6 @@ interface BatchNoSelectorProps {
 const BatchNoSelector: React.FC<BatchNoSelectorProps> = ({ stockItemUuid, error, initialValue, onValueChange }) => {
   const { isLoading, stockItemBatchNos } = useStockItemBatchNumbers(stockItemUuid);
   const { t } = useTranslation();
-
   const { items, setStockItemUuid, isLoading: isLoadingBatchinfo } = useStockItemBatchInformationHook();
 
   useEffect(() => {
@@ -24,46 +23,93 @@ const BatchNoSelector: React.FC<BatchNoSelectorProps> = ({ stockItemUuid, error,
   }, [stockItemUuid, setStockItemUuid]);
 
   const stockItemBatchesInfo = useMemo(() => {
-    return stockItemBatchNos?.map((item) => {
+    if (!stockItemBatchNos) return [];
+
+    return stockItemBatchNos.map((item) => {
       const matchingBatch = items?.find((batch) => batch.batchNumber === item.batchNo);
-      if (matchingBatch) {
-        return {
-          ...item,
-          quantity: matchingBatch.quantity ?? '',
-        };
-      }
-      return item;
+
+      return matchingBatch
+        ? ({
+            ...item,
+            ...matchingBatch,
+            quantity: String(matchingBatch.quantity),
+          } as StockBatchWithUoM)
+        : (item as StockBatchWithUoM);
     });
   }, [stockItemBatchNos, items]);
 
   const filteredBatches = useMemo(() => {
-    return stockItemBatchesInfo?.filter((s) => s.quantity !== undefined && s.quantity !== 0);
+    if (!stockItemBatchesInfo) return [];
+
+    return stockItemBatchesInfo.filter((batch) => {
+      const quantity = typeof batch.quantity === 'string' ? parseFloat(batch.quantity) : batch.quantity;
+
+      return !isNaN(quantity) && quantity > 0;
+    });
   }, [stockItemBatchesInfo]);
+
   const initialSelectedItem = useMemo(
-    () => filteredBatches?.find((s) => s.uuid === initialValue),
+    () => filteredBatches.find((batch) => batch.uuid === initialValue) ?? null,
     [filteredBatches, initialValue],
   );
 
-  if (isLoading || isLoadingBatchinfo) return <SelectSkeleton role="progressbar" />;
+  const formatQuantityDisplay = useCallback(
+    (batch: StockBatchWithUoM): string => {
+      if (batch.quantity === undefined) return t('unknown', 'Unknown');
+
+      const quantity = typeof batch.quantity === 'string' ? parseFloat(batch.quantity) : batch.quantity;
+
+      if (isNaN(quantity)) return t('unknown', 'Unknown');
+
+      const baseQuantity = quantity.toString();
+
+      if (!batch.quantityUoM) return baseQuantity;
+
+      const withUnit = `${baseQuantity} ${batch.quantityUoM}`;
+
+      if (!batch.quantityFactor) return withUnit;
+
+      const factor = parseFloat(batch.quantityFactor);
+      return !isNaN(factor) && factor > 1 ? `${withUnit} (${factor} units each)` : withUnit;
+    },
+    [t],
+  );
+
+  const itemToString = useCallback(
+    (batch: StockBatchWithUoM | null): string => {
+      if (!batch?.batchNo) return '';
+
+      const quantityDisplay = formatQuantityDisplay(batch);
+      const expiryDate = batch.expiration ? formatForDatePicker(batch.expiration) : t('noExpiry', 'No expiry');
+
+      return `${batch.batchNo} | Qty: ${quantityDisplay} | Expiry: ${expiryDate}`;
+    },
+    [formatQuantityDisplay, t],
+  );
+
+  const handleChange = useCallback(
+    (data: { selectedItem?: StockBatchWithUoM | null }) => {
+      onValueChange?.(data.selectedItem?.uuid ?? '');
+    },
+    [onValueChange],
+  );
+
+  if (isLoading || isLoadingBatchinfo) {
+    return <SelectSkeleton role="progressbar" />;
+  }
 
   return (
     <ComboBox
-      id={'stockBatchUuid'}
+      id="stockBatchUuid"
       invalid={!!error}
       invalidText={error}
-      items={filteredBatches || []}
-      itemToString={(s: StockBatchDTO) =>
-        s?.batchNo
-          ? `${s?.batchNo} | Qty: ${s?.quantity ?? 'Unknown'} | Expiry: ${formatForDatePicker(s.expiration)}`
-          : ''
-      }
-      name={'stockBatchUuid'}
-      onChange={(data: { selectedItem?: StockBatchDTO }) => {
-        onValueChange(data.selectedItem?.uuid);
-      }}
-      placeholder={t('filter', "'Filter") + '...'}
+      items={filteredBatches}
+      itemToString={itemToString}
+      name="stockBatchUuid"
+      onChange={handleChange}
+      placeholder={`${t('filter', 'Filter')}...`}
       selectedItem={initialSelectedItem}
-      style={{ flexGrow: '1' }}
+      style={{ flexGrow: 1 }}
       titleText={t('batchNo', 'Batch no.')}
     />
   );

package/src/types/index.ts

@@ -3,3 +3,13 @@ export interface DashboardConfig {
   slot: string;
   title: string;
 }
+
+export interface OutofStockListResponse {
+  results: Array<{
+    partyUuid: string;
+    locationUuid: string;
+    partyId: number;
+    partyName: string;
+    outOfStock: number;
+  }>;
+}