github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-05-06 01:08:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

tracking: Fix in-flight collision of two related PRs

Browse Source 
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().
This commit is contained in:
Damien Lespiau
2017-09-26 11:09:14 +01:00
parent c74e683a26
commit 53f1890ad7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/app/scripts/components/node-details/node-details-control-button.js
View File

@@ -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));
}
}