@openmrs/esm-stock-management-app 1.0.1-pre.368 → 1.0.1-pre.377

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

@@ -59,9 +59,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1024655,
+      "size": 1024662,
       "sizes": {
-        "javascript": 1024445,
+        "javascript": 1024452,
         "consume-shared": 210
       },
       "names": [],
@@ -75,7 +75,7 @@
       "auxiliaryFiles": [
         "56.js.map"
       ],
-      "hash": "2c8d7edfd39db751",
+      "hash": "4ee3259f79d57dc5",
       "childrenByOrder": {}
     },
     {
@@ -110,10 +110,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4773704,
+      "size": 4773711,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4751756,
+        "javascript": 4751763,
         "share-init": 252,
         "runtime": 21444
       },
@@ -130,7 +130,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "3e8626336ae7a6e4",
+      "hash": "b5fe33bc3d4cadc9",
       "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"}],"pages":[{"component":"stockManagement","route":"stock-management"}],"version":"1.0.1-pre.368"}
+{"$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"}],"pages":[{"component":"stockManagement","route":"stock-management"}],"version":"1.0.1-pre.377"}

package/package.json

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

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

@@ -2,6 +2,7 @@ import { closeOverlay, launchOverlay } from "../core/components/overlay/hook";
 import React from "react";
 import {
   FetchResponse,
+  restBaseUrl,
   showModal,
   showNotification,
   showToast,
@@ -47,7 +48,7 @@ export const addOrEditStockOperation = async (
       : createStockOperation)(payload);
 
     if (response?.data) {
-      handleMutate("ws/rest/v1/stockmanagement/stockoperation");
+      handleMutate(`${restBaseUrl}/stockmanagement/stockoperation`);
       showToast({
         critical: true,
         title: `${isEditing ? "Edit" : "Add"} Stock Operation`,

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

@@ -16,9 +16,10 @@ import {
   StopOperationActionType,
 } from "../../core/api/types/stockOperation/StockOperationAction";
 import { executeStockOperationAction } from "../stock-operations.resource";
-import { showNotification, showToast } from "@openmrs/esm-framework";
+import { restBaseUrl, showSnackbar } from "@openmrs/esm-framework";
 import { closeOverlay } from "../../core/components/overlay/hook";
 import { extractErrorMessagesFromResponse } from "../../constants";
+import { handleMutate } from "../swr-revalidation";
 
 interface StockOperationDialogProps {
   title: string;
@@ -92,28 +93,27 @@ const StockOperationDialog: React.FC<StockOperationDialogProps> = ({
     executeStockOperationAction(payload).then(
       () => {
         setIsApproving(false);
-        showToast({
-          critical: true,
+        showSnackbar({
           title: t("title", `${title} Operation`),
-          kind: "success",
-          description: t(
+          subtitle: t(
             "successMessage",
             `You have successfully ${title} operation `
           ),
-        });
-        closeModal();
+          kind: "success",
+        }),
+          closeModal();
         closeOverlay();
+        handleMutate(`${restBaseUrl}/stockmanagement/stockoperation`);
       },
       (err) => {
         setIsApproving(false);
         const errorMessages = extractErrorMessagesFromResponse(err);
-        showNotification({
-          description: t("errorDescription", errorMessages.join(", ")),
+        showSnackbar({
           title: t("errorDescriptionTitle", "Error on saving form"),
+          subtitle: t("errorDescription", errorMessages.join(", ")),
           kind: "error",
-          critical: true,
-        });
-        closeModal();
+        }),
+          closeModal();
         closeOverlay();
       }
     );

package/src/stock-operations/stock-operations-table.component.tsx

@@ -45,7 +45,6 @@ import { initialStockOperationValue } from "../core/utils/utils";
 import { StockOperationType } from "../core/api/types/stockOperation/StockOperationType";
 import { useTranslation } from "react-i18next";
 import EditStockOperationActionMenu from "./edit-stock-operation/edit-stock-operation-action-menu.component";
-import { handleMutate } from "./swr-revalidation";
 import StockOperationsFilters from "./stock-operations-filters.component";
 import {
   DATE_PICKER_CONTROL_FORMAT,
@@ -107,18 +106,14 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
   const [selectedSources, setSelectedSources] = useState<string[]>([]);
   const [selectedStatus, setSelectedStatus] = useState<string[]>([]);
   const [selectedOperations, setSelectedOperations] = useState<string[]>([]);
-
   const config = useConfig();
 
   let operations: StockOperationType[] | null | undefined;
   const handleOnComplete = () => {
     const dispose = showModal("stock-operation-dialog", {
       title: "complete",
-      operation: operation,
-      requireReason: "",
       closeModal: () => dispose(),
     });
-    handleMutate("ws/rest/v1/stockmanagement/stockoperation");
   };
 
   useEffect(() => {
@@ -131,6 +126,7 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
     selectedOperations,
     currentPage,
     currentPageSize,
+    items,
   ]);
 
   const handleOnFilterChange = useCallback((selectedItems, filterType) => {
@@ -230,12 +226,12 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
       details: (
         <div className="tbl-expand-display-fields">
           <div className="field-label">
-            <span className="field-title">Created</span>
+            <span className="field-title"> {t("created", "Created")}</span>
             <span className="field-desc">
               <span className="action-date">
                 {formatDisplayDate(stockOperation?.dateCreated)}
               </span>{" "}
-              By
+              {t("by", "By")}
               <span className="action-by">
                 {stockOperation.creatorFamilyName ?? ""}{" "}
                 {stockOperation.creatorGivenName ?? ""}
@@ -246,12 +242,14 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
             stockOperation?.status !== StockOperationStatusReturned &&
             stockOperation?.submittedDate && (
               <div className="field-label">
-                <span className="field-title">Submitted</span>
+                <span className="field-title">
+                  {t("submitted", "Submitted")}
+                </span>
                 <span className="field-desc">
                   <span className="action-date">
                     {formatDisplayDate(stockOperation?.submittedDate)}
                   </span>{" "}
-                  By
+                  {t("by", "By")}
                   <span className="action-by">
                     {stockOperation.submittedByFamilyName ?? ""}{" "}
                     {stockOperation.submittedByGivenName ?? ""}
@@ -262,12 +260,12 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
 
           {stockOperation?.completedDate && (
             <div className="field-label">
-              <span className="field-title">Completed</span>
+              <span className="field-title">{t("completed", "Completed")}</span>
               <span className="field-desc">
                 <span className="action-date">
                   {formatDisplayDate(stockOperation?.completedDate)}
                 </span>{" "}
-                By
+                {t("by", "By")}
                 <span className="action-by">
                   {stockOperation.completedByFamilyName ?? ""}{" "}
                   {stockOperation.completedByGivenName ?? ""}
@@ -278,12 +276,15 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
 
           {stockOperation?.status === StockOperationStatusCancelled && (
             <div className="field-label">
-              <span className="field-title">Cancelled</span>
+              <span className="field-title">
+                {" "}
+                {t("cancelled", "Cancelled")}
+              </span>
               <span className="field-desc">
                 <span className="action-date">
                   {formatDisplayDate(stockOperation?.cancelledDate)}
                 </span>{" "}
-                By
+                {t("by", "By")}
                 <span className="action-by">
                   {stockOperation.cancelledByFamilyName ?? ""}{" "}
                   {stockOperation.cancelledByGivenName ?? ""}
@@ -300,7 +301,7 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
                 <span className="action-date">
                   {formatDisplayDate(stockOperation?.rejectedDate)}
                 </span>{" "}
-                By
+                {t("by", "By")}
                 <span className="action-by">
                   {stockOperation.rejectedByFamilyName ?? ""}{" "}
                   {stockOperation.rejectedByGivenName ?? ""}
@@ -346,7 +347,7 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
         </OverflowMenu>
       ),
     }));
-  }, [handleOnComplete, filteredItems, operation, operations]);
+  }, [handleOnComplete, filteredItems, operation, operations, items]);
 
   if (isLoading) {
     return (