From c9f46a39cf42ae9cde037e1bcbe67cbe67680878 Mon Sep 17 00:00:00 2001 From: Alex Schiller Date: Thu, 11 Oct 2018 16:11:01 -0400 Subject: [PATCH] Syntax cleanup --- addon/adapters/contributor.js | 6 +++--- addon/adapters/preprint.js | 2 +- addon/components/file-renderer/component.js | 2 +- addon/mixins/contributor-mixin.js | 18 +++++++++--------- tests/unit/mixins/contributor-mixin-test.js | 7 +++---- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/addon/adapters/contributor.js b/addon/adapters/contributor.js index a0f01fccd..12061a195 100644 --- a/addon/adapters/contributor.js +++ b/addon/adapters/contributor.js @@ -3,9 +3,9 @@ import OsfAdapter from './osf-adapter'; export default OsfAdapter.extend({ buildURL(modelName, id, snapshot, requestType) { // jshint ignore:line if (requestType === 'createRecord' || requestType === 'findRecord') { - var nodeId; - var sendEmail = true; - var requestUrl; + let nodeId; + let sendEmail = true; + let requestUrl; if (snapshot) { nodeId = snapshot.record.get('nodeId'); diff --git a/addon/adapters/preprint.js b/addon/adapters/preprint.js index faccbc0a0..807ec17a8 100644 --- a/addon/adapters/preprint.js +++ b/addon/adapters/preprint.js @@ -20,7 +20,7 @@ export default OsfAdapter.extend({ // Send patch request to preprint detail link const serializer = store.serializerFor(type.modelName); serializer.serializeIntoHash(data, type, snapshot, { includeId: true }); - var id = snapshot.id; + const id = snapshot.id; url = this.buildURL(type.modelName, id, snapshot, 'updateRecord'); } diff --git a/addon/components/file-renderer/component.js b/addon/components/file-renderer/component.js index 78ea74b8a..023fd21e6 100644 --- a/addon/components/file-renderer/component.js +++ b/addon/components/file-renderer/component.js @@ -28,7 +28,7 @@ export default Ember.Component.extend({ version: null, mfrUrl: Ember.computed('download', 'version', function() { let download = this.get('download'); - if (download.indexOf('?') !== -1) { + if (download.includes('?')) { download = download + '&mode=render'; } else { download = download + '?direct&mode=render'; diff --git a/addon/mixins/contributor-mixin.js b/addon/mixins/contributor-mixin.js index 3c4339df7..b7b62577b 100644 --- a/addon/mixins/contributor-mixin.js +++ b/addon/mixins/contributor-mixin.js @@ -12,7 +12,7 @@ export default Ember.Mixin.create({ if (!userId) { return new Ember.RSVP.Promise((resolve) => resolve(false)); } - var contribId = `${this.get('id')}-${userId}`; + const contribId = `${this.get('id')}-${userId}`; return this.store.findRecord('contributor', contribId).then(() => true, () => false); }, @@ -20,12 +20,12 @@ export default Ember.Mixin.create({ // Some duplicate logic from osf-model#save needed to support // contributor edits being saved through the node // Note: order is important here so _dirtyRelationships gets set by the _super call - var promise = this._super(...arguments); + const promise = this._super(...arguments); if (!this.get('_dirtyRelationships.contributors')) { this.set('_dirtyRelationships.contributors', {}); } - var contributors = this.hasMany('contributors').hasManyRelationship; + const contributors = this.hasMany('contributors').hasManyRelationship; this.set( '_dirtyRelationships.contributors.update', contributors.members.list.filter(m => !m.getRecord().get('isNew') && Object.keys(m.getRecord().changedAttributes()).length > 0) @@ -45,7 +45,7 @@ export default Ember.Mixin.create({ return promise; }, addContributor(userId, permission, isBibliographic, sendEmail, fullName, email) { - let contrib = this.store.createRecord('contributor', { + const contrib = this.store.createRecord('contributor', { permission: permission, bibliographic: isBibliographic, sendEmail: sendEmail, @@ -59,8 +59,8 @@ export default Ember.Mixin.create({ }, addContributors(contributors, sendEmail) { - let payload = contributors.map(contrib => { - let contribData = { + const payload = contributors.map(contrib => { + const contribData = { permission: contrib.permission, bibliographic: contrib.bibliographic, nodeId: this.get('id'), @@ -68,9 +68,9 @@ export default Ember.Mixin.create({ id: this.get('id') + '-' + contrib.userId, }; if (contrib.unregisteredContributor) { - contribData['fullName'] = contrib.unregisteredContributor; + contribData.fullName = contrib.unregisteredContributor; } - let c = this.store.createRecord('contributor', contribData); + const c = this.store.createRecord('contributor', contribData); return c.serialize({ includeId: true, @@ -93,7 +93,7 @@ export default Ember.Mixin.create({ isBulk: true }).then(resp => { this.store.pushPayload(resp); - var createdContribs = Ember.A(); + const createdContribs = Ember.A(); resp.data.map((contrib) => { createdContribs.push(this.store.peekRecord('contributor', contrib.id)); }); diff --git a/tests/unit/mixins/contributor-mixin-test.js b/tests/unit/mixins/contributor-mixin-test.js index 09fded0fe..b4238efa7 100644 --- a/tests/unit/mixins/contributor-mixin-test.js +++ b/tests/unit/mixins/contributor-mixin-test.js @@ -4,9 +4,8 @@ import { module, test } from 'qunit'; module('Unit | Mixin | contributor mixin'); -// Replace this with your real tests. test('it works', function(assert) { - let ContributorMixinObject = Ember.Object.extend(ContributorMixinMixin); - let subject = ContributorMixinObject.create(); - assert.ok(subject); + const ContributorMixinObject = Ember.Object.extend(ContributorMixinMixin); + const subject = ContributorMixinObject.create(); + assert.ok(subject); });