From ccfd82d57be214133f599fa128e52e228ae0b581 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Mon, 11 Dec 2023 10:29:49 -0500
Subject: [PATCH] [8.12] [Cloud Security] fix accounts evaluation count issue
 (#173035) (#173065)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Backport

This will backport the following commits from `main` to `8.12`:
- [[Cloud Security] fix accounts evaluation count issue
(#173035)](https://github.com/elastic/kibana/pull/173035)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT
[{"author":{"name":"Lola","email":"omolola.akinleye@elastic.co"},"sourceCommit":{"committedDate":"2023-12-11T14:02:54Z","message":"[Cloud
Security] fix accounts evaluation count issue (#173035)\n\n##
Summary\r\n\r\nSummarize your PR. If it involves visual changes include
a screenshot or\r\ngif.\r\n\r\nThe Account Evaluation counter only
counts the type of benchmark. For\r\ninstance, the `cis_azure` benchmark
counter shows 1 because we count the\r\nbenchmark type which is always
1. We need to display the\r\n`benchmark.meta.assetCount` will accurately
display the number of\r\naccounts per benchmark ID.\r\n<img
width=\"1205\" alt=\"Screenshot 2023-12-11 at 6 09
41 AM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/17135495/978fcca3-fbc8-44d0-b6cf-8f3e07a42505\">","sha":"305b6da3617980bd856e8efd33ed1a020c03ba98","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","Team:Cloud
Security","v8.12.0","v8.13.0"],"number":173035,"url":"https://github.com/elastic/kibana/pull/173035","mergeCommit":{"message":"[Cloud
Security] fix accounts evaluation count issue (#173035)\n\n##
Summary\r\n\r\nSummarize your PR. If it involves visual changes include
a screenshot or\r\ngif.\r\n\r\nThe Account Evaluation counter only
counts the type of benchmark. For\r\ninstance, the `cis_azure` benchmark
counter shows 1 because we count the\r\nbenchmark type which is always
1. We need to display the\r\n`benchmark.meta.assetCount` will accurately
display the number of\r\naccounts per benchmark ID.\r\n<img
width=\"1205\" alt=\"Screenshot 2023-12-11 at 6 09
41 AM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/17135495/978fcca3-fbc8-44d0-b6cf-8f3e07a42505\">","sha":"305b6da3617980bd856e8efd33ed1a020c03ba98"}},"sourceBranch":"main","suggestedTargetBranches":["8.12"],"targetPullRequestStates":[{"branch":"8.12","label":"v8.12.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.13.0","labelRegex":"^v8.13.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/173035","number":173035,"mergeCommit":{"message":"[Cloud
Security] fix accounts evaluation count issue (#173035)\n\n##
Summary\r\n\r\nSummarize your PR. If it involves visual changes include
a screenshot or\r\ngif.\r\n\r\nThe Account Evaluation counter only
counts the type of benchmark. For\r\ninstance, the `cis_azure` benchmark
counter shows 1 because we count the\r\nbenchmark type which is always
1. We need to display the\r\n`benchmark.meta.assetCount` will accurately
display the number of\r\naccounts per benchmark ID.\r\n<img
width=\"1205\" alt=\"Screenshot 2023-12-11 at 6 09
41 AM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/17135495/978fcca3-fbc8-44d0-b6cf-8f3e07a42505\">","sha":"305b6da3617980bd856e8efd33ed1a020c03ba98"}}]}]
BACKPORT-->

Co-authored-by: Lola <omolola.akinleye@elastic.co>
---
 .../public/components/accounts_evaluated_widget.tsx         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/cloud_security_posture/public/components/accounts_evaluated_widget.tsx b/x-pack/plugins/cloud_security_posture/public/components/accounts_evaluated_widget.tsx
index 4feee3a5e2287..c4e2028381ed6 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/accounts_evaluated_widget.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/accounts_evaluated_widget.tsx
@@ -52,8 +52,8 @@ export const AccountsEvaluatedWidget = ({
 }) => {
   const { euiTheme } = useEuiTheme();
 
-  const filterBenchmarksById = (benchmarkId: string) => {
-    return benchmarkAssets?.filter((obj) => obj?.meta.benchmarkId === benchmarkId) || [];
+  const getBenchmarkById = (benchmarkId: string) => {
+    return benchmarkAssets?.find((obj) => obj?.meta.benchmarkId === benchmarkId);
   };
 
   const navToFindings = useNavigateFindings();
@@ -67,7 +67,7 @@ export const AccountsEvaluatedWidget = ({
   };
 
   const benchmarkElements = benchmarks.map((benchmark) => {
-    const cloudAssetAmount = filterBenchmarksById(benchmark.type).length;
+    const cloudAssetAmount = getBenchmarkById(benchmark.type)?.meta?.assetCount || 0;
 
     return (
       cloudAssetAmount > 0 && (