Enable exhaustive-deps; correct any lint warnings

elastic · Jun 5, 2020 · 449a767 · 449a767
1 parent e3d88a4
commit 449a767
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -91,7 +91,6 @@ module.exports = {
     {
       files: ['x-pack/plugins/canvas/**/*.{js,ts,tsx}'],
       rules: {
-        'react-hooks/exhaustive-deps': 'off',
         'jsx-a11y/click-events-have-key-events': 'off',
       },
     },

diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.tsx b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.tsx
@@ -69,6 +69,7 @@ export const withUnconnectedElementsLoadedTelemetry = <P extends {}>(
 ) =>
   function ElementsLoadedTelemetry(props: ElementsLoadedTelemetryProps) {
     const { telemetryElementCounts, workpad, telemetryResolvedArgs, ...other } = props;
+    const { error, pending } = telemetryElementCounts;
 
     const [currentWorkpadId, setWorkpadId] = useState<string | undefined>(undefined);
     const [hasReported, setHasReported] = useState(false);
@@ -87,27 +88,20 @@ export const withUnconnectedElementsLoadedTelemetry = <P extends {}>(
           0
         );
 
-        if (
-          workpadElementCount === 0 ||
-          (resolvedArgsAreForWorkpad && telemetryElementCounts.pending === 0)
-        ) {
+        if (workpadElementCount === 0 || (resolvedArgsAreForWorkpad && pending === 0)) {
           setHasReported(true);
         } else {
           setHasReported(false);
         }
-      } else if (
-        !hasReported &&
-        telemetryElementCounts.pending === 0 &&
-        resolvedArgsAreForWorkpad
-      ) {
-        if (telemetryElementCounts.error > 0) {
+      } else if (!hasReported && pending === 0 && resolvedArgsAreForWorkpad) {
+        if (error > 0) {
           trackMetric(METRIC_TYPE.LOADED, [WorkpadLoadedMetric, WorkpadLoadedWithErrorsMetric]);
         } else {
           trackMetric(METRIC_TYPE.LOADED, WorkpadLoadedMetric);
         }
         setHasReported(true);
       }
-    });
+    }, [currentWorkpadId, hasReported, error, pending, telemetryResolvedArgs, workpad]);
 
     return <Component {...(other as P)} workpad={workpad} />;
   };