@openmrs/esm-stock-management-app 1.0.1-pre.597 → 1.0.1-pre.606

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

@@ -85,9 +85,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1841081,
+      "size": 1840985,
       "sizes": {
-        "javascript": 1840871,
+        "javascript": 1840775,
         "consume-shared": 210
       },
       "names": [],
@@ -101,7 +101,7 @@
       "auxiliaryFiles": [
         "173.js.map"
       ],
-      "hash": "46a14a22a8277c61",
+      "hash": "32293cb595f3bc1a",
       "childrenByOrder": {}
     },
     {
@@ -109,10 +109,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5509508,
+      "size": 5509412,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 5487558,
+        "javascript": 5487462,
         "share-init": 252,
         "runtime": 21446
       },
@@ -129,7 +129,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "940def1cebcc4a09",
+      "hash": "eadc2b790e0bb731",
       "childrenByOrder": {}
     },
     {
@@ -251,9 +251,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 11502,
+      "size": 11501,
       "sizes": {
-        "javascript": 11502
+        "javascript": 11501
       },
       "names": [],
       "idHints": [],
@@ -265,7 +265,7 @@
         "574.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "1dabb0391057300e",
+      "hash": "b881a6484ecb0d98",
       "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.597"}
+{"$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.606"}

package/package.json

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

@@ -30,6 +30,7 @@ import {
   StockOperationType,
   StockOperationTypeCanBeRelatedToRequisition,
   operationFromString,
+  StockOperationTypeRequiresDispatchAcknowledgement,
 } from "../../core/api/types/stockOperation/StockOperationType";
 import {
   getStockOperationLinks,
@@ -52,6 +53,9 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
     props?.isEditing
   );
 
+  const [requiresDispatchAcknowledgement, setRequiresDispatchAcknowledgement] =
+    useState(false);
+
   const currentStockOperationType = types?.results?.find(
     (p) => p.operationType === props.model?.operationType
   );
@@ -88,6 +92,18 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
   const [selectedIndex, setSelectedIndex] = useState(0);
   const [canDisplayReceivedItems, setCanDisplayReceivedItems] = useState(false);
 
