diff --git a/app/mirage/config.js b/app/mirage/config.js index 3982c0c..935eb17 100644 --- a/app/mirage/config.js +++ b/app/mirage/config.js @@ -24,4 +24,19 @@ export function testConfig() { this.post('/characteristics'); this.get('/characteristics/:id'); this.put('/characteristics/:id'); + + this.get('/strains', function(db /*, request*/) { + return { + strains: db.strains, + species: db.species, + }; + }); + this.post('/strains'); + this.get('/strains/:id', function(db, request) { + return { + strain: db.strains.find(request.params.id), + species: db.species, // Just send back everything we've got + }; + }); + this.put('/strains/:id'); } diff --git a/app/mirage/factories/strains.js b/app/mirage/factories/strains.js new file mode 100644 index 0000000..6165528 --- /dev/null +++ b/app/mirage/factories/strains.js @@ -0,0 +1,17 @@ +import Mirage, { faker } from 'ember-cli-mirage'; + +export default Mirage.Factory.extend({ + measurements: [], + characteristics: [], + species: 0, + strainName() { return faker.lorem.words().join(' '); }, + typeStrain: faker.random.boolean(), + accessionNumbers() { return faker.lorem.words().join(' '); }, + genbank() { return faker.lorem.words().join(' '); }, + wholeGenomeSequence() { return faker.lorem.words().join(' '); }, + isolatedFrom: faker.lorem.sentences(), + notes: faker.lorem.sentences(), + totalMeasurements: 0, + sortOrder: faker.random.number(), + canEdit: faker.random.boolean(), +}); diff --git a/app/mixins/save-model.js b/app/mixins/save-model.js index 8d3b233..d4459e3 100644 --- a/app/mixins/save-model.js +++ b/app/mixins/save-model.js @@ -13,17 +13,12 @@ export default Mixin.create({ const fallbackRoute = this.get('fallbackRouteSave'); model.setProperties(properties); - - if (model.get('hasDirtyAttributes')) { - model.save().then((model) => { - this.get('flashMessages').clearMessages(); - this.transitionToRoute(fallbackRoute, model); - }, () => { - ajaxError(model.get('errors'), this.get('flashMessages')); - }); - } else { + model.save().then((model) => { + this.get('flashMessages').clearMessages(); this.transitionToRoute(fallbackRoute, model); - } + }, () => { + ajaxError(model.get('errors'), this.get('flashMessages')); + }); }, cancel: function() { diff --git a/app/models/strain.js b/app/models/strain.js index 72d4ff6..0c59f2f 100644 --- a/app/models/strain.js +++ b/app/models/strain.js @@ -25,6 +25,10 @@ export default DS.Model.extend({ return Ember.String.htmlSafe(`${this.get('strainName')}${type}`); }.property('strainName', 'typeStrain').readOnly(), + fullName: Ember.computed('species', 'strainName', function() { + return `${this.get('species.speciesName')} ${this.get('strainNameMU')}`; + }), + fullNameMU: function() { return Ember.String.htmlSafe(`${this.get('species.speciesName')} ${this.get('strainNameMU')}`); }.property('species', 'strainNameMU').readOnly(), diff --git a/app/pods/protected/species/index/species-table/component.js b/app/pods/protected/species/index/species-table/component.js index d58f509..528c48d 100644 --- a/app/pods/protected/species/index/species-table/component.js +++ b/app/pods/protected/species/index/species-table/component.js @@ -1,12 +1,12 @@ import Ember from 'ember'; import SetupMetaData from '../../../../../mixins/setup-metadata'; -const { Component } = Ember; +const { Component, computed: { sort } } = Ember; export default Component.extend(SetupMetaData, { species: null, sortParams: ['speciesName', 'strainCount'], - sortedSpecies: Ember.computed.sort('species', 'sortParams'), + sortedSpecies: sort('species', 'sortParams'), }); diff --git a/app/pods/protected/strains/edit/controller.js b/app/pods/protected/strains/edit/controller.js index 2f84780..4d68665 100644 --- a/app/pods/protected/strains/edit/controller.js +++ b/app/pods/protected/strains/edit/controller.js @@ -1,31 +1,36 @@ import Ember from 'ember'; +import SaveModel from '../../../../mixins/save-model'; import ajaxError from '../../../../utils/ajax-error'; -export default Ember.Controller.extend({ - actions: { - save: function() { - let strain = this.get('strain'); +const { Controller } = Ember; - if (strain.get('hasDirtyAttributes')) { - strain.save().then((strain) => { - this.transitionToRoute('protected.strains.show', strain); - }, () => { - ajaxError(strain.get('errors'), this.get('flashMessages')); - }); - } else { - strain.destroyRecord().then(() => { - this.transitionToRoute('protected.strains.show', strain); - }); - } +export default Controller.extend(SaveModel, { + // Required for SaveModel mixin + fallbackRouteSave: 'protected.strains.show', + fallbackRouteCancel: 'protected.strains.show', + + actions: { + addCharacteristic: function() { + return this.store.createRecord('measurement', { + characteristic: this.store.createRecord('characteristic', { sortOrder: -999 }), + }); }, - cancel: function() { - let strain = this.get('strain'); + saveMeasurement: function(measurement, properties) { + measurement.setProperties(properties); + measurement.save().then(() => { + this.get('flashMessages').clearMessages(); + }, () => { + ajaxError(measurement.get('errors'), this.get('flashMessages')); + }); + }, - strain.get('errors').clear(); - strain.rollbackAttributes(); - - this.transitionToRoute('protected.strains.show', strain); + deleteMeasurement: function(measurement) { + const characteristic = measurement.get('characteristic'); + if (characteristic.get('isNew')) { + characteristic.destroyRecord(); + } + measurement.destroyRecord(); }, }, diff --git a/app/pods/protected/strains/edit/route.js b/app/pods/protected/strains/edit/route.js index ee75d51..f8d8619 100644 --- a/app/pods/protected/strains/edit/route.js +++ b/app/pods/protected/strains/edit/route.js @@ -1,35 +1,44 @@ import Ember from 'ember'; +import ElevatedAccess from '../../../../mixins/elevated-access'; -export default Ember.Route.extend({ - currentUser: Ember.inject.service('session-account'), +const { Route } = Ember; - beforeModel: function(transition) { - this._super(transition); - this.get('currentUser.account').then((user) => { - if (user.get('isReader')) { - this.transitionTo('protected.strains.index'); - } - }); - }, +export default Route.extend(ElevatedAccess, { + // Required for ElevatedAccess mixin + fallbackRouteBefore: 'protected.strains.index', + fallbackRouteAfter: 'protected.strains.show', model: function(params) { return Ember.RSVP.hash({ - strain: this.store.find('strain', params.strain_id), + strain: this.store.findRecord('strain', params.strain_id), species: this.store.findAll('species'), // Need for dropdown + characteristics: this.store.findAll('characteristic'), // Need for dropdown }); }, + // Overriding afterModel because of RSVP hash afterModel: function(models) { - if (!models.strain.get('canEdit')) { - this.transitionTo('strains.show', models.strain.get('id')); + if (!models.strain.get('isNew') && !models.strain.get('canEdit')) { + this.transitionTo(this.get('fallbackRouteAfter'), models.strain.get('id')); } }, + // Setting up controller because of RSVP hash setupController: function(controller, models) { - controller.setProperties(models); - this.get('currentUser.account').then((user) => { - controller.set('metaData', user.get('metaData')); - }); + controller.set('model', models.strain); + controller.set('speciesList', models.species); + controller.set('allCharacteristics', models.characteristics); }, + actions: { + // Overriding willTransition because of RSVP hash + willTransition: function(/*transition*/) { + const controller = this.get('controller'); + const model = controller.get('model'); + + if (model.get('isNew')) { + model.destroyRecord(); + } + }, + }, }); diff --git a/app/pods/protected/strains/edit/template.hbs b/app/pods/protected/strains/edit/template.hbs index a4885d6..59d1633 100644 --- a/app/pods/protected/strains/edit/template.hbs +++ b/app/pods/protected/strains/edit/template.hbs @@ -1,8 +1,11 @@ {{ protected/strains/strain-form - strain=strain - species=species - canAdd=metaData.canAdd - save="save" - cancel="cancel" + strain=model + speciesList=speciesList + add-characteristic=(action "addCharacteristic") + allCharacteristics=allCharacteristics + save-measurement=(action "saveMeasurement") + delete-measurement=(action "deleteMeasurement") + on-save=(action "save") + on-cancel=(action "cancel") }} diff --git a/app/pods/protected/strains/index/controller.js b/app/pods/protected/strains/index/controller.js deleted file mode 100644 index ec348db..0000000 --- a/app/pods/protected/strains/index/controller.js +++ /dev/null @@ -1,6 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Controller.extend({ - sortParams: ['sortOrder'], - sortedStrains: Ember.computed.sort('model', 'sortParams'), -}); diff --git a/app/pods/protected/strains/index/route.js b/app/pods/protected/strains/index/route.js index e5582d7..627760f 100644 --- a/app/pods/protected/strains/index/route.js +++ b/app/pods/protected/strains/index/route.js @@ -1,17 +1,10 @@ import Ember from 'ember'; -export default Ember.Route.extend({ - currentUser: Ember.inject.service('session-account'), +const { Route } = Ember; +export default Route.extend({ model: function() { return this.store.findAll('strain'); }, - setupController: function(controller, model) { - controller.set('model', model); - this.get('currentUser.account').then((user) => { - controller.set('metaData', user.get('metaData')); - }); - }, - }); diff --git a/app/pods/protected/strains/index/strain-table/component.js b/app/pods/protected/strains/index/strain-table/component.js new file mode 100644 index 0000000..7b3b21c --- /dev/null +++ b/app/pods/protected/strains/index/strain-table/component.js @@ -0,0 +1,12 @@ +import Ember from 'ember'; +import SetupMetaData from '../../../../../mixins/setup-metadata'; + +const { Component, computed: { sort } } = Ember; + +export default Component.extend(SetupMetaData, { + strains: null, + + sortParams: ['fullName'], + sortedStrains: sort('strains', 'sortParams'), + +}); diff --git a/app/pods/protected/strains/index/strain-table/template.hbs b/app/pods/protected/strains/index/strain-table/template.hbs new file mode 100644 index 0000000..bb13d76 --- /dev/null +++ b/app/pods/protected/strains/index/strain-table/template.hbs @@ -0,0 +1,26 @@ +

Total strains: {{strains.length}}

+ +{{add-button label="Add Strain" link="protected.strains.new" canAdd=metaData.canAdd}} + + + + + + + + + + {{#each sortedStrains as |strain|}} + + + + + {{/each}} + +
SpeciesTotal Measurements
+ {{#link-to 'protected.strains.show' strain classBinding="data.typeStrain:type-strain"}} + {{strain.fullNameMU}} + {{/link-to}} + + {{strain.totalMeasurements}} +
diff --git a/app/pods/protected/strains/index/template.hbs b/app/pods/protected/strains/index/template.hbs index 077d22a..d441386 100644 --- a/app/pods/protected/strains/index/template.hbs +++ b/app/pods/protected/strains/index/template.hbs @@ -1,27 +1,6 @@

{{genus-name}} Strains

-

Total strains: {{model.length}}

-{{add-button label="Add Strain" link="protected.strains.new" canAdd=metaData.canAdd}} - - - - - - - - - - {{#each sortedStrains as |row|}} - - - - - {{/each}} - -
SpeciesTotal Measurements
- {{#link-to 'protected.strains.show' row classBinding="data.typeStrain:type-strain"}} - {{row.fullNameMU}} - {{/link-to}} - - {{row.totalMeasurements}} -
+{{ + protected/strains/index/strain-table + strains=model +}} diff --git a/app/pods/protected/strains/measurements-table-row/component.js b/app/pods/protected/strains/measurements-table-row/component.js new file mode 100644 index 0000000..ad63dc9 --- /dev/null +++ b/app/pods/protected/strains/measurements-table-row/component.js @@ -0,0 +1,69 @@ +import Ember from 'ember'; + +const { Component } = Ember; + +export default Component.extend({ + tagName: 'tr', + + // Read-only attributes + isEditing: false, + allCharacteristics: null, + measurement: null, + isDirty: null, + + // Actions + "save-measurement": null, + "delete-measurement": null, + + // Property mapping + propertiesList: ['characteristic', 'value', 'notes'], + characteristic: null, + value: null, + notes: null, + + resetOnInit: Ember.on('init', function() { + this.get('propertiesList').forEach((field) => { + const valueInMeasurement = this.get('measurement').get(field); + this.set(field, valueInMeasurement); + }); + }), + + updateField: function(property, value) { + this.set(property, value); + // Manually compare against passed in value + if (this.get('measurement').get(property) !== value) { + this.set('isDirty', true); + } else { + this.set('isDirty', false); + } + }, + + actions: { + edit: function() { + this.toggleProperty('isEditing'); + }, + + save: function() { + this.attrs['save-measurement'](this.get('measurement'), this.getProperties(this.get('propertiesList'))); + this.toggleProperty('isEditing'); + }, + + delete: function() { + this.attrs['delete-measurement'](this.get('measurement')); + }, + + characteristicDidChange: function(value) { + const newCharacteristic = this.get('allCharacteristics').findBy('id', value); + this.updateField('characteristic', newCharacteristic); + }, + + valueDidChange: function(value) { + this.updateField('value', value); + }, + + notesDidChange: function(value) { + this.updateField('notes', value); + }, + + }, +}); diff --git a/app/pods/protected/strains/measurements-table-row/template.hbs b/app/pods/protected/strains/measurements-table-row/template.hbs new file mode 100644 index 0000000..0dc03b7 --- /dev/null +++ b/app/pods/protected/strains/measurements-table-row/template.hbs @@ -0,0 +1,52 @@ +{{#if isEditing}} + + + + + + {{one-way-input type="text" class="measurement-value" value=value update=(action "valueDidChange")}} + + + {{one-way-input type="text" class="measurement-notes" value=notes update=(action "notesDidChange")}} + + {{#if canEdit}} + + {{#if isDirty}} + + {{else}} + + {{/if}} + + {{/if}} +{{else}} + + {{{measurement.characteristic.characteristicTypeName}}} + + + {{#link-to 'protected.characteristics.show' measurement.characteristic.id}} + {{{measurement.characteristic.characteristicName}}} + {{/link-to}} + + + {{measurement.value}} + + + {{measurement.notes}} + + {{#if canEdit}} + + + {{delete-button delete=(action 'delete')}} + + {{/if}} +{{/if}} diff --git a/app/pods/protected/strains/measurements-table/component.js b/app/pods/protected/strains/measurements-table/component.js new file mode 100644 index 0000000..e4fd3a1 --- /dev/null +++ b/app/pods/protected/strains/measurements-table/component.js @@ -0,0 +1,55 @@ +import Ember from 'ember'; + +const { Component, computed } = Ember; +const { sort } = computed; + +export default Component.extend({ + // Passed in + strain: null, + allCharacteristics: null, + canEdit: false, + canAdd: false, + + // Actions + "add-characteristic": null, + "save-measurement": null, + "delete-measurement": null, + + // Properties + sortParams: ['characteristic.characteristicTypeName', 'characteristic.sortOrder', 'characteristic.characteristicName'], + sortAsc: true, + paramsChanged: false, + sortedMeasurements: sort('strain.measurements', 'sortParams'), + measurementsPresent: computed('strain.measurements', function() { + return this.get('strain.measurements.length') > 0; + }), + + actions: { + addCharacteristic: function() { + const newChar = this.attrs['add-characteristic'](); + this.get('strain.measurements').addObject(newChar); + }, + + changeSortParam: function(col) { + const sort = this.get('sortAsc') ? 'asc' : 'desc'; + this.set('sortParams', [`${col}:${sort}`]); + this.set('paramsChanged', true); + this.toggleProperty('sortAsc'); + }, + + resetSortParam: function() { + this.set('sortParams', ['characteristic.characteristicTypeName', 'characteristic.sortOrder', 'characteristic.characteristicName']); + this.set('paramsChanged', false); + this.set('sortAsc', true); + }, + + saveMeasurement: function(measurement, properties) { + return this.attrs['save-measurement'](measurement, properties); + }, + + deleteMeasurement: function(measurement) { + return this.attrs['delete-measurement'](measurement); + }, + }, + +}); diff --git a/app/pods/protected/strains/show/loading/template.hbs b/app/pods/protected/strains/measurements-table/loading/template.hbs similarity index 100% rename from app/pods/protected/strains/show/loading/template.hbs rename to app/pods/protected/strains/measurements-table/loading/template.hbs diff --git a/app/pods/protected/strains/show/measurements-table/template.hbs b/app/pods/protected/strains/measurements-table/template.hbs similarity index 70% rename from app/pods/protected/strains/show/measurements-table/template.hbs rename to app/pods/protected/strains/measurements-table/template.hbs index a9a45dd..9e22393 100644 --- a/app/pods/protected/strains/show/measurements-table/template.hbs +++ b/app/pods/protected/strains/measurements-table/template.hbs @@ -1,17 +1,17 @@ {{#if canAdd}} -
- -

+
+ +

{{/if}} {{#if measurementsPresent}} -{{#if paramsChanged}} - -{{/if}} + {{#if paramsChanged}} + + {{/if}} {{#if canEdit}} @@ -41,8 +41,11 @@ {{#each sortedMeasurements as |measurement|}} {{ - protected/strains/show/measurements-table-row - row=measurement + protected/strains/measurements-table-row + measurement=measurement + save-measurement=(action "saveMeasurement") + delete-measurement=(action "deleteMeasurement") + allCharacteristics=allCharacteristics canEdit=canEdit }} {{/each}} diff --git a/app/pods/protected/strains/new/controller.js b/app/pods/protected/strains/new/controller.js index d3e1b36..a38edbb 100644 --- a/app/pods/protected/strains/new/controller.js +++ b/app/pods/protected/strains/new/controller.js @@ -1,29 +1,10 @@ import Ember from 'ember'; -import ajaxError from '../../../../utils/ajax-error'; +import SaveModel from '../../../../mixins/save-model'; -export default Ember.Controller.extend({ - actions: { - save: function() { - let strain = this.get('strain'); +const { Controller } = Ember; - if (strain.get('hasDirtyAttributes')) { - strain.save().then((strain) => { - this.transitionToRoute('protected.strains.show', strain); - }, () => { - ajaxError(strain.get('errors'), this.get('flashMessages')); - }); - } else { - strain.destroyRecord().then(() => { - this.transitionToRoute('protected.strains.index'); - }); - } - }, - - cancel: function() { - this.get('strain').destroyRecord().then(() => { - this.transitionToRoute('protected.strains.index'); - }); - }, - - }, +export default Controller.extend(SaveModel, { + // Required for SaveModel mixin + fallbackRouteSave: 'protected.strains.show', + fallbackRouteCancel: 'protected.strains.index', }); diff --git a/app/pods/protected/strains/new/route.js b/app/pods/protected/strains/new/route.js index 837b713..a9f4c6f 100644 --- a/app/pods/protected/strains/new/route.js +++ b/app/pods/protected/strains/new/route.js @@ -1,16 +1,12 @@ import Ember from 'ember'; +import ElevatedAccess from '../../../../mixins/elevated-access'; -export default Ember.Route.extend({ - currentUser: Ember.inject.service('session-account'), +const { Route } = Ember; - beforeModel: function(transition) { - this._super(transition); - this.get('currentUser.account').then((user) => { - if (user.get('isReader')) { - this.transitionTo('protected.strains.index'); - } - }); - }, +export default Route.extend(ElevatedAccess, { + // Required for ElevatedAccess mixin + fallbackRouteBefore: 'protected.strains.index', + fallbackRouteAfter: 'protected.strains.show', model: function() { return Ember.RSVP.hash({ @@ -19,19 +15,28 @@ export default Ember.Route.extend({ }); }, + // Overriding afterModel because of RSVP hash + afterModel: function(models) { + if (!models.strain.get('isNew') && !models.strain.get('canEdit')) { + this.transitionTo(this.get('fallbackRouteAfter'), models.strain.get('id')); + } + }, + + // Setting up controller because of RSVP hash setupController: function(controller, models) { - controller.setProperties(models); + controller.set('model', models.strain); + controller.set('speciesList', models.species); }, actions: { + // Overriding willTransition because of RSVP hash willTransition: function(/*transition*/) { const controller = this.get('controller'); - const strain = controller.get('strain'); + const model = controller.get('model'); - if (strain.get('isNew')) { - strain.destroyRecord(); + if (model.get('isNew')) { + model.destroyRecord(); } }, }, - }); diff --git a/app/pods/protected/strains/new/template.hbs b/app/pods/protected/strains/new/template.hbs index d9c4d43..1ae2d5b 100644 --- a/app/pods/protected/strains/new/template.hbs +++ b/app/pods/protected/strains/new/template.hbs @@ -1,7 +1,7 @@ {{ protected/strains/strain-form - strain=strain - species=species - save="save" - cancel="cancel" + strain=model + speciesList=speciesList + on-save=(action "save") + on-cancel=(action "cancel") }} diff --git a/app/pods/protected/strains/show/controller.js b/app/pods/protected/strains/show/controller.js index 7128b9a..e5e3e77 100644 --- a/app/pods/protected/strains/show/controller.js +++ b/app/pods/protected/strains/show/controller.js @@ -1,12 +1,9 @@ import Ember from 'ember'; +import DeleteModel from '../../../../mixins/delete-model'; -export default Ember.Controller.extend({ - actions: { - delete: function() { - this.get('model').destroyRecord().then(() => { - this.transitionToRoute('protected.strains.index'); - }); - }, - }, +const { Controller } = Ember; +export default Controller.extend(DeleteModel, { + // Required for DeleteModel mixin + transitionRoute: 'protected.strains.index', }); diff --git a/app/pods/protected/strains/show/measurements-table-row/component.js b/app/pods/protected/strains/show/measurements-table-row/component.js deleted file mode 100644 index b4220cd..0000000 --- a/app/pods/protected/strains/show/measurements-table-row/component.js +++ /dev/null @@ -1,47 +0,0 @@ -import Ember from 'ember'; -import ajaxError from '../../../../../utils/ajax-error'; - -export default Ember.Component.extend({ - tagName: 'tr', - isEditing: false, - - oldCharacteristicId: function() { - let json = this.get('row').toJSON(); - return json.characteristic; - }.property(), - - rowChanged: Ember.computed('row.notes', 'row.value', 'row.characteristic.id', function() { - return this.get('row.hasDirtyAttributes') || - this.get('oldCharacteristicId') !== this.get('row.characteristic.id'); - }), - - actions: { - edit: function() { - // The parent table fetches all of the characteristics ahead of time - this.set('characteristics', this.store.peekAll('characteristic')); - this.toggleProperty('isEditing'); - }, - - save: function() { - if (this.get('rowChanged')) { - this.get('row').save().then(() => { - this.get('flashMessages').clearMessages(); - this.toggleProperty('isEditing'); - }, () => { - ajaxError(this.get('row.errors'), this.get('flashMessages')); - }); - } else { - this.toggleProperty('isEditing'); - } - }, - - delete: function() { - let char = this.get('row.characteristic'); - if (char.get('isNew')) { - char.destroyRecord(); - } - this.get('row').destroyRecord(); - } - - }, -}); diff --git a/app/pods/protected/strains/show/measurements-table-row/template.hbs b/app/pods/protected/strains/show/measurements-table-row/template.hbs deleted file mode 100644 index a26fef4..0000000 --- a/app/pods/protected/strains/show/measurements-table-row/template.hbs +++ /dev/null @@ -1,54 +0,0 @@ -{{#if isEditing}} - - - - - {{#if canEdit}} - - {{/if}} -{{else}} - - - - - {{#if canEdit}} - - {{/if}} -{{/if}} diff --git a/app/pods/protected/strains/show/measurements-table/component.js b/app/pods/protected/strains/show/measurements-table/component.js deleted file mode 100644 index 07d94c6..0000000 --- a/app/pods/protected/strains/show/measurements-table/component.js +++ /dev/null @@ -1,47 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Component.extend({ - measurementsPresent: function() { - return this.get('model.measurements.length') > 0; - }.property('model.measurements'), - - fetchCharacteristics: function() { - if (this.get('canEdit')) { - this.store.findAll('characteristic'); - } - }.on('didInsertElement'), - - sortParams: ['characteristic.characteristicTypeName', 'characteristic.sortOrder', 'characteristic.characteristicName'], - sortAsc: true, - paramsChanged: false, - sortedMeasurements: Ember.computed.sort('model.measurements', 'sortParams'), - - actions: { - addCharacteristic: function() { - const c = this.store.createRecord('characteristic', { - sortOrder: -999 - }); - const m = this.store.createRecord('measurement', { - characteristic: c - }); - this.get('model.measurements').addObject(m); - }, - - changeSortParam: function(col) { - let sort = this.get('sortAsc') ? 'asc' : 'desc'; - let sortCol = `${col}:${sort}`; - this.set('sortParams', [sortCol]); - this.set('paramsChanged', true); - this.toggleProperty('sortAsc'); - return false; - }, - - resetSortParam: function() { - this.set('sortParams', ['characteristic.characteristicTypeName', 'characteristic.sortOrder', 'characteristic.characteristicName']); - this.set('paramsChanged', false); - this.set('sortAsc', true); - return false; - }, - }, - -}); diff --git a/app/pods/protected/strains/show/measurements-table/loading/template.hbs b/app/pods/protected/strains/show/measurements-table/loading/template.hbs deleted file mode 100644 index e5a3e05..0000000 --- a/app/pods/protected/strains/show/measurements-table/loading/template.hbs +++ /dev/null @@ -1 +0,0 @@ -{{loading-panel}} diff --git a/app/pods/protected/strains/show/route.js b/app/pods/protected/strains/show/route.js index 0a17d8b..ea320bd 100644 --- a/app/pods/protected/strains/show/route.js +++ b/app/pods/protected/strains/show/route.js @@ -1,8 +1,10 @@ import Ember from 'ember'; -export default Ember.Route.extend({ +const { Route } = Ember; + +export default Route.extend({ model: function(params) { - return this.store.findRecord('strain', params.strain_id, { reload: true }); + return this.store.findRecord('strain', params.strain_id); }, }); diff --git a/app/pods/protected/strains/show/strain-card/component.js b/app/pods/protected/strains/show/strain-card/component.js new file mode 100644 index 0000000..40802c8 --- /dev/null +++ b/app/pods/protected/strains/show/strain-card/component.js @@ -0,0 +1,14 @@ +import Ember from 'ember'; + +const { Component } = Ember; + +export default Component.extend({ + strain: null, + "on-delete": null, + + actions: { + deleteStrain: function() { + return this.attrs['on-delete'](); + }, + }, +}); diff --git a/app/pods/protected/strains/show/strain-card/template.hbs b/app/pods/protected/strains/show/strain-card/template.hbs new file mode 100644 index 0000000..995326a --- /dev/null +++ b/app/pods/protected/strains/show/strain-card/template.hbs @@ -0,0 +1,105 @@ +
+
+ + {{strain.strainNameMU}} + + + {{! ROW 1 }} +
+
+
Species
+
+ {{#link-to 'protected.species.show' strain.species.id}} + {{strain.species.speciesNameMU}} + {{/link-to}} +
+
+
+
Type Strain?
+
+ {{if strain.typeStrain 'Yes' 'No'}} +
+
+
+ + {{! ROW 2 }} +
+
+
Accession Numbers
+
+ {{strain.accessionNumbers}} +
+
+
+
Genbank
+
+ {{genbank-url genbank=strain.genbank}} +
+
+
+
Whole Genome Sequence
+
+ {{genbank-url genbank=strain.wholeGenomeSequence}} +
+
+
+ + {{! ROW 3 }} +
+
+
Isolated From
+
+ {{{strain.isolatedFrom}}} +
+
+
+ + {{! ROW 4 }} +
+
+
Notes
+
+ {{#if strain.notes}} + {{{strain.notes}}} + {{else}} + No notes. + {{/if}} +
+
+
+ + {{! ROW 5 }} +
+
+
Characteristics
+
+ {{ + protected/strains/measurements-table + strain=strain + canEdit=false + canAdd=false + }} +
+
+
+ + {{! ROW 6 }} +
+
+
Record Created
+
{{null-time strain.createdAt 'LL'}}
+
+
+
Record Updated
+
{{null-time strain.updatedAt 'LL'}}
+
+
+
+
+{{#if strain.canEdit}} +
+ {{#link-to 'protected.strains.edit' strain.id class="button-gray smaller"}} + Edit + {{/link-to}} + {{delete-button delete=(action 'deleteStrain')}} +{{/if}} diff --git a/app/pods/protected/strains/show/template.hbs b/app/pods/protected/strains/show/template.hbs index 8a10e60..32d23d6 100644 --- a/app/pods/protected/strains/show/template.hbs +++ b/app/pods/protected/strains/show/template.hbs @@ -1,105 +1,5 @@ -
-
- - Strain {{model.strainNameMU}} - - - {{! ROW 1 }} -
-
-
Species
-
- {{#link-to 'protected.species.show' model.species.id}} - {{model.species.speciesNameMU}} - {{/link-to}} -
-
-
-
Type Strain?
-
- {{if model.typeStrain 'Yes' 'No'}} -
-
-
- - {{! ROW 2 }} -
-
-
Accession Numbers
-
- {{model.accessionNumbers}} -
-
-
-
Genbank
-
- {{genbank-url genbank=model.genbank}} -
-
-
-
Whole Genome Sequence
-
- {{genbank-url genbank=model.wholeGenomeSequence}} -
-
-
- - {{! ROW 3 }} -
-
-
Isolated From
-
- {{{model.isolatedFrom}}} -
-
-
- - {{! ROW 4 }} -
-
-
Notes
-
- {{#if model.notes}} - {{{model.notes}}} - {{else}} - No notes. - {{/if}} -
-
-
- - {{! ROW 5 }} -
-
-
Characteristics
-
- {{ - protected/strains/show/measurements-table - model=model - canEdit=false - canAdd=false - }} -
-
-
- - {{! ROW 6 }} -
-
-
Record Created
-
{{null-time model.createdAt 'LL'}}
-
-
-
Record Updated
-
{{null-time model.updatedAt 'LL'}}
-
-
-
-
-{{#if model.canEdit}} -
- {{#link-to 'protected.strains.edit' model.id class="button-gray smaller"}} - Edit - {{/link-to}} - {{delete-button delete=(action 'delete')}} -{{/if}} +{{ + protected/strains/show/strain-card + strain=model + on-delete=(action 'delete') +}} diff --git a/app/pods/protected/strains/strain-form/component.js b/app/pods/protected/strains/strain-form/component.js index 8ac9027..420db5f 100644 --- a/app/pods/protected/strains/strain-form/component.js +++ b/app/pods/protected/strains/strain-form/component.js @@ -1,21 +1,106 @@ import Ember from 'ember'; +import SetupMetaData from '../../../../mixins/setup-metadata'; + +const { Component } = Ember; + +export default Component.extend(SetupMetaData, { + // Read-only attributes + strain: null, + isNew: null, + isDirty: false, + speciesList: null, + allCharacteristics: null, + + // Actions + "on-save": null, + "on-cancel": null, + "on-update": null, + "add-characteristic": null, + "save-measurement": null, + "delete-measurement": null, + + // Property mapping + propertiesList: ['strainName', 'typeStrain', 'species', 'isolatedFrom', 'accessionNumbers', 'genbank', 'wholeGenomeSequence', 'notes'], + strainName: null, + typeStrain: null, + species: null, + isolatedFrom: null, + accessionNumbers: null, + genbank: null, + wholeGenomeSequence: null, + notes: null, + + resetOnInit: Ember.on('init', function() { + this.get('propertiesList').forEach((field) => { + const valueInStrain = this.get('strain').get(field); + this.set(field, valueInStrain); + }); + // Read-only attributes + this.set('isNew', this.get('strain.isNew')); + }), + + updateField: function(property, value) { + this.set(property, value); + // Manually compare against passed in value + if (this.get('strain').get(property) !== value) { + this.set('isDirty', true); + } else { + this.set('isDirty', false); + } + }, -export default Ember.Component.extend({ actions: { save: function() { - this.sendAction('save'); + return this.attrs['on-save'](this.getProperties(this.get('propertiesList'))); }, cancel: function() { - this.sendAction('cancel'); + return this.attrs['on-cancel'](); + }, + + addCharacteristic: function() { + return this.attrs['add-characteristic'](); + }, + + saveMeasurement: function(measurement, properties) { + return this.attrs['save-measurement'](measurement, properties); + }, + + deleteMeasurement: function(measurement) { + return this.attrs['delete-measurement'](measurement); + }, + + strainNameDidChange: function(value) { + this.updateField('strainName', value); + }, + + typeStrainDidChange: function() { + this.updateField('typeStrain', !this.get('typeStrain')); + }, + + speciesDidChange: function(value) { + const newSpecies = this.get('speciesList').findBy('id', value); + this.updateField('species', newSpecies); }, isolatedFromDidChange: function(value) { - this.set('strain.isolatedFrom', value); + this.updateField('isolatedFrom', value); + }, + + accessionNumbersNameDidChange: function(value) { + this.updateField('accessionNumbers', value); + }, + + genbankDidChange: function(value) { + this.updateField('genbank', value); + }, + + wholeGenomeSequenceDidChange: function(value) { + this.updateField('wholeGenomeSequence', value); }, notesDidChange: function(value) { - this.set('strain.notes', value); + this.updateField('strain.notes', value); }, }, }); diff --git a/app/pods/protected/strains/strain-form/template.hbs b/app/pods/protected/strains/strain-form/template.hbs index 109d037..47c5112 100644 --- a/app/pods/protected/strains/strain-form/template.hbs +++ b/app/pods/protected/strains/strain-form/template.hbs @@ -1,68 +1,72 @@
- {{strain.strainName}} + {{strainName}}
- {{input value=strain.strainName}} + {{one-way-input type="text" class="strain-name" value=strainName update=(action "strainNameDidChange")}}
- {{input type="checkbox" checked=strain.typeStrain}} {{if strain.typeStrain 'Yes' 'No'}} + + {{if typeStrain 'Yes' 'No'}}
- {{ - select-2 - content=species - optionLabelPath="speciesName" - value=strain.species - }} +
- {{text-editor value=strain.isolatedFrom update=(action "isolatedFromDidChange")}} + {{text-editor value=isolatedFrom update=(action "isolatedFromDidChange")}}
- {{input value=strain.accessionNumbers}} + {{one-way-input type="text" class="accession-numbers" value=accessionNumbers update=(action "accessionNumbersNameDidChange")}}
- {{input value=strain.genbank}} + {{one-way-input type="text" class="genbank" value=genbank update=(action "genbankDidChange")}}
- {{input value=strain.wholeGenomeSequence}} + {{one-way-input type="text" class="whole-genome-sequenc" value=wholeGenomeSequence update=(action "wholeGenomeSequenceDidChange")}}
- {{text-editor value=strain.notes update=(action "notesDidChange")}} + {{text-editor value=notes update=(action "notesDidChange")}}
{{ - protected/strains/show/measurements-table - model=strain + protected/strains/measurements-table + strain=strain + add-characteristic=(action "addCharacteristic") + allCharacteristics=allCharacteristics + save-measurement=(action "saveMeasurement") + delete-measurement=(action "deleteMeasurement") canEdit=strain.canEdit - canAdd=canAdd + canAdd=metaData.canAdd }}

Cancel - {{#if strain.hasDirtyAttributes}} - {{/if}} diff --git a/tests/acceptance/strains-test.js b/tests/acceptance/strains-test.js new file mode 100644 index 0000000..a52e7ed --- /dev/null +++ b/tests/acceptance/strains-test.js @@ -0,0 +1,76 @@ +import Ember from 'ember'; +import { module, test } from 'qunit'; +import startApp from '../helpers/start-app'; +import { authenticateSession } from '../helpers/ember-simple-auth'; + +module('Acceptance | strains', { + beforeEach: function() { + this.application = startApp(); + authenticateSession(this.application, { + access_token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWN0ZGIiLCJzdWIiOiIxIiwiZXhwIjoxNDQ2NTAyMjI2LCJpYXQiOjE0NDY0OTg2MjZ9.vIjKHAsp2TkCV505EbtCo2xQT-2oQkB-Nv5y0b6E7Mg" + }); + server.create('users', { role: 'A', canEdit: true }); + }, + + afterEach: function() { + Ember.run(this.application, 'destroy'); + } +}); + +test('visiting /strains', function(assert) { + const species = server.create('species'); + const strains = server.createList('strains', 20, { species: species.id }); + visit('/strains'); + + andThen(function() { + assert.equal(currentURL(), '/strains'); + assert.equal(find(".flakes-table > tbody > tr").length, strains.length); + assert.equal(find("#total-strains").text(), "Total strains: 20"); + }); +}); + +test('visiting /strains/:id', function(assert) { + const species = server.create('species'); + const strain = server.create('strains', { species: species.id }); + visit(`/strains/${strain.id}`); + + andThen(function() { + assert.equal(currentURL(), `/strains/${strain.id}`); + const typeStrain = strain.typeStrain ? 'T' : ''; + assert.equal(find(".flakes-information-box > legend").text().trim(), `${strain.strainName}${typeStrain}`); + }); +}); + +test('editing /strains/:id/edit', function(assert) { + const species = server.create('species'); + const strain = server.create('strains', { canEdit: true , species: species.id }); + visit(`/strains/${strain.id}/edit`); + + andThen(function() { + assert.equal(currentURL(), `/strains/${strain.id}/edit`); + + fillIn('.strain-name', 'Revised Strain Name'); + click('.save-strain'); + + andThen(function() { + assert.equal(currentURL(), `/strains/${strain.id}`); + const typeStrain = strain.typeStrain ? 'T' : ''; + assert.equal(find(".flakes-information-box > legend").text().trim(), `Revised Strain Name${typeStrain}`); + }); + }); +}); + +test('creating /strains/new', function(assert) { + visit(`/strains/new`); + + andThen(function() { + assert.equal(currentURL(), `/strains/new`); + fillIn('.strain-name', 'New Strain Name'); + click('.save-strain'); + + andThen(function() { + assert.equal(find(".flakes-information-box > legend").text().trim(), `New Strain Name`); + assert.equal(server.db.strains.length, 1); + }); + }); +});
- {{ - select-2 - multiple=false - content=characteristics - value=row.characteristic - optionLabelPath="characteristicName" - }} - - {{input value=row.value}} - - {{input value=row.notes}} - - {{#if rowChanged}} - - {{else}} - - {{/if}} - - {{{row.characteristic.characteristicTypeName}}} - - {{#link-to 'protected.characteristics.show' row.characteristic.id}} - {{{row.characteristic.characteristicName}}} - {{/link-to}} - - {{row.value}} - - {{row.notes}} - - - {{delete-button delete=(action 'delete')}} -