@rh-support/cases 1.0.13 → 1.0.15

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

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

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

@@ -35,7 +35,7 @@ export default function useAdvanceSearchParser({ onInit }) {
             return;
         const accounts = (bookmarkedGroupAccounts.data || []);
         const allAccounts = [...accounts, loggedInUsersAccount.data];
-        const grammarStringInternal = `
+        const grammarStringInternal = String.raw `
     {
         function joinByOr(val) {
             return "(" + [].concat.apply([], val).filter(function(item) {return item !== ' '}).join(" OR ")+")";
@@ -72,7 +72,7 @@ export default function useAdvanceSearchParser({ onInit }) {
     / field:textFieldName ":"" "* value:value { return value; }
 
     value = range / string
-    range = "[" from:([^" "]+) " TO " to:([^\\]]+) "]" {return "[" + from.join("") + " TO " + to.join("") + "]"; }
+    range = "[" from:([^" "]+) " TO " to:([^\]]+) "]" {return "[" + from.join("") + " TO " + to.join("") + "]"; }
     string = quoted_term / unquoted_term / _
 
     unquoted_term
@@ -82,7 +82,7 @@ export default function useAdvanceSearchParser({ onInit }) {
         }
 
     term_char
-        =  [^: \\t\\r\\n\\f\\{\\}()"+-/^~\\[\\]]
+        =  [^: \t\r\n\f\{\}()"+-/^~\[\]]
 
     quoted_term
         = '"' term:[^"]+ '"'
@@ -133,10 +133,13 @@ export default function useAdvanceSearchParser({ onInit }) {
 
     groupFieldName = "group" {return "${SolrKeys.group}";}
     groupValue = string
-    / ${(caseGroups.data || []).map((group) => `'"${group.name}"' { return '${group.groupNum}'; }`).join(' / ')}
+    / ${(caseGroups.data || [])
+            .map((group) => `'"${group.name}"' { return '{ key: ${group.name}, value: ${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(' / ')}
@@ -172,8 +175,7 @@ export default function useAdvanceSearchParser({ onInit }) {
     __  = [ ]*
 
     _ "whitespace"
-        = [ \\t\\r\\n\\f]+
-
+        = [ \t\r\n\f]+
     EOF
         = !.
 `;

package/lib/esm/utils/caseSearchUtils.js

@@ -105,7 +105,7 @@ function createUserFriendlyQueryFromFilterStateAdvancedSearch(filterInfo, filter
             ? fieldNameToSolrFieldMapping[_filterKey]
             : _filterKey;
         const fieldValue = isKeyValuePair(filterInfo[_filterKey])
-            ? filterInfo[_filterKey].map((item) => (SolrKeys.accountNumber ? item.key : item.value))
+            ? filterInfo[_filterKey].map((item) => (_filterKey === SolrKeys.accountNumber ? item.key : item.value))
             : filterInfo[_filterKey];
         if (_filterKey !== ProductVersionKey) {
             Array.isArray(fieldValue) && fieldValue.length > 0 && solrQuery.where(fieldLabel).in(flatMap(fieldValue));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/cases",
-    "version": "1.0.13",
+    "version": "1.0.15",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -51,11 +51,11 @@
         "@patternfly/pfe-collapse": "1.12.3",
         "@patternfly/react-core": "4.202.16",
         "@patternfly/react-table": "4.71.16",
-        "@rh-support/components": "1.2.6",
-        "@rh-support/react-context": "1.0.7",
+        "@rh-support/components": "1.2.7",
+        "@rh-support/react-context": "1.0.8",
         "@rh-support/types": "0.2.0",
-        "@rh-support/user-permissions": "1.0.6",
-        "@rh-support/utils": "1.0.4",
+        "@rh-support/user-permissions": "1.0.7",
+        "@rh-support/utils": "1.0.5",
         "i18next": "^19.0.1",
         "localforage": "^1.7.3",
         "lodash": "^4.17.21",
@@ -99,5 +99,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "a6141b62e73e1d74ccf4f4075134da7091b8e96e"
+    "gitHead": "9647d8b819bf1ccbf691c0e89909160752ea24a7"
 }