@openmrs/esm-stock-management-app 1.0.1-pre.514 → 1.0.1-pre.523

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

@@ -85,9 +85,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1733858,
+      "size": 1735991,
       "sizes": {
-        "javascript": 1733648,
+        "javascript": 1735781,
         "consume-shared": 210
       },
       "names": [],
@@ -101,7 +101,7 @@
       "auxiliaryFiles": [
         "157.js.map"
       ],
-      "hash": "04f4bbc9ccf6cac6",
+      "hash": "d619daf08ca10a8c",
       "childrenByOrder": {}
     },
     {
@@ -109,10 +109,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5402285,
+      "size": 5404418,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 5380335,
+        "javascript": 5382468,
         "share-init": 252,
         "runtime": 21446
       },
@@ -129,7 +129,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "100861ca78612a07",
+      "hash": "d738e041a511e2fc",
       "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.514"}
+{"$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.523"}

package/package.json

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

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

@@ -28,18 +28,59 @@ import {
   OperationType,
   StockOperationTypeIsStockIssue,
   StockOperationType,
+  StockOperationTypeCanBeRelatedToRequisition,
+  operationFromString,
 } from "../../core/api/types/stockOperation/StockOperationType";
-import { operationStatusColor } from "../stock-operations.resource";
+import {
+  getStockOperationLinks,
+  operationStatusColor,
+} from "../stock-operations.resource";
 import styles from "./add-stock-operation.scss";
+import { useStockOperationTypes } from "../../stock-lookups/stock-lookups.resource";
+import { StockOperationLinkDTO } from "../../core/api/types/stockOperation/StockOperationLinkDTO";
 
 const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
   const { t } = useTranslation();
   const { isEditing, canEdit, canPrint } = props;
   const { isLoading, isError, result } = useInitializeStockOperations(props);
+  const [operationLinks, setOperationLinks] =
+    useState<StockOperationLinkDTO[]>();
   const [manageStockItems, setManageStockItems] = useState(props?.isEditing);
+  const { types } = useStockOperationTypes();
+  const [requisition, setRequisition] = useState(props?.model?.uuid);
   const [manageSubmitOrComplete, setManageSubmitOrComplete] = useState(
     props?.isEditing
   );
+
+  const currentStockOperationType = types?.results?.find(
+    (p) => p.operationType === props.model?.operationType
+  );
+
+  useEffect(() => {
+    if (
+      currentStockOperationType?.operationType ===
+        OperationType.REQUISITION_OPERATION_TYPE ||
+      props.model?.operationType === OperationType.REQUISITION_OPERATION_TYPE
+    ) {
+      setRequisition(props.model?.uuid);
+    }
+  }, [currentStockOperationType, props.model?.operationType]);
+
+  useEffect(() => {
+    if (
+      isEditing ||
+      StockOperationTypeCanBeRelatedToRequisition(
+        operationFromString(currentStockOperationType?.name.toLowerCase())
+      ) ||
+      OperationType.REQUISITION_OPERATION_TYPE ===
+        currentStockOperationType?.operationType
+    ) {
+      getStockOperationLinks(requisition).then((resp) => {
+        setOperationLinks(resp.data?.results);
+      });
+    }
+  }, [currentStockOperationType, requisition, props.model?.uuid]);
+
   const [selectedIndex, setSelectedIndex] = useState(0);
   const [canReceiveItems, setCanReceiveItems] = useState(false);
 
@@ -506,6 +547,62 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
           )}
         </div>
       )}
+      {operationLinks && operationLinks?.length > 0 && (
+        <div style={{ margin: "10px" }}>
+          <h6 style={{ color: "#24a148" }}>Related Transactions:</h6>
+          {operationLinks.map(
+            (item) =>
+              (props.model?.uuid === item?.parentUuid ||
+                currentStockOperationType.uuid === item?.parentUuid) && (
+                <>
+                  <span>{item?.childOperationTypeName}</span>
+                  <span className={item?.childVoided ? "voided" : ""}>
+                    <span> </span>
+                    {item?.childVoided && item?.childOperationNumber}
+                    {!item?.childVoided && (
+                      <span
+                        style={{
+                          marginLeft: "2px",
+                          color: "#0f62fe",
+                        }}
+                      >
+                        {item?.childOperationNumber}
+                      </span>
+                    )}
+                  </span>
+                  <span> </span>
+                  <span>[{item?.childStatus}]</span>
+                </>
+              )
+          )}
+          <span> </span>
+          {operationLinks.map(
+            (item) =>
+              (props.model?.uuid === item?.childUuid ||
+                currentStockOperationType.uuid === item?.childUuid) && (
+                <>
+                  <span>{item?.parentOperationTypeName}</span>
+                  <span className={item?.parentVoided ? "voided" : ""}>
+                    <span> </span>
+                    {item?.parentVoided && item?.parentOperationNumber}
+                    {!item?.parentVoided && (
+                      <span
+                        style={{
+                          marginLeft: "2px",
+                          color: "#0f62fe",
+                        }}
+                      >
+                        {item?.parentOperationNumber}
+                      </span>
+                    )}
+                  </span>
+                  <span> </span>
+                  <span>[{item?.parentStatus}]</span>
+                </>
+              )
+          )}
+        </div>
+      )}
 
       <StockOperation>
         <VerticalTabs

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

@@ -22,14 +22,11 @@ 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,
-  // urlQueryParams?: URLSearchParams,
   stockOperation?: StockOperationDTO,
   stockOperationTypes?: StockOperationType[]
 ): Promise<InitializeResult> {
@@ -37,15 +34,7 @@ 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;
@@ -81,23 +70,10 @@ export async function initializeNewStockOperation(
       operationType: currentStockOperationType?.operationType,
     });
     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
+      (party) => party.stockSourceUuid !== null
     );
 
     sourcePartyList = filteredPartyList?.filter(
@@ -154,8 +130,6 @@ export async function initializeNewStockOperation(
     showQuantityRequested: false,
     dto: model,
     stockItems: newItemsToCopy,
-    // showQuantityRequested,
-    // requisition,
     isNegativeQuantityAllowed: StockOperationTypeIsNegativeQtyAllowed(opType),
     requiresBatchUuid: StockOperationTypeRequiresBatchUuid(opType),
     requiresActualBatchInfo:

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

@@ -54,17 +54,17 @@ export function useStockOperations(filter: StockOperationFilter) {
 }
 
 // getStockOperationLinks
-export function useStockOperationLinks(filter: string) {
+export function getStockOperationLinks(filter: string) {
   const apiUrl = `${restBaseUrl}/stockmanagement/stockoperationlink?v=default&q=${filter}`;
-  const { data, error, isLoading } = useSWR<
-    { data: PageableResult<StockOperationLinkDTO> },
-    Error
-  >(apiUrl, openmrsFetch);
-  return {
-    items: data.data ? data.data : [],
-    isLoading,
-    isError: error,
-  };
+  const abortController = new AbortController();
+
+  return openmrsFetch(apiUrl, {
+    method: "GET",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    signal: abortController.signal,
+  });
 }
 
 // getStockOperation