@rh-support/cases 1.0.3 → 1.0.5

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":"AAOA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAKhE,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,IAAI,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IACzE,0BAA0B,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;CAC7D;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,eAgT1C"}
+{"version":3,"file":"AdvanceSearch.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/AdvanceSearch.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAIhE,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,IAAI,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IACzE,0BAA0B,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;CAC7D;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,eAwS1C"}

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

@@ -5,15 +5,13 @@ import isEmpty from 'lodash/isEmpty';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { CaseSearchQueryType } from '../../../enums/caseSearch';
-import { CaseListFilterDispatchContext, CaseListFilterStateContext } from '../CaseListFilterContext';
-import { updateFilterQuery } from '../CaseListFilterReducer';
+import { CaseListFilterStateContext } from '../CaseListFilterContext';
 import useAdvanceSearchParser from './useAdvanceSearchParser';
 export function AdvanceSearch(props) {
     const { t } = useTranslation();
     const filterState = useContext(CaseListFilterStateContext);
     const { filterQueryInfo } = filterState;
     const isFirstMountRef = useRef(true);
-    const dispatch = useContext(CaseListFilterDispatchContext);
     const [inputString, setInputString] = useState('');
     const [autoCompleteList, setAutoCompleteList] = useState([]);
     const dropdownWrapperRef = useRef(null);
@@ -35,7 +33,12 @@ export function AdvanceSearch(props) {
             setIsParsingSuccessful(false);
             props.onAdvancedSearchValidation(false);
             parserErrorRef.current = e;
-            autoCompleteSetup(e.expected, inputString.substring(e.location.start.offset, inputString.length));
+            // sometimes a race condition happens. Before parse js runs successfully we
+            // reach to this line because of that wrapped this line in try/catch
+            try {
+                autoCompleteSetup(e.expected, inputString.substring(e.location.start.offset, inputString.length));
+            }
+            catch (_a) { }
         }
     };
     const { parse, parseSafe, parserRef } = useAdvanceSearchParser({ onInit: parseQuery });
@@ -200,20 +203,6 @@ export function AdvanceSearch(props) {
         props.onSearchSubmit && props.onSearchSubmit(CaseSearchQueryType.ADVANCED, parsedQuery);
     };
     const onBasicClick = () => {
-        var _a, _b;
-        if (inputString) {
-            if (((_a = filterState.filterQueryInfo) === null || _a === void 0 ? void 0 : _a.queryString) === '') {
-                props.onSearchValChange && props.onSearchValChange('');
-            }
-            updateFilterQuery(dispatch, {
-                type: CaseSearchQueryType.BASIC,
-                queryString: ((_b = filterState.filterQueryInfo) === null || _b === void 0 ? void 0 : _b.queryString) || '',
-                parsedQuery: '',
-            });
-        }
-        else {
-            updateFilterQuery(dispatch, Object.assign(Object.assign({}, filterState.filterQueryInfo), { type: CaseSearchQueryType.BASIC }));
-        }
         props.onSearchTypeChange && props.onSearchTypeChange(CaseSearchQueryType.BASIC);
     };
     const isQueryInValid = inputString && !isParsingSuccessful;

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":"AAkBA,UAAU,MAAM;IACZ,sBAAsB,EAAE,MAAM,CAAC;CAClC;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,eAuKvC"}
+{"version":3,"file":"CaseSearch.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/CaseSearch.tsx"],"names":[],"mappings":"AAsBA,UAAU,MAAM;IACZ,sBAAsB,EAAE,MAAM,CAAC;CAClC;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,eAsLvC"}

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

