@rh-support/cases 2.6.235 → 2.7.10

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 { downloadCSV, formatDateTime, toNewCaseTypeSwitcher } from '@rh-support/utils';
+import { ToastNotification } from '@rh-support/components';
+import { GlobalMetadataStateContext } from '@rh-support/react-context';
+import { downloadCSV, formatDateTime, mapSfdcStatusToPortalStatus, toNewCaseTypeSwitcher, } from '@rh-support/utils';
 import { isEmpty } from 'lodash';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useContext, 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';
+const csvHeaders = [
     { label: 'Case number', key: SolrKeys.caseNumber },
     {
         label: 'Case link',
@@ -28,20 +28,14 @@ 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 { globalMetadataState: { loggedInUsersAccount }, } = useContext(GlobalMetadataStateContext);
+    const includeSecureSupportCases = Boolean(loggedInUsersAccount.data.secureSupport);
+    const [isFetching, setIsFetching] = useState(false);
     const [downloadCSVFileName, setDownloadCSVFileName] = useState('CaseList.csv');
-    const [isFetchingSFDC, setIsFetchingSFDC] = useState(false);
     const [checkboxes, setCheckboxes] = useState({
         selectAll: false,
         ownerName: false,
@@ -55,89 +49,96 @@ export default function DownloadCSVFileModal(props) {
         type: false,
         caseClosedDate: false,
         group: false,
+        caseLabel: 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]);
+        {
+            checkbox: checkboxes.caseLabel,
+            key: getKey('caseLabel'),
+            label: 'Case labels',
+            transform: (labels) => (Array.isArray(labels) ? labels.join(', ') : labels || ''),
+        },
+    ], [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 +155,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 +173,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, includeSecureSupportCases);
+                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 +190,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 = {
@@ -230,6 +209,7 @@ export default function DownloadCSVFileModal(props) {
             type: newSelectAllState,
             caseClosedDate: newSelectAllState,
             group: newSelectAllState,
+            caseLabel: newSelectAllState,
         };
         setCheckboxes((prevCheckboxes) => (Object.assign({ selectAll: !prevCheckboxes.selectAll }, updatedCheckboxes)));
     };
@@ -247,6 +227,7 @@ export default function DownloadCSVFileModal(props) {
         { label: 'Product and version', key: 'productVersion' },
         { label: 'Personal reference number', key: 'alternateId' },
         { label: 'Closed date', key: 'caseClosedDate' },
+        { label: 'Case labels', key: 'caseLabel' },
     ];
     const generateCheckboxes = (fieldDefinitions) => {
         return fieldDefinitions.map((field) => (React.createElement(Checkbox, { key: field.key, className: "nested", label: t(field.label), isChecked: checkboxes[field.key], onChange: () => {
@@ -294,6 +275,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", "aria-label": "loading" }) : 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')))));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ExportCaseListCSV.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-table/ExportCaseListCSV.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAA+B,MAAM,OAAO,CAAC;AAGpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAK7D,UAAU,MAAM;IACZ,uBAAuB,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAC1D,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,aAAa,EAAE,MAAM,EAAE,CAAC;CAC3B;AAID,wBAAgB,iBAAiB,CAAC,EAAE,uBAAuB,EAAE,aAAa,EAAE,mBAAmB,EAAE,EAAE,MAAM,qBAqExG"}
+{"version":3,"file":"ExportCaseListCSV.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-table/ExportCaseListCSV.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAA+B,MAAM,OAAO,CAAC;AAGpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAI7D,UAAU,MAAM;IACZ,uBAAuB,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAC1D,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,aAAa,EAAE,MAAM,EAAE,CAAC;CAC3B;AAID,wBAAgB,iBAAiB,CAAC,EAAE,uBAAuB,EAAE,aAAa,EAAE,mBAAmB,EAAE,EAAE,MAAM,qBAoDxG"}

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

@@ -1,9 +1,6 @@
-import { Button, Spinner } from '@patternfly/react-core';
-import { useFetch } from '@rh-support/components';
-import { GlobalMetadataStateContext } from '@rh-support/react-context';
+import { Button } from '@patternfly/react-core';
 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;
@@ -13,14 +10,10 @@ 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 isFetchingCSVData = isFetching;
-    const isBtnDisabled = isFetchingCSVData || currentFilteredCaseCount === 0;
+    const isBtnDisabled = 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) {
@@ -28,15 +21,12 @@ 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 }, 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 })));
+        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 })));
 }

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 (Normal)':
+            case '3 (Medium)':
                 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,qBA0HjD"}
