@rh-support/cases 2.6.185 → 2.6.187

package/lib/esm/utils/caseListVariablesBuilder.js

@@ -7,9 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { GET_CONTACT_BY_SSO, getTechnicalSupportRecordTypeId } from '@rh-support/utils';
-import { caseListSortColumnIdsToGraphQLMap } from '../enums/case';
+import { 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 { SolrKeys, SolrPivotKeys } from '../enums/filters';
+import { parseAdvanceSearchDate } from './advanceSearchUtils';
 import { expandStatusGroupsToApiValues } from './statusUtils';
 export function getOwnerFederationIdsToResolve(filterState) {
     const { filterInfo } = filterState;
@@ -25,10 +26,14 @@ function buildOrderByFromSortInfo(sortInfo) {
     var _a;
     if (!(sortInfo === null || sortInfo === void 0 ? void 0 : sortInfo.column))
         return { LastModifiedDate: { order: 'DESC' } };
+    const order = ((_a = sortInfo.direction) === null || _a === void 0 ? void 0 : _a.toUpperCase()) || 'DESC';
+    if (sortInfo.column === CaseListColumnIds.group) {
+        return { Group__r: { Name: { order } } };
+    }
     const gqlField = caseListSortColumnIdsToGraphQLMap[sortInfo.column];
     if (!gqlField)
         return { LastModifiedDate: { order: 'DESC' } };
-    return { [gqlField]: { order: ((_a = sortInfo.direction) === null || _a === void 0 ? void 0 : _a.toUpperCase()) || 'DESC' } };
+    return { [gqlField]: { order } };
 }
 function flattenAccountNumbers(accountFilters) {
     const numbers = [];
@@ -62,7 +67,6 @@ function buildProductFilter(products) {
                     hasVersionIds = true;
                 }
             });
-            // Fallback: if versions lack IDs (resolution failed), use parent product ID
             if (!hasVersionIds && product.productId) {
                 parentProductIds.push(product.productId);
             }
@@ -79,6 +83,68 @@ function buildProductFilter(products) {
     }
     return conditions;
 }
