@rh-support/troubleshoot 2.6.340 → 2.6.349

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

@@ -7,10 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { useApolloClient } from '@apollo/client/react';
+import { escalations, publicApi } from '@cee-eng/hydrajs';
 import { Button, ButtonVariant, Flex, FlexItem } from '@patternfly/react-core';
-import { LoadingIndicator, PFTable, TableComponent, ToastNotification } from '@rh-support/components';
-import { useGlobalStateContext } from '@rh-support/react-context';
+import { LoadingIndicator, PFTable, TableComponent, ToastNotification, useFetch, } 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';
@@ -19,10 +18,11 @@ 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 } from '../../../../context/CaseDetailsPageContext';
-import { GET_CASE_COMMENTS, useCreateCaseComment } from '../../../../hooks/useCaseComments';
+import { useCaseDetailsPageDispatchContext, useCaseDetailsPageStateContext, } from '../../../../context/CaseDetailsPageContext';
+import { useCaseDiscussionTabDispatchContext, useCaseDiscussionTabStateContext, } from '../../../../context/CaseDiscussionTabContext';
 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 +30,20 @@ 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 apolloClient = useApolloClient();
-    const { globalMetadataState: { loggedInUsersAccount }, } = useGlobalStateContext();
-    // 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 existingCaseDetails = useCaseSelector((state) => state.caseDetails, isEqual);
+    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 caseDetailsPageDispatch = useCaseDetailsPageDispatchContext();
     const escalationUpdateInProgessIds = useRef([]);
     const caseDispatch = useCaseDispatch();
-    const isUpdating = isPostingComment;
+    const isUpdating = isUpdatingEscalation || isPostingComment || isUpdatingCase;
     const [escalationList, setEscalationList] = useState([]);
     const cannUpdateRME = ability.can(resourceActions.UPDATE, resources.RME_ESCALATION);
     const { customerEscalation } = useCaseSelector((state) => ({
@@ -54,48 +54,62 @@ export default function RMEEscalationList(props) {
         // called everytime we are updating the escalation
         setEscalationList([...props.escalations]);
     }, [isUpdating, props.escalations]);
-    // 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* () {
-        var _a;
+    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);
         escalationUpdateInProgessIds.current.push(escalationName);
+        return yield updateEscalationRequest(escalationName, updateRequest);
+    });
+    const submitEscalationComment = (escalationNum, comment, message) => __awaiter(this, void 0, void 0, function* () {
         try {
-            fetchCaseEscalations(caseDetailsPageDispatch, caseSalesforceId, apolloClient, false, Boolean((_a = loggedInUsersAccount === null || loggedInUsersAccount === void 0 ? void 0 : loggedInUsersAccount.data) === null || _a === void 0 ? void 0 : _a.secureSupport));
-            yield createComment({
-                caseId: caseSalesforceId,
-                body: comment,
-                isPublic: true,
-            });
-            apolloClient.refetchQueries({ include: [GET_CASE_COMMENTS] });
-            // TODO: migrate updateCaseRequest(props.caseNumber, { customerEscalation: true }) to GraphQL
-            yield checkForCaseStatusToggleOnAttachOrComment(caseDispatch, props.isInternal, props.caseStatus, {
-                apolloClient,
+            escalationNum &&
+                fetchCaseEscalations(caseDetailsPageDispatch, props.caseNumber, props.accountNumber, false);
+            yield postCommentRequest({
                 caseNumber: props.caseNumber,
-                existingCaseDetails,
+                commentBody: comment,
+                contentType: 'plaintext',
             });
-            ToastNotification.addSuccessMessage(message);
+            updateDiscussionStateComments(dispatchDiscussion, caseDispatch, props.caseNumber, allDiscussions, sort, caseFeedbacksHydra.data, discussionFiltersListState);
+            yield updateCaseRequest(props.caseNumber, { customerEscalation: true });
+            checkForCaseStatusToggleOnAttachOrComment(caseDispatch, props.isInternal, props.caseStatus);
+            escalationNum && ToastNotification.addSuccessMessage(message);
         }
         catch (e) {
             ToastNotification.addDangerMessage(e);
             sendToSentry(e, {}, 'RME form submit error');
         }
         finally {
-            escalationUpdateInProgessIds.current = escalationUpdateInProgessIds.current.filter((item) => item !== escalationName);
+            escalationUpdateInProgessIds.current = escalationUpdateInProgessIds.current.filter((item) => item !== escalationNum);
         }
     });
     const requestUpdateRMEEscalation = (escalationName) => __awaiter(this, void 0, void 0, function* () {
         const comment = `${ESCALATION_MSG}\n ${UPDATE_ESCALATION_MSG}`;
-        yield submitEscalationComment(escalationName, comment, 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);
+        }
     });
     const requestClosureRMEEscalation = (escalationName) => __awaiter(this, void 0, void 0, function* () {
         const comment = `${ESCALATION_MSG}\n ${CLOSURE_ESCALATION_MSG}`;
-        yield submitEscalationComment(escalationName, comment, 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);
+        }
     });
     const requestReOpenRMEEscalation = (escalationName) => __awaiter(this, void 0, void 0, function* () {
         const comment = `${ESCALATION_MSG}\n ${REOPEN_ESCALATION_MSG}`;
-        yield submitEscalationComment(escalationName, comment, 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);
+        }
     });
     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,qBAyb/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;AAiB5E,UAAU,MAAM;IACZ,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AAWD,iBAAS,SAAS,CAAC,KAAK,EAAE,MAAM,qBAqW/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 { fetchCaseGroupsForContactGraphQL, setCaseDetails, setCaseState, setSelectedCaseGroupUsers, updateCaseDetailsGraphQL, } from '../../reducers/CaseReducer';
