@rh-support/troubleshoot 2.6.358 → 2.6.361

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

@@ -191,7 +191,7 @@ function OwnerSelector(props) {
         }
         catch (e) {
             setCaseState(caseDispatch, { isCaseOwnerUpdating: false });
-            caseUpdateError.showError(e, t(`Owner failed to update`));
+            caseUpdateError.showFieldError(e, t('Owner'), () => onCaseOwnerUpdate(newOwner));
         }
     });
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"CaseDetailsErrorMessage.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseEditView/CaseDetailsErrorMessage.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,KAAqB,MAAM,OAAO,CAAC;AAG1C,UAAU,MAAM;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,SAAS,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B;AAID,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,qBA4FpD"}
+{"version":3,"file":"CaseDetailsErrorMessage.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseEditView/CaseDetailsErrorMessage.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,KAAqB,MAAM,OAAO,CAAC;AAG1C,UAAU,MAAM;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,SAAS,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B;AAKD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,qBA0GpD"}

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

@@ -5,6 +5,7 @@ import React, { useContext } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 // Here we need to use 'detailMessage' from case API if user is not authorized to see case detail
 const INVALID_CASE_GROUP_API_ERROR_DEFAULT_MESSAGE = 'Invalid group access';
+const NO_PERMISSION_PATTERN = /do not have permission|not authorized|don't have permission/i;
 export function CaseDetailsErrorMessage(props) {
     const { globalMetadataState: { loggedInUserRights }, } = useContext(GlobalMetadataStateContext);
     const { t } = useTranslation();
@@ -18,11 +19,18 @@ export function CaseDetailsErrorMessage(props) {
     */
     const isCaseGroupError = (errorDetails === null || errorDetails === void 0 ? void 0 : errorDetails['detailMessage']) === INVALID_CASE_GROUP_API_ERROR_DEFAULT_MESSAGE;
     const isCssAccessRestrictionError = (errorDetails === null || errorDetails === void 0 ? void 0 : errorDetails['detailMessage']) === CSS_ACCESS_RESTRICTION_ERROR_DETAIL;
+    const rawErrorMessage = [errorDetails === null || errorDetails === void 0 ? void 0 : errorDetails['message'], errorDetails === null || errorDetails === void 0 ? void 0 : errorDetails['detailMessage']].filter(Boolean).join(' ');
+    const isUnauthorizedAccessError = !isCaseGroupError && !isCssAccessRestrictionError && NO_PERMISSION_PATTERN.test(rawErrorMessage);
+    const unauthorizedAccessTitle = t('You do not have permission to view this case');
     const getErrorMessage = () => {
         const { status, message = '' } = errorDetails || {};
-        const customDefaultErrorMessage403 = isCaseGroupError
-            ? t('Please contact your organization’s admin to request access to this case’s group.')
-            : t('You are not authorized to see this case.');
+        let customDefaultErrorMessage403 = t('You are not authorized to see this case.');
+        if (isCaseGroupError) {
+            customDefaultErrorMessage403 = t('Please contact your organization’s admin to request access to this case’s group.');
+        }
+        else if (isUnauthorizedAccessError) {
+            customDefaultErrorMessage403 = t('You do not have permission to view this case. Please contact your organization administrator if you believe you should have access.');
+        }
         const errorMessage404 = t("Case number doesn't exist");
         let errorMessage403;
         if (isCssAccessRestrictionError) {
@@ -57,10 +65,12 @@ export function CaseDetailsErrorMessage(props) {
     };
     return (React.createElement(AlertMessage, { variant: AlertType.DANGER, className: "pf-v6-u-mb-lg", show: true, 
         // Here customizing title of alert based on case group error.
-        title: errorMessageTitle(errorDetails, Object.assign(Object.assign({}, (isCaseGroupError && {
+        title: errorMessageTitle(errorDetails, Object.assign(Object.assign(Object.assign({}, (isCaseGroupError && {
             '403': { title: invalidCaseGroupErrorTitle },
         })), (isCssAccessRestrictionError && {
             '403': { title: cssAccessRestrictionErrorTitle },
+        })), (isUnauthorizedAccessError && {
+            '403': { title: unauthorizedAccessTitle },
         })), canManageCase), isInline: isInlineError },
         React.createElement(Trans, null, getErrorMessage())));
 }

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":"AAkBA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,EAAE,mBAAmB,EAAa,MAAM,kBAAkB,CAAC;AA8BlE,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,qBAoT5C"}
+{"version":3,"file":"CaseDetailsTabs.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseEditView/CaseDetailsTabs.tsx"],"names":[],"mappings":"AAkBA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,EAAE,mBAAmB,EAA0B,MAAM,kBAAkB,CAAC;AA+B/E,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,qBA0U5C"}

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

@@ -4,14 +4,15 @@ import InfoCircleIcon from '@patternfly/react-icons/dist/js/icons/info-circle-ic
 import { ErrorBoundary, LoadingIndicator } from '@rh-support/components';
 import { GlobalMetadataStateContext } from '@rh-support/react-context';
 import { ability, CaseDetailsFields, resourceActions, resources } from '@rh-support/user-permissions';
-import { getConfigField, PCM_CONFIG_FIELD_TYPE } from '@rh-support/utils';
+import { getConfigField, getUrlParsedParams, PCM_CONFIG_FIELD_TYPE } from '@rh-support/utils';
 import isEqual from 'lodash/isEqual';
 import React, { Suspense, useContext, useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
-import { useParams } from 'react-router-dom';
+import { useLocation, useParams } from 'react-router-dom';
 import { CaseDetailsTabsEnum } from '../../constants/caseDetailsConstants';
 import { useCaseSelector } from '../../context/CaseContext';
 import { useCaseDetailsPageStateContext } from '../../context/CaseDetailsPageContext';
+import { useCaseDiscussionTabStateContext } from '../../context/CaseDiscussionTabContext';
 import { useCaseComments } from '../../hooks/useCaseComments';
 import { PDFContext } from './PDFContainer';
 import CaseDetailsManagement from './Tabs/CaseDetails/CaseDetailsManagement';
@@ -44,10 +45,13 @@ export function CaseDetailsTabs(props) {
             privateNotes: (_a = state.caseDetails.notes) !== null && _a !== void 0 ? _a : '',
         });
     }, isEqual);
-    const { comments, loading: commentsLoading, error: commentsError, refetch: refetchComments, } = useCaseComments({
-        caseId: caseSalesforceId,
-        skip: !caseSalesforceId,
-    });
+    const urlSearchParams = getUrlParsedParams(useLocation().search);
+    const deepLinkCommentId = ((urlSearchParams === null || urlSearchParams === void 0 ? void 0 : urlSearchParams.commentId) || (urlSearchParams === null || urlSearchParams === void 0 ? void 0 : urlSearchParams.attachmentId));
+    const { sort: discussionSort } = useCaseDiscussionTabStateContext();
+    const graphqlOrderBy = {
+        LastModifiedDate: { order: discussionSort.sortOrder === 'asc' ? 'ASC' : 'DESC' },
+    };
+    const { comments, loading: commentsLoading, error: commentsError, refetch: refetchComments, fetchMore, hasNextPage, isLoadingMore, loadMoreError, loadMoreRetryCount, retryLoadMore, } = useCaseComments(Object.assign({ caseId: caseSalesforceId, skip: !caseSalesforceId, orderBy: graphqlOrderBy }, (deepLinkCommentId ? { first: 2000 } : {})));
     const { t } = useTranslation();
     const [activeTabKey, setActiveTabKey] = useState(0);
     const { caseDetailsPageState: { caseEscalations }, } = useCaseDetailsPageStateContext();
@@ -94,7 +98,7 @@ export function CaseDetailsTabs(props) {
         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 })),
+            accountNumber: accountNumber, isDiscussionTab: selectedTab === CaseDetailsTabsEnum.DISCUSSION, refetchComments: refetchComments, fetchMore: fetchMore, hasNextPage: hasNextPage, isLoadingMore: isLoadingMore, loadMoreError: loadMoreError, loadMoreRetryCount: loadMoreRetryCount, retryLoadMore: retryLoadMore })),
     });
     tabsToRender.push({
         'data-tracking-id': 'case-details-tab',

package/lib/esm/components/CaseEditView/CaseOverview/CaseStatus.d.ts

@@ -6,6 +6,8 @@ interface IProps extends IDClassNameProps {
     isDisabled: boolean;
     isFetching: boolean;
     hasError: boolean;
+    isClosed: boolean;
+    isInternal: boolean;
 }
 declare function CaseStatus(props: IProps): React.JSX.Element;
 declare namespace CaseStatus {

package/lib/esm/components/CaseEditView/CaseOverview/CaseStatus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseStatus.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/CaseOverview/CaseStatus.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAI5D,OAAO,KAAwC,MAAM,OAAO,CAAC;AAO7D,UAAU,MAAO,SAAQ,gBAAgB;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;CACrB;AAOD,iBAAS,UAAU,CAAC,KAAK,EAAE,MAAM,qBAmEhC;kBAnEQ,UAAU;;;AAsEnB,eAAe,UAAU,CAAC"}
+{"version":3,"file":"CaseStatus.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/CaseOverview/CaseStatus.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAI5D,OAAO,KAAwC,MAAM,OAAO,CAAC;AAO7D,UAAU,MAAO,SAAQ,gBAAgB;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;CACvB;AAgBD,iBAAS,UAAU,CAAC,KAAK,EAAE,MAAM,qBAwEhC;kBAxEQ,UAAU;;;AA2EnB,eAAe,UAAU,CAAC"}

package/lib/esm/components/CaseEditView/CaseOverview/CaseStatus.js

@@ -8,9 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { SingleSelectDropdown, ValueChangedIcon } from '@rh-support/components';
-import { mapSfdcStatusToPortalStatus, PORTAL_USER_SELECTABLE_STATUSES } from '@rh-support/utils';
+import { getPortalStatusDropdownOptions, mapSfdcStatusToPortalStatus } from '@rh-support/utils';
+import i18next from 'i18next';
 import isEmpty from 'lodash/isEmpty';
-import map from 'lodash/map';
 import React, { useContext, useMemo, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { CaseValuesToWatch } from '../../shared/Constants';
@@ -20,6 +20,14 @@ const defaultProps = {
     id: '',
     className: '',
 };
+const STATUS_DESCRIPTIONS = {
+    get restricted() {
+        return i18next.t('Only Red Hat Support can set this status');
+    },
+    get closed() {
+        return i18next.t('Use In Progress to reopen this case');
+    },
+};
 function CaseStatus(props) {
     const { t } = useTranslation();
     const [isCaseStatusInValid, setIsCaseStatusInValid] = useState(false);
@@ -28,21 +36,24 @@ function CaseStatus(props) {
     };
     const { isExportingPDF } = useContext(PDFContext);
     const selectedPortalStatus = useMemo(() => mapSfdcStatusToPortalStatus(props.selectedStatus), [props.selectedStatus]);
-    // value changed logic to show a non local status change
     const [localStatusChange, setLocalStatusChange] = useState(false);
     const afterLocalChange = () => setLocalStatusChange(false);
     const onCaseStatusChange = (option) => __awaiter(this, void 0, void 0, function* () {
-        if (option.value === selectedPortalStatus) {
+        if (option.disabled || option.value === selectedPortalStatus) {
             return;
         }
         yield props.onStatusChange(option.value);
         setLocalStatusChange(true);
         validateCaseStatus(option);
     });
-    const getDropdownOptions = map(PORTAL_USER_SELECTABLE_STATUSES, (option) => ({
-        label: option,
-        value: option,
-    }));
+    const statusOptions = getPortalStatusDropdownOptions(props.isClosed, props.isInternal);
+    const getDropdownOptions = statusOptions.map((opt) => {
+        let description;
+        if (opt.disabled) {
+            description = opt.value === 'Closed' ? STATUS_DESCRIPTIONS.closed : STATUS_DESCRIPTIONS.restricted;
+        }
+        return Object.assign({ label: opt.value, value: opt.value, disabled: opt.disabled }, (description ? { description } : {}));
+    });
     const getSelectedDropdownOption = {
         label: selectedPortalStatus,
         value: selectedPortalStatus,

package/lib/esm/components/CaseEditView/CaseOverview/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/CaseOverview/index.tsx"],"names":[],"mappings":"AAmCA,OAAO,KAAkD,MAAM,OAAO,CAAC;AA4BvE,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;CACnD;AAED,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,KAAK,EAAE,MAAM,qBAwjBjD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/CaseOverview/index.tsx"],"names":[],"mappings":"AAmCA,OAAO,KAAkD,MAAM,OAAO,CAAC;AA4BvE,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;CACnD;AAED,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,KAAK,EAAE,MAAM,qBAqkBjD"}

package/lib/esm/components/CaseEditView/CaseOverview/index.js

@@ -132,7 +132,19 @@ export default function CaseOverview(props) {
         }
         catch (e) {
             setTypeUpdating(caseOverviewDispatch, false);
-            caseUpdateError.showError(e, t('Support type failed to update'));
+            caseUpdateError.showFieldError(e, t('Support type'), () => onTypeChange(type));
+        }
+    });
+    const applySeverityUpdate = (payLoad) => __awaiter(this, void 0, void 0, function* () {
+        setSeverityUpdating(caseOverviewDispatch, true);
+        try {
+            yield updateOverviewCaseDetails(payLoad);
+            setSeverityUpdating(caseOverviewDispatch, false);
+            ToastNotification.addSuccessMessage(t('Severity has been successfully updated'));
+        }
+        catch (e) {
+            setSeverityUpdating(caseOverviewDispatch, false);
+            caseUpdateError.showFieldError(e, t('Severity'), () => applySeverityUpdate(payLoad));
         }
     });
     const onSeverityChange = (payLoad) => __awaiter(this, void 0, void 0, function* () {
@@ -145,16 +157,7 @@ export default function CaseOverview(props) {
                 severity: payLoad.severity,
             }),
         });
-        setSeverityUpdating(caseOverviewDispatch, true);
-        try {
-            yield updateOverviewCaseDetails(payLoad);
-            setSeverityUpdating(caseOverviewDispatch, false);
-            ToastNotification.addSuccessMessage(t('Severity has been successfully updated'));
-        }
-        catch (e) {
-            setSeverityUpdating(caseOverviewDispatch, false);
-            caseUpdateError.showError(e, t('Severity failed to update'));
-        }
+        yield applySeverityUpdate(payLoad);
     });
     const showStatusUpdateSuccessToast = () => {
         ToastNotification.addSuccessMessage(t('Status has been successfully updated'));
@@ -179,7 +182,7 @@ export default function CaseOverview(props) {
         }
         catch (e) {
             setStatusUpdating(caseOverviewDispatch, false);
-            caseUpdateError.showError(e, t('Status failed to update, try refreshing the page. Please contact us if the problem persists.'));
+            caseUpdateError.showFieldError(e, t('Status'), () => updateStatusState(statusVal, reopenedAt, reopenedBySSOName, reopenedReason, reopenedReasonOther, onStatusUpdate, options));
             return false;
         }
     });
@@ -316,7 +319,7 @@ export default function CaseOverview(props) {
             React.createElement("div", { className: "case-overview-secondary card card-md card-light push-bottom" },
                 React.createElement("div", { className: "pf-v6-l-grid pf-m-gutter pf-m-all-4-col-on-lg" },
                     React.createElement("div", { className: "form-wrapper" },
-                        React.createElement(CaseStatus, { selectedStatus: status, onStatusChange: onStatusChange, isDisabled: !canManageCase || allCaseStatuses.isFetching || canEditCase.isCaseNotEditable, isFetching: caseOverviewState.caseStatusUpdating && isCaseUpdating, hasError: allCaseStatuses.isError })),
+                        React.createElement(CaseStatus, { selectedStatus: status, onStatusChange: onStatusChange, isDisabled: !canManageCase || allCaseStatuses.isFetching || canEditCase.isCaseNotEditable, isFetching: caseOverviewState.caseStatusUpdating && isCaseUpdating, hasError: allCaseStatuses.isError, isClosed: isCaseClosed, isInternal: loggedInUserRights.data.isInternal() })),
                     React.createElement("div", { className: "form-wrapper" },
                         React.createElement(CaseType, { selectedType: switchedCaseType, onTypeChange: onTypeChange, isDisabled: !canManageCase ||
                                 allCaseTypes.isFetching ||

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

@@ -1 +1 @@
-{"version":3,"file":"CaseSolutions.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/CaseSolutions/CaseSolutions.tsx"],"names":[],"mappings":"AA0BA,OAAO,KAAsD,MAAM,OAAO,CAAC;AAwF3E,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,sBAAsB,EAAE,OAAO,CAAC;CACnC;AAUD,eAAO,MAAM,aAAa,+EAshBxB,CAAC"}
+{"version":3,"file":"CaseSolutions.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/CaseSolutions/CaseSolutions.tsx"],"names":[],"mappings":"AA0BA,OAAO,KAAsD,MAAM,OAAO,CAAC;AAwF3E,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,sBAAsB,EAAE,OAAO,CAAC;CACnC;AAUD,eAAO,MAAM,aAAa,+EAmhBxB,CAAC"}

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

@@ -161,7 +161,7 @@ export const CaseSolutions = forwardRef((props, ref) => {
             ToastNotification.addSuccessMessage(t('Status has been successfully updated'));
         }
         catch (err) {
-            caseUpdateError.showError(err, t('Status failed to update, try refreshing the page. Please contact us if the problem persists.'));
+            caseUpdateError.showFieldError(err, t('Status'), handleCaseClose);
         }
         finally {
             setIsCaseCloseLoading(false);

package/lib/esm/components/CaseEditView/ConfirmationModals/ReopenCaseModal.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { Button, ButtonVariant, Form, FormGroup, FormHelperText, HelperText, HelperTextItem, Modal, ModalBody, ModalFooter, ModalHeader, ModalVariant, TextArea, } from '@patternfly/react-core';
 import { SingleSelectDropdown } from '@rh-support/components';
-import { formatDateTime, PORTAL_OPEN_DISPLAY_STATUSES } from '@rh-support/utils';
+import { formatDateTime, PORTAL_REOPEN_STATUSES } from '@rh-support/utils';
 import isEmpty from 'lodash/isEmpty';
 import map from 'lodash/map';
 import React, { useState } from 'react';
@@ -66,7 +66,7 @@ export function ReopenCaseModal(props) {
         label: option,
         value: option,
     }));
-    const getStatusDropdownOptions = map(PORTAL_OPEN_DISPLAY_STATUSES, (option) => ({
+    const getStatusDropdownOptions = map(PORTAL_REOPEN_STATUSES, (option) => ({
         label: option,
         value: option,
     }));

package/lib/esm/components/CaseEditView/RequestRemoteSession/NewEssTermsModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NewEssTermsModal.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/RequestRemoteSession/NewEssTermsModal.tsx"],"names":[],"mappings":"AAsBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,KAA8B,MAAM,OAAO,CAAC;AAYnD,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,OAAO,CAAC;IACd,kBAAkB,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAClD,QAAQ,EAAE,OAAO,CAAC;CACrB;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,qBAwb7C"}
+{"version":3,"file":"NewEssTermsModal.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/RequestRemoteSession/NewEssTermsModal.tsx"],"names":[],"mappings":"AAsBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAGxD,OAAO,KAA8B,MAAM,OAAO,CAAC;AAanD,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,OAAO,CAAC;IACd,kBAAkB,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAClD,QAAQ,EAAE,OAAO,CAAC;CACrB;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,qBA0b7C"}

package/lib/esm/components/CaseEditView/RequestRemoteSession/NewEssTermsModal.js

@@ -13,13 +13,14 @@ import { Alert, Button, ButtonVariant, Checkbox, Modal, ModalBody, ModalFooter,
 import DownloadIcon from '@patternfly/react-icons/dist/js/icons/download-icon';
 import ExternalLinkAltIcon from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
 import { SingleSelectDropdown, useFetch } from '@rh-support/components';
+import { resolveSalesforceUserIdByFederationId } from '@rh-support/utils';
 import isEqual from 'lodash/isEqual';
 import React, { useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useCaseDispatch, useCaseSelector } from '../../../context/CaseContext';
 import { GET_CASE_COMMENTS, useCreateCaseComment } from '../../../hooks/useCaseComments';
 import { checkForCaseStatusToggleOnAttachOrComment, updateCaseDetailsGraphQL } from '../../../reducers/CaseReducer';
-import { formatSessionLinks, getLocaleNameFromLocalCode, REMOTE_SESSION_FIELD_LENGTH_LIMIT, } from './remoteSessionUtils';
+import { buildRemoteSessionRequestCaseUpdate, formatSessionLinks, getLocaleNameFromLocalCode, REMOTE_SESSION_FIELD_LENGTH_LIMIT, } from './remoteSessionUtils';
 export function NewEssTermsModal(props) {
     const { t } = useTranslation();
     const { remoteSessionTermsAcked } = useCaseSelector((state) => ({
@@ -127,10 +128,11 @@ export function NewEssTermsModal(props) {
             ? `<p><strong>Remote session link</strong></p><p>${formatSessionLinks(sessionLink)}</p>`
             : ''}<p>This action does not initiate a remote session. A Red Hat Associate will get back to you soon.</p>`);
         try {
-            yield updateCaseDetailsGraphQL(caseDispatch, apolloClient, props.caseNumber, {
-                remoteSessionTermsAcked: true,
-                waitingOnCallback: true,
-            }, false, { existingCaseDetails });
+            const ackedByUserId = yield resolveSalesforceUserIdByFederationId(apolloClient, props.loggedInUser);
+            if (!ackedByUserId) {
+                throw new Error('Salesforce user id is required to request a remote session');
+            }
+            yield updateCaseDetailsGraphQL(caseDispatch, apolloClient, props.caseNumber, buildRemoteSessionRequestCaseUpdate(ackedByUserId), false, { existingCaseDetails });
             try {
                 yield createComment({
                     caseId: caseSalesforceId,

package/lib/esm/components/CaseEditView/RequestRemoteSession/RemoteSessionAgreementModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RemoteSessionAgreementModal.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/RequestRemoteSession/RemoteSessionAgreementModal.tsx"],"names":[],"mappings":"AAsBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,KAA8B,MAAM,OAAO,CAAC;AAgBnD,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,OAAO,CAAC;IACd,kBAAkB,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAClD,QAAQ,EAAE,OAAO,CAAC;CACrB;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,qBAibxD"}
+{"version":3,"file":"RemoteSessionAgreementModal.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/RequestRemoteSession/RemoteSessionAgreementModal.tsx"],"names":[],"mappings":"AAsBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAGxD,OAAO,KAA8B,MAAM,OAAO,CAAC;AAiBnD,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,OAAO,CAAC;IACd,kBAAkB,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAClD,QAAQ,EAAE,OAAO,CAAC;CACrB;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,qBAmbxD"}

package/lib/esm/components/CaseEditView/RequestRemoteSession/RemoteSessionAgreementModal.js

@@ -13,13 +13,14 @@ import { Alert, Button, ButtonVariant, Checkbox, Modal, ModalBody, ModalFooter,
 import DownloadIcon from '@patternfly/react-icons/dist/js/icons/download-icon';
 import ExternalLinkAltIcon from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
 import { SingleSelectDropdown, useFetch } from '@rh-support/components';
+import { resolveSalesforceUserIdByFederationId } from '@rh-support/utils';
 import isEqual from 'lodash/isEqual';
 import React, { useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useCaseDispatch, useCaseSelector } from '../../../context/CaseContext';
 import { GET_CASE_COMMENTS, useCreateCaseComment } from '../../../hooks/useCaseComments';
 import { checkForCaseStatusToggleOnAttachOrComment, setRemoteRiderFlag, updateCaseDetailsGraphQL, } from '../../../reducers/CaseReducer';
-import { formatSessionLinks, getLocaleNameFromLocalCode, REMOTE_SESSION_FIELD_LENGTH_LIMIT, } from './remoteSessionUtils';
+import { buildRemoteSessionRequestCaseUpdate, formatSessionLinks, getLocaleNameFromLocalCode, REMOTE_SESSION_FIELD_LENGTH_LIMIT, } from './remoteSessionUtils';
 export function RemoteSessionAgreementModal(props) {
     const { t } = useTranslation();
     const { remoteSessionTermsAcked } = useCaseSelector((state) => ({
@@ -118,10 +119,11 @@ export function RemoteSessionAgreementModal(props) {
             ? `<p><strong>Remote session link</strong></p><p>${formatSessionLinks(sessionLink)}</p>`
             : ''}<p>This action does not initiate a remote session. A Red Hat Associate will get back to you soon.</p>`);
         try {
-            yield updateCaseDetailsGraphQL(caseDispatch, apolloClient, props.caseNumber, {
-                remoteSessionTermsAcked: true,
-                waitingOnCallback: true,
-            }, false, { existingCaseDetails });
+            const ackedByUserId = yield resolveSalesforceUserIdByFederationId(apolloClient, props.loggedInUser);
+            if (!ackedByUserId) {
+                throw new Error('Salesforce user id is required to request a remote session');
+            }
+            yield updateCaseDetailsGraphQL(caseDispatch, apolloClient, props.caseNumber, buildRemoteSessionRequestCaseUpdate(ackedByUserId), false, { existingCaseDetails });
             setRemoteRiderFlag(caseDispatch, true);
             try {
                 yield createComment({

package/lib/esm/components/CaseEditView/RequestRemoteSession/remoteSessionUtils.d.ts

@@ -1,4 +1,10 @@
 export declare const REMOTE_SESSION_FIELD_LENGTH_LIMIT = 2000;
+export declare function buildRemoteSessionRequestCaseUpdate(ackedByUserId: string): {
+    remoteSessionTermsAcked: boolean;
+    waitingOnCallback: boolean;
+    remoteSessionTermsAckedBy: string;
+    remoteSessionTermsAckedDate: string;
+};
 export declare const getLocaleNameFromLocalCode: (localeCode: string) => string;
 export declare const formatSessionLinks: (sessionLink: string) => string;
 //# sourceMappingURL=remoteSessionUtils.d.ts.map

package/lib/esm/components/CaseEditView/RequestRemoteSession/remoteSessionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remoteSessionUtils.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/RequestRemoteSession/remoteSessionUtils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iCAAiC,OAAO,CAAC;AAEtD,eAAO,MAAM,0BAA0B,GAAI,YAAY,MAAM,KAAG,MAa/D,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,aAAa,MAAM,KAAG,MAOxD,CAAC"}
+{"version":3,"file":"remoteSessionUtils.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/RequestRemoteSession/remoteSessionUtils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iCAAiC,OAAO,CAAC;AAEtD,wBAAgB,mCAAmC,CAAC,aAAa,EAAE,MAAM;;;;;EAOxE;AAED,eAAO,MAAM,0BAA0B,GAAI,YAAY,MAAM,KAAG,MAa/D,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,aAAa,MAAM,KAAG,MAOxD,CAAC"}

package/lib/esm/components/CaseEditView/RequestRemoteSession/remoteSessionUtils.js

@@ -1,4 +1,12 @@
 export const REMOTE_SESSION_FIELD_LENGTH_LIMIT = 2000;
+export function buildRemoteSessionRequestCaseUpdate(ackedByUserId) {
+    return {
+        remoteSessionTermsAcked: true,
+        waitingOnCallback: true,
+        remoteSessionTermsAckedBy: ackedByUserId,
+        remoteSessionTermsAckedDate: new Date().toISOString(),
+    };
+}
 export const getLocaleNameFromLocalCode = (localeCode) => {
     if ('Intl' in window && 'DisplayNames' in Intl) {
         try {

package/lib/esm/components/CaseEditView/Tabs/CaseActionPlan/CaseActionPlan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseActionPlan.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseActionPlan/CaseActionPlan.tsx"],"names":[],"mappings":"AAYA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAQ/D,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;CACtB;AAMD,iBAAS,cAAc,CAAC,KAAK,EAAE,MAAM,qBA4HpC;kBA5HQ,cAAc;;;AA+HvB,eAAe,cAAc,CAAC"}
+{"version":3,"file":"CaseActionPlan.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseActionPlan/CaseActionPlan.tsx"],"names":[],"mappings":"AAYA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAQ/D,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;CACtB;AAMD,iBAAS,cAAc,CAAC,KAAK,EAAE,MAAM,qBAgIpC;kBAhIQ,cAAc;;;AAmIvB,eAAe,cAAc,CAAC"}

package/lib/esm/components/CaseEditView/Tabs/CaseActionPlan/CaseActionPlan.js

@@ -39,8 +39,7 @@ function CaseActionPlan(props) {
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [actionPlan]);
-    const updateCase = (event) => __awaiter(this, void 0, void 0, function* () {
-        event.preventDefault();
+    const persistActionPlan = () => __awaiter(this, void 0, void 0, function* () {
         setIsUpdating(true);
         try {
             const caseDetails = { actionPlan: actionPlanState };
@@ -50,10 +49,14 @@ function CaseActionPlan(props) {
             setIsUpdating(false);
         }
         catch (e) {
-            caseUpdateError.showError(e, t('Action plan failed to update'));
+            caseUpdateError.showFieldError(e, t('Action plan'), persistActionPlan);
             setIsUpdating(false);
         }
     });
+    const updateCase = (event) => __awaiter(this, void 0, void 0, function* () {
+        event.preventDefault();
+        yield persistActionPlan();
+    });
     const discardActionPlan = (event) => {
         event.preventDefault();
         setActionPlan(actionPlan);

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/CaseContactPhoneNumber.js

@@ -128,7 +128,7 @@ export function CaseContactPhoneNumber() {
         catch (e) {
             setCaseState(caseDispatch, { isCasePhoneUpdating: false });
             setIsEditting(false);
-            caseUpdateError.showError(e, t(`Phone number failed to update`));
+            caseUpdateError.showFieldError(e, t('Phone number'), onSave);
         }
     });
     const onClear = () => __awaiter(this, void 0, void 0, function* () {

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/CaseHostname.js

@@ -64,7 +64,7 @@ function CaseHostname(props) {
         }
         catch (e) {
             setIsHostnameUpdating(false);
-            caseUpdateError.showError(e, t('Hostname failed to updated'));
+            caseUpdateError.showFieldError(e, t('Hostname'), () => onHostnameUpdate(caseDetails));
             throw e;
         }
     });

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/CaseInternalStatus.js

@@ -53,7 +53,7 @@ export default function CaseInternalStatus() {
         }
         catch (e) {
             setIsIStatusUpdating(false);
-            caseUpdateError.showError(e, t('Case Internal Status failed to update'));
+            caseUpdateError.showFieldError(e, t('Internal status'), () => onCaseInternalStatusChange(event, selection));
         }
     });
     useEffect(() => {

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/CaseOpenshiftClusterId/CaseOpenshiftClusterId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseOpenshiftClusterId.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/CaseEditView/Tabs/CaseDetails/CaseOpenshiftClusterId/CaseOpenshiftClusterId.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAqBxE,wBAAgB,sBAAsB,sBAiZrC"}
+{"version":3,"file":"CaseOpenshiftClusterId.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/CaseEditView/Tabs/CaseDetails/CaseOpenshiftClusterId/CaseOpenshiftClusterId.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAqBxE,wBAAgB,sBAAsB,sBAmZrC"}

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/CaseOpenshiftClusterId/CaseOpenshiftClusterId.js

@@ -210,7 +210,7 @@ export function CaseOpenshiftClusterId() {
             setLocalOpenshiftClusterIDState(previousLocalOpenshiftClusterIDState);
             if (showToast) {
                 setIsClusterIdUpdating(false);
-                caseUpdateError.showError(e, t(`OpenShift Cluster ID failed to updated`));
+                caseUpdateError.showFieldError(e, t('OpenShift Cluster ID'), () => clusterIdUpdate(caseDetails, showToast));
             }
         }
     });

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/CasePhoneNumberConfirmAlert.js

@@ -44,7 +44,7 @@ export function CaseContactPhoneNumberAlert(props) {
         }
         catch (e) {
             setCasUpdating(false);
-            caseUpdateError.showError(e, t(`Phone number failed to be confirmed`));
+            caseUpdateError.showFieldError(e, t('Phone number'), () => onCaseDetailsChange(caseDetails));
         }
     });
     const goToPhoneField = () => {

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/CaseReferenceNumber.js

@@ -70,7 +70,7 @@ export default function CaseReferenceNumber(props) {
             setIsUpdating(false);
         }
         catch (e) {
-            caseUpdateError.showError(e, t('Personal reference number failed to update'));
+            caseUpdateError.showFieldError(e, t('Personal reference number'), updateReferenceNumber);
             setIsUpdating(false);
             throw e;
         }

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/CaseSbrGroups.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseSbrGroups.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDetails/CaseSbrGroups.tsx"],"names":[],"mappings":"AAYA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAO/D,MAAM,CAAC,OAAO,UAAU,aAAa,sBAoEpC"}
+{"version":3,"file":"CaseSbrGroups.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDetails/CaseSbrGroups.tsx"],"names":[],"mappings":"AAYA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAQ/D,MAAM,CAAC,OAAO,UAAU,aAAa,sBAqEpC"}

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/CaseSbrGroups.js

@@ -18,9 +18,11 @@ import React, { useContext, useEffect, useState } from 'react';
 import { Typeahead } from 'react-bootstrap-typeahead';
 import { Trans, useTranslation } from 'react-i18next';
 import { useCaseDispatch, useCaseSelector } from '../../../../context/CaseContext';
+import { useCaseUpdateErrorMessage } from '../../../../hooks/useCaseUpdateErrorMessage';
 import { setCaseDetails } from '../../../../reducers/CaseReducer';
 export default function CaseSbrGroups() {
     const { t } = useTranslation();
+    const caseUpdateError = useCaseUpdateErrorMessage();
     const { caseDetails } = useCaseSelector((state) => ({
         caseDetails: {
             sbrGroups: state.caseDetails.sbrGroups,
@@ -60,7 +62,7 @@ export default function CaseSbrGroups() {
         }
         catch (e) {
             setIsSbrGroupsUpdating(false);
-            ToastNotification.addDangerMessage(t(`Case SBR group failed to update`));
+            caseUpdateError.showFieldError(e, t('SBR Groups'), () => onCaseSbrGroupsChange(selection));
         }
     });
     return (React.createElement("div", { className: "form-group" },

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/ProductVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProductVersion.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDetails/ProductVersion.tsx"],"names":[],"mappings":"AA2CA,OAAO,KAA2D,MAAM,OAAO,CAAC;AAehF,UAAU,MAAM;IACZ,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACvC;AAED,iBAAS,eAAe,CAAC,KAAK,EAAE,MAAM,qBAsbrC;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"ProductVersion.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDetails/ProductVersion.tsx"],"names":[],"mappings":"AA2CA,OAAO,KAA2D,MAAM,OAAO,CAAC;AAehF,UAAU,MAAM;IACZ,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACvC;AAED,iBAAS,eAAe,CAAC,KAAK,EAAE,MAAM,qBAobrC;AAED,eAAe,eAAe,CAAC"}

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/ProductVersion.js

@@ -173,12 +173,7 @@ function ProductNVersion(props) {
             setInputValue(product);
             setIsProductUpdating(false);
             setIsVersionUpdating(false);
-            if (onlyVersionChanged) {
-                caseUpdateError.showError(e, t('Version failed to update'));
-            }
-            else {
-                caseUpdateError.showError(e, t('Your product failed to update'));
-            }
+            caseUpdateError.showFieldError(e, onlyVersionChanged ? t('Version') : t('Product'), () => updateProductVerstion(selectedProduct, selectedVersion));
         }
     });
     // To check if version in invalid

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/Summary.js

@@ -68,7 +68,7 @@ function Summary(props) {
         }
         catch (e) {
             setIsSummaryUpdating(false);
-            caseUpdateError.showError(e, t(`Title failed to updated`));
+            caseUpdateError.showFieldError(e, t('Title'), () => onSummaryUpdate(caseDetails));
             throw e;
         }
     });

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/useCustomEmails.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCustomEmails.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDetails/useCustomEmails.tsx"],"names":[],"mappings":"AAQA,OAAO,EAAwB,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAYvE,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM;+BAyED,MAAM;+BAnCN,MAAM,UAAU,MAAM,IAAI;;;;;8CAbX,MAAM;EAiGhE"}
+{"version":3,"file":"useCustomEmails.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDetails/useCustomEmails.tsx"],"names":[],"mappings":"AAQA,OAAO,EAAwB,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAavE,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM;+BA4ED,MAAM;+BArCN,MAAM,UAAU,MAAM,IAAI;;;;;8CAbX,MAAM;EAmGhE"}

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/useCustomEmails.js

@@ -18,11 +18,13 @@ import isEqual from 'lodash/isEqual';
 import React, { useContext, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCaseDispatch, useCaseSelector } from '../../../../context/CaseContext';
+import { useCaseUpdateErrorMessage } from '../../../../hooks/useCaseUpdateErrorMessage';
 import { getCustomNotificationEmails, updateEmailListState } from '../../../../reducers/CaseReducer';
 import { AddCustomEmailToAccount } from '../../../CaseManagement/SendNotifications/AddCustomEmailToAccountModal';
 import { PDFContext } from '../../PDFContainer';
 export function useCustomEmails(props) {
     const { t } = useTranslation();
+    const caseUpdateError = useCaseUpdateErrorMessage();
     const { caseNumber } = props;
     const { globalMetadataState: { managedAccounts, accountCustomEmails }, } = useContext(GlobalMetadataStateContext);
     const canManageAccountCustomEmails = ability.can(resourceActions.PATCH, resources.CASE_DETAILS, CaseDetailsFields.CASE_DETAILS_ACCOUNT_CUSTOM_EMAILS);
@@ -72,7 +74,7 @@ export function useCustomEmails(props) {
             updateEmailListState(caseDispatch, lowerCaseEmailVal, customEmailsList, updateEmailInstruction);
         }
         catch (e) {
-            ToastNotification.addDangerMessage(t(`There was an error adding new notification email`));
+            caseUpdateError.showFieldError(e, t('Notification email'), () => addCustomEmail(emailVal, onAdd, skipAccountCheck));
         }
     });
     const deleteCustomEmail = (email) => __awaiter(this, void 0, void 0, function* () {
@@ -87,7 +89,7 @@ export function useCustomEmails(props) {
             updateEmailListState(caseDispatch, email, customEmailsList, updateEmailInstruction);
         }
         catch (e) {
-            ToastNotification.addDangerMessage(t(`There was an error removing notification email`));
+            caseUpdateError.showFieldError(e, t('Notification email'), () => deleteCustomEmail(email));
         }
     });
     useEffect(() => {

package/lib/esm/components/CaseEditView/Tabs/CaseDiscussion/CaseAttachment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseAttachment.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDiscussion/CaseAttachment.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AAoBxE,OAAO,KAAuC,MAAM,OAAO,CAAC;AAS5D,UAAU,MAAM;IACZ,UAAU,EAAE,WAAW,CAAC;IACxB,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,WAAW,KAAK,IAAI,CAAC;IACzE,eAAe,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,kBAAkB,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAChH;AAED,QAAA,MAAM,cAAc,4EA6QlB,CAAC;AAEH,eAAe,cAAc,CAAC"}
+{"version":3,"file":"CaseAttachment.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDiscussion/CaseAttachment.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AAoBxE,OAAO,KAAuC,MAAM,OAAO,CAAC;AAU5D,UAAU,MAAM;IACZ,UAAU,EAAE,WAAW,CAAC;IACxB,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,WAAW,KAAK,IAAI,CAAC;IACzE,eAAe,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,kBAAkB,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAChH;AAED,QAAA,MAAM,cAAc,4EA8QlB,CAAC;AAEH,eAAe,cAAc,CAAC"}