diff --git a/ui/src/layout/AssetScans/AssetScanDetails.jsx b/ui/src/layout/AssetScans/AssetScanDetails.jsx index 946f1b2ab..a77b177b6 100644 --- a/ui/src/layout/AssetScans/AssetScanDetails.jsx +++ b/ui/src/layout/AssetScans/AssetScanDetails.jsx @@ -49,7 +49,7 @@ const AssetScanDetails = () => ( { const { startTime, name } = scan || {}; diff --git a/ui/src/layout/Dashboard/CounterDisplay/index.jsx b/ui/src/layout/Dashboard/CounterDisplay/index.jsx index 1bfbc5b3e..7039f14b3 100644 --- a/ui/src/layout/Dashboard/CounterDisplay/index.jsx +++ b/ui/src/layout/Dashboard/CounterDisplay/index.jsx @@ -12,7 +12,7 @@ export const ScanCounterDisplay = () => { queryParams: { $count: true, $top: 1, - $select: "id", + $select: "count", $filter: "status/state eq 'Aborted' or status/state eq 'Failed' or status/state eq 'Done'", }, diff --git a/ui/src/layout/Dashboard/index.jsx b/ui/src/layout/Dashboard/index.jsx index 32a465d6f..f683273ed 100644 --- a/ui/src/layout/Dashboard/index.jsx +++ b/ui/src/layout/Dashboard/index.jsx @@ -27,7 +27,9 @@ const COUNTERS_CONFIG = [ ]; const Dashboard = () => { - const [{ data, error, loading }] = useFetch(APIS.SCANS); + const [{ data, error, loading }] = useFetch(APIS.SCANS, { + queryParams: { $count: true, $select: "count" }, + }); if (loading) { return ; @@ -37,7 +39,7 @@ const Dashboard = () => { return null; } - if (data.length === 0) { + if (data.count === 0) { return ; } diff --git a/ui/src/layout/Findings/Exploits/ExploitsTable.jsx b/ui/src/layout/Findings/Exploits/ExploitsTable.jsx index bec0633ba..62a27af3e 100644 --- a/ui/src/layout/Findings/Exploits/ExploitsTable.jsx +++ b/ui/src/layout/Findings/Exploits/ExploitsTable.jsx @@ -34,6 +34,7 @@ const ExploitsTable = () => { return ( } /> diff --git a/ui/src/layout/Findings/FindingsTablePage.jsx b/ui/src/layout/Findings/FindingsTablePage.jsx index e312ac522..6cf927a25 100644 --- a/ui/src/layout/Findings/FindingsTablePage.jsx +++ b/ui/src/layout/Findings/FindingsTablePage.jsx @@ -19,6 +19,7 @@ const FindingsTablePage = ({ columns, filterType, filtersConfig, + select, }) => { const filtersDispatch = useFilterDispatch(); const filtersState = useFilterState(); @@ -73,6 +74,7 @@ const FindingsTablePage = ({ { return ( { return ( { return ( { return ( { return ( { return ( { }; const [{ loading, data, error }] = useFetch(APIS.SCANS, { - queryParams: { $filter: scansFilter, $count: true }, + queryParams: { $filter: scansFilter, $count: true, $select: "count" }, }); if (error) { diff --git a/ui/src/layout/Scans/Scans/ScansTable.jsx b/ui/src/layout/Scans/Scans/ScansTable.jsx index 75c414aa4..f2276a570 100644 --- a/ui/src/layout/Scans/Scans/ScansTable.jsx +++ b/ui/src/layout/Scans/Scans/ScansTable.jsx @@ -113,6 +113,7 @@ const ScansTable = () => { { }, [prevOpenConfigForm, openConfigForm, openDisplayModal]); const [{ data, error, loading }, fetchData] = useMountMultiFetch([ - { key: "scans", url: APIS.SCANS }, - { key: "scanConfigs", url: APIS.SCAN_CONFIGS }, + { + key: "scans", + url: APIS.SCANS, + queryParams: { $count: true, $select: "count" }, + }, + { + key: "scanConfigs", + url: APIS.SCAN_CONFIGS, + queryParams: { $count: true, $select: "count" }, + }, ]); if (loading) { @@ -63,7 +71,7 @@ const ScansTabbedPage = () => { return ( <> - {scans?.length === 0 && scanConfigs?.total === 0 ? ( + {scans?.count === 0 && scanConfigs?.count === 0 ? ( diff --git a/ui/src/layout/detail-displays/AssetDetails/AssetScansDisplay.jsx b/ui/src/layout/detail-displays/AssetDetails/AssetScansDisplay.jsx index 308e4fa85..adee34f6b 100644 --- a/ui/src/layout/detail-displays/AssetDetails/AssetScansDisplay.jsx +++ b/ui/src/layout/detail-displays/AssetDetails/AssetScansDisplay.jsx @@ -33,7 +33,7 @@ export const AssetScansDisplay = ({ assetName, assetId }) => { queryParams: { $filter: filter, $count: true, - $select: "id,asset,summary,scan", + $select: "count", }, });