@rh-support/manage 2.5.259 → 2.5.260

package/lib/esm/components/Groups/DefualtGroupSwitch/DefaultGroupSwitch.d.ts

@@ -6,6 +6,7 @@ interface IProps {
     user: IGroupUserWithContactId;
     id: string;
     onToggle: (user: IGroupUserWithContactId, isChecked: boolean) => void;
+    onToggleSuccess?: (user: IGroupUserWithContactId, isChecked: boolean) => void;
 }
 export declare const DefaultGroupSwitch: (props: IProps) => React.JSX.Element;
 export {};

package/lib/esm/components/Groups/DefualtGroupSwitch/DefaultGroupSwitch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultGroupSwitch.d.ts","sourceRoot":"","sources":["../../../../../src/components/Groups/DefualtGroupSwitch/DefaultGroupSwitch.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+CAA+C,CAAC;AAG3E,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAE9E,UAAU,MAAM;IACZ,KAAK,EAAE,UAAU,CAAC;IAClB,IAAI,EAAE,uBAAuB,CAAC;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,CAAC,IAAI,EAAE,uBAAuB,EAAE,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;CACzE;AAED,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,sBA+C/C,CAAC"}
+{"version":3,"file":"DefaultGroupSwitch.d.ts","sourceRoot":"","sources":["../../../../../src/components/Groups/DefualtGroupSwitch/DefaultGroupSwitch.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+CAA+C,CAAC;AAG3E,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAE9E,UAAU,MAAM;IACZ,KAAK,EAAE,UAAU,CAAC;IAClB,IAAI,EAAE,uBAAuB,CAAC;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,CAAC,IAAI,EAAE,uBAAuB,EAAE,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IACtE,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,uBAAuB,EAAE,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;CACjF;AAED,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,sBAgD/C,CAAC"}

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

@@ -13,7 +13,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useToggleDefaultGroup } from '../../../hooks/useCaseGroupGraphQL';
 export const DefaultGroupSwitch = (props) => {
-    const { group, id, user, onToggle } = props;
+    const { group, id, user, onToggle, onToggleSuccess } = props;
     // @ts-ignore
     const { t } = useTranslation();
     const { toggleDefault, loading: isFetching } = useToggleDefaultGroup();
@@ -26,6 +26,7 @@ export const DefaultGroupSwitch = (props) => {
             onToggle(user, isChecked);
             const groupId = isChecked ? group.groupNum : null;
             yield toggleDefault(user.contactSfId, groupId);
+            onToggleSuccess === null || onToggleSuccess === void 0 ? void 0 : onToggleSuccess(user, isChecked);
             ToastNotification.addSuccessMessage(t(`Default group updated successfully`));
         }
         catch (e) {

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":"AAeA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAsC5D,eAAO,MAAM,gBAAgB,yBAiS5B,CAAC"}
+{"version":3,"file":"ManageGroupUsers.d.ts","sourceRoot":"","sources":["../../../../../src/components/Groups/ManageGroupUsers/ManageGroupUsers.tsx"],"names":[],"mappings":"AAoBA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAsC5D,eAAO,MAAM,gBAAgB,yBAwV5B,CAAC"}

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 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 { GlobalMetadataReducerConstants, useGlobalDispatchContext, useGlobalStateContext, } from '@rh-support/react-context';
 import { ability, resourceActions, resources } from '@rh-support/user-permissions';
 import isEmpty from 'lodash/isEmpty';
 import React, { useEffect, useMemo, useState } from 'react';
@@ -31,16 +31,27 @@ const RemoveMemberButton = ({ user, onRemove, isDisabled }) => {
     return button;
 };
 export const ManageGroupUsers = () => {
+    var _a, _b;
     const { t } = useTranslation();
     const location = useLocation();
-    const { globalMetadataState: { loggedInUsersAccount, loggedInUser }, } = useGlobalStateContext();
+    const { globalMetadataState: { caseGroups, loggedInUsersAccount, loggedInUser }, } = useGlobalStateContext();
+    const dispatchToGlobalMetadataReducer = useGlobalDispatchContext();
     const disableGroupSelect = !loggedInUsersAccount || !loggedInUsersAccount.data || !loggedInUsersAccount.data.accountNumber;
     const [selectedGroup, setSelectedGroup] = useState();
     const { data: groupUsers, loading: isFetching, fetchMembers, refetch } = useCaseGroupMembers();
+    const defaultCaseGroupId = (_b = (_a = loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.data) === null || _a === void 0 ? void 0 : _a.defaultCaseGroup) !== null && _b !== void 0 ? _b : null;
     const membersWithOrgAdmin = useMemo(() => {
         var _a, _b, _c, _d;
-        const members = groupUsers || [];
-        const user = loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.data;
+        const loggedInContact = loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.data;
+        const selectedGroupId = selectedGroup === null || selectedGroup === void 0 ? void 0 : selectedGroup.groupNum;
+        const syncLoggedInUserDefault = (members) => {
+            if (!(loggedInContact === null || loggedInContact === void 0 ? void 0 : loggedInContact.ssoUsername) || !selectedGroupId)
+                return members;
+            return members.map((member) => member.ssoUsername === loggedInContact.ssoUsername
+                ? Object.assign(Object.assign({}, member), { isDefault: defaultCaseGroupId === selectedGroupId }) : member);
+        };
+        const members = syncLoggedInUserDefault(groupUsers || []);
+        const user = loggedInContact;
         if (!(user === null || user === void 0 ? void 0 : user.isOrgAdmin) || !user.ssoUsername || !selectedGroup)
             return members;
         const alreadyPresent = members.some((m) => m.ssoUsername === user.ssoUsername);
@@ -52,14 +63,14 @@ export const ManageGroupUsers = () => {
             isOrgAdmin: true,
             access: true,
             write: false,
-            isDefault: false,
+            isDefault: defaultCaseGroupId === selectedGroup.groupNum,
             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]);
+    }, [groupUsers, loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.data, selectedGroup, defaultCaseGroupId]);
     const canManageCaseGroups = ability.can(resourceActions.CREATE, resources.CASE_GROUPS);
     const [isAddMembersModalOpen, setIsAddMembersModalOpen] = useState(false);
     const [memberToRemove, setMemberToRemove] = useState(null);
@@ -95,6 +106,28 @@ export const ManageGroupUsers = () => {
             return tempUser;
         }));
     };
