@rh-support/troubleshoot 2.6.301 → 2.6.302

package/lib/esm/components/CaseEditView/Tabs/RMEEscalations/RMEEscalationList.js

@@ -7,9 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { escalations, publicApi } from '@cee-eng/hydrajs';
+import { useApolloClient } from '@apollo/client/react';
 import { Button, ButtonVariant, Flex, FlexItem } from '@patternfly/react-core';
-import { LoadingIndicator, PFTable, TableComponent, ToastNotification, useFetch, } from '@rh-support/components';
+import { LoadingIndicator, PFTable, TableComponent, ToastNotification } from '@rh-support/components';
 import { ability, resourceActions, resources } from '@rh-support/user-permissions';
 import { formatDate, sendToSentry } from '@rh-support/utils';
 import find from 'lodash/find';
@@ -18,11 +18,10 @@ import isEqual from 'lodash/isEqual';
 import React, { useEffect, useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useCaseDispatch, useCaseSelector } from '../../../../context/CaseContext';
-import { useCaseDetailsPageDispatchContext, useCaseDetailsPageStateContext, } from '../../../../context/CaseDetailsPageContext';
-import { useCaseDiscussionTabDispatchContext, useCaseDiscussionTabStateContext, } from '../../../../context/CaseDiscussionTabContext';
+import { useCaseDetailsPageDispatchContext } from '../../../../context/CaseDetailsPageContext';
+import { GET_CASE_COMMENTS, useCreateCaseComment } from '../../../../hooks/useCaseComments';
 import { escalationStatus } from '../../../../models/escalation';
 import { fetchCaseEscalations } from '../../../../reducers/CaseDetailsPageReducer';
-import { updateDiscussionStateComments } from '../../../../reducers/CaseDiscussionTabReducer';
 import { checkForCaseStatusToggleOnAttachOrComment } from '../../../../reducers/CaseReducer';
 const ESCALATION_MSG = 'Request Management Escalation:';
 const UPDATE_ESCALATION_MSG = 'Escalation update requested. You will receive an update from a manager shortly.';
