Merge branch 'master' into clostridium

* master:
  Add CSV download for compare (change backing service, too)
  Drop new user component, for now
  Clean up some loading stuff

app/pods/login/controller.js

@@ -7,12 +7,12 @@ export default Ember.Controller.extend({
       let session = this.get('session');
       let authenticator = 'simple-auth-authenticator:token';
 
-      this.set('loading', true);
       // Manually clean up because there might not be a transition
       this.get('flashMessages').clearMessages();
-      session.authenticate(authenticator, credentials).then(null, (error)=> {
+      this.transitionTo('loading').then(() => {
-        this.set('loading', false);
+        session.authenticate(authenticator, credentials).then(null, (error)=> {
-        this.get('flashMessages').error(error.error);
+          this.get('flashMessages').error(error.error);
+        });
       });
     }
   }

app/pods/login/template.hbs

@@ -1,16 +1,12 @@
 {{#x-application invalidateSession="invalidateSession"}}
-  {{#if loading}}
+  <form {{action "authenticate" on="submit"}}>
-    {{loading-panel}}
+    <h2>Log In</h2>
-  {{else}}
+      {{input value=identification type="text" placeholder="Email"}}
-    <form {{action "authenticate" on="submit"}}>
+      {{input value=password type="password" placeholder="Password"}}
-      <h2>Log In</h2>
+      {{input class="button-gray" type="submit" value="Log In"}}
-        {{input value=identification type="text" placeholder="Email"}}
+  </form>
-        {{input value=password type="password" placeholder="Password"}}
+  <br>
-        {{input class="button-gray" type="submit" value="Log In"}}
+  <div>
-    </form>
+    Forget your password? {{link-to 'Request a lockout email.' 'users.requestlockouthelp'}}
-    <br>
+  </div>
-    <div>
-      Forget your password? {{link-to 'Request a lockout email.' 'users.requestlockouthelp'}}
-    </div>
-  {{/if}}
 {{/x-application}}

app/pods/protected/compare/results/controller.js

@@ -3,6 +3,13 @@ import Ember from 'ember';
 export default Ember.Controller.extend({
   queryParams: ['strain_ids', 'characteristic_ids'],
 
+  csvLink: function() {
+    let token = encodeURIComponent(this.get('session.secure.token'));
+    return `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/` +
+      `compare?token=${token}&strain_ids=${this.get('strain_ids')}&` +
+      `characteristic_ids=${this.get('characteristic_ids')}&mimeType=csv`;
+  }.property('strain_ids', 'characteristic_ids').readOnly(),
+
   strains: function() {
     let strains = [];
     let strain_ids = this.get('strain_ids').split(',');
@@ -21,30 +28,4 @@ export default Ember.Controller.extend({
     return characteristics;
   }.property('characteristic_ids'),
 
-  // Set up data table matrix
-  data: function() {
-    let characteristics = this.get('characteristics');
-    let strains = this.get('strains');
-    let measurements = this.get('model');
-    let data = Ember.A();
-
-    characteristics.forEach((characteristic) => {
-      let row = {
-        characteristic: characteristic.get('characteristicName'),
-      };
-
-      strains.forEach((strain) => {
-        let meas = measurements.filterBy('strain.id', strain.get('id'))
-          .filterBy('characteristic.id', characteristic.get('id'));
-        if (!Ember.isEmpty(meas)) {
-          row[strain.get('id')] = meas[0].get('value');
-        } else {
-          row[strain.get('id')] = '';
-        }
-      });
-      data.pushObject(row);
-    });
-    return data;
-  }.property('characteristics', 'strains').readOnly(),
-
 });

app/pods/protected/compare/results/route.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import ajaxRequest from '../../../../utils/ajax-request';
 
 export default Ember.Route.extend({
   queryParams: {
@@ -12,16 +13,35 @@ export default Ember.Route.extend({
 
   beforeModel: function(transition) {
     this._super(transition);
-    if (Ember.$.isEmptyObject(transition.queryParams)) {
+    if (Ember.$.isEmptyObject(transition.queryParams.strain_ids) ||
+        Ember.$.isEmptyObject(transition.queryParams.characteristic_ids)) {
       this.transitionTo('protected.compare');
     }
   },
 
   model: function(params) {
+    if (params.strain_ids === '' || params.characteristic_ids === '') {
+      this.transitionTo('protected.compare');
+    }
+
     let compare = this.controllerFor('protected.compare');
     compare.set('selectedStrains', params.strain_ids);
     compare.set('selectedCharacteristics', params.characteristic_ids);
-    return this.store.query('measurement', params);
+
+    let url = `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/compare`;
+    let options = {
+      method: 'GET',
+      data: params,
+    };
+    return ajaxRequest(url, options);
+  },
+
+  setupController: function(controller, model) {
+    model.forEach((m, i) => {
+      let c = this.store.peekRecord('characteristic', m[0]);
+      model[i][0] = c.get('characteristicName');
+    });
+    controller.set('model', model);
   },
 
 });

app/pods/protected/compare/results/template.hbs

@@ -13,14 +13,15 @@
       </tr>
     </thead>
     <tbody>
-      {{#each data as |row|}}
+      {{#each model as |row|}}
         <tr>
-          <td>{{row.characteristic}}</td>
+          {{#each row key="@index" as |col|}}
-          {{#each strains as |strain|}}
+            <td>{{col}}</td>
-            <td>{{get-property row strain.id}}</td>
           {{/each}}
         </tr>
       {{/each}}
     </tbody>
   </table>
+  <hr>
+  <a href="{{csvLink}}" download>Download as CSV</a>
 </div>

app/pods/protected/loading/template.hbs

@@ -0,0 +1 @@
+{{loading-panel}}

app/pods/users/new/controller.js

@@ -1,7 +1,6 @@
 import Ember from 'ember';
 
-export default Ember.Component.extend({
+export default Ember.Controller.extend({
-  classNames: ['grid-1'],
   passwordConfirm: null,
 
   actions: {
@@ -17,7 +16,10 @@ export default Ember.Component.extend({
 
       if (user.get('hasDirtyAttributes')) {
         user.save().then(() => {
-          this.sendAction();
+          this.transitionTo('login').then(() => {
+            this.get('flashMessages').information(`You have successfully signed up.
+              Please check your email for further instructions.`);
+          });
         }).catch(() => {
           // Manually clean up messages because there is no transition
           this.get('flashMessages').clearMessages();

app/pods/users/new/new-user-form/template.hbs

@@ -1,30 +0,0 @@
-<div class="span-1">
-  <fieldset>
-    <legend>New User Signup</legend>
-    <form {{action 'save' on='submit'}}>
-      <ul>
-        <li>
-          <label>Name</label>
-          {{input value=user.name}}
-        </li>
-        <li>
-          <label>Email</label>
-          {{input value=user.email}}
-        </li>
-        <li>
-          <label>Password</label>
-          {{input type="password" value=user.password}}
-        </li>
-        <li>
-          <label>Password (confirm)</label>
-          {{input type="password" value=passwordConfirm}}
-        </li>
-        <li>
-          <button type="submit" class="button-green smaller">
-            Submit
-          </button>
-        </li>
-      </ul>
-    </form>
-  </fieldset>
-</div>

app/pods/users/new/route.js

@@ -12,12 +12,4 @@ export default Ember.Route.extend(UnauthenticatedRouteMixin, {
     controller.setProperties(model);
   },
 
-  actions: {
-    success: function() {
-      this.transitionTo('login').then(() => {
-        this.get('flashMessages').information(`You have successfully signed up.
-          Please check your email for further instructions.`);
-      });
-    }
-  },
 });

app/pods/users/new/template.hbs

@@ -1 +1,32 @@
-{{users/new/new-user-form user=user action="success"}}
+<div class="grid-1">
+  <div class="span-1">
+    <fieldset>
+      <legend>New User Signup</legend>
+      <form {{action 'save' on='submit'}}>
+        <ul>
+          <li>
+            <label>Name</label>
+            {{input value=user.name}}
+          </li>
+          <li>
+            <label>Email</label>
+            {{input value=user.email}}
+          </li>
+          <li>
+            <label>Password</label>
+            {{input type="password" value=user.password}}
+          </li>
+          <li>
+            <label>Password (confirm)</label>
+            {{input type="password" value=passwordConfirm}}
+          </li>
+          <li>
+            <button type="submit" class="button-green smaller">
+              Submit
+            </button>
+          </li>
+        </ul>
+      </form>
+    </fieldset>
+  </div>
+</div>