@rh-support/cases 1.0.1 → 1.0.3

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;;EA4EzC"}
+{"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"}

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

@@ -3,20 +3,12 @@ import PEG from 'pegjs';
 import { useEffect, useRef } from 'react';
 import { SolrKeys } from '../../../enums/filters';
 import { useCaseListStateContext } from '../CaseListContext';
-// escaped from solrGrammar.txt
-const grammarStringInternal = '{\r\n  function joinByOr(val) {\r\n    return "(" + [].concat.apply([], val).filter(function(item) {return item !== \' \'}).join(" or ")+")";\r\n  }\r\n}\r\n\r\nquery = sequence\r\n\r\nsequence = first:sequencePart cont:sequenceCont { return first + cont; }\r\nsequenceCont = orSequence / andSequence / ""\r\n\r\nandSequence = parts:(" and " sequencePart)+ { return [].concat.apply([], parts).join(""); }\r\norSequence = parts:(" or " sequencePart)+ { return [].concat.apply([], parts).join(""); }\r\nsequencePart = criteria / "(" sq:sequence ")" { return \'(\' + sq + \')\' }\r\n\r\n\r\ncriteria = basicCriteria / notCriteria\r\nnotCriteria = "-"criteria:basicCriteria {return \'-\' + criteria; }\r\nbasicCriteria = field:basicFieldName ":"" "* value:value { return field + ":" + value; }\r\n/ field:severityFieldName ":"" "* value:severityValue { return field + ":" + value; }\r\n/ field:statusFieldName ":"" "* value:statusValue { return field + ":" + value; }\r\n/ field:groupFieldName ":"" "* value:groupValue { return field + ":" + value; }\r\n/ field:caseTypeFieldName ":"" "* value:caseTypeValue { return field + ":" + value; }\r\n/ field:productFieldName ":"" "* value:productValue { return field + ":" + value; }\r\n/ field:ftsFieldName ":"" "* value:booleanValue { return field + ":" + value; }\r\n/ field:accountNumberFieldName ":"" "* value:accountNumberValue { return field + ":" + value; }\r\n/ field:accountNameFieldName ":"" "* value:accountNameValue { return field + ":" + value; }\r\n/ field:escalatedFieldName ":"" "* value:booleanValue { return field + ":" + value; }\r\n/ field:cepFieldName ":"" "* value:booleanValue { return field + ":" + value; }\r\n/ field:contactSSOFieldName ":"" "* value:stringOrMulti { return field + ":" + value; }\r\n/ field:ownerSSOFieldName ":"" "* value:stringOrMulti { return field + ":" + value; }\r\n/ field:createdBySSOFieldName ":"" "* value:stringOrMulti { return field + ":" + value; }\r\n/ field:textFieldName ":"" "* value:value { return value; }\r\n\r\nvalue = range / string\r\nrange = "[" from:([^" "]+) " TO " to:([^\\]]+) "]" {return "[" + from.join("") + " TO " + to.join("") + "]"; }\r\nstring = quoted_term / unquoted_term / _\r\n\r\nunquoted_term\r\n  = term:term_char+\r\n    { \r\n        return term.join(\'\');\r\n    }\r\n\r\nterm_char\r\n  =  [^: \\t\\r\\n\\f\\{\\}()"+-/^~\\[\\]]\r\n\r\n    \r\nquoted_term\r\n  = \'"\' term:[^"]+ \'"\'\r\n    {\r\n        return \'"\' + term.join(\'\') + \'"\';\r\n    }\r\nbooleanValue = "true" / "false"\r\nnumber = digits:[0-9]+ { return digits.join(\'\'); }\r\nmultipleValue = "(" val:(value)+ ")" { return joinByOr(val); }\r\nstringOrMulti = string / multipleValue\r\n\r\nbasicFieldName = "contactName" {return "case_contactName";}\r\n/ "createdByName" {return "case_createdByName";}\r\n/ "createdDate" {return "case_createdDate";}\r\n/ "closedDate" {return "case_closedDate";}\r\n/ "description" {return "case_description";}\r\n/ "summary" {return "case_summary";}\r\n/ "productVersion" {return "case_version";}\r\n/ "lastModifiedDate" {return "case_lastModifiedDate";}\r\n/ "lastModifiedByName" {return "case_lastModifiedByName";}\r\n/ "ownerName" {return "case_owner";}\r\n/ "caseNumber" {return "case_number";}\r\n/ "openshiftClusterId" {return "case_openshift_cluster_id";}\r\n/ "alternateCaseId" {return "case_alternate_id";}\r\n\r\ncepFieldName = "CEP" {return "case_is_cep";}\r\nftsFieldName = "FTS" {return "case_24_7";}\r\nescalatedFieldName = "escalated" {return "case_customer_escalation";}\r\ncontactSSOFieldName = "contactSSO" {return "case_contact_sso_username";}\r\nownerSSOFieldName = "ownerSSO" {return "case_owner_sso_username";}\r\ncreatedBySSOFieldName = "createdBySSO" {return "case_createdby_sso_username";}\r\ntextFieldName = "text" {return "";}\r\n\r\nseverityFieldName = "severity" {return "case_severity";}\r\nseverityValue = string / severityMultipleValue / _ \r\nseverityMultipleValue = "(" val:(severityValue)+ ")" { return joinByOr(val); }\r\n\r\nstatusFieldName = "status" {return "case_status";}\r\nstatusValue = string / statusMultipleValue / _ \r\nstatusMultipleValue = "(" val:(statusValue)+ ")" { return joinByOr(val); }\r\n\r\ngroupFieldName = "group" {return "case_folderNumber";}\r\ngroupValue = string / groupMultipleValue / _ \r\ngroupMultipleValue = "(" val:(groupValue)+ ")" { return joinByOr(val); }\r\n\r\ncaseTypeFieldName = "caseType" {return "case_type";}\r\ncaseTypeValue = string / caseTypeMultipleValue / _ \r\ncaseTypeMultipleValue = "(" val:(caseTypeValue)+ ")" { return joinByOr(val); }\r\n\r\nproductFieldName = "productName" { return "case_product"; }\r\nproductValue = string / productMultipleValue / _ \r\nproductMultipleValue = "(" val:(productValue)+ ")" { return joinByOr(val); }\r\n\r\naccountNumberFieldName = "accountNumber" {return "case_accountNumber";}\r\naccountNumberValue = number / string / accountNumberMultipleValue / _ \r\naccountNumberMultipleValue = "(" val:(accountNumberValue)+ ")" { return joinByOr(val); }\r\n\r\naccountNameFieldName = "accountName" { return "case_account_name";}\r\naccountNameValue = string / accountNameMultipleValue / _ \r\naccountNameMultipleValue = "(" val:(accountNameValue)+ ")" { return joinByOr(val); }\r\n\r\n_ "whitespace"\r\n  = [ \\t\\r\\n\\f]+';
 export default function useAdvanceSearchParser({ onInit }) {
     const { filterValuesFromFacetResponse } = useCaseListStateContext();
     const { globalMetadataState: { caseGroups, loggedInUsersAccount, bookmarkedGroupAccounts, allCaseTypes }, } = useGlobalStateContext();
-    const grammerStringRef = useRef(grammarStringInternal);
     const parserRef = useRef(null);
     const parse = (stringQuery) => {
-        // on page load if we try to parse query from url, parser could be undefined
-        // so we just intialise the parser with basic grammar without values
-        if (!parserRef.current) {
-            initParser();
-        }
-        return parserRef.current.parse(stringQuery);
+        return parserRef.current.parse(stringQuery.replace(/  +/g, ' '));
     };
     const parseSafe = (stringQuery) => {
         try {
@@ -25,69 +17,174 @@ export default function useAdvanceSearchParser({ onInit }) {
         catch (e) { }
         return '';
     };
-    const initParser = () => {
+    const initParser = (grammer) => {
         try {
-            parserRef.current = PEG.generate(grammerStringRef.current);
+            parserRef.current = PEG.generate(grammer);
         }
-        catch (_a) {
+        catch (e) {
             parserRef.current = null;
         }
     };
-    // write products, severity and status to grammar string once we have the values from facets
+    // init grammar parser once we have the values from facets
     useEffect(() => {
-        if (!filterValuesFromFacetResponse)
+        if (!filterValuesFromFacetResponse ||
+            caseGroups.isFetching ||
+            allCaseTypes.isFetching ||
+            bookmarkedGroupAccounts.isFetching ||
+            loggedInUsersAccount.isFetching)
             return;
-        const statusValues = filterValuesFromFacetResponse[SolrKeys.status]
-            .map((status) => `"\\"${status.value}\\"" { return '"${status.value}"'; }`)
-            .join(' / ');
-        const severityValues = filterValuesFromFacetResponse[SolrKeys.severity]
-            .map((severity) => `"\\"${severity.value}\\"" { return '"${severity.value}"'; }`)
-            .join(' / ');
-        const productValues = filterValuesFromFacetResponse[SolrKeys.product]
-            .map((product) => `"\\"${product.value}\\"" { return '"${product.value}"'; }`)
-            .join(' / ');
-        writeValuesToGrammarString('status', statusValues);
-        writeValuesToGrammarString('severity', severityValues);
-        writeValuesToGrammarString('product', productValues);
-        initParser();
-        // // parse on page load so that we have the autocomplete setup on first load
-        onInit && onInit();
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [filterValuesFromFacetResponse, caseGroups.data]);
-    // write case groups to solr grammar string
-    useEffect(() => {
-        const groupValues = (caseGroups.data || [])
-            .map((group) => `"\\"${group.name}\\"" { return '${group.groupNum}'; }`)
-            .join(' / ');
-        writeValuesToGrammarString('group', groupValues);
-        initParser();
-    }, [caseGroups.data]);
-    // write case types to solr grammar string
-    useEffect(() => {
-        const caseTypeValues = (allCaseTypes.data || [])
-            .map((caseType) => `"\\"${caseType}\\"" { return '"${caseType}"'; }`)
-            .join(' / ');
-        writeValuesToGrammarString('caseType', caseTypeValues);
-        initParser();
-    }, [allCaseTypes.data]);
-    // write account numbers and account name to solr grammar string
-    useEffect(() => {
         const accounts = (bookmarkedGroupAccounts.data || []);
         const allAccounts = [...accounts, loggedInUsersAccount.data];
-        const numberValues = allAccounts
-            .map((account) => `"${account.accountNumber}" { return "${account.accountNumber}"; }`)
-            .join(' / ');
-        const nameValues = allAccounts
-            .map((account) => `"\\"${account.name}\\"" { return "${account.name}"; }`)
-            .join(' / ');
-        writeValuesToGrammarString('accountNumber', `number / string / ${numberValues}`);
-        writeValuesToGrammarString('accountName', `string / ${nameValues}`);
-        initParser();
-    }, [bookmarkedGroupAccounts.data, loggedInUsersAccount.data]);
-    const writeValuesToGrammarString = (fieldName, values) => {
-        const rule = `${fieldName}Value =  ${values} / ${fieldName}MultipleValue / _`;
-        const replaceRegex = new RegExp(`${fieldName}Value\\s*=.+`);
-        grammerStringRef.current = grammerStringRef.current.replace(replaceRegex, rule);
-    };
+        const grammarStringInternal = `
+    {
+        function joinByOr(val) {
+            return "(" + [].concat.apply([], val).filter(function(item) {return item !== ' '}).join(" OR ")+")";
+        }
+    }
+
+    query = sequence
+
+    sequence = first:sequencePart cont:sequenceCont { return first + cont; }
+
+    sequenceCont = orSequence / andSequence / ""
+
+    andSequence = parts:(" and " sequencePart)+ { return [].concat.apply([], parts).join(""); }
+    orSequence = parts:(" or " sequencePart)+ { return [].concat.apply([], parts).join(""); }
+    sequencePart = criteria / "(" sq:sequence ")" { return '(' + sq + ')' }
+
+    criteria = basicCriteria / notCriteria
+    notCriteria = "-"criteria:basicCriteria {return '-' + criteria; }
+    basicCriteria = field:basicFieldName ":"" "* value:value { return field + ":" + value; }
+    / field:severityFieldName ":"" "* value:severityValue { return field + ":" + value; }
+    / field:statusFieldName ":"" "* value:statusValue { return field + ":" + value; }
+    / field:groupFieldName ":"" "* value:groupValue { return field + ":" + value; }
+    / field:caseTypeFieldName ":"" "* value:caseTypeValue { return field + ":" + value; }
+    / field:productFieldName ":"" "* value:productValue { return field + ":" + value; }
+    / field:versionFieldName ":"" "* value:versionValue { return field + ":" + value; }
+    / field:ftsFieldName ":"" "* value:booleanValue { return field + ":" + value; }
+    / field:accountNumberFieldName ":"" "* value:accountNumberValue { return field + ":" + value; }
+    / field:accountNameFieldName ":"" "* value:accountNameValue { return field + ":" + value; }
+    / field:escalatedFieldName ":"" "* value:booleanValue { return field + ":" + value; }
+    / field:cepFieldName ":"" "* value:booleanValue { return field + ":" + value; }
+    / field:contactSSOFieldName ":"" "* value:stringOrMulti { return field + ":" + value; }
+    / field:ownerSSOFieldName ":"" "* value:stringOrMulti { return field + ":" + value; }
+    / field:createdBySSOFieldName ":"" "* value:stringOrMulti { return field + ":" + value; }
+    / field:textFieldName ":"" "* value:value { return value; }
+
+    value = range / string
+    range = "[" from:([^" "]+) " TO " to:([^\\]]+) "]" {return "[" + from.join("") + " TO " + to.join("") + "]"; }
+    string = quoted_term / unquoted_term / _
+
+    unquoted_term
+        = term:term_char+
+        { 
+            return term.join('');
+        }
+
+    term_char
+        =  [^: \\t\\r\\n\\f\\{\\}()"+-/^~\\[\\]]
+
+    quoted_term
+        = '"' term:[^"]+ '"'
+        { 
+            return '"' + term.join('') + '"';
+        }
+    booleanValue = "true" / "false"
+    number = digits:[0-9]+ { return digits.join(''); }
+    multipleValue = "(" val:(value)+ ")" { return joinByOr(val); }
+    stringOrMulti = string / multipleValue
+
+    basicFieldName = "contactName" {return "${SolrKeys.contactName}";}
+    / "createdByName" {return "${SolrKeys.createdBy}";}
+    / "createdDate" {return "${SolrKeys.createdDate}";}
+    / "closedDate" {return "${SolrKeys.caseClosedDate}";}
+    / "description" {return "${SolrKeys.description}";}
+    / "summary" {return "${SolrKeys.caseSummary}";}
+    / "lastModifiedDate" {return "${SolrKeys.modifiedDate}";}
+    / "lastModifiedByName" {return "${SolrKeys.modifiedBy}";}
+    / "ownerName" {return "${SolrKeys.ownerName}";}
+    / "caseNumber" {return "${SolrKeys.caseNumber}";}
+    / "openshiftClusterId" {return "${SolrKeys.openshiftClusterId}";}
+    / "alternateCaseId" {return "${SolrKeys.alternateId}";}
+
+    cepFieldName = "CEP" {return "${SolrKeys.cep}";}
+    ftsFieldName = "FTS" {return "${SolrKeys.fts}";}
+    escalatedFieldName = "escalated" {return "${SolrKeys.escalation}";}
+    contactSSOFieldName = "contactSSO" {return "${SolrKeys.caseContactSSO}";}
+    ownerSSOFieldName = "ownerSSO" {return "${SolrKeys.caseOwner}";}
+    createdBySSOFieldName = "createdBySSO" {return "${SolrKeys.createdBySsoUsername}";}
+    textFieldName = "text" {return "";}
+
+    severityFieldName = "severity" {return "${SolrKeys.severity}";}
+    severityValue = string
+    /${(filterValuesFromFacetResponse[SolrKeys.severity] || [])
+            .map((severity) => `'"${severity.value}"' { return '"${severity.value}"'; } `)
+            .join(' / ')}
+    / severityMultipleValue / _
+    severityMultipleValue = "(" val:(severityValue)+ ")" { return joinByOr(val); }
+
+    statusFieldName = "status" {return "${SolrKeys.status}";}
+    statusValue = string
+    /${(filterValuesFromFacetResponse[SolrKeys.status] || [])
+            .map((status) => `'"${status.value}"' { return '"${status.value}"'; } `)
+            .join(' / ')}
+    / statusMultipleValue / _
+    statusMultipleValue = "(" val:(statusValue)+ ")" { return joinByOr(val); }
+
+    groupFieldName = "group" {return "${SolrKeys.group}";}
+    groupValue = string
+    / ${(caseGroups.data || []).map((group) => `'"${group.name}"' { return '${group.groupNum}'; }`).join(' / ')}
+    / groupMultipleValue / _
+    groupMultipleValue = "(" val:(groupValue)+ ")" { return joinByOr(val); }
+
+    caseTypeFieldName = "caseType" {return "${SolrKeys.type}";}
+    caseTypeValue = string
+    / ${(allCaseTypes.data || []).map((caseType) => `'"${caseType}"' { return '"${caseType}"'; }`).join(' / ')}
+    / caseTypeMultipleValue / _
+    caseTypeMultipleValue = "(" val:(caseTypeValue)+ ")" { return joinByOr(val); }
+
+    productFieldName = "productName" { return "${SolrKeys.product}"; }
+    productValue = string
+    / ${(filterValuesFromFacetResponse[SolrKeys.product] || [])
+            .map((product) => `'"${product.value}"' { return '"${product.value}"'; } `)
+            .join(' / ')}
+    / productMultipleValue / _
+    productMultipleValue = "(" val:(productValue)+ ")" { return joinByOr(val); }
+
+    versionFieldName = "productVersion" { return "${SolrKeys.version}"; }
+    versionValue = string
+    / versionMultipleValue / _
+    versionMultipleValue = "(" val:(versionValue)+ ")" { return joinByOr(val); }
+
+    accountNumberFieldName = "accountNumber" {return "${SolrKeys.accountNumber}";}
+    accountNumberValue = number
+    / string
+    / ${allAccounts.map((account) => `"${account.accountNumber}" { return "${account.accountNumber}"; }`).join(' / ')}
+    / accountNumberMultipleValue / _
+    accountNumberMultipleValue = "(" val:(accountNumberValue)+ ")" { return joinByOr(val); }
+
+    accountNameFieldName = "accountName" { return "case_account_name";}
+    accountNameValue = string
+    / ${allAccounts.map((account) => `'"${account.name}"' { return "${account.name}"; }`).join(' / ')}
+    / accountNameMultipleValue / _
+    accountNameMultipleValue = "(" val:(accountNameValue)+ ")" { return joinByOr(val); }
+
+    _ "whitespace"
+        = [ \\t\\r\\n\\f]+
+
+    EOF
+        = !.
+`;
+        initParser(grammarStringInternal);
+        // parse on page load so that we have the autocomplete setup on first load
+        onInit && onInit();
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [
+        filterValuesFromFacetResponse,
+        caseGroups.isFetching,
+        allCaseTypes.isFetching,
+        bookmarkedGroupAccounts.isFetching,
+        loggedInUsersAccount.isFetching,
+    ]);
     return { parse, parseSafe, parserRef };
 }

package/lib/esm/css/caseList.css

@@ -155,11 +155,12 @@
     font-size: 14px;
 }
 
-.cases-main .case-search-top .filter-chip-wrapper .filter-chip-version-selector button {
+.cases-main .case-search-top .filter-chip-wrapper button.pf-c-select__toggle {
     font-size: 13px;
+    --pf-c-select__toggle-text--Color: var(--pf-c-select__toggle--m-placeholder__toggle-text--Color) !important;
 }
 
-.cases-main .case-search-top .filter-chip-wrapper .filter-chip-version-selector button svg {
+.cases-main .case-search-top .filter-chip-wrapper button.pf-c-select__toggle svg {
     margin-left: 4px;
 }
 
@@ -469,3 +470,7 @@
     min-width: 10%;
     max-width: 10%;
 }
+
+.filter-group .pf-c-select__toggle {
+    --pf-c-select__toggle-text--Color: var(--pf-c-select__toggle--m-placeholder__toggle-text--Color) !important;
+}

package/lib/esm/css/caseSearch.css

@@ -28,10 +28,6 @@
     }
 }
 
-.case-search-input-container input {
-    padding-right: 35px;
-}
-
 .case-search-input-container button.search-btn {
     margin-left: 1rem;
 }

package/lib/esm/enums/case.js

@@ -35,7 +35,7 @@ export const caseListSortColumnIdsToSolrMap = {
     [CaseListColumnIds.caseId]: SolrKeys.caseNumber,
     [CaseListColumnIds.summary]: SolrKeys.caseSummary,
     [CaseListColumnIds.severity]: SolrKeys.severity,
-    [CaseListColumnIds.owner]: SolrKeys.ownerName,
+    [CaseListColumnIds.owner]: SolrKeys.createdBy,
     [CaseListColumnIds.created]: SolrKeys.createdDate,
     [CaseListColumnIds.status]: SolrKeys.status,
     [CaseListColumnIds.modified]: SolrKeys.modifiedDate,

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

@@ -35,8 +35,42 @@ export declare enum SolrKeys {
     cep = "case_is_cep",
     accountName = "case_accountName",
     alternateId = "case_alternate_id",
-    caseClosedDate = "case_closedDate"
+    caseClosedDate = "case_closedDate",
+    openshiftClusterId = "case_openshift_cluster_id"
 }
+export declare const advancedSearchMap: {
+    case_number: string;
+    case_summary: string;
+    case_product: string;
+    case_status: string;
+    case_accountNumber: string;
+    case_folderNumber: string;
+    case_folderName: string;
+    case_severity: string;
+    case_owner_sso_username: string;
+    case_owner: string;
+    case_contactName: string;
+    case_contact_sso_username: string;
+    case_customer_escalation: string;
+    case_version: string;
+    case_createdByName: string;
+    case_createdby_sso_username: string;
+    case_createdDate: string;
+    case_lastModifiedByName: string;
+    case_lastModifiedDate: string;
+    case_last_public_update_date: string;
+    case_last_public_update_by: string;
+    case_description: string;
+    uri: string;
+    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;
+    case_account_name: string;
+};
 export declare enum SolrPivotKeys {
     product_version = "case_product,case_version"
 }

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;CACrC;AAGD,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,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"}

package/lib/esm/enums/filters.js

@@ -38,7 +38,41 @@ export var SolrKeys;
     SolrKeys["accountName"] = "case_accountName";
     SolrKeys["alternateId"] = "case_alternate_id";
     SolrKeys["caseClosedDate"] = "case_closedDate";
+    SolrKeys["openshiftClusterId"] = "case_openshift_cluster_id";
 })(SolrKeys || (SolrKeys = {}));
+export const advancedSearchMap = {
+    case_number: 'caseNumber',
+    case_summary: 'summary',
+    case_product: 'productName',
+    case_status: 'status',
+    case_accountNumber: 'accountNumber',
+    case_folderNumber: 'group',
+    case_folderName: 'groupName',
+    case_severity: 'severity',
+    case_owner_sso_username: 'caseOwner',
+    case_owner: 'ownerName',
+    case_contactName: 'contactName',
+    case_contact_sso_username: 'contactSSO',
+    case_customer_escalation: 'escalated',
+    case_version: 'productVersion',
+    case_createdByName: 'createdByName',
+    case_createdby_sso_username: 'createdBySSO',
+    case_createdDate: 'createdDate',
+    case_lastModifiedByName: 'lastModifiedByName',
+    case_lastModifiedDate: 'lastModifiedDate',
+    case_last_public_update_date: 'lastPublicUpdateDate',
+    case_last_public_update_by: 'lastPublicUpdateDateBy',
+    case_description: 'description',
+    uri: 'uri',
+    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',
+    case_account_name: 'accountName',
+};
 // just to keep ts happy since the below const does not work
 export var SolrPivotKeys;
 (function (SolrPivotKeys) {

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

@@ -11,12 +11,13 @@ 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 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>;
 declare function mapSFDCCaseListToSolrCaseList(response?: ISFDCCaseListResponse[]): ISolrCaseListResponse[];
 declare function createURLQueryFromFilterState(filterState: ICaseListFilterState): string;
 declare function createFilterStateFromUrlQuery(urlQuery: string, globalMetadataState: IGlobalMetadataState, pageSize?: number, currentPage?: number, searchType?: CaseSearchQueryType): ICaseListFilterState;
-declare function createFilterStateFromAdvancedQuery(queryString: string, globalMetadataState: IGlobalMetadataState, currentFilterState: ICaseListFilterState): ICaseListFilterState;
-export { createSolrQueryFromFilterState, createUserFriendlyQueryFromFilterState, createQueryForCSVDownload, createSFDCQueryFromFilterState, mapSFDCCaseListToSolrCaseList, createURLQueryFromFilterState, createFilterStateFromUrlQuery, createAdvancedSearchQueryFromFilterState, createFilterStateFromAdvancedQuery, };
+declare function createFilterStateFromAdvancedQuery(queryString: string, globalMetadataState: IGlobalMetadataState, currentFilterState: ICaseListFilterState, parsedQuery?: string, type?: CaseSearchQueryType): ICaseListFilterState;
+export { createSolrQueryFromFilterState, createUserFriendlyQueryFromFilterState, createUserFriendlyQueryFromFilterStateAdvancedSearch, createQueryForCSVDownload, createSFDCQueryFromFilterState, mapSFDCCaseListToSolrCaseList, createURLQueryFromFilterState, createFilterStateFromUrlQuery, createAdvancedSearchQueryFromFilterState, createFilterStateFromAdvancedQuery, };
 //# sourceMappingURL=caseSearchUtils.d.ts.map

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;AAS7B,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,OA+DhG;AAED,iBAAS,sCAAsC,CAC3C,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,EAChC,WAAW,EAAE,MAAM,EACnB,eAAe,GAAE,OAAe,UAwBnC;AAeD,iBAAS,wCAAwC,CAC7C,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,EAChC,OAAO,EAAE,MAAM,EACf,eAAe,QAAK,UAoCvB;AAMD,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,wBA4C9D;AAED,iBAAS,kCAAkC,CACvC,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,oBAAoB,EACzC,kBAAkB,EAAE,oBAAoB,wBAmC3C;AAgGD,OAAO,EACH,8BAA8B,EAC9B,sCAAsC,EACtC,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;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"}

package/lib/esm/utils/caseSearchUtils.js

@@ -19,7 +19,7 @@ import { getLabel } from '../components/case-list/case-list-filters/AccountsBook
 import { initialCaseFilterState } from '../components/case-list/CaseListFilterContext';
 import { CaseListColumnIds, 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) {
@@ -285,15 +335,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 +366,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 +450,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.1",
+    "version": "1.0.3",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -99,5 +99,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "4f98bb1c175ecda80b26a491f61afd603f78d9bd"
+    "gitHead": "6ad83aaad97f659afae273d0bf00f1b7400584f1"
 }