fix: ensure draft changes

decaporg · Feb 23, 2020 · c185bf7 · c185bf7
1 parent 14d5a65
commit c185bf7
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/packages/netlify-cms-core/src/actions/entries.ts b/packages/netlify-cms-core/src/actions/entries.ts
@@ -219,10 +219,16 @@ export function discardDraft() {
   return { type: DRAFT_DISCARD };
 }
 
-export function changeDraftField(field: string, value: string, metadata: Record<string, unknown>) {
+export function changeDraftField(
+  field: string,
+  value: string,
+  metadata: Record<string, unknown>,
+  publishedEntry: EntryMap,
+  unpublishedEntry: EntryMap,
+) {
   return {
     type: DRAFT_CHANGE_FIELD,
-    payload: { field, value, metadata },
+    payload: { field, value, metadata, publishedEntry, unpublishedEntry },
   };
 }
 

diff --git a/packages/netlify-cms-core/src/components/Editor/Editor.js b/packages/netlify-cms-core/src/components/Editor/Editor.js
@@ -227,6 +227,12 @@ export class Editor extends React.Component {
     if (entry) this.props.createDraftFromEntry(entry, metadata);
   };
 
+  handleChangeDraftField = (field, value, metadata) => {
+    const publishedEntry = this.props.publishedEntry;
+    const unPublishedEntry = this.props.unPublishedEntry;
+    this.props.changeDraftField(field, value, metadata, publishedEntry, unPublishedEntry);
+  };
+
   handleChangeStatus = newStatusName => {
     const {
       entryDraft,
@@ -378,7 +384,6 @@ export class Editor extends React.Component {
       entryDraft,
       fields,
       collection,
-      changeDraftField,
       changeDraftFieldValidation,
       user,
       hasChanged,
@@ -421,7 +426,7 @@ export class Editor extends React.Component {
         fields={fields}
         fieldsMetaData={entryDraft.get('fieldsMetaData')}
         fieldsErrors={entryDraft.get('fieldsErrors')}
-        onChange={changeDraftField}
+        onChange={this.handleChangeDraftField}
         onValidate={changeDraftFieldValidation}
         onPersist={this.handlePersistEntry}
         onDelete={this.handleDeleteEntry}
@@ -463,8 +468,9 @@ function mapStateToProps(state, ownProps) {
   const useOpenAuthoring = globalUI.get('useOpenAuthoring', false);
   const isModification = entryDraft.getIn(['entry', 'isModification']);
   const collectionEntriesLoaded = !!entries.getIn(['pages', collectionName]);
-  const unpublishedEntry = selectUnpublishedEntry(state, collectionName, slug);
-  const currentStatus = unpublishedEntry && unpublishedEntry.getIn(['metaData', 'status']);
+  const unPublishedEntry = selectUnpublishedEntry(state, collectionName, slug);
+  const publishedEntry = selectEntry(state, collectionName, slug);
+  const currentStatus = unPublishedEntry && unPublishedEntry.getIn(['metaData', 'status']);
   const deployPreview = selectDeployPreview(state, collectionName, slug);
   const localBackup = entryDraft.get('localBackup');
   const draftKey = entryDraft.get('key');
@@ -488,6 +494,8 @@ function mapStateToProps(state, ownProps) {
     deployPreview,
     localBackup,
     draftKey,
+    publishedEntry,
+    unPublishedEntry,
   };
 }
 

diff --git a/packages/netlify-cms-core/src/formats/frontmatter.js b/packages/netlify-cms-core/src/formats/frontmatter.js
@@ -72,7 +72,7 @@ class FrontmatterFormatter {
     const result = matter(content, { engines: parsers, ...format });
     return {
       ...result.data,
-      body: result.content,
+      ...(result.content.trim() && { body: result.content }),
     };
   }
 

diff --git a/packages/netlify-cms-core/src/reducers/entryDraft.js b/packages/netlify-cms-core/src/reducers/entryDraft.js
@@ -88,13 +88,22 @@ const entryDraftReducer = (state = Map(), action) => {
       });
       return state.set('localBackup', newState);
     }
-    case DRAFT_CHANGE_FIELD:
-      return state.withMutations(state => {
+    case DRAFT_CHANGE_FIELD: {
+      const publishedEntry = action.payload.publishedEntry || Map();
+      const unpublishedEntry = action.payload.unpublishedEntry || Map();
+      let newState = state.withMutations(state => {
         state.setIn(['entry', 'data', action.payload.field], action.payload.value);
         state.mergeDeepIn(['fieldsMetaData'], fromJS(action.payload.metadata));
         state.set('hasChanged', true);
       });
+      const newStateData = newState.getIn(['entry', 'data']);
+
+      (newStateData.equals(unpublishedEntry.get('data')) ||
+        newStateData.equals(publishedEntry.get('data'))) &&
+        (newState = newState.set('hasChanged', false));
 
+      return newState;
+    }
     case DRAFT_VALIDATION_ERRORS:
       if (action.payload.errors.length === 0) {
         return state.deleteIn(['fieldsErrors', action.payload.uniquefieldId]);