@rh-support/manage 2.6.1 → 2.6.10

package/lib/esm/components/ManagePreferences/sections/PreferencesCaseView.js

@@ -7,39 +7,37 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { accounts } from '@cee-eng/hydrajs';
-import { Card, CardBody, CardHeader, Popover, PopoverPosition, Spinner, TextArea, Tooltip, } from '@patternfly/react-core';
-import { SelectOption } from '@patternfly/react-core/deprecated';
+// import { accounts } from '@cee-eng/hydrajs';
+import { Card, CardBody, CardHeader, Popover, PopoverPosition, SelectOption, Spinner, TextArea,
+// Tooltip,
+ } from '@patternfly/react-core';
 import InfoCircleIcon from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
-import { EditorMode, ToastNotification, useFetch } from '@rh-support/components';
-import { fetchLoggedInUsersAccount, GlobalMetadataDispatchContext, GlobalMetadataStateContext, } from '@rh-support/react-context';
-import { ability, CaseListFields, resourceActions, resources } from '@rh-support/user-permissions';
+import { ToastNotification /* , useFetch */ } from '@rh-support/components';
+import { GlobalMetadataStateContext } from '@rh-support/react-context';
+import { ability /* , CaseListFields */, resourceActions, resources } from '@rh-support/user-permissions';
 import debounce from 'lodash/debounce';
 import isEmpty from 'lodash/isEmpty';
 import React, { useContext, useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useUserPreferences } from '../../../hooks/useUserPreferences';
 import { PreferenceSelect } from '../components/PreferenceSelect';
