From 5ea1ac6e72154206d143dde417236bed90b1ad8a Mon Sep 17 00:00:00 2001 From: mech Date: Wed, 22 Nov 2017 12:08:27 +0100 Subject: [PATCH 1/6] PLATFORM-3220: switch bucky to https domain --- config/environment.js | 2 +- mirage/config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/environment.js b/config/environment.js index 0ebd026be8e..ad8f7ad4b12 100644 --- a/config/environment.js +++ b/config/environment.js @@ -21,7 +21,7 @@ module.exports = function (environment) { }, weppy: { enabled: false, - host: 'http://speed.wikia.net/__rum', + host: 'https://speed.nocookie.net/__rum', samplingRate: 0.1, aggregationInterval: 1000 }, diff --git a/mirage/config.js b/mirage/config.js index 37d52025526..1d7b1ee2824 100644 --- a/mirage/config.js +++ b/mirage/config.js @@ -11,7 +11,7 @@ export default function () { this.passthrough('https://services.wikia.com/**'); this.passthrough('/wikia.php'); this.passthrough('/api.php'); - this.passthrough('http://speed.wikia.net/**'); + this.passthrough('https://speed.nocookie.net/**'); // We have /front/main/assets prefix hardcoded in route and testem use /assets // This is a quick (hopefully temporary) fix From 90b7cfc7e965eb757980df493912d8c1a0dd272f Mon Sep 17 00:00:00 2001 From: Mateusz Rybarski Date: Fri, 24 Nov 2017 15:59:25 +0100 Subject: [PATCH 2/6] XW-4282: remove connection-type tracking --- app/controllers/application.js | 10 ---------- app/mixins/connection-type.js | 15 --------------- 2 files changed, 25 deletions(-) delete mode 100644 app/mixins/connection-type.js diff --git a/app/controllers/application.js b/app/controllers/application.js index 286ceb1c5df..1caee0b4ecc 100644 --- a/app/controllers/application.js +++ b/app/controllers/application.js @@ -6,13 +6,11 @@ import Controller, {inject as controller} from '@ember/controller'; import MediaModel from '../models/media'; import AlertNotificationsMixin from '../mixins/alert-notifications'; import NoScrollMixin from '../mixins/no-scroll'; -import ConnectionTypeMixin from '../mixins/connection-type'; import {track, trackActions} from '../utils/track'; export default Controller.extend( AlertNotificationsMixin, NoScrollMixin, - ConnectionTypeMixin, { // This has to be here because we need to access media from ArticleController model to open // lightbox TODO: Should be refactored when decoupling article from application @@ -67,14 +65,6 @@ export default Controller.extend( }); this._super(); - - if (this.get('effectiveConnectionType')) { - track({ - action: trackActions.view, - category: 'connection-type', - label: this.get('effectiveConnectionType') - }); - } }, actions: { diff --git a/app/mixins/connection-type.js b/app/mixins/connection-type.js deleted file mode 100644 index 5b03032d241..00000000000 --- a/app/mixins/connection-type.js +++ /dev/null @@ -1,15 +0,0 @@ -import {inject as service} from '@ember/service'; -import Mixin from '@ember/object/mixin'; -import {computed} from '@ember/object'; - -export default Mixin.create({ - fastboot: service(), - connection: computed('fastboot.isFastBoot', function () { - if (!this.get('fastboot.isFastBoot')) { - return navigator.connection || navigator.mozConnection || navigator.webkitConnection; - } - }), - effectiveConnectionType: computed('connection', function () { - return this.get('connection.effectiveType'); - }) -}); From 3ca35cb4b7832a6ae043b45a6c74d3910f756d06 Mon Sep 17 00:00:00 2001 From: Mateusz Rybarski Date: Fri, 24 Nov 2017 16:00:53 +0100 Subject: [PATCH 3/6] XW-4282: remove tracking of sessions between mobile-wiki and WikiaMobile --- app/controllers/application.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/controllers/application.js b/app/controllers/application.js index 1caee0b4ecc..656ee44a93a 100644 --- a/app/controllers/application.js +++ b/app/controllers/application.js @@ -6,7 +6,6 @@ import Controller, {inject as controller} from '@ember/controller'; import MediaModel from '../models/media'; import AlertNotificationsMixin from '../mixins/alert-notifications'; import NoScrollMixin from '../mixins/no-scroll'; -import {track, trackActions} from '../utils/track'; export default Controller.extend( AlertNotificationsMixin, @@ -56,14 +55,6 @@ export default Controller.extend( language: this.get('wikiVariables.language') }); - // This event is for tracking mobile sessions between Mercury and WikiaMobile - // NOTE: this event won't have additional dimensions set up from API, ie. #19 (articleType) - track({ - action: trackActions.impression, - category: 'app', - label: 'load' - }); - this._super(); }, From 74acb3efe95c2f85716d3f9ded03090aae20e2e9 Mon Sep 17 00:00:00 2001 From: Mateusz Rybarski Date: Fri, 24 Nov 2017 16:12:48 +0100 Subject: [PATCH 4/6] XW-4282: remove tracking to special profile --- config/environment.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/environment.js b/config/environment.js index 0ebd026be8e..7a29fd67c83 100644 --- a/config/environment.js +++ b/config/environment.js @@ -46,11 +46,6 @@ module.exports = function (environment) { id: 'UA-32129071-1', sampleRate: 100 }, - special: { - prefix: 'special', - id: 'UA-32132943-1', - sampleRate: 100 - }, scriptUrl: 'https://www.google-analytics.com/analytics.js' }, quantcast: { From e1a1c0e37f5dae5b80d104021373a5b2e3857414 Mon Sep 17 00:00:00 2001 From: Mateusz Rybarski Date: Mon, 27 Nov 2017 10:10:43 +0100 Subject: [PATCH 5/6] XW-4282: remove tracking from article-media-map --- app/components/article-media-map-thumbnail.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/components/article-media-map-thumbnail.js b/app/components/article-media-map-thumbnail.js index bb01d1bbc28..8fed30c70f6 100644 --- a/app/components/article-media-map-thumbnail.js +++ b/app/components/article-media-map-thumbnail.js @@ -19,12 +19,6 @@ export default Component.extend(RenderComponentMixin, { if (url) { this.get('logger').debug('Handling map with id:', id, 'and title:', title); - track({ - action: trackActions.click, - category: 'map', - label: 'open' - }); - this.get('openLightbox')('map', { id, title, From 74e2325c46d620363f4dda663debf19cbc10c00d Mon Sep 17 00:00:00 2001 From: Mateusz Rybarski Date: Mon, 27 Nov 2017 10:15:56 +0100 Subject: [PATCH 6/6] XW-4282: unused import --- app/components/article-media-map-thumbnail.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/components/article-media-map-thumbnail.js b/app/components/article-media-map-thumbnail.js index 8fed30c70f6..296d261eb9f 100644 --- a/app/components/article-media-map-thumbnail.js +++ b/app/components/article-media-map-thumbnail.js @@ -1,6 +1,5 @@ import {inject as service} from '@ember/service'; import Component from '@ember/component'; -import {track, trackActions} from '../utils/track'; import RenderComponentMixin from '../mixins/render-component'; export default Component.extend(RenderComponentMixin, {