@rh-support/manage 1.0.30 → 1.0.32

package/lib/esm/ManageTab.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ManageTab.d.ts","sourceRoot":"","sources":["../../src/ManageTab.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAIxD,UAAU,MAAM;IACZ,GAAG,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;CAC7B;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,eAYtC"}
+{"version":3,"file":"ManageTab.d.ts","sourceRoot":"","sources":["../../src/ManageTab.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD,UAAU,MAAM;IACZ,GAAG,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;CAC7B;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,eAkBtC"}

package/lib/esm/ManageTab.js

@@ -1,11 +1,12 @@
 import { ErrorBoundary } from '@rh-support/components';
 import React from 'react';
-import { Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
 export function ManageTab(props) {
     const tab = props.tab;
+    const { t } = useTranslation();
     return (React.createElement(React.Fragment, null,
         React.createElement("pfe-tab", { role: "heading", slot: "tab", "data-tracking-id": tab['data-tracking-id'], onClick: tab.onClick },
             React.createElement(Trans, null, tab.title)),
         React.createElement("pfe-tab-panel", { role: "region", slot: "panel" },
-            React.createElement(ErrorBoundary, { isPageLevelError: true }, tab.component))));
+            React.createElement(ErrorBoundary, { errorMsgInfo: t('There was an error loading manage tab. Please try refreshing the page.'), isPageLevelError: true }, tab.component))));
 }

package/lib/esm/components/ManageBookmarkedAccountsTab/AddEditBookmarkModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AddEditBookmarkModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageBookmarkedAccountsTab/AddEditBookmarkModal.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAStD,UAAU,MAAM;IACZ,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,MAAM,EAAE,CAAC,gBAAgB,EAAE,SAAS,EAAE,EAAE,aAAa,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACxE,gBAAgB,EAAE,SAAS,EAAE,CAAC;IAC9B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,uBAAuB,EAAE,SAAS,EAAE,CAAC;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,oBAAoB,UAAW,MAAM,gBAmIjD,CAAC"}
+{"version":3,"file":"AddEditBookmarkModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageBookmarkedAccountsTab/AddEditBookmarkModal.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAStD,UAAU,MAAM;IACZ,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,MAAM,EAAE,CAAC,gBAAgB,EAAE,SAAS,EAAE,EAAE,aAAa,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACxE,gBAAgB,EAAE,SAAS,EAAE,CAAC;IAC9B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,uBAAuB,EAAE,SAAS,EAAE,CAAC;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,oBAAoB,UAAW,MAAM,gBA2IjD,CAAC"}

package/lib/esm/components/ManageBookmarkedAccountsTab/AddEditBookmarkModal.js

