Refactor strains/new

app/mirage/config.js

@@ -36,7 +36,7 @@ export function testConfig() {
     return {
       strain: db.strains.find(request.params.id),
       species: db.species, // Just send back everything we've got
-    }
+    };
   });
   this.put('/strains/:id');
 }

app/mixins/save-model.js

@@ -13,17 +13,12 @@ export default Mixin.create({
       const fallbackRoute = this.get('fallbackRouteSave');
 
       model.setProperties(properties);
-
+      model.save().then((model) => {
-      if (model.get('hasDirtyAttributes')) {
+        this.get('flashMessages').clearMessages();
-        model.save().then((model) => {
-          this.get('flashMessages').clearMessages();
-          this.transitionToRoute(fallbackRoute, model);
-        }, () => {
-          ajaxError(model.get('errors'), this.get('flashMessages'));
-        });
-      } else {
         this.transitionToRoute(fallbackRoute, model);
-      }
+      }, () => {
+        ajaxError(model.get('errors'), this.get('flashMessages'));
+      });
     },
 
     cancel: function() {

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(`<em>${this.get('species.speciesName')}</em> ${this.get('strainNameMU')}`);
   }.property('species', 'strainNameMU').readOnly(),

app/pods/protected/strains/edit/template.hbs

@@ -2,7 +2,6 @@
   protected/strains/strain-form
   strain=model
   speciesList=speciesList
-  canAdd=metaData.canAdd
   on-save=(action "save")
   on-cancel=(action "cancel")
 }}

app/pods/protected/strains/index/strain-table/component.js

@@ -6,7 +6,7 @@ const { Component, computed: { sort } } = Ember;
 export default Component.extend(SetupMetaData, {
   strains: null,
 
-  sortParams: ['fullNameMU'],
+  sortParams: ['fullName'],
   sortedStrains: sort('strains', 'sortParams'),
 
 });

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({
+const { Controller } = Ember;
-  actions: {
-    save: function() {
-      let strain = this.get('strain');
 
-      if (strain.get('hasDirtyAttributes')) {
+export default Controller.extend(SaveModel, {
-        strain.save().then((strain) => {
+  // Required for SaveModel mixin
-          this.transitionToRoute('protected.strains.show', strain);
+  fallbackRouteSave: 'protected.strains.show',
-        }, () => {
+  fallbackRouteCancel: 'protected.strains.index',
-          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');
-      });
-    },
-
-  },
 });

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({
+const { Route } = Ember;
-  currentUser: Ember.inject.service('session-account'),
 
-  beforeModel: function(transition) {
+export default Route.extend(ElevatedAccess, {
-    this._super(transition);
+  // Required for ElevatedAccess mixin
-    this.get('currentUser.account').then((user) => {
+  fallbackRouteBefore: 'protected.strains.index',
-      if (user.get('isReader')) {
+  fallbackRouteAfter: 'protected.strains.show',
-        this.transitionTo('protected.strains.index');
-      }
-    });
-  },
 
   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')) {
+      if (model.get('isNew')) {
-        strain.destroyRecord();
+        model.destroyRecord();
       }
     },
   },
-
 });

app/pods/protected/strains/new/template.hbs

@@ -1,7 +1,7 @@
 {{
   protected/strains/strain-form
-  strain=strain
+  strain=model
-  species=species
+  speciesList=speciesList
-  save="save"
+  on-save=(action "save")
-  cancel="cancel"
+  on-cancel=(action "cancel")
 }}

app/pods/protected/strains/show/strain-card/template.hbs

@@ -98,7 +98,7 @@
 </div>
 {{#if strain.canEdit}}
   <br>
-  {{#link-to 'protected.strains.edit' strain class="button-gray smaller"}}
+  {{#link-to 'protected.strains.edit' strain.id class="button-gray smaller"}}
     Edit
   {{/link-to}}
   {{delete-button delete=(action 'deleteStrain')}}

app/pods/protected/strains/strain-form/component.js

@@ -63,7 +63,8 @@ export default Component.extend(SetupMetaData, {
     },
 
     speciesDidChange: function(value) {
-      this.updateField('species', value);
+      const newSpecies = this.get('speciesList').findBy('id', value);
+      this.updateField('species', newSpecies);
     },
 
     isolatedFromDidChange: function(value) {

app/pods/protected/strains/strain-form/template.hbs

@@ -17,7 +17,7 @@
         <label>Species</label>
         <select onchange={{action "speciesDidChange" value="target.value"}}>
           {{#each speciesList as |speciesChoice|}}
-            <option value={{speciesChoice}} selected={{equal species speciesChoice}}>{{speciesChoice.speciesName}}</option>
+            <option value={{speciesChoice.id}} selected={{equal species.id speciesChoice.id}}>{{speciesChoice.speciesName}}</option>
           {{/each}}
         </select>
       </div>