+function buildGroupFilter(groups) {
+    var _a;
+    const groupIds = (_a = groups === null || groups === void 0 ? void 0 : groups.map((group) => group.key).filter(Boolean)) !== null && _a !== void 0 ? _a : [];
+    if (!groupIds.length)
+        return undefined;
+    if (groupIds.length === 1) {
+        return { Group__c: { eq: groupIds[0] } };
+    }
+    return { Group__c: { in: groupIds } };
+}
+function buildDateTimeRangeFilter(fieldName, range) {
+    var _a, _b, _c, _d;
+    if (!range) {
+        return undefined;
+    }
+    const operators = {};
+    const startTrimmed = (_b = (_a = range.startDate) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : '';
+    const endTrimmed = (_d = (_c = range.endDate) === null || _c === void 0 ? void 0 : _c.trim()) !== null && _d !== void 0 ? _d : '';
+    if (startTrimmed && parseAdvanceSearchDate(startTrimmed)) {
+        operators.gte = { value: `${startTrimmed}T00:00:00.000Z` };
+    }
+    if (endTrimmed && parseAdvanceSearchDate(endTrimmed)) {
+        operators.lte = { value: `${endTrimmed}T23:59:59.999Z` };
+    }
+    if (!Object.keys(operators).length) {
+        return undefined;
+    }
+    return { [fieldName]: operators };
+}
+/**
+ * Builds a ContactId / OwnerId filter from looked-up IDs.
+ * Used for Owner and Assigned To — those fields need IDs, not nested name/SSO filters.
+ */
+function buildIdFilter(fieldName, ids, filterRequested = false) {
+    if (!(ids === null || ids === void 0 ? void 0 : ids.length)) {
+        // User searched, but nobody matched — return empty so the API finds no cases.
+        return filterRequested ? { [fieldName]: { in: [] } } : undefined;
+    }
+    const uniqueIds = [...new Set(ids)];
+    if (uniqueIds.length === 1) {
+        return { [fieldName]: { eq: uniqueIds[0] } };
+    }
+    return { [fieldName]: { in: uniqueIds } };
+}
+function buildSalesforceSupportUserMatch(value) {
+    return {
+        or: [{ FederationIdentifier: { eq: value } }, { Name: { like: `%${value}%` } }],
+    };
+}
+function buildSalesforceSupportUserReferenceFilter(fieldName, values) {
+    if (!(values === null || values === void 0 ? void 0 : values.length)) {
+        return undefined;
+    }
+    if (values.length === 1) {
+        return { [fieldName]: buildSalesforceSupportUserMatch(values[0]) };
+    }
+    return {
+        or: values.map((value) => ({
+            [fieldName]: buildSalesforceSupportUserMatch(value),
+        })),
+    };
+}
 function buildKeywordSearchFilter(queryString) {
     if (!queryString)
         return undefined;
@@ -94,29 +160,136 @@ function buildKeywordSearchFilter(queryString) {
         or: [{ Subject: { like: likeValue } }, { CaseNumber__c: { like: likeValue } }],
     };
 }
-function resolveContactIdBySso(ssoUsername, apolloClient) {
+/**
+ * Owner (case contact): find Contact IDs by SSO or name.
+ * We need this because the case query cannot filter by contact name/SSO directly.
+ */
+function resolveContactIdsBySearchTerms(searchTerms, apolloClient) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
-        if (!ssoUsername)
-            return undefined;
-        try {
-            const { data } = yield apolloClient.query({
-                query: GET_CONTACT_BY_SSO,
-                variables: { ssoUsername },
-                fetchPolicy: 'cache-first',
-            });
-            const edges = ((_c = (_b = (_a = data === null || data === void 0 ? void 0 : data.salesforce_support_uiapi) === null || _a === void 0 ? void 0 : _a.query) === null || _b === void 0 ? void 0 : _b.SalesforceSupportContact) === null || _c === void 0 ? void 0 : _c.edges) || [];
-            return (_e = (_d = edges[0]) === null || _d === void 0 ? void 0 : _d.node) === null || _e === void 0 ? void 0 : _e.Id;
+        var _a, _b, _c;
+        if (!(searchTerms === null || searchTerms === void 0 ? void 0 : searchTerms.length)) {
+            return [];
+        }
+        const contactIds = [];
+        for (const searchTerm of searchTerms) {
+            if (!searchTerm) {
+                continue;
+            }
+            try {
+                const { data } = yield apolloClient.query({
+                    query: GET_CONTACT_BY_SSO,
+                    variables: {
+                        searchTerm,
+                        namePattern: `%${searchTerm}%`,
+                    },
+                    fetchPolicy: 'cache-first',
+                });
+                const edges = ((_c = (_b = (_a = data === null || data === void 0 ? void 0 : data.salesforce_support_uiapi) === null || _a === void 0 ? void 0 : _a.query) === null || _b === void 0 ? void 0 : _b.SalesforceSupportContact) === null || _c === void 0 ? void 0 : _c.edges) || [];
+                edges.forEach((edge) => {
+                    var _a, _b, _c;
+                    const ssoUsername = (_b = (_a = edge.node) === null || _a === void 0 ? void 0 : _a.SSOUserName__c) === null || _b === void 0 ? void 0 : _b.value;
+                    if (((_c = edge.node) === null || _c === void 0 ? void 0 : _c.Id) && ssoUsername) {
+                        contactIds.push(edge.node.Id);
+                    }
+                });
+            }
+            catch (error) {
+                console.error('[GraphQL] Failed to resolve contact IDs by SSO or name:', error);
+            }
+        }
+        return [...new Set(contactIds)];
+    });
+}
+/**
+ * Assigned To (user): find user IDs by federation ID or name.
+ * Fallback when IDs were not already resolved earlier.
+ */
+function resolveOwnerUserIdsBySearchTerms(searchTerms, apolloClient) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
+        if (!(searchTerms === null || searchTerms === void 0 ? void 0 : searchTerms.length)) {
+            return [];
+        }
+        const userIds = [];
+        for (const searchTerm of searchTerms) {
+            if (!searchTerm) {
+                continue;
+            }
+            try {
+                const { data } = yield apolloClient.query({
+                    query: GET_USER_IDS_BY_FEDERATION,
+                    variables: {
+                        searchTerm,
+                        namePattern: `%${searchTerm}%`,
+                    },
+                    fetchPolicy: 'cache-first',
+                });
+                const edges = ((_c = (_b = (_a = data === null || data === void 0 ? void 0 : data.salesforce_support_uiapi) === null || _a === void 0 ? void 0 : _a.query) === null || _b === void 0 ? void 0 : _b.SalesforceSupportUser) === null || _c === void 0 ? void 0 : _c.edges) || [];
+                edges.forEach((edge) => {
+                    var _a, _b, _c;
+                    const federationId = (_b = (_a = edge.node) === null || _a === void 0 ? void 0 : _a.FederationIdentifier) === null || _b === void 0 ? void 0 : _b.value;
+                    if (((_c = edge.node) === null || _c === void 0 ? void 0 : _c.Id) && federationId) {
+                        userIds.push(edge.node.Id);
+                    }
+                });
+            }
+            catch (error) {
+                console.error('[GraphQL] Failed to resolve owner user IDs by federation ID or name:', error);
+            }
+        }
+        return [...new Set(userIds)];
+    });
+}
+/**
+ * Assigned To (group/queue): find group IDs by name.
+ * OwnerId can be either a user or a group.
+ */
+function resolveOwnerGroupIdsBySearchTerms(searchTerms, apolloClient) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
+        if (!(searchTerms === null || searchTerms === void 0 ? void 0 : searchTerms.length)) {
+            return [];
         }