+{"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,qBA4GjD"}

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, GlobalMetadataStateContext } from '@rh-support/react-context';
+import { CloseCaseModal } from '@rh-support/react-context';
 import React, { useContext } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCloseCase } from '../../../hooks/useCloseCase';
@@ -22,8 +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);
+    const { isModalOpen, showError, showWarning, getTooltipContent, onCancel, onConfirm, onBtnClick } = useCloseCase(props);
     let closeCaseIconStatus = 'danger';
     if (showWarning) {
         closeCaseIconStatus = 'warning';
@@ -69,7 +68,7 @@ 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, loggedInUserRights: loggedInUserRights, loggedInUsersAccount: loggedInUsersAccount, isDisabled: isExportButtonDisabled, onModalshow: openUpdateSeverityModal, onClose: toggleDownloadCSVModal, selectedCases: selectedCases, filteredCaseCount: currentFilteredCaseCount }),
+        isModalOpen && React.createElement(CloseCaseModal, { onClose: onCancel, onConfirm: onConfirm }),
+        React.createElement(DownloadCSVFileModal, { filterState: filterState, 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,qBAgGpF"}
+{"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"}

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

@@ -38,6 +38,7 @@ 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/AdvanceSearchToggleButton.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+interface IProps {
+    appliedFilterCount: number;
+    onClick: () => void;
+}
+export declare function AdvanceSearchToggleButton({ appliedFilterCount, onClick }: IProps): React.JSX.Element;
+export {};
+//# sourceMappingURL=AdvanceSearchToggleButton.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AdvanceSearchToggleButton.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/AdvanceSearchToggleButton.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,UAAU,MAAM;IACZ,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,wBAAgB,yBAAyB,CAAC,EAAE,kBAAkB,EAAE,OAAO,EAAE,EAAE,MAAM,qBAehF"}

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

@@ -0,0 +1,8 @@
+import { Button } from '@patternfly/react-core';
+import AngleDownIcon from '@patternfly/react-icons/dist/js/icons/angle-down-icon';
+import React from 'react';
+import { Trans } from 'react-i18next';
+export function AdvanceSearchToggleButton({ appliedFilterCount, onClick }) {
+    return (React.createElement(Button, { type: "button", variant: "secondary", onClick: onClick, className: "advance-search-toggle-btn secondary-button-pill", icon: React.createElement(AngleDownIcon, { "aria-hidden": true }), iconPosition: "end", countOptions: appliedFilterCount > 0 ? { count: appliedFilterCount } : undefined, "data-tracking-id": "case-list-adv-toggle-button" },
+        React.createElement(Trans, null, "Advanced Search")));
+}

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":"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"}
+{"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"}

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

@@ -12,6 +12,7 @@ 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';
@@ -19,8 +20,10 @@ 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 { createFilterStateFromAdvancedQuery } from '../../../utils/caseSearchUtils';
+import { decodeCaseListUrlFilterQuery } from '../../../utils/caseGroupDefaultFilterUtils';
+import { createFilterStateFromAdvancedQuery, FILTER_URL_QUERY_SEARCH_PARAM } from '../../../utils/caseSearchUtils';
 import { CaseListFilterDispatchContext, CaseListFilterStateContext, initialCaseFilterState, } from '../CaseListFilterContext';
 import { isNoFilterApplied, isOnlyDefaultFilterApplied } from '../CaseListFilterHelpers';
 import { clearFilters, updateFilterState, updateSort } from '../CaseListFilterReducer';
@@ -28,8 +31,11 @@ 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('');
@@ -69,6 +75,12 @@ 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) {
@@ -91,7 +103,7 @@ export function BookmarkedSearchesSelector(props) {
                 break;
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [mostRecentSearch, userPreferredSearch]);
+    }, [mostRecentSearch, userPreferredSearch, hasUrlFilterQuery]);
     useEffect(() => {
         var _a;
         // enable save search button as soon as user changes something in the input search box
@@ -163,6 +175,7 @@ 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,KAAuD,MAAM,OAAO,CAAC;AAkB5E,UAAU,MAAM;IACZ,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACnC;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,qBA6LvC"}
+{"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"}

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

@@ -2,14 +2,18 @@ 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, useState } from 'react';
+import React, { useCallback, useContext, useEffect, useMemo, 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 { initialFilterInfo, updateFilterQuery, updateFilterState, } from '../CaseListFilterReducer';
+import { AdvanceSearchModal } from './advance-search-modal/AdvanceSearchModal';
 import { AdvanceSearch } from './AdvanceSearch';
+import { AdvanceSearchToggleButton } from './AdvanceSearchToggleButton';
 import { BookmarkedSearchesSelector } from './BookmarkedSearchesSelector';
 export function CaseSearch(props) {
     const { globalMetadataState } = useContext(GlobalMetadataStateContext);
@@ -20,26 +24,29 @@ 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]);
-    // on queryString and parsedQuery change need to update search
+    // Keep the keyword search input in sync with queryString only (not modal filter parsedQuery).
     useEffect(() => {
-        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 query = filterQueryInfo.queryString;
+        setSearchVal(query.endsWith('*') ? query.slice(0, -1) : query);
+    }, [filterQueryInfo === null || filterQueryInfo === void 0 ? void 0 : filterQueryInfo.queryString]);
     const onSearchValChange = (value) => {
         setSearchVal(value === null || value === void 0 ? void 0 : value.trim());
     };
     const clearSearchVal = () => {
         setSearchVal('');
-        (filterQueryInfo === null || filterQueryInfo === void 0 ? void 0 : filterQueryInfo.queryString) &&
-            updateFilterQuery(dispatch, { type: getType(), queryString: '', parsedQuery: '' });
+        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);
     };
     const clearAdvancedSearchVal = () => {
         setSearchVal('');
@@ -48,11 +55,21 @@ export function CaseSearch(props) {
                 queryString: '',
                 parsedQuery: '',
                 type: CaseSearchQueryType.ADVANCED,
-            }, paginationInfo: initialPaginationInfo }));
+            }, paginationInfo: initialPaginationInfo, advanceSearchDateRanges: undefined }));
     };
