diff --git a/apps/client/package.json b/apps/client/package.json index e54d65f7..150a9389 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -1,7 +1,7 @@ { "name": "client", "private": true, - "version": "0.70.3", + "version": "0.71.1", "scripts": { "dev": "vite", "build": "tsc && vite build", @@ -10,76 +10,76 @@ "format": "prettier --write \"src/**/*.tsx\" \"src/**/*.ts\"" }, "dependencies": { - "@casl/react": "^4.0.0", + "@casl/react": "^5.0.1", "@docmost/editor-ext": "workspace:*", "@emoji-mart/data": "^1.2.1", "@emoji-mart/react": "^1.1.1", "@excalidraw/excalidraw": "0.18.0-3a5ef40", - "@mantine/core": "^8.3.14", - "@mantine/dates": "^8.3.14", - "@mantine/form": "^8.3.14", - "@mantine/hooks": "^8.3.14", - "@mantine/modals": "^8.3.14", - "@mantine/notifications": "^8.3.14", - "@mantine/spotlight": "^8.3.14", - "@tabler/icons-react": "^3.36.1", - "@tanstack/react-query": "^5.90.17", + "@mantine/core": "^8.3.18", + "@mantine/dates": "^8.3.18", + "@mantine/form": "^8.3.18", + "@mantine/hooks": "^8.3.18", + "@mantine/modals": "^8.3.18", + "@mantine/notifications": "^8.3.18", + "@mantine/spotlight": "^8.3.18", + "@tabler/icons-react": "^3.40.0", + "@tanstack/react-query": "5.90.17", "alfaaz": "^1.1.0", - "axios": "^1.13.5", + "axios": "1.13.6", "blueimp-load-image": "^5.16.0", "clsx": "^2.1.1", "emoji-mart": "^5.6.0", "file-saver": "^2.0.5", "highlightjs-sap-abap": "^0.3.0", - "i18next": "^23.16.8", - "i18next-http-backend": "^2.7.3", - "jotai": "^2.16.2", + "i18next": "^25.10.1", + "i18next-http-backend": "^3.0.2", + "jotai": "^2.18.1", "jotai-optics": "^0.4.0", "js-cookie": "^3.0.5", "jwt-decode": "^4.0.0", - "katex": "0.16.27", + "katex": "0.16.40", "lowlight": "^3.3.0", "mantine-form-zod-resolver": "^1.3.0", - "mermaid": "^11.12.2", + "mermaid": "^11.13.0", "mitt": "^3.0.1", - "posthog-js": "1.345.5", + "posthog-js": "1.363.1", "react": "^18.3.1", "react-arborist": "3.4.0", - "react-clear-modal": "^2.0.17", + "react-clear-modal": "^2.0.18", "react-dom": "^18.3.1", "react-drawio": "^1.0.7", - "react-error-boundary": "^4.1.2", - "react-helmet-async": "^2.0.5", - "react-i18next": "^15.0.1", - "react-router-dom": "^7.12.0", - "semver": "^7.7.3", + "react-error-boundary": "^6.1.1", + "react-helmet-async": "^3.0.0", + "react-i18next": "^16.5.8", + "react-router-dom": "^7.13.1", + "semver": "^7.7.4", "socket.io-client": "^4.8.3", "tiptap-extension-global-drag-handle": "^0.1.18", "zod": "^4.3.6" }, "devDependencies": { - "@eslint/js": "^9.16.0", - "@tanstack/eslint-plugin-query": "^5.62.1", - "@types/blueimp-load-image": "^5.16.0", + "@eslint/js": "^9.28.0", + "@tanstack/eslint-plugin-query": "^5.94.4", + "@types/blueimp-load-image": "^5.16.6", "@types/file-saver": "^2.0.7", "@types/js-cookie": "^3.0.6", - "@types/katex": "^0.16.7", + "@types/katex": "^0.16.8", "@types/node": "22.19.1", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", - "@vitejs/plugin-react": "^5.1.1", - "eslint": "^9.39.2", - "eslint-plugin-react": "^7.37.2", - "eslint-plugin-react-hooks": "^5.1.0", - "eslint-plugin-react-refresh": "^0.4.16", + "@vitejs/plugin-react": "^6.0.1", + "eslint": "^9.28.0", + "eslint-plugin-react": "^7.37.5", + "eslint-plugin-react-hooks": "^7.0.1", + "eslint-plugin-react-refresh": "^0.5.2", "globals": "^15.13.0", "optics-ts": "^2.4.1", - "postcss": "^8.4.49", - "postcss-preset-mantine": "^1.17.0", + "postcss": "^8.5.8", + "postcss-preset-mantine": "^1.18.0", "postcss-simple-vars": "^7.0.1", - "prettier": "^3.4.1", - "typescript": "^5.7.2", - "typescript-eslint": "^8.17.0", - "vite": "^7.2.4" + "prettier": "^3.8.1", + "typescript": "^5.9.3", + "typescript-eslint": "^8.57.1", + "vite": "8.0.5" } } diff --git a/apps/client/public/locales/de-DE/translation.json b/apps/client/public/locales/de-DE/translation.json index 850374cd..1f618fc5 100644 --- a/apps/client/public/locales/de-DE/translation.json +++ b/apps/client/public/locales/de-DE/translation.json @@ -289,6 +289,11 @@ "Save & Exit": "Speichern & Beenden", "Double-click to edit Excalidraw diagram": "Zum Bearbeiten des Excalidraw-Diagramms doppelklicken", "Paste link": "Link einfügen", + "Paste link or search pages": "Link einfügen oder Seiten durchsuchen", + "Link to web page": "Link zur Webseite", + "Recents": "Zuletzt verwendet", + "Page or URL": "Seite oder URL", + "Link title": "Linktitel", "Edit link": "Link bearbeiten", "Remove link": "Link entfernen", "Add link": "Link hinzufügen", @@ -336,6 +341,7 @@ "Insert horizontal rule divider": "Horizontale Trennlinie einfügen", "Upload any image from your device.": "Laden Sie ein beliebiges Bild von Ihrem Gerät hoch.", "Upload any video from your device.": "Laden Sie ein beliebiges Video von Ihrem Gerät hoch.", + "Upload any audio from your device.": "Laden Sie beliebige Audiodateien von Ihrem Gerät hoch.", "Upload any file from your device.": "Laden Sie eine beliebige Datei von Ihrem Gerät hoch.", "Uploading {{name}}": "Lade {{name}} hoch", "Uploading file": "Datei wird hochgeladen", @@ -346,6 +352,12 @@ "Divider": "Trennlinie", "Quote": "Zitat", "Image": "Bild", + "Audio": "Audio.", + "Embed PDF": "PDF einbetten", + "Upload and embed a PDF file.": "Laden Sie eine PDF-Datei hoch und betten Sie sie ein.", + "Embed as PDF": "Als PDF einbetten", + "Failed to load PDF": "Fehler beim Laden der PDF", + "Convert to attachment": "In Anhang umwandeln", "File attachment": "Dateianhang", "Toggle block": "Block umschalten", "Callout": "Hinweisbox", @@ -437,9 +449,11 @@ "Prevent members from sharing pages publicly.": "Verhindern Sie, dass Mitglieder Seiten öffentlich teilen.", "Toggle public sharing": "Öffentliches Teilen umschalten", "Toggle space public sharing": "Öffentliches Teilen im Bereich umschalten", + "Allow viewers to comment": "Zuschauern erlauben, Kommentare zu hinterlassen", + "Allow viewers to add comments on pages in this space.": "Erlauben Sie Zuschauern, Kommentare auf Seiten in diesem Bereich hinzuzufügen.", + "Toggle viewer comments": "Zuschauerkommentare umschalten", "Public sharing is disabled at the workspace level": "Öffentliches Teilen ist auf der Arbeitsbereichsebene deaktiviert", "Prevent pages in this space from being shared publicly.": "Verhindern Sie, dass Seiten in diesem Bereich öffentlich geteilt werden.", - "Requires an enterprise license": "Erfordert eine Unternehmenslizenz", "Page permissions": "Seitenberechtigungen", "Control who can view and edit individual pages. Available with an enterprise license.": "Steuern Sie, wer einzelne Seiten ansehen und bearbeiten kann. Verfügbar mit einer Enterprise-Lizenz.", "Enable public sharing": "Öffentliches Teilen aktivieren", @@ -621,7 +635,9 @@ "Generative AI (Ask AI)": "Generative KI (KI fragen)", "Enable AI-powered content generation in the editor. Allows users to generate, improve, translate and transform text.": "Aktivieren Sie die KI-unterstützte Inhaltserstellung im Editor. Ermöglicht Benutzern das Erzeugen, Verbessern, Übersetzen und Transformieren von Text.", "Toggle generative AI": "Generative KI umschalten", - "Enterprise feature": "Enterprise-Funktion", + "Upgrade your plan": "Upgrade Ihres Plans", + "Available with a paid license": "Verfügbar mit einer kostenpflichtigen Lizenz", + "Upgrade your license tier.": "Stufen Sie Ihre Lizenz hoch.", "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "KI ist nur in der Docmost Enterprise-Edition verfügbar. Kontaktieren Sie sales@docmost.com.", "AI & MCP": "KI & MCP", "AI": "KI", @@ -629,17 +645,15 @@ "Model Context Protocol (MCP)": "Model Context Protocol (MCP)", "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Aktivieren Sie den MCP-Server, damit KI-Assistenten und -Tools mit den Inhalten Ihres Arbeitsbereichs interagieren können.", "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP ist nur in der Docmost Enterprise-Edition verfügbar. Kontaktieren Sie sales@docmost.com.", - "MCP documentation": "MCP-Dokumentation", "MCP Server URL": "MCP-Server-URL", "Use your API key for authentication. You can manage API keys in your account settings.": "Verwenden Sie Ihren API-Schlüssel zur Authentifizierung. API-Schlüssel können in Ihren Kontoeinstellungen verwaltet werden.", "Supported tools": "Unterstützte Tools", "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "In Ihrem Arbeitsbereich ist MCP aktiviert. Verwenden Sie Ihren API-Schlüssel, um KI-Assistenten anzubinden.", "MCP server URL:": "MCP-Server-URL:", "Learn more": "Mehr erfahren", - "View the": "Anzeigen", - "for usage details.": "für Informationen zur Nutzung.", - "for setup instructions.": "für Einrichtungshinweise.", - "API documentation": "API-Dokumentation", + "Manage API keys for all users in the workspace. View the API documentation for usage details.": "Verwalten Sie API-Schlüssel für alle Nutzer im Arbeitsbereich. Siehe die API-Dokumentation für Details zur Verwendung.", + "View the API documentation for usage details.": "Siehe die API-Dokumentation für Details zur Verwendung.", + "View the MCP documentation.": "Sehen Sie die MCP-Dokumentation ein.", "Sources": "Quellen", "AI Answers not available for attachments": "KI-Antworten sind für Anhänge nicht verfügbar", "No answer available": "Keine Antwort verfügbar", @@ -654,12 +668,30 @@ "Mark all as read": "Alle als gelesen markieren", "Mark as read": "Als gelesen markieren", "More options": "Weitere Optionen", - "mentioned you in a comment": "hat Sie in einem Kommentar erwähnt", - "commented on a page": "hat auf einer Seite kommentiert", - "resolved a comment": "hat einen Kommentar gelöst", - "mentioned you on a page": "hat Sie auf einer Seite erwähnt", - "gave you edit access to a page": "hat Ihnen Bearbeitungsrechte für eine Seite gegeben", - "gave you view access to a page": "hat Ihnen Leserechte für eine Seite gewährt", + "{{name}} mentioned you in a comment": "{{name}} hat Sie in einem Kommentar erwähnt", + "{{name}} commented on a page": "{{name}} hat einen Kommentar auf einer Seite hinterlassen", + "{{name}} resolved a comment": "{{name}} hat einen Kommentar als erledigt markiert", + "{{name}} mentioned you on a page": "{{name}} hat Sie auf einer Seite erwähnt", + "{{name}} gave you edit access to a page": "{{name}} hat Ihnen Bearbeitungszugriff auf eine Seite gegeben", + "{{name}} gave you view access to a page": "{{name}} hat Ihnen Ansichtsrechte für eine Seite gegeben", + "{{name}} updated a page": "{{name}} hat eine Seite aktualisiert.", + "Watch page": "Seite beobachten", + "Stop watching": "Beobachtung beenden", + "Email notifications": "E-Mail-Benachrichtigungen", + "Page updates": "Seitenaktualisierungen", + "Get notified when pages you watch are updated.": "Erhalten Sie eine Benachrichtigung, wenn Seiten, die Sie beobachten, aktualisiert werden.", + "Page mentions": "Seiten-Erwähnungen", + "Get notified when someone mentions you on a page.": "Erhalten Sie eine Benachrichtigung, wenn Sie jemand auf einer Seite erwähnt.", + "Comment mentions": "Kommentar-Erwähnungen", + "Get notified when someone mentions you in a comment.": "Erhalten Sie eine Benachrichtigung, wenn Sie jemand in einem Kommentar erwähnt.", + "New comments": "Neue Kommentare", + "Get notified about new comments on threads you participate in.": "Erhalten Sie eine Benachrichtigung über neue Kommentare in Threads, an denen Sie teilnehmen.", + "Resolved comments": "Erledigte Kommentare", + "Get notified when your comment is resolved.": "Erhalten Sie eine Benachrichtigung, wenn Ihr Kommentar erledigt wurde.", + "You are now watching this page": "Sie beobachten diese Seite jetzt", + "You are no longer watching this page": "Sie beobachten diese Seite nicht mehr", + "Direct": "Direkt", + "Updates": "Aktualisierungen", "Today": "Heute", "Yesterday": "Gestern", "This week": "Diese Woche", @@ -693,5 +725,31 @@ "Failed to update trash retention": "Aktualisierung der Aufbewahrungsdauer des Papierkorbs fehlgeschlagen", "Removed page restriction": "Seitenbeschränkung entfernt", "Added page permission": "Seitenberechtigung hinzugefügt", - "Removed page permission": "Seitenberechtigung entfernt" + "Removed page permission": "Seitenberechtigung entfernt", + "Verifying your email": "E-Mail wird überprüft", + "Please wait...": "Bitte warten...", + "Verification failed. The link may have expired.": "Überprüfung fehlgeschlagen. Der Link ist möglicherweise abgelaufen.", + "Check your email": "Prüfen Sie Ihr E-Mail-Postfach", + "We sent a verification link to {{email}}.": "Wir haben einen Bestätigungslink an {{email}} gesendet.", + "We sent a verification link to your email.": "Wir haben einen Bestätigungslink an Ihre E-Mail-Adresse gesendet.", + "Click the link to verify your email and access your workspace.": "Klicken Sie auf den Link, um Ihre E-Mail zu bestätigen und auf Ihren Arbeitsbereich zuzugreifen.", + "Resend verification email": "Bestätigungs-E-Mail erneut senden", + "Verification email sent. Please check your inbox.": "Bestätigungs-E-Mail gesendet. Bitte überprüfen Sie Ihr Postfach.", + "Failed to resend verification email. Please try again.": "Fehler beim erneuten Senden der Bestätigungs-E-Mail. Bitte versuchen Sie es erneut.", + "We've sent you an email with your associated workspaces.": "Wir haben Ihnen eine E-Mail mit Ihren zugehörigen Arbeitsbereichen gesendet.", + "Load more": "Mehr laden", + "Log out of all devices": "Von allen Geräten abmelden", + "Log out of all sessions except this device": "Von allen Sitzungen außer diesem Gerät abmelden", + "This Device": "Dieses Gerät", + "Unknown device": "Unbekanntes Gerät", + "No active sessions": "Keine aktiven Sitzungen", + "Session revoked": "Sitzung widerrufen", + "All other sessions revoked": "Alle anderen Sitzungen widerrufen", + "Last used": "Zuletzt verwendet", + "Created": "Erstellt", + "Rename": "Umbenennen", + "Publish": "Veröffentlichen", + "Security": "Sicherheit", + "Enforce SSO": "SSO erzwingen", + "Once enforced, members will not be able to login with email and password.": "Nach dem Erzwingen können sich Mitglieder nicht mehr mit E-Mail und Passwort anmelden." } diff --git a/apps/client/public/locales/en-US/translation.json b/apps/client/public/locales/en-US/translation.json index e0a57d9b..7f3eb11c 100644 --- a/apps/client/public/locales/en-US/translation.json +++ b/apps/client/public/locales/en-US/translation.json @@ -348,6 +348,7 @@ "Insert horizontal rule divider": "Insert horizontal rule divider", "Upload any image from your device.": "Upload any image from your device.", "Upload any video from your device.": "Upload any video from your device.", + "Upload any audio from your device.": "Upload any audio from your device.", "Upload any file from your device.": "Upload any file from your device.", "Uploading {{name}}": "Uploading {{name}}", "Uploading file": "Uploading file", @@ -358,6 +359,12 @@ "Divider": "Divider", "Quote": "Quote", "Image": "Image", + "Audio": "Audio", + "Embed PDF": "Embed PDF", + "Upload and embed a PDF file.": "Upload and embed a PDF file.", + "Embed as PDF": "Embed as PDF", + "Failed to load PDF": "Failed to load PDF", + "Convert to attachment": "Convert to attachment", "File attachment": "File attachment", "Toggle block": "Toggle block", "Callout": "Callout", @@ -449,6 +456,9 @@ "Prevent members from sharing pages publicly.": "Prevent members from sharing pages publicly.", "Toggle public sharing": "Toggle public sharing", "Toggle space public sharing": "Toggle space public sharing", + "Allow viewers to comment": "Allow viewers to comment", + "Allow viewers to add comments on pages in this space.": "Allow viewers to add comments on pages in this space.", + "Toggle viewer comments": "Toggle viewer comments", "Public sharing is disabled at the workspace level": "Public sharing is disabled at the workspace level", "Prevent pages in this space from being shared publicly.": "Prevent pages in this space from being shared publicly.", "Page permissions": "Page permissions", @@ -625,6 +635,7 @@ "AI Answer": "AI Answer", "Ask AI": "Ask AI", "AI is thinking...": "AI is thinking...", + "Thinking": "Thinking", "Ask a question...": "Ask a question...", "AI Answers": "AI Answers", "AI-powered search (AI Answers)": "AI-powered search (AI Answers)", @@ -672,6 +683,28 @@ "{{name}} mentioned you on a page": "{{name}} mentioned you on a page", "{{name}} gave you edit access to a page": "{{name}} gave you edit access to a page", "{{name}} gave you view access to a page": "{{name}} gave you view access to a page", + "{{name}} updated a page": "{{name}} updated a page", + "Watch page": "Watch page", + "Stop watching": "Stop watching", + "Watch space": "Watch space", + "Stop watching space": "Stop watching space", + "Email notifications": "Email notifications", + "Page updates": "Page updates", + "Get notified when pages you watch are updated.": "Receive notifications when the pages you watch are updated.", + "Page mentions": "Page mentions", + "Get notified when someone mentions you on a page.": "Receive notifications when someone mentions you on a page.", + "Comment mentions": "Comment mentions", + "Get notified when someone mentions you in a comment.": "Receive notifications when someone mentions you in a comment.", + "New comments": "New comments", + "Get notified about new comments on threads you participate in.": "Receive notifications about new comments in threads you are participating in.", + "Resolved comments": "Resolved comments", + "Get notified when your comment is resolved.": "Receive a notification when your comment is resolved.", + "You are now watching this page": "You’re now watching this page", + "You are no longer watching this page": "You’re no longer watching this page", + "You are now watching this space": "You’re now watching this space", + "You are no longer watching this space": "You’re no longer watching this space", + "Direct": "Direct", + "Updates": "Updates", "Today": "Today", "Yesterday": "Yesterday", "This week": "This week", @@ -716,5 +749,47 @@ "Resend verification email": "Resend verification email", "Verification email sent. Please check your inbox.": "Verification email sent. Please check your inbox.", "Failed to resend verification email. Please try again.": "Failed to resend verification email. Please try again.", - "We've sent you an email with your associated workspaces.": "We've sent you an email with your associated workspaces." + "We've sent you an email with your associated workspaces.": "We've sent you an email with your associated workspaces.", + "Load more": "Load more", + "Log out of all devices": "Log out of all devices", + "Log out of all sessions except this device": "Log out of all sessions except this device", + "This Device": "This Device", + "Unknown device": "Unknown device", + "No active sessions": "No active sessions", + "Session revoked": "Session revoked", + "All other sessions revoked": "All other sessions revoked", + "Last used": "Last used", + "Created": "Created", + "Rename": "Rename", + "Publish": "Publish", + "Security": "Security", + "Enforce SSO": "Enforce SSO", + "Once enforced, members will not be able to login with email and password.": "Once enforced, members will not be able to login with email and password.", + "AI-generated content may not be accurate.": "AI-generated content may not be accurate.", + "AI Chat": "AI Chat", + "Analyze for insights": "Analyze for insights", + "Ask anything...": "Ask anything...", + "Chat history": "Chat history", + "Chat name": "Chat name", + "Close": "Close", + "Docmost AI": "Docmost AI", + "Failed to load chat. An error occurred.": "Failed to load chat. An error occurred.", + "Failed to render this message.": "Failed to render this message.", + "How can I help you today?": "How can I help you today?", + "New chat": "New chat", + "No chat history": "No chat history", + "No chats found": "No chats found", + "No conversations yet": "No conversations yet", + "Open full page": "Open full page", + "Previous 7 days": "Previous 7 days", + "Previous 30 days": "Previous 30 days", + "Search chats...": "Search chats...", + "Start a new chat to see it here.": "Start a new chat to see it here.", + "Summarize this page": "Summarize this page", + "Toggle AI Chat": "Toggle AI Chat", + "Translate this page": "Translate this page", + "Try a different search term.": "Try a different search term.", + "Try again": "Try again", + "Untitled chat": "Untitled chat", + "What can I help you with?": "What can I help you with?" } diff --git a/apps/client/public/locales/es-ES/translation.json b/apps/client/public/locales/es-ES/translation.json index 875ba3f4..d1705bb1 100644 --- a/apps/client/public/locales/es-ES/translation.json +++ b/apps/client/public/locales/es-ES/translation.json @@ -289,6 +289,11 @@ "Save & Exit": "Guardar y Salir", "Double-click to edit Excalidraw diagram": "Doble clic para editar el diagrama de Excalidraw", "Paste link": "Pegar enlace", + "Paste link or search pages": "Pega un enlace o busca páginas", + "Link to web page": "Enlazar a una página web", + "Recents": "Recientes", + "Page or URL": "Página o URL", + "Link title": "Título del enlace", "Edit link": "Editar enlace", "Remove link": "Eliminar enlace", "Add link": "Agregar enlace", @@ -336,6 +341,7 @@ "Insert horizontal rule divider": "Insertar regla horizontal", "Upload any image from your device.": "Sube cualquier imagen desde tu dispositivo.", "Upload any video from your device.": "Sube cualquier video desde tu dispositivo.", + "Upload any audio from your device.": "Sube cualquier audio desde tu dispositivo.", "Upload any file from your device.": "Sube cualquier archivo desde tu dispositivo.", "Uploading {{name}}": "Subiendo {{name}}", "Uploading file": "Subiendo archivo", @@ -346,6 +352,12 @@ "Divider": "Divisor", "Quote": "Cita", "Image": "Imagen", + "Audio": "Audio.", + "Embed PDF": "Adjuntar PDF", + "Upload and embed a PDF file.": "Sube y adjunta un archivo PDF.", + "Embed as PDF": "Adjuntar como PDF", + "Failed to load PDF": "Error al cargar el PDF", + "Convert to attachment": "Convertir en adjunto", "File attachment": "Adjunto de archivo", "Toggle block": "Alternar bloque", "Callout": "Aviso", @@ -437,9 +449,11 @@ "Prevent members from sharing pages publicly.": "Evitar que los miembros compartan páginas públicamente.", "Toggle public sharing": "Alternar el uso compartido público", "Toggle space public sharing": "Alternar el uso compartido público del espacio", + "Allow viewers to comment": "Permitir que los espectadores comenten", + "Allow viewers to add comments on pages in this space.": "Permitir que los espectadores agreguen comentarios en las páginas de este espacio.", + "Toggle viewer comments": "Activar/desactivar comentarios de los espectadores", "Public sharing is disabled at the workspace level": "El uso compartido público está desactivado a nivel de espacio de trabajo", "Prevent pages in this space from being shared publicly.": "Evitar que las páginas en este espacio se compartan públicamente.", - "Requires an enterprise license": "Requiere una licencia empresarial", "Page permissions": "Permisos de la página},{", "Control who can view and edit individual pages. Available with an enterprise license.": "Controla quién puede ver y editar páginas individuales. Disponible con una licencia empresarial.", "Enable public sharing": "Activar el uso compartido público", @@ -621,7 +635,9 @@ "Generative AI (Ask AI)": "IA generativa (Preguntar a la IA)", "Enable AI-powered content generation in the editor. Allows users to generate, improve, translate and transform text.": "Habilitar la generación de contenido impulsada por IA en el editor. Permite a los usuarios generar, mejorar, traducir y transformar texto.", "Toggle generative AI": "Activar IA generativa", - "Enterprise feature": "Función empresarial", + "Upgrade your plan": "Mejora tu plan", + "Available with a paid license": "Disponible con una licencia de pago", + "Upgrade your license tier.": "Mejora el nivel de tu licencia.", "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "La IA solo está disponible en la edición empresarial de Docmost. Contacte con sales@docmost.com.", "AI & MCP": "IA y MCP", "AI": "IA", @@ -629,17 +645,15 @@ "Model Context Protocol (MCP)": "Protocolo de Contexto del Modelo (MCP)", "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Habilite el servidor MCP para permitir que asistentes de IA y herramientas interactúen con el contenido de su espacio de trabajo.", "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP solo está disponible en la edición empresarial de Docmost. Contacte con sales@docmost.com.", - "MCP documentation": "Documentación de MCP", "MCP Server URL": "URL del servidor MCP", "Use your API key for authentication. You can manage API keys in your account settings.": "Use su clave API para la autenticación. Puede gestionar las claves API en la configuración de su cuenta.", "Supported tools": "Herramientas compatibles", "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "Su espacio de trabajo tiene MCP habilitado. Use su clave API para conectar asistentes de IA.", "MCP server URL:": "URL del servidor MCP:", "Learn more": "Más información", - "View the": "Ver la", - "for usage details.": "para detalles de uso.", - "for setup instructions.": "para instrucciones de configuración.", - "API documentation": "Documentación de la API", + "Manage API keys for all users in the workspace. View the API documentation for usage details.": "Gestiona las claves de API para todos los usuarios en el espacio de trabajo. Consulta la documentación de la API para detalles de uso.", + "View the API documentation for usage details.": "Consulta la documentación de la API para detalles de uso.", + "View the MCP documentation.": "Consulta la documentación de MCP.", "Sources": "Fuentes", "AI Answers not available for attachments": "Respuestas de IA no disponibles para archivos adjuntos", "No answer available": "No hay respuesta disponible", @@ -654,12 +668,30 @@ "Mark all as read": "Marcar todo como leído", "Mark as read": "Marcar como leído", "More options": "Más opciones", - "mentioned you in a comment": "te mencionó en un comentario", - "commented on a page": "comentó en una página", - "resolved a comment": "resolvió un comentario", - "mentioned you on a page": "te mencionó en una página", - "gave you edit access to a page": "Te dio acceso para editar una página.", - "gave you view access to a page": "Te dio acceso para ver una página.", + "{{name}} mentioned you in a comment": "{{name}} te mencionó en un comentario", + "{{name}} commented on a page": "{{name}} comentó en una página", + "{{name}} resolved a comment": "{{name}} resolvió un comentario", + "{{name}} mentioned you on a page": "{{name}} te mencionó en una página", + "{{name}} gave you edit access to a page": "{{name}} te dio acceso de edición a una página", + "{{name}} gave you view access to a page": "{{name}} te dio acceso de visualización a una página", + "{{name}} updated a page": "{{name}} actualizó una página.", + "Watch page": "Seguir página", + "Stop watching": "Dejar de seguir", + "Email notifications": "Notificaciones por correo electrónico", + "Page updates": "Actualizaciones de página", + "Get notified when pages you watch are updated.": "Recibe una notificación cuando se actualicen las páginas que sigues.", + "Page mentions": "Menciones en la página", + "Get notified when someone mentions you on a page.": "Recibe una notificación cuando alguien te mencione en una página.", + "Comment mentions": "Menciones en comentarios", + "Get notified when someone mentions you in a comment.": "Recibe una notificación cuando alguien te mencione en un comentario.", + "New comments": "Nuevos comentarios", + "Get notified about new comments on threads you participate in.": "Recibe una notificación sobre nuevos comentarios en los hilos donde participas.", + "Resolved comments": "Comentarios resueltos", + "Get notified when your comment is resolved.": "Recibe una notificación cuando tu comentario sea resuelto.", + "You are now watching this page": "Ahora sigues esta página", + "You are no longer watching this page": "Ya no sigues esta página", + "Direct": "Directo", + "Updates": "Actualizaciones", "Today": "Hoy", "Yesterday": "Ayer", "This week": "Esta semana", @@ -693,5 +725,31 @@ "Failed to update trash retention": "No se pudo actualizar la retención de la papelera.", "Removed page restriction": "Restricción de página eliminada", "Added page permission": "Permiso de página añadido", - "Removed page permission": "Permiso de página eliminado" + "Removed page permission": "Permiso de página eliminado", + "Verifying your email": "Verificando tu correo electrónico", + "Please wait...": "Por favor, espera...", + "Verification failed. The link may have expired.": "La verificación ha fallado. Es posible que el enlace haya expirado.", + "Check your email": "Revisa tu correo electrónico", + "We sent a verification link to {{email}}.": "Te enviamos un enlace de verificación a {{email}}.", + "We sent a verification link to your email.": "Te enviamos un enlace de verificación a tu correo.", + "Click the link to verify your email and access your workspace.": "Haz clic en el enlace para verificar tu correo electrónico y acceder a tu espacio de trabajo.", + "Resend verification email": "Reenviar correo de verificación", + "Verification email sent. Please check your inbox.": "Correo de verificación enviado. Por favor, revisa tu bandeja de entrada.", + "Failed to resend verification email. Please try again.": "No se pudo reenviar el correo de verificación. Por favor, intente de nuevo.", + "We've sent you an email with your associated workspaces.": "Te hemos enviado un correo electrónico con tus espacios de trabajo asociados.", + "Load more": "Cargar más", + "Log out of all devices": "Cerrar sesión en todos los dispositivos", + "Log out of all sessions except this device": "Cerrar sesión en todos los dispositivos excepto este", + "This Device": "Este dispositivo", + "Unknown device": "Dispositivo desconocido", + "No active sessions": "No hay sesiones activas", + "Session revoked": "Sesión revocada", + "All other sessions revoked": "Todas las demás sesiones revocadas", + "Last used": "Último uso", + "Created": "Creado", + "Rename": "Renombrar", + "Publish": "Publicar", + "Security": "Seguridad", + "Enforce SSO": "Forzar SSO", + "Once enforced, members will not be able to login with email and password.": "Una vez forzado, los miembros no podrán iniciar sesión con correo electrónico y contraseña." } diff --git a/apps/client/public/locales/fr-FR/translation.json b/apps/client/public/locales/fr-FR/translation.json index f0e4f7af..f8971588 100644 --- a/apps/client/public/locales/fr-FR/translation.json +++ b/apps/client/public/locales/fr-FR/translation.json @@ -289,6 +289,11 @@ "Save & Exit": "Enregistrer & Quitter", "Double-click to edit Excalidraw diagram": "Double-cliquez pour modifier le diagramme Excalidraw", "Paste link": "Coller le lien", + "Paste link or search pages": "Coller le lien ou rechercher des pages", + "Link to web page": "Lien vers une page web", + "Recents": "Récents", + "Page or URL": "Page ou URL", + "Link title": "Titre du lien", "Edit link": "Modifier le lien", "Remove link": "Supprimer le lien", "Add link": "Ajouter un lien", @@ -336,6 +341,7 @@ "Insert horizontal rule divider": "Insérer un séparateur de règle horizontale", "Upload any image from your device.": "Téléchargez n'importe quelle image depuis votre appareil.", "Upload any video from your device.": "Téléchargez n'importe quelle vidéo depuis votre appareil.", + "Upload any audio from your device.": "Téléchargez n'importe quel fichier audio depuis votre appareil.", "Upload any file from your device.": "Téléchargez n'importe quel fichier depuis votre appareil.", "Uploading {{name}}": "Téléchargement de {{name}}", "Uploading file": "Téléchargement du fichier", @@ -346,6 +352,12 @@ "Divider": "Diviseur", "Quote": "Citation", "Image": "Image", + "Audio": "Audio.", + "Embed PDF": "Intégrer un PDF", + "Upload and embed a PDF file.": "Téléchargez et intégrez un fichier PDF.", + "Embed as PDF": "Intégrer comme PDF", + "Failed to load PDF": "Échec du chargement du PDF", + "Convert to attachment": "Convertir en pièce jointe", "File attachment": "Pièce jointe", "Toggle block": "Basculer le bloc", "Callout": "Appel", @@ -410,7 +422,7 @@ "Move page": "Déplacer la page", "Move page to a different space.": "Déplacer la page vers un autre espace.", "Real-time editor connection lost. Retrying...": "Connexion avec l'éditeur en temps réel perdue. Nouvelle tentative...", - "Table of contents": "", + "Table of contents": "Table des matières.", "Add headings (H1, H2, H3) to generate a table of contents.": "Ajoutez des titres (H1, H2, H3) pour générer une table des matières.", "Share": "Partager", "Public sharing": "Partage public", @@ -437,9 +449,11 @@ "Prevent members from sharing pages publicly.": "Empêcher les membres de partager des pages publiquement.", "Toggle public sharing": "Basculer le partage public", "Toggle space public sharing": "Basculer le partage public de l'espace", + "Allow viewers to comment": "Autoriser les spectateurs à commenter", + "Allow viewers to add comments on pages in this space.": "Autoriser les spectateurs à ajouter des commentaires sur les pages de cet espace.", + "Toggle viewer comments": "Basculer les commentaires des spectateurs", "Public sharing is disabled at the workspace level": "Le partage public est désactivé au niveau de l'espace de travail", "Prevent pages in this space from being shared publicly.": "Empêcher les pages de cet espace d'être partagées publiquement.", - "Requires an enterprise license": "Nécessite une licence d'entreprise", "Page permissions": "Autorisations de la page", "Control who can view and edit individual pages. Available with an enterprise license.": "Contrôlez qui peut consulter et modifier chaque page. Disponible avec une licence Entreprise.", "Enable public sharing": "Activer le partage public", @@ -621,7 +635,9 @@ "Generative AI (Ask AI)": "IA générative (Demandez à l'IA)", "Enable AI-powered content generation in the editor. Allows users to generate, improve, translate and transform text.": "Activer la génération de contenu assistée par IA dans l'éditeur. Permet aux utilisateurs de générer, améliorer, traduire et transformer du texte.", "Toggle generative AI": "Activer/désactiver l'IA générative", - "Enterprise feature": "Fonctionnalité entreprise", + "Upgrade your plan": "Mettez à niveau votre forfait", + "Available with a paid license": "Disponible avec une licence payante", + "Upgrade your license tier.": "Mettez à niveau votre niveau de licence.", "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "L'IA n'est disponible que dans l'édition Entreprise de Docmost. Contactez sales@docmost.com.", "AI & MCP": "IA & MCP", "AI": "IA", @@ -629,17 +645,15 @@ "Model Context Protocol (MCP)": "Protocole de contexte de modèle (MCP)", "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Activez le serveur MCP pour permettre aux assistants et outils IA d'interagir avec le contenu de votre espace de travail.", "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP n'est disponible que dans l'édition Entreprise de Docmost. Contactez sales@docmost.com.", - "MCP documentation": "Documentation MCP", "MCP Server URL": "URL du serveur MCP", "Use your API key for authentication. You can manage API keys in your account settings.": "Utilisez votre clé API pour l'authentification. Vous pouvez gérer les clés API dans les paramètres de votre compte.", "Supported tools": "Outils pris en charge", "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "Votre espace de travail a MCP activé. Utilisez votre clé API pour connecter des assistants IA.", "MCP server URL:": "URL du serveur MCP :", "Learn more": "En savoir plus", - "View the": "Voir la", - "for usage details.": "pour les détails d'utilisation.", - "for setup instructions.": "pour les instructions de configuration.", - "API documentation": "Documentation de l'API", + "Manage API keys for all users in the workspace. View the API documentation for usage details.": "Gérez les clés API pour tous les utilisateurs de l'espace de travail. Consultez la documentation API pour plus de détails sur l'utilisation.", + "View the API documentation for usage details.": "Consultez la documentation API pour plus de détails sur l'utilisation.", + "View the MCP documentation.": "Consultez la documentation MCP.", "Sources": "Sources", "AI Answers not available for attachments": "Réponses IA non disponibles pour les pièces jointes", "No answer available": "Pas de réponse disponible", @@ -654,12 +668,30 @@ "Mark all as read": "Tout marquer comme lu", "Mark as read": "Marquer comme lu", "More options": "Plus d'options", - "mentioned you in a comment": "vous a mentionné dans un commentaire", - "commented on a page": "a commenté une page", - "resolved a comment": "a résolu un commentaire", - "mentioned you on a page": "vous a mentionné sur une page", - "gave you edit access to a page": "vous a donné l'accès pour modifier une page", - "gave you view access to a page": "vous a donné l'accès pour consulter une page", + "{{name}} mentioned you in a comment": "{{name}} vous a mentionné dans un commentaire", + "{{name}} commented on a page": "{{name}} a commenté une page", + "{{name}} resolved a comment": "{{name}} a résolu un commentaire", + "{{name}} mentioned you on a page": "{{name}} vous a mentionné sur une page", + "{{name}} gave you edit access to a page": "{{name}} vous a donné l'accès en modification à une page", + "{{name}} gave you view access to a page": "{{name}} vous a donné l'accès en lecture à une page", + "{{name}} updated a page": "{{name}} a mis à jour une page.", + "Watch page": "Surveiller la page", + "Stop watching": "Ne plus surveiller", + "Email notifications": "Notifications par e-mail", + "Page updates": "Mises à jour de la page", + "Get notified when pages you watch are updated.": "Recevez une notification lorsque les pages que vous surveillez sont mises à jour.", + "Page mentions": "Mentions sur la page", + "Get notified when someone mentions you on a page.": "Recevez une notification lorsqu'une personne vous mentionne sur une page.", + "Comment mentions": "Mentions dans les commentaires", + "Get notified when someone mentions you in a comment.": "Recevez une notification lorsqu'une personne vous mentionne dans un commentaire.", + "New comments": "Nouveaux commentaires", + "Get notified about new comments on threads you participate in.": "Recevez une notification concernant les nouveaux commentaires dans les fils auxquels vous participez.", + "Resolved comments": "Commentaires résolus", + "Get notified when your comment is resolved.": "Recevez une notification lorsque votre commentaire est résolu.", + "You are now watching this page": "Vous surveillez désormais cette page", + "You are no longer watching this page": "Vous ne surveillez plus cette page", + "Direct": "Direct", + "Updates": "Mises à jour", "Today": "Aujourd'hui", "Yesterday": "Hier", "This week": "Cette semaine", @@ -693,5 +725,31 @@ "Failed to update trash retention": "Échec de la mise à jour de la durée de conservation de la corbeille", "Removed page restriction": "Restriction de la page supprimée", "Added page permission": "Autorisation de la page ajoutée", - "Removed page permission": "Autorisation de la page supprimée" + "Removed page permission": "Autorisation de la page supprimée", + "Verifying your email": "Vérification de votre e-mail", + "Please wait...": "Veuillez patienter...", + "Verification failed. The link may have expired.": "Échec de la vérification. Le lien a peut-être expiré.", + "Check your email": "Vérifiez votre e-mail", + "We sent a verification link to {{email}}.": "Nous avons envoyé un lien de vérification à {{email}}.", + "We sent a verification link to your email.": "Nous avons envoyé un lien de vérification à votre adresse e-mail.", + "Click the link to verify your email and access your workspace.": "Cliquez sur le lien pour vérifier votre adresse et accéder à votre espace de travail.", + "Resend verification email": "Renvoyer l'e-mail de vérification", + "Verification email sent. Please check your inbox.": "E-mail de vérification envoyé. Veuillez vérifier votre boîte de réception.", + "Failed to resend verification email. Please try again.": "Échec de l'envoi du nouvel e-mail de vérification. Veuillez réessayer.", + "We've sent you an email with your associated workspaces.": "Nous vous avons envoyé un e-mail avec vos espaces de travail associés.", + "Load more": "Charger plus", + "Log out of all devices": "Déconnexion de tous les appareils", + "Log out of all sessions except this device": "Déconnexion de toutes les sessions sauf cet appareil", + "This Device": "Cet appareil", + "Unknown device": "Appareil inconnu", + "No active sessions": "Aucune session active", + "Session revoked": "Session révoquée", + "All other sessions revoked": "Toutes les autres sessions révoquées", + "Last used": "Dernière utilisation", + "Created": "Créé", + "Rename": "Renommer", + "Publish": "Publier", + "Security": "Sécurité", + "Enforce SSO": "Imposer SSO", + "Once enforced, members will not be able to login with email and password.": "Une fois imposé, les membres ne pourront plus se connecter par e-mail et mot de passe." } diff --git a/apps/client/public/locales/it-IT/translation.json b/apps/client/public/locales/it-IT/translation.json index 78a13f5c..1bc59c3e 100644 --- a/apps/client/public/locales/it-IT/translation.json +++ b/apps/client/public/locales/it-IT/translation.json @@ -289,6 +289,11 @@ "Save & Exit": "Salva ed esci", "Double-click to edit Excalidraw diagram": "Fai doppio clic per modificare il diagramma di Excalidraw", "Paste link": "Incolla link", + "Paste link or search pages": "Incolla il link o cerca le pagine", + "Link to web page": "Collega a una pagina web", + "Recents": "Recenti", + "Page or URL": "Pagina o URL", + "Link title": "Titolo del link", "Edit link": "Modifica link", "Remove link": "Rimuovi link", "Add link": "Aggiungi link", @@ -336,6 +341,7 @@ "Insert horizontal rule divider": "Inserisci divisore di regola orizzontale", "Upload any image from your device.": "Carica un'immagine dal tuo dispositivo.", "Upload any video from your device.": "Carica qualsiasi video dal tuo dispositivo.", + "Upload any audio from your device.": "Carica qualsiasi audio dal tuo dispositivo.", "Upload any file from your device.": "Carica qualsiasi file dal tuo dispositivo.", "Uploading {{name}}": "Caricamento di {{name}}", "Uploading file": "Caricamento file", @@ -346,6 +352,12 @@ "Divider": "Divisore", "Quote": "Preventivo", "Image": "Immagine", + "Audio": "Audio.", + "Embed PDF": "Incorpora PDF", + "Upload and embed a PDF file.": "Carica e incorpora un file PDF.", + "Embed as PDF": "Incorpora come PDF", + "Failed to load PDF": "Caricamento del PDF non riuscito", + "Convert to attachment": "Converti in allegato", "File attachment": "Allegato file", "Toggle block": "Attiva blocco", "Callout": "Avviso", @@ -437,9 +449,11 @@ "Prevent members from sharing pages publicly.": "Impedisci ai membri di condividere pubblicamente le pagine.", "Toggle public sharing": "Attiva/disattiva la condivisione pubblica", "Toggle space public sharing": "Attiva/disattiva la condivisione pubblica nello spazio", + "Allow viewers to comment": "Consenti agli utenti di commentare", + "Allow viewers to add comments on pages in this space.": "Consenti agli utenti di aggiungere commenti alle pagine in questo spazio.", + "Toggle viewer comments": "Attiva/disattiva i commenti degli utenti", "Public sharing is disabled at the workspace level": "La condivisione pubblica è disabilitata a livello di area di lavoro", "Prevent pages in this space from being shared publicly.": "Impedisci che le pagine in questo spazio vengano condivise pubblicamente.", - "Requires an enterprise license": "Richiede una licenza enterprise", "Page permissions": "Autorizzazioni della pagina.", "Control who can view and edit individual pages. Available with an enterprise license.": "Controlla chi può visualizzare e modificare le singole pagine. Disponibile con una licenza Enterprise.", "Enable public sharing": "Abilita la condivisione pubblica", @@ -621,7 +635,9 @@ "Generative AI (Ask AI)": "AI generativa (Chiedi AI)", "Enable AI-powered content generation in the editor. Allows users to generate, improve, translate and transform text.": "Abilita la generazione di contenuti con AI nell'editor. Consente agli utenti di generare, migliorare, tradurre e trasformare il testo.", "Toggle generative AI": "Attiva/Disattiva AI generativa", - "Enterprise feature": "Funzionalità Enterprise", + "Upgrade your plan": "Aggiorna il tuo piano", + "Available with a paid license": "Disponibile con una licenza a pagamento", + "Upgrade your license tier.": "Aggiorna il livello della tua licenza.", "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "L'IA è disponibile solo nell'edizione Enterprise di Docmost. Contatta sales@docmost.com.", "AI & MCP": "IA e MCP", "AI": "IA", @@ -629,17 +645,15 @@ "Model Context Protocol (MCP)": "Model Context Protocol (MCP)", "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Abilita il server MCP per consentire ad assistenti e strumenti IA di interagire con i contenuti del tuo spazio di lavoro.", "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP è disponibile solo nell'edizione Enterprise di Docmost. Contatta sales@docmost.com.", - "MCP documentation": "Documentazione MCP", "MCP Server URL": "URL del server MCP", "Use your API key for authentication. You can manage API keys in your account settings.": "Usa la tua chiave API per l'autenticazione. Puoi gestire le chiavi API nelle impostazioni del tuo account.", "Supported tools": "Strumenti supportati", "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "Il tuo spazio di lavoro ha MCP abilitato. Usa la tua chiave API per collegare gli assistenti IA.", "MCP server URL:": "URL del server MCP:", "Learn more": "Scopri di più", - "View the": "Visualizza la", - "for usage details.": "per i dettagli sull'utilizzo.", - "for setup instructions.": "per le istruzioni di configurazione.", - "API documentation": "Documentazione API", + "Manage API keys for all users in the workspace. View the API documentation for usage details.": "Gestisci le API key per tutti gli utenti nello spazio di lavoro. Consulta la documentazione API per i dettagli sull'utilizzo.", + "View the API documentation for usage details.": "Consulta la documentazione API per i dettagli sull'utilizzo.", + "View the MCP documentation.": "Consulta la documentazione MCP.", "Sources": "Fonti", "AI Answers not available for attachments": "Risposte AI non disponibili per gli allegati", "No answer available": "Nessuna risposta disponibile", @@ -654,12 +668,30 @@ "Mark all as read": "Segna tutto come letto", "Mark as read": "Segna come letto", "More options": "Altre opzioni", - "mentioned you in a comment": "ti ha menzionato in un commento", - "commented on a page": "ha commentato una pagina", - "resolved a comment": "ha risolto un commento", - "mentioned you on a page": "ti ha menzionato in una pagina", - "gave you edit access to a page": "ti ha concesso l'accesso per modificare una pagina", - "gave you view access to a page": "ti ha concesso l'accesso per visualizzare una pagina", + "{{name}} mentioned you in a comment": "{{name}} ti ha menzionato in un commento", + "{{name}} commented on a page": "{{name}} ha commentato una pagina", + "{{name}} resolved a comment": "{{name}} ha risolto un commento", + "{{name}} mentioned you on a page": "{{name}} ti ha menzionato su una pagina", + "{{name}} gave you edit access to a page": "{{name}} ti ha dato l'accesso di modifica a una pagina", + "{{name}} gave you view access to a page": "{{name}} ti ha dato l'accesso di visualizzazione a una pagina", + "{{name}} updated a page": "{{name}} ha aggiornato una pagina.", + "Watch page": "Segui pagina", + "Stop watching": "Smetti di seguire", + "Email notifications": "Notifiche email", + "Page updates": "Aggiornamenti pagina", + "Get notified when pages you watch are updated.": "Ricevi una notifica quando le pagine che segui vengono aggiornate.", + "Page mentions": "Menzioni nella pagina", + "Get notified when someone mentions you on a page.": "Ricevi una notifica quando qualcuno ti menziona su una pagina.", + "Comment mentions": "Menzioni nei commenti", + "Get notified when someone mentions you in a comment.": "Ricevi una notifica quando qualcuno ti menziona in un commento.", + "New comments": "Nuovi commenti", + "Get notified about new comments on threads you participate in.": "Ricevi una notifica sui nuovi commenti nelle discussioni a cui partecipi.", + "Resolved comments": "Commenti risolti", + "Get notified when your comment is resolved.": "Ricevi una notifica quando il tuo commento viene risolto.", + "You are now watching this page": "Ora stai seguendo questa pagina", + "You are no longer watching this page": "Non stai più seguendo questa pagina", + "Direct": "Diretto", + "Updates": "Aggiornamenti", "Today": "Oggi", "Yesterday": "Ieri", "This week": "Questa settimana", @@ -693,5 +725,31 @@ "Failed to update trash retention": "Impossibile aggiornare la conservazione del cestino", "Removed page restriction": "Restrizione della pagina rimossa", "Added page permission": "Permesso sulla pagina aggiunto", - "Removed page permission": "Permesso sulla pagina rimosso" + "Removed page permission": "Permesso sulla pagina rimosso", + "Verifying your email": "Verifica della tua email", + "Please wait...": "Attendere...", + "Verification failed. The link may have expired.": "Verifica non riuscita. Il link potrebbe essere scaduto.", + "Check your email": "Controlla la tua email", + "We sent a verification link to {{email}}.": "Abbiamo inviato un link di verifica a {{email}}.", + "We sent a verification link to your email.": "Abbiamo inviato un link di verifica alla tua email.", + "Click the link to verify your email and access your workspace.": "Clicca sul link per verificare la tua email e accedere al tuo workspace.", + "Resend verification email": "Invia nuovamente l'email di verifica", + "Verification email sent. Please check your inbox.": "Email di verifica inviata. Controlla la tua casella di posta.", + "Failed to resend verification email. Please try again.": "Invio dell'email di verifica non riuscito. Si prega di riprovare.", + "We've sent you an email with your associated workspaces.": "Ti abbiamo inviato un'email con i workspace associati.", + "Load more": "Carica altro", + "Log out of all devices": "Disconnetti da tutti i dispositivi", + "Log out of all sessions except this device": "Disconnetti da tutte le sessioni tranne questo dispositivo", + "This Device": "Questo dispositivo", + "Unknown device": "Dispositivo sconosciuto", + "No active sessions": "Nessuna sessione attiva", + "Session revoked": "Sessione revocata", + "All other sessions revoked": "Tutte le altre sessioni revocate", + "Last used": "Ultimo utilizzo", + "Created": "Creato", + "Rename": "Rinomina", + "Publish": "Pubblica", + "Security": "Sicurezza", + "Enforce SSO": "Forza SSO", + "Once enforced, members will not be able to login with email and password.": "Una volta attivata, i membri non potranno più accedere con email e password." } diff --git a/apps/client/public/locales/ja-JP/translation.json b/apps/client/public/locales/ja-JP/translation.json index 09f10ab0..4e01d2c4 100644 --- a/apps/client/public/locales/ja-JP/translation.json +++ b/apps/client/public/locales/ja-JP/translation.json @@ -289,6 +289,11 @@ "Save & Exit": "保存して終了", "Double-click to edit Excalidraw diagram": "ダブルクリックして Excalidraw 図を編集", "Paste link": "リンクを貼り付け", + "Paste link or search pages": "リンクを貼り付けるかページを検索してください。 ", + "Link to web page": "ウェブページへのリンク", + "Recents": "最近使用したもの", + "Page or URL": "ページまたはURL", + "Link title": "リンクタイトル", "Edit link": "リンクを編集", "Remove link": "リンクを削除", "Add link": "リンクを追加", @@ -336,6 +341,7 @@ "Insert horizontal rule divider": "区切り線を挿入します", "Upload any image from your device.": "デバイスから画像をアップロードします", "Upload any video from your device.": "デバイスから動画をアップロードします", + "Upload any audio from your device.": "デバイスから音声ファイルをアップロードします。", "Upload any file from your device.": "デバイスからファイルをアップロードします", "Uploading {{name}}": "{{name}} をアップロード中", "Uploading file": "ファイルをアップロード中", @@ -346,6 +352,12 @@ "Divider": "区切り線", "Quote": "引用", "Image": "画像", + "Audio": "音声。", + "Embed PDF": "PDFを埋め込む", + "Upload and embed a PDF file.": "PDFファイルをアップロードして埋め込みます。", + "Embed as PDF": "PDFとして埋め込む", + "Failed to load PDF": "PDFの読み込みに失敗しました", + "Convert to attachment": "添付ファイルに変換", "File attachment": "ファイル添付", "Toggle block": "ブロックを切り替える", "Callout": "コールアウト", @@ -437,9 +449,11 @@ "Prevent members from sharing pages publicly.": "メンバーがページを公開で共有するのを防ぐ。", "Toggle public sharing": "公開共有を切り替える", "Toggle space public sharing": "スペースの公開共有を切り替える", + "Allow viewers to comment": "閲覧者によるコメントを許可", + "Allow viewers to add comments on pages in this space.": "このスペース内のページに閲覧者がコメントを追加できるようにします。", + "Toggle viewer comments": "閲覧者コメントの切り替え", "Public sharing is disabled at the workspace level": "ワークスペースレベルで公開共有が無効になっています", "Prevent pages in this space from being shared publicly.": "このスペース内のページが公開で共有されるのを防ぐ。", - "Requires an enterprise license": "エンタープライズライセンスが必要です", "Page permissions": "ページのアクセス権", "Control who can view and edit individual pages. Available with an enterprise license.": "個々のページを誰が表示・編集できるかを制御します。エンタープライズライセンスで利用可能です。", "Enable public sharing": "公開共有を有効にする", @@ -621,7 +635,9 @@ "Generative AI (Ask AI)": "生成AI (Ask AI)", "Enable AI-powered content generation in the editor. Allows users to generate, improve, translate and transform text.": "エディターでAIを活用したコンテンツ生成を有効にします。ユーザーがテキストの生成、改善、翻訳、および変換を行うことができます。", "Toggle generative AI": "生成AIを切り替える", - "Enterprise feature": "エンタープライズ機能", + "Upgrade your plan": "プランをアップグレードする", + "Available with a paid license": "有料ライセンスで利用可能", + "Upgrade your license tier.": "ライセンスタイアをアップグレードしてください。", "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "AI は Docmost のエンタープライズ版でのみ利用可能です。sales@docmost.com までお問い合わせください。", "AI & MCP": "AI と MCP", "AI": "AI", @@ -629,17 +645,15 @@ "Model Context Protocol (MCP)": "モデルコンテキストプロトコル(MCP)", "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "MCP サーバーを有効にして、AI アシスタントやツールがワークスペースのコンテンツとやり取りできるようにします。", "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP は Docmost のエンタープライズ版でのみ利用可能です。sales@docmost.com までお問い合わせください。", - "MCP documentation": "MCP ドキュメント", "MCP Server URL": "MCP サーバーの URL", "Use your API key for authentication. You can manage API keys in your account settings.": "認証には API キーを使用してください。API キーはアカウント設定で管理できます。", "Supported tools": "サポートされているツール", "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "このワークスペースでは MCP が有効になっています。AI アシスタントを接続するには API キーを使用してください。", "MCP server URL:": "MCP サーバーの URL:", "Learn more": "詳細を見る", - "View the": "表示", - "for usage details.": "使用方法の詳細については。", - "for setup instructions.": "設定手順については。", - "API documentation": "API ドキュメント", + "Manage API keys for all users in the workspace. View the API documentation for usage details.": "ワークスペース内のすべてのユーザーのAPIキーを管理します。利用方法の詳細はAPIドキュメントをご覧ください。", + "View the API documentation for usage details.": "利用方法の詳細はAPIドキュメントをご覧ください。", + "View the MCP documentation.": "MCPドキュメントをご覧ください。", "Sources": "ソース", "AI Answers not available for attachments": "添付ファイルにはAI回答を利用できません", "No answer available": "回答がありません", @@ -654,12 +668,30 @@ "Mark all as read": "すべてを既読にする", "Mark as read": "既読にする", "More options": "その他のオプション", - "mentioned you in a comment": "コメントであなたに言及しました", - "commented on a page": "ページにコメントしました", - "resolved a comment": "コメントを解決しました", - "mentioned you on a page": "ページ上であなたに言及しました", - "gave you edit access to a page": "あなたにページの編集アクセス権を付与しました", - "gave you view access to a page": "あなたにページの閲覧アクセス権を付与しました", + "{{name}} mentioned you in a comment": "{{name}}さんがコメントであなたに言及しました", + "{{name}} commented on a page": "{{name}}さんがページにコメントしました", + "{{name}} resolved a comment": "{{name}}さんがコメントを解決しました", + "{{name}} mentioned you on a page": "{{name}}さんがページであなたに言及しました", + "{{name}} gave you edit access to a page": "{{name}}さんがページの編集権限をあなたに付与しました", + "{{name}} gave you view access to a page": "{{name}}さんがページの閲覧権限をあなたに付与しました", + "{{name}} updated a page": "{{name}}さんがページを更新しました。", + "Watch page": "ページをウォッチ", + "Stop watching": "ウォッチを解除", + "Email notifications": "メール通知", + "Page updates": "ページの更新", + "Get notified when pages you watch are updated.": "ウォッチしているページが更新されたときに通知を受け取ります。", + "Page mentions": "ページでの言及", + "Get notified when someone mentions you on a page.": "誰かがページであなたに言及したとき通知を受け取ります。", + "Comment mentions": "コメントでの言及", + "Get notified when someone mentions you in a comment.": "誰かがコメントであなたに言及したとき通知を受け取ります。", + "New comments": "新しいコメント", + "Get notified about new comments on threads you participate in.": "参加しているスレッドに新しいコメントがあると通知されます。", + "Resolved comments": "解決済みコメント", + "Get notified when your comment is resolved.": "あなたのコメントが解決されたとき通知を受け取ります。", + "You are now watching this page": "このページをウォッチしています", + "You are no longer watching this page": "このページのウォッチを解除しました", + "Direct": "直接", + "Updates": "アップデート", "Today": "今日", "Yesterday": "昨日", "This week": "今週", @@ -693,5 +725,31 @@ "Failed to update trash retention": "ゴミ箱保持期間の更新に失敗しました", "Removed page restriction": "ページの制限を解除しました", "Added page permission": "ページの権限を追加しました", - "Removed page permission": "ページの権限を削除しました" + "Removed page permission": "ページの権限を削除しました", + "Verifying your email": "メールを確認中", + "Please wait...": "お待ちください…", + "Verification failed. The link may have expired.": "認証に失敗しました。リンクの有効期限が切れている可能性があります。", + "Check your email": "メールを確認してください", + "We sent a verification link to {{email}}.": "確認用リンクを{{email}}に送信しました。", + "We sent a verification link to your email.": "確認用リンクをあなたのメールアドレスに送信しました。", + "Click the link to verify your email and access your workspace.": "リンクをクリックしてメールを認証し、ワークスペースにアクセスしてください。", + "Resend verification email": "確認メールを再送信", + "Verification email sent. Please check your inbox.": "確認メールを送信しました。受信箱をご確認ください。", + "Failed to resend verification email. Please try again.": "確認メールの再送信に失敗しました。もう一度お試しください。", + "We've sent you an email with your associated workspaces.": "紐づいているワークスペース情報をメールでお送りしました。", + "Load more": "もっと見る", + "Log out of all devices": "すべての端末からログアウト", + "Log out of all sessions except this device": "この端末以外の全セッションからログアウト", + "This Device": "このデバイス", + "Unknown device": "不明な端末", + "No active sessions": "アクティブなセッションはありません", + "Session revoked": "セッションが取り消されました", + "All other sessions revoked": "他のすべてのセッションが取り消されました", + "Last used": "最終使用", + "Created": "作成日", + "Rename": "名前を変更", + "Publish": "公開する", + "Security": "セキュリティ", + "Enforce SSO": "SSOを強制する", + "Once enforced, members will not be able to login with email and password.": "一度SSOが強制されると、メールとパスワードでログインできなくなります。" } diff --git a/apps/client/public/locales/ko-KR/translation.json b/apps/client/public/locales/ko-KR/translation.json index eb763685..f5bcd0df 100644 --- a/apps/client/public/locales/ko-KR/translation.json +++ b/apps/client/public/locales/ko-KR/translation.json @@ -289,6 +289,11 @@ "Save & Exit": "저장 후 나가기", "Double-click to edit Excalidraw diagram": "Excalidraw diagram을 편집하려면 더블 클릭하세요", "Paste link": "링크 붙여넣기", + "Paste link or search pages": "링크를 붙여넣거나 페이지를 검색", + "Link to web page": "웹페이지에 링크하기", + "Recents": "최근 항목", + "Page or URL": "페이지 또는 URL", + "Link title": "링크 제목", "Edit link": "링크 수정", "Remove link": "링크 제거", "Add link": "링크 추가", @@ -336,6 +341,7 @@ "Insert horizontal rule divider": "가로 구분선 삽입", "Upload any image from your device.": "기기에서 이미지를 업로드하세요.", "Upload any video from your device.": "기기에서 비디오를 업로드하세요.", + "Upload any audio from your device.": "기기에서 오디오를 업로드하세요.", "Upload any file from your device.": "기기에서 파일을 업로드하세요.", "Uploading {{name}}": "{{name}} 업로드 중", "Uploading file": "파일 업로드 중", @@ -346,6 +352,12 @@ "Divider": "구분선", "Quote": "인용", "Image": "이미지", + "Audio": "오디오.", + "Embed PDF": "PDF 임베드", + "Upload and embed a PDF file.": "PDF 파일을 업로드하고 임베드하세요.", + "Embed as PDF": "PDF로 임베드", + "Failed to load PDF": "PDF 로드 실패", + "Convert to attachment": "첨부 파일로 변환", "File attachment": "파일 첨부", "Toggle block": "블록 토글", "Callout": "경고 상자", @@ -437,9 +449,11 @@ "Prevent members from sharing pages publicly.": "멤버들이 페이지를 공개적으로 공유하지 못하도록 방지하십시오.", "Toggle public sharing": "공유 전환", "Toggle space public sharing": "공간 공유 전환", + "Allow viewers to comment": "뷰어가 댓글을 달 수 있도록 허용", + "Allow viewers to add comments on pages in this space.": "이 공간 내 페이지에 뷰어가 댓글을 추가할 수 있도록 허용합니다.", + "Toggle viewer comments": "뷰어 댓글 전환", "Public sharing is disabled at the workspace level": "워크스페이스 수준에서 공유가 비활성화되었습니다.", "Prevent pages in this space from being shared publicly.": "이 공간의 페이지가 공개적으로 공유되지 않도록 방지하십시오.", - "Requires an enterprise license": "기업 라이센스가 필요합니다.", "Page permissions": "페이지 권한},{", "Control who can view and edit individual pages. Available with an enterprise license.": "개별 페이지의 조회 및 편집 권한을 제어합니다. 엔터프라이즈 라이선스에서 이용 가능합니다.", "Enable public sharing": "공유 활성화", @@ -621,7 +635,9 @@ "Generative AI (Ask AI)": "생성 AI (Ask AI)", "Enable AI-powered content generation in the editor. Allows users to generate, improve, translate and transform text.": "편집기에서 AI 구동 콘텐츠 생성을 활성화합니다. 사용자가 텍스트를 생성, 개선, 번역 및 변환할 수 있습니다.", "Toggle generative AI": "생성 AI 토글", - "Enterprise feature": "엔터프라이즈 기능", + "Upgrade your plan": "요금제를 업그레이드하세요", + "Available with a paid license": "유료 라이선스에서만 사용 가능합니다", + "Upgrade your license tier.": "라이선스 등급을 업그레이드하세요.", "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "AI는 Docmost 엔터프라이즈 에디션에서만 제공됩니다. sales@docmost.com으로 문의하세요.", "AI & MCP": "AI 및 MCP", "AI": "AI", @@ -629,17 +645,15 @@ "Model Context Protocol (MCP)": "모델 컨텍스트 프로토콜(MCP)", "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "AI 어시스턴트와 도구가 워크스페이스 콘텐츠와 상호작용할 수 있도록 MCP 서버를 활성화하세요.", "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP는 Docmost 엔터프라이즈 에디션에서만 제공됩니다. sales@docmost.com으로 문의하세요.", - "MCP documentation": "MCP 문서", "MCP Server URL": "MCP 서버 URL", "Use your API key for authentication. You can manage API keys in your account settings.": "인증을 위해 API 키를 사용하세요. API 키는 계정 설정에서 관리할 수 있습니다.", "Supported tools": "지원되는 도구", "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "워크스페이스에 MCP가 활성화되어 있습니다. AI 어시스턴트를 연결하려면 API 키를 사용하세요.", "MCP server URL:": "MCP 서버 URL:", "Learn more": "자세히 알아보기", - "View the": "다음을", - "for usage details.": "에서 사용 방법을 확인하세요.", - "for setup instructions.": "에서 설정 지침을 확인하세요.", - "API documentation": "API 문서", + "Manage API keys for all users in the workspace. View the API documentation for usage details.": "워크스페이스의 모든 사용자를 위한 API 키를 관리하세요. 사용 방법은 API 문서를 참고하세요.", + "View the API documentation for usage details.": "사용 방법은 API 문서를 참고하세요.", + "View the MCP documentation.": "MCP 문서를 확인하세요.", "Sources": "출처", "AI Answers not available for attachments": "첨부 파일에 대해 AI 답변을 사용할 수 없습니다", "No answer available": "답변을 제공할 수 없습니다", @@ -654,12 +668,30 @@ "Mark all as read": "모두 읽음으로 표시", "Mark as read": "읽음으로 표시", "More options": "추가 옵션", - "mentioned you in a comment": "댓글에서 당신을 언급했습니다", - "commented on a page": "페이지에 댓글을 달았습니다", - "resolved a comment": "댓글을 해결했습니다", - "mentioned you on a page": "페이지에서 당신을 언급했습니다", - "gave you edit access to a page": "페이지 편집 권한을 부여했습니다", - "gave you view access to a page": "페이지 보기 권한을 부여했습니다", + "{{name}} mentioned you in a comment": "{{name}}님이 댓글에서 당신을 언급했습니다", + "{{name}} commented on a page": "{{name}}님이 페이지에 댓글을 남겼습니다", + "{{name}} resolved a comment": "{{name}}님이 댓글을 해결했습니다", + "{{name}} mentioned you on a page": "{{name}}님이 페이지에서 당신을 언급했습니다", + "{{name}} gave you edit access to a page": "{{name}}님이 페이지 편집 권한을 부여했습니다", + "{{name}} gave you view access to a page": "{{name}}님이 페이지 조회 권한을 부여했습니다", + "{{name}} updated a page": "{{name}}님이 페이지를 업데이트했습니다.", + "Watch page": "페이지 구독", + "Stop watching": "구독 취소", + "Email notifications": "이메일 알림", + "Page updates": "페이지 업데이트", + "Get notified when pages you watch are updated.": "구독한 페이지가 업데이트될 때 알림을 받으세요.", + "Page mentions": "페이지 언급", + "Get notified when someone mentions you on a page.": "누군가가 페이지에서 당신을 언급하면 알림을 받으세요.", + "Comment mentions": "댓글 언급", + "Get notified when someone mentions you in a comment.": "누군가가 댓글에서 당신을 언급하면 알림을 받으세요.", + "New comments": "새 댓글", + "Get notified about new comments on threads you participate in.": "참여 중인 스레드에 새 댓글이 달리면 알림을 받으세요.", + "Resolved comments": "해결된 댓글", + "Get notified when your comment is resolved.": "내 댓글이 해결되었을 때 알림을 받으세요.", + "You are now watching this page": "이제 이 페이지를 주시합니다.", + "You are no longer watching this page": "더 이상 이 페이지를 주시하지 않습니다.", + "Direct": "직접", + "Updates": "업데이트", "Today": "오늘", "Yesterday": "어제", "This week": "이번 주", @@ -693,5 +725,31 @@ "Failed to update trash retention": "휴지통 보관 기간 업데이트에 실패했습니다.", "Removed page restriction": "페이지 제한이 제거됨", "Added page permission": "페이지 권한이 추가됨", - "Removed page permission": "페이지 권한이 제거됨" + "Removed page permission": "페이지 권한이 제거됨", + "Verifying your email": "이메일 인증 중", + "Please wait...": "잠시만 기다려 주세요...", + "Verification failed. The link may have expired.": "인증에 실패했습니다. 링크가 만료되었을 수 있습니다.", + "Check your email": "이메일을 확인하세요", + "We sent a verification link to {{email}}.": "{{email}} 주소로 인증 링크를 보냈습니다.", + "We sent a verification link to your email.": "이메일로 인증 링크를 보냈습니다.", + "Click the link to verify your email and access your workspace.": "이메일의 링크를 클릭하여 인증하고 워크스페이스에 접속하세요.", + "Resend verification email": "인증 이메일 재전송", + "Verification email sent. Please check your inbox.": "인증 이메일이 전송되었습니다. 받은 편지함을 확인하세요.", + "Failed to resend verification email. Please try again.": "인증 이메일 재전송에 실패했습니다. 다시 시도해 주세요.", + "We've sent you an email with your associated workspaces.": "연결된 워크스페이스 목록이 포함된 이메일을 보내드렸습니다.", + "Load more": "더 불러오기", + "Log out of all devices": "모든 기기에서 로그아웃", + "Log out of all sessions except this device": "이 기기를 제외한 모든 세션에서 로그아웃", + "This Device": "이 기기", + "Unknown device": "알 수 없는 기기", + "No active sessions": "활성 세션이 없습니다", + "Session revoked": "세션이 해제되었습니다", + "All other sessions revoked": "나머지 모든 세션이 해제되었습니다", + "Last used": "최근 사용", + "Created": "생성됨", + "Rename": "이름 바꾸기", + "Publish": "게시", + "Security": "보안", + "Enforce SSO": "SSO 강제 적용", + "Once enforced, members will not be able to login with email and password.": "강제 적용 시, 멤버는 이메일과 비밀번호로는 로그인할 수 없습니다." } diff --git a/apps/client/public/locales/nl-NL/translation.json b/apps/client/public/locales/nl-NL/translation.json index eb414753..55349725 100644 --- a/apps/client/public/locales/nl-NL/translation.json +++ b/apps/client/public/locales/nl-NL/translation.json @@ -289,6 +289,11 @@ "Save & Exit": "Opslaan & Afsluiten", "Double-click to edit Excalidraw diagram": "Dubbelklik om Excalidraw diagram te bewerken", "Paste link": "Link plakken", + "Paste link or search pages": "Plak link of zoek pagina's", + "Link to web page": "Link naar webpagina", + "Recents": "Recent", + "Page or URL": "Pagina of URL", + "Link title": "Kop van de link", "Edit link": "Link bewerken", "Remove link": "Link verwijderen", "Add link": "Link toevoegen", @@ -336,6 +341,7 @@ "Insert horizontal rule divider": "Horizontale lijn invoegen", "Upload any image from your device.": "Upload een afbeelding vanaf uw apparaat.", "Upload any video from your device.": "Upload een video vanaf uw apparaat.", + "Upload any audio from your device.": "Upload een audio vanaf uw apparaat.", "Upload any file from your device.": "Upload een bestand vanaf uw apparaat.", "Uploading {{name}}": "Uploaden {{name}}", "Uploading file": "Bestand uploaden", @@ -346,6 +352,12 @@ "Divider": "Scheidingslijn", "Quote": "Quote", "Image": "Afbeelding", + "Audio": "Audio.", + "Embed PDF": "PDF insluiten", + "Upload and embed a PDF file.": "Upload en sluit een PDF-bestand in.", + "Embed as PDF": "Insluiten als PDF", + "Failed to load PDF": "Laden van PDF mislukt", + "Convert to attachment": "Converteren naar bijlage", "File attachment": "Bestand bijlage", "Toggle block": "Schakel blok in/uit", "Callout": "Opmerking", @@ -437,9 +449,11 @@ "Prevent members from sharing pages publicly.": "Voorkom dat leden pagina's openbaar delen.", "Toggle public sharing": "Wissel openbaar delen", "Toggle space public sharing": "Wissel openbaar delen van ruimte", + "Allow viewers to comment": "Toestaan dat kijkers reageren", + "Allow viewers to add comments on pages in this space.": "Sta kijkers toe om reacties toe te voegen op pagina\u0019s in deze ruimte.", + "Toggle viewer comments": "Reacties van kijkers in- of uitschakelen", "Public sharing is disabled at the workspace level": "Openbaar delen is uitgeschakeld op werkruimteniveau", "Prevent pages in this space from being shared publicly.": "Voorkom dat pagina's in deze ruimte openbaar worden gedeeld.", - "Requires an enterprise license": "Vereist een bedrijfslicentie", "Page permissions": "Pagina rechten", "Control who can view and edit individual pages. Available with an enterprise license.": "Beheer wie individuele pagina's kan bekijken en bewerken. Beschikbaar met een Enterprise-licentie.", "Enable public sharing": "Openbaar delen inschakelen", @@ -621,7 +635,9 @@ "Generative AI (Ask AI)": "Generatieve AI (Vraag het AI)", "Enable AI-powered content generation in the editor. Allows users to generate, improve, translate and transform text.": "Schakel AI-gestuurde inhoudsgeneratie in de editor in. Hiermee kunnen gebruikers tekst genereren, verbeteren, vertalen en transformeren.", "Toggle generative AI": "Generatieve AI schakelen", - "Enterprise feature": "Enterprise-functie", + "Upgrade your plan": "Upgrade je abonnement", + "Available with a paid license": "Beschikbaar met een betaalde licentie", + "Upgrade your license tier.": "Upgrade je licentieniveau.", "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "AI is alleen beschikbaar in de Docmost Enterprise-editie. Neem contact op met sales@docmost.com.", "AI & MCP": "AI & MCP", "AI": "AI", @@ -629,17 +645,15 @@ "Model Context Protocol (MCP)": "Model Context Protocol (MCP)", "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Schakel de MCP-server in zodat AI-assistenten en tools kunnen interageren met de inhoud van uw werkruimte.", "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP is alleen beschikbaar in de Docmost Enterprise-editie. Neem contact op met sales@docmost.com.", - "MCP documentation": "MCP-documentatie", "MCP Server URL": "MCP-server-URL", "Use your API key for authentication. You can manage API keys in your account settings.": "Gebruik uw API-sleutel voor authenticatie. U kunt API-sleutels beheren in uw accountinstellingen.", "Supported tools": "Ondersteunde tools", "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "In uw werkruimte is MCP ingeschakeld. Gebruik uw API-sleutel om AI-assistenten te koppelen.", "MCP server URL:": "MCP-server-URL:", "Learn more": "Meer informatie", - "View the": "Bekijk de", - "for usage details.": "voor details over het gebruik.", - "for setup instructions.": "voor installatie-instructies.", - "API documentation": "API-documentatie", + "Manage API keys for all users in the workspace. View the API documentation for usage details.": "Beheer API-sleutels voor alle gebruikers in de werkruimte. Bekijk de API-documentatie voor gebruiksdetails.", + "View the API documentation for usage details.": "Bekijk de API-documentatie voor gebruiksdetails.", + "View the MCP documentation.": "Bekijk de MCP-documentatie.", "Sources": "Bronnen", "AI Answers not available for attachments": "AI Antwoorden niet beschikbaar voor bijlagen", "No answer available": "Geen antwoord beschikbaar", @@ -654,12 +668,30 @@ "Mark all as read": "Markeer alles als gelezen", "Mark as read": "Markeer als gelezen", "More options": "Meer opties", - "mentioned you in a comment": "noemde je in een reactie", - "commented on a page": "reageerde op een pagina", - "resolved a comment": "heeft een opmerking opgelost", - "mentioned you on a page": "noemde je op een pagina", - "gave you edit access to a page": "heeft je toegang gegeven om een pagina te bewerken", - "gave you view access to a page": "heeft je toegang gegeven om een pagina te bekijken", + "{{name}} mentioned you in a comment": "{{name}} noemde je in een reactie", + "{{name}} commented on a page": "{{name}} heeft een reactie geplaatst op een pagina", + "{{name}} resolved a comment": "{{name}} heeft een reactie opgelost", + "{{name}} mentioned you on a page": "{{name}} noemde je op een pagina", + "{{name}} gave you edit access to a page": "{{name}} heeft je toegang gegeven om een pagina te bewerken", + "{{name}} gave you view access to a page": "{{name}} heeft je toegang gegeven om een pagina te bekijken", + "{{name}} updated a page": "{{name}} heeft een pagina bijgewerkt.", + "Watch page": "Pagina volgen", + "Stop watching": "Volgen stoppen", + "Email notifications": "E-mailmeldingen", + "Page updates": "Pagina-updates", + "Get notified when pages you watch are updated.": "Ontvang een melding wanneer pagina's die je volgt worden bijgewerkt.", + "Page mentions": "Pagina-vermeldingen", + "Get notified when someone mentions you on a page.": "Ontvang een melding wanneer iemand je noemt op een pagina.", + "Comment mentions": "Vermeldingen in opmerkingen", + "Get notified when someone mentions you in a comment.": "Ontvang een melding wanneer iemand je noemt in een opmerking.", + "New comments": "Nieuwe opmerkingen", + "Get notified about new comments on threads you participate in.": "Ontvang meldingen over nieuwe reacties in threads waaraan je deelneemt.", + "Resolved comments": "Opgeloste opmerkingen", + "Get notified when your comment is resolved.": "Ontvang een melding wanneer je reactie is opgelost.", + "You are now watching this page": "Je volgt nu deze pagina", + "You are no longer watching this page": "Je volgt deze pagina niet meer", + "Direct": "Direct", + "Updates": "Updates", "Today": "Vandaag", "Yesterday": "Gisteren", "This week": "Deze week", @@ -693,5 +725,31 @@ "Failed to update trash retention": "Bijwerken van de bewaartermijn voor de prullenbak is mislukt.", "Removed page restriction": "Pagina-restrictie verwijderd", "Added page permission": "Paginatoestemming toegevoegd", - "Removed page permission": "Paginatoestemming verwijderd" + "Removed page permission": "Paginatoestemming verwijderd", + "Verifying your email": "Je e-mailadres wordt geverifieerd", + "Please wait...": "Even geduld...", + "Verification failed. The link may have expired.": "Verificatie mislukt. De link is mogelijk verlopen.", + "Check your email": "Controleer je e-mail", + "We sent a verification link to {{email}}.": "We hebben een verificatielink naar {{email}} gestuurd.", + "We sent a verification link to your email.": "We hebben een verificatielink naar je e-mailadres gestuurd.", + "Click the link to verify your email and access your workspace.": "Klik op de link om je e-mailadres te verifiëren en toegang te krijgen tot je werkruimte.", + "Resend verification email": "Verificatie-e-mail opnieuw verzenden", + "Verification email sent. Please check your inbox.": "Verificatie-e-mail verzonden. Controleer je inbox.", + "Failed to resend verification email. Please try again.": "Het verzenden van de verificatie-e-mail is mislukt. Probeer het opnieuw.", + "We've sent you an email with your associated workspaces.": "We hebben je een e-mail gestuurd met je gekoppelde werkruimtes.", + "Load more": "Meer laden", + "Log out of all devices": "Log uit op alle apparaten", + "Log out of all sessions except this device": "Log uit op alle sessies behalve dit apparaat", + "This Device": "Dit apparaat", + "Unknown device": "Onbekend apparaat", + "No active sessions": "Geen actieve sessies", + "Session revoked": "Sessie ingetrokken", + "All other sessions revoked": "Alle andere sessies ingetrokken", + "Last used": "Laatst gebruikt", + "Created": "Aangemaakt", + "Rename": "Hernoemen", + "Publish": "Publiceren", + "Security": "Beveiliging", + "Enforce SSO": "SSO afdwingen", + "Once enforced, members will not be able to login with email and password.": "Zodra dit is afgedwongen, kunnen leden niet meer inloggen met e-mail en wachtwoord." } diff --git a/apps/client/public/locales/pt-BR/translation.json b/apps/client/public/locales/pt-BR/translation.json index 961e9a8f..598f6d79 100644 --- a/apps/client/public/locales/pt-BR/translation.json +++ b/apps/client/public/locales/pt-BR/translation.json @@ -289,6 +289,11 @@ "Save & Exit": "Salvar e Sair", "Double-click to edit Excalidraw diagram": "Clique duas vezes para editar o diagrama Excalidraw", "Paste link": "Colar link", + "Paste link or search pages": "Cole o link ou pesquise páginas", + "Link to web page": "Link para página da web", + "Recents": "Recentes", + "Page or URL": "Página ou URL", + "Link title": "Título do link", "Edit link": "Editar link", "Remove link": "Remover link", "Add link": "Adicionar link", @@ -336,6 +341,7 @@ "Insert horizontal rule divider": "Insira um divisor horizontal", "Upload any image from your device.": "Envie qualquer imagem do seu dispositivo.", "Upload any video from your device.": "Envie qualquer vídeo do seu dispositivo.", + "Upload any audio from your device.": "Envie qualquer áudio do seu dispositivo.", "Upload any file from your device.": "Envie qualquer arquivo do seu dispositivo.", "Uploading {{name}}": "Enviando {{name}}", "Uploading file": "Enviando arquivo", @@ -346,6 +352,12 @@ "Divider": "Divisor", "Quote": "Citação", "Image": "Imagem", + "Audio": "Áudio.", + "Embed PDF": "Incorporar PDF", + "Upload and embed a PDF file.": "Envie e incorpore um arquivo PDF.", + "Embed as PDF": "Incorporar como PDF", + "Failed to load PDF": "Falha ao carregar PDF", + "Convert to attachment": "Converter em anexo", "File attachment": "Anexo de arquivo", "Toggle block": "Bloco colapsável", "Callout": "Aviso", @@ -437,9 +449,11 @@ "Prevent members from sharing pages publicly.": "Impedir que os membros compartilhem páginas publicamente.", "Toggle public sharing": "Alternar compartilhamento público", "Toggle space public sharing": "Alternar compartilhamento público do espaço", + "Allow viewers to comment": "Permitir que os visualizadores comentem", + "Allow viewers to add comments on pages in this space.": "Permitir que os visualizadores adicionem comentários em páginas deste espaço.", + "Toggle viewer comments": "Ativar/desativar comentários de visualizadores", "Public sharing is disabled at the workspace level": "O compartilhamento público está desativado no nível do espaço de trabalho", "Prevent pages in this space from being shared publicly.": "Impedir que as páginas neste espaço sejam compartilhadas publicamente.", - "Requires an enterprise license": "Requer uma licença empresarial", "Page permissions": "Permissões da página},{", "Control who can view and edit individual pages. Available with an enterprise license.": "Controle quem pode visualizar e editar páginas individuais. Disponível com licença empresarial.", "Enable public sharing": "Ativar compartilhamento público", @@ -621,7 +635,9 @@ "Generative AI (Ask AI)": "IA generativa (Perguntar à IA)", "Enable AI-powered content generation in the editor. Allows users to generate, improve, translate and transform text.": "Habilitar geração de conteúdo com IA no editor. Permite aos usuários gerar, melhorar, traduzir e transformar texto.", "Toggle generative AI": "Alternar IA generativa", - "Enterprise feature": "Recurso empresarial", + "Upgrade your plan": "Faça upgrade do seu plano", + "Available with a paid license": "Disponível com uma licença paga", + "Upgrade your license tier.": "Faça upgrade do seu nível de licença.", "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "A IA está disponível apenas na edição empresarial do Docmost. Contate sales@docmost.com.", "AI & MCP": "IA e MCP", "AI": "IA", @@ -629,17 +645,15 @@ "Model Context Protocol (MCP)": "Protocolo de Contexto de Modelo (MCP)", "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Ative o servidor MCP para permitir que assistentes de IA e ferramentas interajam com o conteúdo do seu espaço de trabalho.", "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "O MCP está disponível apenas na edição empresarial do Docmost. Contate sales@docmost.com.", - "MCP documentation": "Documentação do MCP", "MCP Server URL": "URL do servidor MCP", "Use your API key for authentication. You can manage API keys in your account settings.": "Use sua chave de API para autenticação. Você pode gerenciar chaves de API nas configurações da sua conta.", "Supported tools": "Ferramentas compatíveis", "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "Seu espaço de trabalho tem MCP habilitado. Use sua chave de API para conectar assistentes de IA.", "MCP server URL:": "URL do servidor MCP:", "Learn more": "Saiba mais", - "View the": "Veja o", - "for usage details.": "para detalhes de uso.", - "for setup instructions.": "para instruções de configuração.", - "API documentation": "Documentação da API", + "Manage API keys for all users in the workspace. View the API documentation for usage details.": "Gerencie as chaves de API de todos os usuários do workspace. Veja a documentação da API para detalhes de uso.", + "View the API documentation for usage details.": "Veja a documentação da API para detalhes de uso.", + "View the MCP documentation.": "Veja a documentação MCP.", "Sources": "Fontes", "AI Answers not available for attachments": "Respostas de IA não disponíveis para anexos", "No answer available": "Nenhuma resposta disponível", @@ -654,12 +668,30 @@ "Mark all as read": "Marcar todas como lidas", "Mark as read": "Marcar como lida", "More options": "Mais opções", - "mentioned you in a comment": "mencionou você em um comentário", - "commented on a page": "comentou em uma página", - "resolved a comment": "resolveu um comentário", - "mentioned you on a page": "mencionou você em uma página", - "gave you edit access to a page": "concedeu a você acesso para editar a página", - "gave you view access to a page": "concedeu a você acesso para visualizar a página", + "{{name}} mentioned you in a comment": "{{name}} mencionou você em um comentário", + "{{name}} commented on a page": "{{name}} comentou em uma página", + "{{name}} resolved a comment": "{{name}} resolveu um comentário", + "{{name}} mentioned you on a page": "{{name}} mencionou você em uma página", + "{{name}} gave you edit access to a page": "{{name}} concedeu acesso de edição a uma página", + "{{name}} gave you view access to a page": "{{name}} concedeu acesso de visualização a uma página", + "{{name}} updated a page": "{{name}} atualizou uma página.", + "Watch page": "Observar página", + "Stop watching": "Parar de observar", + "Email notifications": "Notificações por e-mail", + "Page updates": "Atualizações da página", + "Get notified when pages you watch are updated.": "Receba notificações quando as páginas que você observa forem atualizadas.", + "Page mentions": "Menções na página", + "Get notified when someone mentions you on a page.": "Receba notificações quando alguém mencionar você em uma página.", + "Comment mentions": "Menções em comentários", + "Get notified when someone mentions you in a comment.": "Receba notificações quando alguém mencionar você em um comentário.", + "New comments": "Novos comentários", + "Get notified about new comments on threads you participate in.": "Receba notificações sobre novos comentários nas discussões em que você participa.", + "Resolved comments": "Comentários resolvidos", + "Get notified when your comment is resolved.": "Receba notificações quando seu comentário for resolvido.", + "You are now watching this page": "Agora você está observando esta página", + "You are no longer watching this page": "Você não está mais observando esta página", + "Direct": "Direto", + "Updates": "Atualizações", "Today": "Hoje", "Yesterday": "Ontem", "This week": "Esta semana", @@ -693,5 +725,31 @@ "Failed to update trash retention": "Falha ao atualizar a retenção da lixeira", "Removed page restriction": "Restrição de página removida", "Added page permission": "Permissão de página adicionada", - "Removed page permission": "Permissão de página removida" + "Removed page permission": "Permissão de página removida", + "Verifying your email": "Verificando seu e-mail", + "Please wait...": "Por favor, aguarde...", + "Verification failed. The link may have expired.": "Falha na verificação. O link pode ter expirado.", + "Check your email": "Verifique seu e-mail", + "We sent a verification link to {{email}}.": "Enviamos um link de verificação para {{email}}.", + "We sent a verification link to your email.": "Enviamos um link de verificação para seu e-mail.", + "Click the link to verify your email and access your workspace.": "Clique no link para verificar seu e-mail e acessar seu workspace.", + "Resend verification email": "Reenviar e-mail de verificação", + "Verification email sent. Please check your inbox.": "E-mail de verificação enviado. Por favor, verifique sua caixa de entrada.", + "Failed to resend verification email. Please try again.": "Falha ao reenviar o e-mail de verificação. Por favor, tente novamente.", + "We've sent you an email with your associated workspaces.": "Enviamos um e-mail para você com seus workspaces associados.", + "Load more": "Carregar mais", + "Log out of all devices": "Sair de todos os dispositivos", + "Log out of all sessions except this device": "Sair de todas as sessões, exceto neste dispositivo", + "This Device": "Este dispositivo", + "Unknown device": "Dispositivo desconhecido", + "No active sessions": "Sem sessões ativas", + "Session revoked": "Sessão revogada", + "All other sessions revoked": "Todas as outras sessões revogadas", + "Last used": "Último uso", + "Created": "Criado", + "Rename": "Renomear", + "Publish": "Publicar", + "Security": "Segurança", + "Enforce SSO": "Exigir SSO", + "Once enforced, members will not be able to login with email and password.": "Uma vez exigido, os membros não poderão entrar com e-mail e senha." } diff --git a/apps/client/public/locales/ru-RU/translation.json b/apps/client/public/locales/ru-RU/translation.json index e6a14df8..c0d3f3d4 100644 --- a/apps/client/public/locales/ru-RU/translation.json +++ b/apps/client/public/locales/ru-RU/translation.json @@ -289,6 +289,11 @@ "Save & Exit": "Сохранить и выйти", "Double-click to edit Excalidraw diagram": "Кликните дважды для редактирования диаграммы Excalidraw", "Paste link": "Вставить ссылку", + "Paste link or search pages": "Вставьте ссылку или найдите страницы", + "Link to web page": "Ссылка на веб-страницу", + "Recents": "Недавние", + "Page or URL": "Страница или URL", + "Link title": "Заголовок ссылки", "Edit link": "Редактировать ссылку", "Remove link": "Удалить ссылку", "Add link": "Добавить ссылку", @@ -336,6 +341,7 @@ "Insert horizontal rule divider": "Вставить горизонтальный разделитель", "Upload any image from your device.": "Загрузить любое изображение с вашего устройства.", "Upload any video from your device.": "Загрузить любое видео с вашего устройства.", + "Upload any audio from your device.": "Загрузите любой аудиофайл с вашего устройства.", "Upload any file from your device.": "Загрузить любой файл с вашего устройства.", "Uploading {{name}}": "Загрузка {{name}}", "Uploading file": "Загрузка файла", @@ -346,6 +352,12 @@ "Divider": "Разделитель", "Quote": "Цитата", "Image": "Изображение", + "Audio": "Аудио.", + "Embed PDF": "Встроить PDF", + "Upload and embed a PDF file.": "Загрузите и встроите PDF-файл.", + "Embed as PDF": "Встроить как PDF", + "Failed to load PDF": "Не удалось загрузить PDF", + "Convert to attachment": "Преобразовать в вложение", "File attachment": "Прикрепленный файл", "Toggle block": "Сворачиваемый блок", "Callout": "Выноска", @@ -437,9 +449,11 @@ "Prevent members from sharing pages publicly.": "Запретить участникам делиться страницами публично.", "Toggle public sharing": "Переключить общий доступ", "Toggle space public sharing": "Переключить общий доступ для пространства", + "Allow viewers to comment": "Разрешить зрителям комментировать", + "Allow viewers to add comments on pages in this space.": "Разрешить зрителям добавлять комментарии на страницах в этом пространстве.", + "Toggle viewer comments": "Переключить комментарии зрителей", "Public sharing is disabled at the workspace level": "Общий доступ отключен на уровне рабочего пространства", "Prevent pages in this space from being shared publicly.": "Запретить делиться страницами в этом пространстве публично.", - "Requires an enterprise license": "Требуется корпоративная лицензия", "Page permissions": "Права доступа к странице},{", "Control who can view and edit individual pages. Available with an enterprise license.": "Контролируйте, кто может просматривать и редактировать отдельные страницы. Доступно при наличии лицензии Enterprise.", "Enable public sharing": "Включить общий доступ", @@ -621,7 +635,9 @@ "Generative AI (Ask AI)": "Генеративный ИИ (Спросить ИИ)", "Enable AI-powered content generation in the editor. Allows users to generate, improve, translate and transform text.": "Включите создание контента на базе ИИ в редакторе. Позволяет пользователям генерировать, улучшать, переводить и преобразовывать текст.", "Toggle generative AI": "Переключить генеративный ИИ", - "Enterprise feature": "Корпоративная функция", + "Upgrade your plan": "Обновите свой тарифный план", + "Available with a paid license": "Доступно с платной лицензией", + "Upgrade your license tier.": "Обновите уровень вашей лицензии.", "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "ИИ доступен только в корпоративной версии Docmost. Свяжитесь по адресу sales@docmost.com.", "AI & MCP": "ИИ и MCP", "AI": "ИИ", @@ -629,17 +645,15 @@ "Model Context Protocol (MCP)": "Протокол контекста модели (MCP)", "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Включите сервер MCP, чтобы ИИ-ассистенты и инструменты могли взаимодействовать с содержимым вашего рабочего пространства.", "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP доступен только в корпоративной версии Docmost. Свяжитесь по адресу sales@docmost.com.", - "MCP documentation": "Документация MCP", "MCP Server URL": "URL сервера MCP", "Use your API key for authentication. You can manage API keys in your account settings.": "Используйте ваш API-ключ для аутентификации. Управлять API-ключами можно в настройках аккаунта.", "Supported tools": "Поддерживаемые инструменты", "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "В вашем рабочем пространстве включён MCP. Используйте свой API-ключ для подключения ИИ-ассистентов.", "MCP server URL:": "URL сервера MCP:", "Learn more": "Подробнее", - "View the": "Просмотреть", - "for usage details.": "для подробностей использования.", - "for setup instructions.": "для инструкций по настройке.", - "API documentation": "Документация API", + "Manage API keys for all users in the workspace. View the API documentation for usage details.": "Управляйте API-ключами для всех пользователей в рабочем пространстве. Смотрите документацию по API для получения информации об использовании.", + "View the API documentation for usage details.": "Смотрите документацию по API для получения информации об использовании.", + "View the MCP documentation.": "Смотрите документацию по MCP.", "Sources": "Источники", "AI Answers not available for attachments": "Ответы ИИ недоступны для вложений", "No answer available": "Ответ недоступен", @@ -654,12 +668,30 @@ "Mark all as read": "Отметить все как прочитанные", "Mark as read": "Отметить как прочитанное", "More options": "Больше возможностей", - "mentioned you in a comment": "упомянул вас в комментарии", - "commented on a page": "прокомментировал на странице", - "resolved a comment": "разрешил комментарий", - "mentioned you on a page": "упомянул вас на странице", - "gave you edit access to a page": "предоставил вам доступ на редактирование страницы", - "gave you view access to a page": "предоставил вам доступ для просмотра страницы", + "{{name}} mentioned you in a comment": "{{name}} упомянул вас в комментарии", + "{{name}} commented on a page": "{{name}} оставил комментарий на странице", + "{{name}} resolved a comment": "{{name}} решил комментарий", + "{{name}} mentioned you on a page": "{{name}} упомянул вас на странице", + "{{name}} gave you edit access to a page": "{{name}} предоставил вам доступ для редактирования страницы", + "{{name}} gave you view access to a page": "{{name}} предоставил вам доступ к просмотру страницы", + "{{name}} updated a page": "{{name}} обновил страницу.", + "Watch page": "Следить за страницей", + "Stop watching": "Прекратить отслеживание", + "Email notifications": "Уведомления на email", + "Page updates": "Обновления страницы", + "Get notified when pages you watch are updated.": "Получайте уведомления, когда отслеживаемые вами страницы обновляются.", + "Page mentions": "Упоминания на странице", + "Get notified when someone mentions you on a page.": "Получайте уведомления, когда кто-то упоминает вас на странице.", + "Comment mentions": "Упоминания в комментариях", + "Get notified when someone mentions you in a comment.": "Получайте уведомления, когда кто-то упоминает вас в комментарии.", + "New comments": "Новые комментарии", + "Get notified about new comments on threads you participate in.": "Получайте уведомления о новых комментариях в цепочках, в которых вы участвуете.", + "Resolved comments": "Разрешённые комментарии", + "Get notified when your comment is resolved.": "Получайте уведомление, когда ваш комментарий разрешён.", + "You are now watching this page": "Вы теперь следите за этой страницей", + "You are no longer watching this page": "Вы больше не следите за этой страницей", + "Direct": "Прямые", + "Updates": "Обновления", "Today": "Сегодня", "Yesterday": "Вчера", "This week": "На этой неделе", @@ -693,5 +725,31 @@ "Failed to update trash retention": "Не удалось обновить срок хранения корзины", "Removed page restriction": "Ограничение доступа к странице удалено", "Added page permission": "Добавлено разрешение доступа к странице", - "Removed page permission": "Удалено разрешение доступа к странице" + "Removed page permission": "Удалено разрешение доступа к странице", + "Verifying your email": "Проверка вашей электронной почты", + "Please wait...": "Пожалуйста, подождите...", + "Verification failed. The link may have expired.": "Ошибка проверки. Ссылка могла устареть.", + "Check your email": "Проверьте вашу электронную почту", + "We sent a verification link to {{email}}.": "Мы отправили ссылку для подтверждения на {{email}}.", + "We sent a verification link to your email.": "Мы отправили ссылку для подтверждения на вашу электронную почту.", + "Click the link to verify your email and access your workspace.": "Перейдите по ссылке, чтобы подтвердить электронную почту и получить доступ к рабочему пространству.", + "Resend verification email": "Отправить письмо для подтверждения повторно", + "Verification email sent. Please check your inbox.": "Письмо для подтверждения отправлено. Пожалуйста, проверьте ваш почтовый ящик.", + "Failed to resend verification email. Please try again.": "Не удалось отправить письмо для подтверждения. Пожалуйста, попробуйте снова.", + "We've sent you an email with your associated workspaces.": "Мы отправили вам электронное письмо с привязанными рабочими пространствами.", + "Load more": "Загрузить ещё", + "Log out of all devices": "Выйти со всех устройств", + "Log out of all sessions except this device": "Выйти из всех сессий, кроме этого устройства", + "This Device": "Это устройство", + "Unknown device": "Неизвестное устройство", + "No active sessions": "Нет активных сессий", + "Session revoked": "Сессия отозвана", + "All other sessions revoked": "Все другие сессии отозваны", + "Last used": "Последнее использование", + "Created": "Создано", + "Rename": "Переименовать", + "Publish": "Опубликовать", + "Security": "Безопасность", + "Enforce SSO": "Принудительно использовать SSO", + "Once enforced, members will not be able to login with email and password.": "После включения участники не смогут войти с помощью электронной почты и пароля." } diff --git a/apps/client/public/locales/uk-UA/translation.json b/apps/client/public/locales/uk-UA/translation.json index 83f96bb7..02c4a4bd 100644 --- a/apps/client/public/locales/uk-UA/translation.json +++ b/apps/client/public/locales/uk-UA/translation.json @@ -289,6 +289,11 @@ "Save & Exit": "Зберегти та вийти", "Double-click to edit Excalidraw diagram": "Клацніть двічі для редагування діаграми Excalidraw", "Paste link": "Вставити посилання", + "Paste link or search pages": "Вставте посилання або знайдіть сторінки", + "Link to web page": "Посилання на веб-сторінку", + "Recents": "Нещодавні", + "Page or URL": "Сторінка або URL", + "Link title": "Назва посилання", "Edit link": "Редагувати посилання", "Remove link": "Видалити посилання", "Add link": "Додати посилання", @@ -336,6 +341,7 @@ "Insert horizontal rule divider": "Вставити горизонтальний роздільник", "Upload any image from your device.": "Завантажити будь-яке зображення з вашого пристрою.", "Upload any video from your device.": "Завантажити будь-яке відео з вашого пристрою.", + "Upload any audio from your device.": "Завантажте будь-який аудіофайл зі свого пристрою.", "Upload any file from your device.": "Завантажити будь-який файл з вашого пристрою.", "Uploading {{name}}": "Завантаження {{name}}", "Uploading file": "Завантаження файлу", @@ -346,6 +352,12 @@ "Divider": "Роздільник", "Quote": "Цитата", "Image": "Зображення", + "Audio": "Аудіо.", + "Embed PDF": "Вбудувати PDF", + "Upload and embed a PDF file.": "Завантажте та вбудуйте файл PDF.", + "Embed as PDF": "Вбудувати як PDF", + "Failed to load PDF": "Не вдалося завантажити PDF", + "Convert to attachment": "Перетворити на вкладення", "File attachment": "Прикріплений файл", "Toggle block": "Блок, що згортається", "Callout": "Виноска", @@ -437,9 +449,11 @@ "Prevent members from sharing pages publicly.": "Перешкодити учасникам публічно ділитися сторінками.", "Toggle public sharing": "Перемикання публічного доступу", "Toggle space public sharing": "Перемикання публічного доступу до просторів", + "Allow viewers to comment": "Дозволити глядачам коментувати", + "Allow viewers to add comments on pages in this space.": "Дозволити глядачам додавати коментарі на сторінках у цьому просторі.", + "Toggle viewer comments": "Увімкнути або вимкнути коментарі глядачів", "Public sharing is disabled at the workspace level": "Публічний доступ вимкнуто на рівні робочого простору", "Prevent pages in this space from being shared publicly.": "Перешкодити публічному поширенню сторінок у цьому просторі.", - "Requires an enterprise license": "Потребує корпоративної ліцензії", "Page permissions": "Права доступу до сторінки.", "Control who can view and edit individual pages. Available with an enterprise license.": "Керуйте тим, хто може переглядати та редагувати окремі сторінки. Доступно з корпоративною ліцензією.", "Enable public sharing": "Увімкнути публічний доступ", @@ -621,7 +635,9 @@ "Generative AI (Ask AI)": "Генеративний ШІ (Запитати ШІ)", "Enable AI-powered content generation in the editor. Allows users to generate, improve, translate and transform text.": "Увімкнути генерацію контенту за допомогою ШІ в редакторі. Дозволяє користувачам генерувати, покращувати, перекладати та трансформувати текст.", "Toggle generative AI": "Переключити генеративний ШІ", - "Enterprise feature": "Функція корпоративної версії", + "Upgrade your plan": "Оновіть свій тарифний план", + "Available with a paid license": "Доступно за платною ліцензією", + "Upgrade your license tier.": "Оновіть рівень своєї ліцензії.", "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "ШІ доступний лише в корпоративній редакції Docmost. Зверніться до sales@docmost.com.", "AI & MCP": "ШІ та MCP", "AI": "ШІ", @@ -629,17 +645,15 @@ "Model Context Protocol (MCP)": "Протокол контексту моделі (MCP)", "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "Увімкніть MCP‑сервер, щоб дозволити ШІ‑помічникам та інструментам взаємодіяти з вмістом вашого робочого простору.", "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP доступний лише в корпоративній редакції Docmost. Зверніться до sales@docmost.com.", - "MCP documentation": "Документація MCP", "MCP Server URL": "URL сервера MCP", "Use your API key for authentication. You can manage API keys in your account settings.": "Використовуйте свій API‑ключ для аутентифікації. Ви можете керувати API‑ключами в налаштуваннях облікового запису.", "Supported tools": "Підтримувані інструменти", "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "У вашому робочому просторі MCP увімкнено. Використайте свій API‑ключ, щоб підключити ШІ‑помічників.", "MCP server URL:": "URL сервера MCP:", "Learn more": "Дізнатися більше", - "View the": "Переглянути", - "for usage details.": "для відомостей про використання.", - "for setup instructions.": "для інструкцій з налаштування.", - "API documentation": "Документація API", + "Manage API keys for all users in the workspace. View the API documentation for usage details.": "Керуйте ключами API для всіх користувачів у робочому просторі. Перегляньте документацію API для деталей використання.", + "View the API documentation for usage details.": "Перегляньте документацію API для деталей використання.", + "View the MCP documentation.": "Перегляньте документацію MCP.", "Sources": "Джерела", "AI Answers not available for attachments": "Відповіді ШІ недоступні для вкладень", "No answer available": "Відповідь недоступна", @@ -654,12 +668,30 @@ "Mark all as read": "Позначити все як прочитане", "Mark as read": "Позначити як прочитане", "More options": "Більше опцій", - "mentioned you in a comment": "згадали вас у коментарі", - "commented on a page": "прокоментували на сторінці", - "resolved a comment": "вирішили коментар", - "mentioned you on a page": "згадали вас на сторінці", - "gave you edit access to a page": "надав вам доступ для редагування сторінки", - "gave you view access to a page": "надав вам доступ для перегляду сторінки", + "{{name}} mentioned you in a comment": "{{name}} згадав вас у коментарі", + "{{name}} commented on a page": "{{name}} залишив коментар на сторінці", + "{{name}} resolved a comment": "{{name}} вирішив коментар", + "{{name}} mentioned you on a page": "{{name}} згадав вас на сторінці", + "{{name}} gave you edit access to a page": "{{name}} надав вам доступ до редагування сторінки", + "{{name}} gave you view access to a page": "{{name}} надав вам доступ до перегляду сторінки", + "{{name}} updated a page": "{{name}} оновив сторінку.", + "Watch page": "Стежити за сторінкою", + "Stop watching": "Припинити стежити", + "Email notifications": "Сповіщення електронною поштою", + "Page updates": "Оновлення сторінки", + "Get notified when pages you watch are updated.": "Отримуйте сповіщення, коли сторінки, за якими ви стежите, оновлюються.", + "Page mentions": "Згадки на сторінці", + "Get notified when someone mentions you on a page.": "Отримуйте сповіщення, коли хтось згадує вас на сторінці.", + "Comment mentions": "Згадки у коментарях", + "Get notified when someone mentions you in a comment.": "Отримуйте сповіщення, коли хтось згадує вас у коментарі.", + "New comments": "Нові коментарі", + "Get notified about new comments on threads you participate in.": "Отримуйте сповіщення про нові коментарі у темах, у яких ви берете участь.", + "Resolved comments": "Вирішені коментарі", + "Get notified when your comment is resolved.": "Отримайте сповіщення, коли ваш коментар вирішено.", + "You are now watching this page": "Ви зараз стежите за цією сторінкою", + "You are no longer watching this page": "Ви більше не стежите за цією сторінкою", + "Direct": "Прямі", + "Updates": "Оновлення", "Today": "Сьогодні", "Yesterday": "Вчора", "This week": "Цього тижня", @@ -693,5 +725,31 @@ "Failed to update trash retention": "Не вдалося оновити термін зберігання у кошику", "Removed page restriction": "Обмеження сторінки видалено", "Added page permission": "Додано дозвіл на сторінку", - "Removed page permission": "Дозвіл на сторінку видалено" + "Removed page permission": "Дозвіл на сторінку видалено", + "Verifying your email": "Підтвердження вашої електронної пошти", + "Please wait...": "Будь ласка, зачекайте...", + "Verification failed. The link may have expired.": "Підтвердження не вдалося. Посилання могло втратити чинність.", + "Check your email": "Перевірте свою електронну пошту", + "We sent a verification link to {{email}}.": "Ми надіслали посилання для підтвердження на {{email}}.", + "We sent a verification link to your email.": "Ми надіслали посилання для підтвердження на вашу електронну пошту.", + "Click the link to verify your email and access your workspace.": "Клікніть на посилання, щоб підтвердити електронну пошту та отримати доступ до робочого простору.", + "Resend verification email": "Повторно надіслати лист для підтвердження", + "Verification email sent. Please check your inbox.": "Лист для підтвердження надіслано. Будь ласка, перевірте свою скриньку.", + "Failed to resend verification email. Please try again.": "Не вдалося повторно надіслати лист для підтвердження. Будь ласка, спробуйте ще раз.", + "We've sent you an email with your associated workspaces.": "Ми надіслали вам лист із переліком пов’язаних робочих просторів.", + "Load more": "Завантажити ще", + "Log out of all devices": "Вийти з усіх пристроїв", + "Log out of all sessions except this device": "Вийти з усіх сесій, окрім цього пристрою", + "This Device": "Цей пристрій", + "Unknown device": "Невідомий пристрій", + "No active sessions": "Немає активних сесій", + "Session revoked": "Сесію скасовано", + "All other sessions revoked": "Всі інші сесії скасовано", + "Last used": "Останнє використання", + "Created": "Створено", + "Rename": "Перейменувати", + "Publish": "Опублікувати", + "Security": "Безпека", + "Enforce SSO": "Вимагати SSO", + "Once enforced, members will not be able to login with email and password.": "Після активування учасники не зможуть увійти за допомогою електронної пошти та паролю." } diff --git a/apps/client/public/locales/zh-CN/translation.json b/apps/client/public/locales/zh-CN/translation.json index 95883800..a4ac6bd3 100644 --- a/apps/client/public/locales/zh-CN/translation.json +++ b/apps/client/public/locales/zh-CN/translation.json @@ -289,6 +289,11 @@ "Save & Exit": "保存并退出", "Double-click to edit Excalidraw diagram": "双击以编辑 Excalidraw 图表", "Paste link": "粘贴链接", + "Paste link or search pages": "粘贴链接或搜索页面", + "Link to web page": "链接到网页", + "Recents": "最近使用", + "Page or URL": "页面或网址", + "Link title": "链接标题", "Edit link": "编辑链接", "Remove link": "移除链接", "Add link": "添加链接", @@ -336,6 +341,7 @@ "Insert horizontal rule divider": "插入水平分割线", "Upload any image from your device.": "从设备上传任何图像", "Upload any video from your device.": "从设备上传任何视频", + "Upload any audio from your device.": "从您的设备上传任意音频文件。", "Upload any file from your device.": "从设备上传任何文件", "Uploading {{name}}": "正在上传{{name}}", "Uploading file": "正在上传文件", @@ -346,6 +352,12 @@ "Divider": "分割线", "Quote": "引用", "Image": "图像", + "Audio": "音频。", + "Embed PDF": "嵌入 PDF", + "Upload and embed a PDF file.": "上传并嵌入 PDF 文件。", + "Embed as PDF": "作为 PDF 嵌入", + "Failed to load PDF": "加载 PDF 失败", + "Convert to attachment": "转换为附件", "File attachment": "文件附件", "Toggle block": "切换块", "Callout": "标注块", @@ -437,9 +449,11 @@ "Prevent members from sharing pages publicly.": "阻止成员公开分享页面。", "Toggle public sharing": "切换公开分享", "Toggle space public sharing": "切换空间公开分享", + "Allow viewers to comment": "允许观众评论", + "Allow viewers to add comments on pages in this space.": "允许观众在此空间的页面上添加评论。", + "Toggle viewer comments": "切换观众评论", "Public sharing is disabled at the workspace level": "公开分享在工作区级别被禁用", "Prevent pages in this space from being shared publicly.": "阻止此空间中的页面被公开分享。", - "Requires an enterprise license": "需要企业许可证", "Page permissions": "页面权限},{", "Control who can view and edit individual pages. Available with an enterprise license.": "控制谁可以查看和编辑单个页面。此功能在企业版许可下可用。", "Enable public sharing": "启用公开分享", @@ -621,7 +635,9 @@ "Generative AI (Ask AI)": "生成型AI (询问AI)", "Enable AI-powered content generation in the editor. Allows users to generate, improve, translate and transform text.": "在编辑器中启用AI驱动的内容生成。允许用户生成、改进、翻译和转换文本。", "Toggle generative AI": "切换生成型AI", - "Enterprise feature": "企业版功能", + "Upgrade your plan": "升级您的方案", + "Available with a paid license": "需付费许可才可用", + "Upgrade your license tier.": "升级您的许可等级。", "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "AI 仅在 Docmost 企业版中提供。请联系 sales@docmost.com。", "AI & MCP": "AI 与 MCP", "AI": "AI", @@ -629,17 +645,15 @@ "Model Context Protocol (MCP)": "模型上下文协议(MCP)", "Enable the MCP server to allow AI assistants and tools to interact with your workspace content.": "启用 MCP 服务器以允许 AI 助手和工具与您的工作区内容交互。", "MCP is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "MCP 仅在 Docmost 企业版中提供。请联系 sales@docmost.com。", - "MCP documentation": "MCP 文档", "MCP Server URL": "MCP 服务器 URL", "Use your API key for authentication. You can manage API keys in your account settings.": "使用您的 API 密钥进行身份验证。您可以在账户设置中管理 API 密钥。", "Supported tools": "支持的工具", "Your workspace has MCP enabled. Use your API key to connect AI assistants.": "您的工作区已启用 MCP。使用您的 API 密钥连接 AI 助手。", "MCP server URL:": "MCP 服务器 URL:", "Learn more": "了解更多", - "View the": "查看", - "for usage details.": "以获取使用详情。", - "for setup instructions.": "以获取设置说明。", - "API documentation": "API 文档", + "Manage API keys for all users in the workspace. View the API documentation for usage details.": "为工作区内所有用户管理 API 密钥。有关使用详情,请查阅API 文档。", + "View the API documentation for usage details.": "有关使用详情,请查阅API 文档。", + "View the MCP documentation.": "查看MCP 文档。", "Sources": "来源", "AI Answers not available for attachments": "AI答案不适用于附件", "No answer available": "无可用答案", @@ -654,12 +668,30 @@ "Mark all as read": "标记所有为已读", "Mark as read": "标记为已读", "More options": "更多选项", - "mentioned you in a comment": "在评论中提到你", - "commented on a page": "在页面上评论", - "resolved a comment": "解决了一个评论", - "mentioned you on a page": "在页面上提到你", - "gave you edit access to a page": "已授予你编辑该页面的权限", - "gave you view access to a page": "已授予你查看该页面的权限", + "{{name}} mentioned you in a comment": "{{name}}在评论中提到你", + "{{name}} commented on a page": "{{name}}在页面上评论了", + "{{name}} resolved a comment": "{{name}}已解决一条评论", + "{{name}} mentioned you on a page": "{{name}}在页面上提到你", + "{{name}} gave you edit access to a page": "{{name}}授予你页面编辑权限", + "{{name}} gave you view access to a page": "{{name}}授予你页面查看权限", + "{{name}} updated a page": "{{name}}更新了一个页面。", + "Watch page": "关注页面", + "Stop watching": "取消关注", + "Email notifications": "邮件通知", + "Page updates": "页面更新", + "Get notified when pages you watch are updated.": "当你关注的页面有更新时收到通知。", + "Page mentions": "页面提及", + "Get notified when someone mentions you on a page.": "当有人在页面上提到你时收到通知。", + "Comment mentions": "评论提及", + "Get notified when someone mentions you in a comment.": "当有人在评论中提到你时收到通知。", + "New comments": "新评论", + "Get notified about new comments on threads you participate in.": "当你参与的讨论有新评论时收到通知。", + "Resolved comments": "已解决的评论", + "Get notified when your comment is resolved.": "当你的评论被解决时收到通知。", + "You are now watching this page": "你现在正在关注此页面", + "You are no longer watching this page": "你已取消关注此页面", + "Direct": "直接", + "Updates": "更新", "Today": "今天", "Yesterday": "昨天", "This week": "本周", @@ -693,5 +725,31 @@ "Failed to update trash retention": "更新垃圾箱保留期失败", "Removed page restriction": "已移除页面限制", "Added page permission": "已添加页面权限", - "Removed page permission": "已移除页面权限" + "Removed page permission": "已移除页面权限", + "Verifying your email": "正在验证您的邮箱", + "Please wait...": "请稍候……", + "Verification failed. The link may have expired.": "验证失败。该链接可能已过期。", + "Check your email": "查看您的邮箱", + "We sent a verification link to {{email}}.": "我们已向{{email}}发送了一封验证邮件。", + "We sent a verification link to your email.": "我们已向您的邮箱发送了一封验证邮件。", + "Click the link to verify your email and access your workspace.": "请点击链接以验证邮箱并访问您的工作区。", + "Resend verification email": "重新发送验证邮件", + "Verification email sent. Please check your inbox.": "验证邮件已发送。请检查您的收件箱。", + "Failed to resend verification email. Please try again.": "重新发送验证邮件失败。请重试。", + "We've sent you an email with your associated workspaces.": "我们已向您发送包含关联工作区的邮件。", + "Load more": "加载更多", + "Log out of all devices": "退出所有设备登录", + "Log out of all sessions except this device": "除本设备外,退出所有会话", + "This Device": "本设备", + "Unknown device": "未知设备", + "No active sessions": "无活动会话", + "Session revoked": "会话已被撤销", + "All other sessions revoked": "所有其他会话已被撤销", + "Last used": "上次使用", + "Created": "创建时间", + "Rename": "重命名", + "Publish": "发布", + "Security": "安全性", + "Enforce SSO": "强制启用 SSO", + "Once enforced, members will not be able to login with email and password.": "一旦强制,成员将无法用邮箱和密码登录。" } diff --git a/apps/client/src/App.tsx b/apps/client/src/App.tsx index 05e0569f..8c24b3d1 100644 --- a/apps/client/src/App.tsx +++ b/apps/client/src/App.tsx @@ -41,6 +41,7 @@ import AuditLogs from "@/ee/audit/pages/audit-logs.tsx"; import TemplateList from "@/ee/template/pages/template-list"; import TemplateEditor from "@/ee/template/pages/template-editor"; import FavoritesPage from "@/pages/favorites/favorites-page"; +import AiChat from "@/ee/ai-chat/pages/ai-chat.tsx"; import VerifyEmail from "@/ee/pages/verify-email.tsx"; export default function App() { @@ -84,6 +85,8 @@ export default function App() { }> } /> + } /> + } /> } /> } /> } /> diff --git a/apps/client/src/components/common/copy.tsx b/apps/client/src/components/common/copy.tsx index 81a70771..745fc4ba 100644 --- a/apps/client/src/components/common/copy.tsx +++ b/apps/client/src/components/common/copy.tsx @@ -1,4 +1,4 @@ -import { ActionIcon, Tooltip } from "@mantine/core"; +import { ActionIcon, MantineColor, MantineSize, Tooltip } from "@mantine/core"; import { CopyButton } from "@/components/common/copy-button"; import { IconCheck, IconCopy } from "@tabler/icons-react"; import React from "react"; @@ -6,8 +6,10 @@ import { useTranslation } from "react-i18next"; interface CopyProps { text: string; + size?: MantineSize; + color?: MantineColor; } -export default function CopyTextButton({ text }: CopyProps) { +export default function CopyTextButton({ text, size }: CopyProps) { const { t } = useTranslation(); return ( @@ -22,6 +24,7 @@ export default function CopyTextButton({ text }: CopyProps) { color={copied ? "teal" : "gray"} variant="subtle" onClick={copy} + size={size} > {copied ? : } diff --git a/apps/client/src/components/layouts/global/app-header.module.css b/apps/client/src/components/layouts/global/app-header.module.css index b2298f13..a70b57e7 100644 --- a/apps/client/src/components/layouts/global/app-header.module.css +++ b/apps/client/src/components/layouts/global/app-header.module.css @@ -7,6 +7,19 @@ padding-right: var(--mantine-spacing-md); } +.brand { + display: flex; + align-items: center; + text-decoration: none; + color: inherit; + cursor: pointer; +} + +.brandIcon { + display: flex; + align-items: center; +} + .link { display: block; line-height: 1; @@ -16,6 +29,9 @@ color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-0)); font-size: var(--mantine-font-size-sm); font-weight: 500; + user-select: none; + white-space: nowrap; + flex-shrink: 0; @mixin hover { background-color: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-6)); diff --git a/apps/client/src/components/layouts/global/app-header.tsx b/apps/client/src/components/layouts/global/app-header.tsx index 016d3e4e..03bbb872 100644 --- a/apps/client/src/components/layouts/global/app-header.tsx +++ b/apps/client/src/components/layouts/global/app-header.tsx @@ -1,8 +1,18 @@ -import { Badge, Group, Text, Tooltip } from "@mantine/core"; +import { + ActionIcon, + Badge, + Box, + Group, + Text, + Tooltip, + UnstyledButton, +} from "@mantine/core"; import classes from "./app-header.module.css"; import React from "react"; import TopMenu from "@/components/layouts/global/top-menu.tsx"; -import { Link } from "react-router-dom"; +import { Link, useLocation } from "react-router-dom"; +import { IconSparkles } from "@tabler/icons-react"; +import useToggleAside from "@/hooks/use-toggle-aside.tsx"; import APP_ROUTE from "@/lib/app-route.ts"; import { useAtom } from "jotai"; import { @@ -23,8 +33,11 @@ import { shareSearchSpotlight, } from "@/features/search/constants.ts"; import { NotificationPopover } from "@/features/notification/components/notification-popover.tsx"; +import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts"; -const links = [{ link: APP_ROUTE.HOME, label: "Home" }]; +const links = [ + { link: APP_ROUTE.HOME, label: "Home" }, +]; export function AppHeader() { const { t } = useTranslation(); @@ -34,6 +47,15 @@ export function AppHeader() { const [desktopOpened] = useAtom(desktopSidebarAtom); const toggleDesktop = useToggleSidebar(desktopSidebarAtom); const { isTrial, trialDaysLeft } = useTrial(); + const location = useLocation(); + const toggleAside = useToggleAside(); + const [workspace] = useAtom(workspaceAtom); + const aiChatEnabled = workspace?.settings?.ai?.chat === true; + + const isHomeRoute = location.pathname.startsWith("/home"); + const isSpacesRoute = location.pathname === "/spaces"; + const isPageRoute = location.pathname.includes("/p/"); + const hideSidebar = isHomeRoute || isSpacesRoute; const items = links.map((link) => ( @@ -65,15 +87,24 @@ export function AppHeader() { /> - - Docmost - + + + Docmost + + + Docmost + + {items} @@ -90,6 +121,49 @@ export function AppHeader() { + {aiChatEnabled && ( + <> + { + if (e.metaKey || e.ctrlKey || e.shiftKey || e.button === 1) { + return; + } + if (isPageRoute) { + e.preventDefault(); + toggleAside("chat"); + } + }} + > + {t("AI Chat")} + + + { + if (e.metaKey || e.ctrlKey || e.shiftKey || e.button === 1) { + return; + } + if (isPageRoute) { + e.preventDefault(); + toggleAside("chat"); + } + }} + > + + + + + )} {isCloud() && isTrial && trialDaysLeft !== 0 && ( ; title = "Table of contents"; break; + case "chat": + component = ; + title = "AI Chat"; + break; default: component = null; title = null; @@ -34,12 +39,14 @@ export default function Aside() { {component && ( <> - - {t(title)} - + {tab !== "chat" && ( + + {t(title)} + + )} - {tab === "comments" ? ( - + {tab === "comments" || tab === "chat" ? ( + component ) : ( - - {isSpaceRoute &&
} - {isSpaceRoute && } - {isSettingsRoute && } - {showGlobalSidebar && } - + {!hideSidebar && ( + + {!isAiRoute &&
} + {isSpaceRoute && } + {isSettingsRoute && } + {isAiRoute && } + {showGlobalSidebar && } + + )} {isSettingsRoute ? ( {children} diff --git a/apps/client/src/components/ui/card-carousel.module.css b/apps/client/src/components/ui/card-carousel.module.css new file mode 100644 index 00000000..4ec513f2 --- /dev/null +++ b/apps/client/src/components/ui/card-carousel.module.css @@ -0,0 +1,68 @@ +.root { + position: relative; +} + +.track { + display: flex; + gap: var(--mantine-spacing-md); + overflow-x: auto; + scroll-snap-type: x mandatory; + scroll-behavior: smooth; + scrollbar-width: none; + -ms-overflow-style: none; + padding: 2px; + margin: -2px; +} + +.track::-webkit-scrollbar { + display: none; +} + +.track > * { + scroll-snap-align: start; + flex: 0 0 auto; +} + +.arrow { + position: absolute; + top: 50%; + transform: translateY(-50%); + width: 32px; + height: 32px; + display: flex; + align-items: center; + justify-content: center; + border-radius: 50%; + border: 1px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4)); + background: light-dark(var(--mantine-color-white), var(--mantine-color-dark-6)); + color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1)); + cursor: pointer; + padding: 0; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08); + opacity: 0; + pointer-events: none; + transition: opacity 120ms ease, background-color 120ms ease, transform 120ms ease; + z-index: 2; +} + +.root:hover .arrow.visible, +.arrow.visible:focus-visible { + opacity: 1; + pointer-events: auto; +} + +.arrow:hover { + background: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-5)); +} + +.arrow:active { + transform: translateY(-50%) scale(0.95); +} + +.arrowLeft { + left: -14px; +} + +.arrowRight { + right: -14px; +} diff --git a/apps/client/src/components/ui/card-carousel.tsx b/apps/client/src/components/ui/card-carousel.tsx new file mode 100644 index 00000000..60d13aba --- /dev/null +++ b/apps/client/src/components/ui/card-carousel.tsx @@ -0,0 +1,77 @@ +import { useCallback, useEffect, useRef, useState, type ReactNode } from "react"; +import { IconChevronLeft, IconChevronRight } from "@tabler/icons-react"; +import { useTranslation } from "react-i18next"; +import classes from "./card-carousel.module.css"; + +type Props = { + children: ReactNode; + ariaLabel?: string; +}; + +export default function CardCarousel({ children, ariaLabel }: Props) { + const { t } = useTranslation(); + const trackRef = useRef(null); + const [canScrollLeft, setCanScrollLeft] = useState(false); + const [canScrollRight, setCanScrollRight] = useState(false); + + const updateScrollState = useCallback(() => { + const el = trackRef.current; + if (!el) return; + const maxScroll = el.scrollWidth - el.clientWidth; + setCanScrollLeft(el.scrollLeft > 1); + setCanScrollRight(el.scrollLeft < maxScroll - 1); + }, []); + + useEffect(() => { + updateScrollState(); + const el = trackRef.current; + if (!el) return; + + const observer = new ResizeObserver(updateScrollState); + observer.observe(el); + for (const child of Array.from(el.children)) { + observer.observe(child); + } + + return () => observer.disconnect(); + }, [updateScrollState, children]); + + const scrollBy = (direction: 1 | -1) => { + const el = trackRef.current; + if (!el) return; + el.scrollBy({ left: direction * el.clientWidth * 0.85, behavior: "smooth" }); + }; + + return ( +
+
+ {children} +
+ + + + +
+ ); +} diff --git a/apps/client/src/ee/ai-chat/components/ai-chat-layout.tsx b/apps/client/src/ee/ai-chat/components/ai-chat-layout.tsx new file mode 100644 index 00000000..f0fe3035 --- /dev/null +++ b/apps/client/src/ee/ai-chat/components/ai-chat-layout.tsx @@ -0,0 +1,106 @@ +import { useEffect, useRef } from "react"; +import { useLocation, useNavigate, useParams } from "react-router-dom"; +import { useChatInfoQuery } from "../queries/ai-chat-query"; +import { useChatStream } from "../hooks/use-chat-stream"; +import ChatMessageList from "./chat-message-list"; +import ChatEmptyState from "./chat-empty-state"; +import ChatInput from "./chat-input"; +import type { HomeAiPromptInitialState } from "@/features/home/components/home-ai-prompt"; +import classes from "../styles/ai-chat.module.css"; + +export default function AiChatLayout() { + const { chatId } = useParams<{ chatId: string }>(); + const location = useLocation(); + const navigate = useNavigate(); + const chatInfoQuery = useChatInfoQuery(chatId); + + // If the URL points at a chat the user does not own, the info fetch 404s. + // Bounce them back to /ai so they cannot interact with any chat UI (including + // kicking off orphan uploads) tied to a chat they have no access to. + useEffect(() => { + if (chatId && chatInfoQuery.isError) { + navigate("/ai", { replace: true }); + } + }, [chatId, chatInfoQuery.isError, navigate]); + const { + messages, + streamingContent, + streamingToolCalls, + isStreaming, + error, + sendMessage, + stopGeneration, + hydrateFromServer, + } = useChatStream(chatId); + + const autoSentRef = useRef(false); + + useEffect(() => { + if (chatInfoQuery.data?.messages) { + hydrateFromServer(chatInfoQuery.data.messages); + } + }, [chatInfoQuery.data, hydrateFromServer]); + + useEffect(() => { + if (autoSentRef.current || chatId) return; + const state = location.state as HomeAiPromptInitialState | null; + if (!state?.initialContent && !state?.initialAttachments?.length) return; + + autoSentRef.current = true; + sendMessage( + state.initialContent ?? "", + state.initialMentions ?? [], + state.initialAttachments ?? [], + ); + navigate(location.pathname, { replace: true, state: null }); + }, [chatId, location, navigate, sendMessage]); + + const hasMessages = messages.length > 0 || isStreaming; + + // While the redirect effect is running (or if the user is still on this + // component for any reason) never render the chat UI for a forbidden chat. + if (chatId && chatInfoQuery.isError) { + return null; + } + + return ( +
+ {error && ( +
+ {error} +
+ )} + + {hasMessages ? ( + <> + +
+ +
+ + ) : ( + + )} +
+ ); +} diff --git a/apps/client/src/ee/ai-chat/components/ai-chat-sidebar-item.tsx b/apps/client/src/ee/ai-chat/components/ai-chat-sidebar-item.tsx new file mode 100644 index 00000000..f59b740e --- /dev/null +++ b/apps/client/src/ee/ai-chat/components/ai-chat-sidebar-item.tsx @@ -0,0 +1,166 @@ +import { useState, useRef, useEffect, useMemo, useCallback } from "react"; +import { ActionIcon, Menu, TextInput } from "@mantine/core"; +import { IconDots, IconTrash, IconEdit } from "@tabler/icons-react"; +import { Link } from "react-router-dom"; +import { useTranslation } from "react-i18next"; +import type { AiChat } from "../types/ai-chat.types"; +import classes from "../styles/chat-sidebar.module.css"; + +type Props = { + chat: AiChat; + isActive: boolean; + onDelete: (chatId: string) => void; + onRename: (chatId: string, title: string) => void; +}; + +function formatChatDate( + isoString: string | Date, + locale: string | undefined, +): string { + const date = new Date(isoString); + if (Number.isNaN(date.getTime())) return ""; + + const now = new Date(); + const startOfToday = new Date( + now.getFullYear(), + now.getMonth(), + now.getDate(), + ).getTime(); + const ts = date.getTime(); + const sameYear = date.getFullYear() === now.getFullYear(); + + if (ts >= startOfToday) { + return date.toLocaleTimeString(locale, { + hour: "numeric", + minute: "2-digit", + }); + } + + if (sameYear) { + return date.toLocaleDateString(locale, { + month: "short", + day: "numeric", + }); + } + + return date.toLocaleDateString(locale, { + month: "short", + day: "numeric", + year: "numeric", + }); +} + +export default function AiChatSidebarItem({ + chat, + isActive, + onDelete, + onRename, +}: Props) { + const { t, i18n } = useTranslation(); + const [renaming, setRenaming] = useState(false); + const [renameValue, setRenameValue] = useState(""); + const inputRef = useRef(null); + + const formattedDate = useMemo( + () => formatChatDate(chat.updatedAt, i18n.language), + [chat.updatedAt, i18n.language], + ); + + useEffect(() => { + if (renaming) { + // Wait for the input to be mounted before selecting. + const id = window.setTimeout(() => inputRef.current?.select(), 0); + return () => window.clearTimeout(id); + } + }, [renaming]); + + const startRename = useCallback(() => { + setRenameValue(chat.title || ""); + setRenaming(true); + }, [chat.title]); + + const submitRename = useCallback(() => { + const trimmed = renameValue.trim(); + if (trimmed && trimmed !== chat.title) { + onRename(chat.id, trimmed); + } + setRenaming(false); + }, [renameValue, chat.id, chat.title, onRename]); + + if (renaming) { + return ( +
+ setRenameValue(e.currentTarget.value)} + onKeyDown={(e) => { + if (e.key === "Enter") { + e.preventDefault(); + submitRename(); + } else if (e.key === "Escape") { + e.preventDefault(); + setRenaming(false); + } + }} + onBlur={submitRename} + classNames={{ input: classes.chatItemRenameInput }} + style={{ flex: 1 }} + /> +
+ ); + } + + return ( + + + {chat.title || t("Untitled chat")} + + {formattedDate} +
+ + + e.preventDefault()} + > + + + + + } + onClick={(e) => { + e.preventDefault(); + e.stopPropagation(); + startRename(); + }} + > + {t("Rename")} + + } + color="red" + onClick={(e) => { + e.preventDefault(); + e.stopPropagation(); + onDelete(chat.id); + }} + > + {t("Delete")} + + + +
+ + ); +} diff --git a/apps/client/src/ee/ai-chat/components/ai-chat-sidebar.tsx b/apps/client/src/ee/ai-chat/components/ai-chat-sidebar.tsx new file mode 100644 index 00000000..e3df3e52 --- /dev/null +++ b/apps/client/src/ee/ai-chat/components/ai-chat-sidebar.tsx @@ -0,0 +1,224 @@ +import { useState, useCallback, useEffect, useMemo, useRef } from "react"; +import { Link, useNavigate, useParams } from "react-router-dom"; +import { ActionIcon, Center, TextInput, Loader, Tooltip } from "@mantine/core"; +import { useDebouncedValue } from "@mantine/hooks"; +import { IconPlus, IconSearch, IconMessageCircle2 } from "@tabler/icons-react"; +import { useTranslation } from "react-i18next"; +import { + useChatsQuery, + useDeleteChatMutation, + useUpdateChatTitleMutation, + useSearchChatsQuery, +} from "../queries/ai-chat-query"; +import AiChatSidebarItem from "./ai-chat-sidebar-item"; +import type { AiChat } from "../types/ai-chat.types"; +import classes from "../styles/chat-sidebar.module.css"; + +type ChatGroup = { key: string; label: string; chats: AiChat[] }; + +function groupChatsByAge( + chats: AiChat[], + t: (key: string) => string, +): ChatGroup[] { + if (chats.length === 0) return []; + + const now = new Date(); + const startOfToday = new Date( + now.getFullYear(), + now.getMonth(), + now.getDate(), + ).getTime(); + const startOfYesterday = startOfToday - 24 * 60 * 60 * 1000; + const startOfLast7 = startOfToday - 7 * 24 * 60 * 60 * 1000; + const startOfLast30 = startOfToday - 30 * 24 * 60 * 60 * 1000; + + const buckets: Record = { + today: { key: "today", label: t("Today"), chats: [] }, + yesterday: { key: "yesterday", label: t("Yesterday"), chats: [] }, + last7: { key: "last7", label: t("Previous 7 days"), chats: [] }, + last30: { key: "last30", label: t("Previous 30 days"), chats: [] }, + older: { key: "older", label: t("Older"), chats: [] }, + }; + + for (const chat of chats) { + const ts = new Date(chat.updatedAt).getTime(); + if (ts >= startOfToday) buckets.today.chats.push(chat); + else if (ts >= startOfYesterday) buckets.yesterday.chats.push(chat); + else if (ts >= startOfLast7) buckets.last7.chats.push(chat); + else if (ts >= startOfLast30) buckets.last30.chats.push(chat); + else buckets.older.chats.push(chat); + } + + return [ + buckets.today, + buckets.yesterday, + buckets.last7, + buckets.last30, + buckets.older, + ].filter((b) => b.chats.length > 0); +} + +export default function AiChatSidebar() { + const { t } = useTranslation(); + const navigate = useNavigate(); + const { chatId } = useParams<{ chatId: string }>(); + const [search, setSearch] = useState(""); + const [debouncedSearch] = useDebouncedValue(search, 300); + const chatsQuery = useChatsQuery(); + const searchQuery = useSearchChatsQuery(debouncedSearch); + const deleteMutation = useDeleteChatMutation(); + const renameMutation = useUpdateChatTitleMutation(); + + const chats = useMemo(() => { + if (debouncedSearch) { + return searchQuery.data || []; + } + return chatsQuery.data?.pages.flatMap((p) => p.items) || []; + }, [debouncedSearch, searchQuery.data, chatsQuery.data]); + + const groupedChats = useMemo(() => groupChatsByAge(chats, t), [chats, t]); + + const sentinelRef = useRef(null); + const { hasNextPage, fetchNextPage, isFetchingNextPage } = chatsQuery; + const isSearching = Boolean(debouncedSearch); + + useEffect(() => { + if (isSearching) return; + const sentinel = sentinelRef.current; + if (!sentinel) return; + + const observer = new IntersectionObserver( + (entries) => { + if (entries[0].isIntersecting && hasNextPage && !isFetchingNextPage) { + fetchNextPage(); + } + }, + { threshold: 0.1 }, + ); + + observer.observe(sentinel); + return () => observer.disconnect(); + }, [isSearching, hasNextPage, isFetchingNextPage, fetchNextPage]); + + const handleNewChat = useCallback( + (event: React.MouseEvent) => { + if ( + event.button !== 0 || + event.ctrlKey || + event.metaKey || + event.shiftKey + ) { + return; + } + event.preventDefault(); + navigate("/ai"); + }, + [navigate], + ); + + const handleDelete = useCallback( + (id: string) => { + deleteMutation.mutate(id, { + onSuccess: () => { + if (chatId === id) { + navigate("/ai"); + } + }, + }); + }, + [deleteMutation, chatId, navigate], + ); + + const handleRename = useCallback( + (chatId: string, title: string) => { + renameMutation.mutate({ chatId, title }); + }, + [renameMutation], + ); + + const isLoading = chatsQuery.isLoading || searchQuery.isLoading; + + return ( +
+
+ {t("AI Chat")} + + + + + +
+ + } + size="xs" + value={search} + onChange={(e) => setSearch(e.currentTarget.value)} + /> + +
+ {isLoading && } + {!isLoading && chats.length === 0 && ( +
+ +
+ {isSearching ? t("No chats found") : t("No conversations yet")} +
+
+ {isSearching + ? t("Try a different search term.") + : t("Start a new chat to see it here.")} +
+
+ )} + {isSearching + ? chats.map((chat) => ( + + )) + : groupedChats.map((group) => ( +
+
{group.label}
+ {group.chats.map((chat) => ( + + ))} +
+ ))} + {!isSearching && ( + <> +
+ {isFetchingNextPage && ( +
+ +
+ )} + + )} +
+
+ ); +} diff --git a/apps/client/src/ee/ai-chat/components/aside-chat-history.tsx b/apps/client/src/ee/ai-chat/components/aside-chat-history.tsx new file mode 100644 index 00000000..c31e5b10 --- /dev/null +++ b/apps/client/src/ee/ai-chat/components/aside-chat-history.tsx @@ -0,0 +1,67 @@ +import { useState } from "react"; +import { TextInput, Loader, Text, ScrollArea } from "@mantine/core"; +import { IconSearch } from "@tabler/icons-react"; +import { useChatsQuery, useSearchChatsQuery } from "../queries/ai-chat-query"; +import { useDebouncedValue } from "@mantine/hooks"; +import { useTranslation } from "react-i18next"; +import classes from "../styles/aside-chat-panel.module.css"; + +type Props = { + activeChatId: string | undefined; + onSelect: (chatId: string) => void; +}; + +export default function AsideChatHistory({ activeChatId, onSelect }: Props) { + const { t } = useTranslation(); + const [searchValue, setSearchValue] = useState(""); + const [debouncedSearch] = useDebouncedValue(searchValue, 300); + + const chatsQuery = useChatsQuery(); + const searchQuery = useSearchChatsQuery(debouncedSearch); + + const isSearching = debouncedSearch.length > 0; + const chats = isSearching + ? (searchQuery.data ?? []) + : (chatsQuery.data?.pages.flatMap((p) => p.items) ?? []); + const isLoading = isSearching ? searchQuery.isLoading : chatsQuery.isLoading; + + return ( +
+ } + size="xs" + mb="xs" + value={searchValue} + onChange={(e) => setSearchValue(e.currentTarget.value)} + /> + + {isLoading ? ( +
+ +
+ ) : chats.length === 0 ? ( + + {isSearching ? t("No chats found") : t("No chat history")} + + ) : ( + +
+ {chats.map((chat) => ( +
onSelect(chat.id)} + > + + {chat.title || t("Untitled chat")} + +
+ ))} +
+
+ )} +
+ ); +} diff --git a/apps/client/src/ee/ai-chat/components/aside-chat-panel.tsx b/apps/client/src/ee/ai-chat/components/aside-chat-panel.tsx new file mode 100644 index 00000000..bd2b9569 --- /dev/null +++ b/apps/client/src/ee/ai-chat/components/aside-chat-panel.tsx @@ -0,0 +1,258 @@ +import { useState, useEffect, useCallback } from "react"; +import { ActionIcon, Popover, Tooltip, UnstyledButton } from "@mantine/core"; +import { + IconPlus, + IconChevronDown, + IconArrowsDiagonal, + IconX, + IconSparkles, + IconFileText, + IconLanguage, + IconSearch, +} from "@tabler/icons-react"; +import { useAtom } from "jotai"; +import { useNavigate, useParams } from "react-router-dom"; +import { useTranslation } from "react-i18next"; +import { asideStateAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom"; +import { usePageQuery } from "@/features/page/queries/page-query"; +import { extractPageSlugId } from "@/lib"; +import { useChatStream } from "../hooks/use-chat-stream"; +import { useChatInfoQuery } from "../queries/ai-chat-query"; +import ChatMessageList from "./chat-message-list"; +import ChatInput from "./chat-input"; +import AsideChatHistory from "./aside-chat-history"; +import type { ChatAttachment, PageMention } from "../types/ai-chat.types"; +import classes from "../styles/aside-chat-panel.module.css"; + +type QuickAction = { + icon: React.ReactNode; + label: string; + prompt: string; +}; + +export default function AsideChatPanel() { + const { t } = useTranslation(); + const navigate = useNavigate(); + const [, setAsideState] = useAtom(asideStateAtom); + const [chatId, setChatId] = useState(undefined); + const [historyOpen, setHistoryOpen] = useState(false); + const [contextPages, setContextPages] = useState([]); + const { pageSlug } = useParams(); + const slugId = extractPageSlugId(pageSlug); + const { data: page } = usePageQuery({ pageId: slugId }); + + const chatInfoQuery = useChatInfoQuery(chatId); + const { + messages, + streamingContent, + streamingToolCalls, + isStreaming, + error, + sendMessage, + stopGeneration, + hydrateFromServer, + } = useChatStream(chatId, { + onChatCreated: (newChatId) => { + setChatId(newChatId); + }, + }); + + useEffect(() => { + if (page && !chatId) { + setContextPages([{ id: page.id, title: page.title || "", slugId: page.slugId }]); + } + }, [page, chatId]); + + const handleRemoveContextPage = useCallback((pageId: string) => { + setContextPages((prev) => prev.filter((p) => p.id !== pageId)); + }, []); + + useEffect(() => { + if (chatInfoQuery.data?.messages) { + hydrateFromServer(chatInfoQuery.data.messages); + } + }, [chatInfoQuery.data, hydrateFromServer]); + + // Drop the open chatId if the current user lost access to it (404/403 on + // the info fetch). Reverts the panel to a fresh chat instead of presenting + // an input tied to a chat the user does not own. + useEffect(() => { + if (chatId && chatInfoQuery.isError) { + setChatId(undefined); + } + }, [chatId, chatInfoQuery.isError]); + + const handleNewChat = useCallback( + (event: React.MouseEvent) => { + if ( + event.button !== 0 || + event.ctrlKey || + event.metaKey || + event.shiftKey + ) { + return; + } + event.preventDefault(); + setChatId(undefined); + if (page) { + setContextPages([ + { id: page.id, title: page.title || "", slugId: page.slugId }, + ]); + } + }, + [page], + ); + + const handleSelectChat = useCallback((selectedChatId: string) => { + setChatId(selectedChatId); + setHistoryOpen(false); + }, []); + + const handleExpand = useCallback(() => { + if (chatId) { + navigate(`/ai/chat/${chatId}`); + } else { + navigate("/ai"); + } + setAsideState({ tab: "", isAsideOpen: false }); + }, [chatId, navigate, setAsideState]); + + const handleClose = useCallback(() => { + setAsideState({ tab: "", isAsideOpen: false }); + }, [setAsideState]); + + const handleSend = useCallback( + (content: string, mentions: PageMention[], attachments: ChatAttachment[]) => { + const contextPageId = contextPages.length > 0 ? contextPages[0].id : undefined; + sendMessage(content, mentions, attachments, contextPageId); + }, + [sendMessage, contextPages], + ); + + const handleQuickAction = useCallback( + (prompt: string) => { + handleSend(prompt, [], []); + }, + [handleSend], + ); + + const hasMessages = messages.length > 0 || isStreaming; + + const quickActions: QuickAction[] = [ + { icon: , label: t("Summarize this page"), prompt: "Summarize this page" }, + { icon: , label: t("Translate this page"), prompt: "Translate this page" }, + { icon: , label: t("Analyze for insights"), prompt: "Analyze this page for insights" }, + ]; + + return ( +
+
+ + + setHistoryOpen((o) => !o)} + > + + {chatInfoQuery.data?.chat?.title || t("New chat")} + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + {error && ( +
+ {error} +
+ )} + + {hasMessages ? ( + <> +
+ +
+ + ) : ( +
+ +
{t("How can I help you today?")}
+
+ {quickActions.map((action) => ( + + ))} +
+
+ )} + +
+ +
+
+ ); +} diff --git a/apps/client/src/ee/ai-chat/components/chat-empty-state.tsx b/apps/client/src/ee/ai-chat/components/chat-empty-state.tsx new file mode 100644 index 00000000..d7bacf18 --- /dev/null +++ b/apps/client/src/ee/ai-chat/components/chat-empty-state.tsx @@ -0,0 +1,91 @@ +import { + IconSparkles, + IconSearch, + IconFilePlus, + IconEdit, + IconFileText, +} from "@tabler/icons-react"; +import { useTranslation } from "react-i18next"; +import ChatInput from "./chat-input"; +import type { ChatAttachment, PageMention } from "../types/ai-chat.types"; +import classes from "../styles/ai-chat.module.css"; + +type Suggestion = { + icon: React.ReactNode; + text: string; + prompt: string; +}; + +const SUGGESTIONS: Suggestion[] = [ + { + icon: , + text: "Search across all pages", + prompt: "Search for pages about ", + }, + { + icon: , + text: "Create a new page", + prompt: "Create a new page titled ", + }, + { + icon: , + text: "Summarize a page", + prompt: "Summarize the page @", + }, + { + icon: , + text: "Update page content", + prompt: "Update the page @", + }, +]; + +type Props = { + isStreaming: boolean; + onSend: (content: string, mentions: PageMention[], attachments: ChatAttachment[]) => void; + onStop: () => void; +}; + +export default function ChatEmptyState({ isStreaming, onSend, onStop }: Props) { + const { t } = useTranslation(); + + const handleSuggestionClick = (prompt: string) => { + onSend(prompt, [], []); + }; + + return ( +
+ +
{t("Docmost AI")}
+
+ {t("What can I help you with?")} +
+ +
+ +
+ +
+
Get started
+
+ {SUGGESTIONS.map((s) => ( + + ))} +
+
+
+ ); +} diff --git a/apps/client/src/ee/ai-chat/components/chat-input.tsx b/apps/client/src/ee/ai-chat/components/chat-input.tsx new file mode 100644 index 00000000..d003adfb --- /dev/null +++ b/apps/client/src/ee/ai-chat/components/chat-input.tsx @@ -0,0 +1,409 @@ +import { useCallback, useRef, useEffect, useState } from "react"; +import { useTranslation } from "react-i18next"; +import { IconArrowUp, IconPaperclip, IconPlayerStopFilled, IconX, IconFile, IconPhoto, IconPlus, IconAt, IconFileText } from "@tabler/icons-react"; +import { Popover } from "@mantine/core"; +import { notifications } from "@mantine/notifications"; +import { EditorContent, ReactNodeViewRenderer, useEditor } from "@tiptap/react"; +import { Placeholder } from "@tiptap/extension-placeholder"; +import { CharacterCount } from "@tiptap/extensions"; +import { StarterKit } from "@tiptap/starter-kit"; +import { Mention, LinkExtension } from "@docmost/editor-ext"; +import EmojiCommand from "@/features/editor/extensions/emoji-command"; +import mentionRenderItems from "@/features/editor/components/mention/mention-suggestion"; +import MentionView from "@/features/editor/components/mention/mention-view"; +import { uploadChatFile } from "../services/ai-chat-service"; +import type { ChatAttachment, PageMention } from "../types/ai-chat.types"; +import classes from "../styles/chat-input.module.css"; + +type PendingAttachment = ChatAttachment & { uploading: boolean }; + +const IMAGE_EXTENSIONS = ["png", "jpg", "jpeg", "webp", "gif"]; +const ACCEPTED_FILE_TYPES = ".pdf,.docx,.txt,.csv,.md,.png,.jpg,.jpeg,.webp"; +// Kept in sync with MAX_ATTACHMENTS_PER_MESSAGE in apps/server/src/ee/ai-chat/ai-chat-limits.ts +const MAX_ATTACHMENTS_PER_MESSAGE = 5; + +type Props = { + isStreaming: boolean; + onSend: (content: string, mentions: PageMention[], attachments: ChatAttachment[]) => void; + onStop: () => void; + placeholder?: string; + autofocus?: boolean; + contextPages?: PageMention[]; + onRemoveContextPage?: (pageId: string) => void; + variant?: "card" | "flat"; + showDisclaimer?: boolean; + chatId?: string; +}; + +function extractMentions(json: any): PageMention[] { + const mentions: PageMention[] = []; + const seen = new Set(); + + function walk(node: any) { + if (node.type === "mention" && node.attrs?.entityType === "page" && node.attrs?.entityId) { + if (!seen.has(node.attrs.entityId)) { + seen.add(node.attrs.entityId); + mentions.push({ + id: node.attrs.entityId, + title: node.attrs.label || "", + slugId: node.attrs.slugId || "", + }); + } + } + if (node.content) { + for (const child of node.content) { + walk(child); + } + } + } + + walk(json); + return mentions; +} + +function editorJsonToText(json: any): string { + let text = ""; + + function walk(node: any) { + if (node.type === "text") { + text += node.text || ""; + } else if (node.type === "mention") { + text += `@${node.attrs?.label || ""}`; + } else if (node.type === "paragraph") { + if (text.length > 0) text += "\n"; + if (node.content) { + for (const child of node.content) { + walk(child); + } + } + return; + } + if (node.content) { + for (const child of node.content) { + walk(child); + } + } + } + + walk(json); + return text; +} + +export default function ChatInput({ + isStreaming, + onSend, + onStop, + placeholder, + autofocus = true, + contextPages, + onRemoveContextPage, + variant = "card", + showDisclaimer = true, + chatId, +}: Props) { + const chatIdRef = useRef(chatId); + chatIdRef.current = chatId; + const { t } = useTranslation(); + const [isEmpty, setIsEmpty] = useState(true); + const [pendingAttachments, setPendingAttachments] = useState([]); + const [plusMenuOpen, setPlusMenuOpen] = useState(false); + const fileInputRef = useRef(null); + const onSendRef = useRef(onSend); + onSendRef.current = onSend; + + const handleFileSelect = useCallback(async (files: FileList | null) => { + if (!files?.length) return; + + const room = MAX_ATTACHMENTS_PER_MESSAGE - pendingAttachments.length; + if (room <= 0) { + notifications.show({ + color: "yellow", + message: t("You can attach up to {{max}} files per message.", { + max: MAX_ATTACHMENTS_PER_MESSAGE, + }), + }); + if (fileInputRef.current) fileInputRef.current.value = ""; + return; + } + + const incoming = Array.from(files); + const accepted = incoming.slice(0, room); + + if (incoming.length > accepted.length) { + notifications.show({ + color: "yellow", + message: t( + "Only the first {{n}} file(s) were added (max {{max}} per message).", + { n: accepted.length, max: MAX_ATTACHMENTS_PER_MESSAGE }, + ), + }); + } + + for (const file of accepted) { + const tempId = `uploading-${Date.now()}-${Math.random()}`; + const ext = file.name.split(".").pop()?.toLowerCase() || ""; + + const placeholder: PendingAttachment = { + id: tempId, + fileName: file.name, + fileExt: ext, + fileSize: file.size, + mimeType: file.type, + uploading: true, + }; + + setPendingAttachments((prev) => [...prev, placeholder]); + + try { + const uploaded = await uploadChatFile(file, chatIdRef.current); + setPendingAttachments((prev) => + prev.map((a) => + a.id === tempId ? { ...uploaded, uploading: false } : a, + ), + ); + } catch { + setPendingAttachments((prev) => prev.filter((a) => a.id !== tempId)); + } + } + + if (fileInputRef.current) { + fileInputRef.current.value = ""; + } + }, [pendingAttachments.length, t]); + + const removeAttachment = useCallback((id: string) => { + setPendingAttachments((prev) => prev.filter((a) => a.id !== id)); + }, []); + + const handleSubmit = useCallback(() => { + if (!editor || isStreaming) return; + const json = editor.getJSON(); + const text = editorJsonToText(json).trim(); + const readyAttachments = pendingAttachments.filter((a) => !a.uploading); + if (!text && readyAttachments.length === 0) return; + + const mentions = extractMentions(json); + onSendRef.current(text, mentions, readyAttachments); + editor.commands.clearContent(); + editor.commands.focus(); + setPendingAttachments([]); + }, [isStreaming, pendingAttachments]); + + const handleSubmitRef = useRef(handleSubmit); + handleSubmitRef.current = handleSubmit; + + const editor = useEditor({ + extensions: [ + StarterKit.configure({ + gapcursor: false, + dropcursor: false, + link: false, + }), + Placeholder.configure({ + placeholder: placeholder || "Ask anything... Use @ to mention pages", + }), + CharacterCount.configure({ + limit: 50000, + }), + LinkExtension, + EmojiCommand, + Mention.configure({ + suggestion: { + allowSpaces: true, + items: () => [], + // @ts-ignore + render: mentionRenderItems, + }, + HTMLAttributes: { + class: "mention", + }, + }).extend({ + addNodeView() { + this.editor.isInitialized = true; + return ReactNodeViewRenderer(MentionView); + }, + }), + ], + editorProps: { + handleDOMEvents: { + keydown: (_view, event) => { + if ( + ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"].includes( + event.key, + ) + ) { + const emojiCommand = document.querySelector("#emoji-command"); + const mentionPopup = document.querySelector("#mention"); + if (emojiCommand || mentionPopup) { + return true; + } + } + + if (event.key === "Enter" && !event.shiftKey) { + event.preventDefault(); + handleSubmitRef.current(); + return true; + } + }, + }, + }, + content: "", + editable: true, + immediatelyRender: true, + shouldRerenderOnTransaction: false, + autofocus: autofocus ? "end" : false, + onUpdate: ({ editor: e }) => { + setIsEmpty(!e.getText().trim()); + }, + }); + + useEffect(() => { + if (editor && autofocus) { + editor.commands.focus(); + } + }, [editor]); + + const hasContent = !isEmpty || pendingAttachments.some((a) => !a.uploading) || (contextPages?.length ?? 0) > 0; + + const wrapperClass = variant === "flat" ? classes.inputWrapperFlat : classes.inputWrapper; + + return ( + <> +
+ handleFileSelect(e.target.files)} + /> + + {((contextPages?.length ?? 0) > 0 || pendingAttachments.length > 0) && ( +
+ {contextPages?.map((page) => ( +
+ + + {page.title || "Untitled"} + + {onRemoveContextPage && ( + + )} +
+ ))} + {pendingAttachments.map((attachment) => ( +
+ {IMAGE_EXTENSIONS.includes(attachment.fileExt) ? ( + + ) : ( + + )} + + {attachment.fileName} + + {!attachment.uploading && ( + + )} +
+ ))} +
+ )} + + +
+ + + + + + + + + + +
+ + {isStreaming ? ( + + ) : ( + + )} +
+
+ {showDisclaimer && ( +
+ {t("AI-generated content may not be accurate.")} +
+ )} + + ); +} diff --git a/apps/client/src/ee/ai-chat/components/chat-message-list.tsx b/apps/client/src/ee/ai-chat/components/chat-message-list.tsx new file mode 100644 index 00000000..3a6fffef --- /dev/null +++ b/apps/client/src/ee/ai-chat/components/chat-message-list.tsx @@ -0,0 +1,174 @@ +import { useEffect, useRef, useCallback, useState } from "react"; +import { ErrorBoundary } from "react-error-boundary"; +import { IconArrowDown, IconAlertTriangle } from "@tabler/icons-react"; +import { useTranslation } from "react-i18next"; +import type { AiChatMessage, AiChatToolCall } from "../types/ai-chat.types"; +import ChatMessage from "./chat-message"; +import classes from "../styles/ai-chat.module.css"; + +function ChatMessageErrorFallback() { + const { t } = useTranslation(); + return ( +
+ + {t("Failed to render this message.")} +
+ ); +} + +type Props = { + messages: AiChatMessage[]; + isStreaming: boolean; + streamingContent: string; + streamingToolCalls: AiChatToolCall[]; +}; + +const BOTTOM_THRESHOLD_PX = 32; +const SCROLL_UP_THRESHOLD_PX = 5; +const SMOOTH_SCROLL_SETTLE_MS = 600; + +export default function ChatMessageList({ + messages, + isStreaming, + streamingContent, + streamingToolCalls, +}: Props) { + const containerRef = useRef(null); + const bottomRef = useRef(null); + const isAtBottomRef = useRef(true); + const isAutoScrollingRef = useRef(false); + const prevScrollTopRef = useRef(0); + const [showScrollButton, setShowScrollButton] = useState(false); + + const scrollToBottom = useCallback((behavior: ScrollBehavior = "smooth") => { + const container = containerRef.current; + if (!container) return; + + isAutoScrollingRef.current = true; + const target = container.scrollHeight - container.clientHeight; + container.scrollTo({ top: target, behavior }); + prevScrollTopRef.current = target; + isAtBottomRef.current = true; + setShowScrollButton(false); + + if (behavior === "smooth") { + setTimeout(() => { + isAutoScrollingRef.current = false; + if (containerRef.current) { + prevScrollTopRef.current = containerRef.current.scrollTop; + } + }, SMOOTH_SCROLL_SETTLE_MS); + } else { + isAutoScrollingRef.current = false; + } + }, []); + + const handleScroll = useCallback(() => { + if (isAutoScrollingRef.current) return; + + const container = containerRef.current; + if (!container) return; + + const currentScrollTop = container.scrollTop; + const scrolledUp = + currentScrollTop < prevScrollTopRef.current - SCROLL_UP_THRESHOLD_PX; + prevScrollTopRef.current = currentScrollTop; + + const distanceFromBottom = + container.scrollHeight - currentScrollTop - container.clientHeight; + const atBottom = distanceFromBottom <= BOTTOM_THRESHOLD_PX; + + if (scrolledUp) { + isAtBottomRef.current = atBottom; + } else if (atBottom) { + isAtBottomRef.current = true; + } + + setShowScrollButton(!atBottom); + }, []); + + useEffect(() => { + const container = containerRef.current; + if (!container) return; + + container.addEventListener("scroll", handleScroll, { passive: true }); + return () => container.removeEventListener("scroll", handleScroll); + }, [handleScroll]); + + // Instant scroll during streaming to keep up with rapid updates + useEffect(() => { + if (isAtBottomRef.current) { + scrollToBottom("instant"); + } + }, [streamingContent, streamingToolCalls.length, scrollToBottom]); + + // Smooth scroll for new messages. Always force-scroll when the latest + // message is from the user (they just sent it), even if they were reading + // scrollback. + useEffect(() => { + const lastMessage = messages[messages.length - 1]; + const lastIsUser = lastMessage?.role === "user"; + if (lastIsUser || isAtBottomRef.current) { + scrollToBottom("smooth"); + return; + } + + // No auto-scroll: recompute from actual layout so that chat switches to + // content that doesn't overflow correctly hide the button even when no + // scroll event fires. + const container = containerRef.current; + if (!container) return; + const distanceFromBottom = + container.scrollHeight - container.scrollTop - container.clientHeight; + const atBottom = distanceFromBottom <= BOTTOM_THRESHOLD_PX; + isAtBottomRef.current = atBottom; + setShowScrollButton(!atBottom); + }, [messages, scrollToBottom]); + + return ( +
+
+ {messages.map((msg) => ( + } + > + + + ))} + {isStreaming && ( + } + > + + + )} +
+
+ {showScrollButton && ( + + )} +
+ ); +} diff --git a/apps/client/src/ee/ai-chat/components/chat-message.tsx b/apps/client/src/ee/ai-chat/components/chat-message.tsx new file mode 100644 index 00000000..d0e9443a --- /dev/null +++ b/apps/client/src/ee/ai-chat/components/chat-message.tsx @@ -0,0 +1,139 @@ +import { useCallback } from "react"; +import { useNavigate } from "react-router"; +import DOMPurify from "dompurify"; +import { ActionIcon, Tooltip } from "@mantine/core"; +import { + IconCheck, + IconCopy, + IconFile, + IconLoader2, + IconPhoto, +} from "@tabler/icons-react"; +import { markdownToHtml } from "@docmost/editor-ext"; +import { CopyButton } from "@/components/common/copy-button"; +import type { AiChatMessage, AiChatToolCall } from "../types/ai-chat.types"; +import ChatToolGroup from "./chat-tool-group"; +import classes from "../styles/chat-message.module.css"; +import CopyTextButton from "@/components/common/copy.tsx"; + +const chatSanitizer = DOMPurify(); +chatSanitizer.addHook("afterSanitizeAttributes", (node) => { + if (node.tagName === "A") { + const href = node.getAttribute("href") || ""; + if (href.startsWith("http://") || href.startsWith("https://")) { + node.setAttribute("target", "_blank"); + node.setAttribute("rel", "noopener noreferrer"); + } + } +}); + +const IMAGE_EXTENSIONS = ["png", "jpg", "jpeg", "webp", "gif"]; + +type Props = { + message: AiChatMessage; + isStreaming?: boolean; + streamingContent?: string; + streamingToolCalls?: AiChatToolCall[]; +}; + +export default function ChatMessage({ + message, + isStreaming, + streamingContent, + streamingToolCalls, +}: Props) { + const navigate = useNavigate(); + + const handleContentClick = useCallback( + (e: React.MouseEvent) => { + const target = e.target as HTMLElement; + const anchor = target.closest("a"); + if (!anchor) return; + + const href = anchor.getAttribute("href"); + if (href && (href.startsWith("/s/") || href.startsWith("/p/"))) { + e.preventDefault(); + navigate(href); + } + }, + [navigate], + ); + + if (message.role === "tool") return null; + + const isUser = message.role === "user"; + const content = isStreaming ? streamingContent : message.content; + const toolCalls = isStreaming ? streamingToolCalls : message.toolCalls; + + if (isUser) { + const displayContent = (content || "").replace( + /\n\n[\s\S]*<\/referenced_pages>$/, + "", + ); + const attachments = + (message.metadata?.attachments as { + id: string; + fileName: string; + fileExt: string; + }[]) || []; + + return ( +
+
+ {attachments.length > 0 && ( +
+ {attachments.map((a) => ( + + {IMAGE_EXTENSIONS.includes(a.fileExt) ? ( + + ) : ( + + )} + {a.fileName} + + ))} +
+ )} + {displayContent} +
+
+ ); + } + + return ( +
+
+ {toolCalls && toolCalls.length > 0 && ( + + )} + {content && ( +
+ )} + {isStreaming && ( + <> + {!content && ( + + + Thinking + + )} + + + )} +
+ {!isStreaming && message.content && ( +
+ +
+ )} +
+ ); +} diff --git a/apps/client/src/ee/ai-chat/components/chat-tool-group.tsx b/apps/client/src/ee/ai-chat/components/chat-tool-group.tsx new file mode 100644 index 00000000..b4e002f6 --- /dev/null +++ b/apps/client/src/ee/ai-chat/components/chat-tool-group.tsx @@ -0,0 +1,56 @@ +import { useState } from "react"; +import { + IconChevronRight, + IconChevronDown, + IconLoader2, +} from "@tabler/icons-react"; +import type { AiChatToolCall } from "../types/ai-chat.types"; +import ChatToolResult, { TOOL_LABELS } from "./chat-tool-result"; +import classes from "../styles/chat-message.module.css"; + +type Props = { + toolCalls: AiChatToolCall[]; + isStreaming?: boolean; +}; + +export default function ChatToolGroup({ toolCalls, isStreaming }: Props) { + const [expanded, setExpanded] = useState(false); + + if (!toolCalls || toolCalls.length === 0) return null; + + const activeCall = + isStreaming && toolCalls.length > 0 + ? [...toolCalls].reverse().find((tc) => tc.result === undefined) + : undefined; + + const activeLabel = activeCall + ? TOOL_LABELS[activeCall.name] || activeCall.name + : null; + + return ( +
+
setExpanded((prev) => !prev)} + > + {activeLabel ? ( + + ) : expanded ? ( + + ) : ( + + )} + + {activeLabel ? `${activeLabel}…` : `Steps ${toolCalls.length}`} + +
+ {expanded && ( +
+ {toolCalls.map((tc) => ( + + ))} +
+ )} +
+ ); +} diff --git a/apps/client/src/ee/ai-chat/components/chat-tool-result.tsx b/apps/client/src/ee/ai-chat/components/chat-tool-result.tsx new file mode 100644 index 00000000..55f20f91 --- /dev/null +++ b/apps/client/src/ee/ai-chat/components/chat-tool-result.tsx @@ -0,0 +1,49 @@ +import { useState } from "react"; +import { IconChevronRight, IconChevronDown } from "@tabler/icons-react"; +import type { AiChatToolCall } from "../types/ai-chat.types"; +import classes from "../styles/chat-message.module.css"; + +export const TOOL_LABELS: Record = { + list_spaces: "Listed spaces", + search_pages: "Searched pages", + get_page: "Read page", + create_page: "Created page", + update_page: "Updated page", +}; + +type Props = { + toolCall: AiChatToolCall; +}; + +export default function ChatToolResult({ toolCall }: Props) { + const [expanded, setExpanded] = useState(false); + const label = TOOL_LABELS[toolCall.name] || toolCall.name; + + return ( +
+
setExpanded((prev) => !prev)} + > + · + {expanded ? ( + + ) : ( + + )} + {label} +
+ {expanded && ( +
+
+            {JSON.stringify(
+              { args: toolCall.args, result: toolCall.result },
+              null,
+              2,
+            )}
+          
+
+ )} +
+ ); +} diff --git a/apps/client/src/ee/ai-chat/components/enable-ai-chat.tsx b/apps/client/src/ee/ai-chat/components/enable-ai-chat.tsx new file mode 100644 index 00000000..f4200e5b --- /dev/null +++ b/apps/client/src/ee/ai-chat/components/enable-ai-chat.tsx @@ -0,0 +1,67 @@ +import { Badge, Group, Text, Switch, Tooltip } from "@mantine/core"; +import { useAtom } from "jotai"; +import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts"; +import { useState } from "react"; +import { useTranslation } from "react-i18next"; +import { updateWorkspace } from "@/features/workspace/services/workspace-service.ts"; +import { notifications } from "@mantine/notifications"; +import { useHasFeature } from "@/ee/hooks/use-feature"; +import { Feature } from "@/ee/features"; +import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label"; + +export default function EnableAiChat() { + const { t } = useTranslation(); + + return ( + +
+ + {t("AI Chat")} + + {t("Beta")} + + + + {t( + "Enable AI Chat to allow users to have multi-turn conversations with AI about your workspace content.", + )} + +
+ + +
+ ); +} + +function AiChatToggle() { + const { t } = useTranslation(); + const [workspace, setWorkspace] = useAtom(workspaceAtom); + const [checked, setChecked] = useState(workspace?.settings?.ai?.chat); + const hasAccess = useHasFeature(Feature.AI); + const upgradeLabel = useUpgradeLabel(); + + const handleChange = async (event: React.ChangeEvent) => { + const value = event.currentTarget.checked; + try { + const updatedWorkspace = await updateWorkspace({ aiChat: value } as any); + setChecked(value); + setWorkspace(updatedWorkspace); + } catch (err: any) { + notifications.show({ + message: err?.response?.data?.message, + color: "red", + }); + } + }; + + return ( + + + + ); +} diff --git a/apps/client/src/ee/ai-chat/hooks/use-chat-stream.ts b/apps/client/src/ee/ai-chat/hooks/use-chat-stream.ts new file mode 100644 index 00000000..65a93a97 --- /dev/null +++ b/apps/client/src/ee/ai-chat/hooks/use-chat-stream.ts @@ -0,0 +1,227 @@ +import { useState, useCallback, useEffect, useRef } from "react"; +import { useQueryClient } from "@tanstack/react-query"; +import { useNavigate } from "react-router-dom"; +import { sendChatMessage } from "../services/ai-chat-service"; +import type { + AiChatMessage, + AiChatStreamEvent, + AiChatToolCall, + ChatAttachment, + PageMention, +} from "../types/ai-chat.types"; + +type ChatStreamOptions = { + onChatCreated?: (chatId: string) => void; +}; + +export function useChatStream( + chatId: string | undefined, + options?: ChatStreamOptions, +) { + const [messages, setMessages] = useState([]); + const [streamingContent, setStreamingContent] = useState(""); + const [streamingToolCalls, setStreamingToolCalls] = useState( + [], + ); + const [isStreaming, setIsStreaming] = useState(false); + const [error, setError] = useState(null); + const [errorCode, setErrorCode] = useState(null); + const [isRetryable, setIsRetryable] = useState(false); + const abortRef = useRef(null); + const queryClient = useQueryClient(); + const navigate = useNavigate(); + const currentChatIdRef = useRef(chatId); + currentChatIdRef.current = chatId; + // Tracks which chatId the local `messages` state currently represents. + // Set when we seed from a server fetch AND when we optimistically own a + // freshly-created chat after `chat_created`. This is the single authority + // marker that keeps server-state effects from clobbering in-flight streams. + const hydratedChatIdRef = useRef(undefined); + + // Reset local state when the consumer switches to a different chat. + // Skip the reset if the new chatId is one the hook itself already claimed + // during a new-chat flow — in that case our optimistic state is the truth. + useEffect(() => { + if (chatId && chatId === hydratedChatIdRef.current) return; + hydratedChatIdRef.current = undefined; + setMessages([]); + setError(null); + setErrorCode(null); + setIsRetryable(false); + }, [chatId]); + + const hydrateFromServer = useCallback((msgs: AiChatMessage[]) => { + const forId = currentChatIdRef.current; + if (!forId) return; + if (hydratedChatIdRef.current === forId) return; + hydratedChatIdRef.current = forId; + setMessages(msgs); + }, []); + + const sendMessage = useCallback( + (content: string, mentions: PageMention[] = [], attachments: ChatAttachment[] = [], contextPageId?: string) => { + if (isStreaming || (!content.trim() && attachments.length === 0)) return; + + setError(null); + setErrorCode(null); + setIsRetryable(false); + setIsStreaming(true); + setStreamingContent(""); + setStreamingToolCalls([]); + + const metadata: Record = {}; + if (mentions.length) { + metadata.mentionedPageIds = mentions.map((m) => m.id); + } + if (attachments.length) { + metadata.attachments = attachments.map((a) => ({ + id: a.id, + fileName: a.fileName, + fileExt: a.fileExt, + })); + } + + const userMessage: AiChatMessage = { + id: `temp-${Date.now()}`, + chatId: currentChatIdRef.current || "", + role: "user", + content, + toolCalls: null, + metadata: Object.keys(metadata).length ? metadata : null, + createdAt: new Date().toISOString(), + }; + + setMessages((prev) => [...prev, userMessage]); + + const attachmentIds = attachments.map((a) => a.id); + + const abortController = sendChatMessage( + { + chatId: currentChatIdRef.current, + content, + mentionedPageIds: mentions.map((m) => m.id), + ...(contextPageId && { contextPageId }), + ...(attachmentIds.length && { attachmentIds }), + }, + (event: AiChatStreamEvent) => { + switch (event.type) { + case "chat_created": + currentChatIdRef.current = event.chatId; + // Claim authority over this new chatId so when the consumer's + // prop catches up via navigation/onChatCreated, the reset effect + // sees a match and preserves our optimistic messages. + hydratedChatIdRef.current = event.chatId; + if (options?.onChatCreated) { + options.onChatCreated(event.chatId); + } else { + navigate(`/ai/chat/${event.chatId}`, { replace: true }); + } + queryClient.invalidateQueries({ queryKey: ["ai-chats"] }); + break; + case "content": + setStreamingContent((prev) => prev + event.text); + break; + case "tool_call": + setStreamingToolCalls((prev) => [ + ...prev, + { + id: event.id, + name: event.name, + args: event.args, + }, + ]); + break; + case "tool_result": + setStreamingToolCalls((prev) => + prev.map((tc) => + tc.id === event.id ? { ...tc, result: event.result } : tc, + ), + ); + break; + case "done": { + setStreamingContent((currentContent) => { + setStreamingToolCalls((currentToolCalls) => { + const assistantMessage: AiChatMessage = { + id: event.messageId, + chatId: currentChatIdRef.current || "", + role: "assistant", + content: currentContent || null, + toolCalls: currentToolCalls.length + ? currentToolCalls + : null, + metadata: event.usage ? { tokenUsage: event.usage } : null, + createdAt: new Date().toISOString(), + }; + + setMessages((prev) => [...prev, assistantMessage]); + return []; + }); + return ""; + }); + setIsStreaming(false); + queryClient.invalidateQueries({ + queryKey: ["ai-chat", currentChatIdRef.current], + }); + break; + } + case "error": + setError(event.message); + setErrorCode(event.code || null); + setIsRetryable(event.retryable || false); + setIsStreaming(false); + break; + } + }, + (errorMsg) => { + setError(errorMsg); + setIsStreaming(false); + }, + () => { + setIsStreaming(false); + }, + ); + + abortRef.current = abortController; + }, + [isStreaming, navigate, queryClient], + ); + + const stopGeneration = useCallback(() => { + abortRef.current?.abort(); + abortRef.current = null; + + setStreamingContent((currentContent) => { + setStreamingToolCalls((currentToolCalls) => { + if (currentContent || currentToolCalls.length > 0) { + const partialMessage: AiChatMessage = { + id: `stopped-${Date.now()}`, + chatId: currentChatIdRef.current || "", + role: "assistant", + content: currentContent || null, + toolCalls: currentToolCalls.length ? currentToolCalls : null, + metadata: null, + createdAt: new Date().toISOString(), + }; + setMessages((prev) => [...prev, partialMessage]); + } + return []; + }); + return ""; + }); + + setIsStreaming(false); + }, []); + + return { + messages, + streamingContent, + streamingToolCalls, + isStreaming, + error, + errorCode, + isRetryable, + sendMessage, + stopGeneration, + hydrateFromServer, + }; +} diff --git a/apps/client/src/ee/ai-chat/pages/ai-chat.tsx b/apps/client/src/ee/ai-chat/pages/ai-chat.tsx new file mode 100644 index 00000000..bb264b73 --- /dev/null +++ b/apps/client/src/ee/ai-chat/pages/ai-chat.tsx @@ -0,0 +1,39 @@ +import { useParams } from "react-router-dom"; +import { ErrorBoundary } from "react-error-boundary"; +import { Button } from "@mantine/core"; +import { IconAlertTriangle } from "@tabler/icons-react"; +import { useTranslation } from "react-i18next"; +import AiChatLayout from "../components/ai-chat-layout"; +import { EmptyState } from "@/components/ui/empty-state.tsx"; +import classes from "../styles/ai-chat.module.css"; + +export default function AiChat() { + const { t } = useTranslation(); + const { chatId } = useParams<{ chatId: string }>(); + + return ( +
+ ( + + {t("Try again")} + + } + /> + )} + > + + +
+ ); +} diff --git a/apps/client/src/ee/ai-chat/queries/ai-chat-query.ts b/apps/client/src/ee/ai-chat/queries/ai-chat-query.ts new file mode 100644 index 00000000..8992a115 --- /dev/null +++ b/apps/client/src/ee/ai-chat/queries/ai-chat-query.ts @@ -0,0 +1,61 @@ +import { + useQuery, + useMutation, + useQueryClient, + useInfiniteQuery, +} from "@tanstack/react-query"; +import { + listChats, + getChatInfo, + deleteChat, + updateChatTitle, + searchChats, +} from "../services/ai-chat-service"; + +export function useChatsQuery() { + return useInfiniteQuery({ + queryKey: ["ai-chats"], + queryFn: ({ pageParam }) => + listChats({ cursor: pageParam, limit: 30 }), + initialPageParam: undefined as string | undefined, + getNextPageParam: (lastPage) => + lastPage.meta.hasNextPage ? lastPage.meta.nextCursor : undefined, + }); +} + +export function useChatInfoQuery(chatId: string | undefined) { + return useQuery({ + queryKey: ["ai-chat", chatId], + queryFn: () => getChatInfo(chatId!), + enabled: !!chatId, + }); +} + +export function useDeleteChatMutation() { + const queryClient = useQueryClient(); + return useMutation({ + mutationFn: (chatId: string) => deleteChat(chatId), + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: ["ai-chats"] }); + }, + }); +} + +export function useUpdateChatTitleMutation() { + const queryClient = useQueryClient(); + return useMutation({ + mutationFn: ({ chatId, title }: { chatId: string; title: string }) => + updateChatTitle(chatId, title), + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: ["ai-chats"] }); + }, + }); +} + +export function useSearchChatsQuery(query: string) { + return useQuery({ + queryKey: ["ai-chats-search", query], + queryFn: () => searchChats(query), + enabled: query.length > 0, + }); +} diff --git a/apps/client/src/ee/ai-chat/services/ai-chat-service.ts b/apps/client/src/ee/ai-chat/services/ai-chat-service.ts new file mode 100644 index 00000000..2932372e --- /dev/null +++ b/apps/client/src/ee/ai-chat/services/ai-chat-service.ts @@ -0,0 +1,144 @@ +import api from "@/lib/api-client.ts"; +import type { + AiChat, + AiChatMessage, + AiChatStreamEvent, + ChatAttachment, +} from "../types/ai-chat.types"; +import { IPagination } from "@/lib/types.ts"; + +export async function createChat(): Promise { + const req = await api.post("/ai/chats/create"); + return req.data; +} + +export async function listChats(params?: { + limit?: number; + cursor?: string; +}): Promise> { + const req = await api.post("/ai/chats", params); + return req.data; +} + +export async function getChatInfo( + chatId: string, +): Promise<{ chat: AiChat; messages: AiChatMessage[] }> { + const req = await api.post("/ai/chats/info", { chatId }); + return req.data; +} + +export async function deleteChat(chatId: string): Promise { + await api.post("/ai/chats/delete", { chatId }); +} + +export async function updateChatTitle( + chatId: string, + title: string, +): Promise { + await api.post("/ai/chats/update", { chatId, title }); +} + +export async function searchChats(query: string): Promise { + const req = await api.post("/ai/chats/search", { query }); + return req.data; +} + +export async function uploadChatFile( + file: File, + chatId?: string, +): Promise { + const formData = new FormData(); + formData.append("file", file); + if (chatId) { + formData.append("chatId", chatId); + } + return await api.post("/ai/chats/upload", formData, { + headers: { "Content-Type": "multipart/form-data" }, + }); +} + +export function sendChatMessage( + params: { + chatId?: string; + content: string; + mentionedPageIds?: string[]; + contextPageId?: string; + attachmentIds?: string[]; + }, + onEvent: (event: AiChatStreamEvent) => void, + onError?: (error: string) => void, + onComplete?: () => void, +): AbortController { + const abortController = new AbortController(); + + (async () => { + try { + const response = await fetch("/api/ai/chats/send", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify(params), + signal: abortController.signal, + credentials: "include", + }); + + if (!response.ok) { + const errorBody = await response.text(); + let errorMessage = `HTTP error ${response.status}`; + try { + const parsed = JSON.parse(errorBody); + errorMessage = parsed.message || errorMessage; + } catch { + // use default + } + onError?.(errorMessage); + return; + } + + const reader = response.body?.getReader(); + const decoder = new TextDecoder(); + + if (!reader) { + onError?.("Response body is not readable"); + return; + } + + let buffer = ""; + try { + while (true) { + const { done, value } = await reader.read(); + if (done) break; + + buffer += decoder.decode(value, { stream: true }); + const lines = buffer.split("\n"); + buffer = lines.pop() || ""; + + for (const line of lines) { + if (line.startsWith("data: ")) { + const data = line.slice(6); + if (data === "[DONE]") { + onComplete?.(); + return; + } + try { + const parsed = JSON.parse(data) as AiChatStreamEvent; + onEvent(parsed); + } catch { + // Skip invalid JSON + } + } + } + } + } finally { + reader.releaseLock(); + } + + onComplete?.(); + } catch (error: any) { + if (error.name !== "AbortError") { + onError?.(error.message); + } + } + })(); + + return abortController; +} diff --git a/apps/client/src/ee/ai-chat/styles/ai-chat.module.css b/apps/client/src/ee/ai-chat/styles/ai-chat.module.css new file mode 100644 index 00000000..27b0f0c0 --- /dev/null +++ b/apps/client/src/ee/ai-chat/styles/ai-chat.module.css @@ -0,0 +1,169 @@ +.layout { + display: flex; + height: 100%; + width: 100%; +} + +.main { + flex: 1; + display: flex; + flex-direction: column; + height: calc(100vh - 45px - 2 * var(--mantine-spacing-md)); + max-width: 900px; + margin: 0 auto; + width: 100%; +} + +.messageListWrapper { + flex: 1; + position: relative; + display: flex; + flex-direction: column; + min-height: 0; + height: 100%; + width: 100%; +} + +.messageList { + flex: 1; + overflow-y: auto; + padding: var(--mantine-spacing-md) var(--mantine-spacing-lg); +} + +.messageErrorFallback { + display: flex; + align-items: center; + gap: 6px; + padding: 8px 12px; + margin-bottom: var(--mantine-spacing-lg); + border-radius: var(--mantine-radius-sm); + background: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-6)); + color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2)); + font-size: var(--mantine-font-size-xs); +} + +.scrollToBottomButton { + position: absolute; + bottom: 12px; + left: 50%; + transform: translateX(-50%); + width: 32px; + height: 32px; + display: flex; + align-items: center; + justify-content: center; + border-radius: 50%; + border: 1px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4)); + background: light-dark(var(--mantine-color-white), var(--mantine-color-dark-6)); + color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1)); + cursor: pointer; + padding: 0; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08); + transition: background-color 120ms ease, border-color 120ms ease, transform 120ms ease; + z-index: 2; +} + +.scrollToBottomButton:hover { + background: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-5)); + border-color: light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-3)); +} + +.scrollToBottomButton:active { + transform: translateX(-50%) scale(0.95); +} + +.inputArea { + padding: var(--mantine-spacing-xs) var(--mantine-spacing-lg) var(--mantine-spacing-lg); +} + +/* Empty state - Notion AI style centered layout */ +.emptyState { + flex: 1; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + padding: var(--mantine-spacing-xl) var(--mantine-spacing-lg); +} + +.emptyStateIcon { + width: 48px; + height: 48px; + margin-bottom: var(--mantine-spacing-sm); + color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2)); +} + +.emptyStateBrand { + font-size: var(--mantine-font-size-xs); + font-weight: 600; + letter-spacing: 0.08em; + text-transform: uppercase; + color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2)); + margin-bottom: var(--mantine-spacing-xs); +} + +.emptyStateTitle { + font-size: 1.5rem; + font-weight: 600; + color: light-dark(var(--mantine-color-gray-8), var(--mantine-color-dark-0)); + margin-bottom: var(--mantine-spacing-xl); + text-align: center; +} + +.emptyStateInput { + width: 100%; + max-width: 600px; + margin-bottom: var(--mantine-spacing-xl); + padding: 6px 0; +} + +.suggestionsSection { + width: 100%; + max-width: 600px; +} + +.suggestionsLabel { + font-size: var(--mantine-font-size-xs); + font-weight: 500; + color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3)); + text-transform: uppercase; + letter-spacing: 0.5px; + margin-bottom: var(--mantine-spacing-sm); +} + +.suggestionsGrid { + display: grid; + grid-template-columns: repeat(2, 1fr); + gap: var(--mantine-spacing-sm); +} + +.suggestionCard { + display: flex; + align-items: flex-start; + gap: var(--mantine-spacing-sm); + padding: var(--mantine-spacing-sm) var(--mantine-spacing-md); + border: 1px solid light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5)); + border-radius: var(--mantine-radius-md); + cursor: pointer; + background: transparent; + transition: background-color 150ms, border-color 150ms; + text-align: left; + width: 100%; + + @mixin hover { + background: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-6)); + border-color: light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4)); + } +} + +.suggestionIcon { + flex-shrink: 0; + color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2)); + margin-top: 1px; +} + +.suggestionText { + font-size: var(--mantine-font-size-sm); + color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1)); + line-height: 1.4; +} diff --git a/apps/client/src/ee/ai-chat/styles/aside-chat-panel.module.css b/apps/client/src/ee/ai-chat/styles/aside-chat-panel.module.css new file mode 100644 index 00000000..f8958615 --- /dev/null +++ b/apps/client/src/ee/ai-chat/styles/aside-chat-panel.module.css @@ -0,0 +1,139 @@ +.panel { + display: flex; + flex-direction: column; + height: 100%; + overflow: hidden; +} + +.toolbar { + display: flex; + align-items: center; + gap: 4px; + padding: 0 0 var(--mantine-spacing-sm) 0; + border-bottom: 1px solid light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5)); +} + +.toolbarSpacer { + flex: 1; +} + +.titleButton { + display: flex; + align-items: center; + gap: 4px; + padding: 4px 8px; + border-radius: var(--mantine-radius-sm); + font-size: var(--mantine-font-size-sm); + font-weight: 500; + color: light-dark(var(--mantine-color-gray-8), var(--mantine-color-dark-0)); + max-width: 60%; + min-width: 0; +} + +.titleButton:hover { + background-color: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-6)); +} + +.titleText { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + min-width: 0; +} + +.messages { + flex: 1; + overflow-y: auto; + padding: var(--mantine-spacing-sm) 0; + scroll-behavior: smooth; +} + +.inputArea { + padding-top: var(--mantine-spacing-sm); +} + +.emptyState { + flex: 1; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: var(--mantine-spacing-md); + padding: var(--mantine-spacing-xl) var(--mantine-spacing-sm); +} + +.emptyStateIcon { + color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3)); +} + +.emptyStateTitle { + font-size: var(--mantine-font-size-lg); + font-weight: 600; + color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1)); + text-align: center; +} + +.quickActions { + display: flex; + flex-direction: column; + gap: 6px; + width: 100%; +} + +.quickAction { + display: flex; + align-items: center; + gap: var(--mantine-spacing-sm); + padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm); + border: 1px solid light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5)); + border-radius: var(--mantine-radius-md); + cursor: pointer; + background: transparent; + color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1)); + font-size: var(--mantine-font-size-sm); + text-align: left; + width: 100%; + transition: background-color 150ms, border-color 150ms; + + @mixin hover { + background: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-6)); + border-color: light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4)); + } +} + +.quickActionIcon { + flex-shrink: 0; + color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3)); +} + +.historyList { + max-height: 300px; + overflow-y: auto; +} + +.historyItem { + display: flex; + align-items: center; + padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm); + cursor: pointer; + border-radius: var(--mantine-radius-sm); + font-size: var(--mantine-font-size-sm); + color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1)); + transition: background-color 150ms; + + @mixin hover { + background: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-6)); + } + + &[data-active] { + background: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-5)); + } +} + +.historyItemTitle { + flex: 1; + min-width: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} diff --git a/apps/client/src/ee/ai-chat/styles/chat-input.module.css b/apps/client/src/ee/ai-chat/styles/chat-input.module.css new file mode 100644 index 00000000..20b287c1 --- /dev/null +++ b/apps/client/src/ee/ai-chat/styles/chat-input.module.css @@ -0,0 +1,242 @@ +.inputWrapper { + position: relative; + overflow: hidden; + border: 1px solid + light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5)); + border-radius: 16px; + background: light-dark(var(--mantine-color-white), var(--mantine-color-dark-7)); + box-shadow: light-dark( + 0 2px 40px 4px rgba(0, 0, 0, 0.07), + 0 2px 40px 4px rgba(0, 0, 0, 0.5) + ); + transition: + border-color 150ms, + box-shadow 150ms; + + &:focus-within { + border-color: light-dark( + var(--mantine-color-gray-3), + var(--mantine-color-dark-4) + ); + box-shadow: light-dark( + 0 4px 48px 6px rgba(0, 0, 0, 0.09), + 0 4px 48px 6px rgba(0, 0, 0, 0.6) + ); + } +} + +.inputWrapperFlat { + position: relative; + overflow: hidden; + border: 1px solid light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5)); + border-radius: 12px; + background: light-dark(var(--mantine-color-white), var(--mantine-color-dark-7)); + box-shadow: none; + transition: border-color 150ms; + + &:focus-within { + border-color: light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4)); + } +} + +.disclaimer { + margin-top: 6px; + text-align: center; + font-size: var(--mantine-font-size-xs); + color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3)); +} + +.attachmentChips { + display: flex; + flex-wrap: wrap; + gap: 6px; + padding: 10px 14px 0; +} + +.attachmentChip { + display: inline-flex; + align-items: center; + gap: 5px; + padding: 4px 8px; + border-radius: 8px; + background: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-6)); + color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1)); + font-size: var(--mantine-font-size-xs); + max-width: 200px; +} + +.attachmentChipUploading { + opacity: 0.55; +} + +.attachmentChipName { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.attachmentChipRemove { + display: flex; + align-items: center; + justify-content: center; + border: none; + background: none; + cursor: pointer; + padding: 0; + margin-left: 2px; + color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3)); + border-radius: 50%; + + @mixin hover { + color: light-dark(var(--mantine-color-gray-8), var(--mantine-color-dark-0)); + } +} + +.editorContent { + overflow: hidden; + + :global(.ProseMirror) { + outline: none; + border: none; + background-color: transparent; + padding: 14px 18px 8px; + font-size: 15px; + line-height: 1.6; + max-height: 200px; + overflow-y: auto; + min-height: 24px; + color: light-dark(var(--mantine-color-gray-9), var(--mantine-color-dark-0)); + } + + :global(.ProseMirror p) { + margin-block-start: 0; + margin-block-end: 0; + } + + :global(.ProseMirror p.is-editor-empty:first-child::before) { + color: light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-3)); + content: attr(data-placeholder); + float: left; + height: 0; + pointer-events: none; + } +} + +.actions { + display: flex; + align-items: center; + justify-content: flex-end; + padding: 4px 12px 10px; + gap: var(--mantine-spacing-xs); +} + +.sendButton { + width: 28px; + height: 28px; + min-width: 28px; + min-height: 28px; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + border: none; + cursor: pointer; + transition: background-color 150ms, opacity 150ms; + background: light-dark(var(--mantine-color-dark-9), var(--mantine-color-gray-0)); + color: light-dark(var(--mantine-color-white), var(--mantine-color-dark-9)); + + &:disabled { + opacity: 0.25; + cursor: default; + } + + @mixin hover { + &:not(:disabled) { + opacity: 0.85; + } + } +} + +.attachButton { + display: flex; + align-items: center; + justify-content: center; + border: none; + background: none; + cursor: pointer; + padding: 2px; + color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3)); + transition: color 150ms; + + @mixin hover { + color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1)); + } +} + +.plusButton { + display: flex; + align-items: center; + justify-content: center; + width: 24px; + height: 24px; + border-radius: 50%; + border: 1px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4)); + background: none; + cursor: pointer; + color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3)); + transition: color 150ms, background-color 150ms; + + @mixin hover { + color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1)); + background: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-6)); + } +} + +.plusMenuItem { + display: flex; + align-items: center; + gap: var(--mantine-spacing-sm); + padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm); + border: none; + background: none; + cursor: pointer; + width: 100%; + font-size: var(--mantine-font-size-sm); + color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1)); + border-radius: var(--mantine-radius-sm); + transition: background-color 150ms; + + @mixin hover { + background: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-6)); + } + + &:disabled { + opacity: 0.45; + cursor: not-allowed; + background: none; + } +} + +.plusMenuIcon { + color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3)); +} + +.stopButton { + width: 28px; + height: 28px; + min-width: 28px; + min-height: 28px; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + border: 1px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4)); + cursor: pointer; + transition: background-color 150ms; + background: light-dark(var(--mantine-color-white), var(--mantine-color-dark-6)); + color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1)); + + @mixin hover { + background: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-5)); + } +} diff --git a/apps/client/src/ee/ai-chat/styles/chat-message.module.css b/apps/client/src/ee/ai-chat/styles/chat-message.module.css new file mode 100644 index 00000000..33e39dd6 --- /dev/null +++ b/apps/client/src/ee/ai-chat/styles/chat-message.module.css @@ -0,0 +1,286 @@ +.message { + margin-bottom: var(--mantine-spacing-lg); +} + +.userMessage { + composes: message; + display: flex; + justify-content: flex-end; +} + +.userBubble { + max-width: 75%; + padding: 10px 16px; + border-radius: 18px; + background: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-6)); + color: light-dark(var(--mantine-color-gray-9), var(--mantine-color-dark-0)); + font-size: 15px; + line-height: 1.6; + word-wrap: break-word; + overflow-wrap: break-word; +} + +[data-aside-chat] .userBubble { + background: light-dark(var(--mantine-color-white), var(--mantine-color-dark-7)); + border: 1px solid light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5)); +} + +.userBubble p { + margin: 0; +} + +.messageAttachments { + display: flex; + flex-wrap: wrap; + gap: 4px; + margin-bottom: 6px; +} + +.messageAttachmentChip { + display: inline-flex; + align-items: center; + gap: 4px; + padding: 2px 8px; + border-radius: 6px; + background: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5)); + color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-2)); + font-size: var(--mantine-font-size-xs); + max-width: 180px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.assistantMessage { + composes: message; +} + +.messageContent { + font-size: 15px; + line-height: 1.7; + color: light-dark(var(--mantine-color-gray-8), var(--mantine-color-dark-1)); + word-wrap: break-word; + overflow-wrap: break-word; +} + +.messageContent p { + margin: 0 0 0.75em 0; +} + +.messageContent p:last-child { + margin-bottom: 0; +} + +.messageContent ul, +.messageContent ol { + margin: 0.5em 0 0.75em 0; + padding-left: 1.5em; +} + +.messageContent li { + margin-bottom: 0.3em; +} + +.messageContent h1, +.messageContent h2, +.messageContent h3 { + margin: 1em 0 0.5em 0; + font-weight: 600; + color: light-dark(var(--mantine-color-gray-9), var(--mantine-color-dark-0)); +} + +.messageContent h1 { + font-size: 1.4em; +} + +.messageContent h2 { + font-size: 1.2em; +} + +.messageContent h3 { + font-size: 1.05em; +} + +.messageContent pre { + background-color: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-7)); + padding: var(--mantine-spacing-sm) var(--mantine-spacing-md); + border-radius: var(--mantine-radius-md); + overflow-x: auto; + font-size: var(--mantine-font-size-sm); + margin: 0.75em 0; +} + +.messageContent code { + background-color: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-6)); + padding: 2px 6px; + border-radius: 4px; + font-size: 0.88em; +} + +.messageContent pre code { + background: none; + padding: 0; +} + +.messageContent blockquote { + border-left: 3px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4)); + padding-left: var(--mantine-spacing-md); + margin: 0.75em 0; + color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-2)); +} + +.messageContent a { + color: light-dark(var(--mantine-color-blue-7), var(--mantine-color-blue-4)); + text-decoration: none; + + @mixin hover { + text-decoration: underline; + } +} + +.messageContent a[href^="/s/"], +.messageContent a[href^="/p/"] { + color: light-dark(var(--mantine-color-dark-4), var(--mantine-color-dark-1)); + font-weight: 500; + text-decoration: none; + cursor: pointer; + + @mixin light { + border-bottom: 0.05em solid var(--mantine-color-dark-0); + } + + @mixin dark { + border-bottom: 0.05em solid var(--mantine-color-dark-2); + } + + @mixin hover { + text-decoration: none; + @mixin light { + border-bottom-color: var(--mantine-color-dark-2); + } + @mixin dark { + border-bottom-color: var(--mantine-color-dark-0); + } + } +} + +.messageContent hr { + border: none; + border-top: 1px solid light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5)); + margin: 1em 0; +} + +.toolGroup { + margin: 6px 0; + font-size: var(--mantine-font-size-xs); +} + +.toolGroupHeader { + display: inline-flex; + align-items: center; + gap: 6px; + cursor: pointer; + user-select: none; + color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2)); + line-height: 1.4; + transition: color 120ms ease; +} + +.toolGroupHeader:hover { + color: light-dark(var(--mantine-color-gray-8), var(--mantine-color-dark-0)); +} + +.toolGroupLabel { + font-weight: 500; +} + +.toolGroupSteps { + margin-top: 4px; + padding-left: 14px; + display: flex; + flex-direction: column; + gap: 2px; +} + +.toolStep { + font-size: var(--mantine-font-size-xs); +} + +.toolStepRow { + display: inline-flex; + align-items: center; + gap: 4px; + cursor: pointer; + user-select: none; + color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2)); + line-height: 1.5; + transition: color 120ms ease; +} + +.toolStepRow:hover { + color: light-dark(var(--mantine-color-gray-8), var(--mantine-color-dark-0)); +} + +.toolStepBullet { + display: inline-block; + width: 8px; + text-align: center; + opacity: 0.6; +} + +.toolStepDetails { + margin-top: 4px; + margin-left: 18px; + padding: 6px 10px; + border-radius: var(--mantine-radius-sm); + background: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-7)); + color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1)); + font-size: 11px; + line-height: 1.5; + overflow-x: auto; +} + +.messageActions { + display: flex; + align-items: center; + gap: 4px; + margin-top: 4px; + color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2)); +} + +.processingIndicator { + display: inline-flex; + align-items: center; + gap: 6px; + color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3)); + font-size: var(--mantine-font-size-sm); +} + +.processingSpinner { + animation: spin 1s linear infinite; +} + +@keyframes spin { + from { + transform: rotate(0deg); + } + to { + transform: rotate(360deg); + } +} + +.streamingCursor { + display: inline-block; + width: 2px; + height: 1em; + background: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-0)); + animation: blink 1s step-end infinite; + vertical-align: text-bottom; + margin-left: 1px; +} + +@keyframes blink { + 50% { + opacity: 0; + } +} diff --git a/apps/client/src/ee/ai-chat/styles/chat-sidebar.module.css b/apps/client/src/ee/ai-chat/styles/chat-sidebar.module.css new file mode 100644 index 00000000..c7991147 --- /dev/null +++ b/apps/client/src/ee/ai-chat/styles/chat-sidebar.module.css @@ -0,0 +1,138 @@ +.sidebar { + height: 100%; + width: 100%; + padding: var(--mantine-spacing-md); + display: flex; + flex-direction: column; + gap: var(--mantine-spacing-xs); +} + +.header { + display: flex; + align-items: center; + justify-content: space-between; + padding-bottom: var(--mantine-spacing-xs); +} + +.title { + font-weight: 600; + font-size: var(--mantine-font-size-sm); +} + +.searchInput { + margin-bottom: var(--mantine-spacing-xs); +} + +.chatList { + flex: 1; + overflow-y: auto; +} + +.chatGroup + .chatGroup { + margin-top: var(--mantine-spacing-sm); +} + +.chatGroupLabel { + padding: 4px var(--mantine-spacing-xs); + font-size: var(--mantine-font-size-xs); + font-weight: 600; + color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2)); + user-select: none; +} + +.chatListEmpty { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + padding: var(--mantine-spacing-xl) var(--mantine-spacing-md); + text-align: center; + gap: 4px; + user-select: none; +} + +.chatListEmptyIcon { + color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3)); + margin-bottom: var(--mantine-spacing-xs); +} + +.chatListEmptyTitle { + font-size: var(--mantine-font-size-sm); + font-weight: 600; + color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1)); +} + +.chatListEmptyHint { + font-size: var(--mantine-font-size-xs); + color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-3)); + line-height: 1.4; +} + +.chatItem { + display: flex; + align-items: center; + padding: 8px var(--mantine-spacing-xs); + border-radius: var(--mantine-radius-sm); + cursor: pointer; + text-decoration: none; + color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1)); + font-size: var(--mantine-font-size-sm); + user-select: none; + gap: var(--mantine-spacing-xs); + + @mixin hover { + background-color: light-dark( + var(--mantine-color-gray-1), + var(--mantine-color-dark-6) + ); + } + + &[data-active] { + background-color: light-dark( + var(--mantine-color-gray-2), + var(--mantine-color-dark-6) + ); + } +} + +.chatItemTitle { + flex: 1; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.chatItemDate { + font-size: var(--mantine-font-size-xs); + color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3)); + white-space: nowrap; + transition: opacity 150ms; +} + +.chatItemRenameInput { + font-size: var(--mantine-font-size-sm); + padding: 0; + height: auto; + min-height: 0; + background: transparent; + color: inherit; +} + +.chatItem:hover .chatItemDate { + opacity: 0; +} + +.chatItemActions { + position: absolute; + right: var(--mantine-spacing-xs); + opacity: 0; + transition: opacity 150ms; +} + +.chatItem { + position: relative; +} + +.chatItem:hover .chatItemActions { + opacity: 1; +} diff --git a/apps/client/src/ee/ai-chat/types/ai-chat.types.ts b/apps/client/src/ee/ai-chat/types/ai-chat.types.ts new file mode 100644 index 00000000..89754d26 --- /dev/null +++ b/apps/client/src/ee/ai-chat/types/ai-chat.types.ts @@ -0,0 +1,49 @@ +export type AiChat = { + id: string; + workspaceId: string; + creatorId: string; + title: string | null; + createdAt: string; + updatedAt: string; +}; + +export type AiChatToolCall = { + id: string; + name: string; + args: Record; + result?: unknown; +}; + +export type AiChatMessage = { + id: string; + chatId: string; + role: 'user' | 'assistant' | 'tool'; + content: string | null; + toolCalls: AiChatToolCall[] | null; + metadata: Record | null; + createdAt: string; +}; + +export type AiChatStreamEvent = + | { type: 'chat_created'; chatId: string } + | { type: 'content'; text: string } + | { type: 'tool_call'; id: string; name: string; args: Record } + | { type: 'tool_result'; id: string; result: unknown } + | { type: 'done'; messageId: string; usage?: Record } + | { type: 'error'; message: string; code?: string; retryable?: boolean }; + +export type PageMention = { + id: string; + title: string; + slugId: string; + spaceSlug?: string; + icon?: string; +}; + +export type ChatAttachment = { + id: string; + fileName: string; + fileExt: string; + fileSize: number; + mimeType: string; +}; diff --git a/apps/client/src/ee/ai/pages/ai-settings.tsx b/apps/client/src/ee/ai/pages/ai-settings.tsx index c3f93810..3a5a281e 100644 --- a/apps/client/src/ee/ai/pages/ai-settings.tsx +++ b/apps/client/src/ee/ai/pages/ai-settings.tsx @@ -6,6 +6,7 @@ import useUserRole from "@/hooks/use-user-role.tsx"; import { useTranslation } from "react-i18next"; import EnableAiSearch from "@/ee/ai/components/enable-ai-search.tsx"; import EnableGenerativeAi from "@/ee/ai/components/enable-generative-ai.tsx"; +import EnableAiChat from "@/ee/ai-chat/components/enable-ai-chat.tsx"; import McpSettings from "@/ee/ai/components/mcp-settings.tsx"; import { Alert, Stack, Tabs } from "@mantine/core"; import { IconInfoCircle } from "@tabler/icons-react"; @@ -71,6 +72,7 @@ export default function AiSettings() { {!isCloud() && } + diff --git a/apps/client/src/ee/components/cloud-login-form.tsx b/apps/client/src/ee/components/cloud-login-form.tsx index 6ab7ebd9..2357f9bb 100644 --- a/apps/client/src/ee/components/cloud-login-form.tsx +++ b/apps/client/src/ee/components/cloud-login-form.tsx @@ -21,6 +21,7 @@ import { useTranslation } from "react-i18next"; import JoinedWorkspaces from "@/ee/components/joined-workspaces.tsx"; import { useJoinedWorkspacesQuery } from "@/ee/cloud/query/cloud-query.ts"; import { findWorkspacesByEmail } from "@/ee/cloud/service/cloud-service.ts"; +import { AuthLayout } from "@/features/auth/components/auth-layout.tsx"; const formSchema = z.object({ hostname: z.string().min(1, { message: "subdomain is required" }), @@ -82,7 +83,7 @@ export function CloudLoginForm() { } return ( -
+ @@ -145,12 +146,12 @@ export function CloudLoginForm() { </Box> </Container> - <Text ta="center"> + <Text ta="center" mb="xl"> {t("Don't have a workspace?")}{" "} <Anchor component={Link} to={APP_ROUTE.AUTH.CREATE_WORKSPACE} fw={500}> {t("Create new workspace")} </Anchor> </Text> - </div> + </AuthLayout> ); } diff --git a/apps/client/src/ee/features.ts b/apps/client/src/ee/features.ts index 15613ee7..a9ab8b0d 100644 --- a/apps/client/src/ee/features.ts +++ b/apps/client/src/ee/features.ts @@ -17,4 +17,5 @@ export const Feature = { RETENTION: 'retention', SHARING_CONTROLS: 'sharing:controls', TEMPLATES: 'templates', + VIEWER_COMMENTS: 'comment:viewer', } as const; diff --git a/apps/client/src/ee/licence/components/activate-license-modal.tsx b/apps/client/src/ee/licence/components/activate-license-modal.tsx index 28b3d0d6..766d3f25 100644 --- a/apps/client/src/ee/licence/components/activate-license-modal.tsx +++ b/apps/client/src/ee/licence/components/activate-license-modal.tsx @@ -1,6 +1,6 @@ import { z } from "zod/v4"; -import React from "react"; -import { Button, Group, Modal, Textarea } from "@mantine/core"; +import React, { useRef } from "react"; +import { Button, Divider, Group, Modal, Stack, Textarea } from "@mantine/core"; import { useForm } from "@mantine/form"; import { zod4Resolver } from "mantine-form-zod-resolver"; import { useTranslation } from "react-i18next"; @@ -49,6 +49,7 @@ interface ActivateLicenseFormProps { export function ActivateLicenseForm({ onClose }: ActivateLicenseFormProps) { const { t } = useTranslation(); const activateLicenseMutation = useActivateMutation(); + const fileInputRef = useRef<HTMLInputElement>(null); const form = useForm<FormValues>({ validate: zod4Resolver(formSchema), @@ -63,29 +64,68 @@ export function ActivateLicenseForm({ onClose }: ActivateLicenseFormProps) { onClose?.(); } + function handleFileUpload(event: React.ChangeEvent<HTMLInputElement>) { + const file = event.target.files?.[0]; + if (!file) return; + + const reader = new FileReader(); + reader.onload = (e) => { + const content = (e.target?.result as string)?.trim(); + if (content) { + form.setFieldValue("licenseKey", content); + handleSubmit({ licenseKey: content }); + } + }; + reader.readAsText(file); + + if (fileInputRef.current) { + fileInputRef.current.value = ""; + } + } + return ( <form onSubmit={form.onSubmit(handleSubmit)}> - <Textarea - label={t("License key")} - description="Enter a valid enterprise license key. Contact sales@docmost.com to purchase one." - placeholder={t("e.g eyJhb.....")} - variant="filled" - autosize - minRows={3} - maxRows={5} - data-autofocus - {...form.getInputProps("licenseKey")} + <input + type="file" + accept=".txt" + ref={fileInputRef} + onChange={handleFileUpload} + hidden /> - <Group justify="flex-end" mt="md"> - <Button - type="submit" - disabled={activateLicenseMutation.isPending} - loading={activateLicenseMutation.isPending} - > - {t("Save")} - </Button> - </Group> + <Stack gap="xs"> + <Textarea + label={t("License key")} + placeholder={t("e.g eyJhb.....")} + variant="filled" + autosize + minRows={3} + maxRows={5} + data-autofocus + {...form.getInputProps("licenseKey")} + /> + + <Group justify="flex-end"> + <Button + type="submit" + disabled={activateLicenseMutation.isPending} + loading={activateLicenseMutation.isPending} + > + {t("Save")} + </Button> + </Group> + + <Divider label={t("Or")} labelPosition="center" /> + + <Group justify="center"> + <Button + variant="light" + onClick={() => fileInputRef.current?.click()} + > + {t("Upload license file")} + </Button> + </Group> + </Stack> </form> ); } diff --git a/apps/client/src/ee/licence/components/oss-details.tsx b/apps/client/src/ee/licence/components/oss-details.tsx index e08db649..1d02daf4 100644 --- a/apps/client/src/ee/licence/components/oss-details.tsx +++ b/apps/client/src/ee/licence/components/oss-details.tsx @@ -68,7 +68,11 @@ export default function OssDetails() { </List> <Text size="sm" c="dimmed"> - Contact <a href="mailto:sales@docmost.com?subject=Enterprise%20License%20Inquiry">sales@docmost.com </a> to purchase an enterprise license. + Get an enterprise trial key at <a href="https://customers.docmost.com/" target="_blank" rel="noopener noreferrer">customers.docmost.com</a>. + </Text> + + <Text size="sm" c="dimmed"> + Visit <a href="https://docmost.com/pricing" target="_blank" rel="noopener noreferrer">docmost.com/pricing</a> to purchase an enterprise license. </Text> </Stack> </Stack> diff --git a/apps/client/src/ee/mfa/components/mfa-challenge.tsx b/apps/client/src/ee/mfa/components/mfa-challenge.tsx index e1d15965..bfa16b22 100644 --- a/apps/client/src/ee/mfa/components/mfa-challenge.tsx +++ b/apps/client/src/ee/mfa/components/mfa-challenge.tsx @@ -22,6 +22,7 @@ import APP_ROUTE, { getPostLoginRedirect } from "@/lib/app-route"; import { useTranslation } from "react-i18next"; import { z } from "zod/v4"; import { MfaBackupCodeInput } from "./mfa-backup-code-input"; +import { AuthLayout } from "@/features/auth/components/auth-layout.tsx"; const formSchema = z.object({ code: z @@ -66,6 +67,7 @@ export function MfaChallenge() { }; return ( + <AuthLayout> <Container size={420} className={classes.container}> <Paper radius="lg" p={40} className={classes.paper}> <Stack align="center" gap="xl"> @@ -157,5 +159,6 @@ export function MfaChallenge() { </Stack> </Paper> </Container> + </AuthLayout> ); } diff --git a/apps/client/src/ee/mfa/components/mfa-setup-required.tsx b/apps/client/src/ee/mfa/components/mfa-setup-required.tsx index ab327c4d..880228a9 100644 --- a/apps/client/src/ee/mfa/components/mfa-setup-required.tsx +++ b/apps/client/src/ee/mfa/components/mfa-setup-required.tsx @@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next"; import { MfaSetupModal } from "@/ee/mfa"; import APP_ROUTE, { getPostLoginRedirect } from "@/lib/app-route.ts"; import { useNavigate } from "react-router-dom"; +import { AuthLayout } from "@/features/auth/components/auth-layout.tsx"; export default function MfaSetupRequired() { const { t } = useTranslation(); @@ -15,6 +16,7 @@ export default function MfaSetupRequired() { }; return ( + <AuthLayout> <Container size="sm" py="xl"> <Paper shadow="sm" p="xl" radius="md" withBorder> <Stack> @@ -44,5 +46,6 @@ export default function MfaSetupRequired() { </Stack> </Paper> </Container> + </AuthLayout> ); } diff --git a/apps/client/src/ee/page-permission/components/page-share-modal.tsx b/apps/client/src/ee/page-permission/components/page-share-modal.tsx index 01b91a7c..0a19b318 100644 --- a/apps/client/src/ee/page-permission/components/page-share-modal.tsx +++ b/apps/client/src/ee/page-permission/components/page-share-modal.tsx @@ -71,7 +71,10 @@ export function PageShareModal({ readOnly }: PageShareModalProps) { ) : null } variant="default" - onClick={open} + onClick={() => { + setActiveTab(isPubliclyShared ? "publish" : hasPagePermissions ? "access" : "publish"); + open(); + }} > {t("Share")} </Button> diff --git a/apps/client/src/ee/pages/verify-email.tsx b/apps/client/src/ee/pages/verify-email.tsx index 623c3202..aef5711d 100644 --- a/apps/client/src/ee/pages/verify-email.tsx +++ b/apps/client/src/ee/pages/verify-email.tsx @@ -9,6 +9,7 @@ import { import { notifications } from "@mantine/notifications"; import APP_ROUTE from "@/lib/app-route.ts"; import { useTranslation } from "react-i18next"; +import { AuthLayout } from "@/features/auth/components/auth-layout.tsx"; export default function VerifyEmail() { const { t } = useTranslation(); @@ -59,20 +60,23 @@ export default function VerifyEmail() { if (token) { return ( - <Container size={420} className={classes.container}> - <Box p="xl" className={classes.containerBox}> - <Title order={2} ta="center" fw={500} mb="md"> - {t("Verifying your email")} - - - {t("Please wait...")} - - - + + + + + {t("Verifying your email")} + + + {t("Please wait...")} + + + + ); } return ( + @@ -103,5 +107,6 @@ export default function VerifyEmail() { )} </Box> </Container> + </AuthLayout> ); } diff --git a/apps/client/src/ee/security/components/space-viewer-comments-toggle.tsx b/apps/client/src/ee/security/components/space-viewer-comments-toggle.tsx new file mode 100644 index 00000000..88fac67f --- /dev/null +++ b/apps/client/src/ee/security/components/space-viewer-comments-toggle.tsx @@ -0,0 +1,61 @@ +import { Group, Text, Switch, Tooltip } from "@mantine/core"; +import React, { useState } from "react"; +import { useTranslation } from "react-i18next"; +import { ISpace } from "@/features/space/types/space.types.ts"; +import { useUpdateSpaceMutation } from "@/features/space/queries/space-query.ts"; +import { useHasFeature } from "@/ee/hooks/use-feature.ts"; +import { Feature } from "@/ee/features.ts"; +import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label.ts"; + +type SpaceViewerCommentsToggleProps = { + space: ISpace; +}; + +export default function SpaceViewerCommentsToggle({ + space, +}: SpaceViewerCommentsToggleProps) { + const { t } = useTranslation(); + const hasViewerComments = useHasFeature(Feature.VIEWER_COMMENTS); + const upgradeLabel = useUpgradeLabel(); + const isDisabled = !hasViewerComments; + const [checked, setChecked] = useState( + space.settings?.comments?.allowViewerComments === true, + ); + const updateSpaceMutation = useUpdateSpaceMutation(); + + const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => { + const value = event.currentTarget.checked; + try { + await updateSpaceMutation.mutateAsync({ + spaceId: space.id, + allowViewerComments: value, + }); + setChecked(value); + } catch { + // error handled by mutation + } + }; + + return ( + <Group justify="space-between" wrap="nowrap" gap="xl"> + <div> + <Text size="md">{t("Allow viewers to comment")}</Text> + <Text size="sm" c="dimmed"> + {t("Allow viewers to add comments on pages in this space.")} + </Text> + </div> + <Tooltip + label={upgradeLabel} + disabled={!isDisabled} + refProp="rootRef" + > + <Switch + checked={checked} + onChange={handleChange} + disabled={isDisabled} + aria-label={t("Toggle viewer comments")} + /> + </Tooltip> + </Group> + ); +} diff --git a/apps/client/src/features/auth/components/auth-layout.tsx b/apps/client/src/features/auth/components/auth-layout.tsx new file mode 100644 index 00000000..d05ad7ec --- /dev/null +++ b/apps/client/src/features/auth/components/auth-layout.tsx @@ -0,0 +1,26 @@ +import React from "react"; +import { Group, Text } from "@mantine/core"; +import classes from "./auth.module.css"; + +type AuthLayoutProps = { + children: React.ReactNode; +}; + +export function AuthLayout({ children }: AuthLayoutProps) { + return ( + <> + <Group justify="center" gap={8} className={classes.logo}> + <img + src="/icons/favicon-32x32.png" + alt="Docmost" + width={22} + height={22} + /> + <Text size="28px" fw={700} style={{ userSelect: "none" }}> + Docmost + </Text> + </Group> + {children} + </> + ); +} diff --git a/apps/client/src/features/auth/components/auth.module.css b/apps/client/src/features/auth/components/auth.module.css index 1e7d09d6..9b99200d 100644 --- a/apps/client/src/features/auth/components/auth.module.css +++ b/apps/client/src/features/auth/components/auth.module.css @@ -1,12 +1,20 @@ +.logo { + margin-top: 80px; + + @media (max-width: $mantine-breakpoint-sm) { + margin-top: 30px; + } +} + .container { box-shadow: rgba(0, 0, 0, 0.07) 0px 2px 45px 4px; border-radius: 4px; background: light-dark(var(--mantine-color-body), rgba(0, 0, 0, 0.1)); - margin-top: 150px; + margin-top: 40px; margin-bottom: 20px; @media (max-width: $mantine-breakpoint-sm) { - margin-top: 50px; + margin-top: 20px; margin-bottom: 20px; } } diff --git a/apps/client/src/features/auth/components/forgot-password-form.tsx b/apps/client/src/features/auth/components/forgot-password-form.tsx index b5987b49..cdb249c9 100644 --- a/apps/client/src/features/auth/components/forgot-password-form.tsx +++ b/apps/client/src/features/auth/components/forgot-password-form.tsx @@ -7,6 +7,7 @@ import { Box, Button, Container, Text, TextInput, Title } from "@mantine/core"; import classes from "./auth.module.css"; import { useRedirectIfAuthenticated } from "@/features/auth/hooks/use-redirect-if-authenticated.ts"; import { useTranslation } from "react-i18next"; +import { AuthLayout } from "./auth-layout.tsx"; const formSchema = z.object({ email: z @@ -35,6 +36,7 @@ export function ForgotPasswordForm() { } return ( + <AuthLayout> <Container size={420} className={classes.container}> <Box p="xl" className={classes.containerBox}> <Title order={2} ta="center" fw={500} mb="md"> @@ -69,5 +71,6 @@ export function ForgotPasswordForm() { </form> </Box> </Container> + </AuthLayout> ); } diff --git a/apps/client/src/features/auth/components/invite-sign-up-form.tsx b/apps/client/src/features/auth/components/invite-sign-up-form.tsx index d06ef307..91d8e167 100644 --- a/apps/client/src/features/auth/components/invite-sign-up-form.tsx +++ b/apps/client/src/features/auth/components/invite-sign-up-form.tsx @@ -19,6 +19,7 @@ import { useGetInvitationQuery } from "@/features/workspace/queries/workspace-qu import { useRedirectIfAuthenticated } from "@/features/auth/hooks/use-redirect-if-authenticated.ts"; import { useTranslation } from "react-i18next"; import SsoLogin from "@/ee/components/sso-login.tsx"; +import { AuthLayout } from "./auth-layout.tsx"; const formSchema = z.object({ name: z.string().trim().min(1), @@ -66,6 +67,7 @@ export function InviteSignUpForm() { } return ( + <AuthLayout> <Container size={420} className={classes.container}> <Box p="xl" className={classes.containerBox}> <Title order={2} ta="center" fw={500} mb="md"> @@ -111,5 +113,6 @@ export function InviteSignUpForm() { )} </Box> </Container> + </AuthLayout> ); } diff --git a/apps/client/src/features/auth/components/login-form.tsx b/apps/client/src/features/auth/components/login-form.tsx index c07ebe02..78aaa94b 100644 --- a/apps/client/src/features/auth/components/login-form.tsx +++ b/apps/client/src/features/auth/components/login-form.tsx @@ -21,6 +21,7 @@ import SsoLogin from "@/ee/components/sso-login.tsx"; import { useWorkspacePublicDataQuery } from "@/features/workspace/queries/workspace-query.ts"; import { Error404 } from "@/components/ui/error-404.tsx"; import React from "react"; +import { AuthLayout } from "./auth-layout.tsx"; const formSchema = z.object({ email: z @@ -62,52 +63,54 @@ export function LoginForm() { } return ( - <Container size={420} className={classes.container}> - <Box p="xl" className={classes.containerBox}> - <Title order={2} ta="center" fw={500} mb="md"> - {t("Login")} - + + + + + {t("Login")} + - + - {!data?.enforceSso && ( - <> -
- + {!data?.enforceSso && ( + <> + + - + - - - {t("Forgot your password?")} - - + + + {t("Forgot your password?")} + + - - - - )} -
-
+ + + + )} +
+
+
); } diff --git a/apps/client/src/features/auth/components/password-reset-form.tsx b/apps/client/src/features/auth/components/password-reset-form.tsx index 4fe836ec..d603264f 100644 --- a/apps/client/src/features/auth/components/password-reset-form.tsx +++ b/apps/client/src/features/auth/components/password-reset-form.tsx @@ -6,6 +6,7 @@ import { Box, Button, Container, PasswordInput, Title } from "@mantine/core"; import classes from "./auth.module.css"; import { useRedirectIfAuthenticated } from "@/features/auth/hooks/use-redirect-if-authenticated.ts"; import { useTranslation } from "react-i18next"; +import { AuthLayout } from "./auth-layout.tsx"; const formSchema = z.object({ newPassword: z @@ -38,6 +39,7 @@ export function PasswordResetForm({ resetToken }: PasswordResetFormProps) { } return ( + @@ -59,5 +61,6 @@ export function PasswordResetForm({ resetToken }: PasswordResetFormProps) { </form> </Box> </Container> + </AuthLayout> ); } diff --git a/apps/client/src/features/auth/components/setup-workspace-form.tsx b/apps/client/src/features/auth/components/setup-workspace-form.tsx index 6eaf3d12..8aa55e99 100644 --- a/apps/client/src/features/auth/components/setup-workspace-form.tsx +++ b/apps/client/src/features/auth/components/setup-workspace-form.tsx @@ -19,6 +19,7 @@ import SsoCloudSignup from "@/ee/components/sso-cloud-signup.tsx"; import { isCloud } from "@/lib/config.ts"; import { Link } from "react-router-dom"; import APP_ROUTE from "@/lib/app-route.ts"; +import { AuthLayout } from "./auth-layout.tsx"; const formSchema = z.object({ workspaceName: z.string().trim().max(50).optional(), @@ -50,7 +51,7 @@ export function SetupWorkspaceForm() { } return ( - <div> + <AuthLayout> <Container size={420} className={classes.container}> <Box p="xl" className={classes.containerBox}> <Title order={2} ta="center" fw={500} mb="md"> @@ -117,6 +118,6 @@ export function SetupWorkspaceForm() { </Anchor> </Text> )} - </div> + </AuthLayout> ); } diff --git a/apps/client/src/features/comment/atoms/comment-atom.ts b/apps/client/src/features/comment/atoms/comment-atom.ts index 384a2f3d..374e7f7f 100644 --- a/apps/client/src/features/comment/atoms/comment-atom.ts +++ b/apps/client/src/features/comment/atoms/comment-atom.ts @@ -3,3 +3,15 @@ import { atom } from 'jotai'; export const showCommentPopupAtom = atom<boolean>(false); export const activeCommentIdAtom = atom<string>(''); export const draftCommentIdAtom = atom<string>(''); + +// Read-only comment state +export const showReadOnlyCommentPopupAtom = atom<boolean>(false); +export type YjsSelection = { + anchor: any; + head: any; +}; +export type ReadOnlyCommentData = { + yjsSelection: YjsSelection; + selectedText: string; +}; +export const readOnlyCommentDataAtom = atom<ReadOnlyCommentData | null>(null); diff --git a/apps/client/src/features/comment/components/comment-dialog.tsx b/apps/client/src/features/comment/components/comment-dialog.tsx index 6248e913..24781a94 100644 --- a/apps/client/src/features/comment/components/comment-dialog.tsx +++ b/apps/client/src/features/comment/components/comment-dialog.tsx @@ -6,6 +6,8 @@ import { activeCommentIdAtom, draftCommentIdAtom, showCommentPopupAtom, + showReadOnlyCommentPopupAtom, + readOnlyCommentDataAtom, } from "@/features/comment/atoms/comment-atom"; import CommentEditor from "@/features/comment/components/comment-editor"; import CommentActions from "@/features/comment/components/comment-actions"; @@ -19,12 +21,15 @@ import { useTranslation } from "react-i18next"; interface CommentDialogProps { editor: ReturnType<typeof useEditor>; pageId: string; + readOnly?: boolean; } -function CommentDialog({ editor, pageId }: CommentDialogProps) { +function CommentDialog({ editor, pageId, readOnly }: CommentDialogProps) { const { t } = useTranslation(); const [comment, setComment] = useState(""); const [, setShowCommentPopup] = useAtom(showCommentPopupAtom); + const [, setShowReadOnlyCommentPopup] = useAtom(showReadOnlyCommentPopupAtom); + const [readOnlyCommentData, setReadOnlyCommentData] = useAtom(readOnlyCommentDataAtom); const [, setActiveCommentId] = useAtom(activeCommentIdAtom); const [draftCommentId, setDraftCommentId] = useAtom(draftCommentIdAtom); const [currentUser] = useAtom(currentUserAtom); @@ -34,11 +39,17 @@ function CommentDialog({ editor, pageId }: CommentDialogProps) { handleDialogClose(); }); const createCommentMutation = useCreateCommentMutation(); - const { isPending } = createCommentMutation; + const isPending = createCommentMutation.isPending; const handleDialogClose = () => { - setShowCommentPopup(false); - editor.chain().focus().unsetCommentDecoration().run(); + if (readOnly) { + setShowReadOnlyCommentPopup(false); + // @ts-ignore + setReadOnlyCommentData(null); + } else { + setShowCommentPopup(false); + editor.chain().focus().unsetCommentDecoration().run(); + } }; const getSelectedText = () => { @@ -47,6 +58,11 @@ function CommentDialog({ editor, pageId }: CommentDialogProps) { }; const handleAddComment = async () => { + if (readOnly) { + await handleAddReadOnlyComment(); + return; + } + try { const selectedText = getSelectedText(); const commentData = { @@ -65,7 +81,6 @@ function CommentDialog({ editor, pageId }: CommentDialogProps) { .run(); setActiveCommentId(createdComment.id); - //unselect text to close bubble menu editor.commands.setTextSelection({ from: editor.view.state.selection.from, to: editor.view.state.selection.from }); setAsideState({ tab: "comments", isAsideOpen: true }); @@ -85,6 +100,33 @@ function CommentDialog({ editor, pageId }: CommentDialogProps) { } }; + const handleAddReadOnlyComment = async () => { + if (!readOnlyCommentData) return; + + try { + const createdComment = await createCommentMutation.mutateAsync({ + pageId, + content: JSON.stringify(comment), + selection: readOnlyCommentData.selectedText, + type: "inline", + yjsSelection: readOnlyCommentData.yjsSelection, + }); + + setActiveCommentId(createdComment.id); + setAsideState({ tab: "comments", isAsideOpen: true }); + + setTimeout(() => { + const selector = `div[data-comment-id="${createdComment.id}"]`; + const commentElement = document.querySelector(selector); + commentElement?.scrollIntoView({ behavior: "smooth", block: "center" }); + }, 400); + } finally { + setShowReadOnlyCommentPopup(false); + // @ts-ignore + setReadOnlyCommentData(null); + } + }; + const handleCommentEditorChange = (newContent: any) => { setComment(newContent); }; diff --git a/apps/client/src/features/comment/components/comment-list-with-tabs.tsx b/apps/client/src/features/comment/components/comment-list-with-tabs.tsx index 022ea2fa..94d9e020 100644 --- a/apps/client/src/features/comment/components/comment-list-with-tabs.tsx +++ b/apps/client/src/features/comment/components/comment-list-with-tabs.tsx @@ -44,7 +44,9 @@ function CommentListWithTabs() { const [isLoading, setIsLoading] = useState(false); const { data: space } = useGetSpaceBySlugQuery(page?.space?.slug); - const canComment = page?.permissions?.canEdit ?? false; + const canComment = + (page?.permissions?.canEdit ?? false) || + (space?.settings?.comments?.allowViewerComments === true); // Separate active and resolved comments const { activeComments, resolvedComments } = useMemo(() => { @@ -153,7 +155,7 @@ function CommentListWithTabs() { )} </Paper> ), - [comments, handleAddReply, isLoading, space?.membership?.role], + [comments, handleAddReply, isLoading, space?.membership?.role, canComment], ); if (isCommentsLoading) { diff --git a/apps/client/src/features/comment/components/comment-menu.tsx b/apps/client/src/features/comment/components/comment-menu.tsx index 201a0702..fe047232 100644 --- a/apps/client/src/features/comment/components/comment-menu.tsx +++ b/apps/client/src/features/comment/components/comment-menu.tsx @@ -75,7 +75,7 @@ function CommentMenu({ {isResolved ? t("Re-open comment") : t("Resolve comment")} </Menu.Item> ) : ( - <Tooltip label={upgradeLabel} position="left"> + <Tooltip label={upgradeLabel} position="left" withinPortal={false}> <Menu.Item disabled leftSection={<IconCircleCheck size={14} />}> {t("Resolve comment")} </Menu.Item> diff --git a/apps/client/src/features/comment/queries/comment-query.ts b/apps/client/src/features/comment/queries/comment-query.ts index 6c86c039..6b7432eb 100644 --- a/apps/client/src/features/comment/queries/comment-query.ts +++ b/apps/client/src/features/comment/queries/comment-query.ts @@ -65,6 +65,11 @@ export function useCreateCommentMutation() { ) as InfiniteData<IPagination<IComment>> | undefined; if (cache && cache.pages.length > 0) { + const alreadyExists = cache.pages.some((page) => + page.items.some((c) => c.id === newComment.id), + ); + if (alreadyExists) return; + const lastIdx = cache.pages.length - 1; queryClient.setQueryData(RQ_KEY(newComment.pageId), { ...cache, diff --git a/apps/client/src/features/comment/types/comment.types.ts b/apps/client/src/features/comment/types/comment.types.ts index 6c8cc909..164e63dc 100644 --- a/apps/client/src/features/comment/types/comment.types.ts +++ b/apps/client/src/features/comment/types/comment.types.ts @@ -17,6 +17,10 @@ export interface IComment { deletedAt?: Date; creator: IUser; resolvedBy?: IUser; + yjsSelection?: { + anchor: any; + head: any; + }; } export interface ICommentData { diff --git a/apps/client/src/features/editor/components/attachment/attachment-view.tsx b/apps/client/src/features/editor/components/attachment/attachment-view.tsx index e3281e64..b72bb00a 100644 --- a/apps/client/src/features/editor/components/attachment/attachment-view.tsx +++ b/apps/client/src/features/editor/components/attachment/attachment-view.tsx @@ -1,17 +1,43 @@ import { NodeViewProps, NodeViewWrapper } from "@tiptap/react"; -import { Group, Text, Paper, ActionIcon, Loader } from "@mantine/core"; +import { Group, Text, Paper, ActionIcon, Loader, Tooltip } from "@mantine/core"; import { getFileUrl } from "@/lib/config.ts"; -import { IconDownload, IconPaperclip } from "@tabler/icons-react"; +import { IconDownload, IconFileTypePdf, IconPaperclip } from "@tabler/icons-react"; import { useHover } from "@mantine/hooks"; import { formatBytes } from "@/lib"; import { useTranslation } from "react-i18next"; +import { useCallback } from "react"; export default function AttachmentView(props: NodeViewProps) { const { t } = useTranslation(); - const { node, selected } = props; - const { url, name, size } = node.attrs; + const { editor, node, getPos, selected } = props; + const { url, name, size, mime, attachmentId, placeholder } = node.attrs; const { hovered, ref } = useHover(); + const isPdf = mime === "application/pdf" || name?.toLowerCase().endsWith(".pdf"); + + const handleEmbedAsPdf = useCallback(() => { + const pos = getPos(); + if (pos === undefined || !url) return; + + const nodeSize = node.nodeSize; + + editor + .chain() + .insertContentAt( + { from: pos, to: pos + nodeSize }, + { + type: "pdf", + attrs: { + src: url, + name, + attachmentId, + size, + }, + }, + ) + .run(); + }, [editor, getPos, node, url, name, attachmentId]); + return ( <NodeViewWrapper> <Paper withBorder p="4px" ref={ref} data-drag-handle> @@ -23,14 +49,14 @@ export default function AttachmentView(props: NodeViewProps) { h={25} > <Group wrap="nowrap" gap="sm" style={{ minWidth: 0, flex: 1 }}> - {url ? ( - <IconPaperclip size={20} style={{ flexShrink: 0 }} /> - ) : ( + {!url && placeholder ? ( <Loader size={20} style={{ flexShrink: 0 }} /> + ) : ( + <IconPaperclip size={20} style={{ flexShrink: 0 }} /> )} <Text component="span" size="md" truncate="end" style={{ minWidth: 0 }}> - {url ? name : t("Uploading {{name}}", { name })} + {!url && placeholder ? t("Uploading {{name}}", { name }) : name} </Text> <Text component="span" size="sm" c="dimmed" style={{ flexShrink: 0 }}> @@ -39,11 +65,20 @@ export default function AttachmentView(props: NodeViewProps) { </Group> {url && (selected || hovered) && ( - <a href={getFileUrl(url)} target="_blank"> - <ActionIcon variant="default" aria-label="download file"> - <IconDownload size={18} /> - </ActionIcon> - </a> + <Group gap={4} wrap="nowrap" style={{ flexShrink: 0 }}> + {isPdf && editor.isEditable && ( + <Tooltip label={t("Embed as PDF")} position="top" withinPortal={false}> + <ActionIcon variant="default" aria-label={t("Embed as PDF")} onClick={handleEmbedAsPdf}> + <IconFileTypePdf size={18} /> + </ActionIcon> + </Tooltip> + )} + <a href={getFileUrl(url)} target="_blank"> + <ActionIcon variant="default" aria-label="download file"> + <IconDownload size={18} /> + </ActionIcon> + </a> + </Group> )} </Group> </Paper> diff --git a/apps/client/src/features/editor/components/audio/audio-menu.tsx b/apps/client/src/features/editor/components/audio/audio-menu.tsx new file mode 100644 index 00000000..3ca1950d --- /dev/null +++ b/apps/client/src/features/editor/components/audio/audio-menu.tsx @@ -0,0 +1,123 @@ +import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus"; +import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react"; +import { useCallback } from "react"; +import { Node as PMNode } from "@tiptap/pm/model"; +import { + EditorMenuProps, + ShouldShowProps, +} from "@/features/editor/components/table/types/types.ts"; +import { ActionIcon, Tooltip } from "@mantine/core"; +import { + IconDownload, + IconTrash, +} from "@tabler/icons-react"; +import { useTranslation } from "react-i18next"; +import { getFileUrl } from "@/lib/config.ts"; +import classes from "../common/toolbar-menu.module.css"; + +export function AudioMenu({ editor }: EditorMenuProps) { + const { t } = useTranslation(); + + const editorState = useEditorState({ + editor, + selector: (ctx) => { + if (!ctx.editor) { + return null; + } + + const audioAttrs = ctx.editor.getAttributes("audio"); + + return { + isAudio: ctx.editor.isActive("audio"), + src: audioAttrs?.src || null, + }; + }, + }); + + const shouldShow = useCallback( + ({ state }: ShouldShowProps) => { + if (!state) { + return false; + } + + return editor.isActive("audio") && editor.getAttributes("audio").src; + }, + [editor], + ); + + const getReferencedVirtualElement = useCallback(() => { + if (!editor) return; + const { selection } = editor.state; + const predicate = (node: PMNode) => node.type.name === "audio"; + const parent = findParentNode(predicate)(selection); + + if (parent) { + const dom = editor.view.nodeDOM(parent?.pos) as HTMLElement; + const domRect = dom.getBoundingClientRect(); + return { + getBoundingClientRect: () => domRect, + getClientRects: () => [domRect], + }; + } + + const domRect = posToDOMRect(editor.view, selection.from, selection.to); + return { + getBoundingClientRect: () => domRect, + getClientRects: () => [domRect], + }; + }, [editor]); + + const handleDownload = useCallback(() => { + if (!editorState?.src) return; + const url = getFileUrl(editorState.src); + const a = document.createElement("a"); + a.href = url; + a.download = ""; + a.click(); + }, [editorState?.src]); + + const handleDelete = useCallback(() => { + editor.commands.deleteSelection(); + }, [editor]); + + return ( + <BaseBubbleMenu + editor={editor} + pluginKey={`audio-menu`} + updateDelay={0} + getReferencedVirtualElement={getReferencedVirtualElement} + options={{ + placement: "top", + offset: 8, + flip: false, + }} + shouldShow={shouldShow} + > + <div className={classes.toolbar}> + <Tooltip position="top" label={t("Download")} withinPortal={false}> + <ActionIcon + onClick={handleDownload} + size="lg" + aria-label={t("Download")} + variant="subtle" + > + <IconDownload size={18} /> + </ActionIcon> + </Tooltip> + + <Tooltip position="top" label={t("Delete")} withinPortal={false}> + <ActionIcon + onClick={handleDelete} + size="lg" + aria-label={t("Delete")} + variant="subtle" + > + <IconTrash size={18} /> + </ActionIcon> + </Tooltip> + </div> + </BaseBubbleMenu> + ); +} + +export default AudioMenu; diff --git a/apps/client/src/features/editor/components/audio/audio-view.module.css b/apps/client/src/features/editor/components/audio/audio-view.module.css new file mode 100644 index 00000000..5773ea82 --- /dev/null +++ b/apps/client/src/features/editor/components/audio/audio-view.module.css @@ -0,0 +1,37 @@ +.audioWrapper { + display: flex; + justify-content: center; + align-items: center; + max-width: 100%; + border-radius: 8px; + overflow: hidden; +} + +.skeleton { + animation: pulse 1.2s ease-in-out infinite; + + @mixin light { + background: linear-gradient(-90deg, var(--mantine-color-gray-3) 0%, var(--mantine-color-gray-1) 50%, var(--mantine-color-gray-3) 100%); + background-size: 400% 400%; + } + + @mixin dark { + background: linear-gradient(-90deg, var(--mantine-color-dark-6) 0%, var(--mantine-color-dark-5) 50%, var(--mantine-color-dark-6) 100%); + background-size: 400% 400%; + } + + @keyframes pulse { + 0% { + background-position: 0% 0%; + } + 100% { + background-position: -135% 0%; + } + } +} + +.audio { + display: block; + width: 100%; + border-radius: 8px; +} diff --git a/apps/client/src/features/editor/components/audio/audio-view.tsx b/apps/client/src/features/editor/components/audio/audio-view.tsx new file mode 100644 index 00000000..9e5f619f --- /dev/null +++ b/apps/client/src/features/editor/components/audio/audio-view.tsx @@ -0,0 +1,68 @@ +import { NodeViewProps, NodeViewWrapper } from "@tiptap/react"; +import { Group, Loader, Text } from "@mantine/core"; +import { useMemo } from "react"; +import { getFileUrl } from "@/lib/config.ts"; +import { isInternalFileUrl } from "@docmost/editor-ext"; +import classes from "./audio-view.module.css"; +import { useTranslation } from "react-i18next"; + +export default function AudioView(props: NodeViewProps) { + const { t } = useTranslation(); + const { editor, node } = props; + const { src, placeholder } = node.attrs; + + const safeSrc = useMemo(() => { + if (!src || !isInternalFileUrl(src)) return null; + return getFileUrl(src); + }, [src]); + + const previewSrc = useMemo(() => { + editor.storage.shared.audioPreviews = + editor.storage.shared.audioPreviews || {}; + + if (placeholder?.id) { + return editor.storage.shared.audioPreviews[placeholder.id]; + } + + return null; + }, [placeholder, editor]); + + return ( + <NodeViewWrapper data-drag-handle> + <div className={`${classes.audioWrapper} ${!safeSrc && placeholder ? classes.skeleton : ''}`}> + {safeSrc && ( + <audio + className={classes.audio} + preload="metadata" + controls + src={safeSrc} + /> + )} + {!safeSrc && previewSrc && ( + <Group pos="relative" w="100%"> + <audio + className={classes.audio} + preload="metadata" + controls + src={previewSrc} + /> + <Loader size={20} pos="absolute" top={6} right={6} /> + </Group> + )} + {!safeSrc && !previewSrc && placeholder && ( + <Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md" h={54}> + <Loader size={20} style={{ flexShrink: 0 }} /> + <Text component="span" size="sm" truncate="end"> + {placeholder?.name + ? t("Uploading {{name}}", { name: placeholder.name }) + : t("Uploading file")} + </Text> + </Group> + )} + {!safeSrc && !previewSrc && !placeholder && ( + <audio className={classes.audio} controls /> + )} + </div> + </NodeViewWrapper> + ); +} diff --git a/apps/client/src/features/editor/components/audio/upload-audio-action.tsx b/apps/client/src/features/editor/components/audio/upload-audio-action.tsx new file mode 100644 index 00000000..e3df5775 --- /dev/null +++ b/apps/client/src/features/editor/components/audio/upload-audio-action.tsx @@ -0,0 +1,36 @@ +import { handleAudioUpload } from "@docmost/editor-ext"; +import { uploadFile } from "@/features/page/services/page-service.ts"; +import { notifications } from "@mantine/notifications"; +import { getFileUploadSizeLimit } from "@/lib/config.ts"; +import { formatBytes } from "@/lib"; +import i18n from "@/i18n.ts"; + +export const uploadAudioAction = handleAudioUpload({ + onUpload: async (file: File, pageId: string): Promise<any> => { + try { + return await uploadFile(file, pageId); + } catch (err) { + notifications.show({ + color: "red", + message: err?.response.data.message, + }); + throw err; + } + }, + validateFn: (file) => { + if (!file.type.includes("audio/")) { + return false; + } + + if (file.size > getFileUploadSizeLimit()) { + notifications.show({ + color: "red", + message: i18n.t("File exceeds the {{limit}} attachment limit", { + limit: formatBytes(getFileUploadSizeLimit()), + }), + }); + return false; + } + return true; + }, +}); diff --git a/apps/client/src/features/editor/components/bubble-menu/readonly-bubble-menu.tsx b/apps/client/src/features/editor/components/bubble-menu/readonly-bubble-menu.tsx new file mode 100644 index 00000000..7998becf --- /dev/null +++ b/apps/client/src/features/editor/components/bubble-menu/readonly-bubble-menu.tsx @@ -0,0 +1,159 @@ +import type { Editor } from "@tiptap/react"; +import { TextSelection } from "@tiptap/pm/state"; +import { FC, useCallback, useEffect, useRef, useState } from "react"; +import { IconMessage } from "@tabler/icons-react"; +import classes from "./bubble-menu.module.css"; +import { ActionIcon, Tooltip } from "@mantine/core"; +import { useAtom } from "jotai"; +import { + showReadOnlyCommentPopupAtom, + readOnlyCommentDataAtom, +} from "@/features/comment/atoms/comment-atom"; +import { useTranslation } from "react-i18next"; +import { getRelativeSelection, ySyncPluginKey } from "@tiptap/y-tiptap"; + +type ReadonlyBubbleMenuProps = { + editor: Editor; +}; + +export const ReadonlyBubbleMenu: FC<ReadonlyBubbleMenuProps> = ({ editor }) => { + const { t } = useTranslation(); + const [showReadOnlyCommentPopup, setShowReadOnlyCommentPopup] = useAtom( + showReadOnlyCommentPopupAtom, + ); + const [, setReadOnlyCommentData] = useAtom(readOnlyCommentDataAtom); + const menuRef = useRef<HTMLDivElement>(null); + const [visible, setVisible] = useState(false); + const [position, setPosition] = useState({ top: 0, left: 0 }); + const isInteractingRef = useRef(false); + + const updateMenuPosition = useCallback(() => { + if (isInteractingRef.current) return; + + const pmSelection = editor.state.selection; + if (!(pmSelection instanceof TextSelection) || pmSelection.empty) { + setVisible(false); + return; + } + + const selection = window.getSelection(); + if ( + !selection || + selection.isCollapsed || + selection.rangeCount === 0 || + showReadOnlyCommentPopup + ) { + setVisible(false); + return; + } + + const editorDom = editor.view.dom; + if ( + !editorDom.contains(selection.anchorNode) || + !editorDom.contains(selection.focusNode) + ) { + setVisible(false); + return; + } + + const range = selection.getRangeAt(0); + const rect = range.getBoundingClientRect(); + + if (rect.width === 0) { + setVisible(false); + return; + } + + const editorRect = editorDom + .closest(".editor-container") + ?.getBoundingClientRect(); + if (!editorRect) { + setVisible(false); + return; + } + + setPosition({ + top: rect.top - editorRect.top - 44, + left: rect.left - editorRect.left + rect.width / 2, + }); + setVisible(true); + }, [editor, showReadOnlyCommentPopup]); + + useEffect(() => { + const handleSelectionChange = () => { + updateMenuPosition(); + }; + + document.addEventListener("selectionchange", handleSelectionChange); + return () => { + document.removeEventListener("selectionchange", handleSelectionChange); + }; + }, [updateMenuPosition]); + + useEffect(() => { + if (showReadOnlyCommentPopup) { + setVisible(false); + } + }, [showReadOnlyCommentPopup]); + + const handleCommentClick = () => { + if (!editor) return; + + const view = editor.view; + const ystate = ySyncPluginKey.getState(view.state); + + if (ystate?.binding) { + const selection = getRelativeSelection(ystate.binding, view.state); + const { from, to } = editor.state.selection; + const selectedText = editor.state.doc.textBetween(from, to); + + // @ts-ignore + setReadOnlyCommentData({ + yjsSelection: { + anchor: selection.anchor, + head: selection.head, + }, + selectedText, + }); + + setShowReadOnlyCommentPopup(true); + setVisible(false); + } + }; + + if (!visible) return null; + + return ( + <div + ref={menuRef} + style={{ + position: "absolute", + top: position.top, + left: position.left, + transform: "translateX(-50%)", + zIndex: 199, + }} + > + <div className={classes.bubbleMenu}> + <Tooltip label={t("Comment")} withArrow withinPortal={false}> + <ActionIcon + variant="default" + size="lg" + radius="6px" + aria-label={t("Comment")} + style={{ border: "none" }} + onMouseDown={(e) => { + e.preventDefault(); + e.stopPropagation(); + isInteractingRef.current = true; + handleCommentClick(); + isInteractingRef.current = false; + }} + > + <IconMessage size={16} stroke={2} /> + </ActionIcon> + </Tooltip> + </div> + </div> + ); +}; diff --git a/apps/client/src/features/editor/components/common/editor-paste-handler.tsx b/apps/client/src/features/editor/components/common/editor-paste-handler.tsx index 6407d835..85d49872 100644 --- a/apps/client/src/features/editor/components/common/editor-paste-handler.tsx +++ b/apps/client/src/features/editor/components/common/editor-paste-handler.tsx @@ -1,6 +1,7 @@ import { uploadImageAction } from "@/features/editor/components/image/upload-image-action.tsx"; import { uploadVideoAction } from "@/features/editor/components/video/upload-video-action.tsx"; import { uploadAttachmentAction } from "../attachment/upload-attachment-action"; +import { uploadPdfAction } from "../pdf/upload-pdf-action"; import { createMentionAction } from "@/features/editor/components/link/internal-link-paste.ts"; import { INTERNAL_LINK_REGEX } from "@/lib/constants.ts"; import { Editor } from "@tiptap/core"; @@ -12,6 +13,8 @@ import { const ATTACHMENT_NODE_TYPES = [ "image", "video", + "audio", + "pdf", "attachment", "excalidraw", "drawio", @@ -63,6 +66,7 @@ export const handlePaste = ( const pos = editor.state.selection.from; uploadImageAction(file, editor, pos, pageId); uploadVideoAction(file, editor, pos, pageId); + uploadPdfAction(file, editor, pos, pageId); uploadAttachmentAction(file, editor, pos, pageId); } return true; @@ -229,6 +233,7 @@ export const handleFileDrop = ( uploadImageAction(file, editor, coordinates?.pos ?? 0 - 1, pageId); uploadVideoAction(file, editor, coordinates?.pos ?? 0 - 1, pageId); + uploadPdfAction(file, editor, coordinates?.pos ?? 0 - 1, pageId); uploadAttachmentAction(file, editor, coordinates?.pos ?? 0 - 1, pageId); } return true; diff --git a/apps/client/src/features/editor/components/common/node-resize-handles.ts b/apps/client/src/features/editor/components/common/node-resize-handles.ts index 0785845d..38e10a9a 100644 --- a/apps/client/src/features/editor/components/common/node-resize-handles.ts +++ b/apps/client/src/features/editor/components/common/node-resize-handles.ts @@ -1,5 +1,5 @@ -import type { ResizableNodeViewDirection } from "@tiptap/core"; import classes from "./node-resize.module.css"; +import { ResizableNodeViewDirection } from "@docmost/editor-ext"; export function createResizeHandle( direction: ResizableNodeViewDirection, diff --git a/apps/client/src/features/editor/components/common/resizable-wrapper.module.css b/apps/client/src/features/editor/components/common/resizable-wrapper.module.css index 0d0a7688..edfa8c3b 100644 --- a/apps/client/src/features/editor/components/common/resizable-wrapper.module.css +++ b/apps/client/src/features/editor/components/common/resizable-wrapper.module.css @@ -20,8 +20,8 @@ .cornerHandle { position: absolute; - width: 36px; - height: 36px; + width: 24px; + height: 24px; z-index: 2; opacity: 0; transition: opacity 0.2s ease; @@ -42,13 +42,13 @@ } &::before { - width: 28px; + width: 20px; height: 3px; } &::after { width: 3px; - height: 28px; + height: 20px; } &:hover::before, diff --git a/apps/client/src/features/editor/components/common/resizable-wrapper.tsx b/apps/client/src/features/editor/components/common/resizable-wrapper.tsx index ebb9cd78..69a5058b 100644 --- a/apps/client/src/features/editor/components/common/resizable-wrapper.tsx +++ b/apps/client/src/features/editor/components/common/resizable-wrapper.tsx @@ -74,6 +74,15 @@ export const ResizableWrapper: React.FC<ResizableWrapperProps> = ({ const constraintsRef = useRef({ minWidth, maxWidth, minHeight, maxHeight }); constraintsRef.current = { minWidth, maxWidth, minHeight, maxHeight }; + useEffect(() => { + if (!dragRef.current && wrapperRef.current) { + widthRef.current = initialWidth; + heightRef.current = initialHeight; + wrapperRef.current.style.width = `${initialWidth}px`; + wrapperRef.current.style.height = `${initialHeight}px`; + } + }, [initialWidth, initialHeight]); + const handleMouseMove = useRef((e: MouseEvent) => { const drag = dragRef.current; if (!drag || !wrapperRef.current) return; diff --git a/apps/client/src/features/editor/components/drawio/drawio-menu.tsx b/apps/client/src/features/editor/components/drawio/drawio-menu.tsx index 8cda0348..869decd7 100644 --- a/apps/client/src/features/editor/components/drawio/drawio-menu.tsx +++ b/apps/client/src/features/editor/components/drawio/drawio-menu.tsx @@ -8,6 +8,7 @@ import { } from "@/features/editor/components/table/types/types.ts"; import { ActionIcon, + LoadingOverlay, Modal, Text, Tooltip, @@ -46,6 +47,8 @@ export function DrawioMenu({ editor }: EditorMenuProps) { const computedColorScheme = useComputedColorScheme(); const isDirtyRef = useRef(false); const isSavingRef = useRef(false); + const [isSaving, setIsSaving] = useState(false); + const [isLoading, setIsLoading] = useState(false); const editorState = useEditorState({ editor, @@ -140,6 +143,7 @@ export function DrawioMenu({ editor }: EditorMenuProps) { if (isSavingRef.current) return; isSavingRef.current = true; + setIsSaving(true); try { const svgString = decodeBase64ToSvgString(svgXml); @@ -167,6 +171,7 @@ export function DrawioMenu({ editor }: EditorMenuProps) { isDirtyRef.current = false; } finally { isSavingRef.current = false; + setIsSaving(false); } }, [editor, editorState?.attachmentId]); @@ -196,6 +201,7 @@ export function DrawioMenu({ editor }: EditorMenuProps) { const handleOpen = useCallback(async () => { if (!editorState?.src) return; + setIsLoading(true); try { const url = getFileUrl(editorState.src); const request = await fetch(url, { @@ -213,6 +219,7 @@ export function DrawioMenu({ editor }: EditorMenuProps) { } catch (err) { console.error(err); } finally { + setIsLoading(false); isDirtyRef.current = false; open(); } @@ -307,6 +314,7 @@ export function DrawioMenu({ editor }: EditorMenuProps) { size="lg" aria-label={t("Edit")} variant="subtle" + loading={isLoading} > <IconEdit size={18} /> </ActionIcon> @@ -339,7 +347,8 @@ export function DrawioMenu({ editor }: EditorMenuProps) { <Modal.Root opened={opened} onClose={handleClose} fullScreen closeOnEscape={false}> <Modal.Overlay /> <Modal.Content style={{ overflow: "hidden" }}> - <Modal.Body> + <Modal.Body pos="relative"> + <LoadingOverlay visible={isSaving} /> <div style={{ height: "100vh" }}> <DrawIoEmbed ref={drawioRef} diff --git a/apps/client/src/features/editor/components/drawio/drawio-view.tsx b/apps/client/src/features/editor/components/drawio/drawio-view.tsx index 1b1ad95c..357057bf 100644 --- a/apps/client/src/features/editor/components/drawio/drawio-view.tsx +++ b/apps/client/src/features/editor/components/drawio/drawio-view.tsx @@ -2,6 +2,7 @@ import { NodeViewProps, NodeViewWrapper } from "@tiptap/react"; import { ActionIcon, Card, + LoadingOverlay, Modal, Text, useComputedColorScheme, @@ -34,6 +35,7 @@ export default function DrawioView(props: NodeViewProps) { const computedColorScheme = useComputedColorScheme(); const isDirtyRef = useRef(false); const isSavingRef = useRef(false); + const [isSaving, setIsSaving] = useState(false); const handleOpen = async () => { if (!editor.isEditable) { @@ -47,6 +49,7 @@ export default function DrawioView(props: NodeViewProps) { if (isSavingRef.current) return; isSavingRef.current = true; + setIsSaving(true); try { const svgString = decodeBase64ToSvgString(svgXml); @@ -79,6 +82,7 @@ export default function DrawioView(props: NodeViewProps) { isDirtyRef.current = false; } finally { isSavingRef.current = false; + setIsSaving(false); } }; @@ -136,7 +140,8 @@ export default function DrawioView(props: NodeViewProps) { <Modal.Root opened={opened} onClose={handleClose} fullScreen closeOnEscape={false}> <Modal.Overlay /> <Modal.Content style={{ overflow: "hidden" }}> - <Modal.Body> + <Modal.Body pos="relative"> + <LoadingOverlay visible={isSaving} /> <div style={{ height: "100vh" }}> <DrawIoEmbed ref={drawioRef} diff --git a/apps/client/src/features/editor/components/embed/embed-view.tsx b/apps/client/src/features/editor/components/embed/embed-view.tsx index 021f4f3a..176f14ad 100644 --- a/apps/client/src/features/editor/components/embed/embed-view.tsx +++ b/apps/client/src/features/editor/components/embed/embed-view.tsx @@ -86,8 +86,8 @@ export default function EmbedView(props: NodeViewProps) { {embedUrl ? ( <div className={classes.embedContainer}> <ResizableWrapper - initialWidth={nodeWidth || 640} - initialHeight={nodeHeight || 480} + initialWidth={nodeWidth || 800} + initialHeight={nodeHeight || 600} minWidth={200} maxWidth={1200} minHeight={200} @@ -102,8 +102,9 @@ export default function EmbedView(props: NodeViewProps) { <iframe className={classes.embedIframe} src={sanitizeUrl(embedUrl)} - allow="encrypted-media" - sandbox="allow-scripts allow-same-origin allow-forms allow-popups" + allow="encrypted-media; clipboard-read; clipboard-write; picture-in-picture;" + loading="lazy" + sandbox="allow-scripts allow-same-origin allow-forms allow-popups allow-downloads" allowFullScreen frameBorder="0" /> diff --git a/apps/client/src/features/editor/components/excalidraw/excalidraw-menu.tsx b/apps/client/src/features/editor/components/excalidraw/excalidraw-menu.tsx index c9ae7c08..fd312806 100644 --- a/apps/client/src/features/editor/components/excalidraw/excalidraw-menu.tsx +++ b/apps/client/src/features/editor/components/excalidraw/excalidraw-menu.tsx @@ -56,6 +56,8 @@ export function ExcalidrawMenu({ editor }: EditorMenuProps) { const computedColorScheme = useComputedColorScheme(); const isDirtyRef = useRef(false); const isSavingRef = useRef(false); + const [isSaving, setIsSaving] = useState(false); + const [isLoading, setIsLoading] = useState(false); const isInitialLoadRef = useRef(true); const lastFingerprintRef = useRef(""); @@ -153,6 +155,7 @@ export function ExcalidrawMenu({ editor }: EditorMenuProps) { const handleOpen = useCallback(async () => { if (!editorState?.src) return; + setIsLoading(true); try { const url = getFileUrl(editorState.src); const request = await fetch(url, { @@ -166,6 +169,7 @@ export function ExcalidrawMenu({ editor }: EditorMenuProps) { } catch (err) { console.error(err); } finally { + setIsLoading(false); isDirtyRef.current = false; isInitialLoadRef.current = true; open(); @@ -178,6 +182,7 @@ export function ExcalidrawMenu({ editor }: EditorMenuProps) { } isSavingRef.current = true; + setIsSaving(true); try { const { exportToSvg } = await import("@excalidraw/excalidraw"); @@ -223,6 +228,7 @@ export function ExcalidrawMenu({ editor }: EditorMenuProps) { isDirtyRef.current = false; } finally { isSavingRef.current = false; + setIsSaving(false); } }, [editor, excalidrawAPI, editorState?.attachmentId]); @@ -339,6 +345,7 @@ export function ExcalidrawMenu({ editor }: EditorMenuProps) { size="lg" aria-label={t("Edit")} variant="subtle" + loading={isLoading} > <IconEdit size={18} /> </ActionIcon> @@ -390,7 +397,7 @@ export function ExcalidrawMenu({ editor }: EditorMenuProps) { bg="var(--mantine-color-body)" p="xs" > - <Button onClick={handleSaveAndExit} size={"compact-sm"}> + <Button onClick={handleSaveAndExit} size={"compact-sm"} loading={isSaving}> {t("Save & Exit")} </Button> <Button onClick={handleClose} color="red" size={"compact-sm"}> diff --git a/apps/client/src/features/editor/components/excalidraw/excalidraw-view.tsx b/apps/client/src/features/editor/components/excalidraw/excalidraw-view.tsx index 0673f853..658743a3 100644 --- a/apps/client/src/features/editor/components/excalidraw/excalidraw-view.tsx +++ b/apps/client/src/features/editor/components/excalidraw/excalidraw-view.tsx @@ -52,6 +52,7 @@ export default function ExcalidrawView(props: NodeViewProps) { const isDirtyRef = useRef(false); const isSavingRef = useRef(false); + const [isSaving, setIsSaving] = useState(false); const isInitialLoadRef = useRef(true); const lastFingerprintRef = useRef(""); @@ -70,6 +71,7 @@ export default function ExcalidrawView(props: NodeViewProps) { } isSavingRef.current = true; + setIsSaving(true); try { const { exportToSvg } = await import("@excalidraw/excalidraw"); @@ -120,6 +122,7 @@ export default function ExcalidrawView(props: NodeViewProps) { isDirtyRef.current = false; } finally { isSavingRef.current = false; + setIsSaving(false); } }, [excalidrawAPI, editor, attachmentId, updateAttributes]); @@ -191,7 +194,7 @@ export default function ExcalidrawView(props: NodeViewProps) { bg="var(--mantine-color-body)" p="xs" > - <Button onClick={handleSaveAndExit} size={"compact-sm"}> + <Button onClick={handleSaveAndExit} size={"compact-sm"} loading={isSaving}> {t("Save & Exit")} </Button> <Button onClick={handleClose} color="red" size={"compact-sm"}> diff --git a/apps/client/src/features/editor/components/image/image-view.module.css b/apps/client/src/features/editor/components/image/image-view.module.css index d326ee5a..987ec0d7 100644 --- a/apps/client/src/features/editor/components/image/image-view.module.css +++ b/apps/client/src/features/editor/components/image/image-view.module.css @@ -5,6 +5,9 @@ max-width: 100%; border-radius: 8px; overflow: hidden; +} + +.skeleton { animation: pulse 1.2s ease-in-out infinite; @mixin light { diff --git a/apps/client/src/features/editor/components/image/image-view.tsx b/apps/client/src/features/editor/components/image/image-view.tsx index defb64c4..1f874694 100644 --- a/apps/client/src/features/editor/components/image/image-view.tsx +++ b/apps/client/src/features/editor/components/image/image-view.tsx @@ -33,6 +33,7 @@ export default function ImageView(props: NodeViewProps) { className={clsx( selected && "ProseMirror-selectednode", classes.imageWrapper, + !src && placeholder && classes.skeleton, alignClass, )} style={{ @@ -54,7 +55,7 @@ export default function ImageView(props: NodeViewProps) { <Loader size={20} pos="absolute" bottom={6} right={6} /> </Group> )} - {!src && !previewSrc && ( + {!src && !previewSrc && placeholder && ( <Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md"> <Loader size={20} style={{ flexShrink: 0 }} /> <Text component="span" size="sm" truncate="end"> diff --git a/apps/client/src/features/editor/components/link/link-menu.tsx b/apps/client/src/features/editor/components/link/link-menu.tsx index e61a586c..4517a79d 100644 --- a/apps/client/src/features/editor/components/link/link-menu.tsx +++ b/apps/client/src/features/editor/components/link/link-menu.tsx @@ -5,7 +5,7 @@ import { useAtom } from "jotai"; import { isTextSelected } from "@docmost/editor-ext"; import { showLinkMenuAtom } from "@/features/editor/atoms/editor-atoms"; import { LinkEditorPanel } from "@/features/editor/components/link/link-editor-panel"; -import { normalizeUrl } from "@/features/editor/components/link/link-view"; +import { normalizeUrl } from "@/lib/utils"; import { TextSelection } from "@tiptap/pm/state"; import { Paper } from "@mantine/core"; diff --git a/apps/client/src/features/editor/components/link/link-view.tsx b/apps/client/src/features/editor/components/link/link-view.tsx index 90b89e82..46227ef9 100644 --- a/apps/client/src/features/editor/components/link/link-view.tsx +++ b/apps/client/src/features/editor/components/link/link-view.tsx @@ -29,12 +29,7 @@ import { useSharePageQuery } from "@/features/share/queries/share-query.ts"; import { buildSharedPageUrl } from "@/features/page/page.utils.ts"; import { extractPageSlugId } from "@/lib"; import { sanitizeUrl, copyToClipboard } from "@docmost/editor-ext"; - -export const normalizeUrl = (url: string): string => { - if (!url) return url; - if (url.startsWith("/") || /^(\S+):(\/\/)?\S+$/.test(url)) return url; - return `https://${url}`; -}; +import { normalizeUrl } from "@/lib/utils"; const parseInternalLink = ( href: string, diff --git a/apps/client/src/features/editor/components/mention/mention-list.tsx b/apps/client/src/features/editor/components/mention/mention-list.tsx index f086df49..3ddf3976 100644 --- a/apps/client/src/features/editor/components/mention/mention-list.tsx +++ b/apps/client/src/features/editor/components/mention/mention-list.tsx @@ -62,7 +62,7 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => { query: props.query, includeUsers: true, includePages: true, - spaceId: space.id, + spaceId: space?.id, limit: props.query ? 10 : 5, preload: true, }); @@ -294,6 +294,7 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => { w={popupWidth} scrollbars={"y"} scrollbarSize={6} + overscrollBehavior={"contain"} styles={{ content: { minWidth: 0 } }} > {renderItems?.map((item, index) => { diff --git a/apps/client/src/features/editor/components/mention/mention-suggestion.ts b/apps/client/src/features/editor/components/mention/mention-suggestion.ts index 658fd182..894e7204 100644 --- a/apps/client/src/features/editor/components/mention/mention-suggestion.ts +++ b/apps/client/src/features/editor/components/mention/mention-suggestion.ts @@ -53,8 +53,8 @@ const mentionRenderItems = () => { const editorDom = props.editor?.view?.dom; const asideEl = editorDom?.closest(".mantine-AppShell-aside"); const dialogEl = editorDom?.closest("[data-comment-dialog]"); - const isInCommentContext = !!(asideEl || dialogEl); - // const isInCommentContext = !!asideEl; + const chatInput = editorDom?.closest("[data-chat-input]"); + const isInCommentContext = !!(asideEl || dialogEl || chatInput); component = new ReactRenderer(MentionList, { props: { ...props, isInCommentContext }, diff --git a/apps/client/src/features/editor/components/pdf/pdf-menu.tsx b/apps/client/src/features/editor/components/pdf/pdf-menu.tsx new file mode 100644 index 00000000..2104bfbc --- /dev/null +++ b/apps/client/src/features/editor/components/pdf/pdf-menu.tsx @@ -0,0 +1,145 @@ +import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus"; +import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react"; +import { useCallback } from "react"; +import { Node as PMNode } from "@tiptap/pm/model"; +import { + EditorMenuProps, + ShouldShowProps, +} from "@/features/editor/components/table/types/types.ts"; +import { ActionIcon, Tooltip } from "@mantine/core"; +import { + IconPaperclip, + IconTrash, +} from "@tabler/icons-react"; +import { useTranslation } from "react-i18next"; +import classes from "../common/toolbar-menu.module.css"; + +export function PdfMenu({ editor }: EditorMenuProps) { + const { t } = useTranslation(); + + const editorState = useEditorState({ + editor, + selector: (ctx) => { + if (!ctx.editor) { + return null; + } + + const pdfAttrs = ctx.editor.getAttributes("pdf"); + + return { + isPdf: ctx.editor.isActive("pdf"), + src: pdfAttrs?.src || null, + name: pdfAttrs?.name || null, + attachmentId: pdfAttrs?.attachmentId || null, + }; + }, + }); + + const shouldShow = useCallback( + ({ state }: ShouldShowProps) => { + if (!state || !editor.isActive("pdf")) { + return false; + } + + const { selection } = state; + const dom = editor.view.nodeDOM(selection.from) as HTMLElement | null; + if (!dom) return false; + + return !!dom.querySelector("[data-pdf-error]"); + }, + [editor], + ); + + const getReferencedVirtualElement = useCallback(() => { + if (!editor) return; + const { selection } = editor.state; + const predicate = (node: PMNode) => node.type.name === "pdf"; + const parent = findParentNode(predicate)(selection); + + if (parent) { + const dom = editor.view.nodeDOM(parent?.pos) as HTMLElement; + const domRect = dom.getBoundingClientRect(); + return { + getBoundingClientRect: () => domRect, + getClientRects: () => [domRect], + }; + } + + const domRect = posToDOMRect(editor.view, selection.from, selection.to); + return { + getBoundingClientRect: () => domRect, + getClientRects: () => [domRect], + }; + }, [editor]); + + const handleConvertToAttachment = useCallback(() => { + if (!editorState?.src) return; + + const { selection } = editor.state; + const { from } = selection; + const node = editor.state.doc.nodeAt(from); + if (!node || node.type.name !== "pdf") return; + + editor + .chain() + .insertContentAt( + { from, to: from + node.nodeSize }, + { + type: "attachment", + attrs: { + url: node.attrs.src, + name: node.attrs.name, + attachmentId: node.attrs.attachmentId, + size: node.attrs.size, + mime: "application/pdf", + }, + }, + ) + .run(); + }, [editor, editorState]); + + const handleDelete = useCallback(() => { + editor.commands.deleteSelection(); + }, [editor]); + + return ( + <BaseBubbleMenu + editor={editor} + pluginKey={`pdf-menu`} + updateDelay={0} + getReferencedVirtualElement={getReferencedVirtualElement} + options={{ + placement: "top", + offset: 8, + flip: false, + }} + shouldShow={shouldShow} + > + <div className={classes.toolbar}> + <Tooltip position="top" label={t("Convert to attachment")} withinPortal={false}> + <ActionIcon + onClick={handleConvertToAttachment} + size="lg" + aria-label={t("Convert to attachment")} + variant="subtle" + > + <IconPaperclip size={18} /> + </ActionIcon> + </Tooltip> + + <Tooltip position="top" label={t("Delete")} withinPortal={false}> + <ActionIcon + onClick={handleDelete} + size="lg" + aria-label={t("Delete")} + variant="subtle" + > + <IconTrash size={18} /> + </ActionIcon> + </Tooltip> + </div> + </BaseBubbleMenu> + ); +} + +export default PdfMenu; diff --git a/apps/client/src/features/editor/components/pdf/pdf-view.module.css b/apps/client/src/features/editor/components/pdf/pdf-view.module.css new file mode 100644 index 00000000..df5af87f --- /dev/null +++ b/apps/client/src/features/editor/components/pdf/pdf-view.module.css @@ -0,0 +1,100 @@ +.pdfWrapper { + display: flex; + justify-content: center; + align-items: center; + max-width: 100%; + border-radius: 8px; + overflow: hidden; +} + +.skeleton { + animation: pulse 1.2s ease-in-out infinite; + + @mixin light { + background: linear-gradient(-90deg, var(--mantine-color-gray-3) 0%, var(--mantine-color-gray-1) 50%, var(--mantine-color-gray-3) 100%); + background-size: 400% 400%; + } + + @mixin dark { + background: linear-gradient(-90deg, var(--mantine-color-dark-6) 0%, var(--mantine-color-dark-5) 50%, var(--mantine-color-dark-6) 100%); + background-size: 400% 400%; + } + + @keyframes pulse { + 0% { + background-position: 0% 0%; + } + 100% { + background-position: -135% 0%; + } + } +} + +.pdfContainer { + display: flex; + justify-content: center; +} + +.pdfResizeWrapper { + @mixin light { + background-color: var(--mantine-color-gray-0); + } + + @mixin dark { + background-color: var(--mantine-color-dark-7); + } +} + +.pdfIframe { + width: 100%; + height: 100%; + border: none; + border-radius: 8px; +} + +.hoverMenu { + position: absolute; + top: 56px; + right: 8px; + z-index: 2; + display: flex; + gap: 4px; + padding: 4px; + border-radius: 6px; + opacity: 0; + transition: opacity 0.15s ease; + background-color: rgba(0, 0, 0, 0.5); +} + +.hoverMenu::before { + content: ""; + position: absolute; + inset: -12px; +} + +.hoverMenu:hover { + opacity: 1; +} + +.pdfResizeWrapper:hover .hoverMenu { + opacity: 1; +} + +.pdfError { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 8px; + padding: 12px 32px; + border-radius: 8px; + cursor: pointer; + + @mixin light { + background-color: var(--mantine-color-gray-0); + } + + @mixin dark { + background-color: var(--mantine-color-dark-7); + } +} diff --git a/apps/client/src/features/editor/components/pdf/pdf-view.tsx b/apps/client/src/features/editor/components/pdf/pdf-view.tsx new file mode 100644 index 00000000..4d06402b --- /dev/null +++ b/apps/client/src/features/editor/components/pdf/pdf-view.tsx @@ -0,0 +1,170 @@ +import { NodeViewProps, NodeViewWrapper } from "@tiptap/react"; +import { ActionIcon, Group, Loader, Text, Tooltip } from "@mantine/core"; +import { useCallback, useMemo, useState } from "react"; +import { getFileUrl } from "@/lib/config.ts"; +import { ResizableWrapper } from "../common/resizable-wrapper"; +import clsx from "clsx"; +import classes from "./pdf-view.module.css"; +import { useTranslation } from "react-i18next"; +import { isInternalFileUrl } from "@docmost/editor-ext"; +import { + IconFileTypePdf, + IconPaperclip, + IconTrash, +} from "@tabler/icons-react"; + +export default function PdfView(props: NodeViewProps) { + const { t } = useTranslation(); + const { editor, node, getPos, selected, updateAttributes } = props; + const { src, placeholder, width: nodeWidth, height: nodeHeight } = node.attrs; + const [hasError, setHasError] = useState(false); + + const safeSrc = useMemo(() => { + if (!src || !isInternalFileUrl(src)) return null; + return getFileUrl(src); + }, [src]); + + const handleSelect = useCallback(() => { + const pos = getPos(); + if (pos !== undefined) { + editor.commands.setNodeSelection(pos); + } + }, [editor, getPos]); + + const handleResize = useCallback( + (newWidth: number, newHeight: number) => { + updateAttributes({ width: newWidth, height: newHeight }); + }, + [updateAttributes], + ); + + const handleConvertToAttachment = useCallback(() => { + if (!src) return; + const pos = getPos(); + if (pos === undefined) return; + const currentNode = editor.state.doc.nodeAt(pos); + if (!currentNode || currentNode.type.name !== "pdf") return; + + editor + .chain() + .insertContentAt( + { from: pos, to: pos + currentNode.nodeSize }, + { + type: "attachment", + attrs: { + url: currentNode.attrs.src, + name: currentNode.attrs.name, + attachmentId: currentNode.attrs.attachmentId, + size: currentNode.attrs.size, + mime: "application/pdf", + }, + }, + ) + .run(); + }, [editor, src, getPos]); + + const handleDelete = useCallback(() => { + const pos = getPos(); + if (pos === undefined) return; + editor.commands.setNodeSelection(pos); + editor.commands.deleteSelection(); + }, [editor, getPos]); + + if (!src || !safeSrc) { + return ( + <NodeViewWrapper data-drag-handle> + <div className={`${classes.pdfWrapper} ${placeholder ? classes.skeleton : ''}`} style={{ height: placeholder ? 600 : undefined }}> + {placeholder && ( + <Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md"> + <Loader size={20} style={{ flexShrink: 0 }} /> + <Text component="span" size="sm" truncate="end"> + {placeholder?.name + ? t("Uploading {{name}}", { name: placeholder.name }) + : t("Uploading file")} + </Text> + </Group> + )} + </div> + </NodeViewWrapper> + ); + } + + if (hasError) { + return ( + <NodeViewWrapper data-drag-handle> + <div data-pdf-error className={clsx(classes.pdfError, { "ProseMirror-selectednode": selected })} onClick={handleSelect}> + <IconFileTypePdf size={32} stroke={1.5} /> + <Text size="sm" c="dimmed"> + {t("Failed to load PDF")} + </Text> + </div> + </NodeViewWrapper> + ); + } + + return ( + <NodeViewWrapper data-drag-handle className={classes.pdfNodeView}> + <div className={classes.pdfContainer}> + <ResizableWrapper + initialWidth={nodeWidth || 800} + initialHeight={nodeHeight || 600} + minWidth={200} + maxWidth={1200} + minHeight={200} + maxHeight={1200} + onResize={handleResize} + isEditable={editor.isEditable} + selected={selected} + className={clsx(classes.pdfResizeWrapper, { + "ProseMirror-selectednode": selected, + })} + > + <iframe + className={classes.pdfIframe} + src={safeSrc} + loading="lazy" + frameBorder="0" + onError={() => setHasError(true)} + onLoad={(e) => { + try { + const iframe = e.currentTarget; + const status = iframe.contentDocument?.querySelector("pre")?.textContent; + if (status && status.includes('"statusCode":404')) { + setHasError(true); + } + } catch { + // cross-origin - can't inspect, assume OK + } + }} + /> + {editor.isEditable && ( + <div className={classes.hoverMenu}> + <Tooltip position="top" label={t("Convert to attachment")} withinPortal> + <ActionIcon + size="sm" + variant="filled" + color="dark" + onClick={handleConvertToAttachment} + aria-label={t("Convert to attachment")} + > + <IconPaperclip size={14} /> + </ActionIcon> + </Tooltip> + <Tooltip position="top" label={t("Delete")} withinPortal> + <ActionIcon + size="sm" + variant="filled" + color="dark" + onClick={handleDelete} + aria-label={t("Delete")} + > + <IconTrash size={14} /> + </ActionIcon> + </Tooltip> + </div> + )} + </ResizableWrapper> + </div> + </NodeViewWrapper> + ); +} diff --git a/apps/client/src/features/editor/components/pdf/upload-pdf-action.tsx b/apps/client/src/features/editor/components/pdf/upload-pdf-action.tsx new file mode 100644 index 00000000..31a56f5b --- /dev/null +++ b/apps/client/src/features/editor/components/pdf/upload-pdf-action.tsx @@ -0,0 +1,36 @@ +import { handlePdfUpload } from "@docmost/editor-ext"; +import { uploadFile } from "@/features/page/services/page-service.ts"; +import { notifications } from "@mantine/notifications"; +import { getFileUploadSizeLimit } from "@/lib/config.ts"; +import { formatBytes } from "@/lib"; +import i18n from "@/i18n.ts"; + +export const uploadPdfAction = handlePdfUpload({ + onUpload: async (file: File, pageId: string): Promise<any> => { + try { + return await uploadFile(file, pageId); + } catch (err) { + notifications.show({ + color: "red", + message: err?.response.data.message, + }); + throw err; + } + }, + validateFn: (file) => { + if (file.type !== "application/pdf") { + return false; + } + + if (file.size > getFileUploadSizeLimit()) { + notifications.show({ + color: "red", + message: i18n.t("File exceeds the {{limit}} attachment limit", { + limit: formatBytes(getFileUploadSizeLimit()), + }), + }); + return false; + } + return true; + }, +}); diff --git a/apps/client/src/features/editor/components/slash-menu/command-list.tsx b/apps/client/src/features/editor/components/slash-menu/command-list.tsx index ab1dcafd..54d6cd17 100644 --- a/apps/client/src/features/editor/components/slash-menu/command-list.tsx +++ b/apps/client/src/features/editor/components/slash-menu/command-list.tsx @@ -87,7 +87,13 @@ const CommandList = ({ return flatItems.length > 0 ? ( <Paper id="slash-command" shadow="md" p="xs" withBorder> - <ScrollArea viewportRef={viewportRef} h={350} w={270} scrollbarSize={8}> + <ScrollArea + viewportRef={viewportRef} + h={350} + w={270} + scrollbarSize={8} + overscrollBehavior="contain" + > {Object.entries(items).map(([category, categoryItems]) => ( <div key={category}> <Text c="dimmed" mb={4} fw={500} tt="capitalize"> @@ -103,10 +109,7 @@ const CommandList = ({ })} > <Group> - <ActionIcon - variant="default" - component="div" - > + <ActionIcon variant="default" component="div"> <item.icon size={18} /> </ActionIcon> diff --git a/apps/client/src/features/editor/components/slash-menu/menu-items.ts b/apps/client/src/features/editor/components/slash-menu/menu-items.ts index 15cdcf73..875e2efd 100644 --- a/apps/client/src/features/editor/components/slash-menu/menu-items.ts +++ b/apps/client/src/features/editor/components/slash-menu/menu-items.ts @@ -12,7 +12,9 @@ import { IconMath, IconMathFunction, IconMovie, + IconMusic, IconPaperclip, + IconFileTypePdf, IconPhoto, IconTable, IconTypography, @@ -30,7 +32,9 @@ import { } from "@/features/editor/components/slash-menu/types"; import { uploadImageAction } from "@/features/editor/components/image/upload-image-action.tsx"; import { uploadVideoAction } from "@/features/editor/components/video/upload-video-action.tsx"; +import { uploadAudioAction } from "@/features/editor/components/audio/upload-audio-action.tsx"; import { uploadAttachmentAction } from "@/features/editor/components/attachment/upload-attachment-action.tsx"; +import { uploadPdfAction } from "@/features/editor/components/pdf/upload-pdf-action.tsx"; import IconExcalidraw from "@/components/icons/icon-excalidraw"; import IconMermaid from "@/components/icons/icon-mermaid"; import IconDrawio from "@/components/icons/icon-drawio"; @@ -161,7 +165,7 @@ const CommandGroups: SlashMenuGroupedItemsType = { { title: "Image", description: "Upload any image from your device.", - searchTerms: ["photo", "picture", "media"], + searchTerms: ["photo", "picture", "media", "file", "attachment"], icon: IconPhoto, command: ({ editor, range }) => { editor.chain().focus().deleteRange(range).run(); @@ -194,7 +198,7 @@ const CommandGroups: SlashMenuGroupedItemsType = { { title: "Video", description: "Upload any video from your device.", - searchTerms: ["video", "mp4", "media"], + searchTerms: ["video", "mp4", "media", "file", "attachment"], icon: IconMovie, command: ({ editor, range }) => { editor.chain().focus().deleteRange(range).run(); @@ -224,10 +228,74 @@ const CommandGroups: SlashMenuGroupedItemsType = { input.click(); }, }, + { + title: "Audio", + description: "Upload any audio from your device.", + searchTerms: ["audio", "music", "sound", "mp3", "media", "file", "attachment"], + icon: IconMusic, + command: ({ editor, range }) => { + editor.chain().focus().deleteRange(range).run(); + + // @ts-ignore + const pageId = editor.storage?.pageId; + if (!pageId) return; + + // upload audio + const input = document.createElement("input"); + input.type = "file"; + input.accept = "audio/*"; + input.multiple = true; + input.style.display = "none"; + document.body.appendChild(input); + input.onchange = async () => { + if (input.files?.length) { + for (const file of input.files) { + const pos = editor.view.state.selection.from; + + uploadAudioAction(file, editor, pos, pageId); + } + } + + input.remove(); + }; + input.click(); + }, + }, + { + title: "Embed PDF", + description: "Upload and embed a PDF file.", + searchTerms: ["pdf", "document", "embed"], + icon: IconFileTypePdf, + command: ({ editor, range }) => { + editor.chain().focus().deleteRange(range).run(); + + // @ts-ignore + const pageId = editor.storage?.pageId; + if (!pageId) return; + + const input = document.createElement("input"); + input.type = "file"; + input.accept = "application/pdf"; + input.style.display = "none"; + document.body.appendChild(input); + input.onchange = async () => { + if (input.files?.length) { + for (const file of input.files) { + const pos = editor.view.state.selection.from; + + uploadPdfAction(file, editor, pos, pageId); + } + } + + input.remove(); + }; + input.click(); + }, + }, { title: "File attachment", description: "Upload any file from your device.", - searchTerms: ["file", "attachment", "upload", "pdf", "csv", "zip"], + searchTerms: ["file", "attachment", "upload", "csv", "zip"], icon: IconPaperclip, command: ({ editor, range }) => { editor.chain().focus().deleteRange(range).run(); @@ -359,7 +427,7 @@ const CommandGroups: SlashMenuGroupedItemsType = { editor.chain().focus().deleteRange(range).setDrawio().run(), }, { - title: "Excalidraw diagram", + title: "Excalidraw (Whiteboard)", description: "Draw and sketch excalidraw diagrams", searchTerms: ["diagrams", "draw", "sketch", "whiteboard"], icon: IconExcalidraw, @@ -548,7 +616,7 @@ const CommandGroups: SlashMenuGroupedItemsType = { { title: "YouTube", description: "Embed YouTube video", - searchTerms: ["youtube", "yt"], + searchTerms: ["youtube", "yt", "media", "video"], icon: YoutubeIcon, command: ({ editor, range }: CommandProps) => { editor @@ -650,7 +718,11 @@ export const getSuggestionItems = ({ }); if (filteredItems.length) { - filteredGroups[group] = filteredItems; + filteredGroups[group] = filteredItems.sort((a, b) => { + const aTitle = a.title.toLowerCase().includes(search) ? 0 : 1; + const bTitle = b.title.toLowerCase().includes(search) ? 0 : 1; + return aTitle - bTitle; + }); } } diff --git a/apps/client/src/features/editor/components/slash-menu/render-items.ts b/apps/client/src/features/editor/components/slash-menu/render-items.ts index 057e8214..041aa036 100644 --- a/apps/client/src/features/editor/components/slash-menu/render-items.ts +++ b/apps/client/src/features/editor/components/slash-menu/render-items.ts @@ -49,7 +49,7 @@ const renderItems = () => { getReferenceClientRect = props.clientRect; popup = document.createElement("div"); - popup.style.zIndex = "9999"; + popup.style.zIndex = "199"; popup.style.position = "absolute"; popup.style.top = "0"; popup.style.left = "0"; diff --git a/apps/client/src/features/editor/components/table/table-menu.tsx b/apps/client/src/features/editor/components/table/table-menu.tsx index 66fe4d7b..4adafb20 100644 --- a/apps/client/src/features/editor/components/table/table-menu.tsx +++ b/apps/client/src/features/editor/components/table/table-menu.tsx @@ -34,7 +34,7 @@ export const TableMenu = React.memo( if (isTextSelected(editor)) return false; return editor.isActive("table") && !isCellSelection(state.selection); }, - [editor] + [editor], ); const getReferencedVirtualElement = useCallback(() => { @@ -121,7 +121,11 @@ export const TableMenu = React.memo( shouldShow={shouldShow} > <div className={classes.toolbar}> - <Tooltip position="top" label={t("Add left column")}> + <Tooltip + position="top" + label={t("Add left column")} + withinPortal={false} + > <ActionIcon onClick={addColumnLeft} variant="subtle" @@ -132,7 +136,11 @@ export const TableMenu = React.memo( </ActionIcon> </Tooltip> - <Tooltip position="top" label={t("Add right column")}> + <Tooltip + position="top" + label={t("Add right column")} + withinPortal={false} + > <ActionIcon onClick={addColumnRight} variant="subtle" @@ -143,7 +151,11 @@ export const TableMenu = React.memo( </ActionIcon> </Tooltip> - <Tooltip position="top" label={t("Delete column")}> + <Tooltip + position="top" + label={t("Delete column")} + withinPortal={false} + > <ActionIcon onClick={deleteColumn} variant="subtle" @@ -156,7 +168,11 @@ export const TableMenu = React.memo( <div className={classes.divider} /> - <Tooltip position="top" label={t("Add row above")}> + <Tooltip + position="top" + label={t("Add row above")} + withinPortal={false} + > <ActionIcon onClick={addRowAbove} variant="subtle" @@ -167,7 +183,11 @@ export const TableMenu = React.memo( </ActionIcon> </Tooltip> - <Tooltip position="top" label={t("Add row below")}> + <Tooltip + position="top" + label={t("Add row below")} + withinPortal={false} + > <ActionIcon onClick={addRowBelow} variant="subtle" @@ -178,7 +198,7 @@ export const TableMenu = React.memo( </ActionIcon> </Tooltip> - <Tooltip position="top" label={t("Delete row")}> + <Tooltip position="top" label={t("Delete row")} withinPortal={false}> <ActionIcon onClick={deleteRow} variant="subtle" @@ -191,7 +211,11 @@ export const TableMenu = React.memo( <div className={classes.divider} /> - <Tooltip position="top" label={t("Toggle header row")}> + <Tooltip + position="top" + label={t("Toggle header row")} + withinPortal={false} + > <ActionIcon onClick={toggleHeaderRow} variant="subtle" @@ -202,7 +226,11 @@ export const TableMenu = React.memo( </ActionIcon> </Tooltip> - <Tooltip position="top" label={t("Toggle header column")}> + <Tooltip + position="top" + label={t("Toggle header column")} + withinPortal={false} + > <ActionIcon onClick={toggleHeaderColumn} variant="subtle" @@ -215,7 +243,11 @@ export const TableMenu = React.memo( <div className={classes.divider} /> - <Tooltip position="top" label={t("Delete table")}> + <Tooltip + position="top" + label={t("Delete table")} + withinPortal={false} + > <ActionIcon onClick={deleteTable} variant="subtle" @@ -228,7 +260,7 @@ export const TableMenu = React.memo( </div> </BubbleMenu> ); - } + }, ); export default TableMenu; diff --git a/apps/client/src/features/editor/components/video/video-view.module.css b/apps/client/src/features/editor/components/video/video-view.module.css index 8d1d28c2..f1a51846 100644 --- a/apps/client/src/features/editor/components/video/video-view.module.css +++ b/apps/client/src/features/editor/components/video/video-view.module.css @@ -5,6 +5,9 @@ max-width: 100%; border-radius: 8px; overflow: hidden; +} + +.skeleton { animation: pulse 1.2s ease-in-out infinite; @mixin light { @@ -26,6 +29,7 @@ } } } + .video { display: block; width: 100%; diff --git a/apps/client/src/features/editor/components/video/video-view.tsx b/apps/client/src/features/editor/components/video/video-view.tsx index e2473afc..46ff7908 100644 --- a/apps/client/src/features/editor/components/video/video-view.tsx +++ b/apps/client/src/features/editor/components/video/video-view.tsx @@ -33,6 +33,7 @@ export default function VideoView(props: NodeViewProps) { className={clsx( selected && "ProseMirror-selectednode", classes.videoWrapper, + !src && placeholder && classes.skeleton, alignClass, )} style={{ @@ -59,7 +60,7 @@ export default function VideoView(props: NodeViewProps) { <Loader size={20} pos="absolute" top={6} right={6} /> </Group> )} - {!src && !previewSrc && ( + {!src && !previewSrc && placeholder && ( <Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md"> <Loader size={20} style={{ flexShrink: 0 }} /> <Text component="span" size="sm" truncate="end"> @@ -69,6 +70,9 @@ export default function VideoView(props: NodeViewProps) { </Text> </Group> )} + {!src && !previewSrc && !placeholder && ( + <video className={classes.video} controls /> + )} </div> </NodeViewWrapper> ); diff --git a/apps/client/src/features/editor/extensions/autojoiner.ts b/apps/client/src/features/editor/extensions/autojoiner.ts new file mode 100644 index 00000000..b69ed042 --- /dev/null +++ b/apps/client/src/features/editor/extensions/autojoiner.ts @@ -0,0 +1,105 @@ +// https://github.com/NiclasDev63/tiptap-extension-auto-joiner - MIT +import { Extension } from "@tiptap/core"; +import { Plugin, PluginKey } from "@tiptap/pm/state"; +import { canJoin } from "@tiptap/pm/transform"; +import { getNodeType } from "@tiptap/react"; +import { NodeType } from "@tiptap/pm/model"; +import { Transaction } from "@tiptap/pm/state"; + +// https://discuss.prosemirror.net/t/how-to-autojoin-all-the-time/2957/4 +// Adapted from prosemirror-commands wrapDispatchForJoin +function autoJoin( + transactions: readonly Transaction[], + newTr: Transaction, + nodeTypes: NodeType[] +) { + // Collect changed ranges across all transactions, mapping earlier ranges + // forward through later mappings so every position lands in newTr.doc space. + let ranges: number[] = []; + for (const tr of transactions) { + for (let i = 0; i < tr.mapping.maps.length; i++) { + let map = tr.mapping.maps[i]; + if (!map) continue; + for (let j = 0; j < ranges.length; j++) ranges[j] = map.map(ranges[j]!); + map.forEach((_s, _e, from, to) => ranges.push(from, to)); + } + } + + // Figure out which joinable points exist inside those ranges, + // by checking all node boundaries in their parent nodes. + // Resolve against newTr.doc — the same document we will join on. + let joinable: number[] = []; + for (let i = 0; i < ranges.length; i += 2) { + let from = ranges[i]!, + to = ranges[i + 1]!; + let $from = newTr.doc.resolve(from), + depth = $from.sharedDepth(to), + parent = $from.node(depth); + for ( + let index = $from.indexAfter(depth), pos = $from.after(depth + 1); + pos <= to; + ++index + ) { + let after = parent.maybeChild(index); + if (!after) break; + if (index && joinable.indexOf(pos) == -1) { + let before = parent.child(index - 1); + if (before.type == after.type && nodeTypes.includes(before.type)) + joinable.push(pos); + } + pos += after.nodeSize; + } + } + + // Join the joinable points (reverse order to preserve earlier positions) + let joined = false; + joinable.sort((a, b) => a - b); + for (let i = joinable.length - 1; i >= 0; i--) { + if (canJoin(newTr.doc, joinable[i]!)) { + newTr.join(joinable[i]!); + joined = true; + } + } + + return joined; +} + +export interface AutoJoinerOptions { + elementsToJoin: string[]; +} + +const AutoJoiner = Extension.create<AutoJoinerOptions>({ + name: "autoJoiner", + + addOptions() { + return { + elementsToJoin: [], + }; + }, + + addProseMirrorPlugins() { + const plugin = new PluginKey(this.name); + const joinableNodes = [ + this.editor.schema.nodes.bulletList, + this.editor.schema.nodes.orderedList, + ]; + this.options.elementsToJoin.forEach((element) => { + const nodeTyp = getNodeType(element, this.editor.schema); + joinableNodes.push(nodeTyp); + }); + + return [ + new Plugin({ + key: plugin, + appendTransaction(transactions, _, newState) { + let newTr = newState.tr; + if (autoJoin(transactions, newTr, joinableNodes as NodeType[])) { + return newTr; + } + }, + }), + ]; + }, +}); + +export default AutoJoiner; diff --git a/apps/client/src/features/editor/extensions/extensions.ts b/apps/client/src/features/editor/extensions/extensions.ts index 24618b92..1ad93308 100644 --- a/apps/client/src/features/editor/extensions/extensions.ts +++ b/apps/client/src/features/editor/extensions/extensions.ts @@ -32,6 +32,7 @@ import { TiptapImage, Callout, TiptapVideo, + TiptapAudio, LinkExtension, Selection, Attachment, @@ -39,6 +40,7 @@ import { Drawio, Excalidraw, Embed, + TiptapPdf, SearchAndReplace, Mention, TableDndExtension, @@ -70,11 +72,13 @@ import ImageView from "@/features/editor/components/image/image-view.tsx"; import CalloutView from "@/features/editor/components/callout/callout-view.tsx"; import StatusView from "@/features/editor/components/status/status-view.tsx"; import VideoView from "@/features/editor/components/video/video-view.tsx"; +import AudioView from "@/features/editor/components/audio/audio-view.tsx"; import AttachmentView from "@/features/editor/components/attachment/attachment-view.tsx"; import CodeBlockView from "@/features/editor/components/code-block/code-block-view.tsx"; import DrawioView from "../components/drawio/drawio-view"; import ExcalidrawView from "@/features/editor/components/excalidraw/excalidraw-view.tsx"; import EmbedView from "@/features/editor/components/embed/embed-view.tsx"; +import PdfView from "@/features/editor/components/pdf/pdf-view.tsx"; import SubpagesView from "@/features/editor/components/subpages/subpages-view.tsx"; import { common, createLowlight } from "lowlight"; import plaintext from "highlight.js/lib/languages/plaintext"; @@ -95,6 +99,7 @@ import i18n from "@/i18n.ts"; import { MarkdownClipboard } from "@/features/editor/extensions/markdown-clipboard.ts"; import EmojiCommand from "./emoji-command"; import { countWords } from "alfaaz"; +import AutoJoiner from "@/features/editor/extensions/autojoiner.ts"; const lowlight = createLowlight(common); lowlight.register("mermaid", plaintext); @@ -139,6 +144,25 @@ export const mainExtensions = [ }), ]; }, + addKeyboardShortcuts() { + return { + Enter: ({ editor }) => { + const { from, to } = editor.state.selection; + if (from !== to) return false; + if (!editor.isActive("code")) return false; + + const $from = editor.state.doc.resolve(from); + const codeType = editor.state.schema.marks.code; + const nodeAfter = $from.nodeAfter; + + if (nodeAfter && codeType.isInSet(nodeAfter.marks)) { + return false; + } + + return editor.chain().unsetCode().splitBlock().run(); + }, + }; + }, }), SharedStorage, Heading, @@ -250,8 +274,8 @@ export const mainExtensions = [ resize: { enabled: true, directions: ["left", "right"], - minWidth: 80, - minHeight: 40, + minWidth: 24, + minHeight: 16, alwaysPreserveAspectRatio: true, //@ts-ignore createCustomHandle: createImageHandle, @@ -263,14 +287,17 @@ export const mainExtensions = [ resize: { enabled: true, directions: ["left", "right"], - minWidth: 80, - minHeight: 40, + minWidth: 24, + minHeight: 16, alwaysPreserveAspectRatio: true, //@ts-ignore createCustomHandle: createResizeHandle, className: buildResizeClasses("node-video"), }, }), + TiptapAudio.configure({ + view: AudioView, + }), Callout.configure({ view: CalloutView, }), @@ -291,8 +318,8 @@ export const mainExtensions = [ resize: { enabled: true, directions: ["left", "right"], - minWidth: 80, - minHeight: 40, + minWidth: 24, + minHeight: 16, alwaysPreserveAspectRatio: true, //@ts-ignore createCustomHandle: createResizeHandle, @@ -304,8 +331,8 @@ export const mainExtensions = [ resize: { enabled: true, directions: ["left", "right"], - minWidth: 80, - minHeight: 40, + minWidth: 24, + minHeight: 16, alwaysPreserveAspectRatio: true, //@ts-ignore createCustomHandle: createResizeHandle, @@ -315,6 +342,9 @@ export const mainExtensions = [ Embed.configure({ view: EmbedView, }), + TiptapPdf.configure({ + view: PdfView, + }), Subpages.configure({ view: SubpagesView, }), @@ -345,6 +375,9 @@ export const mainExtensions = [ }).configure(), Columns, Column, + AutoJoiner.configure({ + elementsToJoin: [], + }), ] as any; type CollabExtensions = (provider: HocuspocusProvider, user: IUser) => any[]; diff --git a/apps/client/src/features/editor/extensions/markdown-clipboard.ts b/apps/client/src/features/editor/extensions/markdown-clipboard.ts index e1e3707d..230798c5 100644 --- a/apps/client/src/features/editor/extensions/markdown-clipboard.ts +++ b/apps/client/src/features/editor/extensions/markdown-clipboard.ts @@ -1,9 +1,9 @@ // adapted from: https://github.com/aguingand/tiptap-markdown/blob/main/src/extensions/tiptap/clipboard.js - MIT import { Extension } from "@tiptap/core"; -import { Plugin, PluginKey } from "@tiptap/pm/state"; -import { DOMParser } from "@tiptap/pm/model"; +import { Plugin, PluginKey, TextSelection } from "@tiptap/pm/state"; +import { DOMParser, DOMSerializer, Fragment, Slice } from "@tiptap/pm/model"; import { find } from "linkifyjs"; -import { markdownToHtml } from "@docmost/editor-ext"; +import { markdownToHtml, htmlToMarkdown } from "@docmost/editor-ext"; export const MarkdownClipboard = Extension.create({ name: "markdownClipboard", @@ -19,6 +19,27 @@ export const MarkdownClipboard = Extension.create({ new Plugin({ key: new PluginKey("markdownClipboard"), props: { + clipboardTextSerializer: (slice) => { + const listTypes = ["bulletList", "orderedList", "taskList"]; + let topLevelCount = 0; + let hasList = false; + slice.content.forEach((node) => { + if (listTypes.includes(node.type.name)) { + hasList = true; + topLevelCount += node.childCount; + } else { + topLevelCount++; + } + }); + + if (!hasList || topLevelCount < 2) return null; + + const div = document.createElement("div"); + const serializer = DOMSerializer.fromSchema(this.editor.schema); + const fragment = serializer.serializeFragment(slice.content); + div.appendChild(fragment); + return htmlToMarkdown(div.innerHTML); + }, handlePaste: (view, event, slice) => { if (!event.clipboardData) { return false; @@ -29,49 +50,80 @@ export const MarkdownClipboard = Extension.create({ } const text = event.clipboardData.getData("text/plain"); + const html = event.clipboardData.getData("text/html"); const vscode = event.clipboardData.getData("vscode-editor-data"); const vscodeData = vscode ? JSON.parse(vscode) : undefined; const language = vscodeData?.mode; - if (language !== "markdown") { + const isVscodeMarkdown = language === "markdown"; + const isPlainTextOnly = !html && !vscode && !!text; + + if (!isVscodeMarkdown && !isPlainTextOnly) { return false; } + if (isPlainTextOnly) { + if ((view as any).input?.shiftKey || !this.options.transformPastedText) { + return false; + } + + const link = find(text, { + defaultProtocol: "http", + }).find((item) => item.isLink && item.value === text); + + if (link) { + return false; + } + } + const { tr } = view.state; const { from, to } = view.state.selection; - const html = markdownToHtml(text); + const parsed = markdownToHtml(text.replace(/\n+$/, "")); const contentNodes = DOMParser.fromSchema( this.editor.schema, - ).parseSlice(elementFromString(html), { + ).parseSlice(elementFromString(parsed), { preserveWhitespace: true, }); tr.replaceRange(from, to, contentNodes); + const insertEnd = tr.mapping.map(from, 1); + tr.setSelection(TextSelection.near(tr.doc.resolve(Math.max(from, insertEnd - 2)), -1)); tr.setMeta('paste', true) view.dispatch(tr); return true; }, - clipboardTextParser: (text, context, plainText) => { - const link = find(text, { - defaultProtocol: "http", - }).find((item) => item.isLink && item.value === text); + // Strip trailing whitespace-only paragraphs from pasted content. + // Terminals (GNOME Terminal, etc.) often include trailing + // whitespace in their HTML clipboard data, which ProseMirror + // parses as an extra paragraph. Inside a list item this creates + // an orphan empty line that breaks the list structure. + transformPasted: (slice) => { + let { content, openStart, openEnd } = slice; - if (plainText || !this.options.transformPastedText || link) { - // don't parse plaintext link to allow link paste handler to work - // pasting with shift key prevents formatting - return null; + // Remove trailing paragraphs that contain only whitespace + while (content.childCount > 1) { + const lastChild = content.lastChild; + if ( + lastChild?.type.name === "paragraph" && + lastChild.textContent.trim() === "" + ) { + const children = []; + for (let i = 0; i < content.childCount - 1; i++) { + children.push(content.child(i)); + } + content = Fragment.from(children); + } else { + break; + } } - const parsed = markdownToHtml(text); - return DOMParser.fromSchema(this.editor.schema).parseSlice( - elementFromString(parsed), - { - preserveWhitespace: true, - context, - }, - ); + if (content !== slice.content) { + return new Slice(content, openStart, Math.max(openEnd, 1)); + } + + return slice; }, }, }), diff --git a/apps/client/src/features/editor/full-editor.tsx b/apps/client/src/features/editor/full-editor.tsx index cbe16adb..89eb7ca8 100644 --- a/apps/client/src/features/editor/full-editor.tsx +++ b/apps/client/src/features/editor/full-editor.tsx @@ -16,6 +16,7 @@ export interface FullEditorProps { content: string; spaceSlug: string; editable: boolean; + canComment?: boolean; } export function FullEditor({ @@ -25,6 +26,7 @@ export function FullEditor({ content, spaceSlug, editable, + canComment, }: FullEditorProps) { const [user] = useAtom(userAtom); const fullPageWidth = user.settings?.preferences?.fullPageWidth; @@ -46,6 +48,7 @@ export function FullEditor({ pageId={pageId} editable={editable} content={content} + canComment={canComment} /> </Container> ); diff --git a/apps/client/src/features/editor/page-editor.tsx b/apps/client/src/features/editor/page-editor.tsx index a226d3d2..7cc4723a 100644 --- a/apps/client/src/features/editor/page-editor.tsx +++ b/apps/client/src/features/editor/page-editor.tsx @@ -37,14 +37,17 @@ import { asideStateAtom } from "@/components/layouts/global/hooks/atoms/sidebar- import { activeCommentIdAtom, showCommentPopupAtom, + showReadOnlyCommentPopupAtom, } from "@/features/comment/atoms/comment-atom"; import CommentDialog from "@/features/comment/components/comment-dialog"; import { EditorBubbleMenu } from "@/features/editor/components/bubble-menu/bubble-menu"; +import { ReadonlyBubbleMenu } from "@/features/editor/components/bubble-menu/readonly-bubble-menu"; import TableCellMenu from "@/features/editor/components/table/table-cell-menu.tsx"; import TableMenu from "@/features/editor/components/table/table-menu.tsx"; import ImageMenu from "@/features/editor/components/image/image-menu.tsx"; import CalloutMenu from "@/features/editor/components/callout/callout-menu.tsx"; import VideoMenu from "@/features/editor/components/video/video-menu.tsx"; +import PdfMenu from "@/features/editor/components/pdf/pdf-menu.tsx"; import SubpagesMenu from "@/features/editor/components/subpages/subpages-menu.tsx"; import { handleFileDrop, @@ -73,12 +76,14 @@ interface PageEditorProps { pageId: string; editable: boolean; content: any; + canComment?: boolean; } export default function PageEditor({ pageId, editable, content, + canComment, }: PageEditorProps) { const collaborationURL = useCollaborationUrl(); const isComponentMounted = useRef(false); @@ -93,6 +98,7 @@ export default function PageEditor({ const [, setAsideState] = useAtom(asideStateAtom); const [, setActiveCommentId] = useAtom(activeCommentIdAtom); const [showCommentPopup, setShowCommentPopup] = useAtom(showCommentPopupAtom); + const [showReadOnlyCommentPopup] = useAtom(showReadOnlyCommentPopupAtom); const [isLocalSynced, setIsLocalSynced] = useState(false); const [isRemoteSynced, setIsRemoteSynced] = useState(false); const [yjsConnectionStatus, setYjsConnectionStatus] = useAtom( @@ -414,6 +420,7 @@ export default function PageEditor({ <TableCellMenu editor={editor} appendTo={menuContainerRef} /> <ImageMenu editor={editor} /> <VideoMenu editor={editor} /> + <PdfMenu editor={editor} /> <CalloutMenu editor={editor} /> <SubpagesMenu editor={editor} /> <ExcalidrawMenu editor={editor} /> @@ -421,7 +428,13 @@ export default function PageEditor({ <ColumnsMenu editor={editor} /> </div> )} + {editor && !editorIsEditable && (editable || canComment) && providersRef.current && ( + <ReadonlyBubbleMenu editor={editor} /> + )} {showCommentPopup && <CommentDialog editor={editor} pageId={pageId} />} + {showReadOnlyCommentPopup && ( + <CommentDialog editor={editor} pageId={pageId} readOnly /> + )} </div> <div onClick={() => editor.commands.focus("end")} diff --git a/apps/client/src/features/editor/styles/core.css b/apps/client/src/features/editor/styles/core.css index 1f8861f3..34ddaca3 100644 --- a/apps/client/src/features/editor/styles/core.css +++ b/apps/client/src/features/editor/styles/core.css @@ -133,10 +133,18 @@ border-top: 1px solid #68cef8; } + &[contenteditable="false"] hr.ProseMirror-selectednode { + border-top: none; + } + .ProseMirror-selectednode { outline: 2px solid #70cff8; } + &[contenteditable="false"] .ProseMirror-selectednode { + outline: none; + } + & > .react-renderer { margin-top: var(--mantine-spacing-sm); margin-bottom: var(--mantine-spacing-sm); diff --git a/apps/client/src/features/editor/styles/media.css b/apps/client/src/features/editor/styles/media.css index ac9cf3f7..0b02cdbe 100644 --- a/apps/client/src/features/editor/styles/media.css +++ b/apps/client/src/features/editor/styles/media.css @@ -8,7 +8,7 @@ } } - .node-image, .node-video, .node-excalidraw, .node-drawio { + .node-image, .node-video, .node-pdf, .node-excalidraw, .node-drawio { &.ProseMirror-selectednode { outline: none; } @@ -37,5 +37,28 @@ font-size: var(--mantine-font-size-md); line-height: var(--mantine-line-height-md); } + + .media-pulse { + animation: media-pulse 1.2s ease-in-out infinite; + + @mixin light { + background: linear-gradient(-90deg, var(--mantine-color-gray-3) 0%, var(--mantine-color-gray-1) 50%, var(--mantine-color-gray-3) 100%); + background-size: 400% 400%; + } + + @mixin dark { + background: linear-gradient(-90deg, var(--mantine-color-dark-6) 0%, var(--mantine-color-dark-5) 50%, var(--mantine-color-dark-6) 100%); + background-size: 400% 400%; + } + + @keyframes media-pulse { + 0% { + background-position: 0% 0%; + } + 100% { + background-position: -135% 0%; + } + } + } } diff --git a/apps/client/src/features/home/components/home-ai-prompt.module.css b/apps/client/src/features/home/components/home-ai-prompt.module.css new file mode 100644 index 00000000..e6d81606 --- /dev/null +++ b/apps/client/src/features/home/components/home-ai-prompt.module.css @@ -0,0 +1,28 @@ +.wrapper { + display: flex; + flex-direction: column; + align-items: center; + padding: var(--mantine-spacing-xl) var(--mantine-spacing-md) var(--mantine-spacing-lg); +} + +.heading { + font-size: 1.75rem; + font-weight: 600; + color: light-dark(var(--mantine-color-gray-8), var(--mantine-color-dark-0)); + text-align: center; + margin: 0; + line-height: 1.2; +} + +.subtitle { + font-size: var(--mantine-font-size-sm); + color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2)); + text-align: center; + margin-top: 6px; + margin-bottom: var(--mantine-spacing-lg); +} + +.inputContainer { + width: 100%; + max-width: 640px; +} diff --git a/apps/client/src/features/home/components/home-ai-prompt.tsx b/apps/client/src/features/home/components/home-ai-prompt.tsx new file mode 100644 index 00000000..c3c69398 --- /dev/null +++ b/apps/client/src/features/home/components/home-ai-prompt.tsx @@ -0,0 +1,60 @@ +import { useAtomValue } from "jotai"; +import { useNavigate } from "react-router-dom"; +import { useTranslation } from "react-i18next"; +import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts"; +import ChatInput from "@/ee/ai-chat/components/chat-input"; +import type { + ChatAttachment, + PageMention, +} from "@/ee/ai-chat/types/ai-chat.types"; +import classes from "./home-ai-prompt.module.css"; + +export type HomeAiPromptInitialState = { + initialContent: string; + initialMentions: PageMention[]; + initialAttachments: ChatAttachment[]; +}; + +export default function HomeAiPrompt() { + const { t } = useTranslation(); + const navigate = useNavigate(); + const workspace = useAtomValue(workspaceAtom); + + const aiChatEnabled = workspace?.settings?.ai?.chat === true; + if (!aiChatEnabled) return null; + + const handleSend = ( + content: string, + mentions: PageMention[], + attachments: ChatAttachment[], + ) => { + if (!content.trim() && attachments.length === 0) return; + const state: HomeAiPromptInitialState = { + initialContent: content, + initialMentions: mentions, + initialAttachments: attachments, + }; + navigate("/ai", { state }); + }; + + return ( + <div className={classes.wrapper}> + <h1 className={classes.heading}> + {t("Welcome to {{name}}", { name: workspace?.name ?? "Docmost" })} + </h1> + <div className={classes.subtitle}> + {t("Ask anything or search your workspace")} + </div> + + <div className={classes.inputContainer}> + <ChatInput + isStreaming={false} + onSend={handleSend} + onStop={() => {}} + placeholder={t("Ask anything... Use @ to mention pages")} + autofocus={false} + /> + </div> + </div> + ); +} diff --git a/apps/client/src/features/notification/components/notification-item.tsx b/apps/client/src/features/notification/components/notification-item.tsx index 0d7db515..0fd4f44b 100644 --- a/apps/client/src/features/notification/components/notification-item.tsx +++ b/apps/client/src/features/notification/components/notification-item.tsx @@ -13,7 +13,7 @@ import { import { CustomAvatar } from "@/components/ui/custom-avatar"; import { INotification } from "../types/notification.types"; import { Trans, useTranslation } from "react-i18next"; -import { useNavigate } from "react-router-dom"; +import { Link } from "react-router-dom"; import { useState } from "react"; import { useMarkReadMutation } from "../queries/notification-query"; import { buildPageUrl } from "@/features/page/page.utils"; @@ -30,7 +30,6 @@ export function NotificationItem({ onNavigate, }: NotificationItemProps) { const { t } = useTranslation(); - const navigate = useNavigate(); const markRead = useMarkReadMutation(); const [hovered, setHovered] = useState(false); @@ -50,37 +49,47 @@ export function NotificationItem({ return notification.data?.role === "writer" ? "<bold>{{name}}</bold> gave you edit access to a page" : "<bold>{{name}}</bold> gave you view access to a page"; + case "page.updated": + return "<bold>{{name}}</bold> updated a page"; default: return ""; } }; - const handleClick = () => { - if (notification.page && notification.space) { - if (isUnread) { - markRead.mutate([notification.id]); - } - navigate( - buildPageUrl( + const pageUrl = + notification.page && notification.space + ? buildPageUrl( notification.space.slug, notification.page.slugId, notification.page.title, - ), - ); - onNavigate(); - } - }; + ) + : undefined; - const handleMarkRead = (e: React.MouseEvent) => { - e.stopPropagation(); + const markReadIfNeeded = () => { if (isUnread) { markRead.mutate([notification.id]); } }; + const handleClick = () => { + markReadIfNeeded(); + onNavigate(); + }; + + const handleMarkRead = (e: React.MouseEvent) => { + e.preventDefault(); + e.stopPropagation(); + markReadIfNeeded(); + }; + return ( <UnstyledButton + component={Link} + to={pageUrl ?? ""} onClick={handleClick} + // auxclick fires for all non-primary buttons; guard to middle-click only (button 1) + // so that right-click (button 2, context menu) does not mark as read + onAuxClick={(e: React.MouseEvent) => e.button === 1 && markReadIfNeeded()} onMouseEnter={() => setHovered(true)} onMouseLeave={() => setHovered(false)} w="100%" diff --git a/apps/client/src/features/notification/components/notification-list.tsx b/apps/client/src/features/notification/components/notification-list.tsx index 4c992c57..4cd30677 100644 --- a/apps/client/src/features/notification/components/notification-list.tsx +++ b/apps/client/src/features/notification/components/notification-list.tsx @@ -3,17 +3,23 @@ import { IconBellOff } from "@tabler/icons-react"; import { useTranslation } from "react-i18next"; import { useEffect, useRef } from "react"; import { NotificationItem } from "./notification-item"; -import { INotification, NotificationFilter } from "../types/notification.types"; +import { + INotification, + NotificationFilter, + NotificationTab, +} from "../types/notification.types"; import { groupNotificationsByTime } from "../notification.utils"; import { useNotificationsQuery } from "../queries/notification-query"; import classes from "../notification.module.css"; type NotificationListProps = { + tab: NotificationTab; filter: NotificationFilter; onNavigate: () => void; }; export function NotificationList({ + tab, filter, onNavigate, }: NotificationListProps) { @@ -24,7 +30,7 @@ export function NotificationList({ hasNextPage, fetchNextPage, isFetchingNextPage, - } = useNotificationsQuery(); + } = useNotificationsQuery(tab as string); const sentinelRef = useRef<HTMLDivElement>(null); diff --git a/apps/client/src/features/notification/components/notification-popover.tsx b/apps/client/src/features/notification/components/notification-popover.tsx index 8ebfedad..161ac1e6 100644 --- a/apps/client/src/features/notification/components/notification-popover.tsx +++ b/apps/client/src/features/notification/components/notification-popover.tsx @@ -6,6 +6,7 @@ import { Menu, Popover, ScrollArea, + Tabs, Text, Tooltip, } from "@mantine/core"; @@ -18,15 +19,20 @@ import { } from "@tabler/icons-react"; import { useTranslation } from "react-i18next"; import { NotificationList } from "./notification-list"; -import { NotificationFilter } from "../types/notification.types"; +import { + NotificationFilter, + NotificationTab, +} from "../types/notification.types"; import { useMarkAllReadMutation, useUnreadCountQuery, } from "../queries/notification-query"; +import classes from "../notification.module.css"; export function NotificationPopover() { const { t } = useTranslation(); const [opened, setOpened] = useState(false); + const [tab, setTab] = useState<NotificationTab>("direct"); const [filter, setFilter] = useState<NotificationFilter>("all"); const { data: unreadData } = useUnreadCountQuery(); @@ -125,13 +131,27 @@ export function NotificationPopover() { </Group> </Group> + <Tabs + value={tab} + onChange={(value) => setTab(value as NotificationTab)} + variant="default" + color="dark" + > + <Tabs.List px="md"> + <Tabs.Tab value="direct">{t("Direct")}</Tabs.Tab> + <Tabs.Tab value="updates">{t("Updates")}</Tabs.Tab> + </Tabs.List> + </Tabs> + <ScrollArea.Autosize mah={500} type="auto" offsetScrollbars scrollbarSize={6} + style={{ overscrollBehavior: "contain" }} > <NotificationList + tab={tab} filter={filter} onNavigate={() => setOpened(false)} /> diff --git a/apps/client/src/features/notification/notification.module.css b/apps/client/src/features/notification/notification.module.css index 8a80bcf8..09802628 100644 --- a/apps/client/src/features/notification/notification.module.css +++ b/apps/client/src/features/notification/notification.module.css @@ -1,7 +1,9 @@ .notificationItem { + display: block; padding: 8px 12px; border-radius: 4px; cursor: pointer; + user-select: none; } .notificationItem:hover { @@ -11,3 +13,4 @@ .divider { border-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5)); } + diff --git a/apps/client/src/features/notification/queries/notification-query.ts b/apps/client/src/features/notification/queries/notification-query.ts index 363482b1..92c46560 100644 --- a/apps/client/src/features/notification/queries/notification-query.ts +++ b/apps/client/src/features/notification/queries/notification-query.ts @@ -15,10 +15,10 @@ import { export const NOTIFICATION_KEY = ["notifications"]; export const UNREAD_COUNT_KEY = ["notifications", "unread-count"]; -export function useNotificationsQuery() { +export function useNotificationsQuery(type?: string) { return useInfiniteQuery({ - queryKey: NOTIFICATION_KEY, - queryFn: ({ pageParam }) => getNotifications({ cursor: pageParam }), + queryKey: [...NOTIFICATION_KEY, type], + queryFn: ({ pageParam }) => getNotifications({ cursor: pageParam, type }), initialPageParam: undefined as string | undefined, getNextPageParam: (lastPage) => lastPage.meta.hasNextPage ? lastPage.meta.nextCursor : undefined, diff --git a/apps/client/src/features/notification/services/notification-service.ts b/apps/client/src/features/notification/services/notification-service.ts index 8adf4909..7e4b8d2c 100644 --- a/apps/client/src/features/notification/services/notification-service.ts +++ b/apps/client/src/features/notification/services/notification-service.ts @@ -5,6 +5,7 @@ import { IPagination } from "@/lib/types"; export async function getNotifications(params: { limit?: number; cursor?: string; + type?: string; }): Promise<IPagination<INotification>> { const req = await api.post<IPagination<INotification>>( "/notifications", diff --git a/apps/client/src/features/notification/types/notification.types.ts b/apps/client/src/features/notification/types/notification.types.ts index 811805d0..f64e3648 100644 --- a/apps/client/src/features/notification/types/notification.types.ts +++ b/apps/client/src/features/notification/types/notification.types.ts @@ -3,7 +3,8 @@ export type NotificationType = | "comment.created" | "comment.resolved" | "page.user_mention" - | "page.permission_granted"; + | "page.permission_granted" + | "page.updated"; export type INotification = { id: string; @@ -38,3 +39,5 @@ export type INotification = { }; export type NotificationFilter = "all" | "unread"; + +export type NotificationTab = "direct" | "updates" | "all"; diff --git a/apps/client/src/features/page/components/header/page-header-menu.tsx b/apps/client/src/features/page/components/header/page-header-menu.tsx index 51fd0672..7b8412ad 100644 --- a/apps/client/src/features/page/components/header/page-header-menu.tsx +++ b/apps/client/src/features/page/components/header/page-header-menu.tsx @@ -3,6 +3,8 @@ import { IconArrowRight, IconArrowsHorizontal, IconDots, + IconEye, + IconEyeOff, IconFileExport, IconHistory, IconLink, @@ -47,6 +49,11 @@ import { useAddFavoriteMutation, useRemoveFavoriteMutation, } from "@/features/favorite/queries/favorite-query"; +import { + useWatchStatusQuery, + useWatchPageMutation, + useUnwatchPageMutation, +} from "@/features/page/queries/watcher-query"; interface PageHeaderMenuProps { readOnly?: boolean; @@ -134,6 +141,9 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) { const addFavoriteMutation = useAddFavoriteMutation(); const removeFavoriteMutation = useRemoveFavoriteMutation(); const isFavorited = page?.id ? favoriteIds.has(page.id) : false; + const { data: watchStatus } = useWatchStatusQuery(page?.id); + const watchPage = useWatchPageMutation(); + const unwatchPage = useUnwatchPageMutation(); const handleCopyLink = () => { const pageUrl = @@ -219,6 +229,23 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) { > {isFavorited ? t("Remove from favorites") : t("Add to favorites")} </Menu.Item> + + {watchStatus?.watching ? ( + <Menu.Item + leftSection={<IconEyeOff size={16} />} + onClick={() => unwatchPage.mutate(page.id)} + > + {t("Stop watching")} + </Menu.Item> + ) : ( + <Menu.Item + leftSection={<IconEye size={16} />} + onClick={() => watchPage.mutate(page.id)} + > + {t("Watch page")} + </Menu.Item> + )} + <Menu.Divider /> <Menu.Item leftSection={<IconArrowsHorizontal size={16} />}> diff --git a/apps/client/src/features/page/queries/page-query.ts b/apps/client/src/features/page/queries/page-query.ts index 5e759f71..89526aa6 100644 --- a/apps/client/src/features/page/queries/page-query.ts +++ b/apps/client/src/features/page/queries/page-query.ts @@ -111,15 +111,7 @@ export function useUpdatePageMutation() { return useMutation<IPage, Error, Partial<IPageInput>>({ mutationFn: (data) => updatePage(data), onSuccess: (data) => { - updatePage(data); - - invalidateOnUpdatePage( - data.spaceId, - data.parentPageId, - data.id, - data.title, - data.icon, - ); + updatePageData(data); }, }); } diff --git a/apps/client/src/features/page/queries/watcher-query.ts b/apps/client/src/features/page/queries/watcher-query.ts new file mode 100644 index 00000000..0c9eba0f --- /dev/null +++ b/apps/client/src/features/page/queries/watcher-query.ts @@ -0,0 +1,43 @@ +import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; +import { + watchPage, + unwatchPage, + getWatchStatus, +} from "@/features/page/services/watcher-service"; +import { notifications } from "@mantine/notifications"; +import { useTranslation } from "react-i18next"; + +const WATCHER_KEY = "watcher"; + +export function useWatchStatusQuery(pageId: string) { + return useQuery({ + queryKey: [WATCHER_KEY, pageId], + queryFn: () => getWatchStatus(pageId), + enabled: !!pageId, + staleTime: 60_000, + }); +} + +export function useWatchPageMutation() { + const queryClient = useQueryClient(); + const { t } = useTranslation(); + return useMutation({ + mutationFn: (pageId: string) => watchPage(pageId), + onSuccess: (_data, pageId) => { + queryClient.setQueryData([WATCHER_KEY, pageId], { watching: true }); + notifications.show({ message: t("You are now watching this page") }); + }, + }); +} + +export function useUnwatchPageMutation() { + const queryClient = useQueryClient(); + const { t } = useTranslation(); + return useMutation({ + mutationFn: (pageId: string) => unwatchPage(pageId), + onSuccess: (_data, pageId) => { + queryClient.setQueryData([WATCHER_KEY, pageId], { watching: false }); + notifications.show({ message: t("You are no longer watching this page") }); + }, + }); +} diff --git a/apps/client/src/features/page/services/watcher-service.ts b/apps/client/src/features/page/services/watcher-service.ts new file mode 100644 index 00000000..d0c1416b --- /dev/null +++ b/apps/client/src/features/page/services/watcher-service.ts @@ -0,0 +1,16 @@ +import api from "@/lib/api-client"; + +export async function watchPage(pageId: string): Promise<{ watching: boolean }> { + const req = await api.post<{ watching: boolean }>("/pages/watch", { pageId }); + return req.data; +} + +export async function unwatchPage(pageId: string): Promise<{ watching: boolean }> { + const req = await api.post<{ watching: boolean }>("/pages/unwatch", { pageId }); + return req.data; +} + +export async function getWatchStatus(pageId: string): Promise<{ watching: boolean }> { + const req = await api.post<{ watching: boolean }>("/pages/watch-status", { pageId }); + return req.data; +} diff --git a/apps/client/src/features/search/components/search-control.module.css b/apps/client/src/features/search/components/search-control.module.css index 5e5a9c26..80be81d9 100644 --- a/apps/client/src/features/search/components/search-control.module.css +++ b/apps/client/src/features/search/components/search-control.module.css @@ -29,6 +29,8 @@ border-radius: var(--mantine-radius-sm); border: 1px solid; font-weight: bold; + white-space: nowrap; + flex-shrink: 0; @mixin light { color: var(--mantine-color-gray-7); diff --git a/apps/client/src/features/session/components/session-list.tsx b/apps/client/src/features/session/components/session-list.tsx new file mode 100644 index 00000000..18a30458 --- /dev/null +++ b/apps/client/src/features/session/components/session-list.tsx @@ -0,0 +1,165 @@ +import { useState } from "react"; +import { + Button, + Divider, + Group, + Skeleton, + Stack, + Table, + Text, +} from "@mantine/core"; +import { IconDevices } from "@tabler/icons-react"; +import { useTranslation } from "react-i18next"; +import { + useGetSessionsQuery, + useRevokeSessionMutation, + useRevokeAllSessionsMutation, +} from "@/features/session/queries/session-query"; +import { formattedDate } from "@/lib/time"; + +const PAGE_SIZE = 5; + +export default function SessionList() { + const { t } = useTranslation(); + const { data: sessions, isLoading } = useGetSessionsQuery(); + const revokeSessionMutation = useRevokeSessionMutation(); + const revokeAllSessionsMutation = useRevokeAllSessionsMutation(); + const [visibleCount, setVisibleCount] = useState(PAGE_SIZE); + + const otherSessions = sessions?.filter((s) => !s?.isCurrentDevice) ?? []; + const visibleSessions = sessions?.slice(0, visibleCount) ?? []; + const hasMore = sessions && visibleCount < sessions.length; + + if (isLoading) { + return ( + <Table verticalSpacing="md"> + <Table.Thead> + <Table.Tr> + <Table.Th>{t("Device Name")}</Table.Th> + <Table.Th>{t("Last Active")}</Table.Th> + <Table.Th /> + </Table.Tr> + </Table.Thead> + <Table.Tbody> + {[1, 2, 3].map((i) => ( + <Table.Tr key={i}> + <Table.Td> + <Group gap="xs"> + <Skeleton height={18} width={18} radius="sm" /> + <Skeleton height={14} width={140} radius="xs" /> + </Group> + </Table.Td> + <Table.Td> + <Skeleton height={14} width={120} radius="xs" /> + </Table.Td> + <Table.Td> + <Skeleton height={30} width={70} radius="sm" /> + </Table.Td> + </Table.Tr> + ))} + </Table.Tbody> + </Table> + ); + } + + return ( + <Stack> + {otherSessions.length > 0 && ( + <> + <div> + <Text fw={500}>{t("Log out of all devices")}</Text> + <Group justify="space-between" align="center" mt={4}> + <Text size="sm" c="dimmed"> + {t( + "Log out of all sessions except this device", + )} + </Text> + <Button + variant="outline" + color="red" + size="xs" + loading={revokeAllSessionsMutation.isPending} + onClick={() => revokeAllSessionsMutation.mutate()} + > + {t("Log out of all devices")} + </Button> + </Group> + </div> + <Divider /> + </> + )} + + <Table verticalSpacing="md"> + <Table.Thead> + <Table.Tr> + <Table.Th>{t("Device Name")}</Table.Th> + <Table.Th>{t("Last Active")}</Table.Th> + {otherSessions.length > 0 && <Table.Th />} + </Table.Tr> + </Table.Thead> + <Table.Tbody> + {visibleSessions.map((session) => ( + <Table.Tr key={session.id}> + <Table.Td> + <Group gap="xs"> + <IconDevices size={18} stroke={1.5} /> + <div> + <Text size="sm"> + {session.deviceName || t("Unknown device")} + </Text> + {session?.isCurrentDevice && ( + <Text size="xs" c="blue"> + {t("This Device")} + </Text> + )} + </div> + </Group> + </Table.Td> + <Table.Td> + <Text size="sm"> + {session?.isCurrentDevice + ? t("Now") + : formattedDate(new Date(session.lastActiveAt))} + </Text> + </Table.Td> + {otherSessions.length > 0 && ( + <Table.Td> + {!session?.isCurrentDevice && ( + <Button + variant="outline" + size="xs" + loading={revokeSessionMutation.isPending} + onClick={() => + revokeSessionMutation.mutate({ + sessionId: session.id, + }) + } + > + {t("Log out")} + </Button> + )} + </Table.Td> + )} + </Table.Tr> + ))} + </Table.Tbody> + </Table> + + {hasMore && ( + <Button + variant="subtle" + size="xs" + onClick={() => setVisibleCount((c) => c + PAGE_SIZE)} + > + {t("Load more")} + </Button> + )} + + {(!sessions || sessions.length === 0) && ( + <Text size="sm" c="dimmed" ta="center"> + {t("No active sessions")} + </Text> + )} + </Stack> + ); +} diff --git a/apps/client/src/features/session/queries/session-query.ts b/apps/client/src/features/session/queries/session-query.ts new file mode 100644 index 00000000..3104ce2b --- /dev/null +++ b/apps/client/src/features/session/queries/session-query.ts @@ -0,0 +1,55 @@ +import { + useMutation, + useQuery, + useQueryClient, + UseQueryResult, +} from "@tanstack/react-query"; +import { + getSessions, + revokeSession, + revokeAllSessions, +} from "@/features/session/services/session-service"; +import { ISession } from "@/features/session/types/session.types"; +import { notifications } from "@mantine/notifications"; +import { useTranslation } from "react-i18next"; + +export function useGetSessionsQuery(): UseQueryResult<ISession[], Error> { + return useQuery({ + queryKey: ["session-list"], + queryFn: () => getSessions(), + }); +} + +export function useRevokeSessionMutation() { + const queryClient = useQueryClient(); + const { t } = useTranslation(); + + return useMutation<void, Error, { sessionId: string }>({ + mutationFn: (data) => revokeSession(data), + onSuccess: () => { + notifications.show({ message: t("Session revoked") }); + queryClient.invalidateQueries({ queryKey: ["session-list"] }); + }, + onError: (error) => { + const errorMessage = error["response"]?.data?.message; + notifications.show({ message: errorMessage, color: "red" }); + }, + }); +} + +export function useRevokeAllSessionsMutation() { + const queryClient = useQueryClient(); + const { t } = useTranslation(); + + return useMutation<void, Error, void>({ + mutationFn: () => revokeAllSessions(), + onSuccess: () => { + notifications.show({ message: t("All other sessions revoked") }); + queryClient.invalidateQueries({ queryKey: ["session-list"] }); + }, + onError: (error) => { + const errorMessage = error["response"]?.data?.message; + notifications.show({ message: errorMessage, color: "red" }); + }, + }); +} diff --git a/apps/client/src/features/session/services/session-service.ts b/apps/client/src/features/session/services/session-service.ts new file mode 100644 index 00000000..6f2bde83 --- /dev/null +++ b/apps/client/src/features/session/services/session-service.ts @@ -0,0 +1,17 @@ +import api from "@/lib/api-client"; +import { ISession } from "@/features/session/types/session.types"; + +export async function getSessions(): Promise<ISession[]> { + const req = await api.post<{ sessions: ISession[] }>("/sessions"); + return req.data.sessions; +} + +export async function revokeSession(data: { + sessionId: string; +}): Promise<void> { + await api.post("/sessions/revoke", data); +} + +export async function revokeAllSessions(): Promise<void> { + await api.post("/sessions/revoke-all"); +} diff --git a/apps/client/src/features/session/types/session.types.ts b/apps/client/src/features/session/types/session.types.ts new file mode 100644 index 00000000..636f8c30 --- /dev/null +++ b/apps/client/src/features/session/types/session.types.ts @@ -0,0 +1,8 @@ +export type ISession = { + id: string; + deviceName: string | null; + geoLocation: string | null; + lastActiveAt: string; + createdAt: string; + isCurrentDevice?: boolean; +}; diff --git a/apps/client/src/features/space/components/settings-modal.tsx b/apps/client/src/features/space/components/settings-modal.tsx index 7fb07b39..fb8d24f6 100644 --- a/apps/client/src/features/space/components/settings-modal.tsx +++ b/apps/client/src/features/space/components/settings-modal.tsx @@ -3,6 +3,7 @@ import SpaceMembersList from "@/features/space/components/space-members.tsx"; import AddSpaceMembersModal from "@/features/space/components/add-space-members-modal.tsx"; import React from "react"; import SpaceDetails from "@/features/space/components/space-details.tsx"; +import SpaceSecuritySettings from "@/features/space/components/space-security-settings.tsx"; import { useSpaceQuery } from "@/features/space/queries/space-query.ts"; import { useSpaceAbility } from "@/features/space/permissions/use-space-ability.ts"; import { @@ -59,6 +60,14 @@ export default function SpaceSettingsModal({ <Tabs.Tab fw={500} value="members"> {t("Members")} </Tabs.Tab> + {spaceAbility.can( + SpaceCaslAction.Manage, + SpaceCaslSubject.Settings, + ) && ( + <Tabs.Tab fw={500} value="security"> + {t("Security")} + </Tabs.Tab> + )} </Tabs.List> <Tabs.Panel value="general"> @@ -91,6 +100,20 @@ export default function SpaceSettingsModal({ )} /> </Tabs.Panel> + + <Tabs.Panel value="security"> + <ScrollArea h={580} scrollbarSize={5} pr={8}> + <div style={{ paddingBottom: "100px" }}> + <SpaceSecuritySettings + space={space} + readOnly={spaceAbility.cannot( + SpaceCaslAction.Manage, + SpaceCaslSubject.Settings, + )} + /> + </div> + </ScrollArea> + </Tabs.Panel> </Tabs> </div> </Modal.Body> diff --git a/apps/client/src/features/space/components/sidebar/space-sidebar.tsx b/apps/client/src/features/space/components/sidebar/space-sidebar.tsx index 62b8a04f..18c07359 100644 --- a/apps/client/src/features/space/components/sidebar/space-sidebar.tsx +++ b/apps/client/src/features/space/components/sidebar/space-sidebar.tsx @@ -9,6 +9,8 @@ import { import { IconArrowDown, IconDots, + IconEye, + IconEyeOff, IconFileExport, IconHome, IconPlus, @@ -17,6 +19,11 @@ import { IconTemplate, IconTrash, } from "@tabler/icons-react"; +import { + useSpaceWatchStatusQuery, + useWatchSpaceMutation, + useUnwatchSpaceMutation, +} from "@/features/space/queries/space-watcher-query.ts"; import classes from "./space-sidebar.module.css"; import React from "react"; import { useAtom } from "jotai"; @@ -207,13 +214,20 @@ export function SpaceSidebar() { {t("Pages")} </Text> - {spaceAbility.can( - SpaceCaslAction.Manage, - SpaceCaslSubject.Page, - ) && ( - <Group gap="xs"> - <SpaceMenu spaceId={space.id} onSpaceSettings={openSettings} /> + <Group gap="xs"> + <SpaceMenu + spaceId={space.id} + canManagePages={spaceAbility.can( + SpaceCaslAction.Manage, + SpaceCaslSubject.Page, + )} + onSpaceSettings={openSettings} + /> + {spaceAbility.can( + SpaceCaslAction.Manage, + SpaceCaslSubject.Page, + ) && ( <Tooltip label={t("Create page")} withArrow position="right"> <ActionIcon variant="default" @@ -224,8 +238,8 @@ export function SpaceSidebar() { <IconPlus /> </ActionIcon> </Tooltip> - </Group> - )} + )} + </Group> </Group> <div className={classes.pages}> @@ -251,9 +265,14 @@ export function SpaceSidebar() { interface SpaceMenuProps { spaceId: string; + canManagePages: boolean; onSpaceSettings: () => void; } -function SpaceMenu({ spaceId, onSpaceSettings }: SpaceMenuProps) { +function SpaceMenu({ + spaceId, + canManagePages, + onSpaceSettings, +}: SpaceMenuProps) { const { t } = useTranslation(); const { spaceSlug } = useParams(); const [importOpened, { open: openImportModal, close: closeImportModal }] = @@ -261,15 +280,24 @@ function SpaceMenu({ spaceId, onSpaceSettings }: SpaceMenuProps) { const [exportOpened, { open: openExportModal, close: closeExportModal }] = useDisclosure(false); + const { data: watchStatus } = useSpaceWatchStatusQuery(spaceId); + const watchMutation = useWatchSpaceMutation(); + const unwatchMutation = useUnwatchSpaceMutation(); + const isWatching = watchStatus?.watching ?? false; + + const handleToggleWatch = () => { + if (isWatching) { + unwatchMutation.mutate(spaceId); + } else { + watchMutation.mutate(spaceId); + } + }; + return ( <> <Menu width={200} shadow="md" withArrow> <Menu.Target> - <Tooltip - label={t("Import pages & space settings")} - withArrow - position="top" - > + <Tooltip label={t("Space menu")} withArrow position="top"> <ActionIcon variant="default" size={18} @@ -282,50 +310,69 @@ function SpaceMenu({ spaceId, onSpaceSettings }: SpaceMenuProps) { <Menu.Dropdown> <Menu.Item - onClick={openImportModal} - leftSection={<IconArrowDown size={16} />} + onClick={handleToggleWatch} + leftSection={ + isWatching ? <IconEyeOff size={16} /> : <IconEye size={16} /> + } > - {t("Import pages")} + {isWatching ? t("Stop watching space") : t("Watch space")} </Menu.Item> - <Menu.Item - onClick={openExportModal} - leftSection={<IconFileExport size={16} />} - > - {t("Export space")} - </Menu.Item> + {canManagePages && ( + <> + <Menu.Divider /> - <Menu.Divider /> + <Menu.Item + onClick={openImportModal} + leftSection={<IconArrowDown size={16} />} + > + {t("Import pages")} + </Menu.Item> - <Menu.Item - onClick={onSpaceSettings} - leftSection={<IconSettings size={16} />} - > - {t("Space settings")} - </Menu.Item> + <Menu.Item + onClick={openExportModal} + leftSection={<IconFileExport size={16} />} + > + {t("Export space")} + </Menu.Item> - <Menu.Item - component={Link} - to={`/s/${spaceSlug}/trash`} - leftSection={<IconTrash size={16} />} - > - {t("Trash")} - </Menu.Item> + <Menu.Divider /> + + <Menu.Item + onClick={onSpaceSettings} + leftSection={<IconSettings size={16} />} + > + {t("Space settings")} + </Menu.Item> + + <Menu.Item + component={Link} + to={`/s/${spaceSlug}/trash`} + leftSection={<IconTrash size={16} />} + > + {t("Trash")} + </Menu.Item> + </> + )} </Menu.Dropdown> </Menu> - <PageImportModal - spaceId={spaceId} - open={importOpened} - onClose={closeImportModal} - /> + {canManagePages && ( + <> + <PageImportModal + spaceId={spaceId} + open={importOpened} + onClose={closeImportModal} + /> - <ExportModal - type="space" - id={spaceId} - open={exportOpened} - onClose={closeExportModal} - /> + <ExportModal + type="space" + id={spaceId} + open={exportOpened} + onClose={closeExportModal} + /> + </> + )} </> ); } diff --git a/apps/client/src/features/space/components/space-carousel.module.css b/apps/client/src/features/space/components/space-carousel.module.css new file mode 100644 index 00000000..87b9f1de --- /dev/null +++ b/apps/client/src/features/space/components/space-carousel.module.css @@ -0,0 +1,22 @@ +.card { + background-color: var(--mantine-color-body); + width: 220px; + + @mixin hover { + box-shadow: var(--mantine-shadow-xs); + transform: scale(1.02); + } +} + +.cardSection { + background: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-6)); +} + +.title { + font-family: + Greycliff CF, + var(--mantine-font-family); + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; +} diff --git a/apps/client/src/features/space/components/space-carousel.tsx b/apps/client/src/features/space/components/space-carousel.tsx new file mode 100644 index 00000000..e8c4eada --- /dev/null +++ b/apps/client/src/features/space/components/space-carousel.tsx @@ -0,0 +1,77 @@ +import { Text, Card, rem, Group, Button } from "@mantine/core"; +import { + prefetchSpace, + useGetSpacesQuery, +} from "@/features/space/queries/space-query.ts"; +import { getSpaceUrl } from "@/lib/config.ts"; +import { Link } from "react-router-dom"; +import classes from "./space-carousel.module.css"; +import { formatMemberCount } from "@/lib"; +import { useTranslation } from "react-i18next"; +import { IconArrowRight } from "@tabler/icons-react"; +import { CustomAvatar } from "@/components/ui/custom-avatar.tsx"; +import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts"; +import CardCarousel from "@/components/ui/card-carousel"; + +export default function SpaceCarousel() { + const { t } = useTranslation(); + const { data } = useGetSpacesQuery({ limit: 20 }); + + const cards = data?.items.map((space) => ( + <Card + key={space.id} + p="xs" + radius="md" + component={Link} + to={getSpaceUrl(space.slug)} + onMouseEnter={() => prefetchSpace(space.slug, space.id)} + className={classes.card} + withBorder + > + <Card.Section className={classes.cardSection} h={40}></Card.Section> + <CustomAvatar + name={space.name} + avatarUrl={space.logo} + type={AvatarIconType.SPACE_ICON} + color="initials" + variant="filled" + size="md" + mt={rem(-20)} + /> + + <Text fz="md" fw={500} mt="xs" className={classes.title}> + {space.name} + </Text> + + <Text c="dimmed" size="xs" fw={700} mt="md"> + {formatMemberCount(space.memberCount, t)} + </Text> + </Card> + )); + + return ( + <> + <Group justify="space-between" align="center" mb="md"> + <Text fz="sm" fw={500}> + {t("Spaces you belong to")} + </Text> + </Group> + + <CardCarousel ariaLabel={t("Spaces you belong to")}>{cards}</CardCarousel> + + {data?.items && data.items.length > 1 && ( + <Group justify="flex-end" mt="lg"> + <Button + component={Link} + to="/spaces" + variant="subtle" + rightSection={<IconArrowRight size={16} />} + size="sm" + > + {t("View all spaces")} + </Button> + </Group> + )} + </> + ); +} diff --git a/apps/client/src/features/space/components/space-details.tsx b/apps/client/src/features/space/components/space-details.tsx index 5aea40aa..746d1bbf 100644 --- a/apps/client/src/features/space/components/space-details.tsx +++ b/apps/client/src/features/space/components/space-details.tsx @@ -18,7 +18,7 @@ import { ResponsiveSettingsControl, ResponsiveSettingsRow, } from "@/components/ui/responsive-settings-row.tsx"; -import SpacePublicSharingToggle from "@/ee/security/components/space-public-sharing-toggle.tsx"; + interface SpaceDetailsProps { spaceId: string; @@ -27,7 +27,6 @@ interface SpaceDetailsProps { export default function SpaceDetails({ spaceId, readOnly }: SpaceDetailsProps) { const { t } = useTranslation(); const { data: space, isLoading, refetch } = useSpaceQuery(spaceId); - const showSharingToggle = !readOnly; const [exportOpened, { open: openExportModal, close: closeExportModal }] = useDisclosure(false); const [isIconUploading, setIsIconUploading] = useState(false); @@ -89,13 +88,6 @@ export default function SpaceDetails({ spaceId, readOnly }: SpaceDetailsProps) { <EditSpaceForm space={space} readOnly={readOnly} /> - {showSharingToggle && ( - <> - <Divider my="lg" /> - <SpacePublicSharingToggle space={space} /> - </> - )} - {!readOnly && ( <> <Divider my="lg" /> diff --git a/apps/client/src/features/space/components/space-security-settings.tsx b/apps/client/src/features/space/components/space-security-settings.tsx new file mode 100644 index 00000000..c606cf68 --- /dev/null +++ b/apps/client/src/features/space/components/space-security-settings.tsx @@ -0,0 +1,34 @@ +import { Text, Divider } from "@mantine/core"; +import React from "react"; +import { useTranslation } from "react-i18next"; +import { ISpace } from "@/features/space/types/space.types.ts"; +import SpacePublicSharingToggle from "@/ee/security/components/space-public-sharing-toggle.tsx"; +import SpaceViewerCommentsToggle from "@/ee/security/components/space-viewer-comments-toggle.tsx"; + +type SpaceSecuritySettingsProps = { + space: ISpace; + readOnly?: boolean; +}; + +export default function SpaceSecuritySettings({ + space, + readOnly, +}: SpaceSecuritySettingsProps) { + const { t } = useTranslation(); + + if (readOnly) return null; + + return ( + <div> + <Text my="md" fw={600}> + {t("Security")} + </Text> + + <SpacePublicSharingToggle space={space} /> + + <Divider my="lg" /> + + <SpaceViewerCommentsToggle space={space} /> + </div> + ); +} diff --git a/apps/client/src/features/space/queries/space-watcher-query.ts b/apps/client/src/features/space/queries/space-watcher-query.ts new file mode 100644 index 00000000..ae4d5696 --- /dev/null +++ b/apps/client/src/features/space/queries/space-watcher-query.ts @@ -0,0 +1,49 @@ +import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; +import { + watchSpace, + unwatchSpace, + getSpaceWatchStatus, +} from "@/features/space/services/space-watcher-service"; +import { notifications } from "@mantine/notifications"; +import { useTranslation } from "react-i18next"; + +const SPACE_WATCHER_KEY = "space-watcher"; + +export function useSpaceWatchStatusQuery(spaceId: string) { + return useQuery({ + queryKey: [SPACE_WATCHER_KEY, spaceId], + queryFn: () => getSpaceWatchStatus(spaceId), + enabled: !!spaceId, + staleTime: 60_000, + }); +} + +export function useWatchSpaceMutation() { + const queryClient = useQueryClient(); + const { t } = useTranslation(); + return useMutation({ + mutationFn: (spaceId: string) => watchSpace(spaceId), + onSuccess: (_data, spaceId) => { + queryClient.setQueryData([SPACE_WATCHER_KEY, spaceId], { + watching: true, + }); + notifications.show({ message: t("You are now watching this space") }); + }, + }); +} + +export function useUnwatchSpaceMutation() { + const queryClient = useQueryClient(); + const { t } = useTranslation(); + return useMutation({ + mutationFn: (spaceId: string) => unwatchSpace(spaceId), + onSuccess: (_data, spaceId) => { + queryClient.setQueryData([SPACE_WATCHER_KEY, spaceId], { + watching: false, + }); + notifications.show({ + message: t("You are no longer watching this space"), + }); + }, + }); +} diff --git a/apps/client/src/features/space/services/space-watcher-service.ts b/apps/client/src/features/space/services/space-watcher-service.ts new file mode 100644 index 00000000..bcbeccc9 --- /dev/null +++ b/apps/client/src/features/space/services/space-watcher-service.ts @@ -0,0 +1,28 @@ +import api from "@/lib/api-client"; + +export async function watchSpace( + spaceId: string, +): Promise<{ watching: boolean }> { + const req = await api.post<{ watching: boolean }>("/spaces/watch", { + spaceId, + }); + return req.data; +} + +export async function unwatchSpace( + spaceId: string, +): Promise<{ watching: boolean }> { + const req = await api.post<{ watching: boolean }>("/spaces/unwatch", { + spaceId, + }); + return req.data; +} + +export async function getSpaceWatchStatus( + spaceId: string, +): Promise<{ watching: boolean }> { + const req = await api.post<{ watching: boolean }>("/spaces/watch-status", { + spaceId, + }); + return req.data; +} diff --git a/apps/client/src/features/space/types/space.types.ts b/apps/client/src/features/space/types/space.types.ts index f7dcc11a..c856d88a 100644 --- a/apps/client/src/features/space/types/space.types.ts +++ b/apps/client/src/features/space/types/space.types.ts @@ -9,8 +9,13 @@ export interface ISpaceSharingSettings { disabled?: boolean; } +export interface ISpaceCommentsSettings { + allowViewerComments?: boolean; +} + export interface ISpaceSettings { sharing?: ISpaceSharingSettings; + comments?: ISpaceCommentsSettings; } export interface ISpace { @@ -29,6 +34,7 @@ export interface ISpace { settings?: ISpaceSettings; // for updates disablePublicSharing?: boolean; + allowViewerComments?: boolean; } interface IMembership { diff --git a/apps/client/src/features/user/components/account-name-form.tsx b/apps/client/src/features/user/components/account-name-form.tsx index 98929b04..70a5b52c 100644 --- a/apps/client/src/features/user/components/account-name-form.tsx +++ b/apps/client/src/features/user/components/account-name-form.tsx @@ -1,9 +1,8 @@ import { useAtom } from "jotai"; -import { focusAtom } from "jotai-optics"; import { z } from "zod/v4"; import { useForm } from "@mantine/form"; import { zod4Resolver } from "mantine-form-zod-resolver"; -import { currentUserAtom } from "@/features/user/atoms/current-user-atom.ts"; +import { userAtom } from "@/features/user/atoms/current-user-atom.ts"; import { updateUser } from "@/features/user/services/user-service.ts"; import { IUser } from "@/features/user/types/user.types.ts"; import { useState } from "react"; @@ -17,18 +16,15 @@ const formSchema = z.object({ type FormValues = z.infer<typeof formSchema>; -const userAtom = focusAtom(currentUserAtom, (optic) => optic.prop("user")); - export default function AccountNameForm() { const { t } = useTranslation(); const [isLoading, setIsLoading] = useState(false); - const [currentUser] = useAtom(currentUserAtom); - const [, setUser] = useAtom(userAtom); + const [user, setUser] = useAtom(userAtom); const form = useForm<FormValues>({ validate: zod4Resolver(formSchema), initialValues: { - name: currentUser?.user.name, + name: user?.name, }, }); diff --git a/apps/client/src/features/user/components/notification-pref.tsx b/apps/client/src/features/user/components/notification-pref.tsx new file mode 100644 index 00000000..e8a983ed --- /dev/null +++ b/apps/client/src/features/user/components/notification-pref.tsx @@ -0,0 +1,117 @@ +import { userAtom } from "@/features/user/atoms/current-user-atom.ts"; +import { updateUser } from "@/features/user/services/user-service.ts"; +import { IUser, IUserSettings } from "@/features/user/types/user.types.ts"; +import { Switch, Text, Title, Stack } from "@mantine/core"; +import { useAtom } from "jotai"; +import React, { useState } from "react"; +import { useTranslation } from "react-i18next"; +import { + ResponsiveSettingsRow, + ResponsiveSettingsContent, + ResponsiveSettingsControl, +} from "@/components/ui/responsive-settings-row"; + +type NotificationKey = keyof NonNullable<IUserSettings["notifications"]>; + +const notificationItems: { + key: NotificationKey; + dtoField: keyof IUser; + label: string; + description: string; +}[] = [ + { + key: "page.updated", + dtoField: "notificationPageUpdates", + label: "Page updates", + description: "Get notified when pages you watch are updated.", + }, + { + key: "page.userMention", + dtoField: "notificationPageUserMention", + label: "Page mentions", + description: "Get notified when someone mentions you on a page.", + }, + { + key: "comment.userMention", + dtoField: "notificationCommentUserMention", + label: "Comment mentions", + description: "Get notified when someone mentions you in a comment.", + }, + { + key: "comment.created", + dtoField: "notificationCommentCreated", + label: "New comments", + description: + "Get notified about new comments on threads you participate in.", + }, + { + key: "comment.resolved", + dtoField: "notificationCommentResolved", + label: "Resolved comments", + description: "Get notified when your comment is resolved.", + }, +]; + +function NotificationToggle({ + settingKey, + dtoField, + label, + description, +}: { + settingKey: NotificationKey; + dtoField: keyof IUser; + label: string; + description: string; +}) { + const { t } = useTranslation(); + const [user, setUser] = useAtom(userAtom); + const [checked, setChecked] = useState( + user.settings?.notifications?.[settingKey] !== false, + ); + + const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => { + const value = event.currentTarget.checked; + setChecked(value); + try { + const updatedUser = await updateUser({ [dtoField]: value } as any); + setUser(updatedUser); + } catch { + setChecked(!value); + } + }; + + return ( + <ResponsiveSettingsRow> + <ResponsiveSettingsContent> + <Text size="md">{t(label)}</Text> + <Text size="sm" c="dimmed"> + {t(description)} + </Text> + </ResponsiveSettingsContent> + + <ResponsiveSettingsControl> + <Switch checked={checked} onChange={handleChange} /> + </ResponsiveSettingsControl> + </ResponsiveSettingsRow> + ); +} + +export default function NotificationPref() { + const { t } = useTranslation(); + + return ( + <Stack gap="xs"> + <Title order={5}>{t("Email notifications")} + + {notificationItems.map((item) => ( + + ))} + + ); +} diff --git a/apps/client/src/features/user/types/user.types.ts b/apps/client/src/features/user/types/user.types.ts index 80d86706..75d45bfd 100644 --- a/apps/client/src/features/user/types/user.types.ts +++ b/apps/client/src/features/user/types/user.types.ts @@ -20,6 +20,11 @@ export interface IUser { deletedAt: Date; fullPageWidth: boolean; // used for update pageEditMode: string; // used for update + notificationPageUpdates: boolean; // used for update + notificationPageUserMention: boolean; // used for update + notificationCommentUserMention: boolean; // used for update + notificationCommentCreated: boolean; // used for update + notificationCommentResolved: boolean; // used for update hasGeneratedPassword?: boolean; } @@ -33,6 +38,13 @@ export interface IUserSettings { fullPageWidth: boolean; pageEditMode: string; }; + notifications?: { + "page.updated"?: boolean; + "page.userMention"?: boolean; + "comment.userMention"?: boolean; + "comment.created"?: boolean; + "comment.resolved"?: boolean; + }; } export enum PageEditMode { diff --git a/apps/client/src/features/workspace/types/workspace.types.ts b/apps/client/src/features/workspace/types/workspace.types.ts index b47c125e..f733f73a 100644 --- a/apps/client/src/features/workspace/types/workspace.types.ts +++ b/apps/client/src/features/workspace/types/workspace.types.ts @@ -45,6 +45,7 @@ export interface IWorkspaceAiSettings { search?: boolean; generative?: boolean; mcp?: boolean; + chat?: boolean; } export interface IWorkspaceSharingSettings { diff --git a/apps/client/src/i18n.ts b/apps/client/src/i18n.ts index 2f240dcf..d5c8a99e 100644 --- a/apps/client/src/i18n.ts +++ b/apps/client/src/i18n.ts @@ -14,6 +14,7 @@ i18n .init({ fallbackLng: "en-US", debug: false, + showSupportNotice: false, load: 'currentOnly', interpolation: { diff --git a/apps/client/src/lib/api-client.ts b/apps/client/src/lib/api-client.ts index 632811db..17f7e102 100644 --- a/apps/client/src/lib/api-client.ts +++ b/apps/client/src/lib/api-client.ts @@ -74,8 +74,12 @@ function redirectToLogin() { ]; if (!exemptPaths.some((path) => window.location.pathname.startsWith(path))) { const redirectTo = window.location.pathname; - const params = new URLSearchParams({ redirect: redirectTo }); - window.location.href = `${APP_ROUTE.AUTH.LOGIN}?${params.toString()}`; + if (redirectTo === APP_ROUTE.HOME) { + window.location.href = APP_ROUTE.AUTH.LOGIN; + } else { + const params = new URLSearchParams({ redirect: redirectTo }); + window.location.href = `${APP_ROUTE.AUTH.LOGIN}?${params.toString()}`; + } } } diff --git a/apps/client/src/lib/config.ts b/apps/client/src/lib/config.ts index bc40020b..67bbe100 100644 --- a/apps/client/src/lib/config.ts +++ b/apps/client/src/lib/config.ts @@ -1,6 +1,7 @@ import bytes from "bytes"; import { castToBoolean } from "@/lib/utils.tsx"; import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts"; +import { sanitizeUrl } from "@docmost/editor-ext"; declare global { interface Window { @@ -66,7 +67,7 @@ export function getFileUrl(src: string) { if (src.startsWith("/files/")) { return getBackendUrl() + src; } - return src; + return sanitizeUrl(src); } export function getFileUploadSizeLimit() { diff --git a/apps/client/src/lib/utils.tsx b/apps/client/src/lib/utils.tsx index e9c39267..5f640d45 100644 --- a/apps/client/src/lib/utils.tsx +++ b/apps/client/src/lib/utils.tsx @@ -94,6 +94,12 @@ export function getPageIcon(icon: string, size = 18): string | ReactNode { ); } +export const normalizeUrl = (url: string): string => { + if (!url) return url; + if (url.startsWith("/") || /^[a-zA-Z][a-zA-Z0-9+.-]*:/.test(url)) return url; + return `https://${url}`; +}; + export function castToBoolean(value: unknown): boolean { if (value == null) { return false; diff --git a/apps/client/src/pages/dashboard/home.tsx b/apps/client/src/pages/dashboard/home.tsx index 900afa40..cefff053 100644 --- a/apps/client/src/pages/dashboard/home.tsx +++ b/apps/client/src/pages/dashboard/home.tsx @@ -1,6 +1,7 @@ import { Container, Space } from "@mantine/core"; import HomeTabs from "@/features/home/components/home-tabs"; -import SpaceGrid from "@/features/space/components/space-grid.tsx"; +import HomeAiPrompt from "@/features/home/components/home-ai-prompt"; +import SpaceCarousel from "@/features/space/components/space-carousel.tsx"; import { getAppName } from "@/lib/config.ts"; import { Helmet } from "react-helmet-async"; import { useTranslation } from "react-i18next"; @@ -16,7 +17,11 @@ export default function Home() { - + + + + + diff --git a/apps/client/src/pages/page/page.tsx b/apps/client/src/pages/page/page.tsx index fc564b4b..f0fc93fa 100644 --- a/apps/client/src/pages/page/page.tsx +++ b/apps/client/src/pages/page/page.tsx @@ -53,6 +53,9 @@ function PageContent({ pageSlug }: { pageSlug: string | undefined }) { const { data: space } = useGetSpaceBySlugQuery(page?.space?.slug); const canEdit = page?.permissions?.canEdit ?? false; + const canComment = + canEdit || + (space?.settings?.comments?.allowViewerComments === true); if (isLoading) { return <>; @@ -104,6 +107,7 @@ function PageContent({ pageSlug }: { pageSlug: string | undefined }) { slugId={page.slugId} spaceSlug={page?.space?.slug} editable={canEdit} + canComment={canComment} />
diff --git a/apps/client/src/pages/settings/account/account-preferences.tsx b/apps/client/src/pages/settings/account/account-preferences.tsx index f082ea1b..caedc1b0 100644 --- a/apps/client/src/pages/settings/account/account-preferences.tsx +++ b/apps/client/src/pages/settings/account/account-preferences.tsx @@ -3,6 +3,7 @@ import AccountLanguage from "@/features/user/components/account-language.tsx"; import AccountTheme from "@/features/user/components/account-theme.tsx"; import PageWidthPref from "@/features/user/components/page-width-pref.tsx"; import PageEditPref from "@/features/user/components/page-state-pref"; +import NotificationPref from "@/features/user/components/notification-pref"; import { getAppName } from "@/lib/config.ts"; import { Divider } from "@mantine/core"; import { Helmet } from "react-helmet-async"; @@ -33,6 +34,10 @@ export default function AccountPreferences() { + + + + ); } diff --git a/apps/client/src/pages/settings/account/account-settings.tsx b/apps/client/src/pages/settings/account/account-settings.tsx index f1d78f7d..6f87d31a 100644 --- a/apps/client/src/pages/settings/account/account-settings.tsx +++ b/apps/client/src/pages/settings/account/account-settings.tsx @@ -8,6 +8,7 @@ import { getAppName } from "@/lib/config.ts"; import { Helmet } from "react-helmet-async"; import { useTranslation } from "react-i18next"; import { AccountMfaSection } from "@/features/user/components/account-mfa-section"; +import SessionList from "@/features/session/components/session-list"; export default function AccountSettings() { const { t } = useTranslation(); @@ -36,6 +37,10 @@ export default function AccountSettings() { + + + + ); } diff --git a/apps/client/vite.config.ts b/apps/client/vite.config.ts index a5fafce3..e6f9de48 100644 --- a/apps/client/vite.config.ts +++ b/apps/client/vite.config.ts @@ -2,7 +2,7 @@ import { defineConfig, loadEnv } from "vite"; import react from "@vitejs/plugin-react"; import * as path from "path"; -export const envPath = path.resolve(process.cwd(), "..", ".."); +const envPath = path.resolve(process.cwd(), "..", ".."); export default defineConfig(({ mode }) => { const { @@ -35,6 +35,20 @@ export default defineConfig(({ mode }) => { APP_VERSION: JSON.stringify(process.env.npm_package_version), }, plugins: [react()], + build: { + rolldownOptions: { + output: { + codeSplitting: { + groups: [ + { name: "vendor-mantine", test: /@mantine/ }, + { name: "vendor-mermaid", test: /mermaid|cytoscape|elkjs/ }, + { name: "vendor-excalidraw", test: /excalidraw/ }, + { name: "vendor-katex", test: /katex/ }, + ], + }, + }, + }, + }, resolve: { alias: { "@": "/src", diff --git a/apps/server/package.json b/apps/server/package.json index 0a5fe355..a1a061db 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -1,6 +1,6 @@ { "name": "server", - "version": "0.70.3", + "version": "0.71.1", "description": "", "author": "", "private": true, @@ -30,123 +30,129 @@ "test:e2e": "jest --config test/jest-e2e.json" }, "dependencies": { - "@ai-sdk/google": "^3.0.29", - "@ai-sdk/openai": "^3.0.29", - "@ai-sdk/openai-compatible": "^2.0.30", - "@aws-sdk/client-s3": "3.1000.0", - "@aws-sdk/lib-storage": "3.1000.0", - "@aws-sdk/s3-request-presigner": "3.1000.0", - "@clickhouse/client": "^1.17.0", + "@ai-sdk/google": "^3.0.52", + "@ai-sdk/openai": "^3.0.47", + "@ai-sdk/openai-compatible": "^2.0.37", + "@aws-sdk/client-s3": "3.1014.0", + "@aws-sdk/lib-storage": "3.1014.0", + "@aws-sdk/s3-request-presigner": "3.1014.0", + "@clickhouse/client": "^1.18.2", "@fastify/cookie": "^11.0.2", "@fastify/multipart": "^9.4.0", "@fastify/static": "^9.0.0", "@keyv/redis": "^5.1.6", - "@langchain/core": "1.1.29", + "@langchain/core": "1.1.34", "@langchain/textsplitters": "1.0.1", "@modelcontextprotocol/sdk": "^1.27.1", + "@nest-lab/throttler-storage-redis": "^1.2.0", "@nestjs-labs/nestjs-ioredis": "^11.0.4", "@nestjs/bullmq": "^11.0.4", "@nestjs/cache-manager": "^3.1.0", - "@nestjs/common": "^11.1.14", + "@nestjs/common": "^11.1.18", "@nestjs/config": "^4.0.3", - "@nestjs/core": "^11.1.14", + "@nestjs/core": "^11.1.18", "@nestjs/event-emitter": "^3.0.1", - "@nestjs/jwt": "11.0.0", - "@nestjs/mapped-types": "^2.1.0", + "@nestjs/jwt": "11.0.2", + "@nestjs/mapped-types": "^2.1.1", "@nestjs/passport": "^11.0.5", - "@nestjs/platform-fastify": "^11.1.14", - "@nestjs/platform-socket.io": "^11.1.14", + "@nestjs/platform-fastify": "^11.1.18", + "@nestjs/platform-socket.io": "^11.1.18", "@nestjs/schedule": "^6.1.1", "@nestjs/terminus": "^11.1.1", - "@nestjs/websockets": "^11.1.14", + "@nestjs/throttler": "^6.5.0", + "@nestjs/websockets": "^11.1.18", "@node-saml/passport-saml": "^5.1.0", - "@react-email/components": "1.0.7", + "@react-email/components": "1.0.10", "@react-email/render": "2.0.4", "@socket.io/redis-adapter": "^8.3.0", - "ai": "^6.0.86", - "ai-sdk-ollama": "^3.7.0", + "ai": "^6.0.134", + "ai-sdk-ollama": "^3.8.1", "bcrypt": "^6.0.0", - "bullmq": "^5.70.1", + "bowser": "^2.14.1", + "bullmq": "^5.71.0", "cache-manager": "^7.2.8", "cheerio": "^1.2.0", "class-transformer": "^0.5.1", "class-validator": "^0.15.1", "cookie": "^1.1.1", - "fs-extra": "^11.3.3", - "happy-dom": "20.1.0", - "ioredis": "^5.4.1", + "fast-bm25": "0.0.5", + "fastify-ip": "^2.0.0", + "fs-extra": "^11.3.4", + "happy-dom": "20.8.9", + "ioredis": "^5.10.1", + "js-tiktoken": "^1.0.21", "jsonwebtoken": "^9.0.3", - "kysely": "^0.28.2", + "kysely": "^0.28.14", "kysely-migration-cli": "^0.4.2", "kysely-postgres-js": "^3.0.0", - "ldapts": "^7.4.0", + "ldapts": "^8.1.7", "lib0": "^0.2.117", - "mammoth": "^1.11.0", - "mime-types": "^2.1.35", - "msgpackr": "^1.11.8", - "nanoid": "3.3.11", + "mammoth": "^1.12.0", + "mime-types": "^3.0.2", + "msgpackr": "^1.11.9", + "nanoid": "5.1.7", "nestjs-cls": "^6.2.0", - "nestjs-kysely": "^1.2.0", - "nestjs-pino": "^4.5.0", - "nodemailer": "^7.0.12", - "openid-client": "^5.7.1", - "otpauth": "^9.4.1", - "p-limit": "^6.2.0", + "nestjs-kysely": "^3.1.2", + "nestjs-pino": "^4.6.1", + "nodemailer": "^8.0.4", + "openid-client": "^6.8.2", + "otpauth": "^9.5.0", + "p-limit": "^7.3.0", "passport-google-oauth20": "^2.0.0", "passport-jwt": "^4.0.1", - "pdfjs-dist": "^5.4.394", + "pdfjs-dist": "^5.5.207", "pg-tsquery": "^8.4.2", "pgvector": "^0.2.1", "pino-http": "^11.0.0", "pino-pretty": "^13.1.3", "postgres": "^3.4.8", - "postmark": "^4.0.5", + "postmark": "^4.0.7", "react": "^18.3.1", "reflect-metadata": "^0.2.2", "rxjs": "^7.8.2", "sanitize-filename-ts": "1.0.2", "socket.io": "^4.8.3", - "stripe": "^17.5.0", + "stripe": "^17.7.0", "tlds": "^1.261.0", "tmp-promise": "^3.0.3", "tseep": "^1.3.1", - "typesense": "^2.1.0", + "typesense": "^3.0.3", "ws": "^8.19.0", - "yauzl": "^3.2.0", + "yauzl": "^3.2.1", "zod": "^4.3.6" }, "devDependencies": { - "@eslint/js": "^9.20.0", - "@nestjs/cli": "^11.0.16", - "@nestjs/schematics": "^11.0.1", - "@nestjs/testing": "^11.0.10", - "@types/bcrypt": "^5.0.2", + "@eslint/js": "^9.28.0", + "@nestjs/cli": "^11.0.18", + "@nestjs/schematics": "^11.0.10", + "@nestjs/testing": "^11.1.18", + "@types/bcrypt": "^6.0.0", "@types/debounce": "^1.2.4", "@types/fs-extra": "^11.0.4", "@types/jest": "^30.0.0", - "@types/mime-types": "^2.1.4", - "@types/node": "^22.13.4", - "@types/nodemailer": "^6.4.17", - "@types/passport-google-oauth20": "^2.0.16", + "@types/mime-types": "^3.0.1", + "@types/node": "^25.5.0", + "@types/nodemailer": "^7.0.11", + "@types/passport-google-oauth20": "^2.0.17", "@types/passport-jwt": "^4.0.1", "@types/supertest": "^6.0.3", "@types/ws": "^8.18.1", "@types/yauzl": "^2.10.3", - "eslint": "^9.39.2", - "eslint-config-prettier": "^10.0.1", - "globals": "^15.15.0", - "jest": "^30.2.0", + "eslint": "^9.28.0", + "eslint-config-prettier": "^10.1.8", + "globals": "^17.4.0", + "jest": "^30.3.0", "kysely-codegen": "^0.20.0", - "prettier": "^3.5.1", - "react-email": "5.2.8", + "prettier": "^3.8.1", + "react-email": "5.2.10", "source-map-support": "^0.5.21", "supertest": "^7.2.2", "ts-jest": "^29.4.6", - "ts-loader": "^9.5.4", + "ts-loader": "^9.5.7", "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", - "typescript": "^5.7.3", - "typescript-eslint": "^8.24.1" + "typescript": "^5.9.3", + "typescript-eslint": "^8.57.1" }, "jest": { "moduleFileExtensions": [ diff --git a/apps/server/src/app.module.ts b/apps/server/src/app.module.ts index 6280ee09..b8cfc587 100644 --- a/apps/server/src/app.module.ts +++ b/apps/server/src/app.module.ts @@ -26,6 +26,7 @@ import KeyvRedis from '@keyv/redis'; import { LoggerModule } from './common/logger/logger.module'; import { ClsModule } from 'nestjs-cls'; import { NoopAuditModule } from './integrations/audit/audit.module'; +import { ThrottleModule } from './integrations/throttle/throttle.module'; const enterpriseModules = []; try { @@ -83,6 +84,7 @@ try { EventEmitterModule.forRoot(), SecurityModule, TelemetryModule, + ThrottleModule, ...enterpriseModules, ], controllers: [AppController], diff --git a/apps/server/src/collaboration/collaboration.gateway.ts b/apps/server/src/collaboration/collaboration.gateway.ts index b296c520..b46c13c8 100644 --- a/apps/server/src/collaboration/collaboration.gateway.ts +++ b/apps/server/src/collaboration/collaboration.gateway.ts @@ -116,7 +116,7 @@ export class CollaborationGateway { // Forward close events client.on('close', (code: number, reason: Buffer) => { - this.redisSync!.onSocketClose(socketId, code, reason); + this.redisSync!.onSocketClose(socketId, code, reason.buffer as ArrayBuffer); }); // Forward pong events for keepalive diff --git a/apps/server/src/collaboration/collaboration.handler.ts b/apps/server/src/collaboration/collaboration.handler.ts index 87dc5010..992f9b74 100644 --- a/apps/server/src/collaboration/collaboration.handler.ts +++ b/apps/server/src/collaboration/collaboration.handler.ts @@ -5,6 +5,7 @@ import { prosemirrorNodeToYElement, tiptapExtensions, } from './collaboration.util'; +import { setYjsMark, updateYjsMarkAttribute, YjsSelection } from './yjs.util'; import * as Y from 'yjs'; import { User } from '@docmost/db/types/entity.types'; @@ -27,6 +28,53 @@ export class CollaborationHandler { // const fragment = doc.getXmlFragment('default'); //}); }, + setCommentMark: async ( + documentName: string, + payload: { + yjsSelection: YjsSelection; + commentId: string; + resolved: boolean; + user: User; + }, + ) => { + const { yjsSelection, commentId, resolved, user } = payload; + await this.withYdocConnection( + hocuspocus, + documentName, + { user }, + (doc) => { + const fragment = doc.getXmlFragment('default'); + setYjsMark(doc, fragment, yjsSelection, 'comment', { + commentId, + resolved, + }); + }, + ); + }, + resolveCommentMark: async ( + documentName: string, + payload: { + commentId: string; + resolved: boolean; + user: User; + }, + ) => { + const { commentId, resolved, user } = payload; + await this.withYdocConnection( + hocuspocus, + documentName, + { user }, + (doc) => { + const fragment = doc.getXmlFragment('default'); + updateYjsMarkAttribute( + fragment, + 'comment', + { name: 'commentId', value: commentId }, + { resolved }, + ); + }, + ); + }, updatePageContent: async ( documentName: string, payload: { @@ -58,8 +106,7 @@ export class CollaborationHandler { } else { const newContent = prosemirrorJson.content || []; const yElements = newContent.map(prosemirrorNodeToYElement); - const position = - operation === 'prepend' ? 0 : fragment.length; + const position = operation === 'prepend' ? 0 : fragment.length; fragment.insert(position, yElements); } }, diff --git a/apps/server/src/collaboration/collaboration.util.ts b/apps/server/src/collaboration/collaboration.util.ts index 9fa2f7a6..6cfed052 100644 --- a/apps/server/src/collaboration/collaboration.util.ts +++ b/apps/server/src/collaboration/collaboration.util.ts @@ -24,6 +24,8 @@ import { CustomTable, TiptapImage, TiptapVideo, + TiptapAudio, + TiptapPdf, TrailingNode, Attachment, Drawio, @@ -86,6 +88,8 @@ export const tiptapExtensions = [ Youtube, TiptapImage, TiptapVideo, + TiptapAudio, + TiptapPdf, Callout, Attachment, CustomCodeBlock, diff --git a/apps/server/src/collaboration/extensions/persistence.extension.ts b/apps/server/src/collaboration/extensions/persistence.extension.ts index 642d0761..d32e4778 100644 --- a/apps/server/src/collaboration/extensions/persistence.extension.ts +++ b/apps/server/src/collaboration/extensions/persistence.extension.ts @@ -18,12 +18,10 @@ import { QueueJob, QueueName } from '../../integrations/queue/constants'; import { Queue } from 'bullmq'; import { extractMentions, - extractPageMentions, extractUserMentions, } from '../../common/helpers/prosemirror/utils'; import { isDeepStrictEqual } from 'node:util'; import { - IPageBacklinkJob, IPageHistoryJob, IPageMentionNotificationJob, } from '../../integrations/queue/constants/queue.interface'; @@ -43,7 +41,6 @@ export class PersistenceExtension implements Extension { constructor( private readonly pageRepo: PageRepo, @InjectKysely() private readonly db: KyselyDB, - @InjectQueue(QueueName.GENERAL_QUEUE) private generalQueue: Queue, @InjectQueue(QueueName.AI_QUEUE) private aiQueue: Queue, @InjectQueue(QueueName.HISTORY_QUEUE) private historyQueue: Queue, @InjectQueue(QueueName.NOTIFICATION_QUEUE) private notificationQueue: Queue, @@ -165,13 +162,6 @@ export class PersistenceExtension implements Extension { await this.collabHistory.addContributors(pageId, editingUserIds); const mentions = extractMentions(tiptapJson); - const pageMentions = extractPageMentions(mentions); - - await this.generalQueue.add(QueueJob.PAGE_BACKLINKS, { - pageId: pageId, - workspaceId: page.workspaceId, - mentions: pageMentions, - } as IPageBacklinkJob); const userMentions = extractUserMentions(mentions); const oldMentions = page.content ? extractMentions(page.content) : []; diff --git a/apps/server/src/collaboration/processors/history.processor.ts b/apps/server/src/collaboration/processors/history.processor.ts index 315dba0b..5374e745 100644 --- a/apps/server/src/collaboration/processors/history.processor.ts +++ b/apps/server/src/collaboration/processors/history.processor.ts @@ -1,8 +1,18 @@ import { Logger, OnModuleDestroy } from '@nestjs/common'; import { OnWorkerEvent, Processor, WorkerHost } from '@nestjs/bullmq'; -import { Job } from 'bullmq'; +import { InjectQueue } from '@nestjs/bullmq'; +import { Job, Queue } from 'bullmq'; import { QueueJob, QueueName } from '../../integrations/queue/constants'; -import { IPageHistoryJob } from '../../integrations/queue/constants/queue.interface'; +import { + IPageBacklinkJob, + IPageHistoryJob, + IPageUpdateNotificationJob, +} from '../../integrations/queue/constants/queue.interface'; +import { + extractMentions, + extractPageMentions, + extractInternalLinkSlugIds, +} from '../../common/helpers/prosemirror/utils'; import { PageHistoryRepo } from '@docmost/db/repos/page/page-history.repo'; import { PageRepo } from '@docmost/db/repos/page/page.repo'; import { isDeepStrictEqual } from 'node:util'; @@ -18,6 +28,8 @@ export class HistoryProcessor extends WorkerHost implements OnModuleDestroy { private readonly pageRepo: PageRepo, private readonly collabHistory: CollabHistoryService, private readonly watcherService: WatcherService, + @InjectQueue(QueueName.NOTIFICATION_QUEUE) private notificationQueue: Queue, + @InjectQueue(QueueName.GENERAL_QUEUE) private generalQueue: Queue, ) { super(); } @@ -47,8 +59,7 @@ export class HistoryProcessor extends WorkerHost implements OnModuleDestroy { !lastHistory || !isDeepStrictEqual(lastHistory.content, page.content) ) { - const contributorIds = - await this.collabHistory.popContributors(pageId); + const contributorIds = await this.collabHistory.popContributors(pageId); try { await this.watcherService.addPageWatchers( @@ -61,12 +72,41 @@ export class HistoryProcessor extends WorkerHost implements OnModuleDestroy { await this.pageHistoryRepo.saveHistory(page, { contributorIds }); this.logger.debug(`History created for page: ${pageId}`); } catch (err) { - await this.collabHistory.addContributors( - pageId, - contributorIds, - ); + await this.collabHistory.addContributors(pageId, contributorIds); throw err; } + + const mentions = extractMentions(page.content); + const pageMentions = extractPageMentions(mentions); + const internalLinkSlugIds = extractInternalLinkSlugIds(page.content); + + await this.generalQueue + .add(QueueJob.PAGE_BACKLINKS, { + pageId, + workspaceId: page.workspaceId, + mentions: pageMentions, + internalLinkSlugIds, + } as IPageBacklinkJob) + .catch((err) => { + this.logger.error( + `Failed to queue backlinks for ${pageId}: ${err.message}`, + ); + }); + + if (contributorIds.length > 0 && lastHistory?.content) { + await this.notificationQueue + .add(QueueJob.PAGE_UPDATED, { + pageId, + spaceId: page.spaceId, + workspaceId: page.workspaceId, + actorIds: contributorIds, + } as IPageUpdateNotificationJob) + .catch((err) => { + this.logger.error( + `Failed to queue page update notification for ${pageId}: ${err.message}`, + ); + }); + } } } catch (err) { throw err; diff --git a/apps/server/src/collaboration/server/collab-app.module.ts b/apps/server/src/collaboration/server/collab-app.module.ts index 396ff0a9..f0e27d41 100644 --- a/apps/server/src/collaboration/server/collab-app.module.ts +++ b/apps/server/src/collaboration/server/collab-app.module.ts @@ -11,12 +11,14 @@ import { CollaborationController } from './collaboration.controller'; import { LoggerModule } from '../../common/logger/logger.module'; import { RedisModule } from '@nestjs-labs/nestjs-ioredis'; import { RedisConfigService } from '../../integrations/redis/redis-config.service'; +import { CaslModule } from '../../core/casl/casl.module'; @Module({ imports: [ LoggerModule, DatabaseModule, EnvironmentModule, + CaslModule, CollaborationModule, QueueModule, HealthModule, diff --git a/apps/server/src/collaboration/yjs.util.ts b/apps/server/src/collaboration/yjs.util.ts index 3e494bbc..863b149a 100644 --- a/apps/server/src/collaboration/yjs.util.ts +++ b/apps/server/src/collaboration/yjs.util.ts @@ -1,7 +1,7 @@ import { initProseMirrorDoc, relativePositionToAbsolutePosition, -} from 'y-prosemirror'; +} from '@tiptap/y-tiptap'; import * as Y from 'yjs'; import { Document } from '@hocuspocus/server'; import { getSchema } from '@tiptap/core'; diff --git a/apps/server/src/common/features.ts b/apps/server/src/common/features.ts new file mode 100644 index 00000000..4db35d3f --- /dev/null +++ b/apps/server/src/common/features.ts @@ -0,0 +1,23 @@ +export const Feature = { + SSO_CUSTOM: 'sso:custom', + SSO_GOOGLE: 'sso:google', + MFA: 'mfa', + API_KEYS: 'api:keys', + COMMENT_RESOLUTION: 'comment:resolution', + PAGE_PERMISSIONS: 'page:permissions', + AI: 'ai', + CONFLUENCE_IMPORT: 'import:confluence', + DOCX_IMPORT: 'import:docx', + ATTACHMENT_INDEXING: 'attachment:indexing', + SECURITY_SETTINGS: 'security:settings', + MCP: 'mcp', + SCIM: 'scim', + PAGE_VERIFICATION: 'page:verification', + AUDIT_LOGS: 'audit:logs', + RETENTION: 'retention', + SHARING_CONTROLS: 'sharing:controls', + VIEWER_COMMENTS: 'comment:viewer', + TEMPLATES: 'templates', +} as const; + +export type FeatureKey = (typeof Feature)[keyof typeof Feature]; diff --git a/apps/server/src/common/helpers/prosemirror/utils.ts b/apps/server/src/common/helpers/prosemirror/utils.ts index 424cd787..07b6828b 100644 --- a/apps/server/src/common/helpers/prosemirror/utils.ts +++ b/apps/server/src/common/helpers/prosemirror/utils.ts @@ -7,6 +7,10 @@ import { validate as isValidUUID } from 'uuid'; import { Transform } from '@tiptap/pm/transform'; import { TiptapTransformer } from '@hocuspocus/transformer'; import * as Y from 'yjs'; +import { + INTERNAL_LINK_REGEX, + extractPageSlugId, +} from '../../../integrations/export/utils'; export interface MentionNode { id: string; @@ -64,6 +68,27 @@ export function extractPageMentions(mentionList: MentionNode[]): MentionNode[] { return pageMentionList as MentionNode[]; } +export function extractInternalLinkSlugIds(prosemirrorJson: any): string[] { + const slugIds: string[] = []; + const doc = jsonToNode(prosemirrorJson); + + doc.descendants((node: Node) => { + for (const mark of node.marks) { + if (mark.type.name === 'link' && mark.attrs.internal && mark.attrs.href) { + const match = mark.attrs.href.match(INTERNAL_LINK_REGEX); + if (match) { + const slugId = extractPageSlugId(match[5]); + if (slugId && !slugIds.includes(slugId)) { + slugIds.push(slugId); + } + } + } + } + }); + + return slugIds; +} + export function extractUserMentionIdsFromJson(json: any): string[] { const userIds: string[] = []; @@ -102,6 +127,8 @@ export function isAttachmentNode(nodeType: string) { 'attachment', 'image', 'video', + 'audio', + 'pdf', 'excalidraw', 'drawio', ]; diff --git a/apps/server/src/common/helpers/utils.ts b/apps/server/src/common/helpers/utils.ts index 36ff5b63..c37e9a47 100644 --- a/apps/server/src/common/helpers/utils.ts +++ b/apps/server/src/common/helpers/utils.ts @@ -142,6 +142,18 @@ export function isUserDisabled(user: { return !!(user.deactivatedAt || user.deletedAt); } +const SENSITIVE_URL_PREFIXES = ['/api/sso/']; + +export function redactSensitiveUrl(url: string): string { + if (url && SENSITIVE_URL_PREFIXES.some((prefix) => url.includes(prefix))) { + const qsIndex = url.indexOf('?'); + if (qsIndex !== -1) { + return url.substring(0, qsIndex); + } + } + return url; +} + export function createByteCountingStream(source: Readable) { let bytesRead = 0; const stream = new Transform({ diff --git a/apps/server/src/common/logger/pino.config.ts b/apps/server/src/common/logger/pino.config.ts index 7299a8e9..4c3b1993 100644 --- a/apps/server/src/common/logger/pino.config.ts +++ b/apps/server/src/common/logger/pino.config.ts @@ -1,5 +1,6 @@ import { Params } from 'nestjs-pino'; import { stdTimeFunctions } from 'pino'; +import { redactSensitiveUrl } from '../helpers/utils'; const CONTEXTS_TO_IGNORE = [ 'InstanceLoader', @@ -50,20 +51,12 @@ export function createPinoConfig(): Params { }, }, serializers: { - req: (req) => { - const forwardedFor = req.headers?.['x-forwarded-for']; - const ip = - req.headers?.['cf-connecting-ip'] || - (typeof forwardedFor === 'string' ? forwardedFor.split(',')[0]?.trim() : undefined) || - req.remoteAddress; - - return { - method: req.method, - url: req.url, - ip, - userAgent: req.headers?.['user-agent'], - }; - }, + req: (req) => ({ + method: req.method, + url: redactSensitiveUrl(req.url), + ip: req.ip || req.remoteAddress, + userAgent: req.headers?.['user-agent'], + }), res: (res) => ({ statusCode: res.statusCode, }), diff --git a/apps/server/src/common/middlewares/audit-context.middleware.ts b/apps/server/src/common/middlewares/audit-context.middleware.ts index d58c4353..52956219 100644 --- a/apps/server/src/common/middlewares/audit-context.middleware.ts +++ b/apps/server/src/common/middlewares/audit-context.middleware.ts @@ -7,6 +7,7 @@ export interface AuditContext { actorId: string | null; actorType: 'user' | 'system' | 'api_key'; ipAddress: string | null; + userAgent: string | null; } export const AUDIT_CONTEXT_KEY = 'auditContext'; @@ -17,34 +18,22 @@ export class AuditContextMiddleware implements NestMiddleware { use(req: FastifyRequest['raw'], res: FastifyReply['raw'], next: () => void) { const workspaceId = (req as any).workspaceId ?? null; - const ipAddress = this.extractIpAddress(req); + + const ipAddress = (req as any).ip ?? (req as any).socket?.remoteAddress ?? null; + + const userAgent = + (req.headers['user-agent'] as string) ?? null; const auditContext: AuditContext = { workspaceId, actorId: null, actorType: 'user', ipAddress, + userAgent, }; this.cls.set(AUDIT_CONTEXT_KEY, auditContext); next(); } - - private extractIpAddress(req: FastifyRequest['raw']): string | null { - const xForwardedFor = req.headers['x-forwarded-for']; - if (xForwardedFor) { - const ips = Array.isArray(xForwardedFor) - ? xForwardedFor[0] - : xForwardedFor.split(',')[0]; - return ips?.trim() ?? null; - } - - const xRealIp = req.headers['x-real-ip']; - if (xRealIp) { - return Array.isArray(xRealIp) ? xRealIp[0] : xRealIp; - } - - return (req as any).socket?.remoteAddress ?? null; - } } diff --git a/apps/server/src/core/attachment/attachment.constants.ts b/apps/server/src/core/attachment/attachment.constants.ts index 7fb7e126..a5d90692 100644 --- a/apps/server/src/core/attachment/attachment.constants.ts +++ b/apps/server/src/core/attachment/attachment.constants.ts @@ -3,6 +3,7 @@ export enum AttachmentType { WorkspaceIcon = 'workspace-icon', SpaceIcon = 'space-icon', File = 'file', + Chat = 'chat', } export const validImageExtensions = ['.jpg', '.png', '.jpeg']; @@ -15,4 +16,9 @@ export const inlineFileExtensions = [ '.pdf', '.mp4', '.mov', + '.mp3', + '.wav', + '.ogg', + '.m4a', + '.webm', ]; diff --git a/apps/server/src/core/attachment/attachment.controller.ts b/apps/server/src/core/attachment/attachment.controller.ts index d70f0034..7b24cc35 100644 --- a/apps/server/src/core/attachment/attachment.controller.ts +++ b/apps/server/src/core/attachment/attachment.controller.ts @@ -178,21 +178,29 @@ export class AttachmentController { } const attachment = await this.attachmentRepo.findById(fileId); - if ( - !attachment || - attachment.workspaceId !== workspace.id || - !attachment.pageId || - !attachment.spaceId - ) { + if (!attachment || attachment.workspaceId !== workspace.id) { throw new NotFoundException(); } - const page = await this.pageRepo.findById(attachment.pageId); - if (!page) { - throw new NotFoundException(); - } + if (attachment.aiChatId) { + // Chat-owned attachment: only the user who uploaded (and therefore + // owns the chat, per AttachmentRepo.claimAttachmentsForChat) can + // read it back. + if (attachment.creatorId !== user.id) { + throw new NotFoundException(); + } + } else { + if (!attachment.pageId || !attachment.spaceId) { + throw new NotFoundException(); + } - await this.pageAccessService.validateCanView(page, user); + const page = await this.pageRepo.findById(attachment.pageId); + if (!page) { + throw new NotFoundException(); + } + + await this.pageAccessService.validateCanView(page, user); + } try { return await this.sendFileResponse(req, res, attachment, 'private'); @@ -457,6 +465,10 @@ export class AttachmentController { const rangeHeader = req.headers.range; res.header('Accept-Ranges', 'bytes'); + res.header( + 'Content-Security-Policy', + "base-uri 'none'; object-src 'self'; default-src 'self';", + ); if (!inlineFileExtensions.includes(attachment.fileExt)) { res.header( diff --git a/apps/server/src/core/attachment/attachment.utils.ts b/apps/server/src/core/attachment/attachment.utils.ts index 88edb2af..616fed53 100644 --- a/apps/server/src/core/attachment/attachment.utils.ts +++ b/apps/server/src/core/attachment/attachment.utils.ts @@ -71,6 +71,8 @@ export function getAttachmentFolderPath( return `${workspaceId}/space-logos`; case AttachmentType.File: return `${workspaceId}/files`; + case AttachmentType.Chat: + return `${workspaceId}/chat-files`; default: return `${workspaceId}/files`; } diff --git a/apps/server/src/core/attachment/processors/attachment.processor.ts b/apps/server/src/core/attachment/processors/attachment.processor.ts index bcf8a08a..7249a9fa 100644 --- a/apps/server/src/core/attachment/processors/attachment.processor.ts +++ b/apps/server/src/core/attachment/processors/attachment.processor.ts @@ -28,6 +28,11 @@ export class AttachmentProcessor extends WorkerHost implements OnModuleDestroy { job.data.pageId, ); } + if (job.name === QueueJob.DELETE_AI_CHAT_ATTACHMENTS) { + await this.attachmentService.handleDeleteAiChatAttachments( + job.data.aiChatId, + ); + } if ( job.name === QueueJob.ATTACHMENT_INDEX_CONTENT || job.name === QueueJob.ATTACHMENT_INDEXING diff --git a/apps/server/src/core/attachment/services/attachment.service.ts b/apps/server/src/core/attachment/services/attachment.service.ts index bc6a1e36..766c9f65 100644 --- a/apps/server/src/core/attachment/services/attachment.service.ts +++ b/apps/server/src/core/attachment/services/attachment.service.ts @@ -70,8 +70,8 @@ export class AttachmentService { } if ( - existingAttachment.pageId !== pageId && - existingAttachment.fileExt !== preparedFile.fileExtension && + existingAttachment.pageId !== pageId || + existingAttachment.fileExt !== preparedFile.fileExtension || existingAttachment.workspaceId !== workspaceId ) { throw new BadRequestException('File attachment does not match'); @@ -289,6 +289,31 @@ export class AttachmentService { ); } + async handleDeleteAiChatAttachments(aiChatId: string) { + try { + const attachments = await this.attachmentRepo.findByAiChatId(aiChatId); + if (!attachments || attachments.length === 0) { + return; + } + + await Promise.all( + attachments.map(async (attachment) => { + try { + await this.storageService.delete(attachment.filePath); + await this.attachmentRepo.deleteAttachmentById(attachment.id); + } catch (err) { + this.logger.log( + `DeleteAiChatAttachments: failed to delete attachment ${attachment.id}:`, + err, + ); + } + }), + ); + } catch (err) { + throw err; + } + } + async handleDeleteSpaceAttachments(spaceId: string) { try { const attachments = await this.attachmentRepo.findBySpaceId(spaceId); diff --git a/apps/server/src/core/auth/auth.controller.ts b/apps/server/src/core/auth/auth.controller.ts index f83fc1cf..89bb9e1b 100644 --- a/apps/server/src/core/auth/auth.controller.ts +++ b/apps/server/src/core/auth/auth.controller.ts @@ -5,12 +5,19 @@ import { HttpStatus, Inject, Post, + Req, Res, UseGuards, Logger, } from '@nestjs/common'; +import { SkipThrottle, ThrottlerGuard } from '@nestjs/throttler'; +import { + AI_CHAT_THROTTLER, + AUTH_THROTTLER, +} from '../../integrations/throttle/throttler-names'; import { LoginDto } from './dto/login.dto'; import { AuthService } from './services/auth.service'; +import { SessionService } from '../session/session.service'; import { SetupGuard } from './guards/setup.guard'; import { EnvironmentService } from '../../integrations/environment/environment.service'; import { CreateAdminUserDto } from './dto/create-admin-user.dto'; @@ -22,7 +29,7 @@ import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard'; import { ForgotPasswordDto } from './dto/forgot-password.dto'; import { PasswordResetDto } from './dto/password-reset.dto'; import { VerifyUserTokenDto } from './dto/verify-user-token.dto'; -import { FastifyReply } from 'fastify'; +import { FastifyReply, FastifyRequest } from 'fastify'; import { validateSsoEnforcement } from './auth.util'; import { ModuleRef } from '@nestjs/core'; import { AuditEvent, AuditResource } from '../../common/events/audit-events'; @@ -31,12 +38,15 @@ import { IAuditService, } from '../../integrations/audit/audit.service'; +@SkipThrottle({ [AI_CHAT_THROTTLER]: true }) +@UseGuards(ThrottlerGuard) @Controller('auth') export class AuthController { private readonly logger = new Logger(AuthController.name); constructor( private authService: AuthService, + private sessionService: SessionService, private environmentService: EnvironmentService, private moduleRef: ModuleRef, @Inject(AUDIT_SERVICE) private readonly auditService: IAuditService, @@ -108,6 +118,7 @@ export class AuthController { return workspace; } + @SkipThrottle({ [AUTH_THROTTLER]: true }) @UseGuards(JwtAuthGuard) @HttpCode(HttpStatus.OK) @Post('change-password') @@ -115,8 +126,15 @@ export class AuthController { @Body() dto: ChangePasswordDto, @AuthUser() user: User, @AuthWorkspace() workspace: Workspace, + @Req() req: FastifyRequest, ) { - return this.authService.changePassword(dto, user.id, workspace.id); + const currentSessionId = (req.raw as any).sessionId; + return this.authService.changePassword( + dto, + user.id, + workspace.id, + currentSessionId, + ); } @HttpCode(HttpStatus.OK) @@ -163,6 +181,7 @@ export class AuthController { return this.authService.verifyUserToken(verifyUserTokenDto, workspace.id); } + @SkipThrottle({ [AUTH_THROTTLER]: true }) @UseGuards(JwtAuthGuard) @HttpCode(HttpStatus.OK) @Post('collab-token') @@ -173,13 +192,24 @@ export class AuthController { return this.authService.getCollabToken(user, workspace.id); } + @SkipThrottle({ [AUTH_THROTTLER]: true }) @UseGuards(JwtAuthGuard) @HttpCode(HttpStatus.OK) @Post('logout') async logout( @AuthUser() user: User, + @Req() req: FastifyRequest, @Res({ passthrough: true }) res: FastifyReply, ) { + const sessionId = (req.raw as any).sessionId; + if (sessionId) { + await this.sessionService.revokeSession( + sessionId, + user.id, + user.workspaceId, + ); + } + res.clearCookie('authToken'); this.auditService.log({ @@ -192,6 +222,7 @@ export class AuthController { setAuthCookie(res: FastifyReply, token: string) { res.setCookie('authToken', token, { httpOnly: true, + sameSite: 'lax', path: '/', expires: this.environmentService.getCookieExpiresIn(), secure: this.environmentService.isHttps(), diff --git a/apps/server/src/core/auth/dto/jwt-payload.ts b/apps/server/src/core/auth/dto/jwt-payload.ts index 0f7db401..f70848b9 100644 --- a/apps/server/src/core/auth/dto/jwt-payload.ts +++ b/apps/server/src/core/auth/dto/jwt-payload.ts @@ -11,6 +11,7 @@ export type JwtPayload = { email: string; workspaceId: string; type: 'access'; + sessionId?: string; }; export type JwtCollabPayload = { diff --git a/apps/server/src/core/auth/services/auth.service.ts b/apps/server/src/core/auth/services/auth.service.ts index 1bb2c5ee..bfd8e1a0 100644 --- a/apps/server/src/core/auth/services/auth.service.ts +++ b/apps/server/src/core/auth/services/auth.service.ts @@ -8,6 +8,8 @@ import { import { LoginDto } from '../dto/login.dto'; import { CreateUserDto } from '../dto/create-user.dto'; import { TokenService } from './token.service'; +import { SessionService } from '../../session/session.service'; +import { UserSessionRepo } from '@docmost/db/repos/session/user-session.repo'; import { SignupService } from './signup.service'; import { CreateAdminUserDto } from '../dto/create-admin-user.dto'; import { UserRepo } from '@docmost/db/repos/user/user.repo'; @@ -44,6 +46,8 @@ export class AuthService { constructor( private signupService: SignupService, private tokenService: TokenService, + private sessionService: SessionService, + private userSessionRepo: UserSessionRepo, private userRepo: UserRepo, private userTokenRepo: UserTokenRepo, private mailService: MailService, @@ -90,19 +94,19 @@ export class AuthService { metadata: { source: 'password' }, }); - return this.tokenService.generateAccessToken(user); + return this.sessionService.createSessionAndToken(user); } async register(createUserDto: CreateUserDto, workspaceId: string) { const user = await this.signupService.signup(createUserDto, workspaceId); - return this.tokenService.generateAccessToken(user); + return this.sessionService.createSessionAndToken(user); } async setup(createAdminUserDto: CreateAdminUserDto) { const { workspace, user } = await this.signupService.initialSetup(createAdminUserDto); - const authToken = await this.tokenService.generateAccessToken(user); + const authToken = await this.sessionService.createSessionAndToken(user); return { workspace, authToken }; } @@ -110,6 +114,7 @@ export class AuthService { dto: ChangePasswordDto, userId: string, workspaceId: string, + currentSessionId?: string, ): Promise { const user = await this.userRepo.findById(userId, workspaceId, { includePassword: true, @@ -138,6 +143,16 @@ export class AuthService { workspaceId, ); + if (currentSessionId) { + await this.userSessionRepo.deleteAllExceptCurrent( + currentSessionId, + userId, + workspaceId, + ); + } else { + await this.userSessionRepo.deleteByUserId(userId, workspaceId); + } + this.auditService.log({ event: AuditEvent.USER_PASSWORD_CHANGED, resourceType: AuditResource.USER, @@ -244,6 +259,8 @@ export class AuthService { .execute(); }); + await this.userSessionRepo.deleteByUserId(user.id, workspace.id); + this.auditService.setActorId(user.id); this.auditService.log({ event: AuditEvent.USER_PASSWORD_RESET, @@ -276,7 +293,7 @@ export class AuthService { }; } - const authToken = await this.tokenService.generateAccessToken(user); + const authToken = await this.sessionService.createSessionAndToken(user); return { authToken }; } diff --git a/apps/server/src/core/auth/services/token.service.ts b/apps/server/src/core/auth/services/token.service.ts index 3929e992..b9035ba3 100644 --- a/apps/server/src/core/auth/services/token.service.ts +++ b/apps/server/src/core/auth/services/token.service.ts @@ -4,6 +4,7 @@ import { UnauthorizedException, } from '@nestjs/common'; import { JwtService } from '@nestjs/jwt'; +import type { StringValue } from 'ms'; import { EnvironmentService } from '../../../integrations/environment/environment.service'; import { JwtApiKeyPayload, @@ -24,7 +25,7 @@ export class TokenService { private environmentService: EnvironmentService, ) {} - async generateAccessToken(user: User): Promise { + async generateAccessToken(user: User, sessionId: string): Promise { if (isUserDisabled(user)) { throw new ForbiddenException(); } @@ -34,6 +35,7 @@ export class TokenService { email: user.email, workspaceId: user.workspaceId, type: JwtType.ACCESS, + sessionId, }; return this.jwtService.sign(payload); } @@ -96,7 +98,7 @@ export class TokenService { apiKeyId: string; user: User; workspaceId: string; - expiresIn?: string | number; + expiresIn?: StringValue | number; }): Promise { const { apiKeyId, user, workspaceId, expiresIn } = opts; if (isUserDisabled(user)) { diff --git a/apps/server/src/core/auth/strategies/jwt.strategy.ts b/apps/server/src/core/auth/strategies/jwt.strategy.ts index 61096245..d861eddf 100644 --- a/apps/server/src/core/auth/strategies/jwt.strategy.ts +++ b/apps/server/src/core/auth/strategies/jwt.strategy.ts @@ -5,6 +5,8 @@ import { EnvironmentService } from '../../../integrations/environment/environmen import { JwtApiKeyPayload, JwtPayload, JwtType } from '../dto/jwt-payload'; import { WorkspaceRepo } from '@docmost/db/repos/workspace/workspace.repo'; import { UserRepo } from '@docmost/db/repos/user/user.repo'; +import { UserSessionRepo } from '@docmost/db/repos/session/user-session.repo'; +import { SessionActivityService } from '../../session/session-activity.service'; import { FastifyRequest } from 'fastify'; import { extractBearerTokenFromHeader, isUserDisabled } from '../../../common/helpers'; import { ModuleRef } from '@nestjs/core'; @@ -16,6 +18,8 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') { constructor( private userRepo: UserRepo, private workspaceRepo: WorkspaceRepo, + private userSessionRepo: UserSessionRepo, + private sessionActivityService: SessionActivityService, private readonly environmentService: EnvironmentService, private moduleRef: ModuleRef, ) { @@ -57,6 +61,16 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') { throw new UnauthorizedException(); } + if ((payload as JwtPayload).sessionId) { + const sessionId = (payload as JwtPayload).sessionId; + const session = await this.userSessionRepo.findActiveById(sessionId); + if (!session || session.userId !== payload.sub || session.workspaceId !== payload.workspaceId) { + throw new UnauthorizedException(); + } + req.raw.sessionId = sessionId; + this.sessionActivityService.trackActivity(sessionId, payload.sub, payload.workspaceId); + } + return { user, workspace }; } diff --git a/apps/server/src/core/auth/token.module.ts b/apps/server/src/core/auth/token.module.ts index d8cd98eb..01ae8cd7 100644 --- a/apps/server/src/core/auth/token.module.ts +++ b/apps/server/src/core/auth/token.module.ts @@ -1,5 +1,6 @@ import { Module } from '@nestjs/common'; import { JwtModule } from '@nestjs/jwt'; +import type { StringValue } from 'ms'; import { EnvironmentService } from '../../integrations/environment/environment.service'; import { TokenService } from './services/token.service'; @@ -10,7 +11,7 @@ import { TokenService } from './services/token.service'; return { secret: environmentService.getAppSecret(), signOptions: { - expiresIn: environmentService.getJwtTokenExpiresIn(), + expiresIn: environmentService.getJwtTokenExpiresIn() as StringValue, issuer: 'Docmost', }, }; diff --git a/apps/server/src/core/comment/comment.controller.ts b/apps/server/src/core/comment/comment.controller.ts index 99e51384..22458848 100644 --- a/apps/server/src/core/comment/comment.controller.ts +++ b/apps/server/src/core/comment/comment.controller.ts @@ -58,13 +58,13 @@ export class CommentController { throw new NotFoundException('Page not found'); } - await this.pageAccessService.validateCanEdit(page, user); + await this.pageAccessService.validateCanComment(page, user, workspace.id); const comment = await this.commentService.create( { - userId: user.id, page, workspaceId: workspace.id, + user, }, createCommentDto, ); @@ -120,7 +120,7 @@ export class CommentController { @HttpCode(HttpStatus.OK) @Post('update') - async update(@Body() dto: UpdateCommentDto, @AuthUser() user: User) { + async update(@Body() dto: UpdateCommentDto, @AuthUser() user: User, @AuthWorkspace() workspace: Workspace) { const comment = await this.commentRepo.findById(dto.commentId, { includeCreator: true, includeResolvedBy: true, @@ -134,14 +134,14 @@ export class CommentController { throw new NotFoundException('Page not found'); } - await this.pageAccessService.validateCanEdit(page, user); + await this.pageAccessService.validateCanComment(page, user, workspace.id); return this.commentService.update(comment, dto, user); } @HttpCode(HttpStatus.OK) @Post('delete') - async delete(@Body() input: CommentIdDto, @AuthUser() user: User) { + async delete(@Body() input: CommentIdDto, @AuthUser() user: User, @AuthWorkspace() workspace: Workspace) { const comment = await this.commentRepo.findById(input.commentId); if (!comment) { throw new NotFoundException('Comment not found'); @@ -152,8 +152,7 @@ export class CommentController { throw new NotFoundException('Page not found'); } - // Check page-level edit permission first - await this.pageAccessService.validateCanEdit(page, user); + await this.pageAccessService.validateCanComment(page, user, workspace.id); // Check if user is the comment owner const isOwner = comment.creatorId === user.id; @@ -169,7 +168,7 @@ export class CommentController { // Space admin can delete any comment if (ability.cannot(SpaceCaslAction.Manage, SpaceCaslSubject.Settings)) { throw new ForbiddenException( - 'You can only delete your own comments or must be a space admin', + 'You can only delete your own comments', ); } await this.commentRepo.deleteComment(comment.id); diff --git a/apps/server/src/core/comment/comment.module.ts b/apps/server/src/core/comment/comment.module.ts index 02cb6d81..e08f3610 100644 --- a/apps/server/src/core/comment/comment.module.ts +++ b/apps/server/src/core/comment/comment.module.ts @@ -1,8 +1,10 @@ import { Module } from '@nestjs/common'; import { CommentService } from './comment.service'; import { CommentController } from './comment.controller'; +import { CollaborationModule } from '../../collaboration/collaboration.module'; @Module({ + imports: [CollaborationModule], controllers: [CommentController], providers: [CommentService], exports: [CommentService], diff --git a/apps/server/src/core/comment/comment.service.ts b/apps/server/src/core/comment/comment.service.ts index 9fa5e24c..e888ef50 100644 --- a/apps/server/src/core/comment/comment.service.ts +++ b/apps/server/src/core/comment/comment.service.ts @@ -7,7 +7,8 @@ import { } from '@nestjs/common'; import { InjectQueue } from '@nestjs/bullmq'; import { Queue } from 'bullmq'; -import { CreateCommentDto } from './dto/create-comment.dto'; +import { CreateCommentDto, yjsSelectionSchema } from './dto/create-comment.dto'; +import { CollaborationGateway } from '../../collaboration/collaboration.gateway'; import { UpdateCommentDto } from './dto/update-comment.dto'; import { CommentRepo } from '@docmost/db/repos/comment/comment.repo'; import { Comment, Page, User } from '@docmost/db/types/entity.types'; @@ -27,6 +28,7 @@ export class CommentService { private commentRepo: CommentRepo, private pageRepo: PageRepo, private wsService: WsService, + private collaborationGateway: CollaborationGateway, @InjectQueue(QueueName.GENERAL_QUEUE) private generalQueue: Queue, @InjectQueue(QueueName.NOTIFICATION_QUEUE) @@ -45,10 +47,10 @@ export class CommentService { } async create( - opts: { userId: string; page: Page; workspaceId: string }, + opts: { page: Page; workspaceId: string; user: User }, createCommentDto: CreateCommentDto, ) { - const { userId, page, workspaceId } = opts; + const { page, workspaceId, user } = opts; const commentContent = JSON.parse(createCommentDto.content); if (createCommentDto.parentCommentId) { @@ -71,11 +73,39 @@ export class CommentService { selection: createCommentDto?.selection?.substring(0, 250) ?? null, type: createCommentDto.type ?? 'page', parentCommentId: createCommentDto?.parentCommentId, - creatorId: userId, + creatorId: user.id, workspaceId: workspaceId, spaceId: page.spaceId, }); + if (createCommentDto.yjsSelection) { + const parsed = yjsSelectionSchema.safeParse(createCommentDto.yjsSelection); + if (!parsed.success) { + this.logger.warn( + `Invalid yjsSelection for comment ${inserted.id}: ${parsed.error.message}`, + ); + } else { + const documentName = `page.${page.id}`; + try { + await this.collaborationGateway.handleYjsEvent( + 'setCommentMark', + documentName, + { + yjsSelection: parsed.data, + commentId: inserted.id, + resolved: false, + user, + }, + ); + } catch (error) { + this.logger.warn( + `Failed to apply comment mark for comment ${inserted.id}, comment saved without inline highlight`, + error, + ); + } + } + } + const comment = await this.commentRepo.findById(inserted.id, { includeCreator: true, includeResolvedBy: true, @@ -83,7 +113,7 @@ export class CommentService { this.generalQueue .add(QueueJob.ADD_PAGE_WATCHERS, { - userIds: [userId], + userIds: [user.id], pageId: page.id, spaceId: page.spaceId, workspaceId, @@ -101,7 +131,7 @@ export class CommentService { page.id, page.spaceId, workspaceId, - userId, + user.id, !isReply, createCommentDto.parentCommentId, ); diff --git a/apps/server/src/core/comment/dto/create-comment.dto.ts b/apps/server/src/core/comment/dto/create-comment.dto.ts index ca21f47b..c82ae187 100644 --- a/apps/server/src/core/comment/dto/create-comment.dto.ts +++ b/apps/server/src/core/comment/dto/create-comment.dto.ts @@ -1,4 +1,22 @@ -import { IsIn, IsJSON, IsOptional, IsString, IsUUID } from 'class-validator'; +import { IsIn, IsJSON, IsObject, IsOptional, IsString, IsUUID } from 'class-validator'; +import { z } from 'zod'; + +const yjsIdSchema = z.object({ + client: z.number().int().nonnegative(), + clock: z.number().int().nonnegative(), +}); + +const yjsRelativePositionSchema = z.object({ + type: yjsIdSchema, + tname: z.string().nullable(), + item: yjsIdSchema.nullable(), + assoc: z.number().int(), +}); + +export const yjsSelectionSchema = z.object({ + anchor: yjsRelativePositionSchema, + head: yjsRelativePositionSchema, +}); export class CreateCommentDto { @IsString() @@ -18,4 +36,11 @@ export class CreateCommentDto { @IsOptional() @IsUUID() parentCommentId: string; + + @IsOptional() + @IsObject() + yjsSelection?: { + anchor: any; + head: any; + }; } diff --git a/apps/server/src/core/core.module.ts b/apps/server/src/core/core.module.ts index bfa6bff0..bb56bd3f 100644 --- a/apps/server/src/core/core.module.ts +++ b/apps/server/src/core/core.module.ts @@ -21,6 +21,7 @@ import { ShareModule } from './share/share.module'; import { NotificationModule } from './notification/notification.module'; import { WatcherModule } from './watcher/watcher.module'; import { FavoriteModule } from './favorite/favorite.module'; +import { SessionModule } from './session/session.module'; import { ClsMiddleware } from 'nestjs-cls'; @Module({ @@ -40,6 +41,7 @@ import { ClsMiddleware } from 'nestjs-cls'; ShareModule, NotificationModule, WatcherModule, + SessionModule, ], }) export class CoreModule implements NestModule { diff --git a/apps/server/src/core/notification/dto/notification.dto.ts b/apps/server/src/core/notification/dto/notification.dto.ts index 0b0bde94..b583c746 100644 --- a/apps/server/src/core/notification/dto/notification.dto.ts +++ b/apps/server/src/core/notification/dto/notification.dto.ts @@ -1,4 +1,5 @@ -import { IsArray, IsOptional, IsUUID } from 'class-validator'; +import { IsArray, IsIn, IsOptional, IsString, IsUUID } from 'class-validator'; +import { PaginationOptions } from '@docmost/db/pagination/pagination-options'; export class NotificationIdDto { @IsUUID() @@ -11,3 +12,10 @@ export class MarkNotificationsReadDto { @IsOptional() notificationIds?: string[]; } + +export class ListNotificationsDto extends PaginationOptions { + @IsOptional() + @IsString() + @IsIn(['direct', 'updates', 'all']) + type?: 'direct' | 'updates' | 'all' = 'all'; +} diff --git a/apps/server/src/core/notification/notification.constants.ts b/apps/server/src/core/notification/notification.constants.ts index 56d2ecad..8f7f5049 100644 --- a/apps/server/src/core/notification/notification.constants.ts +++ b/apps/server/src/core/notification/notification.constants.ts @@ -4,7 +4,45 @@ export const NotificationType = { COMMENT_RESOLVED: 'comment.resolved', PAGE_USER_MENTION: 'page.user_mention', PAGE_PERMISSION_GRANTED: 'page.permission_granted', + PAGE_UPDATED: 'page.updated', } as const; export type NotificationType = (typeof NotificationType)[keyof typeof NotificationType]; + +export type NotificationSettingKey = + | 'page.updated' + | 'page.userMention' + | 'comment.userMention' + | 'comment.created' + | 'comment.resolved'; + +export const NotificationTypeToSettingKey: Partial< + Record +> = { + [NotificationType.PAGE_UPDATED]: 'page.updated', + [NotificationType.PAGE_USER_MENTION]: 'page.userMention', + [NotificationType.COMMENT_USER_MENTION]: 'comment.userMention', + [NotificationType.COMMENT_CREATED]: 'comment.created', + [NotificationType.COMMENT_RESOLVED]: 'comment.resolved', +}; + +export type NotificationTab = 'direct' | 'updates' | 'all'; + +export const DIRECT_NOTIFICATION_TYPES: NotificationType[] = [ + NotificationType.COMMENT_USER_MENTION, + NotificationType.COMMENT_CREATED, + NotificationType.COMMENT_RESOLVED, + NotificationType.PAGE_USER_MENTION, + NotificationType.PAGE_PERMISSION_GRANTED, +]; + +export const UPDATES_NOTIFICATION_TYPES: NotificationType[] = [ + NotificationType.PAGE_UPDATED, +]; + +export function getTypesForTab(tab: NotificationTab): NotificationType[] | undefined { + if (tab === 'direct') return DIRECT_NOTIFICATION_TYPES; + if (tab === 'updates') return UPDATES_NOTIFICATION_TYPES; + return undefined; +} diff --git a/apps/server/src/core/notification/notification.controller.ts b/apps/server/src/core/notification/notification.controller.ts index d041414f..be5ee1d3 100644 --- a/apps/server/src/core/notification/notification.controller.ts +++ b/apps/server/src/core/notification/notification.controller.ts @@ -9,9 +9,8 @@ import { import { NotificationService } from './notification.service'; import { AuthUser } from '../../common/decorators/auth-user.decorator'; import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard'; -import { PaginationOptions } from '@docmost/db/pagination/pagination-options'; import { User } from '@docmost/db/types/entity.types'; -import { MarkNotificationsReadDto } from './dto/notification.dto'; +import { ListNotificationsDto, MarkNotificationsReadDto } from './dto/notification.dto'; @UseGuards(JwtAuthGuard) @Controller('notifications') @@ -21,10 +20,10 @@ export class NotificationController { @HttpCode(HttpStatus.OK) @Post('/') async getNotifications( - @Body() pagination: PaginationOptions, + @Body() dto: ListNotificationsDto, @AuthUser() user: User, ) { - return this.notificationService.findByUserId(user.id, pagination); + return this.notificationService.findByUserId(user.id, dto, dto.type); } @HttpCode(HttpStatus.OK) diff --git a/apps/server/src/core/notification/notification.module.ts b/apps/server/src/core/notification/notification.module.ts index a142eaf8..83778294 100644 --- a/apps/server/src/core/notification/notification.module.ts +++ b/apps/server/src/core/notification/notification.module.ts @@ -4,6 +4,7 @@ import { NotificationController } from './notification.controller'; import { NotificationProcessor } from './notification.processor'; import { CommentNotificationService } from './services/comment.notification'; import { PageNotificationService } from './services/page.notification'; +import { PageUpdateEmailRateLimiter } from './services/page-update-email-rate-limiter'; @Module({ imports: [], @@ -13,6 +14,7 @@ import { PageNotificationService } from './services/page.notification'; NotificationProcessor, CommentNotificationService, PageNotificationService, + PageUpdateEmailRateLimiter, ], exports: [NotificationService], }) diff --git a/apps/server/src/core/notification/notification.processor.ts b/apps/server/src/core/notification/notification.processor.ts index f7c8b577..e3d3a883 100644 --- a/apps/server/src/core/notification/notification.processor.ts +++ b/apps/server/src/core/notification/notification.processor.ts @@ -8,6 +8,7 @@ import { ICommentNotificationJob, ICommentResolvedNotificationJob, IPageMentionNotificationJob, + IPageUpdateNotificationJob, IPermissionGrantedNotificationJob, } from '../../integrations/queue/constants/queue.interface'; import { CommentNotificationService } from './services/comment.notification'; @@ -35,6 +36,7 @@ export class NotificationProcessor | ICommentNotificationJob | ICommentResolvedNotificationJob | IPageMentionNotificationJob + | IPageUpdateNotificationJob | IPermissionGrantedNotificationJob, void >, @@ -76,6 +78,20 @@ export class NotificationProcessor break; } + case QueueJob.PAGE_UPDATED: { + await this.pageNotificationService.processPageUpdate( + job.data as IPageUpdateNotificationJob, + appUrl, + ); + break; + } + + case QueueJob.PAGE_UPDATE_DIGEST: { + const { userId } = job.data as unknown as { userId: string }; + await this.pageNotificationService.processDigest(userId, appUrl); + break; + } + default: this.logger.warn(`Unknown notification job: ${job.name}`); } diff --git a/apps/server/src/core/notification/notification.service.ts b/apps/server/src/core/notification/notification.service.ts index 493b673e..1f88bf59 100644 --- a/apps/server/src/core/notification/notification.service.ts +++ b/apps/server/src/core/notification/notification.service.ts @@ -6,6 +6,8 @@ import { InsertableNotification } from '@docmost/db/types/entity.types'; import { PaginationOptions } from '@docmost/db/pagination/pagination-options'; import { WsGateway } from '../../ws/ws.gateway'; import { MailService } from '../../integrations/mail/mail.service'; +import { NotificationTab, NotificationType, NotificationTypeToSettingKey } from './notification.constants'; +import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo'; @Injectable() export class NotificationService { @@ -13,12 +15,23 @@ export class NotificationService { constructor( private readonly notificationRepo: NotificationRepo, + private readonly pagePermissionRepo: PagePermissionRepo, private readonly wsGateway: WsGateway, private readonly mailService: MailService, @InjectKysely() private readonly db: KyselyDB, ) {} async create(data: InsertableNotification) { + const user = await this.db + .selectFrom('users') + .select(['id']) + .where('id', '=', data.userId) + .where('deletedAt', 'is', null) + .where('deactivatedAt', 'is', null) + .executeTakeFirst(); + + if (!user) return null; + const notification = await this.notificationRepo.insert(data); this.wsGateway.server @@ -28,8 +41,35 @@ export class NotificationService { return notification; } - async findByUserId(userId: string, pagination: PaginationOptions) { - return this.notificationRepo.findByUserId(userId, pagination); + async findByUserId( + userId: string, + pagination: PaginationOptions, + type: NotificationTab = 'all', + ) { + const result = await this.notificationRepo.findByUserId( + userId, + pagination, + type, + ); + + const pageIds = result.items + .map((n: any) => n.pageId) + .filter(Boolean); + + if (pageIds.length > 0) { + const accessiblePageIds = + await this.pagePermissionRepo.filterAccessiblePageIds({ + pageIds, + userId, + }); + const accessibleSet = new Set(accessiblePageIds); + + result.items = result.items.filter( + (n: any) => !n.pageId || accessibleSet.has(n.pageId), + ); + } + + return result; } async getUnreadCount(userId: string) { @@ -53,17 +93,27 @@ export class NotificationService { notificationId: string, subject: string, template: any, + type?: NotificationType, ) { try { const user = await this.db .selectFrom('users') - .select(['email']) + .select(['email', 'settings']) .where('id', '=', userId) .where('deletedAt', 'is', null) + .where('deactivatedAt', 'is', null) .executeTakeFirst(); if (!user?.email) return; + if (type) { + const settingKey = NotificationTypeToSettingKey[type]; + if (settingKey) { + const settings = user.settings as any; + if (settings?.notifications?.[settingKey] === false) return; + } + } + await this.mailService.sendToQueue({ to: user.email, subject, diff --git a/apps/server/src/core/notification/services/comment.notification.ts b/apps/server/src/core/notification/services/comment.notification.ts index e75da302..c79c2895 100644 --- a/apps/server/src/core/notification/services/comment.notification.ts +++ b/apps/server/src/core/notification/services/comment.notification.ts @@ -86,12 +86,14 @@ export class CommentNotificationService { spaceId, commentId, }); + if (!notification) continue; await this.notificationService.queueEmail( userId, notification.id, `${actor.name} mentioned you in a comment`, CommentMentionEmail({ actorName: actor.name, pageTitle, pageUrl }), + NotificationType.COMMENT_USER_MENTION, ); notifiedUserIds.add(userId); @@ -110,12 +112,14 @@ export class CommentNotificationService { spaceId, commentId, }); + if (!notification) continue; await this.notificationService.queueEmail( recipientId, notification.id, `${actor.name} commented on ${pageTitle}`, CommentCreateEmail({ actorName: actor.name, pageTitle, pageUrl }), + NotificationType.COMMENT_CREATED, ); } } @@ -171,6 +175,7 @@ export class CommentNotificationService { spaceId, commentId, }); + if (!notification) return; const subject = `${actor.name} resolved a comment on ${pageTitle}`; @@ -179,6 +184,7 @@ export class CommentNotificationService { notification.id, subject, CommentResolvedEmail({ actorName: actor.name, pageTitle, pageUrl }), + NotificationType.COMMENT_RESOLVED, ); } diff --git a/apps/server/src/core/notification/services/page-update-email-rate-limiter.ts b/apps/server/src/core/notification/services/page-update-email-rate-limiter.ts new file mode 100644 index 00000000..59867f41 --- /dev/null +++ b/apps/server/src/core/notification/services/page-update-email-rate-limiter.ts @@ -0,0 +1,43 @@ +import { Injectable } from '@nestjs/common'; +import { RedisService } from '@nestjs-labs/nestjs-ioredis'; +import type { Redis } from 'ioredis'; + +const KEY_PREFIX = 'page-update:emails:'; +const DIGEST_PREFIX = 'page-update:digest:'; +const TTL_SECONDS = 86400; // 24 hours +const MAX_IMMEDIATE_EMAILS = 4; + +@Injectable() +export class PageUpdateEmailRateLimiter { + private readonly redis: Redis; + + constructor(private readonly redisService: RedisService) { + this.redis = this.redisService.getOrThrow(); + } + + async canSendEmail(userId: string): Promise { + const key = KEY_PREFIX + userId; + const count = await this.redis.incr(key); + await this.redis.expire(key, TTL_SECONDS, 'NX'); + return count <= MAX_IMMEDIATE_EMAILS; + } + + async addToDigest(userId: string, notificationId: string): Promise { + const key = DIGEST_PREFIX + userId; + const len = await this.redis.rpush(key, notificationId); + await this.redis.expire(key, TTL_SECONDS); + return len === 1; + } + + async popDigest(userId: string): Promise { + const key = DIGEST_PREFIX + userId; + const [ids] = await this.redis + .multi() + .lrange(key, 0, -1) + .del(key) + .exec(); + + return (ids?.[1] as string[]) ?? []; + } + +} diff --git a/apps/server/src/core/notification/services/page.notification.ts b/apps/server/src/core/notification/services/page.notification.ts index a8d951dd..77ab967a 100644 --- a/apps/server/src/core/notification/services/page.notification.ts +++ b/apps/server/src/core/notification/services/page.notification.ts @@ -1,25 +1,43 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, Logger } from '@nestjs/common'; import { InjectKysely } from 'nestjs-kysely'; +import { InjectQueue } from '@nestjs/bullmq'; +import { Queue } from 'bullmq'; import { KyselyDB } from '@docmost/db/types/kysely.types'; import { IPageMentionNotificationJob, + IPageUpdateNotificationJob, IPermissionGrantedNotificationJob, } from '../../../integrations/queue/constants/queue.interface'; import { NotificationService } from '../notification.service'; import { NotificationType } from '../notification.constants'; +import { NotificationRepo } from '@docmost/db/repos/notification/notification.repo'; import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo'; import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo'; +import { WatcherRepo } from '@docmost/db/repos/watcher/watcher.repo'; +import { PageUpdateEmailRateLimiter } from './page-update-email-rate-limiter'; import { PageMentionEmail } from '@docmost/transactional/emails/page-mention-email'; +import { PageUpdateEmail } from '@docmost/transactional/emails/page-update-email'; +import { PageUpdateDigestEmail } from '@docmost/transactional/emails/page-update-digest-email'; import { PermissionGrantedEmail } from '@docmost/transactional/emails/permission-granted-email'; import { getPageTitle } from '../../../common/helpers'; +import { QueueJob, QueueName } from '../../../integrations/queue/constants'; + +const PAGE_UPDATE_COOLDOWN_HOURS = 7; +const DIGEST_DELAY_MS = 12 * 60 * 60 * 1000; // 12 hours @Injectable() export class PageNotificationService { + private readonly logger = new Logger(PageNotificationService.name); + constructor( @InjectKysely() private readonly db: KyselyDB, private readonly notificationService: NotificationService, + private readonly notificationRepo: NotificationRepo, private readonly spaceMemberRepo: SpaceMemberRepo, private readonly pagePermissionRepo: PagePermissionRepo, + private readonly watcherRepo: WatcherRepo, + private readonly rateLimiter: PageUpdateEmailRateLimiter, + @InjectQueue(QueueName.NOTIFICATION_QUEUE) private notificationQueue: Queue, ) {} async processPageMention(data: IPageMentionNotificationJob, appUrl: string) { @@ -41,10 +59,9 @@ export class PageNotificationService { ); const usersWithPageAccess = - await this.pagePermissionRepo.getUserIdsWithPageAccess( - pageId, - [...usersWithSpaceAccess], - ); + await this.pagePermissionRepo.getUserIdsWithPageAccess(pageId, [ + ...usersWithSpaceAccess, + ]); const usersWithAccess = new Set(usersWithPageAccess); const accessibleMentions = newMentions.filter((m) => @@ -97,6 +114,7 @@ export class PageNotificationService { spaceId, data: { mentionId }, }); + if (!notification) continue; const pageUrl = `${basePageUrl}`; const subject = `${actor.name} mentioned you in ${pageTitle}`; @@ -106,6 +124,7 @@ export class PageNotificationService { notification.id, subject, PageMentionEmail({ actorName: actor.name, pageTitle, pageUrl }), + NotificationType.PAGE_USER_MENTION, ); } } @@ -139,6 +158,7 @@ export class PageNotificationService { spaceId, data: { role }, }); + if (!notification) continue; const subject = `${actor.name} gave you ${accessLabel} access to ${pageTitle}`; @@ -156,6 +176,237 @@ export class PageNotificationService { } } + async processPageUpdate(data: IPageUpdateNotificationJob, appUrl: string) { + const { pageId, spaceId, workspaceId, actorIds } = data; + + const watcherIds = await this.watcherRepo.getPageUpdateRecipientIds( + pageId, + spaceId, + ); + + if (watcherIds.length === 0) return; + + const actorSet = new Set(actorIds); + const candidateIds = watcherIds.filter((id) => !actorSet.has(id)); + if (candidateIds.length === 0) return; + + const eligibleUsers = await this.getEligiblePageUpdateUsers(candidateIds); + if (eligibleUsers.size === 0) return; + + const afterPrefs = [...eligibleUsers.keys()]; + + const recentlyNotified = + await this.notificationRepo.getRecentlyNotifiedUserIds( + afterPrefs, + pageId, + NotificationType.PAGE_UPDATED, + PAGE_UPDATE_COOLDOWN_HOURS, + ); + const afterCooldown = afterPrefs.filter((id) => !recentlyNotified.has(id)); + if (afterCooldown.length === 0) return; + + const usersWithSpaceAccess = + await this.spaceMemberRepo.getUserIdsWithSpaceAccess( + afterCooldown, + spaceId, + ); + + const usersWithPageAccess = + await this.pagePermissionRepo.getUserIdsWithPageAccess(pageId, [ + ...usersWithSpaceAccess, + ]); + if (usersWithPageAccess.length === 0) return; + + const recipientIds = new Set(usersWithPageAccess); + const actorId = actorIds[0]; + + const context = await this.getPageContext(actorId, pageId, spaceId, appUrl); + if (!context) return; + + const { actor, pageTitle, basePageUrl, spaceName } = context; + + for (const userId of recipientIds) { + const notification = await this.notificationService.create({ + userId, + workspaceId, + type: NotificationType.PAGE_UPDATED, + actorId, + pageId, + spaceId, + }); + if (!notification) continue; + + const canSend = await this.rateLimiter.canSendEmail(userId); + if (canSend) { + await this.notificationService.queueEmail( + userId, + notification.id, + `${actor.name} updated ${pageTitle}`, + PageUpdateEmail({ + userName: eligibleUsers.get(userId) ?? '', + actorName: actor.name, + pageTitle, + pageUrl: basePageUrl, + spaceName, + }), + NotificationType.PAGE_UPDATED, + ); + } else { + const isFirst = await this.rateLimiter.addToDigest( + userId, + notification.id, + ); + if (isFirst) { + await this.scheduleDigest(userId, workspaceId); + } + } + } + } + + private async getEligiblePageUpdateUsers( + userIds: string[], + ): Promise> { + if (userIds.length === 0) return new Map(); + + const users = await this.db + .selectFrom('users') + .select(['id', 'name', 'settings']) + .where('id', 'in', userIds) + .where('deletedAt', 'is', null) + .where('deactivatedAt', 'is', null) + .execute(); + + const eligible = new Map(); + for (const u of users) { + const settings = u.settings as any; + if (settings?.notifications?.['page.updated'] !== false) { + eligible.set(u.id, u.name); + } + } + return eligible; + } + + private async scheduleDigest( + userId: string, + workspaceId: string, + ): Promise { + await this.notificationQueue + .add( + QueueJob.PAGE_UPDATE_DIGEST, + { userId, workspaceId }, + { delay: DIGEST_DELAY_MS, removeOnComplete: true }, + ) + .catch((err) => { + this.logger.error( + `Failed to schedule digest for ${userId}: ${err.message}`, + ); + }); + } + + async processDigest(userId: string, appUrl: string): Promise { + const notificationIds = await this.rateLimiter.popDigest(userId); + if (notificationIds.length === 0) return; + + const [user, notifications] = await Promise.all([ + this.db + .selectFrom('users') + .select(['id', 'name']) + .where('id', '=', userId) + .executeTakeFirst(), + this.db + .selectFrom('notifications') + .select(['id', 'pageId', 'actorId']) + .where('id', 'in', notificationIds) + .execute(), + ]); + + if (!user || notifications.length === 0) return; + + const pageIds = [ + ...new Set(notifications.map((n) => n.pageId).filter(Boolean)), + ]; + const actorIds = [ + ...new Set(notifications.map((n) => n.actorId).filter(Boolean)), + ]; + + const allPages = await this.db + .selectFrom('pages') + .innerJoin('spaces', 'spaces.id', 'pages.spaceId') + .select([ + 'pages.id', + 'pages.title', + 'pages.slugId', + 'pages.spaceId', + 'spaces.slug as spaceSlug', + ]) + .where('pages.id', 'in', pageIds) + .execute(); + + if (allPages.length === 0) return; + + const spaceIds = [...new Set(allPages.map((p) => p.spaceId))]; + + const accessibleSpaceIds = new Set(); + for (const spaceId of spaceIds) { + const usersWithAccess = + await this.spaceMemberRepo.getUserIdsWithSpaceAccess([userId], spaceId); + if (usersWithAccess.has(userId)) accessibleSpaceIds.add(spaceId); + } + + const spaceFilteredPages = allPages.filter((p) => + accessibleSpaceIds.has(p.spaceId), + ); + if (spaceFilteredPages.length === 0) return; + + const accessiblePageIds = new Set(); + for (const p of spaceFilteredPages) { + const hasAccess = await this.pagePermissionRepo.getUserIdsWithPageAccess( + p.id, + [userId], + ); + if (hasAccess.includes(userId)) accessiblePageIds.add(p.id); + } + + const pages = spaceFilteredPages.filter((p) => accessiblePageIds.has(p.id)); + if (pages.length === 0) return; + + const actors = actorIds.length > 0 + ? await this.db + .selectFrom('users') + .select(['id', 'name']) + .where('id', 'in', actorIds) + .execute() + : []; + + const actorMap = new Map(actors.map((a) => [a.id, a.name])); + const pageActors = new Map>(); + for (const n of notifications) { + if (!n.pageId || !n.actorId) continue; + const names = pageActors.get(n.pageId) ?? new Set(); + const name = actorMap.get(n.actorId); + if (name) names.add(name); + pageActors.set(n.pageId, names); + } + + const pageUpdates = pages.map((p) => ({ + title: getPageTitle(p.title), + url: `${appUrl}/s/${p.spaceSlug}/p/${p.slugId}`, + updatedBy: [...(pageActors.get(p.id) ?? [])], + })); + + await this.notificationService.queueEmail( + userId, + notificationIds[0], + `Your digest: ${pageUpdates.length} page ${pageUpdates.length === 1 ? 'update' : 'updates'}`, + PageUpdateDigestEmail({ + userName: user.name, + pageUpdates, + totalUpdates: pageUpdates.length, + }), + NotificationType.PAGE_UPDATED, + ); + } + private async getPageContext( actorId: string, pageId: string, @@ -175,7 +426,7 @@ export class PageNotificationService { .executeTakeFirst(), this.db .selectFrom('spaces') - .select(['id', 'slug']) + .select(['id', 'slug', 'name']) .where('id', '=', spaceId) .executeTakeFirst(), ]); @@ -186,6 +437,11 @@ export class PageNotificationService { const basePageUrl = `${appUrl}/s/${space.slug}/p/${page.slugId}`; - return { actor, pageTitle: getPageTitle(page.title), basePageUrl }; + return { + actor, + pageTitle: getPageTitle(page.title), + basePageUrl, + spaceName: space.name, + }; } } diff --git a/apps/server/src/core/page/page-access/page-access.service.ts b/apps/server/src/core/page/page-access/page-access.service.ts index 07395ed4..6d6db03f 100644 --- a/apps/server/src/core/page/page-access/page-access.service.ts +++ b/apps/server/src/core/page/page-access/page-access.service.ts @@ -6,12 +6,14 @@ import { SpaceCaslAction, SpaceCaslSubject, } from '../../casl/interfaces/space-ability.type'; +import { SpaceRepo } from '@docmost/db/repos/space/space.repo'; @Injectable() export class PageAccessService { constructor( private readonly pagePermissionRepo: PagePermissionRepo, private readonly spaceAbility: SpaceAbilityFactory, + private readonly spaceRepo: SpaceRepo, ) {} /** @@ -99,4 +101,25 @@ export class PageAccessService { return { hasRestriction: hasAnyRestriction }; } + + async validateCanComment( + page: Page, + user: User, + workspaceId: string, + ): Promise { + try { + await this.validateCanEdit(page, user); + return; + } catch { + // User cannot edit — check if reader commenting is enabled + } + + await this.validateCanView(page, user); + + const space = await this.spaceRepo.findById(page.spaceId, workspaceId); + const settings = space?.settings as Record | null; + if (!settings?.comments?.allowViewerComments) { + throw new ForbiddenException(); + } + } } diff --git a/apps/server/src/core/page/services/page.service.ts b/apps/server/src/core/page/services/page.service.ts index d291a2f6..b62d9864 100644 --- a/apps/server/src/core/page/services/page.service.ts +++ b/apps/server/src/core/page/services/page.service.ts @@ -47,6 +47,10 @@ import { QueueJob, QueueName } from '../../../integrations/queue/constants'; import { EventName } from '../../../common/events/event.contants'; import { EventEmitter2 } from '@nestjs/event-emitter'; import { CollaborationGateway } from '../../../collaboration/collaboration.gateway'; +import { + INTERNAL_LINK_REGEX, + extractPageSlugId, +} from '../../../integrations/export/utils'; import { markdownToHtml } from '@docmost/editor-ext'; import { WatcherService } from '../../watcher/watcher.service'; import { sql } from 'kysely'; @@ -510,6 +514,11 @@ export class PageService { }); }); + const slugIdMap = new Map(); + for (const [, entry] of pageMap) { + slugIdMap.set(entry.oldSlugId, entry); + } + const attachmentMap = new Map(); const insertablePages: InsertablePage[] = await Promise.all( @@ -576,6 +585,28 @@ export class PageService { node.attrs.slugId = mappedPage.newSlugId; } } + + // Update internal page links in link marks + for (const mark of node.marks) { + if ( + mark.type.name === 'link' && + mark.attrs.internal && + mark.attrs.href + ) { + const match = mark.attrs.href.match(INTERNAL_LINK_REGEX); + if (match) { + const slugId = extractPageSlugId(match[5]); + if (slugId && slugIdMap.has(slugId)) { + const mappedPage = slugIdMap.get(slugId); + //@ts-ignore + mark.attrs.href = mark.attrs.href.replace( + slugId, + mappedPage.newSlugId, + ); + } + } + } + } }); const prosemirrorJson = prosemirrorDoc.toJSON(); diff --git a/apps/server/src/core/session/dto/revoke-session.dto.ts b/apps/server/src/core/session/dto/revoke-session.dto.ts new file mode 100644 index 00000000..7e7bb86f --- /dev/null +++ b/apps/server/src/core/session/dto/revoke-session.dto.ts @@ -0,0 +1,7 @@ +import { IsNotEmpty, IsUUID } from 'class-validator'; + +export class RevokeSessionDto { + @IsUUID() + @IsNotEmpty() + sessionId: string; +} diff --git a/apps/server/src/core/session/session-activity.service.ts b/apps/server/src/core/session/session-activity.service.ts new file mode 100644 index 00000000..4b9adc4e --- /dev/null +++ b/apps/server/src/core/session/session-activity.service.ts @@ -0,0 +1,36 @@ +import { Injectable } from '@nestjs/common'; +import { RedisService } from '@nestjs-labs/nestjs-ioredis'; +import type { Redis } from 'ioredis'; +import { UserSessionRepo } from '@docmost/db/repos/session/user-session.repo'; +import { UserRepo } from '@docmost/db/repos/user/user.repo'; + +const THROTTLE_SECONDS = 15 * 60; // 15 minutes + +@Injectable() +export class SessionActivityService { + private readonly redis: Redis; + + constructor( + private readonly redisService: RedisService, + private readonly userSessionRepo: UserSessionRepo, + private readonly userRepo: UserRepo, + ) { + this.redis = this.redisService.getOrThrow(); + } + + trackActivity(sessionId: string, userId: string, workspaceId: string): void { + const key = `session:activity:${sessionId}`; + + this.redis + .set(key, '1', 'EX', THROTTLE_SECONDS, 'NX') + .then((result) => { + if (result === null) return; // key already exists, throttled + + this.userSessionRepo.updateLastActiveAt(sessionId).catch(() => {}); + this.userRepo + .updateUser({ lastActiveAt: new Date() }, userId, workspaceId) + .catch(() => {}); + }) + .catch(() => {}); + } +} diff --git a/apps/server/src/core/session/session.controller.ts b/apps/server/src/core/session/session.controller.ts new file mode 100644 index 00000000..75b83c06 --- /dev/null +++ b/apps/server/src/core/session/session.controller.ts @@ -0,0 +1,80 @@ +import { + BadRequestException, + Body, + Controller, + HttpCode, + HttpStatus, + Post, + Req, + UseGuards, +} from '@nestjs/common'; +import { SessionService } from './session.service'; +import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard'; +import { AuthUser } from '../../common/decorators/auth-user.decorator'; +import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator'; +import { User, Workspace } from '@docmost/db/types/entity.types'; +import { RevokeSessionDto } from './dto/revoke-session.dto'; +import { FastifyRequest } from 'fastify'; + +@UseGuards(JwtAuthGuard) +@Controller('sessions') +export class SessionController { + constructor(private readonly sessionService: SessionService) {} + + @HttpCode(HttpStatus.OK) + @Post() + async listSessions( + @AuthUser() user: User, + @AuthWorkspace() workspace: Workspace, + @Req() req: FastifyRequest, + ) { + const currentSessionId = (req.raw as any).sessionId ?? null; + const sessions = await this.sessionService.getActiveSessions( + user.id, + workspace.id, + currentSessionId, + ); + return { sessions }; + } + + @HttpCode(HttpStatus.OK) + @Post('revoke') + async revokeSession( + @Body() dto: RevokeSessionDto, + @AuthUser() user: User, + @AuthWorkspace() workspace: Workspace, + @Req() req: FastifyRequest, + ) { + const currentSessionId = (req.raw as any).sessionId; + if (dto.sessionId === currentSessionId) { + throw new BadRequestException( + 'Cannot revoke current session. Use logout instead.', + ); + } + await this.sessionService.revokeSession( + dto.sessionId, + user.id, + workspace.id, + ); + } + + @HttpCode(HttpStatus.OK) + @Post('revoke-all') + async revokeAllSessions( + @AuthUser() user: User, + @AuthWorkspace() workspace: Workspace, + @Req() req: FastifyRequest, + ) { + const currentSessionId = (req.raw as any).sessionId; + if (!currentSessionId) { + throw new BadRequestException( + 'Current session not found. Please log in again.', + ); + } + await this.sessionService.revokeAllOtherSessions( + currentSessionId, + user.id, + workspace.id, + ); + } +} diff --git a/apps/server/src/core/session/session.module.ts b/apps/server/src/core/session/session.module.ts new file mode 100644 index 00000000..9712e887 --- /dev/null +++ b/apps/server/src/core/session/session.module.ts @@ -0,0 +1,14 @@ +import { Global, Module } from '@nestjs/common'; +import { SessionService } from './session.service'; +import { SessionActivityService } from './session-activity.service'; +import { SessionController } from './session.controller'; +import { TokenModule } from '../auth/token.module'; + +@Global() +@Module({ + imports: [TokenModule], + controllers: [SessionController], + providers: [SessionService, SessionActivityService], + exports: [SessionService, SessionActivityService], +}) +export class SessionModule {} diff --git a/apps/server/src/core/session/session.service.ts b/apps/server/src/core/session/session.service.ts new file mode 100644 index 00000000..5b2ec47c --- /dev/null +++ b/apps/server/src/core/session/session.service.ts @@ -0,0 +1,127 @@ +import { Injectable, Logger } from '@nestjs/common'; +import { Interval } from '@nestjs/schedule'; +import { TokenService } from '../auth/services/token.service'; +import { UserSessionRepo } from '@docmost/db/repos/session/user-session.repo'; +import { EnvironmentService } from '../../integrations/environment/environment.service'; +import { User } from '@docmost/db/types/entity.types'; +import { ClsService } from 'nestjs-cls'; +import { + AuditContext, + AUDIT_CONTEXT_KEY, +} from '../../common/middlewares/audit-context.middleware'; +import * as Bowser from 'bowser'; + +const MAX_SESSIONS_PER_USER = 25; +const RETENTION_DAYS = 7; + +@Injectable() +export class SessionService { + private readonly logger = new Logger(SessionService.name); + + constructor( + private readonly tokenService: TokenService, + private readonly userSessionRepo: UserSessionRepo, + private readonly environmentService: EnvironmentService, + private readonly cls: ClsService, + ) {} + + @Interval('session-cleanup', 24 * 60 * 60 * 1000) + async cleanupSessions() { + try { + await this.userSessionRepo.deleteStale(RETENTION_DAYS); + await this.userSessionRepo.trimExcessSessions(MAX_SESSIONS_PER_USER); + this.logger.debug('Session cleanup completed'); + } catch (err) { + this.logger.error('Session cleanup failed', err); + } + } + + async createSessionAndToken(user: User): Promise { + const auditContext = this.cls.get(AUDIT_CONTEXT_KEY); + const ipAddress = auditContext?.ipAddress ?? null; + const userAgent = auditContext?.userAgent ?? null; + + const deviceName = this.parseDeviceName(userAgent); + const expiresAt = this.environmentService.getCookieExpiresIn(); + + const session = await this.userSessionRepo.insertSession({ + userId: user.id, + workspaceId: user.workspaceId, + deviceName, + ipAddress, + expiresAt, + }); + + return this.tokenService.generateAccessToken(user, session.id); + } + + async getActiveSessions( + userId: string, + workspaceId: string, + currentSessionId: string | null, + ) { + const sessions = await this.userSessionRepo.findActiveByUser( + userId, + workspaceId, + ); + + const mapped = sessions.map((s) => ({ + id: s.id, + deviceName: s.deviceName, + geoLocation: s.geoLocation, + lastActiveAt: s.lastActiveAt, + createdAt: s.createdAt, + isCurrentDevice: s.id === currentSessionId, + })); + + return mapped.sort((a, b) => { + if (a.isCurrentDevice) return -1; + if (b.isCurrentDevice) return 1; + return 0; + }); + } + + async revokeSession( + sessionId: string, + userId: string, + workspaceId: string, + ): Promise { + await this.userSessionRepo.revokeById(sessionId, userId, workspaceId); + } + + async revokeAllOtherSessions( + currentSessionId: string, + userId: string, + workspaceId: string, + ): Promise { + await this.userSessionRepo.revokeAllExceptCurrent( + currentSessionId, + userId, + workspaceId, + ); + } + + private parseDeviceName(userAgent: string | null): string | null { + if (!userAgent) return null; + + try { + const parsed = Bowser.parse(userAgent); + + const os = parsed.os?.name; + const browser = parsed.browser?.name; + const platformType = parsed.platform?.type; + + if (platformType === 'mobile' || platformType === 'tablet') { + return parsed.platform?.model || os || 'Mobile Device'; + } + + if (os) { + return browser ? `${browser} on ${os}` : os; + } + + return browser || null; + } catch { + return null; + } + } +} diff --git a/apps/server/src/core/space/dto/update-space.dto.ts b/apps/server/src/core/space/dto/update-space.dto.ts index 47f1529b..8b40e894 100644 --- a/apps/server/src/core/space/dto/update-space.dto.ts +++ b/apps/server/src/core/space/dto/update-space.dto.ts @@ -11,4 +11,8 @@ export class UpdateSpaceDto extends PartialType(CreateSpaceDto) { @IsOptional() @IsBoolean() disablePublicSharing: boolean; + + @IsOptional() + @IsBoolean() + allowViewerComments: boolean; } diff --git a/apps/server/src/core/space/services/space.service.ts b/apps/server/src/core/space/services/space.service.ts index e512e644..2675a9e6 100644 --- a/apps/server/src/core/space/services/space.service.ts +++ b/apps/server/src/core/space/services/space.service.ts @@ -13,6 +13,7 @@ import { Space, User } from '@docmost/db/types/entity.types'; import { UpdateSpaceDto } from '../dto/update-space.dto'; import { executeTx } from '@docmost/db/utils'; import { InjectKysely } from 'nestjs-kysely'; +import { Feature } from '../../../common/features'; import { SpaceMemberService } from './space-member.service'; import { SpaceRole } from '../../../common/helpers/types/permission'; import { QueueJob, QueueName } from 'src/integrations/queue/constants'; @@ -133,17 +134,34 @@ export class SpaceService { } } - if (typeof updateSpaceDto.disablePublicSharing !== 'undefined') { + if ( + typeof updateSpaceDto.disablePublicSharing !== 'undefined' || + typeof updateSpaceDto.allowViewerComments !== 'undefined' + ) { const workspace = await this.workspaceRepo.findById(workspaceId, { withLicenseKey: true, }); if ( - !this.licenseCheckService.hasFeature(workspace.licenseKey, 'security:settings', workspace.plan) + typeof updateSpaceDto.disablePublicSharing !== 'undefined' && + !this.licenseCheckService.hasFeature( + workspace.licenseKey, + Feature.SECURITY_SETTINGS, + workspace.plan, + ) ) { - throw new ForbiddenException( - 'This feature requires a valid license', - ); + throw new ForbiddenException('This feature requires a valid license'); + } + + if ( + typeof updateSpaceDto.allowViewerComments !== 'undefined' && + !this.licenseCheckService.hasFeature( + workspace.licenseKey, + Feature.VIEWER_COMMENTS, + workspace.plan, + ) + ) { + throw new ForbiddenException('This feature requires a valid license'); } } @@ -179,6 +197,22 @@ export class SpaceService { } } + if (typeof updateSpaceDto.allowViewerComments !== 'undefined') { + const prev = settingsBefore?.comments?.allowViewerComments ?? false; + if (prev !== updateSpaceDto.allowViewerComments) { + before.allowViewerComments = prev; + after.allowViewerComments = updateSpaceDto.allowViewerComments; + } + + await this.spaceRepo.updateCommentSettings( + updateSpaceDto.spaceId, + workspaceId, + 'allowViewerComments', + updateSpaceDto.allowViewerComments, + trx, + ); + } + updatedSpace = await this.spaceRepo.updateSpace( { name: updateSpaceDto.name, diff --git a/apps/server/src/core/user/dto/update-user.dto.ts b/apps/server/src/core/user/dto/update-user.dto.ts index 3f771339..f1c02c51 100644 --- a/apps/server/src/core/user/dto/update-user.dto.ts +++ b/apps/server/src/core/user/dto/update-user.dto.ts @@ -35,4 +35,24 @@ export class UpdateUserDto extends PartialType( @MaxLength(70) @IsString() confirmPassword: string; + + @IsOptional() + @IsBoolean() + notificationPageUpdates: boolean; + + @IsOptional() + @IsBoolean() + notificationPageUserMention: boolean; + + @IsOptional() + @IsBoolean() + notificationCommentUserMention: boolean; + + @IsOptional() + @IsBoolean() + notificationCommentCreated: boolean; + + @IsOptional() + @IsBoolean() + notificationCommentResolved: boolean; } diff --git a/apps/server/src/core/user/user.service.ts b/apps/server/src/core/user/user.service.ts index 59bc08ec..fa229827 100644 --- a/apps/server/src/core/user/user.service.ts +++ b/apps/server/src/core/user/user.service.ts @@ -7,6 +7,7 @@ import { UnauthorizedException, } from '@nestjs/common'; import { UpdateUserDto } from './dto/update-user.dto'; +import { NotificationSettingKey } from '../notification/notification.constants'; import { comparePasswordHash, diffAuditTrackedFields } from 'src/common/helpers/utils'; import { Workspace } from '@docmost/db/types/entity.types'; import { validateSsoEnforcement } from '../auth/auth.util'; @@ -60,6 +61,24 @@ export class UserService { ); } + const notificationSettings: Record = { + notificationPageUpdates: 'page.updated', + notificationPageUserMention: 'page.userMention', + notificationCommentUserMention: 'comment.userMention', + notificationCommentCreated: 'comment.created', + notificationCommentResolved: 'comment.resolved', + }; + + for (const [dtoField, settingKey] of Object.entries(notificationSettings)) { + if (typeof updateUserDto[dtoField] !== 'undefined') { + return this.userRepo.updateNotificationSetting( + userId, + settingKey, + updateUserDto[dtoField], + ); + } + } + const userBefore = { name: user.name, email: user.email, locale: user.locale }; if (updateUserDto.name) { diff --git a/apps/server/src/core/watcher/dto/space-watcher.dto.ts b/apps/server/src/core/watcher/dto/space-watcher.dto.ts new file mode 100644 index 00000000..1df06010 --- /dev/null +++ b/apps/server/src/core/watcher/dto/space-watcher.dto.ts @@ -0,0 +1,7 @@ +import { IsString, IsNotEmpty } from 'class-validator'; + +export class SpaceWatcherDto { + @IsString() + @IsNotEmpty() + spaceId: string; +} diff --git a/apps/server/src/core/watcher/space-watcher.controller.ts b/apps/server/src/core/watcher/space-watcher.controller.ts new file mode 100644 index 00000000..455c7d0d --- /dev/null +++ b/apps/server/src/core/watcher/space-watcher.controller.ts @@ -0,0 +1,95 @@ +import { + Body, + Controller, + ForbiddenException, + HttpCode, + HttpStatus, + NotFoundException, + Post, + UseGuards, +} from '@nestjs/common'; +import { WatcherService } from './watcher.service'; +import { AuthUser } from '../../common/decorators/auth-user.decorator'; +import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator'; +import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard'; +import { User, Workspace } from '@docmost/db/types/entity.types'; +import { SpaceWatcherDto } from './dto/space-watcher.dto'; +import { SpaceRepo } from '@docmost/db/repos/space/space.repo'; +import SpaceAbilityFactory from '../casl/abilities/space-ability.factory'; +import { + SpaceCaslAction, + SpaceCaslSubject, +} from '../casl/interfaces/space-ability.type'; + +@UseGuards(JwtAuthGuard) +@Controller('spaces') +export class SpaceWatcherController { + constructor( + private readonly watcherService: WatcherService, + private readonly spaceRepo: SpaceRepo, + private readonly spaceAbility: SpaceAbilityFactory, + ) {} + + private async loadSpaceAndAuthorize( + spaceId: string, + user: User, + workspace: Workspace, + ) { + const space = await this.spaceRepo.findById(spaceId, workspace.id); + if (!space) { + throw new NotFoundException('Space not found'); + } + + const ability = await this.spaceAbility.createForUser(user, space.id); + if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Settings)) { + throw new ForbiddenException(); + } + + return space; + } + + @HttpCode(HttpStatus.OK) + @Post('watch') + async watchSpace( + @Body() dto: SpaceWatcherDto, + @AuthUser() user: User, + @AuthWorkspace() workspace: Workspace, + ) { + const space = await this.loadSpaceAndAuthorize(dto.spaceId, user, workspace); + + await this.watcherService.watchSpace(user.id, space.id, workspace.id); + + return { watching: true }; + } + + @HttpCode(HttpStatus.OK) + @Post('unwatch') + async unwatchSpace( + @Body() dto: SpaceWatcherDto, + @AuthUser() user: User, + @AuthWorkspace() workspace: Workspace, + ) { + const space = await this.loadSpaceAndAuthorize(dto.spaceId, user, workspace); + + await this.watcherService.unwatchSpace(user.id, space.id); + + return { watching: false }; + } + + @HttpCode(HttpStatus.OK) + @Post('watch-status') + async getWatchStatus( + @Body() dto: SpaceWatcherDto, + @AuthUser() user: User, + @AuthWorkspace() workspace: Workspace, + ) { + const space = await this.loadSpaceAndAuthorize(dto.spaceId, user, workspace); + + const watching = await this.watcherService.isWatchingSpace( + user.id, + space.id, + ); + + return { watching }; + } +} diff --git a/apps/server/src/core/watcher/watcher.controller.ts b/apps/server/src/core/watcher/watcher.controller.ts index 8709719a..24c317f6 100644 --- a/apps/server/src/core/watcher/watcher.controller.ts +++ b/apps/server/src/core/watcher/watcher.controller.ts @@ -1,8 +1,6 @@ -/*** - import { +import { Body, Controller, - ForbiddenException, HttpCode, HttpStatus, NotFoundException, @@ -16,12 +14,7 @@ import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard'; import { User, Workspace } from '@docmost/db/types/entity.types'; import { WatcherPageDto } from './dto/watcher.dto'; import { PageRepo } from '@docmost/db/repos/page/page.repo'; -import SpaceAbilityFactory from '../casl/abilities/space-ability.factory'; -import { - SpaceCaslAction, - SpaceCaslSubject, -} from '../casl/interfaces/space-ability.type'; - +import { PageAccessService } from '../page/page-access/page-access.service'; @UseGuards(JwtAuthGuard) @Controller('pages') @@ -29,7 +22,7 @@ export class WatcherController { constructor( private readonly watcherService: WatcherService, private readonly pageRepo: PageRepo, - private readonly spaceAbility: SpaceAbilityFactory, + private readonly pageAccessService: PageAccessService, ) {} @HttpCode(HttpStatus.OK) @@ -44,10 +37,7 @@ export class WatcherController { throw new NotFoundException('Page not found'); } - const ability = await this.spaceAbility.createForUser(user, page.spaceId); - if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) { - throw new ForbiddenException(); - } + await this.pageAccessService.validateCanView(page, user); await this.watcherService.watchPage( user.id, @@ -67,12 +57,14 @@ export class WatcherController { throw new NotFoundException('Page not found'); } - const ability = await this.spaceAbility.createForUser(user, page.spaceId); - if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) { - throw new ForbiddenException(); - } + await this.pageAccessService.validateCanView(page, user); - await this.watcherService.unwatchPage(user.id, page.id); + await this.watcherService.unwatchPage( + user.id, + page.id, + page.spaceId, + page.workspaceId, + ); return { watching: false }; } @@ -85,15 +77,10 @@ export class WatcherController { throw new NotFoundException('Page not found'); } - const ability = await this.spaceAbility.createForUser(user, page.spaceId); - if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) { - throw new ForbiddenException(); - } + await this.pageAccessService.validateCanView(page, user); const watching = await this.watcherService.isWatchingPage(user.id, page.id); return { watching }; } - } -***/ diff --git a/apps/server/src/core/watcher/watcher.module.ts b/apps/server/src/core/watcher/watcher.module.ts index 68ab5624..357b8352 100644 --- a/apps/server/src/core/watcher/watcher.module.ts +++ b/apps/server/src/core/watcher/watcher.module.ts @@ -1,10 +1,12 @@ import { Module } from '@nestjs/common'; import { WatcherService } from './watcher.service'; -import { CaslModule } from '../casl/casl.module'; +import { WatcherController } from './watcher.controller'; +import { SpaceWatcherController } from './space-watcher.controller'; +import { PageAccessModule } from '../page/page-access/page-access.module'; @Module({ - imports: [CaslModule], - controllers: [], + imports: [PageAccessModule], + controllers: [WatcherController, SpaceWatcherController], providers: [WatcherService], exports: [WatcherService], }) diff --git a/apps/server/src/core/watcher/watcher.service.ts b/apps/server/src/core/watcher/watcher.service.ts index 384a0787..3c5fe621 100644 --- a/apps/server/src/core/watcher/watcher.service.ts +++ b/apps/server/src/core/watcher/watcher.service.ts @@ -50,14 +50,44 @@ export class WatcherService { return this.watcherRepo.insertMany(watchers, trx); } - async unwatchPage(userId: string, pageId: string) { - return this.watcherRepo.mute(userId, pageId); + async unwatchPage( + userId: string, + pageId: string, + spaceId: string, + workspaceId: string, + ) { + return this.watcherRepo.mute(userId, pageId, spaceId, workspaceId); } async isWatchingPage(userId: string, pageId: string): Promise { return this.watcherRepo.isWatching(userId, pageId); } + async watchSpace( + userId: string, + spaceId: string, + workspaceId: string, + trx?: KyselyTransaction, + ) { + const watcher: InsertableWatcher = { + userId, + pageId: null, + spaceId, + workspaceId, + type: WatcherType.SPACE, + addedById: userId, + }; + return this.watcherRepo.upsertSpace(watcher, trx); + } + + async unwatchSpace(userId: string, spaceId: string) { + return this.watcherRepo.deleteSpaceWatch(userId, spaceId); + } + + async isWatchingSpace(userId: string, spaceId: string): Promise { + return this.watcherRepo.isWatchingSpace(userId, spaceId); + } + async getPageWatchers(pageId: string, pagination: PaginationOptions) { return this.watcherRepo.findPageWatchers(pageId, pagination); } diff --git a/apps/server/src/core/workspace/dto/update-workspace-user-role.dto.ts b/apps/server/src/core/workspace/dto/update-workspace-user-role.dto.ts index 2dc52a3b..4df9222e 100644 --- a/apps/server/src/core/workspace/dto/update-workspace-user-role.dto.ts +++ b/apps/server/src/core/workspace/dto/update-workspace-user-role.dto.ts @@ -1,4 +1,5 @@ -import { IsNotEmpty, IsString, IsUUID } from 'class-validator'; +import { IsEnum, IsNotEmpty, IsUUID } from 'class-validator'; +import { UserRole } from '../../../common/helpers/types/permission'; export class UpdateWorkspaceUserRoleDto { @IsNotEmpty() @@ -6,6 +7,6 @@ export class UpdateWorkspaceUserRoleDto { userId: string; @IsNotEmpty() - @IsString() + @IsEnum(UserRole) role: string; } diff --git a/apps/server/src/core/workspace/dto/update-workspace.dto.ts b/apps/server/src/core/workspace/dto/update-workspace.dto.ts index dbcd647f..4b148208 100644 --- a/apps/server/src/core/workspace/dto/update-workspace.dto.ts +++ b/apps/server/src/core/workspace/dto/update-workspace.dto.ts @@ -46,6 +46,10 @@ export class UpdateWorkspaceDto extends PartialType(CreateWorkspaceDto) { @IsBoolean() mcpEnabled: boolean; + @IsOptional() + @IsBoolean() + aiChat: boolean; + @IsOptional() @IsInt() @Min(1) diff --git a/apps/server/src/core/workspace/services/workspace-invitation.service.ts b/apps/server/src/core/workspace/services/workspace-invitation.service.ts index e6ebe7ff..50ed49f0 100644 --- a/apps/server/src/core/workspace/services/workspace-invitation.service.ts +++ b/apps/server/src/core/workspace/services/workspace-invitation.service.ts @@ -22,6 +22,7 @@ import InvitationEmail from '@docmost/transactional/emails/invitation-email'; import { GroupUserRepo } from '@docmost/db/repos/group/group-user.repo'; import InvitationAcceptedEmail from '@docmost/transactional/emails/invitation-accepted-email'; import { TokenService } from '../../auth/services/token.service'; +import { SessionService } from '../../session/session.service'; import { nanoIdGen } from '../../../common/helpers'; import { PaginationOptions } from '@docmost/db/pagination/pagination-options'; import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination'; @@ -49,6 +50,7 @@ export class WorkspaceInvitationService { private mailService: MailService, private domainService: DomainService, private tokenService: TokenService, + private sessionService: SessionService, @InjectKysely() private readonly db: KyselyDB, @InjectQueue(QueueName.BILLING_QUEUE) private billingQueue: Queue, private readonly environmentService: EnvironmentService, @@ -350,7 +352,7 @@ export class WorkspaceInvitationService { }; } - const authToken = await this.tokenService.generateAccessToken(newUser); + const authToken = await this.sessionService.createSessionAndToken(newUser); return { authToken }; } diff --git a/apps/server/src/core/workspace/services/workspace.service.ts b/apps/server/src/core/workspace/services/workspace.service.ts index 90d791e9..72608951 100644 --- a/apps/server/src/core/workspace/services/workspace.service.ts +++ b/apps/server/src/core/workspace/services/workspace.service.ts @@ -7,6 +7,7 @@ import { NotFoundException, } from '@nestjs/common'; import { LicenseCheckService } from '../../../integrations/environment/license-check.service'; +import { UserSessionRepo } from '@docmost/db/repos/session/user-session.repo'; import { CreateWorkspaceDto } from '../dto/create-workspace.dto'; import { UpdateWorkspaceDto } from '../dto/update-workspace.dto'; import { SpaceService } from '../../space/services/space.service'; @@ -17,6 +18,7 @@ import { WorkspaceRepo } from '@docmost/db/repos/workspace/workspace.repo'; import { KyselyDB, KyselyTransaction } from '@docmost/db/types/kysely.types'; import { executeTx } from '@docmost/db/utils'; import { InjectKysely } from 'nestjs-kysely'; +import { Feature } from '../../../common/features'; import { User } from '@docmost/db/types/entity.types'; import { GroupUserRepo } from '@docmost/db/repos/group/group-user.repo'; import { GroupRepo } from '@docmost/db/repos/group/group.repo'; @@ -69,6 +71,7 @@ export class WorkspaceService { @InjectQueue(QueueName.BILLING_QUEUE) private billingQueue: Queue, @InjectQueue(QueueName.AI_QUEUE) private aiQueue: Queue, @Inject(AUDIT_SERVICE) private readonly auditService: IAuditService, + private userSessionRepo: UserSessionRepo, ) {} async findById(workspaceId: string) { @@ -141,7 +144,7 @@ export class WorkspaceService { status = WorkspaceStatus.Active; plan = 'standard'; billingEmail = user.email; - settings = { ai: { generative: true } }; + settings = { ai: { generative: true, chat: true } }; } // create workspace @@ -354,7 +357,7 @@ export class WorkspaceService { typeof updateWorkspaceDto.restrictApiToAdmins !== 'undefined' || typeof updateWorkspaceDto.allowMemberTemplates !== 'undefined' ) { - if (!this.licenseCheckService.hasFeature(ws.licenseKey, 'security:settings', ws.plan)) { + if (!this.licenseCheckService.hasFeature(ws.licenseKey, Feature.SECURITY_SETTINGS, ws.plan)) { throw new ForbiddenException( 'This feature requires a valid license', ); @@ -473,12 +476,27 @@ export class WorkspaceService { ); } + if (typeof updateWorkspaceDto.aiChat !== 'undefined') { + const prev = settingsBefore?.ai?.chat ?? false; + if (prev !== updateWorkspaceDto.aiChat) { + before.aiChat = prev; + after.aiChat = updateWorkspaceDto.aiChat; + } + await this.workspaceRepo.updateAiSettings( + workspaceId, + 'chat', + updateWorkspaceDto.aiChat, + trx, + ); + } + delete updateWorkspaceDto.restrictApiToAdmins; delete updateWorkspaceDto.aiSearch; delete updateWorkspaceDto.generativeAi; delete updateWorkspaceDto.disablePublicSharing; delete updateWorkspaceDto.mcpEnabled; delete updateWorkspaceDto.allowMemberTemplates; + delete updateWorkspaceDto.aiChat; await this.workspaceRepo.updateWorkspace( updateWorkspaceDto, @@ -686,11 +704,15 @@ export class WorkspaceService { } } - await this.userRepo.updateUser( - { deactivatedAt: new Date() }, - userId, - workspaceId, - ); + await executeTx(this.db, async (trx) => { + await this.userRepo.updateUser( + { deactivatedAt: new Date() }, + userId, + workspaceId, + trx, + ); + await this.userSessionRepo.revokeByUserId(userId, workspaceId, trx); + }); this.auditService.log({ event: AuditEvent.USER_DEACTIVATED, @@ -808,6 +830,8 @@ export class WorkspaceService { await this.favoriteRepo.deleteByUserAndWorkspace(userId, workspaceId, { trx, }); + + await this.userSessionRepo.revokeByUserId(userId, workspaceId, trx); }); this.auditService.log({ diff --git a/apps/server/src/database/database.module.ts b/apps/server/src/database/database.module.ts index 3c08b7f7..748cf697 100644 --- a/apps/server/src/database/database.module.ts +++ b/apps/server/src/database/database.module.ts @@ -17,6 +17,7 @@ import { KyselyDB } from '@docmost/db/types/kysely.types'; import * as process from 'node:process'; import { MigrationService } from '@docmost/db/services/migration.service'; import { UserTokenRepo } from './repos/user-token/user-token.repo'; +import { UserSessionRepo } from '@docmost/db/repos/session/user-session.repo'; import { BacklinkRepo } from '@docmost/db/repos/backlink/backlink.repo'; import { ShareRepo } from '@docmost/db/repos/share/share.repo'; import { NotificationRepo } from '@docmost/db/repos/notification/notification.repo'; @@ -79,6 +80,7 @@ import { normalizePostgresUrl } from '../common/helpers'; FavoriteRepo, AttachmentRepo, UserTokenRepo, + UserSessionRepo, BacklinkRepo, ShareRepo, NotificationRepo, @@ -100,6 +102,7 @@ import { normalizePostgresUrl } from '../common/helpers'; FavoriteRepo, AttachmentRepo, UserTokenRepo, + UserSessionRepo, BacklinkRepo, ShareRepo, NotificationRepo, diff --git a/apps/server/src/database/migrations/20260326T121350-user-sessions.ts b/apps/server/src/database/migrations/20260326T121350-user-sessions.ts new file mode 100644 index 00000000..76a56d77 --- /dev/null +++ b/apps/server/src/database/migrations/20260326T121350-user-sessions.ts @@ -0,0 +1,45 @@ +import { Kysely, sql } from 'kysely'; + +export async function up(db: Kysely): Promise { + await db.schema + .createTable('user_sessions') + .addColumn('id', 'uuid', (col) => + col.primaryKey().defaultTo(sql`gen_uuid_v7()`), + ) + .addColumn('user_id', 'uuid', (col) => + col.notNull().references('users.id').onDelete('cascade'), + ) + .addColumn('workspace_id', 'uuid', (col) => + col.notNull().references('workspaces.id').onDelete('cascade'), + ) + .addColumn('device_name', 'varchar') + .addColumn('user_agent', 'text') + .addColumn('ip_address', sql`inet`) + .addColumn('geo_location', 'varchar') + .addColumn('last_active_at', 'timestamptz', (col) => + col.notNull().defaultTo(sql`now()`), + ) + .addColumn('expires_at', 'timestamptz', (col) => col.notNull()) + .addColumn('metadata', 'jsonb') + .addColumn('revoked_at', 'timestamptz') + .addColumn('created_at', 'timestamptz', (col) => + col.notNull().defaultTo(sql`now()`), + ) + .execute(); + + await sql` + CREATE INDEX idx_user_sessions_active + ON user_sessions (user_id, workspace_id, last_active_at DESC) + WHERE revoked_at IS NULL + `.execute(db); + + await sql` + CREATE INDEX idx_user_sessions_revoked + ON user_sessions (expires_at) + WHERE revoked_at IS NOT NULL + `.execute(db); +} + +export async function down(db: Kysely): Promise { + await db.schema.dropTable('user_sessions').execute(); +} diff --git a/apps/server/src/database/migrations/20260329T163516-add-new-indexes.ts b/apps/server/src/database/migrations/20260329T163516-add-new-indexes.ts new file mode 100644 index 00000000..559366b6 --- /dev/null +++ b/apps/server/src/database/migrations/20260329T163516-add-new-indexes.ts @@ -0,0 +1,333 @@ +import { type Kysely, sql } from 'kysely'; + +export async function up(db: Kysely): Promise { + await db.schema + .createIndex('idx_group_users_user_id') + .ifNotExists() + .on('group_users') + .column('user_id') + .execute(); + + await db.schema + .createIndex('idx_space_members_user_id') + .ifNotExists() + .on('space_members') + .column('user_id') + .execute(); + + await db.schema + .createIndex('idx_space_members_group_id') + .ifNotExists() + .on('space_members') + .column('group_id') + .execute(); + + // Page tree + await sql` + CREATE INDEX IF NOT EXISTS idx_pages_space_parent_position + ON pages (space_id, parent_page_id, position COLLATE "C") + WHERE deleted_at IS NULL + `.execute(db); + + await sql` + CREATE INDEX IF NOT EXISTS idx_pages_parent_page_id + ON pages (parent_page_id) + WHERE deleted_at IS NULL + `.execute(db); + + // Recent pages query + await sql` + CREATE INDEX IF NOT EXISTS idx_pages_space_updated + ON pages (space_id, updated_at DESC) + WHERE deleted_at IS NULL + `.execute(db); + + // Trash view + await sql` + CREATE INDEX IF NOT EXISTS idx_pages_space_deleted + ON pages (space_id, deleted_at DESC) + WHERE deleted_at IS NOT NULL + `.execute(db); + + await sql` + CREATE UNIQUE INDEX IF NOT EXISTS idx_workspaces_hostname_lower + ON workspaces (LOWER(hostname)) + `.execute(db); + + await db.schema + .createIndex('idx_workspaces_created_at') + .ifNotExists() + .on('workspaces') + .column('created_at') + .execute(); + + await db.schema + .createIndex('idx_users_workspace_deleted') + .ifNotExists() + .on('users') + .columns(['workspace_id', 'deleted_at']) + .execute(); + + await sql` + CREATE UNIQUE INDEX IF NOT EXISTS idx_spaces_slug_lower_workspace + ON spaces (LOWER(slug), workspace_id) + `.execute(db); + + await db.schema + .createIndex('idx_spaces_workspace_id') + .ifNotExists() + .on('spaces') + .column('workspace_id') + .execute(); + + await sql` + CREATE UNIQUE INDEX IF NOT EXISTS idx_groups_name_lower_workspace + ON groups (LOWER(name), workspace_id) + `.execute(db); + + await db.schema + .createIndex('idx_groups_workspace_id') + .ifNotExists() + .on('groups') + .column('workspace_id') + .execute(); + + await db.schema + .createIndex('idx_shares_page_id') + .ifNotExists() + .on('shares') + .column('page_id') + .execute(); + + await db.schema + .createIndex('idx_attachments_page_id') + .ifNotExists() + .on('attachments') + .column('page_id') + .execute(); + + await db.schema + .createIndex('idx_attachments_space_id') + .ifNotExists() + .on('attachments') + .column('space_id') + .execute(); + + await db.schema + .createIndex('idx_comments_page_id') + .ifNotExists() + .on('comments') + .column('page_id') + .execute(); + + await db.schema + .createIndex('idx_comments_parent_comment_id') + .ifNotExists() + .on('comments') + .column('parent_comment_id') + .execute(); + + await sql` + CREATE INDEX IF NOT EXISTS idx_page_history_page_created + ON page_history (page_id, created_at DESC) + `.execute(db); + + await db.schema + .createIndex('idx_attachments_workspace_id') + .ifNotExists() + .on('attachments') + .column('workspace_id') + .execute(); + + await db.schema + .createIndex('idx_backlinks_target_page_id') + .ifNotExists() + .on('backlinks') + .column('target_page_id') + .execute(); + + await db.schema + .createIndex('idx_pages_workspace_id') + .ifNotExists() + .on('pages') + .column('workspace_id') + .execute(); + + await db.schema + .createIndex('idx_pages_creator_id') + .ifNotExists() + .on('pages') + .column('creator_id') + .execute(); + + // Notifications: FK cascade from pages, spaces, comments + await db.schema + .createIndex('idx_notifications_page_id') + .ifNotExists() + .on('notifications') + .column('page_id') + .execute(); + + await db.schema + .createIndex('idx_notifications_space_id') + .ifNotExists() + .on('notifications') + .column('space_id') + .execute(); + + await db.schema + .createIndex('idx_notifications_comment_id') + .ifNotExists() + .on('notifications') + .column('comment_id') + .execute(); + + // Watchers: cleanup queries and FK cascade + await db.schema + .createIndex('idx_watchers_user_workspace') + .ifNotExists() + .on('watchers') + .columns(['user_id', 'workspace_id']) + .execute(); + + await db.schema + .createIndex('idx_watchers_space_id') + .ifNotExists() + .on('watchers') + .column('space_id') + .execute(); + + // Auth providers: all queries filter by workspaceId + await db.schema + .createIndex('idx_auth_providers_workspace_id') + .ifNotExists() + .on('auth_providers') + .column('workspace_id') + .execute(); + + // Auth accounts: SSO login lookup by provider user + await db.schema + .createIndex('idx_auth_accounts_provider_user_id') + .ifNotExists() + .on('auth_accounts') + .columns(['provider_user_id', 'auth_provider_id']) + .execute(); + + // Workspace invitations: listing and SSO lookup + await db.schema + .createIndex('idx_workspace_invitations_workspace_id') + .ifNotExists() + .on('workspace_invitations') + .column('workspace_id') + .execute(); + + // API keys: query and FK cascade + await db.schema + .createIndex('idx_api_keys_workspace_id') + .ifNotExists() + .on('api_keys') + .column('workspace_id') + .execute(); + + // User sessions: delete queries and FK cascade on all session states + await db.schema + .createIndex('idx_user_sessions_user_workspace') + .ifNotExists() + .on('user_sessions') + .columns(['user_id', 'workspace_id']) + .execute(); +} + +export async function down(db: Kysely): Promise { + await db.schema.dropIndex('idx_group_users_user_id').ifExists().execute(); + await db.schema.dropIndex('idx_space_members_user_id').ifExists().execute(); + await db.schema.dropIndex('idx_space_members_group_id').ifExists().execute(); + await db.schema + .dropIndex('idx_pages_space_parent_position') + .ifExists() + .execute(); + await db.schema.dropIndex('idx_pages_parent_page_id').ifExists().execute(); + await db.schema.dropIndex('idx_pages_space_updated').ifExists().execute(); + await db.schema.dropIndex('idx_pages_space_deleted').ifExists().execute(); + await db.schema + .dropIndex('idx_workspaces_hostname_lower') + .ifExists() + .execute(); + await db.schema.dropIndex('idx_workspaces_created_at').ifExists().execute(); + await db.schema + .dropIndex('idx_users_workspace_deleted') + .ifExists() + .execute(); + await db.schema + .dropIndex('idx_spaces_slug_lower_workspace') + .ifExists() + .execute(); + await db.schema + .dropIndex('idx_spaces_workspace_id') + .ifExists() + .execute(); + await db.schema + .dropIndex('idx_groups_name_lower_workspace') + .ifExists() + .execute(); + await db.schema.dropIndex('idx_groups_workspace_id').ifExists().execute(); + await db.schema.dropIndex('idx_shares_page_id').ifExists().execute(); + await db.schema.dropIndex('idx_attachments_page_id').ifExists().execute(); + await db.schema.dropIndex('idx_attachments_space_id').ifExists().execute(); + await db.schema.dropIndex('idx_comments_page_id').ifExists().execute(); + await db.schema + .dropIndex('idx_comments_parent_comment_id') + .ifExists() + .execute(); + await db.schema + .dropIndex('idx_page_history_page_created') + .ifExists() + .execute(); + await db.schema + .dropIndex('idx_attachments_workspace_id') + .ifExists() + .execute(); + await db.schema + .dropIndex('idx_backlinks_target_page_id') + .ifExists() + .execute(); + await db.schema.dropIndex('idx_pages_workspace_id').ifExists().execute(); + await db.schema.dropIndex('idx_pages_creator_id').ifExists().execute(); + await db.schema + .dropIndex('idx_notifications_page_id') + .ifExists() + .execute(); + await db.schema + .dropIndex('idx_notifications_space_id') + .ifExists() + .execute(); + await db.schema + .dropIndex('idx_notifications_comment_id') + .ifExists() + .execute(); + await db.schema + .dropIndex('idx_watchers_user_workspace') + .ifExists() + .execute(); + await db.schema.dropIndex('idx_watchers_space_id').ifExists().execute(); + await db.schema + .dropIndex('idx_auth_providers_workspace_id') + .ifExists() + .execute(); + await db.schema + .dropIndex('idx_auth_accounts_provider_user_id') + .ifExists() + .execute(); + await db.schema + .dropIndex('idx_workspace_invitations_workspace_id') + .ifExists() + .execute(); + await db.schema + .dropIndex('idx_api_keys_workspace_id') + .ifExists() + .execute(); + await db.schema + .dropIndex('idx_user_sessions_user_workspace') + .ifExists() + .execute(); +} diff --git a/apps/server/src/database/migrations/20260409T132415-ai-chat.ts b/apps/server/src/database/migrations/20260409T132415-ai-chat.ts new file mode 100644 index 00000000..28b595f1 --- /dev/null +++ b/apps/server/src/database/migrations/20260409T132415-ai-chat.ts @@ -0,0 +1,118 @@ +import { type Kysely, sql } from 'kysely'; + +export async function up(db: Kysely): Promise { + await db.schema + .createTable('ai_chats') + .ifNotExists() + .addColumn('id', 'uuid', (col) => + col.primaryKey().defaultTo(sql`gen_uuid_v7()`), + ) + .addColumn('workspace_id', 'uuid', (col) => + col.references('workspaces.id').onDelete('cascade').notNull(), + ) + .addColumn('creator_id', 'uuid', (col) => + col.references('users.id').notNull(), + ) + .addColumn('title', 'varchar', (col) => col) + .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 + .createIndex('idx_ai_chats_workspace_creator') + .ifNotExists() + .on('ai_chats') + .columns(['workspace_id', 'creator_id', 'id']) + .execute(); + + await db.schema + .createTable('ai_chat_messages') + .ifNotExists() + .addColumn('id', 'uuid', (col) => + col.primaryKey().defaultTo(sql`gen_uuid_v7()`), + ) + .addColumn('chat_id', 'uuid', (col) => + col.references('ai_chats.id').onDelete('cascade').notNull(), + ) + .addColumn('workspace_id', 'uuid', (col) => + col.references('workspaces.id').onDelete('cascade').notNull(), + ) + .addColumn('user_id', 'uuid', (col) => + col.references('users.id').onDelete('set null'), + ) + .addColumn('role', 'varchar', (col) => col.notNull()) + .addColumn('content', 'text', (col) => col) + .addColumn('tool_calls', 'jsonb', (col) => col) + .addColumn('metadata', 'jsonb', (col) => col) + .addColumn('tsv', sql`tsvector`, (col) => col) + .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 + .createIndex('idx_ai_chat_messages_chat_id') + .ifNotExists() + .on('ai_chat_messages') + .columns(['chat_id', 'id']) + .execute(); + + await db.schema + .createIndex('idx_ai_chat_messages_tsv') + .ifNotExists() + .on('ai_chat_messages') + .using('GIN') + .column('tsv') + .execute(); + + //ts-vector + await sql` + CREATE OR REPLACE FUNCTION ai_chat_messages_tsvector_trigger() RETURNS trigger AS $$ + BEGIN + NEW.tsv := to_tsvector('english', f_unaccent(substring(coalesce(NEW.content, ''), 1, 100000))); + RETURN NEW; + END; + $$ LANGUAGE plpgsql; + `.execute(db); + + await sql` + CREATE OR REPLACE TRIGGER ai_chat_messages_tsvector_update + BEFORE INSERT OR UPDATE ON ai_chat_messages + FOR EACH ROW EXECUTE FUNCTION ai_chat_messages_tsvector_trigger(); + `.execute(db); + + await db.schema + .alterTable('attachments') + .addColumn('ai_chat_id', 'uuid', (col) => col) + .execute(); + + await db.schema + .createIndex('idx_attachments_ai_chat_id') + .ifNotExists() + .on('attachments') + .column('ai_chat_id') + .execute(); +} + +export async function down(db: Kysely): Promise { + await db.schema.dropIndex('idx_attachments_ai_chat_id').execute(); + await db.schema.alterTable('attachments').dropColumn('ai_chat_id').execute(); + + await sql`DROP TRIGGER IF EXISTS ai_chat_messages_tsvector_update ON ai_chat_messages`.execute( + db, + ); + await sql`DROP FUNCTION IF EXISTS ai_chat_messages_tsvector_trigger`.execute( + db, + ); + await db.schema.dropTable('ai_chat_messages').execute(); + await db.schema.dropTable('ai_chats').execute(); +} diff --git a/apps/server/src/database/repos/attachment/attachment.repo.ts b/apps/server/src/database/repos/attachment/attachment.repo.ts index 5824ce5f..bf2b5ecb 100644 --- a/apps/server/src/database/repos/attachment/attachment.repo.ts +++ b/apps/server/src/database/repos/attachment/attachment.repo.ts @@ -7,6 +7,7 @@ import { InsertableAttachment, UpdatableAttachment, } from '@docmost/db/types/entity.types'; +import { AttachmentType } from '../../../core/attachment/attachment.constants'; @Injectable() export class AttachmentRepo { @@ -23,6 +24,7 @@ export class AttachmentRepo { 'creatorId', 'pageId', 'spaceId', + 'aiChatId', 'workspaceId', 'createdAt', 'updatedAt', @@ -44,6 +46,21 @@ export class AttachmentRepo { .executeTakeFirst(); } + async findByIdWithContent( + attachmentId: string, + opts?: { + trx?: KyselyTransaction; + }, + ): Promise { + const db = dbOrTx(this.db, opts?.trx); + + return db + .selectFrom('attachments') + .select([...this.baseFields, 'textContent']) + .where('id', '=', attachmentId) + .executeTakeFirst(); + } + async insertAttachment( insertableAttachment: InsertableAttachment, trx?: KyselyTransaction, @@ -72,6 +89,21 @@ export class AttachmentRepo { .execute(); } + async findByAiChatId( + aiChatId: string, + opts?: { + trx?: KyselyTransaction; + }, + ): Promise { + const db = dbOrTx(this.db, opts?.trx); + + return db + .selectFrom('attachments') + .select(this.baseFields) + .where('aiChatId', '=', aiChatId) + .execute(); + } + updateAttachmentsByPageId( updatableAttachment: UpdatableAttachment, pageIds: string[], @@ -97,6 +129,25 @@ export class AttachmentRepo { .executeTakeFirst(); } + async claimAttachmentsForChat( + attachmentIds: string[], + aiChatId: string, + creatorId: string, + workspaceId: string, + ): Promise { + if (attachmentIds.length === 0) return; + + await this.db + .updateTable('attachments') + .set({ aiChatId }) + .where('id', 'in', attachmentIds) + .where('creatorId', '=', creatorId) + .where('workspaceId', '=', workspaceId) + .where('type', '=', AttachmentType.Chat) + .where('aiChatId', 'is', null) + .execute(); + } + async deleteAttachmentById(attachmentId: string): Promise { await this.db .deleteFrom('attachments') diff --git a/apps/server/src/database/repos/notification/notification.repo.ts b/apps/server/src/database/repos/notification/notification.repo.ts index 19add3c6..2914dbfc 100644 --- a/apps/server/src/database/repos/notification/notification.repo.ts +++ b/apps/server/src/database/repos/notification/notification.repo.ts @@ -11,6 +11,7 @@ import { ExpressionBuilder } from 'kysely'; import { DB } from '@docmost/db/types/db'; import { jsonObjectFrom } from 'kysely/helpers/postgres'; import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo'; +import { NotificationTab, NotificationType } from '../../../core/notification/notification.constants'; @Injectable() export class NotificationRepo { @@ -27,8 +28,12 @@ export class NotificationRepo { .executeTakeFirst(); } - async findByUserId(userId: string, pagination: PaginationOptions) { - const query = this.db + async findByUserId( + userId: string, + pagination: PaginationOptions, + type: NotificationTab = 'all', + ) { + let query = this.db .selectFrom('notifications') .selectAll('notifications') .select((eb) => this.withActor(eb)) @@ -42,6 +47,12 @@ export class NotificationRepo { ]), ); + if (type === 'direct') { + query = query.where('type', '!=', NotificationType.PAGE_UPDATED); + } else if (type === 'updates') { + query = query.where('type', '=', NotificationType.PAGE_UPDATED); + } + return executeWithCursorPagination(query, { perPage: pagination.limit, cursor: pagination.cursor, @@ -138,6 +149,29 @@ export class NotificationRepo { .execute(); } + async getRecentlyNotifiedUserIds( + userIds: string[], + pageId: string, + type: string, + withinHours: number, + ): Promise> { + if (userIds.length === 0) return new Set(); + + const cutoff = new Date(Date.now() - withinHours * 60 * 60 * 1000); + + const rows = await this.db + .selectFrom('notifications') + .select('userId') + .where('userId', 'in', userIds) + .where('pageId', '=', pageId) + .where('type', '=', type) + .where('createdAt', '>', cutoff) + .groupBy('userId') + .execute(); + + return new Set(rows.map((r) => r.userId)); + } + withActor(eb: ExpressionBuilder) { return jsonObjectFrom( eb diff --git a/apps/server/src/database/repos/session/user-session.repo.ts b/apps/server/src/database/repos/session/user-session.repo.ts new file mode 100644 index 00000000..f3da384b --- /dev/null +++ b/apps/server/src/database/repos/session/user-session.repo.ts @@ -0,0 +1,162 @@ +import { + InsertableUserSession, + UserSession, +} from '@docmost/db/types/entity.types'; +import { KyselyDB, KyselyTransaction } from '@docmost/db/types/kysely.types'; +import { dbOrTx } from '@docmost/db/utils'; +import { Injectable } from '@nestjs/common'; +import { InjectKysely } from 'nestjs-kysely'; +import { sql } from 'kysely'; + +@Injectable() +export class UserSessionRepo { + constructor(@InjectKysely() private readonly db: KyselyDB) {} + + async insertSession( + session: InsertableUserSession, + trx?: KyselyTransaction, + ): Promise { + const db = dbOrTx(this.db, trx); + return db + .insertInto('userSessions') + .values(session) + .returningAll() + .executeTakeFirstOrThrow(); + } + + async findActiveById(id: string): Promise { + return this.db + .selectFrom('userSessions') + .selectAll() + .where('id', '=', id) + .where('expiresAt', '>', new Date()) + .where('revokedAt', 'is', null) + .executeTakeFirst(); + } + + async findActiveByUser( + userId: string, + workspaceId: string, + ): Promise { + return this.db + .selectFrom('userSessions') + .selectAll() + .where('userId', '=', userId) + .where('workspaceId', '=', workspaceId) + .where('expiresAt', '>', new Date()) + .where('revokedAt', 'is', null) + .orderBy('lastActiveAt', 'desc') + .execute(); + } + + async updateLastActiveAt(id: string): Promise { + await this.db + .updateTable('userSessions') + .set({ lastActiveAt: new Date() }) + .where('id', '=', id) + .execute(); + } + + async revokeById( + id: string, + userId: string, + workspaceId: string, + ): Promise { + await this.db + .updateTable('userSessions') + .set({ revokedAt: new Date() }) + .where('id', '=', id) + .where('userId', '=', userId) + .where('workspaceId', '=', workspaceId) + .where('revokedAt', 'is', null) + .execute(); + } + + async revokeAllExceptCurrent( + currentSessionId: string, + userId: string, + workspaceId: string, + ): Promise { + await this.db + .updateTable('userSessions') + .set({ revokedAt: new Date() }) + .where('userId', '=', userId) + .where('workspaceId', '=', workspaceId) + .where('id', '!=', currentSessionId) + .where('revokedAt', 'is', null) + .execute(); + } + + async revokeByUserId( + userId: string, + workspaceId: string, + trx?: KyselyTransaction, + ): Promise { + const db = dbOrTx(this.db, trx); + await db + .updateTable('userSessions') + .set({ revokedAt: new Date() }) + .where('userId', '=', userId) + .where('workspaceId', '=', workspaceId) + .where('revokedAt', 'is', null) + .execute(); + } + + async deleteByUserId( + userId: string, + workspaceId: string, + ): Promise { + await this.db + .deleteFrom('userSessions') + .where('userId', '=', userId) + .where('workspaceId', '=', workspaceId) + .execute(); + } + + async deleteAllExceptCurrent( + currentSessionId: string, + userId: string, + workspaceId: string, + ): Promise { + await this.db + .deleteFrom('userSessions') + .where('userId', '=', userId) + .where('workspaceId', '=', workspaceId) + .where('id', '!=', currentSessionId) + .execute(); + } + + async deleteStale(retentionDays: number): Promise { + const cutoff = new Date(Date.now() - retentionDays * 24 * 60 * 60 * 1000); + await this.db + .deleteFrom('userSessions') + .where((eb) => + eb.or([ + eb('revokedAt', '<', cutoff), + eb('expiresAt', '<', cutoff), + ]), + ) + .execute(); + } + + async trimExcessSessions(maxPerUser: number): Promise { + const overflowed = await this.db + .selectFrom('userSessions') + .select(['userId', 'workspaceId']) + .groupBy(['userId', 'workspaceId']) + .having(sql`COUNT(*)`, '>', maxPerUser) + .execute(); + + for (const { userId, workspaceId } of overflowed) { + await sql` + DELETE FROM user_sessions + WHERE id IN ( + SELECT id FROM user_sessions + WHERE user_id = ${userId} AND workspace_id = ${workspaceId} + ORDER BY last_active_at DESC + OFFSET ${maxPerUser} + ) + `.execute(this.db); + } + } +} diff --git a/apps/server/src/database/repos/space/space.repo.ts b/apps/server/src/database/repos/space/space.repo.ts index 8ec5904c..0b389665 100644 --- a/apps/server/src/database/repos/space/space.repo.ts +++ b/apps/server/src/database/repos/space/space.repo.ts @@ -111,6 +111,28 @@ export class SpaceRepo { .executeTakeFirst(); } + async updateCommentSettings( + spaceId: string, + workspaceId: string, + prefKey: string, + prefValue: string | boolean, + trx?: KyselyTransaction, + ) { + const db = dbOrTx(this.db, trx); + return db + .updateTable('spaces') + .set({ + settings: sql`COALESCE(settings, '{}'::jsonb) + || jsonb_build_object('comments', COALESCE(settings->'comments', '{}'::jsonb) + || jsonb_build_object('${sql.raw(prefKey)}', ${sql.lit(prefValue)}))`, + updatedAt: new Date(), + }) + .where('id', '=', spaceId) + .where('workspaceId', '=', workspaceId) + .returningAll() + .executeTakeFirst(); + } + async insertSpace( insertableSpace: InsertableSpace, trx?: KyselyTransaction, diff --git a/apps/server/src/database/repos/user/user.repo.ts b/apps/server/src/database/repos/user/user.repo.ts index c3903357..eaaa318e 100644 --- a/apps/server/src/database/repos/user/user.repo.ts +++ b/apps/server/src/database/repos/user/user.repo.ts @@ -13,6 +13,7 @@ import { PaginationOptions } from '../../pagination/pagination-options'; import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination'; import { ExpressionBuilder, sql } from 'kysely'; import { jsonObjectFrom } from 'kysely/helpers/postgres'; +import { NotificationSettingKey } from '../../../core/notification/notification.constants'; @Injectable() export class UserRepo { @@ -191,6 +192,24 @@ export class UserRepo { .executeTakeFirst(); } + async updateNotificationSetting( + userId: string, + settingKey: NotificationSettingKey, + settingValue: boolean, + ) { + return await this.db + .updateTable('users') + .set({ + settings: sql`COALESCE(settings, '{}'::jsonb) + || jsonb_build_object('notifications', COALESCE(settings->'notifications', '{}'::jsonb) + || jsonb_build_object(${sql.lit(settingKey)}, ${sql.lit(settingValue)}))`, + updatedAt: new Date(), + }) + .where('id', '=', userId) + .returning(this.baseFields) + .executeTakeFirst(); + } + withUserMfa(eb: ExpressionBuilder) { return jsonObjectFrom( eb diff --git a/apps/server/src/database/repos/watcher/watcher.repo.ts b/apps/server/src/database/repos/watcher/watcher.repo.ts index 9739b4de..f1506ff9 100644 --- a/apps/server/src/database/repos/watcher/watcher.repo.ts +++ b/apps/server/src/database/repos/watcher/watcher.repo.ts @@ -20,18 +20,6 @@ export type WatcherType = (typeof WatcherType)[keyof typeof WatcherType]; export class WatcherRepo { constructor(@InjectKysely() private readonly db: KyselyDB) {} - async findByUserAndPage( - userId: string, - pageId: string, - ): Promise { - return this.db - .selectFrom('watchers') - .selectAll() - .where('userId', '=', userId) - .where('pageId', '=', pageId) - .executeTakeFirst(); - } - async findPageWatchers(pageId: string, pagination: PaginationOptions) { const query = this.db .selectFrom('watchers') @@ -66,6 +54,53 @@ export class WatcherRepo { return watchers.map((w) => w.userId); } + /** + * Recipients for a `page.updated` notification, combining: + * - Active page watchers on this page, AND + * - Active space watchers on this space, EXCLUDING any user who has a + * muted page watcher row for this page (per-page mute always wins). + * + * Deduplicated at the SQL level — a user watching both the page and the + * containing space appears once. + */ + async getPageUpdateRecipientIds( + pageId: string, + spaceId: string, + trx?: KyselyTransaction, + ): Promise { + const db = dbOrTx(this.db, trx); + + const pageWatchers = db + .selectFrom('watchers') + .select('userId') + .where('pageId', '=', pageId) + .where('type', '=', WatcherType.PAGE) + .where('mutedAt', 'is', null); + + const spaceWatchers = db + .selectFrom('watchers as sw') + .select('sw.userId') + .where('sw.spaceId', '=', spaceId) + .where('sw.pageId', 'is', null) + .where('sw.type', '=', WatcherType.SPACE) + .where((eb) => + eb.not( + eb.exists( + eb + .selectFrom('watchers as pw') + .select('pw.id') + .whereRef('pw.userId', '=', 'sw.userId') + .where('pw.pageId', '=', pageId) + .where('pw.type', '=', WatcherType.PAGE) + .where('pw.mutedAt', 'is not', null), + ), + ), + ); + + const rows = await pageWatchers.union(spaceWatchers).execute(); + return [...new Set(rows.map((r) => r.userId))]; + } + async insert( watcher: InsertableWatcher, trx?: KyselyTransaction, @@ -110,20 +145,81 @@ export class WatcherRepo { .executeTakeFirst(); } + async upsertSpace( + watcher: InsertableWatcher, + trx?: KyselyTransaction, + ): Promise { + const db = dbOrTx(this.db, trx); + return db + .insertInto('watchers') + .values(watcher) + .onConflict((oc) => + oc + .columns(['userId', 'spaceId']) + .where('pageId', 'is', null) + .doNothing(), + ) + .returningAll() + .executeTakeFirst(); + } + async mute( userId: string, pageId: string, + spaceId: string, + workspaceId: string, + trx?: KyselyTransaction, + ): Promise { + const db = dbOrTx(this.db, trx); + const mutedAt = new Date(); + await db + .insertInto('watchers') + .values({ + userId, + pageId, + spaceId, + workspaceId, + type: WatcherType.PAGE, + addedById: userId, + mutedAt, + }) + .onConflict((oc) => + oc + .columns(['userId', 'pageId']) + .where('pageId', 'is not', null) + .doUpdateSet({ mutedAt }), + ) + .execute(); + } + + async deleteSpaceWatch( + userId: string, + spaceId: string, trx?: KyselyTransaction, ): Promise { const db = dbOrTx(this.db, trx); await db - .updateTable('watchers') - .set({ mutedAt: new Date() }) + .deleteFrom('watchers') .where('userId', '=', userId) - .where('pageId', '=', pageId) + .where('spaceId', '=', spaceId) + .where('pageId', 'is', null) + .where('type', '=', WatcherType.SPACE) .execute(); } + async isWatchingSpace(userId: string, spaceId: string): Promise { + const watcher = await this.db + .selectFrom('watchers') + .select('id') + .where('userId', '=', userId) + .where('spaceId', '=', spaceId) + .where('pageId', 'is', null) + .where('type', '=', WatcherType.SPACE) + .executeTakeFirst(); + + return !!watcher; + } + async isWatching(userId: string, pageId: string): Promise { const watcher = await this.db .selectFrom('watchers') @@ -164,14 +260,14 @@ export class WatcherRepo { .where('spaceId', '=', spaceId) .where('userId', 'is not', null) .union( - this.db + db .selectFrom('spaceMembers') .innerJoin('groupUsers', 'groupUsers.groupId', 'spaceMembers.groupId') .select('groupUsers.userId') .where('spaceMembers.spaceId', '=', spaceId), ); - await this.db + await db .deleteFrom('watchers') .where('userId', 'in', userIds) .where('spaceId', '=', spaceId) diff --git a/apps/server/src/database/types/db.d.ts b/apps/server/src/database/types/db.d.ts index 69126496..6ec3790c 100644 --- a/apps/server/src/database/types/db.d.ts +++ b/apps/server/src/database/types/db.d.ts @@ -43,6 +43,7 @@ export interface ApiKeys { } export interface Attachments { + aiChatId: string | null; createdAt: Generated; creatorId: string; deletedAt: Timestamp | null; @@ -459,7 +460,49 @@ export interface Templates { deletedAt: Timestamp | null; } +export interface AiChats { + id: Generated; + workspaceId: string; + creatorId: string; + title: string | null; + createdAt: Generated; + updatedAt: Generated; + deletedAt: Timestamp | null; +} + +export interface AiChatMessages { + id: Generated; + chatId: string; + workspaceId: string; + userId: string | null; + role: string; + content: string | null; + toolCalls: Json | null; + metadata: Json | null; + tsv: string | null; + createdAt: Generated; + updatedAt: Generated; + deletedAt: Timestamp | null; +} + +export interface UserSessions { + id: Generated; + userId: string; + workspaceId: string; + deviceName: string | null; + userAgent: string | null; + ipAddress: string | null; + geoLocation: string | null; + metadata: Json | null; + lastActiveAt: Generated; + expiresAt: Timestamp; + revokedAt: Timestamp | null; + createdAt: Generated; +} + export interface DB { + aiChats: AiChats; + aiChatMessages: AiChatMessages; apiKeys: ApiKeys; attachments: Attachments; audit: Audit; @@ -483,6 +526,7 @@ export interface DB { templates: Templates; userMfa: UserMfa; users: Users; + userSessions: UserSessions; userTokens: UserTokens; watchers: Watchers; workspaceInvitations: WorkspaceInvitations; diff --git a/apps/server/src/database/types/entity.types.ts b/apps/server/src/database/types/entity.types.ts index a91a7da1..a15b99f4 100644 --- a/apps/server/src/database/types/entity.types.ts +++ b/apps/server/src/database/types/entity.types.ts @@ -1,5 +1,7 @@ import { Insertable, Selectable, Updateable } from 'kysely'; import { + AiChats, + AiChatMessages, Attachments, Comments, Groups, @@ -23,6 +25,7 @@ import { Favorites, FileTasks, UserMfa as _UserMFA, + UserSessions, ApiKeys, Watchers, Audit as _Audit, @@ -30,6 +33,21 @@ import { } from './db'; import { PageEmbeddings } from '@docmost/db/types/embeddings.types'; +// AI Chat +export type AiChat = Selectable; +export type InsertableAiChat = Insertable; +export type UpdatableAiChat = Updateable>; + +// AI Chat Message +// `tsv` is an internal tsvector column maintained by a trigger for +// full-text search. It is omitted from the public type so it never leaks +// into HTTP responses or the chat history fed to the language model. +export type AiChatMessage = Omit, 'tsv'>; +export type InsertableAiChatMessage = Omit< + Insertable, + 'tsv' +>; + // Workspace export type Workspace = Selectable; export type InsertableWorkspace = Insertable; @@ -164,6 +182,11 @@ export type PagePermission = Selectable<_PagePermissions>; export type InsertablePagePermission = Insertable<_PagePermissions>; export type UpdatablePagePermission = Updateable>; +// User Session +export type UserSession = Selectable; +export type InsertableUserSession = Insertable; +export type UpdatableUserSession = Updateable>; + // Audit export type Audit = Selectable<_Audit>; export type InsertableAudit = Insertable<_Audit>; diff --git a/apps/server/src/integrations/environment/environment.service.ts b/apps/server/src/integrations/environment/environment.service.ts index 89e4bb81..ceb2eae7 100644 --- a/apps/server/src/integrations/environment/environment.service.ts +++ b/apps/server/src/integrations/environment/environment.service.ts @@ -252,6 +252,13 @@ export class EnvironmentService { return this.configService.get('AI_COMPLETION_MODEL'); } + getAiChatModel(): string { + return ( + this.configService.get('AI_CHAT_MODEL') || + this.configService.get('AI_COMPLETION_MODEL') + ); + } + getAiEmbeddingDimension(): number { return parseInt( this.configService.get('AI_EMBEDDING_DIMENSION'), @@ -259,6 +266,12 @@ export class EnvironmentService { ); } + getAiEmbeddingSupportsMrl(): boolean | undefined { + const val = this.configService.get('AI_EMBEDDING_SUPPORTS_MRL'); + if (val === undefined || val === null || val === '') return undefined; + return val === 'true'; + } + getOpenAiApiKey(): string { return this.configService.get('OPENAI_API_KEY'); } diff --git a/apps/server/src/integrations/environment/environment.validation.ts b/apps/server/src/integrations/environment/environment.validation.ts index 5c307da2..3a59b08c 100644 --- a/apps/server/src/integrations/environment/environment.validation.ts +++ b/apps/server/src/integrations/environment/environment.validation.ts @@ -117,6 +117,12 @@ export class EnvironmentVariables { @IsString() AI_EMBEDDING_DIMENSION: string; + @IsOptional() + @ValidateIf((obj) => obj.AI_EMBEDDING_SUPPORTS_MRL) + @IsIn(['true', 'false']) + @IsString() + AI_EMBEDDING_SUPPORTS_MRL: string; + @ValidateIf((obj) => obj.AI_DRIVER) @IsString() @IsNotEmpty() diff --git a/apps/server/src/integrations/export/export.controller.ts b/apps/server/src/integrations/export/export.controller.ts index 0fc5fb96..1ce3f8c8 100644 --- a/apps/server/src/integrations/export/export.controller.ts +++ b/apps/server/src/integrations/export/export.controller.ts @@ -61,7 +61,7 @@ export class ExportController { await this.pageAccessService.validateCanView(page, user); - const zipFileStream = await this.exportService.exportPages( + const result = await this.exportService.exportPages( dto.pageId, dto.format, dto.includeAttachments, @@ -83,15 +83,29 @@ export class ExportController { }, }); - const fileName = sanitize(page.title || 'untitled') + '.zip'; + if (result.type === 'file') { + const ext = getExportExtension(dto.format); + const fileName = sanitize(page.title || 'untitled') + ext; + const contentType = getMimeType(path.extname(fileName)); - res.headers({ - 'Content-Type': 'application/zip', - 'Content-Disposition': - 'attachment; filename="' + encodeURIComponent(fileName) + '"', - }); + res.headers({ + 'Content-Type': contentType, + 'Content-Disposition': + 'attachment; filename="' + encodeURIComponent(fileName) + '"', + }); - res.send(zipFileStream); + res.send(result.content); + } else { + const fileName = sanitize(page.title || 'untitled') + '.zip'; + + res.headers({ + 'Content-Type': 'application/zip', + 'Content-Disposition': + 'attachment; filename="' + encodeURIComponent(fileName) + '"', + }); + + res.send(result.stream); + } } @UseGuards(JwtAuthGuard) diff --git a/apps/server/src/integrations/export/export.service.ts b/apps/server/src/integrations/export/export.service.ts index 64f226a2..3f8da1bf 100644 --- a/apps/server/src/integrations/export/export.service.ts +++ b/apps/server/src/integrations/export/export.service.ts @@ -28,8 +28,7 @@ import { PageRepo } from '@docmost/db/repos/page/page.repo'; import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo'; import { Node } from '@tiptap/pm/model'; import { EditorState } from '@tiptap/pm/state'; -// eslint-disable-next-line @typescript-eslint/no-require-imports -import slugify = require('@sindresorhus/slugify'); +import slugify from '@sindresorhus/slugify'; // eslint-disable-next-line @typescript-eslint/no-require-imports const packageJson = require('../../../package.json'); import { EnvironmentService } from '../environment/environment.service'; @@ -151,6 +150,13 @@ export class ExportService { // set to null to make export of pages with parentId work pages[parentPageIndex].parentPageId = null; + const isSinglePage = pages.length === 1 && !includeAttachments; + + if (isSinglePage) { + const pageContent = await this.exportPage(format, pages[0], true); + return { type: 'file' as const, content: pageContent, page: pages[0] }; + } + const tree = buildTree(pages as Page[]); const baseUrl = await this.getWorkspaceBaseUrl(pages[0].workspaceId); @@ -171,7 +177,7 @@ export class ExportService { compression: 'DEFLATE', }); - return zipFile; + return { type: 'zip' as const, stream: zipFile, page: pages[0] }; } async exportSpace( @@ -347,7 +353,7 @@ export class ExportService { if (attachmentIds.length > 0) { const attachments = await this.db .selectFrom('attachments') - .selectAll() + .select(['id', 'fileName', 'filePath']) .where('id', 'in', attachmentIds) .where('spaceId', '=', spaceId) .execute(); diff --git a/apps/server/src/integrations/import/services/import-attachment.service.ts b/apps/server/src/integrations/import/services/import-attachment.service.ts index a797ecc6..9100149b 100644 --- a/apps/server/src/integrations/import/services/import-attachment.service.ts +++ b/apps/server/src/integrations/import/services/import-attachment.service.ts @@ -190,13 +190,41 @@ export class ImportAttachmentService { } } + // Build a map from resolved archive path → real filename from Confluence + // metadata. Confluence Server archives often store files under numeric IDs + // (e.g. "attachments/65601/65602") instead of the original filename. + // Also register aliases so HTML references using the original filename + // (e.g. "attachments/pageId/original.mp3") resolve to the numeric path. + const pageDir = path.dirname(pageRelativePath); + const attachmentNameByRelPath = new Map(); + for (const attachment of pageAttachments) { + const relPath = resolveRelativeAttachmentPath( + attachment.href, + pageDir, + attachmentCandidates, + ); + if (relPath && attachment.fileName) { + attachmentNameByRelPath.set(relPath, attachment.fileName); + + const dir = path.posix.dirname(relPath); + const aliasKey = `${dir}/${attachment.fileName}`; + if (!attachmentCandidates.has(aliasKey)) { + attachmentCandidates.set(aliasKey, attachmentCandidates.get(relPath)!); + attachmentNameByRelPath.set(aliasKey, attachment.fileName); + } + } + } + const uploadOnce = (relPath: string) => { const abs = attachmentCandidates.get(relPath)!; const attachmentId = v7(); - const ext = path.extname(abs); + + const realName = attachmentNameByRelPath.get(relPath); + const baseName = realName || path.basename(abs); + const ext = path.extname(baseName); const fileNameWithExt = - sanitizeFileName(path.basename(abs, ext)) + ext.toLowerCase(); + sanitizeFileName(path.basename(baseName, ext)) + ext.toLowerCase(); const storageFilePath = `${getAttachmentFolderPath( AttachmentType.File, @@ -240,7 +268,6 @@ export class ImportAttachmentService { return fresh; }; - const pageDir = path.dirname(pageRelativePath); const $ = load(html); // image @@ -335,6 +362,28 @@ export class ImportAttachmentService { unwrapFromParagraph($, $vid); } + // audio + for (const audEl of $('audio').toArray()) { + const $aud = $(audEl); + const src = cleanUrlString($aud.attr('src') ?? '')!; + if (!src || src.startsWith('http')) continue; + + const relPath = resolveRelativeAttachmentPath( + src, + pageDir, + attachmentCandidates, + ); + if (!relPath) continue; + + const { attachmentId, apiFilePath } = processFile(relPath); + + $aud + .attr('src', apiFilePath) + .attr('data-attachment-id', attachmentId); + + unwrapFromParagraph($, $aud); + } + //
for (const el of $('div[data-type="attachment"]').toArray()) { const $oldDiv = $(el); @@ -401,7 +450,18 @@ export class ImportAttachmentService { const { attachmentId, apiFilePath, abs } = processFile(relPath); const ext = path.extname(relPath).toLowerCase(); - if (ext === '.mp4') { + const audioExtensions = new Set(['.mp3', '.wav', '.ogg', '.m4a', '.webm', '.flac', '.aac']); + + if (ext === '.pdf') { + const $pdf = $('
') + .attr('data-type', 'pdf') + .attr('src', apiFilePath) + .attr('data-attachment-id', attachmentId) + .attr('width', '800') + .attr('height', '600'); + $a.replaceWith($pdf); + unwrapFromParagraph($, $pdf); + } else if (ext === '.mp4') { const $video = $('