@@ -10,6 +10,14 @@ export const AddEditBookmarkModal = (props) => {
     const [localSelectedBookmarks, setLocalSelectedBookmarks] = useState([]);
     const [isInValid, setIsInValid] = useState(false);
     const [saveButtonIsClicked, setSaveButtonIsClicked] = useState(false);
+    const [isPresentInGroups, setIsPresentInGroups] = useState(false);
+    const checkBookmarkPresent = () => {
+        if (!(props === null || props === void 0 ? void 0 : props.groups) || !(props === null || props === void 0 ? void 0 : props.selectedAccounts[0])) {
+            return false;
+        }
+        const firstSelectedGroup = props.selectedAccounts[0].bookmarkGroupName;
+        return props.groups.some((b) => b === selectedGroup && selectedGroup !== firstSelectedGroup);
+    };
     // only check if save button has been clicked once
     const checkIsInvalid = (group, selectedAccounts) => {
         const isInvalid = isEmpty(group === null || group === void 0 ? void 0 : group.trim()) || selectedAccounts.length === 0;
@@ -17,28 +25,34 @@ export const AddEditBookmarkModal = (props) => {
     };
     const resetModal = () => {
         setIsInValid(false);
+        setIsPresentInGroups(false);
         setSaveButtonIsClicked(false);
     };
     const save = () => {
         setSaveButtonIsClicked(true);
-        if (isEmpty(selectedGroup === null || selectedGroup === void 0 ? void 0 : selectedGroup.trim()) || localSelectedBookmarks.length === 0) {
+        let isInvalid = isEmpty(selectedGroup === null || selectedGroup === void 0 ? void 0 : selectedGroup.trim()) || localSelectedBookmarks.length === 0;
+        //check if there is already a bookmark with this name
+        if (checkBookmarkPresent()) {
+            isInvalid = true;
+            setIsPresentInGroups(true);
+        }
+        else {
+            setIsPresentInGroups(false);
+        }
+        if (isInvalid) {
             setIsInValid(true);
             return;
         }
         resetModal();
         props.onSave(localSelectedBookmarks, selectedGroup === null || selectedGroup === void 0 ? void 0 : selectedGroup.trim());
     };
-    const remove = () => {
-        props.onRemove(selectedGroup);
-        resetModal();
-        props.onClose();
-    };
     const close = () => {
         resetModal();
         props.onClose();
     };
     const onGroupInputBoxChanged = (group) => {
         setSelectedGroup(group);
+        setIsPresentInGroups(false);
         saveButtonIsClicked && checkIsInvalid(group, localSelectedBookmarks);
     };
     const onBookMarkAccountSelected = (selected) => {
@@ -56,19 +70,18 @@ export const AddEditBookmarkModal = (props) => {
             isEqual(props.selectedAccounts.map((a) => a.accountNumber).sort(), localSelectedBookmarks.map((a) => a.accountNumber).sort()) &&
             selectedGroup === ((_a = props.selectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.bookmarkGroupName));
     };
-    return (React.createElement(Modal, { id: "Add-edit-bookmark-modal", className: "pf-modal-overflow-visible", title: props.title, "aria-describedby": "Add-edit-bookmark-modal", isOpen: props.isOpen, onClose: props.onClose, showClose: true, onEscapePress: props.onClose, variant: ModalVariant.medium, actions: [
+    return (React.createElement(Modal, { id: "Add-edit-bookmark-modal", className: "pf-modal-overflow-visible", title: props.title, "aria-describedby": "Add-edit-bookmark-modal", isOpen: props.isOpen, onClose: close, showClose: true, onEscapePress: props.onClose, variant: ModalVariant.medium, actions: [
             React.createElement(Button, { key: "save", variant: ButtonVariant.primary, onClick: save, isDisabled: isInValid || isNothingIsChangedOnEditMode() },
                 React.createElement(Trans, null, "Save")),
             React.createElement(Button, { key: "cancel", variant: props.addMode ? ButtonVariant.link : ButtonVariant.secondary, onClick: close },
                 React.createElement(Trans, null, "Cancel")),
-            !props.addMode && (React.createElement(Button, { key: "remove", variant: ButtonVariant.link, onClick: remove, isDisabled: !props.groups.includes(selectedGroup), style: props.groups.includes(selectedGroup) ? { color: '#a30000' } : {} },
-                React.createElement(Trans, null, "Remove"))),
         ] },
         React.createElement("div", null,
             React.createElement("div", { className: "pf-u-mb-lg" },
+                React.createElement(BookmarkGroupSelector, { selectedGroup: selectedGroup, groups: props.groups, onGroupInputBoxChanged: onGroupInputBoxChanged, isInValid: isInValid && (isPresentInGroups || isEmpty(selectedGroup === null || selectedGroup === void 0 ? void 0 : selectedGroup.trim())), setIsInValid: setIsInValid, isPresentInGroups: isPresentInGroups })),
+            React.createElement("div", null,
                 React.createElement("label", { id: "add-bookmark-account-on-add-modal" },
                     React.createElement(Trans, null, "Account(s)"),
                     React.createElement("span", { className: "form-required", "aria-hidden": true }, "*")),
-                React.createElement(BookmarkAccountSelector, { defaultSelected: props.selectedAccounts, labelId: "add-bookmark-account-on-add-modal", bookmarkedGroupAccounts: props.bookmarkedGroupAccounts, onBookMarkAccountSelected: onBookMarkAccountSelected, addMode: props.addMode, isInValid: isInValid && isEmpty(localSelectedBookmarks) })),
-            React.createElement(BookmarkGroupSelector, { selectedGroup: selectedGroup, groups: props.groups, onGroupInputBoxChanged: onGroupInputBoxChanged, isInValid: isInValid && isEmpty(selectedGroup === null || selectedGroup === void 0 ? void 0 : selectedGroup.trim()) }))));
+                React.createElement(BookmarkAccountSelector, { defaultSelected: props.selectedAccounts, labelId: "add-bookmark-account-on-add-modal", bookmarkedGroupAccounts: props.bookmarkedGroupAccounts, onBookMarkAccountSelected: onBookMarkAccountSelected, addMode: props.addMode, isInValid: isInValid && isEmpty(localSelectedBookmarks) })))));
 };

package/lib/esm/components/ManageBookmarkedAccountsTab/BookmarkAccountSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BookmarkAccountSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageBookmarkedAccountsTab/BookmarkAccountSelector.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAGhF,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAUtD,UAAU,MAAM;IACZ,uBAAuB,EAAE,SAAS,EAAE,CAAC;IACrC,iBAAiB,CAAC,EAAE,kBAAkB,CAAC;IACvC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,yBAAyB,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,SAAS,EAAE,CAAC;IAC9B,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,eAyPpD;yBAzPe,uBAAuB"}
+{"version":3,"file":"BookmarkAccountSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageBookmarkedAccountsTab/BookmarkAccountSelector.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAGhF,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAUtD,UAAU,MAAM;IACZ,uBAAuB,EAAE,SAAS,EAAE,CAAC;IACrC,iBAAiB,CAAC,EAAE,kBAAkB,CAAC;IACvC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,yBAAyB,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,SAAS,EAAE,CAAC;IAC9B,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,eAwPpD;yBAxPe,uBAAuB"}

package/lib/esm/components/ManageBookmarkedAccountsTab/BookmarkAccountSelector.js

@@ -103,16 +103,16 @@ export function BookmarkAccountSelector(props) {
         })
             .map((a) => a.accountNumber)) ||
         [];
-    const removeAccountChip = (removedAccount) => {
+    const removeAccountLabel = (removedAccount) => {
         const updatedSelectedAccounts = remove(selected, (account) => account.accountNumber !== removedAccount.accountNumber);
         setSelected(updatedSelectedAccounts);
         props.onBookMarkAccountSelected(updatedSelectedAccounts);
     };
     const labelGroupComponent = () => {
-        return (React.createElement(LabelGroup, { numLabels: 2 }, (selected || []).map((currentChip) => (React.createElement(Label, { key: currentChip.accountNumber, onClose: () => removeAccountChip(currentChip), isTruncated: false, color: "cyan" },
-            currentChip.name,
+        return (React.createElement(LabelGroup, { numLabels: 2 }, (selected || []).map((currentLabel) => (React.createElement(Label, { key: currentLabel.accountNumber, onClose: () => removeAccountLabel(currentLabel), isTruncated: false, color: "cyan" },
+            currentLabel.name,
             " (",
-            currentChip.accountNumber,
+            currentLabel.accountNumber,
             ")")))));
     };
     useEffect(() => {

package/lib/esm/components/ManageBookmarkedAccountsTab/BookmarkGroupSelector.d.ts

@@ -1,8 +1,11 @@
+import React from 'react';
 interface IProps {
     groups: string[];
     onGroupInputBoxChanged: (group: string) => void;
     selectedGroup: string;
     isInValid: boolean;
+    setIsInValid: React.Dispatch<React.SetStateAction<boolean>>;
+    isPresentInGroups: boolean;
 }
 declare const BookmarkGroupSelector: (props: IProps) => JSX.Element;
 export { BookmarkGroupSelector };

package/lib/esm/components/ManageBookmarkedAccountsTab/BookmarkGroupSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BookmarkGroupSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageBookmarkedAccountsTab/BookmarkGroupSelector.tsx"],"names":[],"mappings":"AAKA,UAAU,MAAM;IACZ,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,sBAAsB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;CACtB;AAED,QAAA,MAAM,qBAAqB,UAAW,MAAM,gBAsE3C,CAAC;AAEF,OAAO,EAAE,qBAAqB,EAAE,CAAC"}
+{"version":3,"file":"BookmarkGroupSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageBookmarkedAccountsTab/BookmarkGroupSelector.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAGnD,UAAU,MAAM;IACZ,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,sBAAsB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5D,iBAAiB,EAAE,OAAO,CAAC;CAC9B;AAED,QAAA,MAAM,qBAAqB,UAAW,MAAM,gBAkD3C,CAAC;AAEF,OAAO,EAAE,qBAAqB,EAAE,CAAC"}

package/lib/esm/components/ManageBookmarkedAccountsTab/BookmarkGroupSelector.js

@@ -1,27 +1,11 @@
-import { Select, SelectOption, SelectVariant } from '@patternfly/react-core';
+import { Form, FormGroup, TextInput } from '@patternfly/react-core';
 import React, { useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 const BookmarkGroupSelector = (props) => {
     const { t } = useTranslation();
-    const [isOpen, setIsOpen] = useState(false);
     const [validated, setValidated] = useState('default');
-    const onToggle = (isOpen) => {
-        setIsOpen(isOpen);
-    };
-    const onSelect = (event, selection, isPlaceholder) => {
-        if (isPlaceholder)
-            clearSelection();
-        else {
-            setIsOpen(false);
-            props.onGroupInputBoxChanged(selection);
-        }
-    };
-    const onCreateOption = (newValue) => {
-        props.onGroupInputBoxChanged(newValue);
-    };
-    const clearSelection = () => {
-        setIsOpen(false);
-        props.onGroupInputBoxChanged('');
+    const onInputSave = (value) => {
+        props.onGroupInputBoxChanged(value);
     };
     useEffect(() => {
         if (props.isInValid) {
@@ -31,13 +15,15 @@ const BookmarkGroupSelector = (props) => {
             setValidated('default');
         }
     }, [props.isInValid]);
-    const titleId = 'group-name-select';
+    const titleId = 'group-name-input';
     return (React.createElement(React.Fragment, null,
         React.createElement("label", { id: titleId },
             React.createElement(Trans, null, "Bookmark name"),
             React.createElement("span", { className: "form-required", "aria-hidden": true }, "*")),
-        React.createElement(Select, { variant: SelectVariant.typeahead, typeAheadAriaLabel: t('Search for existing bookmarks or create a new one'), onToggle: onToggle, onSelect: onSelect, onClear: clearSelection, selections: props.selectedGroup, isOpen: isOpen, placeholderText: t('Search for existing bookmarks or create a new one'), isCreatable: true, noValidate: props.isInValid, onCreateOption: onCreateOption, "aria-labelledby": titleId, "aria-invalid": props.isInValid, "aria-describedby": "validated-helper", validated: validated }, props.groups.map((option, index) => (React.createElement(SelectOption, { key: index, value: option })))),
-        React.createElement("p", { id: "validated-helper", className: `form-instructions ${props.isInValid ? 'form-invalid' : ''}` },
-            React.createElement(Trans, null, "Enter a unique name to create a new bookmark or add accounts to an existing one."))));
+        React.createElement(Form, null,
+            React.createElement(FormGroup, { helperTextInvalid: props.isPresentInGroups
+                    ? t('A bookmark with this name already exists')
+                    : t('Add a name to your bookmark'), validated: validated },
+                React.createElement(TextInput, { value: props.selectedGroup, onChange: onInputSave, placeholder: t('Enter a unique name for your bookmark'), "aria-invalid": props.isInValid, validated: validated, selected: false, id: "bookmark-group-input", width: 200 })))));
 };
 export { BookmarkGroupSelector };

package/lib/esm/components/ManageBookmarkedAccountsTab/ManageGroupedBookmarkedAccountsTab.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ManageGroupedBookmarkedAccountsTab.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageBookmarkedAccountsTab/ManageGroupedBookmarkedAccountsTab.tsx"],"names":[],"mappings":"AAyCA,UAAU,MAAM;IACZ,yBAAyB,EAAE,OAAO,CAAC;CACtC;AAED,wBAAgB,kCAAkC,CAAC,EAAE,yBAAyB,EAAE,EAAE,MAAM,eA6XvF"}
+{"version":3,"file":"ManageGroupedBookmarkedAccountsTab.d.ts","sourceRoot":"","sources":["../../../../src/components/ManageBookmarkedAccountsTab/ManageGroupedBookmarkedAccountsTab.tsx"],"names":[],"mappings":"AA6CA,UAAU,MAAM;IACZ,yBAAyB,EAAE,OAAO,CAAC;CACtC;AAED,wBAAgB,kCAAkC,CAAC,EAAE,yBAAyB,EAAE,EAAE,MAAM,eA4YvF"}

package/lib/esm/components/ManageBookmarkedAccountsTab/ManageGroupedBookmarkedAccountsTab.js

@@ -7,7 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { AlertVariant, Button, ButtonVariant, Label, LabelGroup, Popover, PopoverPosition, SearchInput, } from '@patternfly/react-core';
+import { ActionList, ActionListItem, AlertVariant, Button, ButtonVariant, Label, LabelGroup, Popover, PopoverPosition, SearchInput, } from '@patternfly/react-core';
+import PencilAltIcon from '@patternfly/react-icons/dist/esm/icons/pencil-alt-icon';
+import TrashIcon from '@patternfly/react-icons/dist/esm/icons/trash-icon';
 import { defaultTableSortMethod, ErrorBoundary, ToastNotification, useConfirmation, } from '@rh-support/components';
 import { addEditbookmarks, getBookmarkGroups, removeGroupedBookmarks, removeWholeGroup, useGlobalDispatchContext, useGlobalStateContext, useGroupedBookmarkApiCalls, } from '@rh-support/react-context';
 import { ability, CaseListFields, resourceActions, resources } from '@rh-support/user-permissions';
@@ -15,6 +17,7 @@ import { promiseReflection } from '@rh-support/utils';
 import differenceBy from 'lodash/differenceBy';
 import groupBy from 'lodash/groupBy';
 import isEmpty from 'lodash/isEmpty';
+import isUndefined from 'lodash/isUndefined';
 import uniq from 'lodash/uniq';
 import React, { useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
@@ -94,7 +97,7 @@ export function ManageGroupedBookmarkedAccountsTab({ canManageBookmarkAccounts }
         });
         // remove already added accounts from selected accounts
         const accounts = selectedAccounts.filter((a) => !alreadyAdded.includes(a.accountNumber));
-        if (accounts.length === 0 && accountsRemovedFromGroup.length === 0) {
+        if (isEmpty(accounts) && isEmpty(accountsRemovedFromGroup)) {
             // clear the account selector inputbox
             if (isInAddMode) {
                 setLocalSelectedAccounts([]);
@@ -104,15 +107,29 @@ export function ManageGroupedBookmarkedAccountsTab({ canManageBookmarkAccounts }
             return;
         }
         try {
-            if (group === selectedGroupOnEdit) {
-                accountsRemovedFromGroup.map((account) => __awaiter(this, void 0, void 0, function* () { return yield apiCalls.removeAccountApiCalls(account); }));
-            }
-            // add bookmarks
             let response = undefined;
-            if (accounts.length !== 0) {
+            if (isInAddMode) {
                 response = yield apiCalls.addBookmarksApiCall(accounts, group);
             }
-            addEditbookmarks(dispatchGlobalContext, bookmarkedGroupAccounts.data, response, accounts, group, group === selectedGroupOnEdit ? accountsRemovedFromGroup : []);
+            else {
+                if (!isEmpty(accountsRemovedFromGroup)) {
+                    yield Promise.all(accountsRemovedFromGroup.map((account) => apiCalls.removeAccountApiCalls(account)));
+                }
+                const rootBookmarkId = allGroups[selectedGroupOnEdit][0].rootBookmarkId;
+                // if we are renaming bookmark then call edit bookmark api
+                if (group !== selectedGroupOnEdit) {
+                    // already existing bookmark accounts are deleted and new bookmark accounts are generated for this group
+                    response = yield apiCalls.editBookmarkApiCall(selectedAccounts, group, rootBookmarkId);
+                    selectedAccounts.forEach((a) => {
+                        if (!isUndefined(a.bookmarkId))
+                            accountsRemovedFromGroup.push(a);
+                    });
+                }
+                else if (!isEmpty(accounts)) {
+                    response = yield apiCalls.addBookmarksApiCall(accounts, group);
+                }
+            }
+            addEditbookmarks(dispatchGlobalContext, bookmarkedGroupAccounts.data, response, accounts, group, accountsRemovedFromGroup);
             // clear the account selector inputbox
             clearRef.current();
             ToastNotification.addSuccessMessage(t(`Account has been successfully updated`));
@@ -194,7 +211,7 @@ export function ManageGroupedBookmarkedAccountsTab({ canManageBookmarkAccounts }
             sortable: true,
             id: 'bookmark-group-name',
             title: t('Bookmark name'),
-            cellWidth: 25,
+            cellWidth: 20,
             sortMethod: (a, b) => defaultTableSortMethod(a.toLowerCase(), b.toLowerCase()),
         },
         {
@@ -208,23 +225,20 @@ export function ManageGroupedBookmarkedAccountsTab({ canManageBookmarkAccounts }
                 account.accountNumber,
                 ")"))))),
         },
+        {
+            id: 'bookmark-actions',
+            title: '',
+            sortable: false,
+            cellWidth: 10,
+            cell: (group) => (React.createElement(ActionList, { isIconList: true },
+                React.createElement(ActionListItem, null,
+                    React.createElement(Button, { variant: "plain", onClick: () => onOpenEditGroupOpenModal(group) },
+                        React.createElement(PencilAltIcon, null))),
+                React.createElement(ActionListItem, null,
+                    React.createElement(Button, { variant: "plain", onClick: () => removeGroup(group) },
+                        React.createElement(TrashIcon, null))))),
+        },
     ];
-    const actionResolver = (rowData) => {
-        //@ts-ignore
-        const group = (rowData === null || rowData === void 0 ? void 0 : rowData.cells[0]) || '';
-        return [
-            {
-                title: 'Edit',
-                onClick: () => onOpenEditGroupOpenModal(group),
-                itemKey: 'edit-bookmaked-group',
-            },
-            {
-                title: 'Remove',
-                onClick: () => removeGroup(group),
-                itemKey: 'remove-bookmaked-group',
-            },
-        ];
-    };
     const isValid = () => {
         return !localSelectedAccounts || localSelectedAccounts.length === 0;
     };
@@ -242,24 +256,25 @@ export function ManageGroupedBookmarkedAccountsTab({ canManageBookmarkAccounts }
                             React.createElement("a", { href: "https://source.redhat.com/communitiesatredhat/applications/integration-community-of-practice/misplaced/lostnfound/bookmarking", target: "_blank", rel: "noopener noreferrer" },
                                 ' ',
                                 "bookmarks in the customer support tool"))), closeBtnAriaLabel: "Close" },
-                    React.createElement("i", { "aria-label": "Cluster Id Info", className: "m-l-1 fa fa-question-circle" }))))),
+                    React.createElement("i", { "aria-label": "Cluster Id Info", className: "m-l-1 fa fa-info-circle" }))))),
         React.createElement("div", { className: "toolbar" },
             React.createElement("form", { className: "toolbar-left" },
                 React.createElement("label", { htmlFor: "bookmark-account-selector" },
-                    React.createElement(Trans, null, "Bookmark")),
+                    React.createElement(Trans, null, "Search accounts")),
                 React.createElement("span", { className: "bookmark-account" },
                     React.createElement(BookmarkAccountSelector, { clearRef: clearRef, labelId: "bookmark-account-selector", isDisabled: !loggedInUserRights.data.isInternal() || !canBookmarkAccounts, bookmarkedGroupAccounts: bookmarkedGroupAccounts.data, onBookMarkAccountSelected: onBookMarkAccountSelected, addMode: true, isInValid: false })),
                 React.createElement("span", { className: "pf-u-ml-sm" },
                     React.createElement(Button, { variant: ButtonVariant.primary, isInline: true, onClick: onOpenAddBookmarkModal, "data-tracking-id": "bookmark-add-button", isDisabled: isValid() || apiCalls.isAddingBookmark },
-                        React.createElement(Trans, null, "Add")))),
+                        React.createElement(Trans, null, "Add bookmark")))),
             React.createElement("div", { className: "toolbar-right" },
                 React.createElement("label", { htmlFor: "search-bookmark-account-selector" },
                     React.createElement(Trans, null, "Filter by")),
                 React.createElement(SearchInput, { className: "pf-u-flex-grow-1 pf-c-search-input pf-u-background-color-100", value: searchString, id: "search-bookmark-account-selector", placeholder: t('Search for a bookmark'), "aria-label": t('Filter by searching for a bookmark'), onChange: setSearchString, onClear: () => setSearchString('') }))),