@@ -2,13 +2,13 @@ import { Button, SearchInput } from '@patternfly/react-core';
 import { GlobalMetadataStateContext } from '@rh-support/react-context';
 import { AbilityContext, CaseListFields, resourceActions, resources } from '@rh-support/user-permissions';
 import isEmpty from 'lodash/isEmpty';
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { CaseSearchQueryType } from '../../../enums/caseSearch';
 import { createFilterStateFromAdvancedQuery, createUserFriendlyQueryFromFilterStateAdvancedSearch, } from '../../../utils/caseSearchUtils';
 import { useCaseListStateContext } from '../CaseListContext';
-import { CaseListFilterDispatchContext, CaseListFilterStateContext } from '../CaseListFilterContext';
-import { updateFilterQuery, updateFilterState } from '../CaseListFilterReducer';
+import { CaseListFilterDispatchContext, CaseListFilterStateContext, initialPaginationInfo, } from '../CaseListFilterContext';
+import { initialFilterInfo, updateFilterQuery, updateFilterState } from '../CaseListFilterReducer';
 import { AdvanceSearch } from './AdvanceSearch';
 import { BookmarkedSearchesSelector } from './BookmarkedSearchesSelector';
 export function CaseSearch(props) {
@@ -19,23 +19,28 @@ export function CaseSearch(props) {
     const filterState = useContext(CaseListFilterStateContext);
     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();
+    const getType = useCallback(() => (filterQueryInfo === null || filterQueryInfo === void 0 ? void 0 : filterQueryInfo.type) || CaseSearchQueryType.BASIC, [filterQueryInfo === null || filterQueryInfo === void 0 ? void 0 : filterQueryInfo.type]);
     // on queryString and parsedQuery change need to update search
     useEffect(() => {
-        setSearchVal(filterQueryInfo.queryString);
-    }, [filterQueryInfo]);
-    useEffect(() => {
-        if (searchType === filterQueryInfo.type)
-            return;
-        setSearchType(filterQueryInfo.type);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [filterQueryInfo.type]);
+        if (getType() === CaseSearchQueryType.ADVANCED) {
+            setSearchVal(filterQueryInfo === null || filterQueryInfo === void 0 ? void 0 : filterQueryInfo.parsedQuery);
+        }
+        else {
+            setSearchVal(filterQueryInfo.queryString);
+        }
+    }, [filterQueryInfo, getType]);
     const onSearchValChange = (value) => {
         if (isEmpty(value.trim())) {
-            clearSearchVal();
+            setSearchVal('');
+            // clear search but keep type and sort info
+            updateFilterState(dispatch, Object.assign(Object.assign({}, filterState), { filterInfo: initialFilterInfo, filterQueryInfo: {
+                    queryString: '',
+                    parsedQuery: '',
+                    type: CaseSearchQueryType.ADVANCED,
+                }, paginationInfo: initialPaginationInfo }));
         }
         else {
             setSearchVal(value.trim());
@@ -44,10 +49,10 @@ export function CaseSearch(props) {
     const clearSearchVal = () => {
         setSearchVal('');
         (filterQueryInfo === null || filterQueryInfo === void 0 ? void 0 : filterQueryInfo.queryString) &&
-            updateFilterQuery(dispatch, { type: searchType, queryString: '', parsedQuery: '' });
+            updateFilterQuery(dispatch, { type: getType(), queryString: '', parsedQuery: '' });
     };
     const onCaseSearch = (parsedQuery = '', queryString = searchVal) => {
-        updateFilterQuery(dispatch, { type: searchType, queryString, parsedQuery });
+        updateFilterQuery(dispatch, { type: getType(), queryString, parsedQuery });
     };
     const onCaseSearchAdvanced = (type, parsedQuery = '', queryStringInputBox = searchVal) => {
         const newFilterState = createFilterStateFromAdvancedQuery(parsedQuery.replace(/ and /g, ' AND ').replace(/ or /g, ' OR '), globalMetadataState, filterState, queryStringInputBox, type);
@@ -64,7 +69,9 @@ export function CaseSearch(props) {
                 parsedQuery,
             });
         }
-        setSearchType(newType);
+        else {
+            updateFilterQuery(dispatch, Object.assign(Object.assign({}, filterState.filterQueryInfo), { type: CaseSearchQueryType.BASIC }));
+        }
     };
     // To check is Search Button is disabled or not
     const isSearchButtonDisabled = isEmpty(filterQueryInfo.queryString) && isEmpty(searchVal === null || searchVal === void 0 ? void 0 : searchVal.trim());
@@ -79,7 +86,7 @@ export function CaseSearch(props) {
     const handleSubmit = (ev) => {
         ev.preventDefault();
         // for advance search submit should only happen on btn click or ctrl+enter which will be handled manually
-        searchType === CaseSearchQueryType.BASIC && onCaseSearch();
+        getType() === CaseSearchQueryType.BASIC && onCaseSearch();
     };
     const renderBasicSearch = () => {
         return (React.createElement(React.Fragment, null,
@@ -96,6 +103,6 @@ export function CaseSearch(props) {
     };
     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, isAdvancedSearchValid: isAdvancedSearchValid, defaultSavedSearchName: props.defaultSavedSearchName })));
+            React.createElement("div", { className: "form-group case-search-form-group" }, CaseSearchQueryType.BASIC === getType() ? renderBasicSearch() : renderAdvanceSearch())),
+        React.createElement(BookmarkedSearchesSelector, { currentCaseSearchString: searchVal === null || searchVal === void 0 ? void 0 : searchVal.trim(), currentSearchType: getType(), isAdvancedSearchValid: isAdvancedSearchValid, defaultSavedSearchName: props.defaultSavedSearchName })));
 }

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":"AAQA,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAAE,MAAM,EAAE;;CAAA;yBASzB,MAAM;6BAIF,MAAM;;EAwLzC"}
+{"version":3,"file":"useAdvanceSearchParser.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/useAdvanceSearchParser.tsx"],"names":[],"mappings":"AAQA,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAAE,MAAM,EAAE;;CAAA;yBASzB,MAAM;6BAIF,MAAM;;EA0LzC"}

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

