@rh-support/cases 2.6.194 → 2.6.196

package/lib/esm/components/case-list/case-list-filters/StatusFilter.js

@@ -4,7 +4,7 @@ import isEmpty from 'lodash/isEmpty';
 import React, { useContext, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { SolrKeys } from '../../../enums/filters';
-import { filterNamesMap, PORTAL_DISPLAY_STATUSES } from '../../../utils/constants';
+import { filterNamesMap, PORTAL_DISPLAY_STATUSES, PORTAL_OPEN_DISPLAY_STATUSES } from '../../../utils/constants';
 import { CaseListFilterDispatchContext, CaseListFilterStateContext } from '../CaseListFilterContext';
 import { updateFilter } from '../CaseListFilterReducer';
 export function StatusFilter(props) {
@@ -59,9 +59,9 @@ export function StatusFilter(props) {
             return t('All cases');
         }
         else {
-            const hasAllOpenSelected = selectedValues.includes('In Progress') &&
-                selectedValues.includes('Waiting on Customer') &&
-                !selectedValues.includes('Closed');
+            const hasAllOpenSelected = PORTAL_OPEN_DISPLAY_STATUSES.every((status) => selectedValues.includes(status)) &&
+                !selectedValues.includes('Closed') &&
+                !selectedValues.includes('Archived');
             if (hasAllOpenSelected) {
                 return t('All open cases');
             }

package/lib/esm/utils/caseListVariablesBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"caseListVariablesBuilder.d.ts","sourceRoot":"","sources":["../../../src/utils/caseListVariablesBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQnD,OAAO,EAEH,oBAAoB,EAEvB,MAAM,+CAA+C,CAAC;AAMvD,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,oBAAoB,GAAG,MAAM,EAAE,CAW1F;AAED,MAAM,WAAW,yBAAyB;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,gBAAgB;IAC7B,6EAA6E;IAC7E,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AA0SD,wBAAsB,qCAAqC,CACvD,WAAW,EAAE,oBAAoB,EACjC,YAAY,EAAE,YAAY,EAC1B,eAAe,CAAC,EAAE,gBAAgB,GACnC,OAAO,CAAC,yBAAyB,CAAC,CA4HpC"}
+{"version":3,"file":"caseListVariablesBuilder.d.ts","sourceRoot":"","sources":["../../../src/utils/caseListVariablesBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AASnD,OAAO,EAEH,oBAAoB,EAEvB,MAAM,+CAA+C,CAAC;AAOvD,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,oBAAoB,GAAG,MAAM,EAAE,CAM1F;AAED,MAAM,WAAW,yBAAyB;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,gBAAgB;IAC7B,6EAA6E;IAC7E,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AA0SD,wBAAsB,qCAAqC,CACvD,WAAW,EAAE,oBAAoB,EACjC,YAAY,EAAE,YAAY,EAC1B,eAAe,CAAC,EAAE,gBAAgB,GACnC,OAAO,CAAC,yBAAyB,CAAC,CA8HpC"}

package/lib/esm/utils/caseListVariablesBuilder.js

@@ -7,8 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { GET_CONTACT_BY_SSO, GET_GROUP_IDS_BY_NAME, GET_USER_IDS_BY_FEDERATION, getTechnicalSupportRecordTypeId, } from '@rh-support/utils';
+import { buildAccessRestrictionExclusionFilter, GET_CONTACT_BY_SSO, GET_GROUP_IDS_BY_NAME, GET_USER_IDS_BY_FEDERATION, getTechnicalSupportRecordTypeId, } from '@rh-support/utils';
 import { CaseListColumnIds, caseListSortColumnIdsToGraphQLMap } from '../enums/case';
+import { CaseSearchQueryType } from '../enums/caseSearch';
 import { SolrKeys, SolrPivotKeys } from '../enums/filters';
 import { parseAdvanceSearchDate } from './advanceSearchUtils';
 import { expandStatusGroupsToApiValues } from './statusUtils';
@@ -17,10 +18,7 @@ export function getOwnerFederationIdsToResolve(filterState) {
     if (!filterInfo)
         return [];
     const ownerSso = filterInfo[SolrKeys.caseOwner];
-    const contactSso = filterInfo[SolrKeys.caseContactSSO];
-    const contactSsoSet = new Set(contactSso || []);
-    const filteredOwnerSso = (ownerSso || []).filter((sso) => !contactSsoSet.has(sso));
-    return [...new Set(filteredOwnerSso)];
+    return [...new Set((ownerSso || []).filter(Boolean))];
 }
 function buildOrderByFromSortInfo(sortInfo) {
     var _a;
@@ -294,6 +292,7 @@ export function createGraphQLVariablesFromFilterState(filterState, apolloClient,
         const first = (paginationInfo === null || paginationInfo === void 0 ? void 0 : paginationInfo.pageSize) || 10;
         const orderBy = buildOrderByFromSortInfo(sortInfo);
         const andConditions = [];
+        andConditions.push(buildAccessRestrictionExclusionFilter());
         if (filterInfo) {
             const statusFilter = buildStatusFilter(filterInfo[SolrKeys.status]);
             if (statusFilter)
@@ -336,16 +335,18 @@ export function createGraphQLVariablesFromFilterState(filterState, apolloClient,
             const ownerUserIds = (resolvedUserIds === null || resolvedUserIds === void 0 ? void 0 : resolvedUserIds.ownerUserIds) ||
                 (assignedToValues.length ? yield resolveOwnerIdsBySearchTerms(assignedToValues, apolloClient) : []);
             const contactIdFilter = buildIdFilter('ContactId', contactIds, Boolean(contactValues === null || contactValues === void 0 ? void 0 : contactValues.length));
-            if (contactIdFilter) {
-                andConditions.push(contactIdFilter);
-            }
             const ownerIdFilter = buildIdFilter('OwnerId', ownerUserIds, assignedToValues.length > 0);
-            if (ownerIdFilter) {
-                andConditions.push(ownerIdFilter);
-            }
             const createdByFilter = buildRedHatSupportUserReferenceFilter('CreatedBy', createdByValues);
-            if (createdByFilter) {
-                andConditions.push(createdByFilter);
+            const isAdvancedSearch = (filterQueryInfo === null || filterQueryInfo === void 0 ? void 0 : filterQueryInfo.type) === CaseSearchQueryType.ADVANCED;
+            const usernameFilters = [contactIdFilter, ownerIdFilter, createdByFilter].filter(Boolean);
+            if (isAdvancedSearch) {
+                usernameFilters.forEach((filter) => andConditions.push(filter));
+            }
+            else if (usernameFilters.length === 1) {
+                andConditions.push(usernameFilters[0]);
+            }
+            else if (usernameFilters.length > 1) {
+                andConditions.push({ or: usernameFilters });
             }
             const lastModifiedByFilter = buildRedHatSupportUserReferenceFilter('LastModifiedBy', modifiedByValues);
             if (lastModifiedByFilter) {

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

@@ -1,5 +1,7 @@
 export declare const PORTAL_STATUS_GROUPS: Record<string, string[]>;
 export declare const PORTAL_DISPLAY_STATUSES: string[];
+/** Statuses treated as open (excludes Closed and Archived). */
+export declare const PORTAL_OPEN_DISPLAY_STATUSES: string[];
 export declare const filterNamesMap: {
     readonly case_status: any;
     readonly case_severity: any;

package/lib/esm/utils/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAazD,CAAC;AAEF,eAAO,MAAM,uBAAuB,UAAoC,CAAC;AAIzE,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;CA6D1B,CAAC;AAEF,eAAO,MAAM,oBAAoB,iDAAiD,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAoBzD,CAAC;AAEF,eAAO,MAAM,uBAAuB,UAAoC,CAAC;AAEzE,+DAA+D;AAC/D,eAAO,MAAM,4BAA4B,UAExC,CAAC;AAIF,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;CA6D1B,CAAC;AAEF,eAAO,MAAM,oBAAoB,iDAAiD,CAAC"}

package/lib/esm/utils/constants.js

@@ -2,19 +2,28 @@ import i18n from 'i18next';
 import { SolrKeys } from '../enums/filters';
 export const PORTAL_STATUS_GROUPS = {
     'In Progress': [
-        'New',
         'In Progress',
-        'Needs New Owner',
+        'New',
         'Waiting on Collab',
         'Waiting on Engineering',
         'Waiting on Sales',
         'Waiting on 3rd Party Vendor',
+        'Needs New Owner',
+        // Legacy Solr value retained for case-list filter expansion
         'Waiting on Red Hat',
     ],
-    'Waiting on Customer': ['Waiting on Customer Action Required', 'Waiting on Customer Solution Delivered'],
+    'Waiting on Customer Action Required': [
+        'Waiting on Customer Action Required',
+        // Legacy Solr value
+        'Waiting on Customer',
+    ],
+    'Waiting on Customer Solution Delivered': ['Waiting on Customer Solution Delivered'],
     Closed: ['Closed'],
+    Archived: ['Archived'],
 };
 export const PORTAL_DISPLAY_STATUSES = Object.keys(PORTAL_STATUS_GROUPS);
+/** Statuses treated as open (excludes Closed and Archived). */
+export const PORTAL_OPEN_DISPLAY_STATUSES = PORTAL_DISPLAY_STATUSES.filter((status) => status !== 'Closed' && status !== 'Archived');
 // used for adding title text for different solr fields
 // test
 export const filterNamesMap = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/cases",
-    "version": "2.6.194",
+    "version": "2.6.196",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -38,11 +38,11 @@
         "@patternfly/patternfly": "6.2.1",
         "@patternfly/react-core": "6.2.1",
         "@patternfly/react-table": "6.2.1",
-        "@rh-support/components": "2.5.190",
-        "@rh-support/react-context": "2.5.284",
+        "@rh-support/components": "2.5.192",
+        "@rh-support/react-context": "2.5.286",
         "@rh-support/types": "2.0.26",
-        "@rh-support/user-permissions": "2.5.136",
-        "@rh-support/utils": "2.5.118",
+        "@rh-support/user-permissions": "2.5.138",
+        "@rh-support/utils": "2.5.120",
         "localforage": "^1.10.0",
         "lodash": "^4.17.21",
         "pegjs": "^0.10.0",
@@ -92,5 +92,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "9017d17207b6357a27edbab889de8f10696e745b"
+    "gitHead": "84a00c5092469be74f67cb35e582d3120d0949b6"
 }