@rh-support/troubleshoot 2.6.355 → 2.6.358

package/lib/esm/components/RemoteRider/RemoteRiderAcceptanceModal.js

@@ -11,24 +11,26 @@ import { publicApi } from '@cee-eng/hydrajs';
 import { AcceptTermsModal, ToastNotification, useFetch } from '@rh-support/components';
 import { GlobalMetadataStateContext } from '@rh-support/react-context';
 import { TncConstants } from '@rh-support/utils';
+import isEqual from 'lodash/isEqual';
 import React, { useContext } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useCaseSelector } from '../../context/CaseContext';
+import { useCreateCaseComment } from '../../hooks/useCaseComments';
 export default function RemoteRiderAcceptanceModal(props) {
     const { globalMetadataState: { loggedInUser }, } = useContext(GlobalMetadataStateContext);
     const { t } = useTranslation();
     const { request, isFetching } = useFetch(publicApi.kase.acknowledgeRemoteSessionTerms, { propgateErrors: true });
-    const { request: postCommentRequest, isFetching: isPostingComment } = useFetch(publicApi.kase.postComment, {
-        propgateErrors: true,
-    });
+    const { createComment, loading: isPostingComment } = useCreateCaseComment();
+    const caseSalesforceId = useCaseSelector((state) => state.caseDetails.id, isEqual);
     const onConfirm = (pdfId) => __awaiter(this, void 0, void 0, function* () {
         try {
             yield request(props.caseNumber, pdfId);
             try {
-                const requestComment = t('#### Remote Access Rider agreement has been accepted.\n\n This action does not initiate a remote session. Please make a case comment if you would like to submit a request.');
-                yield postCommentRequest({
-                    caseNumber: props.caseNumber,
-                    commentBody: requestComment,
-                    contentType: 'markdown',
+                const requestComment = t('<h4>Remote Access Rider agreement has been accepted.</h4><p>This action does not initiate a remote session. Please make a case comment if you would like to submit a request.</p>');
+                yield createComment({
+                    caseId: caseSalesforceId,
+                    body: requestComment,
+                    isPublic: true,
                 });
                 ToastNotification.addSuccessMessage(t('Remote Access Rider agreement has been accepted'), t('This action does not initiate a remote session. Please make a case comment if you would like to submit a request.'));
             }

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

@@ -1 +1 @@
-{"version":3,"file":"Review.d.ts","sourceRoot":"","sources":["../../../../src/components/Review/Review.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAwC,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAIvD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAoBlE,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AACD,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,KAAK,EAAE,MAAM,qBAqF3C"}
+{"version":3,"file":"Review.d.ts","sourceRoot":"","sources":["../../../../src/components/Review/Review.tsx"],"names":[],"mappings":"AAKA,OAAO,KAA4B,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAKvD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAsBlE,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AACD,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,KAAK,EAAE,MAAM,qBAmG3C"}

package/lib/esm/components/Review/Review.js

@@ -1,31 +1,35 @@
 import { Grid, GridItem } from '@patternfly/react-core';
-import { AbilityContext, CaseDetailsFields, resourceActions, resources } from '@rh-support/user-permissions';
+// import { AbilityContext, CaseDetailsFields, resourceActions, resources } from '@rh-support/user-permissions';
 import { PreviousCaseTypes } from '@rh-support/utils';
 import isEmpty from 'lodash/isEmpty';
 import isEqual from 'lodash/isEqual';
-import React, { useContext, useEffect, useRef } from 'react';
+import React, { useEffect, useRef } from 'react';
 import { useCaseDispatch, useCaseSelector } from '../../context/CaseContext';
+import { useShowCaseGroupField } from '../../hooks/useCaseGroupUiState';
 import { setCaseDetails } from '../../reducers/CaseReducer';
 import { AccountSelector } from '../AccountInfo/AccountSelector';
 import { OwnerSelector } from '../AccountInfo/OwnerSelector';
 import CaseGroup from '../CaseInformation/CaseGroup';
 import CaseType from '../CaseInformation/CaseType';
 import { ContactPhoneNumber } from '../CaseInformation/ContactPhoneNumber';
-import { ContactPhoneNumberAlert } from '../CaseInformation/ContactPhoneNumberAlert';
+// TODO: Re-enable once phone number verification flow is fully supported with GraphQL
+// import { ContactPhoneNumberAlert } from '../CaseInformation/ContactPhoneNumberAlert';
 import Fts from '../CaseInformation/Fts';
 import Severity from '../CaseInformation/Severity';
 import SupportLevel from '../CaseInformation/SupportLevel';
+import CaseLabelsCreate from '../CaseManagement/CaseLabelsCreate';
 import CaseLanguageSelector from '../CaseManagement/CaseLanguageSelector';
-import { Cep } from '../CaseManagement/Cep';
+// import { Cep } from '../CaseManagement/Cep';
 import OpenReferenceNumber from '../CaseManagement/OpenReferenceNumber';
 import { OpenShiftClusterId } from '../CaseManagement/OpenShiftClusterId';
-import { RHAssociatesSelector } from '../CaseManagement/RHAssociatesSelector';
-import CaseContactSelector from '../CaseManagement/SendNotifications/CaseContactSelector';
-import { Hostname } from '../ImproveCase/Hostname';
+// import { RHAssociatesSelector } from '../CaseManagement/RHAssociatesSelector';
+// import CaseContactSelector from '../CaseManagement/SendNotifications/CaseContactSelector';
+// import { Hostname } from '../ImproveCase/Hostname';
 import KtQuestions from '../ImproveCase/KtQuestions';
 import { AllProductsSelector } from '../ProductSelector/AllProductsSelector';
 export default function Review(props) {
     const caseDispatch = useCaseDispatch();
+    const showCaseGroupField = useShowCaseGroupField();
     const { contactInfo24x7, caseType } = useCaseSelector((state) => ({
         contactInfo24x7: state.caseDetails.contactInfo24x7,
         caseType: state.caseDetails.caseType,
@@ -41,8 +45,12 @@ export default function Review(props) {
         }
         previousCaseTypeRef.current = caseType;
     }, [caseType, caseDispatch]);
-    const ability = useContext(AbilityContext);
-    const canSeeEmailNotifications = ability.can(resourceActions.PATCH, resources.CASE_DETAILS, CaseDetailsFields.CASE_DETAILS_SEND_NOTIFICATIONS);
+    // const ability = useContext(AbilityContext);
+    // const canSeeEmailNotifications = ability.can(
+    //     resourceActions.PATCH,
+    //     resources.CASE_DETAILS,
+    //     CaseDetailsFields.CASE_DETAILS_SEND_NOTIFICATIONS
+    // );
     const onSeverityChange = (payload) => {
         setCaseDetails(caseDispatch, payload);
     };
@@ -50,9 +58,8 @@ export default function Review(props) {
         React.createElement("form", { className: "review-form card card-light push-bottom" },
             React.createElement(AccountSelector, null),
             React.createElement(OwnerSelector, null),
-            React.createElement(AllProductsSelector, { routeProps: props.routeProps, loadTCOnChange: true, showTCAfterButtonClicked: true, checkEntitledProduct: true, isOnReviewPage: true }),
+            React.createElement(AllProductsSelector, { routeProps: props.routeProps, loadTCOnChange: true, showTCAfterButtonClicked: true, isOnReviewPage: true }),
             React.createElement(OpenShiftClusterId, null),
-            caseType !== PreviousCaseTypes.FEATURE_ENHANCEMENT && React.createElement(Hostname, null),
             React.createElement(KtQuestions, { inlineEditable: true, hideSaveCancel: true, onlyShowKT4: caseType === PreviousCaseTypes.FEATURE_ENHANCEMENT }),
             React.createElement(CaseType, null),
             React.createElement(SupportLevel, null),
@@ -61,15 +68,14 @@ export default function Review(props) {
                     React.createElement(Severity, { showSeverityInfoIcon: true, onSeverityChange: onSeverityChange })),
                 React.createElement(GridItem, { span: 12, xl2: 6, className: "pf-v6-u-mb-xl" },
                     React.createElement(ContactPhoneNumber, null))),
-            React.createElement(ContactPhoneNumberAlert, null),
             React.createElement(Fts, { inlineEditable: true, initialIsEditing: isEmpty(contactInfo24x7), hideSaveCancel: true }),
             React.createElement(Grid, { hasGutter: true },
-                React.createElement(GridItem, { span: 12, xl2: 6, className: "pf-v6-u-mb-xs" },
+                React.createElement(GridItem, { span: 12, xl2: showCaseGroupField ? 6 : 12, className: "pf-v6-u-mb-xs" },
                     React.createElement(CaseLanguageSelector, null)),
-                React.createElement(GridItem, { span: 12, xl2: 6, className: "pf-v6-u-mb-xs" },
-                    React.createElement(CaseGroup, null))),
-            canSeeEmailNotifications && React.createElement(CaseContactSelector, null),
-            React.createElement(RHAssociatesSelector, null),
-            React.createElement(OpenReferenceNumber, { inlineEditable: false, hideSaveCancel: true }),
-            React.createElement(Cep, null))));
+                showCaseGroupField && (React.createElement(GridItem, { span: 12, xl2: 6, className: "pf-v6-u-mb-xs" },
+                    React.createElement(CaseGroup, null)))),
+            React.createElement(Grid, { hasGutter: true },
+                React.createElement(GridItem, { span: 12, xl2: 12, className: "pf-v6-u-mb-xs" },
+                    React.createElement(CaseLabelsCreate, null))),
+            React.createElement(OpenReferenceNumber, { inlineEditable: false, hideSaveCancel: true }))));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"SessionRestore.d.ts","sourceRoot":"","sources":["../../../../src/components/SessionRestore/SessionRestore.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAgC,YAAY,EAAE,MAAM,qDAAqD,CAAC;AAQjH,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,OAAO,EAGH,eAAe,EAElB,MAAM,iCAAiC,CAAC;AAmBzC,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,eAAO,MAAM,6BAA6B,GAAI,aAAa,YAAY,GAAG,SAAS,EAAE,uBAAuB,MAAM,YAKjH,CAAC;AAEF,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,qBAsX3C"}
+{"version":3,"file":"SessionRestore.d.ts","sourceRoot":"","sources":["../../../../src/components/SessionRestore/SessionRestore.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAgC,YAAY,EAAE,MAAM,qDAAqD,CAAC;AAQjH,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,OAAO,EAGH,eAAe,EAElB,MAAM,iCAAiC,CAAC;AAmBzC,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,eAAO,MAAM,6BAA6B,GAAI,aAAa,YAAY,GAAG,SAAS,EAAE,uBAAuB,MAAM,YAKjH,CAAC;AAEF,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,qBAwX3C"}

package/lib/esm/components/SessionRestore/SessionRestore.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 /* eslint-disable @typescript-eslint/no-unused-vars */
+import { useApolloClient } from '@apollo/client/react';
 import { pcm } from '@cee-eng/hydrajs';
 import { useDebounce, useDeepCompareDebounce, usePrevious } from '@rh-support/components';
 import { GlobalMetadataStateContext } from '@rh-support/react-context';
@@ -43,6 +44,7 @@ export const isSessionFromCurrentAuthCycle = (sessionItem, currentLoginStartTime
 };
 export function SessionRestore(props) {
     var _a;
+    const apolloClient = useApolloClient();
     const sessionRestoreDispatch = useContext(SessionRestoreDispatchContext);
     const dispatchToAttachmentReducer = useContext(AttachmentDispatchContext);
     const { sessionRestore } = useContext(SessionRestoreStateContext);
@@ -239,7 +241,7 @@ export function SessionRestore(props) {
             const reg = new RegExp('Cluster Name: (.*) ');
             const v3ClusterName = reg.exec(sessionDetails.description) ? reg.exec(sessionDetails.description)[1] : '';
             setCaseState(caseDispatch, { v3ClusterName });
-            yield updateCaseWithSession(caseDispatch, sessionItem, loggedInUserRights.data.getAccountNumber(), loggedInUserRights.data.getHydraContactFromLoggedInUser(), loggedInUsersAccount.data);
+            yield updateCaseWithSession(caseDispatch, sessionItem, loggedInUserRights.data.getAccountNumber(), loggedInUserRights.data.getHydraContactFromLoggedInUser(), loggedInUsersAccount.data, apolloClient);
             if (!isAISureSession(sessionItem)) {
                 restoreFilesFromSession(dispatchToAttachmentReducer, sessionItem.session.id);
             }

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

@@ -1 +1 @@
-{"version":3,"file":"SubmitCase.d.ts","sourceRoot":"","sources":["../../../../src/components/SubmitCase/SubmitCase.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAErD,OAAO,EAAQ,mBAAmB,EAAe,MAAM,kBAAkB,CAAC;AAQ1E,OAAO,EAAqB,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAWrF,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,KAAK,EAAE,MAAM,qBA6Y/C"}
+{"version":3,"file":"SubmitCase.d.ts","sourceRoot":"","sources":["../../../../src/components/SubmitCase/SubmitCase.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAErD,OAAO,EAAQ,mBAAmB,EAAe,MAAM,kBAAkB,CAAC;AAQ1E,OAAO,EAAqB,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAWrF,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,KAAK,EAAE,MAAM,qBA8Y/C"}

package/lib/esm/components/SubmitCase/SubmitCase.js

@@ -214,7 +214,7 @@ export default function SubmitCase(props) {
                                 React.createElement(Button, { className: "pf-v6-u-ml-md view-case-button", component: "a", href: getCaseURL(), variant: "primary", "data-tracking-id": "get-support-view-case", "aria-label": t('View case'), isAriaDisabled: isUploadingAttachment(attachmentState.caseFiles.selectedLocalFiles) },
                                     React.createElement(Trans, null, "View case"))))) : (React.createElement(Button, { component: (props) => (React.createElement(Link, Object.assign({}, props, { to: `/case/${caseNoOfCreatedCase}` }))), variant: "primary", "data-tracking-id": "get-support-view-case", "aria-label": t('View case'), className: "view-case-button" },
                             React.createElement(Trans, null, "View case"))))))),
-            !isEmpty(attachmentState.caseFiles.selectedLocalFiles) && (React.createElement(FileUploader, { idToUploadTo: caseNoOfCreatedCase, isSessionId: false, isSecureSupport: loggedInUsersAccount.data.secureSupport })),
+            !isEmpty(attachmentState.caseFiles.selectedLocalFiles) && (React.createElement(FileUploader, { idToUploadTo: caseNoOfCreatedCase, isSessionId: false })),
             React.createElement("div", null,
                 (!isEmpty(topContent.data) || !rulesState.EARules.rules || !clusterRecommendations) &&
                     !isIdea && (React.createElement(Content, { className: "pf-v6-u-mt-2xl pf-v6-u-font-weight-light", component: ContentVariants.h2 },

package/lib/esm/components/TroubleshootSection/TroubleshootSection.js

@@ -143,7 +143,7 @@ function TroubleshootSection(props) {
                 updateSession(sessionRestoreDispatch, activeSessionId, sessionDetails, newSession);
             }
         }
-        // Enable Continue button when first chunk is received
+        // Enable "See more resources" button when first chunk is received
         if (eventData.eventName === ARHEventName.FirstMessageReceived) {
             aiResponseDispatch(setHasChunkReceived(true));
         }
@@ -355,7 +355,7 @@ function TroubleshootSection(props) {
             React.createElement("button", { onClick: props.onSeeMoreResources, className: "btn btn-app btn-primary main-nav-button", type: "button", disabled: isFunctionalCookieAccepted() &&
                     props.aiServicesAvailable &&
                     !aiResponseState.hasChunkReceived &&
-                    !aiResponseState.error }, t('Continue')))) : isCaseCreate ? (React.createElement("span", null,
+                    !aiResponseState.error }, isFunctionalCookieAccepted() ? t('See more resources') : t('Continue')))) : isCaseCreate ? (React.createElement("span", null,
             React.createElement(Trans, { i18nKey: "<span>Return to</span> <button>case creation</button>", components: {
                     span: React.createElement("span", { className: "return-to-case-text" }),
                     button: (React.createElement(Button, { className: "return-to-case-btn", variant: "link", component: "a", onClick: () => props.setIsAIChatMode(false) })),

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

@@ -1 +1 @@
-{"version":3,"file":"UpdateSeverityModal.d.ts","sourceRoot":"","sources":["../../../../src/components/UpdateSeverityModal/UpdateSeverityModal.tsx"],"names":[],"mappings":"AAmCA,OAAO,KAAmE,MAAM,OAAO,CAAC;AAgBxF,UAAU,MAAM;IACZ,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,KAAK,EAAE,MAAM,qBAqlBxD"}
+{"version":3,"file":"UpdateSeverityModal.d.ts","sourceRoot":"","sources":["../../../../src/components/UpdateSeverityModal/UpdateSeverityModal.tsx"],"names":[],"mappings":"AAiCA,OAAO,KAAmE,MAAM,OAAO,CAAC;AAexF,UAAU,MAAM;IACZ,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,KAAK,EAAE,MAAM,qBA+oBxD"}

package/lib/esm/components/UpdateSeverityModal/UpdateSeverityModal.js

@@ -7,11 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { publicApi } from '@cee-eng/hydrajs';
+import { useApolloClient } from '@apollo/client/react';
 import { Button, Dropdown, DropdownItem, DropdownList, Flex, FlexItem, MenuToggle, Modal, ModalBody, ModalFooter, ModalHeader, Spinner, TextArea, } from '@patternfly/react-core';
-import { ToastNotification, useFetch } from '@rh-support/components';
+import { ToastNotification } from '@rh-support/components';
 import { GlobalMetadataStateContext, useCanEditCase } from '@rh-support/react-context';
-import { autoEnableFtsOnCaseViewEditPage, isFtsEditableOnEditPage, isSev1, PreviousCaseTypes, severitySort, showFtsOnCreateCasePage, } from '@rh-support/utils';
+import { getFtsForSeverityChange, isPremiumEntitlement, isSev1, PreviousCaseTypes, severitySort, } from '@rh-support/utils';
 import { isUndefined } from 'lodash';
 import find from 'lodash/find';
 import includes from 'lodash/includes';
@@ -21,13 +21,11 @@ import map from 'lodash/map';
 import React, { useContext, useEffect, useReducer, useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useCaseDispatch, useCaseSelector } from '../../context/CaseContext';
-import { useCaseDetailsPageStateContext } from '../../context/CaseDetailsPageContext';
-import { useCaseDiscussionTabDispatchContext, useCaseDiscussionTabStateContext, } from '../../context/CaseDiscussionTabContext';
 import { useCaseUpdateErrorMessage } from '../../hooks/useCaseUpdateErrorMessage';
-import { updateDiscussionStateComments } from '../../reducers/CaseDiscussionTabReducer';
 import { getNewSeverityStringDef, getSeverityDescription } from '../../reducers/CaseHelpers';
 import { caseOverviewReducer, initialCaseViewState, setSeverityUpdating } from '../../reducers/CaseOverviewReducer';
-import { checkForCaseStatusToggleOnAttachOrComment, setCaseState, updateCaseDetails } from '../../reducers/CaseReducer';
+import { checkForCaseStatusToggleOnAttachOrComment, setCaseState, updateCaseSeverityAndFtsGraphQL, } from '../../reducers/CaseReducer';
+import { usePostComment } from '../shared/usePostComment';
 export default function UpdateSeverityModal(props) {
     const { show, onClose, isDisabled, isFetching } = props;
     const { t } = useTranslation();
@@ -40,12 +38,7 @@ export default function UpdateSeverityModal(props) {
     const [isUpdateClickedToShowError, setIsUpdateClickedToShowError] = useState(false);
     const [isSeverityInValid, setIsSeverityInValid] = useState(false);
     const [seviritiesOptions, setSeveritiesOptions] = useState([]);
-    const { request: postCommentRequest, isFetching: isPostingComment } = useFetch(publicApi.kase.postComment, {
-        propgateErrors: true,
-    });
-    const { caseDetailsPageState: { caseFeedbacksHydra }, } = useCaseDetailsPageStateContext();
-    const dispatchDiscussion = useCaseDiscussionTabDispatchContext();
-    const { sort, allDiscussions, discussionFiltersListState } = useCaseDiscussionTabStateContext();
+    const client = useApolloClient();
     const { globalMetadataState: { allCaseSeverities, allProducts, loggedInUserRights }, } = useContext(GlobalMetadataStateContext);
     const caseState = useCaseSelector((state) => ({
         caseDetails: {
@@ -61,19 +54,30 @@ export default function UpdateSeverityModal(props) {
             phoneCountryCode: state.caseDetails.phoneCountryCode,
             phoneAreaCodePrefixLineNumber: state.caseDetails.phoneAreaCodePrefixLineNumber || '',
         },
+        existingCaseDetails: state.caseDetails,
         isCaseUpdating: state.isCaseUpdating,
         versionsDetails: state.versionsDetails,
         ownersEntitlements: state.ownersEntitlements,
         ftsContactSameAsOwner: state.ftsContactSameAsOwner,
     }), isEqual);
-    const { caseDetails, isCaseUpdating, ownersEntitlements, versionsDetails, ftsContactSameAsOwner } = caseState;
+    const { postComment, isPostingComment } = usePostComment({
+        caseNumber: caseState.caseDetails.caseNumber,
+    });
+    const { caseDetails, existingCaseDetails, isCaseUpdating, ownersEntitlements, versionsDetails, ftsContactSameAsOwner, } = caseState;
     const { entitlementSla, fts, contactInfo24x7, caseType, phoneAreaCodePrefixLineNumber, phoneCountryCode } = caseDetails;
     const isIdea = caseType === PreviousCaseTypes.FEATURE_ENHANCEMENT;
     const [currentSeverity, setCurrentSeverity] = useState(caseDetails.caseSeverity);
+    const updateSeverityViaGraphQL = (payload) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        yield updateCaseSeverityAndFtsGraphQL(caseDispatch, client, caseDetails.caseNumber, payload, (_b = (_a = payload.severity) !== null && _a !== void 0 ? _a : currentSeverity) !== null && _b !== void 0 ? _b : caseDetails.caseSeverity, { existingCaseDetails });
+    });
     const [localFtsContact, setLocalFtsContact] = useState(contactInfo24x7 || '');
     const [localFts, setLocalFts] = useState(isUndefined(fts) ? true : fts);
     const initialContactSameAsOwnerRef = useRef(ftsContactSameAsOwner !== null && ftsContactSameAsOwner !== void 0 ? ftsContactSameAsOwner : false);
-    const isFtsEditable = isFtsEditableOnEditPage(entitlementSla, currentSeverity);
+    const hasPremiumSla = isPremiumEntitlement(entitlementSla || '');
+    const severityForFts = String(currentSeverity !== null && currentSeverity !== void 0 ? currentSeverity : '').trim();
+    const shouldShowFts = isSev1(severityForFts) && hasPremiumSla;
+    const isPreviousSeveritySelected = isEqual(caseDetails.caseSeverity, currentSeverity);
     const [isOpen, setIsOpen] = useState(false);
     const onToggleClick = () => {
         setIsOpen(!isOpen);
@@ -114,12 +118,9 @@ export default function UpdateSeverityModal(props) {
     // To update the state when severity changes
     const updateState = (value) => {
         const casePayload = { severity: value };
-        // .. change fts on sev change only while creating case or wchen we change to sev1
-        isEmpty(caseDetails.caseNumber) &&
-            (casePayload.fts = showFtsOnCreateCasePage(caseDetails.entitlementSla, value));
-        !isEmpty(caseDetails.caseNumber) &&
-            autoEnableFtsOnCaseViewEditPage(caseDetails.entitlementSla, value) &&
-            (casePayload.fts = true);
+        casePayload.fts = getFtsForSeverityChange(caseDetails.entitlementSla, value, {
+            isCaseEdit: !isEmpty(caseDetails.caseNumber),
+        });
     };
     // Modal cancel function which resets the field
     const onCancel = () => __awaiter(this, void 0, void 0, function* () {
@@ -148,27 +149,38 @@ export default function UpdateSeverityModal(props) {
     const getFtsUpdateComment = () => {
         if (isIdea)
             return '';
-        if (isEqual(caseDetails.fts, localFts) && isEqual(caseDetails.contactInfo24x7, localFtsContact))
+        // 24x7 fields are only shown for severity 1; do not report contact changes the user could not make.
+        if (!shouldShowFts)
+            return '';
+        const normalize24x7Contact = (value) => (value !== null && value !== void 0 ? value : '').trim();
+        const savedContact = normalize24x7Contact(caseDetails.contactInfo24x7);
+        const localContact = normalize24x7Contact(localFtsContact);
+        if (isEqual(caseDetails.fts, localFts) && isEqual(savedContact, localContact))
             return '';
-        if (caseDetails.fts && !localFts)
-            return '#### Contact Support Update \n User disabled 24x7 contact support';
-        if (!caseDetails.fts && localFts)
-            return '#### Contact Support Update \n User enabled 24x7 contact support';
-        return '#### Contact Support Update \n User updated 24x7 contact information';
+        if (caseDetails.fts && !localFts) {
+            return '<h4>Contact Support Update</h4><p>User disabled 24x7 contact support</p>';
+        }
+        if (!caseDetails.fts && localFts) {
+            return '<h4>Contact Support Update</h4><p>User enabled 24x7 contact support</p>';
+        }
+        return '<h4>Contact Support Update</h4><p>User updated 24x7 contact information</p>';
     };
     const updateCaseFtsInfo = () => __awaiter(this, void 0, void 0, function* () {
+        const ftsUpdateComment = `${getFtsUpdateComment()}<h4>Description</h4><p>${descriptionValue.trim()}</p>`;
         try {
-            const ftsUpdateComment = `${getFtsUpdateComment()} \n\n #### Description \n ${descriptionValue.trim()}`;
-            yield updateCaseDetails(caseDispatch, caseDetails.caseNumber, {
+            yield updateSeverityViaGraphQL({
+                severity: currentSeverity || caseDetails.caseSeverity,
                 fts: localFts,
                 contactInfo24x7: localFtsContact,
             });
-            yield postCommentRequest({
-                caseNumber: caseDetails.caseNumber,
+            ToastNotification.addSuccessMessage(t(`Case has been successfully updated`));
+            void postComment({
                 commentBody: ftsUpdateComment === null || ftsUpdateComment === void 0 ? void 0 : ftsUpdateComment.trim(),
                 contentType: 'markdown',
+                updateDiscussionState: true,
+            }).catch((err) => {
+                caseUpdateError.showError(err, t(`Couldn't post severity update comment. Please try again`));
             });
-            ToastNotification.addSuccessMessage(t(`Case has been successfully updated`));
         }
         catch (err) {
             caseUpdateError.showError(err, t(`Failed to update the case`));
@@ -177,6 +189,7 @@ export default function UpdateSeverityModal(props) {
             onClose();
             setDescriptionValue('');
             setIsUpdateClickedToShowError(false);
+            setSeverityUpdating(caseOverviewDispatch, false);
         }
     });
     const onSubmit = () => __awaiter(this, void 0, void 0, function* () {
@@ -190,64 +203,73 @@ export default function UpdateSeverityModal(props) {
         }
         const ftsUpdateComment = getFtsUpdateComment();
         // Severity update successful comment body
-        const severityUpdateComment = t(`#### Severity update \n Severity changed from {{oldSeverity}} to {{newSeverity}}\n\n ${isEmpty(ftsUpdateComment) ? '' : ftsUpdateComment + '\n\n\n'} #### Description \n{{description}}`, {
+        const severityUpdateComment = t(`<h4>Severity update</h4><p>Severity changed from {{oldSeverity}} to {{newSeverity}}</p>${isEmpty(ftsUpdateComment) ? '' : ftsUpdateComment}<h4>Description</h4><p>{{description}}</p>`, {
             oldSeverity: caseDetails.caseSeverity,
             newSeverity: updatedCaseDetails['severity'],
             description: descriptionValue === null || descriptionValue === void 0 ? void 0 : descriptionValue.trim(),
         });
         // Severity update failed comment body
-        const severityUpdateFailedComment = t('#### Severity update \n Failed to change severity from {{oldSeverity}} to {{newSeverity}}. Please try again\n', {
+        const severityUpdateFailedComment = t('<h4>Severity update</h4><p>Failed to change severity from {{oldSeverity}} to {{newSeverity}}. Please try again</p>', {
             oldSeverity: caseDetails.caseSeverity,
-            newSeveritay: updatedCaseDetails['severity'],
+            newSeverity: updatedCaseDetails['severity'],
         });
         try {
             setSeverityUpdating(caseOverviewDispatch, true);
-            yield updateCaseDetails(caseDispatch, caseDetails.caseNumber, updatedCaseDetails);
-            try {
-                yield postCommentRequest({
-                    caseNumber: caseDetails.caseNumber,
-                    commentBody: severityUpdateComment === null || severityUpdateComment === void 0 ? void 0 : severityUpdateComment.trim(),
-                    contentType: 'markdown',
-                });
+            yield updateSeverityViaGraphQL(updatedCaseDetails);
+            setSeverityUpdating(caseOverviewDispatch, false);
+            const newSeverity = updatedCaseDetails['severity'];
+            setCurrentSeverity(newSeverity);
+            onSuccessfulSubmit();
+            ToastNotification.addSuccessMessage(t('Severity has been successfully updated'));
+            void (() => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    checkForCaseStatusToggleOnAttachOrComment(caseDispatch, loggedInUserRights.data.isInternal(), caseDetails.caseStatus);
-                    setCurrentSeverity(updatedCaseDetails['severity']);
-                    onSuccessfulSubmit();
-                    ToastNotification.addSuccessMessage(t('Severity has been successfully updated'));
+                    yield postComment({
+                        commentBody: severityUpdateComment === null || severityUpdateComment === void 0 ? void 0 : severityUpdateComment.trim(),
+                        contentType: 'markdown',
+                        updateDiscussionState: true,
+                    });
+                    try {
+                        yield checkForCaseStatusToggleOnAttachOrComment(caseDispatch, loggedInUserRights.data.isInternal(), caseDetails.caseStatus, {
+                            apolloClient: client,
+                            caseNumber: caseDetails.caseNumber,
+                            existingCaseDetails,
+                        });
+                    }
+                    catch (e) {
+                        yield postComment({
+                            commentBody: severityUpdateFailedComment === null || severityUpdateFailedComment === void 0 ? void 0 : severityUpdateFailedComment.trim(),
+                            contentType: 'markdown',
+                            updateDiscussionState: true,
+                        });
+                        caseUpdateError.showError(e, t(`Failed to update case status. Please try again`));
+                        yield updateSeverityViaGraphQL({
+                            status: 'Waiting on Customer Action Required',
+                            severity: updatedCaseDetails['severity'],
+                        });
+                    }
                 }
                 catch (e) {
-                    yield postCommentRequest({
-                        caseNumber: caseDetails.caseNumber,
-                        commentBody: severityUpdateFailedComment === null || severityUpdateFailedComment === void 0 ? void 0 : severityUpdateFailedComment.trim(),
-                        contentType: 'markdown',
+                    caseUpdateError.showError(e, t(`Couldn't post severity update comment. Please try again`));
+                    yield updateSeverityViaGraphQL({
+                        severity: caseDetails.caseSeverity,
                     });
-                    onClose();
-                    caseUpdateError.showError(e, t(`Failed to update case status. Please try again`));
-                    yield updateCaseDetails(caseDispatch, caseDetails.caseNumber, Object.assign({ status: 'Waiting on Customer' }, updateCaseDetails));
+                    setCurrentSeverity(caseDetails.caseSeverity);
+                    reUpdateSeverity(caseDetails.caseSeverity);
+                    setSeverityUpdating(caseOverviewDispatch, false);
                 }
-            }
-            catch (e) {
-                onClose();
-                caseUpdateError.showError(e, t(`Couldn't post severity update comment. Please try again`));
-                yield updateCaseDetails(caseDispatch, caseDetails.caseNumber, {
-                    severity: caseDetails.caseSeverity,
-                });
-                setDescriptionValue(descriptionValue === null || descriptionValue === void 0 ? void 0 : descriptionValue.trim());
-                reUpdateSeverity(caseDetails.caseSeverity);
-                setSeverityUpdating(caseOverviewDispatch, false);
-            }
+            }))();
         }
         catch (e) {
+            setSeverityUpdating(caseOverviewDispatch, false);
             onClose();
             caseUpdateError.showError(e, t('Severity failed to update'));
-            yield updateCaseDetails(caseDispatch, caseDetails.caseNumber, {
+            yield updateSeverityViaGraphQL({
                 severity: caseDetails.caseSeverity,
             });
             reUpdateSeverity(caseDetails.caseSeverity);
             setDescriptionValue(descriptionValue === null || descriptionValue === void 0 ? void 0 : descriptionValue.trim());
         }
         finally {
-            yield updateDiscussionStateComments(dispatchDiscussion, caseDispatch, caseDetails.caseNumber, allDiscussions, sort, caseFeedbacksHydra.data, discussionFiltersListState);
             setIsUpdateClickedToShowError(false);
             setDescriptionValue('');
         }
@@ -265,14 +287,12 @@ export default function UpdateSeverityModal(props) {
         if (isEmpty(updatedCaseDetails)) {
             return false;
         }
-        else if (isEqual(caseDetails.caseSeverity, currentSeverity) &&
+        if (isEqual(caseDetails.caseSeverity, currentSeverity) &&
             isEqual(caseDetails.fts, localFts) &&
             isEqual(caseDetails.contactInfo24x7, localFtsContact)) {
             return false;
         }
-        else {
-            return true;
-        }
+        return true;
     };
     const onFtsChange = (e) => {
         if (canEditCase.alert())
@@ -287,8 +307,9 @@ export default function UpdateSeverityModal(props) {
         if (!e.target.checked) {
             return;
         }
-        setUpdatedCaseDetails((pre) => (Object.assign(Object.assign({}, pre), { contactInfo24x7: `${phoneCountryCode}-${phoneAreaCodePrefixLineNumber}` })));
-        setLocalFtsContact(`${phoneCountryCode}-${phoneAreaCodePrefixLineNumber}`);
+        const ownerPhone = `${phoneCountryCode}-${phoneAreaCodePrefixLineNumber}`;
+        setUpdatedCaseDetails((pre) => (Object.assign(Object.assign({}, pre), { contactInfo24x7: ownerPhone })));
+        setLocalFtsContact(ownerPhone);
     };
     const onFtsContactChange = (e) => {
         if (canEditCase.alert())
@@ -296,22 +317,50 @@ export default function UpdateSeverityModal(props) {
         setLocalFtsContact(e.target.value);
         setUpdatedCaseDetails((pre) => (Object.assign(Object.assign({}, pre), { contactInfo24x7: e.target.value.trim() })));
     };
-    // To disable submit button wrt above conditions
-    const isSubmitButtonDisabled = checkIsUpdateValid() && isTextAreaValid() ? false : true;
+    const isUpdateValid = checkIsUpdateValid();
+    const isDescriptionDisabled = (caseOverviewState.caseSeverityUpdating && isCaseUpdating) || isPostingComment || !isUpdateValid;
+    const isSubmitButtonDisabled = !(isUpdateValid && isTextAreaValid());
     // To handle the severity change
-    const onSeverityChange = (event, option) => {
+    const onSeverityChange = (_event, value) => {
         if (canEditCase.alert())
             return;
-        if (!isEqual(caseDetails.caseSeverity, option.name) &&
-            isSev1(option.name) &&
-            isFtsEditableOnEditPage(entitlementSla, option.name)) {
+        const option = typeof value === 'object' && value !== null && 'name' in value
+            ? value
+            : filteredSeverities.find((s) => s.name === value) || {
+                name: String(value),
+                disabled: false,
+                label: String(value),
+                additionalInfo: '',
+            };
+        // Re-selecting the previously saved severity: reset and keep description/Update disabled
+        if (isEqual(caseDetails.caseSeverity, option.name)) {
+            setCurrentSeverity(option.name);
+            setUpdatedCaseDetails({});
+            setLocalFts(isUndefined(fts) ? true : !!fts);
+            setLocalFtsContact(contactInfo24x7 || '');
+            setCaseState(caseDispatch, { ftsContactSameAsOwner: initialContactSameAsOwnerRef.current });
+            setDescriptionValue('');
+            setIsUpdateClickedToShowError(false);
+            setIsSeverityInValidLocal(option);
+            setIsOpen(false);
+            return;
+        }
+        if (isSev1(option.name) && (hasPremiumSla || isEmpty(entitlementSla))) {
             setLocalFts(true);
             setLocalFtsContact('');
             setCaseState(caseDispatch, { ftsContactSameAsOwner: false });
-            setUpdatedCaseDetails((pre) => (Object.assign(Object.assign({}, pre), { severity: option.name, fts: !isIdea, contactInfo24x7: '' })));
+            setUpdatedCaseDetails({
+                severity: option.name,
+                fts: !isIdea,
+                contactInfo24x7: '',
+            });
         }
         else {
-            setUpdatedCaseDetails({ severity: option.name, fts: false });
+            const ftsForSeverity = isIdea
+                ? false
+                : getFtsForSeverityChange(caseDetails.entitlementSla, option.name, { isCaseEdit: true });
+            setLocalFts(ftsForSeverity);
+            setUpdatedCaseDetails({ severity: option.name, fts: ftsForSeverity });
         }
         setCurrentSeverity(option.name);
         updateState(option.name);
@@ -360,8 +409,8 @@ export default function UpdateSeverityModal(props) {
     ]);
     useEffect(() => {
         const phone = `${phoneCountryCode}-${phoneAreaCodePrefixLineNumber}`;
-        setLocalFts(fts);
-        setLocalFtsContact(contactInfo24x7);
+        setLocalFts(isUndefined(fts) ? true : fts);
+        setLocalFtsContact(contactInfo24x7 || '');
         if (contactInfo24x7 === phone) {
             setCaseState(caseDispatch, { ftsContactSameAsOwner: true });
         }
@@ -383,23 +432,21 @@ export default function UpdateSeverityModal(props) {
                                     React.createElement(FlexItem, null, selectedSeverity.label || t(`Select a severity`)),
                                     React.createElement(FlexItem, null, isFetching || versionsDetails.isFetching ? React.createElement(Spinner, { size: "md" }) : '')))), shouldFocusToggleOnSelect: true, isScrollable: true, popperProps: { direction: 'down', enableFlip: false } },
                             React.createElement(DropdownList, null, allCaseSeverities.data
-                                ? filteredSeverities.map((option) => (React.createElement(DropdownItem, { value: option, key: option.name, description: option.additionalInfo }, option.label)))
+                                ? filteredSeverities.map((option) => (React.createElement(DropdownItem, { value: option.name, key: option.name, description: option.additionalInfo }, option.label)))
                                 : []))),
                     React.createElement("div", null,
                         React.createElement("label", { htmlFor: "date-input", className: "pf-v6-u-mt-md" },
                             React.createElement(Trans, null, "Describe update"),
                             React.createElement("span", { className: "form-required", "aria-hidden": "true" }, "*")),
-                        React.createElement(TextArea, { placeholder: t('How has the business impact changed? If you have increased severity, please explain why.'), isDisabled: (caseOverviewState.caseSeverityUpdating && isCaseUpdating) ||
-                                isPostingComment ||
-                                !checkIsUpdateValid(), value: descriptionValue, onChange: (_event, value) => handleTextAreaChange(value), resizeOrientation: "vertical", "aria-label": "severity-update-descritpion", validated: isEmpty(descriptionValue) && isUpdateClickedToShowError ? 'error' : 'default', isRequired: true }),
+                        React.createElement(TextArea, { placeholder: t('How has the business impact changed? If you have increased severity, please explain why.'), isDisabled: isDescriptionDisabled, value: descriptionValue, onChange: (_event, value) => handleTextAreaChange(value), resizeOrientation: "vertical", "aria-label": "severity-update-descritpion", validated: isEmpty(descriptionValue) && isUpdateClickedToShowError ? 'error' : 'default', isRequired: true }),
                         React.createElement("div", { className: "pf-v6-u-mt-xs" },
                             React.createElement(Trans, null, "To view your comment, go to the Discussion tab."))),
-                    !isIdea && isFtsEditable && (React.createElement("div", { className: "pf-v6-u-mt-md pf-v6-u-mb-sm" },
+                    shouldShowFts && (React.createElement("div", { className: "pf-v6-u-mt-md pf-v6-u-mb-sm" },
                         React.createElement("div", null,
                             React.createElement("input", { type: "checkbox", id: "update-severity-fts", "data-tracking-id": "update-severity-fts", name: "update-severity-fts", checked: localFts, onChange: onFtsChange }),
                             React.createElement("label", { htmlFor: "update-severity-fts" },
                                 React.createElement(Trans, null, "24x7 Support"))),
-                        localFts && (React.createElement("div", null,
+                        (localFts || isSev1(currentSeverity)) && (React.createElement("div", null,
                             React.createElement("label", { htmlFor: "update-severity-24-7-contact", className: "pf-v6-u-mt-xs" },
                                 React.createElement(Trans, null, "Contact for 24x7 support")),
                             React.createElement("div", null,
@@ -419,8 +466,9 @@ export default function UpdateSeverityModal(props) {
             React.createElement("p", { className: "pf-v6-u-text-color-subtle pf-v6-u-font-size-sm pf-v6-u-mb-md" }, t('Describing your update helps us better assist you.')),
             modalBody()),
         React.createElement(ModalFooter, null,
-            React.createElement(Button, { key: "submit", variant: "primary", onClick: onSubmit, isLoading: isCaseUpdating || isPostingComment, "data-tracking-id": "update-severity-submit", isDisabled: !isUpdateClickedToShowError && checkIsUpdateValid()
-                    ? false
-                    : isSubmitButtonDisabled || isCaseUpdating || isPostingComment }, t('Update')),
+            React.createElement(Button, { key: "submit", variant: "primary", onClick: onSubmit, isLoading: isCaseUpdating || isPostingComment, "data-tracking-id": "update-severity-submit", isDisabled: (isPreviousSeveritySelected && !onlyFtsInfoChanged) ||
+                    (!isUpdateClickedToShowError && isUpdateValid
+                        ? false
+                        : isSubmitButtonDisabled || isCaseUpdating || isPostingComment) }, t('Update')),
             React.createElement(Button, { key: "back", variant: "link", onClick: onCancel, "data-tracking-id": "update-severity-cancel", isDisabled: isCaseUpdating || isPostingComment }, t('Cancel')))));
 }