Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-12-28 11:24:11 +08:00
Code Issues Projects Releases Packages Wiki Activity

Don’t allow database updates to override unsaved composer changes

Browse source
This commit is contained in:
Ben Gotow 2018-01-25 22:38:26 -08:00
parent 2eb3795d59
commit c711a0c1b0
1 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/src/flux/stores/draft-editing-session.es6
View file

@ -37,7 +37,8 @@ class DraftChangeSet extends EventEmitter {
this.callbacks = callbacks;
this._timer = null;
this._timerTime = null;
this._changedSinceCommit = false;
this._lastModifiedTimes = {};
this._lastCommitTime = 0;
}
cancelCommit() {
@ -50,19 +51,30 @@ class DraftChangeSet extends EventEmitter {
add(changes) {
changes.pristine = false;
// update the per-attribute flags that track our dirty state
for (const key of Object.keys(changes)) this._lastModifiedTimes[key] = Date.now();
if (changes.bodyEditorState) this._lastModifiedTimes.body = Date.now();
if (changes.body) this._lastModifiedTimes.bodyEditorState = Date.now();
this.callbacks.onAddChanges(changes);
this._changedSinceCommit = true;
this.debounceCommit();
}
addPluginMetadata(pluginId, metadata) {
this._lastModifiedTimes.pluginMetadata = Date.now();
this.callbacks.onAddChanges({ [`${MetadataChangePrefix}${pluginId}`]: metadata });
this._changedSinceCommit = true;
this.debounceCommit();
}
isDirty() {
return this._changedSinceCommit;
return this.dirtyFields().length > 0;
}
dirtyFields() {
return Object.keys(this._lastModifiedTimes).filter(
key => this._lastModifiedTimes[key] > this._lastCommitTime
);
}
debounceCommit() {
@ -80,10 +92,10 @@ class DraftChangeSet extends EventEmitter {
}
async commit() {
if (!this._changedSinceCommit) return;
if (this.dirtyFields().length === 0) return;
if (this._timer) clearTimeout(this._timer);
await this.callbacks.onCommit();
this._changedSinceCommit = false;
this._lastCommitTime = Date.now();
}
}
@ -375,11 +387,19 @@ export default class DraftEditingSession extends MailspringStore {
return;
}
// If the session has unsaved changes for a given field (eg: 'to' or 'body'),
// we don't accept changes from the database. All changes to the draft should
// be made through the editing session and we don't want to overwrite the user's
// work under any scenario.
const lockedFields = this.changes.dirtyFields();
console.log(lockedFields);
let changed = false;
for (const [key] of Object.entries(Message.attributes)) {
if (key === 'headerMessageId') continue;
if (nextDraft[key] === undefined) continue;
if (this._draft[key] === nextDraft[key]) continue;
if (lockedFields.includes(key)) continue;
if (changed === false) {
this._draft = fastCloneDraft(this._draft);