From ba15af411ee2f674cfe6c340f495519bd0ad8453 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Tue, 10 Nov 2015 15:49:55 -0700
Subject: [PATCH] Stop loading chars in measurements-table

---
 app/pods/protected/strains/edit/route.js                 | 2 ++
 app/pods/protected/strains/edit/template.hbs             | 1 +
 .../strains/measurements-table-row/component.js          | 2 --
 .../strains/measurements-table-row/template.hbs          | 2 +-
 .../protected/strains/measurements-table/component.js    | 9 ++-------
 .../protected/strains/measurements-table/template.hbs    | 1 +
 app/pods/protected/strains/strain-form/component.js      | 1 +
 app/pods/protected/strains/strain-form/template.hbs      | 1 +
 8 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/pods/protected/strains/edit/route.js b/app/pods/protected/strains/edit/route.js
index 7efe43d..f8d8619 100644
--- a/app/pods/protected/strains/edit/route.js
+++ b/app/pods/protected/strains/edit/route.js
@@ -12,6 +12,7 @@ export default Route.extend(ElevatedAccess, {
     return Ember.RSVP.hash({
       strain: this.store.findRecord('strain', params.strain_id),
       species: this.store.findAll('species'), // Need for dropdown
+      characteristics: this.store.findAll('characteristic'), // Need for dropdown
     });
   },
 
@@ -26,6 +27,7 @@ export default Route.extend(ElevatedAccess, {
   setupController: function(controller, models) {
     controller.set('model', models.strain);
     controller.set('speciesList', models.species);
+    controller.set('allCharacteristics', models.characteristics);
   },
 
   actions: {
diff --git a/app/pods/protected/strains/edit/template.hbs b/app/pods/protected/strains/edit/template.hbs
index c36aa54..727510c 100644
--- a/app/pods/protected/strains/edit/template.hbs
+++ b/app/pods/protected/strains/edit/template.hbs
@@ -3,6 +3,7 @@
   strain=model
   speciesList=speciesList
   add-characteristic=(action "addCharacteristic")
+  allCharacteristics=allCharacteristics
   on-save=(action "save")
   on-cancel=(action "cancel")
 }}
diff --git a/app/pods/protected/strains/measurements-table-row/component.js b/app/pods/protected/strains/measurements-table-row/component.js
index c6983d7..8c265bc 100644
--- a/app/pods/protected/strains/measurements-table-row/component.js
+++ b/app/pods/protected/strains/measurements-table-row/component.js
@@ -20,8 +20,6 @@ export default Component.extend({
 
   actions: {
     edit: function() {
-      // The parent table fetches all of the characteristics ahead of time
-      this.set('characteristics', this.store.peekAll('characteristic'));
       this.toggleProperty('isEditing');
     },
 
diff --git a/app/pods/protected/strains/measurements-table-row/template.hbs b/app/pods/protected/strains/measurements-table-row/template.hbs
index a26fef4..61a7140 100644
--- a/app/pods/protected/strains/measurements-table-row/template.hbs
+++ b/app/pods/protected/strains/measurements-table-row/template.hbs
@@ -4,7 +4,7 @@
     {{
       select-2
       multiple=false
-      content=characteristics
+      content=allCharacteristics
       value=row.characteristic
       optionLabelPath="characteristicName"
     }}
diff --git a/app/pods/protected/strains/measurements-table/component.js b/app/pods/protected/strains/measurements-table/component.js
index a83e25e..497dd39 100644
--- a/app/pods/protected/strains/measurements-table/component.js
+++ b/app/pods/protected/strains/measurements-table/component.js
@@ -9,6 +9,8 @@ export default Component.extend({
   allCharacteristics: null,
   canEdit: false,
   canAdd: false,
+
+  // Actions
   "add-characteristic": null,
 
   // Properties
@@ -20,13 +22,6 @@ export default Component.extend({
     return this.get('strain.measurements.length') > 0;
   }),
 
-  // TODO: remove this
-  // fetchCharacteristics: function() {
-  //   if (this.get('canEdit')) {
-  //     this.store.findAll('characteristic');
-  //   }
-  // }.on('didInsertElement'),
-
   actions: {
     addCharacteristic: function() {
       const newChar = this.attrs['add-characteristic']();
diff --git a/app/pods/protected/strains/measurements-table/template.hbs b/app/pods/protected/strains/measurements-table/template.hbs
index 3f635f1..288421e 100644
--- a/app/pods/protected/strains/measurements-table/template.hbs
+++ b/app/pods/protected/strains/measurements-table/template.hbs
@@ -43,6 +43,7 @@
       {{
         protected/strains/measurements-table-row
         row=measurement
+        allCharacteristics=allCharacteristics
         canEdit=canEdit
       }}
     {{/each}}
diff --git a/app/pods/protected/strains/strain-form/component.js b/app/pods/protected/strains/strain-form/component.js
index 11ef764..b224aef 100644
--- a/app/pods/protected/strains/strain-form/component.js
+++ b/app/pods/protected/strains/strain-form/component.js
@@ -9,6 +9,7 @@ export default Component.extend(SetupMetaData, {
   isNew: null,
   isDirty: false,
   speciesList: null,
+  allCharacteristics: null,
 
   // Actions
   "on-save": null,
diff --git a/app/pods/protected/strains/strain-form/template.hbs b/app/pods/protected/strains/strain-form/template.hbs
index 21e5bcf..0200ea7 100644
--- a/app/pods/protected/strains/strain-form/template.hbs
+++ b/app/pods/protected/strains/strain-form/template.hbs
@@ -54,6 +54,7 @@
       protected/strains/measurements-table
       strain=strain
       add-characteristic=(action "addCharacteristic")
+      allCharacteristics=allCharacteristics
       canEdit=strain.canEdit
       canAdd=metaData.canAdd
     }}