SCIM db table

* New translations translation.json

apps/client/package.json

@@ -15,45 +15,45 @@
     "@docmost/editor-ext": "workspace:*",
     "@emoji-mart/data": "^1.2.1",
     "@emoji-mart/react": "^1.1.1",
-    "@excalidraw/excalidraw": "^0.17.6",
+    "@excalidraw/excalidraw": "0.18.0-864353b",
     "@mantine/core": "^7.17.0",
     "@mantine/form": "^7.17.0",
     "@mantine/hooks": "^7.17.0",
     "@mantine/modals": "^7.17.0",
     "@mantine/notifications": "^7.17.0",
     "@mantine/spotlight": "^7.17.0",
-    "@tabler/icons-react": "^3.22.0",
-    "@tanstack/react-query": "^5.61.4",
-    "@tiptap/extension-character-count": "^2.11.5",
-    "axios": "^1.8.4",
+    "@tabler/icons-react": "^3.34.0",
+    "@tanstack/react-query": "^5.80.6",
+    "@tiptap/extension-character-count": "^2.14.0",
+    "axios": "^1.9.0",
     "clsx": "^2.1.1",
     "emoji-mart": "^5.6.0",
     "file-saver": "^2.0.5",
     "highlightjs-sap-abap": "^0.3.0",
     "i18next": "^23.14.0",
     "i18next-http-backend": "^2.6.1",
-    "jotai": "^2.12.1",
+    "jotai": "^2.12.5",
     "jotai-optics": "^0.4.0",
     "js-cookie": "^3.0.5",
     "jwt-decode": "^4.0.0",
-    "katex": "0.16.21",
-    "lowlight": "^3.2.0",
-    "mermaid": "^11.4.1",
+    "katex": "0.16.22",
+    "lowlight": "^3.3.0",
+    "mermaid": "^11.6.0",
     "mitt": "^3.0.1",
     "react": "^18.3.1",
     "react-arborist": "3.4.0",
-    "react-clear-modal": "^2.0.11",
+    "react-clear-modal": "^2.0.15",
     "react-dom": "^18.3.1",
     "react-drawio": "^1.0.1",
     "react-error-boundary": "^4.1.2",
     "react-helmet-async": "^2.0.5",
     "react-i18next": "^15.0.1",
     "react-router-dom": "^7.0.1",
-    "semver": "^7.7.1",
+    "semver": "^7.7.2",
     "socket.io-client": "^4.8.1",
     "tippy.js": "^6.3.7",
     "tiptap-extension-global-drag-handle": "^0.1.18",
-    "zod": "^3.23.8"
+    "zod": "^3.25.56"
   },
   "devDependencies": {
     "@eslint/js": "^9.16.0",
@@ -77,6 +77,6 @@
     "prettier": "^3.4.1",
     "typescript": "^5.7.2",
     "typescript-eslint": "^8.17.0",
-    "vite": "^6.3.2"
+    "vite": "^6.3.5"
   }
 }

apps/client/public/locales/de-DE/translation.json

@@ -383,5 +383,8 @@
   "Publicly shared pages from spaces you are a member of will appear here": "Öffentlich geteilte Seiten aus Bereichen, in denen Sie Mitglied sind, erscheinen hier",
   "Share deleted successfully": "Freigabe erfolgreich gelöscht",
   "Share not found": "Freigabe nicht gefunden",
-  "Failed to share page": "Fehler beim Teilen der Seite"
+  "Failed to share page": "Fehler beim Teilen der Seite",
+  "Copy page": "Seite kopieren",
+  "Copy page to a different space.": "Seite in einen anderen Bereich kopieren.",
+  "Page copied successfully": "Seite erfolgreich kopiert"
 }

apps/client/public/locales/en-US/translation.json

@@ -384,7 +384,7 @@
   "Share deleted successfully": "Share deleted successfully",
   "Share not found": "Share not found",
   "Failed to share page": "Failed to share page",
-  "Copy page":  "Copy page",
+  "Copy page": "Copy page",
   "Copy page to a different space.": "Copy page to a different space.",
   "Page copied successfully": "Page copied successfully"
 }

apps/client/public/locales/es-ES/translation.json

@@ -383,5 +383,8 @@
   "Publicly shared pages from spaces you are a member of will appear here": "Las páginas compartidas públicamente de los espacios a los que pertenece aparecerán aquí",
   "Share deleted successfully": "Compartición eliminada con éxito",
   "Share not found": "Compartición no encontrada",
-  "Failed to share page": "Error al compartir la página"
+  "Failed to share page": "Error al compartir la página",
+  "Copy page": "Copy page",
+  "Copy page to a different space.": "Copy page to a different space.",
+  "Page copied successfully": "Page copied successfully"
 }

apps/client/public/locales/fr-FR/translation.json

@@ -383,5 +383,8 @@
   "Publicly shared pages from spaces you are a member of will appear here": "Les pages partagées publiquement des espaces dont vous êtes membre apparaîtront ici",
   "Share deleted successfully": "Partage supprimé avec succès",
   "Share not found": "Partage non trouvé",
-  "Failed to share page": "Échec du partage de la page"
+  "Failed to share page": "Échec du partage de la page",
+  "Copy page": "Copier la page",
+  "Copy page to a different space.": "Copier la page dans un autre espace.",
+  "Page copied successfully": "Page copiée avec succès"
 }

apps/client/public/locales/it-IT/translation.json

@@ -383,5 +383,8 @@
   "Publicly shared pages from spaces you are a member of will appear here": "Le pagine condivise pubblicamente dagli spazi di cui sei membro appariranno qui",
   "Share deleted successfully": "Condivisione eliminata con successo",
   "Share not found": "Condivisione non trovata",
-  "Failed to share page": "Condivisione della pagina fallita"
+  "Failed to share page": "Condivisione della pagina fallita",
+  "Copy page": "Copia pagina",
+  "Copy page to a different space.": "Copia pagina in un altro spazio.",
+  "Page copied successfully": "Pagina copiata con successo"
 }

apps/client/public/locales/ja-JP/translation.json

@@ -347,7 +347,7 @@
   "Members added successfully": "メンバーを追加しました",
   "Member removed successfully": "メンバーが削除されました",
   "Member role updated successfully": "メンバーのロールを更新しました",
-  "Created by: <b>{{creatorName}}</b>": "作成者： <b>{{creatorName}}</b>",
+  "Created by: <b>{{creatorName}}</b>": "作成者: <b>{{creatorName}}</b>",
   "Created at: {{time}}": "が作成しました：{{time}}",
   "Edited by {{name}} {{time}}": "最終編集: {{name}} {{time}}",
   "Word count: {{wordCount}}": "ワード数: {{wordCount}}",
@@ -383,5 +383,8 @@
   "Publicly shared pages from spaces you are a member of will appear here": "メンバーであるスペースからの公開ページがここに表示されます",
   "Share deleted successfully": "共有が正常に削除されました",
   "Share not found": "共有が見つかりません",
-  "Failed to share page": "ページの共有に失敗しました"
+  "Failed to share page": "ページの共有に失敗しました",
+  "Copy page": "ページをコピー",
+  "Copy page to a different space.": "ページを別のスペースにコピーします。",
+  "Page copied successfully": "ページのコピーに成功しました"
 }

apps/client/public/locales/ko-KR/translation.json

@@ -58,7 +58,7 @@
   "Enter a strong password": "강력한 비밀번호를 입력하세요",
   "Enter valid email addresses separated by comma or space max_50": "유효한 이메일 주소를 쉼표나 공백으로 구분하여 입력하세요 [최대: 50]",
   "enter valid emails addresses": "유효한 이메일 주소를 입력하세요",
-  "Enter your current password": "현재 비밀번호를 입력하세요",
+  "Enter your current password": "기존 비밀번호를 입력하세요",
   "enter your full name": "전체 이름을 입력하세요",
   "Enter your new password": "새 비밀번호를 입력하세요",
   "Enter your new preferred email": "새로운 이메일을 입력하세요",
@@ -170,7 +170,7 @@
   "Successfully restored": "복원 완료",
   "System settings": "시스템 설정",
   "Theme": "배경",
-  "To change your email, you have to enter your password and new email.": "이메일을 변경하려면 현재 비밀번호와 새 이메일을 입력해야 합니다.",
+  "To change your email, you have to enter your password and new email.": "이메일을 변경하려면 기존 비밀번호와 새 이메일을 입력해야 합니다.",
   "Toggle full page width": "전체 페이지 너비 전환",
   "Unable to import pages. Please try again.": "페이지를 가져올 수 없습니다. 다시 시도해주세요.",
   "untitled": "제목 없음",
@@ -383,5 +383,8 @@
   "Publicly shared pages from spaces you are a member of will appear here": "회원인 공간의 공개 공유된 페이지가 여기에 표시됩니다",
   "Share deleted successfully": "공유가 성공적으로 삭제되었습니다",
   "Share not found": "공유를 찾을 수 없습니다",
-  "Failed to share page": "페이지 공유에 실패했습니다"
+  "Failed to share page": "페이지 공유에 실패했습니다",
+  "Copy page": "Copy page",
+  "Copy page to a different space.": "Copy page to a different space.",
+  "Page copied successfully": "Page copied successfully"
 }

apps/client/public/locales/nl-NL/translation.json

@@ -383,5 +383,8 @@
   "Publicly shared pages from spaces you are a member of will appear here": "Openbaar gedeelde pagina's van ruimtes waarvan u lid bent, verschijnen hier",
   "Share deleted successfully": "Delen succesvol verwijderd",
   "Share not found": "Delen niet gevonden",
-  "Failed to share page": "Pagina delen mislukt"
+  "Failed to share page": "Pagina delen mislukt",
+  "Copy page": "Copy page",
+  "Copy page to a different space.": "Copy page to a different space.",
+  "Page copied successfully": "Page copied successfully"
 }

apps/client/public/locales/pt-BR/translation.json

@@ -383,5 +383,8 @@
   "Publicly shared pages from spaces you are a member of will appear here": "Páginas compartilhadas publicamente de espaços que você é membro aparecerão aqui",
   "Share deleted successfully": "Compartilhamento excluído com sucesso",
   "Share not found": "Compartilhamento não encontrado",
-  "Failed to share page": "Falha ao compartilhar página"
+  "Failed to share page": "Falha ao compartilhar página",
+  "Copy page": "Copy page",
+  "Copy page to a different space.": "Copy page to a different space.",
+  "Page copied successfully": "Page copied successfully"
 }

apps/client/public/locales/ru-RU/translation.json

@@ -383,5 +383,8 @@
   "Publicly shared pages from spaces you are a member of will appear here": "Общие страницы из пространств, участником которых вы являетесь, появятся здесь",
   "Share deleted successfully": "Общий доступ успешно удален",
   "Share not found": "Общий доступ не найден",
-  "Failed to share page": "Не удалось поделиться страницей"
+  "Failed to share page": "Не удалось поделиться страницей",
+  "Copy page": "Копировать страницу",
+  "Copy page to a different space.": "Копировать страницу в другое пространство.",
+  "Page copied successfully": "Страница успешно скопирована"
 }

apps/client/public/locales/uk-UA/translation.json

