@openmrs/esm-stock-management-app 1.0.1-pre.435 → 1.0.1-pre.438

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

@@ -86,10 +86,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4766218,
+      "size": 4766459,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4744269,
+        "javascript": 4744510,
         "share-init": 252,
         "runtime": 21445
       },
@@ -106,7 +106,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "d0c0f47acf3128da",
+      "hash": "99c6ba951bc1fc50",
       "childrenByOrder": {}
     },
     {
@@ -255,9 +255,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1075037,
+      "size": 1075278,
       "sizes": {
-        "javascript": 1074827,
+        "javascript": 1075068,
         "consume-shared": 210
       },
       "names": [],
@@ -271,7 +271,7 @@
       "auxiliaryFiles": [
         "699.js.map"
       ],
-      "hash": "bbf3fbb2db3b4e53",
+      "hash": "09aacd80fa7bd83c",
       "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.435"}
+{"$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.438"}

package/package.json

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

package/src/core/components/carbon/controlled-number-input/controlled-number-input.component.tsx

@@ -19,6 +19,7 @@ const ControlledNumberInput = <T,>(props: ControlledNumberInputProps<T>) => {
       control={props.control}
       render={({ field: { onChange, value, ref } }) => (
         <NumberInput
+          label={props.label}
           id={`${props.name}-${props.row?.id}-${props.row?.uuid}`}
           value={props.row?.factor ?? value}
           min={props.min}

package/src/stock-items/add-stock-item/packaging-units/packaging-units-delete-modal.component.tsx

@@ -1,9 +1,5 @@
+import React, { useState, useEffect } from "react";
 import { showNotification, showToast } from "@openmrs/esm-framework";
-import React, { useState } from "react";
-import { deleteStockItemPackagingUnit } from "../../stock-items.resource";
-import { useTranslation } from "react-i18next";
-import { StockItemPackagingUOMDTO } from "../../../core/api/types/stockItem/StockItemPackagingUOM";
-import styles from "../packaging-units/packaging-units.scss";
 import {
   Button,
   ModalHeader,
@@ -11,6 +7,12 @@ import {
   ModalFooter,
   TextArea,
 } from "@carbon/react";
+import { deleteStockItemPackagingUnit } from "../../stock-items.resource";
+import { useStockItemPackageUnitsHook } from "./packaging-units.resource";
+import { useTranslation } from "react-i18next";
+import { StockItemPackagingUOMDTO } from "../../../core/api/types/stockItem/StockItemPackagingUOM";
+
+import styles from "../packaging-units/packaging-units.scss";
 
 interface DeletePackagingUnitProps {
   row?: StockItemPackagingUOMDTO;
@@ -22,6 +24,11 @@ const DeletePackagingUnit: React.FC<DeletePackagingUnitProps> = ({
   closeModal,
 }) => {
   const { t } = useTranslation();
+  const { mutate, setStockItemUuid } = useStockItemPackageUnitsHook();
+
+  useEffect(() => {
+    setStockItemUuid(row.stockItemUuid);
+  }, [row.stockItemUuid, setStockItemUuid]);
 
   const [reason, setReason] = useState("");
 
@@ -33,6 +40,8 @@ const DeletePackagingUnit: React.FC<DeletePackagingUnitProps> = ({
     e.preventDefault();
     deleteStockItemPackagingUnit(row.uuid).then(
       () => {
+        mutate();
+        closeModal();
         showToast({
           critical: true,
           title: t("deletePackagingUnitTitle", `Delete packing item `),

package/src/stock-items/add-stock-item/packaging-units/packaging-units.component.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo } from "react";
-import { showSnackbar, restBaseUrl } from "@openmrs/esm-framework";
+import { showSnackbar } from "@openmrs/esm-framework";
 import { useTranslation } from "react-i18next";
 import { useStockItemPackageUnitsHook } from "./packaging-units.resource";
 import {
@@ -23,8 +23,6 @@ import { PackageUnitFormData, packageUnitSchema } from "./validationSchema";
 import { StockItemPackagingUOMDTO } from "../../../core/api/types/stockItem/StockItemPackagingUOM";
 import { createStockItemPackagingUnit } from "../../stock-items.resource";
 import DeleteModalButton from "./packaging-units-delete-modal-button.component";
-import { handleMutate } from "../../../utils";
-import { toQueryParams, ResourceRepresentation } from "../../../core/api/api";
 
 import styles from "./packaging-units.scss";
 
@@ -39,7 +37,8 @@ const PackagingUnits: React.FC<PackagingUnitsProps> = ({
   stockItemUuid,
   handleTabChange,
 }) => {
-  const { items, isLoading, setStockItemUuid } = useStockItemPackageUnitsHook();
+  const { items, isLoading, setStockItemUuid, mutate } =
+    useStockItemPackageUnitsHook();
   useEffect(() => {
     setStockItemUuid(stockItemUuid);
   }, [stockItemUuid, setStockItemUuid]);
@@ -81,20 +80,9 @@ const PackagingUnits: React.FC<PackagingUnitsProps> = ({
       stockItemUuid,
     };
 
-    const filters = {
-      startIndex: 0,
-      v: ResourceRepresentation.Default,
-      totalCount: true,
-      stockItemUuid,
-    };
-
-    const fetchUrl = `${restBaseUrl}/stockmanagement/stockitempackaginguom${toQueryParams(
-      filters
-    )}`;
-
     createStockItemPackagingUnit(payload).then(
       () => {
-        handleMutate(fetchUrl);
+        mutate();
 
         showSnackbar({
           title: t("savePackingUnitTitle", "Package Unit"),
@@ -204,6 +192,7 @@ const PackagingUnitRow: React.FC<{
               row={row}
               controllerName={"packagingUomUuid"}
               name="packagingUomUuid"
+              placeholder="Filter"
               control={control}
               invalid={!!errors.packagingUomUuid}
             />

package/src/stock-items/add-stock-item/packaging-units/packaging-units.resource.tsx

@@ -25,7 +25,7 @@ export function useStockItemPackageUnitsHook(v?: ResourceRepresentation) {
     });
   }, [stockItemUuid]);
 
-  const { items, isLoading, isError } =
+  const { items, isLoading, isError, mutate } =
     useStockItemPackagingUOMs(stockItemFilter);
 
   return {
@@ -34,5 +34,6 @@ export function useStockItemPackageUnitsHook(v?: ResourceRepresentation) {
     isLoading,
     isError,
     setStockItemUuid,
+    mutate,
   };
 }

package/src/stock-items/add-stock-item/stock-item-units-edit/stock-item-units-edit.component.tsx

@@ -109,7 +109,7 @@ const StockItemUnitsEdit: React.FC<StockItemUnitsEditProps> = ({
           controllerName="purchasePrice"
           size={"md"}
           allowEmpty={true}
-          label={t("purchasePrice", "Purchase Price")}
+          label={t("purchasePrice", "Purchase Price:")}
           value={stockItem.purchasePrice ?? ""}
           invalid={!!errors.purchasePrice}
           invalidText={errors.purchasePrice && errors?.purchasePrice?.message}
@@ -120,7 +120,10 @@ const StockItemUnitsEdit: React.FC<StockItemUnitsEditProps> = ({
         name="purchasePriceUoMUuid"
         controllerName="purchasePriceUoMUuid"
         control={control}
-        title={t("purchasePricePackagingUnit", "Purchase price packaging unit")}
+        title={t(
+          "purchasePricePackagingUnit",
+          "Purchase price packaging unit:"
+        )}
         placeholder={t("notSet", "Not Set")}
         isLoading={isLoading}
         packagingUnits={stockItem.packagingUnits}

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

@@ -167,7 +167,7 @@ export function useStockItemPackagingUOMs(filter: StockItemPackagingUOMFilter) {
   const apiUrl = `${restBaseUrl}/stockmanagement/stockitempackaginguom${toQueryParams(
     filter
   )}`;
-  const { data, error, isLoading } = useSWR<
+  const { data, error, isLoading, mutate } = useSWR<
     {
       data: PageableResult<StockItemPackagingUOMDTO>;
     },
@@ -178,6 +178,7 @@ export function useStockItemPackagingUOMs(filter: StockItemPackagingUOMFilter) {
     items: data?.data || <PageableResult<StockItemPackagingUOMDTO>>{},
     isLoading,
     isError: error,
+    mutate,
   };
 }