Merge branch 'master' into clostridium

* master:
  Fix up full name, again
  Force sort order for compare

app/models/strain.js

@@ -23,12 +23,8 @@ export default Model.extend({
   sortOrder          : attr('number'),
   canEdit            : attr('boolean'),
 
-  // Used internally for sorting
-  fullName: computed('species', 'strainName', function() {
-    return `${this.get('species.speciesName')} ${this.get('strainNameMU')}`;
-  }),
-
   fullNameMU: computed('species', 'strainName', function() {
-    return htmlSafe(`<em>${this.get('species.speciesName')}</em> ${this.get('strainName')}`);
+    const type = this.get('typeStrain') ? '<sup>T</sup>' : '';
+    return htmlSafe(`<em>${this.get('species.speciesName')}</em> ${this.get('strainName')}${type}`);
   }),
 });

app/pods/components/full-strain-name/template.hbs

@@ -1 +0,0 @@
-{{strain.fullNameMU}}{{{if strain.typeStrain '<sup>T</sup>' ''}}}

app/pods/protected/compare/select-form/component.js

@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-const { Component } = Ember;
+const { Component, computed: { sort } } = Ember;
 
 export default Component.extend({
   characteristics: null,
@@ -10,6 +10,12 @@ export default Component.extend({
   "update-strains": null,
   "update-characteristics": null,
 
+
+  charSortParams: ['characteristicTypeName', 'sortOrder', 'characteristicName'],
+  sortedCharacteristics: sort('characteristics', 'charSortParams'),
+  strainSortParams: ['sortOrder'],
+  sortedStrains: sort('strains', 'sortParams'),
+
   selectedStrains: [],
   selectedCharacteristics: [],
 

app/pods/protected/compare/select-form/template.hbs

@@ -6,7 +6,7 @@
           <label>Strains</label>
           {{
             x-select
-            options=strains
+            options=sortedStrains
             nameAttr='fullNameMU'
             multiple=true
             selected=selectedStrains
@@ -26,7 +26,7 @@
           <label>Characteristics</label>
           {{
             x-select
-            options=characteristics
+            options=sortedCharacteristics
             nameAttr='characteristicName'
             multiple=true
             selected=selectedCharacteristics

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: ['fullName'],
+  sortParams: ['sortOrder'],
   sortedStrains: sort('strains', 'sortParams'),
 
 });

app/pods/protected/strains/index/strain-table/template.hbs

@@ -14,7 +14,7 @@
       <tr>
         <td>
           {{#link-to 'protected.strains.show' strain classBinding="strain.typeStrain:type-strain"}}
-            {{full-strain-name strain=strain}}
+            {{strain.fullNameMU}}
           {{/link-to}}
         </td>
         <td>