stepus53/writer
1
0
Fork 0
mirror of https://github.com/usatiuk/writer.git synced 2025-10-29 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19 from usaatyuk/autosave-fix

Browse Source 
don't overwrite local document content on upload
This commit is contained in:
Stepan Usatiuk
2020-01-19 20:47:32 +03:00
committed by GitHub
parent 298d28c9af 6ca1ff6227
commit 02af1d9a28
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/redux/docs/reducer.ts
View File

@@ -34,6 +34,14 @@ const defaultDocsState: IDocsState = {
deletedDocument: null,
};
function isDocDirty(doc1: IDocumentJSON, doc2: IDocumentJSON) {
return (
doc1.content !== doc2.content ||
doc1.name !== doc2.name ||
doc1.shared !== doc2.shared
);
}
export const docsReducer: Reducer<IDocsState, DocsAction> = (
state: IDocsState = defaultDocsState,
action: DocsAction | UserAction,
@@ -83,7 +91,11 @@ export const docsReducer: Reducer<IDocsState, DocsAction> = (
case DocsTypes.DOCS_UPLOAD_SUCCESS: {
const all: { [key: number]: IDocumentEntry } = { ...state.all };
action.payload.all.forEach(doc => {
all[doc.id] = { ...doc, remote: doc, dirty: false };
if (isDocDirty(all[doc.id], doc)) {
all[doc.id] = { ...all[doc.id], remote: doc, dirty: true };
} else {
all[doc.id] = { ...all[doc.id], remote: doc, dirty: false };
}
});
return { ...state, all, uploading: false, dirty: false };
}