-        React.createElement(AddEditBookmarkModal, { selectedAccounts: isInAddMode ? localSelectedAccounts : editGroupSelectedAccounts, groups: groups, isOpen: isUpdateBookmarkModalOpen, onSave: onAddEditBookmarksSave, onClose: closeAddEditBookmarkModal, onRemove: removeGroup, bookmarkedGroupAccounts: bookmarkedGroupAccounts.data, addMode: isInAddMode, title: isInAddMode ? t('Create or add to an existing bookmark') : t('Edit bookmark') }),
+        React.createElement(AddEditBookmarkModal, { selectedAccounts: isInAddMode ? localSelectedAccounts : editGroupSelectedAccounts, groups: groups, isOpen: isUpdateBookmarkModalOpen, onSave: onAddEditBookmarksSave, onClose: closeAddEditBookmarkModal, onRemove: removeGroup, bookmarkedGroupAccounts: bookmarkedGroupAccounts.data, addMode: isInAddMode, title: isInAddMode ? t('Add a bookmark') : t('Edit bookmark') }),
         React.createElement(ErrorBoundary, { errorMsgInfo: { message: t('There was an error loading bookmarked accounts list') } },
             React.createElement(ManageTable, { ariaLabel: t('Table to manage bookmarks'), columns: columns, data: groupNames, sortInfo: { column: 'bookmark-group-name', direction: 'asc' }, errorVariant: AlertVariant.warning, isFetching: bookmarkedGroupAccounts.isFetching ||
                     loggedInUser.isFetching ||
                     apiCalls.isAddingBookmark ||
-                    apiCalls.isRemovingBookmark, isError: bookmarkedGroupAccounts.isError, errorTitle: t('Bookmarked accounts error'), errorComponent: React.createElement(Trans, null, "Could not get bookmarked accounts"), actionResolver: bookmarkedGroupAccounts.data.length !== 0 ? actionResolver : null, noResultText: t('There are no results to display. Try adding a bookmark or refining your search') }))));
+                    apiCalls.isRemovingBookmark ||
+                    apiCalls.isEditingBookmark, isError: bookmarkedGroupAccounts.isError, errorTitle: t('Bookmarked accounts error'), errorComponent: React.createElement(Trans, null, "Could not get bookmarked accounts"), noResultText: t('There are no results to display. Try adding a bookmark or refining your search') }))));
 }

