{{
protected/strains/measurements-table
- strain=strain
+ measurements=strain.measurements
canEdit=false
canAdd=false
}}
diff --git a/app/pods/protected/strains/strain-form/component.js b/app/pods/protected/strains/strain-form/component.js
index ebb157c..f0fbab7 100644
--- a/app/pods/protected/strains/strain-form/component.js
+++ b/app/pods/protected/strains/strain-form/component.js
@@ -9,22 +9,22 @@ export default Component.extend(SetupMetaData, {
isNew: null,
isDirty: false,
speciesList: null,
- allCharacteristics: null,
+ allCharacteristics: [],
+ updateQueue: [],
+ deleteQueue: [],
// Actions
"on-save": null,
"on-cancel": null,
"on-update": null,
- "add-characteristic": null,
- "save-measurement": null,
- "delete-measurement": null,
+ "add-measurements": null,
// CPs
sortParams: ['sortOrder'],
sortedSpeciesList: sort('speciesList', 'sortParams'),
// Property mapping
- propertiesList: ['strainName', 'typeStrain', 'species', 'isolatedFrom', 'accessionNumbers', 'genbank', 'wholeGenomeSequence', 'notes'],
+ propertiesList: ['strainName', 'typeStrain', 'species', 'isolatedFrom', 'accessionNumbers', 'genbank', 'wholeGenomeSequence', 'notes', 'measurements'],
strainName: null,
typeStrain: null,
species: null,
@@ -33,15 +33,55 @@ export default Component.extend(SetupMetaData, {
genbank: null,
wholeGenomeSequence: null,
notes: null,
+ measurements: [],
+
+ // Dropdown menu
+ characteristics: [],
+ charSortParams: ['characteristicTypeName', 'sortOrder', 'characteristicName'],
+ sortedCharacteristics: sort('characteristics', 'charSortParams'),
+ setupCharacteristics: Ember.on('init', function() {
+ const tempArray = this._resetArray(this.get('allCharacteristics'));
+ this.set('characteristics', tempArray);
+ }),
resetOnInit: Ember.on('init', function() {
+ this._resetProperties();
+ }),
+
+ _resetArray: function(arr) {
+ let tempArray = [];
+ arr.forEach((val) => {
+ if (!val.get('isNew')) {
+ tempArray.push(val);
+ }
+ });
+ return tempArray;
+ },
+
+ _resetProperties: function() {
+ // Still some coupling going on here because of adding strain to measurement
+ this.get('measurements').forEach((val) => {
+ if (val.get('hasDirtyAttributes')) {
+ val.rollbackAttributes();
+ }
+ if (val.get('isNew')) {
+ this.get('strain.measurements').removeObject(val);
+ }
+ });
this.get('propertiesList').forEach((field) => {
const valueInStrain = this.get('strain').get(field);
- this.set(field, valueInStrain);
+ if (field === 'measurements') {
+ const tempArray = this._resetArray(valueInStrain);
+ this.set(field, tempArray);
+ } else {
+ this.set(field, valueInStrain);
+ }
});
+ this.set('updateQueue', []);
+ this.set('deleteQueue', []);
// Read-only attributes
this.set('isNew', this.get('strain.isNew'));
- }),
+ },
updateField: function(property, value) {
this.set(property, value);
@@ -55,23 +95,32 @@ export default Component.extend(SetupMetaData, {
actions: {
save: function() {
- return this.attrs['on-save'](this.getProperties(this.get('propertiesList')));
+ return this.attrs['on-save'](this.getProperties(this.get('propertiesList')), this.get('deleteQueue'), this.get('updateQueue'));
},
cancel: function() {
+ this._resetProperties();
return this.attrs['on-cancel']();
},
- addCharacteristic: function() {
- return this.attrs['add-characteristic']();
+ addMeasurement: function() {
+ const measurement = this.attrs['add-measurement']();
+ this.get('measurements').pushObject(measurement);
},
saveMeasurement: function(measurement, properties) {
- return this.attrs['save-measurement'](measurement, properties);
+ measurement.setProperties(properties);
+ measurement.set('strain', this.get('strain'));
+ if (!measurement.get('isNew')) {
+ this.get('updateQueue').pushObject(measurement);
+ }
+ this.set('isDirty', true);
},
deleteMeasurement: function(measurement) {
- return this.attrs['delete-measurement'](measurement);
+ this.get('deleteQueue').pushObject(measurement);
+ this.get('measurements').removeObject(measurement);
+ this.set('isDirty', true);
},
strainNameDidChange: function(value) {
diff --git a/app/pods/protected/strains/strain-form/template.hbs b/app/pods/protected/strains/strain-form/template.hbs
index e44096f..99b729c 100644
--- a/app/pods/protected/strains/strain-form/template.hbs
+++ b/app/pods/protected/strains/strain-form/template.hbs
@@ -61,9 +61,9 @@
{{
protected/strains/measurements-table
- strain=strain
- add-characteristic=(action "addCharacteristic")
- allCharacteristics=allCharacteristics
+ measurements=measurements
+ add-measurement=(action "addMeasurement")
+ allCharacteristics=sortedCharacteristics
save-measurement=(action "saveMeasurement")
delete-measurement=(action "deleteMeasurement")
canEdit=strain.canEdit
diff --git a/app/pods/protected/users/changepassword/controller.js b/app/pods/protected/users/changepassword/controller.js
index 638961f..ddfd685 100644
--- a/app/pods/protected/users/changepassword/controller.js
+++ b/app/pods/protected/users/changepassword/controller.js
@@ -1,11 +1,11 @@
import Ember from 'ember';
-import ajaxErrorNew from '../../../../utils/ajax-error-new';
const { Controller, inject: { service } } = Ember;
export default Controller.extend({
session: service(),
ajax: service(),
+ ajaxError: service('ajax-error'),
currentUser: service('session-account'),
actions: {
@@ -15,12 +15,13 @@ export default Controller.extend({
this.get('ajax').post('/users/password', { data: data }).then(() => {
this.transitionToRoute('protected.users.show', id);
this.get('flashMessages').information('Your password has been changed.');
- }, (error) => {
- ajaxErrorNew(error, this.get('flashMessages'));
+ }, (errors) => {
+ this.get('ajaxError').alert(errors);
});
},
cancel: function() {
+ this.get('flashMessages').clearMessages();
this.transitionToRoute('protected.users.show', this.get('currentUser.account.id'));
},
},
diff --git a/app/serializers/application.js b/app/serializers/application.js
index d40a2bf..4a316f0 100644
--- a/app/serializers/application.js
+++ b/app/serializers/application.js
@@ -5,24 +5,41 @@ const { RESTSerializer } = DS;
const { isNone } = Ember;
export default RESTSerializer.extend({
- isNewSerializerAPI: true,
-
serializeBelongsTo: function(snapshot, json, relationship) {
- let key = relationship.key;
- const belongsTo = snapshot.belongsTo(key);
- key = this.keyForRelationship ? this.keyForRelationship(key, "belongsTo", "serialize") : key;
- json[key] = isNone(belongsTo) ? belongsTo : +belongsTo.record.id;
+ const key = relationship.key;
+ if (this._canSerialize(key)) {
+ const belongsToId = snapshot.belongsTo(key, { id: true });
+ let payloadKey = this._getMappedKey(key, snapshot.type);
+ if (payloadKey === key && this.keyForRelationship) {
+ payloadKey = this.keyForRelationship(key, "belongsTo", "serialize");
+ }
+ if (isNone(belongsToId)) {
+ json[payloadKey] = null;
+ } else {
+ json[payloadKey] = +belongsToId;
+ }
+
+ if (relationship.options.polymorphic) {
+ this.serializePolymorphicType(snapshot, json, relationship);
+ }
+ }
},
serializeHasMany: function(snapshot, json, relationship) {
- let key = relationship.key;
- const hasMany = snapshot.hasMany(key);
- key = this.keyForRelationship ? this.keyForRelationship(key, "hasMany", "serialize") : key;
-
- json[key] = [];
- hasMany.forEach((item) => {
- json[key].push(+item.id);
- });
+ const key = relationship.key;
+ if (this._shouldSerializeHasMany(snapshot, key, relationship)) {
+ const hasMany = snapshot.hasMany(key, { ids: true });
+ if (hasMany !== undefined) {
+ let payloadKey = this._getMappedKey(key, snapshot.type);
+ if (payloadKey === key && this.keyForRelationship) {
+ payloadKey = this.keyForRelationship(key, "hasMany", "serialize");
+ }
+ json[payloadKey] = [];
+ hasMany.forEach((item) => {
+ json[payloadKey].push(+item);
+ });
+ }
+ }
},
});
diff --git a/app/services/ajax-error.js b/app/services/ajax-error.js
new file mode 100644
index 0000000..6cfd29a
--- /dev/null
+++ b/app/services/ajax-error.js
@@ -0,0 +1,19 @@
+import Ember from 'ember';
+
+const { Service, inject: { service } } = Ember;
+
+export default Service.extend({
+ flashMessages: service(),
+
+ alert: function(error) {
+ const flash = this.get('flashMessages');
+
+ flash.clearMessages();
+ window.scrollTo(0,0);
+ error.errors.forEach((error) => {
+ console.error(error);
+ const source = error.source.pointer.split('/');
+ flash.error(`${source[source.length-1].replace(/([A-Z])/g, ' $1').capitalize()} - ${error.detail}`);
+ });
+ }
+});
diff --git a/app/utils/ajax-error-new.js b/app/utils/ajax-error-new.js
deleted file mode 100644
index 37031f2..0000000
--- a/app/utils/ajax-error-new.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function ajaxErrorNew(error, flash) {
- flash.clearMessages();
- error.errors.forEach((error) => {
- const source = error.source.pointer.split('/');
- flash.error(`${source[source.length-1].replace(/([A-Z])/g, ' $1').capitalize()} - ${error.detail}`);
- });
-}