@@ -0,0 +1,390 @@
+{
+  "Account": "Обліковий запис",
+  "Active": "Активний",
+  "Add": "Додати",
+  "Add group members": "Додати учасників групи",
+  "Add groups": "Додати групи",
+  "Add members": "Додати учасників",
+  "Add to groups": "Додати до груп",
+  "Add space members": "Додати учасників простору",
+  "Admin": "Адміністратор",
+  "Are you sure you want to delete this group? Members will lose access to resources this group has access to.": "Ви впевнені, що хочете видалити цю групу? Учасники втратять доступ до матеріалів, до яких ця група має доступ.",
+  "Are you sure you want to delete this page?": "Ви впевнені, що хочете видалити цю сторінку?",
+  "Are you sure you want to remove this user from the group? The user will lose access to resources this group has access to.": "Ви впевнені, що хочете видалити цього користувача з групи? Користувач втратить доступ до матеріалів, до яких ця група має доступ.",
+  "Are you sure you want to remove this user from the space? The user will lose all access to this space.": "Ви впевнені, що хочете видалити цього користувача з простору? Користувач втратить весь доступ до цього простору.",
+  "Are you sure you want to restore this version? Any changes not versioned will be lost.": "Ви впевнені, що хочете відновити цю версію? Усі не збережені зміни будуть втрачені.",
+  "Can become members of groups and spaces in workspace": "Можуть ставати учасниками груп та просторів у робочій області",
+  "Can create and edit pages in space.": "Може створювати та редагувати сторінки в просторі.",
+  "Can edit": "Може редагувати",
+  "Can manage workspace": "Може керувати робочою областю",
+  "Can manage workspace but cannot delete it": "Може керувати робочою областю, але не може її видалити",
+  "Can view": "Може переглядати",
+  "Can view pages in space but not edit.": "Може переглядати сторінки в просторі, але не може їх редагувати.",
+  "Cancel": "Скасувати",
+  "Change email": "Змінити електронну пошту",
+  "Change password": "Змінити пароль",
+  "Change photo": "Змінити фото",
+  "Choose a role": "Оберіть роль",
+  "Choose your preferred color scheme.": "Оберіть бажану кольорову схему.",
+  "Choose your preferred interface language.": "Оберіть бажану мову інтерфейсу.",
+  "Choose your preferred page width.": "Оберіть бажану ширину сторінки.",
+  "Confirm": "Підтвердити",
+  "Copy link": "Копіювати посилання",
+  "Create": "Створити",
+  "Create group": "Створити групу",
+  "Create page": "Створити сторінку",
+  "Create space": "Створити простір",
+  "Create workspace": "Створити робочу область",
+  "Current password": "Поточний пароль",
+  "Dark": "Темна",
+  "Date": "Дата",
+  "Delete": "Видалити",
+  "Delete group": "Видалити групу",
+  "Are you sure you want to delete this page? This will delete its children and page history. This action is irreversible.": "Ви впевнені, що хочете видалити цю сторінку? Це видалить її дочірні сторінки, а також історію сторінки. Ця дія необоротна.",
+  "Description": "Опис",
+  "Details": "Деталі",
+  "e.g ACME": "наприклад, ACME",
+  "e.g ACME Inc": "наприклад, ACME Inc",
+  "e.g Developers": "наприклад, Розробники",
+  "e.g Group for developers": "наприклад, Група для розробників",
+  "e.g product": "наприклад, продукт",
+  "e.g Product Team": "наприклад, Продуктова команда",
+  "e.g Sales": "наприклад, Продажі",
+  "e.g Space for product team": "наприклад, Простір для продуктової команди",
+  "e.g Space for sales team to collaborate": "наприклад, Простір для спільної роботи команди продажів",
+  "Edit": "Редагувати",
+  "Edit group": "Редагувати групу",
+  "Email": "Електронна пошта",
+  "Enter a strong password": "Введіть надійний пароль",
+  "Enter valid email addresses separated by comma or space max_50": "Введіть дійсні адреси електронної пошти, розділені комою або пробілом [макс: 50]",
+  "enter valid emails addresses": "введіть дійсні адреси електронної пошти",
+  "Enter your current password": "Введіть ваш поточний пароль",
+  "enter your full name": "введіть ваше повне ім'я",
+  "Enter your new password": "Введіть ваш новий пароль",
+  "Enter your new preferred email": "Введіть вашу нову бажану електронну пошту",
+  "Enter your password": "Введіть ваш пароль",
+  "Error fetching page data.": "Помилка при завантаженні даних сторінки.",
+  "Error loading page history.": "Помилка при завантаженні історії сторінки.",
+  "Export": "Експорт",
+  "Failed to create page": "Не вдалося створити сторінку",
+  "Failed to delete page": "Не вдалося видалити сторінку",
+  "Failed to fetch recent pages": "Не вдалося отримати нещодавні сторінки",
+  "Failed to import pages": "Не вдалося імпортувати сторінки",
+  "Failed to load page. An error occurred.": "Не вдалося завантажити сторінку. Сталася помилка.",
+  "Failed to update data": "Не вдалося оновити дані",
+  "Full access": "Повний доступ",
+  "Full page width": "Ширина на всю сторінку",
+  "Full width": "На всю ширину",
+  "General": "Загальні",
+  "Group": "Група",
+  "Group description": "Опис групи",
+  "Group name": "Назва групи",
+  "Groups": "Групи",
+  "Has full access to space settings and pages.": "Має повний доступ до налаштувань простору та сторінок.",
+  "Home": "Головна",
+  "Import pages": "Імпорт сторінок",
+  "Import pages & space settings": "Імпорт сторінок і налаштування простору",
+  "Importing pages": "Імпортування сторінок",
+  "invalid invitation link": "посилання на запрошення недійсне",
+  "Invitation signup": "Реєстрація за запрошенням",
+  "Invite by email": "Запросити електронною поштою",
+  "Invite members": "Запросити учасників",
+  "Invite new members": "Запросити нових учасників",
+  "Invited members who are yet to accept their invitation will appear here.": "Запрошені учасники, які ще не прийняли запрошення, з'являться тут.",
+  "Invited members will be granted access to spaces the groups can access": "Запрошені учасники отримають доступ до просторів, доступ до яких має група",
+  "Join the workspace": "Приєднатися до робочої області",
+  "Language": "Мова",
+  "Light": "Світла",
+  "Link copied": "Посилання скопійовано",
+  "Login": "Увійти",
+  "Logout": "Вийти",
+  "Manage Group": "Керування групою",
+  "Manage members": "Керування учасниками",
+  "member": "учасник",
+  "Member": "Учасник",
+  "members": "учасники",
+  "Members": "Учасники",
+  "My preferences": "Мої налаштування",
+  "My Profile": "Мій профіль",
+  "My profile": "Мій профіль",
+  "Name": "Ім'я",
+  "New email": "Нова електронна адреса",
+  "New page": "Нова сторінка",
+  "New password": "Новий пароль",
+  "No group found": "Групу не знайдено",
+  "No page history saved yet.": "Історія сторінок ще не збережена.",
+  "No pages yet": "Сторінок поки немає",
+  "No results found...": "Результати не знайдено...",
+  "No user found": "Користувача не знайдено",
+  "Overview": "Огляд",
+  "Owner": "Власник",
+  "page": "сторінка",
+  "Page deleted successfully": "Сторінку успішно видалено",
+  "Page history": "Історія сторінки",
+  "Page import is in progress. Please do not close this tab.": "Імпорт сторінки в процесі. Будь ласка, не закривайте цю вкладку.",
+  "Pages": "Сторінки",
+  "pages": "сторінки",
+  "Password": "Пароль",
+  "Password changed successfully": "Пароль успішно змінено",
+  "Pending": "В очікуванні",
+  "Please confirm your action": "Будь ласка, підтвердіть вашу дію",
+  "Preferences": "Налаштування",
+  "Print PDF": "Друк PDF",
+  "Profile": "Профіль",
+  "Recently updated": "Нещодавно оновлено",
+  "Remove": "Видалити",
+  "Remove group member": "Видалити учасника групи",
+  "Remove space member": "Видалити учасника простору",
+  "Restore": "Відновити",
+  "Role": "Роль",
+  "Save": "Зберегти",
+  "Search": "Пошук",
+  "Search for groups": "Пошук груп",
+  "Search for users": "Пошук користувачів",
+  "Search for users and groups": "Пошук користувачів та груп",
+  "Search...": "Пошук...",
+  "Select language": "Оберіть мову",
+  "Select role": "Оберіть роль",
+  "Select role to assign to all invited members": "Оберіть роль для всіх запрошених учасників",
+  "Select theme": "Оберіть тему",
+  "Send invitation": "Надіслати запрошення",
+  "Invitation sent": "Запрошення надіслано",
+  "Settings": "Налаштування",
+  "Setup workspace": "Налаштувати робочу область",
+  "Sign In": "Вхід",
+  "Sign Up": "Реєстрація",
+  "Slug": "Slug",
+  "Space": "Простір",
+  "Space description": "Опис простору",
+  "Space menu": "Меню простору",
+  "Space name": "Назва простору",
+  "Space settings": "Налаштування простору",
+  "Space slug": "Slug простору",
+  "Spaces": "Простори",
+  "Spaces you belong to": "Простори, до яких ви належите",
+  "No space found": "Простори не знайдено",
+  "Search for spaces": "Пошук просторів",
+  "Start typing to search...": "Почніть вводити для пошуку...",
+  "Status": "Статус",
+  "Successfully imported": "Успішно імпортовано",
+  "Successfully restored": "Успішно відновлено",
+  "System settings": "Системні налаштування",
+  "Theme": "Тема",
+  "To change your email, you have to enter your password and new email.": "Щоб змінити електронну пошту, вам потрібно ввести пароль і нову адресу.",
+  "Toggle full page width": "Перемкнути ширину на всю сторінку",
+  "Unable to import pages. Please try again.": "Не вдалося імпортувати сторінки. Будь ласка, спробуйте ще раз.",
+  "untitled": "без назви",
+  "Untitled": "Без назви",
+  "Updated successfully": "Оновлено успішно",
+  "User": "Користувач",
+  "Workspace": "Робоча область",
+  "Workspace Name": "Ім'я робочої області",
+  "Workspace settings": "Налаштування робочої області",
+  "You can change your password here.": "Ви можете змінити свій пароль тут.",
+  "Your Email": "Ваша електронна пошта",
+  "Your import is complete.": "Ваш імпорт завершено.",
+  "Your name": "Ваше ім'я",
+  "Your Name": "Ваше ім'я",
+  "Your password": "Ваш пароль",
+  "Your password must be a minimum of 8 characters.": "Ваш пароль повинен містити мінімум 8 символів.",
+  "Sidebar toggle": "Перемкнути бічну панель",
+  "Comments": "Коментарі",
+  "404 page not found": "404 сторінку не знайдено",
+  "Sorry, we can't find the page you are looking for.": "На жаль, ми не можемо знайти сторінку, яку ви шукаєте.",
+  "Take me back to homepage": "Повернутися на головну сторінку",
+  "Forgot password": "Забули пароль",
+  "Forgot your password?": "Забули пароль?",
+  "A password reset link has been sent to your email. Please check your inbox.": "Посилання для скидання пароля було надіслано на вашу електронну адресу. Будь ласка, перевірте вхідні повідомлення.",
+  "Send reset link": "Надіслати посилання для скидання",
+  "Password reset": "Скидання пароля",
+  "Your new password": "Ваш новий пароль",
+  "Set password": "Встановити пароль",
+  "Write a comment": "Написати коментар",
+  "Reply...": "Відповісти...",
+  "Error loading comments.": "Помилка при завантаженні коментарів.",
+  "No comments yet.": "Коментарів поки немає.",
+  "Edit comment": "Редагувати коментар",
+  "Delete comment": "Видалити коментар",
+  "Are you sure you want to delete this comment?": "Ви впевнені, що хочете видалити цей коментар?",
+  "Comment created successfully": "Коментар успішно створено",
+  "Error creating comment": "Помилка при створенні коментаря",
+  "Comment updated successfully": "Коментар успішно оновлено",
+  "Failed to update comment": "Не вдалося оновити коментар",
+  "Comment deleted successfully": "Коментар успішно видалено",
+  "Failed to delete comment": "Не вдалося видалити коментар",
+  "Comment resolved successfully": "Коментар успішно вирішено",
+  "Failed to resolve comment": "Не вдалося вирішити коментар",
+  "Revoke invitation": "Відкликати запрошення",
+  "Revoke": "Відкликати",
+  "Don't": "Ні",
+  "Are you sure you want to revoke this invitation? The user will not be able to join the workspace.": "Ви впевнені, що хочете відкликати це запрошення? Користувач не зможе приєднатися до робочої області.",
+  "Resend invitation": "Надіслати запрошення повторно",
+  "Anyone with this link can join this workspace.": "Будь-хто, хто має це посилання, може приєднатися до цієї робочої області.",
+  "Invite link": "Посилання для запрошення",
+  "Copy": "Копіювати",
+  "Copied": "Скопійовано",
+  "Select a user": "Оберіть користувача",
+  "Select a group": "Оберіть групу",
+  "Export all pages and attachments in this space.": "Експортувати всі сторінки та вкладення в цьому просторі.",
+  "Delete space": "Видалити простір",
+  "Are you sure you want to delete this space?": "Ви впевнені, що хочете видалити цей простір?",
+  "Delete this space with all its pages and data.": "Видалити цей простір з усіма його сторінками та даними.",
+  "All pages, comments, attachments and permissions in this space will be deleted irreversibly.": "Усі сторінки, коментарі, вкладення та дозволи в цьому просторі будуть видалені безповоротно.",
+  "Confirm space name": "Підтвердіть назву простору",
+  "Type the space name <b>{{spaceName}}</b> to confirm your action.": "Введіть назву простору <b>{{spaceName}}</b>, щоб підтвердити вашу дію.",
+  "Format": "Формат",
+  "Include subpages": "Включити вкладені сторінки",
+  "Include attachments": "Включити вкладення",
+  "Select export format": "Виберіть формат експорту",
+  "Export failed:": "Експортування не вдалося:",
+  "export error": "помилка експорту",
+  "Export page": "Експорт сторінки",
+  "Export space": "Експорт простору",
+  "Export {{type}}": "Експорт {{type}}",
+  "File exceeds the {{limit}} attachment limit": "Файл перевищує ліміт вкладень {{limit}}",
+  "Align left": "По лівому краю",
+  "Align right": "По правому краю",
+  "Align center": "По центру",
+  "Justify": "По ширині",
+  "Merge cells": "Об'єднати комірки",
+  "Split cell": "Розділити комірку",
+  "Delete column": "Видалити стовпець",
+  "Delete row": "Видалити рядок",
+  "Add left column": "Додати стовпець ліворуч",
+  "Add right column": "Додати стовпець праворуч",
+  "Add row above": "Додати рядок вище",
+  "Add row below": "Додати рядок нижче",
+  "Delete table": "Видалити таблицю",
+  "Info": "Інформація",
+  "Success": "Успішно",
+  "Warning": "Попередження",
+  "Danger": "Важливо",
+  "Mermaid diagram error:": "Помилка діаграми Mermaid:",
+  "Invalid Mermaid diagram": "Неприпустима діаграма Mermaid",
+  "Double-click to edit Draw.io diagram": "Клацніть двічі для редагування діаграми Draw.io",
+  "Exit": "Вийти",
+  "Save & Exit": "Зберегти та вийти",
+  "Double-click to edit Excalidraw diagram": "Клацніть двічі для редагування діаграми Excalidraw",
+  "Paste link": "Вставити посилання",
+  "Edit link": "Редагувати посилання",
+  "Remove link": "Видалити посилання",
+  "Add link": "Додати посилання",
+  "Please enter a valid url": "Будь ласка, введіть коректний url",
+  "Empty equation": "Порожнє рівняння",
+  "Invalid equation": "Неприпустиме рівняння",
+  "Color": "Колір",
+  "Text color": "Колір тексту",
+  "Default": "За замовчуванням",
+  "Blue": "Синій",
+  "Green": "Зелений",
+  "Purple": "Фіолетовий",
+  "Red": "Червоний",
+  "Yellow": "Жовтий",
+  "Orange": "Помаранчевий",
+  "Pink": "Рожевий",
+  "Gray": "Сірий",
+  "Embed link": "Вбудоване посилання",
+  "Invalid {{provider}} embed link": "Невірне посилання для вбудовування {{provider}}",
+  "Embed {{provider}}": "Вбудувати {{provider}}",
+  "Enter {{provider}} link to embed": "Введіть посилання для вбудовування {{provider}}",
+  "Bold": "Жирний",
+  "Italic": "Курсив",
+  "Underline": "Підкреслений",
+  "Strike": "Закреслений",
+  "Code": "Код",
+  "Comment": "Коментар",
+  "Text": "Текст",
+  "Heading 1": "Заголовок 1",
+  "Heading 2": "Заголовок 2",
+  "Heading 3": "Заголовок 3",
+  "To-do List": "Список справ",
+  "Bullet List": "Маркований список",
+  "Numbered List": "Нумерований список",
+  "Blockquote": "Блок цитування",
+  "Just start typing with plain text.": "Просто почніть друкувати звичайний текст.",
+  "Track tasks with a to-do list.": "Відстежуйте завдання за допомогою списку справ.",
+  "Big section heading.": "Великий заголовок розділу.",
+  "Medium section heading.": "Середній заголовок розділу.",
+  "Small section heading.": "Малий заголовок розділу.",
+  "Create a simple bullet list.": "Створити простий маркований список.",
+  "Create a list with numbering.": "Створити нумерований список.",
+  "Create block quote.": "Створити блок цитування.",
+  "Insert code snippet.": "Вставити фрагмент коду.",
+  "Insert horizontal rule divider": "Вставити горизонтальний роздільник",
+  "Upload any image from your device.": "Завантажити будь-яке зображення з вашого пристрою.",
+  "Upload any video from your device.": "Завантажити будь-яке відео з вашого пристрою.",
+  "Upload any file from your device.": "Завантажити будь-який файл з вашого пристрою.",
+  "Table": "Таблиця",
+  "Insert a table.": "Вставити таблицю.",
+  "Insert collapsible block.": "Вставити блок, що згортається.",
+  "Video": "Відео",
+  "Divider": "Роздільник",
+  "Quote": "Цитата",
+  "Image": "Зображення",
+  "File attachment": "Прикріплений файл",
+  "Toggle block": "Блок, що згортається",
+  "Callout": "Виноска",
+  "Insert callout notice.": "Вставити виноску з повідомленням.",
+  "Math inline": "Формула",
+  "Insert inline math equation.": "Вставити математичне рівняння в рядок.",
+  "Math block": "Блок формул",
+  "Insert math equation": "Вставити математичне рівняння",
+  "Mermaid diagram": "Діаграма Mermaid",
+  "Insert mermaid diagram": "Вставити діаграму Mermaid",
+  "Insert and design Drawio diagrams": "Вставити та розробити діаграми Draw.io",
+  "Insert current date": "Вставити поточну дату",
+  "Draw and sketch excalidraw diagrams": "Вставити та малювати діаграми Excalidraw",
+  "Multiple": "Декілька",
+  "Heading {{level}}": "Заголовок {{level}}",
+  "Toggle title": "Перемкнути заголовок",
+  "Write anything. Enter \"/\" for commands": "Почніть писати. Введіть \"/\" для списку команд",
+  "Names do not match": "Назви не співпадають",
+  "Today, {{time}}": "Сьогодні, {{time}}",
+  "Yesterday, {{time}}": "Вчора, {{time}}",
+  "Space created successfully": "Простір успішно створено",
+  "Space updated successfully": "Простір успішно оновлено",
+  "Space deleted successfully": "Простір успішно видалено",
+  "Members added successfully": "Учасників успішно додано",
+  "Member removed successfully": "Учасника успішно видалено",
+  "Member role updated successfully": "Роль учасника успішно оновлено",
+  "Created by: <b>{{creatorName}}</b>": "Автор: <b>{{creatorName}}</b>",
+  "Created at: {{time}}": "Дата створення: {{time}}",
+  "Edited by {{name}} {{time}}": "Змінено {{name}} {{time}}",
+  "Word count: {{wordCount}}": "Кількість слів: {{wordCount}}",
+  "Character count: {{characterCount}}": "Кількість символів: {{characterCount}}",
+  "New update": "Нове оновлення",
+  "{{latestVersion}} is available": "Доступна нова версія {{latestVersion}}",
+  "Delete member": "Видалити учасника",
+  "Member deleted successfully": "Учасника успішно видалено",
+  "Are you sure you want to delete this workspace member? This action is irreversible.": "Ви впевнені, що хочете видалити цього учасника робочої області? Ця дія незворотна.",
+  "Move": "Перемістити",
+  "Move page": "Перемістити сторінку",
+  "Move page to a different space.": "Перемістити сторінку в інший простір.",
+  "Real-time editor connection lost. Retrying...": "З'єднання з редактором у реальному часі втрачено. Повторна спроба...",
+  "Table of contents": "Зміст",
+  "Add headings (H1, H2, H3) to generate a table of contents.": "Додайте заголовки (H1, H2, H3), щоб створити зміст.",
+  "Share": "Поділитися",
+  "Public sharing": "Публічний доступ",
+  "Shared by": "Поділився",
+  "Shared at": "Поділився в",
+  "Inherits public sharing from": "Успадковує публічний доступ від",
+  "Share to web": "Поділитися в інтернеті",
+  "Shared to web": "Розміщено в інтернеті",
+  "Anyone with the link can view this page": "Будь-хто, хто має посилання, може переглянути цю сторінку",
+  "Make this page publicly accessible": "Зробити цю сторінку загальнодоступною",
+  "Include sub-pages": "Включити підсторінки",
+  "Make sub-pages public too": "Зробити підсторінки також загальнодоступними",
+  "Allow search engines to index page": "Дозволити пошуковим системам індексувати сторінку",
+  "Open page": "Відкрити сторінку",
+  "Page": "Сторінка",
+  "Delete public share link": "Видалити посилання на публічний доступ",
+  "Delete share": "Видалити спільний доступ",
+  "Are you sure you want to delete this shared link?": "Ви впевнені, що хочете видалити це посилання спільного доступу?",
+  "Publicly shared pages from spaces you are a member of will appear here": "Публічні сторінки з просторів, учасником яких ви є, з'являться тут",
+  "Share deleted successfully": "Спільний доступ успішно видалено",
+  "Share not found": "Спільний доступ не знайдено",
+  "Failed to share page": "Не вдалося поділитися сторінкою",
+  "Copy page": "Копіювати сторінки",
+  "Copy page to a different space.": "Скопіювати сторінку в інший простір.",
+  "Page copied successfully": "Сторінку успішно скопійовано"
+}

apps/client/public/locales/zh-CN/translation.json

@@ -383,5 +383,8 @@
   "Publicly shared pages from spaces you are a member of will appear here": "您所在空间的公开共享页面会显示在此处",
   "Share deleted successfully": "分享已成功删除",
   "Share not found": "未找到分享",
-  "Failed to share page": "页面分享失败"
+  "Failed to share page": "页面分享失败",
+  "Copy page": "复制页面",
+  "Copy page to a different space.": "将页面复制到不同的空间。",
+  "Page copied successfully": "页面复制成功"
 }

apps/client/src/components/icons/confluence-icon.tsx

@@ -0,0 +1,20 @@
+import { rem } from "@mantine/core";
+
+interface Props {
+  size?: number | string;
+}
+
+export function ConfluenceIcon({ size }: Props) {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      style={{ width: rem(size), height: rem(size) }}
+    >
+      <path d="M.87 18.257c-.248.382-.53.875-.763 1.245a.764.764 0 0 0 .255 1.04l4.965 3.054a.764.764 0 0 0 1.058-.26c.199-.332.454-.763.733-1.221 1.967-3.247 3.945-2.853 7.508-1.146l4.957 2.337a.764.764 0 0 0 1.028-.382l2.364-5.346a.764.764 0 0 0-.382-1 599.851 599.851 0 0 1-4.965-2.361C10.911 10.97 5.224 11.185.87 18.257zM23.131 5.743c.249-.405.531-.875.764-1.25a.764.764 0 0 0-.256-1.034L18.675.404a.764.764 0 0 0-1.058.26c-.195.335-.451.763-.734 1.225-1.966 3.246-3.945 2.85-7.508 1.146L4.437.694a.764.764 0 0 0-1.027.382L1.046 6.422a.764.764 0 0 0 .382 1c1.039.49 3.105 1.467 4.965 2.361 6.698 3.246 12.392 3.029 16.738-4.04z" />
+    </svg>
+  );
+}

apps/client/src/features/auth/types/auth.types.ts

@@ -36,5 +36,5 @@ export interface IVerifyUserToken {
 }
 
 export interface ICollabToken {
-  token: string;
+  token?: string;
 }

apps/client/src/features/editor/components/bubble-menu/bubble-menu.tsx

