@rh-support/cases 2.6.168 → 2.6.170

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

@@ -1,43 +1,23 @@
 import { Button, MenuToggle, Select, SelectList, SelectOption, } from '@patternfly/react-core';
-import { SingleSelectDropdown, useSelectKeyboardNavigator } from '@rh-support/components';
+import { useSelectKeyboardNavigator } from '@rh-support/components';
 import isEmpty from 'lodash/isEmpty';
 import React, { useContext, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { SolrKeys } from '../../../enums/filters';
-import { filterNamesMap } from '../../../utils/constants';
+import { filterNamesMap, PORTAL_DISPLAY_STATUSES } from '../../../utils/constants';
 import { CaseListFilterDispatchContext, CaseListFilterStateContext } from '../CaseListFilterContext';
 import { updateFilter } from '../CaseListFilterReducer';
 export function StatusFilter(props) {
-    var _a;
     const dispatch = useContext(CaseListFilterDispatchContext);
     const { t } = useTranslation();
     const { filterInfo } = useContext(CaseListFilterStateContext);
     const [isOpen, setIsOpen] = useState(false);
     const [selectedItems, setSelectedItems] = useState({});
-    const list = props.isSolrSearchDown
-        ? props.allCaseStatuses.map((status) => ({ value: status, key: status }))
-        : props.filterValues.map((filterValue) => ({ value: filterValue.value, key: filterValue.value }));
-    const singleSelectOptions = list.map((item) => ({
-        value: item.value,
-        label: item.value,
-    }));
-    const selectedStatus = ((_a = filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrKeys.status]) === null || _a === void 0 ? void 0 : _a[0]) || '';
-    const selectedOption = {
-        value: selectedStatus,
-        label: selectedStatus,
-    };
+    const list = PORTAL_DISPLAY_STATUSES.map((status) => ({ value: status, key: status }));
     const onToggleClick = (e) => {
         setIsOpen(!isOpen);
     };
     const onSelect = (option) => {
-        if (props.isSolrSearchDown) {
-            updateFilter(dispatch, {
-                filterKey: SolrKeys.status,
-                values: [option.value],
-            });
-            setIsOpen(false);
-            return;
-        }
         const prevSelectedStatuses = Object.keys(selectedItems).filter((item) => selectedItems[item] && item);
         if (selectedItems[option.value]) {
             setSelectedItems((prevData) => (Object.assign(Object.assign({}, prevData), { [option.value]: false })));
@@ -75,42 +55,32 @@ export function StatusFilter(props) {
         else if (selectedValues && selectedValues.length === 1) {
             return selectedValues[0];
         }
-        else if (selectedValues && selectedValues.length === 3) {
+        else if (selectedValues && totalLength && selectedValues.length === totalLength) {
             return t('All cases');
         }
         else {
-            if (selectedValues &&
-                selectedValues.length === 2 &&
-                selectedValues.every((item) => item.includes('Waiting'))) {
+            const hasAllOpenSelected = selectedValues.includes('In Progress') &&
+                selectedValues.includes('Waiting on Customer') &&
+                !selectedValues.includes('Closed');
+            if (hasAllOpenSelected) {
                 return t('All open cases');
             }
-            else if (selectedValues && totalLength && selectedValues.length === totalLength) {
-                return totalLengthString || btnPlaceholder;
-            }
             else {
                 return `${selectedValues.length} ${type} selected`;
             }
         }
     };
-    const placeholder = props.isSolrSearchDown
-        ? t('Select a status')
-        : getBtnPlaceholder(t('Select a status'), (filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrKeys.status]) || [], ' ', list.length, t('All selected'));
+    const placeholder = getBtnPlaceholder(t('Select a status'), (filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrKeys.status]) || [], ' ', list.length, t('All selected'));
     const toggle = (toggleRef) => (React.createElement(MenuToggle, { variant: "default", onClick: onToggleClick, innerRef: toggleRef, isExpanded: isOpen, isFullWidth: true, onKeyDown: onInputKeyDown },
         placeholder,
         Object.keys(selectedItems).filter((key) => selectedItems[key] === true).length > 0 && (React.createElement(Button, { icon: "", variant: "plain", onClick: onClick, "aria-label": "Clear selection", className: "pf-v6-c-select__toggle-clear" }))));
-    const dropdownOptions = list.map((option, index) => !isEmpty(option.value) && (React.createElement(SelectOption, { key: option.key, value: option, hasCheckbox: !props.isSolrSearchDown, isSelected: selectedItems[option.value], isFocused: focusedItemIndex !== null && focusedItemIndex === index, id: `select-status-${option.value.replace(' ', '-')}` }, option.value)));
-    const onSingleSelectChange = (option) => {
-        updateFilter(dispatch, {
-            filterKey: SolrKeys.status,
-            values: [option.value],
-        });
-    };
+    const dropdownOptions = list.map((option, index) => !isEmpty(option.value) && (React.createElement(SelectOption, { key: option.key, value: option, hasCheckbox: true, isSelected: selectedItems[option.value], isFocused: focusedItemIndex !== null && focusedItemIndex === index, id: `select-status-${option.value.replace(' ', '-')}` }, option.value)));
     useEffect(() => {
         var _a;
         if (isEmpty(filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrKeys.status])) {
             setSelectedItems({});
         }
-        else if (!props.isSolrSearchDown) {
+        else {
             const selectedStatuses = (_a = filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrKeys.status]) === null || _a === void 0 ? void 0 : _a.reduce((selection, status) => {
                 selection[status] = true;
                 return selection;
@@ -118,10 +88,10 @@ export function StatusFilter(props) {
             setSelectedItems(selectedStatuses || {});
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrKeys.status], props.isSolrSearchDown]);
+    }, [filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrKeys.status]]);
     const titleId = 'case-list-status-filter';
     return (React.createElement("div", { className: "status-filter" },
         React.createElement("label", { htmlFor: titleId, className: "pf-v6-u-mb-sm status-filter-label" }, t(filterNamesMap[SolrKeys.status])),
-        props.isSolrSearchDown ? (React.createElement(SingleSelectDropdown, { id: titleId, selected: selectedOption, options: singleSelectOptions, placeholder: t('Select a status'), onSelect: onSingleSelectChange, dataTrackingId: "status-filter", isScrollable: true })) : (React.createElement(Select, { shouldFocusToggleOnSelect: true, shouldPreventScrollOnItemFocus: true, id: titleId, "data-tracking-id": "status-filter", isOpen: isOpen, selected: selectedItems, onSelect: (_e, v) => onSelect(v), onOpenChange: (nextOpen) => setIsOpen(nextOpen), toggle: toggle, isScrollable: true, popperProps: { direction: 'down', enableFlip: false } },
-            React.createElement(SelectList, null, dropdownOptions)))));
+        React.createElement(Select, { shouldFocusToggleOnSelect: true, shouldPreventScrollOnItemFocus: true, id: titleId, "data-tracking-id": "status-filter", isOpen: isOpen, selected: selectedItems, onSelect: (_e, v) => onSelect(v), onOpenChange: (nextOpen) => setIsOpen(nextOpen), toggle: toggle, isScrollable: true, popperProps: { direction: 'down', enableFlip: false } },
+            React.createElement(SelectList, null, dropdownOptions))));
 }

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

