From dfe2c9cd7416abb4bb653d5a0fb712ca4f072dfe Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 16 Nov 2015 09:37:31 -0700 Subject: [PATCH 1/4] Lint --- app/models/species.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/species.js b/app/models/species.js index 6e4ac05..362462b 100644 --- a/app/models/species.js +++ b/app/models/species.js @@ -1,6 +1,5 @@ import DS from 'ember-data'; import config from '../config/environment'; -import Ember from 'ember'; const { Model, attr, hasMany } = DS; From 5ba3b125e8f6c686ac3c81026d2dd002270a244b Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 16 Nov 2015 10:32:49 -0700 Subject: [PATCH 2/4] Clean up delete button and tests Fixes #59 --- app/mirage/config.js | 3 +++ .../components/delete-button/component.js | 21 ++++++++++++------ .../components/delete-button/template.hbs | 15 +++++++++---- tests/acceptance/characteristics-test.js | 21 +++++++++++++++++- tests/acceptance/species-test.js | 21 +++++++++++++++++- tests/acceptance/strains-test.js | 22 ++++++++++++++++++- tests/acceptance/users-test.js | 2 +- 7 files changed, 90 insertions(+), 15 deletions(-) diff --git a/app/mirage/config.js b/app/mirage/config.js index 935eb17..418da09 100644 --- a/app/mirage/config.js +++ b/app/mirage/config.js @@ -19,11 +19,13 @@ export function testConfig() { this.post('/species'); this.get('/species/:id'); this.put('/species/:id'); + this.delete('/species/:id'); this.get('/characteristics'); this.post('/characteristics'); this.get('/characteristics/:id'); this.put('/characteristics/:id'); + this.delete('/characteristics/:id'); this.get('/strains', function(db /*, request*/) { return { @@ -39,4 +41,5 @@ export function testConfig() { }; }); this.put('/strains/:id'); + this.delete('/strains/:id'); } diff --git a/app/pods/components/delete-button/component.js b/app/pods/components/delete-button/component.js index 1cd364a..77fc1d0 100644 --- a/app/pods/components/delete-button/component.js +++ b/app/pods/components/delete-button/component.js @@ -1,16 +1,23 @@ import Ember from 'ember'; -export default Ember.Component.extend({ - tagName: 'button', - classNames: ["button-red", "smaller", "delete"], +const { Component } = Ember; + +export default Component.extend({ + tagName: 'span', showConfirmDelete: false, - click: function() { - if (!this.get('showConfirmDelete')) { + actions: { + initialClick: function() { this.set('showConfirmDelete', true); - } else { + }, + + cancelDelete: function() { + this.set('showConfirmDelete', false); + }, + + confirmDelete: function() { this.attrs.delete(); - } + }, }, }); diff --git a/app/pods/components/delete-button/template.hbs b/app/pods/components/delete-button/template.hbs index de6c612..0fd90d7 100644 --- a/app/pods/components/delete-button/template.hbs +++ b/app/pods/components/delete-button/template.hbs @@ -1,5 +1,12 @@ -{{#if showConfirmDelete}} - Are you sure? +{{#unless showConfirmDelete}} + {{else}} - Delete -{{/if}} + + +{{/unless}} diff --git a/tests/acceptance/characteristics-test.js b/tests/acceptance/characteristics-test.js index ad62807..b8a2edd 100644 --- a/tests/acceptance/characteristics-test.js +++ b/tests/acceptance/characteristics-test.js @@ -6,10 +6,10 @@ import { authenticateSession } from '../helpers/ember-simple-auth'; module('Acceptance | characteristics', { beforeEach: function() { this.application = startApp(); + server.create('users', { role: 'A', canEdit: true, sub: 1 }); authenticateSession(this.application, { access_token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWN0ZGIiLCJzdWIiOiIxIiwiZXhwIjoxNDQ2NTAyMjI2LCJpYXQiOjE0NDY0OTg2MjZ9.vIjKHAsp2TkCV505EbtCo2xQT-2oQkB-Nv5y0b6E7Mg" }); - server.create('users', { role: 'A', canEdit: true }); }, afterEach: function() { @@ -70,3 +70,22 @@ test('creating /characteristics/new', function(assert) { }); }); }); + +test('deleting /characteristics/:id', function(assert) { + const characteristic = server.create('characteristics', { 'canEdit': true }); + visit(`/characteristics/${characteristic.id}`); + + andThen(function() { + assert.equal(currentURL(), `/characteristics/${characteristic.id}`); + click('button.delete'); + + andThen(function() { + click('button.delete-confirm'); + + andThen(function() { + assert.equal(currentURL(), `/characteristics`); + assert.equal(server.db.characteristics.length, 0); + }); + }); + }); +}); diff --git a/tests/acceptance/species-test.js b/tests/acceptance/species-test.js index 1b4fe85..a137276 100644 --- a/tests/acceptance/species-test.js +++ b/tests/acceptance/species-test.js @@ -6,10 +6,10 @@ import { authenticateSession } from '../helpers/ember-simple-auth'; module('Acceptance | species', { beforeEach: function() { this.application = startApp(); + server.create('users', { role: 'A', canEdit: true, sub: 1 }); authenticateSession(this.application, { access_token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWN0ZGIiLCJzdWIiOiIxIiwiZXhwIjoxNDQ2NTAyMjI2LCJpYXQiOjE0NDY0OTg2MjZ9.vIjKHAsp2TkCV505EbtCo2xQT-2oQkB-Nv5y0b6E7Mg" }); - server.create('users', { role: 'A', canEdit: true }); }, afterEach: function() { @@ -69,3 +69,22 @@ test('creating /species/new', function(assert) { }); }); }); + +test('deleting /species/:id', function(assert) { + const species = server.create('species', { 'canEdit': true }); + visit(`/species/${species.id}`); + + andThen(function() { + assert.equal(currentURL(), `/species/${species.id}`); + click('button.delete'); + + andThen(function() { + click('button.delete-confirm'); + + andThen(function() { + assert.equal(currentURL(), `/species`); + assert.equal(server.db.species.length, 0); + }); + }); + }); +}); diff --git a/tests/acceptance/strains-test.js b/tests/acceptance/strains-test.js index a52e7ed..405960a 100644 --- a/tests/acceptance/strains-test.js +++ b/tests/acceptance/strains-test.js @@ -6,10 +6,10 @@ import { authenticateSession } from '../helpers/ember-simple-auth'; module('Acceptance | strains', { beforeEach: function() { this.application = startApp(); + server.create('users', { role: 'A', canEdit: true, sub: 1 }); authenticateSession(this.application, { access_token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWN0ZGIiLCJzdWIiOiIxIiwiZXhwIjoxNDQ2NTAyMjI2LCJpYXQiOjE0NDY0OTg2MjZ9.vIjKHAsp2TkCV505EbtCo2xQT-2oQkB-Nv5y0b6E7Mg" }); - server.create('users', { role: 'A', canEdit: true }); }, afterEach: function() { @@ -74,3 +74,23 @@ test('creating /strains/new', function(assert) { }); }); }); + +test('deleting /strains/:id', function(assert) { + const species = server.create('species'); + const strain = server.create('strains', { canEdit: true , species: species.id }); + visit(`/strains/${strain.id}`); + + andThen(function() { + assert.equal(currentURL(), `/strains/${strain.id}`); + click('button.delete'); + + andThen(function() { + click('button.delete-confirm'); + + andThen(function() { + assert.equal(currentURL(), `/strains`); + assert.equal(server.db.strains.length, 0); + }); + }); + }); +}); diff --git a/tests/acceptance/users-test.js b/tests/acceptance/users-test.js index ed08d72..2fe4d4d 100644 --- a/tests/acceptance/users-test.js +++ b/tests/acceptance/users-test.js @@ -6,10 +6,10 @@ import { invalidateSession, authenticateSession } from '../helpers/ember-simple- module('Acceptance | users', { beforeEach: function() { this.application = startApp(); + server.create('users', { role: 'A', canEdit: true, sub: 1 }); authenticateSession(this.application, { access_token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWN0ZGIiLCJzdWIiOiIxIiwiZXhwIjoxNDQ2NTAyMjI2LCJpYXQiOjE0NDY0OTg2MjZ9.vIjKHAsp2TkCV505EbtCo2xQT-2oQkB-Nv5y0b6E7Mg" }); - server.create('users', { role: 'A', canEdit: true }); }, afterEach: function() { From 7673b225f8671f96b4ecdf641a7a261c1bf8fef6 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 16 Nov 2015 10:49:46 -0700 Subject: [PATCH 3/4] Strains form formatting Gridforms doesn't play well with textarea, so just split rows for now. Fixes #60. --- app/pods/protected/strains/strain-form/template.hbs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/pods/protected/strains/strain-form/template.hbs b/app/pods/protected/strains/strain-form/template.hbs index dabfd7c..6bbfb42 100644 --- a/app/pods/protected/strains/strain-form/template.hbs +++ b/app/pods/protected/strains/strain-form/template.hbs @@ -30,7 +30,7 @@ {{text-editor value=isolatedFrom update=(action "isolatedFromDidChange")}} -
+
{{one-way-input type="text" class="accession-numbers" value=accessionNumbers update=(action "accessionNumbersNameDidChange")}} @@ -39,6 +39,8 @@ {{one-way-input type="text" class="genbank" value=genbank update=(action "genbankDidChange")}}
+
+
{{one-way-input type="text" class="whole-genome-sequenc" value=wholeGenomeSequence update=(action "wholeGenomeSequenceDidChange")}} From 7d05740901069ab7b5ab6f78aef86e7f20d9281f Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 16 Nov 2015 10:53:28 -0700 Subject: [PATCH 4/4] Inline images in CSP --- config/environment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environment.js b/config/environment.js index f163a3d..5ec51ce 100644 --- a/config/environment.js +++ b/config/environment.js @@ -29,7 +29,7 @@ module.exports = function(environment) { 'script-src': "'self'", 'font-src': "'self'", 'connect-src': "'self'", - 'img-src': "'self'", + 'img-src': "'self' data:", 'style-src': "'self' 'unsafe-inline'", 'media-src': "'self'" }