@@ -50,7 +50,7 @@ export default function useAdvanceSearchParser({ onInit }) {
 
     andSequence = parts:(" and " sequencePart)+ { return [].concat.apply([], parts).join(""); }
     orSequence = parts:(" or " sequencePart)+ { return [].concat.apply([], parts).join(""); }
-    sequencePart = criteria / "(" sq:sequence ")" { return '(' + sq + ')' }
+    sequencePart = criteria / "("__ sq:sequence __")" { return '(' + sq + ')' }
 
     criteria = basicCriteria / notCriteria
     notCriteria = "-"criteria:basicCriteria {return '-' + criteria; }
@@ -169,6 +169,8 @@ export default function useAdvanceSearchParser({ onInit }) {
     / accountNameMultipleValue / _
     accountNameMultipleValue = "(" val:(accountNameValue)+ ")" { return joinByOr(val); }
 
+    __  = [ ]*
+
     _ "whitespace"
         = [ \\t\\r\\n\\f]+
 

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

@@ -1,4 +1,4 @@
-import { SolrKeys } from './filters';
+import { SFDCKeys, SolrKeys } from './filters';
 export declare enum CaseStatus {
     WaitingOnCustomer = "Waiting on Customer",
     WaitingOnRedHat = "Waiting on Red Hat",
@@ -42,4 +42,18 @@ export declare const caseListSortColumnIdsToSolrMap: {
     type: SolrKeys;
     closedDate: SolrKeys;
 };
+export declare const caseListSortColumnIdsToSFDCMap: {
+    number: SFDCKeys;
+    summary: SFDCKeys;
+    severity: SFDCKeys;
+    contactName: SFDCKeys;
+    createdDate: SFDCKeys;
+    status: SFDCKeys;
+    lastModifiedDate: SFDCKeys;
+    accountNumber: SFDCKeys;
+    folderName: SFDCKeys;
+    alternateCaseId: SFDCKeys;
+    type: SFDCKeys;
+    closedDate: SFDCKeys;
+};
 //# sourceMappingURL=case.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"case.d.ts","sourceRoot":"","sources":["../../../src/enums/case.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,oBAAY,UAAU;IAClB,iBAAiB,wBAAwB;IACzC,eAAe,uBAAuB;IACtC,IAAI,mBAAmB;IACvB,MAAM,WAAW;IACjB,GAAG,cAAc;CACpB;AAED,oBAAY,YAAY;IACpB,MAAM,eAAe;IACrB,SAAS,kBAAkB;IAC3B,MAAM,eAAe;IACrB,GAAG,YAAY;CAClB;AAED,eAAO,MAAM,cAAc,0UACgT,CAAC;AAE5U,oBAAY,iBAAiB;IACzB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,KAAK,gBAAgB;IACrB,OAAO,gBAAgB;IACvB,MAAM,WAAW;IACjB,QAAQ,qBAAqB;IAC7B,iBAAiB,YAAY;IAC7B,aAAa,kBAAkB;IAC/B,KAAK,eAAe;IACpB,eAAe,oBAAoB;IACnC,IAAI,SAAS;IACb,cAAc,eAAe;CAChC;AAED,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;CAa1C,CAAC"}
+{"version":3,"file":"case.d.ts","sourceRoot":"","sources":["../../../src/enums/case.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE/C,oBAAY,UAAU;IAClB,iBAAiB,wBAAwB;IACzC,eAAe,uBAAuB;IACtC,IAAI,mBAAmB;IACvB,MAAM,WAAW;IACjB,GAAG,cAAc;CACpB;AAED,oBAAY,YAAY;IACpB,MAAM,eAAe;IACrB,SAAS,kBAAkB;IAC3B,MAAM,eAAe;IACrB,GAAG,YAAY;CAClB;AAED,eAAO,MAAM,cAAc,0UACgT,CAAC;AAE5U,oBAAY,iBAAiB;IACzB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,KAAK,gBAAgB;IACrB,OAAO,gBAAgB;IACvB,MAAM,WAAW;IACjB,QAAQ,qBAAqB;IAC7B,iBAAiB,YAAY;IAC7B,aAAa,kBAAkB;IAC/B,KAAK,eAAe;IACpB,eAAe,oBAAoB;IACnC,IAAI,SAAS;IACb,cAAc,eAAe;CAChC;AAED,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;CAa1C,CAAC;AAEF,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;CAa1C,CAAC"}

package/lib/esm/enums/case.js

@@ -1,4 +1,4 @@
-import { SolrKeys } from './filters';
+import { SFDCKeys, SolrKeys } from './filters';
 export var CaseStatus;
 (function (CaseStatus) {
     CaseStatus["WaitingOnCustomer"] = "Waiting on Customer";
@@ -35,7 +35,7 @@ export const caseListSortColumnIdsToSolrMap = {
     [CaseListColumnIds.caseId]: SolrKeys.caseNumber,
     [CaseListColumnIds.summary]: SolrKeys.caseSummary,
     [CaseListColumnIds.severity]: SolrKeys.severity,
-    [CaseListColumnIds.owner]: SolrKeys.createdBy,
+    [CaseListColumnIds.owner]: SolrKeys.contactName,
     [CaseListColumnIds.created]: SolrKeys.createdDate,
     [CaseListColumnIds.status]: SolrKeys.status,
     [CaseListColumnIds.modified]: SolrKeys.modifiedDate,
@@ -45,3 +45,17 @@ export const caseListSortColumnIdsToSolrMap = {
     [CaseListColumnIds.type]: SolrKeys.type,
     [CaseListColumnIds.caseClosedDate]: SolrKeys.caseClosedDate,
 };
+export const caseListSortColumnIdsToSFDCMap = {
+    [CaseListColumnIds.caseId]: SFDCKeys.caseNumber,
+    [CaseListColumnIds.summary]: SFDCKeys.caseSummary,
+    [CaseListColumnIds.severity]: SFDCKeys.severity,
+    [CaseListColumnIds.owner]: SFDCKeys.contactName,
+    [CaseListColumnIds.created]: SFDCKeys.createdDate,
+    [CaseListColumnIds.status]: SFDCKeys.status,
+    [CaseListColumnIds.modified]: SFDCKeys.modifiedDate,
+    [CaseListColumnIds.accountNumber]: SFDCKeys.accountNumber,
+    [CaseListColumnIds.group]: SFDCKeys.groupName,
+    [CaseListColumnIds.alternateCaseId]: SFDCKeys.alternateId,
+    [CaseListColumnIds.type]: SFDCKeys.caseType,
+    [CaseListColumnIds.caseClosedDate]: SFDCKeys.caseClosedDate,
+};

package/lib/esm/utils/caseSearchUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"caseSearchUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/caseSearchUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAUxD,OAAO,EACH,oBAAoB,EACpB,WAAW,EAId,MAAM,+CAA+C,CAAC;AAEvD,OAAO,EAEH,mBAAmB,EAEtB,MAAM,qBAAqB,CAAC;AAU7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,eAAO,MAAM,6BAA6B,UAAU,CAAC;AACrD,eAAO,MAAM,oCAAoC,MAAM,CAAC;AACxD,eAAO,MAAM,iCAAiC,SAAS,CAAC;AACxD,eAAO,MAAM,qBAAqB,eAAe,CAAC;AAElD,iBAAS,8BAA8B,CAAC,WAAW,EAAE,oBAAoB,EAAE,YAAY,EAAE,QAAQ,OA4DhG;AAED,iBAAS,sCAAsC,CAC3C,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,EAChC,WAAW,EAAE,MAAM,EACnB,eAAe,GAAE,OAAe,UAwBnC;AAED,iBAAS,oDAAoD,CACzD,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,EAChC,WAAW,EAAE,MAAM,EACnB,eAAe,GAAE,OAAe,UAgDnC;AAeD,iBAAS,wCAAwC,CAC7C,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,EAChC,OAAO,EAAE,MAAM,EACf,eAAe,QAAK,UAoCvB;AASD,iBAAS,yBAAyB,CAC9B,WAAW,EAAE,oBAAoB,EACjC,kBAAkB,EAAE,QAAQ,EAC5B,oBAAoB,KAAA,EACpB,UAAU,SAAI,EACd,UAAU,SAAO,OAcpB;AAkBD,iBAAS,8BAA8B,CACnC,WAAW,EAAE,oBAAoB,EACjC,YAAY,EAAE,QAAQ,EACtB,mBAAmB,EAAE,OAAO,CAAC,QAAQ,CAAC,GACvC,OAAO,CAAC,eAAe,CAAC,CAkE1B;AAED,iBAAS,6BAA6B,CAAC,QAAQ,GAAE,qBAAqB,EAAO,GAAG,qBAAqB,EAAE,CAEtG;AAcD,iBAAS,6BAA6B,CAAC,WAAW,EAAE,oBAAoB,UAUvE;AAED,iBAAS,6BAA6B,CAClC,QAAQ,EAAE,MAAM,EAChB,mBAAmB,EAAE,oBAAoB,EACzC,QAAQ,CAAC,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,EACpB,UAAU,GAAE,mBAA+C,wBAsD9D;AAGD,iBAAS,kCAAkC,CACvC,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,oBAAoB,EACzC,kBAAkB,EAAE,oBAAoB,EACxC,WAAW,GAAE,MAAW,EACxB,IAAI,GAAE,mBAA+C,wBAqCxD;AAgGD,OAAO,EACH,8BAA8B,EAC9B,sCAAsC,EACtC,oDAAoD,EACpD,yBAAyB,EACzB,8BAA8B,EAC9B,6BAA6B,EAC7B,6BAA6B,EAC7B,6BAA6B,EAC7B,wCAAwC,EACxC,kCAAkC,GACrC,CAAC"}
+{"version":3,"file":"caseSearchUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/caseSearchUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAUxD,OAAO,EACH,oBAAoB,EACpB,WAAW,EAId,MAAM,+CAA+C,CAAC;AAOvD,OAAO,EAEH,mBAAmB,EAEtB,MAAM,qBAAqB,CAAC;AAU7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,eAAO,MAAM,6BAA6B,UAAU,CAAC;AACrD,eAAO,MAAM,oCAAoC,MAAM,CAAC;AACxD,eAAO,MAAM,iCAAiC,SAAS,CAAC;AACxD,eAAO,MAAM,qBAAqB,eAAe,CAAC;AAElD,iBAAS,8BAA8B,CAAC,WAAW,EAAE,oBAAoB,EAAE,YAAY,EAAE,QAAQ,OA4DhG;AAED,iBAAS,sCAAsC,CAC3C,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,EAChC,WAAW,EAAE,MAAM,EACnB,eAAe,GAAE,OAAe,UAwBnC;AAED,iBAAS,oDAAoD,CACzD,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,EAChC,WAAW,EAAE,MAAM,EACnB,eAAe,GAAE,OAAe,UA6CnC;AAkBD,iBAAS,wCAAwC,CAC7C,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,EAChC,OAAO,EAAE,MAAM,EACf,eAAe,QAAK,UA6BvB;AASD,iBAAS,yBAAyB,CAC9B,WAAW,EAAE,oBAAoB,EACjC,kBAAkB,EAAE,QAAQ,EAC5B,oBAAoB,KAAA,EACpB,UAAU,SAAI,EACd,UAAU,SAAO,OAcpB;AAkBD,iBAAS,8BAA8B,CACnC,WAAW,EAAE,oBAAoB,EACjC,YAAY,EAAE,QAAQ,EACtB,mBAAmB,EAAE,OAAO,CAAC,QAAQ,CAAC,GACvC,OAAO,CAAC,eAAe,CAAC,CAgE1B;AAED,iBAAS,6BAA6B,CAAC,QAAQ,GAAE,qBAAqB,EAAO,GAAG,qBAAqB,EAAE,CAEtG;AAcD,iBAAS,6BAA6B,CAAC,WAAW,EAAE,oBAAoB,UAUvE;AAED,iBAAS,6BAA6B,CAClC,QAAQ,EAAE,MAAM,EAChB,mBAAmB,EAAE,oBAAoB,EACzC,QAAQ,CAAC,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,EACpB,UAAU,GAAE,mBAA+C,wBAsD9D;AAGD,iBAAS,kCAAkC,CACvC,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,oBAAoB,EACzC,kBAAkB,EAAE,oBAAoB,EACxC,WAAW,GAAE,MAAW,EACxB,IAAI,GAAE,mBAA+C,wBAqCxD;AAgGD,OAAO,EACH,8BAA8B,EAC9B,sCAAsC,EACtC,oDAAoD,EACpD,yBAAyB,EACzB,8BAA8B,EAC9B,6BAA6B,EAC7B,6BAA6B,EAC7B,6BAA6B,EAC7B,wCAAwC,EACxC,kCAAkC,GACrC,CAAC"}

package/lib/esm/utils/caseSearchUtils.js

@@ -17,7 +17,7 @@ import merge from 'lodash/merge';
 import SolrQueryBuilder from 'solr-query-builder';
 import { getLabel } from '../components/case-list/case-list-filters/AccountsBookmarkedGroupFilter';
 import { initialCaseFilterState } from '../components/case-list/CaseListFilterContext';
-import { CaseListColumnIds, caseListSortColumnIdsToSolrMap, CaseStatus } from '../enums/case';
+import { CaseListColumnIds, caseListSortColumnIdsToSFDCMap, caseListSortColumnIdsToSolrMap, CaseStatus, } from '../enums/case';
 import { advanceSearchFieldNameToSolrFieldMapping, CaseSearchQueryType, fieldNameToSolrFieldMapping, } from '../enums/caseSearch';
 import { AdditionalFilterLabels, advancedSearchMap, ProductVersionKey, sfdcFieldToSolrMap, SolrKeys, SolrPivotKeys, SolrTags, } from '../enums/filters';
 export const FILTER_URL_QUERY_SEARCH_PARAM = 'query';
@@ -115,18 +115,13 @@ function createUserFriendlyQueryFromFilterStateAdvancedSearch(filterInfo, filter
     const productVersionQuery = createProductVersionQueryStringFromFilterState(filterInfo);
     // add text: to string search and create and with the rest
     const q = parseSolrQuery(filterQuery);
-    const newFilterInfo = {};
     let advanceToBasicQuery = [];
+    let freeTextQuery = [];
     Object.keys(q || {}).forEach((_key) => {
-        if (_key === SolrKeys.product) {
-            newFilterInfo[SolrPivotKeys.product_version] = generateProductVersionPivotValue(q[_key]);
-        }
-        // if it's an unnamed field we should add it to free text querystring
-        else if (_key === '<implicit>' || _key === 'undefined') {
-            advanceToBasicQuery.push(q[_key]);
+        if (_key === '<implicit>' || _key === 'undefined') {
+            freeTextQuery.push(q[_key]);
         }
         else {
-            // it means field is not supported as a filter
             if (!fieldNameToSolrFieldMapping[_key]) {
                 // if it's supported in basic search mode then add it as a query string in the search input
                 if (advanceSearchFieldNameToSolrFieldMapping[_key] || SolrKeys[_key]) {
@@ -135,15 +130,17 @@ function createUserFriendlyQueryFromFilterStateAdvancedSearch(filterInfo, filter
             }
         }
     });
-    const textSearch = advanceToBasicQuery.length !== 0 ? [`text:"${advanceToBasicQuery.join(' ')}"`] : [];
+    freeTextQuery = freeTextQuery.length !== 0 ? [`text:"${flatMap(freeTextQuery).join(' ')}"`] : [];
     const parsedQueryString = []
-        .concat(textSearch)
+        .concat(freeTextQuery)
+        .concat(advanceToBasicQuery)
         .concat(productVersionQuery ? productVersionQuery : [])
         .concat(filtersQuery !== '*:*' ? filtersQuery : []);
     return parsedQueryString.join(' and ').replace(/ AND /g, ' and ').replace(/ OR /g, ' or ');
 }
 function createProductVersionQueryStringFromFilterState(filterInfo) {
-    const queryStringForProductFilter = buildSolrQuery({ [ProductVersionKey]: filterInfo[ProductVersionKey] });
+    var _a;
+    const queryStringForProductFilter = buildSolrQuery({ [ProductVersionKey]: filterInfo[ProductVersionKey] }, ((_a = filterInfo[ProductVersionKey]) === null || _a === void 0 ? void 0 : _a.length) > 1);
     let productVersionQuery = '';
     if (queryStringForProductFilter !== '*:*') {
         const regexForProductReplace = new RegExp(SolrKeys.product, 'g');
@@ -152,7 +149,7 @@ function createProductVersionQueryStringFromFilterState(filterInfo) {
             .replace(regexForProductReplace, fieldNameToSolrFieldMapping[SolrKeys.product])
             .replace(regexForVersionReplace, fieldNameToSolrFieldMapping[SolrKeys.version]);
     }
-    return productVersionQuery.replace(/\(\s+/g, '(').replace(/\s\)+/g, ')');
+    return productVersionQuery;
 }
 function createAdvancedSearchQueryFromFilterState(filterInfo, keyword, useKeyForKVPair = []) {
     const finalQueryArr = [];
@@ -177,12 +174,7 @@ function createAdvancedSearchQueryFromFilterState(filterInfo, keyword, useKeyFor
     }
     const filtersQuery = advanceQuery.build().replace(/ AND /g, ' and ');
     const productVersionQuery = createProductVersionQueryStringFromFilterState(filterInfo);
-    productVersionQuery &&
-        finalQueryArr.push(productVersionQuery
-            .replace(/\s?\(\s/g, '(')
-            .replace(/\s?\)\s?/g, ')')
-            .replace(/ OR /g, ' or ')
-            .replace(/ AND /g, ' and '));
+    productVersionQuery && finalQueryArr.push(productVersionQuery.replace(/ OR /g, ' or ').replace(/ AND /g, ' and '));
     filtersQuery !== '*:*' && finalQueryArr.push(filtersQuery);
     return finalQueryArr.join(' and ');
 }
@@ -224,7 +216,6 @@ function objectFlip(obj, camelCaseKey = false) {
     }, {});
 }
 function createSFDCQueryFromFilterState(filterState, loggedInUser, loggedInUserAccount) {
-    const solrFieldToSfdcMap = objectFlip(sfdcFieldToSolrMap, true);
     const { paginationInfo: { pageSize, currentPage }, sortInfo: { column, direction }, filterInfo, filterQueryInfo, } = filterState;
     const maxResults = pageSize;
     const offset = (currentPage - 1) * pageSize;
@@ -242,12 +233,11 @@ function createSFDCQueryFromFilterState(filterState, loggedInUser, loggedInUserA
     if ((filteredStatus || []).length > 1 && filteredStatus.includes(CaseStatus.Closed)) {
         filteredStatus = filteredStatus.filter((status) => status !== CaseStatus.Closed);
     }
-    const sortFieldSolr = caseListSortColumnIdsToSolrMap[column];
     const sfdcFilter = {
         maxResults,
         offset,
         includeClosed,
-        sortField: solrFieldToSfdcMap[sortFieldSolr],
+        sortField: caseListSortColumnIdsToSFDCMap[column],
         sortOrder: direction.toUpperCase(),
     };
     const queryString = (filterQueryInfo.queryString || '').trim();
@@ -443,7 +433,7 @@ function generateProductVersionPivotValue(values) {
             : {
                 field: SolrKeys.product,
                 value: item.value,
-                [SolrKeys.version]: item[fieldNameToSolrFieldMapping[SolrKeys.version]].map((item) => ({
+                [SolrKeys.version]: (item[fieldNameToSolrFieldMapping[SolrKeys.version]] || []).map((item) => ({
                     field: SolrKeys.version,
                     value: item,
                 })),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/cases",
-    "version": "1.0.3",
+    "version": "1.0.5",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -51,11 +51,11 @@
         "@patternfly/pfe-collapse": "1.12.3",
         "@patternfly/react-core": "4.202.16",
         "@patternfly/react-table": "4.71.16",
-        "@rh-support/components": "1.2.0",
-        "@rh-support/react-context": "1.0.1",
+        "@rh-support/components": "1.2.1",
+        "@rh-support/react-context": "1.0.2",
         "@rh-support/types": "0.2.0",
-        "@rh-support/user-permissions": "1.0.0",
-        "@rh-support/utils": "1.0.0",
+        "@rh-support/user-permissions": "1.0.1",
+        "@rh-support/utils": "1.0.1",
         "i18next": "^19.0.1",
         "localforage": "^1.7.3",
         "lodash": "^4.17.21",
@@ -99,5 +99,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "6ad83aaad97f659afae273d0bf00f1b7400584f1"
+    "gitHead": "4c44ec177438ff8e09a761a4f38ce3fbd83c7aaa"
 }