-import { PreferenceSwitch } from '../components/PreferenceSwitch';
 export function PreferencesCaseView(props) {
     const { t } = useTranslation();
-    const { updateCommentType, getCommentTypeFromPreference, getCommentSignature, updateCommentSignature, getOriginalCaseView, updateOriginalCaseView, } = useUserPreferences();
-    const { globalMetadataState: { loggedInUsersAccount, loggedInUserJwtToken, loggedInUserRights }, } = useContext(GlobalMetadataStateContext);
-    const dispatchToGlobalMetadataReducer = useContext(GlobalMetadataDispatchContext);
-    const [isSharingHostNames, setIsSharingHostNames] = useState(false);
+    const { getCommentSignature, updateCommentSignature, getOriginalCaseView, updateOriginalCaseView } = useUserPreferences();
+    const { 
+    // globalMetadataState: { loggedInUsersAccount, loggedInUserRights },
+    globalMetadataState: { loggedInUserRights }, } = useContext(GlobalMetadataStateContext);
+    // const [isSharingHostNames, setIsSharingHostNames] = useState(false);
     const [localCommentSignature, setLocalCommentSignature] = useState('');
-    const [originalCommentType, setOriginalCommentType] = useState('');
     const [originalCommentSignature, setOriginalCommentSignature] = useState('');
     const [commentValidated, setCommentValidated] = useState('default');
-    const [isHostnamesLoading, setIsHostnamesLoading] = useState(true);
+    // const [isHostnamesLoading, setIsHostnamesLoading] = useState(true);
     const [isCommentSignatureLoading, setIsCommentSignatureLoading] = useState(false);
-    const commentTypes = [EditorMode.PLAIN, EditorMode.MARKDOWN];
-    const defaultCommentTitleID = 'default-comment-preference-select';
     const defaultCaseViewID = 'default-case-view-select';
-    const canUseHostName = ability.can(resourceActions.PATCH, resources.CASE_CREATE, CaseListFields.HOSTNAME);
+    // const canUseHostName = ability.can(resourceActions.PATCH, resources.CASE_CREATE, CaseListFields.HOSTNAME);
     const isInternalUserPermission = ability.can(resourceActions.READ, resources.ACCOUNTS_FILTER);
-    const accountNumber = loggedInUsersAccount.data.accountNumber;
-    const { request: updateShareHostnames } = useFetch(accounts.updateIsSharingHostname);
+    // const accountNumber = loggedInUsersAccount.data.accountNumber;
+    // const { request: updateShareHostnames } = useFetch(accounts.updateIsSharingHostname);
     const originalAccountPermission = loggedInUserRights.data.isInternal();
     const [originalCaseView, setOriginalCaseView] = useState(+originalAccountPermission);
     const caseViewTypes = [
@@ -51,7 +49,6 @@ export function PreferencesCaseView(props) {
     ];
     useEffect(() => {
         userOriginalCommentSignature();
-        userOriginalCommentType();
         userOriginalCaseView();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
@@ -60,23 +57,19 @@ export function PreferencesCaseView(props) {
             setCommentValidated('default');
         }
     }, [localCommentSignature, commentValidated]);
-    useEffect(() => {
-        function userOriginalHostnameValue() {
-            return __awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
-                try {
-                    ((_a = loggedInUsersAccount.data) === null || _a === void 0 ? void 0 : _a.shareHostnameWithRHT) &&
-                        setIsSharingHostNames((_b = loggedInUsersAccount.data) === null || _b === void 0 ? void 0 : _b.shareHostnameWithRHT);
-                }
-                catch (error) {
-                    console.log(error);
-                }
-                setIsHostnamesLoading(false);
-            });
-        }
-        canUseHostName && userOriginalHostnameValue();
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+    // useEffect(() => {
+    //     async function userOriginalHostnameValue() {
+    //         try {
+    //             loggedInUsersAccount.data?.shareHostnameWithRHT &&
+    //                 setIsSharingHostNames(loggedInUsersAccount.data?.shareHostnameWithRHT);
+    //         } catch (error) {
+    //             console.log(error);
+    //         }
+    //         setIsHostnamesLoading(false);
+    //     }
+    //     canUseHostName && userOriginalHostnameValue();
+    //     // eslint-disable-next-line react-hooks/exhaustive-deps
+    // }, []);
     const userOriginalCaseView = () => __awaiter(this, void 0, void 0, function* () {
         try {
             const retrievedCaseView = yield getOriginalCaseView();
@@ -88,15 +81,6 @@ export function PreferencesCaseView(props) {
             ToastNotification.addWarningMessage(t('Failed to fetch original preference'));
         }
     });
-    const userOriginalCommentType = () => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const retrievedComment = yield getCommentTypeFromPreference();
-            setOriginalCommentType(retrievedComment);
-        }
-        catch (_a) {
-            ToastNotification.addWarningMessage(t('Failed to fetch original preference'));
-        }
-    });
     const userOriginalCommentSignature = () => __awaiter(this, void 0, void 0, function* () {
         try {
             const retrievedSignature = yield getCommentSignature();
@@ -130,7 +114,7 @@ export function PreferencesCaseView(props) {
     });
     const onPrefCaseViewSelect = (event, selection) => __awaiter(this, void 0, void 0, function* () {
         try {
-            let selectedView = event.currentTarget.getAttribute('data-index');
+            let selectedView = caseViewTypes.findIndex((option) => option.value === selection);
             updateOriginalCaseView(selectedView);
             setOriginalCaseView(+selectedView);
         }
@@ -138,48 +122,19 @@ export function PreferencesCaseView(props) {
             console.log(error);
         }
     });
-    // To set the case of text in dropdown
-    const setOptionCase = (option, reverse) => {
-        if (reverse) {
-            if (option === 'Plain text') {
-                return EditorMode.PLAIN;
-            }
-            else if (option === 'Markdown') {
-                return EditorMode.MARKDOWN;
-            }
-        }
-        else {
-            if (option === EditorMode.PLAIN) {
-                return 'Plain text';
-            }
-            else if (option === EditorMode.MARKDOWN) {
-                return 'Markdown';
-            }
-        }
-    };
-    const onCommentSelect = (event, selection) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const selectedComment = setOptionCase(selection, true);
-            yield updateCommentType(selectedComment);
-            setOriginalCommentType(selectedComment);
-        }
-        catch (error) {
-            console.log(error);
-        }
-    });
-    const onShareHostNamesSwitch = () => __awaiter(this, void 0, void 0, function* () {
-        try {
-            setIsHostnamesLoading(true);
-            yield updateShareHostnames(!isSharingHostNames, accountNumber);
-            fetchLoggedInUsersAccount(dispatchToGlobalMetadataReducer, loggedInUserJwtToken, true);
-            setIsSharingHostNames(!isSharingHostNames);
-        }
-        catch (error) {
-            console.log(error);
-        }
-        setIsHostnamesLoading(false);
-    });
-    const prefHostnameCopy = 'Red Hat Support cannot currently access hostnames that have been entered on a case. You can share this information at any time to improve your support experience.';
+    // const onShareHostNamesSwitch = async () => {
+    //     try {
+    //         setIsHostnamesLoading(true);
+    //         await updateShareHostnames!(!isSharingHostNames, accountNumber!);
+    //         // TODO: migrate to GraphQL - fetchLoggedInUsersAccount(dispatchToGlobalMetadataReducer, loggedInUserJwtToken, true, apolloClient);
+    //         setIsSharingHostNames(!isSharingHostNames);
+    //     } catch (error) {
+    //         console.log(error);
+    //     }
+    //     setIsHostnamesLoading(false);
+    // };
+    // const prefHostnameCopy =
+    //     'Red Hat Support cannot currently access hostnames that have been entered on a case. You can share this information at any time to improve your support experience.';
     const caseViewPrefSelection = () => {
         if (!!originalCaseView) {
             return caseViewTypes[+originalAccountPermission].value;
@@ -192,31 +147,20 @@ export function PreferencesCaseView(props) {
         React.createElement(Trans, null, "Default case view"),
         React.createElement(Popover, { "aria-label": "Preferred-default-case-view-popover", position: PopoverPosition.top, bodyContent: React.createElement("p", { className: 'pref-case-popover-text' },
                 React.createElement(Trans, null, "Choose the default view you want to see when looking at a case")), showClose: false },
-            React.createElement(InfoCircleIcon, { "aria-label": "Preferred-default-case-view-info-icon", className: "pf-v5-u-ml-sm" }))));
-    return (React.createElement(Card, { className: "preference-card" },
+            React.createElement(InfoCircleIcon, { "aria-label": "Preferred-default-case-view-info-icon", className: "pf-v6-u-ml-sm" }))));
+    return (React.createElement(Card, { variant: "secondary", className: "preference-card" },
         React.createElement(CardHeader, null,
             React.createElement("h3", null,
                 React.createElement(Trans, null, "Case view"))),
         React.createElement(CardBody, null,
             React.createElement("form", null,
                 isInternalUserPermission && (React.createElement("div", { className: "form-group" },
-                    React.createElement(PreferenceSelect, { onSelect: onPrefCaseViewSelect, selections: caseViewPrefSelection(), id: defaultCaseViewID, label: prefCasePopover }, caseViewTypes.map((option, index) => (React.createElement(SelectOption, Object.assign({ "data-index": index, key: index, value: option.value }, (option.description && { description: option.description })))))))),
-                React.createElement("div", { className: "form-group" },
-                    React.createElement(PreferenceSelect, { onSelect: onCommentSelect, selections: setOptionCase(originalCommentType, false), id: defaultCommentTitleID, label: "Default comment type" }, commentTypes.map((option, index) => (React.createElement(SelectOption, { key: index, value: setOptionCase(option, false) }))))),
+                    React.createElement(PreferenceSelect, { onSelect: (event, selection) => onPrefCaseViewSelect(event, selection), selections: caseViewPrefSelection(), id: defaultCaseViewID, label: prefCasePopover }, caseViewTypes.map((option, index) => (React.createElement(SelectOption, Object.assign({ "data-index": index, key: index, value: option.value }, (option.description && { description: option.description })))))))),
                 React.createElement("div", { className: "form-group" },
                     React.createElement("label", { htmlFor: "comment-signature-textarea" },
                         React.createElement(Trans, null, "Comment signature")),
                     React.createElement(TextArea, { value: localCommentSignature, onChange: (_event, value) => handleCommentSignatureChange(value), "aria-label": "comment-signature-textarea", placeholder: originalCommentSignature || 'Add a comment signature', id: "comment-signature-textarea", 
                         // @ts-ignore
                         validated: commentValidated, resizeOrientation: "vertical" }),
-                    isCommentSignatureLoading && React.createElement(Spinner, { size: "md" })),
-                canUseHostName && (React.createElement("div", { className: "form-group" },
-                    React.createElement("label", null,
-                        React.createElement(Trans, null, "Case information")),
-                    React.createElement("div", { className: "preference-page-switch-container" },
-                        React.createElement(PreferenceSwitch, { id: "share-hostnames-switch", label: 'Share hostnames', isChecked: isSharingHostNames, onSwitchChange: onShareHostNamesSwitch }),
-                        React.createElement("div", { className: "prefhostnameTooltip" },
-                            React.createElement(Tooltip, { content: prefHostnameCopy, position: "right" },
-                                React.createElement(InfoCircleIcon, { className: "pf-v5-u-ml-sm" })),
-                            isHostnamesLoading && (React.createElement(Spinner, { size: "lg", className: "pf-v5-u-ml-sm hostnameSpinner", "aria-label": "Hostname loading" }))))))))));
+                    isCommentSignatureLoading && React.createElement(Spinner, { size: "md" }))))));
 }