+import { fetchCaseGroupsForAccount, fetchCaseGroupsForSSO, setCaseDetails, setSelectedCaseGroupUsers, updateCaseDetails, } from '../../reducers/CaseReducer';
 import { PDFContext } from '../CaseEditView/PDFContainer';
 import { CaseValuesToWatch } from '../shared/Constants';
 import { getChangedValueTooltip } from '../shared/utils';
@@ -35,37 +35,20 @@ const emptyCaseGroup = {
 function CaseGroup(props) {
     const { t } = useTranslation();
     const caseUpdateError = useCaseUpdateErrorMessage();
-    const { groupNumber, caseNumber, caseId, accountNumber, selectedAccountDetails, ownersCaseGroups, groupName, isCaseOwnerUpdating, contactSSOName, selectedOwnerContactId, selectedOwnerIsOrgAdmin, pendingCaseOwnerUpdate, existingCaseDetails, } = 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,
-            pendingCaseOwnerUpdate: state.pendingCaseOwnerUpdate,
-            existingCaseDetails: state.caseDetails,
-        });
-    }, isEqual);
+    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 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, null, selectedOwnerIsOrgAdmin, groupNumber !== null && groupNumber !== void 0 ? groupNumber : '');
-        // 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);
@@ -87,23 +70,14 @@ function CaseGroup(props) {
         return isInValidGroup;
     };
     const onCaseGroupUpdate = (caseDetails) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
         if (canEditCase.alert())
             return;
         setCaseGroupUpdating(true);
         try {
-            const pendingOwnerUpdate = pendingCaseOwnerUpdate;
-            const updatePayload = pendingOwnerUpdate
-                ? Object.assign({ contactId: pendingOwnerUpdate.contactId, contactSSOName: pendingOwnerUpdate.contactSSOName, groupNumber: caseDetails.groupNumber }, ((_a = pendingOwnerUpdate.phoneCaseUpdate) !== null && _a !== void 0 ? _a : {})) : { groupNumber: caseDetails.groupNumber };
-            yield updateCaseDetailsGraphQL(caseDispatch, apolloClient, caseNumber, updatePayload, false, pendingOwnerUpdate
-                ? { existingCaseDetails }
-                : { salesforceCaseId: caseId });
-            if (pendingOwnerUpdate) {
-                setCaseState(caseDispatch, { pendingCaseOwnerUpdate: null });
-                setSelectedCaseGroupUsers(caseDispatch, accountNumber, caseDetails.groupNumber, loggedInUserRights.data);
-            }
-            ToastNotification.addSuccessMessage(t(`Group has been successfully updated`));
+            yield updateCaseDetails(caseDispatch, caseNumber, caseDetails);
             setCaseGroupUpdating(false);
+            setSelectedCaseGroupUsers(caseDispatch, accountNumber, caseDetails.groupNumber, loggedInUserRights.data);
+            ToastNotification.addSuccessMessage(t(`Group has been successfully updated`));
         }
         catch (e) {
             setCaseGroupUpdating(false);
@@ -111,7 +85,7 @@ function CaseGroup(props) {
         }
     });
     const onCaseGroupChange = (selection) => __awaiter(this, void 0, void 0, function* () {
-        if (!isInvalidateCaseGroup(selection) && (selection.groupNum !== groupNumber || !selected)) {
+        if (!isInvalidateCaseGroup(selection) && selection.groupNum !== groupNumber) {
             const caseDetails = {
                 groupNumber: selection.groupNum,
                 groupName: selection.name || '',
@@ -119,7 +93,7 @@ function CaseGroup(props) {
             setIsOpen(false);
             if (!isEmpty(caseNumber)) {
                 yield onCaseGroupUpdate(caseDetails);
-                setIsSelectedUngroupedInvalid(isGroupMandatory && !selection.groupNum);
+                setIsSelectedUngroupedInvalid(isGroupMandatory && (!selection.groupNum || selection.groupNum === '-1'));
             }
             else {
                 setCaseDetails(caseDispatch, caseDetails);
@@ -146,7 +120,10 @@ function CaseGroup(props) {
             ? list.filter((v) => v.name.toLowerCase().includes(inputValue === null || inputValue === void 0 ? void 0 : inputValue.toLowerCase()))
             : list;
         if (isGroupMandatory) {
-            return options.filter((g) => !!g.groupNum);
+            // 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');
         }
         else
             return options;
@@ -157,11 +134,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);
+        setIsSelectedUngroupedInvalid(isGroupMandatory && (!groupNumber || groupNumber === '-1'));
         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 && groupName && caseNumber) {
+            if (groupNumber !== '-1' && groupName && caseNumber) {
                 setSelectedCaseGroup({
                     name: groupName,
                     groupNum: groupNumber,
@@ -173,16 +150,11 @@ function CaseGroup(props) {
                 setInputValue(groupName);
                 setSelected(groupName);
             }
-            else if (!groupNumber) {
-                setSelectedCaseGroup(isGroupMandatory ? undefined : emptyCaseGroup);
-                setInputValue('');
-                setSelected('');
-            }
             return;
         }
         const selectedGroup = find(ownersCaseGroups.data, (g) => g.groupNum === groupNumber);
         if (selectedGroup && selectedGroup.groupNum) {
-            if (isGroupMandatory && !selectedGroup.groupNum) {
+            if (isGroupMandatory && selectedGroup.groupNum === '-1') {
                 setCaseGroupInvalid(true);
             }
             else {
@@ -191,77 +163,40 @@ function CaseGroup(props) {
             setInputValue(selectedGroup.name);
             setSelected(selectedGroup.name);
         }
-        else if (groupNumber && groupName) {
-            setSelectedCaseGroup({
-                name: groupName,
-                groupNum: groupNumber,
-                defaultMembers: [],
-                isDefault: false,
-                isPrivate: false,
-                members: [],
-            });
-            setInputValue(groupName);
-            setSelected(groupName);
-        }
-        else if (!groupNumber) {
-            setSelectedCaseGroup(isGroupMandatory ? undefined : emptyCaseGroup);
-            setInputValue('');
-            setSelected('');
-            setCaseGroupInvalid(!!isGroupMandatory);
-        }
         else {
             setCaseGroupInvalid(true);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [ownersCaseGroups, caseNumber, isGroupMandatory, groupNumber, groupName]);
-    const onCaseGroupClear = () => __awaiter(this, void 0, void 0, function* () {
-        if (canEditCase.alert())
+    }, [ownersCaseGroups, caseNumber, isGroupMandatory]);
+    useEffect(() => {
+        // On case edit, groups are loaded via fetchCaseDetails/setCaseOwner and OwnerSelector.
+        if (caseNumber)
             return;
-        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;
+        if (loggedInUserRights.data.isInternal()) {
+            if (accountNumber) {
+                fetchCaseGroupsForAccount(caseDispatch, accountNumber);
             }
         }
-        else {
-            setCaseDetails(caseDispatch, caseDetails);
-            setSelectedCaseGroupUsers(caseDispatch, accountNumber, '', loggedInUserRights.data);
+        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);
         }
-        setSelectedCaseGroup(emptyCaseGroup);
-        setCaseGroupInvalid(!!isGroupMandatory);
-        setInputValue('');
-        setSelected('');
-        setIsOpen(false);
     });
-    const caseGroupRequiredErrorMessage = caseNumber
-        ? t('Users are not allowed to update case if on account level caseGroupRequired is set to true')
-        : t('Users are not allowed to create case if on account level caseGroupRequired is set to true');
-    const showMandatoryGroupValidationError = isGroupMandatory &&
-        !isExportingPDF &&
-        (isCaseGroupInvalid || isSelectedUngroupedInvalid || !!pendingCaseOwnerUpdate) &&
-        isEmpty(groupNumber) &&
-        (!!caseNumber || isNextBtnClickedToShowValidationError || isEmpty(groupNumber));
-    const showHelperText = !showMandatoryGroupValidationError;
-    useEffect(() => {
-        setCaseState(caseDispatch, { showMandatoryCaseGroupValidationError: !!showMandatoryGroupValidationError });
-        return () => {
-            setCaseState(caseDispatch, { showMandatoryCaseGroupValidationError: false });
-        };
-    }, [caseDispatch, showMandatoryGroupValidationError]);
+    const showHelperText = !isSelectedUngroupedInvalid || (!isCaseGroupInvalid && !isGroupMandatory);
+    const showEmptyValidationError = !caseNumber && isNextBtnClickedToShowValidationError && isCaseGroupInvalid;
     const canNotChangeGroup = () => !loggedInUserRights.data.isInternal() &&
         !loggedInUser.data.isOrgAdmin &&
         loggedInUser.data.ssoUsername !== contactSSOName &&
@@ -290,15 +225,11 @@ function CaseGroup(props) {
             ownersCaseGroups.isFetching ||
             isCaseGroupUpdating ||
             isCaseOwnerUpdating ||
-            canNotChangeGroup() ||
-            canEditCase.isCaseNotEditable, status: ownersCaseGroups.isError || showMandatoryGroupValidationError ? 'danger' : undefined, isFullWidth: true },
+            canNotChangeGroup(), status: ownersCaseGroups.isError || showEmptyValidationError || (caseNumber && isSelectedUngroupedInvalid)
+            ? 'danger'
+            : undefined, isFullWidth: true },
         React.createElement(TextInputGroup, { isPlain: true },
-            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" }),
+            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" }),
             !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" }))))));
@@ -309,7 +240,10 @@ function CaseGroup(props) {
             isGroupMandatory && !isExportingPDF && (React.createElement("span", { className: "form-required", "aria-hidden": true }, "*"))),
         React.createElement(Select, { id: "get-support-group", "data-tracking-id": "get-support-group", isOpen: isOpen, selected: selected, onSelect: (event, val) => onCaseGroupChange(val), onOpenChange: () => setIsOpen(false), toggle: toggle, shouldFocusFirstItemOnOpen: false, onBlur: () => onOuterClickGroupCheck, isScrollable: true, popperProps: { direction: 'down', enableFlip: false } },
             React.createElement(SelectList, null, computeDropdownList().map((option, index) => (React.createElement(SelectOption, { key: option.name, isFocused: focusedItemIndex === index, value: option, isSelected: option.name === selected }, option.name))))),
-        showMandatoryGroupValidationError && (React.createElement("p", { className: "form-instructions form-invalid" }, caseGroupRequiredErrorMessage)),
+        caseNumber && isSelectedUngroupedInvalid && !isExportingPDF && (React.createElement("p", { className: "form-instructions form-invalid" },
+            React.createElement(Trans, null, "'Ungrouped Case' cannot be selected. Please select a group."))),
+        showEmptyValidationError && isGroupMandatory && !isExportingPDF && (React.createElement("p", { className: "form-instructions form-invalid" },
+            React.createElement(Trans, null, "Case group cannot be empty."))),
         showHelperText && (React.createElement("p", { className: "form-instructions" },
             React.createElement(Trans, null, "Organization administrators have the permission to manage groups.")))));
 }

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":"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,qBAmHpD"}
+{"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"}

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

@@ -1,4 +1,3 @@
-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';
@@ -8,18 +7,18 @@ 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 } = useCaseSelector((state) => ({
+    const { contactSSOName, selectedAccountDetails, ownersCaseGroups, hasInvalidEntitlements } = useCaseSelector((state) => ({
         contactSSOName: state.caseDetails.contactSSOName,
         ownersCaseGroups: state.ownersCaseGroups,
         selectedAccountDetails: state.selectedAccountDetails,
+        hasInvalidEntitlements: state.hasInvalidEntitlements,
     }), isEqual);
     const isMetadataLoading = () => {
         return !isMetadataLoadingError() && (loggedInUser.isFetching || selectedAccountDetails.isFetching);
@@ -39,13 +38,13 @@ export default function CaseInformation(props) {
         }
         const allPromisses = [];
         if (haventLoadedMetadata(allCaseTypes)) {
-            allPromisses.push(fetchCaseTypes(dispatchToGlobalMetadataReducer, apolloClient));
+            allPromisses.push(fetchCaseTypes(dispatchToGlobalMetadataReducer, loggedInUsersAccount.data.secureSupport));
         }
         if (haventLoadedMetadata(allCaseSeverities)) {
-            allPromisses.push(fetchCaseSeverities(dispatchToGlobalMetadataReducer, apolloClient));
+            allPromisses.push(fetchCaseSeverities(dispatchToGlobalMetadataReducer, loggedInUsersAccount.data.secureSupport));
         }
         if (haventLoadedMetadata(caseLanguages)) {
-            allPromisses.push(fetchLanguageMetadata(dispatchToGlobalMetadataReducer, apolloClient));
+            allPromisses.push(fetchLanguageMetadata(dispatchToGlobalMetadataReducer));
         }
         Promise.all(allPromisses);
     }, [
@@ -57,7 +56,6 @@ export default function CaseInformation(props) {
         loggedInUserJwtToken,
         selectedAccountDetails,
         loggedInUsersAccount.data.secureSupport,
-        apolloClient,
     ]);
     return (React.createElement(React.Fragment, null,
         React.createElement(LoadingIndicator, { show: isMetadataLoading(), size: "lg" }),
@@ -68,17 +66,18 @@ export default function CaseInformation(props) {
                 ' ',
                 React.createElement("a", { href: "/support/contact/customerService" }, "Customer Service"),
                 " for assistance.")),
-        React.createElement(AlertMessage, { show: !loggedInUserRights.data.isEntitled(), variant: AlertType.DANGER, className: "pf-v6-u-mt-lg", isInline: true },
+        React.createElement(AlertMessage, { show: hasInvalidEntitlements, variant: AlertType.DANGER, className: "pf-v6-u-mt-lg", isInline: true },
             React.createElement(Trans, { i18nKey: "i18ValidEntitlementContactCustomerService" },
                 "You need a valid entitlement to create a case.\u00A0 Please contact",
                 ' ',
                 React.createElement("a", { href: "/support/contact/customerService" }, "Customer Service"),
                 " for assistance.")),
-        loggedInUserRights.data.isEntitled() &&
+        !hasInvalidEntitlements &&
             !isMetadataLoading() &&
             !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":"AAQA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAsC/D,wBAAgB,kBAAkB,sBAwZjC"}
+{"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"}