-    const onCaseSearch = (parsedQuery = '', queryString = searchVal) => {
-        const finalQueryString = `${queryString.trim()}*`;
-        updateFilterQuery(dispatch, { type: getType(), queryString: finalQueryString, parsedQuery });
+    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 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);
@@ -90,24 +107,38 @@ export function CaseSearch(props) {
     };
     const handleSubmit = (ev) => {
         ev.preventDefault();
-        // For advance search submit should only happen on btn click or ctrl+enter which will be handled manually
-        getType() === CaseSearchQueryType.BASIC && onCaseSearch();
+        onCaseSearch();
+    };
+    const openAdvanceSearchModal = () => {
+        setIsAdvanceSearchModalOpen(true);
+    };
+    const closeAdvanceSearchModal = () => {
+        setIsAdvanceSearchModalOpen(false);
+    };
+    const onAdvanceSearchModalSubmit = (formState) => {
+        const newFilterState = createCaseListFilterStateFromAdvanceSearchForm(formState, filterState);
+        updateFilterState(dispatch, newFilterState);
+        closeAdvanceSearchModal();
     };
+    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(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"))))));
+                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 }))))));
     };
+    // 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" }, CaseSearchQueryType.BASIC === getType() ? renderBasicSearch() : renderAdvanceSearch())),
+            React.createElement("div", { className: "form-group case-search-form-group" }, renderBasicSearch())),
         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/advance-search-modal/AdvanceSearchAccountSection.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import { IAdvanceSearchFormState } from '../../CaseListFilterReducer';
+interface IProps {
+    formState: IAdvanceSearchFormState;
+    onChange: (updates: Partial<IAdvanceSearchFormState>) => void;
+    canReadAccounts: boolean;
+}
+export declare function AdvanceSearchAccountSection({ formState, onChange, canReadAccounts }: IProps): React.JSX.Element;
+export {};
+//# sourceMappingURL=AdvanceSearchAccountSection.d.ts.map