@rh-support/cases 2.6.233 → 2.6.236

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

@@ -1,6 +1,9 @@
-import { Button } from '@patternfly/react-core';
+import { Button, Spinner } from '@patternfly/react-core';
+import { useFetch } from '@rh-support/components';
+import { GlobalMetadataStateContext } from '@rh-support/react-context';
 import React, { useContext, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
+import { getCaseListFromSolr } from '../../../utils/caseListUtils';
 import { CaseListFilterStateContext } from '../CaseListFilterContext';
 import DownloadCSVFileModal from './DownloadCSVFileModal';
 const MAX_LIMIT = 1000;
@@ -10,10 +13,14 @@ export function ExportCaseListCSV({ currentFilteredCaseList, selectedCases, isEx
     const btnToolTip = t('Export the current list of cases to CSV. Please note that exporting a large number of cases may take a while.');
     const maxLengthTooltip = t('Export the current list of cases to CSV. Please note that only the top {{limit}} cases will be exported and that it may take awhile.', { limit: MAX_LIMIT });
     const currentFilteredCaseCount = (_a = currentFilteredCaseList === null || currentFilteredCaseList === void 0 ? void 0 : currentFilteredCaseList.numFound) !== null && _a !== void 0 ? _a : 0;
+    const { isFetching } = useFetch(getCaseListFromSolr, { propgateErrors: true });
     const [openUpdateSeverityModal, setOpenUpdateSeverityModal] = useState(false);
-    const isBtnDisabled = currentFilteredCaseCount === 0;
+    const isFetchingCSVData = isFetching;
+    const isBtnDisabled = isFetchingCSVData || currentFilteredCaseCount === 0;
     let btnTitle = currentFilteredCaseCount >= MAX_LIMIT ? maxLengthTooltip : btnToolTip;
     const filterState = useContext(CaseListFilterStateContext);
+    const { globalMetadataState: { loggedInUserRights, loggedInUsersAccount }, } = useContext(GlobalMetadataStateContext);
+    // To show tooltip if export csv is disabled when SOLR is down
     const getTooltipContent = () => {
         let tooltipText = t('Export Cases');
         if (isExportCsvDisabled) {
@@ -21,12 +28,15 @@ export function ExportCaseListCSV({ currentFilteredCaseList, selectedCases, isEx
         }
         return tooltipText;
     };
+    // To check if export csv button is disabled
     const isExportButtonDisabled = isBtnDisabled || isExportCsvDisabled;
+    // To toggle download csv modal
     const toggleDownloadCSVModal = () => {
         setOpenUpdateSeverityModal((openUpdateSeverityModal) => !openUpdateSeverityModal);
     };
     return (React.createElement("span", { title: (isExportCsvDisabled && getTooltipContent()) || '' },
-        React.createElement(Button, { variant: "tertiary", onClick: toggleDownloadCSVModal, title: btnTitle, "data-tracking-id": "case-list-toolbar-export-csv", isDisabled: isExportButtonDisabled },
-            React.createElement(Trans, null, "Export CSV")),
-        React.createElement(DownloadCSVFileModal, { filterState: filterState, isDisabled: isExportButtonDisabled, onModalshow: openUpdateSeverityModal, onClose: toggleDownloadCSVModal, selectedCases: selectedCases, filteredCaseCount: currentFilteredCaseCount })));
+        React.createElement(Button, { variant: "tertiary", onClick: toggleDownloadCSVModal, title: btnTitle, "data-tracking-id": "case-list-toolbar-export-csv", isDisabled: isExportButtonDisabled }, isFetchingCSVData ? (React.createElement(React.Fragment, null,
+            React.createElement(Trans, null, "Exporting CSV"),
+            React.createElement(Spinner, { size: "md", "aria-label": "loading", className: "export-csv-loader pf-v6-u-ml-xs" }))) : (React.createElement(Trans, null, "Export CSV"))),
+        React.createElement(DownloadCSVFileModal, { filterState: filterState, loggedInUserRights: loggedInUserRights, loggedInUsersAccount: loggedInUsersAccount, isDisabled: isExportButtonDisabled, onModalshow: openUpdateSeverityModal, onClose: toggleDownloadCSVModal, selectedCases: selectedCases, filteredCaseCount: currentFilteredCaseCount })));
 }

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

@@ -12,7 +12,7 @@ export default function SeverityLabel({ sevValue }) {
                 return 'danger';
             case '2 (High)':
                 return 'warning';
-            case '3 (Medium)':
+            case '3 (Normal)':
                 return 'info';
             case '4 (Low)':
                 return 'custom';

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

@@ -1 +1 @@
-{"version":3,"file":"TableActionsDropdown.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-table/TableActionsDropdown.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAG1C,OAAO,EAAE,kBAAkB,EAAgB,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAwB,MAAM,qCAAqC,CAAC;AASlG,UAAU,MAAO,SAAQ,kBAAkB,EAAE,qBAAqB;CAAG;AAErE,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,qBAoHjD"}
+{"version":3,"file":"TableActionsDropdown.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-table/TableActionsDropdown.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAG1C,OAAO,EAAE,kBAAkB,EAAgB,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAwB,MAAM,qCAAqC,CAAC;AASlG,UAAU,MAAO,SAAQ,kBAAkB,EAAE,qBAAqB;CAAG;AAErE,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,qBA0HjD"}

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

@@ -3,7 +3,7 @@ import ExclamationCircleIcon from '@patternfly/react-icons/dist/js/icons/exclama
 import InfoCircleIcon from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
 import WarningTriangleIcon from '@patternfly/react-icons/dist/js/icons/warning-triangle-icon';
 import { SingleSelectDropdown } from '@rh-support/components';
-import { CloseCaseModal } from '@rh-support/react-context';
+import { CloseCaseModal, GlobalMetadataStateContext } from '@rh-support/react-context';
 import React, { useContext } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCloseCase } from '../../../hooks/useCloseCase';
@@ -22,6 +22,7 @@ export function TableActionsDropdown(props) {
     const currentFilteredCaseCount = (_a = currentFilteredCaseList === null || currentFilteredCaseList === void 0 ? void 0 : currentFilteredCaseList.numFound) !== null && _a !== void 0 ? _a : 0;
     const filterState = useContext(CaseListFilterStateContext);
     const { isExportButtonDisabled, openUpdateSeverityModal, showError: showExportCSVError, getTooltipContent: getExportCSVTooltipContent, toggleDownloadCSVModal, } = useExportCaseListCSV(props);
+    const { globalMetadataState: { loggedInUserRights, loggedInUsersAccount }, } = useContext(GlobalMetadataStateContext);
     const { isModalOpen, isPostingComment, showError, showWarning, getTooltipContent, onCancel, onConfirm, onBtnClick, } = useCloseCase(props);
     let closeCaseIconStatus = 'danger';
     if (showWarning) {
@@ -69,6 +70,6 @@ export function TableActionsDropdown(props) {
     };
     return (React.createElement(React.Fragment, null,
         isModalOpen && React.createElement(CloseCaseModal, { onClose: onCancel, onConfirm: onConfirm, isUpdating: !!isPostingComment }),
-        React.createElement(DownloadCSVFileModal, { filterState: filterState, isDisabled: isExportButtonDisabled, onModalshow: openUpdateSeverityModal, onClose: toggleDownloadCSVModal, selectedCases: selectedCases, filteredCaseCount: currentFilteredCaseCount }),
+        React.createElement(DownloadCSVFileModal, { filterState: filterState, loggedInUserRights: loggedInUserRights, loggedInUsersAccount: loggedInUsersAccount, isDisabled: isExportButtonDisabled, onModalshow: openUpdateSeverityModal, onClose: toggleDownloadCSVModal, selectedCases: selectedCases, filteredCaseCount: currentFilteredCaseCount }),
         React.createElement(SingleSelectDropdown, { hideToggleIcons: true, selected: { value: null, label: '' }, onSelect: onSelect, options: toolbarDropdownItems, id: "table-actions-dropdown", placeholder: t('Actions'), badge: React.createElement(Badge, null, selectedCases.length) })));
 }

package/lib/esm/components/case-list/case-list-table/table-column-selector/TableColumnSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TableColumnSelector.d.ts","sourceRoot":"","sources":["../../../../../../src/components/case-list/case-list-table/table-column-selector/TableColumnSelector.tsx"],"names":[],"mappings":"AAAA,OAAO,4BAA4B,CAAC;AAWpC,OAAO,KAAmB,MAAM,OAAO,CAAC;AAGxC,UAAU,MAAM;IACZ,sBAAsB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACpD,aAAa,EAAE,MAAM,EAAE,CAAC;CAC3B;AAMD,wBAAgB,mBAAmB,CAAC,EAAE,sBAAsB,EAAE,aAAa,EAAE,EAAE,MAAM,qBAiGpF"}
+{"version":3,"file":"TableColumnSelector.d.ts","sourceRoot":"","sources":["../../../../../../src/components/case-list/case-list-table/table-column-selector/TableColumnSelector.tsx"],"names":[],"mappings":"AAAA,OAAO,4BAA4B,CAAC;AAWpC,OAAO,KAAmB,MAAM,OAAO,CAAC;AAGxC,UAAU,MAAM;IACZ,sBAAsB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACpD,aAAa,EAAE,MAAM,EAAE,CAAC;CAC3B;AAMD,wBAAgB,mBAAmB,CAAC,EAAE,sBAAsB,EAAE,aAAa,EAAE,EAAE,MAAM,qBAgGpF"}

package/lib/esm/components/case-list/case-list-table/table-column-selector/TableColumnSelector.js

@@ -38,7 +38,6 @@ export function TableColumnSelector({ onColumnSelectorChange, cachedColumns }) {
         { label: t('Product and version'), key: 'product' },
         { label: t('Personal reference number'), key: 'alternateCaseId' },
         { label: t('Closed date'), key: 'closedDate' },
-        { label: t('Case labels'), key: 'caseLabel' },
     ];
     const generateCheckboxes = (fieldDefinitions) => {
         return fieldDefinitions === null || fieldDefinitions === void 0 ? void 0 : fieldDefinitions.map((field) => (React.createElement(Checkbox, { key: field.key, className: "case-column-selector", label: field.label, isChecked: cachedColumns.includes(field.key), onChange: () => {

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

@@ -1 +1 @@
-{"version":3,"file":"BookmarkedSearchesSelector.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/BookmarkedSearchesSelector.tsx"],"names":[],"mappings":"AAuBA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAIvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAchE,UAAU,MAAM;IACZ,uBAAuB,EAAE,MAAM,CAAC;IAChC,iBAAiB,EAAE,mBAAmB,CAAC;IACvC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,sBAAsB,EAAE,MAAM,CAAC;CAClC;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,qBAsUvD"}
+{"version":3,"file":"BookmarkedSearchesSelector.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/BookmarkedSearchesSelector.tsx"],"names":[],"mappings":"AAsBA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAGvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAahE,UAAU,MAAM;IACZ,uBAAuB,EAAE,MAAM,CAAC;IAChC,iBAAiB,EAAE,mBAAmB,CAAC;IACvC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,sBAAsB,EAAE,MAAM,CAAC;CAClC;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,qBAyTvD"}

package/lib/esm/components/case-list/case-search/BookmarkedSearchesSelector.js

@@ -12,7 +12,6 @@ import PencilAltIcon from '@patternfly/react-icons/dist/js/icons/pencil-alt-icon
 import StarIcon from '@patternfly/react-icons/dist/js/icons/star-icon';
 import { ConfirmationServiceProvider } from '@rh-support/components';
 import { GlobalMetadataStateContext, UserPreferencesKeys, useUserPreferences } from '@rh-support/react-context';
-import { getUrlParsedParams } from '@rh-support/utils';
 import filter from 'lodash/filter';
 import find from 'lodash/find';
 import flatMap from 'lodash/flatMap';
@@ -20,10 +19,8 @@ import isEmpty from 'lodash/isEmpty';
 import isEqual from 'lodash/isEqual';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
-import { useLocation } from 'react-router-dom';
 import { CaseSearchQueryType } from '../../../enums/caseSearch';
-import { decodeCaseListUrlFilterQuery } from '../../../utils/caseGroupDefaultFilterUtils';
-import { createFilterStateFromAdvancedQuery, FILTER_URL_QUERY_SEARCH_PARAM } from '../../../utils/caseSearchUtils';
+import { createFilterStateFromAdvancedQuery } from '../../../utils/caseSearchUtils';
 import { CaseListFilterDispatchContext, CaseListFilterStateContext, initialCaseFilterState, } from '../CaseListFilterContext';
 import { isNoFilterApplied, isOnlyDefaultFilterApplied } from '../CaseListFilterHelpers';
 import { clearFilters, updateFilterState, updateSort } from '../CaseListFilterReducer';
@@ -31,11 +28,8 @@ import { SaveCaseSearchModal } from './SaveCaseSearchModal';
 import useAdvanceSearchParser from './useAdvanceSearchParser';
 export function BookmarkedSearchesSelector(props) {
     const { t } = useTranslation();
-    const location = useLocation();
     const { globalMetadataState, globalMetadataState: { hydraUserPreferences }, } = useContext(GlobalMetadataStateContext);
     const dispatch = useContext(CaseListFilterDispatchContext);
-    const urlQueryParam = getUrlParsedParams(location.search)[FILTER_URL_QUERY_SEARCH_PARAM];
-    const hasUrlFilterQuery = Boolean(decodeCaseListUrlFilterQuery(urlQueryParam));
     const [bookmarkedSearches, setBookmarkedSearches] = useState({});
     const [mostRecentSearch, setMostRecentSearch] = useState({});
     const [selectedSearch, setSelectedSearch] = useState('');
@@ -75,12 +69,6 @@ export function BookmarkedSearchesSelector(props) {
     const emptySearchPlaceholderText = 'Select an option';
     const recentSearchLoaded = useRef(false);
     useEffect(() => {
-        // Deep links (e.g. Manage → View assigned cases) encode filters in the URL query.
-        // Do not overwrite them with saved-search auto-restore.
-        if (hasUrlFilterQuery) {
-            recentSearchLoaded.current = true;
-            return;
-        }
         switch (userPreferredSearch) {
             case restoreLatestText:
                 if (!isEmpty(mostRecentSearch) && !recentSearchLoaded.current) {
@@ -103,7 +91,7 @@ export function BookmarkedSearchesSelector(props) {
                 break;
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [mostRecentSearch, userPreferredSearch, hasUrlFilterQuery]);
+    }, [mostRecentSearch, userPreferredSearch]);
     useEffect(() => {
         var _a;
         // enable save search button as soon as user changes something in the input search box
@@ -175,7 +163,6 @@ export function BookmarkedSearchesSelector(props) {
         !isEmpty(props.defaultSavedSearchName) && setSelectedSearch(props.defaultSavedSearchName);
     }, [props.defaultSavedSearchName]);
     const renderSavedSearchItems = Object.keys(bookmarkedSearches)
-        .filter((key) => { var _a; return ((_a = bookmarkedSearches[key]) === null || _a === void 0 ? void 0 : _a.type) !== 'advanced'; })
         .sort()
         .map((bookmarkedSearch) => {
         var _a;

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

@@ -1 +1 @@
-{"version":3,"file":"CaseSearch.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/CaseSearch.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAgE,MAAM,OAAO,CAAC;AA8BrF,UAAU,MAAM;IACZ,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACnC;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,qBA4OvC"}
+{"version":3,"file":"CaseSearch.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/CaseSearch.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAuD,MAAM,OAAO,CAAC;AAkB5E,UAAU,MAAM;IACZ,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACnC;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,qBA6LvC"}

package/lib/esm/components/case-list/case-search/CaseSearch.js

@@ -2,18 +2,14 @@ import { Button, SearchInput } from '@patternfly/react-core';
 import { GlobalMetadataStateContext } from '@rh-support/react-context';
 import { AbilityContext, CaseListFields, resourceActions, resources } from '@rh-support/user-permissions';
 import isEmpty from 'lodash/isEmpty';
-import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { CaseSearchQueryType } from '../../../enums/caseSearch';
-import { createCaseListFilterStateFromAdvanceSearchForm, deriveSearchQueryType, } from '../../../utils/advanceSearchFormMapper';
-import { getAdvanceSearchAppliedFilterCount } from '../../../utils/advanceSearchUtils';
 import { createFilterStateFromAdvancedQuery, createUserFriendlyQueryFromFilterStateAdvancedSearch, } from '../../../utils/caseSearchUtils';
-// import { useCaseListStateContext } from '../CaseListContext';
+import { useCaseListStateContext } from '../CaseListContext';
 import { CaseListFilterDispatchContext, CaseListFilterStateContext, initialPaginationInfo, } from '../CaseListFilterContext';
-import { initialFilterInfo, updateFilterQuery, updateFilterState, } from '../CaseListFilterReducer';
-import { AdvanceSearchModal } from './advance-search-modal/AdvanceSearchModal';
+import { initialFilterInfo, updateFilterQuery, updateFilterState } from '../CaseListFilterReducer';
 import { AdvanceSearch } from './AdvanceSearch';
-import { AdvanceSearchToggleButton } from './AdvanceSearchToggleButton';
 import { BookmarkedSearchesSelector } from './BookmarkedSearchesSelector';
 export function CaseSearch(props) {
     const { globalMetadataState } = useContext(GlobalMetadataStateContext);
@@ -24,29 +20,26 @@ export function CaseSearch(props) {
     const { filterQueryInfo } = filterState;
     const [searchVal, setSearchVal] = useState(filterQueryInfo.queryString);
     const [isAdvancedSearchValid, setIsAdvancedSearchValid] = useState(true);
-    const [isAdvanceSearchModalOpen, setIsAdvanceSearchModalOpen] = useState(false);
     const dispatch = useContext(CaseListFilterDispatchContext);
-    // const { isFetching } = useCaseListStateContext();
+    const { isFetching } = useCaseListStateContext();
     const getType = useCallback(() => (filterQueryInfo === null || filterQueryInfo === void 0 ? void 0 : filterQueryInfo.type) || CaseSearchQueryType.BASIC, [filterQueryInfo === null || filterQueryInfo === void 0 ? void 0 : filterQueryInfo.type]);
-    // Keep the keyword search input in sync with queryString only (not modal filter parsedQuery).
+    // on queryString and parsedQuery change need to update search
     useEffect(() => {
-        const query = filterQueryInfo.queryString;
-        setSearchVal(query.endsWith('*') ? query.slice(0, -1) : query);
-    }, [filterQueryInfo === null || filterQueryInfo === void 0 ? void 0 : filterQueryInfo.queryString]);
+        if (getType() === CaseSearchQueryType.ADVANCED) {
+            setSearchVal(filterQueryInfo === null || filterQueryInfo === void 0 ? void 0 : filterQueryInfo.parsedQuery);
+        }
+        else {
+            const query = filterQueryInfo.queryString;
+            setSearchVal(query.endsWith('*') ? query.slice(0, -1) : query);
+        }
+    }, [filterQueryInfo, getType]);
     const onSearchValChange = (value) => {
         setSearchVal(value === null || value === void 0 ? void 0 : value.trim());
     };
     const clearSearchVal = () => {
         setSearchVal('');
-        if (!(filterQueryInfo === null || filterQueryInfo === void 0 ? void 0 : filterQueryInfo.queryString)) {
-            return;
-        }
-        const nextFilterQueryInfo = {
-            queryString: '',
-            parsedQuery: filterQueryInfo.parsedQuery || '',
-            type: deriveSearchQueryType(Object.assign(Object.assign({}, filterState), { filterQueryInfo: Object.assign(Object.assign({}, filterQueryInfo), { queryString: '' }) })),
-        };
-        updateFilterQuery(dispatch, nextFilterQueryInfo);
+        (filterQueryInfo === null || filterQueryInfo === void 0 ? void 0 : filterQueryInfo.queryString) &&
+            updateFilterQuery(dispatch, { type: getType(), queryString: '', parsedQuery: '' });
     };
     const clearAdvancedSearchVal = () => {
         setSearchVal('');
@@ -55,21 +48,11 @@ export function CaseSearch(props) {
                 queryString: '',
                 parsedQuery: '',
                 type: CaseSearchQueryType.ADVANCED,
-            }, paginationInfo: initialPaginationInfo, advanceSearchDateRanges: undefined }));
+            }, paginationInfo: initialPaginationInfo }));
     };
-    const onCaseSearch = (parsedQuery = filterQueryInfo.parsedQuery || '', queryString = searchVal) => {
-        const trimmedQuery = queryString.trim();
-        const finalQueryString = trimmedQuery ? `${trimmedQuery}*` : '';
-        const nextFilterState = Object.assign(Object.assign({}, filterState), { filterQueryInfo: {
-                queryString: finalQueryString,
-                parsedQuery,
-                type: filterQueryInfo.type,
-            } });
-        updateFilterQuery(dispatch, {
-            queryString: finalQueryString,
-            parsedQuery,
-            type: deriveSearchQueryType(nextFilterState),
-        });
+    const onCaseSearch = (parsedQuery = '', queryString = searchVal) => {
+        const finalQueryString = `${queryString.trim()}*`;
+        updateFilterQuery(dispatch, { type: getType(), queryString: finalQueryString, parsedQuery });
     };
     const onCaseSearchAdvanced = (type, parsedQuery = '', queryStringInputBox = searchVal) => {
         const newFilterState = createFilterStateFromAdvancedQuery(parsedQuery.replace(/ and /g, ' AND ').replace(/ or /g, ' OR ').replace('Bug OR defect', 'Bug or defect'), globalMetadataState, filterState, queryStringInputBox, type);
@@ -107,38 +90,24 @@ export function CaseSearch(props) {
     };
     const handleSubmit = (ev) => {
         ev.preventDefault();
-        onCaseSearch();
-    };
-    const openAdvanceSearchModal = () => {
-        setIsAdvanceSearchModalOpen(true);
-    };
-    const closeAdvanceSearchModal = () => {
-        setIsAdvanceSearchModalOpen(false);
-    };
-    const onAdvanceSearchModalSubmit = (formState) => {
-        const newFilterState = createCaseListFilterStateFromAdvanceSearchForm(formState, filterState);
-        updateFilterState(dispatch, newFilterState);
-        closeAdvanceSearchModal();
+        // For advance search submit should only happen on btn click or ctrl+enter which will be handled manually
+        getType() === CaseSearchQueryType.BASIC && onCaseSearch();
     };
-    const appliedAdvanceSearchFilterCount = useMemo(() => getAdvanceSearchAppliedFilterCount(filterState), [filterState]);
     const renderBasicSearch = () => {
         return (React.createElement(React.Fragment, null,
             React.createElement("div", { className: "case-search-input-container" },
                 React.createElement(SearchInput, { className: "pf-v6-u-w-100 case-search-input", placeholder: t('Search by keyword or case ID'), value: searchVal === null || searchVal === void 0 ? void 0 : searchVal.trim(), "data-tracking-id": "search-cases-text-input", id: "case-search-basic", "aria-label": t('Search by keyword or case ID'), onChange: (_event, val) => onSearchValChange(val), onClear: clearSearchVal }),
                 React.createElement(Button, { variant: "primary", type: "submit", className: "search-btn", "data-tracking-id": "case-list-search-button", isDisabled: isSearchButtonDisabled },
                     React.createElement(Trans, null, "Search")),
-                canUseAdvancedSearch && (React.createElement("div", { className: "advance-search-panel-container" },
-                    React.createElement(AdvanceSearchToggleButton, { appliedFilterCount: appliedAdvanceSearchFilterCount, onClick: openAdvanceSearchModal }),
-                    React.createElement(AdvanceSearchModal, { isOpen: isAdvanceSearchModalOpen, onClose: closeAdvanceSearchModal, onSearch: onAdvanceSearchModalSubmit }))))));
+                canUseAdvancedSearch && (React.createElement(Button, { variant: "link", onClick: () => onSearchTypeChange(CaseSearchQueryType.ADVANCED), isDisabled: isFetching, "data-tracking-id": "case-list-adv-toggle-button", className: "case-search-toggle secondary-button-pill" },
+                    React.createElement(Trans, null, "Advanced"))))));
     };
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const renderAdvanceSearch = () => {
         return canUseAdvancedSearch ? (React.createElement(React.Fragment, null,
             React.createElement(AdvanceSearch, { isSearchDisabled: isSearchButtonDisabled, onSearchValChange: onSearchValChange, onSearchClear: clearAdvancedSearchVal, onSearchSubmit: onCaseSearchAdvanced, onSearchTypeChange: onSearchTypeChange, onAdvancedSearchValidation: (isValid) => setIsAdvancedSearchValid(isValid) }))) : (renderBasicSearch());
     };
-    void renderAdvanceSearch;
     return (React.createElement(React.Fragment, null,
         React.createElement("form", { onSubmit: handleSubmit, onKeyDown: handleSearchInputKeyDown },
-            React.createElement("div", { className: "form-group case-search-form-group" }, renderBasicSearch())),
+            React.createElement("div", { className: "form-group case-search-form-group" }, CaseSearchQueryType.BASIC === getType() ? renderBasicSearch() : renderAdvanceSearch())),
         React.createElement(BookmarkedSearchesSelector, { currentCaseSearchString: searchVal === null || searchVal === void 0 ? void 0 : searchVal.trim(), currentSearchType: getType(), isAdvancedSearchValid: isAdvancedSearchValid, defaultSavedSearchName: props.defaultSavedSearchName })));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"useAdvanceSearchParser.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/useAdvanceSearchParser.tsx"],"names":[],"mappings":"AASA,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAAE,MAAM,EAAE;;CAAA;yBAUzB,MAAM;6BAIF,MAAM;;EA+LzC"}
+{"version":3,"file":"useAdvanceSearchParser.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/useAdvanceSearchParser.tsx"],"names":[],"mappings":"AASA,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAAE,MAAM,EAAE;;CAAA;yBASzB,MAAM;6BAIF,MAAM;;EA+LzC"}

package/lib/esm/components/case-list/case-search/useAdvanceSearchParser.js

@@ -5,8 +5,7 @@ import { useEffect, useRef } from 'react';
 import { SolrKeys } from '../../../enums/filters';
 import { useCaseListStateContext } from '../CaseListContext';
 export default function useAdvanceSearchParser({ onInit }) {
-    const caseListState = useCaseListStateContext();
-    const filterValuesFromFacetResponse = caseListState.filterValuesFromFacetResponse || {};
+    const { filterValuesFromFacetResponse } = useCaseListStateContext();
     const { globalMetadataState: { caseGroups, loggedInUsersAccount, bookmarkedGroupAccounts, allCaseTypes }, } = useGlobalStateContext();
     const parserRef = useRef(null);
     const parse = (stringQuery) => {

package/lib/esm/css/caseList.css

@@ -186,15 +186,9 @@
 .cases-main .case-search-table {
     -ms-flex: 1;
     flex-grow: 1;
-    display: flex;
-    flex-direction: column;
-    min-width: 0;
-    border-radius: 0 0 16px !important;
-}
-
-.cases-main .case-search-table > .pf-v6-c-scroll-inner-wrapper {
+    display: block;
     overflow-x: auto;
-    flex: 1;
+    border-radius: 0 0 16px !important;
 }
 
 .case-search-bottom .case-list-table-toolbar {
@@ -206,10 +200,6 @@
     background-color: var(--pf-t--color--gray--10);
     border-top: 1px solid var(--pf-t--global--border--color--100);
     border-right: 1px solid var(--pf-t--global--border--color--100);
-    border-bottom: 1px solid var(--pf-t--global--border--color--100);
-    position: sticky;
-    top: 0;
-    z-index: 100;
 }
 
 .case-search-bottom .case-list-table-toolbar .toolbar-actions {
@@ -229,105 +219,26 @@
     color: #06c !important;
 }
 
+.case-search-bottom .case-list-table-toolbar .toolbar-pagination button[disabled] {
+    color: #999;
+}
+
 .case-search-bottom .case-list-table-toolbar button.pf-m-secondary:not([disabled]),
 .case-search-bottom .case-list-table-toolbar button.pf-m-tertiary:not([disabled]),
 .case-search-bottom .case-list-table-toolbar button.pf-m-control:not([disabled]) {
     background-color: #fff;
 }
 
-.case-count-indicator {
-    font-size: 14px !important;
-    line-height: 1.5em;
-    white-space: nowrap;
-    padding-right: 1rem;
-    color: var(--pf-t--global--text--color--regular, #151515);
-}
-
 .cases-main .case-search-table .case-list-table {
+    border-top: 1px solid var(--pf-t--global--border--color--100);
     border-right: 1px solid var(--pf-t--global--border--color--100);
     border-bottom: 1px solid var(--pf-t--global--border--color--100);
 }
 
-.case-list-table td[data-label='Case labels'] .pf-v6-c-label .pf-v6-c-label__content .pf-v6-c-label__icon {
+.case-list-table .pf-v6-c-label .pf-v6-c-label__content .pf-v6-c-label__icon {
     display: none;
 }
 
-.case-number-section .archived-case-label.pf-m-purple .pf-v6-c-label__icon {
-    color: #5e40be;
-}
-
-.case-list-table th#caseLabel,
-.case-list-table td[data-label='Case labels'] {
-    width: 20rem;
-    min-width: 20rem;
-    max-width: 20rem;
-}
-
-.case-list-label-cell {
-    --case-list-label-gap: 8px;
-    position: relative;
-    max-width: 100%;
-    width: 100%;
-}
-
-.case-list-label-cell__measure {
-    display: flex;
-    column-gap: var(--case-list-label-gap);
-    position: absolute;
-    visibility: hidden;
-    pointer-events: none;
-    height: 0;
-    overflow: hidden;
-    white-space: nowrap;
-}
-
-.case-list-table td[data-label='Case labels'] .case-list-label-group,
-.case-list-table td[data-label='Case labels'] .case-list-label-group .pf-v6-c-label-group__main,
-.case-list-table td[data-label='Case labels'] .case-list-label-group .pf-v6-c-label-group__list {
-    max-width: 100%;
-    width: 100%;
-}
-
-.case-list-table td[data-label='Case labels'] .case-list-label-group .pf-v6-c-label-group__list {
-    column-gap: var(--case-list-label-gap);
-    flex-wrap: nowrap;
-}
-
-.case-list-table td[data-label='Case labels'] .case-list-label-group .pf-v6-c-label-group__list-item {
-    flex-shrink: 0;
-}
-
-.case-list-table td[data-label='Case labels'] .case-list-label-group .pf-v6-c-label__text {
-    white-space: nowrap;
-}
-
-.case-list-label-popover .pf-v6-c-label-group__list {
-    column-gap: var(--case-list-label-gap);
-    row-gap: var(--case-list-label-gap);
-    flex-wrap: wrap;
-}
-
-.case-list-label-popover-panel {
-    --case-list-label-gap: 8px;
-    --case-list-label-popover-offset-x: 0.9rem;
-    --case-list-label-popover-offset-y: 0.1rem;
-    --case-list-label-popover-close-offset-x: 0.5rem;
-    --pf-v6-c-popover__close--sibling--PaddingInlineEnd: var(--pf-t--global--spacer--md);
-    --pf-v6-c-popover__close--InsetInlineEnd: calc(
-        var(--pf-v6-c-popover__content--PaddingInlineEnd, 1rem) - var(--case-list-label-popover-close-offset-x)
-    );
-    margin-inline-start: var(--case-list-label-popover-offset-x);
-    margin-block-start: var(--case-list-label-popover-offset-y);
-}
-
-.case-list-label-popover-panel .pf-v6-c-popover__close .pf-v6-c-button {
-    width: 21px;
-    height: 21px;
-    min-width: 21px;
-    min-height: 21px;
-    padding: 0;
-}
-
 .case-list-table td[data-label='Title'] {
     text-align: start !important;
 }
@@ -366,6 +277,17 @@
     text-transform: uppercase;
 }
 
+.case-search-bottom .case-search-table footer.toolbar-pagination {
+    margin-top: 0 !important;
+    border-right: 1px solid var(--pf-t--global--border--color--100);
+    border-bottom: 1px solid var(--pf-t--global--border--color--100);
+    border-radius: 16px !important;
+}
+
+.case-search-bottom .case-search-table footer.toolbar-pagination > :first-child {
+    padding: 1rem;
+}
+
 .case-search-bottom #case-filters-panel {
     -ms-flex: 100%;
     flex-basis: 100%;
@@ -378,13 +300,11 @@
     border-right: 1px solid var(--pf-t--global--border--color--100);
     border-bottom: 1px solid var(--pf-t--global--border--color--100);
     border-radius: 0 0 0 16px;
-    align-self: stretch;
 }
 
 .case-search-filters .filter-header {
     min-height: 4rem;
     margin: 0;
-    padding: 0;
 }
 
 .case-search-filters .filter-header .pf-v6-svg {
@@ -429,10 +349,6 @@
     font-size: 1rem;
     font-weight: 600;
     height: 4.3rem;
-    position: sticky;
-    top: 0;
-    z-index: 100;
-    background-color: #f2f2f2;
 
     .pf-v6-c-button__icon.pf-m-end {
         margin-right: -4px !important;
@@ -443,8 +359,6 @@
 .filter-wrapper {
     padding: 24px;
     background-color: var(--pf-t--color--gray--10);
-    position: relative;
-    z-index: 0;
 }
 
 .filter-wrapper .filter-group > * {
@@ -499,6 +413,10 @@
     .case-search-bottom .case-list-table-toolbar .toolbar-actions > * {
         margin-bottom: 0;
     }
+
+    .case-search-bottom .case-list-table-toolbar .toolbar-pagination {
+        margin-top: 0;
+    }
 }
 
 @media (min-width: 768px) {
@@ -727,86 +645,3 @@ th#product.pf-v6-c-table__th {
 .case-list-table .pf-v6-c-table__button {
     margin-bottom: 0px !important;
 }
-
-.skeleton-loader-row {
-    height: 62px;
-}
-
-.skeleton-loader-row .skeleton-sentinel {
-    display: flex;
-    align-items: center;
-    height: 100%;
-}
-
-.skeleton-loader-row .skeleton-bar {
-    display: block;
-    height: 24px;
-    border-radius: 4px;
-    background-color: #e0e0e0;
-    animation: skeleton-pulse 1.5s ease-in-out infinite;
-}
-
-.skeleton-loader-row .skeleton-bar--checkbox {
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    border-radius: 3px;
-}
-
-@keyframes skeleton-pulse {
-    0% {
-        opacity: 1;
-    }
-    50% {
-        opacity: 0.4;
-    }
-    100% {
-        opacity: 1;
-    }
-}
-
-.infinite-scroll-footer-message {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    gap: 8px;
-    padding: 12px 0;
-    position: sticky;
-    left: 0;
-    background-color: #fff;
-}
-
-.infinite-scroll-footer-text,
-.infinite-scroll-alert,
-.infinite-scroll-alert * {
-    font-size: 14px !important;
-}
-
-.infinite-scroll-footer-message .pf-v6-c-alert.pf-m-inline.pf-m-plain {
-    padding: 0;
-}
-
-.infinite-scroll-footer-message .pf-v6-c-button.pf-m-link.pf-m-inline {
-    text-decoration: none;
-}
-
-.infinite-scroll-retry-btn.pf-v6-c-button.pf-m-secondary {
-    border-radius: 999px;
-    padding: 8px 24px;
-    gap: 6px;
-    font-size: 14px;
-    font-weight: 400;
-    line-height: 1.5;
-    display: inline-flex;
-    align-items: center;
-}
-
-.infinite-scroll-retry-btn .pf-v6-c-button__icon {
-    display: inline-flex;
-    align-items: center;
-    line-height: 0;
-}
-
-.infinite-scroll-retry-btn .pf-v6-c-button__icon svg {
-    vertical-align: middle;
-}