package/lib/esm/components/ManageTable/ManageTable.d.ts

@@ -1,5 +1,4 @@
 import { AlertVariant } from '@patternfly/react-core';
-import { IActions, IActionsResolver, IAreActionsDisabled } from '@patternfly/react-table';
 import { IColumn, ISortInfo } from '@rh-support/components';
 import React from 'react';
 interface IProps {
@@ -14,9 +13,9 @@ interface IProps {
     isError: boolean;
     pagination?: boolean;
     keepPageNumberOnDataChange?: boolean;
-    actions?: IActions;
-    areActionsDisabled?: IAreActionsDisabled;
-    actionResolver?: IActionsResolver;
+    actions?: any;
+    areActionsDisabled?: any;
+    actionResolver?: any;
     noResultText?: string;
     perPage?: number;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ManageTable.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageTable/ManageTable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGH,YAAY,EAQf,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC1F,OAAO,EAAE,OAAO,EAAE,SAAS,EAA4C,MAAM,wBAAwB,CAAC;AACtG,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,UAAU,MAAM;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,SAAS,CAAC;IAGrB,cAAc,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IAEjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IAErC,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,kBAAkB,CAAC,EAAE,mBAAmB,CAAC;IACzC,cAAc,CAAC,EAAE,gBAAgB,CAAC;IAElC,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AA+BD,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,qBAoDxC"}
+{"version":3,"file":"ManageTable.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageTable/ManageTable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGH,YAAY,EAMf,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,OAAO,EAAE,SAAS,EAA4C,MAAM,wBAAwB,CAAC;AACtG,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,UAAU,MAAM;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,SAAS,CAAC;IAGrB,cAAc,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IAEjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IAErC,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,kBAAkB,CAAC,EAAE,GAAG,CAAC;IACzB,cAAc,CAAC,EAAE,GAAG,CAAC;IAErB,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAyBD,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,qBAqDxC"}

package/lib/esm/components/ManageTable/ManageTable.js

@@ -9,34 +9,28 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import { Alert, AlertActionCloseButton, Bullseye, EmptyState, EmptyStateBody, EmptyStateHeader, EmptyStateIcon, EmptyStateVariant, PaginationVariant, } from '@patternfly/react-core';
+import { Alert, AlertActionCloseButton, Bullseye, EmptyState, EmptyStateBody, EmptyStateVariant, PaginationVariant, } from '@patternfly/react-core';
 import SearchIcon from '@patternfly/react-icons/dist/js/icons/search-icon';
+// Removed direct imports from @patternfly/react-table to avoid version conflicts
 import { PFTable, TableComponent, TablePagination } from '@rh-support/components';
 import React from 'react';
 import { Trans } from 'react-i18next';
-const noResultFoundRow = (noResultString = '') => [
-    {
-        heightAuto: true,
-        cells: [
-            {
-                props: { colSpan: 10 },
-                title: (React.createElement(Bullseye, null,
-                    React.createElement(EmptyState, { variant: EmptyStateVariant.xs },
-                        React.createElement(EmptyStateHeader, { titleText: React.createElement(React.Fragment, null,
-                                React.createElement(Trans, null, "No results found")), icon: React.createElement(EmptyStateIcon, { icon: SearchIcon }), headingLevel: "h3" }),
-                        React.createElement(EmptyStateBody, null, noResultString ? noResultString : React.createElement(Trans, null, "There are no results to display."))))),
-            },
-        ],
-    },
-];
+const noResultFoundRow = (noResultString = '') => ({
+    heightAuto: true,
+    colSpan: 10,
+    content: (React.createElement(Bullseye, null,
+        React.createElement(EmptyState, { headingLevel: "h3", icon: SearchIcon, titleText: React.createElement(React.Fragment, null,
+                React.createElement(Trans, null, "No results found")), variant: EmptyStateVariant.xs },
+            React.createElement(EmptyStateBody, null, noResultString ? noResultString : React.createElement(Trans, null, "There are no results to display."))))),
+});
 export function ManageTable(props) {
     const { ariaLabel, errorComponent, errorTitle, errorVariant, isError, isFetching, sortInfo, actions, keepPageNumberOnDataChange, areActionsDisabled, actionResolver } = props, tableProps = __rest(props, ["ariaLabel", "errorComponent", "errorTitle", "errorVariant", "isError", "isFetching", "sortInfo", "actions", "keepPageNumberOnDataChange", "areActionsDisabled", "actionResolver"]);
     const pagination = () => (props.pagination !== undefined ? props.pagination : true);
     return (React.createElement("div", { className: "table-wrapper" },
         isError && (React.createElement(React.Fragment, null,
-            React.createElement(Alert, { variant: errorVariant, isInline: true, title: errorTitle, actionClose: React.createElement(AlertActionCloseButton, null), className: "pf-v5-u-my-sm" }, errorComponent))),
+            React.createElement(Alert, { variant: errorVariant, isInline: true, title: errorTitle, actionClose: React.createElement(AlertActionCloseButton, null), className: "pf-v6-u-my-sm bookmark-alert" }, errorComponent))),
         React.createElement(TableComponent, Object.assign({}, tableProps),
-            React.createElement(PFTable, { sortInfo: sortInfo, "aria-label": ariaLabel, pagination: pagination(), emptyStateRow: noResultFoundRow(props.noResultText), actions: actions, areActionsDisabled: areActionsDisabled, actionResolver: actionResolver, isLoading: isFetching, keepPageNumberOnDataChange: keepPageNumberOnDataChange }),
+            React.createElement(PFTable, Object.assign({ sortInfo: sortInfo, "aria-label": ariaLabel, pagination: pagination(), emptyStateRow: noResultFoundRow(props.noResultText) }, (actions && { actions }), (areActionsDisabled && { areActionsDisabled }), (actionResolver && { actionResolver }), { isLoading: isFetching, keepPageNumberOnDataChange: keepPageNumberOnDataChange })),
             tableProps.data.length > 0 && pagination() && (React.createElement("footer", null,
                 React.createElement(TablePagination, { variant: PaginationVariant.bottom, perPage: props.perPage || 10 }))))));
 }

