@rh-support/troubleshoot 2.6.299 → 2.6.300

package/lib/esm/components/AccountInfo/AccountSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AccountSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/AccountInfo/AccountSelector.tsx"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AAOnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAK5D,OAAO,KAA0C,MAAM,OAAO,CAAC;AAS/D,UAAU,MAAO,SAAQ,gBAAgB;CAAG;AAE5C,eAAO,MAAM,YAAY,EAAE,MAG1B,CAAC;AAEF,iBAAS,eAAe,CAAC,KAAK,EAAE,MAAM,qBAmKrC;kBAnKQ,eAAe;;;AAuKxB,OAAO,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"AccountSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/AccountInfo/AccountSelector.tsx"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AAOnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAK5D,OAAO,KAA0C,MAAM,OAAO,CAAC;AAS/D,UAAU,MAAO,SAAQ,gBAAgB;CAAG;AAE5C,eAAO,MAAM,YAAY,EAAE,MAG1B,CAAC;AAEF,iBAAS,eAAe,CAAC,KAAK,EAAE,MAAM,qBA6KrC;kBA7KQ,eAAe;;;AAiLxB,OAAO,EAAE,eAAe,EAAE,CAAC"}

package/lib/esm/components/AccountInfo/AccountSelector.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import './css/accountSelector.css';
-import { useApolloClient } from '@apollo/client/react';
+import { accounts } from '@cee-eng/hydrajs';
 import InfoCircleIcon from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
 import { AlertMessage, AlertType } from '@rh-support/components';
 import { AccountSelectorInternal, GlobalMetadataStateContext } from '@rh-support/react-context';
