diff --git a/app/models/characteristic.js b/app/models/characteristic.js index 766fdbf..ea6a6d5 100644 --- a/app/models/characteristic.js +++ b/app/models/characteristic.js @@ -1,14 +1,16 @@ import DS from 'ember-data'; -export default DS.Model.extend({ - characteristicName : DS.attr('string'), - characteristicTypeName: DS.attr('string'), - strains : DS.hasMany('strain', { async: false }), - measurements : DS.hasMany('measurements', { async: false }), - createdAt : DS.attr('date'), - updatedAt : DS.attr('date'), - createdBy : DS.attr('number'), - updatedBy : DS.attr('number'), - sortOrder : DS.attr('number'), - canEdit : DS.attr('boolean'), +const { Model, attr, hasMany } = DS; + +export default Model.extend({ + characteristicName : attr('string'), + characteristicTypeName: attr('string'), + strains : hasMany('strain', { async: false }), + measurements : hasMany('measurements', { async: false }), + createdAt : attr('date'), + updatedAt : attr('date'), + createdBy : attr('number'), + updatedBy : attr('number'), + sortOrder : attr('number'), + canEdit : attr('boolean'), }); diff --git a/app/models/measurement.js b/app/models/measurement.js index 41a7644..009aa8b 100644 --- a/app/models/measurement.js +++ b/app/models/measurement.js @@ -1,15 +1,17 @@ import DS from 'ember-data'; -export default DS.Model.extend({ - strain : DS.belongsTo('strain', { async: false }), - characteristic : DS.belongsTo('characteristic', { async: false }), - value : DS.attr('string'), - confidenceInterval : DS.attr('number'), - unitType : DS.attr('string'), - notes : DS.attr('string'), - testMethod : DS.attr('string'), - createdAt : DS.attr('date'), - updatedAt : DS.attr('date'), - createdBy : DS.attr('number'), - updatedBy : DS.attr('number'), +const { Model, belongsTo, attr } = DS; + +export default Model.extend({ + strain : belongsTo('strain', { async: false }), + characteristic : belongsTo('characteristic', { async: false }), + value : attr('string'), + confidenceInterval : attr('number'), + unitType : attr('string'), + notes : attr('string'), + testMethod : attr('string'), + createdAt : attr('date'), + updatedAt : attr('date'), + createdBy : attr('number'), + updatedBy : attr('number'), }); diff --git a/app/models/species.js b/app/models/species.js index bb27451..7581d10 100644 --- a/app/models/species.js +++ b/app/models/species.js @@ -2,20 +2,23 @@ import DS from 'ember-data'; import config from '../config/environment'; import Ember from 'ember'; -export default DS.Model.extend({ - speciesName : DS.attr('string'), - typeSpecies : DS.attr('boolean'), - etymology : DS.attr('string'), - genusName : DS.attr('string', { defaultValue: config.APP.genus }), - strains : DS.hasMany('strain', { async: false }), - totalStrains: DS.attr('number'), - createdAt : DS.attr('date'), - updatedAt : DS.attr('date'), - createdBy : DS.attr('number'), - updatedBy : DS.attr('number'), - sortOrder : DS.attr('number'), - canEdit : DS.attr('boolean'), +const { Model, attr, hasMany } = DS; +export default Model.extend({ + speciesName : attr('string'), + typeSpecies : attr('boolean'), + etymology : attr('string'), + genusName : attr('string', { defaultValue: config.APP.genus }), + strains : hasMany('strain', { async: false }), + totalStrains: attr('number'), + createdAt : attr('date'), + updatedAt : attr('date'), + createdBy : attr('number'), + updatedBy : attr('number'), + sortOrder : attr('number'), + canEdit : attr('boolean'), + + // TODO: move this to component/helper speciesNameMU: function() { return Ember.String.htmlSafe(`${this.get('speciesName')}`); }.property('speciesName').readOnly(), diff --git a/app/models/strain.js b/app/models/strain.js index 0c59f2f..b202a78 100644 --- a/app/models/strain.js +++ b/app/models/strain.js @@ -1,34 +1,39 @@ import DS from 'ember-data'; import Ember from 'ember'; -export default DS.Model.extend({ - measurements : DS.hasMany('measurements', { async: false }), - characteristics : DS.hasMany('characteristics', { async: false }), - species : DS.belongsTo('species', { async: false }), - strainName : DS.attr('string'), - typeStrain : DS.attr('boolean'), - accessionNumbers : DS.attr('string'), - genbank : DS.attr('string'), - wholeGenomeSequence: DS.attr('string'), - isolatedFrom : DS.attr('string'), - notes : DS.attr('string'), - createdAt : DS.attr('date'), - updatedAt : DS.attr('date'), - createdBy : DS.attr('number'), - updatedBy : DS.attr('number'), - totalMeasurements : DS.attr('number'), - sortOrder : DS.attr('number'), - canEdit : DS.attr('boolean'), +const { Model, hasMany, belongsTo, attr } = DS; +export default Model.extend({ + measurements : hasMany('measurements', { async: false }), + characteristics : hasMany('characteristics', { async: false }), + species : belongsTo('species', { async: false }), + strainName : attr('string'), + typeStrain : attr('boolean'), + accessionNumbers : attr('string'), + genbank : attr('string'), + wholeGenomeSequence: attr('string'), + isolatedFrom : attr('string'), + notes : attr('string'), + createdAt : attr('date'), + updatedAt : attr('date'), + createdBy : attr('number'), + updatedBy : attr('number'), + totalMeasurements : attr('number'), + sortOrder : attr('number'), + canEdit : attr('boolean'), + + // TODO: move this to component/helper strainNameMU: function() { let type = this.get('typeStrain') ? 'T' : ''; return Ember.String.htmlSafe(`${this.get('strainName')}${type}`); }.property('strainName', 'typeStrain').readOnly(), + // TODO: move this to component/helper fullName: Ember.computed('species', 'strainName', function() { return `${this.get('species.speciesName')} ${this.get('strainNameMU')}`; }), + // TODO: move this to component/helper fullNameMU: function() { return Ember.String.htmlSafe(`${this.get('species.speciesName')} ${this.get('strainNameMU')}`); }.property('species', 'strainNameMU').readOnly(), diff --git a/app/models/user.js b/app/models/user.js index 198f451..89b7c0f 100644 --- a/app/models/user.js +++ b/app/models/user.js @@ -1,29 +1,32 @@ import Ember from 'ember'; import DS from 'ember-data'; -export default DS.Model.extend({ - email : DS.attr('string'), - password : DS.attr('string'), - name : DS.attr('string'), - role : DS.attr('string'), - canEdit : DS.attr('boolean'), - createdAt: DS.attr('date'), - updatedAt: DS.attr('date'), +const { Model, attr } = DS; +const { computed } = Ember; - isAdmin: function() { +export default Model.extend({ + email : attr('string'), + password : attr('string'), + name : attr('string'), + role : attr('string'), + canEdit : attr('boolean'), + createdAt: attr('date'), + updatedAt: attr('date'), + + isAdmin: computed('role', function() { return this.get('role') === 'A'; - }.property('role'), + }), - isWriter: function() { + isWriter: computed('role', function() { return this.get('role') === 'W'; - }.property('role'), + }), - isReader: function() { + isReader: computed('role', function() { return this.get('role') === 'R'; - }.property('role'), + }), - fullRole: function() { - let role = this.get('role'); + fullRole: computed('role', function() { + const role = this.get('role'); if (role === 'R') { return 'Read-Only'; } else if (role === 'W') { @@ -33,13 +36,13 @@ export default DS.Model.extend({ } else { return 'Error'; } - }.property('role'), + }), - canWrite: Ember.computed('role', function() { + canWrite: computed('role', function() { return this.get('role') !== 'R'; }), - metaData: Ember.computed('canWrite', function() { + metaData: computed('canWrite', function() { return { 'canAdd': this.get('canWrite') }; }), diff --git a/app/pods/application/adapter.js b/app/pods/application/adapter.js index 96daa1a..0d7ed91 100644 --- a/app/pods/application/adapter.js +++ b/app/pods/application/adapter.js @@ -1,7 +1,9 @@ import DS from 'ember-data'; import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin'; -export default DS.RESTAdapter.extend(DataAdapterMixin, { +const { RESTAdapter } = DS; + +export default RESTAdapter.extend(DataAdapterMixin, { authorizer: 'authorizer:application', namespace: function() { diff --git a/app/pods/application/route.js b/app/pods/application/route.js index ca03050..e677da9 100644 --- a/app/pods/application/route.js +++ b/app/pods/application/route.js @@ -1,7 +1,9 @@ import Ember from 'ember'; import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin'; -export default Ember.Route.extend(ApplicationRouteMixin, { +const { Route } = Ember; + +export default Route.extend(ApplicationRouteMixin, { actions: { invalidateSession: function() { this.get('session').invalidate().then(() => { @@ -9,7 +11,5 @@ export default Ember.Route.extend(ApplicationRouteMixin, { return true; }); }, - }, - }); diff --git a/app/pods/login/controller.js b/app/pods/login/controller.js index ec1077b..910a88a 100644 --- a/app/pods/login/controller.js +++ b/app/pods/login/controller.js @@ -1,14 +1,15 @@ import Ember from 'ember'; -export default Ember.Controller.extend({ - session: Ember.inject.service('session'), +const { Controller, inject: { service } } = Ember; + +export default Controller.extend({ + session: service(), actions: { - authenticate: function() { + authenticate: function(identification, password) { // Manually clean up because there might not be a transition this.get('flashMessages').clearMessages(); - let { identification, password } = this.getProperties('identification', 'password'); this.transitionToRoute('loading').then(() => { this.get('session').authenticate('authenticator:oauth2', identification, password).catch((error) => { this.transitionToRoute('login').then(() => { diff --git a/app/pods/login/login-form/component.js b/app/pods/login/login-form/component.js new file mode 100644 index 0000000..638cba4 --- /dev/null +++ b/app/pods/login/login-form/component.js @@ -0,0 +1,27 @@ +import Ember from 'ember'; + +const { Component } = Ember; + +export default Component.extend({ + // Actions + "on-submit": null, + + // Property mapping + propertiesList: ['identification', 'password'], + identification: null, + password: null, + + actions: { + submit: function() { + return this.attrs['on-submit'](this.get('identification'), this.get('password')); + }, + + identificationDidChange: function(value) { + this.set('identification', value); + }, + + passwordDidChange: function(value) { + this.set('password', value); + }, + }, +}); diff --git a/app/pods/login/login-form/template.hbs b/app/pods/login/login-form/template.hbs new file mode 100644 index 0000000..45afb9b --- /dev/null +++ b/app/pods/login/login-form/template.hbs @@ -0,0 +1,12 @@ +
+

Log In

+ {{one-way-input type="text" class="identification" value=identification update=(action "identificationDidChange") placeholder="Email"}} + {{one-way-input type="password" class="password" value=password update=(action "passwordDidChange") placeholder="Password"}} + +
+
+
+ {{link-to 'Forget your password?' 'users.requestlockouthelp'}} +
diff --git a/app/pods/login/route.js b/app/pods/login/route.js index c38d19e..a9687fd 100644 --- a/app/pods/login/route.js +++ b/app/pods/login/route.js @@ -1,4 +1,6 @@ import Ember from 'ember'; import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin'; -export default Ember.Route.extend(UnauthenticatedRouteMixin, {}); +const { Route } = Ember; + +export default Route.extend(UnauthenticatedRouteMixin, {}); diff --git a/app/pods/login/template.hbs b/app/pods/login/template.hbs index 246c876..870b977 100644 --- a/app/pods/login/template.hbs +++ b/app/pods/login/template.hbs @@ -1,12 +1,6 @@ {{#x-application invalidateSession="invalidateSession"}} -
-

Log In

- {{input value=identification type="text" placeholder="Email"}} - {{input value=password type="password" placeholder="Password"}} - {{input class="button-gray" type="submit" value="Log In"}} -
-
-
- {{link-to 'Forget your password?' 'users.requestlockouthelp'}} -
+ {{ + login/login-form + on-submit=(action "authenticate") + }} {{/x-application}} diff --git a/app/pods/not-found/route.js b/app/pods/not-found/route.js index 5be93bf..c14f72d 100644 --- a/app/pods/not-found/route.js +++ b/app/pods/not-found/route.js @@ -1,8 +1,10 @@ import Ember from 'ember'; -export default Ember.Route.extend({ +const { Route } = Ember; + +export default Route.extend({ redirect: function() { - let url = this.router.location.formatURL('/not-found'); + const url = this.router.location.formatURL('/not-found'); if (window.location.pathname !== url) { this.transitionTo('/not-found'); diff --git a/app/pods/protected/about/route.js b/app/pods/protected/about/route.js index 096e3c5..5f46de6 100644 --- a/app/pods/protected/about/route.js +++ b/app/pods/protected/about/route.js @@ -1,3 +1,5 @@ import Ember from 'ember'; -export default Ember.Route.extend({}); +const { Route } = Ember; + +export default Route.extend({}); diff --git a/app/pods/protected/compare/controller.js b/app/pods/protected/compare/controller.js index 00ef991..0ba05a4 100644 --- a/app/pods/protected/compare/controller.js +++ b/app/pods/protected/compare/controller.js @@ -1,41 +1,22 @@ import Ember from 'ember'; -export default Ember.Controller.extend({ +const { Controller } = Ember; + +export default Controller.extend({ + selectedStrains: null, + selectedCharacteristics: null, + actions: { - search: function() { - let query = { - strain_ids: this.get('selectedStrains'), - characteristic_ids: this.get('selectedCharacteristics'), - }; - - this.transitionToRoute('protected.compare.results', {queryParams: query}); + search: function(query) { + this.transitionToRoute('protected.compare.results', { queryParams: query }); }, - selectAllStrains: function() { - let strains = this.get('strains'); - let strain_ids = []; - strains.forEach((strain) => { - strain_ids.push(strain.id); - }); - this.set('selectedStrains', strain_ids.join(",")); + updateStrainSelection: function(selection) { + this.set('selectedStrains', selection); }, - deselectAllStrains: function() { - this.set('selectedStrains', ''); + updateCharacteristicSelection: function(selection) { + this.set('selectedCharacteristics', selection); }, - - selectAllCharacteristics: function() { - let chars = this.get('characteristics'); - let char_ids = []; - chars.forEach((char) => { - char_ids.push(char.id); - }); - this.set('selectedCharacteristics', char_ids.join(",")); - }, - - deselectAllCharacteristics: function() { - this.set('selectedCharacteristics', ''); - }, - } }); diff --git a/app/pods/protected/compare/results/controller.js b/app/pods/protected/compare/results/controller.js index 391985a..c054c46 100644 --- a/app/pods/protected/compare/results/controller.js +++ b/app/pods/protected/compare/results/controller.js @@ -1,31 +1,8 @@ import Ember from 'ember'; -export default Ember.Controller.extend({ +const { Controller } = Ember; + +export default Controller.extend({ queryParams: ['strain_ids', 'characteristic_ids'], - csvLink: function() { - let token = encodeURIComponent(this.get('session.secure.token')); - return `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/` + - `compare?token=${token}&strain_ids=${this.get('strain_ids')}&` + - `characteristic_ids=${this.get('characteristic_ids')}&mimeType=csv`; - }.property('strain_ids', 'characteristic_ids').readOnly(), - - strains: function() { - let strains = []; - let strain_ids = this.get('strain_ids').split(','); - strain_ids.forEach((id) => { - strains.push(this.store.peekRecord('strain', id)); - }); - return strains; - }.property('strain_ids'), - - characteristics: function() { - let characteristics = []; - let characteristic_ids = this.get('characteristic_ids').split(','); - characteristic_ids.forEach((id) => { - characteristics.push(this.store.peekRecord('characteristic', id)); - }); - return characteristics; - }.property('characteristic_ids'), - }); diff --git a/app/pods/protected/compare/results/results-table/component.js b/app/pods/protected/compare/results/results-table/component.js new file mode 100644 index 0000000..87b2369 --- /dev/null +++ b/app/pods/protected/compare/results/results-table/component.js @@ -0,0 +1,19 @@ +import Ember from 'ember'; + +const { Component, computed, inject: { service } } = Ember; + +export default Component.extend({ + session: service(), + + strains: null, + characteristics: null, + strain_ids: null, + characteristic_ids: null, + + csvLink: computed('strain_ids', 'characteristic_ids', function() { + const token = encodeURIComponent(this.get('session.data.authenticated.access_token')); + return `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/` + + `compare?token=${token}&strain_ids=${this.get('strain_ids')}&` + + `characteristic_ids=${this.get('characteristic_ids')}&mimeType=csv`; + }), +}); diff --git a/app/pods/protected/compare/results/results-table/template.hbs b/app/pods/protected/compare/results/results-table/template.hbs new file mode 100644 index 0000000..c90d3bc --- /dev/null +++ b/app/pods/protected/compare/results/results-table/template.hbs @@ -0,0 +1,25 @@ + + + + + {{#each strains as |strain|}} + + {{/each}} + + + + {{#each characteristics as |row|}} + + {{#each row key="@index" as |col|}} + + {{/each}} + + {{/each}} + +
Characteristic + {{#link-to 'protected.strains.show' strain.id classBinding="data.typeStrain:type-strain"}} + {{strain.fullNameMU}} + {{/link-to}} +
{{col}}
+
+Download as CSV diff --git a/app/pods/protected/compare/results/route.js b/app/pods/protected/compare/results/route.js index 981fa36..5a8ec60 100644 --- a/app/pods/protected/compare/results/route.js +++ b/app/pods/protected/compare/results/route.js @@ -1,8 +1,10 @@ import Ember from 'ember'; import ajaxRequest from '../../../../utils/ajax-request'; -export default Ember.Route.extend({ - session: Ember.inject.service('session'), +const { Route, $: { isEmptyObject }, inject: { service } } = Ember; + +export default Route.extend({ + session: service(), queryParams: { strain_ids: { @@ -15,8 +17,9 @@ export default Ember.Route.extend({ beforeModel: function(transition) { this._super(transition); - if (Ember.$.isEmptyObject(transition.queryParams.strain_ids) || - Ember.$.isEmptyObject(transition.queryParams.characteristic_ids)) { + const strain_ids = transition.queryParams.strain_ids; + const characteristic_ids = transition.queryParams.characteristic_ids; + if (isEmptyObject(strain_ids) || isEmptyObject(characteristic_ids)) { this.transitionTo('protected.compare'); } }, @@ -26,12 +29,12 @@ export default Ember.Route.extend({ this.transitionTo('protected.compare'); } - let compare = this.controllerFor('protected.compare'); + const compare = this.controllerFor('protected.compare'); compare.set('selectedStrains', params.strain_ids); compare.set('selectedCharacteristics', params.characteristic_ids); - let url = `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/compare`; - let options = { + const url = `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/compare`; + const options = { method: 'GET', data: params, }; @@ -40,9 +43,26 @@ export default Ember.Route.extend({ setupController: function(controller, model) { model.forEach((m, i) => { - let c = this.store.peekRecord('characteristic', m[0]); + const c = this.store.peekRecord('characteristic', m[0]); model[i][0] = c.get('characteristicName'); }); + + const compare = this.controllerFor('protected.compare'); + + const strains = []; + const strain_ids = compare.get('selectedStrains').split(','); + strain_ids.forEach((id) => { + strains.push(this.store.peekRecord('strain', id)); + }); + controller.set('strains', strains); + + const characteristics = []; + const characteristic_ids = compare.get('selectedCharacteristics').split(','); + characteristic_ids.forEach((id) => { + characteristics.push(this.store.peekRecord('characteristic', id)); + }); + controller.set('characteristics', characteristics); + controller.set('model', model); }, diff --git a/app/pods/protected/compare/results/template.hbs b/app/pods/protected/compare/results/template.hbs index f40869c..18542e7 100644 --- a/app/pods/protected/compare/results/template.hbs +++ b/app/pods/protected/compare/results/template.hbs @@ -1,25 +1,7 @@ - - - - - {{#each strains as |strain|}} - - {{/each}} - - - - {{#each model as |row|}} - - {{#each row key="@index" as |col|}} - - {{/each}} - - {{/each}} - -
Characteristic - {{#link-to 'protected.strains.show' strain.id classBinding="data.typeStrain:type-strain"}} - {{strain.fullNameMU}} - {{/link-to}} -
{{col}}
-
-Download as CSV +{{ + protected/compare/results/results-table + strains=strains + characteristics=model + strain_ids=strain_ids + characteristic_ids=characteristic_ids +}} diff --git a/app/pods/protected/compare/route.js b/app/pods/protected/compare/route.js index 19c8e94..199ade7 100644 --- a/app/pods/protected/compare/route.js +++ b/app/pods/protected/compare/route.js @@ -1,6 +1,8 @@ import Ember from 'ember'; -export default Ember.Route.extend({ +const { Route } = Ember; + +export default Route.extend({ model: function() { return this.store.findAll('characteristic'); }, diff --git a/app/pods/protected/compare/select-form/component.js b/app/pods/protected/compare/select-form/component.js new file mode 100644 index 0000000..db58626 --- /dev/null +++ b/app/pods/protected/compare/select-form/component.js @@ -0,0 +1,61 @@ +import Ember from 'ember'; + +const { Component } = Ember; + +export default Component.extend({ + characteristics: null, + strains: null, + + "on-search": null, + "update-strains": null, + "update-characteristics": null, + + selectedStrains: null, + selectedCharacteristics: null, + + updateStrains: function(selection) { + this.set('selectedStrains', selection); + this.attrs['update-strains'](this.get('selectedStrains')); + }, + + updateCharacteristics: function(selection) { + this.set('selectedCharacteristics', selection); + this.attrs['update-characteristics'](this.get('selectedCharacteristics')); + }, + + actions: { + search: function() { + const query = { + strain_ids: this.get('selectedStrains'), + characteristic_ids: this.get('selectedCharacteristics'), + }; + this.attrs['on-search'](query); + }, + + selectAllStrains: function() { + const strains = this.get('strains'); + const strain_ids = []; + strains.forEach((strain) => { + strain_ids.push(strain.get('id')); + }); + this.updateStrains(strain_ids.join(",")); + }, + + deselectAllStrains: function() { + this.updateStrains(""); + }, + + selectAllCharacteristics: function() { + const chars = this.get('characteristics'); + const char_ids = []; + chars.forEach((char) => { + char_ids.push(char.get('id')); + }); + this.updateCharacteristics(char_ids.join(",")); + }, + + deselectAllCharacteristics: function() { + this.updateCharacteristics(""); + }, + }, +}); diff --git a/app/pods/protected/compare/select-form/template.hbs b/app/pods/protected/compare/select-form/template.hbs new file mode 100644 index 0000000..61a07a5 --- /dev/null +++ b/app/pods/protected/compare/select-form/template.hbs @@ -0,0 +1,53 @@ +
+
+
+
    +
  • + + {{ + select-2 + multiple=true + content=strains + value=selectedStrains + optionValuePath="id" + optionLabelPath="fullNameMU" + placeholder="Select one or more strains" + }} +
    • +
  • + + +
    • +
  • + + {{ + select-2 + multiple=true + content=characteristics + value=selectedCharacteristics + optionValuePath="id" + optionLabelPath="characteristicName" + placeholder="Select one or more characteristics" + }} +
    • +
  • + + +
    • +
  • + +
    • +
+
+
+
diff --git a/app/pods/protected/compare/template.hbs b/app/pods/protected/compare/template.hbs index fefe9a6..af8b15a 100644 --- a/app/pods/protected/compare/template.hbs +++ b/app/pods/protected/compare/template.hbs @@ -1,57 +1,14 @@

{{genus-name}} - Compare Strains

-
-
-
-
    -
  • - - {{ - select-2 - multiple=true - content=strains - value=selectedStrains - optionValuePath="id" - optionLabelPath="fullNameMU" - placeholder="Select one or more strains" - }} -
    • -
  • - - -
    • -
  • - - {{ - select-2 - multiple=true - content=characteristics - value=selectedCharacteristics - optionValuePath="id" - optionLabelPath="characteristicName" - placeholder="Select one or more characteristics" - }} -
    • -
  • - - -
    • -
  • - -
    • -
-
-
-
+{{ + protected/compare/select-form + characteristics=characteristics + strains=strains + selectedStrains=selectedStrains + selectedCharacteristics=selectedCharacteristics + on-search=(action "search") + update-strains=(action "updateStrainSelection") + update-characteristics=(action "updateCharacteristicSelection") +}} {{outlet}} diff --git a/app/pods/protected/index/route.js b/app/pods/protected/index/route.js index bfdf329..fdf337b 100644 --- a/app/pods/protected/index/route.js +++ b/app/pods/protected/index/route.js @@ -1,6 +1,8 @@ import Ember from 'ember'; -export default Ember.Route.extend({ +const { Route } = Ember; + +export default Route.extend({ beforeModel: function(transition) { this._super(transition); this.transitionTo('protected.compare'); diff --git a/app/pods/protected/index/template.hbs b/app/pods/protected/index/template.hbs deleted file mode 100644 index ba4c514..0000000 --- a/app/pods/protected/index/template.hbs +++ /dev/null @@ -1 +0,0 @@ -Welcome diff --git a/app/pods/protected/route.js b/app/pods/protected/route.js index b1cdc95..64bc25d 100644 --- a/app/pods/protected/route.js +++ b/app/pods/protected/route.js @@ -1,9 +1,12 @@ import Ember from 'ember'; import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; -export default Ember.Route.extend(AuthenticatedRouteMixin, { +const { Route } = Ember; + +export default Route.extend(AuthenticatedRouteMixin, { actions: { - error: function() { + error: function(err) { + console.log(err); this.transitionTo('/not-found'); }, diff --git a/app/serializers/application.js b/app/serializers/application.js index 52f555e..d40a2bf 100644 --- a/app/serializers/application.js +++ b/app/serializers/application.js @@ -1,19 +1,22 @@ import DS from 'ember-data'; import Ember from 'ember'; -export default DS.RESTSerializer.extend({ +const { RESTSerializer } = DS; +const { isNone } = Ember; + +export default RESTSerializer.extend({ isNewSerializerAPI: true, serializeBelongsTo: function(snapshot, json, relationship) { - var key = relationship.key; - var belongsTo = snapshot.belongsTo(key); + let key = relationship.key; + const belongsTo = snapshot.belongsTo(key); key = this.keyForRelationship ? this.keyForRelationship(key, "belongsTo", "serialize") : key; - json[key] = Ember.isNone(belongsTo) ? belongsTo : +belongsTo.record.id; + json[key] = isNone(belongsTo) ? belongsTo : +belongsTo.record.id; }, serializeHasMany: function(snapshot, json, relationship) { - var key = relationship.key; - var hasMany = snapshot.hasMany(key); + let key = relationship.key; + const hasMany = snapshot.hasMany(key); key = this.keyForRelationship ? this.keyForRelationship(key, "hasMany", "serialize") : key; json[key] = [];