+  useEffect(() => {
+    const validOperationType = Object.values(OperationType).includes(
+      props.model.operationType as OperationType
+    )
+      ? (props.model.operationType as OperationType)
+      : OperationType.RETURN_OPERATION_TYPE;
+
+    setRequiresDispatchAcknowledgement(
+      StockOperationTypeRequiresDispatchAcknowledgement(validOperationType)
+    );
+  }, [props.model.operationType]);
+
   useEffect(() => {
     setCanDisplayReceivedItems(
       props?.model?.permission?.canDisplayReceivedItems ?? false
@@ -467,24 +483,15 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
                 {!props?.model?.permission?.canEdit &&
                   props?.model?.permission?.canApprove && (
                     <>
-                      {(props?.model
-                        ? props?.model?.operationTypeName ===
-                            OperationType.RETURN_OPERATION_TYPE ||
-                          props?.model?.operationTypeName ===
-                            OperationType.STOCK_ISSUE_OPERATION_TYPE
-                        : true) && (
+                      {!requiresDispatchAcknowledgement && (
                         <div style={{ margin: "2px" }}>
                           <StockOperationApprovalButton
                             operation={props?.model}
                           />
                         </div>
                       )}
-                      {!(props?.model
-                        ? props?.model?.operationTypeName ===
-                            OperationType.RETURN_OPERATION_TYPE ||
-                          props?.model?.operationTypeName ===
-                            OperationType.STOCK_ISSUE_OPERATION_TYPE
-                        : true) && (
+
+                      {requiresDispatchAcknowledgement && (
                         <div style={{ margin: "2px" }}>
                           <StockOperationApproveDispatchButton
                             operation={props?.model}

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

@@ -165,7 +165,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
             {model?.operationNumber && (
               <TextInput
                 id="operationNoLbl"
-                value={model.operationNumber}
+                value={model?.operationNumber}
                 readOnly={true}
                 labelText={t("operationNumber", "Operation Number")}
               />

package/src/stock-operations/edit-stock-operation/edit-stock-operation-action-menu.component.tsx

@@ -36,7 +36,7 @@ const EditStockOperationActionMenu: React.FC<
       iconDescription={t("editStockOperation", "Edit Stock Operation")}
       renderIcon={showIcon ? Edit : undefined}
     >
-      {showprops && model.operationNumber}
+      {showprops && model?.operationNumber}
     </Button>
   );
 };

package/src/stock-operations/stock-operations-dialog/stock-operations-approve-button.component.tsx

@@ -28,7 +28,7 @@ const StockOperationApprovalButton: React.FC<
       onClick={launchApprovalModal}
       renderIcon={(props) => <CheckmarkOutline size={16} {...props} />}
     >
-      {t("approve", "Approve ")}
+      {t("approve", "Approve")}
     </Button>
   );
 };

package/src/stock-operations/stock-operations-dialog/stock-operations-approve-dispatch-button.component.tsx

@@ -18,7 +18,7 @@ const StockOperationApproveDispatchButton: React.FC<
     const dispose = showModal("stock-operation-dialog", {
       title: "Dispatch",
       operation: operation,
-      requireReason: true,
+      requireReason: false,
       closeModal: () => dispose(),
     });
   }, [operation]);
@@ -28,7 +28,7 @@ const StockOperationApproveDispatchButton: React.FC<
       onClick={launchApproveDispatchModal}
       renderIcon={(props) => <Departure size={16} {...props} />}
     >
-      {t("approve", "Dispatch")}
+      {t("dispatch", "Dispatch")}
     </Button>
   );
 };

package/src/stock-operations/stock-print-reports/StockOperationReport.tsx

@@ -63,7 +63,7 @@ export const BuildStockOperationData = async (
       : "";
   }
   data.remarks = currentOperation.remarks;
-  data.operationNumber = currentOperation.operationNumber;
+  data.operationNumber = currentOperation?.operationNumber;
   data.operationDate =
     parentOperation?.operationDate ?? currentOperation?.operationDate;
   data.location =
@@ -80,10 +80,10 @@ export const BuildStockOperationData = async (
         }`;
   data.organizationName = HEALTH_CENTER_NAME;
   data.documentTitle = `${currentOperation.operationTypeName} ${
-    currentOperation.operationNumber
+    currentOperation?.operationNumber
   }${
     parentOperation
-      ? ` of ${parentOperation.operationTypeName} ${parentOperation.operationNumber}`
+      ? ` of ${parentOperation.operationTypeName} ${parentOperation?.operationNumber}`
       : ""
   }`;
   data.items = stockOperationItems.map((p) => {

package/src/stock-sources/stock-sources-delete/stock-sources-delete.test.tsx

@@ -45,14 +45,17 @@ describe("StockSourcesDeleteActionMenu", () => {
     const { getByRole } = render(<StockSourcesDeleteActionMenu uuid={uuid} />);
     const button = getByRole("button", { name: "deleteSource" });
     fireEvent.click(button);
-    expect(showModal).toHaveBeenCalledWith("delete-stock-modal", expect.objectContaining({
-      close: expect.any(Function),
-      uuid: uuid,
-      onConfirmation: expect.any(Function),
-    }));
+    expect(showModal).toHaveBeenCalledWith(
+      "delete-stock-modal",
+      expect.objectContaining({
+        close: expect.any(Function),
+        uuid: uuid,
+        onConfirmation: expect.any(Function),
+      })
+    );
   });
 
-  it('calls onConfirmation when delete is clicked', () => {
+  it("calls onConfirmation when delete is clicked", () => {
     const mockOnConfirmation = jest.fn();
     const mockClose = jest.fn();
 
@@ -65,7 +68,7 @@ describe("StockSourcesDeleteActionMenu", () => {
 
     expect(screen.getByText(/deleteStockUserScope/i)).toBeInTheDocument();
 
-    const deleteButton = screen.getByRole('button', { name: /delete/i });
+    const deleteButton = screen.getByRole("button", { name: /delete/i });
     fireEvent.click(deleteButton);
 
     expect(mockOnConfirmation).toHaveBeenCalledTimes(1);
@@ -75,7 +78,7 @@ describe("StockSourcesDeleteActionMenu", () => {
   it("calls deleteStockSource with the correct UUID on confirmation", async () => {
     const mockOnConfirmation = jest.fn();
     const mockClose = jest.fn();
-  
+
     render(
       <DeleteConfirmation
         close={mockClose}
@@ -85,10 +88,10 @@ describe("StockSourcesDeleteActionMenu", () => {
         }}
       />
     );
-  
-    const deleteButton = screen.getByRole('button', { name: /delete/i });
+
+    const deleteButton = screen.getByRole("button", { name: /delete/i });
     fireEvent.click(deleteButton);
-  
+
     expect(mockOnConfirmation).toHaveBeenCalledTimes(1);
     expect(deleteStockSource).toHaveBeenCalledWith([uuid]);
   });
@@ -109,17 +112,21 @@ describe("StockSourcesDeleteActionMenu", () => {
       />
     );
 
-    const deleteButton = screen.getByRole('button', { name: /delete/i });
+    const deleteButton = screen.getByRole("button", { name: /delete/i });
     fireEvent.click(deleteButton);
 
     await waitFor(() => {
       expect(deleteStockSource).toHaveBeenCalledWith([uuid]);
-      expect(handleMutate).toHaveBeenCalledWith("/openmrs/ws/rest/v1/stocksource");
+      expect(handleMutate).toHaveBeenCalledWith(
+        "/openmrs/ws/rest/v1/stocksource"
+      );
     });
   });
 
   it("calls showSnackbar with the correct parameters on deletion error", async () => {
-    (deleteStockSource as jest.Mock).mockRejectedValueOnce(new Error("Deletion failed"));
+    (deleteStockSource as jest.Mock).mockRejectedValueOnce(
+      new Error("Deletion failed")
+    );
 
     const mockOnConfirmation = jest.fn();
     const mockClose = jest.fn();
@@ -140,7 +147,7 @@ describe("StockSourcesDeleteActionMenu", () => {
       />
     );
 
-    const deleteButton = screen.getByRole('button', { name: /delete/i });
+    const deleteButton = screen.getByRole("button", { name: /delete/i });
     fireEvent.click(deleteButton);
 
     await waitFor(() => {
@@ -153,7 +160,9 @@ describe("StockSourcesDeleteActionMenu", () => {
   });
 
   it("handles the error state correctly when the delete action fails", async () => {
-    (deleteStockSource as jest.Mock).mockRejectedValueOnce(new Error("Deletion failed"));
+    (deleteStockSource as jest.Mock).mockRejectedValueOnce(
+      new Error("Deletion failed")
+    );
 
     const mockOnConfirmation = jest.fn();
     const mockClose = jest.fn();

package/translations/en.json

@@ -22,7 +22,7 @@
   "adminSettings": "Admin settings",
   "alertRole": "Alert Role",
   "all": "All",
-  "approve": "Dispatch",
+  "approve": "Approve",
   "batch": "Batch No",
   "batchInformation": "Batch Information",
   "batchJob": "Batch Job",