@@ -30,14 +30,12 @@ export const defaultProps = {
 function AccountSelector(props) {
     var _a;
     const [showNotEntitledMessage, setShowNotEntitledMessage] = useState(false);
-    const { accountNumber, selectedAccountDetails, hasInvalidEntitlements } = useCaseSelector((state) => ({
+    const { accountNumber, selectedAccountDetails } = useCaseSelector((state) => ({
         accountNumber: state.caseDetails.accountNumberRef,
         selectedAccountDetails: state.selectedAccountDetails,
-        hasInvalidEntitlements: state.hasInvalidEntitlements,
     }), isEqual);
     const isSelectedAccountSubscriptionAbused = ((_a = selectedAccountDetails === null || selectedAccountDetails === void 0 ? void 0 : selectedAccountDetails.data) === null || _a === void 0 ? void 0 : _a.subscriptionAbuse) || false;
     const caseDispatch = useCaseDispatch();
-    const apolloClient = useApolloClient();
     const routeDispatch = useRouteDispatchContext();
     const { globalMetadataState: { bookmarkedGroupAccounts, loggedInUserRights, managedAccounts, loggedInUsersAccount }, } = useContext(GlobalMetadataStateContext);
     const { t } = useTranslation();
@@ -45,7 +43,7 @@ function AccountSelector(props) {
     const ability = useContext(AbilityContext);
     const canAccessManagedAccounts = ability.can(resourceActions.PATCH, resources.CASE_CREATE, CaseListFields.MANAGED_ACCOUNTS);
     const canBookmarkAccounts = ability.can(resourceActions.PATCH, resources.CASE_CREATE, CaseListFields.BOOKMARK_ACCOUNTS);
-    // const canUseFindMyAccount = loggedInUserRights.data.isAccountDifferentFromLoggedInAccount(accountNumber!);
+    const canUseFindMyAccount = loggedInUserRights.data.isAccountDifferentFromLoggedInAccount(accountNumber);
     // Account Change Handler
     const onAccountChange = (account) => __awaiter(this, void 0, void 0, function* () {
         if (selectedAccountDetails.data.accountNumber === account.accountNumber)
@@ -54,7 +52,7 @@ function AccountSelector(props) {
             clearSelectedAccount(caseDispatch);
             return;
         }
-        setCaseAccountNumber(caseDispatch, account.accountNumber, loggedInUserRights.data.isAccountSameAsLoggedInAccount(account.accountNumber), loggedInUsersAccount.data, apolloClient);
+        setCaseAccountNumber(caseDispatch, account.accountNumber, loggedInUserRights.data.isAccountSameAsLoggedInAccount(account.accountNumber), loggedInUsersAccount.data);
     });
     const onInternalAccountSelect = (accounts) => {
         if (!isArray(accounts))
@@ -66,36 +64,48 @@ function AccountSelector(props) {
             selection.accountNum &&
             onAccountChange({ accountNumber: selection.accountNum, name: selection.name });
     };
-    // const onFindMyAccountClick = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
-    //     !isEmpty(loggedInUserRights.data) &&
-    //         onAccountChange({
-    //             accountNumber: loggedInUserRights.data.getAccountNumber(),
-    //             name: loggedInUserRights.data.getAccountName(),
-    //         });
-    // };
+    const onFindMyAccountClick = (event) => {
+        !isEmpty(loggedInUserRights.data) &&
+            onAccountChange({
+                accountNumber: loggedInUserRights.data.getAccountNumber(),
+                name: loggedInUserRights.data.getAccountName(),
+            });
+    };
     const selectedAccount = {
         name: selectedAccountDetails.data.name,
         accountNumber: selectedAccountDetails.data.accountNumber,
         subscriptionAbuse: selectedAccountDetails.data.subscriptionAbuse,
     };
+    // When internal user wants to open a case for a customer but customer account doesn't have entitlement, we show an error
     useEffect(() => {
-        if (!loggedInUserRights.data.isInternal() || !selectedAccountDetails.data.accountNumber) {
-            return;
-        }
-        if (selectedAccountDetails.data.accountNumber === loggedInUsersAccount.data.accountNumber) {
-            setNoValidEntitlement(routeDispatch, false);
+        const getAccountEntitlement = () => __awaiter(this, void 0, void 0, function* () {
+            // internal user doesn't open case for customer. No need to check account entitlement
+            if (selectedAccountDetails.data.accountNumber === loggedInUsersAccount.data.accountNumber) {
+                setNoValidEntitlement(routeDispatch, false);
+                setShowNotEntitledMessage(false);
+                return;
+            }
             setShowNotEntitledMessage(false);
-            return;
+            try {
+                const res = yield accounts.getAccountEntitlementByInternalUser(selectedAccountDetails.data.accountNumber);
+                if (isEmpty(res)) {
+                    setShowNotEntitledMessage(true);
+                    setNoValidEntitlement(routeDispatch, true);
+                }
+                else {
+                    setShowNotEntitledMessage(false);
+                    setNoValidEntitlement(routeDispatch, false);
+                }
+            }
+            catch (e) {
+                console.log(e);
+            }
+        });
+        if (loggedInUserRights.data.isInternal() && selectedAccountDetails.data.accountNumber) {
+            getAccountEntitlement();
         }
-        setShowNotEntitledMessage(hasInvalidEntitlements);
-        setNoValidEntitlement(routeDispatch, hasInvalidEntitlements);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [
-        selectedAccountDetails.data.accountNumber,
-        loggedInUserRights.data,
-        loggedInUsersAccount.data,
-        hasInvalidEntitlements,
-    ]);
+    }, [selectedAccountDetails.data.accountNumber, loggedInUserRights.data, loggedInUsersAccount.data]);
     if (isEmpty(loggedInUserRights.data))
         return React.createElement(React.Fragment, null);
     return (React.createElement("div", { id: props.id, className: `form-group ${props.className}` },
@@ -104,7 +114,9 @@ function AccountSelector(props) {
             React.createElement("label", { htmlFor: "account-selector" },
                 React.createElement(Trans, null, "Account"),
                 ' ',
-                React.createElement("span", { className: "form-required", "aria-hidden": true }, "*"))),
+                React.createElement("span", { className: "form-required", "aria-hidden": true }, "*")),
+            canUseFindMyAccount && (React.createElement("button", { role: "link", className: "btn btn-link btn-app find-my-account pf-v6-u-ml-auto", onClick: onFindMyAccountClick, disabled: selectedAccountDetails.isFetching, "data-tracking-id": "get-support-find-my-account", type: "button" },
+                React.createElement(Trans, null, "Find my account")))),
         React.createElement("div", { className: "account-selector-wrapper" },
             React.createElement(AccountSelectorInternal, { selectedAccounts: [selectedAccount], canBookmarkAccount: canBookmarkAccounts, bookmarkedAccounts: bookmarkedGroupAccounts.data, id: "account-or-bookmark-selector", className: "account-selector", name: "account-or-bookmark-selector", placeholder: t(`Search for an account ${loggedInUserRights.data.isExternal() ? 'or select a bookmark' : ''} `), onSelect: onInternalAccountSelect, disabled: loggedInUserRights.data.isExternal() || selectedAccountDetails.isFetching, isInValid: isSelectedAccountSubscriptionAbused, restrictedOnSubscriptionAbuse: true })),
         canAccessManagedAccounts && !isEmpty(managedAccounts.data) && (React.createElement(ManagedAccountsDropdown, { className: "managed-account-selector pf-v6-u-mt-xl", onManagedAccountChange: onManagedAccountChange, managedAccounts: managedAccounts, selectedAccountNumber: accountNumber, disabled: selectedAccountDetails.isFetching })),

package/lib/esm/components/CaseEditView/ActiveCustomerEscalation/RequestEscalationModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestEscalationModal.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/ActiveCustomerEscalation/RequestEscalationModal.tsx"],"names":[],"mappings":"AAkCA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAmBnD,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAID,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,qBAuXnD"}
+{"version":3,"file":"RequestEscalationModal.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/ActiveCustomerEscalation/RequestEscalationModal.tsx"],"names":[],"mappings":"AAiCA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAkBnD,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAID,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,qBA6WnD"}

package/lib/esm/components/CaseEditView/ActiveCustomerEscalation/RequestEscalationModal.js

@@ -7,7 +7,6 @@ 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, Form, FormGroup, FormHelperText, Grid, GridItem, HelperText, HelperTextItem, Modal, ModalBody, ModalFooter, ModalHeader, Popover, TextArea, TextInput, Title, ValidatedOptions, } from '@patternfly/react-core';
 import InfoCircleIcon from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
@@ -17,18 +16,17 @@ import isEmpty from 'lodash/isEmpty';
 import React, { useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useCaseDispatch } from '../../../context/CaseContext';
-import { useCaseDetailsPageDispatchContext } from '../../../context/CaseDetailsPageContext';
+import { useCaseDetailsPageDispatchContext, useCaseDetailsPageStateContext, } from '../../../context/CaseDetailsPageContext';
+import { useCaseDiscussionTabDispatchContext, useCaseDiscussionTabStateContext, } from '../../../context/CaseDiscussionTabContext';
 import { CustomerGEOs } from '../../../enums/customerGEOs';
-import { CREATE_RME_CASE_ESCALATION, GET_PARENT_ID, } from '../../../graphql';
-import { GET_CASE_COMMENTS } from '../../../hooks/useCaseComments';
 import { ESCALATION_SUBJECT_LENGTH_LIMIT } from '../../../reducers/CaseConstNTypes';
 import { fetchCaseEscalations } from '../../../reducers/CaseDetailsPageReducer';
-import { checkForCaseStatusToggleOnAttachOrComment, fetchCaseDetailsHydra } from '../../../reducers/CaseReducer';
+import { updateDiscussionStateComments } from '../../../reducers/CaseDiscussionTabReducer';
+import { checkForCaseStatusToggleOnAttachOrComment, fetchCaseDetails } from '../../../reducers/CaseReducer';
 const customerGEOKeys = Object.keys(CustomerGEOs);
 export function RequestEscalationModal(props) {
     const { globalMetadataState: { loggedInUser, loggedInUserRights }, } = useGlobalStateContext();
     const { t } = useTranslation();
-    const apolloClient = useApolloClient();
     const [categories, setCategories] = useState([]);
     const initialState = {
         subject: '',
@@ -44,13 +42,15 @@ export function RequestEscalationModal(props) {
     // checks if all the fields have values.
     const hasRequiredInfo = () => Object.keys(formState).reduce((accumulator, currentValue) => { var _a; return !accumulator ? accumulator : formState[currentValue].length > 0 && ((_a = formState[currentValue]) === null || _a === void 0 ? void 0 : _a.trim()); }, true);
     const setFormStateValue = (key, value) => setFormState((pre) => (Object.assign(Object.assign({}, pre), { [key]: value })));
-    const [isCreatingEscalation, setIsCreatingEscalation] = useState(false);
+    const createEscalationFetch = useFetch(escalations.createIceEscalation, { propgateErrors: true });
     const { request: postCommentRequest, isFetching: isPostingComment } = useFetch(publicApi.kase.postComment, {
         propgateErrors: true,
     });
     const { request: updateCaseRequest, isFetching: isUpdatingCase } = useFetch(publicApi.kase.updateCase);
     const { request: getRmeCategories, isFetching: isCategoriesFetching } = useFetch(escalations.getEscalationCategories, { propgateErrors: true });
-    const client = useApolloClient();
+    const { sort, allDiscussions, discussionFiltersListState } = useCaseDiscussionTabStateContext();
+    const dispatchDiscussion = useCaseDiscussionTabDispatchContext();
+    const { caseDetailsPageState: { caseFeedbacksHydra }, } = useCaseDetailsPageStateContext();
     const caseDetailsPageDispatch = useCaseDetailsPageDispatchContext();
     const caseDispatch = useCaseDispatch();
     const [creationError, setCreationError] = useState(false);
@@ -62,12 +62,13 @@ export function RequestEscalationModal(props) {
         setFormState(Object.assign(Object.assign({}, formState), { rmeCategory: selection.value }));
     };
     const submitEscalationComment = (escalationNum, comment) => __awaiter(this, void 0, void 0, function* () {
-        escalationNum && fetchCaseEscalations(caseDetailsPageDispatch, props.caseNumber, apolloClient, false);
+        escalationNum &&
+            fetchCaseEscalations(caseDetailsPageDispatch, props.caseNumber, loggedInUserRights.data.getAccountNumber(), false);
         yield postCommentRequest({ caseNumber: props.caseNumber, commentBody: comment, contentType: 'markdown' });
-        client.refetchQueries({ include: [GET_CASE_COMMENTS] });
+        updateDiscussionStateComments(dispatchDiscussion, caseDispatch, props.caseNumber, allDiscussions, sort, caseFeedbacksHydra.data, discussionFiltersListState);
         yield updateCaseRequest(props.caseNumber, { customerEscalation: true });
         checkForCaseStatusToggleOnAttachOrComment(caseDispatch, loggedInUserRights.data.isInternal(), props.caseStatus);
-        yield fetchCaseDetailsHydra(caseDispatch, props.caseNumber, loggedInUserRights.data, loggedInUser.data, apolloClient);
+        yield fetchCaseDetails(caseDispatch, props.caseNumber, loggedInUserRights.data, loggedInUser.data);
         escalationNum &&
             ToastNotification.addSuccessMessage(t('Your escalation request has been successfully submitted.'));
     });
@@ -77,7 +78,7 @@ export function RequestEscalationModal(props) {
         setFormState(Object.assign(Object.assign({}, formState), { subject }));
     };
     const onCancel = () => {
-        if (isPostingComment || isUpdatingCase || isCreatingEscalation)
+        if (isPostingComment || isUpdatingCase || createEscalationFetch.isFetching)
             return;
         setSubmitSaveButtonIsClicked(false);
         setFormState(initialState);
@@ -85,37 +86,11 @@ export function RequestEscalationModal(props) {
         props.onClose();
     };
     const onSubmit = () => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         setSubmitSaveButtonIsClicked(true);
         if (!hasRequiredInfo() || hasLargeSubject)
             return;
         try {
-            setIsCreatingEscalation(true);
-            const { data: parentData } = yield apolloClient.query({
-                query: GET_PARENT_ID,
-                variables: { where: { CaseNumber: { eq: props.caseNumber } } },
-            });
-            const parentId = (_f = (_e = (_d = (_c = (_b = (_a = parentData === null || parentData === void 0 ? void 0 : parentData.salesforce_support_uiapi) === null || _a === void 0 ? void 0 : _a.query) === null || _b === void 0 ? void 0 : _b.SalesforceSupportCase) === 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.Id;
-            if (!parentId)
-                throw new Error('Could not find parent case ID');
-            const { data: escalationData } = yield apolloClient.mutate({
-                mutation: CREATE_RME_CASE_ESCALATION,
-                variables: {
-                    caseInput: {
-                        Subject: formState.subject,
-                        Description: formState.description,
-                        Status: 'New',
-                        Origin: 'Portal ACE',
-                        Priority: props.severity ? `P${props.severity.charAt(0)}` : 'Medium',
-                        Type: 'RME',
-                        RecordTypeId: '012Ek00000JUtx5IAD',
-                        ParentId: parentId,
-                        EscalationCategory__c: formState.rmeCategory,
-                        ImpactOnUserOrBusiness__c: formState.businessImpactDescription,
-                    },
-                },
-            });
-            const createdCaseNumber = (_k = (_j = (_h = (_g = escalationData === null || escalationData === void 0 ? void 0 : escalationData.salesforce_support_uiapi) === null || _g === void 0 ? void 0 : _g.CaseCreate) === null || _h === void 0 ? void 0 : _h.SalesforceSupportRecord) === null || _j === void 0 ? void 0 : _j.CaseNumber) === null || _k === void 0 ? void 0 : _k.value;
+            const res = yield createEscalationFetch.request(Object.assign(Object.assign({}, formState), { recordType: 'Active Customer Escalation', escalationSource: 'RME Escalation', status: 'New', accountNumber: loggedInUserRights.data.getAccountNumber(), caseNumber: props.caseNumber, requestor: `${loggedInUser.data.firstName} ${loggedInUser.data.lastName}`, requestorEmail: loggedInUser.data.email, requestorPhone: loggedInUser.data.phone, alreadyEscalated: false, severity: props.severity ? props.severity.charAt(0) : '3' }));
             const fullComment = t('### Request Management Escalation:\n\n**Subject**\n{{subject}}\n\n**Category**\n{{rmeCategory}}\n\n**Description**\n{{description}}\n\n**Expectations**\n{{expectations}}\n\n**Business Impact**\n{{businessImpactDescription}}', {
                 category: formState.rmeCategory,
                 subject: formState.subject,
@@ -125,7 +100,7 @@ export function RequestEscalationModal(props) {
                 rmeCategory: formState.rmeCategory,
             });
             try {
-                yield submitEscalationComment(createdCaseNumber, fullComment);
+                yield submitEscalationComment(res.name, fullComment);
             }
             catch (e) {
                 // silently fails, escalation is created but adding comment fails
@@ -133,11 +108,9 @@ export function RequestEscalationModal(props) {
             props.onClose();
         }
         catch (error) {
+            //=> handle error
             setCreationError(true);
         }
-        finally {
-            setIsCreatingEscalation(false);
-        }
     });
     const header = (React.createElement(Title, { className: "pf-v6-u-mb-0", id: "custom-header-label", headingLevel: "h1" },
         React.createElement(Trans, null, "Request an escalation"),
@@ -219,9 +192,9 @@ export function RequestEscalationModal(props) {
                                 : ValidatedOptions.default, placeholder: t('Does your business impact change with this escalation? Please describe how it changed.'), id: "business-impact-input", value: formState.businessImpactDescription, "aria-label": t('Business impact'), resizeOrientation: "vertical" }))))),
         React.createElement(ModalFooter, null,
             React.createElement(Button, { key: "submit", variant: "primary", onClick: onSubmit, "data-tracking-id": "request-rme-submit", isDisabled: submitButtonIsClicked &&
-                    (isPostingComment || isUpdatingCase || isCreatingEscalation || !hasRequiredInfo()), "aria-label": t('Submit') },
-                (isPostingComment || isUpdatingCase || isCreatingEscalation) && (React.createElement(LoadingIndicator, { key: "loading", isInline: true })),
+                    (isPostingComment || isUpdatingCase || createEscalationFetch.isFetching || !hasRequiredInfo()), "aria-label": t('Submit') },
+                (isPostingComment || isUpdatingCase || createEscalationFetch.isFetching) && (React.createElement(LoadingIndicator, { key: "loading", isInline: true })),
                 ' ',
                 t('Submit')),
-            React.createElement(Button, { key: "cancel", variant: "link", onClick: onCancel, "data-tracking-id": "request-rme-cancel", isDisabled: isCreatingEscalation || isPostingComment || isUpdatingCase, "aria-label": t('Cancel') }, t('Cancel')))));
+            React.createElement(Button, { key: "cancel", variant: "link", onClick: onCancel, "data-tracking-id": "request-rme-cancel", isDisabled: createEscalationFetch.isFetching || isPostingComment || isUpdatingCase, "aria-label": t('Cancel') }, t('Cancel')))));
 }

package/lib/esm/components/CaseEditView/Case.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Case.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseEditView/Case.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAwC,MAAM,OAAO,CAAC;AAE7D,OAAO,EAAS,mBAAmB,EAAiD,MAAM,kBAAkB,CAAC;AAoB7G,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC;CACnC;AAED,MAAM,CAAC,OAAO,UAAU,IAAI,CAAC,KAAK,EAAE,MAAM,qBA0PzC"}
+{"version":3,"file":"Case.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseEditView/Case.tsx"],"names":[],"mappings":"AAcA,OAAO,KAAwC,MAAM,OAAO,CAAC;AAE7D,OAAO,EAAS,mBAAmB,EAAiD,MAAM,kBAAkB,CAAC;AAmB7G,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC;CACnC;AAED,MAAM,CAAC,OAAO,UAAU,IAAI,CAAC,KAAK,EAAE,MAAM,qBAmPzC"}

package/lib/esm/components/CaseEditView/Case.js

@@ -7,9 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { useApolloClient } from '@apollo/client/react';
 import { CoverSpinner, ErrorBoundary, OverviewContentLoader, ToastNotification, useDocumentTitle, usePrevious, } from '@rh-support/components';
-import { fetchCaseDetails, GlobalMetadataStateContext, HostnameAwarenessModal } from '@rh-support/react-context';
+import { GlobalMetadataStateContext, HostnameAwarenessModal } from '@rh-support/react-context';
 import { AbilityContext, CaseDetailsFields, resourceActions, resources } from '@rh-support/user-permissions';
 import { getUrlParsedParams, isValidCaseNumber } from '@rh-support/utils';
 import isEmpty from 'lodash/isEmpty';
@@ -20,14 +19,8 @@ import { Route, Switch, useLocation, useParams, useRouteMatch } from 'react-rout
 import { useCaseDispatch, useCaseSelector } from '../../context/CaseContext';
 import { useCaseDetailsPageDispatchContext } from '../../context/CaseDetailsPageContext';
 import { CaseReducerConstants } from '../../reducers/CaseConstNTypes';
-import { 
-// TODO: Re-enable after GraphQL migration
-// fetchAttachments,
-fetchCaseEscalations,
-// fetchExternalTrackers,
-// fetchFeedbacks,
- } from '../../reducers/CaseDetailsPageReducer';
-import { setCaseAccountNumber } from '../../reducers/CaseReducer';
+import { fetchAttachments, fetchCaseEscalations, fetchExternalTrackers, fetchFeedbacks, } from '../../reducers/CaseDetailsPageReducer';
+import { fetchCaseDetails, setCaseAccountNumber } from '../../reducers/CaseReducer';
 import { CaseDetailsAside } from './CaseDetailsAside';
 import { CaseDetailsErrorMessage } from './CaseDetailsErrorMessage';
 import CaseDetailsModals from './CaseDetailsModals';
@@ -35,9 +28,8 @@ import { CaseDetailsTabs } from './CaseDetailsTabs';
 import CaseOverview from './CaseOverview';
 import { PDFContext } from './PDFContainer';
 export default function Case(props) {
-    const { globalMetadataState: { loggedInUserRights, loggedInUsersAccount }, } = useContext(GlobalMetadataStateContext);
+    const { globalMetadataState: { loggedInUserRights, loggedInUsersAccount, loggedInUser }, } = useContext(GlobalMetadataStateContext);
     const caseDetailsPageDispatch = useCaseDetailsPageDispatchContext();
-    const apolloClient = useApolloClient();
     const { t } = useTranslation();
     // The `path` lets us build <Route> paths that are
     // relative to the parent route, while the `url` lets
@@ -51,18 +43,8 @@ export default function Case(props) {
     const canSeeFeedbackButtons = ability.can(resourceActions.PATCH, resources.CASE_DETAILS, CaseDetailsFields.CASE_DETAILS_FEEDBACK_BUTTONS);
     const canReadCase = ability.can(resourceActions.READ, resources.CASE_DETAILS);
     const canManageCase = ability.can(resourceActions.UPDATE, resources.CASE_DETAILS);
-    // TODO: Re-enable after GraphQL migration of external trackers
-    // const canSeeExternalTracker = ability.can(
-    //     resourceActions.PATCH,
-    //     resources.CASE_DETAILS,
-    //     CaseDetailsFields.CASE_DETAILS_EXTERNAL_TRACKER
-    // );
-    // TODO: Re-enable after GraphQL migration of attachments
-    // const canSeeAttachments = ability.can(
-    //     resourceActions.PATCH,
-    //     resources.CASE_DETAILS,
-    //     CaseDetailsFields.CASE_DETAILS_SEE_ATTACHMENTS
-    // );
+    const canSeeExternalTracker = ability.can(resourceActions.PATCH, resources.CASE_DETAILS, CaseDetailsFields.CASE_DETAILS_EXTERNAL_TRACKER);
+    const canSeeAttachments = ability.can(resourceActions.PATCH, resources.CASE_DETAILS, CaseDetailsFields.CASE_DETAILS_SEE_ATTACHMENTS);
     const canSeeRMEs = ability.can(resourceActions.PATCH, resources.CASE_DETAILS, CaseDetailsFields.CASE_DETAILS_RMES);
     const { product, isFetchingCaseDetails, isFetchingCaseDetailsError, caseDetailsError, selectedAccountDetails } = useCaseSelector((state) => ({
         product: state.caseDetails.product,
@@ -97,7 +79,6 @@ export default function Case(props) {
     useEffect(() => {
         if (!isEmpty(loggedInUsersAccount.data) &&
             !isEmpty(selectedAccountDetails.data) &&
-            selectedAccountDetails.data.accountNumber &&
             loggedInUserRights.data.isAccountSameAsLoggedInAccount(selectedAccountDetails.data.accountNumber) &&
             !isEqual(loggedInUsersAccount.data, selectedAccountDetails.data)) {
             setCaseAccountNumber(caseDispatch, loggedInUsersAccount.data.accountNumber, true, loggedInUsersAccount.data);
@@ -126,34 +107,21 @@ export default function Case(props) {
                         caseDispatch(action);
                     }
                 };
-                yield fetchCaseDetails(safeDispatch, apolloClient, targetCaseNumber, setCaseAccountNumber);
+                yield fetchCaseDetails(safeDispatch, targetCaseNumber, loggedInUserRights.data, loggedInUser.data);
                 if (currentCaseRef.current !== targetCaseNumber)
                     return;
                 if (canSeeRMEs) {
-                    fetchCaseEscalations((action) => currentCaseRef.current === targetCaseNumber && caseDetailsPageDispatch(action), targetCaseNumber, apolloClient);
+                    fetchCaseEscalations((action) => currentCaseRef.current === targetCaseNumber && caseDetailsPageDispatch(action), targetCaseNumber, loggedInUserRights.data.getAccountNumber());
+                }
+                if (canSeeAttachments) {
+                    fetchAttachments((action) => currentCaseRef.current === targetCaseNumber && caseDetailsPageDispatch(action), targetCaseNumber, loggedInUsersAccount.data.secureSupport);
+                }
+                if (canSeeExternalTracker) {
+                    fetchExternalTrackers((action) => currentCaseRef.current === targetCaseNumber && caseDetailsPageDispatch(action), targetCaseNumber);
+                }
+                if (canSeeFeedbackButtons) {
+                    fetchFeedbacks((action) => currentCaseRef.current === targetCaseNumber && caseDetailsPageDispatch(action), targetCaseNumber);
                 }
-                // TODO: Re-enable after GraphQL migration of attachments
-                // if (canSeeAttachments) {
-                //     fetchAttachments(
-                //         (action) => currentCaseRef.current === targetCaseNumber && caseDetailsPageDispatch(action),
-                //         targetCaseNumber,
-                //         loggedInUsersAccount.data.secureSupport!
-                //     );
-                // }
-                // TODO: Re-enable after GraphQL migration of external trackers
-                // if (canSeeExternalTracker) {
-                //     fetchExternalTrackers(
-                //         (action) => currentCaseRef.current === targetCaseNumber && caseDetailsPageDispatch(action),
-                //         targetCaseNumber
-                //     );
-                // }
-                // TODO: Re-enable after GraphQL migration of feedback
-                // if (canSeeFeedbackButtons) {
-                //     fetchFeedbacks(
-                //         (action) => currentCaseRef.current === targetCaseNumber && caseDetailsPageDispatch(action),
-                //         targetCaseNumber
-                //     );
-                // }
                 if (currentCaseRef.current === targetCaseNumber) {
                     checkRemoteSessionFlag();
                 }

package/lib/esm/components/CaseEditView/CaseDetailsAside.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseDetailsAside.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseEditView/CaseDetailsAside.tsx"],"names":[],"mappings":"AAkBA,OAAO,KAA2D,MAAM,OAAO,CAAC;AAahF,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;CACtB;AAMD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,qBA2Z7C"}
+{"version":3,"file":"CaseDetailsAside.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseEditView/CaseDetailsAside.tsx"],"names":[],"mappings":"AAiBA,OAAO,KAA2D,MAAM,OAAO,CAAC;AAYhF,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;CACtB;AAMD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,qBAyY7C"}

package/lib/esm/components/CaseEditView/CaseDetailsAside.js

@@ -7,7 +7,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { useQuery } from '@apollo/client/react';
 import { Button, Checkbox, Icon, Popover, PopoverPosition, Switch, Tooltip } from '@patternfly/react-core';
 import InfoCircleIcon from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
 import ListIcon from '@patternfly/react-icons/dist/js/icons/list-icon';
@@ -26,13 +25,12 @@ import { Link } from 'react-router-dom';
 import { useCaseSelector } from '../../context/CaseContext';
 import { useCaseDetailsPageStateContext } from '../../context/CaseDetailsPageContext';
 import { useRecommendationStateContext } from '../../context/RecommendationContext';
-import { GET_ESCALATION_DETAILS, GET_PARENT_ID } from '../../graphql';
 import { ActiveCustomerEscalation } from './ActiveCustomerEscalation';
 import { CaseSolutions } from './CaseSolutions';
 import { PDFContext } from './PDFContainer';
 import { ESSRemoteSession, RemoteSessionAgreement } from './RequestRemoteSession';
 export function CaseDetailsAside(props) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b;
     const { t } = useTranslation();
     const { severity, status, isFetchingCaseDetails, isFetchingCaseDetailsError, acceptedRemoteSessionTerms, product, waitingOnCallback, groupNumber, ownersCaseGroups, } = useCaseSelector((state) => ({
         severity: state.caseDetails.severity,
@@ -50,15 +48,6 @@ export function CaseDetailsAside(props) {
     const isCreateRMEVisible = (caseEscalations.data || []).length === 0 || caseEscalations.data.every((item) => item.status === 'Closed');
     const { recommendationState: { isLoadingRecommendations, allDocs }, } = useRecommendationStateContext();
     const { caseNumber } = props;
-    const { data: parentData, loading: isLoadingParentId } = useQuery(GET_PARENT_ID, {
-        variables: { where: { CaseNumber: { eq: caseNumber } } },
-    });
-    const parentId = (_f = (_e = (_d = (_c = (_b = (_a = parentData === null || parentData === void 0 ? void 0 : parentData.salesforce_support_uiapi) === null || _a === void 0 ? void 0 : _a.query) === null || _b === void 0 ? void 0 : _b.SalesforceSupportCase) === 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.Id;
-    const { loading: isLoadingEscalations } = useQuery(GET_ESCALATION_DETAILS, {
-        variables: { where: { ParentId: { eq: parentId } } },
-        skip: !parentId,
-    });
-    const isEscalationsFetching = isLoadingParentId || isLoadingEscalations;
     const canCreateRME = ability.can(resourceActions.CREATE, resources.RME_ESCALATION);
     const canCreateICE = ability.can(resourceActions.CREATE, resources.ICE_ESCALATION);
     const canSeeToggleCustomerView = ability.can(resourceActions.PATCH, resources.CASE_DETAILS, CaseDetailsFields.CASE_DETAILS_TOGGLE_CUSTOMER_VIEW);
@@ -72,8 +61,7 @@ export function CaseDetailsAside(props) {
     const isXLScreen = breakPoint.xl;
     const toggleCustomerViewRef = useRef(null);
     const isFirstMountRef = useRef(true);
-    const { globalMetadataState: { navBarRef, viewAsCustomer, loggedInUsersAccount, allProducts, loggedInUserRights }, } = useGlobalStateContext();
-    const isInternal = (_g = loggedInUserRights.data) === null || _g === void 0 ? void 0 : _g.isInternal();
+    const { globalMetadataState: { navBarRef, viewAsCustomer, loggedInUsersAccount, allProducts }, } = useGlobalStateContext();
     const isSecureSupportAccount = loggedInUsersAccount.data.secureSupport;
     // To check if user has read only access
     const canReadCase = ability.can(resourceActions.READ, resources.CASE_DETAILS);
@@ -89,14 +77,9 @@ export function CaseDetailsAside(props) {
     const [viewAsInternalPref, setViewAsInternalPref] = useState();
     const [isDefaultBoxChecked, setIsDefaultBoxChecked] = useState(true);
     const { isExportingPDF } = useContext(PDFContext);
-    // TODO: When casegroups is deployed on SCT stage, update this logic to properly gate on ownersCaseGroups.data
     const isWritePermissionforCase = useMemo(() => {
-        if (isInternal || groupNumber === '-1')
-            return true;
-        if (!ownersCaseGroups.data)
-            return true;
-        return (ownersCaseGroups.data || []).some((group) => group.groupNum === groupNumber);
-    }, [groupNumber, ownersCaseGroups.data, isInternal]);
+        return (ownersCaseGroups.data || []).some((group) => group.groupNum === groupNumber) || groupNumber === '-1';
+    }, [groupNumber, ownersCaseGroups.data]);
     useEffect(() => {
         const userPreferredCaseView = () => __awaiter(this, void 0, void 0, function* () {
             try {
@@ -174,7 +157,7 @@ export function CaseDetailsAside(props) {
         setIsDefaultBoxChecked(!isDefaultBoxChecked);
         toggleViewAsCustomerFlag(globalMetadataDispatchContext);
     };
-    const isSideBarExpanded = (_h = caseDetailsAsidePanelRef.current) === null || _h === void 0 ? void 0 : _h.expanded;
+    const isSideBarExpanded = (_a = caseDetailsAsidePanelRef.current) === null || _a === void 0 ? void 0 : _a.expanded;
     if (isFetchingCaseDetails || isFetchingCaseDetailsError)
         return null;
     const renderCasePrefPopoverText = () => {
@@ -186,7 +169,7 @@ export function CaseDetailsAside(props) {
         }
     };
     // To check if the user is ESS Customer and Product has ESS Support
-    const isESSCustomer = isSpecialSupportOfferingEnabled((_j = allProducts.data) === null || _j === void 0 ? void 0 : _j.productsResult, selectedProduct);
+    const isESSCustomer = isSpecialSupportOfferingEnabled((_b = allProducts.data) === null || _b === void 0 ? void 0 : _b.productsResult, selectedProduct);
     return (React.createElement("aside", { className: `grid-aside ${isSideBarExpanded ? '' : 'sidebar-collapsed'} ` },
         React.createElement("pfe-collapse-toggle", { "aria-label": `${isSideBarExpanded ? t('Collapse sidebar') : t('Expand sidebar')}`, "aria-controls": "case-details-aside-content", onClick: onToggleAside }, isSideBarExpanded ? (React.createElement("div", { className: `sidebar-header ${isExportingPDF ? 'hide-in-pdf' : ''}` },
             React.createElement("div", { className: "case-detail-collapse-panel" },
@@ -203,7 +186,7 @@ export function CaseDetailsAside(props) {
                 !isLoadingRecommendations && allDocs.length > 0 && (React.createElement(Tooltip, { content: t('Top recommendations'), position: "left" },
                     React.createElement(Button, { icon: React.createElement(Icon, { className: "pf-v6-u-p-sm", size: "lg" },
                             React.createElement(ListIcon, null)), variant: "link", onClick: () => setSectionToScollRef(topSolutionsRef), className: "sidebar-section-toggle-btn", "aria-label": t('Top recommendations') }))),
-                !isEscalationsFetching && (canCreateICE || (canCreateRME && isCreateRMEVisible)) && (React.createElement(Tooltip, { content: t('Request an escalation'), position: "left" },
+                !caseEscalations.isFetching && (canCreateICE || (canCreateRME && isCreateRMEVisible)) && (React.createElement(Tooltip, { content: t('Request an escalation'), position: "left" },
                     React.createElement(Button, { icon: React.createElement(Icon, { className: "pf-v6-u-p-sm", size: "lg" },
                             React.createElement(TrendUpIcon, null)), variant: "link", className: "sidebar-section-toggle-btn", onClick: () => setSectionToScollRef(createEscalationRef), "aria-label": t('Request an escalation') }))))))),
         React.createElement("pfe-collapse-panel", { className: "sidebar-content", "pfe-animation": "false", id: "case-details-aside-content", ref: caseDetailsAsidePanelRef },
@@ -230,6 +213,6 @@ export function CaseDetailsAside(props) {
                     React.createElement(ESSRemoteSession, { waitingOnCallback: waitingOnCallback, remoteSessionTermsAcked: acceptedRemoteSessionTerms, caseNumber: caseNumber, caseSeverity: severity, caseStatus: status, ref: createEscalationRef, readOnly: canReadCase }))),
                 !isESSCustomer && (React.createElement(ErrorBoundary, { errorMsgInfo: { message: t('There was an error loading remote session agreement section') } },
                     React.createElement(RemoteSessionAgreement, { caseNumber: caseNumber, caseSeverity: severity, caseStatus: status, ref: createEscalationRef, waitingOnCallback: waitingOnCallback, acceptedRemoteSessionTerms: acceptedRemoteSessionTerms && waitingOnCallback, readOnly: canReadCase }))),
-                !isEscalationsFetching && isWritePermissionforCase && (React.createElement(ErrorBoundary, { errorMsgInfo: { message: t('There was an error loading customer escalation section') } },
+                !caseEscalations.isFetching && isWritePermissionforCase && (React.createElement(ErrorBoundary, { errorMsgInfo: { message: t('There was an error loading customer escalation section') } },
                     React.createElement(ActiveCustomerEscalation, { caseNumber: caseNumber, caseSeverity: severity, caseStatus: status, ref: createEscalationRef })))))));
 }

package/lib/esm/components/CaseEditView/CaseDetailsTabs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseDetailsTabs.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseEditView/CaseDetailsTabs.tsx"],"names":[],"mappings":"AAmBA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,EAAE,mBAAmB,EAAa,MAAM,kBAAkB,CAAC;AA4BlE,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,mBAAmB,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;CACnD;AACD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,qBAsT5C"}
+{"version":3,"file":"CaseDetailsTabs.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseEditView/CaseDetailsTabs.tsx"],"names":[],"mappings":"AAmBA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,EAAE,mBAAmB,EAAa,MAAM,kBAAkB,CAAC;AA0BlE,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,mBAAmB,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;CACnD;AACD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,qBAoS5C"}

package/lib/esm/components/CaseEditView/CaseDetailsTabs.js

@@ -12,16 +12,12 @@ import { useParams } from 'react-router-dom';
 import { CaseDetailsTabsEnum } from '../../constants/caseDetailsConstants';
 import { useCaseSelector } from '../../context/CaseContext';
 import { useCaseDetailsPageStateContext } from '../../context/CaseDetailsPageContext';
-import { useCaseComments } from '../../hooks/useCaseComments';
 import { PDFContext } from './PDFContainer';
 import CaseDetailsManagement from './Tabs/CaseDetails/CaseDetailsManagement';
 import CaseHistory from './Tabs/CaseHistory/CaseHistory';
 import { CaseSummary } from './Tabs/CaseSummary/CaseSummary';
 const RelatedTasks = React.lazy(() => import(/* webpackChunkName: 'CaseBugzilla' */ './Tabs/RelatedTasks/RelatedTasks'));
-// TODO: Re-enable Action Plan tab when ready
-// const CaseActionPlan = React.lazy(
-//     () => import(/* webpackChunkName: 'CaseActionPlan' */ './Tabs/CaseActionPlan/CaseActionPlan')
-// );
+const CaseActionPlan = React.lazy(() => import(/* webpackChunkName: 'CaseActionPlan' */ './Tabs/CaseActionPlan/CaseActionPlan'));
 const CasePrivateNotes = React.lazy(() => import(/* webpackChunkName: 'CasePrivateNotes' */ './Tabs/CasePrivateNotes/CasePrivateNotes'));
 const CaseDiscussion = React.lazy(() => import(/* webpackChunkName: 'CaseDiscussion' */ './Tabs/CaseDiscussion/CaseDiscussion'));
 const RMEEscalationList = React.lazy(() => import(/* webpackChunkName: 'RMEEscalationList' */ './Tabs/RMEEscalations/RMEEscalationList'));
@@ -29,17 +25,12 @@ export function CaseDetailsTabs(props) {
     const { caseNumber } = props;
     const { activeTab } = useParams();
     const { globalMetadataState: { loggedInUserRights, loggedInUsersAccount, pcmConfig, viewAsCustomer }, } = useContext(GlobalMetadataStateContext);
-    const { accountNumber, status, caseSalesforceId } = useCaseSelector((state) => ({
+    const { accountNumber, chats, comments, status } = useCaseSelector((state) => ({
         accountNumber: state.caseDetails.accountNumberRef,
-        // TODO: Re-enable after GraphQL migration of chats
-        // chats: state.caseDetails.chats,
+        chats: state.caseDetails.chats,
+        comments: state.caseDetails.comments,
         status: state.caseDetails.status,
-        caseSalesforceId: state.caseDetails.id,
     }), isEqual);
-    const { comments, loading: commentsLoading, error: commentsError, refetch: refetchComments, } = useCaseComments({
-        caseId: caseSalesforceId,
-        skip: !caseSalesforceId,
-    });
     const { t } = useTranslation();
     const [activeTabKey, setActiveTabKey] = useState(0);
     const { caseDetailsPageState: { caseEscalations }, } = useCaseDetailsPageStateContext();
@@ -58,16 +49,15 @@ export function CaseDetailsTabs(props) {
     // const bugZillaTabRef: React.MutableRefObject<HTMLDivElement> = useRef(null);
     const managementTabRef = useRef(null);
     const privateNotesTabRef = useRef(null);
-    // const actionPlanTabRef: React.MutableRefObject<HTMLDivElement> = useRef(null);
+    const actionPlanTabRef = useRef(null);
     const escalationTabRef = useRef(null);
     const relatedTasksRef = useRef(null);
     const caseHistoryTabRef = useRef(null);
     const generateAiCaseSummaryTabRef = useRef(null);
     const tabsToRender = [];
-    const handleTabClick = (_event, tabIndex) => {
-        const index = Number(tabIndex);
-        setActiveTabKey(index);
-        setSelectedTab(tabsToRender[index].title);
+    const handleTabClick = (event, tabIndex) => {
+        setActiveTabKey(tabIndex);
+        setSelectedTab(tabsToRender[tabIndex].title);
     };
     const isCaseHistoryEnabled = getConfigField(pcmConfig.data, 'isCaseHistoryEnabled', PCM_CONFIG_FIELD_TYPE.FEATURE_FLAG);
     tabsToRender.push({
@@ -76,10 +66,7 @@ export function CaseDetailsTabs(props) {
         title: CaseDetailsTabsEnum.DISCUSSION,
         ref: discussionTabRef,
         routePath: 'discussion',
-        component: (React.createElement(CaseDiscussion, { caseNumber: caseNumber, tabRef: discussionTabRef, caseComments: comments, commentsLoading: commentsLoading, commentsError: commentsError, 
-            // TODO: Re-enable after GraphQL migration of chats
-            // caseChats={chats}
-            accountNumber: accountNumber, isDiscussionTab: selectedTab === CaseDetailsTabsEnum.DISCUSSION, refetchComments: refetchComments })),
+        component: (React.createElement(CaseDiscussion, { caseNumber: caseNumber, tabRef: discussionTabRef, caseComments: comments, caseChats: chats, accountNumber: accountNumber, isDiscussionTab: selectedTab === CaseDetailsTabsEnum.DISCUSSION })),
     });
     tabsToRender.push({
         'data-tracking-id': 'case-details-tab',
@@ -99,15 +86,14 @@ export function CaseDetailsTabs(props) {
             title: CaseDetailsTabsEnum.RELATED_TASKS,
             component: React.createElement(RelatedTasks, null),
         });
-    // TODO: Re-enable Action Plan tab when ready
-    // tabsToRender.push({
-    //     'data-tracking-id': 'case-details-actionplan-tab',
-    //     key: 'action plan',
-    //     ref: actionPlanTabRef,
-    //     title: CaseDetailsTabsEnum.ACTION_PLAN,
-    //     routePath: 'plan',
-    //     component: <CaseActionPlan caseNumber={caseNumber} />,
-    // });
+    tabsToRender.push({
+        'data-tracking-id': 'case-details-actionplan-tab',
+        key: 'action plan',
+        ref: actionPlanTabRef,
+        title: CaseDetailsTabsEnum.ACTION_PLAN,
+        routePath: 'plan',
+        component: React.createElement(CaseActionPlan, { caseNumber: caseNumber }),
+    });
     canSeePrivateNotes &&
         tabsToRender.push({
             'data-tracking-id': 'case-details-pvtnotes-tab',