@rh-support/troubleshoot 2.7.1 → 2.7.10

package/lib/esm/components/CaseManagement/SendNotifications/AddCustomEmailToAccountModal.js

@@ -8,11 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { customEmail } from '@cee-eng/hydrajs';
-import { Button, Form, FormGroup, FormHelperText, HelperText, HelperTextItem, Modal, ModalVariant, TextInput, ValidatedOptions, } from '@patternfly/react-core';
+import { Button, ButtonVariant, Form, FormGroup, FormHelperText, HelperText, HelperTextItem, Modal, ModalBody, ModalFooter, ModalHeader, ModalVariant, TextInput, ValidatedOptions, } from '@patternfly/react-core';
 import { ToastNotification, useFetch } from '@rh-support/components';
 import isEmpty from 'lodash/isEmpty';
 import React, { useState } from 'react';
-import { Trans, useTranslation } from 'react-i18next';
+import { useTranslation } from 'react-i18next';
 export function AddCustomEmailToAccount(props) {
     const { t } = useTranslation();
     const { request, isFetching } = useFetch(customEmail.addCustomEmailToAccount, { propgateErrors: true });
@@ -45,23 +45,21 @@ export function AddCustomEmailToAccount(props) {
         : isEmpty(firstName.trim())
             ? ValidatedOptions.error
             : ValidatedOptions.default;
-    return (React.createElement(Modal, { variant: ModalVariant.medium, title: t('Add a notification email to your account'), isOpen: true, onClose: handleClose, onEscapePress: handleClose, actions: [
-            React.createElement(Button, { spinnerAriaValueText: isFetching ? t('Adding') : undefined, isLoading: isFetching, key: "confirm", variant: "primary", onClick: onAdd, isDisabled: isFetching || (isSaveButtonClicked && isEmpty(firstName.trim())) },
-                React.createElement(Trans, null, "Add to account")),
-            React.createElement(Button, { key: "cancel", variant: "link", onClick: handleClose, isDisabled: isFetching },
-                React.createElement(Trans, null, "Cancel")),
-        ] },
-        React.createElement("p", { className: "pf-v5-u-mb-lg" },
-            React.createElement(Trans, null, "Note: This email will be added at an account level, not a case level.")),
-        React.createElement(Form, null,
-            React.createElement(FormGroup, { label: t('New email address'), fieldId: "custom-email-address", isRequired: true },
-                React.createElement(TextInput, { id: "custom-email", isDisabled: true, value: props.customEmailAddress, isRequired: true })),
-            React.createElement(FormGroup, { label: t('First name'), fieldId: "custom-email-firstName", isRequired: true },
-                firstNameValidated === 'error' && (React.createElement(FormHelperText, null,
-                    React.createElement(HelperText, null,
-                        React.createElement(HelperTextItem, { variant: "error" },
-                            React.createElement(Trans, null, "First name cannot be empty"))))),
-                React.createElement(TextInput, { id: "custom-email-firstName", value: firstName, isRequired: true, type: "text", validated: firstNameValidated, onChange: (_event, firstName) => onFirstNameChange(firstName), "aria-label": t('First name'), placeholder: t('First name'), maxLength: 254 })),
-            React.createElement(FormGroup, { label: t('Last name'), fieldId: "custom-email-lastName", className: "pf-v5-u-mb-md" },
-                React.createElement(TextInput, { id: "custom-email-lastName", value: lastName, type: "text", onChange: (_event, lastName) => onLastNameChange(lastName), "aria-label": t('Last name'), placeholder: t('Last name'), maxLength: 254 })))));
+    return (React.createElement(Modal, { isOpen: true, onClose: handleClose, variant: ModalVariant.medium, "aria-labelledby": "add-email-modal-title", "aria-describedby": "add-email-modal-body" },
+        React.createElement(ModalHeader, { title: t('Add a notification email to your account'), labelId: "add-email-modal-title" }),
+        React.createElement(ModalBody, { id: "add-email-modal-body" },
+            React.createElement("p", { className: "pf-v6-u-mb-md" }, t('Note: This email will be added at an account level, not a case level.')),
+            React.createElement(Form, null,
+                React.createElement(FormGroup, { label: t('New email address'), fieldId: "custom-email-address", isRequired: true },
+                    React.createElement(TextInput, { id: "custom-email", isDisabled: true, value: props.customEmailAddress, isRequired: true, "aria-label": t('New email address') })),
+                React.createElement(FormGroup, { label: t('First name'), fieldId: "custom-email-firstName", isRequired: true },
+                    React.createElement(TextInput, { id: "custom-email-firstName", value: firstName, isRequired: true, type: "text", validated: firstNameValidated, onChange: (_event, firstName) => onFirstNameChange(firstName), "aria-label": t('First name'), placeholder: t('First name'), maxLength: 254 }),
+                    firstNameValidated === ValidatedOptions.error && (React.createElement(FormHelperText, null,
+                        React.createElement(HelperText, null,
+                            React.createElement(HelperTextItem, { variant: ValidatedOptions.error }, t('First name cannot be empty')))))),
+                React.createElement(FormGroup, { label: t('Last name'), fieldId: "custom-email-lastName" },
+                    React.createElement(TextInput, { id: "custom-email-lastName", value: lastName, type: "text", onChange: (_event, lastName) => onLastNameChange(lastName), "aria-label": t('Last name'), placeholder: t('Last name'), maxLength: 254 })))),
+        React.createElement(ModalFooter, null,
+            React.createElement(Button, { key: "confirm", variant: ButtonVariant.primary, onClick: onAdd, isDisabled: isFetching || (isSaveButtonClicked && isEmpty(firstName.trim())), spinnerAriaValueText: isFetching ? t('Loading') : undefined, isLoading: isFetching }, t('Add to account')),
+            React.createElement(Button, { key: "cancel", variant: ButtonVariant.link, onClick: handleClose, isDisabled: isFetching }, t('Cancel')))));
 }

package/lib/esm/components/CaseManagement/SendNotifications/CaseContactSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseContactSelector.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseManagement/SendNotifications/CaseContactSelector.tsx"],"names":[],"mappings":"AA2BA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAgBvE,MAAM,WAAW,MAAM;CAAG;AAG1B,iBAAS,mBAAmB,CAAC,KAAK,EAAE,MAAM,qBA4czC;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"CaseContactSelector.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseManagement/SendNotifications/CaseContactSelector.tsx"],"names":[],"mappings":"AA2BA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAiBvE,MAAM,WAAW,MAAM;CAAG;AAG1B,iBAAS,mBAAmB,CAAC,KAAK,EAAE,MAAM,qBAudzC;AAED,eAAe,mBAAmB,CAAC"}

