+
{% data ui.support.still_need_help %}
diff --git a/javascripts/events.js b/javascripts/events.js
index 5ec3540242..27a9d9b254 100644
--- a/javascripts/events.js
+++ b/javascripts/events.js
@@ -27,7 +27,7 @@ export function getUserEventsId () {
return cookieValue
}
-export async function sendEvent ({
+export function sendEvent ({
type,
version = '1.0.0',
page_render_duration,
@@ -141,7 +141,7 @@ function trackScroll () {
if (scrollPosition > maxScrollY) maxScrollY = scrollPosition
}
-async function sendExit () {
+function sendExit () {
if (sentExit) return
if (document.visibilityState !== 'hidden') return
if (!pageEventId) return
@@ -162,14 +162,44 @@ async function sendExit () {
})
}
-export default async function initializeEvents () {
+export default function initializeEvents () {
// Page event
const { render } = getPerformance()
- const pageEvent = await sendEvent({
+ const pageEvent = sendEvent({
type: 'page',
page_render_duration: render
})
+ // Link event
+ document.documentElement.addEventListener('click', evt => {
+ const link = evt.target.closest('a[href^="http"]')
+ if (!link) return
+ sendEvent({
+ type: 'link',
+ link_url: link.href
+ })
+ })
+
+ // Navigate event
+ Array.from(
+ document.querySelectorAll('.sidebar-products details')
+ ).forEach(details => details.addEventListener(
+ 'toggle',
+ evt => sendEvent({
+ type: 'navigate',
+ navigate_label: `details ${evt.target.open ? 'open' : 'close'}: ${evt.target.querySelector('summary').innerText}`
+ })
+ ))
+
+ document.querySelector('.sidebar-products').addEventListener('click', evt => {
+ const link = evt.target.closest('a')
+ if (!link) return
+ sendEvent({
+ type: 'navigate',
+ navigate_label: `link: ${link.href}`
+ })
+ })
+
// Exit event
pageEventId = pageEvent?.context?.event_id
window.addEventListener('scroll', trackScroll)
diff --git a/javascripts/google-analytics.js b/javascripts/google-analytics.js
deleted file mode 100644
index 9e45eeaa14..0000000000
--- a/javascripts/google-analytics.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/* eslint-disable */
-
-export default function () {
- (function (i, s, o, g, r, a, m) {
- i.GoogleAnalyticsObject = r; i[r] = i[r] || function () {
- (i[r].q = i[r].q || []).push(arguments)
- }, i[r].l = 1 * new Date(); a = s.createElement(o),
- m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
- })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga')
-
- ga('create', 'UA-3769691-27', 'auto')
- ga('send', 'pageview')
-}
diff --git a/javascripts/index.js b/javascripts/index.js
index 12bf1f341a..8d381eff36 100644
--- a/javascripts/index.js
+++ b/javascripts/index.js
@@ -5,7 +5,6 @@ import explorer from './explorer'
import search from './search'
import nav from './nav'
import browserDateFormatter from 'browser-date-formatter'
-import googleAnalytics from './google-analytics'
import deprecationBanner from './deprecation-banner'
import sidebar from './sidebar'
import wrapCodeTerms from './wrap-code-terms'
@@ -23,7 +22,6 @@ document.addEventListener('DOMContentLoaded', async () => {
search()
nav()
browserDateFormatter()
- googleAnalytics()
deprecationBanner()
sidebar()
wrapCodeTerms()
diff --git a/javascripts/print.js b/javascripts/print.js
index d25efd3a1d..fab075c5f8 100644
--- a/javascripts/print.js
+++ b/javascripts/print.js
@@ -1,3 +1,5 @@
+import { sendEvent } from './events'
+
export default function () {
const printButton = document.querySelector('.js-print')
@@ -10,11 +12,6 @@ export default function () {
// Track print events
window.onbeforeprint = function () {
- // Ensure that Google Analytics was registered
- if (!window.ga) return
- const category = 'Print'
- const action = 'print'
- const label = 'print'
- window.ga('send', 'event', category, action, label)
+ sendEvent({ type: 'print' })
}
}
diff --git a/javascripts/search.js b/javascripts/search.js
index 155082ee5c..4f9f5fd8db 100644
--- a/javascripts/search.js
+++ b/javascripts/search.js
@@ -1,5 +1,6 @@
+import { sendEvent } from './events'
const instantsearch = require('instantsearch.js').default
-const { searchBox, hits, configure } = require('instantsearch.js/es/widgets')
+const { searchBox, hits, configure, analytics } = require('instantsearch.js/es/widgets')
const algoliasearch = require('algoliasearch')
const searchWithYourKeyboard = require('search-with-your-keyboard')
const querystring = require('querystring')
@@ -162,6 +163,15 @@ export default function () {
autofocus: (hasStandaloneSearch()) && !window.location.hash.length,
showReset: false,
showSubmit: false
+ }),
+ analytics({
+ pushFunction (params, state, results) {
+ sendEvent({
+ type: 'search',
+ search_query: results.query
+ // search_context
+ })
+ }
})
]
)
diff --git a/middleware/render-page.js b/middleware/render-page.js
index cd0c84965f..1d3e3880ae 100644
--- a/middleware/render-page.js
+++ b/middleware/render-page.js
@@ -6,8 +6,21 @@ const layouts = require('../lib/layouts')
const getMiniTocItems = require('../lib/get-mini-toc-items')
const Page = require('../lib/page')
+// We've got lots of memory, let's use it
+// We can eventually throw this into redis
+const pageCache = {}
+
module.exports = async function renderPage (req, res, next) {
const page = req.context.page
+ const originalUrl = req.originalUrl
+
+ // Serve from the cache if possible
+ if (!process.env.CI) {
+ if (req.method === 'GET' && pageCache[originalUrl]) {
+ console.log(`Serving from cached version of ${originalUrl}`)
+ return res.send(pageCache[originalUrl])
+ }
+ }
// render a 404 page
if (!page) {
@@ -74,5 +87,13 @@ module.exports = async function renderPage (req, res, next) {
const output = await liquid.parseAndRender(layout, context)
- res.send(output)
+ // Save output to cache for the next time around
+ if (!process.env.CI) {
+ if (req.method === 'GET') {
+ pageCache[originalUrl] = output
+ }
+ }
+
+ // send response
+ return res.send(output)
}
diff --git a/tests/browser/browser.js b/tests/browser/browser.js
index 4429471e1d..11134c7914 100644
--- a/tests/browser/browser.js
+++ b/tests/browser/browser.js
@@ -92,28 +92,6 @@ describe('algolia browser search', () => {
})
})
-describe('google analytics', () => {
- it('is set on page load with expected properties', async () => {
- await page.goto('http://localhost:4001/en/actions')
-
- // check that GA global object exists and is a function
- const gaObjectType = await page.evaluate(() => typeof window.ga)
- expect(gaObjectType).toBe('function')
-
- // check that default tracker is set
- // https://developers.google.com/analytics/devguides/collection/analyticsjs/ga-object-methods-reference#getByName
- const gaDefaultTracker = await page.evaluate(() => window.ga.getByName('t0'))
- expect('filters' in gaDefaultTracker).toBe(true)
- expect(Object.keys(gaDefaultTracker)).toHaveLength(3)
-
- // check that default cookies are set
- // https://developers.google.com/analytics/devguides/collection/analyticsjs/cookie-usage#analyticsjs
- const cookies = await page.cookies()
- expect(cookies.some(cookie => cookie.name === '_gat')).toBe(true)
- expect(cookies.some(cookie => cookie.name === '_gid')).toBe(true)
- })
-})
-
describe('helpfulness', () => {
it('sends an event to /events when submitting form', async () => {
// Visit a page that displays the prompt
@@ -122,8 +100,8 @@ describe('helpfulness', () => {
// Track network requests
await page.setRequestInterception(true)
page.on('request', request => {
- // Ignore GET to google analytics
- if (!/\/events/.test(request.method())) return request.continue()
+ // Ignore GET requests
+ if (!/\/events$/.test(request.url())) return request.continue()
expect(request.method()).toMatch(/POST|PUT/)
request.respond({
contentType: 'application/json',