@@ -1,10 +1,8 @@
 import React from 'react';
-import { IProductVersionPivotMap } from '../CaseList';
 import { IProductFilter } from '../CaseListFilterReducer';
 interface IProps {
     productInfo: IProductFilter;
-    productVersionPivot: IProductVersionPivotMap[];
 }
-export declare function VersionsFilter({ productInfo, productVersionPivot }: IProps): React.JSX.Element;
+export declare function VersionsFilter({ productInfo }: IProps): React.JSX.Element;
 export {};
 //# sourceMappingURL=VersionsFilter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"VersionsFilter.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-filters/VersionsFilter.tsx"],"names":[],"mappings":"AAeA,OAAO,KAA2D,MAAM,OAAO,CAAC;AAIhF,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAgB,MAAM,0BAA0B,CAAC;AAoCxE,UAAU,MAAM;IACZ,WAAW,EAAE,cAAc,CAAC;IAC5B,mBAAmB,EAAE,uBAAuB,EAAE,CAAC;CAClD;AAED,wBAAgB,cAAc,CAAC,EAAE,WAAW,EAAE,mBAAmB,EAAE,EAAE,MAAM,qBAkO1E"}
+{"version":3,"file":"VersionsFilter.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-filters/VersionsFilter.tsx"],"names":[],"mappings":"AAkBA,OAAO,KAA2D,MAAM,OAAO,CAAC;AAKhF,OAAO,EAAE,cAAc,EAAgB,MAAM,0BAA0B,CAAC;AAgCxE,UAAU,MAAM;IACZ,WAAW,EAAE,cAAc,CAAC;CAC/B;AAED,wBAAgB,cAAc,CAAC,EAAE,WAAW,EAAE,EAAE,MAAM,qBAiQrD"}

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

@@ -1,15 +1,15 @@
+import { useApolloClient } from '@apollo/client/react';
 import { Button, MenuToggle, Select, SelectList, SelectOption, TextInputGroup, TextInputGroupMain, TextInputGroupUtilities, } from '@patternfly/react-core';
 import TimesIcon from '@patternfly/react-icons/dist/js/icons/times-icon';
 import { useSelectKeyboardNavigator } from '@rh-support/components';
+import { GlobalMetadataStateContext } from '@rh-support/react-context';
+import { GET_PRODUCTS, handleGraphQLVersionsResponse } from '@rh-support/utils';
 import isEmpty from 'lodash/isEmpty';
 import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { SolrKeys, SolrPivotKeys } from '../../../enums/filters';
 import { CaseListFilterDispatchContext, CaseListFilterStateContext } from '../CaseListFilterContext';
 import { updateFilter } from '../CaseListFilterReducer';