package/lib/esm/components/CaseManagement/SendNotifications/CaseContactSelector.js

@@ -28,6 +28,7 @@ import React, { useContext, useEffect, useRef, useState } from 'react';
 import { Token } from 'react-bootstrap-typeahead';
 import { Trans, useTranslation } from 'react-i18next';
 import { useCaseDispatch, useCaseSelector } from '../../../context/CaseContext';
+import { useCaseUpdateErrorMessage } from '../../../hooks/useCaseUpdateErrorMessage';
 import { addingNotifiedUsers, deleteNotifiedUsers, setNotifiedUser, setSelectedCaseGroupUsers, } from '../../../reducers/CaseReducer';
 import { PDFContext } from '../../CaseEditView/PDFContainer';
 import { useCustomEmails } from '../../CaseEditView/Tabs/CaseDetails/useCustomEmails';
@@ -38,6 +39,7 @@ function CaseContactSelector(props) {
     const canSeeEmailNotifications = ability.can(resourceActions.PATCH, resources.CASE_DETAILS, CaseDetailsFields.CASE_DETAILS_SEND_NOTIFICATIONS);
     const [isAssociatesUpdating, setIsAssociatesUpdating] = useState(false);
     const { t } = useTranslation();
+    const caseUpdateError = useCaseUpdateErrorMessage();
     const { accountNumber, caseNumber, contactSsoUsername, selectedNotificationContacts, selectedOwner, customEmailsList, product, selectedCaseGroupUsers, ownersCaseGroups, groupNumber, createdById, version, isCaseOwnerUpdating, } = useCaseSelector((state) => ({
         accountNumber: state.caseDetails.accountNumberRef,
         caseNumber: state.caseDetails.caseNumber,
@@ -78,7 +80,7 @@ function CaseContactSelector(props) {
         }
         catch (e) {
             setIsAssociatesUpdating(false);
-            ToastNotification.addDangerMessage(t(`Contact failed to update`));
+            caseUpdateError.showFieldError(e, t('Contact'), () => onCaseContactAdded(addedUsers));
         }
     });
     const onCaseContactRemoved = (removedUsers) => __awaiter(this, void 0, void 0, function* () {
@@ -91,7 +93,7 @@ function CaseContactSelector(props) {
         }
         catch (e) {
             setIsAssociatesUpdating(false);
-            ToastNotification.addDangerMessage(t(`Contact failed to update`));
+            caseUpdateError.showFieldError(e, t('Contact'), () => onCaseContactRemoved(removedUsers));
         }
     });
     const addCaseContact = (toAdd) => __awaiter(this, void 0, void 0, function* () {
@@ -198,7 +200,7 @@ function CaseContactSelector(props) {
             ...customEmailsList.data,
             ...filter(selectedNotificationContacts, (c) => !c.isInternal),
         ];
-        if (xor(alreadySelected, selectedContacts).length === 0)
+        if (alreadySelected.length !== 1 && xor(alreadySelected, selectedContacts).length === 0)
             return;
         if (canEditCase.alert())
             return;
@@ -248,7 +250,9 @@ function CaseContactSelector(props) {
         return false;
     };
     const clearNonOrgTypeahead = () => {
-        nonOrgTypeaheadRef.current && nonOrgTypeaheadRef.current.clear();
+        if (nonOrgTypeaheadRef.current) {
+            nonOrgTypeaheadRef.current.value = '';
+        }
     };
     const clearErrorState = () => {
         showGroupPermissionError && setShowGroupPermissionError(false);
@@ -259,7 +263,7 @@ function CaseContactSelector(props) {
     const getCreateNewText = (query) => `Add to your account: ${query}`;
     if (!canSeeEmailNotifications)
         return React.createElement(React.Fragment, null);
-    return (React.createElement("div", { className: "form-group pf-v5-u-mb-md" },
+    return (React.createElement("div", { className: "form-group pf-v6-u-mb-md" },
         React.createElement("label", { className: "react-typeahead-label-wrapper", htmlFor: "get-support-notifications" },
             React.createElement(Trans, null, "Send notifications"),
             loggedInUserRights.data.isOrgAdmin() ? (React.createElement(React.Fragment, null,
@@ -267,7 +271,7 @@ function CaseContactSelector(props) {
                     React.createElement(CaseContactsSelectorExternal, { isDisabled: isUpdatingCustomEmails || isAssociatesUpdating, groupContactsAndEmails: true, allowCustomEmailAdd: true, contactSsoUsername: contactSsoUsername !== null && contactSsoUsername !== void 0 ? contactSsoUsername : '', loggedInUserRights: loggedInUserRights.data, selectedAccountNumber: accountNumber, selected: [
                             ...customEmailsList.data,
                             ...filter(selectedNotificationContacts, (c) => !c.isInternal),
-                        ], contactsToExclude: !isEmpty(selectedOwner.data) ? [selectedOwner.data] : [], onChange: onNotifiedUserChange, clearButton: true, multiple: true, placeholder: t(`Search for an email address or username of the person you want to notify`), id: "open-case-notifications", name: "open-case-notifications", className: "react-select-custom", renderToken: renderToken, isUpdating: isAssociatesUpdating ||
+                        ], contactsToExclude: !isEmpty(selectedOwner.data) ? [selectedOwner.data] : [], onChange: onNotifiedUserChange, clearButton: true, multiple: true, placeholder: t('Search for an email address or username of the person you want to notify'), id: "open-case-notifications", name: "open-case-notifications", className: "react-select-custom", renderToken: renderToken, isUpdating: isAssociatesUpdating ||
                             customEmailsList.isFetching ||
                             isUpdatingCustomEmails ||
                             isCaseOwnerUpdating, isExportingPDF: isExportingPDF, customEmails: accountCustomEmails.data || [], canAddNew: onAddNew, getCreateNewText: getCreateNewText })),
@@ -284,12 +288,13 @@ function CaseContactSelector(props) {
                     " is not listed under your account. You can always",
                     ' ',
                     React.createElement(Button, { variant: "link", isInline: true, component: "span", onClick: onAddEmailToAccountBtnClick }, "add them at the account level"))))),
-                caseNumber && showAddWatchButton() && !isExportingPDF && (React.createElement(Button, { variant: "secondary", onClick: addCurrentUser, type: "button", "data-tracking-id": "case-add-me-watcher" },
+                caseNumber && showAddWatchButton() && !isExportingPDF && (React.createElement(Button, { className: "add-watcher-button", variant: "secondary", onClick: addCurrentUser, type: "button", "data-tracking-id": "case-add-me-watcher", isDisabled: isUpdatingCustomEmails || isAssociatesUpdating },
                     React.createElement(Trans, null, "Add me as a watcher"))),
-                caseNumber && showRemoveWatchButton() && !isExportingPDF && (React.createElement("div", { ref: toolTipRef, className: "remove-me-as-watcher pf-v5-u-display-inline-block" }, isCurrentUserCaseContact ? (React.createElement(React.Fragment, null,
+                caseNumber && showRemoveWatchButton() && !isExportingPDF && (React.createElement("div", { className: "remove-me-as-watcher pf-v6-u-display-inline-block" }, isCurrentUserCaseContact ? (React.createElement(React.Fragment, null,
                     React.createElement(Tooltip, { trigger: 'mouseenter focus', triggerRef: toolTipRef, position: TooltipPosition.top, content: React.createElement(Trans, null, "You are case contact and therefore you cannot be removed as watcher") }),
-                    React.createElement(Button, { variant: "tertiary", onClick: removeCurrentUser, type: "button", isDisabled: true, "data-tracking-id": "case-remove-me-watcher" },
-                        React.createElement(Trans, null, "Remove me as a watcher")))) : (React.createElement(Button, { variant: "secondary", onClick: removeCurrentUser, type: "button", "data-tracking-id": "case-remove-me-watcher" },
+                    React.createElement("div", { className: "pf-v6-u-display-inline-block", ref: toolTipRef },
+                        React.createElement(Button, { className: "remove-watcher-button", variant: "tertiary", onClick: removeCurrentUser, type: "button", isDisabled: true, "data-tracking-id": "case-remove-me-watcher" },
+                            React.createElement(Trans, null, "Remove me as a watcher"))))) : (React.createElement(Button, { className: "remove-watcher-button", variant: "secondary", onClick: removeCurrentUser, isDisabled: isUpdatingCustomEmails || isAssociatesUpdating, type: "button", "data-tracking-id": "case-remove-me-watcher" },
                     React.createElement(Trans, null, "Remove me as a watcher"))))))) : (React.createElement(NonOrgCaseNotifyeesSelector, { id: "open-case-notifications", placeholder: t('Enter an email address or username for the person you want to notify'), isDisabled: isAssociatesUpdating || customEmailsList.isFetching || isUpdatingCustomEmails, selectedItems: [
                     ...customEmailsList.data,
                     ...filter(selectedNotificationContacts, (c) => !c.isInternal),

package/lib/esm/components/CaseManagement/SendNotifications/NonOrgCaseNotifyeesSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NonOrgCaseNotifyeesSelector.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseManagement/SendNotifications/NonOrgCaseNotifyeesSelector.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAwB,oBAAoB,EAAY,MAAM,wBAAwB,CAAC;AAE9F,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAA+B,MAAM,OAAO,CAAC;AAIpD,UAAU,MAAO,SAAQ,gBAAgB;IACrC,aAAa,EAAE,oBAAoB,EAAE,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,CAAC,aAAa,EAAE,oBAAoB,EAAE,KAAK,IAAI,CAAC;IAC1D,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC1C,kBAAkB,EAAE,MAAM,CAAC;CAC9B;AAeD,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,qBA4JxD"}
+{"version":3,"file":"NonOrgCaseNotifyeesSelector.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseManagement/SendNotifications/NonOrgCaseNotifyeesSelector.tsx"],"names":[],"mappings":"AAiBA,OAAO,EAAwB,oBAAoB,EAAY,MAAM,wBAAwB,CAAC;AAE9F,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,OAAO,KAAkD,MAAM,OAAO,CAAC;AAEvE,UAAU,MAAO,SAAQ,gBAAgB;IACrC,aAAa,EAAE,oBAAoB,EAAE,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,CAAC,aAAa,EAAE,oBAAoB,EAAE,KAAK,IAAI,CAAC;IAC1D,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC1C,kBAAkB,EAAE,MAAM,CAAC;CAC9B;AA+BD,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,qBA2NxD"}

package/lib/esm/components/CaseManagement/SendNotifications/NonOrgCaseNotifyeesSelector.js

@@ -19,11 +19,11 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { accounts } from '@cee-eng/hydrajs';
-import { Button, Flex, FlexItem } from '@patternfly/react-core';
+import { Button, Flex, FlexItem, Label, LabelGroup, Menu, MenuContent, MenuItem, MenuList, Popper, TextInputGroup, TextInputGroupMain, } from '@patternfly/react-core';
 import { getHydraContactLabel, useFetch } from '@rh-support/components';
 import { GlobalMetadataStateContext } from '@rh-support/react-context';
-import React, { useContext, useState } from 'react';
-import { Highlighter, Token, Typeahead } from 'react-bootstrap-typeahead';
+import { haltEvent } from '@rh-support/utils';
+import React, { useContext, useEffect, useRef, useState } from 'react';
 import { Trans } from 'react-i18next';
 const isCustomEmailAddress = (user) => {
     return !!(user === null || user === void 0 ? void 0 : user.emailAddress);
@@ -35,55 +35,86 @@ const getKey = (option) => {
     if (isCustomEmailAddress(option))
         return option.emailAddress;
     if (isContact(option))
-        return option.ssoUsername;
+        return option.ssoUsername || '';
+    return '';
+};
+const CustomHighlighter = ({ search, children }) => {
+    if (!search)
+        return React.createElement(React.Fragment, null, children);
+    const regex = new RegExp(`(${search})`, 'gi');
+    const parts = children.split(regex);
+    return (React.createElement(React.Fragment, null, parts.map((part, index) => regex.test(part) ? (React.createElement("mark", { key: index, style: { backgroundColor: '#FFF3CD' } }, part)) : (part))));
 };
 export function NonOrgCaseNotifyeesSelector(props) {
     const [inputVal, setInputVal] = useState('');
+    const [isDropdownOpen, setIsDropdownOpen] = useState(false);
+    const inputRef = useRef(null);
+    const menuRef = useRef(null);
     const { request, isFetching } = useFetch(accounts.searchAccountForContactAndNotificationAddress);
     const [notifyeesList, setNotifyeesList] = useState([]);
     const { globalMetadataState: { loggedInUsersAccount }, } = useContext(GlobalMetadataStateContext);
     const [showGroupPermissionError, setShowGroupPermissionError] = useState(false);
     const [showAccountPermissionError, setShowAccountPermissionError] = useState(false);
-    const onItemSelect = (selected) => {
-        props.onChange && props.onChange(selected);
+    useEffect(() => {
+        if (props.typeaheadRef) {
+            props.typeaheadRef.current = inputRef.current;
+        }
+    }, [props.typeaheadRef]);
+    const onItemSelect = (option) => {
+        props.onChange && props.onChange([option]);
+        setInputVal('');
         clearList();
+        setIsDropdownOpen(false);
     };
+    const onRemoveItem = (optionToRemove) => {
+        props.onChange && props.onChange([optionToRemove]);
+    };
+    const mapContactsToNotifyees = (rawContacts) => rawContacts
+        .filter((c) => !!c.ssoName)
+        .map((c) => {
+        const { ssoName } = c, rest = __rest(c, ["ssoName"]);
+        return Object.assign({ ssoUsername: ssoName }, rest);
+    });
+    const hasSelectedUsername = (mappedContacts) => mappedContacts.some((contact) => props.selectedItems.some((item) => isContact(item) && item.ssoUsername === contact.ssoUsername));
     const onAddClick = () => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         clearErrors();
-        const searchResults = yield request(props.accountNumber, inputVal, 
-        // eslint-disable-next-line eqeqeq
-        props.groupNumber == '-1' ? null : props.groupNumber);
+        const searchResults = yield request(props.accountNumber, inputVal, props.groupNumber || null);
         const { notificationAddress = { email: '' }, contacts = [] } = (_a = searchResults === null || searchResults === void 0 ? void 0 : searchResults[0]) !== null && _a !== void 0 ? _a : {};
         if ((notificationAddress === null || notificationAddress === void 0 ? void 0 : notificationAddress.email) && (contacts === null || contacts === void 0 ? void 0 : contacts.length)) {
-            const mappedContacts = contacts
-                .filter((c) => !!c.ssoName)
-                .map((c) => {
-                const { ssoName } = c, rest = __rest(c, ["ssoName"]);
-                return Object.assign({ ssoUsername: ssoName }, rest);
-            });
+            const mappedContacts = mapContactsToNotifyees(contacts);
+            if (!hasSelectedUsername(mappedContacts)) {
+                (_b = props.onChange) === null || _b === void 0 ? void 0 : _b.call(props, [...mappedContacts]);
+            }
+            setInputVal('');
             setNotifyeesList([...mappedContacts, { emailAddress: notificationAddress.email }]);
+            return;
         }
-        else {
-            if (notificationAddress === null || notificationAddress === void 0 ? void 0 : notificationAddress.email) {
-                (_b = props.onChange) === null || _b === void 0 ? void 0 : _b.call(props, [...props.selectedItems, { emailAddress: notificationAddress.email, caseNumber: '' }]);
-                setInputVal('');
-            }
-            else if (contacts === null || contacts === void 0 ? void 0 : contacts.length) {
-                const mappedContacts = contacts
-                    .filter((c) => !!c.ssoName)
-                    .map((c) => {
-                    const { ssoName } = c, rest = __rest(c, ["ssoName"]);
-                    return Object.assign({ ssoUsername: ssoName }, rest);
-                });
-                (_c = props.onChange) === null || _c === void 0 ? void 0 : _c.call(props, [...props.selectedItems, ...mappedContacts]);
-                setInputVal('');
+        if (notificationAddress === null || notificationAddress === void 0 ? void 0 : notificationAddress.email) {
+            const isEmailAlreadySelected = props.selectedItems.some((item) => {
+                var _a, _b;
+                return isCustomEmailAddress(item) &&
+                    ((_a = item.emailAddress) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === ((_b = notificationAddress.email) === null || _b === void 0 ? void 0 : _b.toLowerCase());
+            });
+            if (!isEmailAlreadySelected) {
+                (_c = props.onChange) === null || _c === void 0 ? void 0 : _c.call(props, [{ emailAddress: notificationAddress.email, caseNumber: '' }]);
             }
-            else {
-                loggedInUsersAccount.data.hasGroupACLs && props.groupNumber && props.groupNumber !== '-1'
-                    ? setShowGroupPermissionError(true)
-                    : setShowAccountPermissionError(true);
+            setInputVal('');
+            return;
+        }
+        if (contacts === null || contacts === void 0 ? void 0 : contacts.length) {
+            const mappedContacts = mapContactsToNotifyees(contacts);
+            if (!hasSelectedUsername(mappedContacts)) {
+                (_d = props.onChange) === null || _d === void 0 ? void 0 : _d.call(props, [...mappedContacts]);
             }
+            setInputVal('');
+            return;
+        }
+        if (loggedInUsersAccount.data.hasGroupACLs && props.groupNumber) {
+            setShowGroupPermissionError(true);
+        }
+        else {
+            setShowAccountPermissionError(true);
         }
     });
     const clearErrors = () => {
@@ -102,22 +133,39 @@ export function NonOrgCaseNotifyeesSelector(props) {
             setInputVal(val);
         }
         clearList();
+        setIsDropdownOpen(false);
     };
-    const renderToken = (option, thProps, idx) => {
-        const isContactOption = isContact(option);
-        const isCurrentUserCaseContact = option.ssoUsername === props.contactSsoUsername;
-        return (React.createElement(Token, { option: option, key: idx, onRemove: thProps.onRemove, disabled: (props.isChipDisabled && isContactOption) || isCurrentUserCaseContact }, getHydraContactLabel(option)));
-    };
-    const renderMenuItemChildren = (option, p) => (React.createElement(Highlighter, { key: getKey(option), search: p.text }, getHydraContactLabel(option)));
-    const onBlur = () => {
+    const onBlur = (event) => {
+        if (menuRef.current && menuRef.current.contains(event.relatedTarget)) {
+            return;
+        }
         clearList();
+        setIsDropdownOpen(false);
+    };
+    const renderSelectedItems = () => {
+        if (props.selectedItems.length === 0)
+            return null;
+        return (React.createElement(LabelGroup, { "aria-label": "Selected contacts" }, props.selectedItems.map((option, index) => {
+            const isContactOption = isContact(option);
+            const isCurrentUserCaseContact = isContactOption && option.ssoUsername === props.contactSsoUsername;
+            const isDisabled = (props.isChipDisabled && isContactOption) || isCurrentUserCaseContact;
+            return (React.createElement(Label, { key: getKey(option) || index, onClose: () => onRemoveItem(option), isDisabled: isDisabled, closeBtnAriaLabel: `Remove ${getHydraContactLabel(option)}`, variant: "outline", color: "blue", onClick: haltEvent }, getHydraContactLabel(option)));
+        })));
     };
+    const menu = (React.createElement(Menu, { ref: menuRef },
+        React.createElement(MenuContent, null,
+            React.createElement(MenuList, null, notifyeesList.map((option, index) => (React.createElement(MenuItem, { key: getKey(option) || index, onClick: () => onItemSelect(option) },
+                React.createElement(CustomHighlighter, { search: inputVal }, getHydraContactLabel(option)))))))));
     return (React.createElement(Flex, null,
         React.createElement(FlexItem, { grow: { sm: 'grow' } },
-            React.createElement(Typeahead, { id: props.id, "data-tracking-id": props.dataTrackingId, onChange: onItemSelect, onInputChange: onInputChange, open: notifyeesList.length > 0, ref: props.typeaheadRef, selected: props.selectedItems, placeholder: props.placeholder, disabled: props.isDisabled || isFetching, options: notifyeesList, renderToken: renderToken, multiple: true, filterBy: () => true, labelKey: getHydraContactLabel, renderMenuItemChildren: renderMenuItemChildren, onBlur: onBlur, isInvalid: showGroupPermissionError || showAccountPermissionError }),
-            props.selectedItems.length > 0 && !showAccountPermissionError && !showAccountPermissionError && (React.createElement("p", { className: "form-instructions" },
-                React.createElement(Trans, null, "Enter an email address or username for the person you want to notify"))),
-            React.createElement("p", { className: "pf-v5-c-form__helper-text pf-m-error", style: { color: '#c9190b' } },
+            React.createElement("div", null,
+                React.createElement(Flex, null,
+                    React.createElement(FlexItem, { grow: { sm: 'grow' } },
+                        React.createElement(Popper, { trigger: React.createElement(TextInputGroup, null,
+                                React.createElement(TextInputGroupMain, { ref: inputRef, id: props.id, "data-tracking-id": props.dataTrackingId, value: inputVal, onChange: (_, value) => onInputChange(value), placeholder: props.placeholder, disabled: props.isDisabled || isFetching, onBlur: onBlur }, renderSelectedItems())), popper: menu, isVisible: isDropdownOpen && notifyeesList.length > 0, position: "start" })),
+                    React.createElement(Button, { variant: "primary", onClick: onAddClick, isLoading: props.isDisabled || isFetching, spinnerAriaValueText: props.isDisabled ? 'Loading' : undefined, isDisabled: !(inputVal || '').trim() || props.isDisabled || isFetching, "data-tracking-id": `${props.dataTrackingId}-add-btn`, className: "send-notifications-add" },
+                        React.createElement(Trans, null, "Add")))),
+            React.createElement("p", { className: "pf-v6-c-form__helper-text pf-m-error", style: { color: '#C9190B' } },
                 showGroupPermissionError && (React.createElement(Trans, null,
                     inputVal,
                     " was not found under the selected group. Please contact your Org Admin to add them to this group.")),
@@ -125,8 +173,5 @@ export function NonOrgCaseNotifyeesSelector(props) {
                     inputVal,
                     " isn't associated with your account. Please contact Org Admin to add them to your account.")),
                 !showGroupPermissionError && !showAccountPermissionError && (React.createElement("p", { className: "form-instructions" },
-                    React.createElement(Trans, null, "Include someone from your account to inform about the status of this case."))))),
-        React.createElement(FlexItem, { style: { alignSelf: 'flex-start' } },
-            React.createElement(Button, { variant: "primary", onClick: onAddClick, isLoading: props.isDisabled || isFetching, spinnerAriaValueText: props.isDisabled ? 'Loading' : undefined, isDisabled: !(inputVal || '').trim() || props.isDisabled || isFetching, "data-tracking-id": `${props.dataTrackingId}-add-btn` },
-                React.createElement(Trans, null, "Add")))));
+                    React.createElement(Trans, null, "Include someone from your account to inform about the status of this case.")))))));
 }

package/lib/esm/components/ConfirmationModals/NoAttachmentSelectedModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NoAttachmentSelectedModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ConfirmationModals/NoAttachmentSelectedModal.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAiBvE,UAAU,MAAM;IACZ,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,EAAE,MAAM,IAAI,CAAC;CACzB;AAID,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,qBAuJtD"}
+{"version":3,"file":"NoAttachmentSelectedModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ConfirmationModals/NoAttachmentSelectedModal.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAgBvE,UAAU,MAAM;IACZ,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,EAAE,MAAM,IAAI,CAAC;CACzB;AAID,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,qBAiJtD"}

package/lib/esm/components/ConfirmationModals/NoAttachmentSelectedModal.js

@@ -1,14 +1,12 @@
-import { Button, ButtonVariant, Modal, ModalVariant } from '@patternfly/react-core';
+import { Button, ButtonVariant, Modal, ModalBody, ModalFooter, ModalHeader, ModalVariant, } from '@patternfly/react-core';
 import { GlobalMetadataStateContext } from '@rh-support/react-context';
 import { ability, resourceActions, resources } from '@rh-support/user-permissions';
-import { pendoTrackEvent } from '@rh-support/utils';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { RulesDispatchContext, RulesStateContext } from '../../context/RulesContext';
 import { SessionRestoreStateContext } from '../../context/SessionRestoreContext';
 import { RulesReducerConstants } from '../../reducers/RulesReducer';
 import FileEARule from '../ImproveCase/FileEARule';
-import { recsViewedFromNoAttachmentModalEvent } from '../shared/Constants';
 import { AttachmentStateContext, isAnyFileAttached, isAnyFileDiagnosticsAttachment, isUploadingAttachment, } from '../shared/fileUpload';
 import FileSelectorButton from '../shared/fileUpload/fileSelectors/FileSelectorButton';
 import FileUpload from '../shared/fileUpload/FileUpload';
@@ -16,27 +14,27 @@ const TIMEOUT_DURATION = 9000;
 export function NoAttachmentSelectedModal(props) {
     const { t } = useTranslation();
     const { sessionRestore: { activeSessionId }, } = useContext(SessionRestoreStateContext);
-    const { globalMetadataState: { loggedInUsersAccount }, } = useContext(GlobalMetadataStateContext);
     const { attachmentState: { caseFiles: { selectedLocalFiles }, }, } = useContext(AttachmentStateContext);
     const [isUploading, setIsUploading] = useState(false);
     const isAnyFileAttachedLocal = isAnyFileAttached(selectedLocalFiles);
     const skipAndCreateCaseBtntimeoutRef = useRef(null);
     const rulesDispatch = useContext(RulesDispatchContext);
     const { rulesState } = useContext(RulesStateContext);
+    const { globalMetadataState: { loggedInUsersAccount }, } = useContext(GlobalMetadataStateContext);
+    const isSecureSupport = Boolean(loggedInUsersAccount.data.secureSupport);
     const isFirstMounRef = useRef(true);
     const canUseSessionManagement = ability.can(resourceActions.CREATE, resources.SESSION_TRACKING);
     useEffect(() => {
-        if (rulesState.triggerRuleNotification && !isFirstMounRef.current) {
+        if (rulesState.triggerRuleNotification && !isFirstMounRef.current && !isSecureSupport) {
             rulesDispatch({
                 type: RulesReducerConstants.triggerEARulesModalVisibiltyChange,
                 payload: { isRuleModalVisible: true },
             });
-            pendoTrackEvent(recsViewedFromNoAttachmentModalEvent);
             props.onClose();
         }
         isFirstMounRef.current = false;
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [rulesState.triggerRuleNotification, rulesDispatch]);
+    }, [rulesState.triggerRuleNotification, rulesDispatch, isSecureSupport]);
     /** Clearing timeout on component unmount */
     useEffect(() => {
         return () => {
@@ -56,26 +54,6 @@ export function NoAttachmentSelectedModal(props) {
         }
         return title;
     };
-    const getModalActionButtons = () => {
-        let actionButtons = [];
-        if (isUploading) {
-            actionButtons = [
-                React.createElement(Button, { key: "create-case", variant: ButtonVariant.primary, onClick: props.onConfirm, "data-tracking-id": "skip-upload-or-analysis-and-submit" },
-                    React.createElement(Trans, null, "Skip analyze and create my case")),
-            ];
-        }
-        else if (isAnyFileAttachedLocal) {
-            actionButtons = [];
-        }
-        else {
-            actionButtons = [
-                React.createElement(FileSelectorButton, { key: "file-selector-btn", buttonLabel: t('Upload a file'), className: "pf-m-primary", "data-tracking-id": "no-attachment-file-selector-button", isSessionId: true }),
-                React.createElement(Button, { key: "skip-file", onClick: props.onConfirm, className: "pf-v5-u-ml-sm", "data-tracking-id": "submit-without-attachment", variant: ButtonVariant.secondary },
-                    React.createElement(Trans, null, "Yes, I'm sure")),
-            ];
-        }
-        return actionButtons;
-    };
     const onFileUploadClick = () => {
         if (skipAndCreateCaseBtntimeoutRef.current) {
             clearTimeout(skipAndCreateCaseBtntimeoutRef.current);
@@ -92,12 +70,17 @@ export function NoAttachmentSelectedModal(props) {
             !isUploading && setIsUploading(true);
         }
     };
-    return (React.createElement(Modal, { id: "no-attachment-selected", title: t(getModalTitle()), "aria-describedby": "no-attachment-selected-modal", isOpen: props.isOpen, onClose: props.onClose, showClose: true, actions: getModalActionButtons(), variant: ModalVariant.large, "data-tracking-id": "no-attachment-selected-modal-body" },
-        !isAnyFileAttachedLocal && (React.createElement(React.Fragment, null,
-            React.createElement("p", { className: "pf-v5-u-mb-md" },
+    return (React.createElement(Modal, { id: "no-attachment-selected", title: t(getModalTitle()), "aria-describedby": "no-attachment-selected-modal", isOpen: props.isOpen, onClose: props.onClose, variant: ModalVariant.large, "data-tracking-id": "no-attachment-selected-modal-body" },
+        React.createElement(ModalHeader, { title: t(getModalTitle()) }),
+        React.createElement(ModalBody, null, !isAnyFileAttachedLocal && (React.createElement(React.Fragment, null,
+            React.createElement("p", { className: "pf-v6-u-mb-md" },
                 React.createElement(Trans, null, "Uploading an attachment will speed up your case's resolution time")),
-            React.createElement(FileEARule, { isInline: true }))),
-        React.createElement(FileUpload, { idToUploadTo: activeSessionId, onUploadClick: onFileUploadClick, isSessionId: true, needsAnalyzing: true, autoUploadOnSelect: loggedInUsersAccount.data.secureSupport ? false : true, isSecureSupport: loggedInUsersAccount.data.secureSupport, isPrivate: false }),
-        !canUseSessionManagement && isAnyFileAttachedLocal && (React.createElement(Button, { className: "pf-v5-u-mt-sm", variant: ButtonVariant.primary, onClick: props.onConfirm, "data-tracking-id": "no-attachment-modal-create-case" },
-            React.createElement(Trans, null, "Create Case")))));
+            React.createElement(FileEARule, { isInline: true })))),
+        React.createElement(FileUpload, { idToUploadTo: activeSessionId, onUploadClick: onFileUploadClick, isSessionId: true, needsAnalyzing: !isSecureSupport, autoUploadOnSelect: isSecureSupport ? false : true, isSecureSupport: isSecureSupport, isPrivate: false }),
+        React.createElement(ModalFooter, null, isUploading ? (React.createElement(Button, { key: "create-case", variant: ButtonVariant.primary, onClick: props.onConfirm, "data-tracking-id": "skip-upload-or-analysis-and-submit" },
+            React.createElement(Trans, null, "Skip analyze and create my case"))) : isAnyFileAttachedLocal ? (!canUseSessionManagement && (React.createElement(Button, { className: "pf-v6-u-mt-sm", variant: ButtonVariant.primary, onClick: props.onConfirm, "data-tracking-id": "no-attachment-modal-create-case" },
+            React.createElement(Trans, null, "Create Case")))) : (React.createElement(React.Fragment, null,
+            React.createElement(FileSelectorButton, { key: "file-selector-btn", buttonLabel: t('Upload a file'), className: "pf-m-primary", "data-tracking-id": "no-attachment-file-selector-button", isSessionId: true }),
+            React.createElement(Button, { key: "skip-file", onClick: props.onConfirm, className: "pf-v6-u-ml-sm", "data-tracking-id": "submit-without-attachment", variant: ButtonVariant.secondary },
+                React.createElement(Trans, null, "Yes, I'm sure")))))));
 }

package/lib/esm/components/ConfirmationModals/PreCaseConfirmationModals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PreCaseConfirmationModals.d.ts","sourceRoot":"","sources":["../../../../src/components/ConfirmationModals/PreCaseConfirmationModals.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,oBAAY,6BAA6B;IACrC,SAAS,aAAa;IACtB,mBAAmB,sBAAsB;IACzC,UAAU,cAAc;IACxB,mBAAmB,sBAAsB;CAC5C;AAED,UAAU,MAAM;IACZ,qBAAqB,EAAE,6BAA6B,CAAC;IACrD,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,IAAI,CAAC;CACzB;AAED,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAAC,KAAK,EAAE,MAAM,qBAqB9D"}
+{"version":3,"file":"PreCaseConfirmationModals.d.ts","sourceRoot":"","sources":["../../../../src/components/ConfirmationModals/PreCaseConfirmationModals.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,oBAAY,6BAA6B;IACrC,SAAS,aAAa;IACtB,mBAAmB,sBAAsB;IACzC,UAAU,cAAc;IACxB,mBAAmB,sBAAsB;CAC5C;AAED,UAAU,MAAM;IACZ,qBAAqB,EAAE,6BAA6B,CAAC;IACrD,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,IAAI,CAAC;CACzB;AAED,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAAC,KAAK,EAAE,MAAM,qBAuB9D"}

package/lib/esm/components/ConfirmationModals/PreferredSecureSupportModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PreferredSecureSupportModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ConfirmationModals/PreferredSecureSupportModal.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,UAAU,MAAM;IACZ,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,eAAO,MAAM,2BAA2B,UAAW,MAAM,sBAiCxD,CAAC"}
+{"version":3,"file":"PreferredSecureSupportModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ConfirmationModals/PreferredSecureSupportModal.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,UAAU,MAAM;IACZ,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,eAAO,MAAM,2BAA2B,GAAI,OAAO,MAAM,sBAgCxD,CAAC"}

package/lib/esm/components/ConfirmationModals/PreferredSecureSupportModal.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 export const PreferredSecureSupportModal = (props) => {
     const { t } = useTranslation();
-    return (React.createElement(Modal, { id: "preferred-secured-support-modal", title: t('Preferred secure support account'), "aria-describedby": "preferred-secured-support-modal", isOpen: props.isOpen, onClose: props.onClose, showClose: true, variant: ModalVariant.small },
+    return (React.createElement(Modal, { id: "preferred-secured-support-modal", title: t('Preferred secure support account'), "aria-describedby": "preferred-secured-support-modal", isOpen: props.isOpen, onClose: props.onClose, variant: ModalVariant.small },
         React.createElement("p", null,
             React.createElement(Trans, null, "To comply with AT&T's SISR agreement, all Red Hat support cases must be opened under a different, designated secure support account."),
             "\u00A0",

package/lib/esm/components/Cve/CveItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CveItem.d.ts","sourceRoot":"","sources":["../../../../src/components/Cve/CveItem.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAKrD,OAAO,EAAE,0BAA0B,EAAkB,MAAM,oCAAoC,CAAC;AAShG,UAAU,KAAK;IACX,GAAG,EAAE,0BAA0B,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACjB;AAaD,eAAO,MAAM,OAAO,UAAW,KAAK,sBA2NnC,CAAC"}
+{"version":3,"file":"CveItem.d.ts","sourceRoot":"","sources":["../../../../src/components/Cve/CveItem.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAKrD,OAAO,EAAE,0BAA0B,EAAkB,MAAM,oCAAoC,CAAC;AAUhG,UAAU,KAAK;IACX,GAAG,EAAE,0BAA0B,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACjB;AAaD,eAAO,MAAM,OAAO,GAAI,OAAO,KAAK,sBAwNnC,CAAC"}

package/lib/esm/components/Cve/CveItem.js

@@ -1,5 +1,5 @@
 import { pcm } from '@cee-eng/hydrajs';
-import { Button, Flex, FlexItem, Label, LabelGroup, Text, TextVariants } from '@patternfly/react-core';
+import { Button, Content, ContentVariants, Flex, FlexItem, Label, LabelGroup } from '@patternfly/react-core';
 import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
 import StarIcon from '@patternfly/react-icons/dist/esm/icons/star-icon';
 import { Table, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
@@ -15,6 +15,7 @@ import { useCaseSelector } from '../../context/CaseContext';
 import { SessionRestoreDispatchContext, SessionRestoreStateContext } from '../../context/SessionRestoreContext';
 import { createOrUpdateSessionResources, getSessResFromCve, getSessResFromErrata, } from '../../reducers/SessionRestoreReducer';
 import RouteUtils from '../../utils/routeUtils';
+import { trackClickedResourcesSequence } from '../../utils/visitedResourcesUtils';
 const { SessionResourceVisibility, SessionResourceWorkflowComponent, SessionResourceSource } = pcm.preCase.session;
 const sanitize = (html) => ({ __html: DOMPurify.sanitize(html) });
 function formatDate(dateString) {
@@ -55,18 +56,20 @@ export const CveItem = (props) => {
         createOrUpdateSessionResources(sessionRestoreDispatch, activeSessionId, sessionResourceTracking, SessionResourceSource.DRUPAL, resources, JSON.stringify(payload), workflowSource);
     };
     const onClickErrataLink = (errataDetails, index = 0) => {
+        var _a, _b;
         updateSessionDb([
             getSessResFromErrata(errataDetails, SessionResourceVisibility.VISITED, index + 1, isCveModalOpened
                 ? SessionResourceWorkflowComponent.CVE_MODEl
                 : SessionResourceWorkflowComponent.CVE_ASIDE),
         ]);
+        trackClickedResourcesSequence('CVE recommendations', (_a = errataDetails.advisory) === null || _a === void 0 ? void 0 : _a.url, (_b = errataDetails.advisory) === null || _b === void 0 ? void 0 : _b.name);
     };
     const onPresentOrVisitedCveErrataData = (isVisited = false) => {
         updateSessionDb(getSessResFromCve(cve, isVisited ? SessionResourceVisibility.VISITED : SessionResourceVisibility.PRESENTED, index + 1, isCveModalOpened
             ? SessionResourceWorkflowComponent.CVE_MODEl
             : SessionResourceWorkflowComponent.CVE_ASIDE, isVisited ? true : false, isCveModalOpened ? 3 : 2));
     };
-    const renderDate = () => (cve === null || cve === void 0 ? void 0 : cve.publicDate) && (React.createElement("div", { className: "pf-v5-u-disabled-color-100" },
+    const renderDate = () => (cve === null || cve === void 0 ? void 0 : cve.publicDate) && (React.createElement("div", { className: "pf-v6-u-disabled-color-100" },
         React.createElement(Trans, null, "Public on"),
         " - ",
         formatDate(cve.publicDate)));
@@ -78,7 +81,7 @@ export const CveItem = (props) => {
                 : cve.severity === 'Important'
                     ? 'orange'
                     : cve.severity === 'Moderate'
-                        ? 'gold'
+                        ? 'yellow'
                         : undefined, isCompact: true }, cve.severity)),
         !isEmpty(cve.errataData) && (React.createElement(Label, { color: "blue", isCompact: true },
             React.createElement(Trans, null, "Fixed"))),
@@ -88,7 +91,7 @@ export const CveItem = (props) => {
         if (isEmpty(cve === null || cve === void 0 ? void 0 : cve.errataData)) {
             return null;
         }
-        return (React.createElement(Table, { "aria-label": "Errata table", variant: 'compact', className: "pf-v5-u-mt-md", style: { borderTop: 'var(--pf-v5-global--BorderColor--light-100) solid 1px' } },
+        return (React.createElement(Table, { "aria-label": "Errata table", variant: 'compact', className: "pf-v6-u-mt-md" },
             React.createElement(Thead, null,
                 React.createElement(Tr, null,
                     React.createElement(Th, null,
@@ -101,9 +104,9 @@ export const CveItem = (props) => {
                 var _a, _b, _c;
                 return (React.createElement(Tr, Object.assign({ key: (_a = errata === null || errata === void 0 ? void 0 : errata.advisory) === null || _a === void 0 ? void 0 : _a.name }, (index % 2 === 0 && { isStriped: true })),
                     React.createElement(Td, null,
-                        React.createElement(Text, { component: TextVariants.a, href: (_b = errata === null || errata === void 0 ? void 0 : errata.advisory) === null || _b === void 0 ? void 0 : _b.url, target: "_blank", ouiaSafe: true, "data-tracking-id": "errata-link", onClick: () => onClickErrataLink(errata, index) }, (_c = errata === null || errata === void 0 ? void 0 : errata.advisory) === null || _c === void 0 ? void 0 :
+                        React.createElement(Content, { component: ContentVariants.a, href: (_b = errata === null || errata === void 0 ? void 0 : errata.advisory) === null || _b === void 0 ? void 0 : _b.url, target: "_blank", ouiaSafe: true, "data-tracking-id": "errata-link", onClick: () => onClickErrataLink(errata, index) }, (_c = errata === null || errata === void 0 ? void 0 : errata.advisory) === null || _c === void 0 ? void 0 :
                             _c.name,
-                            React.createElement(ExternalLinkAltIcon, { className: "pf-v5-u-ml-sm" }))),
+                            React.createElement(ExternalLinkAltIcon, { className: "pf-v6-u-ml-sm" }))),
                     React.createElement(Td, { modifier: "truncate" }, errata === null || errata === void 0 ? void 0 : errata.package),
                     React.createElement(Td, null,
                         React.createElement(Trans, null, errata === null || errata === void 0 ? void 0 : errata.state))));
@@ -112,7 +115,7 @@ export const CveItem = (props) => {
     const displayDescription = () => {
         var _a;
         if (isEmpty(cve === null || cve === void 0 ? void 0 : cve.mitigation) && ((_a = cve === null || cve === void 0 ? void 0 : cve.errataData) === null || _a === void 0 ? void 0 : _a.length) === 0) {
-            return (React.createElement("p", { className: "pf-v5-u-mt-md" },
+            return (React.createElement("p", { className: "pf-v6-u-mt-md" },
                 React.createElement(Trans, null, "for this CVE, mitigation and fix is not available, for more details, go to the CVE page.")));
         }
         const MAX_DESCRIPTION_LENGTH = isCveModalOpened ? 300 : 120;
@@ -122,10 +125,11 @@ export const CveItem = (props) => {
         const trimmedDescription = description.length <= MAX_DESCRIPTION_LENGTH
             ? description
             : description.slice(0, MAX_DESCRIPTION_LENGTH).trim() + '...';
-        return React.createElement("p", { className: "pf-v5-u-mt-md pf-v5-u-color-300", dangerouslySetInnerHTML: sanitize(trimmedDescription) });
+        return React.createElement("p", { className: "pf-v6-u-mt-md pf-v6-u-color-300", dangerouslySetInnerHTML: sanitize(trimmedDescription) });
     };
     const onClickGoToCveButtonPage = () => {
         onPresentOrVisitedCveErrataData(true);
+        trackClickedResourcesSequence('CVE recommendations', cve.cveLink, cve.title);
     };
     return (React.createElement("div", null,
         React.createElement(Flex, null,
@@ -133,7 +137,6 @@ export const CveItem = (props) => {
             React.createElement(FlexItem, null, renderDate())),
         displayErrataTable(),
         displayDescription(),
-        (cve === null || cve === void 0 ? void 0 : cve.cveLink) && (React.createElement(Button, { variant: "primary", className: isCveModalOpened ? 'pf-v5-u-my-md' : '', "data-tracking-id": "go-to-CVE-button", component: "a", href: `${cve.cveLink}?${RouteUtils.getSEResourceQueryParams(activeSessionId, (_b = (_a = sessionResourceTracking[workflowSource]) === null || _a === void 0 ? void 0 : _a.resourceOriginId) !== null && _b !== void 0 ? _b : '', SessionResourceSource.DRUPAL)}`, target: "_blank", rel: "noopener noreferrer", onClick: onClickGoToCveButtonPage },
-            React.createElement(Trans, null, "Go to CVE"),
-            React.createElement(ExternalLinkAltIcon, { className: "pf-v5-u-ml-sm" })))));
+        (cve === null || cve === void 0 ? void 0 : cve.cveLink) && (React.createElement(Button, { icon: React.createElement(ExternalLinkAltIcon, { className: "pf-v6-u-ml-sm" }), variant: "primary", className: isCveModalOpened ? 'pf-v6-u-my-md' : '', "data-tracking-id": "go-to-CVE-button", component: "a", href: `${cve.cveLink}?${RouteUtils.getSEResourceQueryParams(activeSessionId, (_b = (_a = sessionResourceTracking[workflowSource]) === null || _a === void 0 ? void 0 : _a.resourceOriginId) !== null && _b !== void 0 ? _b : '', SessionResourceSource.DRUPAL)}`, target: "_blank", rel: "noopener noreferrer", onClick: onClickGoToCveButtonPage },
+            React.createElement(Trans, null, "Go to CVE")))));
 };