@@ -116,6 +116,12 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
     },
     tippyOptions: {
       moveTransition: "transform 0.15s ease-out",
+      onCreate: (instance) => {
+        instance.popper.firstChild?.addEventListener("blur", (event) => {
+          event.preventDefault();
+          event.stopImmediatePropagation();
+        });
+      },
       onHide: () => {
         setIsNodeSelectorOpen(false);
         setIsTextAlignmentOpen(false);
@@ -177,8 +183,8 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
         <LinkSelector
           editor={props.editor}
           isOpen={isLinkSelectorOpen}
-          setIsOpen={() => {
-            setIsLinkSelectorOpen(!isLinkSelectorOpen);
+          setIsOpen={(value) => {
+            setIsLinkSelectorOpen(value);
             setIsNodeSelectorOpen(false);
             setIsTextAlignmentOpen(false);
             setIsColorSelectorOpen(false);

apps/client/src/features/editor/components/embed/embed-view.tsx

@@ -15,13 +15,13 @@ import {
 import { IconEdit } from "@tabler/icons-react";
 import { z } from "zod";
 import { useForm, zodResolver } from "@mantine/form";
-import {
-  getEmbedProviderById,
-  getEmbedUrlAndProvider,
-} from "@/features/editor/components/embed/providers.ts";
 import { notifications } from "@mantine/notifications";
 import { useTranslation } from "react-i18next";
 import i18n from "i18next";
+import {
+  getEmbedProviderById,
+  getEmbedUrlAndProvider,
+} from "@docmost/editor-ext";
 
 const schema = z.object({
   url: z
@@ -52,6 +52,10 @@ export default function EmbedView(props: NodeViewProps) {
   async function onSubmit(data: { url: string }) {
     if (provider) {
       const embedProvider = getEmbedProviderById(provider);
+      if (embedProvider.id === "iframe") {
+        updateAttributes({ src: data.url });
+        return;
+      }
       if (embedProvider.regex.test(data.url)) {
         updateAttributes({ src: data.url });
       } else {
@@ -101,7 +105,7 @@ export default function EmbedView(props: NodeViewProps) {
 
                 <Text component="span" size="lg" c="dimmed">
                   {t("Embed {{provider}}", {
-                    provider: getEmbedProviderById(provider).name,
+                    provider: getEmbedProviderById(provider)?.name,
                   })}
                 </Text>
               </div>

apps/client/src/features/editor/components/excalidraw/excalidraw-utils.ts

@@ -0,0 +1,42 @@
+type LibraryItems = any;
+
+type LibraryPersistedData = {
+  libraryItems: LibraryItems;
+};
+
+export interface LibraryPersistenceAdapter {
+  load(metadata: { source: "load" | "save" }):
+    | Promise<{ libraryItems: LibraryItems } | null>
+    | {
+    libraryItems: LibraryItems;
+  }
+    | null;
+
+  save(libraryData: LibraryPersistedData): Promise<void> | void;
+}
+
+const LOCAL_STORAGE_KEY = "excalidrawLibrary";
+
+export const localStorageLibraryAdapter: LibraryPersistenceAdapter = {
+  async load() {
+    try {
+      const data = localStorage.getItem(LOCAL_STORAGE_KEY);
+      if (data) {
+        return JSON.parse(data);
+      }
+    } catch (e) {
+      console.error("Error downloading Excalidraw library from localStorage", e);
+    }
+    return null;
+  },
+  async save(libraryData) {
+    try {
+      localStorage.setItem(LOCAL_STORAGE_KEY, JSON.stringify(libraryData));
+    } catch (e) {
+      console.error(
+        "Error while saving library from Excalidraw to localStorage",
+        e,
+      );
+    }
+  },
+};

apps/client/src/features/editor/components/excalidraw/excalidraw-view.tsx

@@ -13,7 +13,8 @@ import { uploadFile } from "@/features/page/services/page-service.ts";
 import { svgStringToFile } from "@/lib";
 import { useDisclosure } from "@mantine/hooks";
 import { getFileUrl } from "@/lib/config.ts";
-import { ExcalidrawImperativeAPI } from "@excalidraw/excalidraw/types/types";
+import "@excalidraw/excalidraw/index.css";
+import type { ExcalidrawImperativeAPI } from "@excalidraw/excalidraw/types";
 import { IAttachment } from "@/lib/types";
 import ReactClearModal from "react-clear-modal";
 import clsx from "clsx";
@@ -21,6 +22,8 @@ import { IconEdit } from "@tabler/icons-react";
 import { lazy } from "react";
 import { Suspense } from "react";
 import { useTranslation } from "react-i18next";
+import { useHandleLibrary } from "@excalidraw/excalidraw";
+import { localStorageLibraryAdapter } from "@/features/editor/components/excalidraw/excalidraw-utils.ts";
 
 const Excalidraw = lazy(() =>
   import("@excalidraw/excalidraw").then((module) => ({
@@ -35,6 +38,10 @@ export default function ExcalidrawView(props: NodeViewProps) {
 
   const [excalidrawAPI, setExcalidrawAPI] =
     useState<ExcalidrawImperativeAPI>(null);
+  useHandleLibrary({
+    excalidrawAPI,
+    adapter: localStorageLibraryAdapter,
+  });
   const [excalidrawData, setExcalidrawData] = useState<any>(null);
   const [opened, { open, close }] = useDisclosure(false);
   const computedColorScheme = useComputedColorScheme();

apps/client/src/features/editor/components/slash-menu/menu-items.ts

@@ -17,8 +17,8 @@ import {
   IconTable,
   IconTypography,
   IconMenu4,
-  IconCalendar,
-} from "@tabler/icons-react";
+  IconCalendar, IconAppWindow,
+} from '@tabler/icons-react';
 import {
   CommandProps,
   SlashMenuGroupedItemsType,
@@ -357,6 +357,20 @@ const CommandGroups: SlashMenuGroupedItemsType = {
           .run();
       },
     },
+    {
+      title: "Iframe embed",
+      description: "Embed any Iframe",
+      searchTerms: ["iframe"],
+      icon: IconAppWindow,
+      command: ({ editor, range }: CommandProps) => {
+        editor
+          .chain()
+          .focus()
+          .deleteRange(range)
+          .setEmbed({ provider: "iframe" })
+          .run();
+      },
+    },
     {
       title: "Airtable",
       description: "Embed Airtable",

apps/client/src/features/editor/components/table/table-menu.tsx

@@ -17,9 +17,9 @@ import {
   IconColumnRemove,
   IconRowInsertBottom,
   IconRowInsertTop,
-  IconRowRemove,
+  IconRowRemove, IconTableColumn, IconTableRow,
   IconTrashX,
-} from "@tabler/icons-react";
+} from '@tabler/icons-react';
 import { isCellSelection } from "@docmost/editor-ext";
 import { useTranslation } from "react-i18next";
 
@@ -50,6 +50,14 @@ export const TableMenu = React.memo(
       return posToDOMRect(editor.view, selection.from, selection.to);
     }, [editor]);
 
+    const toggleHeaderColumn = useCallback(() => {
+      editor.chain().focus().toggleHeaderColumn().run();
+    }, [editor]);
+
+    const toggleHeaderRow = useCallback(() => {
+      editor.chain().focus().toggleHeaderRow().run();
+    }, [editor]);
+
     const addColumnLeft = useCallback(() => {
       editor.chain().focus().addColumnBefore().run();
     }, [editor]);
@@ -180,6 +188,30 @@ export const TableMenu = React.memo(
             </ActionIcon>
           </Tooltip>
 
+          <Tooltip position="top" label={t("Toggle header row")}
+          >
+            <ActionIcon
+              onClick={toggleHeaderRow}
+              variant="default"
+              size="lg"
+              aria-label={t("Toggle header row")}
+            >
+              <IconTableRow size={18} />
+            </ActionIcon>
+          </Tooltip>
+
+          <Tooltip position="top" label={t("Toggle header column")}
+          >
+            <ActionIcon
+              onClick={toggleHeaderColumn}
+              variant="default"
+              size="lg"
+              aria-label={t("Toggle header column")}
+            >
+              <IconTableColumn size={18} />
+            </ActionIcon>
+          </Tooltip>
+
           <Tooltip position="top" label={t("Delete table")}>
             <ActionIcon
               onClick={deleteTable}

apps/client/src/features/editor/title-editor.tsx

@@ -103,7 +103,7 @@ export function TitleEditor({
         spaceId: page.spaceId,
         entity: ["pages"],
         id: page.id,
-        payload: { title: page.title, slugId: page.slugId },
+        payload: { title: page.title, slugId: page.slugId, parentPageId: page.parentPageId, icon: page.icon },
       };
 
       if (page.title !== titleEditor.getText()) return;

apps/client/src/features/file-task/services/file-task-service.ts

@@ -0,0 +1,14 @@
+import api from "@/lib/api-client";
+import { IFileTask } from "@/features/file-task/types/file-task.types.ts";
+
+export async function getFileTaskById(fileTaskId: string): Promise<IFileTask> {
+  const req = await api.post<IFileTask>("/file-tasks/info", {
+    fileTaskId: fileTaskId,
+  });
+  return req.data;
+}
+
+export async function getFileTasks(): Promise<IFileTask[]> {
+  const req = await api.post<IFileTask[]>("/file-tasks");
+  return req.data;
+}

apps/client/src/features/file-task/types/file-task.types.ts

@@ -0,0 +1,17 @@
+export interface IFileTask {
+  id: string;
+  type: "import" | "export";
+  source: string;
+  status: string;
+  fileName: string;
+  filePath: string;
+  fileSize: number;
+  fileExt: string;
+  errorMessage: string | null;
+  creatorId: string;
+  spaceId: string;
+  workspaceId: string;
+  createdAt: string;
+  updatedAt: string;
+  deletedAt: string | null;
+}

apps/client/src/features/page-history/services/page-history-service.ts

@@ -1,9 +1,10 @@
 import api from "@/lib/api-client";
 import { IPageHistory } from "@/features/page-history/types/page.types";
+import { IPagination } from "@/lib/types.ts";
 
 export async function getPageHistoryList(
   pageId: string,
-): Promise<IPageHistory[]> {
+): Promise<IPagination<IPageHistory>> {
   const req = await api.post("/pages/history", {
     pageId,
   });

apps/client/src/features/page/components/page-import-modal.tsx

@@ -1,18 +1,38 @@
-import { Modal, Button, SimpleGrid, FileButton } from "@mantine/core";
 import {
+  Modal,
+  Button,
+  SimpleGrid,
+  FileButton,
+  Group,
+  Text,
+  Tooltip,
+} from "@mantine/core";
+import {
+  IconBrandNotion,
   IconCheck,
   IconFileCode,
+  IconFileTypeZip,
   IconMarkdown,
   IconX,
 } from "@tabler/icons-react";
-import { importPage } from "@/features/page/services/page-service.ts";
+import {
+  importPage,
+  importZip,
+} from "@/features/page/services/page-service.ts";
 import { notifications } from "@mantine/notifications";
 import { treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom.ts";
 import { useAtom } from "jotai";
 import { buildTree } from "@/features/page/tree/utils";
 import { IPage } from "@/features/page/types/page.types.ts";
-import React from "react";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
+import { ConfluenceIcon } from "@/components/icons/confluence-icon.tsx";
+import { getFileImportSizeLimit, isCloud } from "@/lib/config.ts";
+import { formatBytes } from "@/lib";
+import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
+import { getFileTaskById } from "@/features/file-task/services/file-task-service.ts";
+import { queryClient } from "@/main.tsx";
+import { useQueryEmit } from "@/features/websocket/use-query-emit.ts";
 
 interface PageImportModalProps {
   spaceId: string;
@@ -36,6 +56,7 @@ export default function PageImportModal({
         yOffset="10vh"
         xOffset={0}
         mah={400}
+        keepMounted={true}
       >
         <Modal.Overlay />
         <Modal.Content style={{ overflow: "hidden" }}>
@@ -59,6 +80,133 @@ interface ImportFormatSelection {
 function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
   const { t } = useTranslation();
   const [treeData, setTreeData] = useAtom(treeDataAtom);
+  const [workspace] = useAtom(workspaceAtom);
+  const [fileTaskId, setFileTaskId] = useState<string | null>(null);
+  const emit = useQueryEmit();
+
+  const canUseConfluence = isCloud() || workspace?.hasLicenseKey;
+
+  const handleZipUpload = async (selectedFile: File, source: string) => {
+    if (!selectedFile) {
+      return;
+    }
+
+    try {
+      onClose();
+
+      notifications.show({
+        id: "import",
+        title: t("Uploading import file"),
+        message: t("Please don't close this tab."),
+        loading: true,
+        withCloseButton: false,
+        autoClose: false,
+      });
+
+      const importTask = await importZip(selectedFile, spaceId, source);
+      notifications.update({
+        id: "import",
+        title: t("Importing pages"),
+        message: t(
+          "Page import is in progress. You can check back later if this takes longer.",
+        ),
+        loading: true,
+        withCloseButton: true,
+        autoClose: false,
+      });
+
+      setFileTaskId(importTask.id);
+    } catch (err) {
+      console.log("Failed to upload import file", err);
+      notifications.update({
+        id: "import",
+        color: "red",
+        title: t("Failed to upload import file"),
+        message: err?.response.data.message,
+        icon: <IconX size={18} />,
+        loading: false,
+        withCloseButton: true,
+        autoClose: false,
+      });
+    }
+  };
+
+  useEffect(() => {
+    if (!fileTaskId) return;
+
+    const intervalId = setInterval(async () => {
+      try {
+        const fileTask = await getFileTaskById(fileTaskId);
+        const status = fileTask.status;
+
+        if (status === "success") {
+          notifications.update({
+            id: "import",
+            color: "teal",
+            title: t("Import complete"),
+            message: t("Your pages were successfully imported."),
+            icon: <IconCheck size={18} />,
+            loading: false,
+            withCloseButton: true,
+            autoClose: false,
+          });
+          clearInterval(intervalId);
+          setFileTaskId(null);
+
+          await queryClient.refetchQueries({
+            queryKey: ["root-sidebar-pages", fileTask.spaceId],
+          });
+
+          setTimeout(() => {
+            emit({
+              operation: "refetchRootTreeNodeEvent",
+              spaceId: spaceId,
+            });
+          }, 50);
+        }
+
+        if (status === "failed") {
+          notifications.update({
+            id: "import",
+            color: "red",
+            title: t("Page import failed"),
+            message: t(
+              "Something went wrong while importing pages: {{reason}}.",
+              {
+                reason: fileTask.errorMessage,
+              },
+            ),
+            icon: <IconX size={18} />,
+            loading: false,
+            withCloseButton: true,
+            autoClose: false,
+          });
+          clearInterval(intervalId);
+          setFileTaskId(null);
+          console.error(fileTask.errorMessage);
+        }
+      } catch (err) {
+        notifications.update({
+          id: "import",
+          color: "red",
+          title: t("Import failed"),
+          message: t(
+            "Something went wrong while importing pages: {{reason}}.",
+            {
+              reason: err.response?.data.message,
+            },
+          ),
+          icon: <IconX size={18} />,
+          loading: false,
+          withCloseButton: true,
+          autoClose: false,
+        });
+        clearInterval(intervalId);
+        setFileTaskId(null);
+        console.error("Failed to fetch import status", err);
+      }
+    }, 3000);
+  }, [fileTaskId]);
 
   const handleFileUpload = async (selectedFiles: File[]) => {
     if (!selectedFiles) {
@@ -120,6 +268,7 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
     }
   };
 
+  // @ts-ignore
   return (
     <>
       <SimpleGrid cols={2}>
@@ -148,7 +297,76 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
             </Button>
           )}
         </FileButton>
+
+        <FileButton
+          onChange={(file) => handleZipUpload(file, "notion")}
+          accept="application/zip"
+        >
+          {(props) => (
+            <Button
+              justify="start"
+              variant="default"
+              leftSection={<IconBrandNotion size={18} />}
+              {...props}
+            >
+              Notion
+            </Button>
+          )}
+        </FileButton>
+        <FileButton
+          onChange={(file) => handleZipUpload(file, "confluence")}
+          accept="application/zip"
+        >
+          {(props) => (
+            <Tooltip
+              label="Available in enterprise edition"
+              disabled={canUseConfluence}
+            >
+              <Button
+                disabled={!canUseConfluence}
+                justify="start"
+                variant="default"
+                leftSection={<ConfluenceIcon size={18} />}
+                {...props}
+              >
+                Confluence
+              </Button>
+            </Tooltip>
+          )}
+        </FileButton>
       </SimpleGrid>
+
+      <Group justify="center" gap="xl" mih={150}>
+        <div>
+          <Text ta="center" size="lg" inline>
+            Import zip file
+          </Text>
+          <Text ta="center" size="sm" c="dimmed" inline py="sm">
+            {t(
+              `Upload zip file containing Markdown and HTML files. Max: {{sizeLimit}}`,
+              {
+                sizeLimit: formatBytes(getFileImportSizeLimit()),
+              },
+            )}
+          </Text>
+          <FileButton
+            onChange={(file) => handleZipUpload(file, "generic")}
+            accept="application/zip"
+          >
+            {(props) => (
+              <Group justify="center">
+                <Button
+                  justify="center"
+                  leftSection={<IconFileTypeZip size={18} />}
+                  {...props}
+                >
+                  {t("Upload file")}
+                </Button>
+              </Group>
+            )}
+          </FileButton>
+        </div>
+      </Group>
     </>
   );
 }

apps/client/src/features/page/queries/page-query.ts

@@ -1,5 +1,8 @@
 import {
+  InfiniteData,
+  QueryKey,
   useInfiniteQuery,
+  UseInfiniteQueryResult,
   useMutation,
   useQuery,
   useQueryClient,
@@ -14,6 +17,7 @@ import {
   movePage,
   getPageBreadcrumbs,
   getRecentChanges,
+  getAllSidebarPages,
 } from "@/features/page/services/page-service";
 import {
   IMovePage,
@@ -56,7 +60,9 @@ export function useCreatePageMutation() {
   const { t } = useTranslation();
   return useMutation<IPage, Error, Partial<IPageInput>>({
     mutationFn: (data) => createPage(data),
-    onSuccess: (data) => {},
+    onSuccess: (data) => {
+      invalidateOnCreatePage(data);
+    },
     onError: (error) => {
       notifications.show({ message: t("Failed to create page"), color: "red" });
     },
@@ -80,6 +86,8 @@ export function updatePageData(data: IPage) {
   if (pageById) {
     queryClient.setQueryData(["pages", data.id], { ...pageById, ...data });
   }
+
+  invalidateOnUpdatePage(data.spaceId, data.parentPageId, data.id, data.title, data.icon);
 }
 
 export function useUpdateTitlePageMutation() {
@@ -93,6 +101,8 @@ export function useUpdatePageMutation() {
     mutationFn: (data) => updatePage(data),
     onSuccess: (data) => {
       updatePage(data);
+
+      invalidateOnUpdatePage(data.spaceId, data.parentPageId, data.id, data.title, data.icon);
     },
   });
 }
@@ -101,8 +111,9 @@ export function useDeletePageMutation() {
   const { t } = useTranslation();
   return useMutation({
     mutationFn: (pageId: string) => deletePage(pageId),
-    onSuccess: () => {
+    onSuccess: (data, pageId) => {
       notifications.show({ message: t("Page deleted successfully") });
+      invalidateOnDeletePage(pageId);
     },
     onError: (error) => {
       notifications.show({ message: t("Failed to delete page"), color: "red" });
@@ -113,15 +124,21 @@ export function useDeletePageMutation() {
 export function useMovePageMutation() {
   return useMutation<void, Error, IMovePage>({
     mutationFn: (data) => movePage(data),
+    onSuccess: () => {
+      invalidateOnMovePage();
+    },
   });
 }
 
-export function useGetSidebarPagesQuery(
-  data: SidebarPagesParams,
-): UseQueryResult<IPagination<IPage>, Error> {
-  return useQuery({
+export function useGetSidebarPagesQuery(data: SidebarPagesParams|null): UseInfiniteQueryResult<InfiniteData<IPagination<IPage>, unknown>> {
+  return useInfiniteQuery({
     queryKey: ["sidebar-pages", data],
-    queryFn: () => getSidebarPages(data),
+    queryFn: ({ pageParam }) => getSidebarPages({ ...data, page: pageParam }),
+    initialPageParam: 1,
+    getPreviousPageParam: (firstPage) =>
+      firstPage.meta.hasPrevPage ? firstPage.meta.page - 1 : undefined,
+    getNextPageParam: (lastPage) =>
+      lastPage.meta.hasNextPage ? lastPage.meta.page + 1 : undefined,
   });
 }
 
@@ -149,14 +166,16 @@ export function usePageBreadcrumbsQuery(
   });
 }
 
-export async function fetchAncestorChildren(params: SidebarPagesParams) {
+export async function fetchAllAncestorChildren(params: SidebarPagesParams) {
   // not using a hook here, so we can call it inside a useEffect hook
   const response = await queryClient.fetchQuery({
     queryKey: ["sidebar-pages", params],
-    queryFn: () => getSidebarPages(params),
+    queryFn: () => getAllSidebarPages(params),
     staleTime: 30 * 60 * 1000,
   });
-  return buildTree(response.items);
+
+  const allItems = response.pages.flatMap((page) => page.items);
+  return buildTree(allItems);
 }
 
 export function useRecentChangesQuery(
@@ -168,3 +187,157 @@ export function useRecentChangesQuery(
     refetchOnMount: true,
   });
 }
+
+export function invalidateOnCreatePage(data: Partial<IPage>) {
+  const newPage: Partial<IPage> = {
+    creatorId: data.creatorId,
+    hasChildren: data.hasChildren,
+    icon: data.icon,
+    id: data.id,
+    parentPageId: data.parentPageId,
+    position: data.position,
+    slugId: data.slugId,
+    spaceId: data.spaceId,
+    title: data.title,
+  };
+
+  let queryKey: QueryKey = null;
+  if (data.parentPageId===null) {
+    queryKey = ['root-sidebar-pages', data.spaceId];
+  }else{
+    queryKey = ['sidebar-pages', {pageId: data.parentPageId, spaceId: data.spaceId}]
+  }
+
+  //update all sidebar pages
+  queryClient.setQueryData<InfiniteData<IPagination<Partial<IPage>>>>(queryKey, (old) => {
+    if (!old) return old;
+    return {
+      ...old,
+      pages: old.pages.map((page,index) => {
+        if (index === old.pages.length - 1) {
+          return {
+            ...page,
+            items: [...page.items, newPage],
+          };
+        }
+        return page;
+      }),
+    };
+  });
+
+  //update sidebar haschildren
+  if (data.parentPageId!==null){
+    //update sub sidebar pages haschildern
+    const subSideBarMatches = queryClient.getQueriesData({
+      queryKey: ['sidebar-pages'],
+      exact: false,
+    });
+
+    subSideBarMatches.forEach(([key, d]) => {
+      queryClient.setQueryData<InfiniteData<IPagination<IPage>>>(key, (old) => {
+        if (!old) return old;
+        return {
+          ...old,
+          pages: old.pages.map((page) => ({
+            ...page,
+            items: page.items.map((sidebarPage: IPage) =>
+              sidebarPage.id === data.parentPageId ? { ...sidebarPage, hasChildren: true } : sidebarPage
+            )
+          })),
+        };
+      });
+    });
+
+    //update root sidebar pages haschildern
+    const rootSideBarMatches = queryClient.getQueriesData({
+      queryKey: ['root-sidebar-pages', data.spaceId],
+      exact: false,
+    });
+
+    rootSideBarMatches.forEach(([key, d]) => {
+      queryClient.setQueryData<InfiniteData<IPagination<IPage>>>(key, (old) => {
+        if (!old) return old;
+        return {
+          ...old,
+          pages: old.pages.map((page) => ({
+            ...page,
+            items: page.items.map((sidebarPage: IPage) =>
+              sidebarPage.id === data.parentPageId ? { ...sidebarPage, hasChildren: true } : sidebarPage
+            )
+          })),
+        };
+      });
+    });
+  }
+
+  //update recent changes
+  queryClient.invalidateQueries({
+    queryKey: ["recent-changes", data.spaceId],
+  });
+}
+
+export function invalidateOnUpdatePage(spaceId: string, parentPageId: string, id: string, title: string, icon: string) {
+  let queryKey: QueryKey = null;
+  if(parentPageId===null){
+    queryKey = ['root-sidebar-pages', spaceId];
+  }else{
+    queryKey = ['sidebar-pages', {pageId: parentPageId, spaceId: spaceId}]
+  }
+  //update all sidebar pages
+  queryClient.setQueryData<InfiniteData<IPagination<IPage>>>(queryKey, (old) => {
+    if (!old) return old;
+    return {
+      ...old,
+      pages: old.pages.map((page) => ({
+        ...page,
+        items: page.items.map((sidebarPage: IPage) =>
+          sidebarPage.id === id ? { ...sidebarPage, title: title, icon: icon } : sidebarPage
+        )
+      })),
+    };
+  });
+  
+  //update recent changes
+  queryClient.invalidateQueries({
+    queryKey: ["recent-changes", spaceId],
+  });
+}
+
+export function invalidateOnMovePage() {
+  //for move invalidate all sidebars for now (how to do???)
+  //invalidate all root sidebar pages
+  queryClient.invalidateQueries({
+    queryKey: ["root-sidebar-pages"],
+  });
+  //invalidate all sub sidebar pages
+  queryClient.invalidateQueries({
+    queryKey: ['sidebar-pages'],
+  });
+  // ---
+}
+
+export function invalidateOnDeletePage(pageId: string) {
+  //update all sidebar pages
+  const allSideBarMatches = queryClient.getQueriesData({
+    predicate: (query) =>
+      query.queryKey[0] === 'root-sidebar-pages' || query.queryKey[0] === 'sidebar-pages',
+  });
+
+  allSideBarMatches.forEach(([key, d]) => {
+    queryClient.setQueryData<InfiniteData<IPagination<IPage>>>(key, (old) => {
+      if (!old) return old;
+      return {
+        ...old,
+        pages: old.pages.map((page) => ({
+          ...page,
+          items: page.items.filter((sidebarPage: IPage) => sidebarPage.id !== pageId),
+        })),
+      };
+    });
+  });
+  
+  //update recent changes
+  queryClient.invalidateQueries({
+    queryKey: ["recent-changes"],
+  });
+}

apps/client/src/features/page/services/page-service.ts

@@ -7,9 +7,11 @@ import {
   IPage,
   IPageInput,
   SidebarPagesParams,
-} from "@/features/page/types/page.types";
+} from '@/features/page/types/page.types';
 import { IAttachment, IPagination } from "@/lib/types.ts";
 import { saveAs } from "file-saver";
+import { InfiniteData } from "@tanstack/react-query";
+import { IFileTask } from '@/features/file-task/types/file-task.types.ts';
 
 export async function createPage(data: Partial<IPage>): Promise<IPage> {
   const req = await api.post<IPage>("/pages/create", data);
@@ -52,6 +54,32 @@ export async function getSidebarPages(
   return req.data;
 }
 
+export async function getAllSidebarPages(
+  params: SidebarPagesParams,
+): Promise<InfiniteData<IPagination<IPage>, unknown>> {
+  let page = 1;
+  let hasNextPage = false;
+  const pages: IPagination<IPage>[] = [];
+  const pageParams: number[] = [];
+
+  do {
+    const req = await api.post("/pages/sidebar-pages", { ...params, page: page });
+
+    const data: IPagination<IPage> = req.data;
+    pages.push(data);
+    pageParams.push(page);
+
+    hasNextPage = data.meta.hasNextPage;
+
+    page += 1;
+  } while (hasNextPage);
+
+  return {
+    pageParams,
+    pages,
+  };
+}
+
 export async function getPageBreadcrumbs(
   pageId: string,
 ): Promise<Partial<IPage[]>> {
@@ -92,6 +120,25 @@ export async function importPage(file: File, spaceId: string) {
   return req.data;
 }
 
+export async function importZip(
+  file: File,
+  spaceId: string,
+  source?: string,
+): Promise<IFileTask> {
+  const formData = new FormData();
+  formData.append("spaceId", spaceId);
+  formData.append("source", source);
+  formData.append("file", file);
+
+  const req = await api.post<any>("/pages/import-zip", formData, {
+    headers: {
+      "Content-Type": "multipart/form-data",
+    },
+  });
+
+  return req.data;
+}
+
 export async function uploadFile(
   file: File,
   pageId: string,

apps/client/src/features/page/tree/atoms/tree-data-atom.ts

@@ -1,4 +1,19 @@
 import { atom } from "jotai";
 import { SpaceTreeNode } from "@/features/page/tree/types";
+import { appendNodeChildren } from "../utils";
 
 export const treeDataAtom = atom<SpaceTreeNode[]>([]);
+
+// Atom
+export const appendNodeChildrenAtom = atom(
+  null,
+  (
+    get,
+    set,
+    { parentId, children }: { parentId: string; children: SpaceTreeNode[] }
+  ) => {
+    const currentTree = get(treeDataAtom);
+    const updatedTree = appendNodeChildren(currentTree, parentId, children);
+    set(treeDataAtom, updatedTree);
+  }
+);

apps/client/src/features/page/tree/components/space-tree.tsx

@@ -2,7 +2,7 @@ import { NodeApi, NodeRendererProps, Tree, TreeApi } from "react-arborist";
 import { atom, useAtom } from "jotai";
 import { treeApiAtom } from "@/features/page/tree/atoms/tree-api-atom.ts";
 import {
-  fetchAncestorChildren,
+  fetchAllAncestorChildren,
   useGetRootSidebarPagesQuery,
   usePageQuery,
   useUpdatePageMutation,
@@ -24,7 +24,10 @@ import {
   IconPointFilled,
   IconTrash,
 } from "@tabler/icons-react";
-import { treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom.ts";
+import {
+  appendNodeChildrenAtom,
+  treeDataAtom,
+} from "@/features/page/tree/atoms/tree-data-atom.ts";
 import clsx from "clsx";
 import EmojiPicker from "@/components/ui/emoji-picker.tsx";
 import { useTreeMutation } from "@/features/page/tree/hooks/use-tree-mutation.ts";
@@ -32,6 +35,7 @@ import {
   appendNodeChildren,
   buildTree,
   buildTreeWithChildren,
+  mergeRootTrees,
   updateTreeNodeIcon,
 } from "@/features/page/tree/utils/utils.ts";
 import { SpaceTreeNode } from "@/features/page/tree/types.ts";
@@ -104,17 +108,17 @@ export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) {
       const allItems = pagesData.pages.flatMap((page) => page.items);
       const treeData = buildTree(allItems);
 
-      if (data.length < 1 || data?.[0].spaceId !== spaceId) {
-        //Thoughts
-        // don't reset if there is data in state
-        // we only expect to call this once on initial load
-        // even if we decide to refetch, it should only update
-        // and append root pages instead of resetting the entire tree
-        // which looses async loaded children too
-        setData(treeData);
-        setIsDataLoaded(true);
-        setOpenTreeNodes({});
-      }
+      setData((prev) => {
+        // fresh space; full reset
+        if (prev.length === 0 || prev[0]?.spaceId !== spaceId) {
+          setIsDataLoaded(true);
+          setOpenTreeNodes({});
+          return treeData;
+        }
+
+        // same space; append only missing roots
+        return mergeRootTrees(prev, treeData);
+      });
     }
   }, [pagesData, hasNextPage]);
 
@@ -140,7 +144,7 @@ export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) {
             if (ancestor.id === currentPage.id) {
               return;
             }
-            const children = await fetchAncestorChildren({
+            const children = await fetchAllAncestorChildren({
               pageId: ancestor.id,
               spaceId: ancestor.spaceId,
             });
@@ -237,6 +241,7 @@ function Node({ node, style, dragHandle, tree }: NodeRendererProps<any>) {
   const { t } = useTranslation();
   const updatePageMutation = useUpdatePageMutation();
   const [treeData, setTreeData] = useAtom(treeDataAtom);
+  const [, appendChildren] = useAtom(appendNodeChildrenAtom);
   const emit = useQueryEmit();
   const { spaceSlug } = useParams();
   const timerRef = useRef(null);
@@ -262,9 +267,10 @@ function Node({ node, style, dragHandle, tree }: NodeRendererProps<any>) {
 
   async function handleLoadChildren(node: NodeApi<SpaceTreeNode>) {
     if (!node.data.hasChildren) return;
-    if (node.data.children && node.data.children.length > 0) {
-      return;
-    }
+    // in conflict with use-query-subscription.ts => case "addTreeNode","moveTreeNode" etc with websocket
+    // if (node.data.children && node.data.children.length > 0) {
+    //   return;
+    // }
 
     try {
       const params: SidebarPagesParams = {
@@ -272,21 +278,12 @@ function Node({ node, style, dragHandle, tree }: NodeRendererProps<any>) {
         spaceId: node.data.spaceId,
       };
 
-      const newChildren = await queryClient.fetchQuery({
-        queryKey: ["sidebar-pages", params],
-        queryFn: () => getSidebarPages(params),
-        staleTime: 10 * 60 * 1000,
+      const childrenTree = await fetchAllAncestorChildren(params);
+
+      appendChildren({
+        parentId: node.data.id,
+        children: childrenTree,
       });
-
-      const childrenTree = buildTree(newChildren.items);
-
-      const updatedTreeData = appendNodeChildren(
-        treeData,
-        node.data.id,
-        childrenTree,
-      );
-
-      setTreeData(updatedTreeData);
     } catch (error) {
       console.error("Failed to fetch children:", error);
     }
@@ -304,17 +301,19 @@ function Node({ node, style, dragHandle, tree }: NodeRendererProps<any>) {
 
   const handleEmojiSelect = (emoji: { native: string }) => {
     handleUpdateNodeIcon(node.id, emoji.native);
-    updatePageMutation.mutateAsync({ pageId: node.id, icon: emoji.native });
-
-    setTimeout(() => {
-      emit({
-        operation: "updateOne",
-        spaceId: node.data.spaceId,
-        entity: ["pages"],
-        id: node.id,
-        payload: { icon: emoji.native },
+    updatePageMutation
+      .mutateAsync({ pageId: node.id, icon: emoji.native })
+      .then((data) => {
+        setTimeout(() => {
+          emit({
+            operation: "updateOne",
+            spaceId: node.data.spaceId,
+            entity: ["pages"],
+            id: node.id,
+            payload: { icon: emoji.native, parentPageId: data.parentPageId },
+          });
+        }, 50);
       });
-    }, 50);
   };
 
   const handleRemoveEmoji = () => {
@@ -576,6 +575,12 @@ interface PageArrowProps {
 }
 
 function PageArrow({ node, onExpandTree }: PageArrowProps) {
+  useEffect(() => {
+    if (node.isOpen) {
+      onExpandTree();
+    }
+  }, []);
+
   return (
     <ActionIcon
       size={20}

apps/client/src/features/page/tree/hooks/use-tree-mutation.ts

@@ -93,7 +93,7 @@ export function useTreeMutation<T>(spaceId: string) {
     return data;
   };
 
-  const onMove: MoveHandler<T> = (args: {
+  const onMove: MoveHandler<T> = async (args: {
     dragIds: string[];
     dragNodes: NodeApi<T>[];
     parentId: string | null;
@@ -176,7 +176,7 @@ export function useTreeMutation<T>(spaceId: string) {
     };
 
     try {
-      movePageMutation.mutateAsync(payload);
+      await movePageMutation.mutateAsync(payload);
 
       setTimeout(() => {
         emit({
@@ -206,6 +206,23 @@ export function useTreeMutation<T>(spaceId: string) {
     }
   };
 
+  const isPageInNode = (
+    node: { data: SpaceTreeNode; children?: any[] },
+    pageSlug: string
+  ): boolean => {
+    if (node.data.slugId === pageSlug) {
+      return true;
+    }
+    for (const item of node.children) {
+      if (item.data.slugId === pageSlug) {
+        return true;
+      } else {
+        return isPageInNode(item, pageSlug);
+      }
+    }
+    return false;
+  };
+
   const onDelete: DeleteHandler<T> = async (args: { ids: string[] }) => {
     try {
       await deletePageMutation.mutateAsync(args.ids[0]);
@@ -218,8 +235,7 @@ export function useTreeMutation<T>(spaceId: string) {
       tree.drop({ id: args.ids[0] });
       setData(tree.data);
 
-      // navigate only if the current url is same as the deleted page
-      if (pageSlug && node.data.slugId === pageSlug.split("-")[1]) {
+      if (pageSlug && isPageInNode(node, pageSlug.split("-")[1])) {
         navigate(getSpaceUrl(spaceSlug));
       }
 

apps/client/src/features/page/tree/utils/utils.ts

@@ -121,7 +121,6 @@ export const deleteTreeNode = (
     .filter((node) => node !== null);
 };
 
-
 export function buildTreeWithChildren(items: SpaceTreeNode[]): SpaceTreeNode[] {
   const nodeMap = {};
   let result: SpaceTreeNode[] = [];
@@ -164,16 +163,55 @@ export function appendNodeChildren(
   nodeId: string,
   children: SpaceTreeNode[],
 ) {
-  return treeItems.map((nodeItem) => {
-    if (nodeItem.id === nodeId) {
-      return { ...nodeItem, children };
-    }
-    if (nodeItem.children) {
+  // Preserve deeper children if they exist and remove node if deleted
+  return treeItems.map((node) => {
+    if (node.id === nodeId) {
+      const newIds = new Set(children.map((c) => c.id));
+
+      const existingMap = new Map(
+        (node.children ?? [])
+          .filter((c) => newIds.has(c.id))
+          .map((c) => [c.id, c]),
+      );
+
+      const merged = children.map((newChild) => {
+        const existing = existingMap.get(newChild.id);
+        return existing && existing.children
+          ? { ...newChild, children: existing.children }
+          : newChild;
+      });
+
       return {
-        ...nodeItem,
-        children: appendNodeChildren(nodeItem.children, nodeId, children),
+        ...node,
+        children: merged,
       };
     }
-    return nodeItem;
+
+    if (node.children) {
+      return {
+        ...node,
+        children: appendNodeChildren(node.children, nodeId, children),
+      };
+    }
+
+    return node;
   });
 }
+
+/**
+ * Merge root nodes; keep existing ones intact, append new ones,
+ */
+export function mergeRootTrees(
+  prevRoots: SpaceTreeNode[],
+  incomingRoots: SpaceTreeNode[],
+): SpaceTreeNode[] {
+  const seen = new Set(prevRoots.map((r) => r.id));
+
+  // add new roots that were not present before
+  const merged = [...prevRoots];
+  incomingRoots.forEach((node) => {
+    if (!seen.has(node.id)) merged.push(node);
+  });
+
+  return sortPositionKeys(merged);
+}

apps/client/src/features/user/components/account-language.tsx

@@ -42,14 +42,15 @@ function LanguageSwitcher() {
       label={t("Select language")}
       data={[
         { value: "en-US", label: "English (US)" },
-        { value: "de-DE", label: "Deutsch (German)" },
-        { value: "nl-NL", label: "Dutch (Netherlands)" },
-        { value: "fr-FR", label: "Français (French)" },
         { value: "es-ES", label: "Español (Spanish)" },
+        { value: "de-DE", label: "Deutsch (German)" },
+        { value: "fr-FR", label: "Français (French)" },
+        { value: "nl-NL", label: "Dutch (Netherlands)" },
         { value: "pt-BR", label: "Português (Brasil)" },
         { value: "it-IT", label: "Italiano (Italian)" },
         { value: "ja-JP", label: "日本語 (Japanese)" },
         { value: "ko-KR", label: "한국어 (Korean)" },
+        { value: "uk-UA", label: "Українська (Ukrainian)" },
         { value: "ru-RU", label: "Русский (Russian)" },
         { value: "zh-CN", label: "中文 (简体)" },
       ]}

apps/client/src/features/websocket/types/types.ts

@@ -1,4 +1,5 @@
 import { SpaceTreeNode } from "@/features/page/tree/types.ts";
+import { IPage } from "@/features/page/types/page.types";
 
 export type InvalidateEvent = {
   operation: "invalidate";
@@ -17,7 +18,7 @@ export type UpdateEvent = {
   spaceId: string;
   entity: Array<string>;
   id: string;
-  payload: Partial<any>;
+  payload: Partial<IPage>;
 };
 
 export type DeleteEvent = {
@@ -25,7 +26,7 @@ export type DeleteEvent = {
   spaceId: string;
   entity: Array<string>;
   id: string;
-  payload?: Partial<any>;
+  payload?: Partial<IPage>;
 };
 
 export type AddTreeNodeEvent = {
@@ -46,15 +47,28 @@ export type MoveTreeNodeEvent = {
     parentId: string;
     index: number;
     position: string;
-  }
+  };
 };
 
 export type DeleteTreeNodeEvent = {
   operation: "deleteTreeNode";
   spaceId: string;
   payload: {
-    node: SpaceTreeNode
-  }
+    node: SpaceTreeNode;
+  };
 };
 
-export type WebSocketEvent = InvalidateEvent | InvalidateCommentsEvent | UpdateEvent | DeleteEvent | AddTreeNodeEvent | MoveTreeNodeEvent | DeleteTreeNodeEvent;
+export type RefetchRootTreeNodeEvent = {
+  operation: "refetchRootTreeNodeEvent";
+  spaceId: string;
+};
+
+export type WebSocketEvent =
+  | InvalidateEvent
+  | InvalidateCommentsEvent
+  | UpdateEvent
+  | DeleteEvent
+  | AddTreeNodeEvent
+  | MoveTreeNodeEvent
+  | DeleteTreeNodeEvent
+  | RefetchRootTreeNodeEvent;

apps/client/src/features/websocket/use-query-subscription.ts

@@ -1,9 +1,18 @@
 import React from "react";
 import { socketAtom } from "@/features/websocket/atoms/socket-atom.ts";
 import { useAtom } from "jotai";
-import { useQueryClient } from "@tanstack/react-query";
+import { InfiniteData, useQueryClient } from "@tanstack/react-query";
 import { WebSocketEvent } from "@/features/websocket/types";
+import { IPage } from "../page/types/page.types";
+import { IPagination } from "@/lib/types";
+import {
+  invalidateOnCreatePage,
+  invalidateOnDeletePage,
+  invalidateOnMovePage,
+  invalidateOnUpdatePage,
+} from "../page/queries/page-query";
 import { RQ_KEY } from "../comment/queries/comment-query";
+import { queryClient } from "@/main.tsx";
 
 export const useQuerySubscription = () => {
   const queryClient = useQueryClient();
@@ -27,6 +36,15 @@ export const useQuerySubscription = () => {
             queryKey: RQ_KEY(data.pageId),
           });
           break;
+        case "addTreeNode":
+          invalidateOnCreatePage(data.payload.data);
+          break;
+        case "moveTreeNode":
+          invalidateOnMovePage();
+          break;
+        case "deleteTreeNode":
+          invalidateOnDeletePage(data.payload.node.id);
+          break;
         case "updateOne":
           entity = data.entity[0];
           if (entity === "pages") {
@@ -37,13 +55,23 @@ export const useQuerySubscription = () => {
           }
 
           // only update if data was already in cache
-          if(queryClient.getQueryData([...data.entity, queryKeyId])){
+          if (queryClient.getQueryData([...data.entity, queryKeyId])) {
             queryClient.setQueryData([...data.entity, queryKeyId], {
               ...queryClient.getQueryData([...data.entity, queryKeyId]),
               ...data.payload,
             });
           }
 
+          if (entity === "pages") {
+            invalidateOnUpdatePage(
+              data.spaceId,
+              data.payload.parentPageId,
+              data.id,
+              data.payload.title,
+              data.payload.icon,
+            );
+          }
+
           /*
           queryClient.setQueriesData(
             { queryKey: [data.entity, data.id] },
@@ -57,6 +85,17 @@ export const useQuerySubscription = () => {
           );
       */
           break;
+        case "refetchRootTreeNodeEvent": {
+          const spaceId = data.spaceId;
+          queryClient.refetchQueries({
+            queryKey: ["root-sidebar-pages", spaceId],
+          });
+
+          queryClient.invalidateQueries({
+            queryKey: ["recent-changes", spaceId],
+          });
+          break;
+        }
       }
     });
   }, [queryClient, socket]);

apps/client/src/lib/config.ts

@@ -70,6 +70,11 @@ export function getFileUploadSizeLimit() {
   return bytes(limit);
 }
 
+export function getFileImportSizeLimit() {
+  const limit = getConfigValue("FILE_IMPORT_SIZE_LIMIT", "200mb");
+  return bytes(limit);
+}
+
 export function getDrawioUrl() {
   return getConfigValue("DRAWIO_URL", "https://embed.diagrams.net");
 }

apps/client/vite.config.ts

@@ -8,6 +8,7 @@ export default defineConfig(({ mode }) => {
   const {
     APP_URL,
     FILE_UPLOAD_SIZE_LIMIT,
+    FILE_IMPORT_SIZE_LIMIT,
     DRAWIO_URL,
     CLOUD,
     SUBDOMAIN_HOST,
@@ -20,6 +21,7 @@ export default defineConfig(({ mode }) => {
       "process.env": {
         APP_URL,
         FILE_UPLOAD_SIZE_LIMIT,
+        FILE_IMPORT_SIZE_LIMIT,
         DRAWIO_URL,
         CLOUD,
         SUBDOMAIN_HOST,

apps/server/package.json

@@ -31,56 +31,61 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "3.701.0",
+    "@aws-sdk/lib-storage": "3.701.0",
     "@aws-sdk/s3-request-presigner": "3.701.0",
     "@casl/ability": "^6.7.3",
     "@fastify/cookie": "^11.0.2",
     "@fastify/multipart": "^9.0.3",
-    "@fastify/static": "^8.1.1",
+    "@fastify/static": "^8.2.0",
     "@nestjs/bullmq": "^11.0.2",
-    "@nestjs/common": "^11.0.20",
+    "@nestjs/common": "^11.1.3",
     "@nestjs/config": "^4.0.2",
-    "@nestjs/core": "^11.0.20",
-    "@nestjs/event-emitter": "^3.0.0",
+    "@nestjs/core": "^11.1.3",
+    "@nestjs/event-emitter": "^3.0.1",
     "@nestjs/jwt": "^11.0.0",
     "@nestjs/mapped-types": "^2.1.0",
     "@nestjs/passport": "^11.0.5",
-    "@nestjs/platform-fastify": "^11.0.20",
-    "@nestjs/platform-socket.io": "^11.0.20",
-    "@nestjs/schedule": "^5.0.1",
+    "@nestjs/platform-fastify": "^11.1.3",
+    "@nestjs/platform-socket.io": "^11.1.3",
+    "@nestjs/schedule": "^6.0.0",
     "@nestjs/terminus": "^11.0.0",
-    "@nestjs/websockets": "^11.0.20",
+    "@nestjs/websockets": "^11.1.3",
     "@node-saml/passport-saml": "^5.0.1",
     "@react-email/components": "0.0.28",
     "@react-email/render": "1.0.2",
     "@socket.io/redis-adapter": "^8.3.0",
     "bcrypt": "^5.1.1",
-    "bullmq": "^5.41.3",
-    "cache-manager": "^6.4.0",
+    "bullmq": "^5.53.2",
+    "cache-manager": "^6.4.3",
+    "cheerio": "^1.1.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "cookie": "^1.0.2",
     "fs-extra": "^11.3.0",
     "happy-dom": "^15.11.6",
     "jsonwebtoken": "^9.0.2",
-    "kysely": "^0.27.5",
+    "kysely": "^0.28.2",
     "kysely-migration-cli": "^0.4.2",
     "mime-types": "^2.1.35",
     "nanoid": "3.3.11",
-    "nestjs-kysely": "^1.1.0",
-    "nodemailer": "^6.10.0",
+    "nestjs-kysely": "^1.2.0",
+    "nodemailer": "^7.0.3",
     "openid-client": "^5.7.1",
     "passport-google-oauth20": "^2.0.0",
     "passport-jwt": "^4.0.1",
-    "pg": "^8.13.3",
+    "pg": "^8.16.0",
     "pg-tsquery": "^8.4.2",
     "postmark": "^4.0.5",
     "react": "^18.3.1",
     "reflect-metadata": "^0.2.2",
-    "rxjs": "^7.8.1",
+    "rxjs": "^7.8.2",
     "sanitize-filename-ts": "^1.0.2",
+    "scimmy": "1.3.5",
     "socket.io": "^4.8.1",
     "stripe": "^17.5.0",
-    "ws": "^8.18.0"
+    "tmp-promise": "^3.0.3",
+    "ws": "^8.18.2",
+    "yauzl": "^3.2.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.20.0",
@@ -99,6 +104,7 @@
     "@types/pg": "^8.11.11",
     "@types/supertest": "^6.0.2",
     "@types/ws": "^8.5.14",
+    "@types/yauzl": "^2.10.3",
     "eslint": "^9.20.1",
     "eslint-config-prettier": "^10.0.1",
     "globals": "^15.15.0",

apps/server/src/collaboration/extensions/persistence.extension.ts

@@ -130,7 +130,7 @@ export class PersistenceExtension implements Extension {
           );
           this.contributors.delete(documentName);
         } catch (err) {
-          this.logger.debug('Contributors error:' + err?.['message']);
+          //this.logger.debug('Contributors error:' + err?.['message']);
         }
 
         await this.pageRepo.updatePage(

apps/server/src/common/helpers/utils.ts

@@ -1,5 +1,6 @@
 import * as path from 'path';
 import * as bcrypt from 'bcrypt';
+import { sanitize } from 'sanitize-filename-ts';
 
 export const envPath = path.resolve(process.cwd(), '..', '..', '.env');
 
@@ -62,3 +63,8 @@ export function extractDateFromUuid7(uuid7: string) {
 
   return new Date(timestamp);
 }
+
+export function sanitizeFileName(fileName: string): string {
+  const sanitizedFilename = sanitize(fileName).replace(/ /g, '_');
+  return sanitizedFilename.slice(0, 255);
+}

apps/server/src/core/group/services/group-user.service.ts

@@ -7,10 +7,11 @@ import {
 } from '@nestjs/common';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { GroupService } from './group.service';
-import { KyselyDB } from '@docmost/db/types/kysely.types';
+import { KyselyDB, KyselyTransaction } from '@docmost/db/types/kysely.types';
 import { InjectKysely } from 'nestjs-kysely';
 import { GroupUserRepo } from '@docmost/db/repos/group/group-user.repo';
 import { UserRepo } from '@docmost/db/repos/user/user.repo';
+import { dbOrTx } from '@docmost/db/utils';
 
 @Injectable()
 export class GroupUserService {
@@ -41,17 +42,23 @@ export class GroupUserService {
     userIds: string[],
     groupId: string,
     workspaceId: string,
+    trx?: KyselyTransaction,
   ): Promise<void> {
-    await this.groupService.findAndValidateGroup(groupId, workspaceId);
+    const db = dbOrTx(this.db, trx);
+    await this.groupService.findAndValidateGroup(groupId, workspaceId, trx);
+
+    if (userIds.length === 0) return;
 
     // make sure we have valid workspace users
-    const validUsers = await this.db
+    const validUsers = await db
       .selectFrom('users')
       .select(['id', 'name'])
       .where('users.id', 'in', userIds)
       .where('users.workspaceId', '=', workspaceId)
       .execute();
 
+    if (validUsers.length === 0) return;
+
     // prepare users to add to group
     const groupUsersToInsert = [];
     for (const user of validUsers) {
@@ -62,7 +69,7 @@ export class GroupUserService {
     }
 
     // batch insert new group users
-    await this.db
+    await db
       .insertInto('groupUsers')
       .values(groupUsersToInsert)
       .onConflict((oc) => oc.columns(['userId', 'groupId']).doNothing())

apps/server/src/core/group/services/group.service.ts

@@ -151,8 +151,11 @@ export class GroupService {
   async findAndValidateGroup(
     groupId: string,
     workspaceId: string,
+    trx?: KyselyTransaction,
   ): Promise<Group> {
-    const group = await this.groupRepo.findById(groupId, workspaceId);
+    const group = await this.groupRepo.findById(groupId, workspaceId, {
+      trx,
+    });
     if (!group) {
       throw new NotFoundException('Group not found');
     }

apps/server/src/database/migrations/20250521T154949-file_tasks.ts

@@ -0,0 +1,39 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .createTable('file_tasks')
+    .addColumn('id', 'uuid', (col) =>
+      col.primaryKey().defaultTo(sql`gen_uuid_v7()`),
+    )
+    // type (import, export)
+    .addColumn('type', 'varchar', (col) => col)
+    // source (generic, notion, confluence)
+    .addColumn('source', 'varchar', (col) => col)
+    // status (pending|processing|success|failed),
+    .addColumn('status', 'varchar', (col) => col)
+    .addColumn('file_name', 'varchar', (col) => col.notNull())
+    .addColumn('file_path', 'varchar', (col) => col.notNull())
+    .addColumn('file_size', 'int8', (col) => col)
+    .addColumn('file_ext', 'varchar', (col) => col)
+    .addColumn('error_message', 'varchar', (col) => col)
+    .addColumn('creator_id', 'uuid', (col) => col.references('users.id'))
+    .addColumn('space_id', 'uuid', (col) =>
+      col.references('spaces.id').onDelete('cascade'),
+    )
+    .addColumn('workspace_id', 'uuid', (col) =>
+      col.references('workspaces.id').onDelete('cascade').notNull(),
+    )
+    .addColumn('created_at', 'timestamptz', (col) =>
+      col.notNull().defaultTo(sql`now()`),
+    )
+    .addColumn('updated_at', 'timestamptz', (col) =>
+      col.notNull().defaultTo(sql`now()`),
+    )
+    .addColumn('deleted_at', 'timestamptz', (col) => col)
+    .execute();
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await db.schema.dropTable('file_tasks').execute();
+}

apps/server/src/database/migrations/20250708T092214-scim.ts

@@ -0,0 +1,51 @@
+import { type Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .createTable('scim_tokens')
+    .addColumn('id', 'uuid', (col) =>
+      col.primaryKey().defaultTo(sql`gen_uuid_v7()`),
+    )
+    .addColumn('name', 'varchar', (col) => col.notNull())
+
+    .addColumn('token', 'varchar', (col) => col.notNull())
+
+    .addColumn('expires_at', 'timestamptz', (col) => col)
+
+    .addColumn('last_used_at', 'timestamptz', (col) => col)
+    .addColumn('allow_signup', 'boolean', (col) =>
+      col.defaultTo(false).notNull(),
+    )
+    .addColumn('is_enabled', 'boolean', (col) => col.defaultTo(false).notNull())
+
+    .addColumn('creator_id', 'uuid', (col) =>
+      col.references('users.id').onDelete('set null'),
+    )
+    .addColumn('workspace_id', 'uuid', (col) =>
+      col.references('workspaces.id').onDelete('cascade').notNull(),
+    )
+    .addColumn('created_at', 'timestamptz', (col) =>
+      col.notNull().defaultTo(sql`now()`),
+    )
+    .addColumn('updated_at', 'timestamptz', (col) =>
+      col.notNull().defaultTo(sql`now()`),
+    )
+    .addColumn('deleted_at', 'timestamptz', (col) => col)
+    .execute();
+
+  await db.schema
+    .alterTable('workspaces')
+    .addColumn('is_scim_enabled', 'boolean', (col) =>
+      col.defaultTo(false).notNull(),
+    )
+    .execute();
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await db.schema.dropTable('scim_tokens').execute();
+
+  await db.schema
+    .alterTable('workspaces')
+    .dropColumn('is_scim_enabled')
+    .execute();
+}

apps/server/src/database/repos/group/group.repo.ts

@@ -51,8 +51,11 @@ export class GroupRepo {
     updatableGroup: UpdatableGroup,
     groupId: string,
     workspaceId: string,
+    trx?: KyselyTransaction,
   ): Promise<void> {
-    await this.db
+    const db = dbOrTx(this.db, trx);
+
+    await db
       .updateTable('groups')
       .set({ ...updatableGroup, updatedAt: new Date() })
       .where('id', '=', groupId)

apps/server/src/database/types/db.d.ts

@@ -122,6 +122,24 @@ export interface Comments {
   workspaceId: string;
 }
 
+export interface FileTasks {
+  createdAt: Generated<Timestamp>;
+  creatorId: string | null;
+  deletedAt: Timestamp | null;
+  errorMessage: string | null;
+  fileExt: string | null;
+  fileName: string;
+  filePath: string;
+  fileSize: Int8 | null;
+  id: Generated<string>;
+  source: string | null;
+  spaceId: string | null;
+  status: string | null;
+  type: string | null;
+  updatedAt: Generated<Timestamp>;
+  workspaceId: string;
+}
+
 export interface Groups {
   createdAt: Generated<Timestamp>;
   creatorId: string | null;
@@ -298,6 +316,7 @@ export interface DB {
   backlinks: Backlinks;
   billing: Billing;
   comments: Comments;
+  fileTasks: FileTasks;
   groups: Groups;
   groupUsers: GroupUsers;
   pageHistory: PageHistory;

apps/server/src/database/types/entity.types.ts

@@ -17,6 +17,7 @@ import {
   AuthProviders,
   AuthAccounts,
   Shares,
+  FileTasks,
 } from './db';
 
 // Workspace
@@ -107,3 +108,8 @@ export type UpdatableAuthAccount = Updateable<Omit<AuthAccounts, 'id'>>;
 export type Share = Selectable<Shares>;
 export type InsertableShare = Insertable<Shares>;
 export type UpdatableShare = Updateable<Omit<Shares, 'id'>>;
+
+// File Task
+export type FileTask = Selectable<FileTasks>;
+export type InsertableFileTask = Insertable<FileTasks>;
+export type UpdatableFileTask = Updateable<Omit<FileTasks, 'id'>>;

apps/server/src/integrations/environment/environment.service.ts

@@ -67,6 +67,10 @@ export class EnvironmentService {
     return this.configService.get<string>('FILE_UPLOAD_SIZE_LIMIT', '50mb');
   }
 
+  getFileImportSizeLimit(): string {
+    return this.configService.get<string>('FILE_IMPORT_SIZE_LIMIT', '200mb');
+  }
+
   getAwsS3AccessKeyId(): string {
     return this.configService.get<string>('AWS_S3_ACCESS_KEY_ID');
   }

apps/server/src/integrations/export/turndown-utils.ts

@@ -1,5 +1,6 @@
 import * as TurndownService from '@joplin/turndown';
 import * as TurndownPluginGfm from '@joplin/turndown-plugin-gfm';
+import * as path from 'path';
 
 export function turndown(html: string): string {
   const turndownService = new TurndownService({
@@ -23,6 +24,7 @@ export function turndown(html: string): string {
     mathInline,
     mathBlock,
     iframeEmbed,
+    video,
   ]);
   return turndownService.turndown(html).replaceAll('<br>', ' ');
 }
@@ -87,8 +89,12 @@ function preserveDetail(turndownService: TurndownService) {
       }
 
       const detailsContent = Array.from(node.childNodes)
-        .filter(child => child.nodeName !== 'SUMMARY')
-        .map(child => (child.nodeType === 1 ? turndownService.turndown((child as HTMLElement).outerHTML) : child.textContent))
+        .filter((child) => child.nodeName !== 'SUMMARY')
+        .map((child) =>
+          child.nodeType === 1
+            ? turndownService.turndown((child as HTMLElement).outerHTML)
+            : child.textContent,
+        )
         .join('');
 
       return `\n<details>\n${detailSummary}\n\n${detailsContent}\n\n</details>\n`;
@@ -135,3 +141,16 @@ function iframeEmbed(turndownService: TurndownService) {
     },
   });
 }
+
+function video(turndownService: TurndownService) {
+  turndownService.addRule('video', {
+    filter: function (node: HTMLInputElement) {
+      return node.tagName === 'VIDEO';
+    },
+    replacement: function (content: any, node: HTMLInputElement) {
+      const src = node.getAttribute('src') || '';
+      const name = path.basename(src);
+      return '[' + name + '](' + src + ')';
+    },
+  });
+}

apps/server/src/integrations/import/dto/file-task-dto.ts

@@ -0,0 +1,18 @@
+import { IsNotEmpty, IsUUID } from 'class-validator';
+
+export class FileTaskIdDto {
+  @IsNotEmpty()
+  @IsUUID()
+  fileTaskId: string;
+}
+
+export type ImportPageNode = {
+  id: string;
+  slugId: string;
+  name: string;
+  content: string;
+  position?: string | null;
+  parentPageId: string | null;
+  fileExtension: string;
+  filePath: string;
+};

apps/server/src/integrations/import/file-task.controller.ts

@@ -0,0 +1,79 @@
+import {
+  Body,
+  Controller,
+  ForbiddenException,
+  HttpCode,
+  HttpStatus,
+  NotFoundException,
+  Post,
+  UseGuards,
+} from '@nestjs/common';
+import SpaceAbilityFactory from '../../core/casl/abilities/space-ability.factory';
+import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
+import { User } from '@docmost/db/types/entity.types';
+import {
+  SpaceCaslAction,
+  SpaceCaslSubject,
+} from '../../core/casl/interfaces/space-ability.type';
+import { InjectKysely } from 'nestjs-kysely';
+import { KyselyDB } from '@docmost/db/types/kysely.types';
+import { AuthUser } from '../../common/decorators/auth-user.decorator';
+import { FileTaskIdDto } from './dto/file-task-dto';
+import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';
+
+@Controller('file-tasks')
+export class FileTaskController {
+  constructor(
+    private readonly spaceMemberRepo: SpaceMemberRepo,
+    private readonly spaceAbility: SpaceAbilityFactory,
+    @InjectKysely() private readonly db: KyselyDB,
+  ) {}
+
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  @Post()
+  async getFileTasks(@AuthUser() user: User) {
+    const userSpaceIds = await this.spaceMemberRepo.getUserSpaceIds(user.id);
+
+    if (!userSpaceIds || userSpaceIds.length === 0) {
+      return [];
+    }
+
+    const fileTasks = await this.db
+      .selectFrom('fileTasks')
+      .selectAll()
+      .where('spaceId', 'in', userSpaceIds)
+      .execute();
+
+    if (!fileTasks) {
+      throw new NotFoundException('File task not found');
+    }
+
+    return fileTasks;
+  }
+
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  @Post('info')
+  async getFileTask(@Body() dto: FileTaskIdDto, @AuthUser() user: User) {
+    const fileTask = await this.db
+      .selectFrom('fileTasks')
+      .selectAll()
+      .where('id', '=', dto.fileTaskId)
+      .executeTakeFirst();
+
+    if (!fileTask || !fileTask.spaceId) {
+      throw new NotFoundException('File task not found');
+    }
+
+    const ability = await this.spaceAbility.createForUser(
+      user,
+      fileTask.spaceId,
+    );
+    if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
+      throw new ForbiddenException();
+    }
+
+    return fileTask;
+  }
+}

apps/server/src/integrations/import/import.controller.ts

@@ -21,8 +21,9 @@ import {
 import { FileInterceptor } from '../../common/interceptors/file.interceptor';
 import * as bytes from 'bytes';
 import * as path from 'path';
-import { ImportService } from './import.service';
+import { ImportService } from './services/import.service';
 import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
+import { EnvironmentService } from '../environment/environment.service';
 
 @Controller()
 export class ImportController {
@@ -31,6 +32,7 @@ export class ImportController {
   constructor(
     private readonly importService: ImportService,
     private readonly spaceAbility: SpaceAbilityFactory,
+    private readonly environmentService: EnvironmentService,
   ) {}
 
   @UseInterceptors(FileInterceptor)
@@ -44,18 +46,18 @@ export class ImportController {
   ) {
     const validFileExtensions = ['.md', '.html'];
 
-    const maxFileSize = bytes('100mb');
+    const maxFileSize = bytes('10mb');
 
     let file = null;
     try {
       file = await req.file({
-        limits: { fileSize: maxFileSize, fields: 3, files: 1 },
+        limits: { fileSize: maxFileSize, fields: 4, files: 1 },
       });
     } catch (err: any) {
       this.logger.error(err.message);
       if (err?.statusCode === 413) {
         throw new BadRequestException(
-          `File too large. Exceeds the 100mb import limit`,
+          `File too large. Exceeds the 10mb import limit`,
         );
       }
     }
@@ -73,7 +75,7 @@ export class ImportController {
     const spaceId = file.fields?.spaceId?.value;
 
     if (!spaceId) {
-      throw new BadRequestException('spaceId or format not found');
+      throw new BadRequestException('spaceId is required');
     }
 
     const ability = await this.spaceAbility.createForUser(user, spaceId);
@@ -83,4 +85,69 @@ export class ImportController {
 
     return this.importService.importPage(file, user.id, spaceId, workspace.id);
   }
+
+  @UseInterceptors(FileInterceptor)
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  @Post('pages/import-zip')
+  async importZip(
+    @Req() req: any,
+    @AuthUser() user: User,
+    @AuthWorkspace() workspace: Workspace,
+  ) {
+    const validFileExtensions = ['.zip'];
+
+    const maxFileSize = bytes(this.environmentService.getFileImportSizeLimit());
+
+    let file = null;
+    try {
+      file = await req.file({
+        limits: { fileSize: maxFileSize, fields: 3, files: 1 },
+      });
+    } catch (err: any) {
+      this.logger.error(err.message);
+      if (err?.statusCode === 413) {
+        throw new BadRequestException(
+          `File too large. Exceeds the ${this.environmentService.getFileImportSizeLimit()} import limit`,
+        );
+      }
+    }
+
+    if (!file) {
+      throw new BadRequestException('Failed to upload file');
+    }
+
+    if (
+      !validFileExtensions.includes(path.extname(file.filename).toLowerCase())
+    ) {
+      throw new BadRequestException('Invalid import file extension.');
+    }
+
+    const spaceId = file.fields?.spaceId?.value;
+    const source = file.fields?.source?.value;
+
+    const validZipSources = ['generic', 'notion', 'confluence'];
+    if (!validZipSources.includes(source)) {
+      throw new BadRequestException(
+        'Invalid import source. Import source must either be generic, notion or confluence.',
+      );
+    }
+
+    if (!spaceId) {
+      throw new BadRequestException('spaceId is required');
+    }
+
+    const ability = await this.spaceAbility.createForUser(user, spaceId);
+    if (ability.cannot(SpaceCaslAction.Edit, SpaceCaslSubject.Page)) {
+      throw new ForbiddenException();
+    }
+
+    return this.importService.importZip(
+      file,
+      source,
+      user.id,
+      spaceId,
+      workspace.id,
+    );
+  }
 }

apps/server/src/integrations/import/import.module.ts

@@ -1,9 +1,22 @@
 import { Module } from '@nestjs/common';
-import { ImportService } from './import.service';
+import { ImportService } from './services/import.service';
 import { ImportController } from './import.controller';
+import { StorageModule } from '../storage/storage.module';
+import { FileTaskService } from './services/file-task.service';
+import { FileTaskProcessor } from './processors/file-task.processor';
+import { ImportAttachmentService } from './services/import-attachment.service';
+import { FileTaskController } from './file-task.controller';
+import { PageModule } from '../../core/page/page.module';
 
 @Module({
-  providers: [ImportService],
-  controllers: [ImportController],
+  providers: [
+    ImportService,
+    FileTaskService,
+    FileTaskProcessor,
+    ImportAttachmentService,
+  ],
+  exports: [ImportService, ImportAttachmentService],
+  controllers: [ImportController, FileTaskController],
+  imports: [StorageModule, PageModule],
 })
 export class ImportModule {}

apps/server/src/integrations/import/processors/file-task.processor.ts

@@ -0,0 +1,76 @@
+import { Logger, OnModuleDestroy } from '@nestjs/common';
+import { OnWorkerEvent, Processor, WorkerHost } from '@nestjs/bullmq';
+import { Job } from 'bullmq';
+import { QueueJob, QueueName } from 'src/integrations/queue/constants';
+import { FileTaskService } from '../services/file-task.service';
+import { FileTaskStatus } from '../utils/file.utils';
+import { StorageService } from '../../storage/storage.service';
+
+@Processor(QueueName.FILE_TASK_QUEUE)
+export class FileTaskProcessor extends WorkerHost implements OnModuleDestroy {
+  private readonly logger = new Logger(FileTaskProcessor.name);
+
+  constructor(
+    private readonly fileTaskService: FileTaskService,
+    private readonly storageService: StorageService,
+  ) {
+    super();
+  }
+
+  async process(job: Job<any, void>): Promise<void> {
+    try {
+      switch (job.name) {
+        case QueueJob.IMPORT_TASK:
+          await this.fileTaskService.processZIpImport(job.data.fileTaskId);
+          break;
+        case QueueJob.EXPORT_TASK:
+          // TODO: export task
+          break;
+      }
+    } catch (err) {
+      this.logger.error('File task failed', err);
+      throw err;
+    }
+  }
+
+  @OnWorkerEvent('active')
+  onActive(job: Job) {
+    this.logger.debug(`Processing ${job.name} job`);
+  }
+
+  @OnWorkerEvent('failed')
+  async onFailed(job: Job) {
+    this.logger.error(
+      `Error processing ${job.name} job. Reason: ${job.failedReason}`,
+    );
+
+    try {
+      const fileTaskId = job.data.fileTaskId;
+      await this.fileTaskService.updateTaskStatus(
+        fileTaskId,
+        FileTaskStatus.Failed,
+        job.failedReason,
+      );
+
+      const fileTask = await this.fileTaskService.getFileTask(fileTaskId);
+      if (fileTask) {
+        await this.storageService.delete(fileTask.filePath);
+      }
+    } catch (err) {
+      this.logger.error(err);
+    }
+  }
+
+  @OnWorkerEvent('completed')
+  onCompleted(job: Job) {
+    this.logger.log(
+      `Completed ${job.name} job for File task ID ${job.data.fileTaskId}`,
+    );
+  }
+
+  async onModuleDestroy(): Promise<void> {
+    if (this.worker) {
+      await this.worker.close();
+    }
+  }
+}

apps/server/src/integrations/import/services/file-task.service.ts

@@ -0,0 +1,346 @@
+import { Injectable, Logger } from '@nestjs/common';
+import * as path from 'path';
+import { jsonToText } from '../../../collaboration/collaboration.util';
+import { InjectKysely } from 'nestjs-kysely';
+import { KyselyDB } from '@docmost/db/types/kysely.types';
+import {
+  extractZip,
+  FileImportSource,
+  FileTaskStatus,
+} from '../utils/file.utils';
+import { StorageService } from '../../storage/storage.service';
+import * as tmp from 'tmp-promise';
+import { pipeline } from 'node:stream/promises';
+import { createWriteStream } from 'node:fs';
+import { ImportService } from './import.service';
+import { promises as fs } from 'fs';
+import { generateSlugId } from '../../../common/helpers';
+import { v7 } from 'uuid';
+import { generateJitteredKeyBetween } from 'fractional-indexing-jittered';
+import { FileTask, InsertablePage } from '@docmost/db/types/entity.types';
+import { markdownToHtml } from '@docmost/editor-ext';
+import { getProsemirrorContent } from '../../../common/helpers/prosemirror/utils';
+import { formatImportHtml } from '../utils/import-formatter';
+import {
+  buildAttachmentCandidates,
+  collectMarkdownAndHtmlFiles,
+} from '../utils/import.utils';
+import { executeTx } from '@docmost/db/utils';
+import { BacklinkRepo } from '@docmost/db/repos/backlink/backlink.repo';
+import { ImportAttachmentService } from './import-attachment.service';
+import { ModuleRef } from '@nestjs/core';
+import { PageService } from '../../../core/page/services/page.service';
+import { ImportPageNode } from '../dto/file-task-dto';
+
+@Injectable()
+export class FileTaskService {
+  private readonly logger = new Logger(FileTaskService.name);
+
+  constructor(
+    private readonly storageService: StorageService,
+    private readonly importService: ImportService,
+    private readonly pageService: PageService,
+    private readonly backlinkRepo: BacklinkRepo,
+    @InjectKysely() private readonly db: KyselyDB,
+    private readonly importAttachmentService: ImportAttachmentService,
+    private moduleRef: ModuleRef,
+  ) {}
+
+  async processZIpImport(fileTaskId: string): Promise<void> {
+    const fileTask = await this.db
+      .selectFrom('fileTasks')
+      .selectAll()
+      .where('id', '=', fileTaskId)
+      .executeTakeFirst();
+
+    if (!fileTask) {
+      this.logger.log(`Import file task with ID ${fileTaskId} not found`);
+      return;
+    }
+
+    if (fileTask.status === FileTaskStatus.Failed) {
+      return;
+    }
+
+    if (fileTask.status === FileTaskStatus.Success) {
+      this.logger.log('Imported task already processed.');
+      return;
+    }
+
+    const { path: tmpZipPath, cleanup: cleanupTmpFile } = await tmp.file({
+      prefix: 'docmost-import',
+      postfix: '.zip',
+      discardDescriptor: true,
+    });
+
+    const { path: tmpExtractDir, cleanup: cleanupTmpDir } = await tmp.dir({
+      prefix: 'docmost-extract-',
+      unsafeCleanup: true,
+    });
+
+    try {
+      const fileStream = await this.storageService.readStream(
+        fileTask.filePath,
+      );
+      await pipeline(fileStream, createWriteStream(tmpZipPath));
+      await extractZip(tmpZipPath, tmpExtractDir);
+    } catch (err) {
+      await cleanupTmpFile();
+      await cleanupTmpDir();
+
+      throw err;
+    }
+
+    try {
+      if (
+        fileTask.source === FileImportSource.Generic ||
+        fileTask.source === FileImportSource.Notion
+      ) {
+        await this.processGenericImport({
+          extractDir: tmpExtractDir,
+          fileTask,
+        });
+      }
+
+      if (fileTask.source === FileImportSource.Confluence) {
+        let ConfluenceModule: any;
+        try {
+          // eslint-disable-next-line @typescript-eslint/no-require-imports
+          ConfluenceModule = require('./../../../ee/confluence-import/confluence-import.service');
+        } catch (err) {
+          this.logger.error(
+            'Confluence import requested but EE module not bundled in this build',
+          );
+          return;
+        }
+        const confluenceImportService = this.moduleRef.get(
+          ConfluenceModule.ConfluenceImportService,
+          { strict: false },
+        );
+
+        await confluenceImportService.processConfluenceImport({
+          extractDir: tmpExtractDir,
+          fileTask,
+        });
+      }
+      try {
+        await this.updateTaskStatus(fileTaskId, FileTaskStatus.Success, null);
+        await cleanupTmpFile();
+        await cleanupTmpDir();
+        // delete stored file on success
+        await this.storageService.delete(fileTask.filePath);
+      } catch (err) {
+        this.logger.error(
+          `Failed to delete import file from storage. Task ID: ${fileTaskId}`,
+          err,
+        );
+      }
+    } catch (err) {
+      await cleanupTmpFile();
+      await cleanupTmpDir();
+
+      throw err;
+    }
+  }
+
+  async processGenericImport(opts: {
+    extractDir: string;
+    fileTask: FileTask;
+  }): Promise<void> {
+    const { extractDir, fileTask } = opts;
+    const allFiles = await collectMarkdownAndHtmlFiles(extractDir);
+    const attachmentCandidates = await buildAttachmentCandidates(extractDir);
+
+    const pagesMap = new Map<string, ImportPageNode>();
+
+    for (const absPath of allFiles) {
+      const relPath = path
+        .relative(extractDir, absPath)
+        .split(path.sep)
+        .join('/'); // normalize to forward-slashes
+      const ext = path.extname(relPath).toLowerCase();
+      let content = await fs.readFile(absPath, 'utf-8');
+
+      if (ext.toLowerCase() === '.md') {
+        content = await markdownToHtml(content);
+      }
+
+      pagesMap.set(relPath, {
+        id: v7(),
+        slugId: generateSlugId(),
+        name: path.basename(relPath, ext),
+        content,
+        parentPageId: null,
+        fileExtension: ext,
+        filePath: relPath,
+      });
+    }
+
+    // parent/child linking
+    pagesMap.forEach((page, filePath) => {
+      const segments = filePath.split('/');
+      segments.pop();
+      let parentPage = null;
+      while (segments.length) {
+        const tryMd = segments.join('/') + '.md';
+        const tryHtml = segments.join('/') + '.html';
+        if (pagesMap.has(tryMd)) {
+          parentPage = pagesMap.get(tryMd)!;
+          break;
+        }
+        if (pagesMap.has(tryHtml)) {
+          parentPage = pagesMap.get(tryHtml)!;
+          break;
+        }
+        segments.pop();
+      }
+      if (parentPage) page.parentPageId = parentPage.id;
+    });
+
+    // generate position keys
+    const siblingsMap = new Map<string | null, ImportPageNode[]>();
+
+    pagesMap.forEach((page) => {
+      const group = siblingsMap.get(page.parentPageId) ?? [];
+      group.push(page);
+      siblingsMap.set(page.parentPageId, group);
+    });
+
+    // get root pages
+    const rootSibs = siblingsMap.get(null);
+
+    if (rootSibs?.length) {
+      rootSibs.sort((a, b) => a.name.localeCompare(b.name));
+
+      // get first position key from the server
+      const nextPosition = await this.pageService.nextPagePosition(
+        fileTask.spaceId,
+      );
+
+      let prevPos: string | null = null;
+      rootSibs.forEach((page, idx) => {
+        if (idx === 0) {
+          page.position = nextPosition;
+        } else {
+          page.position = generateJitteredKeyBetween(prevPos, null);
+        }
+        prevPos = page.position;
+      });
+    }
+
+    // non-root buckets (children & deeper levels)
+    siblingsMap.forEach((sibs, parentId) => {
+      if (parentId === null) return; // root already done
+
+      sibs.sort((a, b) => a.name.localeCompare(b.name));
+
+      let prevPos: string | null = null;
+      for (const page of sibs) {
+        page.position = generateJitteredKeyBetween(prevPos, null);
+        prevPos = page.position;
+      }
+    });
+
+    // internal page links
+    const filePathToPageMetaMap = new Map<
+      string,
+      { id: string; title: string; slugId: string }
+    >();
+    pagesMap.forEach((page) => {
+      filePathToPageMetaMap.set(page.filePath, {
+        id: page.id,
+        title: page.name,
+        slugId: page.slugId,
+      });
+    });
+
+    const pageResults = await Promise.all(
+      Array.from(pagesMap.values()).map(async (page) => {
+        const htmlContent =
+          await this.importAttachmentService.processAttachments({
+            html: page.content,
+            pageRelativePath: page.filePath,
+            extractDir,
+            pageId: page.id,
+            fileTask,
+            attachmentCandidates,
+          });
+
+        const { html, backlinks } = await formatImportHtml({
+          html: htmlContent,
+          currentFilePath: page.filePath,
+          filePathToPageMetaMap: filePathToPageMetaMap,
+          creatorId: fileTask.creatorId,
+          sourcePageId: page.id,
+          workspaceId: fileTask.workspaceId,
+        });
+
+        const pmState = getProsemirrorContent(
+          await this.importService.processHTML(html),
+        );
+
+        const { title, prosemirrorJson } =
+          this.importService.extractTitleAndRemoveHeading(pmState);
+
+        const insertablePage: InsertablePage = {
+          id: page.id,
+          slugId: page.slugId,
+          title: title || page.name,
+          content: prosemirrorJson,
+          textContent: jsonToText(prosemirrorJson),
+          ydoc: await this.importService.createYdoc(prosemirrorJson),
+          position: page.position!,
+          spaceId: fileTask.spaceId,
+          workspaceId: fileTask.workspaceId,
+          creatorId: fileTask.creatorId,
+          lastUpdatedById: fileTask.creatorId,
+          parentPageId: page.parentPageId,
+        };
+
+        return { insertablePage, backlinks };
+      }),
+    );
+
+    const insertablePages = pageResults.map((r) => r.insertablePage);
+    const insertableBacklinks = pageResults.flatMap((r) => r.backlinks);
+
+    if (insertablePages.length < 1) return;
+    const validPageIds = new Set(insertablePages.map((row) => row.id));
+    const filteredBacklinks = insertableBacklinks.filter(
+      ({ sourcePageId, targetPageId }) =>
+        validPageIds.has(sourcePageId) && validPageIds.has(targetPageId),
+    );
+
+    await executeTx(this.db, async (trx) => {
+      await trx.insertInto('pages').values(insertablePages).execute();
+
+      if (filteredBacklinks.length > 0) {
+        await this.backlinkRepo.insertBacklink(filteredBacklinks, trx);
+      }
+    });
+  }
+
+  async getFileTask(fileTaskId: string) {
+    return this.db
+      .selectFrom('fileTasks')
+      .selectAll()
+      .where('id', '=', fileTaskId)
+      .executeTakeFirst();
+  }
+
+  async updateTaskStatus(
+    fileTaskId: string,
+    status: FileTaskStatus,
+    errorMessage?: string,
+  ) {
+    try {
+      await this.db
+        .updateTable('fileTasks')
+        .set({ status: status, errorMessage, updatedAt: new Date() })
+        .where('id', '=', fileTaskId)
+        .execute();
+    } catch (err) {
+      this.logger.error(err);
+    }
+  }
+}

apps/server/src/integrations/import/services/import-attachment.service.ts

@@ -0,0 +1,303 @@
+import { Injectable, Logger } from '@nestjs/common';
+import * as path from 'path';
+import { InjectKysely } from 'nestjs-kysely';
+import { KyselyDB } from '@docmost/db/types/kysely.types';
+import { cleanUrlString } from '../utils/file.utils';
+import { StorageService } from '../../storage/storage.service';
+import { createReadStream } from 'node:fs';
+import { promises as fs } from 'fs';
+import { getMimeType, sanitizeFileName } from '../../../common/helpers';
+import { v7 } from 'uuid';
+import { FileTask } from '@docmost/db/types/entity.types';
+import { getAttachmentFolderPath } from '../../../core/attachment/attachment.utils';
+import { AttachmentType } from '../../../core/attachment/attachment.constants';
+import { unwrapFromParagraph } from '../utils/import-formatter';
+import { resolveRelativeAttachmentPath } from '../utils/import.utils';
+import { load } from 'cheerio';
+
+@Injectable()
+export class ImportAttachmentService {
+  private readonly logger = new Logger(ImportAttachmentService.name);
+
+  constructor(
+    private readonly storageService: StorageService,
+    @InjectKysely() private readonly db: KyselyDB,
+  ) {}
+
+  async processAttachments(opts: {
+    html: string;
+    pageRelativePath: string;
+    extractDir: string;
+    pageId: string;
+    fileTask: FileTask;
+    attachmentCandidates: Map<string, string>;
+  }): Promise<string> {
+    const {
+      html,
+      pageRelativePath,
+      extractDir,
+      pageId,
+      fileTask,
+      attachmentCandidates,
+    } = opts;
+
+    const attachmentTasks: Promise<void>[] = [];
+
+    /**
+     * Cache keyed by the *relative* path that appears in the HTML.
+     * Ensures we upload (and DB-insert) each attachment at most once,
+     * even if it’s referenced multiple times on the page.
+     */
+    const processed = new Map<
+      string,
+      {
+        attachmentId: string;
+        storageFilePath: string;
+        apiFilePath: string;
+        fileNameWithExt: string;
+        abs: string;
+      }
+    >();
+
+    const uploadOnce = (relPath: string) => {
+      const abs = attachmentCandidates.get(relPath)!;
+      const attachmentId = v7();
+      const ext = path.extname(abs);
+
+      const fileNameWithExt =
+        sanitizeFileName(path.basename(abs, ext)) + ext.toLowerCase();
+
+      const storageFilePath = `${getAttachmentFolderPath(
+        AttachmentType.File,
+        fileTask.workspaceId,
+      )}/${attachmentId}/${fileNameWithExt}`;
+
+      const apiFilePath = `/api/files/${attachmentId}/${fileNameWithExt}`;
+
+      attachmentTasks.push(
+        (async () => {
+          const fileStream = createReadStream(abs);
+          await this.storageService.uploadStream(storageFilePath, fileStream);
+          const stat = await fs.stat(abs);
+
+          await this.db
+            .insertInto('attachments')
+            .values({
+              id: attachmentId,
+              filePath: storageFilePath,
+              fileName: fileNameWithExt,
+              fileSize: stat.size,
+              mimeType: getMimeType(fileNameWithExt),
+              type: 'file',
+              fileExt: ext,
+              creatorId: fileTask.creatorId,
+              workspaceId: fileTask.workspaceId,
+              pageId,
+              spaceId: fileTask.spaceId,
+            })
+            .execute();
+        })(),
+      );
+
+      return {
+        attachmentId,
+        storageFilePath,
+        apiFilePath,
+        fileNameWithExt,
+        abs,
+      };
+    };
+
+    /**
+     * – Returns cached data if we’ve already processed this path.
+     * – Otherwise calls `uploadOnce`, stores the result, and returns it.
+     */
+    const processFile = (relPath: string) => {
+      const cached = processed.get(relPath);
+      if (cached) return cached;
+
+      const fresh = uploadOnce(relPath);
+      processed.set(relPath, fresh);
+      return fresh;
+    };
+
+    const pageDir = path.dirname(pageRelativePath);
+    const $ = load(html);
+
+    // image
+    for (const imgEl of $('img').toArray()) {
+      const $img = $(imgEl);
+      const src = cleanUrlString($img.attr('src') ?? '')!;
+      if (!src || src.startsWith('http')) continue;
+
+      const relPath = resolveRelativeAttachmentPath(
+        src,
+        pageDir,
+        attachmentCandidates,
+      );
+      if (!relPath) continue;
+
+      const { attachmentId, apiFilePath, abs } = processFile(relPath);
+      const stat = await fs.stat(abs);
+
+      const width = $img.attr('width') ?? '100%';
+      const align = $img.attr('data-align') ?? 'center';
+
+      $img
+        .attr('src', apiFilePath)
+        .attr('data-attachment-id', attachmentId)
+        .attr('data-size', stat.size.toString())
+        .attr('width', width)
+        .attr('data-align', align);
+
+      unwrapFromParagraph($, $img);
+    }
+
+    // video
+    for (const vidEl of $('video').toArray()) {
+      const $vid = $(vidEl);
+      const src = cleanUrlString($vid.attr('src') ?? '')!;
+      if (!src || src.startsWith('http')) continue;
+
+      const relPath = resolveRelativeAttachmentPath(
+        src,
+        pageDir,
+        attachmentCandidates,
+      );
+      if (!relPath) continue;
+
+      const { attachmentId, apiFilePath, abs } = processFile(relPath);
+      const stat = await fs.stat(abs);
+
+      const width = $vid.attr('width') ?? '100%';
+      const align = $vid.attr('data-align') ?? 'center';
+
+      $vid
+        .attr('src', apiFilePath)
+        .attr('data-attachment-id', attachmentId)
+        .attr('data-size', stat.size.toString())
+        .attr('width', width)
+        .attr('data-align', align);
+
+      unwrapFromParagraph($, $vid);
+    }
+
+    // <div data-type="attachment">
+    for (const el of $('div[data-type="attachment"]').toArray()) {
+      const $oldDiv = $(el);
+      const rawUrl = cleanUrlString($oldDiv.attr('data-attachment-url') ?? '')!;
+      if (!rawUrl || rawUrl.startsWith('http')) continue;
+
+      const relPath = resolveRelativeAttachmentPath(
+        rawUrl,
+        pageDir,
+        attachmentCandidates,
+      );
+      if (!relPath) continue;
+
+      const { attachmentId, apiFilePath, abs } = processFile(relPath);
+      const stat = await fs.stat(abs);
+      const fileName = path.basename(abs);
+      const mime = getMimeType(abs);
+
+      const $newDiv = $('<div>')
+        .attr('data-type', 'attachment')
+        .attr('data-attachment-url', apiFilePath)
+        .attr('data-attachment-name', fileName)
+        .attr('data-attachment-mime', mime)
+        .attr('data-attachment-size', stat.size.toString())
+        .attr('data-attachment-id', attachmentId);
+
+      $oldDiv.replaceWith($newDiv);
+      unwrapFromParagraph($, $newDiv);
+    }
+
+    // rewrite other attachments via <a>
+    for (const aEl of $('a').toArray()) {
+      const $a = $(aEl);
+      const href = cleanUrlString($a.attr('href') ?? '')!;
+      if (!href || href.startsWith('http')) continue;
+
+      const relPath = resolveRelativeAttachmentPath(
+        href,
+        pageDir,
+        attachmentCandidates,
+      );
+      if (!relPath) continue;
+
+      const { attachmentId, apiFilePath, abs } = processFile(relPath);
+      const stat = await fs.stat(abs);
+      const ext = path.extname(relPath).toLowerCase();
+
+      if (ext === '.mp4') {
+        const $video = $('<video>')
+          .attr('src', apiFilePath)
+          .attr('data-attachment-id', attachmentId)
+          .attr('data-size', stat.size.toString())
+          .attr('width', '100%')
+          .attr('data-align', 'center');
+        $a.replaceWith($video);
+        unwrapFromParagraph($, $video);
+      } else {
+        const confAliasName = $a.attr('data-linked-resource-default-alias');
+        let attachmentName = path.basename(abs);
+        if (confAliasName) attachmentName = confAliasName;
+
+        const $div = $('<div>')
+          .attr('data-type', 'attachment')
+          .attr('data-attachment-url', apiFilePath)
+          .attr('data-attachment-name', attachmentName)
+          .attr('data-attachment-mime', getMimeType(abs))
+          .attr('data-attachment-size', stat.size.toString())
+          .attr('data-attachment-id', attachmentId);
+
+        $a.replaceWith($div);
+        unwrapFromParagraph($, $div);
+      }
+    }
+
+    // excalidraw and drawio
+    for (const type of ['excalidraw', 'drawio'] as const) {
+      for (const el of $(`div[data-type="${type}"]`).toArray()) {
+        const $oldDiv = $(el);
+        const rawSrc = cleanUrlString($oldDiv.attr('data-src') ?? '')!;
+        if (!rawSrc || rawSrc.startsWith('http')) continue;
+
+        const relPath = resolveRelativeAttachmentPath(
+          rawSrc,
+          pageDir,
+          attachmentCandidates,
+        );
+        if (!relPath) continue;
+
+        const { attachmentId, apiFilePath, abs } = processFile(relPath);
+        const stat = await fs.stat(abs);
+        const fileName = path.basename(abs);
+
+        const width = $oldDiv.attr('data-width') || '100%';
+        const align = $oldDiv.attr('data-align') || 'center';
+
+        const $newDiv = $('<div>')
+          .attr('data-type', type)
+          .attr('data-src', apiFilePath)
+          .attr('data-title', fileName)
+          .attr('data-width', width)
+          .attr('data-size', stat.size.toString())
+          .attr('data-align', align)
+          .attr('data-attachment-id', attachmentId);
+
+        $oldDiv.replaceWith($newDiv);
+        unwrapFromParagraph($, $newDiv);
+      }
+    }
+
+    // wait for all uploads & DB inserts
+    try {
+      await Promise.all(attachmentTasks);
+    } catch (err) {
+      this.logger.log('Import attachment upload error', err);
+    }
+
+    return $.root().html() || '';
+  }
+}

apps/server/src/integrations/import/services/import.service.ts

@@ -4,16 +4,27 @@ import { MultipartFile } from '@fastify/multipart';
 import { sanitize } from 'sanitize-filename-ts';
 import * as path from 'path';
 import {
-  htmlToJson, jsonToText,
+  htmlToJson,
+  jsonToText,
   tiptapExtensions,
-} from '../../collaboration/collaboration.util';
+} from '../../../collaboration/collaboration.util';
 import { InjectKysely } from 'nestjs-kysely';
 import { KyselyDB } from '@docmost/db/types/kysely.types';
-import { generateSlugId } from '../../common/helpers';
+import { generateSlugId, sanitizeFileName } from '../../../common/helpers';
 import { generateJitteredKeyBetween } from 'fractional-indexing-jittered';
 import { TiptapTransformer } from '@hocuspocus/transformer';
 import * as Y from 'yjs';
-import { markdownToHtml } from "@docmost/editor-ext";
+import { markdownToHtml } from '@docmost/editor-ext';
+import {
+  FileTaskStatus,
+  FileTaskType,
+  getFileTaskFolderPath,
+} from '../utils/file.utils';
+import { v7 as uuid7 } from 'uuid';
+import { StorageService } from '../../storage/storage.service';
+import { InjectQueue } from '@nestjs/bullmq';
+import { Queue } from 'bullmq';
+import { QueueJob, QueueName } from '../../queue/constants';
 
 @Injectable()
 export class ImportService {
@@ -21,7 +32,10 @@ export class ImportService {
 
   constructor(
     private readonly pageRepo: PageRepo,
+    private readonly storageService: StorageService,
     @InjectKysely() private readonly db: KyselyDB,
+    @InjectQueue(QueueName.FILE_TASK_QUEUE)
+    private readonly fileTaskQueue: Queue,
   ) {}
 
   async importPage(
@@ -113,7 +127,7 @@ export class ImportService {
 
   async createYdoc(prosemirrorJson: any): Promise<Buffer | null> {
     if (prosemirrorJson) {
-      this.logger.debug(`Converting prosemirror json state to ydoc`);
+      // this.logger.debug(`Converting prosemirror json state to ydoc`);
 
       const ydoc = TiptapTransformer.toYdoc(
         prosemirrorJson,
@@ -129,20 +143,34 @@ export class ImportService {
   }
 
   extractTitleAndRemoveHeading(prosemirrorState: any) {
-    let title = null;
+    let title: string | null = null;
+
+    const content = prosemirrorState.content ?? [];
 
     if (
-      prosemirrorState?.content?.length > 0 &&
-      prosemirrorState.content[0].type === 'heading' &&
-      prosemirrorState.content[0].attrs?.level === 1
+      content.length > 0 &&
+      content[0].type === 'heading' &&
+      content[0].attrs?.level === 1
     ) {
-      title = prosemirrorState.content[0].content[0].text;
-
-      // remove h1 header node from state
-      prosemirrorState.content.shift();
+      title = content[0].content?.[0]?.text ?? null;
+      content.shift();
     }
 
-    return { title, prosemirrorJson: prosemirrorState };
+    // ensure at least one paragraph
+    if (content.length === 0) {
+      content.push({
+        type: 'paragraph',
+        content: [],
+      });
+    }
+
+    return {
+      title,
+      prosemirrorJson: {
+        ...prosemirrorState,
+        content,
+      },
+    };
   }
 
   async getNewPagePosition(spaceId: string): Promise<string> {
@@ -161,4 +189,52 @@ export class ImportService {
       return generateJitteredKeyBetween(null, null);
     }
   }
+
+  async importZip(
+    filePromise: Promise<MultipartFile>,
+    source: string,
+    userId: string,
+    spaceId: string,
+    workspaceId: string,
+  ) {
+    const file = await filePromise;
+    const fileBuffer = await file.toBuffer();
+    const fileExtension = path.extname(file.filename).toLowerCase();
+    const fileName = sanitizeFileName(
+      path.basename(file.filename, fileExtension),
+    );
+    const fileSize = fileBuffer.length;
+
+    const fileNameWithExt = fileName + fileExtension;
+
+    const fileTaskId = uuid7();
+    const filePath = `${getFileTaskFolderPath(FileTaskType.Import, workspaceId)}/${fileTaskId}/${fileNameWithExt}`;
+
+    // upload file
+    await this.storageService.upload(filePath, fileBuffer);
+
+    const fileTask = await this.db
+      .insertInto('fileTasks')
+      .values({
+        id: fileTaskId,
+        type: FileTaskType.Import,
+        source: source,
+        status: FileTaskStatus.Processing,
+        fileName: fileNameWithExt,
+        filePath: filePath,
+        fileSize: fileSize,
+        fileExt: 'zip',
+        creatorId: userId,
+        spaceId: spaceId,
+        workspaceId: workspaceId,
+      })
+      .returningAll()
+      .executeTakeFirst();
+
+    await this.fileTaskQueue.add(QueueJob.IMPORT_TASK, {
+      fileTaskId: fileTaskId,
+    });
+
+    return fileTask;
+  }
 }

apps/server/src/integrations/import/utils/file.utils.ts

@@ -0,0 +1,187 @@
+import * as yauzl from 'yauzl';
+import * as path from 'path';
+import * as fs from 'node:fs';
+
+export enum FileTaskType {
+  Import = 'import',
+  Export = 'export',
+}
+
+export enum FileImportSource {
+  Generic = 'generic',
+  Notion = 'notion',
+  Confluence = 'confluence',
+}
+
+export enum FileTaskStatus {
+  Processing = 'processing',
+  Success = 'success',
+  Failed = 'failed',
+}
+
+export function getFileTaskFolderPath(
+  type: FileTaskType,
+  workspaceId: string,
+): string {
+  switch (type) {
+    case FileTaskType.Import:
+      return `${workspaceId}/imports`;
+    case FileTaskType.Export:
+      return `${workspaceId}/exports`;
+  }
+}
+
+/**
+ * Extracts a ZIP archive.
+ */
+export async function extractZip(
+  source: string,
+  target: string,
+): Promise<void> {
+  return extractZipInternal(source, target, true);
+}
+
+/**
+ * Internal helper to extract a ZIP, with optional single-nested-ZIP handling.
+ * @param source   Path to the ZIP file
+ * @param target   Directory to extract into
+ * @param allowNested  Whether to check and unwrap one level of nested ZIP
+ */
+function extractZipInternal(
+  source: string,
+  target: string,
+  allowNested: boolean,
+): Promise<void> {
+  return new Promise((resolve, reject) => {
+    yauzl.open(
+      source,
+      { lazyEntries: true, decodeStrings: false, autoClose: true },
+      (err, zipfile) => {
+        if (err) return reject(err);
+
+        // Handle one level of nested ZIP if allowed
+        if (allowNested && zipfile.entryCount === 1) {
+          zipfile.readEntry();
+          zipfile.once('entry', (entry) => {
+            const name = entry.fileName.toString('utf8').replace(/^\/+/, '');
+            const isZip =
+              !/\/$/.test(entry.fileName) &&
+              name.toLowerCase().endsWith('.zip');
+            if (isZip) {
+              // temporary name to avoid overwriting file
+              const nestedPath = source.endsWith('.zip')
+                ? source.slice(0, -4) + '.inner.zip'
+                : source + '.inner.zip';
+
+              zipfile.openReadStream(entry, (openErr, rs) => {
+                if (openErr) return reject(openErr);
+                const ws = fs.createWriteStream(nestedPath);
+                rs.on('error', reject);
+                ws.on('error', reject);
+                ws.on('finish', () => {
+                  zipfile.close();
+                  extractZipInternal(nestedPath, target, false)
+                    .then(() => {
+                      fs.unlinkSync(nestedPath);
+                      resolve();
+                    })
+                    .catch(reject);
+                });
+                rs.pipe(ws);
+              });
+            } else {
+              zipfile.close();
+              extractZipInternal(source, target, false).then(resolve, reject);
+            }
+          });
+          zipfile.once('error', reject);
+          return;
+        }
+
+        // Normal extraction
+        zipfile.readEntry();
+        zipfile.on('entry', (entry) => {
+          const name = entry.fileName.toString('utf8');
+          const safe = name.replace(/^\/+/, '');
+          if (safe.startsWith('__MACOSX/')) {
+            zipfile.readEntry();
+            return;
+          }
+
+          const fullPath = path.join(target, safe);
+
+          // Handle directories
+          if (/\/$/.test(name)) {
+            try {
+              fs.mkdirSync(fullPath, { recursive: true });
+            } catch (mkdirErr: any) {
+              if (mkdirErr.code === 'ENAMETOOLONG') {
+                console.warn(`Skipping directory (path too long): ${fullPath}`);
+                zipfile.readEntry();
+                return;
+              }
+              return reject(mkdirErr);
+            }
+            zipfile.readEntry();
+            return;
+          }
+
+          // Handle files
+          try {
+            fs.mkdirSync(path.dirname(fullPath), { recursive: true });
+          } catch (mkdirErr: any) {
+            if (mkdirErr.code === 'ENAMETOOLONG') {
+              console.warn(
+                `Skipping file directory creation (path too long): ${fullPath}`,
+              );
+              zipfile.readEntry();
+              return;
+            }
+            return reject(mkdirErr);
+          }
+
+          zipfile.openReadStream(entry, (openErr, rs) => {
+            if (openErr) return reject(openErr);
+
+            let ws: fs.WriteStream;
+            try {
+              ws = fs.createWriteStream(fullPath);
+            } catch (openWsErr: any) {
+              if (openWsErr.code === 'ENAMETOOLONG') {
+                console.warn(
+                  `Skipping file write (path too long): ${fullPath}`,
+                );
+                zipfile.readEntry();
+                return;
+              }
+              return reject(openWsErr);
+            }
+
+            rs.on('error', (err) => reject(err));
+            ws.on('error', (err) => {
+              if ((err as any).code === 'ENAMETOOLONG') {
+                console.warn(
+                  `Skipping file write on stream (path too long): ${fullPath}`,
+                );
+                zipfile.readEntry();
+              } else {
+                reject(err);
+              }
+            });
+            ws.on('finish', () => zipfile.readEntry());
+            rs.pipe(ws);
+          });
+        });
+
+        zipfile.on('end', () => resolve());
+        zipfile.on('error', (err) => reject(err));
+      },
+    );
+  });
+}
+
+export function cleanUrlString(url: string): string {
+  if (!url) return null;
+  const [mainUrl] = url.split('?', 1);
+  return mainUrl;
+}

apps/server/src/integrations/import/utils/import-formatter.ts

@@ -0,0 +1,254 @@
+import { getEmbedUrlAndProvider } from '@docmost/editor-ext';
+import * as path from 'path';
+import { v7 } from 'uuid';
+import { InsertableBacklink } from '@docmost/db/types/entity.types';
+import { Cheerio, CheerioAPI, load } from 'cheerio';
+
+export async function formatImportHtml(opts: {
+  html: string;
+  currentFilePath: string;
+  filePathToPageMetaMap: Map<
+    string,
+    { id: string; title: string; slugId: string }
+  >;
+  creatorId: string;
+  sourcePageId: string;
+  workspaceId: string;
+  pageDir?: string;
+  attachmentCandidates?: string[];
+}): Promise<{ html: string; backlinks: InsertableBacklink[] }> {
+  const {
+    html,
+    currentFilePath,
+    filePathToPageMetaMap,
+    creatorId,
+    sourcePageId,
+    workspaceId,
+  } = opts;
+  const $: CheerioAPI = load(html);
+  const $root: Cheerio<any> = $.root();
+
+  notionFormatter($, $root);
+  defaultHtmlFormatter($, $root);
+
+  const backlinks = await rewriteInternalLinksToMentionHtml(
+    $,
+    $root,
+    currentFilePath,
+    filePathToPageMetaMap,
+    creatorId,
+    sourcePageId,
+    workspaceId,
+  );
+
+  return {
+    html: $root.html() || '',
+    backlinks,
+  };
+}
+
+export function defaultHtmlFormatter($: CheerioAPI, $root: Cheerio<any>) {
+  $root.find('a[href]').each((_, el) => {
+    const $el = $(el);
+    const url = $el.attr('href')!;
+    const { provider } = getEmbedUrlAndProvider(url);
+    if (provider === 'iframe') return;
+
+    const embed = `<div data-type=\"embed\" data-src=\"${url}\" data-provider=\"${provider}\" data-align=\"center\" data-width=\"640\" data-height=\"480\"></div>`;
+    $el.replaceWith(embed);
+  });
+
+  $root.find('iframe[src]').each((_, el) => {
+    const $el = $(el);
+    const url = $el.attr('src')!;
+    const { provider } = getEmbedUrlAndProvider(url);
+
+    const embed = `<div data-type=\"embed\" data-src=\"${url}\" data-provider=\"${provider}\" data-align=\"center\" data-width=\"640\" data-height=\"480\"></div>`;
+    $el.replaceWith(embed);
+  });
+}
+
+export function notionFormatter($: CheerioAPI, $root: Cheerio<any>) {
+  // remove empty description paragraphs
+  $root.find('p.page-description').each((_, el) => {
+    if (!$(el).text().trim()) $(el).remove();
+  });
+
+  // block math → mathBlock
+  $root.find('figure.equation').each((_: any, fig: any) => {
+    const $fig = $(fig);
+    const tex = $fig
+      .find('annotation[encoding="application/x-tex"]')
+      .text()
+      .trim();
+    const $math = $('<div>')
+      .attr('data-type', 'mathBlock')
+      .attr('data-katex', 'true')
+      .text(tex);
+    $fig.replaceWith($math);
+  });
+
+  // inline math → mathInline
+  $root.find('span.notion-text-equation-token').each((_, tok) => {
+    const $tok = $(tok);
+    const $prev = $tok.prev('style');
+    if ($prev.length) $prev.remove();
+    const tex = $tok
+      .find('annotation[encoding="application/x-tex"]')
+      .text()
+      .trim();
+    const $inline = $('<span>')
+      .attr('data-type', 'mathInline')
+      .attr('data-katex', 'true')
+      .text(tex);
+    $tok.replaceWith($inline);
+  });
+
+  // callouts
+  $root
+    .find('figure.callout')
+    .get()
+    .reverse()
+    .forEach((fig) => {
+      const $fig = $(fig);
+      const $content = $fig.find('div').eq(1);
+      if (!$content.length) return;
+      const $wrapper = $('<div>')
+        .attr('data-type', 'callout')
+        .attr('data-callout-type', 'info');
+      // @ts-ignore
+      $content.children().each((_, child) => $wrapper.append(child));
+      $fig.replaceWith($wrapper);
+    });
+
+  // to-do lists
+  $root.find('ul.to-do-list').each((_, list) => {
+    const $old = $(list);
+    const $new = $('<ul>').attr('data-type', 'taskList');
+    $old.find('li').each((_, li) => {
+      const $li = $(li);
+      const isChecked = $li.find('.checkbox.checkbox-on').length > 0;
+      const text =
+        $li
+          .find('span.to-do-children-unchecked, span.to-do-children-checked')
+          .first()
+          .text()
+          .trim() || '';
+      const $taskItem = $('<li>')
+        .attr('data-type', 'taskItem')
+        .attr('data-checked', String(isChecked));
+      const $label = $('<label>');
+      const $input = $('<input>').attr('type', 'checkbox');
+      if (isChecked) $input.attr('checked', '');
+      $label.append($input, $('<span>'));
+      const $container = $('<div>').append($('<p>').text(text));
+      $taskItem.append($label, $container);
+      $new.append($taskItem);
+    });
+    $old.replaceWith($new);
+  });
+
+  // toggle blocks
+  $root
+    .find('ul.toggle details')
+    .get()
+    .reverse()
+    .forEach((det) => {
+      const $det = $(det);
+      const $li = $det.closest('li');
+      if ($li.length) {
+        $li.before($det);
+        if (!$li.children().length) $li.remove();
+      }
+      const $ul = $det.closest('ul.toggle');
+      if ($ul.length) {
+        $ul.before($det);
+        if (!$ul.children().length) $ul.remove();
+      }
+    });
+
+  // bookmarks
+  $root
+    .find('figure')
+    .filter((_, fig) => $(fig).find('a.bookmark.source').length > 0)
+    .get()
+    .reverse()
+    .forEach((fig) => {
+      const $fig = $(fig);
+      const $link = $fig.find('a.bookmark.source').first();
+      if (!$link.length) return;
+
+      const href = $link.attr('href')!;
+      const title = $link.find('.bookmark-title').text().trim() || href;
+
+      const $newAnchor = $('<a>')
+        .addClass('bookmark source')
+        .attr('href', href)
+        .append($('<div>').addClass('bookmark-info').text(title));
+
+      $fig.replaceWith($newAnchor);
+    });
+
+  // remove toc
+  $root.find('nav.table_of_contents').remove();
+}
+
+export function unwrapFromParagraph($: CheerioAPI, $node: Cheerio<any>) {
+  // find the nearest <p> or <a> ancestor
+  let $wrapper = $node.closest('p, a');
+
+  while ($wrapper.length) {
+    // if the wrapper has only our node inside, replace it entirely
+    if ($wrapper.contents().length === 1) {
+      $wrapper.replaceWith($node);
+    } else {
+      // otherwise just move the node to before the wrapper
+      $wrapper.before($node);
+    }
+    // look again for any new wrapper around $node
+    $wrapper = $node.closest('p, a');
+  }
+}
+
+export async function rewriteInternalLinksToMentionHtml(
+  $: CheerioAPI,
+  $root: Cheerio<any>,
+  currentFilePath: string,
+  filePathToPageMetaMap: Map<
+    string,
+    { id: string; title: string; slugId: string }
+  >,
+  creatorId: string,
+  sourcePageId: string,
+  workspaceId: string,
+): Promise<InsertableBacklink[]> {
+  const normalize = (p: string) => p.replace(/\\/g, '/');
+  const backlinks: InsertableBacklink[] = [];
+
+  $root.find('a[href]').each((_, el) => {
+    const $a = $(el);
+    const raw = $a.attr('href')!;
+    if (raw.startsWith('http') || raw.startsWith('/api/')) return;
+    const resolved = normalize(
+      path.join(path.dirname(currentFilePath), decodeURIComponent(raw)),
+    );
+    const meta = filePathToPageMetaMap.get(resolved);
+    if (!meta) return;
+    const mentionId = v7();
+    const $mention = $('<span>')
+      .attr({
+        'data-type': 'mention',
+        'data-id': mentionId,
+        'data-entity-type': 'page',
+        'data-entity-id': meta.id,
+        'data-label': meta.title,
+        'data-slug-id': meta.slugId,
+        'data-creator-id': creatorId,
+      })
+      .text(meta.title);
+    $a.replaceWith($mention);
+    backlinks.push({ sourcePageId, targetPageId: meta.id, workspaceId });
+  });
+
+  return backlinks;
+}

apps/server/src/integrations/import/utils/import.utils.ts

@@ -0,0 +1,66 @@
+import { promises as fs } from 'fs';
+import * as path from 'path';
+
+export async function buildAttachmentCandidates(
+  extractDir: string,
+): Promise<Map<string, string>> {
+  const map = new Map<string, string>();
+  async function walk(dir: string) {
+    for (const ent of await fs.readdir(dir, { withFileTypes: true })) {
+      const abs = path.join(dir, ent.name);
+      if (ent.isDirectory()) {
+        await walk(abs);
+      } else {
+        if (['.md', '.html'].includes(path.extname(ent.name).toLowerCase())) {
+          continue;
+        }
+
+        const rel = path.relative(extractDir, abs).split(path.sep).join('/');
+        map.set(rel, abs);
+      }
+    }
+  }
+
+  await walk(extractDir);
+  return map;
+}
+
+export function resolveRelativeAttachmentPath(
+  raw: string,
+  pageDir: string,
+  attachmentCandidates: Map<string, string>,
+): string | null {
+  const mainRel = decodeURIComponent(raw.replace(/^\.?\/+/, ''));
+  const fallback = path.normalize(path.join(pageDir, mainRel));
+
+  if (attachmentCandidates.has(mainRel)) {
+    return mainRel;
+  }
+  if (attachmentCandidates.has(fallback)) {
+    return fallback;
+  }
+  return null;
+}
+
+export async function collectMarkdownAndHtmlFiles(
+  dir: string,
+): Promise<string[]> {
+  const results: string[] = [];
+
+  async function walk(current: string) {
+    const entries = await fs.readdir(current, { withFileTypes: true });
+    for (const ent of entries) {
+      const fullPath = path.join(current, ent.name);
+      if (ent.isDirectory()) {
+        await walk(fullPath);
+      } else if (
+        ['.md', '.html'].includes(path.extname(ent.name).toLowerCase())
+      ) {
+        results.push(fullPath);
+      }
+    }
+  }
+
+  await walk(dir);
+  return results;
+}

apps/server/src/integrations/queue/constants/queue.constants.ts

@@ -3,6 +3,7 @@ export enum QueueName {
   ATTACHMENT_QUEUE = '{attachment-queue}',
   GENERAL_QUEUE = '{general-queue}',
   BILLING_QUEUE = '{billing-queue}',
+  FILE_TASK_QUEUE = '{file-task-queue}',
 }
 
 export enum QueueJob {
@@ -19,4 +20,7 @@ export enum QueueJob {
   TRIAL_ENDED = 'trial-ended',
   WELCOME_EMAIL = 'welcome-email',
   FIRST_PAYMENT_EMAIL = 'first-payment-email',
+
+  IMPORT_TASK = 'import-task',
+  EXPORT_TASK = 'export-task',
 }

apps/server/src/integrations/queue/queue.module.ts

@@ -49,6 +49,14 @@ import { BacklinksProcessor } from './processors/backlinks.processor';
     BullModule.registerQueue({
       name: QueueName.BILLING_QUEUE,
     }),
+    BullModule.registerQueue({
+      name: QueueName.FILE_TASK_QUEUE,
+      defaultJobOptions: {
+        removeOnComplete: true,
+        removeOnFail: true,
+        attempts: 1,
+      },
+    }),
   ],
   exports: [BullModule],
   providers: [BacklinksProcessor],

apps/server/src/integrations/storage/drivers/local.driver.ts

@@ -3,8 +3,11 @@ import {
   LocalStorageConfig,
   StorageOption,
 } from '../interfaces';
-import { join } from 'path';
+import { join, dirname } from 'path';
 import * as fs from 'fs-extra';
+import { Readable } from 'stream';
+import { createReadStream, createWriteStream } from 'node:fs';
+import { pipeline } from 'node:stream/promises';
 
 export class LocalDriver implements StorageDriver {
   private readonly config: LocalStorageConfig;
@@ -25,6 +28,16 @@ export class LocalDriver implements StorageDriver {
     }
   }
 
+  async uploadStream(filePath: string, file: Readable): Promise<void> {
+    try {
+      const fullPath = this._fullPath(filePath);
+      await fs.mkdir(dirname(fullPath), { recursive: true });
+      await pipeline(file, createWriteStream(fullPath));
+    } catch (err) {
+      throw new Error(`Failed to upload file: ${(err as Error).message}`);
+    }
+  }
+
   async copy(fromFilePath: string, toFilePath: string): Promise<void> {
     try {
       if (await this.exists(fromFilePath)) {
@@ -43,6 +56,14 @@ export class LocalDriver implements StorageDriver {
     }
   }
 
+  async readStream(filePath: string): Promise<Readable> {
+    try {
+      return createReadStream(this._fullPath(filePath));
+    } catch (err) {
+      throw new Error(`Failed to read file: ${(err as Error).message}`);
+    }
+  }
+
   async exists(filePath: string): Promise<boolean> {
     try {
       return await fs.pathExists(this._fullPath(filePath));

apps/server/src/integrations/storage/drivers/s3.driver.ts

@@ -12,6 +12,7 @@ import { streamToBuffer } from '../storage.utils';
 import { Readable } from 'stream';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { getMimeType } from '../../../common/helpers';
+import { Upload } from '@aws-sdk/lib-storage';
 
 export class S3Driver implements StorageDriver {
   private readonly s3Client: S3Client;
@@ -40,6 +41,26 @@ export class S3Driver implements StorageDriver {
     }
   }
 
+  async uploadStream(filePath: string, file: Readable): Promise<void> {
+    try {
+      const contentType = getMimeType(filePath);
+
+      const upload = new Upload({
+        client: this.s3Client,
+        params: {
+          Bucket: this.config.bucket,
+          Key: filePath,
+          Body: file,
+          ContentType: contentType,
+        },
+      });
+
+      await upload.done();
+    } catch (err) {
+      throw new Error(`Failed to upload file: ${(err as Error).message}`);
+    }
+  }
+
   async copy(fromFilePath: string, toFilePath: string): Promise<void> {
     try {
       if (await this.exists(fromFilePath)) {
@@ -71,6 +92,21 @@ export class S3Driver implements StorageDriver {
     }
   }
 
+  async readStream(filePath: string): Promise<Readable> {
+    try {
+      const command = new GetObjectCommand({
+        Bucket: this.config.bucket,
+        Key: filePath,
+      });
+
+      const response = await this.s3Client.send(command);
+
+      return response.Body as Readable;
+    } catch (err) {
+      throw new Error(`Failed to read file from S3: ${(err as Error).message}`);
+    }
+  }
+
   async exists(filePath: string): Promise<boolean> {
     try {
       const command = new HeadObjectCommand({

apps/server/src/integrations/storage/interfaces/storage-driver.interface.ts

@@ -1,10 +1,16 @@
+import { Readable } from 'stream';
+
 export interface StorageDriver {
   upload(filePath: string, file: Buffer): Promise<void>;
 
+  uploadStream(filePath: string, file: Readable): Promise<void>;
+
   copy(fromFilePath: string, toFilePath: string): Promise<void>;
 
   read(filePath: string): Promise<Buffer>;
 
+  readStream(filePath: string): Promise<Readable>;
+
   exists(filePath: string): Promise<boolean>;
 
   getUrl(filePath: string): string;

apps/server/src/integrations/storage/storage.service.ts

@@ -1,6 +1,7 @@
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { STORAGE_DRIVER_TOKEN } from './constants/storage.constants';
 import { StorageDriver } from './interfaces';
+import { Readable } from 'stream';
 
 @Injectable()
 export class StorageService {
@@ -14,6 +15,11 @@ export class StorageService {
     this.logger.debug(`File uploaded successfully. Path: ${filePath}`);
   }
 
+  async uploadStream(filePath: string, fileContent: Readable) {
+    await this.storageDriver.uploadStream(filePath, fileContent);
+    this.logger.debug(`File uploaded successfully. Path: ${filePath}`);
+  }
+
   async copy(fromFilePath: string, toFilePath: string) {
     await this.storageDriver.copy(fromFilePath, toFilePath);
     this.logger.debug(`File copied successfully. Path: ${toFilePath}`);
@@ -23,6 +29,10 @@ export class StorageService {
     return this.storageDriver.read(filePath);
   }
 
+  async readStream(filePath: string): Promise<Readable> {
+    return this.storageDriver.readStream(filePath);
+  }
+
   async exists(filePath: string): Promise<boolean> {
     return this.storageDriver.exists(filePath);
   }

apps/server/src/main.ts

@@ -39,6 +39,22 @@ async function bootstrap() {
   await app.register(fastifyMultipart);
   await app.register(fastifyCookie);
 
+  app
+    .getHttpAdapter()
+    .getInstance()
+    .addContentTypeParser(
+      'application/scim+json',
+      { parseAs: 'string' },
+      (_, body, done) => {
+        try {
+          const json = JSON.parse(body.toString());
+          done(null, json);
+        } catch (err: any) {
+          done(err);
+        }
+      },
+    );
+
   app
     .getHttpAdapter()
     .getInstance()
@@ -88,7 +104,7 @@ async function bootstrap() {
   const logger = new Logger('NestApplication');
 
   process.on('unhandledRejection', (reason, promise) => {
-    logger.error(`UnhandledRejection: ${promise}, reason: ${reason}`);
+    logger.error(`UnhandledRejection, reason: ${reason}`, promise);
   });
 
   process.on('uncaughtException', (error) => {

package.json

@@ -26,52 +26,52 @@
     "@joplin/turndown": "^4.0.74",
     "@joplin/turndown-plugin-gfm": "^1.0.56",
     "@sindresorhus/slugify": "1.1.0",
-    "@tiptap/core": "^2.10.3",
-    "@tiptap/extension-code-block": "^2.10.3",
-    "@tiptap/extension-code-block-lowlight": "^2.10.3",
-    "@tiptap/extension-collaboration": "^2.10.3",
-    "@tiptap/extension-collaboration-cursor": "^2.10.3",
-    "@tiptap/extension-color": "^2.10.3",
-    "@tiptap/extension-document": "^2.10.3",
-    "@tiptap/extension-heading": "^2.10.3",
-    "@tiptap/extension-highlight": "^2.10.3",
-    "@tiptap/extension-history": "^2.10.3",
-    "@tiptap/extension-image": "^2.10.3",
-    "@tiptap/extension-link": "^2.10.3",
-    "@tiptap/extension-list-item": "^2.10.3",
-    "@tiptap/extension-list-keymap": "^2.10.3",
-    "@tiptap/extension-placeholder": "^2.10.3",
-    "@tiptap/extension-subscript": "^2.10.3",
-    "@tiptap/extension-superscript": "^2.10.3",
-    "@tiptap/extension-table": "^2.10.3",
-    "@tiptap/extension-table-cell": "^2.10.3",
-    "@tiptap/extension-table-header": "^2.10.3",
-    "@tiptap/extension-table-row": "^2.10.3",
-    "@tiptap/extension-task-item": "^2.10.3",
-    "@tiptap/extension-task-list": "^2.10.3",
-    "@tiptap/extension-text": "^2.10.3",
-    "@tiptap/extension-text-align": "^2.10.3",
-    "@tiptap/extension-text-style": "^2.10.3",
-    "@tiptap/extension-typography": "^2.10.3",
-    "@tiptap/extension-underline": "^2.10.3",
-    "@tiptap/extension-youtube": "^2.10.3",
-    "@tiptap/html": "^2.10.3",
-    "@tiptap/pm": "^2.10.3",
-    "@tiptap/react": "^2.10.3",
-    "@tiptap/starter-kit": "^2.10.3",
-    "@tiptap/suggestion": "^2.10.3",
+    "@tiptap/core": "^2.14.0",
+    "@tiptap/extension-code-block": "^2.14.0",
+    "@tiptap/extension-code-block-lowlight": "^2.14.0",
+    "@tiptap/extension-collaboration": "^2.14.0",
+    "@tiptap/extension-collaboration-cursor": "^2.14.0",
+    "@tiptap/extension-color": "^2.14.0",
+    "@tiptap/extension-document": "^2.14.0",
+    "@tiptap/extension-heading": "^2.14.0",
+    "@tiptap/extension-highlight": "^2.14.0",
+    "@tiptap/extension-history": "^2.14.0",
+    "@tiptap/extension-image": "^2.14.0",
+    "@tiptap/extension-link": "^2.14.0",
+    "@tiptap/extension-list-item": "^2.14.0",
+    "@tiptap/extension-list-keymap": "^2.14.0",
+    "@tiptap/extension-placeholder": "^2.14.0",
+    "@tiptap/extension-subscript": "^2.14.0",
+    "@tiptap/extension-superscript": "^2.14.0",
+    "@tiptap/extension-table": "^2.14.0",
+    "@tiptap/extension-table-cell": "^2.14.0",
+    "@tiptap/extension-table-header": "^2.14.0",
+    "@tiptap/extension-table-row": "^2.14.0",
+    "@tiptap/extension-task-item": "^2.14.0",
+    "@tiptap/extension-task-list": "^2.14.0",
+    "@tiptap/extension-text": "^2.14.0",
+    "@tiptap/extension-text-align": "^2.14.0",
+    "@tiptap/extension-text-style": "^2.14.0",
+    "@tiptap/extension-typography": "^2.14.0",
+    "@tiptap/extension-underline": "^2.14.0",
+    "@tiptap/extension-youtube": "^2.14.0",
+    "@tiptap/html": "^2.14.0",
+    "@tiptap/pm": "^2.14.0",
+    "@tiptap/react": "^2.14.0",
+    "@tiptap/starter-kit": "^2.14.0",
+    "@tiptap/suggestion": "^2.14.0",
     "bytes": "^3.1.2",
     "cross-env": "^7.0.3",
     "date-fns": "^4.1.0",
-    "dompurify": "^3.2.4",
+    "dompurify": "^3.2.6",
     "fractional-indexing-jittered": "^1.0.0",
     "ioredis": "^5.4.1",
     "jszip": "^3.10.1",
     "linkifyjs": "^4.2.0",
-    "marked": "^13.0.3",
+    "marked": "13.0.3",
     "uuid": "^11.1.0",
     "y-indexeddb": "^9.0.12",
-    "yjs": "^13.6.20"
+    "yjs": "^13.6.27"
   },
   "devDependencies": {
     "@nx/js": "20.4.5",
@@ -90,7 +90,8 @@
   "packageManager": "pnpm@10.4.0",
   "pnpm": {
     "patchedDependencies": {
-      "react-arborist@3.4.0": "patches/react-arborist@3.4.0.patch"
+      "react-arborist@3.4.0": "patches/react-arborist@3.4.0.patch",
+      "scimmy@1.3.5": "patches/scimmy@1.3.5.patch"
     },
     "overrides": {
       "jsdom": "25.0.1"

packages/editor-ext/src/index.ts

@@ -16,4 +16,5 @@ export * from "./lib/drawio";
 export * from "./lib/excalidraw";
 export * from "./lib/embed";
 export * from "./lib/mention";
-export * from "./lib/markdown";
+export * from "./lib/markdown";
+export * from "./lib/embed-provider";

packages/editor-ext/src/lib/embed-provider.ts

@@ -7,102 +7,117 @@ export interface IEmbedProvider {
 
 export const embedProviders: IEmbedProvider[] = [
   {
-    id: 'loom',
-    name: 'Loom',
+    id: "loom",
+    name: "Loom",
     regex: /^https?:\/\/(?:www\.)?loom\.com\/(?:share|embed)\/([\da-zA-Z]+)\/?/,
     getEmbedUrl: (match, url) => {
-      if(url.includes("/embed/")){
+      if (url.includes("/embed/")) {
         return url;
       }
       return `https://loom.com/embed/${match[1]}`;
-    }
+    },
   },
   {
-    id: 'airtable',
-    name: 'Airtable',
+    id: "airtable",
+    name: "Airtable",
     regex: /^https:\/\/(www.)?airtable.com\/([a-zA-Z0-9]{2,})\/.*/,
     getEmbedUrl: (match, url: string) => {
-      const path = url.split('airtable.com/');
-      if(url.includes("/embed/")){
+      const path = url.split("airtable.com/");
+      if (url.includes("/embed/")) {
         return url;
       }
       return `https://airtable.com/embed/${path[1]}`;
-    }
+    },
   },
   {
-    id: 'figma',
-    name: 'Figma',
-    regex: /^https:\/\/[\w\.-]+\.?figma.com\/(file|proto|board|design|slides|deck)\/([0-9a-zA-Z]{22,128})/,
+    id: "figma",
+    name: "Figma",
+    regex:
+      /^https:\/\/[\w\.-]+\.?figma.com\/(file|proto|board|design|slides|deck)\/([0-9a-zA-Z]{22,128})/,
     getEmbedUrl: (match, url: string) => {
       return `https://www.figma.com/embed?url=${url}&embed_host=docmost`;
-    }
+    },
   },
   {
-    'id': 'typeform',
-    name: 'Typeform',
+    id: "typeform",
+    name: "Typeform",
     regex: /^(https?:)?(\/\/)?[\w\.]+\.typeform\.com\/to\/.+/,
     getEmbedUrl: (match, url: string) => {
       return url;
-    }
+    },
   },
   {
-    id: 'miro',
-    name: 'Miro',
+    id: "miro",
+    name: "Miro",
     regex: /^https:\/\/(www\.)?miro\.com\/app\/board\/([\w-]+=)/,
     getEmbedUrl: (match, url) => {
-      if(url.includes("/live-embed/")){
+      if (url.includes("/live-embed/")) {
         return url;
       }
       return `https://miro.com/app/live-embed/${match[2]}?embedMode=view_only_without_ui&autoplay=true&embedSource=docmost`;
-    }
+    },
   },
   {
-    id: 'youtube',
-    name: 'YouTube',
-    regex: /^((?:https?:)?\/\/)?((?:www|m|music)\.)?((?:youtube\.com|youtu.be))(\/(?:[\w\-]+\?v=|embed\/|v\/)?)([\w\-]+)(\S+)?$/,
+    id: "youtube",
+    name: "YouTube",
+    regex:
+      /^((?:https?:)?\/\/)?((?:www|m|music)\.)?((?:youtube\.com|youtu.be))(\/(?:[\w\-]+\?v=|embed\/|v\/)?)([\w\-]+)(\S+)?$/,
     getEmbedUrl: (match, url) => {
-      if (url.includes("/embed/")){
+      if (url.includes("/embed/")) {
         return url;
       }
       return `https://www.youtube-nocookie.com/embed/${match[5]}`;
-    }
+    },
   },
   {
-    id: 'vimeo',
-    name: 'Vimeo',
-    regex: /^(https:)?\/\/(?:www\.|player\.)?vimeo.com\/(?:channels\/(?:\w+\/)?|groups\/([^/]*)\/videos\/|album\/(\d+)\/video\/|video\/|)(\d+)/,
+    id: "vimeo",
+    name: "Vimeo",
+    regex:
+      /^(https:)?\/\/(?:www\.|player\.)?vimeo.com\/(?:channels\/(?:\w+\/)?|groups\/([^/]*)\/videos\/|album\/(\d+)\/video\/|video\/|)(\d+)/,
     getEmbedUrl: (match) => {
       return `https://player.vimeo.com/video/${match[4]}`;
-    }
+    },
   },
   {
-    id: 'framer',
-    name: 'Framer',
+    id: "framer",
+    name: "Framer",
     regex: /^https:\/\/(www\.)?framer\.com\/embed\/([\w-]+)/,
     getEmbedUrl: (match, url: string) => {
       return url;
-    }
+    },
   },
   {
-    id: 'gdrive',
-    name: 'Google Drive',
-    regex: /^((?:https?:)?\/\/)?((?:www|m)\.)?(drive\.google\.com)\/file\/d\/([a-zA-Z0-9_-]+)\/.*$/,
+    id: "gdrive",
+    name: "Google Drive",
+    regex:
+      /^((?:https?:)?\/\/)?((?:www|m)\.)?(drive\.google\.com)\/file\/d\/([a-zA-Z0-9_-]+)\/.*$/,
     getEmbedUrl: (match) => {
       return `https://drive.google.com/file/d/${match[4]}/preview`;
-    }
+    },
   },
   {
-    id: 'gsheets',
-    name: 'Google Sheets',
-    regex: /^((?:https?:)?\/\/)?((?:www|m)\.)?(docs\.google\.com)\/spreadsheets\/d\/e\/([a-zA-Z0-9_-]+)\/.*$/,
+    id: "gsheets",
+    name: "Google Sheets",
+    regex:
+      /^((?:https?:)?\/\/)?((?:www|m)\.)?(docs\.google\.com)\/spreadsheets\/d\/e\/([a-zA-Z0-9_-]+)\/.*$/,
     getEmbedUrl: (match, url: string) => {
-      return url
-    }
+      return url;
+    },
+  },
+  {
+    id: "iframe",
+    name: "Iframe",
+    regex: /any-iframe/,
+    getEmbedUrl: (match, url) => {
+      return url;
+    },
   },
 ];
 
 export function getEmbedProviderById(id: string) {
-  return embedProviders.find(provider => provider.id.toLowerCase() === id.toLowerCase());
+  return embedProviders.find(
+    (provider) => provider.id.toLowerCase() === id.toLowerCase(),
+  );
 }
 
 export interface IEmbedResult {
@@ -116,14 +131,12 @@ export function getEmbedUrlAndProvider(url: string): IEmbedResult {
     if (match) {
       return {
         embedUrl: provider.getEmbedUrl(match, url),
-        provider: provider.name.toLowerCase()
+        provider: provider.name.toLowerCase(),
       };
     }
   }
   return {
     embedUrl: url,
-    provider: 'iframe',
+    provider: "iframe",
   };
 }
-
-

packages/editor-ext/src/lib/image/image.ts

@@ -80,7 +80,7 @@ export const TiptapImage = Image.extend<ImageOptions>({
         default: undefined,
         parseHTML: (element) => element.getAttribute("data-attachment-id"),
         renderHTML: (attributes: ImageAttributes) => ({
-          "data-attachment-id": attributes.align,
+          "data-attachment-id": attributes.attachmentId,
         }),
       },
       size: {

packages/editor-ext/src/lib/trailing-node.ts

@@ -51,8 +51,13 @@ export const TrailingNode = Extension.create<TrailingNodeExtensionOptions>({
         },
         state: {
           init: (_, state) => {
-            const lastNode = state.tr.doc.lastChild
-            return !nodeEqualsType({ node: lastNode, types: disabledNodes })
+            try {
+              const lastNode = state.tr.doc.lastChild
+              return !nodeEqualsType({ node: lastNode, types: disabledNodes })
+            } catch (err){
+              console.log(err)
+            }
+            return true;
           },
           apply: (tr, value) => {
             if (!tr.docChanged) {

packages/editor-ext/src/lib/video/video.ts

@@ -57,7 +57,7 @@ export const TiptapVideo = Node.create<VideoOptions>({
         default: undefined,
         parseHTML: (element) => element.getAttribute("data-attachment-id"),
         renderHTML: (attributes: VideoAttributes) => ({
-          "data-attachment-id": attributes.align,
+          "data-attachment-id": attributes.attachmentId,
         }),
       },
       width: {
@@ -84,6 +84,14 @@ export const TiptapVideo = Node.create<VideoOptions>({
     };
   },
 
+  parseHTML() {
+    return [
+      {
+        tag: 'video',
+      },
+    ]
+  },
+
   renderHTML({ HTMLAttributes }) {
     return [
       "video",

patches/scimmy@1.3.5.patch

@@ -0,0 +1,23 @@
+diff --git a/dist/cjs/lib/messages.cjs b/dist/cjs/lib/messages.cjs
+index e74b8f52137e3267f3d065c4210a1114c4f32dd1..5740606b18851c0ac4f55cfa333152359e0ad135 100644
+--- a/dist/cjs/lib/messages.cjs
++++ b/dist/cjs/lib/messages.cjs
+@@ -502,10 +502,15 @@ class PatchOp {
+                 }
+             }
+         }
+-        
++
++        /** Reason: Commented out to avoid failing patch requests when filters don't match.
++         * Some IdPs send patch paths like `addresses[type eq "work"].country` even if no such address exists. We can't always decide what the end user IdPs send.
++         * Since we manually control patch application, we safely ignore these cases.
++         * example error: "noTarget","detail":"Filter 'addresses[type eq \"work\"].country' does not match any values for 'add' op of operation 5 in PatchOp request body
++         */
+         // No targets, bail out!
+-        if (targets.length === 0 && op !== "remove")
+-            throw new lib_types.default.Error(400, "noTarget", `Filter '${path}' does not match any values for '${op}' op of operation ${index} in PatchOp request body`);
++        //  if (targets.length === 0 && op !== "remove")
++      //      throw new lib_types.default.Error(400, "noTarget", `Filter '${path}' does not match any values for '${op}' op of operation ${index} in PatchOp request body`);
+         
+         /**
+          * @typedef {Object} PatchOpDetails