-
Notifications
You must be signed in to change notification settings - Fork 485
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Integrate Google Analytics into Search Page #220
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,4 +14,5 @@ coverage | |
.DS_Store | ||
npm-debug.log | ||
.vscode | ||
.idea | ||
yarn-error.log |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,6 +32,8 @@ import { formatDate, formatTime } from '../../utils/date'; | |
import reduxFormFieldAdapter from '../../utils/redux-form-field-adapter'; | ||
|
||
import './SearchForm.css'; | ||
import { trackEvent } from '../../utils/tracking'; | ||
import { CATEGORY_BASE } from './SearchForm.track'; | ||
|
||
const FormItem = Form.Item; | ||
const Option = Select.Option; | ||
|
@@ -40,6 +42,21 @@ const AdaptedInput = reduxFormFieldAdapter(Input); | |
const AdaptedSelect = reduxFormFieldAdapter(Select); | ||
const AdaptedVirtualSelect = reduxFormFieldAdapter(VirtSelect, option => (option ? option.value : null)); | ||
|
||
const DEFAULT_OPERATION = 'all'; | ||
const DEFAULT_LOOKBACK = '1h'; | ||
const DEFAULT_LIMIT = 20; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please move these constants into |
||
|
||
const ACTION_SET = 'set'; | ||
const ACTION_CLEAR = 'clear'; | ||
const ACTION_DEFAULT = 'default'; | ||
|
||
export const CATEGORY_OPERATION = `${CATEGORY_BASE}/operation`; | ||
export const CATEGORY_LOOKBACK = `${CATEGORY_BASE}/lookback`; | ||
export const CATEGORY_TAGS = `${CATEGORY_BASE}/tags`; | ||
export const CATEGORY_MIN_DURATION = `${CATEGORY_BASE}/min_duration`; | ||
export const CATEGORY_MAX_DURATION = `${CATEGORY_BASE}/max_duration`; | ||
export const CATEGORY_LIMIT = `${CATEGORY_BASE}/limit`; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Upon reflection, please add
|
||
|
||
export function getUnixTimeStampInMSFromForm({ startDate, startDateTime, endDate, endDateTime }) { | ||
const start = `${startDate} ${startDateTime}`; | ||
const end = `${endDate} ${endDateTime}`; | ||
|
@@ -96,6 +113,15 @@ export function convertQueryParamsToFormDates({ start, end }) { | |
}; | ||
} | ||
|
||
function trackFormInput(resultsLimit, operation, tags, minDuration, maxDuration, lookback) { | ||
trackEvent(CATEGORY_OPERATION, operation === DEFAULT_OPERATION ? ACTION_DEFAULT : ACTION_SET, operation); | ||
trackEvent(CATEGORY_LIMIT, resultsLimit === DEFAULT_LIMIT ? ACTION_DEFAULT : ACTION_SET, resultsLimit); | ||
trackEvent(CATEGORY_TAGS, tags ? ACTION_SET : ACTION_CLEAR, tags); | ||
trackEvent(CATEGORY_MAX_DURATION, maxDuration ? ACTION_SET : ACTION_CLEAR, maxDuration); | ||
trackEvent(CATEGORY_MIN_DURATION, minDuration ? ACTION_SET : ACTION_CLEAR, minDuration); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hm, why are the values being passed into |
||
trackEvent(CATEGORY_LOOKBACK, lookback); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please move this and the related constants |
||
|
||
export function submitForm(fields, searchTraces) { | ||
const { | ||
resultsLimit, | ||
|
@@ -134,9 +160,11 @@ export function submitForm(fields, searchTraces) { | |
end = times.end; | ||
} | ||
|
||
trackFormInput(resultsLimit, operation, tags, minDuration, maxDuration, lookback); | ||
|
||
searchTraces({ | ||
service, | ||
operation: operation !== 'all' ? operation : undefined, | ||
operation: operation !== DEFAULT_OPERATION ? operation : undefined, | ||
limit: resultsLimit, | ||
lookback, | ||
start, | ||
|
@@ -459,13 +487,13 @@ export function mapStateToProps(state) { | |
destroyOnUnmount: false, | ||
initialValues: { | ||
service: service || lastSearchService || '-', | ||
resultsLimit: limit || 20, | ||
lookback: lookback || '1h', | ||
resultsLimit: limit || DEFAULT_LIMIT, | ||
lookback: lookback || DEFAULT_LOOKBACK, | ||
startDate: queryStartDate || today, | ||
startDateTime: queryStartDateTime || '00:00', | ||
endDate: queryEndDate || today, | ||
endDateTime: queryEndDateTime || currentTime, | ||
operation: operation || lastSearchOperation || 'all', | ||
operation: operation || lastSearchOperation || DEFAULT_OPERATION, | ||
tags, | ||
minDuration: minDuration || null, | ||
maxDuration: maxDuration || null, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,12 +14,14 @@ | |
|
||
/* eslint-disable import/first */ | ||
jest.mock('store'); | ||
jest.mock('../../utils/tracking'); | ||
|
||
import React from 'react'; | ||
import { shallow } from 'enzyme'; | ||
import moment from 'moment'; | ||
import queryString from 'query-string'; | ||
import store from 'store'; | ||
import { trackEvent } from '../../utils/tracking'; | ||
|
||
import { | ||
convertQueryParamsToFormDates, | ||
|
@@ -29,6 +31,12 @@ import { | |
submitForm, | ||
traceIDsToQuery, | ||
SearchFormImpl as SearchForm, | ||
CATEGORY_OPERATION, | ||
CATEGORY_LIMIT, | ||
CATEGORY_TAGS, | ||
CATEGORY_MAX_DURATION, | ||
CATEGORY_MIN_DURATION, | ||
CATEGORY_LOOKBACK, | ||
} from './SearchForm'; | ||
import * as markers from './SearchForm.markers'; | ||
|
||
|
@@ -139,6 +147,7 @@ describe('submitForm()', () => { | |
resultsLimit: 20, | ||
service: 'svc-a', | ||
}; | ||
trackEvent.mockClear(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd say this might be better if it's in the test case... To make it clear it is only relevant in one test case? |
||
}); | ||
|
||
it('ignores `fields.operation` when it is "all"', () => { | ||
|
@@ -240,6 +249,22 @@ describe('submitForm()', () => { | |
expect(maxDuration).toBe(null); | ||
}); | ||
}); | ||
|
||
it('sends form input to GA', () => { | ||
submitForm(fields, searchTraces); | ||
expect(trackEvent.mock.calls.length).toBe(6); | ||
const categoriesTracked = trackEvent.mock.calls.map(call => call[0]).sort(); | ||
expect(categoriesTracked).toEqual( | ||
[ | ||
CATEGORY_OPERATION, | ||
CATEGORY_LIMIT, | ||
CATEGORY_TAGS, | ||
CATEGORY_MAX_DURATION, | ||
CATEGORY_MIN_DURATION, | ||
CATEGORY_LOOKBACK, | ||
].sort() | ||
); | ||
}); | ||
}); | ||
|
||
describe('<SearchForm>', () => { | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
// @flow | ||
|
||
// Copyright (c) 2017 Uber Technologies, Inc. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
import type { Store } from 'redux'; | ||
import { trackEvent } from '../../utils/tracking'; | ||
|
||
export const CATEGORY_BASE = 'jaeger/ux/trace/search'; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please remove the |
||
export const CATEGORY_SORTBY = `${CATEGORY_BASE}/sortby`; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Upon reflection, please change this category to include
|
||
export const FORM_CHANGE_ACTION_TYPE = '@@redux-form/CHANGE'; | ||
|
||
export const middlewareHooks = { | ||
[FORM_CHANGE_ACTION_TYPE]: (store: Store, action: any) => { | ||
if (action.meta.form === 'sortBy') { | ||
trackEvent(CATEGORY_SORTBY, action.payload); | ||
} | ||
}, | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
// Copyright (c) 2017 Uber Technologies, Inc. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Typo in the file name, F |
||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
/* eslint-disable import/first */ | ||
jest.mock('../../utils/tracking'); | ||
|
||
import { trackEvent } from '../../utils/tracking'; | ||
import * as track from '../SearchTracePage/SearchForm.track'; | ||
|
||
describe('middlewareHooks', () => { | ||
it('tracks a GA event for changing sort criteria', () => { | ||
const action = { meta: { form: 'sortBy' }, payload: 'MOST_RECENT' }; | ||
track.middlewareHooks[track.FORM_CHANGE_ACTION_TYPE]({}, action); | ||
expect(trackEvent.mock.calls.length).toBe(1); | ||
expect(trackEvent.mock.calls[0]).toEqual([track.CATEGORY_SORTBY, expect.any(String)]); | ||
}); | ||
}); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Imports are sorted alphabetically with more dots under less dots and css files that are imported for the side effect go below the other imports
Please adjust this in all cases