From 86b92f36a6cbbcdf49bfdd720415f85b4ba5308e Mon Sep 17 00:00:00 2001
From: Marta Bondyra <marta.bondyra@elastic.co>
Date: Thu, 15 Aug 2024 16:56:12 +0200
Subject: [PATCH] simplify

---
 .../vis_types/vislib/public/vis_wrapper.tsx   | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/plugins/vis_types/vislib/public/vis_wrapper.tsx b/src/plugins/vis_types/vislib/public/vis_wrapper.tsx
index 87f192afd0ecd..262f6cc70038a 100644
--- a/src/plugins/vis_types/vislib/public/vis_wrapper.tsx
+++ b/src/plugins/vis_types/vislib/public/vis_wrapper.tsx
@@ -46,23 +46,24 @@ const extractContainerType = (context?: KibanaExecutionContext): string | undefi
 const VislibWrapper = ({ core, charts, visData, visConfig, handlers }: VislibWrapperProps) => {
   const chartDiv = useRef<HTMLDivElement>(null);
   const visController = useRef<VislibVisController | null>(null);
-  const shouldCountRender = useRef<boolean>(false);
+  const skipRenderComplete = useRef<boolean>(true);
 
   const renderComplete = useCallback(() => {
-    if (shouldCountRender.current) {
-      const usageCollection = getUsageCollectionStart();
-      const containerType = extractContainerType(handlers.getExecutionContext());
-
-      if (usageCollection && containerType) {
-        usageCollection.reportUiCounter(
-          containerType,
-          METRIC_TYPE.COUNT,
-          `render_agg_based_${visConfig!.type}`
-        );
-      }
-      handlers.done();
-      shouldCountRender.current = false;
+    if (skipRenderComplete.current) {
+      return;
+    }
+    const usageCollection = getUsageCollectionStart();
+    const containerType = extractContainerType(handlers.getExecutionContext());
+
+    if (usageCollection && containerType) {
+      usageCollection.reportUiCounter(
+        containerType,
+        METRIC_TYPE.COUNT,
+        `render_agg_based_${visConfig!.type}`
+      );
     }
+    handlers.done();
+    skipRenderComplete.current = true;
   }, [handlers, visConfig]);
 
   const renderChart = useMemo(
@@ -80,7 +81,7 @@ const VislibWrapper = ({ core, charts, visData, visConfig, handlers }: VislibWra
   }, [renderChart]);
 
   useEffect(() => {
-    shouldCountRender.current = true;
+    skipRenderComplete.current = false;
     renderChart();
   }, [renderChart]);