From 75aa52a650942d9713522d7f2e2abafa3cb95a3e Mon Sep 17 00:00:00 2001
From: Caleb <inchristalway-tech4him@yahoo.com>
Date: Sat, 2 Sep 2017 19:24:37 -0600
Subject: [PATCH 1/3] Disable Save button when entry has not been changed.

---
 src/components/EntryEditor/EntryEditor.js        | 3 +++
 src/components/EntryEditor/EntryEditorToolbar.js | 4 +++-
 src/containers/EntryPage.js                      | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/EntryEditor/EntryEditor.js b/src/components/EntryEditor/EntryEditor.js
index 5413d12d..b0ceacf4 100644
--- a/src/components/EntryEditor/EntryEditor.js
+++ b/src/components/EntryEditor/EntryEditor.js
@@ -47,6 +47,7 @@ class EntryEditor extends Component {
         fieldsErrors,
         getAsset,
         onChange,
+        hasChanged,
         showDelete,
         onDelete,
         onValidate,
@@ -131,6 +132,7 @@ class EntryEditor extends Component {
             onCancelEdit={onCancelEdit}
             onDelete={onDelete}
             showDelete={showDelete}
+            hasChanged={hasChanged}
           />
         </div>
       </div>
@@ -149,6 +151,7 @@ EntryEditor.propTypes = {
   onChange: PropTypes.func.isRequired,
   onValidate: PropTypes.func.isRequired,
   onPersist: PropTypes.func.isRequired,
+  hasChanged: PropTypes.bool.isRequired,
   showDelete: PropTypes.bool.isRequired,
   onDelete: PropTypes.func.isRequired,
   onRemoveAsset: PropTypes.func.isRequired,
diff --git a/src/components/EntryEditor/EntryEditorToolbar.js b/src/components/EntryEditor/EntryEditorToolbar.js
index da5847e9..204bad6e 100644
--- a/src/components/EntryEditor/EntryEditorToolbar.js
+++ b/src/components/EntryEditor/EntryEditorToolbar.js
@@ -5,11 +5,12 @@ const EntryEditorToolbar = (
   {
     isPersisting,
     onPersist,
+    hasChanged,
     showDelete,
     onDelete,
     onCancelEdit,
   }) => {
-  const disabled = isPersisting;
+  const disabled = !hasChanged || isPersisting;
   return (
     <div>
       <Button
@@ -37,6 +38,7 @@ const EntryEditorToolbar = (
 EntryEditorToolbar.propTypes = {
   isPersisting: PropTypes.bool,
   onPersist: PropTypes.func.isRequired,
+  hasChanged: PropTypes.bool.isRequired,
   showDelete: PropTypes.bool.isRequired,
   onDelete: PropTypes.func.isRequired,
   onCancelEdit: PropTypes.func.isRequired,
diff --git a/src/containers/EntryPage.js b/src/containers/EntryPage.js
index 7a85c08d..0977b377 100644
--- a/src/containers/EntryPage.js
+++ b/src/containers/EntryPage.js
@@ -151,6 +151,7 @@ class EntryPage extends React.Component {
         onPersist={this.handlePersistEntry}
         onDelete={this.handleDeleteEntry}
         showDelete={this.props.showDelete}
+        hasChanged={entryDraft.get('hasChanged')}
         onCancelEdit={this.handleCloseEntry}
       />
     );

From 87f942e73bc05aa7dc6c8e7247250d4bc8a73843 Mon Sep 17 00:00:00 2001
From: Caleb <inchristalway-tech4him@yahoo.com>
Date: Mon, 11 Sep 2017 14:08:07 -0600
Subject: [PATCH 2/3] Rename `hasChanged` to `enableSave` for the editor Save
 button.

---
 src/components/EntryEditor/EntryEditor.js        | 6 +++---
 src/components/EntryEditor/EntryEditorToolbar.js | 6 +++---
 src/containers/EntryPage.js                      | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/EntryEditor/EntryEditor.js b/src/components/EntryEditor/EntryEditor.js
index b0ceacf4..fdde5d90 100644
--- a/src/components/EntryEditor/EntryEditor.js
+++ b/src/components/EntryEditor/EntryEditor.js
@@ -47,7 +47,7 @@ class EntryEditor extends Component {
         fieldsErrors,
         getAsset,
         onChange,
-        hasChanged,
+        enableSave,
         showDelete,
         onDelete,
         onValidate,
@@ -132,7 +132,7 @@ class EntryEditor extends Component {
             onCancelEdit={onCancelEdit}
             onDelete={onDelete}
             showDelete={showDelete}
-            hasChanged={hasChanged}
+            enableSave={enableSave}
           />
         </div>
       </div>
@@ -151,7 +151,7 @@ EntryEditor.propTypes = {
   onChange: PropTypes.func.isRequired,
   onValidate: PropTypes.func.isRequired,
   onPersist: PropTypes.func.isRequired,
-  hasChanged: PropTypes.bool.isRequired,
+  enableSave: PropTypes.bool.isRequired,
   showDelete: PropTypes.bool.isRequired,
   onDelete: PropTypes.func.isRequired,
   onRemoveAsset: PropTypes.func.isRequired,
diff --git a/src/components/EntryEditor/EntryEditorToolbar.js b/src/components/EntryEditor/EntryEditorToolbar.js
index 204bad6e..022e78ac 100644
--- a/src/components/EntryEditor/EntryEditorToolbar.js
+++ b/src/components/EntryEditor/EntryEditorToolbar.js
@@ -5,12 +5,12 @@ const EntryEditorToolbar = (
   {
     isPersisting,
     onPersist,
-    hasChanged,
+    enableSave,
     showDelete,
     onDelete,
     onCancelEdit,
   }) => {
-  const disabled = !hasChanged || isPersisting;
+  const disabled = !enableSave || isPersisting;
   return (
     <div>
       <Button
@@ -38,7 +38,7 @@ const EntryEditorToolbar = (
 EntryEditorToolbar.propTypes = {
   isPersisting: PropTypes.bool,
   onPersist: PropTypes.func.isRequired,
-  hasChanged: PropTypes.bool.isRequired,
+  enableSave: PropTypes.bool.isRequired,
   showDelete: PropTypes.bool.isRequired,
   onDelete: PropTypes.func.isRequired,
   onCancelEdit: PropTypes.func.isRequired,
diff --git a/src/containers/EntryPage.js b/src/containers/EntryPage.js
index 0977b377..1238a513 100644
--- a/src/containers/EntryPage.js
+++ b/src/containers/EntryPage.js
@@ -151,7 +151,7 @@ class EntryPage extends React.Component {
         onPersist={this.handlePersistEntry}
         onDelete={this.handleDeleteEntry}
         showDelete={this.props.showDelete}
-        hasChanged={entryDraft.get('hasChanged')}
+        enableSave={entryDraft.get('hasChanged')}
         onCancelEdit={this.handleCloseEntry}
       />
     );

From 6e356e81da1343d371cdd94562709f15d0cb90a0 Mon Sep 17 00:00:00 2001
From: Caleb <inchristalway-tech4him@yahoo.com>
Date: Mon, 11 Sep 2017 14:25:23 -0600
Subject: [PATCH 3/3] Update tests for EntryEditorToolbar

---
 .../__tests__/EntryEditorToolbar.spec.js          | 15 ++++++++++++++-
 .../__snapshots__/EntryEditorToolbar.spec.js.snap |  4 +++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/components/EntryEditor/__tests__/EntryEditorToolbar.spec.js b/src/components/EntryEditor/__tests__/EntryEditorToolbar.spec.js
index 5da4eb64..c8e28d65 100644
--- a/src/components/EntryEditor/__tests__/EntryEditorToolbar.spec.js
+++ b/src/components/EntryEditor/__tests__/EntryEditorToolbar.spec.js
@@ -3,7 +3,7 @@ import { shallow } from 'enzyme';
 import EntryEditorToolbar from '../EntryEditorToolbar';
 
 describe('EntryEditorToolbar', () => {
-  it('should have both buttons enabled initially', () => {
+  it('should have the Save button disabled initally, and the Cancel button enabled', () => {
     const component = shallow(
       <EntryEditorToolbar
         onPersist={() => {}}
@@ -15,6 +15,19 @@ describe('EntryEditorToolbar', () => {
     expect(tree).toMatchSnapshot();
   });
 
+  it('should enable the Save button', () => {
+    const component = shallow(
+      <EntryEditorToolbar
+        enableSave
+        onPersist={() => {}}
+        onCancelEdit={() => {}}
+        onDelete={() => {}}
+      />
+    );
+    const tree = component.html();
+    expect(tree).toMatchSnapshot();
+  });
+
   it('should disable and update label of Save button when persisting', () => {
     const component = shallow(
       <EntryEditorToolbar
diff --git a/src/components/EntryEditor/__tests__/__snapshots__/EntryEditorToolbar.spec.js.snap b/src/components/EntryEditor/__tests__/__snapshots__/EntryEditorToolbar.spec.js.snap
index f51fe48a..74155fcc 100644
--- a/src/components/EntryEditor/__tests__/__snapshots__/EntryEditorToolbar.spec.js.snap
+++ b/src/components/EntryEditor/__tests__/__snapshots__/EntryEditorToolbar.spec.js.snap
@@ -2,4 +2,6 @@
 
 exports[`EntryEditorToolbar should disable and update label of Save button when persisting 1`] = `"<div><button disabled=\\"\\" class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Saving...</button> <button class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Cancel</button></div>"`;
 
-exports[`EntryEditorToolbar should have both buttons enabled initially 1`] = `"<div><button class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Save</button> <button class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Cancel</button></div>"`;
+exports[`EntryEditorToolbar should enable the Save button 1`] = `"<div><button class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Save</button> <button class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Cancel</button></div>"`;
+
+exports[`EntryEditorToolbar should have the Save button disabled initally, and the Cancel button enabled 1`] = `"<div><button disabled=\\"\\" class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Save</button> <button class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Cancel</button></div>"`;