@openmrs/esm-stock-management-app 1.0.1-pre.411 → 1.0.1-pre.413

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

@@ -32,9 +32,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1033865,
+      "size": 1033664,
       "sizes": {
-        "javascript": 1033655,
+        "javascript": 1033454,
         "consume-shared": 210
       },
       "names": [],
@@ -48,7 +48,7 @@
       "auxiliaryFiles": [
         "39.js.map"
       ],
-      "hash": "36d7594192fbb296",
+      "hash": "18c3174bdcd2453a",
       "childrenByOrder": {}
     },
     {
@@ -110,10 +110,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4725045,
+      "size": 4724844,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4703097,
+        "javascript": 4702896,
         "share-init": 252,
         "runtime": 21444
       },
@@ -130,7 +130,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "ae5edd249b6c153d",
+      "hash": "698d620af01dedda",
       "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-management-dashboard","slot":"stock-management-dashboard-slot","component":"stockManagementDashboard"},{"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":"stockManagement","route":"stock-management"}],"version":"1.0.1-pre.411"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-management-dashboard","slot":"stock-management-dashboard-slot","component":"stockManagementDashboard"},{"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":"stockManagement","route":"stock-management"}],"version":"1.0.1-pre.413"}

package/package.json

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

package/src/constants.ts

@@ -110,7 +110,6 @@ export const PRINT_LOGO =
 export const PRINT_LOGO_TEXT = "Ministry of Health";
 
 export const MAIN_STORE_LOCATION_TAG = "Main Store";
-
 export const BASE_OPENMRS_APP_URL = "/openmrs/";
 
 export const STOCKMGMT_RESOURCE_URL = "/openmrs/stockmanagement/spa.page/";

package/src/stock-items/add-stock-item/stock-item-rules/add-stock-rules.component.tsx

@@ -15,7 +15,7 @@ import React, { ChangeEvent, useCallback, useState, useEffect } from "react";
 import styles from "./add-stock-rules.scss";
 import {
   useRoles,
-  useStockLocations,
+  useStockTagLocations,
 } from "../../../stock-lookups/stock-lookups.resource";
 import { createOrUpdateStockRule } from "./stock-rules.resource";
 import { StockRule } from "../../../core/api/types/stockItem/StockRule";
@@ -38,7 +38,6 @@ const StockRulesAddOrUpdate: React.FC<AddStockRuleProps> = ({
   stockItemUuid,
 }) => {
   const { t } = useTranslation();
-  console.warn("Got stock id: ", stockItemUuid);
 
   const [stockItemFilter, setStockItemFilter] =
     useState<StockItemInventoryFilter>({
@@ -59,10 +58,7 @@ const StockRulesAddOrUpdate: React.FC<AddStockRuleProps> = ({
 
   const { items: dispensingUnits } = useStockItemPackagingUOMs(stockItemFilter);
 
-  //locations
-  const {
-    locations: { results: locations },
-  } = useStockLocations({ v: ResourceRepresentation.Default });
+  const { stockLocations } = useStockTagLocations();
 
   //Roles
   const {
@@ -113,8 +109,10 @@ const StockRulesAddOrUpdate: React.FC<AddStockRuleProps> = ({
   };
 
   const onLocationChange = (evt: ChangeEvent<HTMLSelectElement>) => {
-    const selectedLocation = locations.find((x) => x.uuid === evt.target.value);
-    setFormModel({ ...formModel, locationUuid: selectedLocation.uuid });
+    const selectedLocation = stockLocations.find(
+      (x) => x.id === evt.target.value
+    );
+    setFormModel({ ...formModel, locationUuid: selectedLocation.id });
   };
 
   const onQuantityUnitChange = (evt: ChangeEvent<HTMLSelectElement>) => {
@@ -217,12 +215,12 @@ const StockRulesAddOrUpdate: React.FC<AddStockRuleProps> = ({
                     value=""
                     text={t("chooseLocation", "Choose the location")}
                   />
-                  {locations?.map((location) => {
+                  {stockLocations?.map((location) => {
                     return (
                       <SelectItem
-                        key={location.uuid}
-                        value={location.uuid}
-                        text={location.display}
+                        key={location.id}
+                        value={location.id}
+                        text={location.name}
                       />
                     );
                   })}