From cf34466e7f4d4007ef27f5d8e6d2a342cc44058f Mon Sep 17 00:00:00 2001 From: RachelElysia <71795832+RachelElysia@users.noreply.github.com> Date: Wed, 23 Mar 2022 14:50:16 -0400 Subject: [PATCH] Live query percent fix (#4768) --- .../PolicyPage/components/QueryResults/QueryResults.tsx | 8 ++++---- .../QueryPage/components/QueryResults/QueryResults.tsx | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/pages/policies/PolicyPage/components/QueryResults/QueryResults.tsx b/frontend/pages/policies/PolicyPage/components/QueryResults/QueryResults.tsx index 73a6a3b4bd..97320161de 100644 --- a/frontend/pages/policies/PolicyPage/components/QueryResults/QueryResults.tsx +++ b/frontend/pages/policies/PolicyPage/components/QueryResults/QueryResults.tsx @@ -66,11 +66,11 @@ const QueryResults = ({ useEffect(() => { const calculatePercent = - Math.round( - ((totalRowsCount + errors?.length) / targetsTotalCount) * 100 - ) || 0; + targetsTotalCount !== 0 + ? Math.round((campaign.hosts_count.total / targetsTotalCount) * 100) + : 0; setTargetsRespondedPercent(calculatePercent); - }, [totalRowsCount, errors]); + }, [campaign]); useEffect(() => { if (isQueryFinished) { diff --git a/frontend/pages/queries/QueryPage/components/QueryResults/QueryResults.tsx b/frontend/pages/queries/QueryPage/components/QueryResults/QueryResults.tsx index 29d11b87fb..1989f3dc6d 100644 --- a/frontend/pages/queries/QueryPage/components/QueryResults/QueryResults.tsx +++ b/frontend/pages/queries/QueryPage/components/QueryResults/QueryResults.tsx @@ -63,11 +63,11 @@ const QueryResults = ({ useEffect(() => { const calculatePercent = - Math.round( - ((totalRowsCount + errors?.length) / targetsTotalCount) * 100 - ) || 0; + targetsTotalCount !== 0 + ? Math.round((campaign.hosts_count.total / targetsTotalCount) * 100) + : 0; setTargetsRespondedPercent(calculatePercent); - }, [totalRowsCount, errors]); + }, [campaign]); useEffect(() => { if (isQueryFinished) {