package/lib/esm/components/ManagePreferences/sections/PreferencesCaseCreate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PreferencesCaseCreate.d.ts","sourceRoot":"","sources":["../../../../../src/components/ManagePreferences/sections/PreferencesCaseCreate.tsx"],"names":[],"mappings":"AAoBA,UAAU,MAAM;CAAG;AACnB,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,eAkKlD"}
+{"version":3,"file":"PreferencesCaseCreate.d.ts","sourceRoot":"","sources":["../../../../../src/components/ManagePreferences/sections/PreferencesCaseCreate.tsx"],"names":[],"mappings":"AAmBA,UAAU,MAAM;CAAG;AACnB,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,eA8KlD"}

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

@@ -7,11 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { publicApi } from '@cee-eng/hydrajs';
 import { Card, CardBody, CardHeader, SelectOption } from '@patternfly/react-core';
-import { ToastNotification } from '@rh-support/components';
-import { fetchCaseGroupsForSSO, fetchLanguageMetadata, GlobalMetadataDispatchContext, GlobalMetadataStateContext, } from '@rh-support/react-context';
+import { ToastNotification, useFetch } from '@rh-support/components';
+import { fetchLanguageMetadata, GlobalMetadataDispatchContext, GlobalMetadataStateContext, } from '@rh-support/react-context';
 import { haventLoadedMetadata, PreferredLanguages } from '@rh-support/utils';