@@ -30,20 +29,18 @@ const REOPEN_ESCALATION_MSG = 'Escalation reopened. A manager will review your r
 const CLOSURE_ESCALATION_MSG = 'Escalation closed.';
 export default function RMEEscalationList(props) {
     const { t } = useTranslation();
-    const { request: updateEscalationRequest, isFetching: isUpdatingEscalation } = useFetch(escalations.updateEscalations, { propgateErrors: true });
-    const { request: postCommentRequest, isFetching: isPostingComment } = useFetch(publicApi.kase.postComment, {
-        propgateErrors: true,
-    });
-    const { request: updateCaseRequest, isFetching: isUpdatingCase } = useFetch(publicApi.kase.updateCase, {
-        propgateErrors: true,
-    });
-    const { sort, allDiscussions, discussionFiltersListState } = useCaseDiscussionTabStateContext();
-    const dispatchDiscussion = useCaseDiscussionTabDispatchContext();
-    const { caseDetailsPageState: { caseFeedbacksHydra }, } = useCaseDetailsPageStateContext();
+    const apolloClient = useApolloClient();
+    // TODO: migrate escalation update from Hydra to GraphQL
+    // const { request: updateEscalationRequest, isFetching: isUpdatingEscalation } = useFetch(
+    //     escalations.updateEscalations,
+    //     { propgateErrors: true }
+    // );
+    const { createComment, loading: isPostingComment } = useCreateCaseComment();
+    const caseSalesforceId = useCaseSelector((state) => state.caseDetails.id, isEqual);
     const caseDetailsPageDispatch = useCaseDetailsPageDispatchContext();
     const escalationUpdateInProgessIds = useRef([]);
     const caseDispatch = useCaseDispatch();
-    const isUpdating = isUpdatingEscalation || isPostingComment || isUpdatingCase;
+    const isUpdating = isPostingComment;
     const [escalationList, setEscalationList] = useState([]);
     const cannUpdateRME = ability.can(resourceActions.UPDATE, resources.RME_ESCALATION);
     const { customerEscalation } = useCaseSelector((state) => ({
@@ -54,62 +51,43 @@ export default function RMEEscalationList(props) {
         // called everytime we are updating the escalation
         setEscalationList([...props.escalations]);
     }, [isUpdating, props.escalations]);
-    const updateEscalation = (escalationName, text, options) => __awaiter(this, void 0, void 0, function* () {
-        const updateRequest = Object.assign({ escalationName, isPrivate: false, text, isRequestForUpdate: false, isRequestForReOpen: false, isRequestForClosure: false, status: escalationStatus.requestUpdate }, options);
+    // TODO: migrate updateEscalation from Hydra (escalations.updateEscalations) to GraphQL
+    // const updateEscalation = async (escalationName: string, text: string, options: Partial<IEscalationUpdate>) => {
+    //     ...
+    // };
+    const submitEscalationComment = (escalationName, comment, message) => __awaiter(this, void 0, void 0, function* () {
         escalationUpdateInProgessIds.current.push(escalationName);
-        return yield updateEscalationRequest(escalationName, updateRequest);
-    });
-    const submitEscalationComment = (escalationNum, comment, message) => __awaiter(this, void 0, void 0, function* () {
         try {
-            escalationNum &&
-                fetchCaseEscalations(caseDetailsPageDispatch, props.caseNumber, props.accountNumber, false);
-            yield postCommentRequest({
-                caseNumber: props.caseNumber,
-                commentBody: comment,
-                contentType: 'plaintext',
+            fetchCaseEscalations(caseDetailsPageDispatch, caseSalesforceId, apolloClient, false);
+            yield createComment({
+                caseId: caseSalesforceId,
+                body: comment,
+                isPublic: true,
             });
-            updateDiscussionStateComments(dispatchDiscussion, caseDispatch, props.caseNumber, allDiscussions, sort, caseFeedbacksHydra.data, discussionFiltersListState);
-            yield updateCaseRequest(props.caseNumber, { customerEscalation: true });
+            apolloClient.refetchQueries({ include: [GET_CASE_COMMENTS] });
+            // TODO: migrate updateCaseRequest(props.caseNumber, { customerEscalation: true }) to GraphQL
             checkForCaseStatusToggleOnAttachOrComment(caseDispatch, props.isInternal, props.caseStatus);
-            escalationNum && ToastNotification.addSuccessMessage(message);
+            ToastNotification.addSuccessMessage(message);
         }
         catch (e) {
             ToastNotification.addDangerMessage(e);
             sendToSentry(e, {}, 'RME form submit error');
         }
         finally {
-            escalationUpdateInProgessIds.current = escalationUpdateInProgessIds.current.filter((item) => item !== escalationNum);
+            escalationUpdateInProgessIds.current = escalationUpdateInProgessIds.current.filter((item) => item !== escalationName);
         }
     });
     const requestUpdateRMEEscalation = (escalationName) => __awaiter(this, void 0, void 0, function* () {
         const comment = `${ESCALATION_MSG}\n ${UPDATE_ESCALATION_MSG}`;
-        try {
-            const updatedInfo = yield updateEscalation(escalationName, comment, { isRequestForUpdate: true });
-            updatedInfo && submitEscalationComment(updatedInfo.escalationName, comment, UPDATE_ESCALATION_MSG);
-        }
-        catch (e) {
-            ToastNotification.addDangerMessage(e);
-        }
+        yield submitEscalationComment(escalationName, comment, UPDATE_ESCALATION_MSG);
     });
     const requestClosureRMEEscalation = (escalationName) => __awaiter(this, void 0, void 0, function* () {
         const comment = `${ESCALATION_MSG}\n ${CLOSURE_ESCALATION_MSG}`;
-        try {
-            const updatedInfo = yield updateEscalation(escalationName, comment, { isRequestForClosure: true });
-            updatedInfo && submitEscalationComment(updatedInfo.escalationName, comment, CLOSURE_ESCALATION_MSG);
-        }
-        catch (e) {
-            ToastNotification.addDangerMessage(e);
-        }
+        yield submitEscalationComment(escalationName, comment, CLOSURE_ESCALATION_MSG);
     });
     const requestReOpenRMEEscalation = (escalationName) => __awaiter(this, void 0, void 0, function* () {
         const comment = `${ESCALATION_MSG}\n ${REOPEN_ESCALATION_MSG}`;
-        try {
-            const updatedInfo = yield updateEscalation(escalationName, comment, { isRequestForReOpen: true });
-            updatedInfo && submitEscalationComment(updatedInfo.escalationName, comment, REOPEN_ESCALATION_MSG);
-        }
-        catch (e) {
-            ToastNotification.addDangerMessage(e);
-        }
+        yield submitEscalationComment(escalationName, comment, REOPEN_ESCALATION_MSG);
     });
     const renderActionButtons = (escalation) => {
         if (isUpdating && escalationUpdateInProgessIds.current.includes(escalation.name)) {

package/lib/esm/components/CaseInformation/CaseGroup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseGroup.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseInformation/CaseGroup.tsx"],"names":[],"mappings":"AAqBA,OAAO,KAAuD,MAAM,OAAO,CAAC;AAiB5E,UAAU,MAAM;IACZ,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AAWD,iBAAS,SAAS,CAAC,KAAK,EAAE,MAAM,qBAqW/B;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"CaseGroup.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseInformation/CaseGroup.tsx"],"names":[],"mappings":"AAqBA,OAAO,KAAuD,MAAM,OAAO,CAAC;AAgB5E,UAAU,MAAM;IACZ,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AAWD,iBAAS,SAAS,CAAC,KAAK,EAAE,MAAM,qBAsY/B;AAED,eAAe,SAAS,CAAC"}

package/lib/esm/components/CaseInformation/CaseGroup.js

@@ -7,11 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { useApolloClient } from '@apollo/client/react';
 import { Button, MenuToggle, Select, SelectList, SelectOption, Spinner, TextInputGroup, TextInputGroupMain, TextInputGroupUtilities, } from '@patternfly/react-core';
 import TimesIcon from '@patternfly/react-icons/dist/js/icons/times-icon';
 import { ToastNotification, useSelectKeyboardNavigator, ValueChangedIcon } from '@rh-support/components';
 import { GlobalMetadataStateContext, useCanEditCase } from '@rh-support/react-context';
-import { toOption } from '@rh-support/utils';
 import find from 'lodash/find';
 import isEmpty from 'lodash/isEmpty';
 import isEqual from 'lodash/isEqual';
@@ -20,7 +20,7 @@ import { Trans, useTranslation } from 'react-i18next';
 import { useCaseDispatch, useCaseSelector } from '../../context/CaseContext';
 import { RouteContext } from '../../context/RouteContext';
 import { useCaseUpdateErrorMessage } from '../../hooks/useCaseUpdateErrorMessage';
-import { fetchCaseGroupsForAccount, fetchCaseGroupsForSSO, setCaseDetails, setSelectedCaseGroupUsers, updateCaseDetails, } from '../../reducers/CaseReducer';
+import { fetchCaseGroupsForContactGraphQL, setCaseDetails, setSelectedCaseGroupUsers, updateCaseDetailsGraphQL, } from '../../reducers/CaseReducer';
 import { PDFContext } from '../CaseEditView/PDFContainer';
 import { CaseValuesToWatch } from '../shared/Constants';
 import { getChangedValueTooltip } from '../shared/utils';
@@ -35,20 +35,35 @@ const emptyCaseGroup = {
 function CaseGroup(props) {
     const { t } = useTranslation();
     const caseUpdateError = useCaseUpdateErrorMessage();
-    const { groupNumber, caseNumber, accountNumber, selectedAccountDetails, ownersCaseGroups, groupName, isCaseOwnerUpdating, contactSSOName, } = useCaseSelector((state) => ({
-        caseNumber: state.caseDetails.caseNumber,
-        groupNumber: state.caseDetails.groupNumber,
-        accountNumber: state.caseDetails.accountNumberRef,
-        ownersCaseGroups: state.ownersCaseGroups,
-        selectedAccountDetails: state.selectedAccountDetails,
-        groupName: state.caseDetails.groupName,
-        isCaseOwnerUpdating: state.isCaseOwnerUpdating,
-        contactSSOName: state.caseDetails.contactSSOName,
-    }), isEqual);
+    const { groupNumber, caseNumber, caseId, accountNumber, selectedAccountDetails, ownersCaseGroups, groupName, isCaseOwnerUpdating, contactSSOName, selectedOwnerContactId, selectedOwnerIsOrgAdmin, } = useCaseSelector((state) => {
+        var _a, _b, _c, _d, _e;
+        return ({
+            caseNumber: state.caseDetails.caseNumber,
+            caseId: state.caseDetails.id,
+            groupNumber: state.caseDetails.groupNumber,
+            accountNumber: state.caseDetails.accountNumberRef,
+            ownersCaseGroups: state.ownersCaseGroups,
+            selectedAccountDetails: state.selectedAccountDetails,
+            groupName: state.caseDetails.groupName,
+            isCaseOwnerUpdating: state.isCaseOwnerUpdating,
+            contactSSOName: state.caseDetails.contactSSOName,
+            selectedOwnerContactId: (_b = (_a = state.selectedOwner) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.id,
+            selectedOwnerIsOrgAdmin: (_e = (_d = (_c = state.selectedOwner) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.isOrgAdmin) !== null && _e !== void 0 ? _e : false,
+        });
+    }, isEqual);
     const caseDispatch = useCaseDispatch();
+    const apolloClient = useApolloClient();
     const { isExportingPDF } = useContext(PDFContext);
     const { routeState: { isNextBtnClickedToShowValidationError }, } = useContext(RouteContext);
     const isGroupMandatory = selectedAccountDetails.data.requireCGroupOnCreate;
+    useEffect(() => {
+        if (!caseNumber)
+            return;
+        if (isEmpty(selectedOwnerContactId) || isEmpty(accountNumber))
+            return;
+        fetchCaseGroupsForContactGraphQL(caseDispatch, apolloClient, selectedOwnerContactId, accountNumber, groupNumber, selectedOwnerIsOrgAdmin);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [selectedOwnerContactId, accountNumber, selectedOwnerIsOrgAdmin]);
     const [selectedCaseGroup, setSelectedCaseGroup] = useState(isGroupMandatory ? undefined : emptyCaseGroup);
     const [isCaseGroupInvalid, setCaseGroupInvalid] = useState(false);
     const [isSelectedUngroupedInvalid, setIsSelectedUngroupedInvalid] = useState(false);
@@ -74,9 +89,8 @@ function CaseGroup(props) {
             return;
         setCaseGroupUpdating(true);
         try {
-            yield updateCaseDetails(caseDispatch, caseNumber, caseDetails);
+            yield updateCaseDetailsGraphQL(caseDispatch, apolloClient, caseNumber, { groupNumber: caseDetails.groupNumber }, false, { salesforceCaseId: caseId });
             setCaseGroupUpdating(false);
-            setSelectedCaseGroupUsers(caseDispatch, accountNumber, caseDetails.groupNumber, loggedInUserRights.data);
             ToastNotification.addSuccessMessage(t(`Group has been successfully updated`));
         }
         catch (e) {
@@ -85,7 +99,7 @@ function CaseGroup(props) {
         }
     });
     const onCaseGroupChange = (selection) => __awaiter(this, void 0, void 0, function* () {
-        if (!isInvalidateCaseGroup(selection) && selection.groupNum !== groupNumber) {
+        if (!isInvalidateCaseGroup(selection) && (selection.groupNum !== groupNumber || !selected)) {
             const caseDetails = {
                 groupNumber: selection.groupNum,
                 groupName: selection.name || '',
@@ -93,7 +107,7 @@ function CaseGroup(props) {
             setIsOpen(false);
             if (!isEmpty(caseNumber)) {
                 yield onCaseGroupUpdate(caseDetails);
-                setIsSelectedUngroupedInvalid(isGroupMandatory && (!selection.groupNum || selection.groupNum === '-1'));
+                setIsSelectedUngroupedInvalid(isGroupMandatory && !selection.groupNum);
             }
             else {
                 setCaseDetails(caseDispatch, caseDetails);
@@ -120,10 +134,7 @@ function CaseGroup(props) {
             ? list.filter((v) => v.name.toLowerCase().includes(inputValue === null || inputValue === void 0 ? void 0 : inputValue.toLowerCase()))
             : list;
         if (isGroupMandatory) {
-            // having group selected for case is mandatory, make 'UnGrouped Case' option disabled
-            const listItems = options.map((item) => (Object.assign(Object.assign({}, item), { disabled: item.groupNum === '-1' })));
-            // As group is mandatory, 'UnGrouped Case' cannot be selected we filter it out
-            return listItems.filter((g) => g.groupNum !== '-1');
+            return options.filter((g) => !!g.groupNum);
         }
         else
             return options;
@@ -134,11 +145,11 @@ function CaseGroup(props) {
     useEffect(() => {
         var _a, _b;
         // case group may change outside of PCM. On group load check if we have a valid group
-        setIsSelectedUngroupedInvalid(isGroupMandatory && (!groupNumber || groupNumber === '-1'));
+        setIsSelectedUngroupedInvalid(isGroupMandatory && !groupNumber);
         if (groupNumber === undefined)
             return;
         if (((_b = (_a = ownersCaseGroups === null || ownersCaseGroups === void 0 ? void 0 : ownersCaseGroups.data) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) === 0) {
-            if (groupNumber !== '-1' && groupName && caseNumber) {
+            if (groupNumber && groupName && caseNumber) {
                 setSelectedCaseGroup({
                     name: groupName,
                     groupNum: groupNumber,
@@ -154,7 +165,7 @@ function CaseGroup(props) {
         }
         const selectedGroup = find(ownersCaseGroups.data, (g) => g.groupNum === groupNumber);
         if (selectedGroup && selectedGroup.groupNum) {
-            if (isGroupMandatory && selectedGroup.groupNum === '-1') {
+            if (isGroupMandatory && !selectedGroup.groupNum) {
                 setCaseGroupInvalid(true);
             }
             else {
@@ -168,32 +179,38 @@ function CaseGroup(props) {
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [ownersCaseGroups, caseNumber, isGroupMandatory]);
-    useEffect(() => {
-        // On case edit, groups are loaded via fetchCaseDetails/setCaseOwner and OwnerSelector.
-        if (caseNumber)
+    const onCaseGroupClear = () => __awaiter(this, void 0, void 0, function* () {
+        if (canEditCase.alert())
             return;
-        if (loggedInUserRights.data.isInternal()) {
-            if (accountNumber) {
-                fetchCaseGroupsForAccount(caseDispatch, accountNumber);
+        const caseDetails = {
+            groupNumber: '',
+            groupName: '',
+        };
+        if (caseNumber) {
+            setCaseGroupUpdating(true);
+            try {
+                yield updateCaseDetailsGraphQL(caseDispatch, apolloClient, caseNumber, { groupNumber: '' }, false, {
+                    salesforceCaseId: caseId,
+                });
+                setCaseDetails(caseDispatch, caseDetails);
+                setCaseGroupUpdating(false);
+                ToastNotification.addSuccessMessage(t(`Group has been successfully updated`));
+            }
+            catch (e) {
+                setCaseGroupUpdating(false);
+                caseUpdateError.showError(e, t(`Group failed to update`));
+                return;
             }
         }
-        else if (contactSSOName) {
-            fetchCaseGroupsForSSO(caseDispatch, contactSSOName);
-        }
-    }, [accountNumber, caseDispatch, caseNumber, contactSSOName, loggedInUserRights.data]);
-    const onCaseGroupClear = () => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        try {
-            yield onCaseGroupChange(toOption(emptyCaseGroup));
-            setSelectedCaseGroup(emptyCaseGroup);
-            setInputValue('');
-            setSelected('');
-            (_a = textInputRef === null || textInputRef === void 0 ? void 0 : textInputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
-            setIsOpen(false);
-        }
-        catch (error) {
-            console.log(error);
+        else {
+            setCaseDetails(caseDispatch, caseDetails);
+            setSelectedCaseGroupUsers(caseDispatch, accountNumber, '', loggedInUserRights.data);
         }
+        setSelectedCaseGroup(emptyCaseGroup);
+        setCaseGroupInvalid(false);
+        setInputValue('');
+        setSelected('');
+        setIsOpen(false);
     });
     const showHelperText = !isSelectedUngroupedInvalid || (!isCaseGroupInvalid && !isGroupMandatory);
     const showEmptyValidationError = !caseNumber && isNextBtnClickedToShowValidationError && isCaseGroupInvalid;
@@ -229,7 +246,12 @@ function CaseGroup(props) {
             ? 'danger'
             : undefined, isFullWidth: true },
         React.createElement(TextInputGroup, { isPlain: true },
-            React.createElement(TextInputGroupMain, { value: inputValue, onClick: onToggleClick, onChange: onInputQueryChange, onKeyDown: onInputKeyDown, autoComplete: "off", innerRef: textInputRef, placeholder: t(`Select a group`), role: "combobox", isExpanded: isOpen, "aria-controls": "select-typeahead-listbox" }),
+            React.createElement(TextInputGroupMain, { value: inputValue, onClick: onToggleClick, onChange: onInputQueryChange, onKeyDown: onInputKeyDown, onBlur: () => {
+                    if (selected) {
+                        setInputValue(selected);
+                        setShouldFilter(false);
+                    }
+                }, autoComplete: "off", innerRef: textInputRef, placeholder: t(`Select a group`), role: "combobox", isExpanded: isOpen, "aria-controls": "select-typeahead-listbox" }),
             !isCaseOwnerUpdating && (ownersCaseGroups.isFetching || isCaseGroupUpdating) ? (React.createElement(TextInputGroupUtilities, null,
                 React.createElement(Spinner, { size: "md" }))) : (React.createElement(TextInputGroupUtilities, Object.assign({}, (!inputValue ? { style: { display: 'none' } } : {})),
                 React.createElement(Button, { icon: React.createElement(TimesIcon, { "aria-hidden": true }), variant: "plain", onClick: onCaseGroupClear, "aria-label": "Clear input value" }))))));

package/lib/esm/components/CaseInformation/CaseInformation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseInformation.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseInformation/CaseInformation.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC;CACnC;AAED,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,KAAK,EAAE,MAAM,qBAkHpD"}
+{"version":3,"file":"CaseInformation.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseInformation/CaseInformation.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC;CACnC;AAED,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,KAAK,EAAE,MAAM,qBAoHpD"}

package/lib/esm/components/CaseInformation/CaseInformation.js

@@ -1,3 +1,4 @@
+import { useApolloClient } from '@apollo/client/react';
 import { AlertMessage, AlertType, LoadingIndicator } from '@rh-support/components';
 import { fetchCaseSeverities, fetchCaseTypes, fetchLanguageMetadata, GlobalMetadataDispatchContext, GlobalMetadataStateContext, } from '@rh-support/react-context';
 import { haventLoadedMetadata } from '@rh-support/utils';
@@ -7,13 +8,14 @@ import React, { useContext, useEffect } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useCaseSelector } from '../../context/CaseContext';
 import { OpenShiftClusterId } from '../CaseManagement/OpenShiftClusterId';
-import { Hostname } from '../ImproveCase/Hostname';
+// import { Hostname } from '../ImproveCase/Hostname';
 import KtQuestions from '../ImproveCase/KtQuestions';
 import ClusterRecommendations from '../Recommendations/ClusterRecommendations';
 export default function CaseInformation(props) {
     const { t } = useTranslation();
     const { globalMetadataState: { allCaseTypes, allCaseSeverities, caseLanguages, loggedInUser, loggedInUserJwtToken, loggedInUsersAccount, loggedInUserRights, }, } = useContext(GlobalMetadataStateContext);
     const dispatchToGlobalMetadataReducer = useContext(GlobalMetadataDispatchContext);
+    const apolloClient = useApolloClient();
     const { contactSSOName, selectedAccountDetails, ownersCaseGroups, hasInvalidEntitlements } = useCaseSelector((state) => ({
         contactSSOName: state.caseDetails.contactSSOName,
         ownersCaseGroups: state.ownersCaseGroups,
@@ -38,13 +40,13 @@ export default function CaseInformation(props) {
         }
         const allPromisses = [];
         if (haventLoadedMetadata(allCaseTypes)) {
-            allPromisses.push(fetchCaseTypes(dispatchToGlobalMetadataReducer, loggedInUsersAccount.data.secureSupport));
+            allPromisses.push(fetchCaseTypes(dispatchToGlobalMetadataReducer, apolloClient));
         }
         if (haventLoadedMetadata(allCaseSeverities)) {
-            allPromisses.push(fetchCaseSeverities(dispatchToGlobalMetadataReducer, loggedInUsersAccount.data.secureSupport));
+            allPromisses.push(fetchCaseSeverities(dispatchToGlobalMetadataReducer, apolloClient));
         }
         if (haventLoadedMetadata(caseLanguages)) {
-            allPromisses.push(fetchLanguageMetadata(dispatchToGlobalMetadataReducer));
+            allPromisses.push(fetchLanguageMetadata(dispatchToGlobalMetadataReducer, apolloClient));
         }
         Promise.all(allPromisses);
     }, [
@@ -56,6 +58,7 @@ export default function CaseInformation(props) {
         loggedInUserJwtToken,
         selectedAccountDetails,
         loggedInUsersAccount.data.secureSupport,
+        apolloClient,
     ]);
     return (React.createElement(React.Fragment, null,
         React.createElement(LoadingIndicator, { show: isMetadataLoading(), size: "lg" }),
@@ -77,7 +80,6 @@ export default function CaseInformation(props) {
             !isMetadataLoadingError() &&
             loggedInUserRights.data.canManageCases() && (React.createElement(React.Fragment, null,
             React.createElement("form", null,
-                React.createElement(Hostname, null),
                 React.createElement(OpenShiftClusterId, null),
                 React.createElement(ClusterRecommendations, { className: "push-bottom" }),
                 React.createElement(KtQuestions, null))))));

package/lib/esm/components/CaseInformation/ContactPhoneNumber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContactPhoneNumber.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseInformation/ContactPhoneNumber.tsx"],"names":[],"mappings":"AAOA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAiB/D,wBAAgB,kBAAkB,sBAsVjC"}
+{"version":3,"file":"ContactPhoneNumber.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseInformation/ContactPhoneNumber.tsx"],"names":[],"mappings":"AAQA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAuC/D,wBAAgB,kBAAkB,sBAwVjC"}

package/lib/esm/components/CaseInformation/ContactPhoneNumber.js

@@ -7,10 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { contacts } from '@cee-eng/hydrajs';
+import { useApolloClient } from '@apollo/client/react';
 import { ValidatedOptions } from '@patternfly/react-core';
 import { getPhoneObj, PhoneInput } from '@rh-support/components';
 import { GlobalMetadataStateContext } from '@rh-support/react-context';
+import { GET_ACCOUNT_CONTACTS } from '@rh-support/utils';
 import isEmpty from 'lodash/isEmpty';
 import isEqual from 'lodash/isEqual';
 import isUndefined from 'lodash/isUndefined';
@@ -24,13 +25,33 @@ import { setCaseDetails, setCaseState } from '../../reducers/CaseReducer';
 import { PDFContext } from '../CaseEditView/PDFContainer';
 import { removeAllChars, trimAndReplacePlus } from '../shared/utils';
 import { ContactPhoneNumberPopOver } from './ContactPhoneNumberPopOver';
+function fetchContactBySSO(apolloClient, accountNumber, ssoUsername) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        const { data } = yield apolloClient.query({
+            query: GET_ACCOUNT_CONTACTS,
+            variables: {
+                accountNumber: { eq: accountNumber },
+                contactsWhere: { SSOUserName__c: { eq: ssoUsername } },
+                first: 1,
+            },
+        });
+        const response = data;
+        const contactNode = (_j = (_h = (_g = (_f = (_e = (_d = (_c = (_b = (_a = response === null || response === void 0 ? void 0 : response.salesforce_support_uiapi) === null || _a === void 0 ? void 0 : _a.query) === null || _b === void 0 ? void 0 : _b.SalesforceSupportAccount) === null || _c === void 0 ? void 0 : _c.edges) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.node) === null || _f === void 0 ? void 0 : _f.Contacts) === null || _g === void 0 ? void 0 : _g.edges) === null || _h === void 0 ? void 0 : _h[0]) === null || _j === void 0 ? void 0 : _j.node;
+        return {
+            phone: (_l = (_k = contactNode === null || contactNode === void 0 ? void 0 : contactNode.Phone) === null || _k === void 0 ? void 0 : _k.value) !== null && _l !== void 0 ? _l : '',
+        };
+    });
+}
 export function ContactPhoneNumber() {
-    const { suppliedPhoneNumberVerified, phoneCountryCode = '', phoneAreaCodePrefixLineNumber = '', hasLoggedInUserConfirmedPhoneNumber, contactSSOName, shouldNotSetPhoneCountryCode, isCasePhoneUpdating, } = useCaseSelector((state) => ({
+    const apolloClient = useApolloClient();
+    const { suppliedPhoneNumberVerified, phoneCountryCode = '', phoneAreaCodePrefixLineNumber = '', hasLoggedInUserConfirmedPhoneNumber, contactSSOName, accountNumberRef, shouldNotSetPhoneCountryCode, isCasePhoneUpdating, } = useCaseSelector((state) => ({
         suppliedPhoneNumberVerified: state.caseDetails.suppliedPhoneNumberVerified,
         phoneCountryCode: state.caseDetails.phoneCountryCode,
         phoneAreaCodePrefixLineNumber: state.caseDetails.phoneAreaCodePrefixLineNumber,
         hasLoggedInUserConfirmedPhoneNumber: state.hasLoggedInUserConfirmedPhoneNumber,
         contactSSOName: state.caseDetails.contactSSOName,
+        accountNumberRef: state.caseDetails.accountNumberRef,
         shouldNotSetPhoneCountryCode: state.shouldNotSetPhoneCountryCode,
         isCasePhoneUpdating: state.isCasePhoneUpdating,
     }), isEqual);
@@ -156,32 +177,25 @@ export function ContactPhoneNumber() {
                     }
                 }
                 else {
-                    // user is openning case for others (use is partner or red hatter)
+                    // user is opening case for others (user is partner or red hatter)
                     try {
                         if (!contactSSOName)
                             return;
                         setIsFetchingSso(true);
-                        const selectedContact = yield contacts.getSFDCContactBySso(contactSSOName);
+                        const selectedContact = yield fetchContactBySSO(apolloClient, accountNumberRef, contactSSOName);
                         setIsFetchingSso(false);
-                        if (selectedContact.supportPhoneAreaCodePrefixLineNumber) {
-                            _phoneAreaCodePrefixLineNumber = selectedContact.supportPhoneAreaCodePrefixLineNumber;
-                            _phoneCountryCode = selectedContact.supportPhoneCountryCode;
-                            _suppliedPhoneNumberVerified = 'Deferred';
+                        const phoneLength = trimAndReplacePlus(removeAllChars(selectedContact.phone)).length;
+                        if (phoneLength > 10) {
+                            _phoneAreaCodePrefixLineNumber = getPhoneObj(selectedContact.phone).phoneLine || '';
+                            _phoneCountryCode = getPhoneObj(selectedContact.phone).countryCode || '';
                         }
                         else {
-                            const phoneLength = trimAndReplacePlus(removeAllChars(selectedContact.phone)).length;
-                            if (phoneLength > 10) {
-                                _phoneAreaCodePrefixLineNumber = getPhoneObj(selectedContact.phone).phoneLine || '';
-                                _phoneCountryCode = getPhoneObj(selectedContact.phone).countryCode || '';
-                            }
-                            else {
-                                _phoneAreaCodePrefixLineNumber = selectedContact.phone;
-                                _phoneCountryCode = '';
-                                setCaseState(caseDispatch, { shouldNotSetPhoneCountryCode: true });
-                                setPortalPhone(selectedContact.phone);
-                            }
-                            _suppliedPhoneNumberVerified = 'Deferred';
+                            _phoneAreaCodePrefixLineNumber = selectedContact.phone;
+                            _phoneCountryCode = '';
+                            setCaseState(caseDispatch, { shouldNotSetPhoneCountryCode: true });
+                            setPortalPhone(selectedContact.phone);
                         }
+                        _suppliedPhoneNumberVerified = 'Deferred';
                     }
                     catch (e) {
                         _phoneAreaCodePrefixLineNumber = '';
@@ -213,12 +227,11 @@ export function ContactPhoneNumber() {
                     try {
                         if (!contactSSOName)
                             return;
-                        const selectedContact = yield contacts.getSFDCContactBySso(contactSSOName);
-                        if (isEmpty(selectedContact.supportPhoneAreaCodePrefixLineNumber) &&
-                            !isEmpty(selectedContact.phone)) {
+                        const selectedContact = yield fetchContactBySSO(apolloClient, accountNumberRef, contactSSOName);
+                        if (!isEmpty(selectedContact.phone)) {
                             portalPhone = selectedContact.phone;
                             phoneLength = trimAndReplacePlus(removeAllChars(portalPhone)).length;
-                            supportPhone = selectedContact.supportPhoneAreaCodePrefixLineNumber;
+                            supportPhone = '';
                         }
                     }
                     catch (e) {

package/lib/esm/components/CaseInformation/SupportLevel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SupportLevel.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseInformation/SupportLevel.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAI5D,OAAO,KAA0C,MAAM,OAAO,CAAC;AAM/D,UAAU,MAAO,SAAQ,gBAAgB;CAAG;AAO5C,iBAAS,YAAY,CAAC,KAAK,EAAE,MAAM,qBAoJlC;kBApJQ,YAAY;;;AAsJrB,eAAe,YAAY,CAAC"}
+{"version":3,"file":"SupportLevel.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseInformation/SupportLevel.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAI5D,OAAO,KAA8B,MAAM,OAAO,CAAC;AAMnD,UAAU,MAAO,SAAQ,gBAAgB;CAAG;AAO5C,iBAAS,YAAY,CAAC,KAAK,EAAE,MAAM,qBAqHlC;kBArHQ,YAAY;;;AAuHrB,eAAe,YAAY,CAAC"}