-        catch (error) {
-            console.error('[GraphQL] Failed to resolve contact ID by SSO:', error);
-            return undefined;
+        const groupIds = [];
+        for (const searchTerm of searchTerms) {
+            if (!searchTerm) {
+                continue;
+            }
+            try {
+                const { data } = yield apolloClient.query({
+                    query: GET_GROUP_IDS_BY_NAME,
+                    variables: {
+                        namePattern: `%${searchTerm}%`,
+                    },
+                    fetchPolicy: 'cache-first',
+                });
+                const edges = ((_c = (_b = (_a = data === null || data === void 0 ? void 0 : data.salesforce_support_uiapi) === null || _a === void 0 ? void 0 : _a.query) === null || _b === void 0 ? void 0 : _b.SalesforceSupportGroup) === null || _c === void 0 ? void 0 : _c.edges) || [];
+                edges.forEach((edge) => {
+                    var _a;
+                    if ((_a = edge.node) === null || _a === void 0 ? void 0 : _a.Id) {
+                        groupIds.push(edge.node.Id);
+                    }
+                });
+            }
+            catch (error) {
+                console.error('[GraphQL] Failed to resolve owner group IDs by name:', error);
+            }
         }
+        return [...new Set(groupIds)];
+    });
+}
+/** Assigned To: merge user IDs and group IDs into one OwnerId list. */
+function resolveOwnerIdsBySearchTerms(searchTerms, apolloClient) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const [userIds, groupIds] = yield Promise.all([
+            resolveOwnerUserIdsBySearchTerms(searchTerms, apolloClient),
+            resolveOwnerGroupIdsBySearchTerms(searchTerms, apolloClient),
+        ]);
+        return [...new Set([...userIds, ...groupIds])];
     });
 }
 export function createGraphQLVariablesFromFilterState(filterState, apolloClient, resolvedUserIds) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const { paginationInfo, sortInfo, filterInfo, filterQueryInfo } = filterState;
         const first = (paginationInfo === null || paginationInfo === void 0 ? void 0 : paginationInfo.pageSize) || 10;
         const orderBy = buildOrderByFromSortInfo(sortInfo);
