@rh-support/cases 1.0.2 → 1.0.4

package/lib/esm/utils/caseSearchUtils.js

@@ -17,9 +17,9 @@ 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, ProductVersionKey, sfdcFieldToSolrMap, SolrKeys, SolrPivotKeys, SolrTags, } from '../enums/filters';
+import { AdditionalFilterLabels, advancedSearchMap, ProductVersionKey, sfdcFieldToSolrMap, SolrKeys, SolrPivotKeys, SolrTags, } from '../enums/filters';
 export const FILTER_URL_QUERY_SEARCH_PARAM = 'query';
 export const FILTER_URL_CURRENT_PAGE_SEARCH_PARAM = 'p';
 export const FILTER_URL_PAGE_SIZE_SEARCH_PARAM = 'size';
@@ -27,8 +27,7 @@ export const FILTER_URL_QUERY_TYPE = 'searchType';
 function createSolrQueryFromFilterState(filterState, loggedInUser) {
     const { paginationInfo: { pageSize, currentPage }, sortInfo: { column, direction }, filterInfo, filterQueryInfo, } = filterState;
     const rows = pageSize;
-    const isAdvancedSearch = filterQueryInfo.type === CaseSearchQueryType.ADVANCED;
-    const queryString = ((isAdvancedSearch ? filterQueryInfo.parsedQuery : filterQueryInfo.queryString) || '*:*').trim();
+    const queryString = (filterQueryInfo.queryString || '*:*').trim();
     const isCaseNumberQuery = isValidCaseNumber(queryString);
     const q = isCaseNumberQuery ? `${SolrKeys.caseNumber}:${queryString}` : queryString;
     const sort = `${caseListSortColumnIdsToSolrMap[column]} ${direction}`;
@@ -97,6 +96,52 @@ function createUserFriendlyQueryFromFilterState(filterInfo, filterQuery, useKeyF
     filtersQuery !== '*:*' && finalQueryArr.push(filtersQuery);
     return finalQueryArr.join(' AND ');
 }
+function createUserFriendlyQueryFromFilterStateAdvancedSearch(filterInfo, filterQuery, useKeyForKVPair = false) {
+    // 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();
+    Object.keys(filterInfo).forEach((_filterKey) => {
+        const fieldLabel = fieldNameToSolrFieldMapping[_filterKey]
+            ? fieldNameToSolrFieldMapping[_filterKey]
+            : _filterKey;
+        const fieldValue = isKeyValuePair(filterInfo[_filterKey])
+            ? filterInfo[_filterKey].map((item) => (useKeyForKVPair ? item.key : item.value))
+            : filterInfo[_filterKey];
+        if (_filterKey !== ProductVersionKey) {
+            Array.isArray(fieldValue) && fieldValue.length > 0 && solrQuery.where(fieldLabel).in(flatMap(fieldValue));
+        }
+    });
+    const filtersQuery = solrQuery.build();
+    const productVersionQuery = createProductVersionQueryStringFromFilterState(filterInfo);
+    // add text: to string search and create and with the rest
+    const q = parseSolrQuery(filterQuery);
+    const newFilterInfo = {};
+    let advanceToBasicQuery = [];
+    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]);
+        }
+        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]) {
+                    advanceToBasicQuery.push(`${advancedSearchMap[_key]}:${getStringOrBooleanValue(q[_key][0])}`);
+                }
+            }
+        }
+    });
+    const textSearch = advanceToBasicQuery.length !== 0 ? [`text:"${advanceToBasicQuery.join(' ')}"`] : [];
+    const parsedQueryString = []
+        .concat(textSearch)
+        .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] });
     let productVersionQuery = '';
@@ -107,7 +152,7 @@ function createProductVersionQueryStringFromFilterState(filterInfo) {
             .replace(regexForProductReplace, fieldNameToSolrFieldMapping[SolrKeys.product])
             .replace(regexForVersionReplace, fieldNameToSolrFieldMapping[SolrKeys.version]);
     }
