@rh-support/manage 2.5.257 → 2.5.259

package/lib/esm/components/Groups/DefualtGroupSwitch/DefaultGroupSwitch.js

@@ -40,6 +40,6 @@ export const DefaultGroupSwitch = (props) => {
         }
     });
     return (React.createElement(React.Fragment, null,
-        React.createElement(Switch, { "aria-label": "Toggle default group", "data-tracking-id": `group-user-toggle-default-${user.isDefault ? 'off' : 'on'}`, label: t('On'), id: id, isDisabled: isFetching || !user.contactSfId, isChecked: user.isDefault, onChange: (_event, isChecked) => handleToggle(isChecked) }),
+        React.createElement(Switch, { "aria-label": "Toggle default group", "data-tracking-id": `group-user-toggle-default-${user.isDefault ? 'off' : 'on'}`, label: user.isDefault ? t('On') : t('Off'), id: id, isDisabled: isFetching || !user.contactSfId, isChecked: user.isDefault, onChange: (_event, isChecked) => handleToggle(isChecked) }),
         React.createElement(LoadingIndicator, { show: isFetching, size: "xs" })));
 };

package/lib/esm/components/Groups/ManageGroupUsers/ManageGroupUsers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ManageGroupUsers.d.ts","sourceRoot":"","sources":["../../../../../src/components/Groups/ManageGroupUsers/ManageGroupUsers.tsx"],"names":[],"mappings":"AAMA,OAAO,KAA8B,MAAM,OAAO,CAAC;AA0BnD,eAAO,MAAM,gBAAgB,yBA0Q5B,CAAC"}
+{"version":3,"file":"ManageGroupUsers.d.ts","sourceRoot":"","sources":["../../../../../src/components/Groups/ManageGroupUsers/ManageGroupUsers.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAsC5D,eAAO,MAAM,gBAAgB,yBAiS5B,CAAC"}

package/lib/esm/components/Groups/ManageGroupUsers/ManageGroupUsers.js

@@ -7,12 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Button, Modal, ModalBody, ModalFooter, ModalHeader, ModalVariant, SearchInput } from '@patternfly/react-core';
+import { Button, Modal, ModalBody, ModalFooter, ModalHeader, ModalVariant, SearchInput, Tooltip, } from '@patternfly/react-core';
 import { ErrorBoundary, ToastNotification, usePrevious } from '@rh-support/components';
 import { useGlobalStateContext } from '@rh-support/react-context';
 import { ability, resourceActions, resources } from '@rh-support/user-permissions';
 import isEmpty from 'lodash/isEmpty';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useLocation } from 'react-router-dom';
 import { useCaseGroupMembers, useDeleteCaseGroupMember } from '../../../hooks/useCaseGroupGraphQL';