-function getVersionValuesForProduct(productPivot = [], productName) {
-    return (productPivot.find((item) => item.value === productName) || {}).case_version;
-}
 //split version into parts
 function parseVersionIntoParts(version) {
     //keep unknown version at last
@@ -33,32 +33,62 @@ function compareVersions(versionA, versionB) {
         //one is string and other is number => string takes precendence
         if (typeof a === 'string')
             return -1;
-        if (typeof b == 'string')
+        if (typeof b === 'string')
             return 1;
     }
     return 0;
 }
-export function VersionsFilter({ productInfo, productVersionPivot }) {
+export function VersionsFilter({ productInfo }) {
     const { t } = useTranslation();
     const { filterInfo } = useContext(CaseListFilterStateContext);
     const dispatch = useContext(CaseListFilterDispatchContext);
+    const apolloClient = useApolloClient();
+    const { globalMetadataState: { allProducts }, } = useContext(GlobalMetadataStateContext);
     const [inputValue, setInputValue] = useState('');
     const [activeItem, setActiveItem] = useState(null);
     const [isOpen, setIsOpen] = useState(false);
     const [selectedItems, setSelectedItems] = useState({});
+    const [fetchedVersions, setFetchedVersions] = useState([]);
+    const [isLoading, setIsLoading] = useState(false);
     const textInputRef = useRef();
-    // Memoize versions to prevent unnecessary recalculations
-    const versions = useMemo(() => {
-        const versionValues = getVersionValuesForProduct(productVersionPivot, productInfo.value);
-        return versionValues === null || versionValues === void 0 ? void 0 : versionValues.sort((a, b) => compareVersions(a.value, b.value));
-    }, [productVersionPivot, productInfo.value]);
-    // Memoize list to prevent unnecessary recreations
-    const list = useMemo(() => (versions === null || versions === void 0 ? void 0 : versions.map((version) => ({
-        value: version.value,
-        key: version.value,
-    }))) || [], [versions]);
+    useEffect(() => {
+        const productObj = allProducts.data.productsResult.find((p) => p.name === productInfo.value || p.product === productInfo.value);
+        if (!(productObj === null || productObj === void 0 ? void 0 : productObj.productId))
+            return;
+        setIsLoading(true);
+        apolloClient
+            .query({
+            query: GET_PRODUCTS,
+            variables: {
+                where: { ParentProduct__c: { eq: productObj.productId }, IsActive: { eq: true } },
+                first: 200,
+                orderBy: { Name: { order: 'ASC' } },
+            },
+            fetchPolicy: 'cache-first',
+        })
+            .then(({ data }) => {
+            var _a, _b, _c, _d;
+            const edges = (_d = (_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.SalesforceSupportProduct2) === null || _c === void 0 ? void 0 : _c.edges) !== null && _d !== void 0 ? _d : [];
+            const versionData = handleGraphQLVersionsResponse(edges, productObj.name || productInfo.value);
+            setFetchedVersions(versionData);
+        })
+            .catch((err) => {
+            console.error('[VersionsFilter] Failed to fetch versions:', err);
+            setFetchedVersions([]);
+        })
+            .finally(() => setIsLoading(false));
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [productInfo.value, allProducts.data]);
+    const list = useMemo(() => {
+        const sorted = [...fetchedVersions].sort((a, b) => compareVersions(a.name, b.name));
+        return sorted.map((version) => ({
+            value: version.name,
+            key: version.name,
+            id: version.id,
+        }));
+    }, [fetchedVersions]);
     const [selectOptions, setSelectOptions] = useState(list);
-    const onToggleClick = (e) => {
+    const onToggleClick = () => {
         setIsOpen(!isOpen);
     };
     const onSelect = (option) => {
@@ -72,18 +102,17 @@ export function VersionsFilter({ productInfo, productVersionPivot }) {
             setSelectedItems((prevData) => (Object.assign(Object.assign({}, prevData), { [option.value]: true })));
             prevSelectedVersions.push(option.value);
         }
-        const newVersionState = prevSelectedVersions.map((version) => ({
-            field: SolrKeys.version,
-            value: version,
-        }));
-        const productNewState = [...filterInfo[SolrPivotKeys.product_version]];
+        const newVersionState = prevSelectedVersions.map((version) => {
+            const versionOption = list.find((item) => item.value === version);
+            return {
+                field: SolrKeys.version,
+                value: version,
+                productId: (versionOption === null || versionOption === void 0 ? void 0 : versionOption.id) || '',
+            };
+        });
+        const productNewState = [...((filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrPivotKeys.product_version]) || [])];
         const objIndex = productNewState.findIndex((item) => item.value === productInfo.value);
-        // replace product with updated versions
-        productNewState[objIndex] = {
-            field: SolrKeys.product,
-            value: productInfo.value,
-            [SolrKeys.version]: newVersionState,
-        };
+        productNewState[objIndex] = Object.assign(Object.assign({}, productNewState[objIndex]), { field: SolrKeys.product, value: productInfo.value, [SolrKeys.version]: newVersionState });
         updateFilter(dispatch, { filterKey: SolrPivotKeys.product_version, values: productNewState });
     };
     // Use the keyboard navigator hook
@@ -103,7 +132,7 @@ export function VersionsFilter({ productInfo, productVersionPivot }) {
         var _a;
         setInputValue('');
         setSelectedItems({});
-        const productNewState = [...filterInfo[SolrPivotKeys.product_version]];
+        const productNewState = [...((filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrPivotKeys.product_version]) || [])];
         const objIndex = productNewState.findIndex((item) => item.value === productInfo.value);
         productNewState[objIndex] = {
             field: SolrKeys.product,
@@ -117,7 +146,7 @@ export function VersionsFilter({ productInfo, productVersionPivot }) {
     useEffect(() => {
         if (focusedItemIndex !== null && list[focusedItemIndex]) {
             const focusedItem = list[focusedItemIndex];
-            setActiveItem(`select-multi-typeahead-checkbox-${focusedItem === null || focusedItem === void 0 ? void 0 : focusedItem.value.replace(' ', '-')}`);
+            setActiveItem(`select-multi-typeahead-checkbox-${String(focusedItem === null || focusedItem === void 0 ? void 0 : focusedItem.value).replace(' ', '-')}`);
         }
         else {
             setActiveItem(null);
@@ -131,7 +160,7 @@ export function VersionsFilter({ productInfo, productVersionPivot }) {
     // Memoize dropdownOptions to prevent unnecessary rerenders
     const dropdownOptions = useMemo(() => {
         const optionsToRender = !isEmpty(selectOptions) ? selectOptions : list;
-        return optionsToRender.map((option, index) => option.value && (React.createElement(SelectOption, { key: option.key, value: option, hasCheckbox: true, isSelected: selectedItems[option.value], isFocused: focusedItemIndex !== null && focusedItemIndex === index, id: `select-multi-typeahead-${option.value.replace(' ', '-')}` }, option.value)));
+        return optionsToRender.map((option, index) => option.value && (React.createElement(SelectOption, { key: option.key, value: option, hasCheckbox: true, isSelected: selectedItems[String(option.value)], isFocused: focusedItemIndex !== null && focusedItemIndex === index, id: `select-multi-typeahead-${String(option.value).replace(' ', '-')}` }, option.value)));
     }, [selectOptions, list, selectedItems, focusedItemIndex]);
     // Update selectOptions when input value changes
     useEffect(() => {
@@ -156,9 +185,9 @@ export function VersionsFilter({ productInfo, productVersionPivot }) {
         setSelectedItems(selectedVersions);
     }, [productInfo.case_version]);
     const titleId = 'case-list-versions-filter';
-    return (React.createElement(React.Fragment, null, (!isEmpty(versions) || true) && (React.createElement("div", { className: "version-filter-chip" },
+    return (React.createElement("div", { className: "version-filter-chip" },
         React.createElement("label", { hidden: true, htmlFor: titleId }, t('Open versions dropdown')),
         React.createElement("div", { className: "pf-v6-c-select" },
             React.createElement(Select, { shouldFocusToggleOnSelect: true, shouldPreventScrollOnItemFocus: true, "data-tracking-id": "versions-filter", id: titleId, title: t('Version'), isOpen: isOpen, selected: selectedItems, onSelect: (_e, v) => onSelect(v), onOpenChange: (nextOpen) => setIsOpen(nextOpen), popperProps: { direction: 'down', enableFlip: false }, toggle: toggle, isScrollable: true },
-                React.createElement(SelectList, null, dropdownOptions)))))));
+                React.createElement(SelectList, null, isLoading ? React.createElement(SelectOption, { isDisabled: true }, t('Loading...')) : dropdownOptions)))));
 }

package/lib/esm/components/case-list/case-list-table/CaseListTable.d.ts

@@ -12,7 +12,6 @@ interface IProps {
     paginationInfo?: IPaginationInfo;
     isCaseListPageLoading: boolean;
     hasError: boolean;
-    isSolrDown?: boolean;
 }
 export declare function CaseListTable(props: IProps): React.JSX.Element;
 export {};

package/lib/esm/components/case-list/case-list-table/CaseListTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseListTable.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-table/CaseListTable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+CAA+C,CAAC;AAqB3E,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAQxD,OAAO,KAAkD,MAAM,OAAO,CAAC;AAKvE,OAAO,EAAE,iBAAiB,EAAyB,MAAM,0BAA0B,CAAC;AAEpF,OAAO,EAEH,eAAe,EACf,SAAS,EAIZ,MAAM,0BAA0B,CAAC;AA4BlC,UAAU,MAAM;IACZ,QAAQ,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAC3C,UAAU,EAAE,UAAU,EAAE,CAAC;IACzB,kBAAkB,EAAE,QAAQ,CAAC;IAC7B,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,cAAc,CAAC,EAAE,eAAe,CAAC;IACjC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAsBD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,qBA2kB1C"}
+{"version":3,"file":"CaseListTable.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-table/CaseListTable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+CAA+C,CAAC;AAqB3E,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAQxD,OAAO,KAAkD,MAAM,OAAO,CAAC;AAKvE,OAAO,EAAE,iBAAiB,EAAyB,MAAM,0BAA0B,CAAC;AAGpF,OAAO,EAEH,eAAe,EACf,SAAS,EAIZ,MAAM,0BAA0B,CAAC;AA4BlC,UAAU,MAAM;IACZ,QAAQ,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAC3C,UAAU,EAAE,UAAU,EAAE,CAAC;IACzB,kBAAkB,EAAE,QAAQ,CAAC;IAC7B,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,cAAc,CAAC,EAAE,eAAe,CAAC;IACjC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,QAAQ,EAAE,OAAO,CAAC;CACrB;AAsBD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,qBA6kB1C"}

package/lib/esm/components/case-list/case-list-table/CaseListTable.js

@@ -14,6 +14,7 @@ import React, { useContext, useEffect, useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import { CaseListColumnIds } from '../../../enums/case';
+import { mapSfdcStatusToPortalStatus } from '../../../utils/statusUtils';
 import { CaseListFilterDispatchContext, CaseListFilterStateContext } from '../CaseListFilterContext';
 import { clearFilters, resetFilterToDefaultState, updatePagination, updateSort, } from '../CaseListFilterReducer';
 import SeverityLabel from './SeverityLabel';
@@ -219,9 +220,7 @@ export function CaseListTable(props) {
         if (props.isCaseListPageLoading)
             return 0;
         let paginationCount = (_b = (_a = props.caseList) === null || _a === void 0 ? void 0 : _a.numFound) !== null && _b !== void 0 ? _b : 0;
-        // solr return 400 if we fetch the elements after 10000 limit
-        // so we need to restrict the user from FE too
-        paginationCount = paginationCount > 10000 ? 10000 : paginationCount;
+        paginationCount = paginationCount > 4000 ? 4000 : paginationCount;
         return paginationCount;
     };
     const onBottomPaginationSetPage = (paginationInfo) => {
@@ -274,9 +273,11 @@ export function CaseListTable(props) {
             case_number: row.case_number,
             case_summary: row.case_summary,
             case_createdByName: row.case_createdByName,
-            case_lastModifiedDate: formatDate(row.case_lastModifiedDate) ? formatDate(row.case_lastModifiedDate) : '',
+            case_lastModifiedDate: formatDate(row.case_last_public_update_date)
+                ? formatDate(row.case_last_public_update_date)
+                : '',
             case_severity: row.case_severity ? row.case_severity : '',
-            case_status: row.case_status,
+            case_status: mapSfdcStatusToPortalStatus(row.case_status),
             case_createdDate: formatDate(row.case_createdDate),
             case_accountNumber: row.case_accountNumber,
             case_alternate_id: row.case_alternate_id ? row.case_alternate_id : '',
@@ -284,7 +285,7 @@ export function CaseListTable(props) {
             case_closedDate: formatDate(row.case_closedDate) ? formatDate(row.case_closedDate) : '',
             case_folderName: row.case_folderName || getCaseGroupName(row.case_folderNumber) || '',
             case_contactName: row.case_contactName,
-            case_lastModifiedByName: row.case_lastModifiedByName ? row.case_lastModifiedByName : '',
+            case_lastModifiedByName: row.case_last_public_update_by ? row.case_last_public_update_by : '',
             case_version: row.case_version,
             id: row.id,
             case_product: row.case_product,
@@ -348,7 +349,7 @@ export function CaseListTable(props) {
                     React.createElement(TableColumnSelector, { onColumnSelectorChange: onColumnSelectorChange, cachedColumns: selectedColumns }),
                     React.createElement(TableActionsDropdown, { caseList: caseListData, selectedCases: selectedCases, onCasesCloseSuccess: onCasesCloseSuccess, currentFilteredCaseList: props.caseList })),
                 React.createElement("span", { className: "toolbar-pagination" },
-                    React.createElement(TablePagination, { perPage: (_c = props.paginationInfo) === null || _c === void 0 ? void 0 : _c.pageSize, currentPage: (_d = props.paginationInfo) === null || _d === void 0 ? void 0 : _d.currentPage, onPerPageSelect: onPerPageSelect, onSetPage: onSetPage, variant: PaginationVariant.top, itemCount: getItemCount() }))),
+                    React.createElement(TablePagination, { perPage: (_c = props.paginationInfo) === null || _c === void 0 ? void 0 : _c.pageSize, currentPage: (_d = props.paginationInfo) === null || _d === void 0 ? void 0 : _d.currentPage, onPerPageSelect: onPerPageSelect, onSetPage: onSetPage, variant: PaginationVariant.top, itemCount: getItemCount(), isCompact: true }))),
             React.createElement("div", { className: "pf-v6-c-scroll-inner-wrapper" },
                 React.createElement(Table, { variant: TableVariant.compact, "aria-label": "case-list", className: "case-list-table" },
                     React.createElement(Thead, null,
@@ -401,5 +402,5 @@ export function CaseListTable(props) {
                                 React.createElement(Td, { className: !isColumnVisible('closedDate') ? Visibility.hidden : '', "data-label": "Closed date" }, row.case_closedDate ? formatDate(row.case_closedDate) : ''),
                                 React.createElement(Td, { className: !isColumnVisible('folderName') ? Visibility.hidden : '', "data-label": "Group" }, row.case_folderName ? row.case_folderName : ''))))))),
             React.createElement("footer", { className: "toolbar-pagination", "data-tracking-id": "case-list-table-pagination" },
-                React.createElement(TablePagination, { perPage: (_e = props === null || props === void 0 ? void 0 : props.paginationInfo) === null || _e === void 0 ? void 0 : _e.pageSize, currentPage: (_f = props === null || props === void 0 ? void 0 : props.paginationInfo) === null || _f === void 0 ? void 0 : _f.currentPage, onPerPageSelect: onPerPageSelect, onSetPage: onBottomPaginationSetPage, variant: PaginationVariant.bottom, itemCount: getItemCount() })))));
+                React.createElement(TablePagination, { perPage: (_e = props === null || props === void 0 ? void 0 : props.paginationInfo) === null || _e === void 0 ? void 0 : _e.pageSize, currentPage: (_f = props === null || props === void 0 ? void 0 : props.paginationInfo) === null || _f === void 0 ? void 0 : _f.currentPage, onPerPageSelect: onPerPageSelect, onSetPage: onBottomPaginationSetPage, variant: PaginationVariant.bottom, itemCount: getItemCount(), isCompact: true })))));
 }