package/lib/esm/components/ManageTags/TagsManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TagsManager.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageTags/TagsManager.tsx"],"names":[],"mappings":"AA4BA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAOxE,MAAM,CAAC,OAAO,UAAU,WAAW,sBAyYlC"}
+{"version":3,"file":"TagsManager.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageTags/TagsManager.tsx"],"names":[],"mappings":"AA8BA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAaxE,MAAM,CAAC,OAAO,UAAU,WAAW,sBAqZlC"}

package/lib/esm/components/ManageTags/TagsManager.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { ActionList, ActionListItem, Bullseye, Button, ButtonVariant, EmptyState, EmptyStateVariant, Flex, FormGroup, FormHelperText, HelperText, HelperTextItem, Modal, Spinner, TextInput, TextInputGroup, TextInputGroupMain, TextInputGroupUtilities, } from '@patternfly/react-core';
+import { ActionList, ActionListItem, Bullseye, Button, ButtonVariant, EmptyState, EmptyStateVariant, FormGroup, FormHelperText, HelperText, HelperTextItem, Modal, ModalBody, ModalFooter, ModalHeader, Spinner, TextInput, TextInputGroup, TextInputGroupMain, TextInputGroupUtilities, } from '@patternfly/react-core';
 import PencilAltIcon from '@patternfly/react-icons/dist/js/icons/pencil-alt-icon';
 import SearchIcon from '@patternfly/react-icons/dist/js/icons/search-icon';
 import TimesIcon from '@patternfly/react-icons/dist/js/icons/times-icon';