@@ -24,15 +24,42 @@ import { GroupSelect } from '../GroupSelect';
 // import { GroupUserPermissionsSelect } from '../GroupUserPermissionsSelect';
 const RemoveMemberButton = ({ user, onRemove, isDisabled }) => {
     const { t } = useTranslation();
-    return (React.createElement(Button, { variant: "link", isDanger: true, onClick: () => onRemove(user), isDisabled: isDisabled }, t('Remove')));
+    const button = (React.createElement(Button, { variant: "link", isDanger: true, onClick: () => onRemove(user), isAriaDisabled: user.isOrgAdmin || isDisabled }, t('Remove')));
+    if (user.isOrgAdmin) {
+        return (React.createElement(Tooltip, { content: t('Organization Administrators cannot be removed because they have access to all groups') }, button));
+    }
+    return button;
 };
 export const ManageGroupUsers = () => {
     const { t } = useTranslation();
     const location = useLocation();
-    const { globalMetadataState: { loggedInUsersAccount }, } = useGlobalStateContext();
+    const { globalMetadataState: { loggedInUsersAccount, loggedInUser }, } = useGlobalStateContext();
     const disableGroupSelect = !loggedInUsersAccount || !loggedInUsersAccount.data || !loggedInUsersAccount.data.accountNumber;
     const [selectedGroup, setSelectedGroup] = useState();
     const { data: groupUsers, loading: isFetching, fetchMembers, refetch } = useCaseGroupMembers();
+    const membersWithOrgAdmin = useMemo(() => {
+        var _a, _b, _c, _d;
+        const members = groupUsers || [];
+        const user = loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.data;
+        if (!(user === null || user === void 0 ? void 0 : user.isOrgAdmin) || !user.ssoUsername || !selectedGroup)
+            return members;
+        const alreadyPresent = members.some((m) => m.ssoUsername === user.ssoUsername);
+        if (alreadyPresent)
+            return members;
+        const syntheticEntry = {
+            firstName: (_a = user.firstName) !== null && _a !== void 0 ? _a : '',
+            lastName: (_b = user.lastName) !== null && _b !== void 0 ? _b : '',
+            isOrgAdmin: true,
+            access: true,
+            write: false,
+            isDefault: false,
+            ssoUsername: user.ssoUsername,
+            email: (_c = user.email) !== null && _c !== void 0 ? _c : '',
+            contactSfId: (_d = user.id) !== null && _d !== void 0 ? _d : '',
+            memberRecordId: '',
+        };
+        return [...members, syntheticEntry];
+    }, [groupUsers, loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.data, selectedGroup]);
     const canManageCaseGroups = ability.can(resourceActions.CREATE, resources.CASE_GROUPS);
     const [isAddMembersModalOpen, setIsAddMembersModalOpen] = useState(false);
     const [memberToRemove, setMemberToRemove] = useState(null);
@@ -47,9 +74,9 @@ export const ManageGroupUsers = () => {
     //     ToastNotification.addDangerMessage(message);
     // }
     // set and sort fetched data.
-    const [initialData, setInitialData] = useState(groupUsers);
-    const [data, setData] = useState(groupUsers);
-    useEffect(() => setAllData(groupUsers || []), [groupUsers]);
+    const [initialData, setInitialData] = useState(membersWithOrgAdmin);
+    const [data, setData] = useState(membersWithOrgAdmin);
+    useEffect(() => setAllData(membersWithOrgAdmin || []), [membersWithOrgAdmin]);
     function setAllData(users) {
         setInitialData(users);
         setData(users);
@@ -173,12 +200,12 @@ export const ManageGroupUsers = () => {
         else {
             setData(initialData);
         }
-    }, [initialData, userSearch, setData, previousUserSearch, groupUsers]);
+    }, [initialData, userSearch, setData, previousUserSearch, membersWithOrgAdmin]);
     useEffect(() => {
         if (location.pathname !== '/manage/groups') {
             return;
         }
-        setAllData(groupUsers || []);
+        setAllData(membersWithOrgAdmin || []);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [location.pathname, loggedInUsersAccount.data]);
     return (React.createElement(React.Fragment, null,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/manage",
-    "version": "2.5.257",
+    "version": "2.5.259",
     "description": "Customer Support Manage App",
     "author": "Jordan Eudy <jeudy100@gmail.com>",
     "license": "ISC",
@@ -78,12 +78,12 @@
         "@patternfly/patternfly": "6.2.1",
         "@patternfly/react-core": "6.2.1",
         "@patternfly/react-table": "6.2.1",
-        "@rh-support/components": "2.5.208",
+        "@rh-support/components": "2.5.210",
         "@rh-support/configs": "2.0.75",
-        "@rh-support/react-context": "2.5.303",
+        "@rh-support/react-context": "2.5.305",
         "@rh-support/types": "2.0.26",
-        "@rh-support/user-permissions": "2.5.155",
-        "@rh-support/utils": "2.5.136",
+        "@rh-support/user-permissions": "2.5.157",
+        "@rh-support/utils": "2.5.138",
         "@types/react-beautiful-dnd": "^13.0.0",
         "i18next": "^23.15.0",
         "lodash": ">=4.17.15",
@@ -102,5 +102,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "f7a13ec00f6cb4714674e5cbfc342df08a509f06"
+    "gitHead": "d8c5155f1ffe40e41ea5bb448df3b0418cc0ea0c"
 }