From 45223fd57f89fd576b5d8d620da5852384e23cbc Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 6 Jul 2015 11:02:41 -0800 Subject: [PATCH 01/23] Species edit refactor --- app/pods/application/adapter.js | 5 +- .../forms/species-form/component.js | 12 +++ .../forms/species-form/template.hbs | 42 +++++++++ .../components/species-details/component.js | 20 ----- .../components/species-details/template.hbs | 89 ------------------- app/pods/species/edit/controller.js | 29 ++++++ app/pods/species/edit/route.js | 4 + app/pods/species/edit/template.hbs | 6 ++ app/pods/species/index/route.js | 5 +- app/pods/species/index/template.hbs | 10 +-- app/pods/species/new/controller.js | 23 +++-- app/pods/species/new/route.js | 6 +- app/pods/species/new/template.hbs | 3 +- app/pods/species/show/controller.js | 22 ----- app/pods/species/show/template.hbs | 64 +++++++++++-- app/router.js | 1 + 16 files changed, 181 insertions(+), 160 deletions(-) create mode 100644 app/pods/components/forms/species-form/component.js create mode 100644 app/pods/components/forms/species-form/template.hbs delete mode 100644 app/pods/components/species-details/component.js delete mode 100644 app/pods/components/species-details/template.hbs create mode 100644 app/pods/species/edit/controller.js create mode 100644 app/pods/species/edit/route.js create mode 100644 app/pods/species/edit/template.hbs delete mode 100644 app/pods/species/show/controller.js diff --git a/app/pods/application/adapter.js b/app/pods/application/adapter.js index e979dec..bb89c25 100644 --- a/app/pods/application/adapter.js +++ b/app/pods/application/adapter.js @@ -5,10 +5,13 @@ export default DS.RESTAdapter.extend({ namespace: function() { return 'api/' + this.get('globals.genus'); }.property(), + host: function() { return this.get('globals.apiURL'); }.property(), + coalesceFindRequests: true, + ajaxError: function(jqXHR) { // http://stackoverflow.com/a/24027443 var error = this._super(jqXHR); @@ -25,5 +28,5 @@ export default DS.RESTAdapter.extend({ } else { return error; } - } + }, }); diff --git a/app/pods/components/forms/species-form/component.js b/app/pods/components/forms/species-form/component.js new file mode 100644 index 0000000..0e5912c --- /dev/null +++ b/app/pods/components/forms/species-form/component.js @@ -0,0 +1,12 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + actions: { + save: function() { + this.sendAction('save'); + }, + cancel: function() { + this.sendAction('cancel'); + }, + } +}); diff --git a/app/pods/components/forms/species-form/template.hbs b/app/pods/components/forms/species-form/template.hbs new file mode 100644 index 0000000..fda54bc --- /dev/null +++ b/app/pods/components/forms/species-form/template.hbs @@ -0,0 +1,42 @@ +
+
+ {{species.speciesName}} +
+
+ + {{input value=species.speciesName}} +
+
+ + {{input type="checkbox" checked=species.typeSpecies}} {{if species.typeSpecies 'Yes' 'No'}} +
+
+
+
+ + {{#each species.strains as |strain index|}} + {{if index ","}} + {{#link-to 'strains.show' strain.id}} + {{{strain.strainNameMU}}} + {{/link-to}} + {{/each}} + {{add-button label="Add Strain" link="strains.new"}} +
+
+
+
+ + {{textarea value=species.etymology cols="70" rows="5"}} +
+
+
+
+
+{{#if species.isDirty}} + + Save + +{{/if}} + + Cancel + diff --git a/app/pods/components/species-details/component.js b/app/pods/components/species-details/component.js deleted file mode 100644 index 6070141..0000000 --- a/app/pods/components/species-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('species.createdBy')); - }.property('session.currentUser', 'species.createdBy').readOnly(), - - actions: { - save: function() { - this.sendAction('save'); - }, - cancel: function() { - this.sendAction('cancel'); - }, - } -}); diff --git a/app/pods/components/species-details/template.hbs b/app/pods/components/species-details/template.hbs deleted file mode 100644 index 813ada2..0000000 --- a/app/pods/components/species-details/template.hbs +++ /dev/null @@ -1,89 +0,0 @@ -
-
- - Species - {{#if isEditing}} - {{input value=species.speciesName}} - {{else}} - {{species.speciesName}} - {{/if}} - {{display-errors a=species.errors.speciesName}} - - - {{! ROW 1 }} -
-
-
Strains
-
- {{#each species.strains as |strain index|}} - {{if index ","}} - {{#link-to 'strains.show' strain.id}} - {{{strain.strainNameMU}}} - {{/link-to}} - {{/each}} - {{#unless species.isNew}} - {{add-button label="Add Strain" link="strains.new"}} - {{/unless}} -
-
-
-
Type Species?
-
- {{#if isEditing}} - {{input type="checkbox" checked=species.typeSpecies}} - {{/if}} - {{if species.typeSpecies 'Yes' 'No'}} - {{display-errors a=species.errors.typeSpecies}} -
-
-
- - {{! ROW 2 }} -
-
-
Etymology
-
- {{#if isEditing}} - {{textarea value=species.etymology cols="70" rows="3"}} - {{else}} - {{species.etymology}} - {{/if}} - {{display-errors a=species.errors.etymology}} -
-
-
- - {{! ROW 3 }} -
-
-
Record Created
-
{{null-time species.createdAt 'LL'}}
-
-
-
Record Updated
-
{{null-time species.updatedAt 'LL'}}
-
-
-
Record Deleted
-
{{null-time species.deletedAt 'LL'}}
-
-
-
- - {{! ROW 4 }} - {{#if canEdit}} -
-
- - {{#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 new file mode 100644 index 0000000..463392e --- /dev/null +++ b/app/pods/species/edit/controller.js @@ -0,0 +1,29 @@ +import Ember from 'ember'; + +export default Ember.Controller.extend({ + actions: { + save: function() { + let species = this.get('model'); + + if (species.get('isDirty')) { + species.save().then((species) => { + this.transitionToRoute('species.show', species.get('id')); + }, (err) => { + this.get('flashMessages').error(err.responseJSON.error); + }); + } else { + this.transitionToRoute('species.show', species.get('id')); + } + }, + + cancel: function() { + let species = this.get('model'); + + species.get('errors').clear(); + species.rollback(); + + this.transitionToRoute('species.show', species.get('id')); + }, + + }, +}); diff --git a/app/pods/species/edit/route.js b/app/pods/species/edit/route.js new file mode 100644 index 0000000..b3f843f --- /dev/null +++ b/app/pods/species/edit/route.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; +import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; + +export default Ember.Route.extend(AuthenticatedRouteMixin, {}); diff --git a/app/pods/species/edit/template.hbs b/app/pods/species/edit/template.hbs new file mode 100644 index 0000000..5c6c82f --- /dev/null +++ b/app/pods/species/edit/template.hbs @@ -0,0 +1,6 @@ +{{ + forms/species-form + species=model + save="save" + cancel="cancel" +}} diff --git a/app/pods/species/index/route.js b/app/pods/species/index/route.js index d2ab490..b0968ba 100644 --- a/app/pods/species/index/route.js +++ b/app/pods/species/index/route.js @@ -5,10 +5,11 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function() { return Ember.RSVP.hash({ species: this.store.findAll('species'), + strains: this.store.findAll('strain'), }); }, - setupController: function(controller, model) { - controller.setProperties(model); + setupController: function(controller, models) { + controller.setProperties(models); }, }); diff --git a/app/pods/species/index/template.hbs b/app/pods/species/index/template.hbs index 00454fb..b02064a 100644 --- a/app/pods/species/index/template.hbs +++ b/app/pods/species/index/template.hbs @@ -1,5 +1,5 @@

{{genus-name}} Species

-

Total species: {{species.length}}

+

Total species: {{model.length}}

{{add-button label="Add Species" link="species.new"}} @@ -11,17 +11,17 @@ - {{#each sortedSpecies as |row|}} + {{#each sortedSpecies as |species|}} - {{#link-to 'species.show' row}} - {{row.speciesName}} + {{#link-to 'species.show' species}} + {{species.speciesName}} {{/link-to}} - {{#each row.strains as |strain index|}} + {{#each species.strains as |strain index|}} {{if index ","}} {{#link-to 'strains.show' strain.id}} {{{strain.strainNameMU}}} diff --git a/app/pods/species/new/controller.js b/app/pods/species/new/controller.js index a289976..568648f 100644 --- a/app/pods/species/new/controller.js +++ b/app/pods/species/new/controller.js @@ -1,21 +1,30 @@ import Ember from 'ember'; export default Ember.Controller.extend({ - isEditing: true, actions: { save: function() { - var species = this.get('model'); + let species = this.get('model'); + if (species.get('isDirty')) { - species.save(); + species.save().then((species) => { + this.transitionToRoute('species.show', species.get('id')); + }, (err) => { + this.get('flashMessages').error(err.responseJSON.error); + }); + } else { + this.transitionToRoute('species.index'); } - this.transitionToRoute('species.index'); }, + cancel: function() { - var species = this.get('model'); + let species = this.get('model'); + if (species.get('isNew')) { species.deleteRecord(); } + this.transitionToRoute('species.index'); - } - } + }, + + }, }); diff --git a/app/pods/species/new/route.js b/app/pods/species/new/route.js index b9f79eb..98741c6 100644 --- a/app/pods/species/new/route.js +++ b/app/pods/species/new/route.js @@ -5,9 +5,5 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function() { return this.store.createRecord('species'); }, - actions: { - cancelSpecies: function() { - this.transitionTo('species.index'); - } - } + }); diff --git a/app/pods/species/new/template.hbs b/app/pods/species/new/template.hbs index f38417f..5c6c82f 100644 --- a/app/pods/species/new/template.hbs +++ b/app/pods/species/new/template.hbs @@ -1,7 +1,6 @@ {{ - species-details + forms/species-form species=model - isEditing=true save="save" cancel="cancel" }} diff --git a/app/pods/species/show/controller.js b/app/pods/species/show/controller.js deleted file mode 100644 index 2d5a523..0000000 --- a/app/pods/species/show/controller.js +++ /dev/null @@ -1,22 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Controller.extend({ - isEditing: false, - actions: { - save: function() { - var species = this.get('model'); - if (species.get('isDirty')) { - species.save(); - } - this.toggleProperty('isEditing'); - }, - cancel: function() { - if (this.get('isEditing')) { - var species = this.get('model'); - species.get('errors').clear(); - species.rollback(); - } - this.toggleProperty('isEditing'); - } - } -}); diff --git a/app/pods/species/show/template.hbs b/app/pods/species/show/template.hbs index b242fc5..11b72ba 100644 --- a/app/pods/species/show/template.hbs +++ b/app/pods/species/show/template.hbs @@ -1,7 +1,57 @@ -{{ - species-details - species=model - isEditing=isEditing - save="save" - cancel="cancel" -}} +
+
+
+ + Species {{model.speciesName}} + + + {{! ROW 1 }} +
+
+
Strains
+
+ {{#each model.strains as |strain index|}} + {{if index ","}} + {{#link-to 'strains.show' strain.id}} + {{{strain.strainNameMU}}} + {{/link-to}} + {{/each}} +
+
+
+
Type Species?
+
+ {{if model.typeSpecies 'Yes' 'No'}} +
+
+
+ + {{! ROW 2 }} +
+
+
Etymology
+
+ {{model.etymology}} +
+
+
+ + {{! ROW 3 }} +
+
+
Record Created
+
{{null-time model.createdAt 'LL'}}
+
+
+
Record Updated
+
{{null-time model.updatedAt 'LL'}}
+
+
+
Record Deleted
+
{{null-time model.deletedAt 'LL'}}
+
+
+
+
+
+
diff --git a/app/router.js b/app/router.js index 27112b6..6f43b21 100644 --- a/app/router.js +++ b/app/router.js @@ -15,6 +15,7 @@ Router.map(function() { this.route('species', function() { this.route('new'); this.route('show', { path: ':species_id' }); + this.route('edit', { path: ':species_id/edit' }); }); this.route('strains', function() { this.route('new'); From 3db54ea9335dbd58abceddb9bf1c9d69ba189934 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 7 Jul 2015 09:56:49 -0800 Subject: [PATCH 02/23] Test-drive metadata --- app/pods/components/add-button/component.js | 9 --------- app/pods/species/index/controller.js | 5 +++++ app/pods/species/index/template.hbs | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) delete mode 100644 app/pods/components/add-button/component.js diff --git a/app/pods/components/add-button/component.js b/app/pods/components/add-button/component.js deleted file mode 100644 index 8075297..0000000 --- a/app/pods/components/add-button/component.js +++ /dev/null @@ -1,9 +0,0 @@ -import Ember from 'ember'; -import userCanAdd from '../../../utils/user-can-add'; - -export default Ember.Component.extend({ - canAdd: function() { - let user_role = this.get('session.currentUser.role'); - return userCanAdd(user_role); - }.property('session.currentUser.role').readOnly(), -}); diff --git a/app/pods/species/index/controller.js b/app/pods/species/index/controller.js index a28a11f..82a022e 100644 --- a/app/pods/species/index/controller.js +++ b/app/pods/species/index/controller.js @@ -3,4 +3,9 @@ import Ember from 'ember'; export default Ember.Controller.extend({ sortParams: ['speciesName', 'strainCount'], sortedSpecies: Ember.computed.sort('species', 'sortParams'), + + metaData: function() { + return this.store.metadataFor('species'); + }.property('model.isLoaded').readOnly(), + }); diff --git a/app/pods/species/index/template.hbs b/app/pods/species/index/template.hbs index b02064a..6fc2993 100644 --- a/app/pods/species/index/template.hbs +++ b/app/pods/species/index/template.hbs @@ -1,7 +1,7 @@

{{genus-name}} Species

Total species: {{model.length}}

-{{add-button label="Add Species" link="species.new"}} +{{add-button label="Add Species" link="species.new" canAdd=metaData.canAdd}} From 3b17955c0de21e9ebf27fb785eaecfee076b26b6 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 7 Jul 2015 11:09:41 -0800 Subject: [PATCH 03/23] Sideload strains in species list --- app/models/species.js | 2 +- app/models/strain.js | 2 +- app/pods/species/index/controller.js | 2 +- app/pods/species/index/route.js | 11 ++--------- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/app/models/species.js b/app/models/species.js index fee135a..b6d509a 100644 --- a/app/models/species.js +++ b/app/models/species.js @@ -7,7 +7,7 @@ export default DS.Model.extend({ typeSpecies : DS.attr('boolean'), etymology : DS.attr('string'), genusName : DS.attr('string', { defaultValue: config.APP.genus }), - strains : DS.hasMany('strain', { async: true }), + strains : DS.hasMany('strain', { async: false }), totalStrains: DS.attr('number'), createdAt : DS.attr('date'), updatedAt : DS.attr('date'), diff --git a/app/models/strain.js b/app/models/strain.js index 7f69f45..49344cf 100644 --- a/app/models/strain.js +++ b/app/models/strain.js @@ -3,7 +3,7 @@ import Ember from 'ember'; export default DS.Model.extend({ measurements : DS.hasMany('measurements', { async: true }), - species : DS.belongsTo('species', { async: true }), + species : DS.belongsTo('species', { async: false }), strainName : DS.attr('string'), typeStrain : DS.attr('boolean'), accessionNumbers : DS.attr('string'), diff --git a/app/pods/species/index/controller.js b/app/pods/species/index/controller.js index 82a022e..2714e73 100644 --- a/app/pods/species/index/controller.js +++ b/app/pods/species/index/controller.js @@ -2,7 +2,7 @@ import Ember from 'ember'; export default Ember.Controller.extend({ sortParams: ['speciesName', 'strainCount'], - sortedSpecies: Ember.computed.sort('species', 'sortParams'), + sortedSpecies: Ember.computed.sort('model', 'sortParams'), metaData: function() { return this.store.metadataFor('species'); diff --git a/app/pods/species/index/route.js b/app/pods/species/index/route.js index b0968ba..6b02e0e 100644 --- a/app/pods/species/index/route.js +++ b/app/pods/species/index/route.js @@ -3,13 +3,6 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function() { - return Ember.RSVP.hash({ - species: this.store.findAll('species'), - strains: this.store.findAll('strain'), - }); - }, - - setupController: function(controller, models) { - controller.setProperties(models); - }, + return this.store.findAll('species'); + } }); From 6f0f9d8ea2fb66bd8590274ce00f6ef20f210596 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 7 Jul 2015 14:28:16 -0800 Subject: [PATCH 04/23] Edit species --- app/pods/species/show/controller.js | 14 ++++++++++++++ app/pods/species/show/template.hbs | 6 ++++++ 2 files changed, 20 insertions(+) create mode 100644 app/pods/species/show/controller.js diff --git a/app/pods/species/show/controller.js b/app/pods/species/show/controller.js new file mode 100644 index 0000000..d9625f4 --- /dev/null +++ b/app/pods/species/show/controller.js @@ -0,0 +1,14 @@ +import Ember from 'ember'; + +export default Ember.Controller.extend({ + userCanEdit: function() { + let meta = this.store.metadataFor('species'); + 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/species/show/template.hbs b/app/pods/species/show/template.hbs index 11b72ba..e892234 100644 --- a/app/pods/species/show/template.hbs +++ b/app/pods/species/show/template.hbs @@ -55,3 +55,9 @@ +{{#if userCanEdit}} +
+ {{#link-to 'species.edit' model class="button-gray smaller"}} + Edit + {{/link-to}} +{{/if}} From 03b6ea2c3b8c03e6e7e779f0a6c20314649f087f Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 7 Jul 2015 14:38:36 -0800 Subject: [PATCH 05/23] Overflow table --- app/pods/compare/template.hbs | 2 +- app/styles/app.css | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/pods/compare/template.hbs b/app/pods/compare/template.hbs index 8724242..a4466f4 100644 --- a/app/pods/compare/template.hbs +++ b/app/pods/compare/template.hbs @@ -12,7 +12,7 @@ Please select one or more strains and one or more characteristics. {{else}} -
+
diff --git a/app/styles/app.css b/app/styles/app.css index ff245dd..2a02ea6 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -1,3 +1,8 @@ +.overflow-div { + white-space: nowrap; + overflow: auto; +} + .measurements-container { padding: 2em 0em 0em 0em; } From 963b3591a4c47530013971e0893030bc196fadef Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 7 Jul 2015 14:47:06 -0800 Subject: [PATCH 06/23] characteristics sort order --- app/pods/characteristics/controller.js | 2 +- app/pods/characteristics/template.hbs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/pods/characteristics/controller.js b/app/pods/characteristics/controller.js index ae686a9..88d2200 100644 --- a/app/pods/characteristics/controller.js +++ b/app/pods/characteristics/controller.js @@ -1,6 +1,6 @@ import Ember from 'ember'; export default Ember.Controller.extend({ - sortParams: ['characteristicType.characteristicTypeName', 'characteristicName'], + sortParams: ['characteristicType.characteristicTypeName', 'sortOrder'], sortedCharacteristics: Ember.computed.sort('characteristics', 'sortParams'), }); diff --git a/app/pods/characteristics/template.hbs b/app/pods/characteristics/template.hbs index 63f40a4..cc21bab 100644 --- a/app/pods/characteristics/template.hbs +++ b/app/pods/characteristics/template.hbs @@ -6,6 +6,7 @@ + @@ -13,6 +14,7 @@ + {{/each}} From 5290e7efd7d3cd10d7d9b34152e8ca44f6a5eb89 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 7 Jul 2015 16:53:43 -0800 Subject: [PATCH 07/23] Shuffle cancel button --- app/pods/components/forms/species-form/template.hbs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/pods/components/forms/species-form/template.hbs b/app/pods/components/forms/species-form/template.hbs index fda54bc..4eaa726 100644 --- a/app/pods/components/forms/species-form/template.hbs +++ b/app/pods/components/forms/species-form/template.hbs @@ -32,11 +32,11 @@
+ + Cancel + {{#if species.isDirty}} Save {{/if}} - - Cancel - From 01a307565538474be9141780c4e213e6507bf6d9 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 8 Jul 2015 14:44:24 -0800 Subject: [PATCH 08/23] 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}}
Name TypeSort Order
{{row.characteristicName}} {{row.characteristicType.characteristicTypeName}}{{row.sortOrder}}
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'); From 780b5ddb6cb23e2fe61ec306031c99cf7a05f0a3 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 9 Jul 2015 09:26:55 -0800 Subject: [PATCH 09/23] Cleaning up species and strains --- app/models/species.js | 1 + app/models/strain.js | 1 + app/pods/species/edit/route.js | 9 ++++++++- app/pods/species/index/controller.js | 2 +- app/pods/species/show/controller.js | 14 ------------- app/pods/species/show/route.js | 5 +++-- app/pods/species/show/template.hbs | 30 +++++++++++++++------------- app/pods/strains/edit/route.js | 8 +++++++- app/pods/strains/index/controller.js | 2 +- app/pods/strains/new/route.js | 6 +++++- app/pods/strains/show/controller.js | 14 ------------- app/pods/strains/show/route.js | 5 +++-- app/pods/strains/show/template.hbs | 27 ++++++++++++------------- 13 files changed, 59 insertions(+), 65 deletions(-) delete mode 100644 app/pods/species/show/controller.js delete mode 100644 app/pods/strains/show/controller.js diff --git a/app/models/species.js b/app/models/species.js index b6d509a..c8746bd 100644 --- a/app/models/species.js +++ b/app/models/species.js @@ -16,6 +16,7 @@ export default DS.Model.extend({ updatedBy : DS.attr('number'), deletedBy : DS.attr('number'), sortOrder : DS.attr('number'), + canEdit : DS.attr('boolean'), speciesNameMU: function() { return Ember.String.htmlSafe(`${this.get('speciesName')}`); diff --git a/app/models/strain.js b/app/models/strain.js index 49344cf..1f54647 100644 --- a/app/models/strain.js +++ b/app/models/strain.js @@ -19,6 +19,7 @@ export default DS.Model.extend({ deletedBy : DS.attr('number'), totalMeasurements : DS.attr('number'), sortOrder : DS.attr('number'), + canEdit : DS.attr('boolean'), strainNameMU: function() { let type = this.get('typeStrain') ? 'T' : ''; diff --git a/app/pods/species/edit/route.js b/app/pods/species/edit/route.js index b3f843f..6c264c2 100644 --- a/app/pods/species/edit/route.js +++ b/app/pods/species/edit/route.js @@ -1,4 +1,11 @@ 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, { + afterModel: function(species) { + if (!species.get('canEdit')) { + this.transitionTo('species.show', species.get('id')); + } + }, + +}); diff --git a/app/pods/species/index/controller.js b/app/pods/species/index/controller.js index 2714e73..00f9448 100644 --- a/app/pods/species/index/controller.js +++ b/app/pods/species/index/controller.js @@ -5,7 +5,7 @@ export default Ember.Controller.extend({ sortedSpecies: Ember.computed.sort('model', 'sortParams'), metaData: function() { - return this.store.metadataFor('species'); + return Ember.copy(this.store.metadataFor('species')); }.property('model.isLoaded').readOnly(), }); diff --git a/app/pods/species/show/controller.js b/app/pods/species/show/controller.js deleted file mode 100644 index 6d9a32a..0000000 --- a/app/pods/species/show/controller.js +++ /dev/null @@ -1,14 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Controller.extend({ - userCanEdit: function() { - let meta = this.store.metadataFor('species'); - 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/species/show/route.js b/app/pods/species/show/route.js index dcf76cf..da42b03 100644 --- a/app/pods/species/show/route.js +++ b/app/pods/species/show/route.js @@ -3,6 +3,7 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function(params) { - return this.store.find('species', params.species_id); - } + return this.store.findRecord('species', params.species_id, { reload: true }); + }, + }); diff --git a/app/pods/species/show/template.hbs b/app/pods/species/show/template.hbs index e892234..49a83dc 100644 --- a/app/pods/species/show/template.hbs +++ b/app/pods/species/show/template.hbs @@ -6,19 +6,22 @@ {{! ROW 1 }} -
-
+
+
Strains
- {{#each model.strains as |strain index|}} - {{if index ","}} - {{#link-to 'strains.show' strain.id}} - {{{strain.strainNameMU}}} - {{/link-to}} - {{/each}} +
    + {{#each model.strains as |strain index|}} +
  • + {{#link-to 'strains.show' strain.id}} + {{{strain.strainNameMU}}} + {{/link-to}} +
    • + {{/each}} +
-
+
Type Species?
{{if model.typeSpecies 'Yes' 'No'}} @@ -27,8 +30,8 @@
{{! ROW 2 }} -
-
+
+
Etymology
{{model.etymology}} @@ -37,7 +40,7 @@
{{! ROW 3 }} -
+
Record Created
{{null-time model.createdAt 'LL'}}
@@ -50,12 +53,11 @@
Record Deleted
{{null-time model.deletedAt 'LL'}}
-
-{{#if userCanEdit}} +{{#if model.canEdit}}
{{#link-to 'species.edit' model class="button-gray smaller"}} Edit diff --git a/app/pods/strains/edit/route.js b/app/pods/strains/edit/route.js index 9400fff..94a7710 100644 --- a/app/pods/strains/edit/route.js +++ b/app/pods/strains/edit/route.js @@ -5,10 +5,16 @@ 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'), + species: this.store.findAll('species'), // Need for dropdown }); }, + afterModel: function(models) { + if (!models.strain.get('canEdit')) { + this.transitionTo('strains.show', models.strain.get('id')); + } + }, + setupController: function(controller, models) { controller.setProperties(models); }, diff --git a/app/pods/strains/index/controller.js b/app/pods/strains/index/controller.js index 17b709b..07954e7 100644 --- a/app/pods/strains/index/controller.js +++ b/app/pods/strains/index/controller.js @@ -5,7 +5,7 @@ export default Ember.Controller.extend({ sortedStrains: Ember.computed.sort('model', 'sortParams'), metaData: function() { - return this.store.metadataFor('strain'); + return Ember.copy(this.store.metadataFor('strain')); }.property('model.isLoaded').readOnly(), }); diff --git a/app/pods/strains/new/route.js b/app/pods/strains/new/route.js index 0199071..03b7907 100644 --- a/app/pods/strains/new/route.js +++ b/app/pods/strains/new/route.js @@ -5,10 +5,14 @@ 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'), // Need for dropdown }); }, + afterModel: function(models) { + console.log('after model'); + }, + setupController: function(controller, models) { controller.setProperties(models); }, diff --git a/app/pods/strains/show/controller.js b/app/pods/strains/show/controller.js deleted file mode 100644 index 2925c60..0000000 --- a/app/pods/strains/show/controller.js +++ /dev/null @@ -1,14 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Controller.extend({ - 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 bd0b588..4c9634b 100644 --- a/app/pods/strains/show/route.js +++ b/app/pods/strains/show/route.js @@ -3,6 +3,7 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function(params) { - return this.store.find('strain', params.strain_id); - } + return this.store.findRecord('strain', params.strain_id, { reload: true }); + }, + }); diff --git a/app/pods/strains/show/template.hbs b/app/pods/strains/show/template.hbs index 4605f97..01eb5cf 100644 --- a/app/pods/strains/show/template.hbs +++ b/app/pods/strains/show/template.hbs @@ -5,8 +5,8 @@ {{! ROW 1 }} -
-
+
+
Species
{{#link-to 'species.show' model.species.id}} @@ -14,7 +14,7 @@ {{/link-to}}
-
+
Type Strain?
{{if model.typeStrain 'Yes' 'No'}} @@ -23,20 +23,20 @@
{{! ROW 2 }} -
-
+
+
Accession Numbers
{{model.accessionNumbers}}
-
+
Genbank
{{genbank-url genbank=model.genbank}}
-
+
Whole Genome Sequence
{{model.wholeGenomeSequence}} @@ -45,8 +45,8 @@
{{! ROW 3 }} -
-
+
+
Isolated From
{{model.isolatedFrom}} @@ -55,8 +55,8 @@
{{! ROW 4 }} -
-
+
+
Notes
{{model.notes}} @@ -65,7 +65,7 @@
{{! ROW 5 }} -
+
Record Created
{{null-time model.createdAt 'LL'}}
@@ -78,11 +78,10 @@
Record Deleted
{{null-time model.deletedAt 'LL'}}
-
-{{#if userCanEdit}} +{{#if model.canEdit}}
{{#link-to 'species.edit' model class="button-gray smaller"}} Edit From 58779a4a7d160bf4e5cdf34bafced3f903284442 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 9 Jul 2015 11:40:58 -0800 Subject: [PATCH 10/23] ember-cli 1.13.1 --- app/initializers/component-store.js | 2 +- app/initializers/global-variables.js | 8 +++---- app/pods/application/adapter.js | 2 +- app/pods/application/template.hbs | 2 ++ app/pods/application/view.js | 9 ------- app/pods/components/site-logo/component.js | 3 +++ .../components/x-application/component.js | 10 ++++++++ .../components/x-application/template.hbs | 1 + bower.json | 10 ++++---- ember-cli-build.js | 24 +++++++++++++++++++ package.json | 17 ++++++------- tests/.jshintrc | 5 ++-- tests/helpers/start-app.js | 1 - 13 files changed, 63 insertions(+), 31 deletions(-) delete mode 100644 app/pods/application/view.js create mode 100644 app/pods/components/site-logo/component.js create mode 100644 app/pods/components/x-application/component.js create mode 100644 app/pods/components/x-application/template.hbs create mode 100644 ember-cli-build.js diff --git a/app/initializers/component-store.js b/app/initializers/component-store.js index 0556ebf..54a3064 100644 --- a/app/initializers/component-store.js +++ b/app/initializers/component-store.js @@ -1,5 +1,5 @@ export function initialize(container, application) { - application.inject('component', 'store', 'store:main'); + application.inject('component', 'store', 'service:store'); } export default { diff --git a/app/initializers/global-variables.js b/app/initializers/global-variables.js index 4ed58e6..7090375 100644 --- a/app/initializers/global-variables.js +++ b/app/initializers/global-variables.js @@ -7,10 +7,10 @@ var globals = Ember.Object.extend({ }); export function initialize(container, application) { - application.register('global:variables', globals, {singleton: true}); - application.inject('controller', 'globals', 'global:variables'); - application.inject('component', 'globals', 'global:variables'); - application.inject('adapter', 'globals', 'global:variables'); + application.register('service:globals', globals, {singleton: true}); + application.inject('controller', 'globals', 'service:globals'); + application.inject('component', 'globals', 'service:globals'); + application.inject('adapter', 'globals', 'service:globals'); } export default { diff --git a/app/pods/application/adapter.js b/app/pods/application/adapter.js index bb89c25..a2c9722 100644 --- a/app/pods/application/adapter.js +++ b/app/pods/application/adapter.js @@ -20,7 +20,7 @@ export default DS.RESTAdapter.extend({ errors = {}; if (response.errors !== undefined) { var jsonErrors = response.errors; - Ember.EnumerableUtils.forEach(Ember.keys(jsonErrors), function(key) { + Ember.EnumerableUtils.forEach(Object.keys(jsonErrors), function(key) { errors[Ember.String.camelize(key)] = jsonErrors[key]; }); } diff --git a/app/pods/application/template.hbs b/app/pods/application/template.hbs index 6e52a50..5fe3d0d 100644 --- a/app/pods/application/template.hbs +++ b/app/pods/application/template.hbs @@ -1,3 +1,4 @@ +{{#x-application}}
{{site-logo}} {{#if session.isAuthenticated}} @@ -49,3 +50,4 @@ {{outlet}}
+{{/x-application}} diff --git a/app/pods/application/view.js b/app/pods/application/view.js deleted file mode 100644 index 7da9eeb..0000000 --- a/app/pods/application/view.js +++ /dev/null @@ -1,9 +0,0 @@ -import Ember from 'ember'; -/* global FlakesFrame */ - -export default Ember.View.extend({ - classNames: ['flakes-frame'], - didInsertElement: function() { - FlakesFrame.init(); - } -}); diff --git a/app/pods/components/site-logo/component.js b/app/pods/components/site-logo/component.js new file mode 100644 index 0000000..6e705e6 --- /dev/null +++ b/app/pods/components/site-logo/component.js @@ -0,0 +1,3 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({}); diff --git a/app/pods/components/x-application/component.js b/app/pods/components/x-application/component.js new file mode 100644 index 0000000..79540b0 --- /dev/null +++ b/app/pods/components/x-application/component.js @@ -0,0 +1,10 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + classNames: ["flakes-frame"], + + didInsertElement: function() { + FlakesFrame.init(); + }, + +}); diff --git a/app/pods/components/x-application/template.hbs b/app/pods/components/x-application/template.hbs new file mode 100644 index 0000000..889d9ee --- /dev/null +++ b/app/pods/components/x-application/template.hbs @@ -0,0 +1 @@ +{{yield}} diff --git a/bower.json b/bower.json index 7c160ea..122e534 100644 --- a/bower.json +++ b/bower.json @@ -2,14 +2,14 @@ "name": "hymenobacterdotinfo", "dependencies": { "jquery": "~2.1.1", - "ember": "1.12.0", + "ember": "1.13.3", "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", - "ember-data": "1.0.0-beta.18", - "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4", - "ember-qunit": "0.3.3", + "ember-data": "1.13.5", + "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5", + "ember-qunit": "0.4.1", "ember-qunit-notifications": "0.0.7", - "ember-resolver": "~0.1.15", + "ember-resolver": "~0.1.18", "loader.js": "ember-cli/loader.js#3.2.0", "qunit": "~1.17.1", "flakes": "~1.0.0", diff --git a/ember-cli-build.js b/ember-cli-build.js new file mode 100644 index 0000000..8c5e8c0 --- /dev/null +++ b/ember-cli-build.js @@ -0,0 +1,24 @@ +/* global require, module */ +var EmberApp = require('ember-cli/lib/broccoli/ember-app'); + +module.exports = function(defaults) { + var app = new EmberApp(defaults, { + // Add options here + }); + + // STYLES ////////////////////////////////////////////////////////////////////// + // flakes (and deps) + app.import('bower_components/flakes/css/all.css'); + app.import('bower_components/gridforms/gridforms/gridforms.css'); + + // LIBS //////////////////////////////////////////////////////////////////////// + // flakes (and deps) + app.import('bower_components/snapjs/snap.js'); + app.import('bower_components/responsive-elements/responsive-elements.js'); + app.import('bower_components/gridforms/gridforms/gridforms.js'); + app.import('bower_components/flakes/js/base.js'); + // moment + app.import('bower_components/moment/moment.js'); + + return app.toTree(); +}; diff --git a/package.json b/package.json index 466029d..65f1ffe 100644 --- a/package.json +++ b/package.json @@ -20,25 +20,26 @@ "license": "MIT", "devDependencies": { "broccoli-asset-rev": "^2.0.2", - "ember-cli": "0.2.7", - "ember-cli-app-version": "0.3.3", + "ember-cli": "1.13.1", + "ember-cli-app-version": "0.4.0", "ember-cli-babel": "^5.0.0", "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "^1.0.0", "ember-cli-divshot": "^0.1.7", "ember-cli-flash": "1.1.4", - "ember-cli-htmlbars": "0.7.6", - "ember-cli-ic-ajax": "0.1.1", + "ember-cli-htmlbars": "0.7.9", + "ember-cli-htmlbars-inline-precompile": "^0.1.1", + "ember-cli-ic-ajax": "0.2.1", "ember-cli-inject-live-reload": "^1.3.0", - "ember-cli-qunit": "0.3.13", + "ember-cli-qunit": "0.3.15", "ember-cli-simple-auth": "^0.8.0", "ember-cli-simple-auth-token": "^0.7.2", + "ember-cli-release": "0.2.3", "ember-cli-uglify": "^1.0.1", - "ember-data": "1.0.0-beta.18", + "ember-data": "1.13.5", "ember-disable-proxy-controllers": "^1.0.0", "ember-export-application-global": "^1.0.2", "ember-select-2": "1.3.0", - "ember-table": "0.5.0", - "glob": "^4.5.3" + "ember-table": "0.5.0" } } diff --git a/tests/.jshintrc b/tests/.jshintrc index ea8b88f..6ec0b7c 100644 --- a/tests/.jshintrc +++ b/tests/.jshintrc @@ -26,7 +26,7 @@ "node": false, "browser": false, "boss": true, - "curly": false, + "curly": true, "debug": false, "devel": false, "eqeqeq": true, @@ -47,5 +47,6 @@ "strict": false, "white": false, "eqnull": true, - "esnext": true + "esnext": true, + "unused": true } diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js index 16cc7c3..0f7aab1 100644 --- a/tests/helpers/start-app.js +++ b/tests/helpers/start-app.js @@ -1,6 +1,5 @@ import Ember from 'ember'; import Application from '../../app'; -import Router from '../../router'; import config from '../../config/environment'; export default function startApp(attrs) { From bb2386807c97cf11afac8b2a13c8f2c813ecb9d0 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 9 Jul 2015 17:39:31 -0800 Subject: [PATCH 11/23] Limit species and strain new access --- app/pods/species/new/controller.js | 6 ------ app/pods/species/new/route.js | 17 +++++++++++++++++ app/pods/strains/new/controller.js | 6 ------ app/pods/strains/new/route.js | 21 +++++++++++++++++---- 4 files changed, 34 insertions(+), 16 deletions(-) diff --git a/app/pods/species/new/controller.js b/app/pods/species/new/controller.js index 10704f8..b3cb74e 100644 --- a/app/pods/species/new/controller.js +++ b/app/pods/species/new/controller.js @@ -18,12 +18,6 @@ export default Ember.Controller.extend({ }, cancel: function() { - let species = this.get('model'); - - if (species.get('isNew')) { - species.deleteRecord(); - } - this.transitionToRoute('species.index'); }, diff --git a/app/pods/species/new/route.js b/app/pods/species/new/route.js index 98741c6..0cdcf55 100644 --- a/app/pods/species/new/route.js +++ b/app/pods/species/new/route.js @@ -2,8 +2,25 @@ import Ember from 'ember'; import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; export default Ember.Route.extend(AuthenticatedRouteMixin, { + beforeModel: function() { + if (this.get('session.currentUser.role') === 'R') { + this.transitionTo('species.index'); + } + }, + model: function() { return this.store.createRecord('species'); }, + actions: { + willTransition: function(transition) { + let controller = this.get('controller'); + let species = controller.get('model'); + + if (species.get('isNew')) { + species.deleteRecord(); + } + }, + }, + }); diff --git a/app/pods/strains/new/controller.js b/app/pods/strains/new/controller.js index a6c3139..fa0bcf2 100644 --- a/app/pods/strains/new/controller.js +++ b/app/pods/strains/new/controller.js @@ -17,12 +17,6 @@ export default Ember.Controller.extend({ }, cancel: function() { - 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 03b7907..e2bdecb 100644 --- a/app/pods/strains/new/route.js +++ b/app/pods/strains/new/route.js @@ -2,6 +2,12 @@ import Ember from 'ember'; import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; export default Ember.Route.extend(AuthenticatedRouteMixin, { + beforeModel: function() { + if (this.get('session.currentUser.role') === 'R') { + this.transitionTo('strains.index'); + } + }, + model: function() { return Ember.RSVP.hash({ strain: this.store.createRecord('strain'), @@ -9,12 +15,19 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, { }); }, - afterModel: function(models) { - console.log('after model'); - }, - setupController: function(controller, models) { controller.setProperties(models); }, + actions: { + willTransition: function(transition) { + let controller = this.get('controller'); + let strain = controller.get('strain'); + + if (strain.get('isNew')) { + strain.deleteRecord(); + } + }, + }, + }); From 72c957f8dc733f9a98c2874deb3ab5d9ac84de5e Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 9 Jul 2015 20:52:01 -0800 Subject: [PATCH 12/23] roughing in custom session (again :( ) --- app/initializers/custom-session.js | 24 ++++++++++++++++++++++++ app/pods/application/route.js | 10 ++++++++++ app/pods/index/route.js | 3 ++- app/pods/login/controller.js | 8 +------- app/pods/species/new/route.js | 3 ++- app/pods/strains/new/route.js | 3 ++- config/environment.js | 1 + 7 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 app/initializers/custom-session.js diff --git a/app/initializers/custom-session.js b/app/initializers/custom-session.js new file mode 100644 index 0000000..7c58420 --- /dev/null +++ b/app/initializers/custom-session.js @@ -0,0 +1,24 @@ +import Session from 'simple-auth/session'; +import parseBase64 from '../utils/parse-base64'; + +var CustomSession = Session.extend({ + currentUser: function() { + let token = this.get('secure.token'); + if (!Ember.isEmpty(token)) { + let t = parseBase64(token); + return this.container.lookup('store:main').find('user', t['sub']); + } + return null; + }.property('secure.token'), + +}); + +export function initialize(container, application) { + application.register('session:custom', CustomSession); +} + +export default { + name: 'custom-session', + before: 'simple-auth', + initialize: initialize +}; diff --git a/app/pods/application/route.js b/app/pods/application/route.js index e3173ee..38000bd 100644 --- a/app/pods/application/route.js +++ b/app/pods/application/route.js @@ -1,7 +1,17 @@ import Ember from 'ember'; import ApplicationRouteMixin from 'simple-auth/mixins/application-route-mixin'; +// import parseBase64 from '../../utils/parse-base64'; export default Ember.Route.extend(ApplicationRouteMixin, { + // model: function() { + // let token = this.get('session.secure.token'); + // if (Ember.isNone(token)) { + // return null; + // } + // let user = parseBase64(token); + // return this.store.find('user', user.sub); + // }, + actions: { invalidateSession: function() { this.get('session').invalidate().then(() => { diff --git a/app/pods/index/route.js b/app/pods/index/route.js index d38ae27..2c4d6db 100644 --- a/app/pods/index/route.js +++ b/app/pods/index/route.js @@ -2,7 +2,8 @@ import Ember from 'ember'; import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; export default Ember.Route.extend(AuthenticatedRouteMixin, { - beforeModel: function() { + beforeModel: function(transition) { + this._super(transition); this.transitionTo('compare'); } }); diff --git a/app/pods/login/controller.js b/app/pods/login/controller.js index c622ec8..fd1b966 100644 --- a/app/pods/login/controller.js +++ b/app/pods/login/controller.js @@ -11,13 +11,7 @@ export default Ember.Controller.extend({ this.set('loading', true); // Manually clean up because there might not be a transition this.get('flashMessages').clearMessages(); - session.authenticate(authenticator, credentials).then(()=>{ - this.set('loading', false); - let t = parseBase64(session.get('secure.token')); - this.store.find('user', t['sub']).then((user) => { - session.set('currentUser', user); - }); - }, (error)=> { + session.authenticate(authenticator, credentials).then(null, (error)=> { this.set('loading', false); this.get('flashMessages').error(error.error); }); diff --git a/app/pods/species/new/route.js b/app/pods/species/new/route.js index 0cdcf55..37be440 100644 --- a/app/pods/species/new/route.js +++ b/app/pods/species/new/route.js @@ -2,7 +2,8 @@ import Ember from 'ember'; import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; export default Ember.Route.extend(AuthenticatedRouteMixin, { - beforeModel: function() { + beforeModel: function(transition) { + this._super(transition); if (this.get('session.currentUser.role') === 'R') { this.transitionTo('species.index'); } diff --git a/app/pods/strains/new/route.js b/app/pods/strains/new/route.js index e2bdecb..d214671 100644 --- a/app/pods/strains/new/route.js +++ b/app/pods/strains/new/route.js @@ -2,7 +2,8 @@ import Ember from 'ember'; import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; export default Ember.Route.extend(AuthenticatedRouteMixin, { - beforeModel: function() { + beforeModel: function(transition) { + this._super(transition); if (this.get('session.currentUser.role') === 'R') { this.transitionTo('strains.index'); } diff --git a/config/environment.js b/config/environment.js index 847fa80..97172f8 100644 --- a/config/environment.js +++ b/config/environment.js @@ -16,6 +16,7 @@ module.exports = function(environment) { }, podModulePrefix: 'hymenobacterdotinfo/pods', 'simple-auth': { + session: 'session:custom', authorizer: 'simple-auth-authorizer:token', store: 'simple-auth-session-store:local-storage', }, From eb1a8bb6e3c649777369a7ceb5e953adbda24172 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 10 Jul 2015 09:29:12 -0800 Subject: [PATCH 13/23] protected route --- app/pods/application/template.hbs | 24 ++++++------ .../forms/species-form/template.hbs | 2 +- app/pods/components/site-logo/template.hbs | 2 +- app/pods/{ => protected}/about/route.js | 0 app/pods/{ => protected}/about/template.hbs | 0 .../characteristics/controller.js | 0 .../{ => protected}/characteristics/route.js | 0 .../characteristics/template.hbs | 0 .../{ => protected}/compare/controller.js | 0 app/pods/{ => protected}/compare/route.js | 3 +- app/pods/{ => protected}/compare/template.hbs | 2 +- app/pods/{ => protected}/index/route.js | 2 +- app/pods/{ => protected}/index/template.hbs | 0 .../measurements/controller.js | 0 .../{ => protected}/measurements/route.js | 0 .../{ => protected}/measurements/template.hbs | 0 .../{species/index => protected}/route.js | 3 +- .../species/edit/controller.js | 0 .../{ => protected}/species/edit/route.js | 0 .../{ => protected}/species/edit/template.hbs | 0 .../species/index/controller.js | 0 app/pods/protected/species/index/route.js | 7 ++++ .../species/index/template.hbs | 6 +-- .../{ => protected}/species/new/controller.js | 0 app/pods/{ => protected}/species/new/route.js | 0 .../{ => protected}/species/new/template.hbs | 0 .../{ => protected}/species/show/route.js | 0 .../{ => protected}/species/show/template.hbs | 4 +- .../strains/edit/controller.js | 0 .../{ => protected}/strains/edit/route.js | 0 .../{ => protected}/strains/edit/template.hbs | 0 .../strains/index/controller.js | 0 .../{ => protected}/strains/index/route.js | 0 .../strains/index/template.hbs | 2 +- .../{ => protected}/strains/new/controller.js | 0 app/pods/{ => protected}/strains/new/route.js | 0 .../{ => protected}/strains/new/template.hbs | 0 .../{ => protected}/strains/show/route.js | 0 .../{ => protected}/strains/show/template.hbs | 4 +- app/router.js | 37 +++++++++++-------- config/environment.js | 1 + 41 files changed, 56 insertions(+), 43 deletions(-) rename app/pods/{ => protected}/about/route.js (100%) rename app/pods/{ => protected}/about/template.hbs (100%) rename app/pods/{ => protected}/characteristics/controller.js (100%) rename app/pods/{ => protected}/characteristics/route.js (100%) rename app/pods/{ => protected}/characteristics/template.hbs (100%) rename app/pods/{ => protected}/compare/controller.js (100%) rename app/pods/{ => protected}/compare/route.js (63%) rename app/pods/{ => protected}/compare/template.hbs (89%) rename app/pods/{ => protected}/index/route.js (84%) rename app/pods/{ => protected}/index/template.hbs (100%) rename app/pods/{ => protected}/measurements/controller.js (100%) rename app/pods/{ => protected}/measurements/route.js (100%) rename app/pods/{ => protected}/measurements/template.hbs (100%) rename app/pods/{species/index => protected}/route.js (72%) rename app/pods/{ => protected}/species/edit/controller.js (100%) rename app/pods/{ => protected}/species/edit/route.js (100%) rename app/pods/{ => protected}/species/edit/template.hbs (100%) rename app/pods/{ => protected}/species/index/controller.js (100%) create mode 100644 app/pods/protected/species/index/route.js rename app/pods/{ => protected}/species/index/template.hbs (74%) rename app/pods/{ => protected}/species/new/controller.js (100%) rename app/pods/{ => protected}/species/new/route.js (100%) rename app/pods/{ => protected}/species/new/template.hbs (100%) rename app/pods/{ => protected}/species/show/route.js (100%) rename app/pods/{ => protected}/species/show/template.hbs (91%) rename app/pods/{ => protected}/strains/edit/controller.js (100%) rename app/pods/{ => protected}/strains/edit/route.js (100%) rename app/pods/{ => protected}/strains/edit/template.hbs (100%) rename app/pods/{ => protected}/strains/index/controller.js (100%) rename app/pods/{ => protected}/strains/index/route.js (100%) rename app/pods/{ => protected}/strains/index/template.hbs (84%) rename app/pods/{ => protected}/strains/new/controller.js (100%) rename app/pods/{ => protected}/strains/new/route.js (100%) rename app/pods/{ => protected}/strains/new/template.hbs (100%) rename app/pods/{ => protected}/strains/show/route.js (100%) rename app/pods/{ => protected}/strains/show/template.hbs (93%) diff --git a/app/pods/application/template.hbs b/app/pods/application/template.hbs index 5fe3d0d..e31c7fa 100644 --- a/app/pods/application/template.hbs +++ b/app/pods/application/template.hbs @@ -3,23 +3,23 @@ {{site-logo}} {{#if session.isAuthenticated}}
    - {{#link-to 'compare' tagName='li' href=false}} - {{link-to 'Compare' 'compare'}} + {{#link-to 'protected.compare' tagName='li' href=false}} + {{link-to 'Compare' 'protected.compare'}} {{/link-to}} - {{#link-to 'measurements' tagName='li' href=false}} - {{link-to 'Measurements' 'measurements'}} + {{#link-to 'protected.measurements' tagName='li' href=false}} + {{link-to 'Measurements' 'protected.measurements'}} {{/link-to}} - {{#link-to 'characteristics' tagName='li' href=false}} - {{link-to 'Characteristics' 'characteristics'}} + {{#link-to 'protected.characteristics' tagName='li' href=false}} + {{link-to 'Characteristics' 'protected.characteristics'}} {{/link-to}} - {{#link-to 'species' tagName='li' href=false}} - {{link-to 'Species' 'species'}} + {{#link-to 'protected.species' tagName='li' href=false}} + {{link-to 'Species' 'protected.species'}} {{/link-to}} - {{#link-to 'strains' tagName='li' href=false}} - {{link-to 'Strains' 'strains'}} + {{#link-to 'protected.strains' tagName='li' href=false}} + {{link-to 'Strains' 'protected.strains'}} {{/link-to}} - {{#link-to 'about' tagName='li' href=false}} - {{link-to 'About' 'about'}} + {{#link-to 'protected.about' tagName='li' href=false}} + {{link-to 'About' 'protected.about'}} {{/link-to}}

diff --git a/app/pods/components/forms/species-form/template.hbs b/app/pods/components/forms/species-form/template.hbs index 4eaa726..47fcf42 100644 --- a/app/pods/components/forms/species-form/template.hbs +++ b/app/pods/components/forms/species-form/template.hbs @@ -16,7 +16,7 @@ {{#each species.strains as |strain index|}} {{if index ","}} - {{#link-to 'strains.show' strain.id}} + {{#link-to 'protected.strains.show' strain.id}} {{{strain.strainNameMU}}} {{/link-to}} {{/each}} diff --git a/app/pods/components/site-logo/template.hbs b/app/pods/components/site-logo/template.hbs index 4219c12..72e4d5d 100644 --- a/app/pods/components/site-logo/template.hbs +++ b/app/pods/components/site-logo/template.hbs @@ -1,3 +1,3 @@ -{{#link-to 'index' class='logo'}} +{{#link-to 'protected.index' class='logo'}}

{{globals.genus}}.info

{{/link-to}} diff --git a/app/pods/about/route.js b/app/pods/protected/about/route.js similarity index 100% rename from app/pods/about/route.js rename to app/pods/protected/about/route.js diff --git a/app/pods/about/template.hbs b/app/pods/protected/about/template.hbs similarity index 100% rename from app/pods/about/template.hbs rename to app/pods/protected/about/template.hbs diff --git a/app/pods/characteristics/controller.js b/app/pods/protected/characteristics/controller.js similarity index 100% rename from app/pods/characteristics/controller.js rename to app/pods/protected/characteristics/controller.js diff --git a/app/pods/characteristics/route.js b/app/pods/protected/characteristics/route.js similarity index 100% rename from app/pods/characteristics/route.js rename to app/pods/protected/characteristics/route.js diff --git a/app/pods/characteristics/template.hbs b/app/pods/protected/characteristics/template.hbs similarity index 100% rename from app/pods/characteristics/template.hbs rename to app/pods/protected/characteristics/template.hbs diff --git a/app/pods/compare/controller.js b/app/pods/protected/compare/controller.js similarity index 100% rename from app/pods/compare/controller.js rename to app/pods/protected/compare/controller.js diff --git a/app/pods/compare/route.js b/app/pods/protected/compare/route.js similarity index 63% rename from app/pods/compare/route.js rename to app/pods/protected/compare/route.js index b53f980..9ccdd56 100644 --- a/app/pods/compare/route.js +++ b/app/pods/protected/compare/route.js @@ -1,7 +1,6 @@ import Ember from 'ember'; -import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; -export default Ember.Route.extend(AuthenticatedRouteMixin, { +export default Ember.Route.extend({ resetController: function(controller, isExiting /*, transition*/) { if (isExiting) { controller.set('data', null); diff --git a/app/pods/compare/template.hbs b/app/pods/protected/compare/template.hbs similarity index 89% rename from app/pods/compare/template.hbs rename to app/pods/protected/compare/template.hbs index a4466f4..7b40e6a 100644 --- a/app/pods/compare/template.hbs +++ b/app/pods/protected/compare/template.hbs @@ -19,7 +19,7 @@
{{#each strains as |strain|}} diff --git a/app/pods/index/route.js b/app/pods/protected/index/route.js similarity index 84% rename from app/pods/index/route.js rename to app/pods/protected/index/route.js index 2c4d6db..6fc51ce 100644 --- a/app/pods/index/route.js +++ b/app/pods/protected/index/route.js @@ -4,6 +4,6 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi export default Ember.Route.extend(AuthenticatedRouteMixin, { beforeModel: function(transition) { this._super(transition); - this.transitionTo('compare'); + this.transitionTo('protected.compare'); } }); diff --git a/app/pods/index/template.hbs b/app/pods/protected/index/template.hbs similarity index 100% rename from app/pods/index/template.hbs rename to app/pods/protected/index/template.hbs diff --git a/app/pods/measurements/controller.js b/app/pods/protected/measurements/controller.js similarity index 100% rename from app/pods/measurements/controller.js rename to app/pods/protected/measurements/controller.js diff --git a/app/pods/measurements/route.js b/app/pods/protected/measurements/route.js similarity index 100% rename from app/pods/measurements/route.js rename to app/pods/protected/measurements/route.js diff --git a/app/pods/measurements/template.hbs b/app/pods/protected/measurements/template.hbs similarity index 100% rename from app/pods/measurements/template.hbs rename to app/pods/protected/measurements/template.hbs diff --git a/app/pods/species/index/route.js b/app/pods/protected/route.js similarity index 72% rename from app/pods/species/index/route.js rename to app/pods/protected/route.js index 6b02e0e..b435021 100644 --- a/app/pods/species/index/route.js +++ b/app/pods/protected/route.js @@ -3,6 +3,7 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function() { - return this.store.findAll('species'); + let user = this.get('session.secure.currentUser'); + console.log(user); } }); diff --git a/app/pods/species/edit/controller.js b/app/pods/protected/species/edit/controller.js similarity index 100% rename from app/pods/species/edit/controller.js rename to app/pods/protected/species/edit/controller.js diff --git a/app/pods/species/edit/route.js b/app/pods/protected/species/edit/route.js similarity index 100% rename from app/pods/species/edit/route.js rename to app/pods/protected/species/edit/route.js diff --git a/app/pods/species/edit/template.hbs b/app/pods/protected/species/edit/template.hbs similarity index 100% rename from app/pods/species/edit/template.hbs rename to app/pods/protected/species/edit/template.hbs diff --git a/app/pods/species/index/controller.js b/app/pods/protected/species/index/controller.js similarity index 100% rename from app/pods/species/index/controller.js rename to app/pods/protected/species/index/controller.js diff --git a/app/pods/protected/species/index/route.js b/app/pods/protected/species/index/route.js new file mode 100644 index 0000000..8f05241 --- /dev/null +++ b/app/pods/protected/species/index/route.js @@ -0,0 +1,7 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ + model: function() { + return this.store.findAll('species'); + } +}); diff --git a/app/pods/species/index/template.hbs b/app/pods/protected/species/index/template.hbs similarity index 74% rename from app/pods/species/index/template.hbs rename to app/pods/protected/species/index/template.hbs index 6fc2993..0774bb3 100644 --- a/app/pods/species/index/template.hbs +++ b/app/pods/protected/species/index/template.hbs @@ -1,7 +1,7 @@

{{genus-name}} Species

Total species: {{model.length}}

-{{add-button label="Add Species" link="species.new" canAdd=metaData.canAdd}} +{{add-button label="Add Species" link="protected.species.new" canAdd=metaData.canAdd}}
Characteristic - {{#link-to 'strains.show' strain.id classBinding="data.typeStrain:type-strain"}} + {{#link-to 'protected.strains.show' strain.id classBinding="data.typeStrain:type-strain"}} {{strain.fullNameMU}} {{/link-to}}
@@ -15,7 +15,7 @@ diff --git a/app/pods/strains/new/controller.js b/app/pods/protected/strains/new/controller.js similarity index 100% rename from app/pods/strains/new/controller.js rename to app/pods/protected/strains/new/controller.js diff --git a/app/pods/strains/new/route.js b/app/pods/protected/strains/new/route.js similarity index 100% rename from app/pods/strains/new/route.js rename to app/pods/protected/strains/new/route.js diff --git a/app/pods/strains/new/template.hbs b/app/pods/protected/strains/new/template.hbs similarity index 100% rename from app/pods/strains/new/template.hbs rename to app/pods/protected/strains/new/template.hbs diff --git a/app/pods/strains/show/route.js b/app/pods/protected/strains/show/route.js similarity index 100% rename from app/pods/strains/show/route.js rename to app/pods/protected/strains/show/route.js diff --git a/app/pods/strains/show/template.hbs b/app/pods/protected/strains/show/template.hbs similarity index 93% rename from app/pods/strains/show/template.hbs rename to app/pods/protected/strains/show/template.hbs index 01eb5cf..d7997ba 100644 --- a/app/pods/strains/show/template.hbs +++ b/app/pods/protected/strains/show/template.hbs @@ -9,7 +9,7 @@
Species
- {{#link-to 'species.show' model.species.id}} + {{#link-to 'protected.species.show' model.species.id}} {{model.species.speciesNameMU}} {{/link-to}}
@@ -83,7 +83,7 @@ {{#if model.canEdit}}
- {{#link-to 'species.edit' model class="button-gray smaller"}} + {{#link-to 'protected.species.edit' model class="button-gray smaller"}} Edit {{/link-to}} {{/if}} diff --git a/app/router.js b/app/router.js index 2720075..c03f534 100644 --- a/app/router.js +++ b/app/router.js @@ -7,22 +7,6 @@ var Router = Ember.Router.extend({ Router.map(function() { this.route('login'); - this.route('about'); - this.route('characteristics'); - this.route('measurements'); - this.route('compare'); - - this.route('species', function() { - this.route('new'); - 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() { @@ -31,6 +15,27 @@ Router.map(function() { this.route('verify', { path: ':nonce' }); }); }); + + this.route('protected', { path: '/' }, function() { + this.route('about'); + this.route('characteristics'); + this.route('measurements'); + this.route('compare'); + + this.route('species', function() { + this.route('new'); + 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' }); + }); + + }); + }); export default Router; diff --git a/config/environment.js b/config/environment.js index 97172f8..daba50a 100644 --- a/config/environment.js +++ b/config/environment.js @@ -19,6 +19,7 @@ module.exports = function(environment) { session: 'session:custom', authorizer: 'simple-auth-authorizer:token', store: 'simple-auth-session-store:local-storage', + routeAfterAuthentication: 'protected.index', }, 'simple-auth-token': { identificationField: 'email', From e36d327f366a081aa8ca6b8728c302f917186664 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 10 Jul 2015 10:31:07 -0800 Subject: [PATCH 14/23] Wait to load until currentUser returns --- app/pods/application/route.js | 10 ---- app/pods/application/template.hbs | 53 ------------------- .../components/x-application/component.js | 7 +++ .../components/x-application/template.hbs | 52 +++++++++++++++++- app/pods/login/template.hbs | 6 +-- app/pods/protected/route.js | 9 ++-- app/pods/protected/species/edit/controller.js | 6 +-- app/pods/protected/species/new/controller.js | 6 +-- app/pods/protected/strains/edit/controller.js | 8 +-- app/pods/protected/strains/new/controller.js | 6 +-- app/pods/protected/template.hbs | 3 ++ app/pods/users/template.hbs | 3 ++ 12 files changed, 85 insertions(+), 84 deletions(-) delete mode 100644 app/pods/application/template.hbs create mode 100644 app/pods/protected/template.hbs create mode 100644 app/pods/users/template.hbs diff --git a/app/pods/application/route.js b/app/pods/application/route.js index 38000bd..e3173ee 100644 --- a/app/pods/application/route.js +++ b/app/pods/application/route.js @@ -1,17 +1,7 @@ import Ember from 'ember'; import ApplicationRouteMixin from 'simple-auth/mixins/application-route-mixin'; -// import parseBase64 from '../../utils/parse-base64'; export default Ember.Route.extend(ApplicationRouteMixin, { - // model: function() { - // let token = this.get('session.secure.token'); - // if (Ember.isNone(token)) { - // return null; - // } - // let user = parseBase64(token); - // return this.store.find('user', user.sub); - // }, - actions: { invalidateSession: function() { this.get('session').invalidate().then(() => { diff --git a/app/pods/application/template.hbs b/app/pods/application/template.hbs deleted file mode 100644 index e31c7fa..0000000 --- a/app/pods/application/template.hbs +++ /dev/null @@ -1,53 +0,0 @@ -{{#x-application}} -
- {{site-logo}} - {{#if session.isAuthenticated}} -
    - {{#link-to 'protected.compare' tagName='li' href=false}} - {{link-to 'Compare' 'protected.compare'}} - {{/link-to}} - {{#link-to 'protected.measurements' tagName='li' href=false}} - {{link-to 'Measurements' 'protected.measurements'}} - {{/link-to}} - {{#link-to 'protected.characteristics' tagName='li' href=false}} - {{link-to 'Characteristics' 'protected.characteristics'}} - {{/link-to}} - {{#link-to 'protected.species' tagName='li' href=false}} - {{link-to 'Species' 'protected.species'}} - {{/link-to}} - {{#link-to 'protected.strains' tagName='li' href=false}} - {{link-to 'Strains' 'protected.strains'}} - {{/link-to}} - {{#link-to 'protected.about' tagName='li' href=false}} - {{link-to 'About' 'protected.about'}} - {{/link-to}} -
-

- {{session.currentUser.name}}
- Logout -

- {{else}} -

- {{link-to 'Login' 'login'}} -
- {{link-to 'Sign Up' 'users.new'}} -

- {{/if}} -
- -
-
- {{site-logo}} - - - -
- -
- {{#each flashMessages.queue as |flash|}} - {{custom-flash-message flash=flash}} - {{/each}} - {{outlet}} -
-
-{{/x-application}} diff --git a/app/pods/components/x-application/component.js b/app/pods/components/x-application/component.js index 79540b0..27c8d25 100644 --- a/app/pods/components/x-application/component.js +++ b/app/pods/components/x-application/component.js @@ -7,4 +7,11 @@ export default Ember.Component.extend({ FlakesFrame.init(); }, + actions: { + invalidateSession: function() { + this.sendAction('invalidateSession'); + }, + + }, + }); diff --git a/app/pods/components/x-application/template.hbs b/app/pods/components/x-application/template.hbs index 889d9ee..7fd81aa 100644 --- a/app/pods/components/x-application/template.hbs +++ b/app/pods/components/x-application/template.hbs @@ -1 +1,51 @@ -{{yield}} +
+ {{site-logo}} + {{#if session.isAuthenticated}} +
    + {{#link-to 'protected.compare' tagName='li' href=false}} + {{link-to 'Compare' 'protected.compare'}} + {{/link-to}} + {{#link-to 'protected.measurements' tagName='li' href=false}} + {{link-to 'Measurements' 'protected.measurements'}} + {{/link-to}} + {{#link-to 'protected.characteristics' tagName='li' href=false}} + {{link-to 'Characteristics' 'protected.characteristics'}} + {{/link-to}} + {{#link-to 'protected.species' tagName='li' href=false}} + {{link-to 'Species' 'protected.species'}} + {{/link-to}} + {{#link-to 'protected.strains' tagName='li' href=false}} + {{link-to 'Strains' 'protected.strains'}} + {{/link-to}} + {{#link-to 'protected.about' tagName='li' href=false}} + {{link-to 'About' 'protected.about'}} + {{/link-to}} +
+

+ {{session.currentUser.name}}
+ Logout +

+ {{else}} +

+ {{link-to 'Login' 'login'}} +
+ {{link-to 'Sign Up' 'users.new'}} +

+ {{/if}} +
+ +
+
+ {{site-logo}} + + + +
+ +
+ {{#each flashMessages.queue as |flash|}} + {{custom-flash-message flash=flash}} + {{/each}} + {{yield}} +
+
diff --git a/app/pods/login/template.hbs b/app/pods/login/template.hbs index c851114..8f07896 100644 --- a/app/pods/login/template.hbs +++ b/app/pods/login/template.hbs @@ -1,6 +1,4 @@ -{{#if loggedIn}} -

You are already logged in!

-{{else}} +{{#x-application invalidateSession="invalidateSession"}} {{#if loading}} {{loading-panel}} {{else}} @@ -11,4 +9,4 @@ {{input class="button-gray" type="submit" value="Log In"}} {{/if}} -{{/if}} +{{/x-application}} diff --git a/app/pods/protected/route.js b/app/pods/protected/route.js index b435021..a665e94 100644 --- a/app/pods/protected/route.js +++ b/app/pods/protected/route.js @@ -1,9 +1,12 @@ import Ember from 'ember'; import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; +import parseBase64 from '../../utils/parse-base64'; export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function() { - let user = this.get('session.secure.currentUser'); - console.log(user); - } + let token = this.get('session.secure.token'); + let user = parseBase64(token); + return this.store.find('user', user.sub); + }, + }); diff --git a/app/pods/protected/species/edit/controller.js b/app/pods/protected/species/edit/controller.js index 385e70d..d8fae89 100644 --- a/app/pods/protected/species/edit/controller.js +++ b/app/pods/protected/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); + this.transitionToRoute('protected.species.show', species); }, (err) => { this.get('flashMessages').error(err.responseJSON.error); }); } else { - this.transitionToRoute('species.show', species); + this.transitionToRoute('protected.species.show', species); } }, @@ -22,7 +22,7 @@ export default Ember.Controller.extend({ species.get('errors').clear(); species.rollback(); - this.transitionToRoute('species.show', species); + this.transitionToRoute('protected.species.show', species); }, }, diff --git a/app/pods/protected/species/new/controller.js b/app/pods/protected/species/new/controller.js index b3cb74e..dfe5127 100644 --- a/app/pods/protected/species/new/controller.js +++ b/app/pods/protected/species/new/controller.js @@ -7,18 +7,18 @@ export default Ember.Controller.extend({ if (species.get('isDirty')) { species.save().then((species) => { - this.transitionToRoute('species.show', species.get('id')); + this.transitionToRoute('protected.species.show', species.get('id')); }, (err) => { this.get('flashMessages').error(err.responseJSON.error); }); } else { species.deleteRecord(); - this.transitionToRoute('species.index'); + this.transitionToRoute('protected.species.index'); } }, cancel: function() { - this.transitionToRoute('species.index'); + this.transitionToRoute('protected.species.index'); }, }, diff --git a/app/pods/protected/strains/edit/controller.js b/app/pods/protected/strains/edit/controller.js index f79a682..0b26876 100644 --- a/app/pods/protected/strains/edit/controller.js +++ b/app/pods/protected/strains/edit/controller.js @@ -7,23 +7,23 @@ export default Ember.Controller.extend({ if (strain.get('isDirty')) { strain.save().then((strain) => { - this.transitionToRoute('strains.show', strain); + this.transitionToRoute('protected.strains.show', strain); }, (err) => { this.get('flashMessages').error(err.responseJSON.error); }); } else { strain.deleteRecord(); - this.transitionToRoute('strains.show', strain); + this.transitionToRoute('protected.strains.show', strain); } }, cancel: function() { - let strain = this.get('strain'); + let strain = this.get('protected.strain'); strain.get('errors').clear(); strain.rollback(); - this.transitionToRoute('strains.show', strain); + this.transitionToRoute('protected.strains.show', strain); }, }, diff --git a/app/pods/protected/strains/new/controller.js b/app/pods/protected/strains/new/controller.js index fa0bcf2..3041572 100644 --- a/app/pods/protected/strains/new/controller.js +++ b/app/pods/protected/strains/new/controller.js @@ -7,17 +7,17 @@ export default Ember.Controller.extend({ if (strain.get('isDirty')) { strain.save().then((strain) => { - this.transitionToRoute('strains.show', strain); + this.transitionToRoute('protected.strains.show', strain); }, (err) => { this.get('flashMessages').error(err.responseJSON.error); }); } else { - this.transitionToRoute('strains.index'); + this.transitionToRoute('protected.strains.index'); } }, cancel: function() { - this.transitionToRoute('strains.index'); + this.transitionToRoute('protected.strains.index'); }, }, diff --git a/app/pods/protected/template.hbs b/app/pods/protected/template.hbs new file mode 100644 index 0000000..dd9b46a --- /dev/null +++ b/app/pods/protected/template.hbs @@ -0,0 +1,3 @@ +{{#x-application invalidateSession="invalidateSession"}} + {{outlet}} +{{/x-application}} diff --git a/app/pods/users/template.hbs b/app/pods/users/template.hbs new file mode 100644 index 0000000..dd9b46a --- /dev/null +++ b/app/pods/users/template.hbs @@ -0,0 +1,3 @@ +{{#x-application invalidateSession="invalidateSession"}} + {{outlet}} +{{/x-application}} From 6bc5ddfeb05787647ca223c7d9c893c297e8eaa7 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 10 Jul 2015 10:52:59 -0800 Subject: [PATCH 15/23] Remove old perms utils --- app/utils/user-can-add.js | 3 --- app/utils/user-can-edit.js | 5 ----- tests/unit/utils/user-can-add-test.js | 10 ---------- tests/unit/utils/user-can-edit-test.js | 10 ---------- 4 files changed, 28 deletions(-) delete mode 100644 app/utils/user-can-add.js delete mode 100644 app/utils/user-can-edit.js delete mode 100644 tests/unit/utils/user-can-add-test.js delete mode 100644 tests/unit/utils/user-can-edit-test.js diff --git a/app/utils/user-can-add.js b/app/utils/user-can-add.js deleted file mode 100644 index 68a135b..0000000 --- a/app/utils/user-can-add.js +++ /dev/null @@ -1,3 +0,0 @@ -export default function userCanAdd(role) { - return (role === 'W') || (role === 'A'); -} diff --git a/app/utils/user-can-edit.js b/app/utils/user-can-edit.js deleted file mode 100644 index 20146d5..0000000 --- a/app/utils/user-can-edit.js +++ /dev/null @@ -1,5 +0,0 @@ -export default function userCanEdit(currentUser, author) { - let id = currentUser.id; - let role = currentUser.role; - return (role === 'W' && (+id === author)) || (role === 'A'); -} diff --git a/tests/unit/utils/user-can-add-test.js b/tests/unit/utils/user-can-add-test.js deleted file mode 100644 index d94174e..0000000 --- a/tests/unit/utils/user-can-add-test.js +++ /dev/null @@ -1,10 +0,0 @@ -import userCanAdd from '../../../utils/user-can-add'; -import { module, test } from 'qunit'; - -module('Unit | Utility | user can add'); - -// Replace this with your real tests. -test('it works', function(assert) { - var result = userCanAdd(); - assert.ok(result); -}); diff --git a/tests/unit/utils/user-can-edit-test.js b/tests/unit/utils/user-can-edit-test.js deleted file mode 100644 index a14b4da..0000000 --- a/tests/unit/utils/user-can-edit-test.js +++ /dev/null @@ -1,10 +0,0 @@ -import userCanEdit from '../../../utils/user-can-edit'; -import { module, test } from 'qunit'; - -module('Unit | Utility | user can edit'); - -// Replace this with your real tests. -test('it works', function(assert) { - var result = userCanEdit(); - assert.ok(result); -}); From 33b6fe32b37ffa0eb3023f154c3626f5ad1753e3 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 10 Jul 2015 12:14:05 -0800 Subject: [PATCH 16/23] more cleanup --- app/pods/components/forms/species-form/template.hbs | 4 ++-- app/pods/components/forms/strain-form/template.hbs | 2 +- app/pods/protected/strains/index/template.hbs | 2 +- app/pods/protected/strains/show/template.hbs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/pods/components/forms/species-form/template.hbs b/app/pods/components/forms/species-form/template.hbs index 47fcf42..a523838 100644 --- a/app/pods/components/forms/species-form/template.hbs +++ b/app/pods/components/forms/species-form/template.hbs @@ -20,7 +20,7 @@ {{{strain.strainNameMU}}} {{/link-to}} {{/each}} - {{add-button label="Add Strain" link="strains.new"}} + {{add-button label="Add Strain" link="protected.strains.new"}}
@@ -35,7 +35,7 @@ Cancel -{{#if species.isDirty}} +{{#if species.hasDirtyAttributes}} Save diff --git a/app/pods/components/forms/strain-form/template.hbs b/app/pods/components/forms/strain-form/template.hbs index 84bc241..b2f5582 100644 --- a/app/pods/components/forms/strain-form/template.hbs +++ b/app/pods/components/forms/strain-form/template.hbs @@ -54,7 +54,7 @@ Cancel -{{#if strain.isDirty}} +{{#if strain.hasDirtyAttributes}} Save diff --git a/app/pods/protected/strains/index/template.hbs b/app/pods/protected/strains/index/template.hbs index 720e7ad..2d40098 100644 --- a/app/pods/protected/strains/index/template.hbs +++ b/app/pods/protected/strains/index/template.hbs @@ -1,7 +1,7 @@

{{genus-name}} Strains

Total strains: {{model.length}}

-{{add-button label="Add Strain" link="strains.new" canAdd=metaData.canAdd}} +{{add-button label="Add Strain" link="protected.strains.new" canAdd=metaData.canAdd}}
- {{#link-to 'species.show' species}} + {{#link-to 'protected.species.show' species}} {{species.speciesName}} {{/link-to}} @@ -23,7 +23,7 @@ {{#each species.strains as |strain index|}} {{if index ","}} - {{#link-to 'strains.show' strain.id}} + {{#link-to 'protected.strains.show' strain.id}} {{{strain.strainNameMU}}} {{/link-to}} {{/each}} diff --git a/app/pods/species/new/controller.js b/app/pods/protected/species/new/controller.js similarity index 100% rename from app/pods/species/new/controller.js rename to app/pods/protected/species/new/controller.js diff --git a/app/pods/species/new/route.js b/app/pods/protected/species/new/route.js similarity index 100% rename from app/pods/species/new/route.js rename to app/pods/protected/species/new/route.js diff --git a/app/pods/species/new/template.hbs b/app/pods/protected/species/new/template.hbs similarity index 100% rename from app/pods/species/new/template.hbs rename to app/pods/protected/species/new/template.hbs diff --git a/app/pods/species/show/route.js b/app/pods/protected/species/show/route.js similarity index 100% rename from app/pods/species/show/route.js rename to app/pods/protected/species/show/route.js diff --git a/app/pods/species/show/template.hbs b/app/pods/protected/species/show/template.hbs similarity index 91% rename from app/pods/species/show/template.hbs rename to app/pods/protected/species/show/template.hbs index 49a83dc..fac3273 100644 --- a/app/pods/species/show/template.hbs +++ b/app/pods/protected/species/show/template.hbs @@ -13,7 +13,7 @@
    {{#each model.strains as |strain index|}}
  • - {{#link-to 'strains.show' strain.id}} + {{#link-to 'protected.strains.show' strain.id}} {{{strain.strainNameMU}}} {{/link-to}}
    • @@ -59,7 +59,7 @@ {{#if model.canEdit}}
    - {{#link-to 'species.edit' model class="button-gray smaller"}} + {{#link-to 'protected.species.edit' model class="button-gray smaller"}} Edit {{/link-to}} {{/if}} diff --git a/app/pods/strains/edit/controller.js b/app/pods/protected/strains/edit/controller.js similarity index 100% rename from app/pods/strains/edit/controller.js rename to app/pods/protected/strains/edit/controller.js diff --git a/app/pods/strains/edit/route.js b/app/pods/protected/strains/edit/route.js similarity index 100% rename from app/pods/strains/edit/route.js rename to app/pods/protected/strains/edit/route.js diff --git a/app/pods/strains/edit/template.hbs b/app/pods/protected/strains/edit/template.hbs similarity index 100% rename from app/pods/strains/edit/template.hbs rename to app/pods/protected/strains/edit/template.hbs diff --git a/app/pods/strains/index/controller.js b/app/pods/protected/strains/index/controller.js similarity index 100% rename from app/pods/strains/index/controller.js rename to app/pods/protected/strains/index/controller.js diff --git a/app/pods/strains/index/route.js b/app/pods/protected/strains/index/route.js similarity index 100% rename from app/pods/strains/index/route.js rename to app/pods/protected/strains/index/route.js diff --git a/app/pods/strains/index/template.hbs b/app/pods/protected/strains/index/template.hbs similarity index 84% rename from app/pods/strains/index/template.hbs rename to app/pods/protected/strains/index/template.hbs index a513167..720e7ad 100644 --- a/app/pods/strains/index/template.hbs +++ b/app/pods/protected/strains/index/template.hbs @@ -14,7 +14,7 @@ {{#each sortedStrains as |row|}}
- {{#link-to 'strains.show' row.id classBinding="data.typeStrain:type-strain"}} + {{#link-to 'protected.strains.show' row.id classBinding="data.typeStrain:type-strain"}} {{row.fullNameMU}} {{/link-to}}
diff --git a/app/pods/protected/strains/show/template.hbs b/app/pods/protected/strains/show/template.hbs index d7997ba..1ba5fe6 100644 --- a/app/pods/protected/strains/show/template.hbs +++ b/app/pods/protected/strains/show/template.hbs @@ -83,7 +83,7 @@ {{#if model.canEdit}}
- {{#link-to 'protected.species.edit' model class="button-gray smaller"}} + {{#link-to 'protected.strains.edit' model.id class="button-gray smaller"}} Edit {{/link-to}} {{/if}} From b78aa571ee040780a109738c771889f344ea8bf3 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 10 Jul 2015 12:33:12 -0800 Subject: [PATCH 17/23] Remove ember-table and measurements --- app/pods/protected/measurements/controller.js | 50 ------------------- app/pods/protected/measurements/route.js | 6 +-- app/pods/protected/measurements/template.hbs | 20 +------- package.json | 3 +- 4 files changed, 3 insertions(+), 76 deletions(-) delete mode 100644 app/pods/protected/measurements/controller.js diff --git a/app/pods/protected/measurements/controller.js b/app/pods/protected/measurements/controller.js deleted file mode 100644 index f71a66f..0000000 --- a/app/pods/protected/measurements/controller.js +++ /dev/null @@ -1,50 +0,0 @@ -import Ember from 'ember'; -import ColumnDefinition from 'ember-table/models/column-definition'; - -export default Ember.Controller.extend({ - measurements: [], - - measurementsEmpty: function() { - return this.get('measurements').length === 0; - }.property('measurements'), - - tableColumns: Ember.computed(function() { - let strainCol = ColumnDefinition.create({ - savedWidth: 200, - textAlign: 'text-align-left', - headerCellName: 'Strain', - contentPath: 'strain.fullNameMU', - }); - - let charCol = ColumnDefinition.create({ - savedWidth: 200, - textAlign: 'text-align-left', - headerCellName: 'Characteristic', - contentPath: 'characteristic.characteristicName', - }); - - let valCol = ColumnDefinition.create({ - savedWidth: 150, - textAlign: 'text-align-left', - headerCellName: 'Value', - contentPath: 'value', - }); - - return [strainCol, charCol, valCol]; - }), - - tableContent: Ember.computed('measurements', function() { - return this.get('measurements'); - }), - - actions: { - search: function(selectedStrains, selectedCharacteristics) { - this.store.find('measurement', { - strain: selectedStrains, - characteristic: selectedCharacteristics, - }).then((measurements)=>{ - this.set('measurements', measurements); - }); - } - }, -}); diff --git a/app/pods/protected/measurements/route.js b/app/pods/protected/measurements/route.js index 4219aea..b3f843f 100644 --- a/app/pods/protected/measurements/route.js +++ b/app/pods/protected/measurements/route.js @@ -1,8 +1,4 @@ import Ember from 'ember'; import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; -export default Ember.Route.extend(AuthenticatedRouteMixin, { - model: function() { - return this.store.findAll('measurement'); - }, -}); +export default Ember.Route.extend(AuthenticatedRouteMixin, {}); diff --git a/app/pods/protected/measurements/template.hbs b/app/pods/protected/measurements/template.hbs index 6ddf84e..bc4b4ec 100644 --- a/app/pods/protected/measurements/template.hbs +++ b/app/pods/protected/measurements/template.hbs @@ -1,21 +1,3 @@

{{genus-name}} Measurements

-{{measurement-search-panel search='search' strainLabel='All strains' charLabel='All characteristics'}} - -
-
-

Total matching measurements: {{measurements.length}}

-
-
- -{{#if measurementsEmpty}} - No results -{{else}} - {{ - ember-table - columns=tableColumns - content=tableContent - columnMode='fluid' - hasFooter=false - }} -{{/if}} +Be back soon diff --git a/package.json b/package.json index 65f1ffe..595092f 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,6 @@ "ember-data": "1.13.5", "ember-disable-proxy-controllers": "^1.0.0", "ember-export-application-global": "^1.0.2", - "ember-select-2": "1.3.0", - "ember-table": "0.5.0" + "ember-select-2": "1.3.0" } } From 99c94e9c7b9c67bc52b76d4a77e60ac8f9271d62 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 10 Jul 2015 15:28:27 -0800 Subject: [PATCH 18/23] Clean up species id in strain serializer --- app/serializers/strain.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 app/serializers/strain.js diff --git a/app/serializers/strain.js b/app/serializers/strain.js new file mode 100644 index 0000000..9fd16c7 --- /dev/null +++ b/app/serializers/strain.js @@ -0,0 +1,13 @@ +import DS from 'ember-data'; + +export default DS.RESTSerializer.extend({ + isNewSerializerAPI: true, + + serializeBelongsTo: function(snapshot, json, relationship) { + var key = relationship.key; + var belongsTo = snapshot.belongsTo(key); + key = this.keyForRelationship ? this.keyForRelationship(key, "belongsTo", "serialize") : key; + json[key] = Ember.isNone(belongsTo) ? belongsTo : +belongsTo.record.id; + } + +}); From ea77042b19afa8b4e594d0b9cdb3e58be8a956a2 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 13 Jul 2015 08:27:03 -0800 Subject: [PATCH 19/23] Drop characteristic types --- app/models/characteristic-type.js | 13 ----------- app/models/characteristic.js | 22 +++++++++---------- .../measurement-search-panel/component.js | 3 ++- .../protected/characteristics/controller.js | 2 +- app/pods/protected/characteristics/route.js | 8 +------ .../protected/characteristics/template.hbs | 2 +- 6 files changed, 16 insertions(+), 34 deletions(-) delete mode 100644 app/models/characteristic-type.js diff --git a/app/models/characteristic-type.js b/app/models/characteristic-type.js deleted file mode 100644 index 284486e..0000000 --- a/app/models/characteristic-type.js +++ /dev/null @@ -1,13 +0,0 @@ -import DS from 'ember-data'; - -export default DS.Model.extend({ - characteristicTypeName: DS.attr('string'), - characteristics: DS.hasMany('characteristic', { async: true }), - createdAt: DS.attr('date'), - updatedAt: DS.attr('date'), - deletedAt: DS.attr('date'), - createdBy: DS.attr('number'), - updatedBy: DS.attr('number'), - deletedBy: DS.attr('number'), - sortOrder: DS.attr('number'), -}); diff --git a/app/models/characteristic.js b/app/models/characteristic.js index 9f33d7b..d896ca1 100644 --- a/app/models/characteristic.js +++ b/app/models/characteristic.js @@ -1,15 +1,15 @@ import DS from 'ember-data'; export default DS.Model.extend({ - characteristicName: DS.attr('string'), - characteristicType: DS.belongsTo('characteristicType', { async: true }), - strains : DS.hasMany('strain', { async: true }), - measurements : DS.hasMany('measurements', { async: true }), - createdAt : DS.attr('date'), - updatedAt : DS.attr('date'), - deletedAt : DS.attr('date'), - createdBy : DS.attr('number'), - updatedBy : DS.attr('number'), - deletedBy : DS.attr('number'), - sortOrder : DS.attr('number'), + characteristicName : DS.attr('string'), + characteristicTypeName: DS.attr('string'), + strains : DS.hasMany('strain', { async: true }), + measurements : DS.hasMany('measurements', { async: true }), + createdAt : DS.attr('date'), + updatedAt : DS.attr('date'), + deletedAt : DS.attr('date'), + createdBy : DS.attr('number'), + updatedBy : DS.attr('number'), + deletedBy : DS.attr('number'), + sortOrder : DS.attr('number'), }); diff --git a/app/pods/components/measurement-search-panel/component.js b/app/pods/components/measurement-search-panel/component.js index b9e9749..56d60d5 100644 --- a/app/pods/components/measurement-search-panel/component.js +++ b/app/pods/components/measurement-search-panel/component.js @@ -7,9 +7,10 @@ export default Ember.Component.extend({ Ember.RSVP.hash({ species: this.store.findAll('species'), strains: this.store.findAll('strain'), - characteristicTypes: this.store.findAll('characteristic-type'), characteristics: this.store.findAll('characteristic'), }).then((models) => { + models['characteristicTypes'] = models.characteristics.mapBy('characteristicTypeName').uniq(); + // Set up search parameters // Clean up sort order let selects = [ diff --git a/app/pods/protected/characteristics/controller.js b/app/pods/protected/characteristics/controller.js index 88d2200..d1d9ed1 100644 --- a/app/pods/protected/characteristics/controller.js +++ b/app/pods/protected/characteristics/controller.js @@ -2,5 +2,5 @@ import Ember from 'ember'; export default Ember.Controller.extend({ sortParams: ['characteristicType.characteristicTypeName', 'sortOrder'], - sortedCharacteristics: Ember.computed.sort('characteristics', 'sortParams'), + sortedCharacteristics: Ember.computed.sort('model', 'sortParams'), }); diff --git a/app/pods/protected/characteristics/route.js b/app/pods/protected/characteristics/route.js index 6fc0c60..77c7739 100644 --- a/app/pods/protected/characteristics/route.js +++ b/app/pods/protected/characteristics/route.js @@ -3,13 +3,7 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function() { - return Ember.RSVP.hash({ - characteristicTypes: this.store.findAll('characteristic-type'), - characteristics: this.store.findAll('characteristic'), - }); + return this.store.findAll('characteristic'); }, - setupController: function(controller, models) { - controller.setProperties(models); - }, }); diff --git a/app/pods/protected/characteristics/template.hbs b/app/pods/protected/characteristics/template.hbs index cc21bab..b9bd848 100644 --- a/app/pods/protected/characteristics/template.hbs +++ b/app/pods/protected/characteristics/template.hbs @@ -1,5 +1,5 @@

{{genus-name}} Characteristics

-

Total characteristics: {{characteristics.length}}

+

Total characteristics: {{model.length}}

From de18cfc94937cdee4b9dcaa188f206148c38065d Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 13 Jul 2015 08:29:53 -0800 Subject: [PATCH 20/23] Minor cleanup --- app/initializers/custom-session.js | 1 + app/pods/login/controller.js | 1 - app/pods/protected/species/new/route.js | 2 +- app/pods/protected/strains/new/route.js | 2 +- app/serializers/strain.js | 1 + 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/initializers/custom-session.js b/app/initializers/custom-session.js index 7c58420..c6a230a 100644 --- a/app/initializers/custom-session.js +++ b/app/initializers/custom-session.js @@ -1,5 +1,6 @@ import Session from 'simple-auth/session'; import parseBase64 from '../utils/parse-base64'; +import Ember from 'ember'; var CustomSession = Session.extend({ currentUser: function() { diff --git a/app/pods/login/controller.js b/app/pods/login/controller.js index fd1b966..70eca2b 100644 --- a/app/pods/login/controller.js +++ b/app/pods/login/controller.js @@ -1,5 +1,4 @@ import Ember from 'ember'; -import parseBase64 from '../../utils/parse-base64'; export default Ember.Controller.extend({ actions: { diff --git a/app/pods/protected/species/new/route.js b/app/pods/protected/species/new/route.js index 37be440..8c9caf9 100644 --- a/app/pods/protected/species/new/route.js +++ b/app/pods/protected/species/new/route.js @@ -14,7 +14,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, { }, actions: { - willTransition: function(transition) { + willTransition: function(/*transition*/) { let controller = this.get('controller'); let species = controller.get('model'); diff --git a/app/pods/protected/strains/new/route.js b/app/pods/protected/strains/new/route.js index d214671..cb601a3 100644 --- a/app/pods/protected/strains/new/route.js +++ b/app/pods/protected/strains/new/route.js @@ -21,7 +21,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, { }, actions: { - willTransition: function(transition) { + willTransition: function(/*transition*/) { let controller = this.get('controller'); let strain = controller.get('strain'); diff --git a/app/serializers/strain.js b/app/serializers/strain.js index 9fd16c7..ddadf39 100644 --- a/app/serializers/strain.js +++ b/app/serializers/strain.js @@ -1,4 +1,5 @@ import DS from 'ember-data'; +import Ember from 'ember'; export default DS.RESTSerializer.extend({ isNewSerializerAPI: true, From 9b0528e38ffd296c3e2827207e33d50c650bad3f Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 13 Jul 2015 09:46:18 -0800 Subject: [PATCH 21/23] SQUASH with drop chartype --- app/pods/protected/characteristics/controller.js | 2 +- app/pods/protected/characteristics/template.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/pods/protected/characteristics/controller.js b/app/pods/protected/characteristics/controller.js index d1d9ed1..be9f042 100644 --- a/app/pods/protected/characteristics/controller.js +++ b/app/pods/protected/characteristics/controller.js @@ -1,6 +1,6 @@ import Ember from 'ember'; export default Ember.Controller.extend({ - sortParams: ['characteristicType.characteristicTypeName', 'sortOrder'], + sortParams: ['characteristicTypeName', 'sortOrder'], sortedCharacteristics: Ember.computed.sort('model', 'sortParams'), }); diff --git a/app/pods/protected/characteristics/template.hbs b/app/pods/protected/characteristics/template.hbs index b9bd848..a599cbd 100644 --- a/app/pods/protected/characteristics/template.hbs +++ b/app/pods/protected/characteristics/template.hbs @@ -13,7 +13,7 @@ {{#each sortedCharacteristics as |row|}} - + {{/each}} From 6ad9ad17b861676b7a42fb2b5640ee26eca2b2be Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 13 Jul 2015 09:46:37 -0800 Subject: [PATCH 22/23] Remove search panel and related --- .../measurement-search-panel/component.js | 51 ------------------- .../measurement-search-panel/template.hbs | 33 ------------ .../components/search-button/component.js | 13 ----- .../components/search-button/template.hbs | 7 --- 4 files changed, 104 deletions(-) delete mode 100644 app/pods/components/measurement-search-panel/component.js delete mode 100644 app/pods/components/measurement-search-panel/template.hbs delete mode 100644 app/pods/components/search-button/component.js delete mode 100644 app/pods/components/search-button/template.hbs diff --git a/app/pods/components/measurement-search-panel/component.js b/app/pods/components/measurement-search-panel/component.js deleted file mode 100644 index 56d60d5..0000000 --- a/app/pods/components/measurement-search-panel/component.js +++ /dev/null @@ -1,51 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Component.extend({ - classNames: ["grid-1", "gutter-50"], - - setup: function() { - Ember.RSVP.hash({ - species: this.store.findAll('species'), - strains: this.store.findAll('strain'), - characteristics: this.store.findAll('characteristic'), - }).then((models) => { - models['characteristicTypes'] = models.characteristics.mapBy('characteristicTypeName').uniq(); - - // Set up search parameters - // Clean up sort order - let selects = [ - { model: 'species', id: 'id', text: 'speciesNameMU', - children: 'strains', cid: 'id', ctext: 'strainNameMU' }, - { model: 'characteristicTypes', id: 'id', text: 'characteristicTypeName', - children: 'characteristics', cid: 'id', ctext: 'characteristicName' }, - ]; - - selects.forEach((item /*, index, enumerable*/) => { - models[item.model] = models[item.model].filter((i) => { - if (!Ember.isEmpty(i.get(item.children))) { return true; } - }); - models[item.model] = models[item.model].sortBy('sortOrder'); - let temp = models[item.model].map((data) => { - let temp_children = []; - let sorted_children = data.get(item.children).sortBy('sortOrder'); - sorted_children.forEach((child) => { - temp_children.push({id: child.get(item.cid), text: child.get(item.ctext)}); - }); - return { - text: data.get(item.text), - children: temp_children, - }; - }); - this.set(item.model, temp); - }); - }); - }.on('init'), - - actions: { - search: function() { - let strains = this.get('selectedStrains'), - characteristics = this.get('selectedCharacteristics'); - this.sendAction('search', strains, characteristics); - }, - }, -}); diff --git a/app/pods/components/measurement-search-panel/template.hbs b/app/pods/components/measurement-search-panel/template.hbs deleted file mode 100644 index 0376f8a..0000000 --- a/app/pods/components/measurement-search-panel/template.hbs +++ /dev/null @@ -1,33 +0,0 @@ -
-
-
-
    -
  • - - {{ - select-2 - multiple=true - content=species - value=selectedStrains - optionValuePath="id" - placeholder=strainLabel - }} -
    • -
  • - - {{ - select-2 - multiple=true - content=characteristicTypes - value=selectedCharacteristics - optionValuePath="id" - placeholder=charLabel - }} -
    • -
  • - {{search-button isLoading=isLoading action='search'}} -
    • -
- -
-
diff --git a/app/pods/components/search-button/component.js b/app/pods/components/search-button/component.js deleted file mode 100644 index e37949d..0000000 --- a/app/pods/components/search-button/component.js +++ /dev/null @@ -1,13 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Component.extend({ - isLoading: false, - buttonText: 'Search', - actions: { - showLoading: function() { - if (!this.get('isLoading')) { - this.sendAction('action'); - } - } - } -}); diff --git a/app/pods/components/search-button/template.hbs b/app/pods/components/search-button/template.hbs deleted file mode 100644 index 4bd6134..0000000 --- a/app/pods/components/search-button/template.hbs +++ /dev/null @@ -1,7 +0,0 @@ - - {{#if isLoading}} - LOADING - {{else}} - {{buttonText}} - {{/if}} - From 8bdc31f99e30effa03a76c468e4712be9051ccc9 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 13 Jul 2015 15:19:27 -0800 Subject: [PATCH 23/23] Refactor compare --- app/pods/protected/compare/controller.js | 47 ++---------- .../protected/compare/results/controller.js | 50 ++++++++++++ app/pods/protected/compare/results/route.js | 11 +++ .../protected/compare/results/template.hbs | 26 +++++++ app/pods/protected/compare/route.js | 16 ++-- app/pods/protected/compare/template.hbs | 76 +++++++++---------- app/router.js | 5 +- 7 files changed, 145 insertions(+), 86 deletions(-) create mode 100644 app/pods/protected/compare/results/controller.js create mode 100644 app/pods/protected/compare/results/route.js create mode 100644 app/pods/protected/compare/results/template.hbs diff --git a/app/pods/protected/compare/controller.js b/app/pods/protected/compare/controller.js index c867880..da7295b 100644 --- a/app/pods/protected/compare/controller.js +++ b/app/pods/protected/compare/controller.js @@ -1,47 +1,14 @@ import Ember from 'ember'; export default Ember.Controller.extend({ - strains: [], - dataEmpty: true, - actions: { - search: function(selectedStrains, selectedCharacteristics) { - if (Ember.isEmpty(selectedStrains) || Ember.isEmpty(selectedCharacteristics)) { - this.set('dataEmpty', true); - return false; - } + search: function() { + let query = { + strain_ids: this.get('selectedStrains'), + characteristic_ids: this.get('selectedCharacteristics'), + }; - let data = Ember.A(); - let strains = []; - selectedStrains.forEach((strain) => { - let s = this.store.getById('strain', strain); - strains.pushObject(s); - }); - this.set('strains', strains); - - this.store.find('measurement', { - strain: selectedStrains, - characteristic: selectedCharacteristics, - }).then((measurements) => { - selectedCharacteristics.forEach((characteristic) => { - let char = this.store.getById('characteristic', characteristic); - let row = { - characteristic: char.get('characteristicName'), - }; - selectedStrains.forEach((strain) => { - let meas = measurements.filterBy('strain.id', strain) - .filterBy('characteristic.id', characteristic); - if (!Ember.isEmpty(meas)) { - row[strain] = meas[0].get('value'); - } else { - row[strain] = ''; - } - }); - data.pushObject(row); - }); - this.set('data', data); - this.set('dataEmpty', false); - }); + this.transitionToRoute('protected.compare.results', {queryParams: query}); } - }, + } }); diff --git a/app/pods/protected/compare/results/controller.js b/app/pods/protected/compare/results/controller.js new file mode 100644 index 0000000..24fd5e7 --- /dev/null +++ b/app/pods/protected/compare/results/controller.js @@ -0,0 +1,50 @@ +import Ember from 'ember'; + +export default Ember.Controller.extend({ + queryParams: ['strain_ids', 'characteristic_ids'], + + strains: function() { + let strains = []; + let strain_ids = this.get('strain_ids').split(','); + strain_ids.forEach((id) => { + strains.push(this.store.peekRecord('strain', id)); + }) + return strains; + }.property('strain_ids'), + + characteristics: function() { + let characteristics = []; + let characteristic_ids = this.get('characteristic_ids').split(','); + characteristic_ids.forEach((id) => { + characteristics.push(this.store.peekRecord('characteristic', id)); + }) + 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'), + +}); diff --git a/app/pods/protected/compare/results/route.js b/app/pods/protected/compare/results/route.js new file mode 100644 index 0000000..757d14d --- /dev/null +++ b/app/pods/protected/compare/results/route.js @@ -0,0 +1,11 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ + model: function(params) { + let compare = this.controllerFor('protected.compare'); + compare.set('selectedStrains', params.strain_ids); + compare.set('selectedCharacteristics', params.characteristic_ids); + return this.store.query('measurement', params); + }, + +}); diff --git a/app/pods/protected/compare/results/template.hbs b/app/pods/protected/compare/results/template.hbs new file mode 100644 index 0000000..dbed78d --- /dev/null +++ b/app/pods/protected/compare/results/template.hbs @@ -0,0 +1,26 @@ +
+
{{row.characteristicName}}{{row.characteristicType.characteristicTypeName}}{{row.characteristicTypeName}} {{row.sortOrder}}
+ + + + {{#each strains as |strain|}} + + {{/each}} + + + + {{#each data as |row|}} + + + {{#each strains as |strain|}} + + {{/each}} + + {{/each}} + +
Characteristic + {{#link-to 'protected.strains.show' strain.id classBinding="data.typeStrain:type-strain"}} + {{strain.fullNameMU}} + {{/link-to}} +
{{row.characteristic}}{{get-property row strain.id}}
+ diff --git a/app/pods/protected/compare/route.js b/app/pods/protected/compare/route.js index 9ccdd56..e8a8576 100644 --- a/app/pods/protected/compare/route.js +++ b/app/pods/protected/compare/route.js @@ -1,11 +1,13 @@ import Ember from 'ember'; export default Ember.Route.extend({ - resetController: function(controller, isExiting /*, transition*/) { - if (isExiting) { - controller.set('data', null); - controller.set('strains', null); - controller.set('dataEmpty', true); - } - } + model: function() { + return this.store.findAll('characteristic'); + }, + + setupController: function(controller, model) { + controller.set('characteristics', this.store.peekAll('characteristic')); + controller.set('strains', this.store.peekAll('strain')); + }, + }); diff --git a/app/pods/protected/compare/template.hbs b/app/pods/protected/compare/template.hbs index 7b40e6a..f075a52 100644 --- a/app/pods/protected/compare/template.hbs +++ b/app/pods/protected/compare/template.hbs @@ -1,41 +1,41 @@

{{genus-name}} - Compare Strains

-{{ - measurement-search-panel - search='search' - strainLabel='Select one or more strains' - charLabel='Select one or more characteristics' -}} - -{{#if dataEmpty}} -
- Please select one or more strains and one or more characteristics. -
-{{else}} -
- - - - - {{#each strains as |strain|}} - - {{/each}} - - - - {{#each data as |row|}} - - - {{#each strains as |strain|}} - - {{/each}} - - {{/each}} - -
Characteristic - {{#link-to 'protected.strains.show' strain.id classBinding="data.typeStrain:type-strain"}} - {{strain.fullNameMU}} - {{/link-to}} -
{{row.characteristic}}{{get-property row strain.id}}
+
+
+
+
    +
  • + + {{ + select-2 + multiple=true + content=strains + value=selectedStrains + optionValuePath="id" + optionLabelPath="fullNameMU" + placeholder="Select one or more strains" + }} +
    • +
  • + + {{ + select-2 + multiple=true + content=characteristics + value=selectedCharacteristics + optionValuePath="id" + optionLabelPath="characteristicName" + placeholder="Select one or more characteristics" + }} +
    • +
  • + + Search + +
    • +
+
+
-{{/if}} + +{{outlet}} diff --git a/app/router.js b/app/router.js index c03f534..5fb53e3 100644 --- a/app/router.js +++ b/app/router.js @@ -20,7 +20,10 @@ Router.map(function() { this.route('about'); this.route('characteristics'); this.route('measurements'); - this.route('compare'); + + this.route('compare', function() { + this.route('results'); + }); this.route('species', function() { this.route('new');