Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(desktop): cancel unsynced attachment imports cleanly

tianma-if2276ab69c574
diff --git a/apps/web/src/components/WorkspaceApp.tsx b/apps/web/src/components/WorkspaceApp.tsx
index 0b3ce9e4..23683073 100644
--- a/apps/web/src/components/WorkspaceApp.tsx
+++ b/apps/web/src/components/WorkspaceApp.tsx
@@ -1754,7 +1754,9 @@ export const WorkspaceApp = ({
contentMarkdown: content.contentMarkdown,
tags: created.tags,
}),
- deleteMemo: (memoId) => repository.deleteMemo(memoId, true),
+ deleteMemo: (memoId) => isDesktopResourceRuntime()
+ ? import("@/lib/desktop-repository").then(({ cancelPendingDesktopImportMemo }) => cancelPendingDesktopImportMemo(memoId))
+ : repository.deleteMemo(memoId, true),
});
await putLocalMemo(localDataScope, memo);
revealCreatedMemo(memo);
@@ -1864,7 +1866,9 @@ export const WorkspaceApp = ({
contentMarkdown: content.contentMarkdown,
tags: created.tags,
}),
- deleteMemo: (memoId) => repository.deleteMemo(memoId, true),
+ deleteMemo: (memoId) => isDesktopResourceRuntime()
+ ? import("@/lib/desktop-repository").then(({ cancelPendingDesktopImportMemo }) => cancelPendingDesktopImportMemo(memoId))
+ : repository.deleteMemo(memoId, true),
});
savedMemo = memo;
await bridge?.finishWeChatImport?.(importId, true).catch(() => undefined);
diff --git a/apps/web/src/lib/desktop-repository.ts b/apps/web/src/lib/desktop-repository.ts
index 78909ba1..84c7d7c9 100644
--- a/apps/web/src/lib/desktop-repository.ts
+++ b/apps/web/src/lib/desktop-repository.ts
@@ -114,6 +114,12 @@ const request = async <M extends DesktopRpcMethod>(method: M, params: DesktopRpc
return bridge.sidecarRequest<DesktopRpcResponses[M]>(method, params);
};
+export const cancelPendingDesktopImportMemo = async (memoId: string) => {
+ const result = await request("memo.delete", { memoId, permanent: true, cancelPendingCreate: true });
+ window.dispatchEvent(new CustomEvent("edgeever:sync-queue-changed"));
+ return result;
+};
+
export const createDesktopRepository = (): EdgeEverRepository => ({
listNotebooks: () => request("notebook.list", {}),
diff --git a/crates/desktop-sidecar/src/memo.rs b/crates/desktop-sidecar/src/memo.rs
index 20c8b463..d69427c7 100644
--- a/crates/desktop-sidecar/src/memo.rs
+++ b/crates/desktop-sidecar/src/memo.rs
@@ -616,6 +616,35 @@ pub(crate) fn update_memo(database: &Connection, params: &Value) -> Result<Value
pub(crate) fn delete_memo(database: &Connection, params: &Value) -> Result<Value, String> {
let memo_id = string_param(params, "memoId")?;
+ if bool_param(params, "cancelPendingCreate", false) {
+ if !bool_param(params, "permanent", false) || !memo_id.starts_with("memo_local_") {
+ return Err("Only an unsynced local memo can be cancelled".to_owned());
+ }
+ let tx = database.unchecked_transaction().map_err(|e| e.to_string())?;
+ let pending_create: i64 = tx.query_row(
+ "SELECT COUNT(*) FROM _edgeever_sidecar_outbox WHERE kind = 'memo.create' AND entity_id = ?1 AND status = 'pending'",
+ [&memo_id],
+ |row| row.get(0),
+ ).map_err(|e| e.to_string())?;
+ let other_changes: i64 = tx.query_row(
+ "SELECT COUNT(*) FROM _edgeever_sidecar_outbox WHERE entity_id = ?1 AND kind <> 'memo.create'",
+ [&memo_id],
+ |row| row.get(0),
+ ).map_err(|e| e.to_string())?;
+ if pending_create != 1 || other_changes != 0 {
+ return Err("Local memo cannot be cancelled after synchronization started".to_owned());
+ }
+ let deleted = tx.execute("DELETE FROM memos WHERE id = ?1", [&memo_id]).map_err(|e| e.to_string())?;
+ if deleted != 1 {
+ return Err("Local memo no longer exists".to_owned());
+ }
+ tx.execute(
+ "DELETE FROM _edgeever_sidecar_outbox WHERE kind = 'memo.create' AND entity_id = ?1 AND status = 'pending'",
+ [&memo_id],
+ ).map_err(|e| e.to_string())?;
+ tx.commit().map_err(|e| e.to_string())?;
+ return Ok(json!({ "ok": true }));
+ }
if bool_param(params, "permanent", false) {
database
.execute("DELETE FROM memos WHERE id = ?1", [&memo_id])
diff --git a/packages/shared/src/desktop-rpc.ts b/packages/shared/src/desktop-rpc.ts
index 84c0cc11..ed7450c5 100644
--- a/packages/shared/src/desktop-rpc.ts
+++ b/packages/shared/src/desktop-rpc.ts
@@ -164,7 +164,7 @@ export type DesktopRpcParams = {
"memo.get": { memoId: string; includeDeleted?: boolean };
"memo.create": DesktopMemoCreateParams;
"memo.update": DesktopMemoUpdateParams;
- "memo.delete": { memoId: string; permanent?: boolean };
+ "memo.delete": { memoId: string; permanent?: boolean; cancelPendingCreate?: boolean };
"memo.restore": { memoId: string };
"memo.revisions": { memoId: string; limit?: number };
"memo.restoreRevision": { memoId: string; revisionId: string };
diff --git a/scripts/test-desktop-sidecar.mjs b/scripts/test-desktop-sidecar.mjs
index 3255f4c8..17c0d630 100644
--- a/scripts/test-desktop-sidecar.mjs
+++ b/scripts/test-desktop-sidecar.mjs
@@ -113,6 +113,14 @@ await request("sync.apply", {
});
inbox = (await request("notebook.list")).notebooks.find((notebook) => notebook.id === "ws_1_inbox");
assert.ok(inbox, "sidecar should keep the workspace inbox even when its remote slug was renamed");
+const cancelledImport = (await request("memo.create", {
+ notebookId: inbox.id, title: "Failed screenshot import", contentMarkdown: "", tags: [],
+})).memo;
+assert.ok((await request("sync.outbox.list", { limit: 200 })).items.some((item) => item.kind === "memo.create" && item.entityId === cancelledImport.id));
+await request("memo.delete", { memoId: cancelledImport.id, permanent: true, cancelPendingCreate: true });
+assert.ok(!(await request("sync.outbox.list", { limit: 200 })).items.some((item) => item.entityId === cancelledImport.id), "cancelling an unsynced import must not queue a cloud delete");
+await assert.rejects(request("memo.get", { memoId: cancelledImport.id, includeDeleted: true }), /Query returned no rows/);
+await assert.rejects(request("memo.delete", { memoId: "memo_e2e_renamed_inbox", permanent: true, cancelPendingCreate: true }), /Only an unsynced local memo/);
assert.equal(inbox.slug, "inbox", "synced inbox identity should restore slug=inbox");
assert.equal(
(await request("memo.get", { memoId: "memo_e2e_renamed_inbox", includeDeleted: true })).memo.notebookId,