Merge pull request #211 from ninjaconcept/211-confirm-unsaved-elements

Add isEdited property for all element models

app/api/chemotion/reaction_api.rb

@@ -109,6 +109,7 @@ module Chemotion
 
           if reaction = Reaction.find(id)
             reaction.update_attributes(attributes)
+            reaction.touch
             ReactionUpdator.update_materials_for_reaction(reaction, materials)
             reaction.reload
             reaction

app/assets/javascripts/components/ReactionDetails.js

@@ -81,7 +81,7 @@ export default class ReactionDetails extends Component {
     };
     const submitLabel = (reaction && reaction.isNew) ? "Create" : "Save";
     return (
-        <Panel header="Reaction Details" bsStyle='primary'>
+        <Panel header="Reaction Details" bsStyle={reaction.isEdited ? 'info' : 'primary'}>
           <Row>
             <Col md={3}>
               <h3>{reaction.name}</h3>

app/assets/javascripts/components/SampleDetails.js

@@ -178,7 +178,7 @@ export default class SampleDetails extends React.Component {
   handleTopSecretChanged(e) {
     let sample = this.state.sample;
     let checkedState = this.refs.topSecretInput.props.checked;
-    
+
     sample.is_top_secret = !checkedState;
     this.setState({
       sample: sample
@@ -513,7 +513,7 @@ export default class SampleDetails extends React.Component {
           onCancel={this.handleStructureEditorCancel.bind(this)}
           molfile={molfile}
           />
-        <Panel header="Sample Details" bsStyle='primary'>
+        <Panel header="Sample Details" bsStyle={sample.isEdited ? 'info' : 'primary'}>
           {this.sampleHeader(sample)}
 
           <ListGroup fill>

app/assets/javascripts/components/ScreenDetails.js

@@ -90,7 +90,7 @@ export default class ScreenDetails extends Component {
     const submitLabel = (id == '_new_') ? "Create" : "Save";
     return (
       <div key={screen.id}>
-        <Panel header="Screen Details" bsStyle='primary'>
+        <Panel header="Screen Details" bsStyle={screen.isEdited ? 'info' : 'primary'}>
           <h3>{name}</h3>
           <ElementCollectionLabels element={screen}/>
           <ListGroup fill>

app/assets/javascripts/components/WellplateDetails.js

@@ -81,7 +81,7 @@ export default class WellplateDetails extends Component {
 
     return (
       <div key={wellplate.id}>
-        <Panel header="Wellplate Details" bsStyle='primary'>
+        <Panel header="Wellplate Details" bsStyle={wellplate.isEdited ? 'info' : 'primary'} >
           <h3>{name}</h3>
           <ElementCollectionLabels element={wellplate}/>
           <ListGroup fill>

app/assets/javascripts/components/models/Element.js

+import sha256 from 'sha256';
+import _ from 'lodash';
+
+export default class Element {
+
+  constructor(args) {
+    Object.assign(this, args);
+    this._checksum = this.checksum();
+  }
+
+  get isEdited() {
+    return this._checksum != this.checksum();
+  }
+
+  checksum() {
+    return sha256(JSON.stringify(_.omit(_.omit(this, '_checksum'), _.isEmpty)));
+  }
+
+  get isNew() {
+    return this.id == '_new_'
+  }
+
+}

app/assets/javascripts/components/models/Molecule.js

-export default class Molecule {
+import Element from './Element';
 
-  constructor(args) {
-    Object.assign(this, args);
-  }
+export default class Molecule extends Element {
 
   get svgPath() {
     return this.molecule_svg_file && `/images/molecules/${this.molecule_svg_file}`

app/assets/javascripts/components/models/Reaction.js

-import Sample from '../models/Sample';
+import Element from './Element';
+import Sample from './Sample';
 
-export default class Reaction {
-
-  constructor(args) {
-    Object.assign(this, args);
-  }
+export default class Reaction extends Element {
 
   static buildEmpty() {
     return new Reaction({
@@ -29,10 +26,6 @@ export default class Reaction {
     })
   }
 
-  get isNew() {
-    return this.id == '_new_'
-  }
-
   get temperature() {
     return this._temperature
   }

app/assets/javascripts/components/models/Sample.js

 import uuid from 'uuid';
 
+import Element from './Element';
 import Molecule from './Molecule';
 
-export default class Sample {
-
-  constructor(args) {
-    Object.assign(this, args);
-  }
+export default class Sample extends Element {
 
   // methods regarding sharing and sample detail levels
   isRestricted() {
@@ -14,7 +11,7 @@ export default class Sample {
   }
 
   get isNew() {
-    return this.id == '_new_' || this._split
+    return super.isNew || this._split
   }
 
   static buildChild(sample) {

app/assets/javascripts/components/models/Screen.js

+import Element from './Element';
 import Wellplate from './Wellplate';
 
-export default class Screen {
-
-  constructor(args) {
-    Object.assign(this, args);
-  }
+export default class Screen extends Element {
 
   static buildEmpty() {
     return new Screen({

app/assets/javascripts/components/models/Well.js

-export default class Well {
+import Element from './Element';
 
-  constructor(args) {
-    Object.assign(this, args);
-  }
+export default class Well extends Element {
 
 }

app/assets/javascripts/components/models/Wellplate.js

+import Element from './Element';
 import Well from './Well';
 
-export default class Wellplate {
+export default class Wellplate extends Element {
 
   constructor(args) {
-    Object.assign(this, args);
+    super(args)
     this.wells = this.initWellsWithPosition(this.wells, 96);
+    this._checksum = this.checksum();
   }
 
   static buildEmpty() {

package.json

@@ -22,6 +22,7 @@
     "react-select": "0.6.1",
     "react-tools": "0.13.3",
     "react-ui-tree": "2.2.1",
+    "sha256": "^0.2.0",
     "uuid": "^2.0.1",
     "whatwg-fetch": "0.9.0"
   },