@rh-support/cases 2.4.10-beta.6 → 2.5.1

package/lib/esm/utils/caseSearchUtils.js

@@ -24,7 +24,7 @@ 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';
 export const FILTER_URL_QUERY_TYPE = 'searchType';
-function createSolrQueryFromFilterState(filterState, loggedInUser) {
+function createSolrQueryFromFilterState(filterState, loggedInUser, selectedCases = []) {
     const { paginationInfo: { pageSize, currentPage }, sortInfo: { column, direction }, filterInfo, filterQueryInfo, } = filterState;
     const rows = pageSize;
     const queryString = (filterQueryInfo.queryString || '*:*').trim();
@@ -66,6 +66,7 @@ function createSolrQueryFromFilterState(filterState, loggedInUser) {
         .fq(SolrKeys.accountNumber, filteredAccounts)
         .fq(SolrKeys.escalation, escalationValue)
         .fq(SolrKeys.type, filterInfo[SolrKeys.type], [SolrTags.c_type])
+        .fq(SolrKeys.caseNumber, selectedCases)
         .beginOr()
         .fq(SolrKeys.createdBySsoUsername, filterInfo[SolrKeys.createdBySsoUsername])
         .fq(SolrKeys.caseContactSSO, filterInfo[SolrKeys.caseContactSSO])
@@ -197,15 +198,16 @@ function getStringOrBooleanValue(val) {
         return val;
     return val === 'true' ? true : val === 'false' ? false : `"${val}"`;
 }
-function createQueryForCSVDownload(filterState, loggedInUserRights, loggedInUsersAccount, startValue = 0, limitValue = 1000) {
+function createQueryForCSVDownload(filterState, loggedInUserRights, loggedInUsersAccount, selectedCases = [], startValue = 0, limitValue = 1000) {
+    const newSelectedCases = selectedCases.slice(0, limitValue);
     if (loggedInUsersAccount.secureSupport) {
-        const sfdcFilter = createSFDCQueryFromFilterState(filterState, loggedInUserRights, loggedInUsersAccount);
+        const sfdcFilter = createSFDCQueryFromFilterState(filterState, loggedInUserRights, loggedInUsersAccount, newSelectedCases);
         sfdcFilter.offset = startValue;
         sfdcFilter.maxResults = limitValue;
         return sfdcFilter;
     }
     else {
-        const query = createSolrQueryFromFilterState(filterState, loggedInUserRights);
+        const query = createSolrQueryFromFilterState(filterState, loggedInUserRights, newSelectedCases);
         const { start, rows } = query, solrQuery = __rest(query, ["start", "rows"]);
         solrQuery.start = startValue;
         solrQuery.rows = limitValue;
@@ -226,7 +228,7 @@ function objectFlip(obj, camelCaseKey = false) {
         return ret;
     }, {});
 }
-function createSFDCQueryFromFilterState(filterState, loggedInUser, loggedInUserAccount) {
+function createSFDCQueryFromFilterState(filterState, loggedInUser, loggedInUserAccount, selectedCases = []) {
     const { paginationInfo: { pageSize, currentPage }, sortInfo: { column, direction }, filterInfo, filterQueryInfo, } = filterState;
     const maxResults = pageSize;
     const offset = (currentPage - 1) * pageSize;
@@ -236,6 +238,8 @@ function createSFDCQueryFromFilterState(filterState, loggedInUser, loggedInUserA
     const filteredSeverity = filterInfo[SolrKeys.severity];
     const filteredProduct = filterInfo[ProductVersionKey];
     const includeClosed = filteredStatus.length === 0 ? true : filteredStatus.includes(CaseStatus.Closed);
+    const filteredCaseOwner = filterInfo[SolrKeys.caseOwner];
+    const filteredCaseCreatedBySSO = filterInfo[SolrKeys.createdBySsoUsername];
     // https://projects.engineering.redhat.com/browse/CPCCM-8069?focusedCommentId=2426553&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-2426553
     // Truth table in Comment here decsribes how combination of statuses work in sfdc.
     // below we remove the closed status from the selected status array because we have already set the include_closed flag on the line before this comment
@@ -259,6 +263,9 @@ function createSFDCQueryFromFilterState(filterState, loggedInUser, loggedInUserA
     else if (!isEmpty(queryString)) {
         sfdcFilter['keyword'] = queryString;
     }
+    if (selectedCases.length > 0) {
+        sfdcFilter['caseNumbers'] = [...(sfdcFilter['caseNumbers'] || []), ...selectedCases];
+    }
     if ((filteredStatus || []).length === 1) {
         sfdcFilter['status'] = filteredStatus[0];
     }
@@ -274,6 +281,12 @@ function createSFDCQueryFromFilterState(filterState, loggedInUser, loggedInUserA
     if (filteredAccounts.length === 1 && filteredAccounts[0] !== loggedInUser.getAccountNumber()) {
         sfdcFilter['accountNumber'] = filteredAccounts[0];
     }
+    if ((filteredCaseOwner || []).length === 1) {
+        sfdcFilter['ownerSSOName'] = filteredCaseOwner[0];
+    }
+    if ((filteredCaseCreatedBySSO || []).length === 1) {
+        sfdcFilter['createdBySSOName'] = filteredCaseCreatedBySSO[0];
+    }
     return sfdcFilter;
 }
 function mapSFDCCaseListToSolrCaseList(response = []) {

package/lib/esm/utils/constants.js

@@ -5,7 +5,7 @@ export const filterNamesMap = {
     [SolrKeys.severity]: 'Severity',
     [SolrKeys.group]: 'Groups',
     [SolrKeys.accountNumber]: 'Bookmarks',
-    [SolrKeys.caseSummary]: 'Summary',
+    [SolrKeys.caseSummary]: 'Title',
     [SolrKeys.escalation]: 'Escalated',
     [SolrKeys.contactName]: 'Owner',
     [SolrKeys.product]: 'Products',

package/lib/esm/utils/routeUtils.js

@@ -1,3 +1,4 @@
-export default class RouteUtils {
+class RouteUtils {
 }
 RouteUtils.casesBasePath = '';
+export default RouteUtils;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/cases",
-    "version": "2.4.10-beta.6",
+    "version": "2.5.1",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -26,52 +26,55 @@
         "lib/**/*"
     ],
     "peerDependencies": {
-        "@cee-eng/hydrajs": "4.16.43",
-        "@patternfly/patternfly": "4.196.7",
-        "@patternfly/pfe-collapse": "1.12.3",
-        "@patternfly/react-core": "4.264.0",
-        "@patternfly/react-table": "4.111.33",
-        "i18next": "^19.0.1",
+        "@cee-eng/hydrajs": "4.17.36",
+        "@patternfly/patternfly": "5.4.0",
+        "@patternfly/react-core": "5.4.0",
+        "@patternfly/react-table": "5.4.0",
         "localforage": "^1.10.0",
         "lodash": "^4.17.21",
-        "react": "17.0.2",
-        "react-dom": "17.0.2",
-        "react-i18next": "^11.2.5",
+        "react": "18.2.0",
+        "react-dom": "18.2.0",
+        "react-i18next": "^15.0.1",
         "react-router-dom": "^5.1.2",
         "solr-query-builder": "1.0.1"
     },
     "dependencies": {
-        "@cee-eng/hydrajs": "4.16.43",
-        "@patternfly/patternfly": "4.196.7",
-        "@patternfly/pfe-collapse": "1.12.3",
-        "@patternfly/react-core": "4.264.0",
-        "@patternfly/react-table": "4.111.33",
-        "@rh-support/components": "2.4.10-beta.6",
-        "@rh-support/react-context": "2.4.10-beta.6",
-        "@rh-support/types": "2.0.2",
-        "@rh-support/user-permissions": "2.4.10-beta.6",
-        "@rh-support/utils": "2.4.10-beta.6",
-        "i18next": "^19.0.1",
+        "@cee-eng/hydrajs": "4.17.36",
+        "@patternfly/patternfly": "5.4.0",
+        "@patternfly/react-core": "5.4.0",
+        "@patternfly/react-table": "5.4.0",
+        "@rh-support/components": "2.5.1",
+        "@rh-support/react-context": "2.5.1",
+        "@rh-support/types": "2.0.5",
+        "@rh-support/user-permissions": "2.5.0",
+        "@rh-support/utils": "2.5.0",
         "localforage": "^1.10.0",
         "lodash": "^4.17.21",
         "pegjs": "^0.10.0",
-        "react": "17.0.2",
-        "react-dom": "17.0.2",
-        "react-i18next": "^11.2.5",
+        "react": "18.2.0",
+        "react-dom": "18.2.0",
+        "react-i18next": "^15.0.1",
         "react-router-dom": "^5.1.2",
         "solr-query-builder": "1.0.1"
     },
     "devDependencies": {
-        "@testing-library/jest-dom": "^5.16.5",
-        "@testing-library/react": "^12.0.0",
-        "@testing-library/user-event": "^13.1.9",
+        "@testing-library/jest-dom": "^6.2.0",
+        "@testing-library/react": "^14.1.2",
+        "@testing-library/user-event": "^14.5.1",
         "@types/i18next": "^12.1.0",
+        "@types/jest": "^29.5.11",
         "@types/lodash": "^4.14.136",
-        "@types/react": "^17.0.14",
-        "@types/react-dom": "^17.0.9",
-        "@types/react-i18next": "^8.1.0",
+        "@types/node": "^20.11.5",
+        "@types/react": "^18.2.20",
+        "@types/react-dom": "^18.2.18",
         "@types/react-router-dom": "^5.1.2",
-        "faker": "^5.5.3"
+        "faker": "^5.5.3",
+        "jest": "^29.7.0",
+        "jest-environment-jsdom": "^29.7.0"
+    },
+    "overrides": {
+        "@types/react": "^18.2.20",
+        "@types/react-dom": "^18.2.18"
     },
     "scripts": {
         "build:watch": "../../node_modules/.bin/tsc -w -p config/tsconfig.json & npm run watch:css",
@@ -93,5 +96,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "f4caba45a2ffbc0cb441fdd30630769b447931d1"
+    "gitHead": "78f51b2cfd60107a49503d13542ba46d29df4d04"
 }