@rh-support/cases 0.2.40 → 0.2.41

package/lib/esm/components/case-list/CaseList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseList.d.ts","sourceRoot":"","sources":["../../../../src/components/case-list/CaseList.tsx"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,CAAC;AAChC,OAAO,0BAA0B,CAAC;AA4BlC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAKH,0BAA0B,EAI7B,MAAM,mBAAmB,CAAC;AAK3B,OAAO,EAAE,mBAAmB,EAAe,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAM1C,OAAO,EAAgB,WAAW,EAA2B,MAAM,uBAAuB,CAAC;AA2B3F,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,uBAAwB,SAAQ,cAAc;IAC3D,YAAY,EAAE,cAAc,EAAE,CAAC;CAClC;AAED,oBAAY,YAAY,GAAG,0BAA0B,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;AAM5F,MAAM,WAAW,gBAAgB;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;CAChC;AAED,MAAM,WAAW,aAAa;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,eAubrC"}
+{"version":3,"file":"CaseList.d.ts","sourceRoot":"","sources":["../../../../src/components/case-list/CaseList.tsx"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,CAAC;AAChC,OAAO,0BAA0B,CAAC;AA4BlC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAKH,0BAA0B,EAI7B,MAAM,mBAAmB,CAAC;AAK3B,OAAO,EAAE,mBAAmB,EAAe,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAM1C,OAAO,EAAgB,WAAW,EAA2B,MAAM,uBAAuB,CAAC;AA2B3F,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,uBAAwB,SAAQ,cAAc;IAC3D,YAAY,EAAE,cAAc,EAAE,CAAC;CAClC;AAED,oBAAY,YAAY,GAAG,0BAA0B,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;AAM5F,MAAM,WAAW,gBAAgB;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;CAChC;AAED,MAAM,WAAW,aAAa;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,eA4brC"}

package/lib/esm/components/case-list/CaseList.js

@@ -258,16 +258,15 @@ export function CaseList(props) {
             // move saved user data in localstorage to user preferences db - needs to be removed after a while
             useMoveCache.save();
             // set filter state based on url or default saved search
-            useFilterStateInit.set(queryFromUrl, pageSizeFromUrl, currentPageFromUrl, searchType);
+            const initFilterState = useFilterStateInit.set(queryFromUrl, pageSizeFromUrl, currentPageFromUrl, searchType);
             // set default params when they are empty
             if (!queryFromUrl) {
                 searchParams[FILTER_URL_QUERY_SEARCH_PARAM] = ' orderBy lastModifiedDate desc';
             }
-            props.routeProps.history.replace({
-                search: getStringifiedParams(searchParams),
-            });
             setCurrentQuery(CaseListDispatch, queryFromUrl);
             isFirstMount.current = false;
+            // we only update the state without api call as we fetch result in another useEffect that observes the state
+            updateFilterState(filterDispatch, initFilterState);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [

package/lib/esm/components/case-list/case-search/BookmarkedSearchesSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BookmarkedSearchesSelector.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/BookmarkedSearchesSelector.tsx"],"names":[],"mappings":"AAuBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAOhE,UAAU,MAAM;IACZ,uBAAuB,EAAE,MAAM,CAAC;IAChC,iBAAiB,EAAE,mBAAmB,CAAC;CAC1C;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,eAyMvD"}
+{"version":3,"file":"BookmarkedSearchesSelector.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/BookmarkedSearchesSelector.tsx"],"names":[],"mappings":"AAwBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAWhE,UAAU,MAAM;IACZ,uBAAuB,EAAE,MAAM,CAAC;IAChC,iBAAiB,EAAE,mBAAmB,CAAC;CAC1C;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,eA6MvD"}

package/lib/esm/components/case-list/case-search/BookmarkedSearchesSelector.js

@@ -3,13 +3,14 @@ import PencilAltIcon from '@patternfly/react-icons/dist/js/icons/pencil-alt-icon
 import StarIcon from '@patternfly/react-icons/dist/js/icons/star-icon';
 import { ConfirmationServiceProvider } from '@rh-support/components';
 import { GlobalMetadataStateContext, UserPreferencesKeys } from '@rh-support/react-context';
+import filter from 'lodash/filter';
 import find from 'lodash/find';
 import flatMap from 'lodash/flatMap';
 import isEmpty from 'lodash/isEmpty';
 import isEqual from 'lodash/isEqual';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
-import { CaseListFilterDispatchContext, CaseListFilterStateContext } from '../CaseListFilterContext';
+import { CaseListFilterDispatchContext, CaseListFilterStateContext, initialCaseFilterState, } from '../CaseListFilterContext';
 import { isNoFilterApplied, isOnlyDefaultFilterApplied } from '../CaseListFilterHelpers';
 import { clearFilters, updateFilterQuery, updateFilterState, updateSort } from '../CaseListFilterReducer';
 import { SaveCaseSearchModal } from './SaveCaseSearchModal';
@@ -21,7 +22,7 @@ export function BookmarkedSearchesSelector(props) {
     const [mostRecentSearch, setMostRecentSearch] = useState({});
     const [selectedSearch, setSelectedSearch] = useState('');
     const filterState = useContext(CaseListFilterStateContext);
-    const { filterQueryInfo, filterInfo, sortInfo } = filterState;
+    const { filterQueryInfo, filterInfo } = filterState;
     const [isSaveSearchModalOpen, setIsSaveSearchModalOpen] = useState(false);
     const [isMenuOpen, toggleMenu] = useState(false);
     const isUpdatingFilters = useRef(false);
@@ -46,16 +47,17 @@ export function BookmarkedSearchesSelector(props) {
     }, [props.currentCaseSearchString]);
     useEffect(() => {
         if (selectedSearch && bookmarkedSearches[selectedSearch] && !isUpdatingFilters.current) {
-            const { filterState: filterStateSaved, queryString, type, sortState } = bookmarkedSearches[selectedSearch];
+            const { filterState: savedSearchFilterInfo, type: savedSearchType } = bookmarkedSearches[selectedSearch];
             // if selected bookmark search is equal to the current filter state
-            const isFilterStatesEqual = isEqual({ filterInfo: filterStateSaved, sortInfo: sortState, filterQueryInfo: { queryString, type } }, { filterInfo, filterQueryInfo, sortInfo });
-            // if they are not means filters have changed and we should give user a chance to bookmark another search
-            if (!isFilterStatesEqual) {
+            const isFilterStatesEqual = isEqual(filter(savedSearchFilterInfo, (i) => i.length !== 0), filter(filterInfo, (i) => i.length !== 0));
+            // if selected saved search and current selected filters are not equal, we need to enable saved
+            // search button and we need to give user ability to bookmark another search
+            if (!isFilterStatesEqual || savedSearchType !== filterQueryInfo.type) {
                 setSelectedSearch('');
             }
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [filterInfo, filterQueryInfo, sortInfo]);
+    }, [filterInfo, filterQueryInfo]);
     const onMenuToggle = () => {
         toggleMenu(!isMenuOpen);
     };
@@ -67,7 +69,7 @@ export function BookmarkedSearchesSelector(props) {
         const { filterState: filterStateSaved, queryString, type, sortState } = searchQuery;
         // update filters with new value
         queryString && updateFilterQuery(dispatch, { queryString, type });
-        filterState && updateFilterState(dispatch, { filterInfo: Object.assign(Object.assign({}, filterState.filterInfo), filterStateSaved) });
+        updateFilterState(dispatch, { filterInfo: Object.assign(Object.assign({}, initialCaseFilterState.filterInfo), filterStateSaved) });
         sortState && updateSort(dispatch, sortState);
         doToggle && toggleMenu(!isMenuOpen);
         isUpdatingFilters.current = false;
@@ -77,6 +79,7 @@ export function BookmarkedSearchesSelector(props) {
         toggleMenu(false);
     };
     const onEditSavedSearchClick = (searchName) => (e) => {
+        e.preventDefault();
         e.stopPropagation();
         setSelectedSearchNameToEdit(searchName);
         setIsAddingBookmarkSearch(false);
@@ -120,6 +123,5 @@ export function BookmarkedSearchesSelector(props) {
                     ], splitButtonVariant: "action", onToggle: onMenuToggle, "aria-label": t(`${isMenuOpen ? 'Close' : 'Open'} bookmarked searches selector'`), isDisabled: !bookmarkedSearches }), disabled: hydraUserPreferences.isFetching || hydraUserPreferences.isError }),
             flatMap(filterInfo).length === 0 && (React.createElement(Button, { variant: "link", onClick: onBookmarkSelectorChange('', mostRecentSearch, false), "data-tracking-id": "case-most-recent-search-button", className: "most-recent-search-button" },
                 React.createElement(Trans, null, "Restore most recent filters")))),
-        React.createElement(ConfirmationServiceProvider, null,
-            React.createElement(SaveCaseSearchModal, { isModalOpen: isSaveSearchModalOpen, modalToggle: modalToggle, isAdding: isAddingBookmarkSearch, selectedSearchNameToEdit: selectedSearchNameToEdit }))));
+        React.createElement(ConfirmationServiceProvider, null, isSaveSearchModalOpen && (React.createElement(SaveCaseSearchModal, { isModalOpen: isSaveSearchModalOpen, modalToggle: modalToggle, isAdding: isAddingBookmarkSearch, selectedSearchNameToEdit: selectedSearchNameToEdit })))));
 }

