AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.
HTML ai-agentcloudflarecloudflare-d1cloudflare-r2cloudflare-workersdockerelectronevernoteevernote-alternativeknowledge-basemcpnote-takingobsidian-alternativeoffline-firstpersonal-knowledge-basepwaself-hostedsqlitetiptapweb-clipper
fix(web): refresh workspace after ZIP import (#202)
tianma-if27a3470302de
diff --git a/apps/web/src/components/SettingsPane.tsx b/apps/web/src/components/SettingsPane.tsxindex 6ebffd9b..13df47ef 100644--- a/apps/web/src/components/SettingsPane.tsx+++ b/apps/web/src/components/SettingsPane.tsx@@ -50,6 +50,7 @@ interface SettingsPaneProps {demoMode: boolean;isOwner: boolean;user: AuthUser | null;+ refreshWorkspaceAfterImport: () => Promise<void>;}// Slate and brand color variables already switch values with the root theme.@@ -87,6 +88,7 @@ export const SettingsPane = ({demoMode,isOwner,user,+ refreshWorkspaceAfterImport,}: SettingsPaneProps) => {const { t } = useTranslation();const [activeTab, setActiveTab] = useState<TabKey>("general");@@ -211,7 +213,7 @@ export const SettingsPane = ({case "data":return (<SettingsGroup>- <DataExportCard />+ <DataExportCard refreshWorkspaceAfterImport={refreshWorkspaceAfterImport} /><EvernoteImportGuideCard /></SettingsGroup>);diff --git a/apps/web/src/components/WorkspaceApp.tsx b/apps/web/src/components/WorkspaceApp.tsxindex 420765fd..86ef1ea7 100644--- a/apps/web/src/components/WorkspaceApp.tsx+++ b/apps/web/src/components/WorkspaceApp.tsx@@ -2847,6 +2847,9 @@ export const WorkspaceApp = ({demoMode={demoMode}isOwner={authRequired && user?.role === "owner"}user={user}+ refreshWorkspaceAfterImport={async () => {+ await refreshWorkspaceFromServer("manual");+ }}/>) : rightView === "assets" ? (<AssetsPane onClose={handleCloseAssets} activeMemo={selectedMemo} repository={repository} />diff --git a/apps/web/src/components/settings/DataExportCard.tsx b/apps/web/src/components/settings/DataExportCard.tsxindex 6a6580e1..ec60f183 100644--- a/apps/web/src/components/settings/DataExportCard.tsx+++ b/apps/web/src/components/settings/DataExportCard.tsx@@ -1,5 +1,4 @@import { useRef, useState } from "react";-import { useQueryClient } from "@tanstack/react-query";import { AlertCircle, CheckCircle2, DatabaseBackup, Download, Upload } from "lucide-react";import { useTranslation } from "react-i18next";import { Button } from "@/components/ui/button";@@ -18,11 +17,15 @@ import {downloadEdgeEverZip,EdgeEverZipImportError,parseEdgeEverZip,- restoreEdgeEverZip,+ restoreEdgeEverZipAndRefresh,type EdgeEverZipProgress,type ParsedEdgeEverZip,} from "@/lib/json-backup";+type DataExportCardProps = {+ refreshWorkspaceAfterImport: () => Promise<void>;+};+type OperationState = "idle" | "working" | "complete" | "error";type OperationKind = "export" | "import";@@ -35,9 +38,8 @@ const Progress = ({ progress }: { progress: EdgeEverZipProgress }) => {);};-export const DataExportCard = () => {+export const DataExportCard = ({ refreshWorkspaceAfterImport }: DataExportCardProps) => {const { t } = useTranslation();- const queryClient = useQueryClient();const fileInputRef = useRef<HTMLInputElement>(null);const [state, setState] = useState<OperationState>("idle");const [operation, setOperation] = useState<OperationKind>("export");@@ -118,16 +120,16 @@ export const DataExportCard = () => {setProgress({ completed: 0, total: 0 });setErrorMessage(null);try {- await restoreEdgeEverZip(+ await restoreEdgeEverZipAndRefresh(archive,{restoreNotebooks: api.restoreJsonNotebooks,restoreMemos: api.restoreJsonMemos,restoreResource: api.restoreJsonResource,},+ refreshWorkspaceAfterImport,setProgress);- await queryClient.invalidateQueries();setState("complete");} catch (error) {console.error("Failed to import EdgeEver ZIP", error);diff --git a/apps/web/src/lib/json-backup.ts b/apps/web/src/lib/json-backup.tsindex 5fe5406a..8a8ae00e 100644--- a/apps/web/src/lib/json-backup.ts+++ b/apps/web/src/lib/json-backup.ts@@ -367,6 +367,16 @@ export const restoreEdgeEverZip = async (}};+export const restoreEdgeEverZipAndRefresh = async (+ backup: ParsedEdgeEverZip,+ target: JsonRestoreTarget,+ refreshWorkspace: () => Promise<void>,+ onProgress?: (progress: EdgeEverZipProgress) => void+) => {+ await restoreEdgeEverZip(backup, target, onProgress);+ await refreshWorkspace();+};+export const downloadEdgeEverZip = (blob: Blob) => {const date = new Date().toISOString().slice(0, 10);const url = URL.createObjectURL(blob);diff --git a/tests/json-backup.test.ts b/tests/json-backup.test.tsindex a7f7963d..80077f1e 100644--- a/tests/json-backup.test.ts+++ b/tests/json-backup.test.ts@@ -5,6 +5,7 @@ import {createEdgeEverZip,parseEdgeEverZip,restoreEdgeEverZip,+ restoreEdgeEverZipAndRefresh,} from "../apps/web/src/lib/json-backup";const notebook = (id: string, name: string, parentId: string | null = null): Notebook => ({@@ -173,4 +174,45 @@ describe("EdgeEver ZIP", () => {expect(calls).toEqual(["notebooks", "memos", "resource:3"]);});++ test("refreshes the workspace after all imported data is restored", async () => {+ const calls: string[] = [];+ const backup = {+ manifest: {+ format: "edgeever-zip" as const,+ formatVersion: 1 as const,+ schemaVersion: 1,+ edgeeverVersion: "1.13.3",+ buildId: "test-build",+ exportedAt: "2026-08-09T00:00:00.000Z",+ includesTrash: false as const,+ counts: { notebooks: 1, memos: 1, revisions: 0, resources: 0 },+ },+ notebooks: [{+ id: "nb_child",+ parentId: null,+ name: "Child",+ slug: null,+ icon: null,+ color: null,+ sortOrder: 0,+ createdAt: memo.createdAt,+ updatedAt: memo.updatedAt,+ }] satisfies JsonBackupNotebook[],+ memos: [{ memo, revisions: [], resources: [] }] satisfies JsonBackupMemo[],+ files: {},+ };++ await restoreEdgeEverZipAndRefresh(+ backup,+ {+ restoreNotebooks: async () => { calls.push("notebooks"); },+ restoreMemos: async () => { calls.push("memos"); },+ restoreResource: async () => { calls.push("resource"); },+ },+ async () => { calls.push("refresh"); },+ );++ expect(calls).toEqual(["notebooks", "memos", "refresh"]);+ });});