Merge branch 'hotfix/19.0.2'

Author: jamescdavis

CHANGELOG.md

@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [19.0.2] - 2019-01-08
+### Changed
+- Routes
+ - `goodbye` - add page tracking
+ - `guid-node.forks` - accurately report resource privacy and type when page tracking
+ - `guid-node.registrations` - accurately report resource privacy and type when page tracking
+ - `guid-registration.forks` - add page tracking
+ - `guid-user.quickfiles` - add resource type to page tracking
+ - `settings.tokens.create` - add page tracking
+ - `settings.tokens.edit` - - add page tracking
+ - `settings.tokens.index` - add page tracking
+- Engines:
+ - `analytics-page` - accurately report resource privacy and type when page tracking
+
 ## [19.0.1] - 2019-01-04
 ### Fixed
 - Routes:

app/dashboard/route.ts

@@ -29,6 +29,6 @@ export default class Dashboard extends Route {
 
  @action
  didTransition(this: Dashboard) {
- this.get('analytics').trackPage();
+ this.analytics.trackPage();
  }
 }

app/goodbye/route.ts

@@ -1,14 +1,23 @@
+import { action } from '@ember-decorators/object';
 import { service } from '@ember-decorators/service';
 import Route from '@ember/routing/route';
 import Ember from 'ember';
 import Session from 'ember-simple-auth/services/session';
 
+import Analytics from 'ember-osf-web/services/analytics';
+
 export default class Goodbye extends Route {
+ @service analytics!: Analytics;
  @service session!: Session;
 
  async beforeModel(this: Goodbye, transition: Ember.Transition) {
  await super.beforeModel(transition);
  const queryParams = this.session.isAuthenticated ? {} : { goodbye: true };
  this.transitionTo('home', { queryParams });
  }
+
+ @action
+ didTransition() {
+ this.analytics.trackPage();
+ }
 }

app/guid-node/forks/route.ts

@@ -2,6 +2,8 @@ import { action } from '@ember-decorators/object';
 import { service } from '@ember-decorators/service';
 import Route from '@ember/routing/route';
 
+import Node from 'ember-osf-web/models/node';
+import { GuidRouteModel } from 'ember-osf-web/resolve-guid/guid-route';
 import Analytics from 'ember-osf-web/services/analytics';
 import Ready from 'ember-osf-web/services/ready';
 
@@ -14,7 +16,10 @@ export default class GuidNodeForks extends Route {
  }
 
  @action
- didTransition() {
- this.analytics.trackPage(true);
+ async didTransition() {
+ const { taskInstance } = this.controller.model as GuidRouteModel<Node>;
+ await taskInstance;
+ const node = taskInstance.value;
+ this.analytics.trackPage(node ? node.public : undefined, 'nodes');
  }
 }

app/guid-node/registrations/route.ts

@@ -21,7 +21,10 @@ export default class GuidNodeRegistrations extends Route {
  }
 
  @action
- didTransition() {
- this.analytics.trackPage(true);
+ async didTransition() {
+ const { taskInstance } = this.controller.model as GuidRouteModel<Node>;
+ await taskInstance;
+ const node = taskInstance.value;
+ this.analytics.trackPage(node ? node.public : undefined, 'nodes');
  }
 }

app/guid-registration/forks/route.ts

@@ -1,12 +1,25 @@
+import { action } from '@ember-decorators/object';
 import { service } from '@ember-decorators/service';
 import Route from '@ember/routing/route';
 
+import Registration from 'ember-osf-web/models/registration';
+import { GuidRouteModel } from 'ember-osf-web/resolve-guid/guid-route';
+import Analytics from 'ember-osf-web/services/analytics';
 import Ready from 'ember-osf-web/services/ready';
 
 export default class GuidRegistrationForks extends Route {
+ @service analytics!: Analytics;
  @service ready!: Ready;
 
  model(this: GuidRegistrationForks) {
  return this.modelFor('guid-registration');
  }
+
+ @action
+ async didTransition() {
+ const { taskInstance } = this.controller.model as GuidRouteModel<Registration>;
+ await taskInstance;
+ const registration = taskInstance.value;
+ this.analytics.trackPage(registration ? registration.public : undefined, 'registrations');
+ }
 }

app/guid-user/quickfiles/route.ts

@@ -62,6 +62,6 @@ export default class UserQuickfiles extends Route.extend({
  window.addEventListener('dragover', preventDrop);
  window.addEventListener('drop', preventDrop);
 
- this.analytics.trackPage(true);
+ this.analytics.trackPage(true, 'users');
  }
 }

app/home/route.ts

@@ -20,6 +20,6 @@ export default class Home extends Route {
 
  @action
  didTransition(this: Home) {
- this.get('analytics').trackPage();
+ this.analytics.trackPage();
  }
 }

app/register/route.ts

@@ -24,6 +24,6 @@ export default class Register extends Route {
 
  @action
  didTransition(this: Register) {
- this.get('analytics').trackPage();
+ this.analytics.trackPage();
  }
 }

app/services/analytics.ts

@@ -1,5 +1,6 @@
 import { action } from '@ember-decorators/object';
 import { service } from '@ember-decorators/service';
+import { debug } from '@ember/debug';
 import Service from '@ember/service';
 import { task, waitForQueue } from 'ember-concurrency';
 import config from 'ember-get-config';
@@ -22,6 +23,8 @@ export default class Analytics extends Service {
  // Wait until everything has settled
  yield waitForQueue('destroy');
 
+ debug(`Track Page: pagePublic: ${pagePublic}, resourceType: ${resourceType}`);
+
  const eventParams = {
  page: this.router.currentURL,
  title: this.router.currentRouteName,