@@ -18,7 +18,7 @@ import { isEmpty, isNull, isUndefined } from 'lodash';
 import React, { useContext, useEffect, useMemo, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { TagManagementDispatchContext, TagManagementStateContext } from '../../context/TagManagementContextProvider';
-import { createNewTags, deleteTag, fetchTopContentTags, updateTag } from '../../reducers/TagManagmentReducer';
+import { createNewTags, deleteTag, fetchTopContentTags, updateTag, } from '../../reducers/TagManagmentReducer';
 import { ManageTable } from '../ManageTable';
 export default function TagsManager() {
     const { t } = useTranslation();
@@ -49,16 +49,17 @@ export default function TagsManager() {
     };
     //filtering tags for user search
     const filteredTagIds = useMemo(() => {
+        const tagStates = Object.values(tagsByIds);
         if (isEmpty(tagSearchTerm))
-            return tags.map((t) => t.id);
+            return tagStates.map((t) => t.id);
         const filteredIds = [];
-        tags.forEach((t) => {
+        tagStates.forEach((t) => {
             if (t.tagName.toLowerCase().includes(tagSearchTerm.toLowerCase())) {
                 filteredIds.push(t.id);
             }
         });
         return filteredIds;
-    }, [tagSearchTerm, tags]);
+    }, [tagSearchTerm, tagsByIds]);
     const getTopContentTags = () => __awaiter(this, void 0, void 0, function* () {
         try {
             yield fetchTopContentTags(dispatch);
@@ -155,7 +156,7 @@ export default function TagsManager() {
     const onSearchClear = () => {
         setTagSearchTerm('');
     };
-    const columns = [
+    const columns = useMemo(() => [
         {
             accessor: (id) => tagsByIds[id].tagName,
             sortable: false,
@@ -191,69 +192,76 @@ export default function TagsManager() {
             cellWidth: 10,
             cell: (id) => (React.createElement(ActionList, { isIconList: true },
                 React.createElement(ActionListItem, null,
-                    React.createElement(Button, { variant: "plain", "data-tracking-id": "edit-tag", "aria-label": `edit tag ${tagsByIds[id].tagName}`, onClick: () => onEditTagClick(tagsByIds[id]) },
-                        React.createElement(PencilAltIcon, null))),
+                    React.createElement(Button, { icon: React.createElement(PencilAltIcon, null), variant: "plain", "data-tracking-id": "edit-tag", "aria-label": `edit tag ${tagsByIds[id].tagName}`, onClick: () => onEditTagClick(tagsByIds[id]) })),
                 React.createElement(ActionListItem, null,
-                    React.createElement(Button, { "aria-label": `delete tag ${tagsByIds[id].tagName}`, variant: "plain", "data-tracking-id": "delete-tag", onClick: () => onDeleteTagClick(tagsByIds[id]) },
-                        React.createElement(TrashIcon, null))))),
+                    React.createElement(Button, { icon: React.createElement(TrashIcon, null), "aria-label": `delete tag ${tagsByIds[id].tagName}`, variant: "plain", "data-tracking-id": "delete-tag", onClick: () => onDeleteTagClick(tagsByIds[id]) })))),
         },
-    ];
-    const CreateTagModel = (React.createElement(Modal, { title: t('Create a tag'), onClose: onCancelCreateNewTag, isOpen: createTagModalOpen, actions: [
-            React.createElement(Button, { key: "create-tag", variant: ButtonVariant.primary, onClick: onCreateNewTag, isLoading: isCreatingNewTag, isDisabled: !isEmpty(createTagError) || isCreatingNewTag },
+    ], 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [tagsByIds]);
+    const CreateTagModel = (React.createElement(Modal, { onClose: onCancelCreateNewTag, isOpen: createTagModalOpen },
+        React.createElement(ModalHeader, null,
+            React.createElement("h2", null, t('Create a tag'))),
+        React.createElement(ModalBody, null,
+            React.createElement(FormGroup, { label: "Tag name", isRequired: true },
+                React.createElement(TextInput, { isRequired: true, type: "text", id: "create-new-tag-text-input", value: newTagName, onChange: (e, v) => {
+                        setNewTagName(v);
+                        setCreateTagError('');
+                    }, placeholder: t('Enter a unique name to create a tag'), validated: isEmpty(createTagError) ? 'default' : 'error' }),
+                !isEmpty(createTagError) && (React.createElement(FormHelperText, null,
+                    React.createElement(HelperText, null,
+                        React.createElement(HelperTextItem, { variant: "error" }, createTagError)))))),
+        React.createElement(ModalFooter, null,
+            React.createElement(Button, { key: "create-tag", variant: ButtonVariant.primary, onClick: onCreateNewTag, isLoading: isCreatingNewTag, isDisabled: isEmpty(newTagName) || !isEmpty(createTagError) || isCreatingNewTag },
                 React.createElement(Trans, null, "Create")),
-            React.createElement(Button, { key: "cancel-create-tag", variant: ButtonVariant.link, onClick: onCancelCreateNewTag }, "Cancel"),
-        ] },
-        React.createElement(FormGroup, { label: "Tag name", isRequired: true },
-            React.createElement(TextInput, { isRequired: true, type: "text", id: "create-new-tag-text-input", value: newTagName, onChange: (e, v) => {
-                    setNewTagName(v);
-                    setCreateTagError('');
-                }, placeholder: t('Enter a unique name to create a tag'), validated: isEmpty(createTagError) ? 'default' : 'error' }),
-            !isEmpty(createTagError) && (React.createElement(FormHelperText, null,
-                React.createElement(HelperText, null,
-                    React.createElement(HelperTextItem, { variant: "error" }, createTagError)))))));
-    const EditTagModal = (React.createElement(Modal, { title: t('Edit Tag'), isOpen: editTagModalOpen, onClose: onEditCancel, actions: [
+            React.createElement(Button, { key: "cancel-create-tag", variant: ButtonVariant.link, onClick: onCancelCreateNewTag }, "Cancel"))));
+    const EditTagModal = (React.createElement(Modal, { isOpen: editTagModalOpen, onClose: onEditCancel },
+        React.createElement(ModalHeader, null,
+            React.createElement("h2", null, t('Edit Tag'))),
+        React.createElement(ModalBody, null,
+            React.createElement(FormGroup, { label: "Tag name", isRequired: true },
+                React.createElement(TextInput, { isRequired: true, type: "text", id: "edit-tag-text-input", value: editTagName, onChange: (e, v) => {
+                        setEditTagName(v);
+                        setEditTagError('');
+                    }, placeholder: t('Enter a unique name for this tag') }),
+                !isEmpty(editTagError) && (React.createElement(FormHelperText, null,
+                    React.createElement(HelperText, null,
+                        React.createElement(HelperTextItem, { variant: "error" }, editTagError)))))),
+        React.createElement(ModalFooter, null,
             React.createElement(Button, { key: "edit-tag", variant: ButtonVariant.primary, onClick: onEditTagConfirm, isLoading: isEditingTagName, isDisabled: !isEmpty(editTagError) || isEditingTagName },
                 React.createElement(Trans, null, "Save")),
-            React.createElement(Button, { key: "cancel-edit-tag", variant: ButtonVariant.link, onClick: onEditCancel }, "Cancel"),
-        ] },
-        React.createElement(FormGroup, { label: "Tag name", isRequired: true },
-            React.createElement(TextInput, { isRequired: true, type: "text", id: "edit-tag-text-input", value: editTagName, onChange: (e, v) => {
-                    setEditTagName(v);
-                    setEditTagError('');
-                }, placeholder: t('Enter a unique name for this tag') }),
-            !isEmpty(editTagError) && (React.createElement(FormHelperText, null,
-                React.createElement(HelperText, null,
-                    React.createElement(HelperTextItem, { variant: "error" }, editTagError)))))));
-    const DeleteTagModel = () => (React.createElement(Modal, { title: t('Are you sure?'), isOpen: deleteTagModalOpen, onClose: () => setDeleteTagModalOpen(false), actions: [
+            React.createElement(Button, { key: "cancel-edit-tag", variant: ButtonVariant.link, onClick: onEditCancel }, "Cancel"))));
+    const DeleteTagModel = () => (React.createElement(Modal, { isOpen: deleteTagModalOpen, onClose: () => setDeleteTagModalOpen(false) },
+        React.createElement(ModalHeader, null,
+            React.createElement("h2", null, t('Are you sure?'))),
+        React.createElement(ModalBody, null,
+            React.createElement(Trans, null, "Deleting this tag will permanently untag all content associated with it. Are you sure you want to proceed?")),
+        React.createElement(ModalFooter, null,
             React.createElement(Button, { key: "delete-tag", variant: ButtonVariant.danger, onClick: onDeleteTagConfirm, isLoading: isDeletingTag, isDisabled: isDeletingTag },
                 React.createElement(Trans, null, "Yes, I am sure")),
-            React.createElement(Button, { key: "cancel-delete-tag", variant: ButtonVariant.link, onClick: () => setDeleteTagModalOpen(false) }, "Cancel"),
-        ] },
-        React.createElement(Trans, null, "Deleting this tag will permanently untag all content associated with it. Are you sure you want to proceed?")));
+            React.createElement(Button, { key: "cancel-delete-tag", variant: ButtonVariant.link, onClick: () => setDeleteTagModalOpen(false) }, "Cancel"))));
     return (React.createElement(React.Fragment, null,
         CreateTagModel,
         EditTagModal,
         React.createElement(DeleteTagModel, null),
         React.createElement("header", null,
             React.createElement("h2", null, "Tags"),
-            React.createElement("p", { className: "pf-v5-u-my-sm" },
+            React.createElement("p", { className: "pf-v6-u-my-sm" },
                 React.createElement(Trans, null, "Add, edit or remove tags and manage tagged top content."))),
-        React.createElement("div", { className: "toolbar" },
-            React.createElement(Flex, { alignItems: { default: 'alignItemsCenter' }, className: "pf-v5-u-w-100" },
+        React.createElement("div", { className: "toolbar pf-v6-u-display-flex pf-v6-u-flex-direction-row pf-v6-u-align-items-center" },
+            React.createElement("div", { className: "pf-v6-u-display-flex pf-v6-u-flex-direction-row pf-v6-u-align-items-center" },
                 React.createElement("label", { htmlFor: "tag-search-input" },
                     React.createElement(Trans, null, "Search Tag")),
-                React.createElement("div", { className: "pf-v5-u-flex-grow-1" },
+                React.createElement("div", null,
                     React.createElement(TextInputGroup, null,
                         React.createElement(TextInputGroupMain, { type: "text", id: "tag-search-input", placeholder: t('Search for a tag'), icon: React.createElement(SearchIcon, null), value: tagSearchTerm, onChange: (e, v) => setTagSearchTerm(v) }),
                         !isEmpty(tagSearchTerm) && (React.createElement(TextInputGroupUtilities, null,
-                            React.createElement(Button, { variant: "plain", onClick: onSearchClear, "aria-label": "Clear button and input" },
-                                React.createElement(TimesIcon, null)))))),
-                React.createElement("span", { className: "pf-v5-u-ml-sm" },
-                    React.createElement(Button, { variant: ButtonVariant.primary, isInline: true, onClick: () => {
-                            setCreateTagModalOpen(true);
-                            setNewTagName(tagSearchTerm);
-                        }, "data-tracking-id": "tag-create-button" },
-                        React.createElement(Trans, null, "Create tag"))))),
+                            React.createElement(Button, { icon: React.createElement(TimesIcon, null), variant: "plain", onClick: onSearchClear, "aria-label": "Clear button and input" })))))),
+            React.createElement(Button, { variant: ButtonVariant.primary, isInline: true, onClick: () => {
+                    setCreateTagModalOpen(true);
+                    setNewTagName(tagSearchTerm);
+                }, "data-tracking-id": "tag-create-button", className: "pf-v6-u-ml-md" },
+                React.createElement(Trans, null, "Create tag"))),
         React.createElement("div", { className: "tags-manager-wrapper" },
             React.createElement(ErrorBoundary, { errorMsgInfo: { message: t('There was an error loading tags list') } }, tagResponse.isFetching ? (React.createElement(Bullseye, null,
                 React.createElement(EmptyState, { variant: EmptyStateVariant.full },

package/lib/esm/components/NotificationEmails/NotificationEmailsModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NotificationEmailsModal.d.ts","sourceRoot":"","sources":["../../../../src/components/NotificationEmails/NotificationEmailsModal.tsx"],"names":[],"mappings":"AAiBA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAGnD,UAAU,MAAM;IACZ,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACzE,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACtE,yBAAyB,EAAE,GAAG,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,yBAAyB,EAAE,OAAO,CAAC;IACnC,UAAU,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,eAAO,MAAM,uBAAuB,UAAW,MAAM,sBA0NpD,CAAC"}
+{"version":3,"file":"NotificationEmailsModal.d.ts","sourceRoot":"","sources":["../../../../src/components/NotificationEmails/NotificationEmailsModal.tsx"],"names":[],"mappings":"AAoBA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAGnD,UAAU,MAAM;IACZ,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACzE,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACtE,yBAAyB,EAAE,GAAG,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,yBAAyB,EAAE,OAAO,CAAC;IACnC,UAAU,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,eAAO,MAAM,uBAAuB,GAAI,OAAO,MAAM,sBAmOpD,CAAC"}

package/lib/esm/components/NotificationEmails/NotificationEmailsModal.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { customEmail } from '@cee-eng/hydrajs';
-import { Button, ButtonVariant, 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 { isEmailValid } from '@rh-support/utils';
 import isEmpty from 'lodash/isEmpty';
@@ -45,7 +45,9 @@ export const NotificationEmailsModal = (props) => {
         setSaveButtonIsClicked(true);
         const isAValidEmail = checkEmailIsValid(email);
         const isAValidFirstName = !isEmpty(firstName.trim());
-        const isDuplicateEmail = props.isAddingNotificationEmail ? props.emailsList.includes(email) : false;
+        const isDuplicateEmail = props.isAddingNotificationEmail
+            ? props.emailsList.includes(email.toLowerCase())
+            : false;
         setIsValidEmail(isAValidEmail);
         setIsValidFirstName(isAValidFirstName);
         setIsValidLastName(!checkForSpecialCharacters(lastName));
@@ -57,7 +59,7 @@ export const NotificationEmailsModal = (props) => {
             if (props.isAddingNotificationEmail) {
                 yield addCustomEmailToAccount(props.accountNumber, email, firstName, lastName);
                 ToastNotification.addSuccessMessage(t(`Notification email has been successfully added`));
-                props.onAdd(email, firstName, lastName);
+                props.onAdd(email.toLowerCase(), firstName, lastName);
             }
             else {
                 yield updateCustomEmail(props.accountNumber, props.selectedEmailNotification.email, email, firstName, lastName);
@@ -87,7 +89,7 @@ export const NotificationEmailsModal = (props) => {
         props.selectedEmailNotification.lastName !== lastName;
     const onEmailChange = (localemail) => {
         saveButtonIsClicked && setIsValidEmail(checkEmailIsValid(localemail));
-        props.isAddingNotificationEmail && setIsEmailDuplicate(props.emailsList.includes(localemail));
+        props.isAddingNotificationEmail && setIsEmailDuplicate(props.emailsList.includes(localemail.toLowerCase()));
         setEmail(localemail);
     };
     const onFirstNameChange = (firstName) => {
@@ -105,7 +107,34 @@ export const NotificationEmailsModal = (props) => {
         const specialCharRegex = /[^a-zA-Z0-9\s]/;
         return specialCharRegex.test(s);
     };
-    return (React.createElement(Modal, { id: "Add-edit-notification-email-modal", className: "pf-modal-overflow-visible", title: t('Edit notification email'), "aria-describedby": "Add-edit-notification-email-modal", isOpen: props.isOpen, onClose: props.onClose, showClose: true, onEscapePress: props.onClose, variant: ModalVariant.medium, actions: [
+    return (React.createElement(Modal, { id: "Add-edit-notification-email-modal", className: "pf-modal-overflow-visible", "aria-describedby": "Add-edit-notification-email-modal", isOpen: props.isOpen, onClose: props.onClose, onEscapePress: props.onClose, variant: ModalVariant.medium },
+        React.createElement(ModalHeader, null,
+            React.createElement("h2", null, t('Edit notification email'))),
+        React.createElement(ModalBody, null,
+            React.createElement(Form, null,
+                React.createElement(FormGroup, { label: t('Email address'), isRequired: true, fieldId: "email-notification-first-emailaddress" },
+                    React.createElement(TextInput, { value: email, isRequired: true, type: "text", onChange: (_event, localemail) => onEmailChange(localemail), "aria-label": t('Email address'), placeholder: t('Email address'), maxLength: 254, validated: isValidEmail && !isEmailDuplicate ? ValidatedOptions.default : ValidatedOptions.error, isDisabled: !props.isAddingNotificationEmail }),
+                    !(isValidEmail && !isEmailDuplicate) && (React.createElement(FormHelperText, null,
+                        React.createElement(HelperText, null,
+                            React.createElement(HelperTextItem, { variant: ValidatedOptions.error }, !isValidEmail
+                                ? t('Invalid email')
+                                : isEmailDuplicate
+                                    ? t('Duplicate Email')
+                                    : ''))))),
+                React.createElement(FormGroup, { label: t('First name'), isRequired: true, fieldId: "email-notification-first-name" },
+                    React.createElement(TextInput, { value: firstName, isRequired: true, validated: isValidFirstName ? ValidatedOptions.default : ValidatedOptions.error, type: "text", onChange: (_event, firstName) => onFirstNameChange(firstName), "aria-label": t('First name'), placeholder: t('First name'), maxLength: 254 }),
+                    !isValidFirstName && (React.createElement(FormHelperText, null,
+                        React.createElement(HelperText, null,
+                            React.createElement(HelperTextItem, { variant: ValidatedOptions.error }, isSpecialCharFirstName
+                                ? t('First name cannot contain special characters')
+                                : t('First name cannot be empty')))))),
+                React.createElement(FormGroup, { label: t('Last name'), fieldId: "email-notification-last-name" },
+                    React.createElement(TextInput, { value: lastName, type: "text", validated: isValidLastName ? ValidatedOptions.default : ValidatedOptions.error, onChange: (_event, lastName) => onLastNameChange(lastName), "aria-label": t('Last name'), placeholder: t('Last name'), maxLength: 254 }),
+                    !isValidLastName && (React.createElement(FormHelperText, null,
+                        React.createElement(HelperText, null,
+                            React.createElement(HelperTextItem, { variant: ValidatedOptions.error },
+                                React.createElement(Trans, null, "Last name cannot contain special characters")))))))),
+        React.createElement(ModalFooter, null,
             React.createElement(Button, { key: "save", variant: ButtonVariant.primary, onClick: save, isDisabled: !isFormDirty() ||
                     isUpdating ||
                     isAdding ||
@@ -115,25 +144,5 @@ export const NotificationEmailsModal = (props) => {
                     isEmailDuplicate, spinnerAriaValueText: isUpdating || isAdding ? t('Adding') : undefined, isLoading: isUpdating || isAdding },
                 React.createElement(Trans, null, "Save")),
             React.createElement(Button, { key: "cancel", isDisabled: isLoading, variant: ButtonVariant.secondary, onClick: close },
-                React.createElement(Trans, null, "Cancel")),
-        ] },
-        React.createElement(Form, null,
-            React.createElement(FormGroup, { label: t('Email address'), isRequired: true, fieldId: "email-notification-first-emailaddress" },
-                React.createElement(TextInput, { value: email, isRequired: true, type: "text", onChange: (_event, localemail) => onEmailChange(localemail), "aria-label": t('Email address'), placeholder: t('Email address'), maxLength: 254, validated: isValidEmail && !isEmailDuplicate ? ValidatedOptions.default : ValidatedOptions.error, isDisabled: !props.isAddingNotificationEmail }),
-                !(isValidEmail && !isEmailDuplicate) && (React.createElement(FormHelperText, null,
-                    React.createElement(HelperText, null,
-                        React.createElement(HelperTextItem, { variant: ValidatedOptions.error }, !isValidEmail ? t('Invalid email') : isEmailDuplicate ? t('Duplicate Email') : ''))))),
-            React.createElement(FormGroup, { label: t('First name'), isRequired: true, fieldId: "email-notification-first-name" },
-                React.createElement(TextInput, { value: firstName, isRequired: true, validated: isValidFirstName ? ValidatedOptions.default : ValidatedOptions.error, type: "text", onChange: (_event, firstName) => onFirstNameChange(firstName), "aria-label": t('First name'), placeholder: t('First name'), maxLength: 254 }),
-                !isValidFirstName && (React.createElement(FormHelperText, null,
-                    React.createElement(HelperText, null,
-                        React.createElement(HelperTextItem, { variant: ValidatedOptions.error }, isSpecialCharFirstName
-                            ? t('First name cannot contain special characters')
-                            : t('First name cannot be empty')))))),
-            React.createElement(FormGroup, { label: t('Last name'), fieldId: "email-notification-last-name" },
-                React.createElement(TextInput, { value: lastName, type: "text", validated: isValidLastName ? ValidatedOptions.default : ValidatedOptions.error, onChange: (_event, lastName) => onLastNameChange(lastName), "aria-label": t('Last name'), placeholder: t('Last name'), maxLength: 254 }),
-                !isValidLastName && (React.createElement(FormHelperText, null,
-                    React.createElement(HelperText, null,
-                        React.createElement(HelperTextItem, { variant: ValidatedOptions.error },
-                            React.createElement(Trans, null, "Last name cannot contain special characters")))))))));
+                React.createElement(Trans, null, "Cancel")))));
 };

package/lib/esm/components/NotificationEmails/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/NotificationEmails/index.tsx"],"names":[],"mappings":"AAYA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAMnD,wBAAgB,kBAAkB,sBAmOjC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/NotificationEmails/index.tsx"],"names":[],"mappings":"AAYA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAMnD,wBAAgB,kBAAkB,sBAuOjC"}