-import invert from 'lodash/invert';
 import isEmpty from 'lodash/isEmpty';
 import map from 'lodash/map';
 import React, { useContext, useEffect, useState } from 'react';
@@ -20,9 +20,43 @@ import { useUserPreferences } from '../../../hooks/useUserPreferences';
 import { PreferenceSelect } from '../components/PreferenceSelect';
 export function PreferencesCaseCreate(props) {
     const { t } = useTranslation();
-    const { globalMetadataState: { caseGroups, caseLanguages, loggedInUserJwtToken }, } = useContext(GlobalMetadataStateContext);
+    const { globalMetadataState: { caseGroups, caseLanguages, loggedInUserJwtToken, loggedInUserRights, loggedInUsersAccount, }, } = useContext(GlobalMetadataStateContext);
     const dispatchToGlobalMetadataReducer = useContext(GlobalMetadataDispatchContext);
     const languageConst = caseLanguages.data;
+    const getDefaultGroupFetch = useFetch(publicApi.caseGroups.getCaseGroupsForSSO, {
+        propgateErrors: true,
+    });
+    const toggleDefaultGroupFetch = useFetch(publicApi.caseGroups.toggleDefaultGroup, {
+        propgateErrors: true,
+    });
+    useEffect(() => {
+        const grabDefaultGroupList = (ssoUser) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                let list = yield getDefaultGroupFetch.request(ssoUser);
+                setUserDefaultGroupList(list);
+                let filteredDefaultGroup = (list ? list : []).filter((group) => group.isDefault === true);
+                if (!isEmpty(filteredDefaultGroup)) {
+                    setOriginalDefaultGroup(filteredDefaultGroup[0].name);
+                }
+                else {
+                    setOriginalDefaultGroup('Ungrouped Case');
+                }
+            }
+            catch (error) {
+                console.log(error);
+            }
+        });
+        grabDefaultGroupList(loggedInUserRights.data.getSSOUsername());
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [loggedInUserRights, caseGroups]);
+    const updateDefaultGroupPref = (groupNum) => __awaiter(this, void 0, void 0, function* () {
+        try {
+            yield toggleDefaultGroupFetch.request(groupNum, loggedInUserRights.data.getSSOUsername(), true, loggedInUsersAccount.data.secureSupport);
+        }
+        catch (error) {
+            console.log(error);
+        }
+    });
     useEffect(() => {
         if (haventLoadedMetadata(caseLanguages)) {
             fetchLanguageMetadata(dispatchToGlobalMetadataReducer);
@@ -35,9 +69,8 @@ export function PreferencesCaseCreate(props) {
     }));
     const [originalPreferredLanguage, setOriginalPreferredLanguage] = useState('');
     const [originalDefaultGroup, setOriginalDefaultGroup] = useState('');
-    const [groupDictionary, setGroupDictionary] = useState({});
-    const [userDefaultGroupList, setUserDefaultGroupList] = useState([]);
-    const { getPreferredLanguage, updatePreferredLanguage, updateDefaultGroup, getDefaultGroup } = useUserPreferences();
+    const [userDefaultGroupList, setUserDefaultGroupList] = useState();
+    const { getPreferredLanguage, updatePreferredLanguage } = useUserPreferences();
     const preferredLangTitleId = 'preferred-language-select';
     const defaultGroupTitleId = 'default-group-select';
     const getLanguageKey = (selection) => {
@@ -60,53 +93,21 @@ export function PreferencesCaseCreate(props) {
         }
     });
     const onDefaultGroupSelect = (event, selection, isPlaceholder) => __awaiter(this, void 0, void 0, function* () {
-        const selectionKey = invert(groupDictionary)[selection];
         try {
-            yield updateDefaultGroup(selectionKey);
-            setOriginalDefaultGroup(selection);
+            if (selection === 'Ungrouped Case') {
+                updateDefaultGroupPref('-1');
+            }
+            if (!isEmpty(userDefaultGroupList)) {
+                let filteredGroupSelect = userDefaultGroupList.filter((group) => group.name === selection);
+                yield updateDefaultGroupPref(filteredGroupSelect[0].groupNum);
+                setOriginalDefaultGroup(filteredGroupSelect[0].name);
+            }
         }
         catch (error) {
             console.log(error);
         }
     });
