From 53f1890ad716f2a0b85f52e295d2a42be199f115 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Tue, 26 Sep 2017 11:09:14 +0100 Subject: [PATCH] tracking: Fix in-flight collision of two related PRs Unfortunately, I forgot to rebase before renaming trackMixpanelEvent() and a PR adding a new trace point was already in-flight. More precisely: - https://github.com/weaveworks/scope/pull/2861 renames trackMixpanelEvent() to trackAnalysticsEent() - https://github.com/weaveworks/scope/pull/2857 add a new trackMixpanelEvent() call. Each PR is fine, but with the merge of both without rebasing any, we end up with master having a dandling call to trackMixpanelEvent(). --- .../components/node-details/node-details-control-button.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/app/scripts/components/node-details/node-details-control-button.js b/client/app/scripts/components/node-details/node-details-control-button.js index f1d1f83ba..5e73ae69c 100644 --- a/client/app/scripts/components/node-details/node-details-control-button.js +++ b/client/app/scripts/components/node-details/node-details-control-button.js @@ -1,7 +1,7 @@ import React from 'react'; import { connect } from 'react-redux'; -import { trackMixpanelEvent } from '../../utils/tracking-utils'; +import { trackAnalyticsEvent } from '../../utils/tracking-utils'; import { doControl } from '../../actions/app-actions'; class NodeDetailsControlButton extends React.Component { @@ -23,7 +23,7 @@ class NodeDetailsControlButton extends React.Component { handleClick(ev) { ev.preventDefault(); const { id, human } = this.props.control; - trackMixpanelEvent('scope.node.control.click', { id, title: human }); + trackAnalyticsEvent('scope.node.control.click', { id, title: human }); this.props.dispatch(doControl(this.props.nodeId, this.props.control)); } }