📚 The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.
Vue dockergolangkanbanknowledge-baseknowledge-managementmarkdownnote-takingnotesnotes-appnotionnuxtnuxtjsoffline-firstoidcpwaselfhostedssovuevuejswiki
feat: new import system with support of attachments and unified files import (#700)
Smaug983f2aef8e4c
diff --git a/frontend/app/components/AppCollapse.vue b/frontend/app/components/AppCollapse.vuenew file mode 100644index 00000000..0f94f615--- /dev/null+++ b/frontend/app/components/AppCollapse.vue@@ -0,0 +1,97 @@+<template>+ <div class="app-collapse" :class="{ 'is-open': isOpen }">+ <button type="button" class="collapse-header" @click="isOpen = !isOpen">+ <span class="collapse-title">+ <slot name="title">{{ title }}</slot>+ </span>+ <Icon name="expand" :size="18" class="collapse-icon" />+ </button>++ <div class="collapse-body">+ <div class="collapse-content">+ <slot />+ </div>+ </div>+ </div>+</template>++<script setup lang="ts">+const props = withDefaults(+ defineProps<{+ title?: string;+ modelValue?: boolean;+ }>(),+ {+ title: '',+ modelValue: false,+ },+);++const emit = defineEmits<{+ 'update:modelValue': [value: boolean];+}>();++const isOpen = ref(props.modelValue);++watch(+ () => props.modelValue,+ val => {+ isOpen.value = val;+ },+);++watch(isOpen, val => {+ emit('update:modelValue', val);+});+</script>++<style scoped lang="scss">+.app-collapse {+ border: 1px solid var(--border, #e5e7eb);+ border-radius: 8px;+ overflow: hidden;+}++.collapse-header {+ display: flex;+ justify-content: space-between;+ align-items: center;+ width: 100%;+ padding: 0.75rem 1rem;+ border: none;+ font-weight: 600;+ color: inherit;+ text-align: left;+ background: transparent;+ cursor: pointer;+}++.collapse-icon {+ transition: transform 0.25s ease;+}++.is-open .collapse-icon {+ transform: rotate(180deg);+}++.collapse-body {+ display: grid;+ grid-template-rows: 0fr;+ transition: grid-template-rows 0.25s ease-out;+}++.is-open .collapse-body {+ grid-template-rows: 1fr;+}++.collapse-content {+ /* Optionnel : padding interne si le composant est ouvert */+ padding: 0 1rem;+ transition: padding 0.25s ease-out;+ overflow: hidden;+}++.is-open .collapse-content {+ padding: 0.5rem 1rem 1rem;+}+</style>diff --git a/frontend/app/components/AppDrop.vue b/frontend/app/components/AppDrop.vueindex 77238a28..bfbfbeef 100644--- a/frontend/app/components/AppDrop.vue+++ b/frontend/app/components/AppDrop.vue@@ -21,7 +21,7 @@/></div><footer>- <span class="total">{{ selectedFiles.length }} file{{ selectedFiles.length > 1 ? 's' : '' }} • {{ readableFileSize(totalSize) }}</span>+ <span class="total">{{ selectedFiles.length }} {{ t('cdn.appdrop.file', { n: selectedFiles.length }) }} • {{ readableFileSize(totalSize) }}</span><span class="link" @click="triggerFileSelect">+ {{ t('cdn.appdrop.addMore') }}</span></footer></div>diff --git a/frontend/app/components/ImportJob/Status.vue b/frontend/app/components/ImportJob/Status.vueindex 2d53b58c..b10996e4 100644--- a/frontend/app/components/ImportJob/Status.vue+++ b/frontend/app/components/ImportJob/Status.vue@@ -12,10 +12,12 @@<div class="progress-bar" :style="{ width: progress + '%' }"></div></div>- <!-- eslint-disable-next-line vue/no-v-html -->- <small v-if="displayErr" v-html="`${importJob.error_message}`"></small>- <small v-if="importJob.failures > 0">{{ importJob.failures }} {{ t('common.status.failed') }}</small>- <small v-if="importJob.created.length > 0">{{ importJob.created.length }} {{ t('common.status.completed') }}</small>+ <div class="footer">+ <!-- eslint-disable-next-line vue/no-v-html -->+ <small v-if="displayErr" v-html="`${importJob.error_message}`"></small>+ <small v-if="importJob.failures > 0">{{ importJob.failures }} {{ t('common.status.failed') }}</small>+ <small v-if="importJob.created.length > 0">{{ importJob.created.length }} {{ t('common.status.completed') }}</small>+ </div></div></template>@@ -112,6 +114,12 @@ const displayErr = computed(() => props.importJob.status === 'failed' || props.itransition: width $transition-medium ease;}+.footer {+ display: flex;+ flex-direction: column;+ gap: 0.25rem;+}+small {color: var(--text-primary);}diff --git a/frontend/app/components/Node/Import/Preview.vue b/frontend/app/components/Node/Import/Preview.vueindex 2dbe16cf..8bc0ca8c 100644--- a/frontend/app/components/Node/Import/Preview.vue+++ b/frontend/app/components/Node/Import/Preview.vue@@ -22,7 +22,7 @@<span class="version-date">{{ numericDate(node.updated_timestamp) }}</span></div></div>- <div class="doc-actions">+ <div v-if="allowSingleImport" class="doc-actions"><AppButton type="primary" size="sm" :disabled="isImporting" @click="importSingle">{{ t('import.tabs.importFromBackup') }}</AppButton>@@ -34,7 +34,9 @@import { resolveIcon, getRoleName } from '~/helpers/node';import type { DB_Node } from '~/stores';-const props = defineProps<{ node: DB_Node; selectable: boolean; selected?: boolean; isImporting?: boolean }>();+const props = withDefaults(defineProps<{ node: DB_Node; selectable: boolean; selected?: boolean; isImporting?: boolean; allowSingleImport?: boolean }>(), {+ allowSingleImport: true,+});const emit = defineEmits<{(e: 'toggleSelection' | 'importSingle'): void;diff --git a/frontend/app/helpers/backups/Importer.ts b/frontend/app/helpers/backups/Importer.tsindex 6fa45815..048c3af1 100644--- a/frontend/app/helpers/backups/Importer.ts+++ b/frontend/app/helpers/backups/Importer.ts@@ -13,6 +13,8 @@ export interface ImportJob<T = DB_Node, O = ImportOptions> {options: O;}+export type ImportBackupJob = ImportJob<ImportItem>;+interface ImportOptions {extractFrontMatter?: boolean;normalizeLineEndings?: boolean;@@ -28,12 +30,29 @@ interface ImportOptions {};}-interface NormalizedEntry<T = 'folder' | 'text_based' | 'resource'> {+interface ImportItemBase {+ id: string;+ name: string;+ status: 'pending' | 'completed' | 'failed';+ error_message?: string;+}++export interface NodeImportItem extends ImportItemBase {+ type: 'node';+ data: DB_Node;+}+export interface ResourceImportItem extends ImportItemBase {+ type: 'resource';+ data: ResourceImportTask;+}+export type ImportItem = NodeImportItem | ResourceImportItem;++export interface NormalizedEntry<T = 'folder' | 'text_based' | 'resource'> {id: string;+ parent_id?: string;filetype: T;file: File;filename?: string;- children?: NormalizedEntry[];content: string | ArrayBuffer;}export interface ResourceImportTask {@@ -66,71 +85,56 @@ export class Importer {for (const file of fileArray) {if (!isImportable(file)) continue;- const path = file.webkitRelativePath; // ex: "A/B/C/D/file.txt"+ const path = file.webkitRelativePath || file.name; // webkitRelativePath is only available when the user selects a folder, otherwise we use the file nameconst parts = path.split('/'); // ["A", "B", "C", "D", "file.txt"]+ const isFolder = Boolean(file.webkitRelativePath);+// --- 1. REBUILDING INTERMEDIATE FOLDERS ---// We iterate through the parts of the path, creating folder entries in normalized_files as needed.- let currentPath: string = '';-- for (let i = 0; i < parts.length - 1; i++) {- const folderName = parts[i]!;- const previousPath = currentPath;- currentPath = currentPath ? `${currentPath}/${folderName}` : folderName;-- // We check if this level of folder already exists in the global tree- let folderEntry = this.normalized_files.find(e => e.id === currentPath);-- // If we are at the first level ("A"), the parent is the root (undefined),- // otherwise it's the previous folder ("A/B" has "A" as parent)- if (!folderEntry) {- folderEntry = {- id: currentPath,- filetype: 'folder',- file: file, // We use the current file as a placeholder for the folder entry- filename: folderName,- children: [],- content: '',- };-- if (!previousPath) {- // Root folder of the import (ex: "A")+ if (isFolder) {+ let currentPath: string = '';++ for (let i = 0; i < parts.length - 1; i++) {+ const folderName = parts[i]!;+ const previousPath = currentPath;+ currentPath = currentPath ? `${currentPath}/${folderName}` : folderName;+ console.log('Processing folder:', currentPath, 'Previous path:', previousPath);+ // We check if this level of folder already exists in the global tree+ let folderEntry = this.normalized_files.find(e => e.id === currentPath);+ console.log('Existing folder entry:', folderEntry);+ // If we are at the first level ("A"), the parent is the root (undefined),+ // otherwise it's the previous folder ("A/B" has "A" as parent)+ if (!folderEntry) {+ folderEntry = {+ id: currentPath,+ parent_id: previousPath || undefined,+ filetype: 'folder',+ file: file, // We use the current file as a placeholder for the folder entry+ filename: folderName,+ content: '',+ };+this.normalized_files.push(folderEntry);- } else {- // Find the direct parent folder in the global structure to assign it as a child- const parentEntry = this.normalized_files.find(e => e.id === previousPath);- if (parentEntry && parentEntry.children) {- parentEntry.children.push(folderEntry);- } else {- // Security: If the parent folder doesn't exist (which shouldn't happen), we add the folder to the root of normalized_files- this.normalized_files.push(folderEntry);- }}}}-// --- 2. ADDING THE FILE TO ITS FINAL PARENT FOLDER ---- const finalParentPath = parts.slice(0, -1).join('/');+ const finalParentPath = isFolder ? parts.slice(0, -1).join('/') : path;const isText = file.type.startsWith('text/') || file.name.endsWith('.md') || file.name.endsWith('.json');const filetype: 'folder' | 'text_based' | 'resource' = isText ? 'text_based' : 'resource';const content = isText ? await file.text() : '';const fileEntry = {id: path,+ parent_id: finalParentPath || undefined,filetype,file,filename: file.name,content,};- // We find the final parent folder in the normalized structure and add the file to its children- const finalParentFolder = this.normalized_files.find(e => e.id === finalParentPath);- if (finalParentFolder && finalParentFolder.children) {- finalParentFolder.children.push(fileEntry);- } else {- // If the parent folder doesn't exist (which shouldn't happen), we add the file to the root of normalized_files- this.normalized_files.push(fileEntry);- }+ this.normalized_files.push(fileEntry);}}async normalizedToNodes() {@@ -191,8 +195,6 @@ export class Importer {file: entry.file,});}-- if (entry.children?.length) to_process.push(...entry.children);}return {nodesToCreate: this.nodes,diff --git a/frontend/app/helpers/backups/index.ts b/frontend/app/helpers/backups/index.tsindex 05f82e76..d8abe27d 100644--- a/frontend/app/helpers/backups/index.ts+++ b/frontend/app/helpers/backups/index.ts@@ -1,19 +1,15 @@-import type { FileEntry } from '@zip.js/zip.js';-import type { Manifest } from './types';+import { ZipReader, BlobReader, type FileEntry, BlobWriter } from '@zip.js/zip.js';+import type { FilesIndex, Manifest } from './types';import type { DB_Node } from '~/stores';+import type { ResourceImportTask } from './Importer';export async function readZipFile(file: File): Promise<FileEntry[]> {- const { ZipReader, BlobReader } = await import('@zip.js/zip.js');- const entries: FileEntry[] = [];const zipReader = new ZipReader(new BlobReader(file));- const zipEntries = await zipReader.getEntries();- for (const entry of zipEntries) {- if (!entry.directory && entry.filename.endsWith('.json')) {- entries.push(entry);- }- }+ const entries = await zipReader.getEntries();+await zipReader.close();- return entries;++ return entries as FileEntry[];}async function _readJSONFile(fileEntry: FileEntry): Promise<object> {@@ -58,18 +54,48 @@ export async function handleBackupFile(file: File): Promise<{manifest: Manifest;documents: DB_Node[] | null;localData: object | null;+ files: ResourceImportTask[];}> {const entries = await readZipFile(file);+let manifest: Manifest | null = null;let documents: DB_Node[] | null = null;let localData: object | null = null;+ let filesIndex: FilesIndex | null = null;+ const files: ResourceImportTask[] = [];+for (const entry of entries) {+ if (entry.directory) {+ continue;+ }+if (entry.filename === 'manifest.json') {manifest = await readBackupManifest(entry);} else if (entry.filename === 'documents.json') {documents = await readBackupDocuments(entry);} else if (entry.filename === 'user_settings.json') {localData = await readLocalData(entry);+ } else if (entry.filename === 'files_index.json') {+ const data = await _readJSONFile(entry);+ if (!Array.isArray(data)) {+ throw new Error('Invalid files index structure');+ }+ filesIndex = data as FilesIndex;+ }+ }++ if (filesIndex) {+ for (const fileEntry of filesIndex) {+ const entry = entries.find(e => e.filename === fileEntry.archive_path);+ if (entry) {+ const blob = await entry.getData!(new BlobWriter());+ const file = new File([blob], fileEntry.name, { type: fileEntry.metadata.filetype });+ files.push({+ id: fileEntry.id,+ parent_id: undefined,+ file,+ });+ }}}@@ -81,5 +107,6 @@ export async function handleBackupFile(file: File): Promise<{manifest,documents,localData,+ files,};}diff --git a/frontend/app/helpers/backups/types.ts b/frontend/app/helpers/backups/types.tsindex 002cd99d..8655d5a0 100644--- a/frontend/app/helpers/backups/types.ts+++ b/frontend/app/helpers/backups/types.ts@@ -14,3 +14,15 @@ export interface Manifest {total_size_bytes: number;};}+export interface FileIndex {+ archive_path: string;+ id: string;+ metadata: {+ filetype: string;+ transformed_path: string;+ };+ name: string;+ size: number;+}++export type FilesIndex = FileIndex[];diff --git a/frontend/app/pages/dashboard/import/_components/ImportActions.vue b/frontend/app/pages/dashboard/import/_components/ImportActions.vueindex 47ee884b..42d4e7be 100644--- a/frontend/app/pages/dashboard/import/_components/ImportActions.vue+++ b/frontend/app/pages/dashboard/import/_components/ImportActions.vue@@ -5,26 +5,24 @@<AppCheck v-model="preserveTimestamps"> {{ t('import.actions.preserveTimestamps') }} </AppCheck><AppCheck v-model="skipExisting"> {{ t('import.actions.skipExisting') }} </AppCheck></div>- <div class="actions-row">- <AppButton type="secondary" @click="resetImport">- <Icon name="close" :size="16" />- {{ t('import.actions.cancel') }}- </AppButton>- <AppButton type="primary" :disabled="isImporting || (importJob.toCreate.length === 0 && importJob.toUpdate.length === 0)" @click="importAll">- <Icon name="download" :size="16" />- {{ isImporting ? t('import.actions.importing') : t('import.actions.importAll') }}- </AppButton>- </div>+ <AppButton+ style=" display: flex; justify-content: center; align-items: center; gap: 0.5rem;width: 100%; margin-top: 2rem"+ type="primary"+ :disabled="isImporting || (importJob.toCreate.length === 0 && importJob.toUpdate.length === 0)"+ @click="importAll"+ >+ <Icon name="download" :size="16" />+ {{ isImporting ? t('import.actions.importing') : t('import.actions.importAll') }}+ </AppButton></div></template><script setup lang="ts">-import type { ImportJob } from '~/helpers/backups/Importer';+import type { ImportBackupJob } from '~/helpers/backups/Importer';const { t } = useI18nT();const props = defineProps<{- importJob: ImportJob;- resetImport: () => void;+ importJob: ImportBackupJob;importAll: () => void;}>();const preserveTimestamps = defineModel<boolean>('preserveTimestamps');@@ -35,10 +33,6 @@ const isImporting = computed(() => props.importJob.status === 'in_progress');<style scoped lang="scss">.actions-card {- display: flex;- justify-content: space-between;- align-items: center;- padding: 1rem;border-top: 1px solid var(--border);.import-options {diff --git a/frontend/app/pages/dashboard/import/_components/ImportReport.vue b/frontend/app/pages/dashboard/import/_components/ImportReport.vuenew file mode 100644index 00000000..d2bf2299--- /dev/null+++ b/frontend/app/pages/dashboard/import/_components/ImportReport.vue@@ -0,0 +1,233 @@+<template>+ <div class="report-card">+ <div class="report-header">+ <h3>Import report</h3>+ <div class="summary">+ <span class="chip success">{{ t('common.status.success') }}: {{ successCount }}</span>+ <span class="chip error">{{ t('common.status.failed') }}: {{ failedCount }}</span>+ <span class="chip neutral">{{ t('common.status.skipped') }}: {{ skippedCount }}</span>+ <span class="chip pending">{{ t('common.status.pending') }}: {{ pendingCount }}</span>+ </div>+ </div>++ <p v-if="importJob.error_message" class="global-error">{{ importJob.error_message }}</p>++ <div v-if="rows.length" class="table-wrapper">+ <table class="report-table">+ <thead>+ <tr>+ <th>{{ t('common.labels.name') }}</th>+ <th>{{ t('common.labels.kind') }}</th>+ <th>{{ t('common.labels.action') }}</th>+ <th>{{ t('common.labels.status') }}</th>+ <th>{{ t('common.errors.generic') }}</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="row in rows" :key="row.key">+ <td>{{ row.name }}</td>+ <td>{{ row.kind }}</td>+ <td>{{ row.action }}</td>+ <td>+ <span class="status" :class="row.statusClass">{{ row.statusLabel }}</span>+ </td>+ <td>{{ row.errorMessage || '-' }}</td>+ </tr>+ </tbody>+ </table>+ </div>++ <p v-else class="empty">No imported item to display.</p>++ <div class="actions">+ <AppButton type="secondary" @click="resetImport">Start a new import</AppButton>+ </div>+ </div>+</template>++<script setup lang="ts">+import type { ImportBackupJob, ImportItem } from '~/helpers/backups/Importer';++type ReportStatus = 'completed' | 'failed' | 'pending';+type ReportAction = 'create' | 'update';++interface ReportRow {+ key: string;+ id: string;+ name: string;+ kind: 'node' | 'resource';+ action: ReportAction;+ status: ReportStatus;+ statusClass: 'completed' | 'failed' | 'pending' | 'skipped';+ statusLabel: string;+ isSkipped: boolean;+ errorMessage?: string;+}++const props = defineProps<{+ importJob: ImportBackupJob;+ skipExisting?: boolean;+ resetImport: () => void;+}>();++const { t } = useI18nT();++const buildRow = (item: ImportItem, action: ReportAction): ReportRow => {+ const isSkipped = Boolean(props.skipExisting && action === 'update' && item.status === 'pending');++ return {+ key: `${action}-${item.id}`,+ id: item.id,+ name: item.name,+ kind: item.type,+ action,+ status: item.status,+ statusClass: isSkipped ? 'skipped' : item.status,+ statusLabel: isSkipped ? 'Skipped' : item.status === 'completed' ? 'Completed' : item.status === 'failed' ? 'Failed' : 'Pending',+ isSkipped,+ errorMessage: item.error_message,+ };+};++const rows = computed<ReportRow[]>(() => {+ const createRows = props.importJob.toCreate.map(item => buildRow(item, 'create'));+ const updateRows = props.importJob.toUpdate.map(item => buildRow(item, 'update'));+ return [...createRows, ...updateRows].sort((a, b) => {+ if (a.status !== b.status) {+ const order: Record<ReportStatus, number> = { failed: 0, pending: 1, completed: 2 };+ return order[a.status] - order[b.status];+ }+ return a.name.localeCompare(b.name);+ });+});++const successCount = computed(() => rows.value.filter(row => row.status === 'completed').length);+const failedCount = computed(() => rows.value.filter(row => row.status === 'failed').length);+const skippedCount = computed(() => rows.value.filter(row => row.isSkipped).length);+const pendingCount = computed(() => rows.value.filter(row => row.status === 'pending' && !row.isSkipped).length);++const resetImport = () => {+ props.resetImport();+};+</script>++<style scoped lang="scss">+.report-card {+ display: flex;+ flex-direction: column;+ gap: 1rem;+}++.report-header {+ display: flex;+ flex-wrap: wrap;+ justify-content: space-between;+ align-items: center;+ gap: 0.75rem;++ h2 {+ margin: 0;+ font-size: 1.2rem;+ }+}++.summary {+ display: flex;+ flex-wrap: wrap;+ align-items: baseline;+ gap: 0.5rem;+}++.chip {+ padding: 0.2rem 0.6rem;+ border-radius: var(--radius-xs);+ font-size: 0.8rem;+ font-weight: 600;++ &.success {+ color: var(--green);+ background: var(--green-bg);+ }++ &.error {+ color: var(--red);+ background: var(--red-bg);+ }++ &.pending {+ color: var(--orange);+ background: var(--orange-bg);+ }++ &.neutral {+ color: var(--grey);+ background: var(--grey-bg);+ }+}++.global-error {+ margin: 0;+ color: var(--red);+}++.table-wrapper {+ overflow-x: auto;+}++.report-table {+ width: 100%;+ min-width: 720px;+ border-collapse: collapse;++ th,+ td {+ padding: 0.6rem;+ border-bottom: 1px solid var(--border);+ font-size: 0.85rem;+ text-align: left;+ vertical-align: top;+ }++ th {+ color: var(--text-secondary);+ }+}++.status {+ display: inline-block;+ padding: 0.2rem 0.5rem;+ border-radius: var(--radius-xs);+ font-size: 0.8rem;+ font-weight: 600;++ &.completed {+ color: var(--green);+ background: var(--green-bg);+ }++ &.failed {+ color: var(--red);+ background: var(--red-bg);+ }++ &.pending {+ color: var(--orange);+ background: var(--orange-bg);+ }++ &.skipped {+ color: var(--text-secondary);+ background: var(--hover);+ }+}++.empty {+ margin: 0;+ color: var(--text-secondary);+}++.actions {+ display: flex;+ justify-content: flex-end;+}+</style>diff --git a/frontend/app/pages/dashboard/import/_components/ImportSummary.vue b/frontend/app/pages/dashboard/import/_components/ImportSummary.vueindex 64a8e873..a04b3082 100644--- a/frontend/app/pages/dashboard/import/_components/ImportSummary.vue+++ b/frontend/app/pages/dashboard/import/_components/ImportSummary.vue@@ -1,6 +1,6 @@<template><div class="ctn">- <h2>{{ t('import.summary.title') }}</h2>+ <h3>{{ t('import.summary.title') }}</h3><div class="stats"><div class="stat new"><Icon name="plus" :size="20" />@@ -18,18 +18,15 @@<span class="label">{{ t('import.summary.unchanged') }}</span></div></div>- <div class="progess">- <ImportJobStatus :import-job="importJob" />- </div></div></template><script setup lang="ts">-import type { ImportJob } from '~/helpers/backups/Importer';+import type { ImportBackupJob } from '~/helpers/backups/Importer';defineProps<{unchangedCount: number;- importJob: ImportJob;+ importJob: ImportBackupJob;}>();const { t } = useI18nT();@@ -83,8 +80,4 @@ const { t } = useI18nT();background: var(--grey-bg);}}--.progess {- margin-top: 1rem;-}</style>diff --git a/frontend/app/pages/dashboard/import/_components/ImportTabs.vue b/frontend/app/pages/dashboard/import/_components/ImportTabs.vueindex 217c3663..cb643ad6 100644--- a/frontend/app/pages/dashboard/import/_components/ImportTabs.vue+++ b/frontend/app/pages/dashboard/import/_components/ImportTabs.vue@@ -27,14 +27,14 @@</div><div class="documents-list"><NodeImportPreview- v-for="doc in importJob.toCreate"+ v-for="doc in importJob.toCreate.filter(d => d.type === 'node')":key="doc.id"- :node="doc"+ :node="doc.data"selectable:selected="selectedCreate.includes(doc.id)":is-importing="isImporting"@toggle-selection="() => toggleSelection(doc.id, 'create')"- @import-single="() => importSingle(doc, 'create')"+ @import-single="() => importSingle(doc.data, 'create')"/></div></template>@@ -56,14 +56,14 @@</div><div class="documents-list"><NodeImportPreview- v-for="doc in importJob.toUpdate"+ v-for="doc in importJob.toUpdate.filter(d => d.type === 'node')":key="doc.id"- :node="doc"+ :node="doc.data"selectable:selected="selectedUpdate.includes(doc.id)":is-importing="isImporting"@toggle-selection="() => toggleSelection(doc.id, 'update')"- @import-single="() => importSingle(doc, 'update')"+ @import-single="() => importSingle(doc.data, 'update')"/></div></template>@@ -89,9 +89,9 @@<script setup lang="ts">import type { DB_Node } from '~/stores';import type { Manifest } from '~/helpers/backups/types';-import type { ImportJob } from '~/helpers/backups/Importer';+import type { ImportBackupJob, ResourceImportTask } from '~/helpers/backups/Importer';-const props = defineProps<{ manifest: Manifest; importJob: ImportJob }>();+const props = defineProps<{ manifest: Manifest; importJob: ImportBackupJob }>();const emit = defineEmits<{(e: 'import', type: 'create' | 'update', nodeIds: string[]): void;(e: 'importLocalSettings'): void;@@ -134,7 +134,7 @@ function toggleSelectAllUpdate(value: boolean) {}}-function importSingle(doc: DB_Node, type: 'create' | 'update') {+function importSingle(doc: DB_Node | ResourceImportTask, type: 'create' | 'update') {emit('import', type, [doc.id]);}function importSelected(type: 'create' | 'update') {diff --git a/frontend/app/pages/dashboard/import/advanced.vue b/frontend/app/pages/dashboard/import/advanced.vuedeleted file mode 100644index 469b5a1e..00000000--- a/frontend/app/pages/dashboard/import/advanced.vue+++ /dev/null@@ -1,242 +0,0 @@-<template>- <div class="page-card files-import">- <Teleport to="#navbar-title">{{ t('import.files.meta.title') }} <tag v-if="displayFeatureTags" class="orange">Beta</tag></Teleport>- <p class="subtitle">- {{ t('import.files.meta.description') }}- </p>-- <AppDrop ref="dropComponent" multiple allow-folders :max-files="200" @select="selectFiles" />- <small>{{ t('import.files.importable') }}</small>-- <h3>{{ t('import.advanced.options') }}</h3>-- <div class="actions-row">- <AppToggle v-model="importJob.options.extractFrontMatter" />- <p>{{ t('import.actions.extractFrontMatter') }}</p>- </div>-- <div class="actions-row">- <AppToggle v-model="importJob.options.normalizeLineEndings" />- <p>{{ t('import.actions.normalizeLineEndings') }}</p>- </div>-- <div class="actions-row">- <AppToggle v-model="importJob.options.preserveTimestamps" />- <p>{{ t('import.actions.preserveTimestamps') }}</p>- </div>- <div>- <div>- <label for="default-parent">{{ t('import.advanced.defaultParent') }}</label>- <AppSelect- v-model="importJob.options.defaultValues!!.defaultParent"- class="entry"- :items="categoriesItem"- nullable- :placeholder="t('common.labels.parent')"- />- </div>- <label for="default-description">- {{ t('import.advanced.defaultDescription') }}- </label>- <input- id="default-description"- v-model="importJob.options.defaultValues!.defaultDescription"- type="text"- placeholder="Default description for imported nodes"- />- <label for="default-tags">- {{ t('import.advanced.defaultTags') }}- </label>- <input id="default-tags" v-model="importJob.options.defaultValues!.defaultTags" type="text" placeholder="tag1, tag2, tag3" />- <label for="default-color">- {{ t('import.advanced.defaultColor') }}- </label>- <AppColorPicker id="default-color" v-model="importJob.options.defaultValues!.defaultColor" nullable />- <label for="default-thumbnail">- {{ t('import.advanced.defaultThumbnail') }}- </label>- <input id="default-thumbnail" v-model="importJob.options.defaultValues!.defaultThumbnail" type="text" />- <label for="default-icon">- {{ t('import.advanced.defaultIcon') }}- </label>- <input id="default-icon" v-model="importJob.options.defaultValues!.defaultIcon" type="text" />- <label for="default-theme">- {{ t('import.advanced.defaultTheme') }}- </label>- <AppSelect id="default-theme" v-model="importJob.options.defaultValues!.defaultTheme" :items="DOCUMENT_THEMES" />- </div>- <h3>{{ t('import.progress.title') }}</h3>- <ImportJobStatus :import-job="importJob" />- <section v-if="nodes.length" class="panel">- <div class="panel-head">- <h3>{{ t('import.files.toImport') }} ({{ totalItemsToImport }})</h3>- <div class="actions-row">- <AppButton type="primary" size="sm" :disabled="selectedNodes.length === 0" @click="importSelected">- {{ t('import.tabs.importSelected', { count: selectedNodes.length }) }}- </AppButton>- <AppButton type="primary" @click="importAll">- <Icon name="download" :size="16" />- {{ t('import.actions.importAll') }}- </AppButton>- </div>- </div>- <div class="list">- <NodeImportPreview- v-for="node in nodes"- :key="node.id"- :node="node"- selectable- :selected="selectedNodes.includes(node.id)"- @toggle-selection="() => toggleSelection(node.id)"- @import-single="() => importSingle(node)"- />- <FileInline- v-for="resource in resourcesToUpload"- :key="resource.id"- :file="resource.file"- :selected="selectedNodes.includes(resource.id)"- :remove-file="() => false"- />- </div>- </section>- </div>-</template>-<script setup lang="ts">-import { Importer, type ResourceImportTask, type ImportJob } from '~/helpers/backups/Importer';-import { DOCUMENT_THEMES } from '~/helpers/constants';-import type { DB_Node } from '~/stores';--definePageMeta({ breadcrumb: { i18n: 'import.meta.breadcrumb' } });--const nodesImporterStore = useNodesImporterStore();-const preferences = usePreferencesStore();--const nodesTree = useNodesTree();-const { t } = useI18nT();--const categoriesItem = nodesTree.getTreeUpToRole(2);-const displayFeatureTags = preferences.get('displayFeatureTags');--const selectedNodes = ref<string[]>([]);--const files = ref<File[]>([]);-const nodes = ref<DB_Node[]>([]);-const resourcesToUpload = ref<ResourceImportTask[]>([]);--const totalItemsToImport = computed(() => nodes.value.length + resourcesToUpload.value.length);--const importJob = ref<ImportJob>({- status: 'pending',- toCreate: [],- toUpdate: [],- created: [],- updated: [],- failures: 0,- options: {- extractFrontMatter: true,- normalizeLineEndings: true,- preserveTimestamps: true,- defaultValues: {- defaultParent: undefined,- defaultDescription: '',- defaultTags: '',- defaultColor: -1,- defaultThumbnail: '',- defaultIcon: '',- defaultTheme: '',- },- },-});--watch(- () => importJob.value,- _ => {- // Re-process files with new options- if (files.value.length) processImport();- },- { deep: true },-);--function selectFiles(importedFiles: File | File[] | null) {- if (!importedFiles) return;- files.value = Array.isArray(importedFiles) ? importedFiles : [importedFiles];- processImport();-}--async function processImport() {- if (!files.value) return;- const imp = new Importer(importJob.value.options);- await imp.handleFiles(files.value);-- const result = await imp.normalizedToNodes();- nodes.value = result.nodesToCreate;- resourcesToUpload.value = result.resourcesToUpload;-}--function toggleSelection(id: string) {- const idx = selectedNodes.value.indexOf(id);- if (idx === -1) selectedNodes.value.push(id);- else selectedNodes.value.splice(idx, 1);-}--const importSingle = (node: DB_Node) => {- const relatedResources = resourcesToUpload.value.filter(r => r.id === node.id || r.parent_id === node.id);- importNodes([node], relatedResources);-};--const importSelected = () => {- const targetNodes = nodes.value.filter(n => selectedNodes.value.includes(n.id));- const targetResources = resourcesToUpload.value.filter(r => selectedNodes.value.includes(r.id) || (r.parent_id && selectedNodes.value.includes(r.parent_id)));- importNodes(targetNodes, targetResources);-};--const importAll = () => importNodes(nodes.value, resourcesToUpload.value);--async function importNodes(nodesToImport: DB_Node[], resourcesImport: ResourceImportTask[]) {- importJob.value.toCreate = nodesToImport;- importJob.value.toUpdate = [];- await nodesImporterStore.importAllNodesAndResources({ toCreate: nodesToImport, toUpdate: [], resources: resourcesImport }, importJob);- nodes.value = [];- resourcesToUpload.value = [];-}-</script>--<style scoped lang="scss">-.files-import {- display: grid;- gap: 1rem;-}--.actions-row > p {- margin: 0.1rem;-}--label {- margin-top: 0.5rem;-}--.panel {- padding: 0.85rem;- border: 1px solid var(--border);- border-radius: 10px;-}--.panel h3 {- margin: 0 0 0.65rem;-}--.panel-head {- display: flex;- justify-content: space-between;- align-items: center;- gap: 0.7rem;- margin-bottom: 0.65rem;-}--.list {- display: grid;- gap: 0.35rem;- max-height: 250px;- overflow: auto;-}-</style>diff --git a/frontend/app/pages/dashboard/import/backup.vue b/frontend/app/pages/dashboard/import/backup.vueindex f7ec07b6..23f27fc2 100644--- a/frontend/app/pages/dashboard/import/backup.vue+++ b/frontend/app/pages/dashboard/import/backup.vue@@ -25,17 +25,25 @@<!-- Import Summary --><SummaryCard :unchanged-count="unchangedCount" :import-job="importJob" />- <!-- Tabs for New / Updates -->- <ImportTabs :manifest="manifest" :import-job="importJob" @import="importNodes" @import-local-settings="importLocalSettings" />+ <AppRadio v-model="type" :items="IMPORT_TYPES" placeholder="Import Type" />- <!-- Import All Actions -->+ <!-- Tabs for New / Updates -->+ <ImportTabs v-if="type === 'selected'" :manifest="manifest" :import-job="importJob" @import="importNodes" @import-local-settings="importLocalSettings" /><ImportActions+ v-if="type === 'all'"v-model:preserve-timestamps="importJob.options.preserveTimestamps"v-model:skip-existing="importOptions.skipExisting":reset-import="resetImport":import-all="importAll":import-job="importJob"/>+ <ImportJobStatus :import-job="importJob" />++ <!-- Import All Actions -->+ </template>+ <template v-if="step === 'report'">+ <ImportHeader v-if="manifest" :manifest="manifest" :reset-import="resetImport" />+ <ImportReport :import-job="importJob" :skip-existing="importOptions.skipExisting" :reset-import="resetImport" /></template></div></template>@@ -45,10 +53,10 @@ import ImportHeader from './_components/ImportHeader.vue';import SummaryCard from './_components/ImportSummary.vue';import ImportTabs from './_components/ImportTabs.vue';import ImportActions from './_components/ImportActions.vue';+import ImportReport from './_components/ImportReport.vue';import { handleBackupFile } from '~/helpers/backups';-import type { ImportJob } from '~/helpers/backups/Importer';+import type { ImportBackupJob } from '~/helpers/backups/Importer';import type { Manifest } from '~/helpers/backups/types';-import type { DB_Node } from '~/stores/db_structures';definePageMeta({ breadcrumb: { i18n: 'import.meta.breadcrumb' } });@@ -58,18 +66,19 @@ const { t } = useI18nT();const notifications = useNotifications();// State-const step = ref<'select' | 'preview'>('select');+const step = ref<'select' | 'preview' | 'report'>('select');+const type = ref<'all' | 'selected'>('all');const selectedFile = ref<File>();const isAnalyzing = ref(false);const analyzeError = ref('');// Backup dataconst manifest = ref<Manifest | null>(null);-const backupDocuments = ref<DB_Node[]>([]);+const totalItems = ref<number>(0);const localData = ref<object | null>(null);// Import state-const importJob = ref<ImportJob>({+const importJob = ref<ImportBackupJob>({status: 'pending',toCreate: [],toUpdate: [],@@ -81,13 +90,17 @@ const importJob = ref<ImportJob>({},});+const IMPORT_TYPES = [+ { id: 'all', label: 'Import All' },+ { id: 'selected', label: 'Import Selection' },+];+const importOptions = reactive({skipExisting: false,});const unchangedCount = computed(() => {- if (!backupDocuments.value.length) return 0;- return backupDocuments.value.length - importJob.value.toCreate.length - importJob.value.toUpdate.length;+ return totalItems.value - importJob.value.toCreate.length - importJob.value.toUpdate.length;});// Methods@@ -109,12 +122,12 @@ async function analyzeFile() {localData.value = result.localData;if (result.documents?.length) {- backupDocuments.value = result.documents;- const { toCreate: create, toUpdate: update } = nodesImporterStore.prepareImport(result.documents);+ totalItems.value = result.documents.length + result.files.length;+ const { toCreate: create, toUpdate: update } = nodesImporterStore.prepareImport(result.documents, result.files);importJob.value.toCreate = create;importJob.value.toUpdate = update;} else {- backupDocuments.value = [];+ totalItems.value = 0;importJob.value.toCreate = [];importJob.value.toUpdate = [];}@@ -131,7 +144,7 @@ function resetImport() {step.value = 'select';selectedFile.value = undefined;manifest.value = null;- backupDocuments.value = [];+ totalItems.value = 0;importJob.value.toCreate = [];importJob.value.toUpdate = [];@@ -149,14 +162,13 @@ function resetImport() {}async function importNodes(type: 'create' | 'update', ids: string[]) {- const nodes: DB_Node[] =- type === 'create' ? importJob.value.toCreate.filter(d => ids.includes(d.id)) : importJob.value.toUpdate.filter(d => ids.includes(d.id));+ const nodes = type === 'create' ? importJob.value.toCreate.filter(d => ids.includes(d.id)) : importJob.value.toUpdate.filter(d => ids.includes(d.id));if (type === 'create') {- await nodesImporterStore.importAllNodesAndResources({ toCreate: nodes, toUpdate: [], resources: [] }, importJob);+ await nodesImporterStore.importAllNodesAndResources({ toCreate: nodes, toUpdate: [] }, importJob, true);importJob.value.toCreate = importJob.value.toCreate.filter(d => !importJob.value.created.includes(d.id));} else if (type == 'update') {- await nodesImporterStore.importAllNodesAndResources({ toCreate: [], toUpdate: nodes, resources: [] }, importJob);+ await nodesImporterStore.importAllNodesAndResources({ toCreate: [], toUpdate: nodes }, importJob, true);importJob.value.toUpdate = importJob.value.toUpdate.filter(d => !importJob.value.updated.includes(d.id));}@@ -191,9 +203,18 @@ async function importAll() {const createDocs = importJob.value.toCreate;const updateDocs = importOptions.skipExisting ? [] : importJob.value.toUpdate;- await nodesImporterStore.importAllNodesAndResources({ toCreate: createDocs, toUpdate: updateDocs, resources: [] }, importJob);- importJob.value.toCreate = importJob.value.toCreate.filter(d => !importJob.value.created.includes(d.id));- importJob.value.toUpdate = importJob.value.toUpdate.filter(d => !importJob.value.updated.includes(d.id));+ await nodesImporterStore.importAllNodesAndResources({ toCreate: createDocs, toUpdate: updateDocs }, importJob, true);++ step.value = 'report';++ if (importJob.value.failures > 0 || importJob.value.status === 'failed') {+ notifications.add({+ type: 'error',+ title: t('import.notifications.importFailedTitle'),+ message: importJob.value.error_message || `${importJob.value.failures} item(s) failed during import`,+ });+ return;+ }notifications.add({type: 'success',diff --git a/frontend/app/pages/dashboard/import/files.vue b/frontend/app/pages/dashboard/import/files.vueindex c4d1e691..21313a6c 100644--- a/frontend/app/pages/dashboard/import/files.vue+++ b/frontend/app/pages/dashboard/import/files.vue@@ -1,58 +1,116 @@<template><div class="page-card files-import">- <Teleport to="#navbar-title">{{ t('import.files.meta.title') }} <tag v-if="displayFeatureTags" class="orange">Beta</tag></Teleport>+ <Teleport to="#navbar-title">{{ t('import.files.meta.title') }} <tag v-if="displayFeatureTags" class="orange">Beta v2</tag></Teleport><p class="subtitle">{{ t('import.files.meta.description') }}</p>- <AppDrop ref="dropComponent" multiple allow-folders :max-files="100" @select="selectFiles" />+ <AppDrop ref="dropComponent" multiple :max-files="200" @select="selectFiles" /><small>{{ t('import.files.importable') }}</small>- <section v-if="nodes.length" class="panel">- <div class="panel-head">- <h3>{{ t('import.files.toImport') }} ({{ nodes.length }})</h3>- <div class="actions-row">- <AppButton type="primary" size="sm" :disabled="selectedNodes.length === 0" @click="importSelected">- {{ t('import.tabs.importSelected', { count: selectedNodes.length }) }}- </AppButton>- <AppButton type="primary" @click="importAll">- <Icon name="download" :size="16" />- {{ t('import.actions.importAll') }}- </AppButton>++ <AppCollapse :title="t('import.folder.options')">+ <div class="actions-row">+ <AppToggle v-model="importJob.options.extractFrontMatter" />+ <p>{{ t('import.actions.extractFrontMatter') }}</p>+ </div>++ <div class="actions-row">+ <AppToggle v-model="importJob.options.normalizeLineEndings" />+ <p>{{ t('import.actions.normalizeLineEndings') }}</p>+ </div>++ <div class="actions-row">+ <AppToggle v-model="importJob.options.preserveTimestamps" />+ <p>{{ t('import.actions.preserveTimestamps') }}</p>+ </div>+ <div>+ <div>+ <label for="default-parent">{{ t('import.folder.defaultParent') }}</label>+ <AppSelect+ v-model="importJob.options.defaultValues!!.defaultParent"+ class="entry"+ :items="categoriesItem"+ nullable+ :placeholder="t('common.labels.parent')"+ /></div>+ <label for="default-description">+ {{ t('import.folder.defaultDescription') }}+ </label>+ <input+ id="default-description"+ v-model="importJob.options.defaultValues!.defaultDescription"+ type="text"+ placeholder="Default description for imported nodes"+ />+ <label for="default-tags">+ {{ t('import.folder.defaultTags') }}+ </label>+ <input id="default-tags" v-model="importJob.options.defaultValues!.defaultTags" type="text" placeholder="tag1, tag2, tag3" />+ <label for="default-color">+ {{ t('import.folder.defaultColor') }}+ </label>+ <AppColorPicker id="default-color" v-model="importJob.options.defaultValues!.defaultColor" nullable />+ <label for="default-thumbnail">+ {{ t('import.folder.defaultThumbnail') }}+ </label>+ <input id="default-thumbnail" v-model="importJob.options.defaultValues!.defaultThumbnail" type="text" />+ <label for="default-icon">+ {{ t('import.folder.defaultIcon') }}+ </label>+ <input id="default-icon" v-model="importJob.options.defaultValues!.defaultIcon" type="text" />+ <label for="default-theme">+ {{ t('import.folder.defaultTheme') }}+ </label>+ <AppSelect id="default-theme" v-model="importJob.options.defaultValues!.defaultTheme" :items="DOCUMENT_THEMES" />+ </div>+ </AppCollapse>+ <h3>{{ t('import.progress.title') }}</h3>+ <ImportJobStatus :import-job="importJob" />+ <section v-if="totalItemsToImport && importJob.status === 'pending'" class="panel">+ <div class="panel-head">+ <h3>{{ t('import.files.toImport') }} ({{ totalItemsToImport }})</h3>++ <AppButton type="primary" @click="importNodes">+ <Icon name="download" :size="16" />+ {{ t('import.actions.importAll') }}+ </AppButton></div>- <ImportJobStatus :import-job="importJob" /><div class="list"><NodeImportPreview- v-for="node in nodes"- :key="node.id"- :node="node"- selectable- :selected="selectedNodes.includes(node.id)"- @toggle-selection="() => toggleSelection(node.id)"- @import-single="() => importSingle(node)"+ v-for="item in importJob.toCreate.filter(i => i.type === 'node')"+ :key="item.id"+ :node="item.data"+ :selectable="false"+ :allow-single-import="false"/>+ <FileInline v-for="item in importJob.toCreate.filter(i => i.type === 'resource')" :key="item.id" :file="item.data.file" :remove-file="() => false" /></div></section>+ <ImportReport v-if="importJob.status === 'completed' || importJob.status === 'failed'" :import-job="importJob" :reset-import="() => {}" /></div></template>-<script setup lang="ts">-import { Importer, type ImportJob } from '~/helpers/backups/Importer';-import type { DB_Node } from '~/stores';+import { Importer, type ImportJob, type ImportItem } from '~/helpers/backups/Importer';+import { DOCUMENT_THEMES } from '~/helpers/constants';+import ImportReport from './_components/ImportReport.vue';definePageMeta({ breadcrumb: { i18n: 'import.meta.breadcrumb' } });const nodesImporterStore = useNodesImporterStore();const preferences = usePreferencesStore();+const nodesTree = useNodesTree();const { t } = useI18nT();+const categoriesItem = nodesTree.getTreeUpToRole(2);const displayFeatureTags = preferences.get('displayFeatureTags');-const selectedNodes = ref<string[]>([]);-const nodes = ref<DB_Node[]>([]);+const files = ref<File[]>([]);++const totalItemsToImport = computed(() => importJob.value.toCreate.length);-const importJob = ref<ImportJob>({+const importJob = ref<ImportJob<ImportItem>>({status: 'pending',toCreate: [],toUpdate: [],@@ -62,42 +120,62 @@ const importJob = ref<ImportJob>({options: {extractFrontMatter: true,normalizeLineEndings: true,- preserveTimestamps: false,+ preserveTimestamps: true,defaultValues: {- defaultColor: 0,+ defaultParent: undefined,defaultDescription: '',defaultTags: '',+ defaultColor: -1,+ defaultThumbnail: '',defaultIcon: '',defaultTheme: '',- defaultThumbnail: '',},},});-async function selectFiles(files: File | File[] | null) {- if (!files) return;- const imp = new Importer(importJob.value.options);- await imp.handleFiles(files);- nodes.value = (await imp.normalizedToNodes()).nodesToCreate;+watch(+ () => importJob.value.options,+ _ => {+ // Re-process files with new options+ if (files.value.length) processImport();+ },+ { deep: true },+);++function selectFiles(importedFiles: File | File[] | null) {+ if (!importedFiles) return;+ files.value = Array.isArray(importedFiles) ? importedFiles : [importedFiles];+ processImport();}-function toggleSelection(id: string) {- const idx = selectedNodes.value.indexOf(id);- if (idx === -1) selectedNodes.value.push(id);- else selectedNodes.value.splice(idx, 1);+async function processImport() {+ if (!files.value) return;+ const imp = new Importer(importJob.value.options);+ await imp.handleFiles(files.value);+ const result = await imp.normalizedToNodes();+ importJob.value.toCreate = [];+ importJob.value.toCreate.push(+ ...(result.nodesToCreate.map(node => ({+ type: 'node',+ data: node,+ id: node.id,+ name: node.name,+ status: 'pending',+ })) as ImportItem[]),+ );+ importJob.value.toCreate.push(+ ...(result.resourcesToUpload.map(resource => ({+ type: 'resource',+ data: resource,+ id: resource.id,+ name: resource.file.name,+ status: 'pending',+ })) as ImportItem[]),+ );}-const importSingle = (node: DB_Node) => importNodes([node]);-const importSelected = () => {- const toImport = nodes.value.filter(n => selectedNodes.value.includes(n.id));- importNodes(toImport);-};-const importAll = () => importNodes(nodes.value);--async function importNodes(importNodes: DB_Node[]) {- importJob.value.toCreate = importNodes;- await nodesImporterStore.importAllNodesAndResources({ toCreate: importNodes, toUpdate: [], resources: [] }, importJob);- nodes.value = nodes.value.filter(n => !importJob.value.created.includes(n.id));+async function importNodes() {+ await nodesImporterStore.importAllNodesAndResources({ toCreate: importJob.value.toCreate, toUpdate: importJob.value.toUpdate }, importJob);}</script>@@ -107,6 +185,14 @@ async function importNodes(importNodes: DB_Node[]) {gap: 1rem;}+.actions-row > p {+ margin: 0.1rem;+}++label {+ margin-top: 0.5rem;+}+.panel {padding: 0.85rem;border: 1px solid var(--border);@@ -131,10 +217,4 @@ async function importNodes(importNodes: DB_Node[]) {max-height: 250px;overflow: auto;}--@media (width <= 900px) {- .grid {- grid-template-columns: 1fr;- }-}</style>diff --git a/frontend/app/pages/dashboard/import/folder.vue b/frontend/app/pages/dashboard/import/folder.vuenew file mode 100644index 00000000..6e4b252c--- /dev/null+++ b/frontend/app/pages/dashboard/import/folder.vue@@ -0,0 +1,220 @@+<template>+ <div class="page-card files-import">+ <Teleport to="#navbar-title">{{ t('import.categories.folder.title') }} <tag v-if="displayFeatureTags" class="orange">Beta v2</tag></Teleport>+ <p class="subtitle">+ {{ t('import.categories.folder.description') }}+ </p>++ <AppDrop ref="dropComponent" multiple allow-folders :max-files="200" @select="selectFiles" />+ <small>{{ t('import.files.importable') }}</small>++ <AppCollapse :title="t('import.folder.options')">+ <div class="actions-row">+ <AppToggle v-model="importJob.options.extractFrontMatter" />+ <p>{{ t('import.actions.extractFrontMatter') }}</p>+ </div>++ <div class="actions-row">+ <AppToggle v-model="importJob.options.normalizeLineEndings" />+ <p>{{ t('import.actions.normalizeLineEndings') }}</p>+ </div>++ <div class="actions-row">+ <AppToggle v-model="importJob.options.preserveTimestamps" />+ <p>{{ t('import.actions.preserveTimestamps') }}</p>+ </div>+ <div>+ <div>+ <label for="default-parent">{{ t('import.folder.defaultParent') }}</label>+ <AppSelect+ v-model="importJob.options.defaultValues!!.defaultParent"+ class="entry"+ :items="categoriesItem"+ nullable+ :placeholder="t('common.labels.parent')"+ />+ </div>+ <label for="default-description">+ {{ t('import.folder.defaultDescription') }}+ </label>+ <input+ id="default-description"+ v-model="importJob.options.defaultValues!.defaultDescription"+ type="text"+ placeholder="Default description for imported nodes"+ />+ <label for="default-tags">+ {{ t('import.folder.defaultTags') }}+ </label>+ <input id="default-tags" v-model="importJob.options.defaultValues!.defaultTags" type="text" placeholder="tag1, tag2, tag3" />+ <label for="default-color">+ {{ t('import.folder.defaultColor') }}+ </label>+ <AppColorPicker id="default-color" v-model="importJob.options.defaultValues!.defaultColor" nullable />+ <label for="default-thumbnail">+ {{ t('import.folder.defaultThumbnail') }}+ </label>+ <input id="default-thumbnail" v-model="importJob.options.defaultValues!.defaultThumbnail" type="text" />+ <label for="default-icon">+ {{ t('import.folder.defaultIcon') }}+ </label>+ <input id="default-icon" v-model="importJob.options.defaultValues!.defaultIcon" type="text" />+ <label for="default-theme">+ {{ t('import.folder.defaultTheme') }}+ </label>+ <AppSelect id="default-theme" v-model="importJob.options.defaultValues!.defaultTheme" :items="DOCUMENT_THEMES" />+ </div>+ </AppCollapse>+ <h3>{{ t('import.progress.title') }}</h3>+ <ImportJobStatus :import-job="importJob" />+ <section v-if="totalItemsToImport && importJob.status === 'pending'" class="panel">+ <div class="panel-head">+ <h3>{{ t('import.files.toImport') }} ({{ totalItemsToImport }})</h3>++ <AppButton type="primary" @click="importNodes">+ <Icon name="download" :size="16" />+ {{ t('import.actions.importAll') }}+ </AppButton>+ </div>+ <div class="list">+ <NodeImportPreview+ v-for="item in importJob.toCreate.filter(i => i.type === 'node')"+ :key="item.id"+ :node="item.data"+ :selectable="false"+ :allow-single-import="false"+ />+ <FileInline v-for="item in importJob.toCreate.filter(i => i.type === 'resource')" :key="item.id" :file="item.data.file" :remove-file="() => false" />+ </div>+ </section>+ <ImportReport v-if="importJob.status === 'completed' || importJob.status === 'failed'" :import-job="importJob" :reset-import="() => {}" />+ </div>+</template>+<script setup lang="ts">+import { Importer, type ImportJob, type ImportItem } from '~/helpers/backups/Importer';+import { DOCUMENT_THEMES } from '~/helpers/constants';+import ImportReport from './_components/ImportReport.vue';++definePageMeta({ breadcrumb: { i18n: 'import.meta.breadcrumb' } });++const nodesImporterStore = useNodesImporterStore();+const preferences = usePreferencesStore();++const nodesTree = useNodesTree();+const { t } = useI18nT();++const categoriesItem = nodesTree.getTreeUpToRole(2);+const displayFeatureTags = preferences.get('displayFeatureTags');++const files = ref<File[]>([]);++const totalItemsToImport = computed(() => importJob.value.toCreate.length);++const importJob = ref<ImportJob<ImportItem>>({+ status: 'pending',+ toCreate: [],+ toUpdate: [],+ created: [],+ updated: [],+ failures: 0,+ options: {+ extractFrontMatter: true,+ normalizeLineEndings: true,+ preserveTimestamps: true,+ defaultValues: {+ defaultParent: undefined,+ defaultDescription: '',+ defaultTags: '',+ defaultColor: -1,+ defaultThumbnail: '',+ defaultIcon: '',+ defaultTheme: '',+ },+ },+});++watch(+ () => importJob.value.options,+ _ => {+ // Re-process files with new options+ if (files.value.length) processImport();+ },+ { deep: true },+);++function selectFiles(importedFiles: File | File[] | null) {+ if (!importedFiles) return;+ files.value = Array.isArray(importedFiles) ? importedFiles : [importedFiles];+ processImport();+}++async function processImport() {+ if (!files.value) return;+ const imp = new Importer(importJob.value.options);+ await imp.handleFiles(files.value);+ const result = await imp.normalizedToNodes();+ importJob.value.toCreate = [];+ importJob.value.toCreate.push(+ ...(result.nodesToCreate.map(node => ({+ type: 'node',+ data: node,+ id: node.id,+ name: node.name,+ status: 'pending',+ })) as ImportItem[]),+ );+ importJob.value.toCreate.push(+ ...(result.resourcesToUpload.map(resource => ({+ type: 'resource',+ data: resource,+ id: resource.id,+ name: resource.file.name,+ status: 'pending',+ })) as ImportItem[]),+ );+}++async function importNodes() {+ await nodesImporterStore.importAllNodesAndResources({ toCreate: importJob.value.toCreate, toUpdate: importJob.value.toUpdate }, importJob);+}+</script>++<style scoped lang="scss">+.files-import {+ display: grid;+ gap: 1rem;+}++.actions-row > p {+ margin: 0.1rem;+}++label {+ margin-top: 0.5rem;+}++.panel {+ padding: 0.85rem;+ border: 1px solid var(--border);+ border-radius: 10px;+}++.panel h3 {+ margin: 0 0 0.65rem;+}++.panel-head {+ display: flex;+ justify-content: space-between;+ align-items: center;+ gap: 0.7rem;+ margin-bottom: 0.65rem;+}++.list {+ display: grid;+ gap: 0.35rem;+ max-height: 250px;+ overflow: auto;+}+</style>diff --git a/frontend/app/pages/dashboard/import/index.vue b/frontend/app/pages/dashboard/import/index.vueindex f2d748ac..82e7c380 100644--- a/frontend/app/pages/dashboard/import/index.vue+++ b/frontend/app/pages/dashboard/import/index.vue@@ -4,38 +4,29 @@<p class="page-subtitle">{{ t('import.meta.description') }}- <NuxtLink to="/dashboard/settings?p=backup">{{ t('import.meta.settingsLink') }}</NuxtLink>+ <NuxtLink to="/dashboard/settings?p=backup" class="settings-link">{{ t('import.meta.settingsLink') }}</NuxtLink></p><section class="cards-grid"><NuxtLink class="import-card" to="/dashboard/import/backup">- <div class="top">- <h3>{{ t('import.categories.backup.title') }}</h3>- <tag class="green">{{ t('common.labels.basic') }}</tag>- </div>+ <h3>{{ t('import.categories.backup.title') }}</h3><IconApp class="icon-app" /><p>{{ t('import.categories.backup.description') }}</p><span class="cta">{{ t('common.actions.open') }}</span></NuxtLink><NuxtLink class="import-card" to="/dashboard/import/files">- <div class="top">- <h3>{{ t('import.categories.files.title') }}</h3>- <tag class="green">{{ t('common.labels.basic') }}</tag>- </div>+ <h3>{{ t('import.categories.files.title') }}</h3><Icon name="files" display="xxl" /><p>{{ t('import.categories.files.description') }}</p><span class="cta">{{ t('common.actions.open') }}</span></NuxtLink>- <NuxtLink class="import-card" to="/dashboard/import/advanced">- <div class="top" style="position: relative">- <h3>{{ t('import.categories.advanced.title') }}<span class="bubble" /></h3>- <tag class="orange">{{ t('common.labels.advanced') }}</tag>- </div>- <Icon name="advanced" display="xxl" />- <p>{{ t('import.categories.advanced.description') }}</p>- <span class="cta">{{ t('common.actions.preview') }}</span>+ <NuxtLink class="import-card" to="/dashboard/import/folder">+ <h3>{{ t('import.categories.folder.title') }}</h3>+ <Icon name="folder" display="xxl" />+ <p>{{ t('import.categories.folder.description') }}</p>+ <span class="cta">{{ t('common.actions.open') }}</span></NuxtLink></section></div>@@ -54,6 +45,11 @@ const { t } = useI18nT();gap: 1rem;}+.settings-link {+ color: var(--primary);+ cursor: pointer;+}+.cards-grid {display: grid;grid-template-columns: repeat(2, minmax(0, 1fr));@@ -74,13 +70,6 @@ const { t } = useI18nT();box-shadow 0.18s ease,border-color 0.18s ease;- .top {- display: flex;- justify-content: space-between;- align-items: center;- gap: 0.6rem;- }-h3 {margin: 0;font-size: 0.98rem;diff --git a/frontend/app/stores/nodes.importer.store.ts b/frontend/app/stores/nodes.importer.store.tsindex 2b1d8e59..7f83be17 100644--- a/frontend/app/stores/nodes.importer.store.ts+++ b/frontend/app/stores/nodes.importer.store.ts@@ -1,34 +1,69 @@import type { DB_Node, Node } from './db_structures';-import type { ImportJob, ResourceImportTask } from '~/helpers/backups/Importer';+import type { ImportBackupJob, ImportItem, NodeImportItem, ResourceImportTask } from '~/helpers/backups/Importer';++const WAIT_BETWEEN_IMPORTS_MS = 50;export const useNodesImporterStore = defineStore('nodesImporter', () => {const nodesStore = useNodesStore();+ const resourcesStore = useResourcesStore();+ const preferences = usePreferencesStore();+ const defaultUploadFolder = preferences.get('defaultUploadFolder').value;// Prepare nodes for import by checking which nodes need to be created or updated- function prepareImport(nodesToImport: DB_Node[]): { toCreate: DB_Node[]; toUpdate: DB_Node[] } {- const toCreate: DB_Node[] = [];- const toUpdate: DB_Node[] = [];+ function prepareImport(nodesToImport: DB_Node[], filesToImport: ResourceImportTask[] = []): { toCreate: ImportItem[]; toUpdate: ImportItem[] } {+ const toCreate: ImportItem[] = [];+ const toUpdate: ImportItem[] = [];for (const backupNode of nodesToImport) {const existingNode = nodesStore.getById(backupNode.id);if (!existingNode) {- toCreate.push(backupNode);+ toCreate.push({+ type: 'node',+ data: backupNode,+ id: backupNode.id,+ name: backupNode.name,+ status: 'pending',+ });} else {if (backupNode.updated_timestamp !== existingNode.updated_timestamp) {- toUpdate.push(backupNode);+ toUpdate.push({+ type: 'node',+ data: backupNode,+ id: backupNode.id,+ name: backupNode.name,+ status: 'pending',+ });}}}+ for (const backupNode of filesToImport) {+ console.log('Preparing resource for import:', backupNode.file.name, 'with ID:', backupNode.id);+ const existingNode = nodesStore.getById(backupNode.id);+ if (!existingNode) {+ toCreate.push({+ type: 'resource',+ data: backupNode,+ id: backupNode.id,+ name: backupNode.file.name,+ status: 'pending',+ });+ }+ }return { toCreate, toUpdate };}- async function importAllNodesAndResources(nodes: { toCreate: DB_Node[]; toUpdate: DB_Node[]; resources: ResourceImportTask[] }, job: Ref<ImportJob>) {+ async function importAllNodesAndResources(+ nodes: { toCreate: ImportItem[]; toUpdate: ImportItem[] },+ job: Ref<ImportBackupJob>,+ importResourcesFirst: boolean = false,+ ) {job.value.status = 'in_progress';job.value.failures = 0;nodesStore.nodes.startBulk();try {const corresponding: Record<string, string> = {};+ if (importResourcesFirst) await importAllResources(nodes.toCreate, job, corresponding);await importAllNodes(nodes.toCreate, job, corresponding);- await updateAllNodes(nodes.toUpdate, job);- await importAllResources(nodes.resources, job, corresponding);+ await updateAllNodes(nodes.toUpdate, job, corresponding);+ if (!importResourcesFirst) await importAllResources(nodes.toCreate, job, corresponding);job.value.status = 'completed';} catch (error) {job.value.status = 'failed';@@ -36,14 +71,22 @@ export const useNodesImporterStore = defineStore('nodesImporter', () => {}nodesStore.nodes.endBulk();}- async function importAllNodes(nodes: DB_Node[], job: Ref<ImportJob>, corresponding: Record<string, string>) {- const nodesById = new Map(nodes.map(n => [n.id, n]));+ async function importAllNodes(items: ImportItem[], job: Ref<ImportBackupJob>, corresponding: Record<string, string>) {+ const nodesById = new Map(items.map(n => [n.id, n]));- for (const node of nodes) {- await importNode(node, nodesById, corresponding, job);+ for (const item of items) {+ if (item.type !== 'node') continue;+ await importNode(item, nodesById, corresponding, job);}}- async function importNode(node: DB_Node, nodesById: Map<string, DB_Node>, corresponding: Record<string, string>, job: Ref<ImportJob>): Promise<void> {++ async function importNode(+ item: NodeImportItem,+ nodesById: Map<string, ImportItem>,+ corresponding: Record<string, string>,+ job: Ref<ImportBackupJob>,+ ): Promise<void> {+ const node = item.data;if (corresponding[node.id]) return; // Already importedif (node.parent_id && !nodesStore.getById(node.parent_id)) {@@ -53,7 +96,7 @@ export const useNodesImporterStore = defineStore('nodesImporter', () => {const parent = nodesById.get(node.parent_id); // Parent from the backup (future import)if (parent) {- await importNode(parent, nodesById, corresponding, job); // Import the parent first+ await importNode(parent as NodeImportItem, nodesById, corresponding, job); // Import the parent first} else {delete node.parent_id; // Parent not found → detach}@@ -62,25 +105,45 @@ export const useNodesImporterStore = defineStore('nodesImporter', () => {if (corresponding[node.parent_id!]) node.parent_id = corresponding[node.parent_id!]; // Update parent_id after import}- // Import of the node- const res = await nodesStore.post({ ...node, user_id: undefined });- job.value.created.push(node.id);- //await new Promise(resolve => setTimeout(resolve, 75));- corresponding[node.id] = res.id;+ try {+ // Replace all occurences of old IDs with the new one in the content+ replaceIdsInContent(node, corresponding);++ // Import of the node+ const res = await nodesStore.post({ ...node, user_id: undefined });+ job.value.created.push(node.id);+ item.status = 'completed';+ await new Promise(resolve => setTimeout(resolve, WAIT_BETWEEN_IMPORTS_MS));+ corresponding[node.id] = res.id;+ } catch (error) {+ item.status = 'failed';+ item.error_message = String(error);+ job.value.failures++;+ }}- async function updateAllNodes(nodes: DB_Node[], job?: Ref<ImportJob>) {- for (const node of nodes) {+ async function updateAllNodes(items: ImportItem[], job?: Ref<ImportBackupJob>, corresponding: Record<string, string> = {}) {+ for (const item of items) {+ if (item.type !== 'node') continue;+ const node = item.data;if (!nodesStore.getById(node.id)) continue;- await nodesStore.update({ ...(node as Node), partial: false, shared: false, permissions: [] });- if (job) job.value.updated.push(node.id);- await new Promise(resolve => setTimeout(resolve, 75));+ try {+ replaceIdsInContent(node, corresponding);++ await nodesStore.update({ ...(node as Node), partial: false, shared: false, permissions: [] });+ if (job) job.value.updated.push(node.id);+ item.status = 'completed';+ await new Promise(resolve => setTimeout(resolve, WAIT_BETWEEN_IMPORTS_MS));+ } catch (error) {+ item.status = 'failed';+ item.error_message = String(error);+ if (job) job.value.failures++;+ }}}- async function importAllResources(resources: ResourceImportTask[], job: Ref<ImportJob>, corresponding: Record<string, string>) {- const preferences = usePreferencesStore();- const defaultUploadFolder = preferences.get('defaultUploadFolder').value;- const resourcesStore = useResourcesStore();- for (const task of resources) {+ async function importAllResources(items: ImportItem[], job: Ref<ImportBackupJob>, corresponding: Record<string, string>) {+ for (const item of items) {+ if (item.type !== 'resource') continue;+ const task = item.data;try {let finalParentId = undefined;if (task.parent_id) finalParentId = corresponding[task.parent_id] || task.parent_id;@@ -96,14 +159,25 @@ export const useNodesImporterStore = defineStore('nodesImporter', () => {const uploadedResourceNode = await resourcesStore.post(formData);job.value.created.push(uploadedResourceNode.id);-- await new Promise(resolve => setTimeout(resolve, 50));+ corresponding[task.id] = uploadedResourceNode.id;+ item.status = 'completed';+ await new Promise(resolve => setTimeout(resolve, WAIT_BETWEEN_IMPORTS_MS));} catch (error) {- console.error(`[Import] Failed to upload resource ${task.file.name}:`, error);+ item.status = 'failed';+ item.error_message = String(error);+ job.value.failures++;}}}+ function replaceIdsInContent(node: DB_Node, corresponding: Record<string, string>) {+ for (const [oldId, newId] of Object.entries(corresponding)) {+ const regex = new RegExp(`\\b${oldId}\\b`, 'g');+ if (node.content) node.content = node.content.replace(regex, newId);+ if (node.content_compiled) node.content_compiled = node.content_compiled?.replace(regex, newId);+ }+ }+return {prepareImport,importAllNodesAndResources,diff --git a/frontend/i18n/locales/de/cdn.ts b/frontend/i18n/locales/de/cdn.tsindex 84e03d1a..8b177a20 100644--- a/frontend/i18n/locales/de/cdn.ts+++ b/frontend/i18n/locales/de/cdn.ts@@ -10,6 +10,7 @@ export default {appdrop: {addMore: 'Mehr Dateien hinzufügen',+ file: 'Datei | Dateien',link: 'hier klicken',max: 'Maximal {n} Dateien',prompt: 'Ziehe deine Datei hierher oder klicke auf {link}, um sie auszuwählen',diff --git a/frontend/i18n/locales/de/common.ts b/frontend/i18n/locales/de/common.tsindex dfedd6f6..fcafc500 100644--- a/frontend/i18n/locales/de/common.ts+++ b/frontend/i18n/locales/de/common.ts@@ -53,6 +53,7 @@ export default {email: 'E-Mail',icon: 'Symbol',id: 'ID',+ kind: 'Art',name: 'Name',order: 'Reihenfolge',parent: 'Übergeordnet',@@ -93,6 +94,7 @@ export default {loading: 'Laden...',pending: 'Ausstehend',processing: 'Verarbeitung',+ skipped: 'Übersprungen',success: 'Erfolg',unknown: 'Unbekannt',},diff --git a/frontend/i18n/locales/de/import.ts b/frontend/i18n/locales/de/import.tsindex b1622d6a..3153d98e 100644--- a/frontend/i18n/locales/de/import.ts+++ b/frontend/i18n/locales/de/import.ts@@ -10,22 +10,7 @@ export default {skipExisting: 'Bereits vorhandene Dokumente überspringen (nur neue importieren)',},- advanced: {- defaultColor: 'Standardfarbe für importierte Dokumente',- defaultDescription: 'Standardbeschreibung für importierte Dokumente',- defaultIcon: 'Standard-Symbol für importierte Dokumente (SVG oder Unicode-Emoji)',- defaultParent: 'Standardübergeordnete Kategorie für importierte Dokumente',- defaultTags: 'Standard-Tags für importierte Dokumente (durch Kommas getrennt)',- defaultTheme: 'Standarddesign für importierte Dokumente',- defaultThumbnail: 'Standard-Miniaturansicht für importierte Dokumente (SVG oder Unicode-Emoji)',- options: 'Erweiterte Importoptionen',- },-categories: {- advanced: {- description: 'Importiere gesamte Ordner (einschließlich Unterordner & Uploads) mit benutzerdefinierten Optionen für maximale Kontrolle.',- title: 'Erweiterter Import',- },backup: {description: 'Stelle ein vollständiges Alexandrie-Backup mit Dokumenten und Einstellungen wieder her.',title: 'Aus Backup importieren',@@ -34,6 +19,10 @@ export default {description: 'Dokumente aus Markdown-Dateien mit variablen Optionen importieren.',title: 'Aus Dateien importieren',},+ folder: {+ description: 'Importiere gesamte Ordner (einschließlich Unterordner & Uploads) mit benutzerdefinierten Optionen für maximale Kontrolle.',+ title: 'Ordner importieren',+ },},files: {@@ -46,6 +35,17 @@ export default {toImport: 'Zu importierende Elemente',},+ folder: {+ defaultColor: 'Standardfarbe für importierte Dokumente',+ defaultDescription: 'Standardbeschreibung für importierte Dokumente',+ defaultIcon: 'Standard-Symbol für importierte Dokumente (SVG oder Unicode-Emoji)',+ defaultParent: 'Standardübergeordnete Kategorie für importierte Dokumente',+ defaultTags: 'Standard-Tags für importierte Dokumente (durch Kommas getrennt)',+ defaultTheme: 'Standarddesign für importierte Dokumente',+ defaultThumbnail: 'Standard-Miniaturansicht für importierte Dokumente (SVG oder Unicode-Emoji)',+ options: 'Erweiterte Importoptionen',+ },+header: {changeFile: 'Datei ändern',created: 'Erstellt',diff --git a/frontend/i18n/locales/en/cdn.ts b/frontend/i18n/locales/en/cdn.tsindex a9e9a2f1..5cf61ba0 100644--- a/frontend/i18n/locales/en/cdn.ts+++ b/frontend/i18n/locales/en/cdn.ts@@ -10,6 +10,7 @@ export default {appdrop: {addMore: 'Add more files',+ file: 'file | files',link: 'click here',max: 'Maximum {n} files',prompt: 'Drag and drop your file here or {link} to select',diff --git a/frontend/i18n/locales/en/common.ts b/frontend/i18n/locales/en/common.tsindex cd007444..724d9c63 100644--- a/frontend/i18n/locales/en/common.ts+++ b/frontend/i18n/locales/en/common.ts@@ -53,6 +53,7 @@ export default {email: 'Email',icon: 'Icon',id: 'ID',+ kind: 'Kind',name: 'Name',order: 'Order',parent: 'Parent',@@ -93,6 +94,7 @@ export default {loading: 'Loading...',pending: 'Pending',processing: 'Processing',+ skipped: 'Skipped',success: 'Success',unknown: 'Unknown',},diff --git a/frontend/i18n/locales/en/import.ts b/frontend/i18n/locales/en/import.tsindex f633bc61..f04c4426 100644--- a/frontend/i18n/locales/en/import.ts+++ b/frontend/i18n/locales/en/import.ts@@ -10,22 +10,7 @@ export default {skipExisting: 'Skip existing documents (import only new ones)',},- advanced: {- defaultColor: 'Default color for imported documents',- defaultDescription: 'Default description for imported documents',- defaultIcon: 'Default icon for imported documents (svg or unicode emoji)',- defaultParent: 'Default parent category for imported documents',- defaultTags: 'Default tags for imported documents (comma-separated)',- defaultTheme: 'Default theme for imported documents',- defaultThumbnail: 'Default thumbnail for imported documents (svg or unicode emoji)',- options: 'Advanced import options',- },-categories: {- advanced: {- description: 'Import entire folder (including subfolders & uploads) using custom options for maximum control.',- title: 'Advanced import',- },backup: {description: 'Restore a complete Alexandrie backup with documents and settings.',title: 'Import from backup',@@ -34,6 +19,10 @@ export default {description: 'Import documents from markdown files with flexible options.',title: 'Import from files',},+ folder: {+ description: 'Import entire folder (including subfolders & uploads) using custom options for maximum control.',+ title: 'Import folder',+ },},files: {@@ -46,6 +35,17 @@ export default {toImport: 'Items to import',},+ folder: {+ defaultColor: 'Default color for imported documents',+ defaultDescription: 'Default description for imported documents',+ defaultIcon: 'Default icon for imported documents (svg or unicode emoji)',+ defaultParent: 'Default parent category for imported documents',+ defaultTags: 'Default tags for imported documents (comma-separated)',+ defaultTheme: 'Default theme for imported documents',+ defaultThumbnail: 'Default thumbnail for imported documents (svg or unicode emoji)',+ options: 'Advanced import options',+ },+header: {changeFile: 'Change file',created: 'Created',diff --git a/frontend/i18n/locales/fr/cdn.ts b/frontend/i18n/locales/fr/cdn.tsindex 6a630c42..82f07f2a 100644--- a/frontend/i18n/locales/fr/cdn.ts+++ b/frontend/i18n/locales/fr/cdn.ts@@ -10,6 +10,7 @@ export default {appdrop: {addMore: 'Ajouter plus de fichiers',+ file: 'fichier | fichiers',link: 'cliquez ici',max: 'Maximum {n} fichiers',prompt: 'Glissez-déposez votre fichier ici ou {link} pour sélectionner',diff --git a/frontend/i18n/locales/fr/common.ts b/frontend/i18n/locales/fr/common.tsindex caf02f85..e557bfd9 100644--- a/frontend/i18n/locales/fr/common.ts+++ b/frontend/i18n/locales/fr/common.ts@@ -53,6 +53,7 @@ export default {email: 'Email',icon: 'Icône',id: 'ID',+ kind: 'Type',name: 'Nom',order: 'Ordre',parent: 'Parent',@@ -93,6 +94,7 @@ export default {loading: 'Chargement...',pending: 'En attente',processing: 'Traitement en cours',+ skipped: 'Ignoré',success: 'Succès',unknown: 'Inconnu',},diff --git a/frontend/i18n/locales/fr/import.ts b/frontend/i18n/locales/fr/import.tsindex 59c52e4c..e1e0f944 100644--- a/frontend/i18n/locales/fr/import.ts+++ b/frontend/i18n/locales/fr/import.ts@@ -10,23 +10,7 @@ export default {skipExisting: 'Ignorer les documents existants (importer uniquement les nouveaux)',},- advanced: {- defaultColor: 'Couleur par défaut pour les documents importés',- defaultDescription: 'Description par défaut pour les documents importés',- defaultIcon: 'Icône par défaut pour les documents importés (svg ou emoji unicode)',- defaultParent: 'Catégorie parente par défaut pour les documents importés',- defaultTags: 'Balises par défaut pour les documents importés (séparées par des virgules)',- defaultTheme: 'Thème par défaut pour les documents importés',- defaultThumbnail: 'Vignette par défaut pour les documents importés (svg ou emoji unicode)',- options: "Options d'importation avancées",- },-categories: {- advanced: {- description:- 'Importer un dossier entier (y compris les sous-dossiers et les téléchargements) en utilisant des options personnalisées pour un contrôle maximal.',- title: 'Importation avancée',- },backup: {description: "Restaurez une sauvegarde complète d'Alexandrie avec les documents et les paramètres.",title: 'Importer depuis une sauvegarde',@@ -35,6 +19,11 @@ export default {description: 'Importez des documents à partir de fichiers markdown avec des options flexibles.',title: 'Importer à partir de fichiers',},+ folder: {+ description:+ 'Importer un dossier entier (y compris les sous-dossiers et les téléchargements) en utilisant des options personnalisées pour un contrôle maximal.',+ title: 'Importer un dossier',+ },},files: {@@ -47,6 +36,17 @@ export default {toImport: 'Éléments à importer',},+ folder: {+ defaultColor: 'Couleur par défaut pour les documents importés',+ defaultDescription: 'Description par défaut pour les documents importés',+ defaultIcon: 'Icône par défaut pour les documents importés (svg ou emoji unicode)',+ defaultParent: 'Catégorie parente par défaut pour les documents importés',+ defaultTags: 'Balises par défaut pour les documents importés (séparées par des virgules)',+ defaultTheme: 'Thème par défaut pour les documents importés',+ defaultThumbnail: 'Vignette par défaut pour les documents importés (svg ou emoji unicode)',+ options: "Options d'importation avancées",+ },+header: {changeFile: 'Changer de fichier',created: 'Créé',diff --git a/frontend/i18n/locales/it/cdn.ts b/frontend/i18n/locales/it/cdn.tsindex 56614c6a..84d8f284 100644--- a/frontend/i18n/locales/it/cdn.ts+++ b/frontend/i18n/locales/it/cdn.ts@@ -10,6 +10,7 @@ export default {appdrop: {addMore: 'Aggiungi altri file',+ file: 'file | files',link: 'clicca qui',max: 'Massimo {n} file',prompt: 'Trascina e rilascia il tuo file qui o {link} per selezionarlo',diff --git a/frontend/i18n/locales/it/common.ts b/frontend/i18n/locales/it/common.tsindex 567147e8..1dbdad18 100644--- a/frontend/i18n/locales/it/common.ts+++ b/frontend/i18n/locales/it/common.ts@@ -53,12 +53,14 @@ export default {email: 'Email',icon: 'Icona',id: 'ID',+ kind: 'Tipo',name: 'Nome',order: 'Ordine',parent: 'Elemento genitore',pinned: 'Fissato',role: 'Ruolo',size: 'Dimensione',+ skipped: 'Saltato',status: 'Stato',tags: 'Tag',type: 'Tipo',@@ -93,6 +95,7 @@ export default {loading: 'Caricamento...',pending: 'In attesa',processing: 'In elaborazione',+ skipped: 'Saltato',success: 'Successo',unknown: 'Sconosciuto',},diff --git a/frontend/i18n/locales/it/import.ts b/frontend/i18n/locales/it/import.tsindex 5fd8e934..e6f48458 100644--- a/frontend/i18n/locales/it/import.ts+++ b/frontend/i18n/locales/it/import.ts@@ -10,22 +10,7 @@ export default {skipExisting: 'Salta i documenti esistenti (importa solo quelli nuovi)',},- advanced: {- defaultColor: 'Colore predefinito per i documenti importati',- defaultDescription: 'Descrizione predefinita per i documenti importati',- defaultIcon: 'Icona predefinita per i documenti importati (svg o emoji unicode)',- defaultParent: 'Categoria genitore predefinita per i documenti importati',- defaultTags: 'Tag predefiniti per i documenti importati (separati da virgola)',- defaultTheme: 'Tema predefinito per i documenti importati',- defaultThumbnail: 'Miniatura predefinita per i documenti importati (svg o emoji unicode)',- options: 'Opzioni di importazione avanzate',- },-categories: {- advanced: {- description: 'Importa un\'intera cartella (incluse sottocartelle e caricamenti) utilizzando opzioni personalizzate per il massimo controllo.',- title: 'Importazione avanzata',- },backup: {description: 'Ripristina un backup completo di Alexandrie con documenti e impostazioni.',title: 'Importa da backup',@@ -34,11 +19,15 @@ export default {description: 'Importa documenti da file markdown con opzioni flessibili.',title: 'Importa da file',},+ folder: {+ description: "Importa un'intera cartella (incluse sottocartelle e caricamenti) utilizzando opzioni personalizzate per il massimo controllo.",+ title: 'Importa cartella',+ },},files: {importable:- 'Puoi importare file markdown o una cartella contenente file markdown. Le cartelle verranno importate in modo ricorsivo, preservando la loro struttura se scegli l\'opzione importa tutto.',+ "Puoi importare file markdown o una cartella contenente file markdown. Le cartelle verranno importate in modo ricorsivo, preservando la loro struttura se scegli l'opzione importa tutto.",meta: {description: 'Importa rapidamente file markdown con opzioni di destinazione ed elaborazione.',title: 'Importa da file markdown',@@ -46,6 +35,17 @@ export default {toImport: 'Elementi da importare',},+ folder: {+ defaultColor: 'Colore predefinito per i documenti importati',+ defaultDescription: 'Descrizione predefinita per i documenti importati',+ defaultIcon: 'Icona predefinita per i documenti importati (svg o emoji unicode)',+ defaultParent: 'Categoria genitore predefinita per i documenti importati',+ defaultTags: 'Tag predefiniti per i documenti importati (separati da virgola)',+ defaultTheme: 'Tema predefinito per i documenti importati',+ defaultThumbnail: 'Miniatura predefinita per i documenti importati (svg o emoji unicode)',+ options: 'Opzioni di importazione avanzate',+ },+header: {changeFile: 'Cambia file',created: 'Creato',@@ -69,7 +69,7 @@ export default {notifications: {importCompleteMessage: 'I documenti sono stati importati con successo.',importCompleteTitle: 'Importazione completata',- importFailedMessage: 'Si è verificato un errore durante l\'importazione. Riprova.',+ importFailedMessage: "Si è verificato un errore durante l'importazione. Riprova.",importFailedTitle: 'Importazione fallita',localImportedMessage: 'Le tue impostazioni locali sono state sostituite con il backup.',localImportedTitle: 'Impostazioni locali importate',diff --git a/frontend/i18n/locales/ko/cdn.ts b/frontend/i18n/locales/ko/cdn.tsindex 9cd21507..b685f24b 100644--- a/frontend/i18n/locales/ko/cdn.ts+++ b/frontend/i18n/locales/ko/cdn.ts@@ -10,6 +10,7 @@ export default {appdrop: {addMore: '파일 추가',+ file: '파일 | 파일들',link: '여기를 클릭',max: '최대 {n}개 파일',prompt: '파일을 여기로 드래그 앤 드롭하거나 {link}해서 선택하세요',diff --git a/frontend/i18n/locales/ko/common.ts b/frontend/i18n/locales/ko/common.tsindex 145d7129..3eda1d1f 100644--- a/frontend/i18n/locales/ko/common.ts+++ b/frontend/i18n/locales/ko/common.ts@@ -53,12 +53,14 @@ export default {email: '이메일',icon: '아이콘',id: 'ID',+ kind: '종류',name: '이름',order: '순서',parent: '상위',pinned: '고정됨',role: '역할',size: '크기',+ skipped: '건너뜀',status: '상태',tags: '태그',type: '유형',@@ -93,6 +95,7 @@ export default {loading: '로딩 중...',pending: '대기 중',processing: '처리 중',+ skipped: '건너뜀',success: '성공',unknown: '알 수 없음',},diff --git a/frontend/i18n/locales/ko/import.ts b/frontend/i18n/locales/ko/import.tsindex 1644bb00..5732f36d 100644--- a/frontend/i18n/locales/ko/import.ts+++ b/frontend/i18n/locales/ko/import.ts@@ -10,22 +10,7 @@ export default {skipExisting: '기존 문서 건너뛰기 (새 문서만 가져오기)',},- advanced: {- defaultColor: '가져온 문서의 기본 색상',- defaultDescription: '가져온 문서의 기본 설명',- defaultIcon: '가져온 문서의 기본 아이콘 (svg 또는 유니코드 이모지)',- defaultParent: '가져온 문서의 기본 상위 카테고리',- defaultTags: '가져온 문서의 기본 태그 (쉼표로 구분)',- defaultTheme: '가져온 문서의 기본 테마',- defaultThumbnail: '가져온 문서의 기본 썸네일 (svg 또는 유니코드 이모지)',- options: '고급 가져오기 옵션',- },-categories: {- advanced: {- description: '최대한의 제어를 위해 사용자 지정 옵션을 사용하여 전체 폴더(하위 폴더 및 업로드 포함)를 가져옵니다.',- title: '고급 가져오기',- },backup: {description: '문서와 설정이 포함된 전체 Alexandrie 백업을 복원합니다.',title: '백업에서 가져오기',@@ -34,10 +19,15 @@ export default {description: '유연한 옵션으로 마크다운 파일에서 문서를 가져옵니다.',title: '파일에서 가져오기',},+ folder: {+ description: '최대한의 제어를 위해 사용자 지정 옵션을 사용하여 전체 폴더(하위 폴더 및 업로드 포함)를 가져옵니다.',+ title: '폴더 가져오기',+ },},files: {- importable: '마크다운 파일 또는 마크다운 파일이 포함된 폴더를 가져올 수 있습니다. "모두 가져오기" 옵션을 선택하면 폴더는 구조를 유지한 채 재귀적으로 가져와집니다.',+ importable:+ '마크다운 파일 또는 마크다운 파일이 포함된 폴더를 가져올 수 있습니다. "모두 가져오기" 옵션을 선택하면 폴더는 구조를 유지한 채 재귀적으로 가져와집니다.',meta: {description: '대상 및 처리 옵션과 함께 마크다운 파일을 빠르게 가져옵니다.',title: '마크다운 파일에서 가져오기',@@ -45,6 +35,17 @@ export default {toImport: '가져올 항목',},+ folder: {+ defaultColor: '가져온 문서의 기본 색상',+ defaultDescription: '가져온 문서의 기본 설명',+ defaultIcon: '가져온 문서의 기본 아이콘 (svg 또는 유니코드 이모지)',+ defaultParent: '가져온 문서의 기본 상위 카테고리',+ defaultTags: '가져온 문서의 기본 태그 (쉼표로 구분)',+ defaultTheme: '가져온 문서의 기본 테마',+ defaultThumbnail: '가져온 문서의 기본 썸네일 (svg 또는 유니코드 이모지)',+ options: '고급 가져오기 옵션',+ },+header: {changeFile: '파일 변경',created: '생성일',diff --git a/frontend/i18n/locales/uk/cdn.ts b/frontend/i18n/locales/uk/cdn.tsindex 80e0cd7c..17649588 100644--- a/frontend/i18n/locales/uk/cdn.ts+++ b/frontend/i18n/locales/uk/cdn.ts@@ -10,6 +10,7 @@ export default {appdrop: {addMore: 'Додати більше файлів',+ file: 'файл | файли',link: 'натисніть тут',max: 'Максимум {n} файлів',prompt: 'Перетягніть файл сюди або {link}, щоб вибрати',diff --git a/frontend/i18n/locales/uk/common.ts b/frontend/i18n/locales/uk/common.tsindex e551c2f0..b2fb280a 100644--- a/frontend/i18n/locales/uk/common.ts+++ b/frontend/i18n/locales/uk/common.ts@@ -53,6 +53,7 @@ export default {email: 'Електронна пошта',icon: 'Іконка',id: 'ІД',+ kind: 'Вид',name: 'Назва',order: 'Порядок',parent: 'Батьківський файл',@@ -93,6 +94,7 @@ export default {loading: 'Завантаження...',pending: 'На розгляді',processing: 'Обробка',+ skipped: 'Пропущено',success: 'Успіх',unknown: 'Невідомо',},diff --git a/frontend/i18n/locales/uk/import.ts b/frontend/i18n/locales/uk/import.tsindex 6c4f4e47..210378d6 100644--- a/frontend/i18n/locales/uk/import.ts+++ b/frontend/i18n/locales/uk/import.ts@@ -10,22 +10,7 @@ export default {skipExisting: 'Пропустити наявні документи (імпортувати лише нові)',},- advanced: {- defaultColor: 'Типовий колір для імпортованих документів',- defaultDescription: 'Типовий опис для імпортованих документів',- defaultIcon: 'Типова іконка для імпортованих документів (svg або emoji Unicode)',- defaultParent: 'Типова батьківська категорія для імпортованих документів',- defaultTags: 'Типові теги для імпортованих документів (через кому)',- defaultTheme: 'Типова тема для імпортованих документів',- defaultThumbnail: 'Типова мініатюра для імпортованих документів (svg або emoji Unicode)',- options: 'Розширені параметри імпорту',- },-categories: {- advanced: {- description: 'Імпортуйте цілу папку (включаючи підпапки та завантаження) за допомогою спеціальних параметрів для максимального контролю.',- title: 'Розширений імпорт',- },backup: {description: 'Відновіть повну резервну копію Alexandrie з документами та налаштуваннями.',title: 'Імпорт із резервної копії',@@ -34,6 +19,10 @@ export default {description: 'Імпортуйте документи з markdown-файлів із гнучкими параметрами.',title: 'Імпорт із файлів',},+ folder: {+ description: 'Імпортуйте цілу папку (включаючи підпапки та завантаження) за допомогою спеціальних параметрів для максимального контролю.',+ title: 'Імпорт папки',+ },},files: {@@ -46,6 +35,17 @@ export default {toImport: 'Елементи для імпорту',},+ folder: {+ defaultColor: 'Типовий колір для імпортованих документів',+ defaultDescription: 'Типовий опис для імпортованих документів',+ defaultIcon: 'Типова іконка для імпортованих документів (svg або emoji Unicode)',+ defaultParent: 'Типова батьківська категорія для імпортованих документів',+ defaultTags: 'Типові теги для імпортованих документів (через кому)',+ defaultTheme: 'Типова тема для імпортованих документів',+ defaultThumbnail: 'Типова мініатюра для імпортованих документів (svg або emoji Unicode)',+ options: 'Розширені параметри імпорту',+ },+header: {changeFile: 'Змінити файл',created: 'Створено',diff --git a/frontend/i18n/locales/zh-CN/cdn.ts b/frontend/i18n/locales/zh-CN/cdn.tsindex 8888841a..438c7fd3 100644--- a/frontend/i18n/locales/zh-CN/cdn.ts+++ b/frontend/i18n/locales/zh-CN/cdn.ts@@ -10,6 +10,7 @@ export default {appdrop: {addMore: '新增更多文件',+ file: '文件 | 文件们',link: '点击这里',max: '最多 {n} 个文件',prompt: '将文件拖拽至此,或{link}选择文件',diff --git a/frontend/i18n/locales/zh-CN/common.ts b/frontend/i18n/locales/zh-CN/common.tsindex 1565fbd4..f1464fa5 100644--- a/frontend/i18n/locales/zh-CN/common.ts+++ b/frontend/i18n/locales/zh-CN/common.ts@@ -53,6 +53,7 @@ export default {email: '电子邮件',icon: '图标',id: 'ID',+ kind: '类型',name: '名称',order: '排序',parent: '上级项目',@@ -93,6 +94,7 @@ export default {loading: '加载中...',pending: '待处理',processing: '处理中',+ skipped: '已跳过',success: '成功',unknown: '未知',},diff --git a/frontend/i18n/locales/zh-CN/import.ts b/frontend/i18n/locales/zh-CN/import.tsindex 9c576764..b8a06d72 100644--- a/frontend/i18n/locales/zh-CN/import.ts+++ b/frontend/i18n/locales/zh-CN/import.ts@@ -10,22 +10,7 @@ export default {skipExisting: '跳过已存在的文档(仅导入新文档)',},- advanced: {- defaultColor: '导入文档的默认颜色',- defaultDescription: '导入文档的默认描述',- defaultIcon: '导入文档的默认图标(SVG 或 Unicode emoji)',- defaultParent: '导入文档的默认上级分类',- defaultTags: '导入文档的默认标签(以逗号分隔)',- defaultTheme: '导入文档的默认主题',- defaultThumbnail: '导入文档的默认缩略图(SVG 或 Unicode emoji)',- options: '高级导入选项',- },-categories: {- advanced: {- description: '导入整个文件夹(包含子文件夹与上传文件),并使用自定义选项获取最大的控制权。',- title: '高级导入',- },backup: {description: '恢复包含文档与设置的完整 Alexandrie 备份。',title: '从备份导入',@@ -34,11 +19,14 @@ export default {description: '通过灵活的选项从 Markdown 文件导入文档。',title: '从文件导入',},+ folder: {+ description: '导入整个文件夹(包含子文件夹与上传文件),并使用自定义选项获取最大的控制权。',+ title: '导入文件夹',+ },},files: {- importable:- '你可以导入 Markdown 文件,或包含 Markdown 文件的文件夹。文件夹会递归导入;若选择全部导入,将保留原有的结构。',+ importable: '你可以导入 Markdown 文件,或包含 Markdown 文件的文件夹。文件夹会递归导入;若选择全部导入,将保留原有的结构。',meta: {description: '快速导入 Markdown 文件,并可设置目的地与处理方式。',title: '从 Markdown 文件导入',@@ -46,6 +34,17 @@ export default {toImport: '待导入的项目',},+ folder: {+ defaultColor: '导入文档的默认颜色',+ defaultDescription: '导入文档的默认描述',+ defaultIcon: '导入文档的默认图标(SVG 或 Unicode emoji)',+ defaultParent: '导入文档的默认上级分类',+ defaultTags: '导入文档的默认标签(以逗号分隔)',+ defaultTheme: '导入文档的默认主题',+ defaultThumbnail: '导入文档的默认缩略图(SVG 或 Unicode emoji)',+ options: '高级导入选项',+ },+header: {changeFile: '修改文件',created: '创建时间',diff --git a/frontend/i18n/locales/zh-TW/cdn.ts b/frontend/i18n/locales/zh-TW/cdn.tsindex 37c25114..75174397 100644--- a/frontend/i18n/locales/zh-TW/cdn.ts+++ b/frontend/i18n/locales/zh-TW/cdn.ts@@ -10,6 +10,7 @@ export default {appdrop: {addMore: '新增更多檔案',+ file: '檔案 | 檔案們',link: '按這裡',max: '最多 {n} 個檔案',prompt: '將檔案拖曳至此,或{link}選擇檔案',diff --git a/frontend/i18n/locales/zh-TW/common.ts b/frontend/i18n/locales/zh-TW/common.tsindex e63c08bb..b1dafff2 100644--- a/frontend/i18n/locales/zh-TW/common.ts+++ b/frontend/i18n/locales/zh-TW/common.ts@@ -53,6 +53,7 @@ export default {email: '電子郵件',icon: '圖示',id: 'ID',+ kind: '種類',name: '名稱',order: '排序',parent: '上層項目',@@ -93,6 +94,7 @@ export default {loading: '載入中...',pending: '待處理',processing: '處理中',+ skipped: '已跳過',success: '成功',unknown: '未知',},diff --git a/frontend/i18n/locales/zh-TW/import.ts b/frontend/i18n/locales/zh-TW/import.tsindex 0120ed60..efa0c376 100644--- a/frontend/i18n/locales/zh-TW/import.ts+++ b/frontend/i18n/locales/zh-TW/import.ts@@ -10,22 +10,7 @@ export default {skipExisting: '略過已存在的文件(僅匯入新文件)',},- advanced: {- defaultColor: '匯入文件的預設顏色',- defaultDescription: '匯入文件的預設描述',- defaultIcon: '匯入文件的預設圖示(SVG 或 Unicode emoji)',- defaultParent: '匯入文件的預設上層分類',- defaultTags: '匯入文件的預設標籤(以逗號分隔)',- defaultTheme: '匯入文件的預設主題',- defaultThumbnail: '匯入文件的預設縮圖(SVG 或 Unicode emoji)',- options: '進階匯入選項',- },-categories: {- advanced: {- description: '匯入整個資料夾(包含子資料夾與上傳檔案),並使用自訂選項取得最大的控制權。',- title: '進階匯入',- },backup: {description: '還原包含文件與設定的完整 Alexandrie 備份。',title: '從備份匯入',@@ -34,11 +19,14 @@ export default {description: '透過彈性的選項從 Markdown 檔案匯入文件。',title: '從檔案匯入',},+ folder: {+ description: '匯入整個資料夾(包含子資料夾與上傳檔案),並使用自訂選項取得最大的控制權。',+ title: '匯入資料夾',+ },},files: {- importable:- '你可以匯入 Markdown 檔案,或包含 Markdown 檔案的資料夾。資料夾會遞迴匯入;若選擇全部匯入,將保留原有的結構。',+ importable: '你可以匯入 Markdown 檔案,或包含 Markdown 檔案的資料夾。資料夾會遞迴匯入;若選擇全部匯入,將保留原有的結構。',meta: {description: '快速匯入 Markdown 檔案,並可設定目的地與處理方式。',title: '從 Markdown 檔案匯入',@@ -46,6 +34,17 @@ export default {toImport: '待匯入的項目',},+ folder: {+ defaultColor: '匯入文件的預設顏色',+ defaultDescription: '匯入文件的預設描述',+ defaultIcon: '匯入文件的預設圖示(SVG 或 Unicode emoji)',+ defaultParent: '匯入文件的預設上層分類',+ defaultTags: '匯入文件的預設標籤(以逗號分隔)',+ defaultTheme: '匯入文件的預設主題',+ defaultThumbnail: '匯入文件的預設縮圖(SVG 或 Unicode emoji)',+ options: '進階匯入選項',+ },+header: {changeFile: '變更檔案',created: '建立時間',