@rh-support/cases 1.0.5 → 1.0.7

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;AAO3B,OAAO,EAAE,mBAAmB,EAAe,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAK1C,OAAO,EAAgB,WAAW,EAA2B,MAAM,uBAAuB,CAAC;AAmC3F,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,eAkfrC"}
+{"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;AAO3B,OAAO,EAAE,mBAAmB,EAAe,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAK1C,OAAO,EAAgB,WAAW,EAA2B,MAAM,uBAAuB,CAAC;AAmC3F,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,eAsfrC"}

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

@@ -114,11 +114,14 @@ export function CaseList(props) {
     function saveFilterQueryInUserPreferences() {
         if (isNoFilterApplied(filterState))
             return;
+        const type = filterState.filterQueryInfo.type;
         const recentSerach = {
-            filterState: filterState.filterInfo,
+            filterState: type === CaseSearchQueryType.BASIC ? filterState.filterInfo : {},
             sortState: filterState.sortInfo,
-            queryString: filterState.filterQueryInfo.queryString,
-            type: filterState.filterQueryInfo.type,
+            queryString: type === CaseSearchQueryType.BASIC
+                ? filterState.filterQueryInfo.queryString
+                : filterState.filterQueryInfo.parsedQuery,
+            type,
         };
         try {
             updateUserPreferences(dispatchToGlobalMetadataReducer, loggedInUserRights.data.getSSOUsername(), [{ key: UserPreferencesKeys.mostRecentSearch, value: JSON.stringify(recentSerach) }], 'add');

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;IACvC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,sBAAsB,EAAE,MAAM,CAAC;CAClC;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,eAiRvD"}
+{"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;AAahE,UAAU,MAAM;IACZ,uBAAuB,EAAE,MAAM,CAAC;IAChC,iBAAiB,EAAE,mBAAmB,CAAC;IACvC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,sBAAsB,EAAE,MAAM,CAAC;CAClC;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,eAoSvD"}

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

@@ -20,13 +20,15 @@ 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 { createFilterStateFromAdvancedQuery } from '../../../utils/caseSearchUtils';
 import { CaseListFilterDispatchContext, CaseListFilterStateContext, initialCaseFilterState, } from '../CaseListFilterContext';
 import { isNoFilterApplied, isOnlyDefaultFilterApplied } from '../CaseListFilterHelpers';
-import { clearFilters, updateFilterQuery, updateFilterState, updateSort } from '../CaseListFilterReducer';
+import { clearFilters, updateFilterState, updateSort } from '../CaseListFilterReducer';
 import { SaveCaseSearchModal } from './SaveCaseSearchModal';
+import useAdvanceSearchParser from './useAdvanceSearchParser';
 export function BookmarkedSearchesSelector(props) {
     const { t } = useTranslation();
-    const { globalMetadataState: { hydraUserPreferences }, } = useContext(GlobalMetadataStateContext);
+    const { globalMetadataState, globalMetadataState: { hydraUserPreferences }, } = useContext(GlobalMetadataStateContext);
     const dispatch = useContext(CaseListFilterDispatchContext);
     const [bookmarkedSearches, setBookmarkedSearches] = useState({});
     const [mostRecentSearch, setMostRecentSearch] = useState({});
@@ -37,6 +39,7 @@ export function BookmarkedSearchesSelector(props) {
     const [isMenuOpen, toggleMenu] = useState(false);
     const isUpdatingFilters = useRef(false);
     const [isAddingBookmarkSearch, setIsAddingBookmarkSearch] = useState(false);
+    const { parse } = useAdvanceSearchParser({ onInit: () => { } });
     const [selectedSearchNameToEdit, setSelectedSearchNameToEdit] = useState('');
     const [userPreferredSearch, setUserPreferredSearch] = useState('');
     useEffect(() => {
@@ -119,9 +122,18 @@ export function BookmarkedSearchesSelector(props) {
         clearFilters(dispatch, true);
         setSelectedSearch(selectedItem);
         const { filterState: filterStateSaved, queryString, type, sortState } = searchQuery;
+        if (type === CaseSearchQueryType.ADVANCED) {
+            const newFilterState = createFilterStateFromAdvancedQuery(parse(queryString).replace(/ and /g, ' AND ').replace(/ or /g, ' OR '), globalMetadataState, initialCaseFilterState, queryString, type);
+            updateFilterState(dispatch, newFilterState);
+        }
+        else {
+            updateFilterState(dispatch, Object.assign(Object.assign({}, initialCaseFilterState), { filterQueryInfo: {
+                    queryString: queryString || '',
+                    type: type || CaseSearchQueryType.BASIC,
+                    parsedQuery: '',
+                }, filterInfo: Object.assign(Object.assign({}, initialCaseFilterState.filterInfo), filterStateSaved) }));
+        }
         // update filters with new value
-        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);
         isUpdatingFilters.current = false;

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":"AAsBA,UAAU,MAAM;IACZ,sBAAsB,EAAE,MAAM,CAAC;CAClC;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,eAsLvC"}
+{"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,eAoLvC"}

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

@@ -33,24 +33,22 @@ export function CaseSearch(props) {
         }
     }, [filterQueryInfo, getType]);
     const onSearchValChange = (value) => {
-        if (isEmpty(value.trim())) {
-            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());
-        }
+        setSearchVal(value === null || value === void 0 ? void 0 : value.trim());
     };
     const clearSearchVal = () => {
         setSearchVal('');
         (filterQueryInfo === null || filterQueryInfo === void 0 ? void 0 : filterQueryInfo.queryString) &&
             updateFilterQuery(dispatch, { type: getType(), queryString: '', parsedQuery: '' });
     };
+    const clearAdvancedSearchVal = () => {
+        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 }));
+    };
     const onCaseSearch = (parsedQuery = '', queryString = searchVal) => {
         updateFilterQuery(dispatch, { type: getType(), queryString, parsedQuery });
     };
@@ -62,7 +60,7 @@ export function CaseSearch(props) {
     const onSearchTypeChange = (newType) => {
         var _a, _b;
         if (newType === CaseSearchQueryType.ADVANCED) {
-            const parsedQuery = createUserFriendlyQueryFromFilterStateAdvancedSearch(filterState.filterInfo, (_a = filterState.filterQueryInfo) === null || _a === void 0 ? void 0 : _a.queryString, true);
+            const parsedQuery = createUserFriendlyQueryFromFilterStateAdvancedSearch(filterState.filterInfo, (_a = filterState.filterQueryInfo) === null || _a === void 0 ? void 0 : _a.queryString);
             updateFilterQuery(dispatch, {
                 type: CaseSearchQueryType.ADVANCED,
                 queryString: (_b = filterState.filterQueryInfo) === null || _b === void 0 ? void 0 : _b.queryString,
@@ -99,7 +97,7 @@ export function CaseSearch(props) {
     };
     const renderAdvanceSearch = () => {
         return canUseAdvancedSearch ? (React.createElement(React.Fragment, null,
-            React.createElement(AdvanceSearch, { onSearchValChange: onSearchValChange, onSearchClear: clearSearchVal, onSearchSubmit: onCaseSearchAdvanced, onSearchTypeChange: onSearchTypeChange, onAdvancedSearchValidation: (isValid) => setIsAdvancedSearchValid(isValid) }))) : (React.createElement(React.Fragment, null));
+            React.createElement(AdvanceSearch, { onSearchValChange: onSearchValChange, onSearchClear: clearAdvancedSearchVal, onSearchSubmit: onCaseSearchAdvanced, onSearchTypeChange: onSearchTypeChange, onAdvancedSearchValidation: (isValid) => setIsAdvancedSearchValid(isValid) }))) : (React.createElement(React.Fragment, null));
     };
     return (React.createElement(React.Fragment, null,
         React.createElement("form", { onSubmit: handleSubmit, onKeyDown: handleSearchInputKeyDown },

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":"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;IAC1B,eAAe,EAAE,MAAM,IAAI,CAAC;CAC/B;AAED,wBAAgB,mBAAmB,CAAC,EAChC,WAAW,EACX,WAAW,EACX,QAAQ,EACR,wBAAwB,EACxB,uBAAuB,EACvB,iBAAiB,EACjB,eAAe,GAClB,EAAE,MAAM,eA0QR"}
+{"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;IAC1B,eAAe,EAAE,MAAM,IAAI,CAAC;CAC/B;AAED,wBAAgB,mBAAmB,CAAC,EAChC,WAAW,EACX,WAAW,EACX,QAAQ,EACR,wBAAwB,EACxB,uBAAuB,EACvB,iBAAiB,EACjB,eAAe,GAClB,EAAE,MAAM,eA4QR"}

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

@@ -135,7 +135,10 @@ export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, select
                     : currentCaseSearchString;
         }
         else if (selectedSearchNameToEdit && previousBookmarkedSearchesObj[selectedSearchNameToEdit]) {
-            queryStr = createUserFriendlyQueryFromFilterState(previousBookmarkedSearchesObj[selectedSearchNameToEdit].filterState, previousBookmarkedSearchesObj[selectedSearchNameToEdit].queryString);
+            queryStr =
+                currentSearchType === CaseSearchQueryType.BASIC
+                    ? createUserFriendlyQueryFromFilterState(previousBookmarkedSearchesObj[selectedSearchNameToEdit].filterState, previousBookmarkedSearchesObj[selectedSearchNameToEdit].queryString)
+                    : previousBookmarkedSearchesObj[selectedSearchNameToEdit].queryString;
         }
         else {
             queryStr = previousBookmarkedSearchesObj[localSavedSearchName] || '';

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

@@ -19,7 +19,7 @@ export declare const fieldNameToSolrFieldMapping: {
 export declare const advanceSearchFieldNameToSolrFieldMapping: {
     case_24_7: string;
     case_is_cep: string;
-    case_accountNumber: string;
+    case_account_name: string;
     case_number: string;
     case_owner_sso_username: string;
     case_lastModifiedByName: string;
@@ -35,6 +35,7 @@ export declare const advanceSearchFieldNameToSolrFieldMapping: {
     case_closedDate: string;
     case_product: string;
     case_status: string;
+    case_accountNumber: string;
     case_folderNumber: string;
     case_severity: string;
     case_customer_escalation: string;

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;;;;;;;;;;;;;;;;;;;;;;;;CAkBpD,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;;;;;;;;;;;;;;;;;;;;;;;;;CAkBpD,CAAC"}

package/lib/esm/enums/caseSearch.js

@@ -8,7 +8,7 @@ export var CaseSearchQueryType;
 export const fieldNameToSolrFieldMapping = {
     [SolrKeys.product]: 'productName',
     [SolrKeys.status]: 'status',
-    [SolrKeys.accountNumber]: 'accountName',
+    [SolrKeys.accountNumber]: 'accountNumber',
     [SolrKeys.group]: 'group',
     [SolrKeys.severity]: 'severity',
     [SolrKeys.caseOwner]: 'owner',
@@ -18,4 +18,4 @@ export const fieldNameToSolrFieldMapping = {
     [SolrKeys.createdBySsoUsername]: 'createdBySsoUsername',
     [SolrKeys.type]: 'caseType',
 };
-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', [SolrKeys.caseClosedDate]: 'closedDate' });
+export const advanceSearchFieldNameToSolrFieldMapping = Object.assign(Object.assign({}, fieldNameToSolrFieldMapping), { [SolrKeys.fts]: 'FTS', [SolrKeys.cep]: 'CEP', [SolrKeys.accountName]: 'accountName', [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', [SolrKeys.caseClosedDate]: 'closedDate' });

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

@@ -33,7 +33,7 @@ export declare enum SolrKeys {
     fts = "case_24_7",
     type = "case_type",
     cep = "case_is_cep",
-    accountName = "case_accountName",
+    accountName = "case_account_name",
     alternateId = "case_alternate_id",
     caseClosedDate = "case_closedDate",
     openshiftClusterId = "case_openshift_cluster_id"
@@ -65,7 +65,6 @@ export declare const advancedSearchMap: {
     case_24_7: string;
     case_type: string;
     case_is_cep: string;
-    case_accountName: string;
     case_alternate_id: string;
     case_closedDate: string;
     case_openshift_cluster_id: string;

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

@@ -1 +1 @@
-{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../../src/enums/filters.ts"],"names":[],"mappings":"AAAA,oBAAY,QAAQ;IAChB,SAAS,cAAc;IACvB,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;CACpB;AAED,oBAAY,QAAQ;IAChB,UAAU,gBAAgB;IAC1B,WAAW,iBAAiB;IAC5B,OAAO,iBAAiB;IACxB,MAAM,gBAAgB;IACtB,aAAa,uBAAuB;IACpC,KAAK,sBAAsB;IAC3B,SAAS,oBAAoB;IAC7B,QAAQ,kBAAkB;IAC1B,SAAS,4BAA4B;IACrC,SAAS,eAAe;IACxB,WAAW,qBAAqB;IAChC,cAAc,8BAA8B;IAC5C,UAAU,6BAA6B;IACvC,OAAO,iBAAiB;IACxB,SAAS,uBAAuB;IAChC,oBAAoB,gCAAgC;IACpD,WAAW,qBAAqB;IAChC,UAAU,4BAA4B;IACtC,YAAY,0BAA0B;IACtC,oBAAoB,iCAAiC;IACrD,sBAAsB,+BAA+B;IACrD,WAAW,qBAAqB;IAChC,GAAG,QAAQ;IACX,GAAG,cAAc;IACjB,IAAI,cAAc;IAClB,GAAG,gBAAgB;IACnB,WAAW,qBAAqB;IAChC,WAAW,sBAAsB;IACjC,cAAc,oBAAoB;IAClC,kBAAkB,8BAA8B;CACnD;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgC7B,CAAC;AAGF,oBAAY,aAAa;IACrB,eAAe,8BAA8B;CAChD;AAED,eAAO,MAAM,iBAAiB,QAA4C,CAAC;AAC3E,oBAAY,QAAQ;IAChB,UAAU,eAAe;IACzB,WAAW,YAAY;IACvB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,aAAa,qBAAqB;IAClC,QAAQ,aAAa;IACrB,SAAS,YAAY;IACrB,WAAW,gBAAgB;IAC3B,SAAS,mBAAmB;IAC5B,UAAU,uBAAuB;IACjC,OAAO,YAAY;IACnB,SAAS,gBAAgB;IACzB,oBAAoB,gCAAgC;IACpD,WAAW,gBAAgB;IAC3B,UAAU,qBAAqB;IAC/B,YAAY,qBAAqB;IACjC,oBAAoB,qBAAqB;IACzC,sBAAsB,qBAAqB;IAC3C,WAAW,gBAAgB;IAC3B,GAAG,QAAQ;IACX,WAAW,gBAAgB;IAC3B,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B,QAAQ,aAAa;IACrB,cAAc,iBAAiB;CAClC;AAED,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;CAsB9B,CAAC;AAEF,eAAO,MAAM,sBAAsB;;CAElC,CAAC"}
+{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../../src/enums/filters.ts"],"names":[],"mappings":"AAAA,oBAAY,QAAQ;IAChB,SAAS,cAAc;IACvB,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;CACpB;AAED,oBAAY,QAAQ;IAChB,UAAU,gBAAgB;IAC1B,WAAW,iBAAiB;IAC5B,OAAO,iBAAiB;IACxB,MAAM,gBAAgB;IACtB,aAAa,uBAAuB;IACpC,KAAK,sBAAsB;IAC3B,SAAS,oBAAoB;IAC7B,QAAQ,kBAAkB;IAC1B,SAAS,4BAA4B;IACrC,SAAS,eAAe;IACxB,WAAW,qBAAqB;IAChC,cAAc,8BAA8B;IAC5C,UAAU,6BAA6B;IACvC,OAAO,iBAAiB;IACxB,SAAS,uBAAuB;IAChC,oBAAoB,gCAAgC;IACpD,WAAW,qBAAqB;IAChC,UAAU,4BAA4B;IACtC,YAAY,0BAA0B;IACtC,oBAAoB,iCAAiC;IACrD,sBAAsB,+BAA+B;IACrD,WAAW,qBAAqB;IAChC,GAAG,QAAQ;IACX,GAAG,cAAc;IACjB,IAAI,cAAc;IAClB,GAAG,gBAAgB;IACnB,WAAW,sBAAsB;IACjC,WAAW,sBAAsB;IACjC,cAAc,oBAAoB;IAClC,kBAAkB,8BAA8B;CACnD;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+B7B,CAAC;AAGF,oBAAY,aAAa;IACrB,eAAe,8BAA8B;CAChD;AAED,eAAO,MAAM,iBAAiB,QAA4C,CAAC;AAC3E,oBAAY,QAAQ;IAChB,UAAU,eAAe;IACzB,WAAW,YAAY;IACvB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,aAAa,qBAAqB;IAClC,QAAQ,aAAa;IACrB,SAAS,YAAY;IACrB,WAAW,gBAAgB;IAC3B,SAAS,mBAAmB;IAC5B,UAAU,uBAAuB;IACjC,OAAO,YAAY;IACnB,SAAS,gBAAgB;IACzB,oBAAoB,gCAAgC;IACpD,WAAW,gBAAgB;IAC3B,UAAU,qBAAqB;IAC/B,YAAY,qBAAqB;IACjC,oBAAoB,qBAAqB;IACzC,sBAAsB,qBAAqB;IAC3C,WAAW,gBAAgB;IAC3B,GAAG,QAAQ;IACX,WAAW,gBAAgB;IAC3B,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B,QAAQ,aAAa;IACrB,cAAc,iBAAiB;CAClC;AAED,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;CAsB9B,CAAC;AAEF,eAAO,MAAM,sBAAsB;;CAElC,CAAC"}

package/lib/esm/enums/filters.js

@@ -35,7 +35,7 @@ export var SolrKeys;
     SolrKeys["fts"] = "case_24_7";
     SolrKeys["type"] = "case_type";
     SolrKeys["cep"] = "case_is_cep";
-    SolrKeys["accountName"] = "case_accountName";
+    SolrKeys["accountName"] = "case_account_name";
     SolrKeys["alternateId"] = "case_alternate_id";
     SolrKeys["caseClosedDate"] = "case_closedDate";
     SolrKeys["openshiftClusterId"] = "case_openshift_cluster_id";
@@ -67,7 +67,6 @@ export const advancedSearchMap = {
     case_24_7: 'FTS',
     case_type: 'caseType',
     case_is_cep: 'CEP',
-    case_accountName: 'accountName',
     case_alternate_id: 'alternateCaseId',
     case_closedDate: 'closedDate',
     case_openshift_cluster_id: 'openshiftClusterId',

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

@@ -1 +1 @@
-{"version":3,"file":"caseListUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/caseListUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAIxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAuC,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAOlG,MAAM,WAAW,kBAAkB,CAAC,CAAC;IACjC,CAAC,CAAC,EAAE,CAAC,CAAC;IACN,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC;IACjC,CAAC,CAAC,EAAE,KAAK,CAAC;CACb;AAED,UAAU,iBAAiB;IACvB,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C,sBAAsB,EAAE,OAAO,CAAC;IAChC,gBAAgB,EAAE,OAAO,CAAC;CAC7B;AAiBD,wBAAsB,WAAW,CAC7B,WAAW,EAAE,oBAAoB,EACjC,YAAY,EAAE,QAAQ,EACtB,mBAAmB,EAAE,OAAO,CAAC,QAAQ,CAAC,EACtC,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,iBAAiB,CAAC,CAmF5B;AAED,wBAAgB,mBAAmB,CAC/B,SAAS,EAAE,gBAAgB,EAC3B,aAAa,EAAE,OAAO,EACtB,WAAW,EAAE,WAAW,EACxB,eAAe,GAAE,OAAe,GACjC,OAAO,CAAC,uBAAuB,CAAC,CASlC"}
+{"version":3,"file":"caseListUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/caseListUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAIxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AAErF,OAAO,EAAuC,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAOlG,MAAM,WAAW,kBAAkB,CAAC,CAAC;IACjC,CAAC,CAAC,EAAE,CAAC,CAAC;IACN,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC;IACjC,CAAC,CAAC,EAAE,KAAK,CAAC;CACb;AAED,UAAU,iBAAiB;IACvB,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C,sBAAsB,EAAE,OAAO,CAAC;IAChC,gBAAgB,EAAE,OAAO,CAAC;CAC7B;AAiBD,wBAAsB,WAAW,CAC7B,WAAW,EAAE,oBAAoB,EACjC,YAAY,EAAE,QAAQ,EACtB,mBAAmB,EAAE,OAAO,CAAC,QAAQ,CAAC,EACtC,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,iBAAiB,CAAC,CAwF5B;AAED,wBAAgB,mBAAmB,CAC/B,SAAS,EAAE,gBAAgB,EAC3B,aAAa,EAAE,OAAO,EACtB,WAAW,EAAE,WAAW,EACxB,eAAe,GAAE,OAAe,GACjC,OAAO,CAAC,uBAAuB,CAAC,CASlC"}

package/lib/esm/utils/caseListUtils.js

@@ -20,7 +20,8 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { publicApi, search } from '@cee-eng/hydrajs';
 import { promiseReflection } from '@rh-support/utils';
-import { canDoSfdcSearch } from '../components/case-list/CaseListFilterHelpers';
+import { isNoFilterApplied } from '../components/case-list/CaseListFilterHelpers';
+import { CaseSearchQueryType } from '../enums/caseSearch';
 import { createSFDCQueryFromFilterState, createSolrQueryFromFilterState, mapSFDCCaseListToSolrCaseList, } from './caseSearchUtils';
 const throwErrorOnAbort = (message) => {
     const isAbortError = message && message.toLowerCase().includes('abort');
@@ -37,14 +38,18 @@ const throwErrorOnAbort = (message) => {
 // Even though SFDC support most of the filters but another problem with SFDC is it doesnot support multiple values for a praticular filter.
 // if user applies any filter apart from default filter we will always call solr and assume that(not safely) 10 sec scenario is not bound to happen.
 export function getCaseList(filterState, loggedInUser, loggedInUserAccount, abortSignal) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     return __awaiter(this, void 0, void 0, function* () {
         let isSolrSearchDownSFDCUp = false;
         let showErrorMessage = false;
         let caseListResponse;
         const solrFilter = createSolrQueryFromFilterState(filterState, loggedInUser);
         const partnerSearch = loggedInUser.hasManagedAccounts();
-        const isSfdcSearchRequired = canDoSfdcSearch(filterState) && !filterState.filterQueryInfo.queryString && !partnerSearch;
+        //sfdc returns wrong result, for now only call sfdc when we have no filter applied
+        const isSfdcSearchRequired = isNoFilterApplied(filterState) &&
+            !filterState.filterQueryInfo.queryString &&
+            !partnerSearch &&
+            ((_a = filterState.filterQueryInfo) === null || _a === void 0 ? void 0 : _a.type) !== CaseSearchQueryType.ADVANCED;
         let solrPromise = getCaseListFromSolr(solrFilter, partnerSearch, abortSignal, loggedInUserAccount === null || loggedInUserAccount === void 0 ? void 0 : loggedInUserAccount.secureSupport);
         const sfdcAPICall = () => publicApi.caseList.getCaseListFromSFDC(createSFDCQueryFromFilterState(filterState, loggedInUser, loggedInUserAccount), partnerSearch, loggedInUserAccount === null || loggedInUserAccount === void 0 ? void 0 : loggedInUserAccount.secureSupport, abortSignal);
         const sfdcPromise = isSfdcSearchRequired ? sfdcAPICall() : Promise.resolve(undefined);
@@ -54,8 +59,8 @@ export function getCaseList(filterState, loggedInUser, loggedInUserAccount, abor
             throwErrorOnAbort(solrResponse === null || solrResponse === void 0 ? void 0 : solrResponse.e.message);
         if (sfdcResponse.e)
             throwErrorOnAbort(sfdcResponse === null || sfdcResponse === void 0 ? void 0 : sfdcResponse.e.message);
-        const solrFullfilled = !!(solrResponse.status === 'fulfilled' && ((_a = solrResponse.v) === null || _a === void 0 ? void 0 : _a.response));
-        let sfdcFullfilled = !!(sfdcResponse.status === 'fulfilled' && ((_b = sfdcResponse.v) === null || _b === void 0 ? void 0 : _b.cases));
+        const solrFullfilled = !!(solrResponse.status === 'fulfilled' && ((_b = solrResponse.v) === null || _b === void 0 ? void 0 : _b.response));
+        let sfdcFullfilled = !!(sfdcResponse.status === 'fulfilled' && ((_c = sfdcResponse.v) === null || _c === void 0 ? void 0 : _c.cases));
         const sfdcCallIsMadeAndFailed = !sfdcFullfilled && isSfdcSearchRequired;
         const sfdcCallNotMade = !sfdcFullfilled && !isSfdcSearchRequired;
         if (!solrFullfilled && sfdcCallIsMadeAndFailed) {
@@ -65,10 +70,10 @@ export function getCaseList(filterState, loggedInUser, loggedInUserAccount, abor
             // SFDC call didn't make because we had filters that SFDC doesn't support
             try {
                 const sfdcRes = yield promiseReflection(sfdcAPICall());
-                sfdcFullfilled = !!(sfdcRes.status === 'fulfilled' && ((_c = sfdcRes.v) === null || _c === void 0 ? void 0 : _c.cases));
+                sfdcFullfilled = !!(sfdcRes.status === 'fulfilled' && ((_d = sfdcRes.v) === null || _d === void 0 ? void 0 : _d.cases));
                 if (sfdcFullfilled) {
                     isSolrSearchDownSFDCUp = true;
-                    const mappedSfdcRes = mapSFDCCaseListToSolrCaseList((_e = (_d = sfdcRes === null || sfdcRes === void 0 ? void 0 : sfdcRes.v) === null || _d === void 0 ? void 0 : _d.cases) !== null && _e !== void 0 ? _e : []);
+                    const mappedSfdcRes = mapSFDCCaseListToSolrCaseList((_f = (_e = sfdcRes === null || sfdcRes === void 0 ? void 0 : sfdcRes.v) === null || _e === void 0 ? void 0 : _e.cases) !== null && _f !== void 0 ? _f : []);
                     caseListResponse = {
                         response: {
                             docs: mappedSfdcRes,
@@ -85,7 +90,7 @@ export function getCaseList(filterState, loggedInUser, loggedInUserAccount, abor
         }
         else if (solrFullfilled && sfdcFullfilled) {
             caseListResponse = Object.assign(Object.assign({}, solrResponse.v), { response: {
-                    docs: mapSFDCCaseListToSolrCaseList((_g = (_f = sfdcResponse === null || sfdcResponse === void 0 ? void 0 : sfdcResponse.v) === null || _f === void 0 ? void 0 : _f.cases) !== null && _g !== void 0 ? _g : []),
+                    docs: mapSFDCCaseListToSolrCaseList((_h = (_g = sfdcResponse === null || sfdcResponse === void 0 ? void 0 : sfdcResponse.v) === null || _g === void 0 ? void 0 : _g.cases) !== null && _h !== void 0 ? _h : []),
                     numFound: sfdcResponse.v.totalCount,
                 } });
         }
@@ -93,7 +98,7 @@ export function getCaseList(filterState, loggedInUser, loggedInUserAccount, abor
             isSolrSearchDownSFDCUp = true;
             caseListResponse = {
                 response: {
-                    docs: mapSFDCCaseListToSolrCaseList((_j = (_h = sfdcResponse === null || sfdcResponse === void 0 ? void 0 : sfdcResponse.v) === null || _h === void 0 ? void 0 : _h.cases) !== null && _j !== void 0 ? _j : []),
+                    docs: mapSFDCCaseListToSolrCaseList((_k = (_j = sfdcResponse === null || sfdcResponse === void 0 ? void 0 : sfdcResponse.v) === null || _j === void 0 ? void 0 : _j.cases) !== null && _k !== void 0 ? _k : []),
                     numFound: sfdcResponse.v.totalCount,
                 },
             };

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

@@ -11,7 +11,7 @@ export declare const FILTER_URL_PAGE_SIZE_SEARCH_PARAM = "size";
 export declare const FILTER_URL_QUERY_TYPE = "searchType";
 declare function createSolrQueryFromFilterState(filterState: ICaseListFilterState, loggedInUser: UserAuth): any;
 declare function createUserFriendlyQueryFromFilterState(filterInfo: Partial<IFilterInfo>, filterQuery: string, useKeyForKVPair?: boolean): string;
-declare function createUserFriendlyQueryFromFilterStateAdvancedSearch(filterInfo: Partial<IFilterInfo>, filterQuery: string, useKeyForKVPair?: boolean): string;
+declare function createUserFriendlyQueryFromFilterStateAdvancedSearch(filterInfo: Partial<IFilterInfo>, filterQuery: string): string;
 declare function createAdvancedSearchQueryFromFilterState(filterInfo: Partial<IFilterInfo>, keyword: string, useKeyForKVPair?: any[]): string;
 declare function createQueryForCSVDownload(filterState: ICaseListFilterState, loggedInUserRights: UserAuth, loggedInUsersAccount: any, startValue?: number, limitValue?: number): any;
 declare function createSFDCQueryFromFilterState(filterState: ICaseListFilterState, loggedInUser: UserAuth, loggedInUserAccount: Partial<IAccount>): Partial<ISFDCCaseFilter>;

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;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"}
+{"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,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,WAAW,EAAE,MAAM,UA6ClH;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,wBAsCxD;AAmKD,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

@@ -96,7 +96,7 @@ function createUserFriendlyQueryFromFilterState(filterInfo, filterQuery, useKeyF
     filtersQuery !== '*:*' && finalQueryArr.push(filtersQuery);
     return finalQueryArr.join(' AND ');
 }
-function createUserFriendlyQueryFromFilterStateAdvancedSearch(filterInfo, filterQuery, useKeyForKVPair = false) {
+function createUserFriendlyQueryFromFilterStateAdvancedSearch(filterInfo, filterQuery) {
     // if query contains quotes then we need to escape it so that solr parser can parse it successfully
     //const searchTextQuery = filterQuery ? `keyword: "${filterQuery.replace(/"/g, '\\"')}"` : '';
     let solrQuery = new SolrQueryBuilder();
@@ -105,7 +105,7 @@ function createUserFriendlyQueryFromFilterStateAdvancedSearch(filterInfo, filter
             ? fieldNameToSolrFieldMapping[_filterKey]
             : _filterKey;
         const fieldValue = isKeyValuePair(filterInfo[_filterKey])
-            ? filterInfo[_filterKey].map((item) => (useKeyForKVPair ? item.key : item.value))
+            ? filterInfo[_filterKey].map((item) => (SolrKeys.accountNumber ? item.key : item.value))
             : filterInfo[_filterKey];
         if (_filterKey !== ProductVersionKey) {
             Array.isArray(fieldValue) && fieldValue.length > 0 && solrQuery.where(fieldLabel).in(flatMap(fieldValue));
@@ -326,7 +326,7 @@ function createFilterStateFromUrlQuery(urlQuery, globalMetadataState, pageSize,
         }
     });
     const parsedQuery = filterQueryInfo.type === CaseSearchQueryType.ADVANCED
-        ? createUserFriendlyQueryFromFilterStateAdvancedSearch(filterInfo, filterQueryInfo.queryString, true)
+        ? createUserFriendlyQueryFromFilterStateAdvancedSearch(filterInfo, filterQueryInfo.queryString)
         : '';
     const filterQuery = {
         sortInfo,
@@ -352,7 +352,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]) {
-                newFilterInfo[_key] = generateFilterValue(_key, filterObj[_key], globalMetadataState);
+                newFilterInfo[_key] = generateFilterValue(_key, filterObj[_key], globalMetadataState, true);
             }
             else {
                 // if it's supported in basic search mode then add it as a query string in the search input
@@ -367,9 +367,11 @@ function createFilterStateFromAdvancedQuery(queryString, globalMetadataState, cu
             type }), filterInfo: Object.assign(Object.assign({}, initialCaseFilterState.filterInfo), newFilterInfo) });
     return filterState;
 }
-function generateFilterValue(solrFieldName, value, globalMetadataState) {
+function generateFilterValue(solrFieldName, value, globalMetadataState, isAdvancedSearch = false) {
     const valueArr = Array.isArray(value) ? value : value ? [value] : [];
-    return getValidValues(solrFieldName, valueArr, globalMetadataState);
+    return isAdvancedSearch
+        ? getValidValuesAdvancedSearch(solrFieldName, valueArr, globalMetadataState)
+        : getValidValues(solrFieldName, valueArr, globalMetadataState);
 }
 function getValidValues(solrFieldName, itemValues = [], globalMetadataState) {
     var _a, _b, _c, _d;
@@ -422,6 +424,56 @@ function getValidValues(solrFieldName, itemValues = [], globalMetadataState) {
     }
     return mappedValues;
 }
+function getValidValuesAdvancedSearch(solrFieldName, itemValues = [], globalMetadataState) {
+    var _a, _b, _c, _d;
+    if (itemValues.length < 1)
+        return itemValues;
+    let mappedValues = [];
+    if (solrFieldName === SolrKeys.group) {
+        const caseGroupsMap = (((_a = globalMetadataState.caseGroups) === null || _a === void 0 ? void 0 : _a.data) || []).reduce((acc, { groupNum, name = 'Ungrouped' }) => {
+            acc[name] = groupNum;
+            return acc;
+        }, {});
+        itemValues.forEach((item) => {
+            caseGroupsMap[item] && mappedValues.push({ key: caseGroupsMap[item], value: item });
+        });
+    }
+    else if (solrFieldName === SolrKeys.accountNumber) {
+        let bookmarkedAccountsMap = (((_b = globalMetadataState.bookmarkedAccounts) === null || _b === void 0 ? void 0 : _b.data) || []).reduce((acc, { accountNumber, name }) => {
+            acc[accountNumber] = getLabel(accountNumber, name);
+            return acc;
+        }, {});
+        bookmarkedAccountsMap = (((_c = globalMetadataState.bookmarkedGroupAccounts) === null || _c === void 0 ? void 0 : _c.data) || []).reduce((acc, { accountNumber, name }) => {
+            acc[accountNumber] = getLabel(accountNumber, name);
+            return acc;
+        }, {});
+        const managedAccountsMap = (((_d = globalMetadataState.managedAccounts) === null || _d === void 0 ? void 0 : _d.data) || []).reduce((acc, { accountNum, name }) => {
+            acc[accountNum] = getLabel(accountNum, name);
+            return acc;
+        }, {});
+        itemValues.forEach((item) => {
+            if (bookmarkedAccountsMap[item]) {
+                mappedValues.push({ key: item, value: bookmarkedAccountsMap[item] });
+            }
+            else if (managedAccountsMap[item]) {
+                mappedValues.push({ key: item, value: managedAccountsMap[item] });
+            }
+            else if (isEmpty(managedAccountsMap)) {
+                mappedValues.push({ key: item, value: item });
+            }
+        });
+    }
+    else if (solrFieldName === SolrKeys.escalation) {
+        mappedValues = itemValues.map((item) => ({
+            key: item,
+            value: AdditionalFilterLabels[solrFieldName],
+        }));
+    }
+    else {
+        mappedValues = itemValues;
+    }
+    return mappedValues;
+}
 function generateProductVersionPivotValue(values) {
     return (values || []).map((item) => {
         return typeof item === 'string'

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/cases",
-    "version": "1.0.5",
+    "version": "1.0.7",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -99,5 +99,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "4c44ec177438ff8e09a761a4f38ce3fbd83c7aaa"
+    "gitHead": "d205a24d22e9f7e8891b07cfd92aca108bf85e4b"
 }