Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 06:59:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not use item.migrated

Browse Source
This commit is contained in:
thecodrr
2020-12-06 15:21:31 +05:00
parent 8d7621def6
commit 10570e14b2
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/api/sync/collector.js
View File

@@ -37,13 +37,10 @@ class Collector {
_collect(array) { _collect(array) {
return Promise.all( return Promise.all(
tfun tfun
.filter( .filter((item) => item.dateEdited > this._lastSyncedTimestamp)
(item) => item.dateEdited > this._lastSyncedTimestamp || item.migrated
)
.map(async (item) => { .map(async (item) => {
// in case of resolved delta, we do not want to send this key to the server // in case of resolved delta, we do not want to send this key to the server
if (item.resolved) delete item.resolved; if (item.resolved) delete item.resolved;
if (item.migrated) delete item.migrated;
return { return {
id: item.id, id: item.id,

4
packages/core/migrations.js
View File

@@ -12,13 +12,11 @@ export const migrations = {
} }
delete item.notebook; delete item.notebook;
item.remote = true; item.remote = true;
item.migrated = true;
return item; return item;
}, },
delta: function (item) { delta: function (item) {
item.data = item.data.ops; item.data = item.data.ops;
item.type = "delta"; item.type = "delta";
item.migrated = true;
return item; return item;
}, },
trash: function (item) { trash: function (item) {
@@ -28,7 +26,6 @@ export const migrations = {
item.contentId = item.content.delta; item.contentId = item.content.delta;
delete item.content; delete item.content;
} }
item.migrated = true;
return item; return item;
}, },
}, },
@@ -39,7 +36,6 @@ export const migrations = {
delete item.notebook; delete item.notebook;
item.remote = true; item.remote = true;
if (notebook) item.notebooks = [notebook]; if (notebook) item.notebooks = [notebook];
item.migrated = true;
return item; return item;
}, },
}, },