diff --git a/apps/desktop/src/components/kv/KvKeyBrowser.vue b/apps/desktop/src/components/kv/KvKeyBrowser.vue index f9fad988b9..56cdc13b4b 100644 --- a/apps/desktop/src/components/kv/KvKeyBrowser.vue +++ b/apps/desktop/src/components/kv/KvKeyBrowser.vue @@ -48,6 +48,7 @@ import { useTabUiState } from "@/lib/tabs/tabUiState"; import { detectKvValueFormat, validateKvValue, type KvValueFormat } from "@/lib/kv/kvValueFormat"; import { safeLocalStorageGet, safeLocalStorageSet } from "@/lib/backend/safeStorage"; import { copyToClipboard } from "@/lib/common/clipboard"; +import { saveTextFile } from "@/lib/export/saveTextFile"; interface KvKeyBrowserLabels { prefixPlaceholder: string; @@ -933,7 +934,7 @@ async function refreshLazyParent(parentPath: string) { } } -async function loadSelectedKey(input: string | KvKeyRoute) { +async function loadSelectedKey(input: string | KvKeyRoute): Promise { const route = routeFromKey(input); const key = route.key; const keyIdentity = routeIdentity(route); @@ -950,7 +951,7 @@ async function loadSelectedKey(input: string | KvKeyRoute) { detailError.value = ""; try { const result = await props.api.get(connectionId, key, route.keyBytes ? { keyBytes: route.keyBytes } : undefined); - if (requestId !== detailRequestId || selectedKey.value !== key || connectionId !== props.connectionId) return; + if (requestId !== detailRequestId || selectedKey.value !== key || connectionId !== props.connectionId) return false; const lazyNode = lazyTreeState.nodeByKey.get(key); if (lazyNode) { lazyNode.hasValue = result.found; @@ -958,16 +959,18 @@ async function loadSelectedKey(input: string | KvKeyRoute) { } if (!result.found) { removeExpiredSelectedKey(key); - return; + return false; } selectedValue.value = result; selectedKeyIdentity.value = result.keyIdentity ?? selectedKeyIdentity.value; selectedRouteKeyBytes.value = result.keyBytes ?? selectedRouteKeyBytes.value; startMetadataRefresh(key); startKeyListRefresh(); + return true; } catch (error) { - if (requestId !== detailRequestId || selectedKey.value !== key || connectionId !== props.connectionId) return; + if (requestId !== detailRequestId || selectedKey.value !== key || connectionId !== props.connectionId) return false; detailError.value = formatError(error); + return false; } finally { if (requestId === detailRequestId && connectionId === props.connectionId) detailLoading.value = false; } @@ -1487,54 +1490,47 @@ function watchSelectedKey() { }); } -function downloadText(filename: string, content: string, type = "application/json") { - const url = URL.createObjectURL(new Blob([content], { type })); - const anchor = document.createElement("a"); - anchor.href = url; - anchor.download = filename; - anchor.click(); - URL.revokeObjectURL(url); -} - -function exportSelectedKey() { - if (!selectedKey.value || !selectedValue.value?.found) return; - downloadText( - `${selectedKey.value.split("/").filter(Boolean).pop() || props.exportFallbackName}${props.exportFileExtension}`, - JSON.stringify( - { - format: props.exportFormat, - version: 1, - exportedAt: new Date().toISOString(), - prefix: selectedKey.value, - scopeKind: "key", - entries: [ - { - key: selectedKeyBytes.value ?? { encoding: "utf8", data: selectedKey.value }, - value: selectedValue.value.value, - metadata: selectedValue.value.metadata, - formatHint: detectKvValueFormat(selectedTextValue.value, selectedValueIsBase64.value ? "base64" : "utf8"), - }, - ], - }, - null, - 2, - ), +async function exportSelectedKey(): Promise { + if (!selectedKey.value || !selectedValue.value?.found) return false; + const filename = `${selectedKey.value.split("/").filter(Boolean).pop() || props.exportFallbackName}${props.exportFileExtension}`; + const content = JSON.stringify( + { + format: props.exportFormat, + version: 1, + exportedAt: new Date().toISOString(), + prefix: selectedKey.value, + scopeKind: "key", + entries: [ + { + key: selectedKeyBytes.value ?? { encoding: "utf8", data: selectedKey.value }, + value: selectedValue.value.value, + metadata: selectedValue.value.metadata, + formatHint: detectKvValueFormat(selectedTextValue.value, selectedValueIsBase64.value ? "base64" : "utf8"), + }, + ], + }, + null, + 2, ); + return saveTextFile(content, filename, "DBX KV Bundle", "json", { operation: "kv-key-export" }); } async function exportNode(node: BrowserTreeNode) { - const request: KvExportScopeRequest = { - path: nodePath(node), - kind: nodeIsExpandable(node) ? "prefix" : "key", - keyBytes: node.kind === "lazy" ? null : node.keyBytes, - }; - if (props.api.exportScope) { - await props.api.exportScope(props.connectionId, request); - return; + try { + const request: KvExportScopeRequest = { + path: nodePath(node), + kind: nodeIsExpandable(node) ? "prefix" : "key", + keyBytes: node.kind === "lazy" ? null : node.keyBytes, + }; + if (props.api.exportScope) { + await props.api.exportScope(props.connectionId, request); + return; + } + if (!nodeHasValue(node)) return; + if (await loadSelectedKey(routeFromNode(node))) await exportSelectedKey(); + } catch (error) { + toast(formatError(error), 4000); } - if (!nodeHasValue(node)) return; - await loadSelectedKey(routeFromNode(node)); - exportSelectedKey(); } async function openCloneDialog() { diff --git a/apps/desktop/src/components/zookeeper/ZooKeeperKeyBrowser.vue b/apps/desktop/src/components/zookeeper/ZooKeeperKeyBrowser.vue index 22d5510462..4942916710 100644 --- a/apps/desktop/src/components/zookeeper/ZooKeeperKeyBrowser.vue +++ b/apps/desktop/src/components/zookeeper/ZooKeeperKeyBrowser.vue @@ -43,6 +43,9 @@ const labels = computed(() => ({ saved: t("zookeeper.saved"), deleted: t("zookeeper.deleted"), base64Readonly: t("zookeeper.base64Readonly"), + clone: t("zookeeper.clone"), + copyKey: t("zookeeper.copyKey"), + export: t("zookeeper.export"), utf8PreviewLossy: t("zookeeper.utf8PreviewLossy"), utf8PreviewUnavailable: t("zookeeper.utf8PreviewUnavailable"), createMode: t("zookeeper.createMode"), diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.ts index b76c2c9470..12a9183cb4 100644 --- a/apps/desktop/src/i18n/locales/az.ts +++ b/apps/desktop/src/i18n/locales/az.ts @@ -5318,6 +5318,9 @@ export default withEnglishFallback({ saved: "Znode yadda saxlanıldı", deleted: "Znode silindi", base64Readonly: "Bu versiyada Base64 dəyərləri yalnız oxuma üçündür.", + clone: "Klonla", + copyKey: "Açarı kopyala", + export: "İxrac et", utf8PreviewLossy: "Etibarsız UTF-8 baytları əvəzedici simvollar (�) kimi göstərilir. İlkin Base64 dəyəri dəyişməyib.", utf8PreviewUnavailable: "Base64 dəyəri etibarsızdır, buna görə ilkin dəyər göstərilir.", createMode: "Yaratma rejimi", diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts index 93c2c82e91..b8c8935456 100644 --- a/apps/desktop/src/i18n/locales/en.ts +++ b/apps/desktop/src/i18n/locales/en.ts @@ -5910,6 +5910,9 @@ export default { saved: "Znode saved", deleted: "Znode deleted", base64Readonly: "Base64 values are read-only in this version.", + clone: "Clone", + copyKey: "Copy key", + export: "Export", utf8PreviewLossy: "Invalid UTF-8 bytes are shown as replacement characters (�). The original Base64 value is unchanged.", utf8PreviewUnavailable: "The Base64 value is invalid, so the original value is shown.", createMode: "Create Mode", diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts index 4aa9fe1ea2..4156913a17 100644 --- a/apps/desktop/src/i18n/locales/es.ts +++ b/apps/desktop/src/i18n/locales/es.ts @@ -5423,6 +5423,9 @@ export default withEnglishFallback({ saved: "Znode guardado", deleted: "Znode eliminado", base64Readonly: "Los valores Base64 son de solo lectura en esta versión.", + clone: "Clonar", + copyKey: "Copiar clave", + export: "Exportar", utf8PreviewLossy: "Los bytes UTF-8 no válidos se muestran como caracteres de sustitución (�). El valor Base64 original no cambia.", utf8PreviewUnavailable: "El valor Base64 no es válido, por lo que se muestra el valor original.", createMode: "Modo de creación", diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts index 5239b4025d..289b0ad9ab 100644 --- a/apps/desktop/src/i18n/locales/it.ts +++ b/apps/desktop/src/i18n/locales/it.ts @@ -5346,6 +5346,9 @@ export default withEnglishFallback({ saved: "Znode salvato", deleted: "Znode eliminato", base64Readonly: "I valori Base64 sono in sola lettura in questa versione.", + clone: "Clona", + copyKey: "Copia chiave", + export: "Esporta", utf8PreviewLossy: "I byte UTF-8 non validi vengono mostrati come caratteri sostitutivi (�). Il valore Base64 originale non viene modificato.", utf8PreviewUnavailable: "Il valore Base64 non è valido, quindi viene mostrato il valore originale.", createMode: "Modalita Creazione", diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts index 59aabb2832..cce07f5d09 100644 --- a/apps/desktop/src/i18n/locales/ja.ts +++ b/apps/desktop/src/i18n/locales/ja.ts @@ -4173,6 +4173,9 @@ export default withEnglishFallback({ saved: "Znodeを保存しました", deleted: "Znodeを削除しました", base64Readonly: "Base64値はこのバージョンでは読み取り専用です。", + clone: "複製", + copyKey: "キーをコピー", + export: "エクスポート", utf8PreviewLossy: "無効な UTF-8 バイトは置換文字(�)で表示されます。元の Base64 値は変更されません。", utf8PreviewUnavailable: "Base64 値が無効なため UTF-8 プレビューを生成できません。元の値を表示しています。", createMode: "作成モード", diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts index d5aa47fb38..2cd6c25d05 100644 --- a/apps/desktop/src/i18n/locales/ko.ts +++ b/apps/desktop/src/i18n/locales/ko.ts @@ -5017,6 +5017,9 @@ export default withEnglishFallback({ saved: "Znode를 저장했습니다", deleted: "Znode를 삭제했습니다", base64Readonly: "Base64 값은 이 버전에서 읽기 전용입니다.", + clone: "복제", + copyKey: "키 복사", + export: "내보내기", utf8PreviewLossy: "잘못된 UTF-8 바이트는 대체 문자(�)로 표시됩니다. 원본 Base64 값은 변경되지 않습니다.", utf8PreviewUnavailable: "Base64 값이 잘못되어 UTF-8 미리 보기를 생성할 수 없습니다. 원본 값을 표시합니다.", createMode: "생성 모드", diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts index 8bba03aa0c..37bd716cea 100644 --- a/apps/desktop/src/i18n/locales/pt-BR.ts +++ b/apps/desktop/src/i18n/locales/pt-BR.ts @@ -5347,6 +5347,9 @@ export default withEnglishFallback({ saved: "Znode salvo", deleted: "Znode excluído", base64Readonly: "Valores Base64 são somente leitura nesta versão.", + clone: "Clonar", + copyKey: "Copiar chave", + export: "Exportar", utf8PreviewLossy: "Bytes UTF-8 inválidos são exibidos como caracteres de substituição (�). O valor Base64 original não é alterado.", utf8PreviewUnavailable: "O valor Base64 é inválido, portanto o valor original é exibido.", createMode: "Modo de Criação", diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts index 25aa034df4..4935bd5878 100644 --- a/apps/desktop/src/i18n/locales/ru.ts +++ b/apps/desktop/src/i18n/locales/ru.ts @@ -6373,6 +6373,9 @@ export default withEnglishFallback({ saved: "znode сохранён", deleted: "znode удалён", base64Readonly: "Значения Base64 доступны только для чтения в этой версии.", + clone: "Клонировать", + copyKey: "Копировать ключ", + export: "Экспорт", utf8PreviewLossy: "Недопустимые байты UTF-8 отображаются как символы замены (�). Исходное значение Base64 не изменяется.", utf8PreviewUnavailable: "Значение Base64 недействительно, поэтому показано исходное значение.", createMode: "Режим создания", diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.ts index cdb1c0bcec..ce57c7b192 100644 --- a/apps/desktop/src/i18n/locales/tr.ts +++ b/apps/desktop/src/i18n/locales/tr.ts @@ -5212,6 +5212,9 @@ export default withEnglishFallback({ saved: "Znode kaydedildi", deleted: "Znode silindi", base64Readonly: "Bu sürümde Base64 değerleri salt okunurdur.", + clone: "Çoğalt", + copyKey: "Anahtarı kopyala", + export: "Dışa aktar", utf8PreviewLossy: "Geçersiz UTF-8 baytları değiştirme karakteri (�) olarak gösterilir. Özgün Base64 değeri değişmez.", utf8PreviewUnavailable: "Base64 değeri geçersiz olduğu için özgün değer gösteriliyor.", createMode: "Oluşturma Modu", diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts index fdbcd23e45..a202007129 100644 --- a/apps/desktop/src/i18n/locales/zh-CN.ts +++ b/apps/desktop/src/i18n/locales/zh-CN.ts @@ -5883,6 +5883,9 @@ export default withEnglishFallback({ saved: "Znode 已保存", deleted: "Znode 已删除", base64Readonly: "Base64 值当前版本只读。", + clone: "克隆", + copyKey: "复制 Key", + export: "导出", utf8PreviewLossy: "UTF-8 预览中的无效字节已显示为替换字符(�),原始 Base64 值未改变。", utf8PreviewUnavailable: "Base64 值无效,无法生成 UTF-8 预览,当前显示原始值。", createMode: "创建模式", diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts index a42142611c..b2b4777c5a 100644 --- a/apps/desktop/src/i18n/locales/zh-TW.ts +++ b/apps/desktop/src/i18n/locales/zh-TW.ts @@ -9024,6 +9024,9 @@ export default withEnglishFallback({ saved: "Znode 已儲存", deleted: "Znode 已刪除", base64Readonly: "Base64 值在此版本中為唯讀。", + clone: "複製", + copyKey: "複製 Key", + export: "匯出", utf8PreviewLossy: "UTF-8 預覽中的無效位元組已顯示為取代字元(�),原始 Base64 值未變更。", utf8PreviewUnavailable: "Base64 值無效,無法產生 UTF-8 預覽,目前顯示原始值。", createMode: "建立模式",