gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #290 from Benaiah/confirm-navigation-while-changes-unsaved

Browse Source 
Set correct `hasChanged` and set it on all entry persistence actions
This commit is contained in:
Shawn Erquhart 2017-03-16 16:10:04 -04:00 committed by GitHub
commit 2faeb1af4f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/actions/editorialWorkflow.js
View File

@ -241,8 +241,8 @@ export function persistUnpublishedEntry(collection, existingUnpublishedEntry) {
kind: 'success',
dismissAfter: 4000,
}));
dispatch(closeEntry());
dispatch(unpublishedEntryPersisted(collection, entry, transactionID));
dispatch(closeEntry());
})
.catch((error) => {
dispatch(notifSend({

2
src/actions/entries.js
View File

@ -243,8 +243,8 @@ export function persistEntry(collection) {
kind: 'success',
dismissAfter: 4000,
}));
dispatch(closeEntry(collection));
dispatch(entryPersisted(collection, entry));
dispatch(closeEntry(collection));
})
.catch((error) => {
dispatch(notifSend({

6
src/reducers/entryDraft.js
View File

@ -37,6 +37,7 @@ const entryDraftReducer = (state = Map(), action) => {
state.set('mediaFiles', List());
state.set('fieldsMetaData', Map());
state.set('fieldsErrors', Map());
state.set('hasChanged', false);
});
case DRAFT_CREATE_EMPTY:
// New Entry
@ -46,6 +47,7 @@ const entryDraftReducer = (state = Map(), action) => {
state.set('mediaFiles', List());
state.set('fieldsMetaData', Map());
state.set('fieldsErrors', Map());
state.set('hasChanged', false);
});
case DRAFT_DISCARD:
return initialState;
@ -68,16 +70,16 @@ const entryDraftReducer = (state = Map(), action) => {
return state.setIn(['entry', 'isPersisting'], true);
}
case ENTRY_PERSIST_SUCCESS:
case ENTRY_PERSIST_FAILURE:
case UNPUBLISHED_ENTRY_PERSIST_FAILURE: {
return state.deleteIn(['entry', 'isPersisting']);
}
case ENTRY_PERSIST_SUCCESS:
case UNPUBLISHED_ENTRY_PERSIST_SUCCESS:
return state.withMutations((state) => {
state.deleteIn(['entry', 'isPersisting']);
state.setIn(['entry', 'hasChanged'], false);
state.set('hasChanged', false);
});
case ADD_ASSET: