@rh-support/cases 2.6.186 → 2.6.187

package/lib/esm/components/case-list/CaseList.d.ts

@@ -1,18 +1,11 @@
 import '../../css/caseList.css';
 import '../../css/caseSearch.css';
-import { IFacetResponse } from '@rh-support/types/shared';
-import { ISolrResponseToPivotFields } from '@rh-support/utils';
 import React from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import { ICasesRouteURLParams } from '..';
-import { IFacetPivot } from '../../models/caseList';
 interface IProps {
     routeProps: RouteComponentProps<ICasesRouteURLParams>;
 }
-export interface IProductVersionPivotMap extends IFacetResponse {
-    case_version: IFacetResponse[];
-}
-export type IPivotValues = ISolrResponseToPivotFields<IFacetPivot, IProductVersionPivotMap>;
 export interface IChipsNameSsoMap {
     [sso: string]: IChipsNameSso;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"CaseList.d.ts","sourceRoot":"","sources":["../../../../src/components/case-list/CaseList.tsx"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,CAAC;AAChC,OAAO,0BAA0B,CAAC;AA6BlC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAKH,0BAA0B,EAI7B,MAAM,mBAAmB,CAAC;AAK3B,OAAO,KAAkD,MAAM,OAAO,CAAC;AAEvE,OAAO,EAAE,mBAAmB,EAAe,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAK1C,OAAO,EAAgB,WAAW,EAA2B,MAAM,uBAAuB,CAAC;AAmC3F,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,uBAAwB,SAAQ,cAAc;IAC3D,YAAY,EAAE,cAAc,EAAE,CAAC;CAClC;AAED,MAAM,MAAM,YAAY,GAAG,0BAA0B,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;AAM5F,MAAM,WAAW,gBAAgB;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;CAChC;AAED,MAAM,WAAW,aAAa;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,qBAygBrC"}
+{"version":3,"file":"CaseList.d.ts","sourceRoot":"","sources":["../../../../src/components/case-list/CaseList.tsx"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,CAAC;AAChC,OAAO,0BAA0B,CAAC;AAuClC,OAAO,KAAkD,MAAM,OAAO,CAAC;AAGvE,OAAO,EAAE,mBAAmB,EAAe,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAqC1C,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;CACzD;AAMD,MAAM,WAAW,gBAAgB;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;CAChC;AAED,MAAM,WAAW,aAAa;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,qBA8jBrC"}

package/lib/esm/components/case-list/CaseList.js

@@ -9,23 +9,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import '../../css/caseList.css';
 import '../../css/caseSearch.css';
+import { useApolloClient } from '@apollo/client/react';
 import { Alert, AlertActionCloseButton, AlertVariant, Button } from '@patternfly/react-core';
 import OpenDrawerRightIcon from '@patternfly/react-icons/dist/js/icons/open-drawer-right-icon';
-import { ErrorBoundary, ToastNotification, useBreakpoint, useDocumentTitle, useForceUpdate, usePrevious, } from '@rh-support/components';
-import { CSSUserModal, fetchAllStatuses, fetchCaseGroupsForAccount, fetchCaseGroupsForSSO, fetchCaseSeverities, fetchCaseTypes, fetchProducts, GlobalMetadataDispatchContext, GlobalMetadataStateContext, setUserPreferences, updateCaseListTraditionalSupportAgreed, updateUserPreferences, useGlobalDispatchContext, UserPreferencesKeys, } from '@rh-support/react-context';
-import { getStringifiedParams, getUrlParsedParams, haventLoadedMetadata, haventLoadedProductsMetadata, pendoTrackEvent, solrResponseToFacetFields, solrResponseToPivotFields, } from '@rh-support/utils';
-import get from 'lodash/get';
+import { ErrorBoundary, ToastNotification, useBreakpoint, useDocumentTitle, useForceUpdate, } from '@rh-support/components';
+import { CSSUserModal, fetchAllStatuses, fetchCaseGroupsForAccount, fetchCaseGroupsForSSO, fetchCaseRecordTypes, fetchCaseSeverities, fetchCaseTypes, fetchProducts, GlobalMetadataDispatchContext, GlobalMetadataStateContext, setUserPreferences, updateCaseListTraditionalSupportAgreed, updateUserPreferences, useGlobalDispatchContext, UserPreferencesKeys, } from '@rh-support/react-context';
+import { getStringifiedParams, getUrlParsedParams, haventLoadedMetadata, haventLoadedProductsMetadata, pendoTrackEvent, } from '@rh-support/utils';
 import isEmpty from 'lodash/isEmpty';
-import mapValues from 'lodash/mapValues';
 import some from 'lodash/some';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
+import { useInView } from 'react-intersection-observer';
 import { useLocation } from 'react-router-dom';
 import { CaseSearchQueryType } from '../../enums/caseSearch';
-import { SolrPivotKeys } from '../../enums/filters';
 import { PageTitle } from '../../enums/pageTitle';
 import { useFilterStateOnLoad } from '../../hooks/useFilterStateOnLoad';
-import { getCaseList } from '../../utils/caseListUtils';
+import { clearPageCursors, getCaseListFromGraphQL, loadMoreCases, } from '../../utils/caseListGraphQLUtils';
 import { createFilterStateFromUrlQuery, createURLQueryFromFilterState, FILTER_URL_CURRENT_PAGE_SEARCH_PARAM, FILTER_URL_PAGE_SIZE_SEARCH_PARAM, FILTER_URL_QUERY_SEARCH_PARAM, FILTER_URL_QUERY_TYPE, } from '../../utils/caseSearchUtils';
 import { UpdatedCaseDataEvent } from '../../utils/constants';
 import { NewCaseButton } from '../case/NewCaseButton';
@@ -34,27 +33,27 @@ import { CaseListFilters } from './case-list-filters/CaseListFilters';
 import { CaseListTable } from './case-list-table/CaseListTable';
 import { CaseSearch } from './case-search/CaseSearch';
 import { useCaseListDispatchContext, useCaseListStateContext } from './CaseListContext';
-import { CaseListFilterDispatchContext, CaseListFilterStateContext, initialCaseFilterState, } from './CaseListFilterContext';
-import { eligibleSFDCFiltersMultipleValues, isNoFilterApplied, isOnlyDefaultFilterApplied, } from './CaseListFilterHelpers';
+import { CaseListFilterDispatchContext, CaseListFilterStateContext } from './CaseListFilterContext';
+import { isNoFilterApplied, isOnlyDefaultFilterApplied } from './CaseListFilterHelpers';
 import { updateFilterState } from './CaseListFilterReducer';
-import { setCaseList, setCurrentQuery, setFilterValuesFromFacetResponse, setIsFetching, setPivotValues, } from './CaseListReducer';
+import { appendCaseList, setCaseList, setCurrentQuery, setCursorInfo, setIsFetching, setIsLoadingMore, setLoadMoreError, } from './CaseListReducer';
 export function CaseList(props) {
     var _a, _b;
     const { t } = useTranslation();
     useDocumentTitle(PageTitle.CASE_LIST);
     const dispatchToGlobalMetadataReducer = useContext(GlobalMetadataDispatchContext);
-    const { caseList, pivotValues, isFetching, filterValuesFromFacetResponse, currentQuery } = useCaseListStateContext();
+    const { caseList, isFetching, isLoadingMore, hasNextPage, endCursor, currentQuery, loadMoreError, loadMoreRetryCount, } = useCaseListStateContext();
     const CaseListDispatch = useCaseListDispatchContext();
     const breakPoint = useBreakpoint();
-    const { globalMetadataState, globalMetadataState: { caseGroups, loggedInUserJwtToken, loggedInUserRights, loggedInUsersAccount, userPreferences, managedAccounts, bookmarkedAccounts, allCaseTypes, allCaseSeverities, allCaseStatuses, allProducts, caseListTraditionalSupportAgreed, }, } = useContext(GlobalMetadataStateContext);
+    const { globalMetadataState, globalMetadataState: { caseGroups, loggedInUserJwtToken, loggedInUserRights, loggedInUsersAccount, userPreferences, managedAccounts, bookmarkedAccounts, allCaseTypes, allCaseSeverities, allCaseStatuses, allProducts, caseRecordTypes, caseListTraditionalSupportAgreed, }, } = useContext(GlobalMetadataStateContext);
     const globalDispatchContext = useGlobalDispatchContext();
+    const apolloClient = useApolloClient();
     const location = useLocation();
     const searchParams = getUrlParsedParams(location.search);
     const queryFromUrl = searchParams[FILTER_URL_QUERY_SEARCH_PARAM];
-    const pageSizeFromUrl = parseInt(searchParams[FILTER_URL_PAGE_SIZE_SEARCH_PARAM]);
-    const currentPageFromUrl = parseInt(searchParams[FILTER_URL_CURRENT_PAGE_SEARCH_PARAM]);
     const searchType = searchParams[FILTER_URL_QUERY_TYPE];
     const abortControllerRef = useRef(undefined);
+    const lastPushedQueryRef = useRef('');
     const isXLScreen = breakPoint.xl;
     const isFirstMount = useRef(true);
     const filterSectionRef = useRef(null);
@@ -63,71 +62,143 @@ export function CaseList(props) {
     const forceUpdate = useForceUpdate();
     const isCaseListFilterPanelExanded = userPreferences.data.isCaseListFilterPanelExanded;
     const useFilterStateInit = useFilterStateOnLoad();
-    const isBasicSearchMode = filterState.filterQueryInfo.type === CaseSearchQueryType.BASIC ||
-        (filterState.filterQueryInfo.type === CaseSearchQueryType.ADVANCED && loggedInUserRights.data.isExternal());
-    const prevSearchType = usePrevious(filterState.filterQueryInfo.type);
-    let isSearchTypeChanged = filterState.filterQueryInfo.type !== prevSearchType;
     const [hasError, setHasError] = useState(null);
-    const [isSolrSearchDown, setSolrSearchDown] = useState(false);
     const [defaultSavedSearchName, setDefaultSavedSearchName] = useState('');
     const [RHCDValue, setRHCDValue] = useState('');
     const [isRHCDAlertShown, setIsRHCDAlertShown] = useState(true);
+    const loadMoreLockRef = useRef(false);
+    const sentinelElRef = useRef(null);
+    const prefetchRef = useRef({
+        cursor: '',
+        data: null,
+        loading: false,
+    });
+    const { ref: inViewRef, inView } = useInView();
+    const sentinelRef = React.useCallback((node) => {
+        sentinelElRef.current = node || null;
+        inViewRef(node);
+    }, [inViewRef]);
+    function startPrefetch(cursor) {
+        if (!cursor || prefetchRef.current.cursor === cursor)
+            return;
+        prefetchRef.current = { cursor, data: null, loading: true };
+        loadMoreCases(filterState, apolloClient, cursor)
+            .then((result) => {
+            if (prefetchRef.current.cursor === cursor) {
+                prefetchRef.current = { cursor, data: result, loading: false };
+            }
+        })
+            .catch(() => {
+            if (prefetchRef.current.cursor === cursor) {
+                prefetchRef.current = { cursor: '', data: null, loading: false };
+            }
+        });
+    }
+    useEffect(() => {
+        let ticking = false;
+        const onScroll = () => {
+            if (ticking)
+                return;
+            ticking = true;
+            requestAnimationFrame(() => {
+                ticking = false;
+                if (!sentinelElRef.current)
+                    return;
+                const rect = sentinelElRef.current.getBoundingClientRect();
+                if (rect.top <= window.innerHeight + 600) {
+                    loadMore();
+                }
+            });
+        };
+        window.addEventListener('scroll', onScroll, true);
+        return () => window.removeEventListener('scroll', onScroll, true);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [hasNextPage, isLoadingMore, loadMoreError, endCursor]);
+    useEffect(() => {
+        if (inView && hasNextPage && !isLoadingMore && !loadMoreError) {
+            loadMore();
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [inView, hasNextPage, isLoadingMore, loadMoreError]);
     function getCases(currentFilterState) {
         return __awaiter(this, void 0, void 0, function* () {
-            let showError;
+            var _a;
             try {
-                setIsFetching(CaseListDispatch, true);
-                setHasError(false);
-                if (abortControllerRef.current !== undefined) {
-                    // Cancel the previous request
+                if (abortControllerRef.current) {
                     abortControllerRef.current.abort();
                 }
-                // recreate a new AbortController for each call
-                let controller = new AbortController();
+                const controller = new AbortController();
                 abortControllerRef.current = controller;
-                const { caseListResponse, isSolrSearchDownSFDCUp, showErrorMessage } = yield getCaseList(currentFilterState, loggedInUserRights.data, loggedInUsersAccount.data, controller.signal);
-                showError = showErrorMessage;
-                setSolrSearchDown(isSolrSearchDownSFDCUp);
-                setFilterValuesFromFacetResponse(CaseListDispatch, solrResponseToFacetFields(caseListResponse));
-                setPivotValues(CaseListDispatch, solrResponseToPivotFields(caseListResponse));
-                setCaseList(CaseListDispatch, caseListResponse.response);
+                setIsFetching(CaseListDispatch, true);
+                setHasError(false);
+                prefetchRef.current = { cursor: '', data: null, loading: false };
+                const result = yield getCaseListFromGraphQL(currentFilterState, apolloClient, undefined, controller.signal);
+                if (controller.signal.aborted) {
+                    return;
+                }
+                setCaseList(CaseListDispatch, result.caseListResponse.response);
+                setCursorInfo(CaseListDispatch, result.hasNextPage, result.endCursor);
                 setIsFetching(CaseListDispatch, false);
+                if (result.hasNextPage && result.endCursor) {
+                    startPrefetch(result.endCursor);
+                }
+                if (result.showErrorMessage) {
+                    setHasError(true);
+                    ToastNotification.addDangerMessage(t('There was an error loading case data. Please try again.'));
+                }
             }
             catch (err) {
-                const isAbortError = err.message && err.message.toLowerCase().indexOf('abort') > -1;
-                if (!isAbortError) {
-                    setIsFetching(CaseListDispatch, false);
-                    setHasError(true);
-                    showError && ToastNotification.addXHRErrorMessage(err);
+                if ((err === null || err === void 0 ? void 0 : err.name) === 'AbortError' || ((_a = err === null || err === void 0 ? void 0 : err.message) === null || _a === void 0 ? void 0 : _a.includes('aborted'))) {
+                    return;
                 }
+                setIsFetching(CaseListDispatch, false);
+                setHasError(true);
+                ToastNotification.addXHRErrorMessage(err);
             }
         });
     }
+    function loadMore() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (loadMoreLockRef.current || isLoadingMore || !hasNextPage || !endCursor || loadMoreError)
+                return;
+            loadMoreLockRef.current = true;
+            setIsLoadingMore(CaseListDispatch, true);
+            try {
+                let result;
+                const pf = prefetchRef.current;
+                if (pf.cursor === endCursor && pf.data) {
+                    result = pf.data;
+                    prefetchRef.current = { cursor: '', data: null, loading: false };
+                }
+                else {
+                    prefetchRef.current = { cursor: '', data: null, loading: false };
+                    result = yield loadMoreCases(filterState, apolloClient, endCursor);
+                }
+                setLoadMoreError(CaseListDispatch, false, 0);
+                appendCaseList(CaseListDispatch, result.docs, result.hasNextPage, result.endCursor);
+                if (result.hasNextPage && result.endCursor) {
+                    startPrefetch(result.endCursor);
+                }
+            }
+            catch (err) {
+                const nextRetryCount = loadMoreRetryCount + 1;
+                setLoadMoreError(CaseListDispatch, true, nextRetryCount);
+                console.error('[CaseList] loadMore error:', err);
+            }
+            finally {
+                loadMoreLockRef.current = false;
+            }
+        });
+    }
+    function retryLoadMore() {
+        setLoadMoreError(CaseListDispatch, false, loadMoreRetryCount);
+    }
     const toggleFilterSection = (isExpanded) => {
         if (!filterSectionRef.current)
             return;
         filterSectionRef.current.expanded = isExpanded;
         forceUpdate();
     };
-    function saveFilterQueryInUserPreferences() {
-        if (isNoFilterApplied(filterState))
-            return;
-        const type = filterState.filterQueryInfo.type;
-        const recentSerach = {
-            filterState: type === CaseSearchQueryType.BASIC ? filterState.filterInfo : {},
-            sortState: filterState.sortInfo,
-            queryString: type === CaseSearchQueryType.BASIC
-                ? filterState.filterQueryInfo.queryString
-                : filterState.filterQueryInfo.parsedQuery,
-            type,
-        };
-        try {
-            updateUserPreferences(dispatchToGlobalMetadataReducer, loggedInUserRights.data.getSSOUsername(), [{ key: UserPreferencesKeys.mostRecentSearch, value: JSON.stringify(recentSerach) }], 'add');
-        }
-        catch (e) {
-            console.error('Could not save filter query in user preferences');
-        }
-    }
     const onToggleFilterBtnClick = () => {
         var _a, _b;
         toggleFilterSection(!((_a = filterSectionRef.current) === null || _a === void 0 ? void 0 : _a.expanded));
@@ -137,8 +208,7 @@ export function CaseList(props) {
     };
     const checkNewCases = () => __awaiter(this, void 0, void 0, function* () {
         try {
-            const { caseListResponse, isSolrSearchDownSFDCUp } = yield getCaseList(filterState, loggedInUserRights.data, loggedInUsersAccount.data, null);
-            setSolrSearchDown(isSolrSearchDownSFDCUp);
+            const { caseListResponse } = yield getCaseListFromGraphQL(filterState, apolloClient);
             let changed = false;
             if (caseListResponse.response.numFound <= filterState.paginationInfo.pageSize &&
                 caseListResponse.response.numFound !== caseList.numFound) {
@@ -180,67 +250,84 @@ export function CaseList(props) {
         }
     }, [caseGroups, dispatchToGlobalMetadataReducer, loggedInUserJwtToken, loggedInUsersAccount.data]);
     useEffect(() => {
-        if (haventLoadedMetadata(allCaseTypes)) {
-            fetchCaseTypes(dispatchToGlobalMetadataReducer, loggedInUsersAccount.data.secureSupport);
-        }
-        // when solr is down, we use hydra metadata api to populated filter dropdowns
-        if (isSolrSearchDown) {
+        const loadMetadata = () => __awaiter(this, void 0, void 0, function* () {
+            if (haventLoadedMetadata(caseRecordTypes)) {
+                yield fetchCaseRecordTypes(dispatchToGlobalMetadataReducer, apolloClient);
+            }
+            if (haventLoadedMetadata(allCaseTypes)) {
+                fetchCaseTypes(dispatchToGlobalMetadataReducer, apolloClient);
+            }
             if (haventLoadedMetadata(allCaseSeverities)) {
-                fetchCaseSeverities(dispatchToGlobalMetadataReducer, loggedInUsersAccount.data.secureSupport);
+                fetchCaseSeverities(dispatchToGlobalMetadataReducer, apolloClient);
             }
             if (haventLoadedMetadata(allCaseStatuses)) {
-                fetchAllStatuses(dispatchToGlobalMetadataReducer, loggedInUsersAccount.data.secureSupport);
+                fetchAllStatuses(dispatchToGlobalMetadataReducer, apolloClient);
             }
             if (haventLoadedProductsMetadata(allProducts)) {
-                fetchProducts(dispatchToGlobalMetadataReducer);
+                fetchProducts(dispatchToGlobalMetadataReducer, apolloClient);
             }
-            // on sfdc fields that only one value is allowed, set filter to first item
-            const sfdcFilterState = mapValues(filterState.filterInfo, (value, key) => {
-                //@ts-ignore
-                if (eligibleSFDCFiltersMultipleValues.includes(key))
-                    return value;
-                return value[0] ? [value[0]] : [];
-            });
-            updateFilterState(filterDispatch, {
-                //@ts-ignore
-                filterInfo: Object.assign(Object.assign({}, initialCaseFilterState.filterInfo), sfdcFilterState),
-            });
-        }
+        });
+        loadMetadata();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         allCaseTypes,
         allCaseSeverities,
         allCaseStatuses,
         allProducts,
+        caseRecordTypes,
         dispatchToGlobalMetadataReducer,
-        loggedInUsersAccount.data.secureSupport,
-        isSolrSearchDown,
+        apolloClient,
     ]);
+    function saveFilterQueryInUserPreferences() {
+        if (isNoFilterApplied(filterState))
+            return;
+        const type = filterState.filterQueryInfo.type;
+        const recentSearch = {
+            filterState: type === CaseSearchQueryType.BASIC ? filterState.filterInfo : {},
+            sortState: filterState.sortInfo,
+            queryString: type === CaseSearchQueryType.BASIC
+                ? filterState.filterQueryInfo.queryString
+                : filterState.filterQueryInfo.parsedQuery,
+            type,
+        };
+        try {
+            updateUserPreferences(dispatchToGlobalMetadataReducer, loggedInUserRights.data.getSSOUsername(), [{ key: UserPreferencesKeys.mostRecentSearch, value: JSON.stringify(recentSearch) }], 'add');
+        }
+        catch (e) {
+            console.error('Could not save filter query in user preferences');
+        }
+    }
     // effect to update url query and call get case api whenever filter state changes
     useEffect(() => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (!isFirstMount.current) {
             const urlQuery = (isNoFilterApplied(filterState) || isOnlyDefaultFilterApplied(filterState)) &&
                 !((_a = filterState.filterQueryInfo) === null || _a === void 0 ? void 0 : _a.queryString) &&
                 !filterState.sortInfo.column
                 ? ''
                 : createURLQueryFromFilterState(filterState);
+            const paginationKey = `p${(_b = filterState.paginationInfo) === null || _b === void 0 ? void 0 : _b.currentPage}_s${(_c = filterState.paginationInfo) === null || _c === void 0 ? void 0 : _c.pageSize}`;
+            const advanceSearchKey = [
+                ((_d = filterState.filterQueryInfo) === null || _d === void 0 ? void 0 : _d.parsedQuery) || '',
+                JSON.stringify(filterState.advanceSearchDateRanges || null),
+            ].join('|');
+            const fullQueryKey = `${urlQuery}_${paginationKey}_${advanceSearchKey}`;
+            if (fullQueryKey === lastPushedQueryRef.current) {
+                return;
+            }
+            if (urlQuery !== lastPushedQueryRef.current) {
+                clearPageCursors();
+            }
             setCurrentQuery(CaseListDispatch, urlQuery);
+            lastPushedQueryRef.current = urlQuery;
             searchParams[FILTER_URL_QUERY_SEARCH_PARAM] = encodeURIComponent(urlQuery);
-            searchParams[FILTER_URL_CURRENT_PAGE_SEARCH_PARAM] = (_b = filterState.paginationInfo) === null || _b === void 0 ? void 0 : _b.currentPage.toString();
-            searchParams[FILTER_URL_PAGE_SIZE_SEARCH_PARAM] = (_c = filterState.paginationInfo) === null || _c === void 0 ? void 0 : _c.pageSize.toString();
             searchParams[FILTER_URL_QUERY_TYPE] = filterState.filterQueryInfo.type;
+            delete searchParams[FILTER_URL_CURRENT_PAGE_SEARCH_PARAM];
+            delete searchParams[FILTER_URL_PAGE_SIZE_SEARCH_PARAM];
             props.routeProps.history.push({
                 search: getStringifiedParams(searchParams),
             });
             saveFilterQueryInUserPreferences();
-            // so that we don't call get cases every time user switches between basic and advanced without any filters applied
-            if (isSearchTypeChanged &&
-                !filterState.filterQueryInfo.queryString &&
-                isNoFilterApplied(filterState) &&
-                filterValuesFromFacetResponse // if this is null, it means it is the first page load so get cases anyway
-            )
-                return;
             getCases(filterState);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -250,12 +337,14 @@ export function CaseList(props) {
         if (bookmarkedAccounts.isFetching ||
             managedAccounts.isFetching ||
             caseGroups.isFetching ||
-            caseGroups.data === undefined)
+            caseGroups.data === undefined ||
+            caseRecordTypes.isFetching ||
+            isEmpty(caseRecordTypes.data))
             return;
         // when user manually changes url and hit enter, new result is fetched without refreshing the page
         if (!isFirstMount.current) {
-            if (queryFromUrl !== currentQuery) {
-                const filterStateFromQueryUrl = createFilterStateFromUrlQuery(queryFromUrl, globalMetadataState, pageSizeFromUrl, currentPageFromUrl, searchType);
+            if (queryFromUrl !== currentQuery && queryFromUrl !== lastPushedQueryRef.current) {
+                const filterStateFromQueryUrl = createFilterStateFromUrlQuery(queryFromUrl, globalMetadataState, undefined, 1, searchType);
                 updateFilterState(filterDispatch, filterStateFromQueryUrl);
             }
             return;
@@ -268,8 +357,6 @@ export function CaseList(props) {
             if (currentQuery) {
                 const navObj = {
                     [FILTER_URL_QUERY_SEARCH_PARAM]: encodeURIComponent(currentQuery),
-                    [FILTER_URL_PAGE_SIZE_SEARCH_PARAM]: filterState.paginationInfo.pageSize,
-                    [FILTER_URL_CURRENT_PAGE_SEARCH_PARAM]: filterState.paginationInfo.currentPage,
                     [FILTER_URL_QUERY_TYPE]: filterState.filterQueryInfo.type,
                 };
                 props.routeProps.history.replace({ search: getStringifiedParams(navObj) });
@@ -283,7 +370,10 @@ export function CaseList(props) {
                 setRHCDValue(searchParams.rhcd);
             }
             // set filter state based on url or default saved search
-            const { initFilterState, defaultSearchName } = useFilterStateInit.set(decodeURIComponent(queryFromUrl), pageSizeFromUrl, currentPageFromUrl, searchType);
+            // Remove when we get OFFSET field from SCT
+            // Always reset to page 1 on fresh load — cursor-based pagination
+            // has no stored cursors after refresh, so page > 1 would cause a mismatch
+            const { initFilterState, defaultSearchName } = useFilterStateInit.set(decodeURIComponent(queryFromUrl), undefined, 1, searchType);
             // to set default saved search name
             setDefaultSavedSearchName(defaultSearchName);
             // set default params when they are empty
@@ -296,14 +386,12 @@ export function CaseList(props) {
             updateFilterState(filterDispatch, initFilterState);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [managedAccounts, bookmarkedAccounts, caseGroups, queryFromUrl, pageSizeFromUrl, currentPageFromUrl]);
-    // effect to initially set the filter state to expanded and when we switch from advanced to basic mode
+    }, [managedAccounts, bookmarkedAccounts, caseGroups, caseRecordTypes, queryFromUrl]);
+    // effect to initially set the filter state to expanded on load
     useEffect(() => {
-        // currently there is no easy way to set the panel as expanded on initial load
-        // also we only use the standalone panel and manually change the panel state on toggle btn click
-        isCaseListFilterPanelExanded && isXLScreen && isBasicSearchMode && toggleFilterSection(true);
+        isCaseListFilterPanelExanded && isXLScreen && toggleFilterSection(true);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [isBasicSearchMode]);
+    }, []);
     const onConfirmTraditionalSupportAgreement = () => {
         updateCaseListTraditionalSupportAgreed(globalDispatchContext, true);
     };
@@ -329,12 +417,6 @@ export function CaseList(props) {
     return (React.createElement(React.Fragment, null,
         React.createElement(CSSUserModal, { onConfirmTraditionalSupportAgreement: onConfirmTraditionalSupportAgreement, display: !caseListTraditionalSupportAgreed }),
         React.createElement("article", { id: "rh-support-cases", className: "cases-main" },
-            isSolrSearchDown && (React.createElement(Alert, { isInline: true, variant: AlertVariant.warning, component: "p", title: React.createElement(Trans, null,
-                    "Case search is working with limited functionality. Please check",
-                    ' ',
-                    React.createElement("a", { href: "https://status.redhat.com", target: "_blank", rel: "noreferrer", "data-tracking-id": "caselist-redirect-status-page" }, "status page"),
-                    ' ',
-                    "for details.") })),
             React.createElement("section", { className: "case-search-top" },
                 !isEmpty(RHCDValue) && isRHCDAlertShown && React.createElement("div", { className: "push-bottom" }, displayRHCDAlert()),
                 React.createElement("div", { className: "search-wrapper" },
@@ -342,17 +424,17 @@ export function CaseList(props) {
                         React.createElement(NewCaseButton, { routeProps: props.routeProps })),
                     React.createElement(ErrorBoundary, { errorMsgInfo: { message: t('There was an error loading case search input') } },
                         React.createElement(CaseSearch, { defaultSavedSearchName: defaultSavedSearchName }))),
-                isBasicSearchMode && (React.createElement(ErrorBoundary, { errorMsgInfo: { message: t('There was an error loading filter chips') } },
-                    React.createElement(CaseListFilterChips, { productVersionPivotValues: get(pivotValues, SolrPivotKeys.product_version, []), isSolrSearchDown: isSolrSearchDown })))),
+                React.createElement(ErrorBoundary, { errorMsgInfo: { message: t('There was an error loading filter chips') } },
+                    React.createElement(CaseListFilterChips, null))),
             React.createElement("section", { className: "case-search-bottom" },
-                isBasicSearchMode && (React.createElement("aside", { className: `case-search-filters ${((_a = filterSectionRef.current) === null || _a === void 0 ? void 0 : _a.expanded) ? '' : 'collapsed'}` },
+                React.createElement("aside", { className: `case-search-filters ${((_a = filterSectionRef.current) === null || _a === void 0 ? void 0 : _a.expanded) ? '' : 'collapsed'}` },
                     React.createElement("h2", { className: "filter-header pf-v6-u-display-flex" }, ((_b = filterSectionRef.current) === null || _b === void 0 ? void 0 : _b.expanded) ? (React.createElement(React.Fragment, null,
                         React.createElement(Button, { isInline: true, className: "pf-v6-u-flex-shrink-0 pf-v6-u-flex-none case-search-filter-text-button", variant: "link", title: t('Collapse filter section'), "data-tracking-id": "collapse-case-list-filter", onClick: onToggleFilterBtnClick, iconPosition: "right", icon: React.createElement(OpenDrawerRightIcon, { className: "mirrored" }) },
                             React.createElement(Trans, null, "Filters")))) : (React.createElement(Button, { isInline: true, className: "pf-v6-c-button pf-m-link pf-m-inline pf-v6-u-flex-shrink-0 pf-v6-u-flex-none pf-v6-u-display-flex pf-v6-u-align-items-center pf-v6-u-justify-content-center pf-v6-u-px-lg", variant: "link", title: t('Expand filter section'), "data-tracking-id": "expand-case-list-filter", onClick: onToggleFilterBtnClick, iconPosition: "right", icon: React.createElement(OpenDrawerRightIcon, null) }, isXLScreen ? null : React.createElement(Trans, null, "Filters")))),
                     React.createElement("div", { className: "filter-wrapper" },
                         React.createElement("pfe-collapse-panel", { id: "case-filters-panel", "pfe-animation": "false", ref: filterSectionRef },
                             React.createElement(ErrorBoundary, { errorMsgInfo: { message: t('There was an error loading filters') } },
-                                React.createElement(CaseListFilters, { filterValues: filterValuesFromFacetResponse, allCaseTypes: allCaseTypes, allCaseStatuses: allCaseStatuses, allCaseSeverities: allCaseSeverities, allProducts: allProducts, isSolrSearchDown: isSolrSearchDown })))))),
+                                React.createElement(CaseListFilters, { allCaseTypes: allCaseTypes, allCaseStatuses: allCaseStatuses, allCaseSeverities: allCaseSeverities, allProducts: allProducts }))))),
                 React.createElement("section", { className: "case-search-table pf-v6-u-display-flex pf-v6-u-flex-direction-column" },
-                    React.createElement(CaseListTable, { caseList: caseList, caseGroups: caseGroups.data || [], loggedInUserRights: loggedInUserRights.data, sortInfo: filterState.sortInfo, paginationInfo: filterState.paginationInfo, isCaseListPageLoading: isFetching, hasError: hasError, isSolrDown: isSolrSearchDown }))))));
+                    React.createElement(CaseListTable, { caseList: caseList, caseGroups: caseGroups.data || [], loggedInUserRights: loggedInUserRights.data, sortInfo: filterState.sortInfo, isCaseListPageLoading: isFetching, hasError: hasError, hasNextPage: hasNextPage, isLoadingMore: isLoadingMore, loadMoreError: loadMoreError, loadMoreRetryCount: loadMoreRetryCount, onRetryLoadMore: retryLoadMore, sentinelRef: sentinelRef }))))));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"CaseListContext.d.ts","sourceRoot":"","sources":["../../../../src/components/case-list/CaseListContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAE1C,OAAO,EAAE,oBAAoB,EAAmB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAE1F,eAAO,MAAM,oBAAoB,EAAE,cAWlC,CAAC;AAIF,QAAA,MAAM,oBAAoB,+BAA4C,CAAC;AAEvE,QAAA,MAAM,uBAAuB,qCAAmE,CAAC;AAEjG,QAAA,MAAM,uBAAuB,sBAAyC,CAAC;AACvE,QAAA,MAAM,0BAA0B,4BAA4C,CAAC;AAE7E,iBAAS,gBAAgB,CAAC,EAAE,QAAQ,EAAE;;CAAA,qBAOrC;AAED,OAAO,EACH,oBAAoB,EACpB,uBAAuB,EACvB,gBAAgB,EAChB,uBAAuB,EACvB,0BAA0B,GAC7B,CAAC"}
+{"version":3,"file":"CaseListContext.d.ts","sourceRoot":"","sources":["../../../../src/components/case-list/CaseListContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAE1C,OAAO,EAAE,oBAAoB,EAAmB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAE1F,eAAO,MAAM,oBAAoB,EAAE,cAclC,CAAC;AAIF,QAAA,MAAM,oBAAoB,+BAA4C,CAAC;AAEvE,QAAA,MAAM,uBAAuB,qCAAmE,CAAC;AAEjG,QAAA,MAAM,uBAAuB,sBAAyC,CAAC;AACvE,QAAA,MAAM,0BAA0B,4BAA4C,CAAC;AAE7E,iBAAS,gBAAgB,CAAC,EAAE,QAAQ,EAAE;;CAAA,qBAOrC;AAED,OAAO,EACH,oBAAoB,EACpB,uBAAuB,EACvB,gBAAgB,EAChB,uBAAuB,EACvB,0BAA0B,GAC7B,CAAC"}

package/lib/esm/components/case-list/CaseListContext.js

@@ -7,9 +7,12 @@ export const initialCaseListState = {
         start: 0,
     },
     isFetching: false,
+    isLoadingMore: false,
+    hasNextPage: false,
+    endCursor: undefined,
+    loadMoreError: false,
+    loadMoreRetryCount: 0,
     chipsNameSsoMap: {},
-    filterValuesFromFacetResponse: null,
-    pivotValues: null,
     currentQuery: undefined,
 };
 const initalDispatchContext = null;

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

@@ -1 +1 @@
-{"version":3,"file":"CaseListFilterContext.d.ts","sourceRoot":"","sources":["../../../../src/components/case-list/CaseListFilterContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EACH,0BAA0B,EAE1B,oBAAoB,EAGpB,eAAe,EACf,SAAS,EACZ,MAAM,yBAAyB,CAAC;AAEjC,QAAA,MAAM,qBAAqB,EAAE,eAG5B,CAAC;AAEF,QAAA,MAAM,eAAe,EAAE,SAGtB,CAAC;AAQF,eAAO,MAAM,sBAAsB,EAAE,oBAKpC,CAAC;AAIF,QAAA,MAAM,0BAA0B,qCAA8C,CAAC;AAC/E,QAAA,MAAM,6BAA6B,2CAAyE,CAAC;AAE7G,iBAAS,sBAAsB,CAAC,EAAE,QAAQ,EAAE;;CAAA,qBAO3C;AAED,OAAO,EACH,0BAA0B,EAC1B,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,EACrB,eAAe,GAClB,CAAC"}
+{"version":3,"file":"CaseListFilterContext.d.ts","sourceRoot":"","sources":["../../../../src/components/case-list/CaseListFilterContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EACH,0BAA0B,EAE1B,oBAAoB,EAGpB,eAAe,EACf,SAAS,EACZ,MAAM,yBAAyB,CAAC;AAIjC,QAAA,MAAM,qBAAqB,EAAE,eAG5B,CAAC;AAEF,QAAA,MAAM,eAAe,EAAE,SAGtB,CAAC;AAQF,eAAO,MAAM,sBAAsB,EAAE,oBAKpC,CAAC;AAIF,QAAA,MAAM,0BAA0B,qCAA8C,CAAC;AAC/E,QAAA,MAAM,6BAA6B,2CAAyE,CAAC;AAE7G,iBAAS,sBAAsB,CAAC,EAAE,QAAQ,EAAE;;CAAA,qBAO3C;AAED,OAAO,EACH,0BAA0B,EAC1B,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,EACrB,eAAe,GAClB,CAAC"}

package/lib/esm/components/case-list/CaseListFilterContext.js

@@ -1,8 +1,9 @@
 import React from 'react';
 import { CaseSearchQueryType } from '../../enums/caseSearch';
 import { caseListFilterReducer, initialFilterInfo, } from './CaseListFilterReducer';
+const SMALL_SCREEN_THRESHOLD = 900;
 const initialPaginationInfo = {
-    pageSize: 10,
+    pageSize: typeof window !== 'undefined' && window.innerHeight < SMALL_SCREEN_THRESHOLD ? 10 : 20,
     currentPage: 1,
 };
 const initialSortInfo = {

package/lib/esm/components/case-list/CaseListFilterHelpers.d.ts

@@ -1,7 +1,8 @@
 import { SolrKeys, SolrPivotKeys } from '../../enums/filters';
 import { ICaseListFilterState, IFilterInfo } from './CaseListFilterReducer';
-declare function isArrayHashMapEmpty(hashMap?: {}): boolean;
+declare const hasAdvanceSearchDateRanges: (filterState: ICaseListFilterState) => boolean;
 declare const isNoFilterApplied: (filterState: ICaseListFilterState) => boolean;
+declare function isArrayHashMapEmpty(hashMap?: {}): boolean;
 declare const isOnlyDefaultFilterApplied: (filterState: ICaseListFilterState) => boolean;
 declare const isStatusFilterWithSFDCSupportedValues: ({ case_status }: Partial<IFilterInfo>) => boolean;
 declare const isOnlyGroupFilterApplied: (filterInfo: Partial<IFilterInfo>) => boolean;
@@ -11,5 +12,5 @@ declare const eligibleSFDCFiltersWithLengthOne: (SolrKeys | SolrPivotKeys)[];
 declare const eligibleSFDCFiltersMultipleValues: SolrKeys[];
 declare const visibleFilterChipsWhenSolrDownSfdcUp: (SolrKeys | SolrPivotKeys)[];
 declare function canDoSfdcSearch(filterState: ICaseListFilterState): boolean;
-export { isNoFilterApplied, isOnlyDefaultFilterApplied, isOnlyGroupFilterApplied, isSearchSupportedBySFDC, isOnlyStatusFilter, isStatusFilterWithSFDCSupportedValues, canDoSfdcSearch, visibleFilterChipsWhenSolrDownSfdcUp, eligibleSFDCFiltersWithLengthOne, eligibleSFDCFiltersMultipleValues, isArrayHashMapEmpty, };
+export { hasAdvanceSearchDateRanges, isNoFilterApplied, isOnlyDefaultFilterApplied, isOnlyGroupFilterApplied, isSearchSupportedBySFDC, isOnlyStatusFilter, isStatusFilterWithSFDCSupportedValues, canDoSfdcSearch, visibleFilterChipsWhenSolrDownSfdcUp, eligibleSFDCFiltersWithLengthOne, eligibleSFDCFiltersMultipleValues, isArrayHashMapEmpty, };
 //# sourceMappingURL=CaseListFilterHelpers.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"CaseListFilterHelpers.d.ts","sourceRoot":"","sources":["../../../../src/components/case-list/CaseListFilterHelpers.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAgB,oBAAoB,EAAE,WAAW,EAAqB,MAAM,yBAAyB,CAAC;AAW7G,iBAAS,mBAAmB,CAAC,OAAO,KAAK,WAExC;AAED,QAAA,MAAM,iBAAiB,GAAI,aAAa,oBAAoB,YAE3D,CAAC;AAEF,QAAA,MAAM,0BAA0B,GAAI,aAAa,oBAAoB,YAEpE,CAAC;AAEF,QAAA,MAAM,qCAAqC,GAAI,iBAAsB,OAAO,CAAC,WAAW,CAAC,YAGxF,CAAC;AAaF,QAAA,MAAM,wBAAwB,GAAI,YAAY,OAAO,CAAC,WAAW,CAAC,YAMjE,CAAC;AAEF,QAAA,MAAM,kBAAkB,GAAI,YAAY,OAAO,CAAC,WAAW,CAAC,YAG3D,CAAC;AAEF,QAAA,MAAM,uBAAuB,GAAI,aAAa,oBAAoB,YAOjE,CAAC;AAEF,QAAA,MAAM,gCAAgC,8BAAsE,CAAC;AAC7G,QAAA,MAAM,iCAAiC,YAAmB,CAAC;AAE3D,QAAA,MAAM,oCAAoC,8BAGzC,CAAC;AAIF,iBAAS,eAAe,CAAC,WAAW,EAAE,oBAAoB,WAiBzD;AAED,OAAO,EACH,iBAAiB,EACjB,0BAA0B,EAC1B,wBAAwB,EACxB,uBAAuB,EACvB,kBAAkB,EAClB,qCAAqC,EACrC,eAAe,EACf,oCAAoC,EACpC,gCAAgC,EAChC,iCAAiC,EACjC,mBAAmB,GACtB,CAAC"}
+{"version":3,"file":"CaseListFilterHelpers.d.ts","sourceRoot":"","sources":["../../../../src/components/case-list/CaseListFilterHelpers.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAGH,oBAAoB,EACpB,WAAW,EAEd,MAAM,yBAAyB,CAAC;AAMjC,QAAA,MAAM,0BAA0B,GAAI,aAAa,oBAAoB,KAAG,OAWvE,CAAC;AAEF,QAAA,MAAM,iBAAiB,GAAI,aAAa,oBAAoB,YAE3D,CAAC;AAWF,iBAAS,mBAAmB,CAAC,OAAO,KAAK,WAExC;AAED,QAAA,MAAM,0BAA0B,GAAI,aAAa,oBAAoB,YAKpE,CAAC;AAEF,QAAA,MAAM,qCAAqC,GAAI,iBAAsB,OAAO,CAAC,WAAW,CAAC,YAGxF,CAAC;AAaF,QAAA,MAAM,wBAAwB,GAAI,YAAY,OAAO,CAAC,WAAW,CAAC,YAMjE,CAAC;AAEF,QAAA,MAAM,kBAAkB,GAAI,YAAY,OAAO,CAAC,WAAW,CAAC,YAG3D,CAAC;AAEF,QAAA,MAAM,uBAAuB,GAAI,aAAa,oBAAoB,YAOjE,CAAC;AAEF,QAAA,MAAM,gCAAgC,8BAAsE,CAAC;AAC7G,QAAA,MAAM,iCAAiC,YAAmB,CAAC;AAE3D,QAAA,MAAM,oCAAoC,8BAGzC,CAAC;AAIF,iBAAS,eAAe,CAAC,WAAW,EAAE,oBAAoB,WAiBzD;AAED,OAAO,EACH,0BAA0B,EAC1B,iBAAiB,EACjB,0BAA0B,EAC1B,wBAAwB,EACxB,uBAAuB,EACvB,kBAAkB,EAClB,qCAAqC,EACrC,eAAe,EACf,oCAAoC,EACpC,gCAAgC,EAChC,iCAAiC,EACjC,mBAAmB,GACtB,CAAC"}

package/lib/esm/components/case-list/CaseListFilterHelpers.js

@@ -14,7 +14,22 @@ import isEqual from 'lodash/isEqual';
 import sortBy from 'lodash/sortBy';
 import { CaseStatus } from '../../enums/case';
 import { SolrKeys, SolrPivotKeys } from '../../enums/filters';
-import { emptyFilters, initialFilterInfo } from './CaseListFilterReducer';
+import { emptyFilters, initialFilterInfo, } from './CaseListFilterReducer';
+function isDateRangeActive(range) {
+    return Boolean((range === null || range === void 0 ? void 0 : range.startDate) || (range === null || range === void 0 ? void 0 : range.endDate));
+}
+const hasAdvanceSearchDateRanges = (filterState) => {
+    const ranges = filterState.advanceSearchDateRanges;
+    if (!ranges) {
+        return false;
+    }
+    return (isDateRangeActive(ranges.createdDateRange) ||
+        isDateRangeActive(ranges.lastModifiedDateRange) ||
+        isDateRangeActive(ranges.closedDateRange));
+};
+const isNoFilterApplied = (filterState) => {
+    return isEqual(filterState.filterInfo, emptyFilters) && !hasAdvanceSearchDateRanges(filterState);
+};
 function sortArrayHashMap(hashMap = {}) {
     const sortedHashMap = Object.keys(hashMap).reduce((acc, currKey) => {
         const rawVal = hashMap[currKey];
@@ -26,11 +41,9 @@ function sortArrayHashMap(hashMap = {}) {
 function isArrayHashMapEmpty(hashMap = {}) {
     return Object.entries(hashMap).every(([, val]) => (val || []).length < 1);
 }
-const isNoFilterApplied = (filterState) => {
-    return isEqual(filterState.filterInfo, emptyFilters);
-};
 const isOnlyDefaultFilterApplied = (filterState) => {
-    return isEqual(sortArrayHashMap(filterState.filterInfo), sortArrayHashMap(initialFilterInfo));
+    return (isEqual(sortArrayHashMap(filterState.filterInfo), sortArrayHashMap(initialFilterInfo)) &&
+        !hasAdvanceSearchDateRanges(filterState));
 };
 const isStatusFilterWithSFDCSupportedValues = ({ case_status = [] }) => {
     const statusLength = case_status.length;
@@ -86,4 +99,4 @@ function canDoSfdcSearch(filterState) {
         }
     });
 }
-export { isNoFilterApplied, isOnlyDefaultFilterApplied, isOnlyGroupFilterApplied, isSearchSupportedBySFDC, isOnlyStatusFilter, isStatusFilterWithSFDCSupportedValues, canDoSfdcSearch, visibleFilterChipsWhenSolrDownSfdcUp, eligibleSFDCFiltersWithLengthOne, eligibleSFDCFiltersMultipleValues, isArrayHashMapEmpty, };
+export { hasAdvanceSearchDateRanges, isNoFilterApplied, isOnlyDefaultFilterApplied, isOnlyGroupFilterApplied, isSearchSupportedBySFDC, isOnlyStatusFilter, isStatusFilterWithSFDCSupportedValues, canDoSfdcSearch, visibleFilterChipsWhenSolrDownSfdcUp, eligibleSFDCFiltersWithLengthOne, eligibleSFDCFiltersMultipleValues, isArrayHashMapEmpty, };