move trackpageload call to dbmetaepics

Author: daveajrussell

src/browser/modules/App/App.tsx

@@ -96,7 +96,6 @@ import {
   updateUdcData
 } from 'shared/modules/udc/udcDuck'
 import { getTelemetrySettings } from 'shared/utils/selectors'
-import { trackPageLoad } from 'shared/modules/preview/previewDuck'
 
 export const MAIN_WRAPPER_DOM_ID = 'MAIN_WRAPPER_DOM_ID'
 
@@ -150,11 +149,6 @@ export function App(props: any) {
     props.bus && props.bus.send(initAction.type, initAction)
   }, [props.bus])
 
-  useEffect(() => {
-    const pageLoadAction = trackPageLoad()
-    props.bus && props.bus.send(pageLoadAction.type, pageLoadAction)
-  }, [props.bus, props.telemetrySettings.allowUserStats])
-
   const {
     browserSyncAuthStatus,
     browserSyncConfig,

src/shared/modules/dbMeta/dbMetaEpics.ts

@@ -97,6 +97,7 @@ import {
   getCurrentDatabase
 } from 'shared/utils/selectors'
 import { isBoltConnectionErrorCode } from 'services/bolt/boltConnectionErrors'
+import { trackPageLoad } from '../preview/previewDuck'
 
 function handleConnectionError(store: any, e: any) {
   if (!e.code || isBoltConnectionErrorCode(e.code)) {
@@ -546,6 +547,12 @@ export const serverConfigEpic = (some$: any, store: any) =>
             store.dispatch(triggerCredentialsTimeout())
           }
 
+          setTimeout(() => {
+            // Track page load after server config is done
+            // setTimeout ensures telemetry settings have been propagated to the App
+            store.dispatch(trackPageLoad())
+          })
+
           return Rx.Observable.of(null)
         })
     })

src/shared/modules/preview/previewDuck.test.ts

@@ -48,7 +48,7 @@ describe('previewDuck tests', () => {
       const [action] = store.getActions()
       expect(action).toEqual({
         type: PREVIEW_EVENT,
-        label: 'ui-switch',
+        label: 'PREVIEW_UI_SWITCH',
         data: {
           switchedTo: 'preview',
           timeSinceLastSwitch: null
@@ -113,7 +113,7 @@ describe('previewDuck tests', () => {
       const [action] = store.getActions()
       expect(action).toEqual({
         type: PREVIEW_EVENT,
-        label: 'page-load',
+        label: 'PREVIEW_PAGE_LOAD',
         data: { previewUI: false, hasTriedPreviewUI: false }
       })
       done()

src/shared/modules/preview/previewDuck.ts

@@ -47,7 +47,7 @@ export const trackNavigateToPreview = (): PreviewEventAction => {
 
   return {
     type: PREVIEW_EVENT,
-    label: 'ui-switch',
+    label: 'PREVIEW_UI_SWITCH',
     data: {
       switchedTo: 'preview',
       timeSinceLastSwitch: timeSinceLastSwitch
@@ -60,7 +60,7 @@ export const trackPageLoad = (): PreviewEventAction => {
 
   return {
     type: PREVIEW_EVENT,
-    label: 'page-load',
+    label: 'PREVIEW_PAGE_LOAD',
     data: { previewUI: false, hasTriedPreviewUI }
   }
 }