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

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

@@ -85,10 +85,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5455010,
+      "size": 5466293,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 5433060,
+        "javascript": 5444343,
         "share-init": 252,
         "runtime": 21446
       },
@@ -105,7 +105,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "a6543a485c11a757",
+      "hash": "33627f87b927e8a1",
       "childrenByOrder": {}
     },
     {
@@ -367,9 +367,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1786583,
+      "size": 1797866,
       "sizes": {
-        "javascript": 1786373,
+        "javascript": 1797656,
         "consume-shared": 210
       },
       "names": [],
@@ -383,7 +383,7 @@
       "auxiliaryFiles": [
         "769.js.map"
       ],
-      "hash": "7b4f5169d581d958",
+      "hash": "5a7cd03d178e7659",
       "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.586"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-stock-management-app",
-  "version": "1.0.1-pre.575",
+  "version": "1.0.1-pre.586",
   "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

@@ -18,7 +18,7 @@ export const configSchema = {
   stockAdjustmentReasonUUID: {
     _type: Type.ConceptUuid,
     _description: "UUID for the stock adjustment reasons",
-    _default: "3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25",
+    _default: "47f0825e-8648-47c2-b847-d3197ed6bb72",
   },
   stockSourceTypeUUID: {
     _type: Type.ConceptUuid,

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-items/add-stock-item/transactions/transactions.component.tsx

@@ -21,6 +21,7 @@ import TransactionsLocationsFilter from "./transaction-filters/transaction-locat
 import { useForm } from "react-hook-form";
 import { StockItemInventoryFilter } from "../../stock-items.resource";
 import { useTranslation } from "react-i18next";
+import { StockOperationDTO } from "../../../core/api/types/stockOperation/StockOperationDTO";
 
 interface TransactionsProps {
   onSubmit?: () => void;
@@ -124,6 +125,10 @@ const Transactions: React.FC<TransactionsProps> = ({ stockItemUuid }) => {
           operationUuid={stockItemTransaction?.stockOperationUuid}
           operationNumber={stockItemTransaction?.stockOperationNumber}
           operations={operations}
+          model={undefined}
+          onEdit={function (operation: StockOperationDTO): void {
+            throw new Error("Function not implemented.");
+          }}
         />
       ) : (
         <></>

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);
@@ -193,9 +197,7 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
                 t,
                 model,
                 props.isEditing,
-                props.operation,
-                props.operations,
-                props.canPrint
+                props.operation
               );
             },
 

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

@@ -1,3 +1,4 @@
+/* eslint-disable prefer-const */
 import { StockOperationDTO } from "../../core/api/types/stockOperation/StockOperationDTO";
 import { initialStockOperationValue } from "../../core/utils/utils";
 import { MAIN_STORE_LOCATION_TAG, today } from "../../constants";
@@ -58,6 +59,27 @@ export async function initializeNewStockOperation(
   let sourcePartyList: Party[] | null | undefined;
   let destinationPartyList: Party[] | null | undefined;
 
+  const partyList = await getParties();
+  if (!partyList.ok) throw Error("Error loading parties");
+  sourcePartyList = partyList?.data?.results?.filter(
+    (p) =>
+      (p.locationUuid &&
+        currentStockOperationType?.sourceType === LocationTypeLocation &&
+        (sourceTags.length === 0 ||
+          (p.tags && sourceTags.some((x) => p.tags.includes(x))))) ||
+      (p.stockSourceUuid &&
+        currentStockOperationType?.sourceType === LocationTypeOther)
+  );
+  destinationPartyList = partyList?.data?.results?.filter(
+    (p) =>
+      (p.locationUuid &&
+        currentStockOperationType?.destinationType === LocationTypeLocation &&
+        (destinationTags.length === 0 ||
+          (p.tags && destinationTags.some((x) => p.tags.includes(x))))) ||
+      (p.stockSourceUuid &&
+        currentStockOperationType?.destinationType === LocationTypeOther)
+  );
+
   if (isNew) {
     model = structuredClone(initialStockOperationValue());
     model = Object.assign(model, {
@@ -66,22 +88,6 @@ export async function initializeNewStockOperation(
       operationTypeUuid: currentStockOperationType?.uuid,
       operationType: currentStockOperationType?.operationType,
     });
-    const partyList = await getParties();
-
-    if (!partyList.ok) throw Error("Error loading parties");
-    const filteredPartyList = partyList.data?.results?.filter(
-      (party) => party.stockSourceUuid !== null
-    );
-
-    sourcePartyList = partyList?.data?.results?.filter(
-      (p) =>
-        (p.locationUuid &&
-          currentStockOperationType?.sourceType === LocationTypeLocation &&
-          (sourceTags.length === 0 ||
-            (p.tags && sourceTags.some((x) => p.tags.includes(x))))) ||
-        (p.stockSourceUuid &&
-          currentStockOperationType?.sourceType === LocationTypeOther)
-    );
     if (currentStockOperationType?.hasSource) {
       if (isNew && shouldLockSource && sourcePartyList?.length > 0) {
         const party = sourcePartyList[0];
@@ -92,17 +98,6 @@ export async function initializeNewStockOperation(
     }
 
     if (currentStockOperationType?.hasDestination) {
-      destinationPartyList = partyList?.data?.results?.filter(
-        (p) =>
-          (p.locationUuid &&
-            currentStockOperationType?.destinationType ===
-              LocationTypeLocation &&
-            (destinationTags.length === 0 ||
-              (p.tags && destinationTags.some((x) => p.tags.includes(x))))) ||
-          (p.stockSourceUuid &&
-            currentStockOperationType?.destinationType === LocationTypeOther)
-      );
-
       if (isNew && shouldLockDestination && destinationPartyList?.length > 0) {
         const party = destinationPartyList[0];
         model.destinationUuid = party.uuid;
@@ -110,6 +105,7 @@ export async function initializeNewStockOperation(
       }
     }
   } else {
+    model = stockOperation!;
     const response = await getStockOperationTypes();
     if (response.ok) {
       operationTypes = response.data.results;