package/lib/esm/components/case-list/case-list-table/DownloadCSVFileModal.d.ts

@@ -1,15 +1,10 @@
 import './DownloadCSVFileModal.scss';
-import { IAccount } from '@cee-eng/hydrajs/@types/models/account';
-import { IApiResponseDetails } from '@rh-support/types/shared';
-import { UserAuth } from '@rh-support/user-permissions';
 import React from 'react';
 import { ICaseListFilterState } from '../CaseListFilterReducer';
 interface IProps {
     isDisabled?: boolean;
     onModalshow: boolean;
     onClose: () => void;
-    loggedInUserRights: IApiResponseDetails<UserAuth>;
-    loggedInUsersAccount: IApiResponseDetails<Partial<IAccount>>;
     filterState: ICaseListFilterState;
     selectedCases: string[];
     filteredCaseCount: number;

package/lib/esm/components/case-list/case-list-table/DownloadCSVFileModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DownloadCSVFileModal.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-table/DownloadCSVFileModal.tsx"],"names":[],"mappings":"AAAA,OAAO,6BAA6B,CAAC;AAGrC,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAqBlE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAGxD,OAAO,KAAuC,MAAM,OAAO,CAAC;AAM5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,UAAU,MAAM;IACZ,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,kBAAkB,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAClD,oBAAoB,EAAE,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7D,WAAW,EAAE,oBAAoB,CAAC;IAClC,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;CAC7B;AAoBD,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,KAAK,EAAE,MAAM,qBA4ZzD"}
+{"version":3,"file":"DownloadCSVFileModal.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-table/DownloadCSVFileModal.tsx"],"names":[],"mappings":"AAAA,OAAO,6BAA6B,CAAC;AAyBrC,OAAO,KAAuC,MAAM,OAAO,CAAC;AAM5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,UAAU,MAAM;IACZ,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,WAAW,EAAE,oBAAoB,CAAC;IAClC,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;CAC7B;AAWD,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,KAAK,EAAE,MAAM,qBA8WzD"}

