@rh-support/cases 0.2.41 → 0.2.55

package/README.md

@@ -16,3 +16,5 @@ export default function CasesApp(routeProps: RouteComponentProps<ICasesRouteURLP
     return (<Cases routeProps={routeProps} basePath="/cases" />);
 }
 ```
+
+.

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

@@ -4,6 +4,7 @@ interface IProps {
     onSearchTypeChange?: (newType: CaseSearchQueryType) => void;
     onSearchClear?: () => void;
     onSearchSubmit: (parsedQuery: string) => void;
+    onAdvancedSearchValidation: (validation: boolean) => void;
 }
 export declare function AdvanceSearch(props: IProps): JSX.Element;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"AdvanceSearch.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/AdvanceSearch.tsx"],"names":[],"mappings":"AAQA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAMhE,UAAU,MAAM;IACZ,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,kBAAkB,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAC5D,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,cAAc,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;CACjD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,eAsV1C"}
+{"version":3,"file":"AdvanceSearch.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/AdvanceSearch.tsx"],"names":[],"mappings":"AAQA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAMhE,UAAU,MAAM;IACZ,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,kBAAkB,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAC5D,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,cAAc,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,0BAA0B,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;CAC7D;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,eAwV1C"}

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

@@ -23,6 +23,7 @@ export function AdvanceSearch(props) {
         try {
             parse(queryString);
             setIsParsingSuccessful(true);
+            props.onAdvancedSearchValidation(true);
             try {
                 // to trigger the autocomplete on a valid selection
                 parse(queryString + ' ');
@@ -34,6 +35,7 @@ export function AdvanceSearch(props) {
         }
         catch (e) {
             setIsParsingSuccessful(false);
+            props.onAdvancedSearchValidation(false);
             parserErrorRef.current = e;
             autoCompleteSetup(e.expected, queryString.substring(e.location.start.offset, queryString.length));
         }

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

@@ -2,6 +2,7 @@ import { CaseSearchQueryType } from '../../../enums/caseSearch';
 interface IProps {
     currentCaseSearchString: string;
     currentSearchType: CaseSearchQueryType;
+    isAdvancedSearchValid: boolean;
 }
 export declare function BookmarkedSearchesSelector(props: IProps): JSX.Element;
 export {};

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":"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"}
+{"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;IACvC,qBAAqB,EAAE,OAAO,CAAC;CAClC;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,eAqNvD"}

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

@@ -10,6 +10,7 @@ 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 { CaseSearchQueryType } from '../../../enums/caseSearch';
 import { CaseListFilterDispatchContext, CaseListFilterStateContext, initialCaseFilterState, } from '../CaseListFilterContext';
 import { isNoFilterApplied, isOnlyDefaultFilterApplied } from '../CaseListFilterHelpers';
 import { clearFilters, updateFilterQuery, updateFilterState, updateSort } from '../CaseListFilterReducer';
@@ -68,7 +69,7 @@ export function BookmarkedSearchesSelector(props) {
         setSelectedSearch(selectedItem);
         const { filterState: filterStateSaved, queryString, type, sortState } = searchQuery;
         // update filters with new value
-        queryString && updateFilterQuery(dispatch, { queryString, type });
+        updateFilterQuery(dispatch, { queryString: queryString || '', type: type || CaseSearchQueryType.BASIC });
         updateFilterState(dispatch, { filterInfo: Object.assign(Object.assign({}, initialCaseFilterState.filterInfo), filterStateSaved) });
         sortState && updateSort(dispatch, sortState);
         doToggle && toggleMenu(!isMenuOpen);
@@ -114,14 +115,16 @@ export function BookmarkedSearchesSelector(props) {
         ...(renderSavedSearchItems.length !== 0 ? [React.createElement(DropdownSeparator, { key: "separator" })] : []),
         ...(!isEmpty(mostRecentSearch) ? renderMostRecentSearch : []),
     ];
+    const advancedSearchPhraseIsNotValid = filterState.filterQueryInfo.type === CaseSearchQueryType.ADVANCED && !props.isAdvancedSearchValid;
+    const noFilterOrSearchQueryApplied = !props.currentCaseSearchString && (isOnlyDefaultFilterApplied(filterState) || isNoFilterApplied(filterState));
     return (React.createElement(React.Fragment, null,
         React.createElement("div", { className: "bookmark-search-dropdown-wrapper" },
             React.createElement(Dropdown, { className: "bookmark-search-dropdown", isOpen: isMenuOpen, dropdownItems: renderListItems, toggle: React.createElement(DropdownToggle, { splitButtonItems: [
                         React.createElement(DropdownToggleAction, { onClick: onSaveForLaterClick, key: "action", isDisabled: !!selectedSearch ||
-                                (!props.currentCaseSearchString &&
-                                    (isOnlyDefaultFilterApplied(filterState) || isNoFilterApplied(filterState))), "data-tracking-id": "case-list-bookmark-search-trigger" }, selectedSearch ? selectedSearch : React.createElement(Trans, null, "Save for later")),
+                                noFilterOrSearchQueryApplied ||
+                                advancedSearchPhraseIsNotValid, "data-tracking-id": "case-list-bookmark-search-trigger" }, selectedSearch ? selectedSearch : React.createElement(Trans, null, "Save for later")),
                     ], 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, isSaveSearchModalOpen && (React.createElement(SaveCaseSearchModal, { isModalOpen: isSaveSearchModalOpen, modalToggle: modalToggle, isAdding: isAddingBookmarkSearch, selectedSearchNameToEdit: selectedSearchNameToEdit })))));
+        React.createElement(ConfirmationServiceProvider, null, isSaveSearchModalOpen && (React.createElement(SaveCaseSearchModal, { currentCaseSearchString: props.currentCaseSearchString, currentSearchType: props.currentSearchType, isModalOpen: isSaveSearchModalOpen, modalToggle: modalToggle, isAdding: isAddingBookmarkSearch, selectedSearchNameToEdit: selectedSearchNameToEdit })))));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"CaseSearch.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/CaseSearch.tsx"],"names":[],"mappings":"AAeA,wBAAgB,UAAU,gBA8IzB"}
+{"version":3,"file":"CaseSearch.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/CaseSearch.tsx"],"names":[],"mappings":"AAeA,wBAAgB,UAAU,gBAoJzB"}

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

@@ -19,6 +19,7 @@ export function CaseSearch() {
     const { filterQueryInfo } = filterState;
     const [searchVal, setSearchVal] = useState(filterQueryInfo.queryString);
     const [searchType, setSearchType] = useState(CaseSearchQueryType.BASIC);
+    const [isAdvancedSearchValid, setIsAdvancedSearchValid] = useState(true);
     const dispatch = useContext(CaseListFilterDispatchContext);
     const { isFetching } = useCaseListStateContext();
     useEffect(() => {
@@ -90,10 +91,10 @@ export function CaseSearch() {
     };
     const renderAdvanceSearch = () => {
         return canUseAdvancedSearch ? (React.createElement(React.Fragment, null,
-            React.createElement(AdvanceSearch, { onSearchValChange: onSearchValChange, onSearchClear: clearSearchVal, onSearchSubmit: onCaseSearch, onSearchTypeChange: onSearchTypeChange }))) : (React.createElement(React.Fragment, null));
+            React.createElement(AdvanceSearch, { onSearchValChange: onSearchValChange, onSearchClear: clearSearchVal, onSearchSubmit: onCaseSearch, onSearchTypeChange: onSearchTypeChange, onAdvancedSearchValidation: (isValid) => setIsAdvancedSearchValid(isValid) }))) : (React.createElement(React.Fragment, null));
     };
     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 === null || searchVal === void 0 ? void 0 : searchVal.trim(), currentSearchType: searchType })));
+        React.createElement(BookmarkedSearchesSelector, { currentCaseSearchString: searchVal === null || searchVal === void 0 ? void 0 : searchVal.trim(), currentSearchType: searchType, isAdvancedSearchValid: isAdvancedSearchValid })));
 }

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

@@ -3,7 +3,9 @@ interface IProps {
     modalToggle: () => void;
     isAdding: boolean;
     selectedSearchNameToEdit: string;
+    currentCaseSearchString: string;
+    currentSearchType: string;
 }
-export declare function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, selectedSearchNameToEdit }: IProps): JSX.Element;
+export declare function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, selectedSearchNameToEdit, currentCaseSearchString, currentSearchType, }: IProps): JSX.Element;
 export {};
 //# sourceMappingURL=SaveCaseSearchModal.d.ts.map

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,eAgQ3G"}
+{"version":3,"file":"SaveCaseSearchModal.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/SaveCaseSearchModal.tsx"],"names":[],"mappings":"AA4BA,UAAU,MAAM;IACZ,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,wBAAwB,EAAE,MAAM,CAAC;IACjC,uBAAuB,EAAE,MAAM,CAAC;IAChC,iBAAiB,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,mBAAmB,CAAC,EAChC,WAAW,EACX,WAAW,EACX,QAAQ,EACR,wBAAwB,EACxB,uBAAuB,EACvB,iBAAiB,GACpB,EAAE,MAAM,eAwQR"}

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

@@ -16,9 +16,10 @@ import isEmpty from 'lodash/isEmpty';
 import pickBy from 'lodash/pickBy';
 import React, { useContext, useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
+import { CaseSearchQueryType } from '../../../enums/caseSearch';
 import { createUserFriendlyQueryFromFilterState } from '../../../utils/caseSearchUtils';
 import { CaseListFilterStateContext } from '../CaseListFilterContext';
-export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, selectedSearchNameToEdit }) {
+export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, selectedSearchNameToEdit, currentCaseSearchString, currentSearchType, }) {
     const { t } = useTranslation();
     const [localSavedSearchName, setLocalSavedSearchName] = useState('');
     const [localDefaultChecked, setLocalDefaultChecked] = useState(false);
@@ -72,7 +73,8 @@ export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, select
                 previousBookmarkedSearchesObj[localSavedSearchName] = {
                     filterState: pickBy(filterState.filterInfo, (value) => value.length !== 0),
                     sortState: sortInfo,
-                    type: filterState.filterQueryInfo.type,
+                    type: currentSearchType,
+                    queryString: currentCaseSearchString,
                     defaultChecked: localDefaultChecked,
                 };
             }
@@ -86,16 +88,13 @@ export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, select
             }
             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();
         }
+        closeModal();
     });
     const deleteSavedSearch = () => __awaiter(this, void 0, void 0, function* () {
         try {
@@ -126,12 +125,28 @@ export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, select
         setLocalSavedSearchName('');
         modalToggle();
     };
+    const getQueryStr = () => {
+        let queryStr = '';
+        if (isAdding) {
+            queryStr =
+                currentSearchType === CaseSearchQueryType.BASIC
+                    ? createUserFriendlyQueryFromFilterState(filterInfo, currentCaseSearchString)
+                    : currentCaseSearchString;
+        }
+        else if (selectedSearchNameToEdit && previousBookmarkedSearchesObj[selectedSearchNameToEdit]) {
+            queryStr = createUserFriendlyQueryFromFilterState(previousBookmarkedSearchesObj[selectedSearchNameToEdit].filterState, previousBookmarkedSearchesObj[selectedSearchNameToEdit].queryString);
+        }
+        else {
+            queryStr = previousBookmarkedSearchesObj[localSavedSearchName] || '';
+        }
+        return queryStr || '';
+    };
     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
-    }, [filterInfo, filterQueryInfo.queryString, isAdding, selectedSearchNameToEdit]);
+    }, [filterInfo, filterQueryInfo.queryString, isAdding, selectedSearchNameToEdit, currentCaseSearchString]);
     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 },
@@ -156,9 +171,5 @@ export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, select
                         ? '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]
-                            ? createUserFriendlyQueryFromFilterState(previousBookmarkedSearchesObj[selectedSearchNameToEdit].filterState, previousBookmarkedSearchesObj[selectedSearchNameToEdit].queryString)
-                            : '', className: "form-control", isDisabled: true })))));
+                React.createElement(TextArea, { isRequired: true, type: "text", id: "filter-query", name: "filter-query", "aria-describedby": "filter-query-helper", value: getQueryStr(), className: "form-control", isDisabled: true })))));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"useAdvanceSearchParser.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/useAdvanceSearchParser.tsx"],"names":[],"mappings":"AAWA,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAAE,MAAM,EAAE;;CAAA;yBASzB,MAAM;6BASF,MAAM;;EAwEzC"}
+{"version":3,"file":"useAdvanceSearchParser.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/useAdvanceSearchParser.tsx"],"names":[],"mappings":"AAWA,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAAE,MAAM,EAAE;;CAAA;yBASzB,MAAM;6BASF,MAAM;;EA4EzC"}

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

@@ -26,7 +26,12 @@ export default function useAdvanceSearchParser({ onInit }) {
         return '';
     };
     const initParser = () => {
-        parserRef.current = PEG.generate(grammerStringRef.current);
+        try {
+            parserRef.current = PEG.generate(grammerStringRef.current);
+        }
+        catch (_a) {
+            parserRef.current = null;
+        }
     };
     // write products, severity and status to grammar string once we have the values from facets
     useEffect(() => {

package/package.json

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