@@ -136,7 +309,6 @@ export function createGraphQLVariablesFromFilterState(filterState, apolloClient,
                     andConditions.push({ Account_Number__c: { in: accountNumbers } });
                 }
             }
-            // Product filter: uses stored parent/child Product2 IDs from filter state
             const products = filterInfo[SolrPivotKeys.product_version];
             if (products === null || products === void 0 ? void 0 : products.length) {
                 const productConditions = buildProductFilter(products);
@@ -151,22 +323,56 @@ export function createGraphQLVariablesFromFilterState(filterState, apolloClient,
             if (types === null || types === void 0 ? void 0 : types.length) {
                 andConditions.push({ Type: { in: types } });
             }
-            const createdBySso = filterInfo[SolrKeys.createdBySsoUsername];
-            const contactSso = filterInfo[SolrKeys.caseContactSSO];
-            if ((_a = resolvedUserIds === null || resolvedUserIds === void 0 ? void 0 : resolvedUserIds.ownerUserIds) === null || _a === void 0 ? void 0 : _a.length) {
-                andConditions.push({ OwnerId: { in: resolvedUserIds.ownerUserIds } });
+            const createdByValues = filterInfo[SolrKeys.createdBySsoUsername];
+            const contactValues = filterInfo[SolrKeys.caseContactSSO];
+            const assignedToValues = getOwnerFederationIdsToResolve(filterState);
+            const alternateIds = filterInfo[SolrKeys.alternateId];
+            const openshiftClusterIds = filterInfo[SolrKeys.openshiftClusterId];
+            const modifiedByValues = filterInfo[SolrKeys.modifiedBy];
+            // Problem: GraphQL will not let us filter cases by Owner name/SSO or Assigned To name
+            // nested under Contact/Owner. So for those fields we look up IDs first, then filter by ID.
+            // Created By / Last Modified By are fine — they support nested name filters directly.
+            const contactIds = yield resolveContactIdsBySearchTerms(contactValues, 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);
             }
-            if (createdBySso === null || createdBySso === void 0 ? void 0 : createdBySso.length) {
-                andConditions.push({ CreatedBy: { FederationIdentifier: { in: createdBySso } } });
+            const ownerIdFilter = buildIdFilter('OwnerId', ownerUserIds, assignedToValues.length > 0);
+            if (ownerIdFilter) {
+                andConditions.push(ownerIdFilter);
             }
-            if (contactSso === null || contactSso === void 0 ? void 0 : contactSso.length) {
-                const contactId = yield resolveContactIdBySso(contactSso[0], apolloClient);
-                if (contactId) {
-                    andConditions.push({ ContactId: { eq: contactId } });
-                }
+            const createdByFilter = buildSalesforceSupportUserReferenceFilter('CreatedBy', createdByValues);
+            if (createdByFilter) {
+                andConditions.push(createdByFilter);
+            }
+            const lastModifiedByFilter = buildSalesforceSupportUserReferenceFilter('LastModifiedBy', modifiedByValues);
+            if (lastModifiedByFilter) {
+                andConditions.push(lastModifiedByFilter);
+            }
+            if (alternateIds === null || alternateIds === void 0 ? void 0 : alternateIds.length) {
+                andConditions.push({ AlternateCaseId__c: { in: alternateIds } });
+            }
+            if (openshiftClusterIds === null || openshiftClusterIds === void 0 ? void 0 : openshiftClusterIds.length) {
+                andConditions.push({ OpenshiftClusterID__c: { in: openshiftClusterIds } });
+            }
+            const { advanceSearchDateRanges } = filterState;
+            if (advanceSearchDateRanges) {
+                const createdDateFilter = buildDateTimeRangeFilter('CreatedDate', advanceSearchDateRanges.createdDateRange);
+                const lastModifiedDateFilter = buildDateTimeRangeFilter('LastModifiedDate', advanceSearchDateRanges.lastModifiedDateRange);
+                const closedDateFilter = buildDateTimeRangeFilter('ClosedDate', advanceSearchDateRanges.closedDateRange);
+                if (createdDateFilter)
+                    andConditions.push(createdDateFilter);
+                if (lastModifiedDateFilter)
+                    andConditions.push(lastModifiedDateFilter);
+                if (closedDateFilter)
+                    andConditions.push(closedDateFilter);
             }
-            // TODO: Add group filter (case_folderNumber) when GraphQL field is available
-            // TODO: Add case_alternate_id filter when GraphQL field is available
+            const groups = filterInfo[SolrKeys.group];
+            const groupFilter = buildGroupFilter(groups);
+            if (groupFilter)
+                andConditions.push(groupFilter);
         }
         const escalation = filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrKeys.escalation];
         const technicalSupportId = getTechnicalSupportRecordTypeId();

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;AAkBxD,OAAO,EACH,oBAAoB,EACpB,WAAW,EAId,MAAM,+CAA+C,CAAC;AAOvD,OAAO,EAEH,mBAAmB,EAEtB,MAAM,qBAAqB,CAAC;AAW7B,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,CACnC,WAAW,EAAE,oBAAoB,EACjC,YAAY,EAAE,QAAQ,EACtB,aAAa,GAAE,MAAM,EAAO,OAgE/B;AAED,iBAAS,sCAAsC,CAC3C,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,EAChC,WAAW,EAAE,MAAM,EACnB,eAAe,GAAE,OAAe,UA2BnC;AAED,iBAAS,oDAAoD,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,WAAW,EAAE,MAAM,UA+DlH;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,aAAa,GAAE,MAAM,EAAO,EAC5B,UAAU,SAAI,EACd,UAAU,SAAO,OAoBpB;AAkBD,iBAAS,8BAA8B,CACnC,WAAW,EAAE,oBAAoB,EACjC,YAAY,EAAE,QAAQ,EACtB,mBAAmB,EAAE,OAAO,CAAC,QAAQ,CAAC,EACtC,aAAa,GAAE,MAAM,EAAO,GAC7B,OAAO,CAAC,eAAe,CAAC,CAkE1B;AAED,iBAAS,6BAA6B,CAAC,QAAQ,GAAE,qBAAqB,EAAO,GAAG,qBAAqB,EAAE,CAEtG;AAoBD,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,wBA0D9D;AAGD,iBAAS,kCAAkC,CACvC,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,oBAAoB,EACzC,kBAAkB,EAAE,oBAAoB,EACxC,WAAW,GAAE,MAAW,EACxB,IAAI,GAAE,mBAA+C,wBAmExD;AA0LD,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;AAkBxD,OAAO,EACH,oBAAoB,EACpB,WAAW,EAId,MAAM,+CAA+C,CAAC;AAOvD,OAAO,EAEH,mBAAmB,EAEtB,MAAM,qBAAqB,CAAC;AAW7B,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,CACnC,WAAW,EAAE,oBAAoB,EACjC,YAAY,EAAE,QAAQ,EACtB,aAAa,GAAE,MAAM,EAAO,OAgE/B;AAED,iBAAS,sCAAsC,CAC3C,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,EAChC,WAAW,EAAE,MAAM,EACnB,eAAe,GAAE,OAAe,UA2BnC;AAED,iBAAS,oDAAoD,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,WAAW,EAAE,MAAM,UA+DlH;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,aAAa,GAAE,MAAM,EAAO,EAC5B,UAAU,SAAI,EACd,UAAU,SAAO,OAoBpB;AAkBD,iBAAS,8BAA8B,CACnC,WAAW,EAAE,oBAAoB,EACjC,YAAY,EAAE,QAAQ,EACtB,mBAAmB,EAAE,OAAO,CAAC,QAAQ,CAAC,EACtC,aAAa,GAAE,MAAM,EAAO,GAC7B,OAAO,CAAC,eAAe,CAAC,CAkE1B;AAED,iBAAS,6BAA6B,CAAC,QAAQ,GAAE,qBAAqB,EAAO,GAAG,qBAAqB,EAAE,CAEtG;AAoBD,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,wBA0D9D;AAGD,iBAAS,kCAAkC,CACvC,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,oBAAoB,EACzC,kBAAkB,EAAE,oBAAoB,EACxC,WAAW,GAAE,MAAW,EACxB,IAAI,GAAE,mBAA+C,wBAiExD;AA0LD,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

@@ -383,13 +383,16 @@ function createFilterStateFromAdvancedQuery(queryString, globalMetadataState, cu
         if (_key === SolrKeys.product) {
             newFilterInfo[SolrPivotKeys.product_version] = generateProductVersionPivotValue(filterObj[_key]);
         }
-        if (_key === SolrKeys.type) {
+        else if (_key === SolrKeys.type) {
             newFilterInfo[SolrKeys.type] = toOldCaseTypeMapper(filterObj[_key]);
         }
-        // if it's an unnamed field we should add it to free text querystring
         else if (_key === '<implicit>') {
+            // if it's an unnamed field we should add it to free text querystring
             advanceToBasicQuery.push(filterObj[_key]);
         }
+        else if (_key === SolrKeys.version) {
+            // merged into product_version below
+        }
         else {
             // if field is present in this map, it means field is supported in basic search mode too
             if (fieldNameToSolrFieldMapping[_key]) {

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

@@ -18,6 +18,8 @@ export declare const filterNamesMap: {
     readonly case_createdby_sso_username: any;
     readonly case_contact_sso_username: any;
     readonly case_type: any;
+    readonly case_alternate_id: any;
+    readonly case_openshift_cluster_id: any;
     readonly usernameFilterTitle: any;
 };
 export declare const UpdatedCaseDataEvent = "PCM-Next > case-list-data-background-refresh";

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;;;;;;;;;;;;;;;;;;;CAuD1B,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,CAazD,CAAC;AAEF,eAAO,MAAM,uBAAuB,UAAoC,CAAC;AAIzE,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;CA6D1B,CAAC;AAEF,eAAO,MAAM,oBAAoB,iDAAiD,CAAC"}

package/lib/esm/utils/constants.js

@@ -69,6 +69,12 @@ export const filterNamesMap = {
     get [SolrKeys.type]() {
         return i18n.t('Support type');
     },
+    get [SolrKeys.alternateId]() {
+        return i18n.t('Personal reference number');
+    },
+    get [SolrKeys.openshiftClusterId]() {
+        return i18n.t('Cluster ID');
+    },
     get usernameFilterTitle() {
         return i18n.t('Username');
     },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/cases",
-    "version": "2.6.185",
+    "version": "2.6.187",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -22,7 +22,6 @@
         "lib/**/*"
     ],
     "peerDependencies": {
-        "@cee-eng/hydrajs": "4.18.111",
         "@patternfly/patternfly": "6.2.1",
         "@patternfly/react-core": "6.2.1",
         "@patternfly/react-table": "6.2.1",
@@ -35,15 +34,15 @@
         "solr-query-builder": "1.0.1"
     },
     "dependencies": {
-        "@cee-eng/hydrajs": "4.18.111",
+        "@cee-eng/hydrajs": "^4.18.113",
         "@patternfly/patternfly": "6.2.1",
         "@patternfly/react-core": "6.2.1",
         "@patternfly/react-table": "6.2.1",
-        "@rh-support/components": "2.5.165",
-        "@rh-support/react-context": "2.5.275",
+        "@rh-support/components": "2.5.183",
+        "@rh-support/react-context": "2.5.277",
         "@rh-support/types": "2.0.26",
-        "@rh-support/user-permissions": "2.5.127",
-        "@rh-support/utils": "2.5.110",
+        "@rh-support/user-permissions": "2.5.129",
+        "@rh-support/utils": "2.5.111",
         "localforage": "^1.10.0",
         "lodash": "^4.17.21",
         "pegjs": "^0.10.0",
@@ -93,5 +92,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "d1a226af32eb5997a31c34001b6146be141c8911"
+    "gitHead": "deb5936155a3b68fc98e231dde9819da0967876b"
 }