From 01a307565538474be9141780c4e213e6507bf6d9 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 8 Jul 2015 14:44:24 -0800 Subject: [PATCH] Refactoring strains --- .../components/display-errors/template.hbs | 3 - .../forms/species-form/component.js | 1 + .../components/forms/strain-form/component.js | 17 ++ .../components/forms/strain-form/template.hbs | 61 ++++++++ .../components/strain-details/component.js | 20 --- .../components/strain-details/template.hbs | 145 ------------------ app/pods/species/edit/controller.js | 6 +- app/pods/species/new/controller.js | 1 + app/pods/species/show/controller.js | 2 +- app/pods/species/show/route.js | 6 +- app/pods/strains/edit/controller.js | 30 ++++ app/pods/strains/edit/route.js | 16 ++ app/pods/strains/edit/template.hbs | 7 + app/pods/strains/index/controller.js | 7 +- app/pods/strains/index/route.js | 8 +- app/pods/strains/index/template.hbs | 4 +- app/pods/strains/new/controller.js | 23 ++- app/pods/strains/new/route.js | 4 +- app/pods/strains/new/template.hbs | 3 +- app/pods/strains/show/controller.js | 23 ++- app/pods/strains/show/route.js | 10 +- app/pods/strains/show/template.hbs | 98 +++++++++++- app/router.js | 3 + 23 files changed, 275 insertions(+), 223 deletions(-) delete mode 100644 app/pods/components/display-errors/template.hbs create mode 100644 app/pods/components/forms/strain-form/component.js create mode 100644 app/pods/components/forms/strain-form/template.hbs delete mode 100644 app/pods/components/strain-details/component.js delete mode 100644 app/pods/components/strain-details/template.hbs create mode 100644 app/pods/strains/edit/controller.js create mode 100644 app/pods/strains/edit/route.js create mode 100644 app/pods/strains/edit/template.hbs diff --git a/app/pods/components/display-errors/template.hbs b/app/pods/components/display-errors/template.hbs deleted file mode 100644 index 6a74209..0000000 --- a/app/pods/components/display-errors/template.hbs +++ /dev/null @@ -1,3 +0,0 @@ -{{#each a as |error|}} -
{{error.message}}
-{{/each}} diff --git a/app/pods/components/forms/species-form/component.js b/app/pods/components/forms/species-form/component.js index 0e5912c..a53a469 100644 --- a/app/pods/components/forms/species-form/component.js +++ b/app/pods/components/forms/species-form/component.js @@ -5,6 +5,7 @@ export default Ember.Component.extend({ save: function() { this.sendAction('save'); }, + cancel: function() { this.sendAction('cancel'); }, diff --git a/app/pods/components/forms/strain-form/component.js b/app/pods/components/forms/strain-form/component.js new file mode 100644 index 0000000..3888156 --- /dev/null +++ b/app/pods/components/forms/strain-form/component.js @@ -0,0 +1,17 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + actions: { + save: function() { + // Need to override the string id for some reason + let strain = this.get('strain'); + let id = strain.get('species.id'); + strain.set('species.id', +id); + this.sendAction('save'); + }, + + cancel: function() { + this.sendAction('cancel'); + }, + } +}); diff --git a/app/pods/components/forms/strain-form/template.hbs b/app/pods/components/forms/strain-form/template.hbs new file mode 100644 index 0000000..84bc241 --- /dev/null +++ b/app/pods/components/forms/strain-form/template.hbs @@ -0,0 +1,61 @@ +
+
+ {{strain.strainName}} +
+
+ + {{input value=strain.strainName}} +
+
+ + {{input type="checkbox" checked=strain.typeStrain}} {{if strain.typeStrain 'Yes' 'No'}} +
+
+
+
+ + {{ + select-2 + content=species + optionLabelPath="speciesName" + value=strain.species + }} +
+
+
+
+ + {{textarea value=strain.isolatedFrom cols="70" rows="5"}} +
+
+
+
+ + {{input value=strain.accessionNumbers}} +
+
+ + {{input value=strain.genbank}} +
+
+ + {{input value=strain.wholeGenomeSequence}} +
+
+
+
+ + {{textarea value=strain.notes cols="70" rows="5"}} +
+
+
+
+
+ + Cancel + +{{#if strain.isDirty}} + + Save + +{{/if}} diff --git a/app/pods/components/strain-details/component.js b/app/pods/components/strain-details/component.js deleted file mode 100644 index b483565..0000000 --- a/app/pods/components/strain-details/component.js +++ /dev/null @@ -1,20 +0,0 @@ -import Ember from 'ember'; -import userCanEdit from '../../../utils/user-can-edit'; - -export default Ember.Component.extend({ - classNames: ['grid-1'], - isEditing: false, - - canEdit: function() { - return userCanEdit(this.get('session.currentUser'), this.get('strain.createdBy')); - }.property('session.currentUser', 'strain.createdBy').readOnly(), - - actions: { - save: function() { - this.sendAction('save'); - }, - cancel: function() { - this.sendAction('cancel'); - }, - } -}); diff --git a/app/pods/components/strain-details/template.hbs b/app/pods/components/strain-details/template.hbs deleted file mode 100644 index 4f98ea7..0000000 --- a/app/pods/components/strain-details/template.hbs +++ /dev/null @@ -1,145 +0,0 @@ -
-
- - Strain - {{#if isEditing}} - {{input value=strain.strainName}} - {{else}} - {{strain.strainNameMU}} - {{/if}} - {{display-errors a=strain.errors.strainName}} - - - {{! ROW 1 }} -
-
-
Species
-
- {{#if isEditing}} - {{ - select-2 - content=species - optionLabelPath="speciesName" - value=strain.species - }} - {{else}} - {{#link-to 'species.show' strain.species}} - {{strain.species.speciesName}} - {{/link-to}} - {{/if}} -
-
-
-
Type Strain?
-
- {{#if isEditing}} - {{input type="checkbox" checked=strain.typeStrain}} - {{/if}} - {{if strain.typeStrain 'Yes' 'No'}} - {{display-errors a=strain.errors.typeStrain}} -
-
-
- - {{! ROW 2 }} -
-
-
Accession Numbers
-
- {{#if isEditing}} - {{input value=strain.accessionNumbers}} - {{else}} - {{strain.accessionNumbers}} - {{/if}} - {{display-errors a=strain.errors.accessionNumbers}} -
-
-
-
Genbank
-
- {{#if isEditing}} - {{input value=strain.genbank}} - {{else}} - {{genbank-url genbank=strain.genbank}} - {{/if}} - {{display-errors a=strain.errors.genbank}} -
-
-
-
Whole Genome Sequence
-
- {{#if isEditing}} - {{input value=strain.wholeGenomeSequence}} - {{else}} - {{strain.wholeGenomeSequence}} - {{/if}} - {{display-errors a=strain.errors.wholeGenomeSequence}} -
-
-
- - {{! ROW 3 }} -
-
-
Isolated From
-
- {{#if isEditing}} - {{textarea value=strain.isolatedFrom cols="70" rows="3"}} - {{else}} - {{strain.isolatedFrom}} - {{/if}} - {{display-errors a=strain.errors.isolatedFrom}} -
-
-
- - {{! ROW 4 }} -
-
-
Notes
-
- {{#if isEditing}} - {{textarea value=strain.notes cols="70" rows="3"}} - {{else}} - {{strain.notes}} - {{/if}} - {{display-errors a=strain.errors.notes}} -
-
-
- - {{! ROW 5 }} -
-
-
Record Created
-
{{null-time strain.createdAt 'LL'}}
-
-
-
Record Updated
-
{{null-time strain.updatedAt 'LL'}}
-
-
-
Record Deleted
-
{{null-time strain.deletedAt 'LL'}}
-
-
-
- - {{! ROW 6 }} - {{#if canEdit}} -
-
- {{! Does nothing ATM }} - - {{#if isEditing}}Cancel{{else}}Edit{{/if}} - - {{#if isEditing}} - - Save - - {{/if}} -
-
- {{/if}} -
-
diff --git a/app/pods/species/edit/controller.js b/app/pods/species/edit/controller.js index 463392e..385e70d 100644 --- a/app/pods/species/edit/controller.js +++ b/app/pods/species/edit/controller.js @@ -7,12 +7,12 @@ export default Ember.Controller.extend({ if (species.get('isDirty')) { species.save().then((species) => { - this.transitionToRoute('species.show', species.get('id')); + this.transitionToRoute('species.show', species); }, (err) => { this.get('flashMessages').error(err.responseJSON.error); }); } else { - this.transitionToRoute('species.show', species.get('id')); + this.transitionToRoute('species.show', species); } }, @@ -22,7 +22,7 @@ export default Ember.Controller.extend({ species.get('errors').clear(); species.rollback(); - this.transitionToRoute('species.show', species.get('id')); + this.transitionToRoute('species.show', species); }, }, diff --git a/app/pods/species/new/controller.js b/app/pods/species/new/controller.js index 568648f..10704f8 100644 --- a/app/pods/species/new/controller.js +++ b/app/pods/species/new/controller.js @@ -12,6 +12,7 @@ export default Ember.Controller.extend({ this.get('flashMessages').error(err.responseJSON.error); }); } else { + species.deleteRecord(); this.transitionToRoute('species.index'); } }, diff --git a/app/pods/species/show/controller.js b/app/pods/species/show/controller.js index d9625f4..6d9a32a 100644 --- a/app/pods/species/show/controller.js +++ b/app/pods/species/show/controller.js @@ -6,7 +6,7 @@ export default Ember.Controller.extend({ let id = this.get('model.id'); if (meta.canEdit.indexOf( +id ) === -1) { - return false + return false; } return true; }.property('model.isLoaded').readOnly(), diff --git a/app/pods/species/show/route.js b/app/pods/species/show/route.js index b3f843f..dcf76cf 100644 --- a/app/pods/species/show/route.js +++ b/app/pods/species/show/route.js @@ -1,4 +1,8 @@ import Ember from 'ember'; import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; -export default Ember.Route.extend(AuthenticatedRouteMixin, {}); +export default Ember.Route.extend(AuthenticatedRouteMixin, { + model: function(params) { + return this.store.find('species', params.species_id); + } +}); diff --git a/app/pods/strains/edit/controller.js b/app/pods/strains/edit/controller.js new file mode 100644 index 0000000..f79a682 --- /dev/null +++ b/app/pods/strains/edit/controller.js @@ -0,0 +1,30 @@ +import Ember from 'ember'; + +export default Ember.Controller.extend({ + actions: { + save: function() { + let strain = this.get('strain'); + + if (strain.get('isDirty')) { + strain.save().then((strain) => { + this.transitionToRoute('strains.show', strain); + }, (err) => { + this.get('flashMessages').error(err.responseJSON.error); + }); + } else { + strain.deleteRecord(); + this.transitionToRoute('strains.show', strain); + } + }, + + cancel: function() { + let strain = this.get('strain'); + + strain.get('errors').clear(); + strain.rollback(); + + this.transitionToRoute('strains.show', strain); + }, + + }, +}); diff --git a/app/pods/strains/edit/route.js b/app/pods/strains/edit/route.js new file mode 100644 index 0000000..9400fff --- /dev/null +++ b/app/pods/strains/edit/route.js @@ -0,0 +1,16 @@ +import Ember from 'ember'; +import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; + +export default Ember.Route.extend(AuthenticatedRouteMixin, { + model: function(params) { + return Ember.RSVP.hash({ + strain: this.store.find('strain', params.strain_id), + species: this.store.findAll('species'), + }); + }, + + setupController: function(controller, models) { + controller.setProperties(models); + }, + +}); diff --git a/app/pods/strains/edit/template.hbs b/app/pods/strains/edit/template.hbs new file mode 100644 index 0000000..e15fec0 --- /dev/null +++ b/app/pods/strains/edit/template.hbs @@ -0,0 +1,7 @@ +{{ + forms/strain-form + strain=strain + species=species + save="save" + cancel="cancel" +}} diff --git a/app/pods/strains/index/controller.js b/app/pods/strains/index/controller.js index 25e4db1..17b709b 100644 --- a/app/pods/strains/index/controller.js +++ b/app/pods/strains/index/controller.js @@ -2,5 +2,10 @@ import Ember from 'ember'; export default Ember.Controller.extend({ sortParams: ['fullNameMU', 'totalMeasurements'], - sortedStrains: Ember.computed.sort('strains', 'sortParams'), + sortedStrains: Ember.computed.sort('model', 'sortParams'), + + metaData: function() { + return this.store.metadataFor('strain'); + }.property('model.isLoaded').readOnly(), + }); diff --git a/app/pods/strains/index/route.js b/app/pods/strains/index/route.js index 034c403..9456dfc 100644 --- a/app/pods/strains/index/route.js +++ b/app/pods/strains/index/route.js @@ -3,12 +3,6 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function() { - return Ember.RSVP.hash({ - strains: this.store.findAll('strain'), - }); - }, - - setupController: function(controller, model) { - controller.setProperties(model); + return this.store.findAll('strain'); }, }); diff --git a/app/pods/strains/index/template.hbs b/app/pods/strains/index/template.hbs index 9ac0600..a513167 100644 --- a/app/pods/strains/index/template.hbs +++ b/app/pods/strains/index/template.hbs @@ -1,7 +1,7 @@

{{genus-name}} Strains

-

Total strains: {{strains.length}}

+

Total strains: {{model.length}}

-{{add-button label="Add Strain" link="strains.new"}} +{{add-button label="Add Strain" link="strains.new" canAdd=metaData.canAdd}} diff --git a/app/pods/strains/new/controller.js b/app/pods/strains/new/controller.js index 1bd3e90..a6c3139 100644 --- a/app/pods/strains/new/controller.js +++ b/app/pods/strains/new/controller.js @@ -1,21 +1,30 @@ import Ember from 'ember'; export default Ember.Controller.extend({ - isEditing: true, actions: { save: function() { - var strain = this.get('strain'); + let strain = this.get('strain'); + if (strain.get('isDirty')) { - strain.save(); + strain.save().then((strain) => { + this.transitionToRoute('strains.show', strain); + }, (err) => { + this.get('flashMessages').error(err.responseJSON.error); + }); + } else { + this.transitionToRoute('strains.index'); } - this.transitionToRoute('strains.index'); }, + cancel: function() { - var strain = this.get('strain'); + let strain = this.get('strain'); + if (strain.get('isNew')) { strain.deleteRecord(); } + this.transitionToRoute('strains.index'); - } - } + }, + + }, }); diff --git a/app/pods/strains/new/route.js b/app/pods/strains/new/route.js index 318dad2..0199071 100644 --- a/app/pods/strains/new/route.js +++ b/app/pods/strains/new/route.js @@ -5,10 +5,12 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function() { return Ember.RSVP.hash({ strain: this.store.createRecord('strain'), - species: this.store.findAll('species') + species: this.store.findAll('species'), }); }, + setupController: function(controller, models) { controller.setProperties(models); }, + }); diff --git a/app/pods/strains/new/template.hbs b/app/pods/strains/new/template.hbs index bd22b30..e15fec0 100644 --- a/app/pods/strains/new/template.hbs +++ b/app/pods/strains/new/template.hbs @@ -1,8 +1,7 @@ {{ - strain-details + forms/strain-form strain=strain species=species - isEditing=true save="save" cancel="cancel" }} diff --git a/app/pods/strains/show/controller.js b/app/pods/strains/show/controller.js index 1055631..2925c60 100644 --- a/app/pods/strains/show/controller.js +++ b/app/pods/strains/show/controller.js @@ -1,19 +1,14 @@ import Ember from 'ember'; export default Ember.Controller.extend({ - isEditing: false, - actions: { - save: function() { - var strain = this.get('strain'); - if (strain.get('isDirty')) { - strain.save(); - } - this.toggleProperty('isEditing'); - }, - cancel: function() { - this.get('strain').get('errors').clear(); - this.get('strain').rollback(); - this.toggleProperty('isEditing'); + userCanEdit: function() { + let meta = this.store.metadataFor('strain'); + let id = this.get('model.id'); + + if (meta.canEdit.indexOf( +id ) === -1) { + return false; } - } + return true; + }.property('model.isLoaded').readOnly(), + }); diff --git a/app/pods/strains/show/route.js b/app/pods/strains/show/route.js index 6a5555b..bd0b588 100644 --- a/app/pods/strains/show/route.js +++ b/app/pods/strains/show/route.js @@ -3,12 +3,6 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function(params) { - return Ember.RSVP.hash({ - strain: this.store.find('strain', params.strain_id), - species: this.store.findAll('species') - }); - }, - setupController: function(controller, models) { - controller.setProperties(models); - }, + return this.store.find('strain', params.strain_id); + } }); diff --git a/app/pods/strains/show/template.hbs b/app/pods/strains/show/template.hbs index 16a7df0..4605f97 100644 --- a/app/pods/strains/show/template.hbs +++ b/app/pods/strains/show/template.hbs @@ -1,8 +1,90 @@ -{{ - strain-details - strain=strain - species=species - isEditing=isEditing - save="save" - cancel="cancel" -}} +
+
+ + Strain {{model.strainNameMU}} + + + {{! ROW 1 }} +
+
+
Species
+
+ {{#link-to '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
+
+ {{model.wholeGenomeSequence}} +
+
+
+ + {{! ROW 3 }} +
+
+
Isolated From
+
+ {{model.isolatedFrom}} +
+
+
+ + {{! ROW 4 }} +
+
+
Notes
+
+ {{model.notes}} +
+
+
+ + {{! ROW 5 }} +
+
+
Record Created
+
{{null-time model.createdAt 'LL'}}
+
+
+
Record Updated
+
{{null-time model.updatedAt 'LL'}}
+
+
+
Record Deleted
+
{{null-time model.deletedAt 'LL'}}
+
+
+
+
+
+{{#if userCanEdit}} +
+ {{#link-to 'species.edit' model class="button-gray smaller"}} + Edit + {{/link-to}} +{{/if}} diff --git a/app/router.js b/app/router.js index 6f43b21..2720075 100644 --- a/app/router.js +++ b/app/router.js @@ -17,10 +17,13 @@ Router.map(function() { this.route('show', { path: ':species_id' }); this.route('edit', { path: ':species_id/edit' }); }); + this.route('strains', function() { this.route('new'); this.route('show', { path: ':strain_id' }); + this.route('edit', { path: ':strain_id/edit' }); }); + this.route('users', function() { this.route('new', function() { this.route('fail');