-    const createCaseGroupStruct = (caseGroups) => {
-        const defaultGroupDictionary = {};
-        for (let i = 0; i < caseGroups.data.length; i++) {
-            defaultGroupDictionary[caseGroups.data[i].groupNum] = caseGroups.data[i].name;
-        }
-        return defaultGroupDictionary;
-    };
-    //Set user default group after group obj built
-    useEffect(() => {
-        const userOriginalDefaultGroup = () => __awaiter(this, void 0, void 0, function* () {
-            try {
-                const retrievedGroupId = yield getDefaultGroup();
-                setOriginalDefaultGroup(groupDictionary[retrievedGroupId]);
-            }
-            catch (e) {
-                ToastNotification.addWarningMessage(t('Failed to fetch original preference'));
-            }
-        });
-        userOriginalDefaultGroup();
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [groupDictionary]);
-    // used to build the groups object and fetch pref language
     useEffect(() => {
-        const refreshParsedGroups = () => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (haventLoadedMetadata(caseGroups, (data) => data === undefined)) {
-                yield fetchCaseGroupsForSSO(dispatchToGlobalMetadataReducer, loggedInUserJwtToken.username);
-            }
-            if (!isEmpty(caseGroups) && ((_a = caseGroups === null || caseGroups === void 0 ? void 0 : caseGroups.data) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-                let updatedDictionary = createCaseGroupStruct(caseGroups);
-                setGroupDictionary(updatedDictionary);
-                const parsedDefaultGroupNames = [];
-                for (let groupId in updatedDictionary) {
-                    parsedDefaultGroupNames.push(updatedDictionary[groupId]);
-                }
-                setUserDefaultGroupList(parsedDefaultGroupNames);
-            }
-        });
         const userOriginalPreferredLanguage = () => __awaiter(this, void 0, void 0, function* () {
             try {
                 const retrievedLanguage = yield getPreferredLanguage();
@@ -117,7 +118,6 @@ export function PreferencesCaseCreate(props) {
                 ToastNotification.addWarningMessage(t('Failed to fetch original preference'));
             }
         });
-        refreshParsedGroups();
         userOriginalPreferredLanguage();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [caseLanguages, caseGroups, dispatchToGlobalMetadataReducer, loggedInUserJwtToken]);
@@ -132,5 +132,5 @@ export function PreferencesCaseCreate(props) {
                     React.createElement("p", { className: "form-instructions" },
                         React.createElement(Trans, null, "Preferred language will impact future cases, not existing ones."))),
                 React.createElement("div", { className: "form-group" },
-                    React.createElement(PreferenceSelect, { label: "Default group", id: defaultGroupTitleId, onSelect: onDefaultGroupSelect, selections: originalDefaultGroup }, userDefaultGroupList.map((option, index) => (React.createElement(SelectOption, { key: index, value: option })))))))));
+                    React.createElement(PreferenceSelect, { label: "Default group", id: defaultGroupTitleId, onSelect: onDefaultGroupSelect, selections: originalDefaultGroup }, (userDefaultGroupList ? userDefaultGroupList : []).map((option, index) => (React.createElement(SelectOption, { key: index, value: option.name })))))))));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/manage",
-    "version": "1.0.30",
+    "version": "1.0.32",
     "description": "Customer Support Manage App",
     "author": "Jordan Eudy <jeudy100@gmail.com>",
     "homepage": "",
@@ -94,9 +94,9 @@
         "@patternfly/pfe-tabs": "1.12.3",
         "@patternfly/react-core": "4.264.0",
         "@patternfly/react-table": "4.111.33",
-        "@rh-support/components": "1.2.14",
+        "@rh-support/components": "1.2.16",
         "@rh-support/configs": "1.0.0",
-        "@rh-support/react-context": "1.0.21",
+        "@rh-support/react-context": "1.0.23",
         "@rh-support/types": "0.2.0",
         "@rh-support/user-permissions": "1.0.11",
         "@rh-support/utils": "1.0.9",
@@ -109,5 +109,5 @@
         "react-i18next": ">=10.11.0",
         "react-router-dom": ">=5.1.2"
     },
-    "gitHead": "ba8c19db472fb4f0af4bc6128cb8b1a49033e2ce"
+    "gitHead": "af45effefff4d9434a171992428c249f80fc84ce"
 }