+    const onDefaultToggleSuccess = (user, isChecked) => {
+        var _a;
+        if (user.ssoUsername !== ((_a = loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.data) === null || _a === void 0 ? void 0 : _a.ssoUsername) || !selectedGroup)
+            return;
+        const groupId = isChecked ? selectedGroup.groupNum : null;
+        const updatedLoggedInUserData = Object.assign(Object.assign({}, loggedInUser.data), { defaultCaseGroup: groupId });
+        dispatchToGlobalMetadataReducer({
+            type: GlobalMetadataReducerConstants.setLoggedInUser,
+            payload: {
+                loggedInUser: Object.assign(Object.assign({}, loggedInUser), { data: updatedLoggedInUserData }),
+            },
+        });
+        if (caseGroups === null || caseGroups === void 0 ? void 0 : caseGroups.data) {
+            const updatedGroups = caseGroups.data.map((group) => (Object.assign(Object.assign({}, group), { isDefault: groupId !== null && group.groupNum === groupId })));
+            dispatchToGlobalMetadataReducer({
+                type: GlobalMetadataReducerConstants.setCaseGroups,
+                payload: {
+                    caseGroups: Object.assign(Object.assign({}, caseGroups), { data: updatedGroups }),
+                },
+            });
+        }
+    };
     const onGroupSelect = (group) => __awaiter(void 0, void 0, void 0, function* () {
         setSelectedGroup(group);
         if (group) {
@@ -172,7 +205,7 @@ export const ManageGroupUsers = () => {
                 {
                     id: 'default',
                     title: t('Default group'),
-                    cell: (user, index) => (React.createElement(DefaultGroupSwitch, { id: `${index}`, onToggle: onDefaultToggle, group: selectedGroup, user: user })),
+                    cell: (user, index) => (React.createElement(DefaultGroupSwitch, { id: `${index}`, onToggle: onDefaultToggle, onToggleSuccess: onDefaultToggleSuccess, group: selectedGroup, user: user })),
                 },
                 {
                     id: 'remove',

package/lib/esm/components/ManagePreferences/sections/PreferencesCaseCreate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PreferencesCaseCreate.d.ts","sourceRoot":"","sources":["../../../../../src/components/ManagePreferences/sections/PreferencesCaseCreate.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAMxE,UAAU,MAAM;CAAG;AACnB,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,qBAmLlD"}
+{"version":3,"file":"PreferencesCaseCreate.d.ts","sourceRoot":"","sources":["../../../../../src/components/ManagePreferences/sections/PreferencesCaseCreate.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAA2D,MAAM,OAAO,CAAC;AAkBhF,UAAU,MAAM;CAAG;AACnB,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,qBAwNlD"}

package/lib/esm/components/ManagePreferences/sections/PreferencesCaseCreate.js

@@ -8,48 +8,73 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { useApolloClient } from '@apollo/client/react';
-import { publicApi } from '@cee-eng/hydrajs';
 import { Card, CardBody, CardHeader, SelectOption } from '@patternfly/react-core';
-import { ToastNotification, useFetch } from '@rh-support/components';
-import { fetchLanguageMetadata, GlobalMetadataDispatchContext, GlobalMetadataReducerConstants, GlobalMetadataStateContext, } from '@rh-support/react-context';
+import { ToastNotification } from '@rh-support/components';
+import { fetchCaseGroupsForAccount, fetchCaseGroupsForSSO, fetchLanguageMetadata, GlobalMetadataDispatchContext, GlobalMetadataReducerConstants, GlobalMetadataStateContext, } from '@rh-support/react-context';
 import { haventLoadedMetadata, PreferredLanguages } from '@rh-support/utils';
 import isEmpty from 'lodash/isEmpty';
 import map from 'lodash/map';
-import React, { useContext, useEffect, useMemo, useState } from 'react';
+import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
+import { useToggleDefaultGroup } from '../../../hooks/useCaseGroupGraphQL';
 import { useUserPreferences } from '../../../hooks/useUserPreferences';
 import { PreferenceSelect } from '../components/PreferenceSelect';
+const UNGROUPED_CASE_LABEL = 'Ungrouped Case';
+function resolveDefaultGroupLabel(defaultCaseGroupId, groupList) {
+    var _a;
+    if (!defaultCaseGroupId || defaultCaseGroupId === '-1') {
+        return UNGROUPED_CASE_LABEL;
+    }
+    const defaultGroup = groupList.find((group) => group.groupNum === defaultCaseGroupId);
+    return (_a = defaultGroup === null || defaultGroup === void 0 ? void 0 : defaultGroup.name) !== null && _a !== void 0 ? _a : UNGROUPED_CASE_LABEL;
+}
 export function PreferencesCaseCreate(props) {
+    var _a, _b, _c, _d, _e, _f;
     const { t } = useTranslation();
     const apolloClient = useApolloClient();
-    const { globalMetadataState: { caseGroups, caseLanguages, loggedInUserJwtToken, loggedInUserRights, loggedInUsersAccount, }, } = useContext(GlobalMetadataStateContext);
+    const { globalMetadataState: { caseGroups, caseLanguages, loggedInUser, loggedInUserJwtToken, loggedInUsersAccount }, } = useContext(GlobalMetadataStateContext);
     const dispatchToGlobalMetadataReducer = useContext(GlobalMetadataDispatchContext);
     const languageConst = caseLanguages.data;
-    const toggleDefaultGroupFetch = useFetch(publicApi.caseGroups.toggleDefaultGroup, {
-        propgateErrors: true,
-    });
+    const { toggleDefault } = useToggleDefaultGroup();
     const groupList = useMemo(() => caseGroups.data || [], [caseGroups.data]);
-    const updateDefaultGroupPref = (groupNum) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    const contactId = (_a = loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.data) === null || _a === void 0 ? void 0 : _a.id;
+    const defaultCaseGroupId = (_c = (_b = loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.data) === null || _b === void 0 ? void 0 : _b.defaultCaseGroup) !== null && _c !== void 0 ? _c : null;
+    const salesforceAccountId = (_d = loggedInUsersAccount.data) === null || _d === void 0 ? void 0 : _d.salesforceAccountId;
+    const loggedInContactId = (_e = loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.data) === null || _e === void 0 ? void 0 : _e.id;
+    const loggedInIsOrgAdmin = (_f = loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.data) === null || _f === void 0 ? void 0 : _f.isOrgAdmin;
+    const hasFetchedCaseGroups = useRef(false);
+    const updateDefaultGroupPref = (groupId) => __awaiter(this, void 0, void 0, function* () {
+        if (!contactId) {
+            ToastNotification.addDangerMessage(t('Cannot update default group: contact information is missing'));
+            throw new Error('Missing contact id');
+        }
         try {
-            yield toggleDefaultGroupFetch.request(groupNum, loggedInUserRights.data.getSSOUsername(), true, loggedInUsersAccount.data.secureSupport);
-            const updatedGroups = groupList.map((group) => (Object.assign(Object.assign({}, group), { isDefault: group.groupNum === groupNum })));
+            yield toggleDefault(contactId, groupId);
+            const updatedGroups = groupList.map((group) => (Object.assign(Object.assign({}, group), { isDefault: groupId !== null && group.groupNum === groupId })));
             dispatchToGlobalMetadataReducer({
                 type: GlobalMetadataReducerConstants.setCaseGroups,
                 payload: {
                     caseGroups: Object.assign(Object.assign({}, caseGroups), { data: updatedGroups }),
                 },
             });
-            setOriginalDefaultGroup(((_a = updatedGroups.find((g) => g.isDefault)) === null || _a === void 0 ? void 0 : _a.name) || 'Ungrouped Case');
+            const updatedLoggedInUserData = Object.assign(Object.assign({}, loggedInUser.data), { defaultCaseGroup: groupId });
+            dispatchToGlobalMetadataReducer({
+                type: GlobalMetadataReducerConstants.setLoggedInUser,
+                payload: {
+                    loggedInUser: Object.assign(Object.assign({}, loggedInUser), { data: updatedLoggedInUserData }),
+                },
+            });
+            setOriginalDefaultGroup(resolveDefaultGroupLabel(groupId, updatedGroups));
         }
         catch (error) {
             const message = String((error === null || error === void 0 ? void 0 : error.message) || '');
             if (message.includes('insufficient access rights')) {
                 ToastNotification.addDangerMessage(t('You do not have permission to change the default group'));
             }
-            else {
+            else if (message !== 'Missing contact id') {
                 ToastNotification.addDangerMessage(t('Failed to update default group'));
             }
+            throw error;
         }
     });
     const languagesList = map(languageConst, (cl) => ({
@@ -81,20 +106,13 @@ export function PreferencesCaseCreate(props) {
         }
     });
     const onDefaultGroupSelect = (event, selection) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            if (selection === 'Ungrouped Case') {
-                updateDefaultGroupPref('-1');
-            }
-            if (!isEmpty(groupList)) {
-                const selectedGroup = groupList.find((group) => group.name === selection);
-                if (selectedGroup) {
-                    yield updateDefaultGroupPref(selectedGroup.groupNum);
-                    setOriginalDefaultGroup(selectedGroup.name);
-                }
-            }
+        if (selection === UNGROUPED_CASE_LABEL) {
+            yield updateDefaultGroupPref(null);
+            return;
         }
-        catch (error) {
-            console.log(error);
+        const selectedGroup = groupList.find((group) => group.name === selection);
+        if (selectedGroup) {
+            yield updateDefaultGroupPref(selectedGroup.groupNum);
         }
     });
     useEffect(() => {
@@ -112,15 +130,31 @@ export function PreferencesCaseCreate(props) {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [caseLanguages, caseGroups, dispatchToGlobalMetadataReducer, loggedInUserJwtToken]);
     useEffect(() => {
-        const defaultGroup = groupList.find((g) => g.isDefault);
-        setOriginalDefaultGroup((defaultGroup === null || defaultGroup === void 0 ? void 0 : defaultGroup.name) || 'Ungrouped Case');
-    }, [groupList]);
+        if (loggedInUser.isFetching)
+            return;
+        setOriginalDefaultGroup(resolveDefaultGroupLabel(defaultCaseGroupId, groupList));
+    }, [defaultCaseGroupId, groupList, loggedInUser.isFetching]);
     useEffect(() => {
         if (haventLoadedMetadata(caseLanguages)) {
             fetchLanguageMetadata(dispatchToGlobalMetadataReducer, apolloClient);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [caseLanguages, apolloClient]);
+    useEffect(() => {
+        var _a;
+        if (!salesforceAccountId || loggedInUser.isFetching || !contactId)
+            return;
+        if (hasFetchedCaseGroups.current)
+            return;
+        hasFetchedCaseGroups.current = true;
+        if ((_a = loggedInUsersAccount.data) === null || _a === void 0 ? void 0 : _a.isInternal) {
+            fetchCaseGroupsForAccount(dispatchToGlobalMetadataReducer, apolloClient, salesforceAccountId, defaultCaseGroupId, loggedInContactId, loggedInIsOrgAdmin);
+        }
+        else {
+            fetchCaseGroupsForSSO(dispatchToGlobalMetadataReducer, apolloClient, salesforceAccountId, defaultCaseGroupId, loggedInContactId, loggedInIsOrgAdmin);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [salesforceAccountId, loggedInUser.isFetching, contactId, defaultCaseGroupId]);
     return (React.createElement(Card, { variant: "secondary", className: "preference-card" },
         React.createElement(CardHeader, null,
             React.createElement("h3", null,
@@ -132,5 +166,5 @@ export function PreferencesCaseCreate(props) {
                     React.createElement("p", { className: "form-instructions" },
                         React.createElement(Trans, null, "Preferred language will impact future cases, not existing ones."))),
                 React.createElement("div", { className: "form-group" },
-                    React.createElement(PreferenceSelect, { label: "Default group", id: defaultGroupTitleId, onSelect: onDefaultGroupSelect, selections: originalDefaultGroup }, groupList.map((option, index) => (React.createElement(SelectOption, { key: index, value: option.name })))))))));
+                    React.createElement(PreferenceSelect, { label: "Default group", id: defaultGroupTitleId, onSelect: onDefaultGroupSelect, selections: originalDefaultGroup }, [UNGROUPED_CASE_LABEL, ...groupList.map((group) => group.name)].map((name, index) => (React.createElement(SelectOption, { key: index, value: name })))))))));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/manage",
-    "version": "2.5.259",
+    "version": "2.5.260",
     "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.210",
+        "@rh-support/components": "2.5.211",
         "@rh-support/configs": "2.0.75",
-        "@rh-support/react-context": "2.5.305",
+        "@rh-support/react-context": "2.5.306",
         "@rh-support/types": "2.0.26",
-        "@rh-support/user-permissions": "2.5.157",
-        "@rh-support/utils": "2.5.138",
+        "@rh-support/user-permissions": "2.5.158",
+        "@rh-support/utils": "2.5.139",
         "@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": "d8c5155f1ffe40e41ea5bb448df3b0418cc0ea0c"
+    "gitHead": "8932407838770cc8548f647dddcc44d39a34dcfd"
 }