@rh-support/cases 2.6.193 → 2.6.195

package/lib/esm/components/case-list/case-list-filters/GroupsFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GroupsFilter.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-filters/GroupsFilter.tsx"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAUrD,OAAO,KAA2D,MAAM,OAAO,CAAC;AAShF,MAAM,WAAW,iBAAiB;IAC9B,qFAAqF;IACrF,cAAc,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1C,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,IAAI,CAAC;IAC5D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAID,wBAAgB,YAAY,CAAC,EACzB,cAAc,EAAE,wBAAwB,EACxC,cAAc,EACd,SAAiB,EACjB,QAAmC,EACnC,uBAA+B,EAC/B,WAAW,EAAE,eAAe,GAC/B,GAAE,iBAAsB,qBAuTxB"}
+{"version":3,"file":"GroupsFilter.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-filters/GroupsFilter.tsx"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAKrD,OAAO,KAA2D,MAAM,OAAO,CAAC;AAShF,MAAM,WAAW,iBAAiB;IAC9B,qFAAqF;IACrF,cAAc,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1C,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,IAAI,CAAC;IAC5D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAID,wBAAgB,YAAY,CAAC,EACzB,cAAc,EAAE,wBAAwB,EACxC,cAAc,EACd,SAAiB,EACjB,QAAmC,EACnC,uBAA+B,EAC/B,WAAW,EAAE,eAAe,GAC/B,GAAE,iBAAsB,qBA+RxB"}

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

@@ -1,8 +1,8 @@
-import { useApolloClient } from '@apollo/client/react';
 import { Badge, Button, MenuFooter, MenuToggle, Select, SelectList, SelectOption, TextInputGroup, TextInputGroupMain, TextInputGroupUtilities, } from '@patternfly/react-core';
 import TimesIcon from '@patternfly/react-icons/dist/js/icons/times-icon';
+import { GlobalMetadataStateContext } from '@rh-support/react-context';
 import { ability, resourceActions, resources } from '@rh-support/user-permissions';
-import { GET_CASE_GROUP, getDropdownBtnPlaceholder, handleGraphQLCaseGroupsResponse, } from '@rh-support/utils';
+import { getDropdownBtnPlaceholder } from '@rh-support/utils';
 import isEmpty from 'lodash/isEmpty';
 import isUndefined from 'lodash/isUndefined';
 import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
@@ -14,9 +14,8 @@ import { CaseListFilterDispatchContext, CaseListFilterStateContext } from '../Ca
 import { updateFilter } from '../CaseListFilterReducer';
 const EMPTY_GROUPS = [];
 export function GroupsFilter({ selectedGroups: controlledSelectedGroups, onGroupsChange, hideLabel = false, idPrefix = 'case-list-group-filter', showSelectionCountBadge = false, placeholder: placeholderProp, } = {}) {
-    var _a;
+    var _a, _b;
     const { t } = useTranslation();
-    const apolloClient = useApolloClient();
     const { filterInfo } = useContext(CaseListFilterStateContext);
     const dispatch = useContext(CaseListFilterDispatchContext);
     const isControlled = typeof onGroupsChange === 'function';
@@ -25,31 +24,12 @@ export function GroupsFilter({ selectedGroups: controlledSelectedGroups, onGroup
     const selectedGroups = isControlled
         ? controlledSelectedGroups || EMPTY_GROUPS
         : (_a = filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrKeys.group]) !== null && _a !== void 0 ? _a : EMPTY_GROUPS;
+    const { globalMetadataState: { caseGroups }, } = useContext(GlobalMetadataStateContext);
+    const isLoading = caseGroups.isFetching;
     const [inputValue, setInputValue] = useState('');
-    const [caseGroups, setCaseGroups] = useState([]);
-    const [isLoading, setIsLoading] = useState(false);
     const [focusedItemIndex, setFocusedItemIndex] = useState(null);
     const [activeItem, setActiveItem] = useState(null);
-    useEffect(() => {
-        setIsLoading(true);
-        apolloClient
-            .query({
-            query: GET_CASE_GROUP,
-            fetchPolicy: 'cache-first',
-        })
-            .then(({ data }) => {
-            var _a, _b, _c, _d;
-            const edges = (_d = (_c = (_b = (_a = data === null || data === void 0 ? void 0 : data.redhat_support_uiapi) === null || _a === void 0 ? void 0 : _a.query) === null || _b === void 0 ? void 0 : _b.RedHatSupportCaseGroup__c) === null || _c === void 0 ? void 0 : _c.edges) !== null && _d !== void 0 ? _d : [];
-            setCaseGroups(handleGraphQLCaseGroupsResponse(edges));
-        })
-            .catch((err) => {
-            console.error('[GroupsFilter] Failed to fetch case groups:', err);
-            setCaseGroups([]);
-        })
-            .finally(() => setIsLoading(false));
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
-    const list = useMemo(() => caseGroups.map((group) => ({ value: group.name, key: group.groupNum })), [caseGroups]);
+    const list = useMemo(() => (caseGroups.data || []).map((group) => ({ value: group.name, key: group.groupNum })), [caseGroups.data]);
     const [selectOptions, setSelectOptions] = useState(list);
     const canViewManageTab = ability.can(resourceActions.READ, resources.MANAGE);
     const canViewCaseGroups = ability.can(resourceActions.READ, resources.CASE_GROUPS) && canViewManageTab;
@@ -153,7 +133,7 @@ export function GroupsFilter({ selectedGroups: controlledSelectedGroups, onGroup
         ? isLoading
             ? t('Loading...')
             : defaultEmptyPlaceholder
-        : getDropdownBtnPlaceholder(isLoading ? t('Loading...') : defaultEmptyPlaceholder, selectedGroups, '', caseGroups.length, t('All selected'));
+        : getDropdownBtnPlaceholder(isLoading ? t('Loading...') : defaultEmptyPlaceholder, selectedGroups, '', ((_b = caseGroups.data) === null || _b === void 0 ? void 0 : _b.length) || 0, t('All selected'));
     const hasSelectedGroups = selectedGroups.length > 0;
     const onClick = () => {
         var _a;
@@ -187,12 +167,7 @@ export function GroupsFilter({ selectedGroups: controlledSelectedGroups, onGroup
         setFocusedItemIndex(null);
         setActiveItem(null);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [inputValue]);
-    useEffect(() => {
-        if (!inputValue) {
-            setSelectOptions(list);
-        }
-    }, [list, inputValue]);
+    }, [inputValue, list]);
     useEffect(() => {
         if (isEmpty(selectedGroups)) {
             setSelectedItems({});

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/cases",
-    "version": "2.6.193",
+    "version": "2.6.195",
     "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.189",
-        "@rh-support/react-context": "2.5.283",
+        "@rh-support/components": "2.5.191",
+        "@rh-support/react-context": "2.5.285",
         "@rh-support/types": "2.0.26",
-        "@rh-support/user-permissions": "2.5.135",
-        "@rh-support/utils": "2.5.117",
+        "@rh-support/user-permissions": "2.5.137",
+        "@rh-support/utils": "2.5.119",
         "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": "8f1387bb291fa73c60cec5251c7cc4c599fd1b5e"
+    "gitHead": "e737fe04f1e771923e483cd65f7d6f6f87b53356"
 }