Skip to content

Commit 6796822

Browse files
authored
Merge pull request #361 from hmoco/feature/auto
[EOSF-601] Only send metrics when license is actually being saved
2 parents a774741 + c810f98 commit 6796822

File tree

3 files changed

+12
-29
lines changed

3 files changed

+12
-29
lines changed

app/controllers/submit.js

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -399,16 +399,6 @@ export default Ember.Controller.extend(Analytics, BasicsValidations, NodeActions
399399
basicsLicense,
400400
licenseValid
401401
});
402-
403-
if (this.get('initialLicenseChangeMade') || this.get('editMode')) {
404-
Ember.get(this, 'metrics')
405-
.trackEvent({
406-
category: 'dropdown',
407-
action: 'select',
408-
label: `${this.get('editMode') ? 'Edit' : 'Submit'} - Edit License`
409-
});
410-
}
411-
this.set('initialLicenseChangeMade', true);
412402
},
413403
applyLicenseToggle(apply) {
414404
this.set('applyLicense', apply);
@@ -762,6 +752,12 @@ export default Ember.Controller.extend(Analytics, BasicsValidations, NodeActions
762752
},
763753
license: this.get('basicsLicense.licenseType')
764754
});
755+
Ember.get(this, 'metrics')
756+
.trackEvent({
757+
category: 'dropdown',
758+
action: 'select',
759+
label: `${this.get('editMode') ? 'Edit' : 'Submit'} - Edit License`
760+
});
765761
}
766762

767763
Promise.all([

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
"ember-cli-code-coverage": "0.3.11",
4040
"ember-cli-dependency-checker": "1.2.0",
4141
"ember-cli-dropzonejs": "0.7.0",
42-
"ember-cli-fake-server": "0.3.2",
4342
"ember-cli-eslint": "3.0.3",
43+
"ember-cli-fake-server": "0.3.2",
4444
"ember-cli-htmlbars": "1.0.3",
4545
"ember-cli-htmlbars-inline-precompile": "0.3.6",
4646
"ember-cli-inject-live-reload": "1.4.0",
@@ -58,17 +58,16 @@
5858
"ember-collection": "1.0.0-alpha.6",
5959
"ember-cp-validations": "2.9.4",
6060
"ember-data": "2.7.0",
61-
"ember-export-application-global": "1.0.5",
6261
"ember-data-factory-guy": "2.11.6",
62+
"ember-export-application-global": "1.0.5",
6363
"ember-faker": "^1.1.1",
6464
"ember-font-awesome": "2.1.1",
6565
"ember-get-config": "0.0.4",
6666
"ember-i18n": "4.3.1",
6767
"ember-link-action": "0.0.35",
68-
"ember-lodash": "3.10.0",
6968
"ember-load-initializers": "0.5.1",
7069
"ember-metrics": "0.6.3",
71-
"ember-osf": "0.5.0",
70+
"ember-osf": "0.5.2",
7271
"ember-page-title": "3.0.6",
7372
"ember-power-select": "1.0.0-beta.7",
7473
"ember-read-more": "0.0.13",

yarn.lock

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2662,14 +2662,6 @@ [email protected]:
26622662
version "0.5.1"
26632663
resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-0.5.1.tgz#76e3db23c111dbdcd3ae6f687036bf0b56be0cbe"
26642664

2665-
2666-
version "3.10.0"
2667-
resolved "https://registry.yarnpkg.com/ember-lodash/-/ember-lodash-3.10.0.tgz#a717dffea1e93c1583d5f91f793fed74ed66c20b"
2668-
dependencies:
2669-
broccoli-merge-trees "^1.1.1"
2670-
ember-cli-babel "^5.1.6"
2671-
lodash-es "3.10.1"
2672-
26732665
26742666
version "0.6.3"
26752667
resolved "https://registry.yarnpkg.com/ember-metrics/-/ember-metrics-0.6.3.tgz#9716a4bb68e6e59a6631b9cd5698e75b264b6d30"
@@ -2697,9 +2689,9 @@ ember-new-computed@^1.0.2:
26972689
dependencies:
26982690
ember-cli-babel "^5.1.5"
26992691

2700-
2701-
version "0.5.0"
2702-
resolved "https://registry.yarnpkg.com/ember-osf/-/ember-osf-0.5.0.tgz#849d804644546cfded596311f688dd10855688cf"
2692+
2693+
version "0.5.2"
2694+
resolved "https://registry.yarnpkg.com/ember-osf/-/ember-osf-0.5.2.tgz#e5617e6b6f41dd5bcbc97d4e996fa6e6f2521175"
27032695
dependencies:
27042696
broccoli-funnel "^1.0.1"
27052697
broccoli-merge-trees "^1.1.1"
@@ -4657,10 +4649,6 @@ lockfile@~1.0.1:
46574649
version "1.0.3"
46584650
resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.3.tgz#2638fc39a0331e9cac1a04b71799931c9c50df79"
46594651

4660-
4661-
version "3.10.1"
4662-
resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-3.10.1.tgz#a1c85d9829c9009004339dc3846dbabb46cf4e19"
4663-
46644652
lodash._arraycopy@^3.0.0:
46654653
version "3.0.0"
46664654
resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1"

0 commit comments

Comments
 (0)