diff --git a/app/abilities/species.js b/app/abilities/species.js deleted file mode 100644 index 7900607..0000000 --- a/app/abilities/species.js +++ /dev/null @@ -1,17 +0,0 @@ -import { Ability } from 'ember-can'; - -export default Ability.extend({ - // Only admins and writers can create a new species - canAdd: function() { - let role = this.get('session.currentUser.role'); - return (role === 'W') || (role === 'A'); - }.property('session.currentUser.role'), - - // Only admins and the person who created can edit - canEdit: function() { - let role = this.get('session.currentUser.role'); - let id = this.get('session.currentUser.id'); - let author = this.get('model.createdBy'); - return (role === 'W' && (+id === author)) || (role === 'A'); - }.property('session.currentUser.role', 'session.currentUser.id', 'model.createdBy') -}); diff --git a/app/abilities/strain.js b/app/abilities/strain.js deleted file mode 100644 index ba12463..0000000 --- a/app/abilities/strain.js +++ /dev/null @@ -1,17 +0,0 @@ -import { Ability } from 'ember-can'; - -export default Ability.extend({ - // Only admins and writers can create a new strain - canAdd: function() { - let role = this.get('session.currentUser.role'); - return (role === 'W') || (role === 'A'); - }.property('session.currentUser.role'), - - // Only admins and the person who created can edit - canEdit: function() { - let role = this.get('session.currentUser.role'); - let id = this.get('session.currentUser.id'); - let author = this.get('model.createdBy'); - return (role === 'W' && (+id === author)) || (role === 'A'); - }.property('session.currentUser.role', 'session.currentUser.id', 'model.createdBy') -}); diff --git a/app/pods/components/add-button/component.js b/app/pods/components/add-button/component.js new file mode 100644 index 0000000..857bde3 --- /dev/null +++ b/app/pods/components/add-button/component.js @@ -0,0 +1,8 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + canAdd: function() { + let role = this.get('session.currentUser.role'); + return (role === 'W') || (role === 'A'); + }.property('session.currentUser.role') +}); diff --git a/app/pods/components/add-button/template.hbs b/app/pods/components/add-button/template.hbs new file mode 100644 index 0000000..43dfc1f --- /dev/null +++ b/app/pods/components/add-button/template.hbs @@ -0,0 +1,5 @@ +{{#if canAdd}} + {{#link-to link class="button-gray smaller"}} + {{label}} + {{/link-to}} +{{/if}} diff --git a/app/pods/components/species-details/component.js b/app/pods/components/species-details/component.js index 58afb31..2950361 100644 --- a/app/pods/components/species-details/component.js +++ b/app/pods/components/species-details/component.js @@ -3,6 +3,14 @@ import Ember from 'ember'; export default Ember.Component.extend({ classNames: ['grid-1'], isEditing: false, + + canEdit: function() { + let role = this.get('session.currentUser.role'); + let id = this.get('session.currentUser.id'); + let author = this.get('species.createdBy'); + return (role === 'W' && (+id === author)) || (role === 'A'); + }.property('session.currentUser.role', 'session.currentUser.id', 'species.createdBy'), + actions: { save: function() { this.sendAction('save'); diff --git a/app/pods/components/species-details/template.hbs b/app/pods/components/species-details/template.hbs index ee6d571..d868809 100644 --- a/app/pods/components/species-details/template.hbs +++ b/app/pods/components/species-details/template.hbs @@ -21,16 +21,9 @@ {{strain.strainName}} {{/link-to}} {{/each}} - {{#if (can "edit species" species)}} - {{#if species.isNew}} - PENDING SAVE - {{else}} -
- {{#link-to 'strains.new' class="button-gray smaller"}} - Add Strain - {{/link-to}} - {{/if}} - {{/if}} + {{#unless species.isNew}} + {{add-button label="Add Strain" link="strains.new"}} + {{/unless}}
@@ -78,10 +71,9 @@ {{! ROW 4 }} - {{#if (can "edit species" species)}} + {{#if canEdit}}
- {{! Does nothing ATM }} {{#if isEditing}}Cancel{{else}}Edit{{/if}} diff --git a/app/pods/components/strain-details/component.js b/app/pods/components/strain-details/component.js index 58afb31..87949ee 100644 --- a/app/pods/components/strain-details/component.js +++ b/app/pods/components/strain-details/component.js @@ -3,6 +3,14 @@ import Ember from 'ember'; export default Ember.Component.extend({ classNames: ['grid-1'], isEditing: false, + + canEdit: function() { + let role = this.get('session.currentUser.role'); + let id = this.get('session.currentUser.id'); + let author = this.get('strain.createdBy'); + return (role === 'W' && (+id === author)) || (role === 'A'); + }.property('session.currentUser.role', 'session.currentUser.id', 'strain.createdBy'), + actions: { save: function() { this.sendAction('save'); diff --git a/app/pods/components/strain-details/template.hbs b/app/pods/components/strain-details/template.hbs index bb9e2b8..8e1ef22 100644 --- a/app/pods/components/strain-details/template.hbs +++ b/app/pods/components/strain-details/template.hbs @@ -116,7 +116,7 @@
{{! ROW 6 }} - {{#if (can "edit strain" strain)}} + {{#if canEdit}}
{{! Does nothing ATM }} diff --git a/app/pods/species/index/template.hbs b/app/pods/species/index/template.hbs index 21ce1cc..6401737 100644 --- a/app/pods/species/index/template.hbs +++ b/app/pods/species/index/template.hbs @@ -1,11 +1,6 @@

{{genus-name}} Species

Total species: {{controller.length}}

-{{#if (can "add species")}} - {{! Does nothing ATM }} - {{#link-to 'species.new' class="button-gray smaller"}} - Add Species - {{/link-to}} -{{/if}} +{{add-button label="Add Species" link="species.new"}} {{sortable-table content=model tableAttrs=tableAttrs row=row}} diff --git a/app/pods/strains/index/template.hbs b/app/pods/strains/index/template.hbs index edb1048..68a1c5a 100644 --- a/app/pods/strains/index/template.hbs +++ b/app/pods/strains/index/template.hbs @@ -1,11 +1,6 @@

{{genus-name}} Strains

Total strains: {{model.length}}

-{{#if (can "add strain")}} - {{! Does nothing ATM }} - {{#link-to 'strains.new' class="button-gray smaller"}} - Add Strain - {{/link-to}} -{{/if}} +{{add-button label="Add Strain" link="strains.new"}} {{sortable-table content=model tableAttrs=tableAttrs row=row}} diff --git a/config/environment.js b/config/environment.js index 4713ad1..30f711b 100644 --- a/config/environment.js +++ b/config/environment.js @@ -43,11 +43,6 @@ module.exports = function(environment) { refreshLeeway: 300, timeFactor: 1 } - ENV['ember-can'] = { - inject: { - session: 'simple-auth-session:main' - } - } ENV.apiURL = 'http://127.0.0.1:4200'; ENV.contentSecurityPolicy = { 'default-src': "'none'", @@ -78,11 +73,6 @@ module.exports = function(environment) { refreshLeeway: 300, timeFactor: 1 } - ENV['ember-can'] = { - inject: { - session: 'simple-auth-session:main' - } - } ENV.apiURL = 'https://bactdb-test.herokuapp.com'; ENV.contentSecurityPolicy = { 'default-src': "'none'", @@ -117,11 +107,6 @@ module.exports = function(environment) { refreshLeeway: 300, timeFactor: 1 } - ENV['ember-can'] = { - inject: { - session: 'simple-auth-session:main' - } - } ENV.apiURL = 'https://bactdb.herokuapp.com'; ENV.contentSecurityPolicy = { 'default-src': "'none'", diff --git a/package.json b/package.json index 2a3d925..05da04e 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "body-parser": "^1.12.2", "broccoli-asset-rev": "^2.0.2", "connect-restreamer": "^1.0.2", - "ember-can": "^0.4.0", "ember-cli": "0.2.3", "ember-cli-app-version": "0.3.3", "ember-cli-babel": "^5.0.0", diff --git a/tests/unit/pods/components/add-button/component-test.js b/tests/unit/pods/components/add-button/component-test.js new file mode 100644 index 0000000..2cfd8fc --- /dev/null +++ b/tests/unit/pods/components/add-button/component-test.js @@ -0,0 +1,21 @@ +import { + moduleForComponent, + test +} from 'ember-qunit'; + +moduleForComponent('add-button', { + // Specify the other units that are required for this test + // needs: ['component:foo', 'helper:bar'] +}); + +test('it renders', function(assert) { + assert.expect(2); + + // Creates the component instance + var component = this.subject(); + assert.equal(component._state, 'preRender'); + + // Renders the component to the page + this.render(); + assert.equal(component._state, 'inDOM'); +});