Skip to content

Commit 823f894

Browse files
brianjgeigerbrianjgeiger
committed
Merge branch 'release/0.108.0'
2 parents c6f58cb + 8cac8e1 commit 823f894

File tree

127 files changed

+4876
-2844
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+4876
-2844
lines changed

‎app/components/add-preprint-box.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import Ember from 'ember';
2+
import Analytics from 'ember-osf/mixins/analytics';
3+
4+
/**
5+
* @module ember-preprints
6+
* @submodule components
7+
*/
8+
9+
/**
10+
* Add preprint box - Component of portion of preprints discover page - asks users if they want to create a preprint
11+
*
12+
* Sample usage:
13+
* ```handlebars
14+
* {{add-preprint-box
15+
*}}
16+
* ```
17+
* @class add-preprint-box
18+
*/
19+
export default Ember.Component.extend(Analytics, {
20+
theme: Ember.inject.service()
21+
});

‎app/components/author-link/component.js

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎app/components/author-link/template.hbs

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎app/components/confirm-share-preprint.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Ember from 'ember';
2-
import Analytics from '../mixins/analytics';
2+
import Analytics from 'ember-osf/mixins/analytics';
33
/**
44
* @module ember-preprints
55
* @submodule components
@@ -26,7 +26,7 @@ export default Ember.Component.extend(Analytics, {
2626
.trackEvent({
2727
category: 'button',
2828
action: 'click',
29-
label: 'Preprints - Submit - Cancel Share Preprint'
29+
label: 'Submit - Cancel Share Preprint'
3030
});
3131
this.set('isOpen', false);
3232
}

‎app/components/convert-or-copy-project.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Ember from 'ember';
2-
import Analytics from '../mixins/analytics';
2+
import Analytics from 'ember-osf/mixins/analytics';
33
/**
44
* @module ember-preprints
55
* @submodule components
@@ -38,7 +38,7 @@ export default Ember.Component.extend(Analytics, {
3838
.trackEvent({
3939
category: 'button',
4040
action: 'click',
41-
label: 'Preprints - Submit - Make a New Component Selection'
41+
label: 'Submit - Make a New Component Selection'
4242
});
4343

4444
},
@@ -54,7 +54,7 @@ export default Ember.Component.extend(Analytics, {
5454
.trackEvent({
5555
category: 'button',
5656
action: 'click',
57-
label: 'Preprints - Submit - Use the Current Project Selection'
57+
label: 'Submit - Use the Current Project Selection'
5858
});
5959
},
6060
confirmConvert() {
@@ -66,7 +66,7 @@ export default Ember.Component.extend(Analytics, {
6666
.trackEvent({
6767
category: 'button',
6868
action: 'click',
69-
label: 'Preprints - Submit - Confirm Continue with the Current Project'
69+
label: 'Submit - Confirm Continue with the Current Project'
7070
});
7171
}
7272
}

‎app/components/error-page.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Ember from 'ember';
2-
import Analytics from '../mixins/analytics';
2+
import Analytics from 'ember-osf/mixins/analytics';
33

44
export default Ember.Component.extend(Analytics, {
55
theme: Ember.inject.service(),

‎app/components/file-uploader.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Ember from 'ember';
22
import {State} from '../controllers/submit';
3-
import Analytics from '../mixins/analytics';
3+
import Analytics from 'ember-osf/mixins/analytics';
44
/**
55
* @module ember-preprints
66
* @submodule components
@@ -135,7 +135,7 @@ export default Ember.Component.extend(Analytics, {
135135
.trackEvent({
136136
category: 'button',
137137
action: 'click',
138-
label: 'Preprints - Submit - Save and Continue, New Node New File'
138+
label: 'Submit - Save and Continue, New Node New File'
139139
});
140140
this.get('store').createRecord('node', {
141141
public: false,
@@ -161,7 +161,7 @@ export default Ember.Component.extend(Analytics, {
161161
.trackEvent({
162162
category: 'button',
163163
action: 'click',
164-
label: 'Preprints - Submit - Save and Continue, New Component New File'
164+
label: 'Submit - Save and Continue, New Component New File'
165165
});
166166
let node = this.get('node');
167167
node
@@ -187,7 +187,7 @@ export default Ember.Component.extend(Analytics, {
187187
.trackEvent({
188188
category: 'button',
189189
action: 'click',
190-
label: `Preprints - ${this.get('editMode') ? 'Edit' : 'Submit'} - Save and Continue, ${this.get('nodeLocked') ? 'Save File/Title Edits' : 'Existing Node New File'}`
190+
label: `${this.get('editMode') ? 'Edit' : 'Submit'} - Save and Continue, ${this.get('nodeLocked') ? 'Save File/Title Edits' : 'Existing Node New File'}`
191191
});
192192
if (this.get('nodeLocked')) { // Edit mode
193193
this.set('uploadInProgress', true);
@@ -331,12 +331,12 @@ export default Ember.Component.extend(Analytics, {
331331
};
332332

333333
if (this.get('newNodeNewFile')) {
334-
eventData.label = 'Preprints - Submit - Drop File, New Node';
334+
eventData.label = 'Submit - Drop File, New Node';
335335
} else {
336336
if (this.get('nodeLocked')) {
337-
eventData.label = `Preprints - ${this.get('editMode') ? 'Edit' : 'Submit'} - Drop File, New Version`;
337+
eventData.label = `${this.get('editMode') ? 'Edit' : 'Submit'} - Drop File, New Version`;
338338
} else {
339-
eventData.label = 'Preprints - Submit - Drop File, Existing Node';
339+
eventData.label = 'Submit - Drop File, Existing Node';
340340
}
341341
}
342342
Ember.get(this, 'metrics')

‎app/components/preprint-footer-branded.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Ember from 'ember';
2-
import Analytics from '../mixins/analytics';
2+
import Analytics from 'ember-osf/mixins/analytics';
33
/**
44
* @module ember-preprints
55
* @submodule components

‎app/components/preprint-form-authors.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Ember from 'ember';
22
import CpPanelBodyComponent from 'ember-collapsible-panel/components/cp-panel-body';
33
import { permissionSelector } from 'ember-osf/const/permissions';
4-
import Analytics from '../mixins/analytics';
4+
import Analytics from 'ember-osf/mixins/analytics';
55
/**
66
* @module ember-preprints
77
* @submodule components
@@ -90,7 +90,7 @@ export default CpPanelBodyComponent.extend(Analytics, {
9090
.trackEvent({
9191
category: 'button',
9292
action: 'click',
93-
label: `Preprints - ${this.get('editMode') ? 'Edit' : 'Submit'} - Add Author`
93+
label: `${this.get('editMode') ? 'Edit' : 'Submit'} - Add Author`
9494
});
9595
this.attrs.addContributor(user.id, 'write', true, this.get('sendEmail'), undefined, undefined, true).then((res) => {
9696
this.toggleAuthorModification();
@@ -109,7 +109,7 @@ export default CpPanelBodyComponent.extend(Analytics, {
109109
.trackEvent({
110110
category: 'button',
111111
action: 'click',
112-
label: `Preprints - Submit - Bulk Add Contributors From Parent`
112+
label: `Submit - Bulk Add Contributors From Parent`
113113
});
114114
this.set('parentContributorsAdded', true);
115115
let contributorsToAdd = Ember.A();
@@ -175,7 +175,7 @@ export default CpPanelBodyComponent.extend(Analytics, {
175175
.trackEvent({
176176
category: 'button',
177177
action: 'click',
178-
label: `Preprints - ${this.get('editMode') ? 'Edit' : 'Submit'} - Remove Author`
178+
label: `${this.get('editMode') ? 'Edit' : 'Submit'} - Remove Author`
179179
});
180180
this.attrs.removeContributor(contrib).then(() => {
181181
this.toggleAuthorModification();
@@ -195,7 +195,7 @@ export default CpPanelBodyComponent.extend(Analytics, {
195195
.trackEvent({
196196
category: 'dropdown',
197197
action: 'select',
198-
label: `Preprints - ${this.get('editMode') ? 'Edit' : 'Submit'} - Change Author Permissions`
198+
label: `${this.get('editMode') ? 'Edit' : 'Submit'} - Change Author Permissions`
199199
});
200200
this.attrs.editContributor(contributor, permission, '').then(() => {
201201
this.toggleAuthorModification();
@@ -214,7 +214,7 @@ export default CpPanelBodyComponent.extend(Analytics, {
214214
.trackEvent({
215215
category: 'checkbox',
216216
action: 'select',
217-
label: `Preprints - ${this.get('editMode') ? 'Edit' : 'Submit'} - Update Bibliographic Author`
217+
label: `${this.get('editMode') ? 'Edit' : 'Submit'} - Update Bibliographic Author`
218218
});
219219
this.attrs.editContributor(contributor, '', isBibliographic).then(() => {
220220
this.toggleAuthorModification();
@@ -231,7 +231,7 @@ export default CpPanelBodyComponent.extend(Analytics, {
231231
.trackEvent({
232232
category: 'button',
233233
action: 'click',
234-
label: `Preprints - ${this.get('editMode') ? 'Edit' : 'Submit'} - Go to Add Author by Email Form`
234+
label: `${this.get('editMode') ? 'Edit' : 'Submit'} - Go to Add Author by Email Form`
235235
});
236236
this.set('addState', 'unregisteredView');
237237
},
@@ -247,7 +247,7 @@ export default CpPanelBodyComponent.extend(Analytics, {
247247
.trackEvent({
248248
category: 'button',
249249
action: 'click',
250-
label: `Preprints - ${this.get('editMode') ? 'Edit' : 'Submit'} - Cancel Add Author By Email`
250+
label: `${this.get('editMode') ? 'Edit' : 'Submit'} - Cancel Add Author By Email`
251251
});
252252
this.set('addState', 'searchView');
253253
},
@@ -258,7 +258,7 @@ export default CpPanelBodyComponent.extend(Analytics, {
258258
.trackEvent({
259259
category: 'div',
260260
action: 'drag',
261-
label: `Preprints - ${this.get('editMode') ? 'Edit' : 'Submit'} - Reorder Authors`
261+
label: `${this.get('editMode') ? 'Edit' : 'Submit'} - Reorder Authors`
262262
});
263263
let originalOrder = this.get('contributors');
264264
this.set('contributors', itemModels);

‎app/components/preprint-form-project-select.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Ember from 'ember';
22
import Permissions from 'ember-osf/const/permissions';
3-
import Analytics from '../mixins/analytics';
3+
import Analytics from 'ember-osf/mixins/analytics';
44
import {stripDiacritics} from 'ember-power-select/utils/group-utils';
55
/**
66
* @module ember-preprints
@@ -83,7 +83,8 @@ export default Ember.Component.extend(Analytics, {
8383
.trackEvent({
8484
category: 'dropdown',
8585
action: 'select',
86-
label: 'Preprints - Submit - Choose Project'
86+
label: 'Submit - Choose Project',
87+
extra: node.id
8788
});
8889

8990
},
@@ -96,7 +97,8 @@ export default Ember.Component.extend(Analytics, {
9697
.trackEvent({
9798
category: 'file browser',
9899
action: 'select',
99-
label: 'Preprints - Submit - Existing File Selected'
100+
label: 'Submit - Existing File Selected',
101+
extra: file.id
100102
});
101103
},
102104
changeExistingState(newState) {
@@ -110,7 +112,7 @@ export default Ember.Component.extend(Analytics, {
110112
.trackEvent({
111113
category: 'button',
112114
action: 'click',
113-
label: 'Preprints - Submit - Choose Select Existing File as Preprint'
115+
label: 'Submit - Choose Select Existing File as Preprint'
114116
});
115117

116118
} else if (newState === this.get('_existingState').NEWFILE) {
@@ -119,7 +121,7 @@ export default Ember.Component.extend(Analytics, {
119121
.trackEvent({
120122
category: 'button',
121123
action: 'click',
122-
label: 'Preprints - Submit - Choose Upload Preprint'
124+
label: 'Submit - Choose Upload Preprint'
123125
});
124126
}
125127
},

‎app/components/preprint-form-section.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Ember from 'ember';
22
import CpPanelComponent from 'ember-collapsible-panel/components/cp-panel';
3-
import Analytics from '../mixins/analytics';
3+
import Analytics from 'ember-osf/mixins/analytics';
44
/**
55
* @module ember-preprints
66
* @submodule components
@@ -88,7 +88,7 @@ export default CpPanelComponent.extend(Analytics, {
8888
.trackEvent({
8989
category: 'div',
9090
action: 'click',
91-
label: `Preprints - ${this.get('editMode') ? 'Edit' : 'Submit'} - Click to edit, ${this.name} section`
91+
label: `${this.get('editMode') ? 'Edit' : 'Submit'} - Click to edit, ${this.name} section`
9292
});
9393
this._super(...arguments);
9494
} else {

‎app/components/preprint-navbar-branded.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Ember from 'ember';
22
import OSFAgnosticAuthControllerMixin from 'ember-osf/mixins/osf-agnostic-auth-controller';
3-
import Analytics from '../mixins/analytics';
3+
import Analytics from 'ember-osf/mixins/analytics';
44
import config from 'ember-get-config';
55

66
/**

‎app/components/preprint-navbar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Ember from 'ember';
2-
import Analytics from '../mixins/analytics';
2+
import Analytics from 'ember-osf/mixins/analytics';
33
/**
44
* @module ember-preprints
55
* @submodule components

‎app/components/provider-carousel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Ember from 'ember';
2-
import Analytics from '../mixins/analytics';
2+
import Analytics from 'ember-osf/mixins/analytics';
33

44
/**
55
* @module ember-preprints

0 commit comments

Comments
 (0)