package/lib/esm/components/case-list/case-list-table/DownloadCSVFileModal.js

@@ -8,19 +8,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import './DownloadCSVFileModal.scss';
-import { publicApi } from '@cee-eng/hydrajs';
+import { useApolloClient } from '@apollo/client/react';
 import { Button, Checkbox, Form, FormGroup, Grid, GridItem, InputGroup, Modal, ModalBody, ModalFooter, ModalHeader, ModalVariant, Spinner, TextInput, ValidatedOptions, } from '@patternfly/react-core';
 import DownloadIcon from '@patternfly/react-icons/dist/js/icons/download-icon';
 import TimesCircleIcon from '@patternfly/react-icons/dist/js/icons/times-circle-icon';
-import { ToastNotification, useFetch } from '@rh-support/components';
+import { ToastNotification } from '@rh-support/components';
 import { downloadCSV, formatDateTime, toNewCaseTypeSwitcher } from '@rh-support/utils';
 import { isEmpty } from 'lodash';
 import React, { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { SFDCKeys, SolrKeys } from '../../../enums/filters';
-import { getCaseListFromSolr } from '../../../utils/caseListUtils';
-import { createQueryForCSVDownload } from '../../../utils/caseSearchUtils';
-const csvHeadersSolr = [
+import { SolrKeys } from '../../../enums/filters';
+import { getCaseListFromGraphQL } from '../../../utils/caseListGraphQLUtils';
+import { mapSfdcStatusToPortalStatus } from '../../../utils/statusUtils';
+const csvHeaders = [
     { label: 'Case number', key: SolrKeys.caseNumber },
     {
         label: 'Case link',
@@ -28,20 +28,12 @@ const csvHeadersSolr = [
     },
     { label: 'Title', key: SolrKeys.caseSummary },
 ];
-const csvHeadersSFDC = [
-    { label: 'Case number', key: SFDCKeys.caseNumber },
-    {
-        label: 'Case link',
-        key: 'case_link',
-    },
-    { label: 'Title', key: SFDCKeys.caseSummary },
-];
 export default function DownloadCSVFileModal(props) {
-    const { onClose, onModalshow, isDisabled, loggedInUserRights, loggedInUsersAccount, filterState, selectedCases, filteredCaseCount, } = props;
+    const { onClose, onModalshow, isDisabled, filterState, selectedCases, filteredCaseCount } = props;
     const { t } = useTranslation();
-    const { isFetching, request } = useFetch(getCaseListFromSolr, { propgateErrors: true });
+    const apolloClient = useApolloClient();
+    const [isFetching, setIsFetching] = useState(false);
     const [downloadCSVFileName, setDownloadCSVFileName] = useState('CaseList.csv');
-    const [isFetchingSFDC, setIsFetchingSFDC] = useState(false);
     const [checkboxes, setCheckboxes] = useState({
         selectAll: false,
         ownerName: false,
@@ -57,87 +49,87 @@ export default function DownloadCSVFileModal(props) {
         group: false,
     });
     const [isSaveClicked, setIsSavedClicked] = useState(false);
-    function getKey(key, isSecureSupport) {
-        return isSecureSupport ? SFDCKeys[key] : SolrKeys[key];
+    function getKey(key) {
+        return SolrKeys[key];
     }
-    const isSecureSupportUser = loggedInUsersAccount.data.secureSupport;
     const headerDefinitions = useMemo(() => [
         {
             checkbox: checkboxes.ownerName,
-            key: getKey('ownerName', isSecureSupportUser),
+            key: getKey('ownerName'),
             label: 'Owner name',
         },
         {
             checkbox: checkboxes.severity,
-            key: getKey('severity', isSecureSupportUser),
+            key: getKey('severity'),
             label: 'Severity',
         },
         {
             checkbox: checkboxes.createdBy,
-            key: getKey('createdBy', isSecureSupportUser),
+            key: getKey('createdBy'),
             label: 'Created by',
         },
         {
             checkbox: checkboxes.createdBy,
-            key: getKey('createdDate', isSecureSupportUser),
+            key: getKey('createdDate'),
             label: 'Created date',
             transform: formatDateTime,
         },
         {
             checkbox: checkboxes.accountNumber,
-            key: getKey('accountNumber', isSecureSupportUser),
+            key: getKey('accountNumber'),
             label: 'Account number',
         },
         {
             checkbox: checkboxes.type,
-            key: getKey(isSecureSupportUser ? 'caseType' : 'type', isSecureSupportUser),
+            key: getKey('type'),
             label: 'Support type',
         },
         {
             checkbox: checkboxes.modifiedBy,
-            key: getKey('modifiedBy', isSecureSupportUser),
+            key: getKey('modifiedBy'),
             label: 'Modified by',
         },
         {
             checkbox: checkboxes.modifiedBy,
-            key: getKey('modifiedDate', isSecureSupportUser),
+            key: getKey('modifiedDate'),
             label: 'Modified date',
             transform: formatDateTime,
         },
         {
             checkbox: checkboxes.status,
-            key: getKey('status', isSecureSupportUser),
+            key: getKey('status'),
             label: 'Status',
+            transform: mapSfdcStatusToPortalStatus,
         },
         {
             checkbox: checkboxes.productVersion,
-            key: getKey('product', isSecureSupportUser),
+            key: getKey('product'),
             label: 'Product',
         },
         {
             checkbox: checkboxes.productVersion,
-            key: getKey('version', isSecureSupportUser),
+            key: getKey('version'),
             label: 'Version',
         },
         {
             checkbox: checkboxes.alternateId,
-            key: getKey('alternateId', isSecureSupportUser),
+            key: getKey('alternateId'),
             label: 'Alternate ID',
         },
         {
             checkbox: checkboxes.caseClosedDate,
-            key: getKey('caseClosedDate', isSecureSupportUser),
+            key: getKey('caseClosedDate'),
             label: 'Closed date',
             transform: formatDateTime,
         },
         {
             checkbox: checkboxes.group,
-            key: getKey('groupName', isSecureSupportUser),
+            key: getKey('groupName'),
             label: 'Group',
         },
-    ], [checkboxes, isSecureSupportUser]);
+    ], [checkboxes]);
     const getHeaders = () => {
-        const updatedCsvHeaders = isSecureSupportUser ? csvHeadersSFDC : csvHeadersSolr;
+        const updatedCsvHeaders = [...csvHeaders];
         headerDefinitions.forEach((headerDefinition) => {
             const { checkbox, key, label, transform } = headerDefinition;
             const index = updatedCsvHeaders.findIndex((header) => header.key === key);
@@ -154,9 +146,8 @@ export default function DownloadCSVFileModal(props) {
         });
         return updatedCsvHeaders;
     };
-    const isFetchingCSVData = isFetching || isFetchingSFDC;
-    const partnerSearch = loggedInUserRights.data.hasManagedAccounts();
-    const splitExtensionName = downloadCSVFileName.split('.')[0].replace(/ +/g, ''); // To split and trim value before saving PDF
+    const isFetchingCSVData = isFetching;
+    const splitExtensionName = downloadCSVFileName.split('.')[0].replace(/ +/g, '');
     const onCancel = () => {
         onClose && onClose();
         setIsSavedClicked(false);
@@ -173,15 +164,16 @@ export default function DownloadCSVFileModal(props) {
     };
     const checkboxValues = Object.values(checkboxes).slice(1); // as we don't want selectAll value
     const allCheckBoxNotSelected = checkboxValues.includes(false);
-    // For SOLR
     const onExportCSVClick = () => __awaiter(this, void 0, void 0, function* () {
         try {
             setIsSavedClicked(true);
             if (!isEmpty(splitExtensionName)) {
-                const query = createQueryForCSVDownload(filterState, loggedInUserRights.data, loggedInUsersAccount.data, selectedCases);
-                const res = yield request(query, partnerSearch, null, isSecureSupportUser);
-                // To map the values in csv to new support type
-                const updatedCsvData = res.response.docs.map((row) => (Object.assign(Object.assign({}, row), { case_type: toNewCaseTypeSwitcher(row.case_type), case_link: `https://${window.location.host}${window.location.pathname}/#/case/${row.case_number}` })));
+                setIsFetching(true);
+                const hasSelectedCases = selectedCases.length > 0;
+                const csvLimit = hasSelectedCases ? selectedCases.length : 1000;
+                const result = yield getCaseListFromGraphQL(filterState, apolloClient, csvLimit, undefined, hasSelectedCases ? selectedCases : undefined);
+                setIsFetching(false);
+                const updatedCsvData = result.caseListResponse.response.docs.map((row) => (Object.assign(Object.assign({}, row), { case_type: toNewCaseTypeSwitcher(row.case_type), case_link: `https://${window.location.host}${window.location.pathname}/#/case/${row.case_number}` })));
                 downloadCSV(updatedCsvData, getHeaders(), splitExtensionName ? `${splitExtensionName}.csv` : 'CaseList.csv');
                 onCancel();
                 ToastNotification.addSuccessMessage(t('File downloaded successfully!'));
@@ -189,33 +181,11 @@ export default function DownloadCSVFileModal(props) {
             }
         }
         catch (e) {
+            setIsFetching(false);
             onCancel();
             ToastNotification.addDangerMessage(t('File could not be downloaded. Please try again!  '));
         }
     });
-    // For SFDC
-    const onExportCSVClickSecureSupport = () => __awaiter(this, void 0, void 0, function* () {
-        try {
-            setIsSavedClicked(true);
-            if (!isEmpty(splitExtensionName)) {
-                const sfdcFilter = createQueryForCSVDownload(filterState, loggedInUserRights.data, loggedInUsersAccount.data, selectedCases);
-                setIsFetchingSFDC(true);
-                const sfdcResponse = yield publicApi.caseList.getCaseListFromSFDC(sfdcFilter, false, true);
-                setIsFetchingSFDC(false);
-                // To map the values in csv to new support type
-                const updatedCsvData = sfdcResponse.cases.map((row) => (Object.assign(Object.assign({}, row), { caseType: toNewCaseTypeSwitcher(row.caseType), case_link: `https://${window.location.host}${window.location.pathname}/#/case/${row.caseNumber}` })));
-                downloadCSV(updatedCsvData, getHeaders(), splitExtensionName ? `${splitExtensionName}.csv` : 'CaseList.csv');
-                onCancel();
-                ToastNotification.addSuccessMessage(t('File downloaded successfully!'));
-                setIsSavedClicked(false);
-            }
-        }
-        catch (e) {
-            setIsFetchingSFDC(false);
-            onCancel();
-            ToastNotification.addDangerMessage(t('Could not export CSV'));
-        }
-    });
     const handleSelectAll = () => {
         const newSelectAllState = !checkboxes.selectAll;
         const updatedCheckboxes = {
@@ -294,6 +264,6 @@ export default function DownloadCSVFileModal(props) {
             React.createElement("p", null, downloadCSVModalDescription(selectedCases.length || filteredCaseCount)),
             downloadCSVModalBody()),
         React.createElement(ModalFooter, null,
-            React.createElement(Button, { key: "submit", icon: isFetchingCSVData ? React.createElement(Spinner, { size: "md" }) : React.createElement(DownloadIcon, null), variant: "primary", "data-tracking-id": "download-csv-modal-submit", onClick: isSecureSupportUser ? onExportCSVClickSecureSupport : onExportCSVClick, isDisabled: (isSaveClicked && isEmpty(splitExtensionName)) || isDisabled || isFetchingCSVData }, t('Download')),
+            React.createElement(Button, { key: "submit", icon: isFetchingCSVData ? React.createElement(Spinner, { size: "md", "aria-label": "loading" }) : React.createElement(DownloadIcon, null), variant: "primary", "data-tracking-id": "download-csv-modal-submit", onClick: onExportCSVClick, isDisabled: (isSaveClicked && isEmpty(splitExtensionName)) || isDisabled || isFetchingCSVData }, t('Download')),
             React.createElement(Button, { key: "back", variant: "secondary", onClick: onCancel, isDisabled: isDisabled || isFetchingCSVData, "data-tracking-id": "download-csv-modal-cancel" }, t('Cancel')))));
 }