-    return productVersionQuery;
+    return productVersionQuery.replace(/\(\s+/g, '(').replace(/\s\)+/g, ')');
 }
 function createAdvancedSearchQueryFromFilterState(filterInfo, keyword, useKeyForKVPair = []) {
     const finalQueryArr = [];
@@ -141,8 +186,13 @@ function createAdvancedSearchQueryFromFilterState(filterInfo, keyword, useKeyFor
     filtersQuery !== '*:*' && finalQueryArr.push(filtersQuery);
     return finalQueryArr.join(' and ');
 }
+function isBoolean(val) {
+    return val === false || val === true;
+}
 function getStringOrBooleanValue(val) {
-    return val === 'true' ? true : val === 'false' ? false : val;
+    if (isBoolean(val))
+        return val;
+    return val === 'true' ? true : val === 'false' ? false : `"${val}"`;
 }
 function createQueryForCSVDownload(filterState, loggedInUserRights, loggedInUsersAccount, startValue = 0, limitValue = 1000) {
     if (loggedInUsersAccount.secureSupport) {
@@ -174,7 +224,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;
@@ -192,12 +241,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();
@@ -285,15 +333,19 @@ function createFilterStateFromUrlQuery(urlQuery, globalMetadataState, pageSize,
             }
         }
     });
+    const parsedQuery = filterQueryInfo.type === CaseSearchQueryType.ADVANCED
+        ? createUserFriendlyQueryFromFilterStateAdvancedSearch(filterInfo, filterQueryInfo.queryString, true)
+        : '';
     const filterQuery = {
         sortInfo,
         paginationInfo,
-        filterQueryInfo,
+        filterQueryInfo: Object.assign(Object.assign({}, filterQueryInfo), { parsedQuery }),
         filterInfo: Object.assign(Object.assign({}, defaultFilterInfo), filterInfo),
     };
     return filterQuery;
 }
-function createFilterStateFromAdvancedQuery(queryString, globalMetadataState, currentFilterState) {
+// when from advaced query we want to swith to basic query is called
+function createFilterStateFromAdvancedQuery(queryString, globalMetadataState, currentFilterState, parsedQuery = '', type = CaseSearchQueryType.BASIC) {
     const filterObj = parseSolrQuery(queryString);
     const newFilterInfo = {};
     let advanceToBasicQuery = [];
@@ -312,14 +364,15 @@ function createFilterStateFromAdvancedQuery(queryString, globalMetadataState, cu
             }
             else {
                 // if it's supported in basic search mode then add it as a query string in the search input
-                if (advanceSearchFieldNameToSolrFieldMapping[_key]) {
+                if (advanceSearchFieldNameToSolrFieldMapping[_key] || SolrKeys[_key]) {
                     const val = filterObj[_key];
-                    advanceToBasicQuery.push(`${_key}: "${getStringOrBooleanValue(val)}"`);
+                    advanceToBasicQuery.push(`${_key}:${getStringOrBooleanValue(val)}`);
                 }
             }
         }
     });
-    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) });
+    const filterState = Object.assign(Object.assign({}, currentFilterState), { filterQueryInfo: Object.assign(Object.assign({}, currentFilterState.filterQueryInfo), { queryString: advanceToBasicQuery.join(' AND '), parsedQuery,
+            type }), filterInfo: Object.assign(Object.assign({}, initialCaseFilterState.filterInfo), newFilterInfo) });
     return filterState;
 }
 function generateFilterValue(solrFieldName, value, globalMetadataState) {
@@ -395,4 +448,4 @@ function generateProductVersionPivotValue(values) {
             };
     });
 }
-export { createSolrQueryFromFilterState, createUserFriendlyQueryFromFilterState, createQueryForCSVDownload, createSFDCQueryFromFilterState, mapSFDCCaseListToSolrCaseList, createURLQueryFromFilterState, createFilterStateFromUrlQuery, createAdvancedSearchQueryFromFilterState, createFilterStateFromAdvancedQuery, };
+export { createSolrQueryFromFilterState, createUserFriendlyQueryFromFilterState, createUserFriendlyQueryFromFilterStateAdvancedSearch, createQueryForCSVDownload, createSFDCQueryFromFilterState, mapSFDCCaseListToSolrCaseList, createURLQueryFromFilterState, createFilterStateFromUrlQuery, createAdvancedSearchQueryFromFilterState, createFilterStateFromAdvancedQuery, };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/cases",
-    "version": "1.0.2",
+    "version": "1.0.4",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -99,5 +99,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "455d21baf7d383cdd9a58ba9ff6483dd4a9b60a9"
+    "gitHead": "08110e83fe460e529f74fa3429ca9f99342dc76d"
 }