@openmrs/esm-stock-management-app 1.0.1-pre.767 → 1.0.1-pre.777

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

@@ -134,10 +134,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5677175,
+      "size": 5678550,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 5655226,
+        "javascript": 5656601,
         "share-init": 252,
         "runtime": 21445
       },
@@ -154,7 +154,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "f65db32b2bbe6fac",
+      "hash": "3870ff843140bc68",
       "childrenByOrder": {}
     },
     {
@@ -254,9 +254,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1944670,
+      "size": 1946045,
       "sizes": {
-        "javascript": 1944460,
+        "javascript": 1945835,
         "consume-shared": 210
       },
       "names": [],
@@ -270,7 +270,7 @@
       "auxiliaryFiles": [
         "400.js.map"
       ],
-      "hash": "3ecc97c33bdaad79",
+      "hash": "40c1de922e3675ef",
       "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-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":"import-bulk-stock-items","component":"importBulkStockItemsModal"},{"name":"stock-operation-dialog","component":"stockOperationModal"},{"name":"transactions-print-bincard-preview-modal","component":"transactionBincardPrintPreviewModal"},{"name":"transactions-print-stockcard-preview-modal","component":"transactionStockcardPrintPreviewModal"}],"pages":[{"component":"root","route":"stock-management"}],"version":"1.0.1-pre.767"}
+{"$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-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":"import-bulk-stock-items","component":"importBulkStockItemsModal"},{"name":"stock-operation-dialog","component":"stockOperationModal"},{"name":"transactions-print-bincard-preview-modal","component":"transactionBincardPrintPreviewModal"},{"name":"transactions-print-stockcard-preview-modal","component":"transactionStockcardPrintPreviewModal"}],"pages":[{"component":"root","route":"stock-management"}],"version":"1.0.1-pre.777"}

package/package.json

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

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

@@ -71,8 +71,8 @@ const StockManagementMetrics: React.FC = (filter: StockOperationFilter) => {
           headerLabel={t('highestServiceVolume', 'Out of Stock ')}
           view="items"
           outofstockCount={{
-            itemsbelowmin: ['0'],
-            itemsabovemax: ['0'],
+            itemsbelowmin: [],
+            itemsabovemax: [],
           }}
         />
         <MetricsCard

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

@@ -242,6 +242,30 @@ const StockItemsAdditionRow: React.FC<StockItemsAdditionRowProps> = ({
                         />
                       </DatePicker>
                     )}
+                  {requiresBatchUuid && !requiresActualBatchInformation && canEdit && (
+                    <DatePicker
+                      id={`expiration-${row.uuid}`}
+                      datePickerType="single"
+                      minDate={formatForDatePicker(today())}
+                      readOnly={true}
+                      locale="en"
+                      dateFormat={DATE_PICKER_CONTROL_FORMAT}
+                      onChange={([newDate]) => {
+                        setValue(`stockItems.${index}.expiration`, newDate);
+                      }}
+                    >
+                      <DatePickerInput
+                        size="sm"
+                        autoComplete="off"
+                        id={`expiration-input-${row.uuid}`}
+                        name="operationDate"
+                        placeholder={DATE_PICKER_FORMAT}
+                        value={formatForDatePicker(stockItemExpiry)}
+                        defaultValue={formatForDatePicker(stockItemExpiry)}
+                        invalid={!!errors?.stockItems?.[index]?.expiration}
+                      />
+                    </DatePicker>
+                  )}
                   {((!(canUpdateBatchInformation && row?.permission?.canUpdateBatchInformation) && !canEdit) ||
                     requiresBatchUuid) &&
                     formatForDatePicker(row.expiration)}

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

@@ -5,6 +5,7 @@ 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 { useTranslation } from 'react-i18next';
+import { formatForDatePicker } from '../../constants';
 
 interface BatchNoSelectorProps<T> {
   placeholder?: string;
@@ -88,7 +89,11 @@ const BatchNoSelector = <T,>(props: BatchNoSelectorProps<T>) => {
               onChange(data.selectedItem?.uuid);
             }}
             initialSelectedItem={initialSelectedItem}
-            itemToString={(s: StockBatchDTO) => (s?.batchNo ? `${s?.batchNo} | Qty: ${s?.quantity ?? 'Unknown'}` : '')}
+            itemToString={(s: StockBatchDTO) =>
+              s?.batchNo
+                ? `${s?.batchNo} | Qty: ${s?.quantity ?? 'Unknown'} | Expiry: ${formatForDatePicker(s.expiration)}`
+                : ''
+            }
             placeholder={props.placeholder}
             invalid={props.invalid}
             invalidText={props.invalidText}