Skip to content

Commit ffe6ac1

Browse files
Enable exhaustive-deps; correct any lint warnings (#68453)
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
1 parent 8e3b5d9 commit ffe6ac1

2 files changed

Lines changed: 5 additions & 12 deletions

File tree

.eslintrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ module.exports = {
9797
{
9898
files: ['x-pack/plugins/canvas/**/*.{js,ts,tsx}'],
9999
rules: {
100-
'react-hooks/exhaustive-deps': 'off',
101100
'jsx-a11y/click-events-have-key-events': 'off',
102101
},
103102
},

x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.tsx

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ export const withUnconnectedElementsLoadedTelemetry = <P extends {}>(
6969
) =>
7070
function ElementsLoadedTelemetry(props: ElementsLoadedTelemetryProps) {
7171
const { telemetryElementCounts, workpad, telemetryResolvedArgs, ...other } = props;
72+
const { error, pending } = telemetryElementCounts;
7273

7374
const [currentWorkpadId, setWorkpadId] = useState<string | undefined>(undefined);
7475
const [hasReported, setHasReported] = useState(false);
@@ -87,27 +88,20 @@ export const withUnconnectedElementsLoadedTelemetry = <P extends {}>(
8788
0
8889
);
8990

90-
if (
91-
workpadElementCount === 0 ||
92-
(resolvedArgsAreForWorkpad && telemetryElementCounts.pending === 0)
93-
) {
91+
if (workpadElementCount === 0 || (resolvedArgsAreForWorkpad && pending === 0)) {
9492
setHasReported(true);
9593
} else {
9694
setHasReported(false);
9795
}
98-
} else if (
99-
!hasReported &&
100-
telemetryElementCounts.pending === 0 &&
101-
resolvedArgsAreForWorkpad
102-
) {
103-
if (telemetryElementCounts.error > 0) {
96+
} else if (!hasReported && pending === 0 && resolvedArgsAreForWorkpad) {
97+
if (error > 0) {
10498
trackMetric(METRIC_TYPE.LOADED, [WorkpadLoadedMetric, WorkpadLoadedWithErrorsMetric]);
10599
} else {
106100
trackMetric(METRIC_TYPE.LOADED, WorkpadLoadedMetric);
107101
}
108102
setHasReported(true);
109103
}
110-
});
104+
}, [currentWorkpadId, hasReported, error, pending, telemetryResolvedArgs, workpad]);
111105

112106
return <Component {...(other as P)} workpad={workpad} />;
113107
};

0 commit comments

Comments
 (0)