@openmrs/esm-stock-management-app 1.0.1-pre.451 → 1.0.1-pre.455

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

@@ -86,10 +86,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4776371,
+      "size": 4778213,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4754422,
+        "javascript": 4756264,
         "share-init": 252,
         "runtime": 21445
       },
@@ -106,7 +106,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "a0d720ed4bc49f02",
+      "hash": "39f7c5ec0dbf836c",
       "childrenByOrder": {}
     },
     {
@@ -164,9 +164,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1085190,
+      "size": 1087032,
       "sizes": {
-        "javascript": 1084980,
+        "javascript": 1086822,
         "consume-shared": 210
       },
       "names": [],
@@ -180,7 +180,7 @@
       "auxiliaryFiles": [
         "457.js.map"
       ],
-      "hash": "a82fbdde638d7656",
+      "hash": "163eee371c885016",
       "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.451"}
+{"$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.455"}

package/package.json

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

package/src/stock-items/add-stock-item/stock-item-category-selector/stock-item-category-selector.component.tsx

@@ -14,6 +14,7 @@ interface StockItemCategorySelectorProps<T> {
   placeholder?: string;
   invalid?: boolean;
   invalidText?: ReactNode;
+  itemType?: string;
 
   // Control
   controllerName: string;
@@ -32,6 +33,10 @@ const StockItemCategorySelector = <T,>(
     isLoading,
   } = useConcept(stockItemCategoryUUID);
 
+  const filteredCategories = props.itemType
+    ? categories?.filter((c) => c.display === props?.itemType)
+    : categories;
+
   if (isLoading) return <TextInputSkeleton />;
 
   return (
@@ -46,7 +51,7 @@ const StockItemCategorySelector = <T,>(
           controllerName={props.controllerName}
           id={props.name}
           size={"md"}
-          items={categories || []}
+          items={filteredCategories || []}
           onChange={(data: { selectedItem: Concept }) => {
             props.onCategoryUuidChange?.(data.selectedItem);
             onChange(data.selectedItem?.uuid);

package/src/stock-items/add-stock-item/stock-item-details/stock-item-details.component.tsx

@@ -61,10 +61,18 @@ const StockItemDetails = forwardRef<never, StockItemDetailsProps>(
 
     const [isSaving, setIsSaving] = useState(false);
     const [isDrug, setIsDrug] = useState(false);
+    const [selectedItemType, setSelectedItemType] = useState("");
     const [hasExpiration, setHasExpiration] = useState(false);
 
     useEffect(() => {
       setIsDrug(model.isDrug ?? false);
+      setSelectedItemType(
+        model.isDrug === true
+          ? "Pharmaceuticals"
+          : model.isDrug === false
+          ? "Non Pharmaceuticals"
+          : undefined
+      );
       setHasExpiration(model.hasExpiration ?? false);
     }, [model.hasExpiration, model.isDrug]);
 
@@ -85,7 +93,12 @@ const StockItemDetails = forwardRef<never, StockItemDetailsProps>(
             invalid={!!errors.isDrug}
             invalidText={errors.isDrug && errors?.isDrug?.message}
             onChange={(selection: boolean) => {
+              const selectedOption = radioOptions.find(
+                (option) => option.value === selection
+              );
+              const selectedLabel = selectedOption ? selectedOption.label : "";
               setIsDrug(selection);
+              setSelectedItemType(selectedLabel);
             }}
             options={radioOptions} // Pass radioOptions directly
           />
@@ -201,6 +214,13 @@ const StockItemDetails = forwardRef<never, StockItemDetailsProps>(
           name="categoryUuid"
           controllerName="categoryUuid"
           control={control}
+          itemType={
+            selectedItemType === "Pharmaceuticals"
+              ? "Drugs"
+              : selectedItemType === "Non Pharmaceuticals"
+              ? "Non Drugs"
+              : undefined
+          }
           title={t("category:", "Category") + ":"}
           placeholder={t("chooseACategory", "Choose a category")}
           invalid={!!errors.categoryUuid}

package/src/stock-user-role-scopes/add-stock-user-scope/add-stock-user-role-scope.component.tsx

@@ -14,7 +14,7 @@ import {
   Select,
   SelectItem,
 } from "@carbon/react";
-import React, { ChangeEvent, useState } from "react";
+import React, { ChangeEvent, useEffect, useState } from "react";
 import styles from "./add-stock-user-role-scope.scss";
 import {
   useRoles,
@@ -56,10 +56,12 @@ const MinDate: Date = today();
 
 interface AddStockUserRoleScopeProps {
   model?: UserRoleScope;
+  editMode?: boolean;
 }
 
 const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
   model,
+  editMode,
 }) => {
   const { t } = useTranslation();
   const currentUser = useSession();
@@ -136,6 +138,11 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
       setFilteredItems(filtered);
     }
   };
+  useEffect(() => {
+    if (model?.userUuid) {
+      setSelectedUserUuid(model.userUuid);
+    }
+  }, [model]);
 
   const handleSearchQueryChange = (query: string) => {
     setSearchQuery(query);
@@ -330,7 +337,7 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
                     id="userName"
                     size="md"
                     labelText={t("user", "User")}
-                    items={filteredItems}
+                    items={filteredItems.length ? filteredItems : usersResults}
                     onChange={onUserChanged}
                     shouldFilterItem={() => true}
                     itemToString={(item) =>
@@ -338,6 +345,11 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
                     }
                     onInputChange={handleSearchQueryChange}
                     placeholder="Filter..."
+                    initialSelectedItem={
+                      usersResults.find(
+                        (user) => user.uuid === model?.userUuid
+                      ) ?? null
+                    }
                   />
                 </>
               )}
@@ -359,15 +371,24 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
                   value="placeholder-item"
                   text={t("Choose a role")}
                 />
-                {(user?.roles ?? roles)?.map((role) => {
-                  return (
-                    <SelectItem
-                      key={role.display}
-                      value={role.display}
-                      text={role.display}
-                    />
-                  );
-                })}
+
+                {editMode ? (
+                  <SelectItem
+                    key={formModel?.role}
+                    value={formModel?.role}
+                    text={formModel?.role}
+                  />
+                ) : (
+                  (user?.roles ?? roles)?.map((role) => {
+                    return (
+                      <SelectItem
+                        key={role.display}
+                        value={role.display}
+                        text={role.display}
+                      />
+                    );
+                  })
+                )}
               </Select>
             </div>
           </section>
@@ -376,7 +397,7 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
               <Checkbox
                 onChange={onEnabledChanged}
                 checked={formModel?.enabled}
-                labelText={t(`Enabled ?`)}
+                labelText={t("enabled", "Enabled ?")}
                 value={model?.enabled}
                 id="chk-userEnabled"
               />
@@ -385,7 +406,7 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
                 name="isPermanent"
                 checked={formModel?.permanent}
                 value={model?.permanent}
-                labelText={t(`Permanent ?`)}
+                labelText={t("permanent", "Permanent ?")}
                 id="chk-userPermanent"
               />
 

package/src/stock-user-role-scopes/edit-stock-user-scope/edit-stock-user-scope-action-menu.component.tsx

@@ -19,7 +19,7 @@ const EditStockUserRoleActionsMenu: React.FC<
   const handleClick = useCallback(() => {
     launchOverlay(
       "Edit Stock User Role",
-      <AddStockUserRoleScope model={data} />
+      <AddStockUserRoleScope model={data} editMode={true} />
     );
   }, [data]);