@rh-support/cases 1.0.7 → 1.0.8-beta.2

package/README.md

@@ -16,3 +16,5 @@ export default function CasesApp(routeProps: RouteComponentProps<ICasesRouteURLP
     return (<Cases routeProps={routeProps} basePath="/cases" />);
 }
 ```
+
+.

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

@@ -94,7 +94,7 @@ export default function useAdvanceSearchParser({ onInit }) {
     multipleValue = "(" val:(value)+ ")" { return joinByOr(val); }
     stringOrMulti = string / multipleValue
 
-    basicFieldName = "contactName" {return "${SolrKeys.contactName}";}
+    basicFieldName = "assignedToName" {return "${SolrKeys.ownerName}";}
     / "createdByName" {return "${SolrKeys.createdBy}";}
     / "createdDate" {return "${SolrKeys.createdDate}";}
     / "closedDate" {return "${SolrKeys.caseClosedDate}";}
@@ -102,7 +102,7 @@ export default function useAdvanceSearchParser({ onInit }) {
     / "summary" {return "${SolrKeys.caseSummary}";}
     / "lastModifiedDate" {return "${SolrKeys.modifiedDate}";}
     / "lastModifiedByName" {return "${SolrKeys.modifiedBy}";}
-    / "ownerName" {return "${SolrKeys.ownerName}";}
+    / "ownerName" {return "${SolrKeys.contactName}";}
     / "caseNumber" {return "${SolrKeys.caseNumber}";}
     / "openshiftClusterId" {return "${SolrKeys.openshiftClusterId}";}
     / "alternateCaseId" {return "${SolrKeys.alternateId}";}
@@ -110,8 +110,8 @@ export default function useAdvanceSearchParser({ onInit }) {
     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}";}
+    contactSSOFieldName = "ownerSSO" {return "${SolrKeys.caseContactSSO}";}
+    ownerSSOFieldName = "assignedToContactSSO" {return "${SolrKeys.caseOwner}";}
     createdBySSOFieldName = "createdBySSO" {return "${SolrKeys.createdBySsoUsername}";}
     textFieldName = "text" {return "";}
 

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,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"}
+{"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,wBA2DxD;AAuKD,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

@@ -336,7 +336,7 @@ function createFilterStateFromUrlQuery(urlQuery, globalMetadataState, pageSize,
     };
     return filterQuery;
 }
-// when from advaced query we want to swith to basic query is called
+// advanced query
 function createFilterStateFromAdvancedQuery(queryString, globalMetadataState, currentFilterState, parsedQuery = '', type = CaseSearchQueryType.BASIC) {
     const filterObj = parseSolrQuery(queryString);
     const newFilterInfo = {};
@@ -363,6 +363,27 @@ function createFilterStateFromAdvancedQuery(queryString, globalMetadataState, cu
             }
         }
     });
+    // here is a hack to match product and vrsions. need to find better way...
+    // ( productName: ".NET Core" and  ( productVersion: "2.0" ) ) => is processed corectly
+    // (productName: ".NET Core" and  productVersion: "2.0") => needs to be matched manually
+    // productName: ".NET Core" and productVersion: "2.0" => needs to be matched manually
+    if (filterObj[SolrKeys.version] && filterObj[SolrKeys.version].length !== 0) {
+        if (newFilterInfo[SolrPivotKeys.product_version] && newFilterInfo[SolrPivotKeys.product_version].length !== 0) {
+            newFilterInfo[SolrPivotKeys.product_version].forEach((p) => {
+                if (p[SolrKeys.version].length === 0)
+                    p[SolrKeys.version] = (filterObj[SolrKeys.version] || []).map((i) => ({
+                        field: SolrKeys.version,
+                        value: i,
+                    }));
+            });
+        }
+        else {
+            filterObj[SolrKeys.version].forEach((i) => {
+                advanceToBasicQuery.push(`${SolrKeys.version}:"${i}"`);
+            });
+        }
+        delete newFilterInfo[SolrKeys.version];
+    }
     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;
@@ -485,9 +506,11 @@ function generateProductVersionPivotValue(values) {
             : {
                 field: SolrKeys.product,
                 value: item.value,
-                [SolrKeys.version]: (item[fieldNameToSolrFieldMapping[SolrKeys.version]] || []).map((item) => ({
+                [SolrKeys.version]: (item[SolrKeys.version] ||
+                    item[fieldNameToSolrFieldMapping[SolrKeys.version]] ||
+                    []).map((version) => ({
                     field: SolrKeys.version,
-                    value: item,
+                    value: version,
                 })),
             };
     });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/cases",
-    "version": "1.0.7",
+    "version": "1.0.8-beta.2",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -51,10 +51,10 @@
         "@patternfly/pfe-collapse": "1.12.3",
         "@patternfly/react-core": "4.202.16",
         "@patternfly/react-table": "4.71.16",
-        "@rh-support/components": "1.2.1",
-        "@rh-support/react-context": "1.0.2",
+        "@rh-support/components": "1.2.1-beta.2",
+        "@rh-support/react-context": "1.0.2-beta.2",
         "@rh-support/types": "0.2.0",
-        "@rh-support/user-permissions": "1.0.1",
+        "@rh-support/user-permissions": "1.0.1-beta.2",
         "@rh-support/utils": "1.0.1",
         "i18next": "^19.0.1",
         "localforage": "^1.7.3",
@@ -99,5 +99,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "d205a24d22e9f7e8891b07cfd92aca108bf85e4b"
+    "gitHead": "bb6def246a3c7b7c4572995701d72ea9cc7ddaa4"
 }