package/lib/esm/components/case-list/case-search/CaseSearch.js

@@ -65,7 +65,7 @@ export function CaseSearch() {
         setSearchType(newType);
     };
     // To check is Search Button is disabled or not
-    const isSearchButtonDisabled = isEmpty(filterQueryInfo.queryString) && isEmpty(searchVal.trim());
+    const isSearchButtonDisabled = isEmpty(filterQueryInfo.queryString) && isEmpty(searchVal === null || searchVal === void 0 ? void 0 : searchVal.trim());
     // To handle return or enter keydown event when search button is disabled
     const handleSearchInputKeyDown = (e) => {
         const key = e.which;
@@ -82,7 +82,7 @@ export function CaseSearch() {
     const renderBasicSearch = () => {
         return (React.createElement(React.Fragment, null,
             React.createElement("div", { className: "case-search-input-container" },
-                React.createElement(SearchInput, { className: "pf-u-w-100", placeholder: t('Search by keyword or case ID'), value: searchVal.trim(), "data-tracking-id": "search-cases-text-input", id: "case-search-basic", "aria-label": t('Search by keyword or case ID'), onChange: onSearchValChange, onClear: clearSearchVal }),
+                React.createElement(SearchInput, { className: "pf-u-w-100", placeholder: t('Search by keyword or case ID'), value: searchVal === null || searchVal === void 0 ? void 0 : searchVal.trim(), "data-tracking-id": "search-cases-text-input", id: "case-search-basic", "aria-label": t('Search by keyword or case ID'), onChange: onSearchValChange, onClear: clearSearchVal }),
                 React.createElement(Button, { variant: "primary", type: "submit", className: "search-btn", "data-tracking-id": "case-list-search-button", isDisabled: isSearchButtonDisabled },
                     React.createElement(Trans, null, "Search")),
                 canUseAdvancedSearch && (React.createElement(Button, { variant: "link", onClick: () => onSearchTypeChange(CaseSearchQueryType.ADVANCED), isDisabled: isFetching, "data-tracking-id": "case-list-adv-toggle-button" },
@@ -95,5 +95,5 @@ export function CaseSearch() {
     return (React.createElement(React.Fragment, null,
         React.createElement("form", { onSubmit: handleSubmit, onKeyDown: handleSearchInputKeyDown },
             React.createElement("div", { className: "form-group case-search-form-group" }, CaseSearchQueryType.BASIC === searchType ? renderBasicSearch() : renderAdvanceSearch())),
-        React.createElement(BookmarkedSearchesSelector, { currentCaseSearchString: searchVal.trim(), currentSearchType: searchType })));
+        React.createElement(BookmarkedSearchesSelector, { currentCaseSearchString: searchVal === null || searchVal === void 0 ? void 0 : searchVal.trim(), currentSearchType: searchType })));
 }

package/lib/esm/components/case-list/case-search/SaveCaseSearchModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SaveCaseSearchModal.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/SaveCaseSearchModal.tsx"],"names":[],"mappings":"AA2BA,UAAU,MAAM;IACZ,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,wBAAwB,EAAE,MAAM,CAAC;CACpC;AAED,wBAAgB,mBAAmB,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,wBAAwB,EAAE,EAAE,MAAM,eAuP3G"}
+{"version":3,"file":"SaveCaseSearchModal.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/SaveCaseSearchModal.tsx"],"names":[],"mappings":"AA2BA,UAAU,MAAM;IACZ,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,wBAAwB,EAAE,MAAM,CAAC;CACpC;AAED,wBAAgB,mBAAmB,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,wBAAwB,EAAE,EAAE,MAAM,eAgQ3G"}

package/lib/esm/components/case-list/case-search/SaveCaseSearchModal.js

@@ -13,6 +13,7 @@ import { GlobalMetadataDispatchContext, GlobalMetadataStateContext, updateUserPr
 import find from 'lodash/find';
 import findKey from 'lodash/findKey';
 import isEmpty from 'lodash/isEmpty';
+import pickBy from 'lodash/pickBy';
 import React, { useContext, useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { createUserFriendlyQueryFromFilterState } from '../../../utils/caseSearchUtils';
@@ -22,14 +23,17 @@ export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, select
     const [localSavedSearchName, setLocalSavedSearchName] = useState('');
     const [localDefaultChecked, setLocalDefaultChecked] = useState(false);
     const [isUpdating, setIsUpdating] = useState(false);
-    const confirmRemove = useConfirmation();
     const [isDuplicateNameError, setIsDuplicateNameError] = useState(false);
-    const { globalMetadataState: { loggedInUserRights, hydraUserPreferences }, } = useContext(GlobalMetadataStateContext);
+    const [saveButtonIsClicked, setSaveButtonIsClicked] = useState(false);
+    const filterState = useContext(CaseListFilterStateContext);
+    const { filterQueryInfo, filterInfo, sortInfo } = filterState;
+    const { globalMetadataState } = useContext(GlobalMetadataStateContext);
+    const { hydraUserPreferences, loggedInUserRights } = globalMetadataState;
+    const confirmRemove = useConfirmation();
     const dispatchToGlobalMetadataReducer = useContext(GlobalMetadataDispatchContext);
-    const { filterInfo, sortInfo, filterQueryInfo } = useContext(CaseListFilterStateContext);
     const handleSaveSearchNameChange = (value) => {
         setLocalSavedSearchName(value);
-        if (previousBookmarkedSearchesObj[value]) {
+        if (previousBookmarkedSearchesObj[value] && selectedSearchNameToEdit !== value) {
             setIsDuplicateNameError(true);
         }
         else {
@@ -55,43 +59,40 @@ export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, select
             previousBookmarkedSearchesObj[defaultSavedSearchKey].defaultChecked = false;
         }
     };
-    const addSavedSearch = () => __awaiter(this, void 0, void 0, function* () {
+    const save = () => __awaiter(this, void 0, void 0, function* () {
+        setSaveButtonIsClicked(true);
+        if (isEmpty(localSavedSearchName.trim()) || isDuplicateNameError)
+            return;
         try {
             setIsUpdating(true);
-            previousBookmarkedSearchesObj[localSavedSearchName] = Object.assign({ filterState: filterInfo, sortState: sortInfo, defaultChecked: localDefaultChecked }, filterQueryInfo);
             // if new added search has 'set default' true,
             // need to remove old default search if there is any
             localDefaultChecked && setDefaultSearchToFalse();
-            yield preferencesApiCall(previousBookmarkedSearchesObj);
-            setIsUpdating(false);
-            ToastNotification.addSuccessMessage(t('Saved search has been updated successfully'));
-            modalToggle();
-        }
-        catch (e) {
-            setIsUpdating(false);
-            ToastNotification.addDangerMessage(t('Saved search failed to update'));
-            modalToggle();
-        }
-    });
-    const onSearchEdit = () => __awaiter(this, void 0, void 0, function* () {
-        try {
-            setIsUpdating(true);
-            // if editted search has 'set default' true,
-            // need to remove old default search if there is any
-            localDefaultChecked && setDefaultSearchToFalse();
-            // add new member to obj
-            previousBookmarkedSearchesObj[localSavedSearchName] = Object.assign(Object.assign({}, previousBookmarkedSearchesObj[selectedSearchNameToEdit]), { defaultChecked: localDefaultChecked });
-            // name changed, need to deleted old obj member
-            if (localSavedSearchName !== selectedSearchNameToEdit) {
-                delete previousBookmarkedSearchesObj[selectedSearchNameToEdit];
+            if (isAdding) {
+                previousBookmarkedSearchesObj[localSavedSearchName] = {
+                    filterState: pickBy(filterState.filterInfo, (value) => value.length !== 0),
+                    sortState: sortInfo,
+                    type: filterState.filterQueryInfo.type,
+                    defaultChecked: localDefaultChecked,
+                };
+            }
+            else {
+                // user can only edit saved search name and `set default` checkbox
+                previousBookmarkedSearchesObj[localSavedSearchName] = Object.assign(Object.assign({}, previousBookmarkedSearchesObj[selectedSearchNameToEdit]), { defaultChecked: localDefaultChecked });
+                // Because saved search name changed, need to deleted old name obj
+                if (localSavedSearchName !== selectedSearchNameToEdit) {
+                    delete previousBookmarkedSearchesObj[selectedSearchNameToEdit];
+                }
             }
             yield preferencesApiCall(previousBookmarkedSearchesObj);
             setIsUpdating(false);
+            setSaveButtonIsClicked(false);
             ToastNotification.addSuccessMessage(t('Saved search has been updated successfully'));
             modalToggle();
         }
         catch (e) {
             setIsUpdating(false);
+            setSaveButtonIsClicked(false);
             ToastNotification.addDangerMessage(t('Saved search failed to update'));
             modalToggle();
         }
@@ -103,6 +104,8 @@ export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, select
                 catchOnCancel: true,
                 title: t(`Delete saved search?`),
                 description: React.createElement(Trans, null, "This will permanently remove it from your list of saved searches."),
+                confirmText: t('Delete'),
+                confirmButtonVariant: ButtonVariant.danger,
             });
             try {
                 delete previousBookmarkedSearchesObj[localSavedSearchName];
@@ -118,16 +121,22 @@ export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, select
             // on confirm modal, cancel button is clicked
         }
     });
+    const closeModal = () => {
+        setSaveButtonIsClicked(false);
+        setLocalSavedSearchName('');
+        modalToggle();
+    };
     useEffect(() => {
         var _a;
         setLocalSavedSearchName(selectedSearchNameToEdit);
         setLocalDefaultChecked(((_a = previousBookmarkedSearchesObj[selectedSearchNameToEdit]) === null || _a === void 0 ? void 0 : _a.defaultChecked) || false);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [selectedSearchNameToEdit]);
-    return (React.createElement(Modal, { variant: ModalVariant.medium, title: isAdding ? t('Save search and filters') : t('Edit saved search and filters'), isOpen: isModalOpen, onClose: modalToggle, actions: [
-            React.createElement(Button, { key: "save", variant: ButtonVariant.primary, isLoading: isUpdating, spinnerAriaValueText: hydraUserPreferences.isFetching ? 'Saving' : undefined, isDisabled: isEmpty(localSavedSearchName.trim()) || isDuplicateNameError || hydraUserPreferences.isFetching, "data-tracking-id": isAdding ? 'case-list-bookmark-search-saved' : 'case-list-bookmark-search-edited', onClick: isAdding ? addSavedSearch : onSearchEdit },
+    }, [filterInfo, filterQueryInfo.queryString, isAdding, selectedSearchNameToEdit]);
+    return (React.createElement(Modal, { variant: ModalVariant.medium, title: isAdding ? t('Save search and filters') : t('Edit saved search and filters'), isOpen: isModalOpen, onClose: closeModal, style: { overflow: 'visible' }, actions: [
+            React.createElement(Button, { key: "save", variant: ButtonVariant.primary, isLoading: isUpdating, spinnerAriaValueText: hydraUserPreferences.isFetching ? 'Saving' : undefined, isDisabled: hydraUserPreferences.isFetching ||
+                    (saveButtonIsClicked && (isEmpty(localSavedSearchName.trim()) || isDuplicateNameError)), "data-tracking-id": isAdding ? 'case-list-bookmark-search-saved' : 'case-list-bookmark-search-edited', onClick: save },
                 React.createElement(Trans, null, "Save")),
-            React.createElement(Button, { key: "cancel", variant: ButtonVariant.secondary, "data-tracking-id": "case-list-bookmark-search-canceled", onClick: modalToggle },
+            React.createElement(Button, { key: "cancel", variant: ButtonVariant.secondary, "data-tracking-id": "case-list-bookmark-search-canceled", onClick: closeModal },
                 React.createElement(Trans, null, "Cancel")),
             React.createElement(React.Fragment, null,
                 React.createElement(Checkbox, { className: "pf-u-ml-md save-search-set-default", key: "set-as-default", "aria-label": t('Set as default'), id: "case-list-bookmark-search-set-as-default", "data-tracking-id": "case-list-bookmark-search-set-as-default", isChecked: localDefaultChecked, onChange: (checkbox, e) => {
@@ -140,9 +149,13 @@ export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, select
                 React.createElement(Trans, null, "Remove")))),
         ] },
         React.createElement(Form, null,
-            React.createElement(FormGroup, { label: t('Name'), isRequired: true, fieldId: "save-search-name", validated: isDuplicateNameError ? 'error' : 'default', helperTextInvalid: t('Filter with same name already exists. Please enter a unique name.'), className: "form-group pull-bottom-narrow" },
-                React.createElement(TextInput, { isRequired: true, type: "text", placeholder: t('Enter a unique name to reference in the future'), id: "save-search-name", name: "save-search-name", "aria-describedby": "save-search-name-helper", value: localSavedSearchName, onChange: handleSaveSearchNameChange, className: `form-control${isDuplicateNameError || !localSavedSearchName ? ' form-invalid' : ''}` })),
-            React.createElement(FormGroup, { label: t('Search and filter query'), isRequired: true, fieldId: "filter-query", className: "form-group pf-u-mt-lg" },
+            React.createElement(FormGroup, { label: t('Name'), isRequired: true, fieldId: "save-search-name", validated: saveButtonIsClicked && isDuplicateNameError ? 'error' : 'default', helperTextInvalid: t('Filter with same name already exists. Please enter a unique name.'), className: "form-group pull-bottom-narrow" },
+                React.createElement(TextInput, { isRequired: true, type: "text", placeholder: t('Enter a unique name to reference in the future'), id: "save-search-name", name: "save-search-name", "aria-describedby": "save-search-name-helper", value: localSavedSearchName, onChange: handleSaveSearchNameChange, className: `form-control${saveButtonIsClicked && (isDuplicateNameError || isEmpty(localSavedSearchName.trim()))
+                        ? ' form-invalid'
+                        : ''}`, validated: saveButtonIsClicked && (isDuplicateNameError || isEmpty(localSavedSearchName.trim()))
+                        ? 'error'
+                        : 'default' })),
+            React.createElement(FormGroup, { label: t('Search and filter query'), isRequired: true, fieldId: "filter-query", className: "form-group pf-u-mt-lg", validated: saveButtonIsClicked ? 'error' : 'default' },
                 React.createElement(TextArea, { isRequired: true, type: "text", id: "filter-query", name: "filter-query", "aria-describedby": "filter-query-helper", value: isAdding
                         ? createUserFriendlyQueryFromFilterState(filterInfo, filterQueryInfo.queryString)
                         : selectedSearchNameToEdit && previousBookmarkedSearchesObj[selectedSearchNameToEdit]

package/lib/esm/enums/caseSearch.d.ts

@@ -20,7 +20,6 @@ export declare const advanceSearchFieldNameToSolrFieldMapping: {
     case_24_7: string;
     case_is_cep: string;
     case_accountNumber: string;
-    case_type: string;
     case_number: string;
     case_owner_sso_username: string;
     case_lastModifiedByName: string;
@@ -32,11 +31,13 @@ export declare const advanceSearchFieldNameToSolrFieldMapping: {
     case_createdDate: string;
     case_description: string;
     case_summary: string;
+    case_alternate_id: string;
     case_product: string;
     case_status: string;
     case_folderNumber: string;
     case_severity: string;
     case_customer_escalation: string;
     case_version: string;
+    case_type: string;
 };
 //# sourceMappingURL=caseSearch.d.ts.map

package/lib/esm/enums/caseSearch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"caseSearch.d.ts","sourceRoot":"","sources":["../../../src/enums/caseSearch.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,4BAA4B,KAAK,CAAC;AAE/C,oBAAY,mBAAmB;IAC3B,KAAK,UAAU;IACf,QAAQ,aAAa;CACxB;AAED,eAAO,MAAM,2BAA2B;;;;;;;;;;;;CAYvC,CAAC;AAEF,eAAO,MAAM,wCAAwC;;;;;;;;;;;;;;;;;;;;;;CAiBpD,CAAC"}
+{"version":3,"file":"caseSearch.d.ts","sourceRoot":"","sources":["../../../src/enums/caseSearch.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,4BAA4B,KAAK,CAAC;AAE/C,oBAAY,mBAAmB;IAC3B,KAAK,UAAU;IACf,QAAQ,aAAa;CACxB;AAED,eAAO,MAAM,2BAA2B;;;;;;;;;;;;CAYvC,CAAC;AAEF,eAAO,MAAM,wCAAwC;;;;;;;;;;;;;;;;;;;;;;;CAiBpD,CAAC"}

package/lib/esm/enums/caseSearch.js

@@ -16,6 +16,6 @@ export const fieldNameToSolrFieldMapping = {
     [SolrKeys.version]: 'productVersion',
     [SolrKeys.caseContactSSO]: 'ownedByMe',
     [SolrKeys.createdBySsoUsername]: 'createdBySsoUsername',
-    [SolrKeys.type]: 'type',
+    [SolrKeys.type]: 'caseType',
 };
-export const advanceSearchFieldNameToSolrFieldMapping = Object.assign(Object.assign({}, fieldNameToSolrFieldMapping), { [SolrKeys.fts]: 'FTS', [SolrKeys.cep]: 'CEP', [SolrKeys.accountNumber]: 'accountNumber', [SolrKeys.type]: 'caseType', [SolrKeys.caseNumber]: 'caseNumber', [SolrKeys.caseOwner]: 'ownerSSO', [SolrKeys.modifiedBy]: 'lastModifiedByName', [SolrKeys.createdBySsoUsername]: 'createdBySSO', [SolrKeys.createdBy]: 'createdByName', [SolrKeys.contactName]: 'contactName', [SolrKeys.caseContactSSO]: 'contactSSO', [SolrKeys.modifiedDate]: 'lastModifiedDate', [SolrKeys.createdDate]: 'createdDate', [SolrKeys.description]: 'description', [SolrKeys.caseSummary]: 'summary' });
+export const advanceSearchFieldNameToSolrFieldMapping = Object.assign(Object.assign({}, fieldNameToSolrFieldMapping), { [SolrKeys.fts]: 'FTS', [SolrKeys.cep]: 'CEP', [SolrKeys.accountNumber]: 'accountNumber', [SolrKeys.caseNumber]: 'caseNumber', [SolrKeys.caseOwner]: 'ownerSSO', [SolrKeys.modifiedBy]: 'lastModifiedByName', [SolrKeys.createdBySsoUsername]: 'createdBySSO', [SolrKeys.createdBy]: 'createdByName', [SolrKeys.contactName]: 'contactName', [SolrKeys.caseContactSSO]: 'contactSSO', [SolrKeys.modifiedDate]: 'lastModifiedDate', [SolrKeys.createdDate]: 'createdDate', [SolrKeys.description]: 'description', [SolrKeys.caseSummary]: 'summary', [SolrKeys.alternateId]: 'alternateId' });

package/lib/esm/hooks/useFilterStateOnLoad.d.ts

@@ -1,5 +1,5 @@
 import { CaseSearchQueryType } from '../enums/caseSearch';
 export declare function useFilterStateOnLoad(): {
-    set: (queryFromUrl: string, pageSizeFromUrl: number, currentPageFromUrl: number, searchType: CaseSearchQueryType) => void;
+    set: (queryFromUrl: string, pageSizeFromUrl: number, currentPageFromUrl: number, searchType: CaseSearchQueryType) => any;
 };
 //# sourceMappingURL=useFilterStateOnLoad.d.ts.map

package/lib/esm/hooks/useFilterStateOnLoad.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFilterStateOnLoad.d.ts","sourceRoot":"","sources":["../../../src/hooks/useFilterStateOnLoad.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAI1D,wBAAgB,oBAAoB;wBAmBd,MAAM,mBACH,MAAM,sBACH,MAAM,cACd,mBAAmB;EA0DtC"}
+{"version":3,"file":"useFilterStateOnLoad.d.ts","sourceRoot":"","sources":["../../../src/hooks/useFilterStateOnLoad.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAI1D,wBAAgB,oBAAoB;wBAkBd,MAAM,mBACH,MAAM,sBACH,MAAM,cACd,mBAAmB;EAsDtC"}

package/lib/esm/hooks/useFilterStateOnLoad.js

@@ -3,41 +3,36 @@ import find from 'lodash/find';
 import findKey from 'lodash/findKey';
 import isEmpty from 'lodash/isEmpty';
 import { useContext, useMemo } from 'react';
-import { CaseListFilterDispatchContext, CaseListFilterStateContext, } from '../components/case-list/CaseListFilterContext';
+import { CaseListFilterStateContext, initialCaseFilterState } from '../components/case-list/CaseListFilterContext';
 import { isArrayHashMapEmpty } from '../components/case-list/CaseListFilterHelpers';
-import { updateFilterState } from '../components/case-list/CaseListFilterReducer';
 import { SolrKeys } from '../enums/filters';
 import { createFilterStateFromUrlQuery } from '../utils/caseSearchUtils';
 export function useFilterStateOnLoad() {
     const { globalMetadataState, globalMetadataState: { caseGroups, hydraUserPreferences }, } = useContext(GlobalMetadataStateContext);
     const filterState = useContext(CaseListFilterStateContext);
-    const filterDispatch = useContext(CaseListFilterDispatchContext);
     const savesSearches = find(hydraUserPreferences.data, (pref) => pref.key === UserPreferencesKeys.caseSavedSearchFilters);
     const savedSearchesObj = useMemo(() => ((savesSearches === null || savesSearches === void 0 ? void 0 : savesSearches.value) ? JSON.parse(savesSearches.value) : {}), [savesSearches]);
     const set = (queryFromUrl, pageSizeFromUrl, currentPageFromUrl, searchType) => {
-        // set state from url
-        let defaultFilterState = filterState;
-        const filterStateFromQuery = createFilterStateFromUrlQuery(queryFromUrl, globalMetadataState, pageSizeFromUrl, currentPageFromUrl, searchType);
-        const hasFilterStateFromQuery = !isArrayHashMapEmpty(filterStateFromQuery.filterInfo) &&
-            !isEmpty(filterStateFromQuery.filterQueryInfo.queryString);
+        const filterStateFromURL = createFilterStateFromUrlQuery(queryFromUrl, globalMetadataState, pageSizeFromUrl, currentPageFromUrl, searchType);
+        const hasFilterStateFromURL = !isArrayHashMapEmpty(filterStateFromURL.filterInfo) &&
+            !isEmpty(filterStateFromURL.filterQueryInfo.queryString);
         let savedSearchFilterState = null;
         const defaultSavedSearchKey = findKey(savedSearchesObj, { defaultChecked: true });
         if (defaultSavedSearchKey) {
             const { filterState: filterStateSaved, queryString, type, sortState, } = savedSearchesObj[defaultSavedSearchKey];
-            savedSearchFilterState = Object.assign(Object.assign({}, filterState), { sortInfo: sortState, filterQueryInfo: Object.assign(Object.assign({}, filterState.filterQueryInfo), { queryString, type }), filterInfo: filterStateSaved });
+            savedSearchFilterState = Object.assign(Object.assign({}, filterState), { sortInfo: sortState, filterQueryInfo: Object.assign(Object.assign({}, filterState.filterQueryInfo), { queryString, type }), filterInfo: Object.assign(Object.assign({}, initialCaseFilterState.filterInfo), filterStateSaved) });
         }
-        defaultFilterState = hasFilterStateFromQuery
-            ? filterStateFromQuery
+        let defaultFilterState = hasFilterStateFromURL
+            ? filterStateFromURL
             : savedSearchFilterState
                 ? savedSearchFilterState
-                : defaultFilterState;
+                : filterState;
         const defaultGroup = (caseGroups.data || []).find((group) => group.isDefault);
         if (defaultGroup) {
             const updatedFilterInfo = Object.assign(Object.assign({}, filterState.filterInfo), { [SolrKeys.group]: [{ key: defaultGroup.groupNum, value: defaultGroup.name }] });
             defaultFilterState = Object.assign(Object.assign({}, filterState), { filterInfo: updatedFilterInfo });
         }
-        // we only update the state without api call as we fetch result in another useEffect that observes the state
-        updateFilterState(filterDispatch, defaultFilterState);
+        return defaultFilterState;
     };
     return {
         set,

package/lib/esm/utils/caseSearchUtils.js

@@ -303,11 +303,11 @@ function createFilterStateFromUrlQuery(urlQuery, globalMetadataState, pageSize,
 }
 function createFilterStateFromAdvancedQuery(queryString, globalMetadataState, currentFilterState) {
     const filterObj = parseSolrQuery(queryString);
-    const filterInfo = {};
+    const newFilterInfo = {};
     let advanceToBasicQuery = [];
     Object.keys(filterObj || {}).forEach((_key) => {
         if (_key === SolrKeys.product) {
-            filterInfo[SolrPivotKeys.product_version] = generateProductVersionPivotValue(filterObj[_key]);
+            newFilterInfo[SolrPivotKeys.product_version] = generateProductVersionPivotValue(filterObj[_key]);
         }
         // if it's an unnamed field we should add it to free text querystring
         else if (_key === '<implicit>') {
@@ -316,7 +316,7 @@ function createFilterStateFromAdvancedQuery(queryString, globalMetadataState, cu
         else {
             // if field is present in this map, it means field is supported in basic search mode too
             if (fieldNameToSolrFieldMapping[_key]) {
-                filterInfo[_key] = generateFilterValue(_key, filterObj[_key], globalMetadataState);
+                newFilterInfo[_key] = generateFilterValue(_key, filterObj[_key], globalMetadataState);
             }
             else {
                 // if it's supported in basic search mode then add it as a query string in the search input
@@ -327,7 +327,7 @@ function createFilterStateFromAdvancedQuery(queryString, globalMetadataState, cu
             }
         }
     });
-    const filterState = Object.assign(Object.assign({}, currentFilterState), { filterQueryInfo: Object.assign(Object.assign({}, currentFilterState.filterQueryInfo), { queryString: advanceToBasicQuery.join(' AND '), type: CaseSearchQueryType.BASIC }), filterInfo: Object.assign(Object.assign({}, currentFilterState.filterInfo), filterInfo) });
+    const filterState = Object.assign(Object.assign({}, currentFilterState), { filterQueryInfo: Object.assign(Object.assign({}, currentFilterState.filterQueryInfo), { queryString: advanceToBasicQuery.join(' AND '), type: CaseSearchQueryType.BASIC }), filterInfo: Object.assign(Object.assign({}, initialCaseFilterState.filterInfo), newFilterInfo) });
     return filterState;
 }
 function generateFilterValue(solrFieldName, value, globalMetadataState) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/cases",
-    "version": "0.2.40",
+    "version": "0.2.41",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -53,11 +53,11 @@
         "@patternfly/react-core": "4.194.0",
         "@patternfly/react-table": "4.63.0",
         "@rh-support/api": "0.3.10",
-        "@rh-support/components": "1.1.28",
-        "@rh-support/react-context": "0.2.31",
+        "@rh-support/components": "1.1.29",
+        "@rh-support/react-context": "0.2.32",
         "@rh-support/types": "0.2.0",
-        "@rh-support/user-permissions": "0.2.22",
-        "@rh-support/utils": "0.2.20",
+        "@rh-support/user-permissions": "0.2.23",
+        "@rh-support/utils": "0.2.21",
         "i18next": "^19.0.1",
         "localforage": "^1.7.3",
         "lodash": "^4.17.15",
@@ -101,5 +101,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "888b282fb16eda05ab2c622c298164921d22bcbc"
+    "gitHead": "cb0d1a0aad49e869ec8b6f6192c49d710dcf37cb"
 }