@openmrs/esm-stock-management-app 1.0.1-pre.448 → 1.0.1-pre.453

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

@@ -86,10 +86,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4775831,
+      "size": 4777297,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4753882,
+        "javascript": 4755348,
         "share-init": 252,
         "runtime": 21445
       },
@@ -106,7 +106,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "a6cc6f2e807e820a",
+      "hash": "d00e98111ae7bcb5",
       "childrenByOrder": {}
     },
     {
@@ -164,9 +164,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1084650,
+      "size": 1086116,
       "sizes": {
-        "javascript": 1084440,
+        "javascript": 1085906,
         "consume-shared": 210
       },
       "names": [],
@@ -180,7 +180,7 @@
       "auxiliaryFiles": [
         "457.js.map"
       ],
-      "hash": "5dd2fd6d0b4d4fa8",
+      "hash": "1ff42f34b5dc4bd2",
       "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.448"}
+{"$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.453"}

package/package.json

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

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,
@@ -32,6 +32,7 @@ import {
   restBaseUrl,
   showNotification,
   showToast,
+  useSession,
 } from "@openmrs/esm-framework";
 import { UserRoleScopeOperationType } from "../../core/api/types/identity/UserRoleScopeOperationType";
 import { UserRoleScopeLocation } from "../../core/api/types/identity/UserRoleScopeLocation";
@@ -55,18 +56,21 @@ const MinDate: Date = today();
 
 interface AddStockUserRoleScopeProps {
   model?: UserRoleScope;
+  editMode?: boolean;
 }
 
 const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
   model,
+  editMode,
 }) => {
   const { t } = useTranslation();
-
+  const currentUser = useSession();
   const [formModel, setFormModel] = useState<UserRoleScope>({ ...model });
 
   const [roles, setRoles] = useState<Role[]>([]);
 
   const [showItems, setShowItems] = useState(false);
+  const loggedInUserUuid = currentUser?.user?.uuid;
 
   // operation types
   const {
@@ -125,13 +129,20 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
       setShowItems(false);
     } else {
       setShowItems(true);
-      const filtered = usersResults.filter((item: any) => {
-        const displayName = item?.person?.display ?? item?.display ?? "";
-        return displayName.toLowerCase().includes(query.toLowerCase());
-      });
+      const filtered = usersResults
+        .filter((item: any) => item.uuid !== loggedInUserUuid)
+        .filter((item: any) => {
+          const displayName = item?.person?.display ?? item?.display ?? "";
+          return displayName.toLowerCase().includes(query.toLowerCase());
+        });
       setFilteredItems(filtered);
     }
   };
+  useEffect(() => {
+    if (model?.userUuid) {
+      setSelectedUserUuid(model.userUuid);
+    }
+  }, [model]);
 
   const handleSearchQueryChange = (query: string) => {
     setSearchQuery(query);
@@ -215,9 +226,9 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
       INVENTORY_ADMNISTRATOR_ROLE_UUID,
     ];
 
-    const filteredStockRoles = data.selectedItem?.roles.filter((role) =>
-      stockRolesUUIDs.includes(role.uuid)
-    );
+    const filteredStockRoles = data.selectedItem?.roles
+      .filter((role) => stockRolesUUIDs.includes(role.uuid))
+      .filter((role) => role.uuid !== loggedInUserUuid);
     setFormModel({ ...formModel, userUuid: data.selectedItem?.uuid });
     setRoles(filteredStockRoles ?? []);
     setSelectedUserUuid(data?.selectedItem?.uuid);
@@ -326,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) =>
@@ -334,6 +345,11 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
                     }
                     onInputChange={handleSearchQueryChange}
                     placeholder="Filter..."
+                    initialSelectedItem={
+                      usersResults.find(
+                        (user) => user.uuid === model?.userUuid
+                      ) ?? null
+                    }
                   />
                 </>
               )}
@@ -355,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>
@@ -372,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"
               />
@@ -381,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]);
 

package/src/stock-user-role-scopes/stock-user-role-scopes-items-table.component.tsx

@@ -108,6 +108,7 @@ function StockUserRoleScopesItems() {
 
   const tableRows = useMemo(() => {
     return items?.map((userRoleScope, index) => {
+      const isCurrentUser = currentUser.user.uuid === userRoleScope.userUuid;
       return {
         ...userRoleScope,
         id: userRoleScope?.uuid,
@@ -141,18 +142,18 @@ function StockUserRoleScopesItems() {
             return operation?.operationTypeName;
           })
           ?.join(", "),
-        permanent: userRoleScope?.permanent
-          ? t("stockmanagement.yes", "Yes")
-          : t("stockmanagement.no", "No"),
+        permanent: userRoleScope?.permanent ? t("yes", "Yes") : t("no", "No"),
         activeFrom: formatDisplayDate(userRoleScope?.activeFrom) ?? "Not Set",
         activeTo: formatDisplayDate(userRoleScope?.activeTo) ?? "Not Set",
-        enabled: userRoleScope?.enabled
-          ? t("stockmanagement.yes", "Yes")
-          : t("stockmanagement.no", "No"),
+        enabled: userRoleScope?.enabled ? t("yes", "Yes") : t("no", "No"),
         actions: (
           <div style={{ display: "flex" }}>
-            <EditStockUserRoleActionsMenu data={items[index]} />
-            <StockUserScopeDeleteActionMenu uuid={items[index].uuid} />
+            {!isCurrentUser && (
+              <>
+                <EditStockUserRoleActionsMenu data={items[index]} />
+                <StockUserScopeDeleteActionMenu uuid={items[index].uuid} />
+              </>
+            )}
           </div>
         ),
       };