desktop: Import and Export work offline; the menu toggle is reachable; errors say why
CI & Build / Build now, or wait for Android? (push) Successful in 4s
Android / Build, or is the channel already serving this? (push) Successful in 4s
CI & Build / Python lint (push) Successful in 2s
CI & Build / Web typecheck and unit tests (push) Successful in 12s
Desktop (Tauri) / Build, or is the channel already serving this? (push) Successful in 2s
CI & Build / Python tests (push) Successful in 13s
CI & Build / integration (push) Successful in 48s
CI & Build / Build & push image (push) Skipped
Desktop (Tauri) / Web tests, clippy, Rust tests and rustfmt (push) Successful in 4m26s
Desktop (Tauri) / Windows installer (cross-compiled) (push) Successful in 3m32s
Desktop (Tauri) / Tauri desktop (Linux) (push) Successful in 4m10s
Desktop (Tauri) / Update manifest (push) Successful in 4s
Android / Kotlin + Rust (APK) (push) Successful in 12m42s
CI & Build / Build now, or wait for Android? (push) Successful in 4s
Android / Build, or is the channel already serving this? (push) Successful in 4s
CI & Build / Python lint (push) Successful in 2s
CI & Build / Web typecheck and unit tests (push) Successful in 12s
Desktop (Tauri) / Build, or is the channel already serving this? (push) Successful in 2s
CI & Build / Python tests (push) Successful in 13s
CI & Build / integration (push) Successful in 48s
CI & Build / Build & push image (push) Skipped
Desktop (Tauri) / Web tests, clippy, Rust tests and rustfmt (push) Successful in 4m26s
Desktop (Tauri) / Windows installer (cross-compiled) (push) Successful in 3m32s
Desktop (Tauri) / Tauri desktop (Linux) (push) Successful in 4m10s
Desktop (Tauri) / Update manifest (push) Successful in 4s
Android / Kotlin + Rust (APK) (push) Successful in 12m42s
Export and Import were a link to the server and a reject("needs a server") on the
desktop. Both now run in the core with no server:
- core/src/local/portable.rs builds the same zip the server writes (notes.json,
a Markdown file per note, each attachment this device holds) and reads either
export marker or a Google Keep Takeout zip, with the server's decompression
budget and an all-or-nothing transaction. Export saves to Downloads (no new
plugin) and the sidebar says where; Import takes the archive as raw IPC bytes.
- core/testdata/portable.json pins the format for both copies: the server runs
its Keep and native readers against it (test_portable_fixture.py) and checks
its real export's keys (test_integration.py); the core runs the same cases.
- Found on the way: both importers skipped a Keep note that is only a photo as
"empty". It now imports, on the server and in the core.
- New dependency, approved: `zip` (deflate only) plus `flate2` on its pure-Rust
backend, both already in the lockfile.
The AppImage applications-menu toggle moves from Account, which the desktop
never shows, to the Sync page; the first-run prompt now says so.
errorMessage (#5236) replaces the hand-rolled `.error ?? …` / `.message ?? e`
reads at the remaining catch sites, so a desktop failure shows its real reason.
Task #5170.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -7,7 +7,7 @@ import BaseButton from "../components/BaseButton.vue";
|
||||
import BaseInput from "../components/BaseInput.vue";
|
||||
import ClientDownloads from "../components/ClientDownloads.vue";
|
||||
import Icon from "../components/Icon.vue";
|
||||
import { isDesktop, desktop as desktopBridge, type IntegrationStatus } from "../desktop/bridge";
|
||||
import { errorMessage } from "../api/errors";
|
||||
|
||||
// Per-user (not admin) management of linked native clients — the Tauri desktop and
|
||||
// Android apps authenticate sync with a device bearer token issued here.
|
||||
@@ -23,9 +23,6 @@ const creating = ref(false);
|
||||
// The freshly-issued plaintext token — shown ONCE (never retrievable again).
|
||||
const freshToken = ref("");
|
||||
|
||||
// Desktop-app self-integration (Linux AppImage only; the card is hidden otherwise).
|
||||
const desktopStatus = ref<IntegrationStatus | null>(null);
|
||||
const desktopBusy = ref(false);
|
||||
|
||||
async function load() {
|
||||
error.value = "";
|
||||
@@ -45,7 +42,7 @@ async function link() {
|
||||
freshToken.value = await devices.create(newName.value.trim() || "Device");
|
||||
newName.value = "";
|
||||
} catch (e) {
|
||||
error.value = (e as { error?: string }).error ?? "Couldn't create a device token.";
|
||||
error.value = errorMessage(e, "Couldn't create a device token.");
|
||||
} finally {
|
||||
creating.value = false;
|
||||
}
|
||||
@@ -74,36 +71,8 @@ function fmt(iso: string | null): string {
|
||||
return new Date(iso).toLocaleString();
|
||||
}
|
||||
|
||||
async function loadDesktop() {
|
||||
if (!isDesktop()) return;
|
||||
try {
|
||||
desktopStatus.value = await desktopBridge.integrationStatus();
|
||||
} catch {
|
||||
desktopStatus.value = null;
|
||||
}
|
||||
}
|
||||
|
||||
async function toggleIntegration() {
|
||||
desktopBusy.value = true;
|
||||
try {
|
||||
desktopStatus.value = desktopStatus.value?.is_integrated
|
||||
? await desktopBridge.unintegrate()
|
||||
: await desktopBridge.integrate();
|
||||
ui.showToast(
|
||||
desktopStatus.value?.is_integrated
|
||||
? "Added to your applications menu."
|
||||
: "Removed from your applications menu.",
|
||||
);
|
||||
} catch (e) {
|
||||
ui.showToast((e as { message?: string }).message ?? "Couldn't update the menu entry.");
|
||||
} finally {
|
||||
desktopBusy.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
void load();
|
||||
void loadDesktop();
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -132,31 +101,6 @@ onMounted(() => {
|
||||
paste it into the app when it asks to connect. You can revoke a device at any time.
|
||||
</p>
|
||||
|
||||
<!-- Desktop app self-integration (Linux AppImage only) -->
|
||||
<section
|
||||
v-if="desktopStatus?.is_appimage"
|
||||
class="mb-6 flex items-center justify-between gap-4 rounded-xl border border-neutral-200 p-4 dark:border-neutral-800"
|
||||
>
|
||||
<div class="min-w-0">
|
||||
<p class="text-sm font-medium text-neutral-800 dark:text-neutral-100">Desktop app</p>
|
||||
<p class="mt-0.5 text-xs text-neutral-400">
|
||||
{{
|
||||
desktopStatus.is_integrated
|
||||
? "Inkwell is in your applications menu."
|
||||
: "Add Inkwell to your applications menu to launch it like an installed app."
|
||||
}}
|
||||
</p>
|
||||
</div>
|
||||
<BaseButton
|
||||
:variant="desktopStatus.is_integrated ? 'ghost' : 'primary'"
|
||||
:loading="desktopBusy"
|
||||
class="shrink-0"
|
||||
@click="toggleIntegration"
|
||||
>
|
||||
{{ desktopStatus.is_integrated ? "Remove" : "Add to applications" }}
|
||||
</BaseButton>
|
||||
</section>
|
||||
|
||||
<!-- Every client this server holds, the one that fits this machine on top.
|
||||
Hides itself when the server holds none. -->
|
||||
<ClientDownloads />
|
||||
|
||||
@@ -12,6 +12,7 @@ import FilterBar from "../components/FilterBar.vue";
|
||||
import NoteGrid from "../components/NoteGrid.vue";
|
||||
import NoteEditor from "../components/NoteEditor.vue";
|
||||
import { isDesktop, onCaptured, onSynced, sync as syncBridge } from "../desktop/bridge";
|
||||
import { errorMessage } from "../api/errors";
|
||||
|
||||
const notes = useNotesStore();
|
||||
const config = useConfigStore();
|
||||
@@ -208,7 +209,7 @@ async function reload() {
|
||||
try {
|
||||
await notes.load(currentView.value, currentLabel.value, facets.value);
|
||||
} catch (e) {
|
||||
loadError.value = (e as { error?: string }).error ?? "Couldn't load your notes.";
|
||||
loadError.value = errorMessage(e, "Couldn't load your notes.");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ import { useSessionStore } from "../stores/session";
|
||||
import { useConfigStore } from "../stores/config";
|
||||
import BaseInput from "../components/BaseInput.vue";
|
||||
import BaseButton from "../components/BaseButton.vue";
|
||||
import type { ApiError } from "../api/client";
|
||||
import { errorMessage } from "../api/errors";
|
||||
|
||||
const session = useSessionStore();
|
||||
const config = useConfigStore();
|
||||
@@ -33,7 +33,7 @@ async function submit() {
|
||||
await session.login(email.value, password.value);
|
||||
await router.replace(safeRedirect(route.query.redirect));
|
||||
} catch (e) {
|
||||
error.value = (e as ApiError).error ?? "Could not sign in.";
|
||||
error.value = errorMessage(e, "Could not sign in.");
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ import { useSessionStore } from "../stores/session";
|
||||
import { useConfigStore } from "../stores/config";
|
||||
import BaseInput from "../components/BaseInput.vue";
|
||||
import BaseButton from "../components/BaseButton.vue";
|
||||
import type { ApiError } from "../api/client";
|
||||
import { errorMessage } from "../api/errors";
|
||||
|
||||
const session = useSessionStore();
|
||||
const config = useConfigStore();
|
||||
@@ -28,7 +28,7 @@ async function submit() {
|
||||
await session.register(email.value, password.value, displayName.value);
|
||||
await router.replace("/");
|
||||
} catch (e) {
|
||||
error.value = (e as ApiError).error ?? "Could not create your account.";
|
||||
error.value = errorMessage(e, "Could not create your account.");
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ import { computed, onMounted, ref, watch } from "vue";
|
||||
import { api } from "../api/client";
|
||||
import { useConfigStore } from "../stores/config";
|
||||
import BaseButton from "../components/BaseButton.vue";
|
||||
import { errorMessage } from "../api/errors";
|
||||
|
||||
interface SettingItem {
|
||||
key: string;
|
||||
@@ -74,7 +75,7 @@ async function save() {
|
||||
saved.value = true;
|
||||
await config.reload(); // header/site name reflects changes immediately
|
||||
} catch (e) {
|
||||
error.value = (e as { error?: string }).error ?? "Could not save settings.";
|
||||
error.value = errorMessage(e, "Could not save settings.");
|
||||
} finally {
|
||||
saving.value = false;
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import { useUiStore } from "../stores/ui";
|
||||
import BaseButton from "../components/BaseButton.vue";
|
||||
import BaseInput from "../components/BaseInput.vue";
|
||||
import Icon from "../components/Icon.vue";
|
||||
import DesktopMenuEntry from "../components/DesktopMenuEntry.vue";
|
||||
import {
|
||||
SUGGESTED_CAPTURE_SHORTCUT,
|
||||
capture as captureBridge,
|
||||
@@ -20,6 +21,7 @@ import {
|
||||
type UpdateChannel,
|
||||
type UpdateStatus,
|
||||
} from "../desktop/bridge";
|
||||
import { errorMessage } from "../api/errors";
|
||||
|
||||
// Opt-in server sync for the desktop app. Being UNLINKED is the normal resting
|
||||
// state, not an incomplete setup — the app is local-first and fully usable having
|
||||
@@ -111,7 +113,7 @@ async function saveShortcut(value: string) {
|
||||
// The message comes from the core and names the actual reason — "something
|
||||
// else is already using it" reads very differently from "that is not a
|
||||
// shortcut this system understands", and both are things you can act on.
|
||||
shortcutError.value = String((e as { message?: string }).message ?? e);
|
||||
shortcutError.value = errorMessage(e, "Couldn't save the shortcut.");
|
||||
} finally {
|
||||
savingShortcut.value = false;
|
||||
}
|
||||
@@ -124,7 +126,7 @@ async function checkUpdates() {
|
||||
update.value = await updateBridge.check();
|
||||
channel.value = update.value.channel;
|
||||
} catch (e) {
|
||||
updateError.value = String((e as Error)?.message ?? e);
|
||||
updateError.value = errorMessage(e, "The update check failed.");
|
||||
} finally {
|
||||
checking.value = false;
|
||||
checkedOnce.value = true;
|
||||
@@ -141,7 +143,7 @@ async function switchChannel(next: UpdateChannel) {
|
||||
checkedOnce.value = false;
|
||||
await checkUpdates();
|
||||
} catch (e) {
|
||||
updateError.value = String((e as Error)?.message ?? e);
|
||||
updateError.value = errorMessage(e, "The update check failed.");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -153,7 +155,7 @@ async function installUpdate() {
|
||||
// means it failed.
|
||||
await updateBridge.install();
|
||||
} catch (e) {
|
||||
updateError.value = String((e as Error)?.message ?? e);
|
||||
updateError.value = errorMessage(e, "The update check failed.");
|
||||
} finally {
|
||||
installing.value = false;
|
||||
}
|
||||
@@ -191,7 +193,7 @@ async function runProbe() {
|
||||
try {
|
||||
probe.value = await syncBridge.probe(url.value);
|
||||
} catch (e) {
|
||||
probeError.value = String((e as Error)?.message ?? e);
|
||||
probeError.value = errorMessage(e, "Couldn't reach that server.");
|
||||
} finally {
|
||||
probing.value = false;
|
||||
}
|
||||
@@ -219,7 +221,7 @@ async function connect() {
|
||||
ui.showToast(`Connected to ${result.status.server_url}.`);
|
||||
await syncNow();
|
||||
} catch (e) {
|
||||
linkError.value = String((e as Error)?.message ?? e);
|
||||
linkError.value = errorMessage(e, "Couldn't link to that server.");
|
||||
} finally {
|
||||
linking.value = false;
|
||||
}
|
||||
@@ -261,7 +263,7 @@ async function syncNow() {
|
||||
showOutcome(await syncBridge.now());
|
||||
pending.value = await syncBridge.hasPending();
|
||||
} catch (e) {
|
||||
syncError.value = String((e as Error)?.message ?? e);
|
||||
syncError.value = errorMessage(e, "Sync failed.");
|
||||
} finally {
|
||||
syncing.value = false;
|
||||
}
|
||||
@@ -303,7 +305,7 @@ async function disconnect() {
|
||||
: "Disconnected. This device now works offline only.",
|
||||
);
|
||||
} catch (e) {
|
||||
ui.showToast(String((e as Error)?.message ?? e));
|
||||
ui.showToast(errorMessage(e, "Couldn't disconnect."));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -676,5 +678,9 @@ onBeforeUnmount(() => stopSyncListener?.());
|
||||
</BaseButton>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- The AppImage's menu entry, which the first-run prompt says can be undone
|
||||
from here. Hides itself on every other build. -->
|
||||
<DesktopMenuEntry />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user