@openmrs/esm-stock-management-app 1.0.1-pre.469 → 1.0.1-pre.473

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

@@ -86,10 +86,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4770073,
+      "size": 4770791,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4748124,
+        "javascript": 4748842,
         "share-init": 252,
         "runtime": 21445
       },
@@ -106,7 +106,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "4584f840c7b06eb6",
+      "hash": "137fc6c0e5d30a79",
       "childrenByOrder": {}
     },
     {
@@ -138,9 +138,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1098361,
+      "size": 1099079,
       "sizes": {
-        "javascript": 1098151,
+        "javascript": 1098869,
         "consume-shared": 210
       },
       "names": [],
@@ -154,7 +154,7 @@
       "auxiliaryFiles": [
         "474.js.map"
       ],
-      "hash": "3d31f10ff5724cc8",
+      "hash": "0f9bb5a017f33892",
       "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.469"}
+{"$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.473"}

package/package.json

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

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

@@ -22,6 +22,7 @@ import { Drug } from "../core/api/types/concept/Drug";
 import { Patient } from "../core/api/types/identity/Patient";
 import { useMemo } from "react";
 import { uniqBy } from "lodash-es";
+import { UserRoleScope } from "../core/api/types/identity/UserRoleScope";
 
 export type PatientFilterCriteria = ResourceFilterCriteria;
 
@@ -304,3 +305,9 @@ export const useUserRoles = () => {
     error,
   };
 };
+export function getUserRoleScopes(): Promise<
+  FetchResponse<PageableResult<UserRoleScope>>
+> {
+  const apiUrl = `${restBaseUrl}/stockmanagement/userrolescope`;
+  return openmrsFetch(apiUrl);
+}

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

@@ -23,8 +23,10 @@ import {
 import {
   getParties,
   getStockOperationTypes,
+  getUserRoleScopes,
 } from "../../stock-lookups/stock-lookups.resource";
 import { Party } from "../../core/api/types/Party";
+import { getCurrentUser } from "@openmrs/esm-framework";
 
 export async function initializeNewStockOperation(
   currentStockOperationType: StockOperationType,
@@ -36,7 +38,15 @@ export async function initializeNewStockOperation(
   const isNew = !!stockOperation;
   const newItemsToCopy: StockOperationItemDTO[] = [];
   const showQuantityRequested = false;
-
+  const currentUserUuid = await new Promise((resolve, reject) => {
+    getCurrentUser().subscribe({
+      next: (user) => {
+        const userUuid = user?.user?.uuid;
+        resolve(userUuid);
+      },
+      error: (err) => reject(err),
+    });
+  });
   let operationTypes = stockOperationTypes;
   const canIssueStock =
     stockOperation?.permission?.isRequisitionAndCanIssueStock ?? false;
@@ -68,69 +78,27 @@ export async function initializeNewStockOperation(
       operationTypeUuid: currentStockOperationType?.uuid,
       operationType: currentStockOperationType?.operationType,
     });
-
-    if (
-      currentStockOperationType.operationType ==
-      OperationType.STOCK_ISSUE_OPERATION_TYPE
-    ) {
-      // requisition = urlQueryParams?.get("requisition");
-      // if (requisition) {
-      //   const response = await getStockOperation(requisition);
-      //   if (!response.ok) {
-      //     return;
-      //   }
-      //
-      //   const requisitionStockOperation = response.data;
-      //
-      //   if (
-      //     !requisitionStockOperation.responsiblePersonUuid &&
-      //     requisitionStockOperation.responsiblePersonOther
-      //   ) {
-      //     requisitionStockOperation.responsiblePersonUuid = "Other";
-      //   }
-      //
-      //   if (
-      //     requisitionStockOperation &&
-      //     requisitionStockOperation.stockOperationItems
-      //   ) {
-      //     let hasQtyRequested = false;
-      //     requisitionStockOperation.stockOperationItems.forEach((si) => {
-      //       if (si.quantity && si.stockItemPackagingUOMName) {
-      //         hasQtyRequested = true;
-      //       }
-      //
-      //       const itemId = `new-item-${getStockOperationUniqueId()}`;
-      //       si.id = itemId;
-      //       si.uuid = itemId;
-      //       newItemsToCopy.push({
-      //         ...si,
-      //         quantityRequested: si.quantity,
-      //         quantityRequestedPackagingUOMUuid: si.stockItemPackagingUOMUuid,
-      //         quantityRequestedPackagingUOMName: si.stockItemPackagingUOMName,
-      //       });
-      //     });
-      //     if (hasQtyRequested) {
-      //       showQuantityRequested = true;
-      //     }
-      //   }
-      //   newItemsToCopy.push({ uuid: `new-item-1`, id: `new-item-1` });
-      //   model.destinationUuid = requisitionStockOperation.sourceUuid;
-      //   model.destinationName = requisitionStockOperation.sourceName;
-      //   model.responsiblePersonUuid =
-      //     requisitionStockOperation.responsiblePersonUuid;
-      //   model.responsiblePersonOther =
-      //     requisitionStockOperation.responsiblePersonOther;
-      //   model.responsiblePersonFamilyName =
-      //     requisitionStockOperation.responsiblePersonFamilyName;
-      //   model.responsiblePersonGivenName =
-      //     requisitionStockOperation.responsiblePersonGivenName;
-      //   model.remarks = requisitionStockOperation.remarks;
-      // }
-    }
     const partyList = await getParties();
+    const userRoleScopes = await getUserRoleScopes();
+    const currentUserRoleScope = userRoleScopes.data?.results?.filter(
+      (role) => role.userUuid === currentUserUuid
+    );
+    const userRoleScopeLocations = [
+      ...new Set(
+        currentUserRoleScope.flatMap((role) =>
+          role?.locations?.map((l) => l.locationUuid)
+        )
+      ),
+    ];
+
     if (!partyList.ok) throw Error("Error loading parties");
+    const filteredPartyList = partyList.data?.results?.filter(
+      (party) =>
+        userRoleScopeLocations.includes(party.locationUuid) ||
+        party.stockSourceUuid !== null
+    );
 
-    sourcePartyList = partyList?.data?.results?.filter(
+    sourcePartyList = filteredPartyList?.filter(
       (p) =>
         (p.locationUuid &&
           currentStockOperationType?.sourceType === LocationTypeLocation &&