@openmrs/esm-stock-management-app 1.0.1-pre.334 → 1.0.1-pre.338

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

@@ -112,10 +112,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4355568,
+      "size": 4354033,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4333620,
+        "javascript": 4332085,
         "share-init": 252,
         "runtime": 21444
       },
@@ -132,7 +132,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "4421563f3b87f2aa",
+      "hash": "b385faba305ca411",
       "childrenByOrder": {}
     },
     {
@@ -140,9 +140,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 918771,
+      "size": 917236,
       "sizes": {
-        "javascript": 918561,
+        "javascript": 917026,
         "consume-shared": 210
       },
       "names": [],
@@ -156,7 +156,7 @@
       "auxiliaryFiles": [
         "220.js.map"
       ],
-      "hash": "71dd66264f583d31",
+      "hash": "0bd6e2fb0c9b226a",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":"^1.2.0","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.334"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":"^1.2.0","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.338"}

package/package.json

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

package/src/stock-home/stock-home-receiving-card.component.tsx

@@ -18,7 +18,7 @@ const StockHomeReceivingCard = () => {
 
   if (isLoading) return <></>;
 
-  if (items.length === 0) {
+  if (items?.length === 0) {
     return (
       <>
         <p className={styles.content}>

package/src/stock-home/useStockList.tsx

@@ -1,5 +1,5 @@
 import useSWR from "swr";
-import { openmrsFetch } from "@openmrs/esm-framework";
+import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework";
 
 interface StockList {
   uuid: string;
@@ -13,7 +13,7 @@ interface StockList {
 }
 
 const useStockList = () => {
-  const url = `/ws/rest/v1/stockmanagement/stockitem`;
+  const url = `${restBaseUrl}/stockmanagement/stockitem`;
 
   const { data, error } = useSWR<{ data: { results: Array<StockList> } }>(
     url,

package/src/stock-items/add-bulk-stock-item/stock-items-bulk-import.resource.ts

@@ -1,9 +1,9 @@
-import { openmrsFetch } from "@openmrs/esm-framework";
+import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework";
 
 export async function UploadStockItems(body: any) {
   const abortController = new AbortController();
 
-  return openmrsFetch(`/ws/rest/v1/stockmanagement/stockitemimport`, {
+  return openmrsFetch(`${restBaseUrl}/stockmanagement/stockitemimport`, {
     method: "POST",
     // headers: {
     //   "Content-Type": "application/json",

package/src/stock-items/add-stock-item/dispensing-package-measurement/dispensing-package-measurement.component.tsx

@@ -1,7 +1,7 @@
-import React, { ReactNode, useState } from "react";
+import React, { ReactNode, useMemo, useState } from "react";
 import { Control, Controller, FieldValues } from "react-hook-form";
 import { StockItemPackagingUOMDTO } from "../../../core/api/types/stockItem/StockItemPackagingUOM";
-import { Select, SelectItem, SelectSkeleton } from "@carbon/react";
+import { ComboBox, SelectSkeleton } from "@carbon/react";
 
 interface DispensingPackageMeasurementProps<T> {
   dispensingUnitPackagingUoMUuid?: string;
@@ -24,52 +24,48 @@ interface DispensingPackageMeasurementProps<T> {
 const DispensingPackageMeasurement = <T,>(
   props: DispensingPackageMeasurementProps<T>
 ) => {
-  const [item, setItem] = useState("");
+  const initialSelectedItem = useMemo<StockItemPackagingUOMDTO | null>(
+    () => (props?.packagingUnits.length > 0 ? props?.packagingUnits[0] : null),
+    [props?.packagingUnits]
+  );
 
   if (props.isLoading) return <SelectSkeleton />;
 
-  if (!(props.packagingUnits && props.packagingUnits.length > 0)) return <></>;
+  if (!(props?.packagingUnits && props?.packagingUnits.length > 0))
+    return <></>;
   return (
-    <Controller
-      name={props.controllerName}
-      control={props.control}
-      render={({ field: { onChange, value, ref } }) => (
-        <Select
-          labelText={props.title}
-          name={props.name}
-          control={props.control}
-          controllerName={props.controllerName}
-          id={props.name}
-          size={"md"}
-          onChange={(data: { selectedItem?: StockItemPackagingUOMDTO }) => {
-            props.onDispensingUnitPackagingUoMUuidChange?.(data?.selectedItem);
-            onChange(data?.selectedItem?.uuid);
-            setItem(data?.selectedItem?.uuid);
-          }}
-          ref={ref}
-          value={item}
-          invalid={props.invalid}
-          invalidText={props.invalidText}
-        >
-          {!item ? (
-            <SelectItem disabled hidden value={null} text={props.placeholder} />
-          ) : (
-            ""
-          )}
-          {props.packagingUnits?.map((uom, index) => {
-            return (
-              <SelectItem
-                key={`${index}-${uom.uuid}`}
-                value={uom.uuid}
-                text={uom.packagingUomName}
-              >
-                {uom?.packagingUomName}
-              </SelectItem>
-            );
-          })}
-        </Select>
-      )}
-    />
+    <div>
+      <Controller
+        name={props.controllerName}
+        control={props.control}
+        defaultValue={initialSelectedItem.uuid ?? ""}
+        render={({ field: { onChange, ref } }) => (
+          <ComboBox
+            titleText={props.title}
+            name={props.name}
+            control={props.control}
+            controllerName={props.controllerName}
+            id={props.name}
+            size={"sm"}
+            items={props.packagingUnits ?? []}
+            onChange={(data: { selectedItem?: StockItemPackagingUOMDTO }) => {
+              props.onDispensingUnitPackagingUoMUuidChange?.(
+                data?.selectedItem
+              );
+              onChange(data?.selectedItem?.uuid);
+            }}
+            initialSelectedItem={initialSelectedItem}
+            itemToString={(s: StockItemPackagingUOMDTO) =>
+              s.packagingUomName ?? ""
+            }
+            placeholder={props.placeholder}
+            invalid={props.invalid}
+            invalidText={props.invalidText}
+            ref={ref}
+          />
+        )}
+      />
+    </div>
   );
 };
 

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

@@ -4,6 +4,7 @@ import {
   fhirBaseUrl,
   openmrsFetch,
   useSession,
+  restBaseUrl,
 } from "@openmrs/esm-framework";
 import { ResourceFilterCriteria, toQueryParams } from "../core/api/api";
 import { PageableResult } from "../core/api/types/PageableResult";
@@ -289,7 +290,7 @@ type UserRole = {
 
 export const useUserRoles = () => {
   const { user: loggedInUser } = useSession();
-  const url = `/ws/rest/v1/stockmanagement/userrolescope`;
+  const url = `${restBaseUrl}/stockmanagement/userrolescope`;
   const { data, isLoading, error } = useSWR<{ data: UserRole }>(
     url,
     openmrsFetch