diff --git a/x-pack/platform/packages/shared/kbn-cloud-security-posture/common/utils/ui_metrics.ts b/x-pack/platform/packages/shared/kbn-cloud-security-posture/common/utils/ui_metrics.ts index 23f0144729986..89c8b219f4789 100644 --- a/x-pack/platform/packages/shared/kbn-cloud-security-posture/common/utils/ui_metrics.ts +++ b/x-pack/platform/packages/shared/kbn-cloud-security-posture/common/utils/ui_metrics.ts @@ -10,8 +10,8 @@ import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public'; export const APP_NAME = 'cloud-security'; -export const MISCONFIGURATION_INSIGHT = 'misconfiguration-insight' as const; -export const VULNERABILITIES_INSIGHT = 'vulnerabilities-insight' as const; +export const MISCONFIGURATION_INSIGHT = 'misconfiguration-insight-v2' as const; +export const VULNERABILITIES_INSIGHT = 'vulnerabilities-insight-v2' as const; export const MISCONFIGURATION_INSIGHT_HOST_DETAILS = `${MISCONFIGURATION_INSIGHT}-host-details` as const; export const MISCONFIGURATION_INSIGHT_USER_DETAILS = diff --git a/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/components/misconfiguration_insight.tsx b/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/components/misconfiguration_insight.tsx index 8bf6f587c4912..9aec2f44e6fa9 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/components/misconfiguration_insight.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/components/misconfiguration_insight.tsx @@ -87,19 +87,19 @@ export const MisconfigurationsInsight: React.FC = 'newExpandableFlyoutNavigationEnabled' ); - useEffect(() => { - if (telemetryKey) { - uiMetricService.trackUiMetric(METRIC_TYPE.COUNT, telemetryKey); - } - }, [telemetryKey, renderingId]); - const passedFindings = data?.count.passed || 0; const failedFindings = data?.count.failed || 0; const totalFindings = useMemo( () => passedFindings + failedFindings, [passedFindings, failedFindings] ); - const hasMisconfigurationFindings = totalFindings > 0; + const shouldRender = totalFindings > 0; // this component only renders if there are findings + + useEffect(() => { + if (shouldRender && telemetryKey) { + uiMetricService.trackUiMetric(METRIC_TYPE.COUNT, telemetryKey); + } + }, [shouldRender, telemetryKey, renderingId]); const misconfigurationsStats = useMemo( () => getFindingsStats(passedFindings, failedFindings), @@ -161,7 +161,7 @@ export const MisconfigurationsInsight: React.FC = ] ); - if (!hasMisconfigurationFindings) return null; + if (!shouldRender) return null; return ( diff --git a/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/components/vulnerabilities_insight.tsx b/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/components/vulnerabilities_insight.tsx index 68bdd303ef2dd..b031dbedec615 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/components/vulnerabilities_insight.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/components/vulnerabilities_insight.tsx @@ -84,19 +84,14 @@ export const VulnerabilitiesInsight: React.FC = ({ 'newExpandableFlyoutNavigationEnabled' ); - useEffect(() => { - if (telemetryKey) { - uiMetricService.trackUiMetric(METRIC_TYPE.COUNT, telemetryKey); - } - }, [telemetryKey, renderingId]); - const { CRITICAL = 0, HIGH = 0, MEDIUM = 0, LOW = 0, NONE = 0 } = data?.count || {}; const totalVulnerabilities = useMemo( () => CRITICAL + HIGH + MEDIUM + LOW + NONE, [CRITICAL, HIGH, MEDIUM, LOW, NONE] ); - const hasVulnerabilitiesFindings = useMemo( + // this component only renders if there are findings + const shouldRender = useMemo( () => hasVulnerabilitiesData({ critical: CRITICAL, @@ -108,6 +103,12 @@ export const VulnerabilitiesInsight: React.FC = ({ [CRITICAL, HIGH, MEDIUM, LOW, NONE] ); + useEffect(() => { + if (shouldRender && telemetryKey) { + uiMetricService.trackUiMetric(METRIC_TYPE.COUNT, telemetryKey); + } + }, [shouldRender, telemetryKey, renderingId]); + const vulnerabilitiesStats = useMemo( () => getVulnerabilityStats( @@ -177,7 +178,7 @@ export const VulnerabilitiesInsight: React.FC = ({ ] ); - if (!hasVulnerabilitiesFindings) return null; + if (!shouldRender) return null; return (