mirror of
https://github.com/docmost/docmost.git
synced 2026-08-22 12:01:05 +08:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Philipinho
|
27c7767f86 |
+3
-2
@@ -1,7 +1,7 @@
|
||||
FROM node:26-slim AS base
|
||||
FROM node:22-slim AS base
|
||||
LABEL org.opencontainers.image.source="https://github.com/docmost/docmost"
|
||||
|
||||
RUN npm install -g pnpm@11.15.1
|
||||
RUN npm install -g pnpm@10.4.0
|
||||
|
||||
FROM base AS builder
|
||||
|
||||
@@ -34,6 +34,7 @@ COPY --from=builder /app/packages/base-formula/package.json /app/packages/base-f
|
||||
# Copy root package files
|
||||
COPY --from=builder /app/package.json /app/package.json
|
||||
COPY --from=builder /app/pnpm*.yaml /app/
|
||||
COPY --from=builder /app/.npmrc /app/.npmrc
|
||||
|
||||
# Copy patches
|
||||
COPY --from=builder /app/patches /app/patches
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "client",
|
||||
"private": true,
|
||||
"version": "0.95.0",
|
||||
"version": "0.90.1",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "tsc && vite build",
|
||||
@@ -36,7 +36,7 @@
|
||||
"@tanstack/react-table": "8.21.3",
|
||||
"@tanstack/react-virtual": "3.14.3",
|
||||
"alfaaz": "1.1.0",
|
||||
"axios": "1.18.1",
|
||||
"axios": "1.16.0",
|
||||
"blueimp-load-image": "5.16.0",
|
||||
"clsx": "2.1.1",
|
||||
"file-saver": "2.0.5",
|
||||
@@ -50,9 +50,9 @@
|
||||
"katex": "0.16.40",
|
||||
"lowlight": "3.3.0",
|
||||
"mantine-form-zod-resolver": "1.3.0",
|
||||
"mermaid": "11.16.1",
|
||||
"mermaid": "11.15.0",
|
||||
"mitt": "3.0.1",
|
||||
"nanoid": "3.3.17",
|
||||
"nanoid": "3.3.8",
|
||||
"posthog-js": "1.391.2",
|
||||
"react": "19.2.7",
|
||||
"react-clear-modal": "^2.0.18",
|
||||
@@ -61,7 +61,7 @@
|
||||
"react-error-boundary": "6.1.1",
|
||||
"react-helmet-async": "3.0.0",
|
||||
"react-i18next": "16.5.8",
|
||||
"react-router-dom": "7.18.2",
|
||||
"react-router-dom": "7.18.0",
|
||||
"semver": "7.7.4",
|
||||
"socket.io-client": "4.8.3",
|
||||
"zod": "4.3.6"
|
||||
@@ -86,7 +86,7 @@
|
||||
"globals": "15.13.0",
|
||||
"jsdom": "25.0.0",
|
||||
"optics-ts": "2.4.1",
|
||||
"postcss": "8.5.25",
|
||||
"postcss": "8.5.14",
|
||||
"postcss-preset-mantine": "1.18.0",
|
||||
"postcss-simple-vars": "7.0.1",
|
||||
"prettier": "3.8.1",
|
||||
|
||||
@@ -1153,141 +1153,5 @@
|
||||
"Create property": "Eigenschaft erstellen",
|
||||
"Hide properties": "Eigenschaften ausblenden",
|
||||
"Find a property type": "Einen Eigenschaftstyp finden",
|
||||
"Properties": "Eigenschaften",
|
||||
"A property with this name already exists": "Eine Eigenschaft mit diesem Namen existiert bereits",
|
||||
"Add card": "Karte hinzufügen",
|
||||
"Add filter": "Filter hinzufügen",
|
||||
"Add option": "Option hinzufügen",
|
||||
"Add sort": "Sortierung hinzufügen",
|
||||
"Add view": "Ansicht hinzufügen",
|
||||
"All data in this column will be lost.": "Alle Daten in dieser Spalte gehen verloren.",
|
||||
"Allow multiple people": "Mehrere Personen zulassen",
|
||||
"Alphabetize": "Alphabetisch sortieren",
|
||||
"Are you sure you want to delete": "Sind Sie sicher, dass Sie löschen möchten",
|
||||
"Ascending": "Aufsteigend",
|
||||
"Base deleted": "Base gelöscht",
|
||||
"Base name": "Base-Name",
|
||||
"Base table": "Base-Tabelle",
|
||||
"Card properties": "Karteneigenschaften",
|
||||
"Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Zellen, die das Textlimit überschreiten, werden abgeschnitten und der zusätzliche Inhalt geht dauerhaft verloren.",
|
||||
"Checkbox": "Kontrollkästchen",
|
||||
"Checked by default": "Standardmäßig aktiviert",
|
||||
"Choose a property": "Wählen Sie eine Eigenschaft",
|
||||
"Clear selection": "Auswahl aufheben",
|
||||
"Column options": "Spaltenoptionen",
|
||||
"Comma, period": "Komma, Punkt",
|
||||
"Complete": "Abgeschlossen",
|
||||
"Contains": "Enthält",
|
||||
"Copy link to view": "Link zur Ansicht kopieren",
|
||||
"Create a status property": "Eine Statuseigenschaft erstellen",
|
||||
"Created at": "Erstellt am",
|
||||
"Currency": "Währung",
|
||||
"Decimal places": "Dezimalstellen",
|
||||
"Default value": "Standardwert",
|
||||
"Delete property": "Eigenschaft löschen",
|
||||
"Delete view": "Ansicht löschen",
|
||||
"Delete {{count}} rows?_one": "Delete 1 row?",
|
||||
"Delete {{count}} rows?_other": "Delete {{count}} rows?",
|
||||
"Descending": "Absteigend",
|
||||
"Discard": "Verwerfen",
|
||||
"Doesn't contain": "Enthält nicht",
|
||||
"Done": "Fertig",
|
||||
"Edit formula": "Formel bearbeiten",
|
||||
"Edit property": "Eigenschaft bearbeiten",
|
||||
"Export CSV": "CSV exportieren",
|
||||
"Failed to load base": "Base konnte nicht geladen werden",
|
||||
"False": "Falsch",
|
||||
"File": "Datei",
|
||||
"Filter and sort changes are visible only to you": "Änderungen an Filtern und Sortierungen sind nur für Sie sichtbar",
|
||||
"Filter by": "Filtern nach",
|
||||
"Formula": "Formel",
|
||||
"Get started with": "Erste Schritte mit",
|
||||
"Greater than": "Größer als",
|
||||
"Group by": "Gruppieren nach",
|
||||
"Group this board by a select or status property.": "Gruppieren Sie dieses Board nach einer Auswahl- oder Statuseigenschaft.",
|
||||
"Hide all": "Alle ausblenden",
|
||||
"Hide group": "Gruppe ausblenden",
|
||||
"In Progress": "In Bearbeitung",
|
||||
"In progress": "In Bearbeitung",
|
||||
"Include time": "Uhrzeit einschließen",
|
||||
"Insert a kanban board on this page": "Fügen Sie ein Kanban-Board auf dieser Seite ein",
|
||||
"Insert an inline base on this page": "Fügen Sie eine Inline-Base auf dieser Seite ein",
|
||||
"Is": "Ist",
|
||||
"Is after": "Ist nach",
|
||||
"Is any of": "Ist eines von",
|
||||
"Is before": "Ist vor",
|
||||
"Is empty": "Ist leer",
|
||||
"Is none of": "Ist keines von",
|
||||
"Is not": "Ist nicht",
|
||||
"Is not empty": "Ist nicht leer",
|
||||
"Is on or after": "Ist am oder nach",
|
||||
"Is on or before": "Ist am oder vor",
|
||||
"Is within": "Ist innerhalb von",
|
||||
"Keep editing": "Weiter bearbeiten",
|
||||
"Last edited at": "Zuletzt bearbeitet am",
|
||||
"Last edited by": "Zuletzt bearbeitet von",
|
||||
"Less than": "Kleiner als",
|
||||
"Link copied to clipboard": "Link in die Zwischenablage kopiert",
|
||||
"Local": "Lokal",
|
||||
"Long text": "Langer Text",
|
||||
"Moved card to {{column}}": "Karte nach {{column}} verschoben",
|
||||
"Moved column to {{column}}": "Spalte nach {{column}} verschoben",
|
||||
"Multi-select": "Mehrfachauswahl",
|
||||
"New row": "Neue Zeile",
|
||||
"Next month": "Nächster Monat",
|
||||
"Next week": "Nächste Woche",
|
||||
"Next year": "Nächstes Jahr",
|
||||
"No filters applied": "Keine Filter angewendet",
|
||||
"No match": "Keine Übereinstimmung",
|
||||
"No options for this property type": "Keine Optionen für diesen Eigenschaftstyp",
|
||||
"No sorts applied": "Keine Sortierungen angewendet",
|
||||
"No value": "Kein Wert",
|
||||
"None": "Keine",
|
||||
"Not started": "Nicht begonnen",
|
||||
"Number": "Zahl",
|
||||
"One month ago": "Vor einem Monat",
|
||||
"One month from now": "In einem Monat",
|
||||
"One week ago": "Vor einer Woche",
|
||||
"One week from now": "In einer Woche",
|
||||
"Open as page": "Als Seite öffnen",
|
||||
"Options": "Optionen",
|
||||
"Past month": "Letzter Monat",
|
||||
"Past week": "Letzte Woche",
|
||||
"Past year": "Letztes Jahr",
|
||||
"Percent": "Prozent",
|
||||
"Period, comma": "Punkt, Komma",
|
||||
"Person": "Person",
|
||||
"Please enter a valid email": "Bitte geben Sie eine gültige E-Mail-Adresse ein",
|
||||
"Progress": "Fortschritt",
|
||||
"Property options": "Eigenschaftsoptionen",
|
||||
"Relative": "Relativ",
|
||||
"Rename property": "Eigenschaft umbenennen",
|
||||
"Reset": "Zurücksetzen",
|
||||
"Save for everyone": "Für alle speichern",
|
||||
"Select": "Auswahl",
|
||||
"Select a property": "Eigenschaft auswählen",
|
||||
"Select all loaded rows": "Alle geladenen Zeilen auswählen",
|
||||
"Show all": "Alle anzeigen",
|
||||
"Sort": "Sortieren",
|
||||
"Sort by": "Sortieren nach",
|
||||
"Space, comma": "Leerzeichen, Komma",
|
||||
"Space, period": "Leerzeichen, Punkt",
|
||||
"This board has no grouping property yet.": "Dieses Board hat noch keine Gruppierungseigenschaft.",
|
||||
"This month": "Diesen Monat",
|
||||
"This year": "Dieses Jahr",
|
||||
"Thousands and decimal separators": "Tausender- und Dezimaltrennzeichen",
|
||||
"Time format": "Zeitformat",
|
||||
"To Do": "Zu erledigen",
|
||||
"Tomorrow": "Morgen",
|
||||
"True": "Wahr",
|
||||
"Unsaved changes": "Nicht gespeicherte Änderungen",
|
||||
"Untitled base": "Unbenannte Base",
|
||||
"URL": "URL",
|
||||
"Value": "Wert",
|
||||
"View updated for everyone": "Ansicht für alle aktualisiert",
|
||||
"You have unsaved changes. Do you want to discard them?": "Sie haben nicht gespeicherte Änderungen. Möchten Sie sie verwerfen?",
|
||||
"{{count}} rows deleted_one": "1 row deleted",
|
||||
"{{count}} rows deleted_other": "{{count}} rows deleted",
|
||||
"{{count}} selected_one": "1 selected",
|
||||
"{{count}} selected_other": "{{count}} selected"
|
||||
"Properties": "Eigenschaften"
|
||||
}
|
||||
|
||||
@@ -387,8 +387,6 @@
|
||||
"Insert horizontal rule divider": "Insert horizontal rule divider",
|
||||
"Page break": "Page break",
|
||||
"Insert a page break for printing.": "Insert a page break for printing.",
|
||||
"Footnote": "Footnote",
|
||||
"Insert a footnote reference.": "Insert a footnote reference.",
|
||||
"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.",
|
||||
@@ -1155,141 +1153,5 @@
|
||||
"Create property": "Create property",
|
||||
"Hide properties": "Hide properties",
|
||||
"Find a property type": "Find a property type",
|
||||
"Properties": "Properties",
|
||||
"A property with this name already exists": "A property with this name already exists",
|
||||
"Add card": "Add card",
|
||||
"Add filter": "Add filter",
|
||||
"Add option": "Add option",
|
||||
"Add sort": "Add sort",
|
||||
"Add view": "Add view",
|
||||
"All data in this column will be lost.": "All data in this column will be lost.",
|
||||
"Allow multiple people": "Allow multiple people",
|
||||
"Alphabetize": "Alphabetize",
|
||||
"Are you sure you want to delete": "Are you sure you want to delete",
|
||||
"Ascending": "Ascending",
|
||||
"Base deleted": "Base deleted",
|
||||
"Base name": "Base name",
|
||||
"Base table": "Base table",
|
||||
"Card properties": "Card properties",
|
||||
"Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Cells longer than the Text limit will be truncated and the extra content permanently lost.",
|
||||
"Checkbox": "Checkbox",
|
||||
"Checked by default": "Checked by default",
|
||||
"Choose a property": "Choose a property",
|
||||
"Clear selection": "Clear selection",
|
||||
"Column options": "Column options",
|
||||
"Comma, period": "Comma, period",
|
||||
"Complete": "Complete",
|
||||
"Contains": "Contains",
|
||||
"Copy link to view": "Copy link to view",
|
||||
"Create a status property": "Create a status property",
|
||||
"Created at": "Created at",
|
||||
"Currency": "Currency",
|
||||
"Decimal places": "Decimal places",
|
||||
"Default value": "Default value",
|
||||
"Delete property": "Delete property",
|
||||
"Delete view": "Delete view",
|
||||
"Delete {{count}} rows?_one": "Delete 1 row?",
|
||||
"Delete {{count}} rows?_other": "Delete {{count}} rows?",
|
||||
"Descending": "Descending",
|
||||
"Discard": "Discard",
|
||||
"Doesn't contain": "Doesn't contain",
|
||||
"Done": "Done",
|
||||
"Edit formula": "Edit formula",
|
||||
"Edit property": "Edit property",
|
||||
"Export CSV": "Export CSV",
|
||||
"Failed to load base": "Failed to load base",
|
||||
"False": "False",
|
||||
"File": "File",
|
||||
"Filter and sort changes are visible only to you": "Filter and sort changes are visible only to you",
|
||||
"Filter by": "Filter by",
|
||||
"Formula": "Formula",
|
||||
"Get started with": "Get started with",
|
||||
"Greater than": "Greater than",
|
||||
"Group by": "Group by",
|
||||
"Group this board by a select or status property.": "Group this board by a select or status property.",
|
||||
"Hide all": "Hide all",
|
||||
"Hide group": "Hide group",
|
||||
"In Progress": "In Progress",
|
||||
"In progress": "In progress",
|
||||
"Include time": "Include time",
|
||||
"Insert a kanban board on this page": "Insert a kanban board on this page",
|
||||
"Insert an inline base on this page": "Insert an inline base on this page",
|
||||
"Is": "Is",
|
||||
"Is after": "Is after",
|
||||
"Is any of": "Is any of",
|
||||
"Is before": "Is before",
|
||||
"Is empty": "Is empty",
|
||||
"Is none of": "Is none of",
|
||||
"Is not": "Is not",
|
||||
"Is not empty": "Is not empty",
|
||||
"Is on or after": "Is on or after",
|
||||
"Is on or before": "Is on or before",
|
||||
"Is within": "Is within",
|
||||
"Keep editing": "Keep editing",
|
||||
"Last edited at": "Last edited at",
|
||||
"Last edited by": "Last edited by",
|
||||
"Less than": "Less than",
|
||||
"Link copied to clipboard": "Link copied to clipboard",
|
||||
"Local": "Local",
|
||||
"Long text": "Long text",
|
||||
"Moved card to {{column}}": "Moved card to {{column}}",
|
||||
"Moved column to {{column}}": "Moved column to {{column}}",
|
||||
"Multi-select": "Multi-select",
|
||||
"New row": "New row",
|
||||
"Next month": "Next month",
|
||||
"Next week": "Next week",
|
||||
"Next year": "Next year",
|
||||
"No filters applied": "No filters applied",
|
||||
"No match": "No match",
|
||||
"No options for this property type": "No options for this property type",
|
||||
"No sorts applied": "No sorts applied",
|
||||
"No value": "No value",
|
||||
"None": "None",
|
||||
"Not started": "Not started",
|
||||
"Number": "Number",
|
||||
"One month ago": "One month ago",
|
||||
"One month from now": "One month from now",
|
||||
"One week ago": "One week ago",
|
||||
"One week from now": "One week from now",
|
||||
"Open as page": "Open as page",
|
||||
"Options": "Options",
|
||||
"Past month": "Past month",
|
||||
"Past week": "Past week",
|
||||
"Past year": "Past year",
|
||||
"Percent": "Percent",
|
||||
"Period, comma": "Period, comma",
|
||||
"Person": "Person",
|
||||
"Please enter a valid email": "Please enter a valid email",
|
||||
"Progress": "Progress",
|
||||
"Property options": "Property options",
|
||||
"Relative": "Relative",
|
||||
"Rename property": "Rename property",
|
||||
"Reset": "Reset",
|
||||
"Save for everyone": "Save for everyone",
|
||||
"Select": "Select",
|
||||
"Select a property": "Select a property",
|
||||
"Select all loaded rows": "Select all loaded rows",
|
||||
"Show all": "Show all",
|
||||
"Sort": "Sort",
|
||||
"Sort by": "Sort by",
|
||||
"Space, comma": "Space, comma",
|
||||
"Space, period": "Space, period",
|
||||
"This board has no grouping property yet.": "This board has no grouping property yet.",
|
||||
"This month": "This month",
|
||||
"This year": "This year",
|
||||
"Thousands and decimal separators": "Thousands and decimal separators",
|
||||
"Time format": "Time format",
|
||||
"To Do": "To Do",
|
||||
"Tomorrow": "Tomorrow",
|
||||
"True": "True",
|
||||
"Unsaved changes": "Unsaved changes",
|
||||
"Untitled base": "Untitled base",
|
||||
"URL": "URL",
|
||||
"Value": "Value",
|
||||
"View updated for everyone": "View updated for everyone",
|
||||
"You have unsaved changes. Do you want to discard them?": "You have unsaved changes. Do you want to discard them?",
|
||||
"{{count}} rows deleted_one": "1 row deleted",
|
||||
"{{count}} rows deleted_other": "{{count}} rows deleted",
|
||||
"{{count}} selected_one": "1 selected",
|
||||
"{{count}} selected_other": "{{count}} selected"
|
||||
"Properties": "Properties"
|
||||
}
|
||||
|
||||
@@ -1153,141 +1153,5 @@
|
||||
"Create property": "Crear propiedad",
|
||||
"Hide properties": "Ocultar propiedades",
|
||||
"Find a property type": "Buscar un tipo de propiedad",
|
||||
"Properties": "Propiedades",
|
||||
"A property with this name already exists": "Ya existe una propiedad con este nombre",
|
||||
"Add card": "Agregar tarjeta",
|
||||
"Add filter": "Agregar filtro",
|
||||
"Add option": "Agregar opción",
|
||||
"Add sort": "Agregar orden",
|
||||
"Add view": "Agregar vista",
|
||||
"All data in this column will be lost.": "Todos los datos de esta columna se perderán.",
|
||||
"Allow multiple people": "Permitir varias personas",
|
||||
"Alphabetize": "Ordenar alfabéticamente",
|
||||
"Are you sure you want to delete": "¿Está seguro de que desea eliminar",
|
||||
"Ascending": "Ascendente",
|
||||
"Base deleted": "Base eliminada",
|
||||
"Base name": "Nombre de la base",
|
||||
"Base table": "Tabla base",
|
||||
"Card properties": "Propiedades de la tarjeta",
|
||||
"Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Las celdas más largas que el límite de texto se truncarán y el contenido adicional se perderá permanentemente.",
|
||||
"Checkbox": "Casilla de verificación",
|
||||
"Checked by default": "Marcado por defecto",
|
||||
"Choose a property": "Seleccione una propiedad",
|
||||
"Clear selection": "Borrar selección",
|
||||
"Column options": "Opciones de columna",
|
||||
"Comma, period": "Coma, punto",
|
||||
"Complete": "Completo",
|
||||
"Contains": "Contiene",
|
||||
"Copy link to view": "Copiar enlace a la vista",
|
||||
"Create a status property": "Crear una propiedad de estado",
|
||||
"Created at": "Creado el",
|
||||
"Currency": "Moneda",
|
||||
"Decimal places": "Decimales",
|
||||
"Default value": "Valor predeterminado",
|
||||
"Delete property": "Eliminar propiedad",
|
||||
"Delete view": "Eliminar vista",
|
||||
"Delete {{count}} rows?_one": "Delete 1 row?",
|
||||
"Delete {{count}} rows?_other": "Delete {{count}} rows?",
|
||||
"Descending": "Descendente",
|
||||
"Discard": "Descartar",
|
||||
"Doesn't contain": "No contiene",
|
||||
"Done": "Hecho",
|
||||
"Edit formula": "Editar fórmula",
|
||||
"Edit property": "Editar propiedad",
|
||||
"Export CSV": "Exportar CSV",
|
||||
"Failed to load base": "No se pudo cargar la base",
|
||||
"False": "Falso",
|
||||
"File": "Archivo",
|
||||
"Filter and sort changes are visible only to you": "Los cambios de filtro y ordenación solo son visibles para usted",
|
||||
"Filter by": "Filtrar por",
|
||||
"Formula": "Fórmula",
|
||||
"Get started with": "Comenzar con",
|
||||
"Greater than": "Mayor que",
|
||||
"Group by": "Agrupar por",
|
||||
"Group this board by a select or status property.": "Agrupe este tablero por una propiedad de selección o estado.",
|
||||
"Hide all": "Ocultar todo",
|
||||
"Hide group": "Ocultar grupo",
|
||||
"In Progress": "En curso",
|
||||
"In progress": "En curso",
|
||||
"Include time": "Incluir hora",
|
||||
"Insert a kanban board on this page": "Insertar un tablero kanban en esta página",
|
||||
"Insert an inline base on this page": "Insertar una base integrada en esta página",
|
||||
"Is": "Es",
|
||||
"Is after": "Es posterior a",
|
||||
"Is any of": "Es cualquiera de",
|
||||
"Is before": "Es anterior a",
|
||||
"Is empty": "Está vacío",
|
||||
"Is none of": "No es ninguno de",
|
||||
"Is not": "No es",
|
||||
"Is not empty": "No está vacío",
|
||||
"Is on or after": "Es en o después de",
|
||||
"Is on or before": "Es en o antes de",
|
||||
"Is within": "Está dentro de",
|
||||
"Keep editing": "Seguir editando",
|
||||
"Last edited at": "Última edición el",
|
||||
"Last edited by": "Última edición por",
|
||||
"Less than": "Menor que",
|
||||
"Link copied to clipboard": "Enlace copiado al portapapeles",
|
||||
"Local": "Local",
|
||||
"Long text": "Texto largo",
|
||||
"Moved card to {{column}}": "Tarjeta movida a {{column}}",
|
||||
"Moved column to {{column}}": "Columna movida a {{column}}",
|
||||
"Multi-select": "Selección múltiple",
|
||||
"New row": "Nueva fila",
|
||||
"Next month": "Próximo mes",
|
||||
"Next week": "Próxima semana",
|
||||
"Next year": "Próximo año",
|
||||
"No filters applied": "No hay filtros aplicados",
|
||||
"No match": "Sin coincidencias",
|
||||
"No options for this property type": "No hay opciones para este tipo de propiedad",
|
||||
"No sorts applied": "No hay ordenaciones aplicadas",
|
||||
"No value": "Sin valor",
|
||||
"None": "Ninguno",
|
||||
"Not started": "No iniciado",
|
||||
"Number": "Número",
|
||||
"One month ago": "Hace un mes",
|
||||
"One month from now": "Dentro de un mes",
|
||||
"One week ago": "Hace una semana",
|
||||
"One week from now": "Dentro de una semana",
|
||||
"Open as page": "Abrir como página",
|
||||
"Options": "Opciones",
|
||||
"Past month": "Último mes",
|
||||
"Past week": "Última semana",
|
||||
"Past year": "Último año",
|
||||
"Percent": "Porcentaje",
|
||||
"Period, comma": "Punto, coma",
|
||||
"Person": "Persona",
|
||||
"Please enter a valid email": "Por favor, introduzca un correo electrónico válido",
|
||||
"Progress": "Progreso",
|
||||
"Property options": "Opciones de propiedad",
|
||||
"Relative": "Relativo",
|
||||
"Rename property": "Renombrar propiedad",
|
||||
"Reset": "Restablecer",
|
||||
"Save for everyone": "Guardar para todos",
|
||||
"Select": "Selección",
|
||||
"Select a property": "Seleccionar una propiedad",
|
||||
"Select all loaded rows": "Seleccionar todas las filas cargadas",
|
||||
"Show all": "Mostrar todo",
|
||||
"Sort": "Ordenar",
|
||||
"Sort by": "Ordenar por",
|
||||
"Space, comma": "Espacio, coma",
|
||||
"Space, period": "Espacio, punto",
|
||||
"This board has no grouping property yet.": "Este tablero aún no tiene una propiedad de agrupación.",
|
||||
"This month": "Este mes",
|
||||
"This year": "Este año",
|
||||
"Thousands and decimal separators": "Separadores de miles y decimales",
|
||||
"Time format": "Formato de hora",
|
||||
"To Do": "Por hacer",
|
||||
"Tomorrow": "Mañana",
|
||||
"True": "Verdadero",
|
||||
"Unsaved changes": "Cambios no guardados",
|
||||
"Untitled base": "Base sin título",
|
||||
"URL": "URL",
|
||||
"Value": "Valor",
|
||||
"View updated for everyone": "Vista actualizada para todos",
|
||||
"You have unsaved changes. Do you want to discard them?": "Tiene cambios no guardados. ¿Quiere descartarlos?",
|
||||
"{{count}} rows deleted_one": "1 row deleted",
|
||||
"{{count}} rows deleted_other": "{{count}} rows deleted",
|
||||
"{{count}} selected_one": "1 selected",
|
||||
"{{count}} selected_other": "{{count}} selected"
|
||||
"Properties": "Propiedades"
|
||||
}
|
||||
|
||||
@@ -1153,141 +1153,5 @@
|
||||
"Create property": "Créer une propriété",
|
||||
"Hide properties": "Masquer les propriétés",
|
||||
"Find a property type": "Rechercher un type de propriété",
|
||||
"Properties": "Propriétés",
|
||||
"A property with this name already exists": "Une propriété portant ce nom existe déjà",
|
||||
"Add card": "Ajouter une carte",
|
||||
"Add filter": "Ajouter un filtre",
|
||||
"Add option": "Ajouter une option",
|
||||
"Add sort": "Ajouter un tri",
|
||||
"Add view": "Ajouter une vue",
|
||||
"All data in this column will be lost.": "Toutes les données de cette colonne seront perdues.",
|
||||
"Allow multiple people": "Autoriser plusieurs personnes",
|
||||
"Alphabetize": "Trier par ordre alphabétique",
|
||||
"Are you sure you want to delete": "Êtes-vous sûr de vouloir supprimer",
|
||||
"Ascending": "Croissant",
|
||||
"Base deleted": "Base supprimée",
|
||||
"Base name": "Nom de la base",
|
||||
"Base table": "Table de base",
|
||||
"Card properties": "Propriétés de la carte",
|
||||
"Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Les cellules dépassant la limite de texte seront tronquées et le contenu supplémentaire sera définitivement perdu.",
|
||||
"Checkbox": "Case à cocher",
|
||||
"Checked by default": "Coché par défaut",
|
||||
"Choose a property": "Choisir une propriété",
|
||||
"Clear selection": "Effacer la sélection",
|
||||
"Column options": "Options de la colonne",
|
||||
"Comma, period": "Virgule, point",
|
||||
"Complete": "Terminé",
|
||||
"Contains": "Contient",
|
||||
"Copy link to view": "Copier le lien vers la vue",
|
||||
"Create a status property": "Créer une propriété de statut",
|
||||
"Created at": "Créé le",
|
||||
"Currency": "Devise",
|
||||
"Decimal places": "Décimales",
|
||||
"Default value": "Valeur par défaut",
|
||||
"Delete property": "Supprimer la propriété",
|
||||
"Delete view": "Supprimer la vue",
|
||||
"Delete {{count}} rows?_one": "Delete 1 row?",
|
||||
"Delete {{count}} rows?_other": "Delete {{count}} rows?",
|
||||
"Descending": "Décroissant",
|
||||
"Discard": "Ignorer",
|
||||
"Doesn't contain": "Ne contient pas",
|
||||
"Done": "Terminé",
|
||||
"Edit formula": "Modifier la formule",
|
||||
"Edit property": "Modifier la propriété",
|
||||
"Export CSV": "Exporter en CSV",
|
||||
"Failed to load base": "Échec du chargement de la base",
|
||||
"False": "Faux",
|
||||
"File": "Fichier",
|
||||
"Filter and sort changes are visible only to you": "Les modifications de filtre et de tri ne sont visibles que par vous",
|
||||
"Filter by": "Filtrer par",
|
||||
"Formula": "Formule",
|
||||
"Get started with": "Commencer avec",
|
||||
"Greater than": "Supérieur à",
|
||||
"Group by": "Grouper par",
|
||||
"Group this board by a select or status property.": "Groupez ce tableau par une propriété de sélection ou de statut.",
|
||||
"Hide all": "Tout masquer",
|
||||
"Hide group": "Masquer le groupe",
|
||||
"In Progress": "En cours",
|
||||
"In progress": "En cours",
|
||||
"Include time": "Inclure l'heure",
|
||||
"Insert a kanban board on this page": "Insérer un tableau kanban sur cette page",
|
||||
"Insert an inline base on this page": "Insérer une base intégrée sur cette page",
|
||||
"Is": "Est",
|
||||
"Is after": "Est après",
|
||||
"Is any of": "Est l'un de",
|
||||
"Is before": "Est avant",
|
||||
"Is empty": "Est vide",
|
||||
"Is none of": "N'est aucun de",
|
||||
"Is not": "N'est pas",
|
||||
"Is not empty": "N'est pas vide",
|
||||
"Is on or after": "Est le ou après le",
|
||||
"Is on or before": "Est le ou avant le",
|
||||
"Is within": "Est dans la plage",
|
||||
"Keep editing": "Continuer la modification",
|
||||
"Last edited at": "Dernière modification le",
|
||||
"Last edited by": "Dernière modification par",
|
||||
"Less than": "Inférieur à",
|
||||
"Link copied to clipboard": "Lien copié dans le presse-papiers",
|
||||
"Local": "Local",
|
||||
"Long text": "Texte long",
|
||||
"Moved card to {{column}}": "Carte déplacée vers {{column}}",
|
||||
"Moved column to {{column}}": "Colonne déplacée vers {{column}}",
|
||||
"Multi-select": "Sélection multiple",
|
||||
"New row": "Nouvelle ligne",
|
||||
"Next month": "Le mois prochain",
|
||||
"Next week": "La semaine prochaine",
|
||||
"Next year": "L'année prochaine",
|
||||
"No filters applied": "Aucun filtre appliqué",
|
||||
"No match": "Aucune correspondance",
|
||||
"No options for this property type": "Aucune option pour ce type de propriété",
|
||||
"No sorts applied": "Aucun tri appliqué",
|
||||
"No value": "Aucune valeur",
|
||||
"None": "Aucun",
|
||||
"Not started": "Non commencé",
|
||||
"Number": "Nombre",
|
||||
"One month ago": "Il y a un mois",
|
||||
"One month from now": "Dans un mois",
|
||||
"One week ago": "Il y a une semaine",
|
||||
"One week from now": "Dans une semaine",
|
||||
"Open as page": "Ouvrir comme page",
|
||||
"Options": "Options",
|
||||
"Past month": "Le mois dernier",
|
||||
"Past week": "La semaine dernière",
|
||||
"Past year": "L'année dernière",
|
||||
"Percent": "Pourcentage",
|
||||
"Period, comma": "Point, virgule",
|
||||
"Person": "Personne",
|
||||
"Please enter a valid email": "Veuillez entrer une adresse e-mail valide",
|
||||
"Progress": "Progression",
|
||||
"Property options": "Options de la propriété",
|
||||
"Relative": "Relatif",
|
||||
"Rename property": "Renommer la propriété",
|
||||
"Reset": "Réinitialiser",
|
||||
"Save for everyone": "Enregistrer pour tout le monde",
|
||||
"Select": "Sélection",
|
||||
"Select a property": "Sélectionner une propriété",
|
||||
"Select all loaded rows": "Sélectionner toutes les lignes chargées",
|
||||
"Show all": "Tout afficher",
|
||||
"Sort": "Trier",
|
||||
"Sort by": "Trier par",
|
||||
"Space, comma": "Espace, virgule",
|
||||
"Space, period": "Espace, point",
|
||||
"This board has no grouping property yet.": "Ce tableau n'a pas encore de propriété de groupement.",
|
||||
"This month": "Ce mois-ci",
|
||||
"This year": "Cette année",
|
||||
"Thousands and decimal separators": "Séparateurs des milliers et des décimales",
|
||||
"Time format": "Format de l'heure",
|
||||
"To Do": "À faire",
|
||||
"Tomorrow": "Demain",
|
||||
"True": "Vrai",
|
||||
"Unsaved changes": "Modifications non enregistrées",
|
||||
"Untitled base": "Base sans titre",
|
||||
"URL": "URL",
|
||||
"Value": "Valeur",
|
||||
"View updated for everyone": "Vue mise à jour pour tout le monde",
|
||||
"You have unsaved changes. Do you want to discard them?": "Vous avez des modifications non enregistrées. Voulez-vous les ignorer ?",
|
||||
"{{count}} rows deleted_one": "1 row deleted",
|
||||
"{{count}} rows deleted_other": "{{count}} rows deleted",
|
||||
"{{count}} selected_one": "1 selected",
|
||||
"{{count}} selected_other": "{{count}} selected"
|
||||
"Properties": "Propriétés"
|
||||
}
|
||||
|
||||
@@ -1153,141 +1153,5 @@
|
||||
"Create property": "Crea proprietà",
|
||||
"Hide properties": "Nascondi proprietà",
|
||||
"Find a property type": "Trova un tipo di proprietà",
|
||||
"Properties": "Proprietà",
|
||||
"A property with this name already exists": "Esiste già una proprietà con questo nome",
|
||||
"Add card": "Aggiungi scheda",
|
||||
"Add filter": "Aggiungi filtro",
|
||||
"Add option": "Aggiungi opzione",
|
||||
"Add sort": "Aggiungi ordinamento",
|
||||
"Add view": "Aggiungi vista",
|
||||
"All data in this column will be lost.": "Tutti i dati in questa colonna andranno persi.",
|
||||
"Allow multiple people": "Consenti più persone",
|
||||
"Alphabetize": "Ordina alfabeticamente",
|
||||
"Are you sure you want to delete": "Sei sicuro di voler eliminare",
|
||||
"Ascending": "Crescente",
|
||||
"Base deleted": "Base eliminata",
|
||||
"Base name": "Nome della base",
|
||||
"Base table": "Tabella della base",
|
||||
"Card properties": "Proprietà della scheda",
|
||||
"Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Le celle più lunghe del limite del testo verranno troncate e il contenuto aggiuntivo andrà perso in modo permanente.",
|
||||
"Checkbox": "Casella di controllo",
|
||||
"Checked by default": "Selezionata per impostazione predefinita",
|
||||
"Choose a property": "Scegli una proprietà",
|
||||
"Clear selection": "Cancella selezione",
|
||||
"Column options": "Opzioni della colonna",
|
||||
"Comma, period": "Virgola, punto",
|
||||
"Complete": "Completato",
|
||||
"Contains": "Contiene",
|
||||
"Copy link to view": "Copia link alla vista",
|
||||
"Create a status property": "Crea una proprietà di stato",
|
||||
"Created at": "Creato il",
|
||||
"Currency": "Valuta",
|
||||
"Decimal places": "Posizioni decimali",
|
||||
"Default value": "Valore predefinito",
|
||||
"Delete property": "Elimina proprietà",
|
||||
"Delete view": "Elimina vista",
|
||||
"Delete {{count}} rows?_one": "Delete 1 row?",
|
||||
"Delete {{count}} rows?_other": "Delete {{count}} rows?",
|
||||
"Descending": "Decrescente",
|
||||
"Discard": "Ignora",
|
||||
"Doesn't contain": "Non contiene",
|
||||
"Done": "Fatto",
|
||||
"Edit formula": "Modifica formula",
|
||||
"Edit property": "Modifica proprietà",
|
||||
"Export CSV": "Esporta CSV",
|
||||
"Failed to load base": "Impossibile caricare la base",
|
||||
"False": "Falso",
|
||||
"File": "File",
|
||||
"Filter and sort changes are visible only to you": "Le modifiche a filtri e ordinamenti sono visibili solo a te",
|
||||
"Filter by": "Filtra per",
|
||||
"Formula": "Formula",
|
||||
"Get started with": "Inizia con",
|
||||
"Greater than": "Maggiore di",
|
||||
"Group by": "Raggruppa per",
|
||||
"Group this board by a select or status property.": "Raggruppa questa bacheca per una proprietà di selezione o di stato.",
|
||||
"Hide all": "Nascondi tutto",
|
||||
"Hide group": "Nascondi gruppo",
|
||||
"In Progress": "In corso",
|
||||
"In progress": "In corso",
|
||||
"Include time": "Includi ora",
|
||||
"Insert a kanban board on this page": "Inserisci una bacheca kanban in questa pagina",
|
||||
"Insert an inline base on this page": "Inserisci una base in linea in questa pagina",
|
||||
"Is": "È",
|
||||
"Is after": "È dopo",
|
||||
"Is any of": "È uno tra",
|
||||
"Is before": "È prima",
|
||||
"Is empty": "È vuoto",
|
||||
"Is none of": "Non è nessuno di",
|
||||
"Is not": "Non è",
|
||||
"Is not empty": "Non è vuoto",
|
||||
"Is on or after": "È il o dopo il",
|
||||
"Is on or before": "È il o prima del",
|
||||
"Is within": "È entro",
|
||||
"Keep editing": "Continua a modificare",
|
||||
"Last edited at": "Ultima modifica il",
|
||||
"Last edited by": "Ultima modifica di",
|
||||
"Less than": "Minore di",
|
||||
"Link copied to clipboard": "Link copiato negli appunti",
|
||||
"Local": "Locale",
|
||||
"Long text": "Testo lungo",
|
||||
"Moved card to {{column}}": "Scheda spostata in {{column}}",
|
||||
"Moved column to {{column}}": "Colonna spostata in {{column}}",
|
||||
"Multi-select": "Selezione multipla",
|
||||
"New row": "Nuova riga",
|
||||
"Next month": "Prossimo mese",
|
||||
"Next week": "Prossima settimana",
|
||||
"Next year": "Prossimo anno",
|
||||
"No filters applied": "Nessun filtro applicato",
|
||||
"No match": "Nessuna corrispondenza",
|
||||
"No options for this property type": "Nessuna opzione per questo tipo di proprietà",
|
||||
"No sorts applied": "Nessun ordinamento applicato",
|
||||
"No value": "Nessun valore",
|
||||
"None": "Nessuno",
|
||||
"Not started": "Non iniziato",
|
||||
"Number": "Numero",
|
||||
"One month ago": "Un mese fa",
|
||||
"One month from now": "Tra un mese",
|
||||
"One week ago": "Una settimana fa",
|
||||
"One week from now": "Tra una settimana",
|
||||
"Open as page": "Apri come pagina",
|
||||
"Options": "Opzioni",
|
||||
"Past month": "Mese scorso",
|
||||
"Past week": "Settimana scorsa",
|
||||
"Past year": "Anno scorso",
|
||||
"Percent": "Percentuale",
|
||||
"Period, comma": "Punto, virgola",
|
||||
"Person": "Persona",
|
||||
"Please enter a valid email": "Inserisci un indirizzo email valido",
|
||||
"Progress": "Avanzamento",
|
||||
"Property options": "Opzioni della proprietà",
|
||||
"Relative": "Relativo",
|
||||
"Rename property": "Rinomina proprietà",
|
||||
"Reset": "Reimposta",
|
||||
"Save for everyone": "Salva per tutti",
|
||||
"Select": "Seleziona",
|
||||
"Select a property": "Seleziona una proprietà",
|
||||
"Select all loaded rows": "Seleziona tutte le righe caricate",
|
||||
"Show all": "Mostra tutto",
|
||||
"Sort": "Ordina",
|
||||
"Sort by": "Ordina per",
|
||||
"Space, comma": "Spazio, virgola",
|
||||
"Space, period": "Spazio, punto",
|
||||
"This board has no grouping property yet.": "Questa bacheca non ha ancora una proprietà di raggruppamento.",
|
||||
"This month": "Questo mese",
|
||||
"This year": "Quest'anno",
|
||||
"Thousands and decimal separators": "Separatori delle migliaia e dei decimali",
|
||||
"Time format": "Formato ora",
|
||||
"To Do": "Da fare",
|
||||
"Tomorrow": "Domani",
|
||||
"True": "Vero",
|
||||
"Unsaved changes": "Modifiche non salvate",
|
||||
"Untitled base": "Base senza titolo",
|
||||
"URL": "URL",
|
||||
"Value": "Valore",
|
||||
"View updated for everyone": "Vista aggiornata per tutti",
|
||||
"You have unsaved changes. Do you want to discard them?": "Hai modifiche non salvate. Vuoi ignorarle?",
|
||||
"{{count}} rows deleted_one": "1 row deleted",
|
||||
"{{count}} rows deleted_other": "{{count}} rows deleted",
|
||||
"{{count}} selected_one": "1 selected",
|
||||
"{{count}} selected_other": "{{count}} selected"
|
||||
"Properties": "Proprietà"
|
||||
}
|
||||
|
||||
@@ -1153,141 +1153,5 @@
|
||||
"Create property": "プロパティを作成",
|
||||
"Hide properties": "プロパティを非表示",
|
||||
"Find a property type": "プロパティの種類を検索",
|
||||
"Properties": "プロパティ",
|
||||
"A property with this name already exists": "この名前のプロパティはすでに存在します",
|
||||
"Add card": "カードを追加",
|
||||
"Add filter": "フィルターを追加",
|
||||
"Add option": "オプションを追加",
|
||||
"Add sort": "並べ替えを追加",
|
||||
"Add view": "ビューを追加",
|
||||
"All data in this column will be lost.": "この列内のすべてのデータは失われます。",
|
||||
"Allow multiple people": "複数のユーザーを許可",
|
||||
"Alphabetize": "アルファベット順",
|
||||
"Are you sure you want to delete": "削除してもよろしいですか",
|
||||
"Ascending": "昇順",
|
||||
"Base deleted": "ベースを削除しました",
|
||||
"Base name": "ベース名",
|
||||
"Base table": "ベーステーブル",
|
||||
"Card properties": "カードのプロパティ",
|
||||
"Cells longer than the Text limit will be truncated and the extra content permanently lost.": "テキストの制限を超える長さのセルは切り詰められ、超過分の内容は完全に失われます。",
|
||||
"Checkbox": "チェックボックス",
|
||||
"Checked by default": "デフォルトでチェックを入れる",
|
||||
"Choose a property": "プロパティを選択",
|
||||
"Clear selection": "選択をクリア",
|
||||
"Column options": "列のオプション",
|
||||
"Comma, period": "カンマ、小数点",
|
||||
"Complete": "完了",
|
||||
"Contains": "含む",
|
||||
"Copy link to view": "ビューへのリンクをコピー",
|
||||
"Create a status property": "ステータスプロパティを作成",
|
||||
"Created at": "作成日時",
|
||||
"Currency": "通貨",
|
||||
"Decimal places": "小数点以下の桁数",
|
||||
"Default value": "デフォルト値",
|
||||
"Delete property": "プロパティを削除",
|
||||
"Delete view": "ビューを削除",
|
||||
"Delete {{count}} rows?_one": "Delete 1 row?",
|
||||
"Delete {{count}} rows?_other": "Delete {{count}} rows?",
|
||||
"Descending": "降順",
|
||||
"Discard": "破棄",
|
||||
"Doesn't contain": "含まない",
|
||||
"Done": "完了",
|
||||
"Edit formula": "数式を編集",
|
||||
"Edit property": "プロパティを編集",
|
||||
"Export CSV": "CSVをエクスポート",
|
||||
"Failed to load base": "ベースの読み込みに失敗しました",
|
||||
"False": "偽",
|
||||
"File": "ファイル",
|
||||
"Filter and sort changes are visible only to you": "フィルターと並べ替えの変更は自分にのみ表示されます",
|
||||
"Filter by": "条件",
|
||||
"Formula": "数式",
|
||||
"Get started with": "次から始める",
|
||||
"Greater than": "より大きい",
|
||||
"Group by": "グループ化",
|
||||
"Group this board by a select or status property.": "このボードをセレクトまたはステータスのプロパティでグループ化します。",
|
||||
"Hide all": "すべて非表示",
|
||||
"Hide group": "グループを非表示",
|
||||
"In Progress": "進行中",
|
||||
"In progress": "進行中",
|
||||
"Include time": "時刻を含める",
|
||||
"Insert a kanban board on this page": "このページにカンバンボードを挿入",
|
||||
"Insert an inline base on this page": "このページにインラインベースを挿入",
|
||||
"Is": "次に等しい",
|
||||
"Is after": "次より後",
|
||||
"Is any of": "次のいずれか",
|
||||
"Is before": "次より前",
|
||||
"Is empty": "空である",
|
||||
"Is none of": "次のいずれでもない",
|
||||
"Is not": "次に等しくない",
|
||||
"Is not empty": "空ではない",
|
||||
"Is on or after": "次以降",
|
||||
"Is on or before": "次以前",
|
||||
"Is within": "次の期間内",
|
||||
"Keep editing": "編集を続ける",
|
||||
"Last edited at": "最終編集日時",
|
||||
"Last edited by": "最終編集者",
|
||||
"Less than": "より小さい",
|
||||
"Link copied to clipboard": "リンクをクリップボードにコピーしました",
|
||||
"Local": "ローカル",
|
||||
"Long text": "長いテキスト",
|
||||
"Moved card to {{column}}": "カードを{{column}}に移動しました",
|
||||
"Moved column to {{column}}": "列を{{column}}に移動しました",
|
||||
"Multi-select": "複数選択",
|
||||
"New row": "新規行",
|
||||
"Next month": "来月",
|
||||
"Next week": "来週",
|
||||
"Next year": "来年",
|
||||
"No filters applied": "フィルターは適用されていません",
|
||||
"No match": "一致なし",
|
||||
"No options for this property type": "このプロパティタイプにはオプションがありません",
|
||||
"No sorts applied": "並べ替えは適用されていません",
|
||||
"No value": "値なし",
|
||||
"None": "なし",
|
||||
"Not started": "未着手",
|
||||
"Number": "数値",
|
||||
"One month ago": "1か月前",
|
||||
"One month from now": "1か月後",
|
||||
"One week ago": "1週間前",
|
||||
"One week from now": "1週間後",
|
||||
"Open as page": "ページとして開く",
|
||||
"Options": "オプション",
|
||||
"Past month": "先月",
|
||||
"Past week": "先週",
|
||||
"Past year": "昨年",
|
||||
"Percent": "パーセント",
|
||||
"Period, comma": "小数点、カンマ",
|
||||
"Person": "ユーザー",
|
||||
"Please enter a valid email": "有効なメールアドレスを入力してください",
|
||||
"Progress": "進捗",
|
||||
"Property options": "プロパティのオプション",
|
||||
"Relative": "相対",
|
||||
"Rename property": "プロパティ名を変更",
|
||||
"Reset": "リセット",
|
||||
"Save for everyone": "全員に保存",
|
||||
"Select": "選択",
|
||||
"Select a property": "プロパティを選択",
|
||||
"Select all loaded rows": "読み込まれているすべての行を選択",
|
||||
"Show all": "すべて表示",
|
||||
"Sort": "並べ替え",
|
||||
"Sort by": "並べ替え条件",
|
||||
"Space, comma": "スペース、カンマ",
|
||||
"Space, period": "スペース、小数点",
|
||||
"This board has no grouping property yet.": "このボードにはまだグループ化プロパティがありません。",
|
||||
"This month": "今月",
|
||||
"This year": "今年",
|
||||
"Thousands and decimal separators": "桁区切りと小数点区切り",
|
||||
"Time format": "時刻形式",
|
||||
"To Do": "To Do",
|
||||
"Tomorrow": "明日",
|
||||
"True": "真",
|
||||
"Unsaved changes": "未保存の変更",
|
||||
"Untitled base": "無題のベース",
|
||||
"URL": "URL",
|
||||
"Value": "値",
|
||||
"View updated for everyone": "ビューが全員向けに更新されました",
|
||||
"You have unsaved changes. Do you want to discard them?": "未保存の変更があります。破棄しますか？",
|
||||
"{{count}} rows deleted_one": "1 row deleted",
|
||||
"{{count}} rows deleted_other": "{{count}} rows deleted",
|
||||
"{{count}} selected_one": "1 selected",
|
||||
"{{count}} selected_other": "{{count}} selected"
|
||||
"Properties": "プロパティ"
|
||||
}
|
||||
|
||||
@@ -1153,141 +1153,5 @@
|
||||
"Create property": "속성 만들기",
|
||||
"Hide properties": "속성 숨기기",
|
||||
"Find a property type": "속성 유형 찾기",
|
||||
"Properties": "속성",
|
||||
"A property with this name already exists": "이 이름의 속성이 이미 있습니다",
|
||||
"Add card": "카드 추가",
|
||||
"Add filter": "필터 추가",
|
||||
"Add option": "옵션 추가",
|
||||
"Add sort": "정렬 추가",
|
||||
"Add view": "보기 추가",
|
||||
"All data in this column will be lost.": "이 열의 모든 데이터가 손실됩니다.",
|
||||
"Allow multiple people": "여러 사람 허용",
|
||||
"Alphabetize": "가나다순",
|
||||
"Are you sure you want to delete": "삭제하시겠습니까",
|
||||
"Ascending": "오름차순",
|
||||
"Base deleted": "베이스가 삭제됨",
|
||||
"Base name": "베이스 이름",
|
||||
"Base table": "베이스 테이블",
|
||||
"Card properties": "카드 속성",
|
||||
"Cells longer than the Text limit will be truncated and the extra content permanently lost.": "텍스트 제한보다 긴 셀은 잘리며, 초과된 콘텐츠는 영구적으로 손실됩니다.",
|
||||
"Checkbox": "체크박스",
|
||||
"Checked by default": "기본적으로 선택됨",
|
||||
"Choose a property": "속성 선택",
|
||||
"Clear selection": "선택 지우기",
|
||||
"Column options": "열 옵션",
|
||||
"Comma, period": "쉼표, 마침표",
|
||||
"Complete": "완료",
|
||||
"Contains": "포함",
|
||||
"Copy link to view": "보기 링크 복사",
|
||||
"Create a status property": "상태 속성 만들기",
|
||||
"Created at": "작성 시간",
|
||||
"Currency": "통화",
|
||||
"Decimal places": "소수 자릿수",
|
||||
"Default value": "기본값",
|
||||
"Delete property": "속성 삭제",
|
||||
"Delete view": "보기 삭제",
|
||||
"Delete {{count}} rows?_one": "Delete 1 row?",
|
||||
"Delete {{count}} rows?_other": "Delete {{count}} rows?",
|
||||
"Descending": "내림차순",
|
||||
"Discard": "삭제",
|
||||
"Doesn't contain": "포함하지 않음",
|
||||
"Done": "완료",
|
||||
"Edit formula": "수식 편집",
|
||||
"Edit property": "속성 편집",
|
||||
"Export CSV": "CSV 내보내기",
|
||||
"Failed to load base": "베이스를 불러오지 못했습니다",
|
||||
"False": "거짓",
|
||||
"File": "파일",
|
||||
"Filter and sort changes are visible only to you": "필터 및 정렬 변경 사항은 나에게만 표시됩니다",
|
||||
"Filter by": "필터 기준",
|
||||
"Formula": "수식",
|
||||
"Get started with": "시작하기",
|
||||
"Greater than": "보다 큼",
|
||||
"Group by": "그룹화 기준",
|
||||
"Group this board by a select or status property.": "선택 또는 상태 속성으로 이 보드를 그룹화하세요.",
|
||||
"Hide all": "모두 숨기기",
|
||||
"Hide group": "그룹 숨기기",
|
||||
"In Progress": "진행 중",
|
||||
"In progress": "진행 중",
|
||||
"Include time": "시간 포함",
|
||||
"Insert a kanban board on this page": "이 페이지에 칸반 보드 삽입",
|
||||
"Insert an inline base on this page": "이 페이지에 인라인 베이스 삽입",
|
||||
"Is": "같음",
|
||||
"Is after": "이후",
|
||||
"Is any of": "다음 중 하나와 같음",
|
||||
"Is before": "이전",
|
||||
"Is empty": "비어 있음",
|
||||
"Is none of": "다음 중 어느 것과도 같지 않음",
|
||||
"Is not": "같지 않음",
|
||||
"Is not empty": "비어 있지 않음",
|
||||
"Is on or after": "해당 날짜 또는 이후",
|
||||
"Is on or before": "해당 날짜 또는 이전",
|
||||
"Is within": "다음 범위 내",
|
||||
"Keep editing": "계속 편집",
|
||||
"Last edited at": "마지막 편집 시간",
|
||||
"Last edited by": "마지막 편집자",
|
||||
"Less than": "보다 작음",
|
||||
"Link copied to clipboard": "링크가 클립보드에 복사됨",
|
||||
"Local": "로컬",
|
||||
"Long text": "긴 텍스트",
|
||||
"Moved card to {{column}}": "카드를 {{column}}(으)로 이동함",
|
||||
"Moved column to {{column}}": "열을 {{column}}(으)로 이동함",
|
||||
"Multi-select": "다중 선택",
|
||||
"New row": "새 행",
|
||||
"Next month": "다음 달",
|
||||
"Next week": "다음 주",
|
||||
"Next year": "내년",
|
||||
"No filters applied": "적용된 필터 없음",
|
||||
"No match": "일치하는 항목 없음",
|
||||
"No options for this property type": "이 속성 유형에는 옵션이 없습니다",
|
||||
"No sorts applied": "적용된 정렬 없음",
|
||||
"No value": "값 없음",
|
||||
"None": "없음",
|
||||
"Not started": "시작 전",
|
||||
"Number": "숫자",
|
||||
"One month ago": "한 달 전",
|
||||
"One month from now": "한 달 후",
|
||||
"One week ago": "일주일 전",
|
||||
"One week from now": "일주일 후",
|
||||
"Open as page": "페이지로 열기",
|
||||
"Options": "옵션",
|
||||
"Past month": "지난달",
|
||||
"Past week": "지난주",
|
||||
"Past year": "작년",
|
||||
"Percent": "백분율",
|
||||
"Period, comma": "마침표, 쉼표",
|
||||
"Person": "사람",
|
||||
"Please enter a valid email": "유효한 이메일을 입력하세요",
|
||||
"Progress": "진행률",
|
||||
"Property options": "속성 옵션",
|
||||
"Relative": "상대값",
|
||||
"Rename property": "속성 이름 변경",
|
||||
"Reset": "재설정",
|
||||
"Save for everyone": "모든 사용자에게 저장",
|
||||
"Select": "선택",
|
||||
"Select a property": "속성 선택",
|
||||
"Select all loaded rows": "불러온 모든 행 선택",
|
||||
"Show all": "모두 보기",
|
||||
"Sort": "정렬",
|
||||
"Sort by": "정렬 기준",
|
||||
"Space, comma": "공백, 쉼표",
|
||||
"Space, period": "공백, 마침표",
|
||||
"This board has no grouping property yet.": "이 보드에는 아직 그룹화 속성이 없습니다.",
|
||||
"This month": "이번 달",
|
||||
"This year": "올해",
|
||||
"Thousands and decimal separators": "천 단위 및 소수 구분 기호",
|
||||
"Time format": "시간 형식",
|
||||
"To Do": "할 일",
|
||||
"Tomorrow": "내일",
|
||||
"True": "참",
|
||||
"Unsaved changes": "저장되지 않은 변경 사항",
|
||||
"Untitled base": "제목 없는 베이스",
|
||||
"URL": "URL",
|
||||
"Value": "값",
|
||||
"View updated for everyone": "보기가 모두에게 업데이트되었습니다",
|
||||
"You have unsaved changes. Do you want to discard them?": "저장되지 않은 변경 사항이 있습니다. 버리시겠습니까?",
|
||||
"{{count}} rows deleted_one": "1 row deleted",
|
||||
"{{count}} rows deleted_other": "{{count}} rows deleted",
|
||||
"{{count}} selected_one": "1 selected",
|
||||
"{{count}} selected_other": "{{count}} selected"
|
||||
"Properties": "속성"
|
||||
}
|
||||
|
||||
@@ -1153,141 +1153,5 @@
|
||||
"Create property": "Eigenschap aanmaken",
|
||||
"Hide properties": "Eigenschappen verbergen",
|
||||
"Find a property type": "Een eigenschapstype zoeken",
|
||||
"Properties": "Eigenschappen",
|
||||
"A property with this name already exists": "Er bestaat al een eigenschap met deze naam",
|
||||
"Add card": "Kaart toevoegen",
|
||||
"Add filter": "Filter toevoegen",
|
||||
"Add option": "Optie toevoegen",
|
||||
"Add sort": "Sortering toevoegen",
|
||||
"Add view": "Weergave toevoegen",
|
||||
"All data in this column will be lost.": "Alle gegevens in deze kolom gaan verloren.",
|
||||
"Allow multiple people": "Meerdere personen toestaan",
|
||||
"Alphabetize": "Alfabetisch sorteren",
|
||||
"Are you sure you want to delete": "Weet je zeker dat je wilt verwijderen",
|
||||
"Ascending": "Oplopend",
|
||||
"Base deleted": "Base verwijderd",
|
||||
"Base name": "Basenaam",
|
||||
"Base table": "Basistabel",
|
||||
"Card properties": "Kaarteigenschappen",
|
||||
"Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Cellen die langer zijn dan de tekstlimiet worden afgekapt en de extra inhoud gaat permanent verloren.",
|
||||
"Checkbox": "Selectievakje",
|
||||
"Checked by default": "Standaard aangevinkt",
|
||||
"Choose a property": "Kies een eigenschap",
|
||||
"Clear selection": "Selectie wissen",
|
||||
"Column options": "Kolomopties",
|
||||
"Comma, period": "Komma, punt",
|
||||
"Complete": "Voltooid",
|
||||
"Contains": "Bevat",
|
||||
"Copy link to view": "Link naar weergave kopiëren",
|
||||
"Create a status property": "Een statuseigenschap maken",
|
||||
"Created at": "Aangemaakt op",
|
||||
"Currency": "Valuta",
|
||||
"Decimal places": "Decimalen",
|
||||
"Default value": "Standaardwaarde",
|
||||
"Delete property": "Eigenschap verwijderen",
|
||||
"Delete view": "Weergave verwijderen",
|
||||
"Delete {{count}} rows?_one": "1 rij verwijderen?",
|
||||
"Delete {{count}} rows?_other": "{{count}} rijen verwijderen?",
|
||||
"Descending": "Aflopend",
|
||||
"Discard": "Negeren",
|
||||
"Doesn't contain": "Bevat niet",
|
||||
"Done": "Klaar",
|
||||
"Edit formula": "Formule bewerken",
|
||||
"Edit property": "Eigenschap bewerken",
|
||||
"Export CSV": "CSV exporteren",
|
||||
"Failed to load base": "Base laden mislukt",
|
||||
"False": "Onwaar",
|
||||
"File": "Bestand",
|
||||
"Filter and sort changes are visible only to you": "Wijzigingen in filters en sortering zijn alleen zichtbaar voor jou",
|
||||
"Filter by": "Filteren op",
|
||||
"Formula": "Formule",
|
||||
"Get started with": "Aan de slag met",
|
||||
"Greater than": "Groter dan",
|
||||
"Group by": "Groeperen op",
|
||||
"Group this board by a select or status property.": "Groepeer dit bord op een selectie- of statuseigenschap.",
|
||||
"Hide all": "Alles verbergen",
|
||||
"Hide group": "Groep verbergen",
|
||||
"In Progress": "In uitvoering",
|
||||
"In progress": "In uitvoering",
|
||||
"Include time": "Tijd opnemen",
|
||||
"Insert a kanban board on this page": "Voeg een kanbanbord in op deze pagina",
|
||||
"Insert an inline base on this page": "Voeg een inline base in op deze pagina",
|
||||
"Is": "Is",
|
||||
"Is after": "Is na",
|
||||
"Is any of": "Is een van",
|
||||
"Is before": "Is vóór",
|
||||
"Is empty": "Is leeg",
|
||||
"Is none of": "Is geen van",
|
||||
"Is not": "Is niet",
|
||||
"Is not empty": "Is niet leeg",
|
||||
"Is on or after": "Is op of na",
|
||||
"Is on or before": "Is op of vóór",
|
||||
"Is within": "Is binnen",
|
||||
"Keep editing": "Doorgaan met bewerken",
|
||||
"Last edited at": "Laatst bewerkt op",
|
||||
"Last edited by": "Laatst bewerkt door",
|
||||
"Less than": "Kleiner dan",
|
||||
"Link copied to clipboard": "Link gekopieerd naar klembord",
|
||||
"Local": "Lokaal",
|
||||
"Long text": "Lange tekst",
|
||||
"Moved card to {{column}}": "Kaart verplaatst naar {{column}}",
|
||||
"Moved column to {{column}}": "Kolom verplaatst naar {{column}}",
|
||||
"Multi-select": "Meervoudige selectie",
|
||||
"New row": "Nieuwe rij",
|
||||
"Next month": "Volgende maand",
|
||||
"Next week": "Volgende week",
|
||||
"Next year": "Volgend jaar",
|
||||
"No filters applied": "Geen filters toegepast",
|
||||
"No match": "Geen overeenkomst",
|
||||
"No options for this property type": "Geen opties voor dit eigenschapstype",
|
||||
"No sorts applied": "Geen sorteringen toegepast",
|
||||
"No value": "Geen waarde",
|
||||
"None": "Geen",
|
||||
"Not started": "Niet gestart",
|
||||
"Number": "Getal",
|
||||
"One month ago": "Een maand geleden",
|
||||
"One month from now": "Over een maand",
|
||||
"One week ago": "Een week geleden",
|
||||
"One week from now": "Over een week",
|
||||
"Open as page": "Openen als pagina",
|
||||
"Options": "Opties",
|
||||
"Past month": "Afgelopen maand",
|
||||
"Past week": "Afgelopen week",
|
||||
"Past year": "Afgelopen jaar",
|
||||
"Percent": "Procent",
|
||||
"Period, comma": "Punt, komma",
|
||||
"Person": "Persoon",
|
||||
"Please enter a valid email": "Voer een geldig e-mailadres in",
|
||||
"Progress": "Voortgang",
|
||||
"Property options": "Eigenschapopties",
|
||||
"Relative": "Relatief",
|
||||
"Rename property": "Eigenschap hernoemen",
|
||||
"Reset": "Opnieuw instellen",
|
||||
"Save for everyone": "Opslaan voor iedereen",
|
||||
"Select": "Selecteren",
|
||||
"Select a property": "Selecteer een eigenschap",
|
||||
"Select all loaded rows": "Alle geladen rijen selecteren",
|
||||
"Show all": "Alles tonen",
|
||||
"Sort": "Sorteren",
|
||||
"Sort by": "Sorteren op",
|
||||
"Space, comma": "Spatie, komma",
|
||||
"Space, period": "Spatie, punt",
|
||||
"This board has no grouping property yet.": "Dit bord heeft nog geen groeperingseigenschap.",
|
||||
"This month": "Deze maand",
|
||||
"This year": "Dit jaar",
|
||||
"Thousands and decimal separators": "Scheidingstekens voor duizendtallen en decimalen",
|
||||
"Time format": "Tijdnotatie",
|
||||
"To Do": "Te doen",
|
||||
"Tomorrow": "Morgen",
|
||||
"True": "Waar",
|
||||
"Unsaved changes": "Niet-opgeslagen wijzigingen",
|
||||
"Untitled base": "Base zonder titel",
|
||||
"URL": "URL",
|
||||
"Value": "Waarde",
|
||||
"View updated for everyone": "Weergave bijgewerkt voor iedereen",
|
||||
"You have unsaved changes. Do you want to discard them?": "Je hebt niet-opgeslagen wijzigingen. Wil je deze negeren?",
|
||||
"{{count}} rows deleted_one": "1 rij verwijderd",
|
||||
"{{count}} rows deleted_other": "{{count}} rijen verwijderd",
|
||||
"{{count}} selected_one": "1 geselecteerd",
|
||||
"{{count}} selected_other": "{{count}} geselecteerd"
|
||||
"Properties": "Eigenschappen"
|
||||
}
|
||||
|
||||
@@ -1153,141 +1153,5 @@
|
||||
"Create property": "Criar propriedade",
|
||||
"Hide properties": "Ocultar propriedades",
|
||||
"Find a property type": "Encontrar um tipo de propriedade",
|
||||
"Properties": "Propriedades",
|
||||
"A property with this name already exists": "Já existe uma propriedade com este nome",
|
||||
"Add card": "Adicionar cartão",
|
||||
"Add filter": "Adicionar filtro",
|
||||
"Add option": "Adicionar opção",
|
||||
"Add sort": "Adicionar ordenação",
|
||||
"Add view": "Adicionar visualização",
|
||||
"All data in this column will be lost.": "Todos os dados nesta coluna serão perdidos.",
|
||||
"Allow multiple people": "Permitir várias pessoas",
|
||||
"Alphabetize": "Ordenar alfabeticamente",
|
||||
"Are you sure you want to delete": "Tem certeza de que deseja excluir",
|
||||
"Ascending": "Crescente",
|
||||
"Base deleted": "Base excluída",
|
||||
"Base name": "Nome da base",
|
||||
"Base table": "Tabela da base",
|
||||
"Card properties": "Propriedades do cartão",
|
||||
"Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Células maiores do que o limite de Texto serão truncadas e o conteúdo extra será perdido permanentemente.",
|
||||
"Checkbox": "Caixa de seleção",
|
||||
"Checked by default": "Marcado por padrão",
|
||||
"Choose a property": "Escolha uma propriedade",
|
||||
"Clear selection": "Limpar seleção",
|
||||
"Column options": "Opções da coluna",
|
||||
"Comma, period": "Vírgula, ponto",
|
||||
"Complete": "Concluído",
|
||||
"Contains": "Contém",
|
||||
"Copy link to view": "Copiar link da visualização",
|
||||
"Create a status property": "Criar uma propriedade de status",
|
||||
"Created at": "Criado em",
|
||||
"Currency": "Moeda",
|
||||
"Decimal places": "Casas decimais",
|
||||
"Default value": "Valor padrão",
|
||||
"Delete property": "Excluir propriedade",
|
||||
"Delete view": "Excluir visualização",
|
||||
"Delete {{count}} rows?_one": "Delete 1 row?",
|
||||
"Delete {{count}} rows?_other": "Delete {{count}} rows?",
|
||||
"Descending": "Decrescente",
|
||||
"Discard": "Descartar",
|
||||
"Doesn't contain": "Não contém",
|
||||
"Done": "Concluído",
|
||||
"Edit formula": "Editar fórmula",
|
||||
"Edit property": "Editar propriedade",
|
||||
"Export CSV": "Exportar CSV",
|
||||
"Failed to load base": "Falha ao carregar a base",
|
||||
"False": "Falso",
|
||||
"File": "Arquivo",
|
||||
"Filter and sort changes are visible only to you": "As alterações de filtro e ordenação são visíveis somente para você",
|
||||
"Filter by": "Filtrar por",
|
||||
"Formula": "Fórmula",
|
||||
"Get started with": "Começar com",
|
||||
"Greater than": "Maior que",
|
||||
"Group by": "Agrupar por",
|
||||
"Group this board by a select or status property.": "Agrupe este quadro por uma propriedade de seleção ou status.",
|
||||
"Hide all": "Ocultar tudo",
|
||||
"Hide group": "Ocultar grupo",
|
||||
"In Progress": "Em andamento",
|
||||
"In progress": "Em andamento",
|
||||
"Include time": "Incluir hora",
|
||||
"Insert a kanban board on this page": "Inserir um quadro kanban nesta página",
|
||||
"Insert an inline base on this page": "Inserir uma base inline nesta página",
|
||||
"Is": "É",
|
||||
"Is after": "É depois de",
|
||||
"Is any of": "É qualquer um de",
|
||||
"Is before": "É antes de",
|
||||
"Is empty": "Está vazio",
|
||||
"Is none of": "Não é nenhum de",
|
||||
"Is not": "Não é",
|
||||
"Is not empty": "Não está vazio",
|
||||
"Is on or after": "É em ou depois de",
|
||||
"Is on or before": "É em ou antes de",
|
||||
"Is within": "Está dentro de",
|
||||
"Keep editing": "Continuar editando",
|
||||
"Last edited at": "Última edição em",
|
||||
"Last edited by": "Última edição por",
|
||||
"Less than": "Menor que",
|
||||
"Link copied to clipboard": "Link copiado para a área de transferência",
|
||||
"Local": "Local",
|
||||
"Long text": "Texto longo",
|
||||
"Moved card to {{column}}": "Cartão movido para {{column}}",
|
||||
"Moved column to {{column}}": "Coluna movida para {{column}}",
|
||||
"Multi-select": "Seleção múltipla",
|
||||
"New row": "Nova linha",
|
||||
"Next month": "Próximo mês",
|
||||
"Next week": "Próxima semana",
|
||||
"Next year": "Próximo ano",
|
||||
"No filters applied": "Nenhum filtro aplicado",
|
||||
"No match": "Sem correspondência",
|
||||
"No options for this property type": "Sem opções para este tipo de propriedade",
|
||||
"No sorts applied": "Nenhuma ordenação aplicada",
|
||||
"No value": "Sem valor",
|
||||
"None": "Nenhum",
|
||||
"Not started": "Não iniciado",
|
||||
"Number": "Número",
|
||||
"One month ago": "Há um mês",
|
||||
"One month from now": "Daqui a um mês",
|
||||
"One week ago": "Há uma semana",
|
||||
"One week from now": "Daqui a uma semana",
|
||||
"Open as page": "Abrir como página",
|
||||
"Options": "Opções",
|
||||
"Past month": "Mês passado",
|
||||
"Past week": "Semana passada",
|
||||
"Past year": "Ano passado",
|
||||
"Percent": "Porcentagem",
|
||||
"Period, comma": "Ponto, vírgula",
|
||||
"Person": "Pessoa",
|
||||
"Please enter a valid email": "Por favor, insira um e-mail válido",
|
||||
"Progress": "Progresso",
|
||||
"Property options": "Opções da propriedade",
|
||||
"Relative": "Relativo",
|
||||
"Rename property": "Renomear propriedade",
|
||||
"Reset": "Redefinir",
|
||||
"Save for everyone": "Salvar para todos",
|
||||
"Select": "Seleção",
|
||||
"Select a property": "Selecione uma propriedade",
|
||||
"Select all loaded rows": "Selecionar todas as linhas carregadas",
|
||||
"Show all": "Mostrar tudo",
|
||||
"Sort": "Ordenar",
|
||||
"Sort by": "Ordenar por",
|
||||
"Space, comma": "Espaço, vírgula",
|
||||
"Space, period": "Espaço, ponto",
|
||||
"This board has no grouping property yet.": "Este quadro ainda não tem uma propriedade de agrupamento.",
|
||||
"This month": "Este mês",
|
||||
"This year": "Este ano",
|
||||
"Thousands and decimal separators": "Separadores de milhares e decimais",
|
||||
"Time format": "Formato de hora",
|
||||
"To Do": "A fazer",
|
||||
"Tomorrow": "Amanhã",
|
||||
"True": "Verdadeiro",
|
||||
"Unsaved changes": "Alterações não salvas",
|
||||
"Untitled base": "Base sem título",
|
||||
"URL": "URL",
|
||||
"Value": "Valor",
|
||||
"View updated for everyone": "Visualização atualizada para todos",
|
||||
"You have unsaved changes. Do you want to discard them?": "Você tem alterações não salvas. Deseja descartá-las?",
|
||||
"{{count}} rows deleted_one": "1 row deleted",
|
||||
"{{count}} rows deleted_other": "{{count}} rows deleted",
|
||||
"{{count}} selected_one": "1 selected",
|
||||
"{{count}} selected_other": "{{count}} selected"
|
||||
"Properties": "Propriedades"
|
||||
}
|
||||
|
||||
@@ -1153,141 +1153,5 @@
|
||||
"Create property": "Создать свойство",
|
||||
"Hide properties": "Скрыть свойства",
|
||||
"Find a property type": "Найти тип свойства",
|
||||
"Properties": "Свойства",
|
||||
"A property with this name already exists": "Свойство с таким именем уже существует",
|
||||
"Add card": "Добавить карточку",
|
||||
"Add filter": "Добавить фильтр",
|
||||
"Add option": "Добавить вариант",
|
||||
"Add sort": "Добавить сортировку",
|
||||
"Add view": "Добавить представление",
|
||||
"All data in this column will be lost.": "Все данные в этом столбце будут потеряны.",
|
||||
"Allow multiple people": "Разрешить нескольких пользователей",
|
||||
"Alphabetize": "По алфавиту",
|
||||
"Are you sure you want to delete": "Вы уверены, что хотите удалить",
|
||||
"Ascending": "По возрастанию",
|
||||
"Base deleted": "База удалена",
|
||||
"Base name": "Название базы",
|
||||
"Base table": "Таблица базы",
|
||||
"Card properties": "Свойства карточки",
|
||||
"Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Ячейки, длина которых превышает ограничение для текста, будут обрезаны, а лишнее содержимое будет безвозвратно потеряно.",
|
||||
"Checkbox": "Флажок",
|
||||
"Checked by default": "Отмечено по умолчанию",
|
||||
"Choose a property": "Выберите свойство",
|
||||
"Clear selection": "Очистить выбор",
|
||||
"Column options": "Параметры столбца",
|
||||
"Comma, period": "Запятая, точка",
|
||||
"Complete": "Завершено",
|
||||
"Contains": "Содержит",
|
||||
"Copy link to view": "Скопировать ссылку на представление",
|
||||
"Create a status property": "Создать свойство статуса",
|
||||
"Created at": "Создано",
|
||||
"Currency": "Валюта",
|
||||
"Decimal places": "Десятичные знаки",
|
||||
"Default value": "Значение по умолчанию",
|
||||
"Delete property": "Удалить свойство",
|
||||
"Delete view": "Удалить представление",
|
||||
"Delete {{count}} rows?_one": "Delete 1 row?",
|
||||
"Delete {{count}} rows?_other": "Delete {{count}} rows?",
|
||||
"Descending": "По убыванию",
|
||||
"Discard": "Отменить",
|
||||
"Doesn't contain": "Не содержит",
|
||||
"Done": "Готово",
|
||||
"Edit formula": "Редактировать формулу",
|
||||
"Edit property": "Редактировать свойство",
|
||||
"Export CSV": "Экспорт CSV",
|
||||
"Failed to load base": "Не удалось загрузить базу",
|
||||
"False": "Ложь",
|
||||
"File": "Файл",
|
||||
"Filter and sort changes are visible only to you": "Изменения фильтра и сортировки видны только вам",
|
||||
"Filter by": "Фильтр по",
|
||||
"Formula": "Формула",
|
||||
"Get started with": "Начать работу с",
|
||||
"Greater than": "Больше чем",
|
||||
"Group by": "Группировать по",
|
||||
"Group this board by a select or status property.": "Сгруппируйте эту доску по свойству выбора или статуса.",
|
||||
"Hide all": "Скрыть все",
|
||||
"Hide group": "Скрыть группу",
|
||||
"In Progress": "В процессе",
|
||||
"In progress": "В процессе",
|
||||
"Include time": "Включить время",
|
||||
"Insert a kanban board on this page": "Вставить канбан-доску на эту страницу",
|
||||
"Insert an inline base on this page": "Вставить встроенную базу на эту страницу",
|
||||
"Is": "Равно",
|
||||
"Is after": "После",
|
||||
"Is any of": "Совпадает с любым из",
|
||||
"Is before": "До",
|
||||
"Is empty": "Пусто",
|
||||
"Is none of": "Не совпадает ни с одним из",
|
||||
"Is not": "Не равно",
|
||||
"Is not empty": "Не пусто",
|
||||
"Is on or after": "В этот день или позже",
|
||||
"Is on or before": "В этот день или раньше",
|
||||
"Is within": "Находится в пределах",
|
||||
"Keep editing": "Продолжить редактирование",
|
||||
"Last edited at": "Последнее изменение",
|
||||
"Last edited by": "Последний изменивший",
|
||||
"Less than": "Меньше чем",
|
||||
"Link copied to clipboard": "Ссылка скопирована в буфер обмена",
|
||||
"Local": "Локальный",
|
||||
"Long text": "Длинный текст",
|
||||
"Moved card to {{column}}": "Карточка перемещена в {{column}}",
|
||||
"Moved column to {{column}}": "Столбец перемещён в {{column}}",
|
||||
"Multi-select": "Множественный выбор",
|
||||
"New row": "Новая строка",
|
||||
"Next month": "Следующий месяц",
|
||||
"Next week": "Следующая неделя",
|
||||
"Next year": "Следующий год",
|
||||
"No filters applied": "Фильтры не применены",
|
||||
"No match": "Нет совпадений",
|
||||
"No options for this property type": "Для этого типа свойства нет параметров",
|
||||
"No sorts applied": "Сортировка не применена",
|
||||
"No value": "Нет значения",
|
||||
"None": "Нет",
|
||||
"Not started": "Не начато",
|
||||
"Number": "Число",
|
||||
"One month ago": "Месяц назад",
|
||||
"One month from now": "Через месяц",
|
||||
"One week ago": "Неделю назад",
|
||||
"One week from now": "Через неделю",
|
||||
"Open as page": "Открыть как страницу",
|
||||
"Options": "Параметры",
|
||||
"Past month": "Прошлый месяц",
|
||||
"Past week": "Прошлая неделя",
|
||||
"Past year": "Прошлый год",
|
||||
"Percent": "Процент",
|
||||
"Period, comma": "Точка, запятая",
|
||||
"Person": "Пользователь",
|
||||
"Please enter a valid email": "Пожалуйста, введите корректный адрес электронной почты",
|
||||
"Progress": "Прогресс",
|
||||
"Property options": "Параметры свойства",
|
||||
"Relative": "Относительный",
|
||||
"Rename property": "Переименовать свойство",
|
||||
"Reset": "Сбросить",
|
||||
"Save for everyone": "Сохранить для всех",
|
||||
"Select": "Выбор",
|
||||
"Select a property": "Выберите свойство",
|
||||
"Select all loaded rows": "Выбрать все загруженные строки",
|
||||
"Show all": "Показать все",
|
||||
"Sort": "Сортировка",
|
||||
"Sort by": "Сортировать по",
|
||||
"Space, comma": "Пробел, запятая",
|
||||
"Space, period": "Пробел, точка",
|
||||
"This board has no grouping property yet.": "У этой доски пока нет свойства для группировки.",
|
||||
"This month": "Этот месяц",
|
||||
"This year": "Этот год",
|
||||
"Thousands and decimal separators": "Разделители тысяч и десятичных знаков",
|
||||
"Time format": "Формат времени",
|
||||
"To Do": "К выполнению",
|
||||
"Tomorrow": "Завтра",
|
||||
"True": "Истина",
|
||||
"Unsaved changes": "Несохранённые изменения",
|
||||
"Untitled base": "База без названия",
|
||||
"URL": "URL",
|
||||
"Value": "Значение",
|
||||
"View updated for everyone": "Представление обновлено для всех",
|
||||
"You have unsaved changes. Do you want to discard them?": "У вас есть несохранённые изменения. Хотите их отменить?",
|
||||
"{{count}} rows deleted_one": "1 row deleted",
|
||||
"{{count}} rows deleted_other": "{{count}} rows deleted",
|
||||
"{{count}} selected_one": "1 selected",
|
||||
"{{count}} selected_other": "{{count}} selected"
|
||||
"Properties": "Свойства"
|
||||
}
|
||||
|
||||
@@ -1153,141 +1153,5 @@
|
||||
"Create property": "Створити властивість",
|
||||
"Hide properties": "Приховати властивості",
|
||||
"Find a property type": "Знайти тип властивості",
|
||||
"Properties": "Властивості",
|
||||
"A property with this name already exists": "Властивість із такою назвою вже існує",
|
||||
"Add card": "Додати картку",
|
||||
"Add filter": "Додати фільтр",
|
||||
"Add option": "Додати опцію",
|
||||
"Add sort": "Додати сортування",
|
||||
"Add view": "Додати подання",
|
||||
"All data in this column will be lost.": "Усі дані в цьому стовпці буде втрачено.",
|
||||
"Allow multiple people": "Дозволити кількох людей",
|
||||
"Alphabetize": "За алфавітом",
|
||||
"Are you sure you want to delete": "Ви впевнені, що хочете видалити",
|
||||
"Ascending": "За зростанням",
|
||||
"Base deleted": "Базу видалено",
|
||||
"Base name": "Назва бази",
|
||||
"Base table": "Таблиця бази",
|
||||
"Card properties": "Властивості картки",
|
||||
"Cells longer than the Text limit will be truncated and the extra content permanently lost.": "Клітинки, довші за обмеження для тексту, буде обрізано, а зайвий вміст буде безповоротно втрачено.",
|
||||
"Checkbox": "Прапорець",
|
||||
"Checked by default": "Позначено за замовчуванням",
|
||||
"Choose a property": "Оберіть властивість",
|
||||
"Clear selection": "Очистити вибір",
|
||||
"Column options": "Параметри стовпця",
|
||||
"Comma, period": "Кома, крапка",
|
||||
"Complete": "Завершено",
|
||||
"Contains": "Містить",
|
||||
"Copy link to view": "Скопіювати посилання на подання",
|
||||
"Create a status property": "Створити властивість статусу",
|
||||
"Created at": "Створено",
|
||||
"Currency": "Валюта",
|
||||
"Decimal places": "Десяткові знаки",
|
||||
"Default value": "Значення за замовчуванням",
|
||||
"Delete property": "Видалити властивість",
|
||||
"Delete view": "Видалити подання",
|
||||
"Delete {{count}} rows?_one": "Delete 1 row?",
|
||||
"Delete {{count}} rows?_other": "Delete {{count}} rows?",
|
||||
"Descending": "За спаданням",
|
||||
"Discard": "Скасувати",
|
||||
"Doesn't contain": "Не містить",
|
||||
"Done": "Готово",
|
||||
"Edit formula": "Редагувати формулу",
|
||||
"Edit property": "Редагувати властивість",
|
||||
"Export CSV": "Експорт CSV",
|
||||
"Failed to load base": "Не вдалося завантажити базу",
|
||||
"False": "Хибність",
|
||||
"File": "Файл",
|
||||
"Filter and sort changes are visible only to you": "Зміни фільтрів і сортування видимі лише вам",
|
||||
"Filter by": "Фільтрувати за",
|
||||
"Formula": "Формула",
|
||||
"Get started with": "Почніть із",
|
||||
"Greater than": "Більше ніж",
|
||||
"Group by": "Групувати за",
|
||||
"Group this board by a select or status property.": "Згрупуйте цю дошку за властивістю вибору або статусу.",
|
||||
"Hide all": "Приховати все",
|
||||
"Hide group": "Приховати групу",
|
||||
"In Progress": "У процесі",
|
||||
"In progress": "У процесі",
|
||||
"Include time": "Включити час",
|
||||
"Insert a kanban board on this page": "Вставити канбан-дошку на цю сторінку",
|
||||
"Insert an inline base on this page": "Вставити вбудовану базу на цю сторінку",
|
||||
"Is": "Є",
|
||||
"Is after": "Після",
|
||||
"Is any of": "Є одним із",
|
||||
"Is before": "До",
|
||||
"Is empty": "Порожнє",
|
||||
"Is none of": "Не є жодним із",
|
||||
"Is not": "Не є",
|
||||
"Is not empty": "Не порожнє",
|
||||
"Is on or after": "У цей день або пізніше",
|
||||
"Is on or before": "У цей день або раніше",
|
||||
"Is within": "У межах",
|
||||
"Keep editing": "Продовжити редагування",
|
||||
"Last edited at": "Востаннє відредаговано",
|
||||
"Last edited by": "Востаннє відредагував",
|
||||
"Less than": "Менше ніж",
|
||||
"Link copied to clipboard": "Посилання скопійовано в буфер обміну",
|
||||
"Local": "Локальний",
|
||||
"Long text": "Довгий текст",
|
||||
"Moved card to {{column}}": "Картку переміщено до {{column}}",
|
||||
"Moved column to {{column}}": "Стовпець переміщено до {{column}}",
|
||||
"Multi-select": "Мультивибір",
|
||||
"New row": "Новий рядок",
|
||||
"Next month": "Наступного місяця",
|
||||
"Next week": "Наступного тижня",
|
||||
"Next year": "Наступного року",
|
||||
"No filters applied": "Фільтри не застосовано",
|
||||
"No match": "Немає збігів",
|
||||
"No options for this property type": "Немає опцій для цього типу властивості",
|
||||
"No sorts applied": "Сортування не застосовано",
|
||||
"No value": "Немає значення",
|
||||
"None": "Немає",
|
||||
"Not started": "Не розпочато",
|
||||
"Number": "Число",
|
||||
"One month ago": "Місяць тому",
|
||||
"One month from now": "Через місяць",
|
||||
"One week ago": "Тиждень тому",
|
||||
"One week from now": "Через тиждень",
|
||||
"Open as page": "Відкрити як сторінку",
|
||||
"Options": "Опції",
|
||||
"Past month": "За минулий місяць",
|
||||
"Past week": "За минулий тиждень",
|
||||
"Past year": "За минулий рік",
|
||||
"Percent": "Відсоток",
|
||||
"Period, comma": "Крапка, кома",
|
||||
"Person": "Особа",
|
||||
"Please enter a valid email": "Будь ласка, введіть коректну електронну адресу",
|
||||
"Progress": "Прогрес",
|
||||
"Property options": "Параметри властивості",
|
||||
"Relative": "Відносний",
|
||||
"Rename property": "Перейменувати властивість",
|
||||
"Reset": "Скинути",
|
||||
"Save for everyone": "Зберегти для всіх",
|
||||
"Select": "Вибір",
|
||||
"Select a property": "Виберіть властивість",
|
||||
"Select all loaded rows": "Вибрати всі завантажені рядки",
|
||||
"Show all": "Показати все",
|
||||
"Sort": "Сортування",
|
||||
"Sort by": "Сортувати за",
|
||||
"Space, comma": "Пробіл, кома",
|
||||
"Space, period": "Пробіл, крапка",
|
||||
"This board has no grouping property yet.": "Ця дошка ще не має властивості групування.",
|
||||
"This month": "Цього місяця",
|
||||
"This year": "Цього року",
|
||||
"Thousands and decimal separators": "Роздільники тисяч і десяткових знаків",
|
||||
"Time format": "Формат часу",
|
||||
"To Do": "До виконання",
|
||||
"Tomorrow": "Завтра",
|
||||
"True": "Істина",
|
||||
"Unsaved changes": "Незбережені зміни",
|
||||
"Untitled base": "База без назви",
|
||||
"URL": "URL",
|
||||
"Value": "Значення",
|
||||
"View updated for everyone": "Подання оновлено для всіх",
|
||||
"You have unsaved changes. Do you want to discard them?": "У вас є незбережені зміни. Хочете їх скасувати?",
|
||||
"{{count}} rows deleted_one": "1 row deleted",
|
||||
"{{count}} rows deleted_other": "{{count}} rows deleted",
|
||||
"{{count}} selected_one": "1 selected",
|
||||
"{{count}} selected_other": "{{count}} selected"
|
||||
"Properties": "Властивості"
|
||||
}
|
||||
|
||||
@@ -1153,141 +1153,5 @@
|
||||
"Create property": "创建属性",
|
||||
"Hide properties": "隐藏属性",
|
||||
"Find a property type": "查找属性类型",
|
||||
"Properties": "属性",
|
||||
"A property with this name already exists": "已存在同名属性",
|
||||
"Add card": "添加卡片",
|
||||
"Add filter": "添加筛选",
|
||||
"Add option": "添加选项",
|
||||
"Add sort": "添加排序",
|
||||
"Add view": "添加视图",
|
||||
"All data in this column will be lost.": "此列中的所有数据都将丢失。",
|
||||
"Allow multiple people": "允许多人",
|
||||
"Alphabetize": "按字母顺序",
|
||||
"Are you sure you want to delete": "您确定要删除",
|
||||
"Ascending": "升序",
|
||||
"Base deleted": "资料库已删除",
|
||||
"Base name": "资料库名称",
|
||||
"Base table": "资料库表",
|
||||
"Card properties": "卡片属性",
|
||||
"Cells longer than the Text limit will be truncated and the extra content permanently lost.": "超出文本长度限制的单元格内容将被截断，额外内容将永久丢失。",
|
||||
"Checkbox": "复选框",
|
||||
"Checked by default": "默认选中",
|
||||
"Choose a property": "选择一个属性",
|
||||
"Clear selection": "清除选择",
|
||||
"Column options": "列选项",
|
||||
"Comma, period": "逗号、句点",
|
||||
"Complete": "完成",
|
||||
"Contains": "包含",
|
||||
"Copy link to view": "复制视图链接",
|
||||
"Create a status property": "创建状态属性",
|
||||
"Created at": "创建于",
|
||||
"Currency": "货币",
|
||||
"Decimal places": "小数位数",
|
||||
"Default value": "默认值",
|
||||
"Delete property": "删除属性",
|
||||
"Delete view": "删除视图",
|
||||
"Delete {{count}} rows?_one": "删除 1 行？",
|
||||
"Delete {{count}} rows?_other": "删除 {{count}} 行？",
|
||||
"Descending": "降序",
|
||||
"Discard": "放弃",
|
||||
"Doesn't contain": "不包含",
|
||||
"Done": "完成",
|
||||
"Edit formula": "编辑公式",
|
||||
"Edit property": "编辑属性",
|
||||
"Export CSV": "导出 CSV",
|
||||
"Failed to load base": "加载资料库失败",
|
||||
"False": "假",
|
||||
"File": "文件",
|
||||
"Filter and sort changes are visible only to you": "筛选和排序更改仅对您可见",
|
||||
"Filter by": "筛选条件",
|
||||
"Formula": "公式",
|
||||
"Get started with": "开始使用",
|
||||
"Greater than": "大于",
|
||||
"Group by": "分组依据",
|
||||
"Group this board by a select or status property.": "按选择或状态属性对此看板进行分组。",
|
||||
"Hide all": "全部隐藏",
|
||||
"Hide group": "隐藏分组",
|
||||
"In Progress": "进行中",
|
||||
"In progress": "进行中",
|
||||
"Include time": "包含时间",
|
||||
"Insert a kanban board on this page": "在此页面插入一个看板",
|
||||
"Insert an inline base on this page": "在此页面插入一个内联资料库",
|
||||
"Is": "是",
|
||||
"Is after": "在此之后",
|
||||
"Is any of": "是其中之一",
|
||||
"Is before": "在此之前",
|
||||
"Is empty": "为空",
|
||||
"Is none of": "都不是",
|
||||
"Is not": "不是",
|
||||
"Is not empty": "不为空",
|
||||
"Is on or after": "在此日期或之后",
|
||||
"Is on or before": "在此日期或之前",
|
||||
"Is within": "在范围内",
|
||||
"Keep editing": "继续编辑",
|
||||
"Last edited at": "最后编辑于",
|
||||
"Last edited by": "最后编辑者",
|
||||
"Less than": "小于",
|
||||
"Link copied to clipboard": "链接已复制到剪贴板",
|
||||
"Local": "本地",
|
||||
"Long text": "长文本",
|
||||
"Moved card to {{column}}": "已将卡片移动到 {{column}}",
|
||||
"Moved column to {{column}}": "已将列移动到 {{column}}",
|
||||
"Multi-select": "多选",
|
||||
"New row": "新行",
|
||||
"Next month": "下个月",
|
||||
"Next week": "下周",
|
||||
"Next year": "明年",
|
||||
"No filters applied": "未应用筛选",
|
||||
"No match": "无匹配项",
|
||||
"No options for this property type": "此属性类型没有可用选项",
|
||||
"No sorts applied": "未应用排序",
|
||||
"No value": "无值",
|
||||
"None": "无",
|
||||
"Not started": "未开始",
|
||||
"Number": "数字",
|
||||
"One month ago": "一个月前",
|
||||
"One month from now": "从现在起一个月后",
|
||||
"One week ago": "一周前",
|
||||
"One week from now": "从现在起一周后",
|
||||
"Open as page": "作为页面打开",
|
||||
"Options": "选项",
|
||||
"Past month": "过去一个月",
|
||||
"Past week": "过去一周",
|
||||
"Past year": "过去一年",
|
||||
"Percent": "百分比",
|
||||
"Period, comma": "句点、逗号",
|
||||
"Person": "人员",
|
||||
"Please enter a valid email": "请输入有效的电子邮件地址",
|
||||
"Progress": "进度",
|
||||
"Property options": "属性选项",
|
||||
"Relative": "相对",
|
||||
"Rename property": "重命名属性",
|
||||
"Reset": "重置",
|
||||
"Save for everyone": "保存给所有人",
|
||||
"Select": "选择",
|
||||
"Select a property": "选择一个属性",
|
||||
"Select all loaded rows": "选择所有已加载的行",
|
||||
"Show all": "显示全部",
|
||||
"Sort": "排序",
|
||||
"Sort by": "排序依据",
|
||||
"Space, comma": "空格、逗号",
|
||||
"Space, period": "空格、句点",
|
||||
"This board has no grouping property yet.": "此看板尚无分组属性。",
|
||||
"This month": "本月",
|
||||
"This year": "今年",
|
||||
"Thousands and decimal separators": "千位分隔符和小数分隔符",
|
||||
"Time format": "时间格式",
|
||||
"To Do": "待办",
|
||||
"Tomorrow": "明天",
|
||||
"True": "真",
|
||||
"Unsaved changes": "未保存的更改",
|
||||
"Untitled base": "未命名资料库",
|
||||
"URL": "网址",
|
||||
"Value": "值",
|
||||
"View updated for everyone": "已为所有人更新视图",
|
||||
"You have unsaved changes. Do you want to discard them?": "您有未保存的更改。要放弃这些更改吗？",
|
||||
"{{count}} rows deleted_one": "已删除 1 行",
|
||||
"{{count}} rows deleted_other": "已删除 {{count}} 行",
|
||||
"{{count}} selected_one": "已选择 1 项",
|
||||
"{{count}} selected_other": "已选择 {{count}} 项"
|
||||
"Properties": "属性"
|
||||
}
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
import { describe, expect, it, beforeEach } from "vitest";
|
||||
import { render } from "@testing-library/react";
|
||||
import { HelmetProvider } from "react-helmet-async";
|
||||
import { DocumentTitle } from "./document-title.tsx";
|
||||
|
||||
const renderTitle = (ui: React.ReactNode) =>
|
||||
render(<HelmetProvider>{ui}</HelmetProvider>);
|
||||
|
||||
describe("DocumentTitle", () => {
|
||||
beforeEach(() => {
|
||||
document.head.innerHTML = "<title>Docmost</title>";
|
||||
});
|
||||
|
||||
it("appends the app name", () => {
|
||||
renderTitle(<DocumentTitle title="Home" />);
|
||||
expect(document.title).toBe("Home - Docmost");
|
||||
});
|
||||
|
||||
it("omits the app name when asked", () => {
|
||||
renderTitle(<DocumentTitle title="My page" withAppName={false} />);
|
||||
expect(document.title).toBe("My page");
|
||||
});
|
||||
|
||||
it("falls back to the app name without a title", () => {
|
||||
renderTitle(<DocumentTitle />);
|
||||
expect(document.title).toBe("Docmost");
|
||||
});
|
||||
|
||||
it("never renders an empty title", () => {
|
||||
renderTitle(<DocumentTitle title="Spaces" />);
|
||||
const titles = Array.from(document.querySelectorAll("head > title"));
|
||||
expect(titles.every((node) => node.textContent !== "")).toBe(true);
|
||||
});
|
||||
|
||||
it("renders extra head children", () => {
|
||||
renderTitle(
|
||||
<DocumentTitle title="Shared">
|
||||
<meta name="robots" content="noindex" />
|
||||
</DocumentTitle>,
|
||||
);
|
||||
expect(
|
||||
document.querySelector('head > meta[name="robots"]')?.getAttribute("content"),
|
||||
).toBe("noindex");
|
||||
});
|
||||
});
|
||||
@@ -1,29 +0,0 @@
|
||||
import React from "react";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { getAppName } from "@/lib/config.ts";
|
||||
|
||||
type DocumentTitleProps = {
|
||||
title?: string;
|
||||
withAppName?: boolean;
|
||||
children?: React.ReactNode;
|
||||
};
|
||||
|
||||
export function DocumentTitle({
|
||||
title,
|
||||
withAppName = true,
|
||||
children,
|
||||
}: DocumentTitleProps) {
|
||||
const appName = getAppName();
|
||||
|
||||
let documentTitle = appName;
|
||||
if (title) {
|
||||
documentTitle = withAppName ? `${title} - ${appName}` : title;
|
||||
}
|
||||
|
||||
return (
|
||||
<Helmet>
|
||||
<title>{documentTitle}</title>
|
||||
{children}
|
||||
</Helmet>
|
||||
);
|
||||
}
|
||||
@@ -1,15 +1,17 @@
|
||||
import { Title, Text, Button, Container, Group } from "@mantine/core";
|
||||
import classes from "./error-404.module.css";
|
||||
import { Link } from "react-router-dom";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export function Error404() {
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("404 page not found")} />
|
||||
<Helmet>
|
||||
<title>{t("404 page not found")} - Docmost</title>
|
||||
</Helmet>
|
||||
<Container className={classes.root}>
|
||||
<Title className={classes.title}>{t("404 page not found")}</Title>
|
||||
<Text c="dimmed" size="lg" ta="center" className={classes.description}>
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { getAppName } from "@/lib/config.ts";
|
||||
import SettingsTitle from "@/components/settings/settings-title.tsx";
|
||||
import React from "react";
|
||||
import useUserRole from "@/hooks/use-user-role.tsx";
|
||||
@@ -13,7 +15,6 @@ import { Feature } from "@/ee/features";
|
||||
import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
|
||||
import { isCloud } from "@/lib/config.ts";
|
||||
import { useLocation, useNavigate } from "react-router-dom";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function AiSettings() {
|
||||
const { t } = useTranslation();
|
||||
@@ -39,7 +40,9 @@ export default function AiSettings() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title="AI settings" />
|
||||
<Helmet>
|
||||
<title>AI settings - {getAppName()}</title>
|
||||
</Helmet>
|
||||
<SettingsTitle title={t("AI settings")} />
|
||||
|
||||
<Tabs color="dark" value={activeTab} onChange={handleTabChange}>
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import React, { useState } from "react";
|
||||
import { Anchor, Alert, Button, Group, Space, Text } from "@mantine/core";
|
||||
import { IconInfoCircle } from "@tabler/icons-react";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { Trans, useTranslation } from "react-i18next";
|
||||
import SettingsTitle from "@/components/settings/settings-title";
|
||||
import { getAppUrl } from "@/lib/config";
|
||||
import { getAppName, getAppUrl } from "@/lib/config";
|
||||
import { ApiKeyTable } from "@/ee/api-key/components/api-key-table";
|
||||
import { CreateApiKeyModal } from "@/ee/api-key/components/create-api-key-modal";
|
||||
import { ApiKeyCreatedModal } from "@/ee/api-key/components/api-key-created-modal";
|
||||
@@ -16,7 +17,6 @@ import { IApiKey } from "@/ee/api-key";
|
||||
import { useAtom } from "jotai";
|
||||
import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
|
||||
import useUserRole from "@/hooks/use-user-role.tsx";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function UserApiKeys() {
|
||||
const { t } = useTranslation();
|
||||
@@ -49,7 +49,11 @@ export default function UserApiKeys() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("API keys")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("API keys")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
|
||||
<SettingsTitle title={t("API keys")} />
|
||||
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
import React, { useState } from "react";
|
||||
import { Anchor, Button, Divider, Group, Space, Text } from "@mantine/core";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { Trans, useTranslation } from "react-i18next";
|
||||
import SettingsTitle from "@/components/settings/settings-title";
|
||||
import { getAppName } from "@/lib/config";
|
||||
import { ApiKeyTable } from "@/ee/api-key/components/api-key-table";
|
||||
import { CreateApiKeyModal } from "@/ee/api-key/components/create-api-key-modal";
|
||||
import { ApiKeyCreatedModal } from "@/ee/api-key/components/api-key-created-modal";
|
||||
@@ -13,7 +15,6 @@ import { useGetApiKeysQuery } from "@/ee/api-key/queries/api-key-query.ts";
|
||||
import { IApiKey } from "@/ee/api-key";
|
||||
import useUserRole from '@/hooks/use-user-role.tsx';
|
||||
import RestrictApiToAdmins from "@/ee/api-key/components/restrict-api-to-admins";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function WorkspaceApiKeys() {
|
||||
const { t } = useTranslation();
|
||||
@@ -46,7 +47,11 @@ export default function WorkspaceApiKeys() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("API management")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("API management")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
|
||||
<SettingsTitle title={t("API management")} />
|
||||
|
||||
|
||||
@@ -10,9 +10,11 @@ import {
|
||||
Text,
|
||||
Tooltip,
|
||||
} from "@mantine/core";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { IconSettings } from "@tabler/icons-react";
|
||||
import SettingsTitle from "@/components/settings/settings-title";
|
||||
import { getAppName } from "@/lib/config";
|
||||
import Paginate from "@/components/common/paginate";
|
||||
import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
|
||||
import {
|
||||
@@ -24,7 +26,6 @@ import { IAuditLogParams } from "@/ee/audit/types/audit.types";
|
||||
import { eventFilterOptions } from "@/ee/audit/lib/audit-event-labels";
|
||||
import AuditLogsTable from "@/ee/audit/components/audit-logs-table";
|
||||
import useUserRole from "@/hooks/use-user-role";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
type RetentionUnit = "days" | "months" | "years";
|
||||
|
||||
@@ -96,7 +97,11 @@ export default function AuditLogs() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Audit log")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("Audit log")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
|
||||
<SettingsTitle title={t("Audit log")} />
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ type BaseKanbanProps = {
|
||||
|
||||
export function BaseKanban({ base, view, pageId, embedded, editable, viewFilter }: BaseKanbanProps) {
|
||||
const { t } = useTranslation();
|
||||
const { groupByPropertyId, groupByProperty, columns, hasValidGroupBy } = useKanbanColumns(base, view);
|
||||
const { groupByPropertyId, columns, hasValidGroupBy } = useKanbanColumns(base, view);
|
||||
const updateView = useUpdateViewMutation();
|
||||
const moveCard = useKanbanMoveCardMutation();
|
||||
const { openRow } = useRowDetailModal(pageId);
|
||||
@@ -201,7 +201,6 @@ export function BaseKanban({ base, view, pageId, embedded, editable, viewFilter
|
||||
column={column}
|
||||
viewFilter={viewFilter}
|
||||
groupByPropertyId={groupByPropertyId!}
|
||||
groupByProperty={groupByProperty}
|
||||
canEdit={editable}
|
||||
onOpenRow={handleOpenRow}
|
||||
onHide={hideColumn}
|
||||
|
||||
@@ -1,27 +1,24 @@
|
||||
import { useRef } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { ActionIcon, Text } from "@mantine/core";
|
||||
import { IconPlus, IconGripVertical } from "@tabler/icons-react";
|
||||
import { ActionIcon, Menu, Text } from "@mantine/core";
|
||||
import { IconDots, IconPlus, IconGripVertical } from "@tabler/icons-react";
|
||||
import clsx from "clsx";
|
||||
import { IBaseProperty, KanbanColumn } from "@/ee/base/types/base.types";
|
||||
import { KanbanColumn } from "@/ee/base/types/base.types";
|
||||
import { choiceColor } from "@/ee/base/components/cells/choice-color";
|
||||
import { useKanbanColumnDnd } from "@/ee/base/hooks/use-kanban-column-dnd";
|
||||
import { BaseDropEdgeIndicator } from "@/ee/base/components/grid/base-drop-edge-indicator";
|
||||
import { KanbanColumnTitle } from "@/ee/base/components/kanban/kanban-column-title";
|
||||
import { KanbanColumnMenu } from "@/ee/base/components/kanban/kanban-column-menu";
|
||||
import classes from "@/ee/base/styles/kanban.module.css";
|
||||
|
||||
type KanbanColumnHeaderProps = {
|
||||
column: KanbanColumn;
|
||||
pageId: string;
|
||||
property: IBaseProperty | undefined;
|
||||
count?: string;
|
||||
canEdit: boolean;
|
||||
onHide: () => void;
|
||||
onAddCard: () => void;
|
||||
};
|
||||
|
||||
export function KanbanColumnHeader({ column, pageId, property, count, canEdit, onHide, onAddCard }: KanbanColumnHeaderProps) {
|
||||
export function KanbanColumnHeader({ column, pageId, count, canEdit, onHide, onAddCard }: KanbanColumnHeaderProps) {
|
||||
const { t } = useTranslation();
|
||||
const dotColor = column.color
|
||||
? choiceColor(column.color).color as string
|
||||
@@ -52,13 +49,22 @@ export function KanbanColumnHeader({ column, pageId, property, count, canEdit, o
|
||||
background: dotColor,
|
||||
}}
|
||||
/>
|
||||
<KanbanColumnTitle column={column} property={property} pageId={pageId} canEdit={canEdit} />
|
||||
<Text fw={600} size="sm" flex={1} truncate>
|
||||
{column.isNoValue ? t("No value") : column.name}
|
||||
</Text>
|
||||
{count !== undefined && <Text className={classes.count}>{count}</Text>}
|
||||
{canEdit && (
|
||||
<>
|
||||
{property && (
|
||||
<KanbanColumnMenu property={property} pageId={pageId} onHide={onHide} />
|
||||
)}
|
||||
<Menu position="bottom-end" withinPortal>
|
||||
<Menu.Target>
|
||||
<ActionIcon variant="subtle" size="sm" color="gray" aria-label={t("Column options")}>
|
||||
<IconDots size={14} />
|
||||
</ActionIcon>
|
||||
</Menu.Target>
|
||||
<Menu.Dropdown>
|
||||
<Menu.Item onClick={onHide}>{t("Hide group")}</Menu.Item>
|
||||
</Menu.Dropdown>
|
||||
</Menu>
|
||||
<ActionIcon variant="subtle" size="sm" color="gray" aria-label={t("Add card")} onClick={onAddCard}>
|
||||
<IconPlus size={14} />
|
||||
</ActionIcon>
|
||||
|
||||
@@ -1,119 +0,0 @@
|
||||
import { useCallback, useEffect, useRef, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { ActionIcon, Popover, Stack } from "@mantine/core";
|
||||
import { IconDots, IconEyeOff, IconSettings } from "@tabler/icons-react";
|
||||
import { useAtom } from "jotai";
|
||||
import {
|
||||
propertyMenuCloseRequestAtomFamily,
|
||||
propertyMenuDirtyAtomFamily,
|
||||
} from "@/ee/base/atoms/base-atoms";
|
||||
import { IBaseProperty } from "@/ee/base/types/base.types";
|
||||
import {
|
||||
MenuItem,
|
||||
PropertyMenuContent,
|
||||
} from "@/ee/base/components/property/property-menu";
|
||||
|
||||
type KanbanColumnMenuProps = {
|
||||
property: IBaseProperty;
|
||||
pageId: string;
|
||||
onHide: () => void;
|
||||
};
|
||||
|
||||
export function KanbanColumnMenu({ property, pageId, onHide }: KanbanColumnMenuProps) {
|
||||
const { t } = useTranslation();
|
||||
const [opened, setOpened] = useState(false);
|
||||
const [view, setView] = useState<"menu" | "property">("menu");
|
||||
const [dirty, setDirty] = useAtom(propertyMenuDirtyAtomFamily(pageId)) as unknown as [boolean, (val: boolean) => void];
|
||||
const [closeRequest, setCloseRequest] = useAtom(propertyMenuCloseRequestAtomFamily(pageId)) as unknown as [number, (val: number) => void];
|
||||
|
||||
const handleClose = useCallback(() => {
|
||||
setOpened(false);
|
||||
setView("menu");
|
||||
}, []);
|
||||
|
||||
const wasOpenedRef = useRef(opened);
|
||||
useEffect(() => {
|
||||
if (wasOpenedRef.current && !opened) setDirty(false);
|
||||
wasOpenedRef.current = opened;
|
||||
}, [opened, setDirty]);
|
||||
|
||||
const handleOpenChange = useCallback(
|
||||
(next: boolean) => {
|
||||
if (next) return;
|
||||
if (dirty) {
|
||||
setCloseRequest(closeRequest + 1);
|
||||
} else {
|
||||
handleClose();
|
||||
}
|
||||
},
|
||||
[dirty, closeRequest, setCloseRequest, handleClose],
|
||||
);
|
||||
|
||||
const toggle = useCallback(() => {
|
||||
if (opened) {
|
||||
handleOpenChange(false);
|
||||
} else if (!dirty) {
|
||||
setOpened(true);
|
||||
}
|
||||
}, [opened, dirty, handleOpenChange]);
|
||||
|
||||
return (
|
||||
<Popover
|
||||
opened={opened}
|
||||
onChange={handleOpenChange}
|
||||
onClose={handleClose}
|
||||
position="bottom-end"
|
||||
shadow="md"
|
||||
width={260}
|
||||
trapFocus
|
||||
returnFocus
|
||||
withinPortal
|
||||
closeOnClickOutside
|
||||
closeOnEscape
|
||||
>
|
||||
<Popover.Target>
|
||||
<ActionIcon
|
||||
variant="subtle"
|
||||
size="sm"
|
||||
color="gray"
|
||||
aria-label={t("Column options")}
|
||||
onClick={toggle}
|
||||
>
|
||||
<IconDots size={14} />
|
||||
</ActionIcon>
|
||||
</Popover.Target>
|
||||
<Popover.Dropdown
|
||||
p={0}
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
onKeyDown={(e) => e.stopPropagation()}
|
||||
>
|
||||
{view === "menu" ? (
|
||||
<Stack gap={0} p={4}>
|
||||
<MenuItem
|
||||
icon={<IconSettings size={14} />}
|
||||
label={t("Edit property")}
|
||||
onClick={() => setView("property")}
|
||||
/>
|
||||
<MenuItem
|
||||
icon={<IconEyeOff size={14} />}
|
||||
label={t("Hide group")}
|
||||
onClick={() => {
|
||||
handleClose();
|
||||
onHide();
|
||||
}}
|
||||
/>
|
||||
</Stack>
|
||||
) : (
|
||||
<PropertyMenuContent
|
||||
property={property}
|
||||
opened={opened}
|
||||
onClose={handleClose}
|
||||
onDirtyChange={setDirty}
|
||||
pageId={pageId}
|
||||
initialPanel={property.pendingType ? "main" : "options"}
|
||||
/>
|
||||
)}
|
||||
</Popover.Dropdown>
|
||||
</Popover>
|
||||
);
|
||||
}
|
||||
@@ -1,113 +0,0 @@
|
||||
import { useCallback, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Button, Group, Popover, Text, TextInput, UnstyledButton } from "@mantine/core";
|
||||
import { IBaseProperty, KanbanColumn, SelectTypeOptions } from "@/ee/base/types/base.types";
|
||||
import { useUpdatePropertyMutation } from "@/ee/base/queries/base-property-query";
|
||||
import classes from "@/ee/base/styles/kanban.module.css";
|
||||
|
||||
type KanbanColumnTitleProps = {
|
||||
column: KanbanColumn;
|
||||
property: IBaseProperty | undefined;
|
||||
pageId: string;
|
||||
canEdit: boolean;
|
||||
};
|
||||
|
||||
export function KanbanColumnTitle({ column, property, pageId, canEdit }: KanbanColumnTitleProps) {
|
||||
const { t } = useTranslation();
|
||||
const [opened, setOpened] = useState(false);
|
||||
const [draft, setDraft] = useState("");
|
||||
const updateProperty = useUpdatePropertyMutation();
|
||||
|
||||
const commit = useCallback(() => {
|
||||
setOpened(false);
|
||||
const name = draft.trim();
|
||||
const options = property?.typeOptions as SelectTypeOptions | undefined;
|
||||
if (!property || !options || !name || name === column.name) return;
|
||||
if (!options.choices.some((c) => c.id === column.key)) return;
|
||||
updateProperty.mutate({
|
||||
propertyId: property.id,
|
||||
pageId,
|
||||
typeOptions: {
|
||||
...options,
|
||||
choices: options.choices.map((c) =>
|
||||
c.id === column.key ? { ...c, name } : c,
|
||||
),
|
||||
},
|
||||
});
|
||||
}, [draft, property, column.name, column.key, pageId, updateProperty]);
|
||||
|
||||
const toggle = useCallback(() => {
|
||||
if (opened) {
|
||||
commit();
|
||||
} else {
|
||||
setDraft(column.name);
|
||||
setOpened(true);
|
||||
}
|
||||
}, [opened, commit, column.name]);
|
||||
|
||||
const cancel = useCallback(() => setOpened(false), []);
|
||||
|
||||
if (!canEdit || column.isNoValue || !property) {
|
||||
return (
|
||||
<Text fw={600} size="sm" flex={1} truncate>
|
||||
{column.isNoValue ? t("No value") : column.name}
|
||||
</Text>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<Popover
|
||||
opened={opened}
|
||||
onChange={(next) => {
|
||||
if (!next) commit();
|
||||
}}
|
||||
position="bottom-start"
|
||||
shadow="md"
|
||||
width={240}
|
||||
withinPortal
|
||||
trapFocus
|
||||
returnFocus
|
||||
closeOnClickOutside
|
||||
closeOnEscape={false}
|
||||
>
|
||||
<Popover.Target>
|
||||
<UnstyledButton className={classes.columnTitleButton} onClick={toggle}>
|
||||
<Text fw={600} size="sm" truncate flex={1} ta="left">
|
||||
{column.name}
|
||||
</Text>
|
||||
</UnstyledButton>
|
||||
</Popover.Target>
|
||||
<Popover.Dropdown
|
||||
p="xs"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === "Escape") {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
cancel();
|
||||
}
|
||||
}}
|
||||
>
|
||||
<Group gap="xs" wrap="nowrap">
|
||||
<TextInput
|
||||
size="xs"
|
||||
flex={1}
|
||||
value={draft}
|
||||
data-autofocus
|
||||
onFocus={(e) => e.currentTarget.select()}
|
||||
onChange={(e) => setDraft(e.currentTarget.value)}
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === "Enter") {
|
||||
e.preventDefault();
|
||||
commit();
|
||||
}
|
||||
}}
|
||||
/>
|
||||
<Button size="xs" onClick={commit}>
|
||||
{t("Done")}
|
||||
</Button>
|
||||
</Group>
|
||||
</Popover.Dropdown>
|
||||
</Popover>
|
||||
);
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useCallback, useEffect, useMemo, useRef } from "react";
|
||||
import { generateJitteredKeyBetween } from "fractional-indexing-jittered";
|
||||
import { dropTargetForElements } from "@atlaskit/pragmatic-drag-and-drop/element/adapter";
|
||||
import { type IBase, type IBaseProperty, type IBaseRow, type IBaseView, type FilterGroup, type KanbanColumn as KanbanColumnType, KANBAN_CARD_DRAG_TYPE } from "@/ee/base/types/base.types";
|
||||
import { type IBase, type IBaseRow, type IBaseView, type FilterGroup, type KanbanColumn as KanbanColumnType, KANBAN_CARD_DRAG_TYPE } from "@/ee/base/types/base.types";
|
||||
import { buildColumnFilter } from "@/ee/base/services/kanban-column-filter";
|
||||
import { formatKanbanCount } from "@/ee/base/services/format-kanban-count";
|
||||
import { useKanbanColumnAutoScroll } from "@/ee/base/hooks/use-kanban-autoscroll";
|
||||
@@ -19,7 +19,6 @@ type KanbanColumnProps = {
|
||||
column: KanbanColumnType;
|
||||
viewFilter: FilterGroup | undefined;
|
||||
groupByPropertyId: string;
|
||||
groupByProperty: IBaseProperty | undefined;
|
||||
canEdit: boolean;
|
||||
onOpenRow: (rowId: string) => void;
|
||||
onHide: (columnKey: string) => void;
|
||||
@@ -34,7 +33,6 @@ export function KanbanColumn({
|
||||
column,
|
||||
viewFilter,
|
||||
groupByPropertyId,
|
||||
groupByProperty,
|
||||
canEdit,
|
||||
onOpenRow,
|
||||
onHide,
|
||||
@@ -141,7 +139,6 @@ export function KanbanColumn({
|
||||
<KanbanColumnHeader
|
||||
column={column}
|
||||
pageId={pageId}
|
||||
property={groupByProperty}
|
||||
count={count}
|
||||
canEdit={canEdit}
|
||||
onHide={() => onHide(column.key)}
|
||||
|
||||
@@ -53,7 +53,6 @@ type PropertyMenuContentProps = {
|
||||
onDirtyChange?: (dirty: boolean) => void;
|
||||
onEditFormula?: () => void;
|
||||
pageId: string;
|
||||
initialPanel?: "main" | "options";
|
||||
};
|
||||
|
||||
type MenuPanel =
|
||||
@@ -97,10 +96,9 @@ export function PropertyMenuContent({
|
||||
onDirtyChange,
|
||||
onEditFormula,
|
||||
pageId,
|
||||
initialPanel,
|
||||
}: PropertyMenuContentProps) {
|
||||
const { t } = useTranslation();
|
||||
const [panel, setPanel] = useState<MenuPanel>(initialPanel ?? "main");
|
||||
const [panel, setPanel] = useState<MenuPanel>("main");
|
||||
const [renameValue, setRenameValue] = useState(property.name);
|
||||
const renameInputRef = useRef<HTMLInputElement>(null);
|
||||
const [optionsDirty, setOptionsDirty] = useState(false);
|
||||
@@ -119,12 +117,12 @@ export function PropertyMenuContent({
|
||||
|
||||
useEffect(() => {
|
||||
if (opened) {
|
||||
setPanel(initialPanel ?? "main");
|
||||
setPanel("main");
|
||||
setRenameValue(property.name);
|
||||
setOptionsDirty(false);
|
||||
setPendingTargetType(null);
|
||||
}
|
||||
}, [opened, property.name, initialPanel]);
|
||||
}, [opened, property.name]);
|
||||
|
||||
useEffect(() => {
|
||||
if (panel === "rename") {
|
||||
@@ -465,7 +463,7 @@ export function PropertyMenuContent({
|
||||
|
||||
PropertyMenuContent.displayName = "PropertyMenuContent";
|
||||
|
||||
export function MenuItem({
|
||||
function MenuItem({
|
||||
icon,
|
||||
label,
|
||||
rightIcon,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useMemo } from "react";
|
||||
import { IBase, IBaseProperty, IBaseView, KanbanColumn, NO_VALUE_CHOICE_ID, SelectTypeOptions } from "@/ee/base/types/base.types";
|
||||
import { IBase, IBaseView, KanbanColumn, NO_VALUE_CHOICE_ID, SelectTypeOptions } from "@/ee/base/types/base.types";
|
||||
|
||||
export type KanbanGroup = KanbanColumn & { hidden: boolean };
|
||||
|
||||
@@ -8,7 +8,6 @@ export function useKanbanColumns(
|
||||
view: IBaseView | undefined,
|
||||
): {
|
||||
groupByPropertyId: string | undefined;
|
||||
groupByProperty: IBaseProperty | undefined;
|
||||
columns: KanbanColumn[];
|
||||
allGroups: KanbanGroup[];
|
||||
hasValidGroupBy: boolean;
|
||||
@@ -19,7 +18,7 @@ export function useKanbanColumns(
|
||||
const groupable = prop && (prop.type === "select" || prop.type === "status");
|
||||
|
||||
if (!groupable || !prop || !view) {
|
||||
return { groupByPropertyId, groupByProperty: undefined, columns: [], allGroups: [], hasValidGroupBy: false };
|
||||
return { groupByPropertyId, columns: [], allGroups: [], hasValidGroupBy: false };
|
||||
}
|
||||
|
||||
const typeOptions = prop.typeOptions as SelectTypeOptions;
|
||||
@@ -48,6 +47,6 @@ export function useKanbanColumns(
|
||||
});
|
||||
const columns: KanbanColumn[] = allGroups.filter((g) => !g.hidden);
|
||||
|
||||
return { groupByPropertyId, groupByProperty: prop, columns, allGroups, hasValidGroupBy: true };
|
||||
return { groupByPropertyId, columns, allGroups, hasValidGroupBy: true };
|
||||
}, [base, view]);
|
||||
}
|
||||
|
||||
@@ -76,21 +76,6 @@
|
||||
cursor: grabbing;
|
||||
}
|
||||
|
||||
.columnTitleButton {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 2px 6px;
|
||||
margin: -2px -6px;
|
||||
border-radius: 6px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.columnTitleButton:hover {
|
||||
background: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-5));
|
||||
}
|
||||
|
||||
.cardList {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { getAppName } from "@/lib/config.ts";
|
||||
import SettingsTitle from "@/components/settings/settings-title.tsx";
|
||||
import BillingPlans from "@/ee/billing/components/billing-plans.tsx";
|
||||
import BillingTrial from "@/ee/billing/components/billing-trial.tsx";
|
||||
@@ -7,7 +9,6 @@ import React from "react";
|
||||
import BillingDetails from "@/ee/billing/components/billing-details.tsx";
|
||||
import { useBillingQuery } from "@/ee/billing/queries/billing-query.ts";
|
||||
import useUserRole from "@/hooks/use-user-role.tsx";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function Billing() {
|
||||
const { data: billing, isError: isBillingError } = useBillingQuery();
|
||||
@@ -19,7 +20,9 @@ export default function Billing() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title="Billing" />
|
||||
<Helmet>
|
||||
<title>Billing - {getAppName()}</title>
|
||||
</Helmet>
|
||||
<SettingsTitle title="Billing" />
|
||||
|
||||
<BillingTrial />
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { getAppName } from "@/lib/config.ts";
|
||||
import SettingsTitle from "@/components/settings/settings-title.tsx";
|
||||
import React from "react";
|
||||
import useUserRole from "@/hooks/use-user-role.tsx";
|
||||
@@ -7,7 +9,6 @@ import InstallationDetails from "@/ee/licence/components/installation-details.ts
|
||||
import OssDetails from "@/ee/licence/components/oss-details.tsx";
|
||||
import { useAtom } from "jotai/index";
|
||||
import { entitlementAtom } from "@/ee/entitlement/entitlement-atom";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function License() {
|
||||
const [entitlements] = useAtom(entitlementAtom);
|
||||
@@ -20,7 +21,9 @@ export default function License() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title="License" />
|
||||
<Helmet>
|
||||
<title>License - {getAppName()}</title>
|
||||
</Helmet>
|
||||
<SettingsTitle title="License" />
|
||||
|
||||
<ActivateLicenseForm />
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
import { useState, useMemo } from "react";
|
||||
import { Group, MultiSelect, Select, Space, TextInput } from "@mantine/core";
|
||||
import { useDebouncedValue } from "@mantine/hooks";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { IconSearch } from "@tabler/icons-react";
|
||||
import SettingsTitle from "@/components/settings/settings-title";
|
||||
import { getAppName } from "@/lib/config";
|
||||
import Paginate from "@/components/common/paginate";
|
||||
import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
|
||||
import { useVerificationListQuery } from "@/ee/page-verification/queries/page-verification-query";
|
||||
import { IVerificationListParams } from "@/ee/page-verification/types/page-verification.types";
|
||||
import VerificationListTable from "@/ee/page-verification/components/verification-list-table";
|
||||
import { useGetSpacesQuery } from "@/features/space/queries/space-query";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function VerifiedPages() {
|
||||
const { t } = useTranslation();
|
||||
@@ -67,7 +68,11 @@ export default function VerifiedPages() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Verified pages")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("Verified pages")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
|
||||
<SettingsTitle title={t("Verified pages")} />
|
||||
|
||||
|
||||
@@ -1,13 +1,18 @@
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { getAppName } from "@/lib/config.ts";
|
||||
import { CloudLoginForm } from "@/ee/components/cloud-login-form.tsx";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function CloudLogin() {
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Login")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("Login")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
|
||||
<CloudLoginForm />
|
||||
</>
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
import { SetupWorkspaceForm } from "@/features/auth/components/setup-workspace-form.tsx";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import React from "react";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
import { getAppName } from "@/lib/config.ts";
|
||||
|
||||
export default function CreateWorkspace() {
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title="Create Workspace" />
|
||||
<Helmet>
|
||||
<title>Create Workspace - {getAppName()}</title>
|
||||
</Helmet>
|
||||
<SetupWorkspaceForm />
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { isCloud } from "@/lib/config.ts";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { getAppName, isCloud } from "@/lib/config.ts";
|
||||
import SettingsTitle from "@/components/settings/settings-title.tsx";
|
||||
import {
|
||||
Alert,
|
||||
@@ -36,7 +37,6 @@ import EnableScim from "@/ee/scim/components/enable-scim";
|
||||
import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
|
||||
import Paginate from "@/components/common/paginate";
|
||||
import { IScimToken } from "@/ee/scim/types/scim-token.types";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
const SCIM_TOKEN_LIMIT = 5;
|
||||
|
||||
@@ -64,7 +64,9 @@ export default function Security() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title="Security" />
|
||||
<Helmet>
|
||||
<title>Security - {getAppName()}</title>
|
||||
</Helmet>
|
||||
<SettingsTitle title={t("Security")} />
|
||||
|
||||
<EnforceMfa />
|
||||
|
||||
@@ -22,6 +22,8 @@ import { useTranslation } from "react-i18next";
|
||||
import { useDisclosure, useWindowEvent } from "@mantine/hooks";
|
||||
import { notifications } from "@mantine/notifications";
|
||||
import { Link, useParams } from "react-router-dom";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { getAppName } from "@/lib/config";
|
||||
import { useEditor, EditorContent } from "@tiptap/react";
|
||||
import { templateExtensions } from "@/features/editor/extensions/extensions";
|
||||
import {
|
||||
@@ -42,7 +44,6 @@ import CalloutMenu from "@/features/editor/components/callout/callout-menu.tsx";
|
||||
import ColumnsMenu from "@/features/editor/components/columns/columns-menu.tsx";
|
||||
|
||||
import classes from "./template-editor.module.css";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function TemplateEditor() {
|
||||
const { t } = useTranslation();
|
||||
@@ -246,7 +247,11 @@ export default function TemplateEditor() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Edit template")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("Edit template")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
|
||||
{editorToolbarEnabled && editor && (
|
||||
<FixedToolbar editor={editor} templateMode />
|
||||
|
||||
@@ -13,9 +13,11 @@ import {
|
||||
} from "@mantine/core";
|
||||
import { modals } from "@mantine/modals";
|
||||
import { IconPlus } from "@tabler/icons-react";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { useDisclosure } from "@mantine/hooks";
|
||||
import { getAppName } from "@/lib/config";
|
||||
import {
|
||||
useGetTemplatesQuery,
|
||||
useDeleteTemplateMutation,
|
||||
@@ -29,7 +31,6 @@ import useUserRole from "@/hooks/use-user-role";
|
||||
import CreateTemplateModal from "@/ee/template/components/create-template-modal";
|
||||
import { useAtomValue } from "jotai";
|
||||
import { workspaceAtom } from "@/features/user/atoms/current-user-atom";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function TemplateList() {
|
||||
const { t } = useTranslation();
|
||||
@@ -101,7 +102,11 @@ export default function TemplateList() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Templates")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("Templates")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
|
||||
<Container size="900" pt="xl">
|
||||
<Group justify="space-between" mb="xl">
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
import {
|
||||
HocuspocusProviderWebsocket,
|
||||
WebSocketStatus,
|
||||
} from "@hocuspocus/provider";
|
||||
import { getCollaborationUrl } from "@/lib/config.ts";
|
||||
|
||||
const RELEASE_GRACE_MS = 5000;
|
||||
|
||||
let socket: HocuspocusProviderWebsocket | null = null;
|
||||
let editorCount = 0;
|
||||
let releaseTimer: ReturnType<typeof setTimeout> | null = null;
|
||||
|
||||
export function getCollabSocket(): HocuspocusProviderWebsocket {
|
||||
if (!socket) {
|
||||
socket = new HocuspocusProviderWebsocket({
|
||||
url: getCollaborationUrl(),
|
||||
autoConnect: false,
|
||||
});
|
||||
}
|
||||
return socket;
|
||||
}
|
||||
|
||||
export function acquireCollabSocket(): void {
|
||||
editorCount++;
|
||||
if (releaseTimer) {
|
||||
clearTimeout(releaseTimer);
|
||||
releaseTimer = null;
|
||||
}
|
||||
const collabSocket = getCollabSocket();
|
||||
collabSocket.shouldConnect = true;
|
||||
if (collabSocket.status === WebSocketStatus.Disconnected) {
|
||||
collabSocket.connect();
|
||||
}
|
||||
}
|
||||
|
||||
export function releaseCollabSocket(): void {
|
||||
editorCount--;
|
||||
if (editorCount > 0) return;
|
||||
if (releaseTimer) clearTimeout(releaseTimer);
|
||||
releaseTimer = setTimeout(() => {
|
||||
releaseTimer = null;
|
||||
if (editorCount === 0) {
|
||||
socket?.disconnect();
|
||||
}
|
||||
}, RELEASE_GRACE_MS);
|
||||
}
|
||||
@@ -2,8 +2,6 @@ import type { Editor, Range } from "@tiptap/core";
|
||||
import { v7 as uuid7 } from "uuid";
|
||||
import { notifications } from "@mantine/notifications";
|
||||
import api from "@/lib/api-client";
|
||||
import i18n from "@/i18n.ts";
|
||||
import { getApiErrorMessage } from "@/lib/api-error";
|
||||
|
||||
function findBaseEmbedPlaceholderPos(
|
||||
editor: Editor,
|
||||
@@ -52,7 +50,7 @@ export async function insertBaseEmbedBlock(
|
||||
return true;
|
||||
})
|
||||
.run();
|
||||
} catch (err) {
|
||||
} catch {
|
||||
const pos = findBaseEmbedPlaceholderPos(editor, pendingKey);
|
||||
if (pos !== null) {
|
||||
editor
|
||||
@@ -64,9 +62,6 @@ export async function insertBaseEmbedBlock(
|
||||
})
|
||||
.run();
|
||||
}
|
||||
notifications.show({
|
||||
message: getApiErrorMessage(err, i18n.t("Failed to create base")),
|
||||
color: "red",
|
||||
});
|
||||
notifications.show({ message: "Failed to create base", color: "red" });
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
z-index: 99;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
min-height: 45px;
|
||||
background: var(--mantine-color-body);
|
||||
border-bottom: 1px solid
|
||||
light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
|
||||
|
||||
@@ -31,6 +31,8 @@ export const FixedToolbar: FC<FixedToolbarProps> = ({
|
||||
const workspace = useAtomValue(workspaceAtom);
|
||||
const isGenerativeAiEnabled = workspace?.settings?.ai?.generative === true;
|
||||
|
||||
if (!editor || !state) return null;
|
||||
|
||||
return (
|
||||
<>
|
||||
<div
|
||||
@@ -47,26 +49,22 @@ export const FixedToolbar: FC<FixedToolbarProps> = ({
|
||||
<div className={classes.divider} />
|
||||
</>
|
||||
)} */}
|
||||
{editor && state && (
|
||||
<>
|
||||
<BlockTypeGroup editor={editor} />
|
||||
<div className={classes.divider} />
|
||||
<InlineMarksGroup editor={editor} state={state} />
|
||||
<div className={classes.divider} />
|
||||
<ColorGroup editor={editor} />
|
||||
<div className={classes.divider} />
|
||||
<ListsGroup editor={editor} state={state} />
|
||||
<div className={classes.divider} />
|
||||
<AlignmentGroup editor={editor} />
|
||||
<div className={classes.divider} />
|
||||
<MediaGroup editor={editor} templateMode={templateMode} />
|
||||
<div className={classes.divider} />
|
||||
<QuickInsertsGroup editor={editor} />
|
||||
<MoreInsertsGroup editor={editor} templateMode={templateMode} />
|
||||
<div className={classes.divider} />
|
||||
<HistoryGroup editor={editor} state={state} />
|
||||
</>
|
||||
)}
|
||||
<BlockTypeGroup editor={editor} />
|
||||
<div className={classes.divider} />
|
||||
<InlineMarksGroup editor={editor} state={state} />
|
||||
<div className={classes.divider} />
|
||||
<ColorGroup editor={editor} />
|
||||
<div className={classes.divider} />
|
||||
<ListsGroup editor={editor} state={state} />
|
||||
<div className={classes.divider} />
|
||||
<AlignmentGroup editor={editor} />
|
||||
<div className={classes.divider} />
|
||||
<MediaGroup editor={editor} templateMode={templateMode} />
|
||||
<div className={classes.divider} />
|
||||
<QuickInsertsGroup editor={editor} />
|
||||
<MoreInsertsGroup editor={editor} templateMode={templateMode} />
|
||||
<div className={classes.divider} />
|
||||
<HistoryGroup editor={editor} state={state} />
|
||||
</div>
|
||||
</div>
|
||||
<div className={classes.spacer} aria-hidden />
|
||||
|
||||
+13
-53
@@ -1,6 +1,6 @@
|
||||
import { FC } from "react";
|
||||
import type { Editor } from "@tiptap/react";
|
||||
import { ActionIcon, Badge, Menu, Tooltip } from "@mantine/core";
|
||||
import { ActionIcon, Menu, Tooltip } from "@mantine/core";
|
||||
import {
|
||||
IconAppWindow,
|
||||
IconCalendar,
|
||||
@@ -12,7 +12,6 @@ import {
|
||||
IconMathFunction,
|
||||
IconRotate2,
|
||||
IconSitemap,
|
||||
IconSuperscript,
|
||||
IconTable,
|
||||
IconTag,
|
||||
} from "@tabler/icons-react";
|
||||
@@ -33,9 +32,6 @@ import {
|
||||
} from "@/components/icons";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { insertBaseEmbedBlock } from "@/features/editor/components/base-embed/insert-base-embed";
|
||||
import { useHasFeature } from "@/ee/hooks/use-feature";
|
||||
import { Feature } from "@/ee/features";
|
||||
import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
|
||||
|
||||
interface Props {
|
||||
editor: Editor;
|
||||
@@ -44,8 +40,6 @@ interface Props {
|
||||
|
||||
export const MoreInsertsGroup: FC<Props> = ({ editor, templateMode }) => {
|
||||
const { t, i18n } = useTranslation();
|
||||
const hasBases = useHasFeature(Feature.BASES);
|
||||
const upgradeLabel = useUpgradeLabel();
|
||||
|
||||
const setEmbed = (provider: string) =>
|
||||
editor.chain().focus().setEmbed({ provider }).run();
|
||||
@@ -112,48 +106,20 @@ export const MoreInsertsGroup: FC<Props> = ({ editor, templateMode }) => {
|
||||
</Menu.Item>
|
||||
)}
|
||||
{!templateMode && (
|
||||
<Tooltip label={upgradeLabel} disabled={hasBases} position="right">
|
||||
<Menu.Item
|
||||
leftSection={<IconTable size={16} />}
|
||||
aria-disabled={!hasBases}
|
||||
closeMenuOnClick={hasBases}
|
||||
style={{ opacity: hasBases ? undefined : 0.7 }}
|
||||
rightSection={
|
||||
!hasBases && (
|
||||
<Badge size="xs" variant="light" color="gray">
|
||||
{t("Upgrade")}
|
||||
</Badge>
|
||||
)
|
||||
}
|
||||
onClick={() => {
|
||||
if (hasBases) insertBaseEmbedBlock(editor);
|
||||
}}
|
||||
>
|
||||
{t("Base (Inline)")}
|
||||
</Menu.Item>
|
||||
</Tooltip>
|
||||
<Menu.Item
|
||||
leftSection={<IconTable size={16} />}
|
||||
onClick={() => insertBaseEmbedBlock(editor)}
|
||||
>
|
||||
{t("Base (Inline)")}
|
||||
</Menu.Item>
|
||||
)}
|
||||
{!templateMode && (
|
||||
<Tooltip label={upgradeLabel} disabled={hasBases} position="right">
|
||||
<Menu.Item
|
||||
leftSection={<IconLayoutKanban size={16} />}
|
||||
aria-disabled={!hasBases}
|
||||
closeMenuOnClick={hasBases}
|
||||
style={{ opacity: hasBases ? undefined : 0.7 }}
|
||||
rightSection={
|
||||
!hasBases && (
|
||||
<Badge size="xs" variant="light" color="gray">
|
||||
{t("Upgrade")}
|
||||
</Badge>
|
||||
)
|
||||
}
|
||||
onClick={() => {
|
||||
if (hasBases) insertBaseEmbedBlock(editor, { template: "kanban" });
|
||||
}}
|
||||
>
|
||||
{t("Kanban")}
|
||||
</Menu.Item>
|
||||
</Tooltip>
|
||||
<Menu.Item
|
||||
leftSection={<IconLayoutKanban size={16} />}
|
||||
onClick={() => insertBaseEmbedBlock(editor, { template: "kanban" })}
|
||||
>
|
||||
{t("Kanban")}
|
||||
</Menu.Item>
|
||||
)}
|
||||
|
||||
<Menu.Divider />
|
||||
@@ -271,12 +237,6 @@ export const MoreInsertsGroup: FC<Props> = ({ editor, templateMode }) => {
|
||||
>
|
||||
{t("Math block")}
|
||||
</Menu.Item>
|
||||
<Menu.Item
|
||||
leftSection={<IconSuperscript size={16} />}
|
||||
onClick={() => editor.chain().focus().addFootnote().run()}
|
||||
>
|
||||
{t("Footnote")}
|
||||
</Menu.Item>
|
||||
</Menu.Dropdown>
|
||||
</Menu>
|
||||
);
|
||||
|
||||
@@ -10,7 +10,6 @@ import {
|
||||
Paper,
|
||||
ScrollArea,
|
||||
Text,
|
||||
Tooltip,
|
||||
UnstyledButton,
|
||||
VisuallyHidden,
|
||||
} from "@mantine/core";
|
||||
@@ -19,7 +18,6 @@ import clsx from "clsx";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useHasFeature } from "@/ee/hooks/use-feature";
|
||||
import { Feature } from "@/ee/features";
|
||||
import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
|
||||
|
||||
const CommandList = ({
|
||||
items,
|
||||
@@ -39,12 +37,11 @@ const CommandList = ({
|
||||
const [selectionAnnouncement, setSelectionAnnouncement] = useState("");
|
||||
|
||||
const hasBases = useHasFeature(Feature.BASES);
|
||||
const upgradeLabel = useUpgradeLabel();
|
||||
// Without the bases entitlement the item stays visible but inert; an
|
||||
// expired license the client can't detect falls through to a handled
|
||||
// create failure.
|
||||
// Title must match the "Base (Inline)" item in menu-items.ts. Without the
|
||||
// bases entitlement the item stays visible but disabled; an expired license
|
||||
// the client can't detect falls through to a handled create failure.
|
||||
const isItemDisabled = (item: SlashMenuItemType) =>
|
||||
!hasBases && item.requiresBases === true;
|
||||
!hasBases && item.title === "Base (Inline)";
|
||||
|
||||
const flatItems = useMemo(() => {
|
||||
return Object.values(items).flat();
|
||||
@@ -155,22 +152,18 @@ const CommandList = ({
|
||||
const itemIndex = flatIndex;
|
||||
const disabled = isItemDisabled(item);
|
||||
return (
|
||||
<Tooltip
|
||||
key={itemIndex}
|
||||
label={upgradeLabel}
|
||||
disabled={!disabled}
|
||||
position="right"
|
||||
>
|
||||
<UnstyledButton
|
||||
data-item-index={itemIndex}
|
||||
key={itemIndex}
|
||||
id={`slash-command-option-${itemIndex}`}
|
||||
role="option"
|
||||
aria-selected={itemIndex === selectedIndex}
|
||||
aria-disabled={disabled}
|
||||
disabled={disabled}
|
||||
onClick={() => selectItem(itemIndex)}
|
||||
className={clsx(classes.menuBtn, {
|
||||
[classes.selectedItem]: itemIndex === selectedIndex,
|
||||
[classes.gatedItem]: disabled,
|
||||
[classes.disabledItem]: disabled,
|
||||
})}
|
||||
>
|
||||
<Group wrap="nowrap">
|
||||
@@ -195,7 +188,6 @@ const CommandList = ({
|
||||
)}
|
||||
</Group>
|
||||
</UnstyledButton>
|
||||
</Tooltip>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
|
||||
@@ -30,7 +30,6 @@ import {
|
||||
IconTag,
|
||||
IconMoodSmile,
|
||||
IconRotate2,
|
||||
IconSuperscript,
|
||||
} from "@tabler/icons-react";
|
||||
import {
|
||||
CommandProps,
|
||||
@@ -178,16 +177,6 @@ const CommandGroups: SlashMenuGroupedItemsType = {
|
||||
command: ({ editor, range }: CommandProps) =>
|
||||
editor.chain().focus().deleteRange(range).setPageBreak().run(),
|
||||
},
|
||||
{
|
||||
title: "Footnote",
|
||||
description: "Insert a footnote reference.",
|
||||
searchTerms: ["footnote", "reference", "citation", "note"],
|
||||
icon: IconSuperscript,
|
||||
command: ({ editor, range }: CommandProps) => {
|
||||
editor.chain().focus().deleteRange(range).run();
|
||||
editor.commands.addFootnote();
|
||||
},
|
||||
},
|
||||
{
|
||||
title: "Image",
|
||||
description: "Upload any image from your device.",
|
||||
@@ -377,7 +366,6 @@ const CommandGroups: SlashMenuGroupedItemsType = {
|
||||
description: "Insert an inline base on this page",
|
||||
searchTerms: ["base", "database", "table", "grid", "spreadsheet"],
|
||||
icon: IconTable,
|
||||
requiresBases: true,
|
||||
command: ({ editor, range }: CommandProps) => {
|
||||
insertBaseEmbedBlock(editor, { range });
|
||||
},
|
||||
@@ -387,7 +375,6 @@ const CommandGroups: SlashMenuGroupedItemsType = {
|
||||
description: "Insert a kanban board on this page",
|
||||
searchTerms: ["kanban", "board", "cards", "status", "task", "database"],
|
||||
icon: IconLayoutKanban,
|
||||
requiresBases: true,
|
||||
command: ({ editor, range }: CommandProps) => {
|
||||
insertBaseEmbedBlock(editor, { range, template: "kanban" });
|
||||
},
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
.gatedItem {
|
||||
opacity: 0.7;
|
||||
.disabledItem {
|
||||
opacity: 0.45;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
@@ -21,7 +21,6 @@ export type SlashMenuItemType = {
|
||||
searchTerms: string[];
|
||||
command: (props: CommandProps) => void;
|
||||
disable?: (editor: ReturnType<typeof useEditor>) => boolean;
|
||||
requiresBases?: true;
|
||||
};
|
||||
|
||||
export type SlashMenuGroupedItemsType = {
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
import { markInputRule } from "@tiptap/core";
|
||||
import { StarterKit } from "@tiptap/starter-kit";
|
||||
import { Document } from "@tiptap/extension-document";
|
||||
import { Code } from "@tiptap/extension-code";
|
||||
import { TextAlign } from "@tiptap/extension-text-align";
|
||||
import { TaskList, TaskItem } from "@tiptap/extension-list";
|
||||
import { CharacterCount, UndoRedo } from "@tiptap/extensions";
|
||||
import { Placeholder } from "@/features/editor/extensions/placeholder";
|
||||
import { Placeholder, CharacterCount, UndoRedo } from "@tiptap/extensions";
|
||||
import { Superscript } from "@tiptap/extension-superscript";
|
||||
import SubScript from "@tiptap/extension-subscript";
|
||||
import { Typography } from "@tiptap/extension-typography";
|
||||
@@ -64,9 +62,6 @@ import {
|
||||
TransclusionReference,
|
||||
TableView,
|
||||
BaseEmbed as BaseEmbedNode,
|
||||
Footnotes,
|
||||
Footnote,
|
||||
FootnoteReference,
|
||||
} from "@docmost/editor-ext";
|
||||
import {
|
||||
randomElement,
|
||||
@@ -136,7 +131,6 @@ lowlight.register("scala", scala);
|
||||
// @ts-ignore
|
||||
export const mainExtensions = [
|
||||
StarterKit.configure({
|
||||
document: false,
|
||||
heading: false,
|
||||
undoRedo: false,
|
||||
link: false,
|
||||
@@ -148,9 +142,6 @@ export const mainExtensions = [
|
||||
codeBlock: false,
|
||||
code: false,
|
||||
}),
|
||||
Document.extend({
|
||||
content: "block+ footnotes?",
|
||||
}),
|
||||
// Override TipTap's Code extension to fix the inline code input rule.
|
||||
// The upstream regex /(^|[^`])`([^`]+)`(?!`)$/ captures the character
|
||||
// before the opening backtick as part of the match, causing markInputRule
|
||||
@@ -203,19 +194,16 @@ export const mainExtensions = [
|
||||
return i18n.t("Toggle title");
|
||||
}
|
||||
if (node.type.name === "paragraph") {
|
||||
const doc = editor.state.doc;
|
||||
if (pos >= 0 && pos <= doc.content.size) {
|
||||
const parentName = doc.resolve(pos).parent.type.name;
|
||||
if (
|
||||
parentName === "column" ||
|
||||
parentName === "tableCell" ||
|
||||
parentName === "tableHeader" ||
|
||||
parentName === "callout" ||
|
||||
parentName === "blockquote" ||
|
||||
parentName === "footnote"
|
||||
) {
|
||||
return i18n.t("Write...");
|
||||
}
|
||||
const $pos = editor.state.doc.resolve(pos);
|
||||
const parentName = $pos.parent.type.name;
|
||||
if (
|
||||
parentName === "column" ||
|
||||
parentName === "tableCell" ||
|
||||
parentName === "tableHeader" ||
|
||||
parentName === "callout" ||
|
||||
parentName === "blockquote"
|
||||
) {
|
||||
return i18n.t("Write...");
|
||||
}
|
||||
return i18n.t('Write anything. Enter "/" for commands');
|
||||
}
|
||||
@@ -426,9 +414,6 @@ export const mainExtensions = [
|
||||
}).configure(),
|
||||
Columns,
|
||||
Column,
|
||||
Footnotes,
|
||||
Footnote,
|
||||
FootnoteReference,
|
||||
AutoJoiner.configure({
|
||||
elementsToJoin: [],
|
||||
}),
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
import { isNodeEmpty } from "@tiptap/core";
|
||||
import { Plugin, PluginKey } from "@tiptap/pm/state";
|
||||
import { Decoration, DecorationSet } from "@tiptap/pm/view";
|
||||
import { Placeholder as TiptapPlaceholder } from "@tiptap/extensions";
|
||||
|
||||
export const Placeholder = TiptapPlaceholder.extend({
|
||||
addProseMirrorPlugins() {
|
||||
const editor = this.editor;
|
||||
const options = this.options;
|
||||
const dataAttribute = `data-${options.dataAttribute || "placeholder"}`;
|
||||
|
||||
return [
|
||||
new Plugin({
|
||||
key: new PluginKey("docmostPlaceholder"),
|
||||
props: {
|
||||
decorations: (state) => {
|
||||
if (options.showOnlyWhenEditable && !editor.isEditable) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const { doc, selection } = state;
|
||||
const { anchor } = selection;
|
||||
const decorations: Decoration[] = [];
|
||||
const isEmptyDoc = editor.isEmpty;
|
||||
|
||||
doc.descendants((node, pos) => {
|
||||
if (!node.type.isTextblock) {
|
||||
return options.includeChildren;
|
||||
}
|
||||
|
||||
const hasAnchor = anchor >= pos && anchor <= pos + node.nodeSize;
|
||||
const isEmpty = !node.isLeaf && isNodeEmpty(node);
|
||||
|
||||
if ((hasAnchor || !options.showOnlyCurrent) && isEmpty) {
|
||||
const emptyNodeClass =
|
||||
typeof options.emptyNodeClass === "function"
|
||||
? options.emptyNodeClass({ editor, node, pos, hasAnchor })
|
||||
: options.emptyNodeClass;
|
||||
const classes = [emptyNodeClass];
|
||||
if (isEmptyDoc) {
|
||||
classes.push(options.emptyEditorClass);
|
||||
}
|
||||
|
||||
decorations.push(
|
||||
Decoration.node(pos, pos + node.nodeSize, {
|
||||
class: classes.join(" "),
|
||||
[dataAttribute]:
|
||||
typeof options.placeholder === "function"
|
||||
? options.placeholder({ editor, node, pos, hasAnchor })
|
||||
: options.placeholder,
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
return options.includeChildren;
|
||||
});
|
||||
|
||||
return DecorationSet.create(doc, decorations);
|
||||
},
|
||||
},
|
||||
}),
|
||||
];
|
||||
},
|
||||
});
|
||||
@@ -0,0 +1,7 @@
|
||||
import { getCollaborationUrl } from "@/lib/config.ts";
|
||||
|
||||
const useCollaborationURL = (): string => {
|
||||
return getCollaborationUrl();
|
||||
};
|
||||
|
||||
export default useCollaborationURL;
|
||||
@@ -2,22 +2,20 @@ import "@/features/editor/styles/index.css";
|
||||
import React, {
|
||||
useCallback,
|
||||
useEffect,
|
||||
useLayoutEffect,
|
||||
useMemo,
|
||||
useRef,
|
||||
useState,
|
||||
} from "react";
|
||||
import { IndexeddbPersistence } from "y-indexeddb";
|
||||
import * as Y from "yjs";
|
||||
import {
|
||||
HocuspocusProvider,
|
||||
onStatusParameters,
|
||||
WebSocketStatus,
|
||||
HocuspocusProviderWebsocket,
|
||||
onSyncedParameters,
|
||||
onStatelessParameters,
|
||||
} from "@hocuspocus/provider";
|
||||
import {
|
||||
HocuspocusProviderWebsocketComponent,
|
||||
HocuspocusRoom,
|
||||
useHocuspocusEvent,
|
||||
useHocuspocusProvider,
|
||||
} from "@hocuspocus/provider-react";
|
||||
import {
|
||||
Editor,
|
||||
EditorContent,
|
||||
@@ -30,6 +28,7 @@ import {
|
||||
mainExtensions,
|
||||
} from "@/features/editor/extensions/extensions";
|
||||
import { useAtom, useAtomValue } from "jotai";
|
||||
import useCollaborationUrl from "@/features/editor/hooks/use-collaboration-url";
|
||||
import { currentUserAtom } from "@/features/user/atoms/current-user-atom";
|
||||
import {
|
||||
currentPageEditModeAtom,
|
||||
@@ -77,11 +76,6 @@ import { EditorLinkMenu } from "@/features/editor/components/link/link-menu";
|
||||
import ColumnsMenu from "@/features/editor/components/columns/columns-menu.tsx";
|
||||
import { TransclusionLookupProvider } from "@/features/editor/components/transclusion/transclusion-lookup-context";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import {
|
||||
acquireCollabSocket,
|
||||
getCollabSocket,
|
||||
releaseCollabSocket,
|
||||
} from "@/features/editor/collab-socket";
|
||||
|
||||
interface PageEditorProps {
|
||||
pageId: string;
|
||||
@@ -97,80 +91,7 @@ export default function PageEditor({
|
||||
canComment,
|
||||
}: PageEditorProps) {
|
||||
const { t } = useTranslation();
|
||||
const { data: collabQuery, refetch: refetchCollabToken } = useCollabToken();
|
||||
const { pageSlug } = useParams();
|
||||
const slugId = extractPageSlugId(pageSlug);
|
||||
const [socket] = useState(getCollabSocket);
|
||||
const hasCollabToken = !!collabQuery?.token;
|
||||
|
||||
useEffect(() => {
|
||||
if (!hasCollabToken) return;
|
||||
acquireCollabSocket();
|
||||
return () => releaseCollabSocket();
|
||||
}, [hasCollabToken]);
|
||||
|
||||
const handleStateless = ({ payload }: onStatelessParameters) => {
|
||||
try {
|
||||
const message = JSON.parse(payload);
|
||||
if (message?.type !== "page.updated" || !message.updatedAt) return;
|
||||
const pageData = queryClient.getQueryData<IPage>(["pages", slugId]);
|
||||
if (pageData) {
|
||||
queryClient.setQueryData(["pages", slugId], {
|
||||
...pageData,
|
||||
updatedAt: message.updatedAt,
|
||||
...(message.lastUpdatedBy && {
|
||||
lastUpdatedBy: message.lastUpdatedBy,
|
||||
}),
|
||||
});
|
||||
}
|
||||
} catch {
|
||||
// ignore unrelated stateless messages
|
||||
}
|
||||
};
|
||||
|
||||
const handleAuthenticationFailed = () => {
|
||||
const payload = jwtDecode(collabQuery?.token);
|
||||
const now = Date.now().valueOf() / 1000;
|
||||
const isTokenExpired = now >= payload.exp;
|
||||
if (isTokenExpired) {
|
||||
refetchCollabToken();
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<TransclusionLookupProvider>
|
||||
{collabQuery?.token ? (
|
||||
<HocuspocusProviderWebsocketComponent websocketProvider={socket}>
|
||||
<HocuspocusRoom
|
||||
name={`page.${pageId}`}
|
||||
token={collabQuery.token}
|
||||
flushDelay={500}
|
||||
onStateless={handleStateless}
|
||||
onAuthenticationFailed={handleAuthenticationFailed}
|
||||
>
|
||||
<CollabPageEditor
|
||||
pageId={pageId}
|
||||
editable={editable}
|
||||
content={content}
|
||||
canComment={canComment}
|
||||
/>
|
||||
</HocuspocusRoom>
|
||||
</HocuspocusProviderWebsocketComponent>
|
||||
) : (
|
||||
<StaticPageEditor content={content} ariaLabel={t("Page content")} />
|
||||
)}
|
||||
</TransclusionLookupProvider>
|
||||
);
|
||||
}
|
||||
|
||||
function CollabPageEditor({
|
||||
pageId,
|
||||
editable,
|
||||
content,
|
||||
canComment,
|
||||
}: PageEditorProps) {
|
||||
const { t } = useTranslation();
|
||||
const provider = useHocuspocusProvider();
|
||||
const collaborationURL = useCollaborationUrl();
|
||||
const isComponentMounted = useRef(false);
|
||||
const editorRef = useRef<Editor | null>(null);
|
||||
|
||||
@@ -191,6 +112,7 @@ function CollabPageEditor({
|
||||
);
|
||||
const [, setYjsSynced] = useAtom(yjsSyncedAtom);
|
||||
const menuContainerRef = useRef(null);
|
||||
const { data: collabQuery, refetch: refetchCollabToken } = useCollabToken();
|
||||
const { isIdle, resetIdle } = useIdle(FIVE_MINUTES, { initialState: false });
|
||||
const documentState = useDocumentVisibility();
|
||||
const { pageSlug } = useParams();
|
||||
@@ -201,24 +123,95 @@ function CollabPageEditor({
|
||||
[isComponentMounted],
|
||||
);
|
||||
const { handleScrollTo } = useEditorScroll({ canScroll });
|
||||
// Providers only created once per pageId
|
||||
const providersRef = useRef<{
|
||||
local: IndexeddbPersistence;
|
||||
remote: HocuspocusProvider;
|
||||
socket: HocuspocusProviderWebsocket;
|
||||
} | null>(null);
|
||||
const [providersReady, setProvidersReady] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
const local = new IndexeddbPersistence(
|
||||
provider.configuration.name,
|
||||
provider.document,
|
||||
);
|
||||
local.on("synced", () => setIsLocalSynced(true));
|
||||
return () => {
|
||||
local.destroy();
|
||||
};
|
||||
}, [provider]);
|
||||
if (!providersRef.current) {
|
||||
const documentName = `page.${pageId}`;
|
||||
const ydoc = new Y.Doc();
|
||||
const local = new IndexeddbPersistence(documentName, ydoc);
|
||||
const socket = new HocuspocusProviderWebsocket({
|
||||
url: collaborationURL,
|
||||
});
|
||||
const onLocalSyncedHandler = () => {
|
||||
setIsLocalSynced(true);
|
||||
};
|
||||
const onStatusHandler = (event: onStatusParameters) => {
|
||||
setYjsConnectionStatus(event.status);
|
||||
};
|
||||
const onSyncedHandler = (event: onSyncedParameters) => {
|
||||
setIsRemoteSynced(event.state);
|
||||
};
|
||||
const onStatelessHandler = ({ payload }: onStatelessParameters) => {
|
||||
try {
|
||||
const message = JSON.parse(payload);
|
||||
if (message?.type !== "page.updated" || !message.updatedAt) return;
|
||||
const pageData = queryClient.getQueryData<IPage>(["pages", slugId]);
|
||||
if (pageData) {
|
||||
queryClient.setQueryData(["pages", slugId], {
|
||||
...pageData,
|
||||
updatedAt: message.updatedAt,
|
||||
...(message.lastUpdatedBy && {
|
||||
lastUpdatedBy: message.lastUpdatedBy,
|
||||
}),
|
||||
});
|
||||
}
|
||||
} catch {
|
||||
// ignore unrelated stateless messages
|
||||
}
|
||||
};
|
||||
const onAuthenticationFailedHandler = () => {
|
||||
const payload = jwtDecode(collabQuery?.token);
|
||||
const now = Date.now().valueOf() / 1000;
|
||||
const isTokenExpired = now >= payload.exp;
|
||||
if (isTokenExpired) {
|
||||
refetchCollabToken().then((result) => {
|
||||
if (result.data?.token) {
|
||||
socket.disconnect();
|
||||
setTimeout(() => {
|
||||
remote.configuration.token = result.data.token;
|
||||
socket.connect();
|
||||
}, 100);
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
const remote = new HocuspocusProvider({
|
||||
websocketProvider: socket,
|
||||
name: documentName,
|
||||
document: ydoc,
|
||||
token: collabQuery?.token,
|
||||
onAuthenticationFailed: onAuthenticationFailedHandler,
|
||||
onStatus: onStatusHandler,
|
||||
onSynced: onSyncedHandler,
|
||||
onStateless: onStatelessHandler,
|
||||
});
|
||||
|
||||
useHocuspocusEvent("synced", ({ state }) => setIsRemoteSynced(state));
|
||||
useHocuspocusEvent("status", ({ status }) => setYjsConnectionStatus(status));
|
||||
local.on("synced", onLocalSyncedHandler);
|
||||
providersRef.current = { socket, local, remote };
|
||||
setProvidersReady(true);
|
||||
} else {
|
||||
setProvidersReady(true);
|
||||
}
|
||||
// Only destroy on final unmount
|
||||
return () => {
|
||||
providersRef.current?.socket.destroy();
|
||||
providersRef.current?.remote.destroy();
|
||||
providersRef.current?.local.destroy();
|
||||
providersRef.current = null;
|
||||
};
|
||||
}, [pageId]);
|
||||
|
||||
// Only connect/disconnect on tab/idle, not destroy
|
||||
useEffect(() => {
|
||||
const socket = provider.configuration.websocketProvider;
|
||||
if (!providersReady || !providersRef.current) return;
|
||||
const socket = providersRef.current.socket;
|
||||
|
||||
if (
|
||||
isIdle &&
|
||||
@@ -235,15 +228,23 @@ function CollabPageEditor({
|
||||
resetIdle();
|
||||
socket.connect();
|
||||
}
|
||||
}, [isIdle, documentState, provider, resetIdle]);
|
||||
}, [isIdle, documentState, providersReady, resetIdle]);
|
||||
|
||||
// Attach here, to make sure the connection gets properly established
|
||||
providersRef.current?.remote.attach();
|
||||
|
||||
const extensions = useMemo(() => {
|
||||
if (!currentUser?.user) {
|
||||
if (!providersReady || !providersRef.current || !currentUser?.user) {
|
||||
return mainExtensions;
|
||||
}
|
||||
|
||||
return [...mainExtensions, ...collabExtensions(provider, currentUser.user)];
|
||||
}, [provider, currentUser?.user]);
|
||||
const remoteProvider = providersRef.current.remote;
|
||||
|
||||
return [
|
||||
...mainExtensions,
|
||||
...collabExtensions(remoteProvider, currentUser?.user),
|
||||
];
|
||||
}, [providersReady, currentUser?.user]);
|
||||
|
||||
const editor = useEditor(
|
||||
{
|
||||
@@ -325,16 +326,6 @@ function CollabPageEditor({
|
||||
[pageId, editable, extensions],
|
||||
);
|
||||
|
||||
useLayoutEffect(() => {
|
||||
if (editor && !editor.isDestroyed) {
|
||||
// @ts-ignore
|
||||
setEditor(editor);
|
||||
// @ts-ignore
|
||||
editor.storage.pageId = pageId;
|
||||
editorRef.current = editor;
|
||||
}
|
||||
}, [editor, pageId, setEditor]);
|
||||
|
||||
const editorIsEditable = useEditorState({
|
||||
editor,
|
||||
selector: (ctx) => {
|
||||
@@ -425,72 +416,65 @@ function CollabPageEditor({
|
||||
}
|
||||
}, [yjsConnectionStatus, isSynced]);
|
||||
|
||||
if (showStatic) {
|
||||
return <StaticPageEditor content={content} ariaLabel={t("Page content")} />;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="editor-container" style={{ position: "relative" }}>
|
||||
<div ref={menuContainerRef}>
|
||||
<EditorContent editor={editor} />
|
||||
<TransclusionLookupProvider>
|
||||
{showStatic ? (
|
||||
<EditorProvider
|
||||
editable={false}
|
||||
immediatelyRender={true}
|
||||
extensions={mainExtensions}
|
||||
content={content}
|
||||
editorProps={{
|
||||
attributes: {
|
||||
"aria-label": t("Page content"),
|
||||
},
|
||||
}}
|
||||
/>
|
||||
) : (
|
||||
<div className="editor-container" style={{ position: "relative" }}>
|
||||
<div ref={menuContainerRef}>
|
||||
<EditorContent editor={editor} />
|
||||
|
||||
{editor && (
|
||||
<SearchAndReplaceDialog editor={editor} editable={editable} />
|
||||
)}
|
||||
{editor && (
|
||||
<SearchAndReplaceDialog editor={editor} editable={editable} />
|
||||
)}
|
||||
|
||||
{editor && editorIsEditable && (
|
||||
<div>
|
||||
<EditorAiMenu editor={editor} />
|
||||
<EditorLinkMenu editor={editor} />
|
||||
<EditorBubbleMenu editor={editor} />
|
||||
<TableMenu editor={editor} />
|
||||
<TableHandlesLayer editor={editor} />
|
||||
<ImageMenu editor={editor} />
|
||||
<VideoMenu editor={editor} />
|
||||
<PdfMenu editor={editor} />
|
||||
<CalloutMenu editor={editor} />
|
||||
<SubpagesMenu editor={editor} />
|
||||
<ExcalidrawMenu editor={editor} />
|
||||
<DrawioMenu editor={editor} />
|
||||
<ColumnsMenu editor={editor} />
|
||||
{editor && editorIsEditable && (
|
||||
<div>
|
||||
<EditorAiMenu editor={editor} />
|
||||
<EditorLinkMenu editor={editor} />
|
||||
<EditorBubbleMenu editor={editor} />
|
||||
<TableMenu editor={editor} />
|
||||
<TableHandlesLayer editor={editor} />
|
||||
<ImageMenu editor={editor} />
|
||||
<VideoMenu editor={editor} />
|
||||
<PdfMenu editor={editor} />
|
||||
<CalloutMenu editor={editor} />
|
||||
<SubpagesMenu editor={editor} />
|
||||
<ExcalidrawMenu editor={editor} />
|
||||
<DrawioMenu editor={editor} />
|
||||
<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>
|
||||
)}
|
||||
{editor && !editorIsEditable && (editable || canComment) && (
|
||||
<ReadonlyBubbleMenu editor={editor} />
|
||||
)}
|
||||
{showCommentPopup && <CommentDialog editor={editor} pageId={pageId} />}
|
||||
{showReadOnlyCommentPopup && (
|
||||
<CommentDialog editor={editor} pageId={pageId} readOnly />
|
||||
)}
|
||||
</div>
|
||||
<div
|
||||
onClick={() => {
|
||||
if (editor && !editor.isDestroyed) editor.commands.focus("end");
|
||||
}}
|
||||
style={{ paddingBottom: "20vh" }}
|
||||
></div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function StaticPageEditor({
|
||||
content,
|
||||
ariaLabel,
|
||||
}: {
|
||||
content: any;
|
||||
ariaLabel: string;
|
||||
}) {
|
||||
return (
|
||||
<EditorProvider
|
||||
editable={false}
|
||||
immediatelyRender={true}
|
||||
extensions={mainExtensions}
|
||||
content={content}
|
||||
editorProps={{
|
||||
attributes: {
|
||||
"aria-label": ariaLabel,
|
||||
},
|
||||
}}
|
||||
/>
|
||||
<div
|
||||
onClick={() => {
|
||||
if (editor && !editor.isDestroyed) editor.commands.focus("end");
|
||||
}}
|
||||
style={{ paddingBottom: "20vh" }}
|
||||
></div>
|
||||
</div>
|
||||
)}
|
||||
</TransclusionLookupProvider>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
.ProseMirror sup a.footnote-ref {
|
||||
color: var(--mantine-primary-color-filled);
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.ProseMirror sup:has(a.footnote-ref) {
|
||||
padding: 0 1px;
|
||||
}
|
||||
|
||||
.ProseMirror ol.footnotes {
|
||||
margin-top: 2rem;
|
||||
padding-top: 0.75rem;
|
||||
font-size: 0.875rem;
|
||||
color: var(--mantine-color-dimmed);
|
||||
list-style-type: decimal;
|
||||
}
|
||||
|
||||
.ProseMirror ol.footnotes:has(li) {
|
||||
border-top: 1px solid var(--mantine-color-default-border);
|
||||
}
|
||||
|
||||
.ProseMirror ol.footnotes li p {
|
||||
margin: 0.15rem 0;
|
||||
}
|
||||
@@ -18,4 +18,3 @@
|
||||
@import "./columns.css";
|
||||
@import "./status.css";
|
||||
@import "./base-embed.css";
|
||||
@import "./footnotes.css";
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
import { ForgotPasswordForm } from "@/features/auth/components/forgot-password-form";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
import { getAppName } from "@/lib/config";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
|
||||
export default function ForgotPassword() {
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title="Forgot Password" />
|
||||
<Helmet>
|
||||
<title>Forgot Password - {getAppName()}</title>
|
||||
</Helmet>
|
||||
<ForgotPasswordForm />
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { InviteSignUpForm } from "@/features/auth/components/invite-sign-up-form.tsx";
|
||||
import {getAppName} from "@/lib/config.ts";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function InviteSignup() {
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Invitation Signup")} />
|
||||
<Helmet>
|
||||
<title>{t("Invitation Signup")} - {getAppName()}</title>
|
||||
</Helmet>
|
||||
<InviteSignUpForm />
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -1,13 +1,18 @@
|
||||
import { LoginForm } from "@/features/auth/components/login-form";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { getAppName } from "@/lib/config.ts";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function LoginPage() {
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Login")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("Login")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
<LoginForm />
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { PasswordResetForm } from "@/features/auth/components/password-reset-form";
|
||||
import { Link, useSearchParams } from "react-router-dom";
|
||||
import { useVerifyUserTokenQuery } from "@/features/auth/queries/auth-query";
|
||||
import { Button, Container, Group, Text } from "@mantine/core";
|
||||
import APP_ROUTE from "@/lib/app-route";
|
||||
import { getAppName } from "@/lib/config.ts";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function PasswordReset() {
|
||||
const { t } = useTranslation();
|
||||
@@ -22,7 +23,11 @@ export default function PasswordReset() {
|
||||
if (isError || !resetToken) {
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Password Reset")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("Password Reset")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
<Container my={40}>
|
||||
<Text size="lg" ta="center">
|
||||
{t("Invalid or expired password reset link")}
|
||||
@@ -44,7 +49,11 @@ export default function PasswordReset() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Password Reset")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("Password Reset")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
<PasswordResetForm resetToken={resetToken} />
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import { useWorkspacePublicDataQuery } from "@/features/workspace/queries/workspace-query.ts";
|
||||
import { SetupWorkspaceForm } from "@/features/auth/components/setup-workspace-form.tsx";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import React, { useEffect } from "react";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import APP_ROUTE from "@/lib/app-route.ts";
|
||||
import { getAppName } from "@/lib/config.ts";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function SetupWorkspace() {
|
||||
const { t } = useTranslation();
|
||||
@@ -34,7 +35,11 @@ export default function SetupWorkspace() {
|
||||
) {
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Setup Workspace")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("Setup Workspace")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
<SetupWorkspaceForm />
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -2,15 +2,20 @@ import { Container, Space } from "@mantine/core";
|
||||
import HomeTabs from "@/features/home/components/home-tabs";
|
||||
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";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function Home() {
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Home")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("Home")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
<Container size={"900"} pt="xl">
|
||||
<HomeAiPrompt />
|
||||
|
||||
|
||||
@@ -17,7 +17,9 @@ import {
|
||||
} from "@tabler/icons-react";
|
||||
import { Link, useParams } from "react-router-dom";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { useDebouncedValue } from "@mantine/hooks";
|
||||
import { getAppName } from "@/lib/config";
|
||||
import { useLabelPagesQuery } from "@/features/label/queries/label-query.ts";
|
||||
import { useGetSpacesQuery } from "@/features/space/queries/space-query.ts";
|
||||
import { getLabelColor } from "@/features/label/utils/label-colors.ts";
|
||||
@@ -27,7 +29,6 @@ import { normalizeLabelName } from "@/features/label/utils/normalize-label.ts";
|
||||
import { SpaceFilterMenu } from "@/features/space/components/space-filter-menu.tsx";
|
||||
import { EmptyState } from "@/components/ui/empty-state";
|
||||
import classes from "@/features/label/label.module.css";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function LabelPage() {
|
||||
const { t } = useTranslation();
|
||||
@@ -81,7 +82,11 @@ export default function LabelPage() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={labelName} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{labelName} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
|
||||
<Container size={820} py="xl">
|
||||
<Stack gap="lg">
|
||||
|
||||
@@ -3,6 +3,7 @@ import { usePageQuery } from "@/features/page/queries/page-query";
|
||||
import { FullEditor } from "@/features/editor/full-editor";
|
||||
import { TitleEditor } from "@/features/editor/title-editor";
|
||||
import HistoryModal from "@/features/page-history/components/history-modal";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import PageHeader from "@/features/page/components/header/page-header.tsx";
|
||||
import { extractPageSlugId } from "@/lib";
|
||||
import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query.ts";
|
||||
@@ -17,7 +18,6 @@ import { BaseView } from "@/ee/base/components/base-view";
|
||||
import { useHasFeature } from "@/ee/hooks/use-feature";
|
||||
import { Feature } from "@/ee/features";
|
||||
import { getPageTitle } from "@/features/page/page.utils";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
const MemoizedFullEditor = React.memo(FullEditor);
|
||||
const MemoizedTitleEditor = React.memo(TitleEditor);
|
||||
const MemoizedPageHeader = React.memo(PageHeader);
|
||||
@@ -110,10 +110,9 @@ function PageContent({ pageSlug }: { pageSlug: string | undefined }) {
|
||||
paddingTop: "calc(var(--page-header-height) + 6px)",
|
||||
}}
|
||||
>
|
||||
<DocumentTitle
|
||||
title={`${page?.icon || ""} ${getPageTitle(page?.title, page?.isBase, t)}`}
|
||||
withAppName={false}
|
||||
/>
|
||||
<Helmet>
|
||||
<title>{`${page?.icon || ""} ${getPageTitle(page?.title, page?.isBase, t)}`}</title>
|
||||
</Helmet>
|
||||
<MemoizedPageHeader readOnly={!canEdit} />
|
||||
<div
|
||||
style={{
|
||||
@@ -160,10 +159,9 @@ function PageContent({ pageSlug }: { pageSlug: string | undefined }) {
|
||||
return (
|
||||
page && (
|
||||
<div>
|
||||
<DocumentTitle
|
||||
title={`${page?.icon || ""} ${getPageTitle(page?.title, page?.isBase, t)}`}
|
||||
withAppName={false}
|
||||
/>
|
||||
<Helmet>
|
||||
<title>{`${page?.icon || ""} ${getPageTitle(page?.title, page?.isBase, t)}`}</title>
|
||||
</Helmet>
|
||||
|
||||
<MemoizedPageHeader readOnly={!canEdit} />
|
||||
|
||||
|
||||
@@ -5,16 +5,21 @@ import PageWidthPref from "@/features/user/components/page-width-pref.tsx";
|
||||
import PageEditPref from "@/features/user/components/page-state-pref";
|
||||
import FixedToolbarPref from "@/features/user/components/fixed-toolbar-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";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function AccountPreferences() {
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Preferences")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("Preferences")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
<SettingsTitle title={t("Preferences")} />
|
||||
|
||||
<AccountTheme />
|
||||
|
||||
@@ -4,17 +4,22 @@ import ChangePassword from "@/features/user/components/change-password";
|
||||
import { Divider } from "@mantine/core";
|
||||
import AccountAvatar from "@/features/user/components/account-avatar";
|
||||
import SettingsTitle from "@/components/settings/settings-title.tsx";
|
||||
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";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function AccountSettings() {
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("My Profile")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("My Profile")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
<SettingsTitle title={t("My Profile")} />
|
||||
|
||||
<AccountAvatar />
|
||||
|
||||
@@ -1,15 +1,20 @@
|
||||
import SettingsTitle from "@/components/settings/settings-title.tsx";
|
||||
import GroupMembersList from "@/features/group/components/group-members";
|
||||
import GroupDetails from "@/features/group/components/group-details";
|
||||
import { getAppName } from "@/lib/config.ts";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function GroupInfo() {
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Manage Group")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("Manage Group")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
<SettingsTitle title={t("Manage Group")} />
|
||||
<GroupDetails />
|
||||
<GroupMembersList />
|
||||
|
||||
@@ -3,8 +3,9 @@ import SettingsTitle from "@/components/settings/settings-title.tsx";
|
||||
import { Group } from "@mantine/core";
|
||||
import CreateGroupModal from "@/features/group/components/create-group-modal";
|
||||
import useUserRole from "@/hooks/use-user-role.tsx";
|
||||
import {getAppName} from "@/lib/config.ts";
|
||||
import {Helmet} from "react-helmet-async";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function Groups() {
|
||||
const { t } = useTranslation();
|
||||
@@ -12,7 +13,9 @@ export default function Groups() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Groups")} />
|
||||
<Helmet>
|
||||
<title>{t("Groups")} - {getAppName()}</title>
|
||||
</Helmet>
|
||||
<SettingsTitle title={t("Groups")} />
|
||||
|
||||
<Group my="md" justify="flex-end">
|
||||
|
||||
@@ -1,17 +1,22 @@
|
||||
import SettingsTitle from "@/components/settings/settings-title.tsx";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { getAppName } from "@/lib/config.ts";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import ShareList from "@/features/share/components/share-list.tsx";
|
||||
import { Alert, Text } from "@mantine/core";
|
||||
import { IconInfoCircle } from "@tabler/icons-react";
|
||||
import React from "react";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function Shares() {
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Public sharing")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("Public sharing")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
<SettingsTitle title={t("Public sharing")} />
|
||||
|
||||
<Alert variant="light" color="blue" icon={<IconInfoCircle />}>
|
||||
|
||||
@@ -3,8 +3,9 @@ import SpaceList from "@/features/space/components/space-list.tsx";
|
||||
import useUserRole from "@/hooks/use-user-role.tsx";
|
||||
import { Group } from "@mantine/core";
|
||||
import CreateSpaceModal from "@/features/space/components/create-space-modal.tsx";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { getAppName } from "@/lib/config.ts";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function Spaces() {
|
||||
const { t } = useTranslation();
|
||||
@@ -12,7 +13,11 @@ export default function Spaces() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Spaces")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("Spaces")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
<SettingsTitle title={t("Spaces")} />
|
||||
|
||||
<Group my="md" justify="flex-end">
|
||||
|
||||
@@ -6,10 +6,11 @@ import { useEffect, useState } from "react";
|
||||
import { useNavigate, useSearchParams } from "react-router-dom";
|
||||
import WorkspaceInvitesTable from "@/features/workspace/components/members/components/workspace-invites-table.tsx";
|
||||
import useUserRole from "@/hooks/use-user-role.tsx";
|
||||
import { getAppName } from "@/lib/config.ts";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useAtom } from "jotai";
|
||||
import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function WorkspaceMembers() {
|
||||
const { t } = useTranslation();
|
||||
@@ -37,7 +38,11 @@ export default function WorkspaceMembers() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Members")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("Members")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
<SettingsTitle title={t("Members")} />
|
||||
|
||||
{/* <WorkspaceInviteSection /> */}
|
||||
|
||||
@@ -2,19 +2,21 @@ import SettingsTitle from "@/components/settings/settings-title.tsx";
|
||||
import WorkspaceNameForm from "@/features/workspace/components/settings/components/workspace-name-form";
|
||||
import WorkspaceIcon from "@/features/workspace/components/settings/components/workspace-icon.tsx";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { isCloud } from "@/lib/config.ts";
|
||||
import { getAppName, isCloud } from "@/lib/config.ts";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import ManageHostname from "@/ee/components/manage-hostname.tsx";
|
||||
import { Divider } from "@mantine/core";
|
||||
import AllowMemberTemplates from "@/ee/security/components/allow-member-templates.tsx";
|
||||
import WorkspaceDefaultPageEditMode from "@/features/workspace/components/settings/components/workspace-default-page-edit-mode.tsx";
|
||||
import PersonalSpacesSetting from "@/ee/personal-space/components/personal-spaces-setting.tsx";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function WorkspaceSettings() {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title="Workspace Settings" />
|
||||
<Helmet>
|
||||
<title>Workspace Settings - {getAppName()}</title>
|
||||
</Helmet>
|
||||
<SettingsTitle title={t("General")} />
|
||||
<WorkspaceIcon />
|
||||
<WorkspaceNameForm />
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { useNavigate, useParams } from "react-router-dom";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useSharePageQuery } from "@/features/share/queries/share-query.ts";
|
||||
import { Container } from "@mantine/core";
|
||||
@@ -13,7 +14,6 @@ import {
|
||||
sharedTreeDataAtom,
|
||||
} from "@/features/share/atoms/shared-page-atom.ts";
|
||||
import { isPageInTree } from "@/features/share/utils.ts";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function SharedPage() {
|
||||
const { t } = useTranslation();
|
||||
@@ -56,14 +56,12 @@ export default function SharedPage() {
|
||||
|
||||
return (
|
||||
<div>
|
||||
<DocumentTitle
|
||||
title={data?.page?.title || t("untitled")}
|
||||
withAppName={false}
|
||||
>
|
||||
<Helmet>
|
||||
<title>{`${data?.page?.title || t("untitled")}`}</title>
|
||||
{!data?.share.searchIndexing && (
|
||||
<meta name="robots" content="noindex" />
|
||||
)}
|
||||
</DocumentTitle>
|
||||
</Helmet>
|
||||
|
||||
<Container fluid={fullWidth} size={fullWidth ? undefined : 900} p={0}>
|
||||
<ReadonlyPageEditor
|
||||
|
||||
@@ -2,7 +2,8 @@ import {Container} from "@mantine/core";
|
||||
import SpaceHomeTabs from "@/features/space/components/space-home-tabs.tsx";
|
||||
import {useParams} from "react-router-dom";
|
||||
import {useGetSpaceBySlugQuery} from "@/features/space/queries/space-query.ts";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
import {getAppName} from "@/lib/config.ts";
|
||||
import {Helmet} from "react-helmet-async";
|
||||
|
||||
export default function SpaceHome() {
|
||||
const {spaceSlug} = useParams();
|
||||
@@ -10,7 +11,9 @@ export default function SpaceHome() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={space?.name || 'Overview'} />
|
||||
<Helmet>
|
||||
<title>{space?.name || 'Overview'} - {getAppName()}</title>
|
||||
</Helmet>
|
||||
<Container size={"900"} pt="xl">
|
||||
{space && <SpaceHomeTabs/>}
|
||||
</Container>
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
import { Container, Title, Text, Group, Box } from "@mantine/core";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Helmet } from "react-helmet-async";
|
||||
import { getAppName } from "@/lib/config";
|
||||
import { useGetSpacesQuery } from "@/features/space/queries/space-query";
|
||||
import CreateSpaceModal from "@/features/space/components/create-space-modal";
|
||||
import { AllSpacesList } from "@/features/space/components/spaces-page";
|
||||
import FavoriteSpacesGrid from "@/features/space/components/spaces-page/favorite-spaces-grid";
|
||||
import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search";
|
||||
import useUserRole from "@/hooks/use-user-role";
|
||||
import { DocumentTitle } from "@/components/ui/document-title.tsx";
|
||||
|
||||
export default function Spaces() {
|
||||
const { t } = useTranslation();
|
||||
@@ -21,7 +22,11 @@ export default function Spaces() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<DocumentTitle title={t("Spaces")} />
|
||||
<Helmet>
|
||||
<title>
|
||||
{t("Spaces")} - {getAppName()}
|
||||
</title>
|
||||
</Helmet>
|
||||
|
||||
<Container size={"800"} pt="xl">
|
||||
<Group justify="space-between" mb="xl">
|
||||
|
||||
+17
-15
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "server",
|
||||
"version": "0.95.0",
|
||||
"version": "0.90.1",
|
||||
"description": "",
|
||||
"author": "",
|
||||
"private": true,
|
||||
@@ -40,30 +40,30 @@
|
||||
"@clickhouse/client": "1.18.2",
|
||||
"@docmost/base-formula": "workspace:*",
|
||||
"@docmost/pdf-inspector": "1.9.6",
|
||||
"@fastify/cookie": "11.0.2",
|
||||
"@fastify/multipart": "10.0.0",
|
||||
"@fastify/static": "10.1.2",
|
||||
"@keyv/redis": "5.1.6",
|
||||
"@fastify/cookie": "^11.0.2",
|
||||
"@fastify/multipart": "^10.0.0",
|
||||
"@fastify/static": "^9.1.3",
|
||||
"@keyv/redis": "^5.1.6",
|
||||
"@langchain/core": "1.1.46",
|
||||
"@langchain/textsplitters": "1.0.1",
|
||||
"@modelcontextprotocol/sdk": "1.30.0",
|
||||
"@nest-lab/throttler-storage-redis": "1.2.0",
|
||||
"@modelcontextprotocol/sdk": "1.29.0",
|
||||
"@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.3",
|
||||
"@nestjs/common": "11.1.28",
|
||||
"@nestjs/common": "11.1.27",
|
||||
"@nestjs/config": "4.0.4",
|
||||
"@nestjs/core": "11.1.27",
|
||||
"@nestjs/event-emitter": "3.1.0",
|
||||
"@nestjs/jwt": "11.0.2",
|
||||
"@nestjs/mapped-types": "2.1.1",
|
||||
"@nestjs/passport": "11.0.5",
|
||||
"@nestjs/platform-fastify": "11.1.28",
|
||||
"@nestjs/platform-socket.io": "11.1.28",
|
||||
"@nestjs/platform-fastify": "11.1.27",
|
||||
"@nestjs/platform-socket.io": "11.1.27",
|
||||
"@nestjs/schedule": "6.1.3",
|
||||
"@nestjs/terminus": "11.1.1",
|
||||
"@nestjs/throttler": "6.5.0",
|
||||
"@nestjs/websockets": "11.1.28",
|
||||
"@nestjs/websockets": "11.1.27",
|
||||
"@node-saml/passport-saml": "5.1.0",
|
||||
"@socket.io/redis-adapter": "8.3.0",
|
||||
"ai": "6.0.134",
|
||||
@@ -88,10 +88,11 @@
|
||||
"kysely-migration-cli": "0.4.2",
|
||||
"kysely-postgres-js": "3.0.0",
|
||||
"ldapts": "8.1.7",
|
||||
"lib0": "0.2.117",
|
||||
"mammoth": "1.12.0",
|
||||
"mime-types": "3.0.2",
|
||||
"msgpackr": "1.11.9",
|
||||
"nanoid": "5.1.16",
|
||||
"msgpackr": "^1.11.9",
|
||||
"nanoid": "5.1.7",
|
||||
"nestjs-cls": "6.2.0",
|
||||
"nestjs-kysely": "3.1.2",
|
||||
"nestjs-pino": "4.6.1",
|
||||
@@ -102,7 +103,7 @@
|
||||
"passport-google-oauth20": "2.0.0",
|
||||
"passport-jwt": "4.0.1",
|
||||
"pg-tsquery": "8.4.2",
|
||||
"pgvector": "0.2.1",
|
||||
"pgvector": "^0.2.1",
|
||||
"pino-http": "11.0.0",
|
||||
"pino-pretty": "13.1.3",
|
||||
"postgres": "3.4.8",
|
||||
@@ -117,8 +118,9 @@
|
||||
"stripe": "^17.7.0",
|
||||
"tlds": "1.261.0",
|
||||
"tmp-promise": "3.0.3",
|
||||
"tseep": "1.3.1",
|
||||
"typesense": "3.0.5",
|
||||
"undici": "7.29.0",
|
||||
"undici": "7.28.0",
|
||||
"ws": "8.21.0",
|
||||
"yauzl": "3.4.0",
|
||||
"zod": "4.3.6"
|
||||
|
||||
@@ -15,7 +15,6 @@ import {
|
||||
RedisSyncExtension,
|
||||
SerializedHTTPRequest,
|
||||
} from './extensions/redis-sync';
|
||||
import { toWebRequest } from './extensions/redis-sync/redis-sync.types';
|
||||
import { WsSocketWrapper } from './extensions/redis-sync/ws-socket-wrapper';
|
||||
import RedisClient from 'ioredis';
|
||||
import { pack, unpack } from 'msgpackr';
|
||||
@@ -99,36 +98,34 @@ export class CollaborationGateway {
|
||||
const serializedHTTPRequest = this.serializeRequest(request);
|
||||
const socketId = serializedHTTPRequest.headers['sec-websocket-key'];
|
||||
|
||||
// Create wrapper socket that only receives events via emit()
|
||||
// This prevents double-handling since Hocuspocus won't listen to raw WebSocket events
|
||||
const wrappedSocket = new WsSocketWrapper(client);
|
||||
|
||||
// Route through RedisSync extension (this calls handleConnection internally)
|
||||
this.redisSync.onSocketOpen(wrappedSocket, serializedHTTPRequest);
|
||||
this.redisSync.onSocketOpen(wrappedSocket as any, serializedHTTPRequest);
|
||||
|
||||
// Forward raw WebSocket messages to the extension
|
||||
client.on('message', (data: ArrayBuffer) => {
|
||||
this.redisSync!.onSocketMessage(serializedHTTPRequest, data);
|
||||
this.redisSync!.onSocketMessage(
|
||||
wrappedSocket as any,
|
||||
serializedHTTPRequest,
|
||||
data,
|
||||
);
|
||||
});
|
||||
|
||||
// Forward close events
|
||||
client.on('close', (code: number, reason: Buffer) => {
|
||||
this.redisSync!.onSocketClose(
|
||||
socketId,
|
||||
code,
|
||||
new Uint8Array(reason).buffer,
|
||||
);
|
||||
this.redisSync!.onSocketClose(socketId, code, reason.buffer as ArrayBuffer);
|
||||
});
|
||||
|
||||
// Forward pong events for keepalive
|
||||
client.on('pong', (data: Buffer) => {
|
||||
wrappedSocket.emit('pong', data);
|
||||
});
|
||||
} else {
|
||||
// Fallback to direct Hocuspocus connection
|
||||
const clientConnection = this.hocuspocus.handleConnection(
|
||||
client,
|
||||
toWebRequest(this.serializeRequest(request)),
|
||||
);
|
||||
|
||||
client.on('message', (data: Buffer) => {
|
||||
clientConnection.handleMessage(new Uint8Array(data));
|
||||
});
|
||||
|
||||
client.on('close', (code: number, reason: Buffer) => {
|
||||
clientConnection.handleClose({ code, reason: reason.toString() });
|
||||
});
|
||||
this.hocuspocus.handleConnection(client, request);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -181,7 +178,6 @@ export class CollaborationGateway {
|
||||
|
||||
if (this.hocuspocus.getDocumentsCount() === 0) resolve('');
|
||||
this.hocuspocus.closeConnections();
|
||||
this.hocuspocus.flushPendingStores();
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { StarterKit } from '@tiptap/starter-kit';
|
||||
import { Document } from '@tiptap/extension-document';
|
||||
import { TextAlign } from '@tiptap/extension-text-align';
|
||||
import { Superscript } from '@tiptap/extension-superscript';
|
||||
import SubScript from '@tiptap/extension-subscript';
|
||||
@@ -46,9 +45,6 @@ import {
|
||||
TransclusionSource,
|
||||
TransclusionReference,
|
||||
BaseEmbed,
|
||||
Footnotes,
|
||||
Footnote,
|
||||
FootnoteReference,
|
||||
} from '@docmost/editor-ext';
|
||||
import { generateText, getSchema, JSONContent } from '@tiptap/core';
|
||||
import { generateHTML, generateJSON } from '../common/helpers/prosemirror/html';
|
||||
@@ -62,15 +58,11 @@ import { Logger } from '@nestjs/common';
|
||||
|
||||
export const tiptapExtensions = [
|
||||
StarterKit.configure({
|
||||
document: false,
|
||||
codeBlock: false,
|
||||
link: false,
|
||||
trailingNode: false,
|
||||
heading: false,
|
||||
}),
|
||||
Document.extend({
|
||||
content: 'block+ footnotes?',
|
||||
}),
|
||||
Heading,
|
||||
UniqueID.configure({
|
||||
types: ['heading', 'paragraph', 'transclusionSource'],
|
||||
@@ -118,10 +110,7 @@ export const tiptapExtensions = [
|
||||
Status,
|
||||
TransclusionSource,
|
||||
TransclusionReference,
|
||||
BaseEmbed,
|
||||
Footnotes,
|
||||
Footnote,
|
||||
FootnoteReference,
|
||||
BaseEmbed
|
||||
] as any;
|
||||
|
||||
export function jsonToHtml(tiptapJson: any) {
|
||||
|
||||
@@ -96,7 +96,7 @@ export class PersistenceExtension implements Extension {
|
||||
}
|
||||
|
||||
async onStoreDocument(data: onStoreDocumentPayload) {
|
||||
const { documentName, document, lastContext } = data;
|
||||
const { documentName, document, context } = data;
|
||||
|
||||
const pageId = getPageId(documentName);
|
||||
|
||||
@@ -151,7 +151,7 @@ export class PersistenceExtension implements Extension {
|
||||
content: tiptapJson,
|
||||
textContent: textContent,
|
||||
ydoc: ydocState,
|
||||
lastUpdatedById: lastContext.user.id,
|
||||
lastUpdatedById: context.user.id,
|
||||
contributorIds: contributorIds,
|
||||
},
|
||||
pageId,
|
||||
@@ -169,12 +169,12 @@ export class PersistenceExtension implements Extension {
|
||||
JSON.stringify({
|
||||
type: 'page.updated',
|
||||
updatedAt: new Date().toISOString(),
|
||||
lastUpdatedById: lastContext?.user?.id,
|
||||
lastUpdatedBy: lastContext?.user
|
||||
lastUpdatedById: context?.user?.id,
|
||||
lastUpdatedBy: context?.user
|
||||
? {
|
||||
id: lastContext.user?.id,
|
||||
name: lastContext.user?.name,
|
||||
avatarUrl: lastContext.user?.avatarUrl,
|
||||
id: context.user?.id,
|
||||
name: context.user?.name,
|
||||
avatarUrl: context.user?.avatarUrl,
|
||||
}
|
||||
: undefined,
|
||||
}),
|
||||
|
||||
@@ -1,37 +1,61 @@
|
||||
import type RedisClient from 'ioredis';
|
||||
import type { WebSocketLike } from '@hocuspocus/server';
|
||||
import type { Pack, RSAMessageClose, RSAMessageSend } from './redis-sync.types';
|
||||
import { EventEmitter } from 'tseep';
|
||||
import type {
|
||||
Pack,
|
||||
RSAMessageClose,
|
||||
RSAMessagePing,
|
||||
RSAMessageSend,
|
||||
} from './redis-sync.types';
|
||||
|
||||
// Stands in for the client WebSocket on the server that owns the document.
|
||||
// Outgoing traffic is relayed over redis to the origin server, which holds the real socket.
|
||||
export class CollabProxySocket implements WebSocketLike {
|
||||
export class CollabProxySocket extends EventEmitter {
|
||||
private readonly replyTo: string;
|
||||
private readonly serverChannel: string;
|
||||
private readonly socketId: string;
|
||||
private pub: RedisClient;
|
||||
private readonly pack: Pack;
|
||||
readyState = 1;
|
||||
onClose?: (code?: number, reason?: string) => void;
|
||||
|
||||
constructor(pub: RedisClient, pack: Pack, replyTo: string, socketId: string) {
|
||||
constructor(
|
||||
pub: RedisClient,
|
||||
pack: Pack,
|
||||
replyTo: string,
|
||||
serverChannel: string,
|
||||
socketId: string,
|
||||
) {
|
||||
super();
|
||||
this.replyTo = replyTo;
|
||||
this.socketId = socketId;
|
||||
this.serverChannel = serverChannel;
|
||||
this.pub = pub;
|
||||
this.pack = pack;
|
||||
this.once('close', () => {
|
||||
this.readyState = 3;
|
||||
});
|
||||
}
|
||||
|
||||
private publish(msg: RSAMessageClose | RSAMessageSend) {
|
||||
private publish(msg: RSAMessageClose | RSAMessagePing | RSAMessageSend) {
|
||||
this.pub.publish(this.replyTo, this.pack(msg));
|
||||
}
|
||||
|
||||
// The origin server already closed the real socket; stop relaying without echoing a close back
|
||||
markClosed() {
|
||||
this.readyState = 3;
|
||||
}
|
||||
|
||||
close(code?: number, reason?: string) {
|
||||
if (this.readyState !== 1) return;
|
||||
this.readyState = 3;
|
||||
this.onClose?.(code, reason);
|
||||
const msg: RSAMessageClose = {
|
||||
type: 'close',
|
||||
code,
|
||||
reason,
|
||||
socketId: this.socketId,
|
||||
};
|
||||
this.publish(msg);
|
||||
}
|
||||
|
||||
ping() {
|
||||
if (this.readyState !== 1) return;
|
||||
const msg: RSAMessagePing = {
|
||||
type: 'ping',
|
||||
socketId: this.socketId,
|
||||
replyTo: this.serverChannel,
|
||||
};
|
||||
this.publish(msg);
|
||||
}
|
||||
|
||||
send(message: Uint8Array) {
|
||||
|
||||
@@ -3,30 +3,27 @@ import {
|
||||
Extension,
|
||||
Hocuspocus,
|
||||
IncomingMessage,
|
||||
afterUnloadDocumentPayload,
|
||||
onConfigurePayload,
|
||||
onLoadDocumentPayload,
|
||||
afterUnloadDocumentPayload,
|
||||
WebSocketLike,
|
||||
} from '@hocuspocus/server';
|
||||
import { ConnectionTimeout, Unauthorized } from '@hocuspocus/common';
|
||||
import RedisClient from 'ioredis';
|
||||
import { readVarString } from 'lib0/decoding.js';
|
||||
import { CollabProxySocket } from './collab-proxy-socket';
|
||||
import {
|
||||
BaseWebSocket,
|
||||
Configuration,
|
||||
CustomEvents,
|
||||
Pack,
|
||||
RSAMessage,
|
||||
RSAMessageClose,
|
||||
RSAMessageCloseProxy,
|
||||
RSAMessageCustomEventComplete,
|
||||
RSAMessageCustomEventStart,
|
||||
RSAMessagePong,
|
||||
RSAMessageProxy,
|
||||
RSAMessageUnload,
|
||||
SerializedHTTPRequest,
|
||||
Unpack,
|
||||
OriginConnection,
|
||||
ProxyConnection,
|
||||
toWebRequest,
|
||||
} from './redis-sync.types';
|
||||
|
||||
export type { Pack, SerializedHTTPRequest } from './redis-sync.types';
|
||||
@@ -41,10 +38,10 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
|
||||
private sub: RedisClient;
|
||||
private readonly pack: Pack;
|
||||
private readonly unpack: Unpack;
|
||||
private originConnections: Record<SocketId, OriginConnection> = {};
|
||||
private originSockets: Record<SocketId, BaseWebSocket> = {};
|
||||
private locks: Record<DocumentName, NodeJS.Timeout> = {};
|
||||
private lockPromises: Record<DocumentName, Promise<ServerId | null>> = {};
|
||||
private proxyConnections: Record<SocketId, ProxyConnection> = {};
|
||||
private proxySockets: Record<SocketId, CollabProxySocket> = {};
|
||||
private readonly prefix: string;
|
||||
private readonly lockPrefix: string;
|
||||
private readonly msgChannel: string;
|
||||
@@ -57,9 +54,6 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
|
||||
// @ts-ignore
|
||||
private pendingReplies: Record<number, PromiseWithResolvers<any>['resolve']> =
|
||||
{};
|
||||
private deriveContext: (
|
||||
serializedHTTPRequest: SerializedHTTPRequest,
|
||||
) => Record<string, any>;
|
||||
|
||||
constructor(configuration: Configuration<TCE>) {
|
||||
const {
|
||||
@@ -71,7 +65,6 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
|
||||
prefix,
|
||||
customEvents,
|
||||
customEventTTL,
|
||||
deriveContext,
|
||||
} = configuration;
|
||||
this.pub = redis.duplicate();
|
||||
this.sub = redis.duplicate();
|
||||
@@ -84,7 +77,6 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
|
||||
this.lockPrefix = `${this.prefix}Lock`;
|
||||
this.msgChannel = `${this.prefix}Msg`;
|
||||
this.customEvents = (customEvents as any) ?? ({} as any as CustomEvents);
|
||||
this.deriveContext = deriveContext ?? (() => ({}));
|
||||
this.sub.subscribe(this.msgChannel, `${this.msgChannel}:${this.serverId}`);
|
||||
this.sub.on('messageBuffer', this.handleRedisMessage);
|
||||
this.pub.on('error', () => {});
|
||||
@@ -95,63 +87,44 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
|
||||
}
|
||||
|
||||
private closeProxy(socketId: string) {
|
||||
const entry = this.proxyConnections[socketId];
|
||||
if (entry) {
|
||||
delete this.proxyConnections[socketId];
|
||||
const { socket, clientConnection } = entry;
|
||||
// The origin socket is already gone; don't echo a close message back
|
||||
socket.markClosed();
|
||||
clientConnection.handleClose({
|
||||
code: 1000,
|
||||
reason: 'provider_initiated',
|
||||
});
|
||||
const proxySocket = this.proxySockets[socketId];
|
||||
if (proxySocket) {
|
||||
proxySocket.emit(
|
||||
'close',
|
||||
1000,
|
||||
Buffer.from('provider_initiated', 'utf-8'),
|
||||
);
|
||||
delete this.proxySockets[socketId];
|
||||
}
|
||||
}
|
||||
|
||||
private pongProxy(socketId: string) {
|
||||
this.proxySockets[socketId]?.emit('pong');
|
||||
}
|
||||
|
||||
private handleProxyMessage(
|
||||
msg: Pick<RSAMessageProxy, 'replyTo' | 'message' | 'serializedHTTPRequest'>,
|
||||
) {
|
||||
const { replyTo, message, serializedHTTPRequest } = msg;
|
||||
const { headers } = serializedHTTPRequest;
|
||||
const socketId = headers['sec-websocket-key'];
|
||||
let entry = this.proxyConnections[socketId];
|
||||
if (!entry) {
|
||||
const socket = new CollabProxySocket(
|
||||
const socketId = headers['sec-websocket-key']!;
|
||||
let socket = this.proxySockets[socketId];
|
||||
if (!socket) {
|
||||
socket = new CollabProxySocket(
|
||||
this.pub,
|
||||
this.pack,
|
||||
replyTo,
|
||||
`${this.msgChannel}:${this.serverId}`,
|
||||
socketId,
|
||||
);
|
||||
// A proxy connection with no live documents (client left the page, auth
|
||||
// failed, or the origin server crashed) is reaped by hocuspocus' message
|
||||
// timeout. Dispose it silently in that case: relaying the timeout close
|
||||
// to the origin would kill the client's real socket, which may be busy
|
||||
// serving other documents. Genuine protocol closes are still relayed.
|
||||
socket.onClose = (code, reason) => {
|
||||
delete this.proxyConnections[socketId];
|
||||
if (code !== ConnectionTimeout.code) {
|
||||
const msg: RSAMessageClose = {
|
||||
type: 'close',
|
||||
code,
|
||||
reason,
|
||||
socketId,
|
||||
};
|
||||
this.pub.publish(replyTo, this.pack(msg));
|
||||
}
|
||||
};
|
||||
const clientConnection = this.instance.handleConnection(
|
||||
socket,
|
||||
toWebRequest(serializedHTTPRequest),
|
||||
this.deriveContext(serializedHTTPRequest),
|
||||
this.proxySockets[socketId] = socket;
|
||||
this.instance.handleConnection(
|
||||
socket as any,
|
||||
serializedHTTPRequest as any,
|
||||
{},
|
||||
);
|
||||
entry = { clientConnection, socket };
|
||||
this.proxyConnections[socketId] = entry;
|
||||
}
|
||||
entry.clientConnection.handleMessage(message);
|
||||
}
|
||||
|
||||
private getLock(documentName: string) {
|
||||
return this.pub.get(this.getKey(documentName));
|
||||
socket.emit('message', message);
|
||||
}
|
||||
|
||||
private getOrClaimLock(documentName: string) {
|
||||
@@ -193,6 +166,10 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
|
||||
this.closeProxy(msg.socketId);
|
||||
return;
|
||||
}
|
||||
if (type === 'pong') {
|
||||
this.pongProxy(msg.socketId);
|
||||
return;
|
||||
}
|
||||
if (type === 'unload') {
|
||||
delete this.lockPromises[msg.documentName];
|
||||
return;
|
||||
@@ -221,14 +198,22 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
|
||||
return;
|
||||
}
|
||||
const { socketId } = msg;
|
||||
const entry = this.originConnections[socketId];
|
||||
if (!entry) {
|
||||
const socket = this.originSockets[socketId];
|
||||
if (!socket) {
|
||||
// origin socket already cleaned up
|
||||
return;
|
||||
}
|
||||
const { socket } = entry;
|
||||
if (type === 'close') {
|
||||
socket.close(msg.code, msg.reason);
|
||||
} else if (type === 'ping') {
|
||||
// Reply instantly to the proxy socket, without forwarding to client
|
||||
// The origin socket handles heartbeat for itself
|
||||
const { replyTo, socketId } = msg;
|
||||
const reply: RSAMessagePong = {
|
||||
type: 'pong',
|
||||
socketId,
|
||||
};
|
||||
this.pub.publish(`${replyTo}`, this.pack(reply));
|
||||
} else if (type === 'send') {
|
||||
socket.send(msg.message);
|
||||
}
|
||||
@@ -266,8 +251,6 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
|
||||
eventName: TName,
|
||||
documentName: string,
|
||||
payload: any,
|
||||
// if true, don't claim the lock. Useful for targeting pages that are currently open
|
||||
onlyIfOpen = false,
|
||||
) {
|
||||
const isDocLoadedOnInstance = this.instance.documents.has(documentName);
|
||||
|
||||
@@ -275,14 +258,7 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
|
||||
return this.handleEventLocally(eventName, documentName, payload);
|
||||
}
|
||||
|
||||
const proxyTo = await (onlyIfOpen
|
||||
? this.getLock(documentName)
|
||||
: this.getOrClaimLockThrottled(documentName));
|
||||
|
||||
if (!proxyTo && onlyIfOpen) {
|
||||
return;
|
||||
}
|
||||
|
||||
const proxyTo = await this.getOrClaimLockThrottled(documentName);
|
||||
if (proxyTo && proxyTo !== this.serverId) {
|
||||
++this.replyIdCounter; // bug in biome thinks this.replyIdCounter is not used if written on the line below
|
||||
const replyId = this.replyIdCounter;
|
||||
@@ -301,8 +277,7 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
|
||||
const { promise, resolve, reject } = Promise.withResolvers();
|
||||
this.pendingReplies[replyId] = resolve;
|
||||
setTimeout(() => {
|
||||
delete this.pendingReplies[replyId];
|
||||
reject(new Error('TIMEOUT'));
|
||||
reject('TIMEOUT');
|
||||
}, this.customEventTTL);
|
||||
return promise as Promise<ReturnType<TCE[TName]>>;
|
||||
}
|
||||
@@ -321,59 +296,36 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
|
||||
|
||||
/* WebSocket Server Hooks */
|
||||
onSocketOpen(
|
||||
ws: WebSocketLike,
|
||||
ws: BaseWebSocket,
|
||||
serializedHTTPRequest: SerializedHTTPRequest,
|
||||
context = {},
|
||||
) {
|
||||
const socketId = serializedHTTPRequest.headers['sec-websocket-key'];
|
||||
const clientConnection = this.instance.handleConnection(
|
||||
ws,
|
||||
toWebRequest(serializedHTTPRequest),
|
||||
this.deriveContext(serializedHTTPRequest),
|
||||
const socketId = serializedHTTPRequest.headers['sec-websocket-key']!;
|
||||
this.originSockets[socketId] = ws;
|
||||
this.instance.handleConnection(
|
||||
ws as any,
|
||||
serializedHTTPRequest as any,
|
||||
context,
|
||||
);
|
||||
this.originConnections[socketId] = { clientConnection, socket: ws };
|
||||
}
|
||||
|
||||
async onSocketMessage(
|
||||
ws: BaseWebSocket,
|
||||
serializedHTTPRequest: SerializedHTTPRequest,
|
||||
detachableMsg: ArrayBuffer,
|
||||
) {
|
||||
const socketId = serializedHTTPRequest.headers['sec-websocket-key'];
|
||||
const entry = this.originConnections[socketId];
|
||||
if (!entry) return;
|
||||
const { clientConnection } = entry;
|
||||
|
||||
let message: Uint8Array;
|
||||
let documentName: string;
|
||||
try {
|
||||
message = new Uint8Array(detachableMsg.slice());
|
||||
const tmpMsg = new IncomingMessage(detachableMsg);
|
||||
const documentNameAndSessionId = tmpMsg.readVarString();
|
||||
// session-aware providers suffix the documentName with \0sessionId
|
||||
const sepIdx = documentNameAndSessionId.indexOf('\0');
|
||||
documentName =
|
||||
sepIdx === -1
|
||||
? documentNameAndSessionId
|
||||
: documentNameAndSessionId.slice(0, sepIdx);
|
||||
} catch (error) {
|
||||
entry.socket.close(Unauthorized.code, Unauthorized.reason);
|
||||
return;
|
||||
}
|
||||
const message = new Uint8Array(detachableMsg.slice());
|
||||
const tmpMsg = new IncomingMessage(detachableMsg);
|
||||
const documentName = readVarString(tmpMsg.decoder);
|
||||
const isDocLoadedOnInstance = this.instance.documents.has(documentName);
|
||||
|
||||
if (isDocLoadedOnInstance) {
|
||||
clientConnection.handleMessage(message);
|
||||
ws.emit('message', message);
|
||||
return;
|
||||
}
|
||||
|
||||
const proxyTo = await this.getOrClaimLockThrottled(documentName);
|
||||
if (proxyTo && proxyTo !== this.serverId) {
|
||||
// Proxied messages bypass handleMessage, so refresh the connection's
|
||||
// liveness fields manually or hocuspocus' message timeout would reap the
|
||||
// real socket every `timeout` ms. connectionEstablishedAt is the
|
||||
// reference while unauthenticated (auth for remote docs is proxied too)
|
||||
// and is private upstream.
|
||||
clientConnection.lastMessageReceivedAt = Date.now();
|
||||
(clientConnection as any).connectionEstablishedAt = Date.now();
|
||||
// another server owns the doc
|
||||
const proxyMessage: RSAMessageProxy = {
|
||||
serializedHTTPRequest: serializedHTTPRequest,
|
||||
@@ -386,17 +338,16 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
|
||||
return;
|
||||
}
|
||||
// This server owns the document, but hocuspocus hasn't loaded it yet
|
||||
clientConnection.handleMessage(message);
|
||||
ws.emit('message', message);
|
||||
}
|
||||
|
||||
onSocketClose(socketId: string, code?: number, reason?: ArrayBuffer) {
|
||||
const entry = this.originConnections[socketId];
|
||||
if (!entry) return;
|
||||
delete this.originConnections[socketId];
|
||||
entry.clientConnection.handleClose({
|
||||
code: code ?? 1000,
|
||||
reason: reason ? Buffer.from(reason).toString() : '',
|
||||
});
|
||||
const socket = this.originSockets[socketId];
|
||||
if (!socket) return;
|
||||
// at this point the socket is considered GC'd and we cannot call close
|
||||
// The origin socket did not set up any connections for the proxy, so none of the hooks will work if we just emit
|
||||
socket?.emit('close', code, reason);
|
||||
delete this.originSockets[socketId];
|
||||
const msg: RSAMessageCloseProxy = { type: 'closeProxy', socketId };
|
||||
this.pub.publish(this.msgChannel, this.pack(msg)).catch(() => {});
|
||||
}
|
||||
@@ -421,7 +372,6 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
|
||||
}
|
||||
|
||||
async onDestroy() {
|
||||
this.pendingReplies = {};
|
||||
this.pub.disconnect(false);
|
||||
this.sub.disconnect(false);
|
||||
}
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
import EventEmitter from 'node:events';
|
||||
import { IncomingHttpHeaders } from 'node:http2';
|
||||
import RedisClient from 'ioredis';
|
||||
import { CollabProxySocket } from './collab-proxy-socket';
|
||||
import { type Hocuspocus, type WebSocketLike } from '@hocuspocus/server';
|
||||
|
||||
export type SecondParam<T> = T extends (
|
||||
arg1: any,
|
||||
arg1: unknown,
|
||||
arg2: infer A,
|
||||
...args: any[]
|
||||
) => any
|
||||
...args: unknown[]
|
||||
) => unknown
|
||||
? A
|
||||
: never;
|
||||
|
||||
@@ -42,6 +41,17 @@ export type RSAMessageClose = {
|
||||
socketId: string;
|
||||
};
|
||||
|
||||
export type RSAMessagePing = {
|
||||
type: 'ping';
|
||||
socketId: string;
|
||||
replyTo: string;
|
||||
};
|
||||
|
||||
export type RSAMessagePong = {
|
||||
type: 'pong';
|
||||
socketId: string;
|
||||
};
|
||||
|
||||
export type RSAMessageSend = {
|
||||
type: 'send';
|
||||
// @ts-ignore
|
||||
@@ -49,7 +59,7 @@ export type RSAMessageSend = {
|
||||
socketId: string;
|
||||
};
|
||||
|
||||
export type RSAMessageCustomEventStart<TName = string, TPayload = any> = {
|
||||
export type RSAMessageCustomEventStart<TName = string, TPayload = unknown> = {
|
||||
type: 'customEventStart';
|
||||
documentName: string;
|
||||
eventName: TName;
|
||||
@@ -61,7 +71,7 @@ export type RSAMessageCustomEventStart<TName = string, TPayload = any> = {
|
||||
export type RSAMessageCustomEventComplete = {
|
||||
type: 'customEventComplete';
|
||||
replyId: number;
|
||||
payload: any;
|
||||
payload: unknown;
|
||||
};
|
||||
|
||||
export type RSAMessage =
|
||||
@@ -69,6 +79,8 @@ export type RSAMessage =
|
||||
| RSAMessageCloseProxy
|
||||
| RSAMessageUnload
|
||||
| RSAMessageClose
|
||||
| RSAMessagePing
|
||||
| RSAMessagePong
|
||||
| RSAMessageSend
|
||||
| RSAMessageCustomEventStart
|
||||
| RSAMessageCustomEventComplete;
|
||||
@@ -87,20 +99,9 @@ type CustomEventName = string;
|
||||
|
||||
export type CustomEvents = Record<
|
||||
CustomEventName,
|
||||
(documentName: string, payload: any) => Promise<any>
|
||||
(documentName: string, payload: unknown) => Promise<unknown>
|
||||
>;
|
||||
|
||||
// Not exported by @hocuspocus/server
|
||||
export type ClientConnection = ReturnType<Hocuspocus['handleConnection']>;
|
||||
export type OriginConnection = {
|
||||
clientConnection: ClientConnection;
|
||||
socket: WebSocketLike;
|
||||
};
|
||||
export type ProxyConnection = {
|
||||
clientConnection: ClientConnection;
|
||||
socket: CollabProxySocket;
|
||||
};
|
||||
|
||||
export interface Configuration<TCE> {
|
||||
redis: RedisClient;
|
||||
pack: Pack;
|
||||
@@ -110,29 +111,11 @@ export interface Configuration<TCE> {
|
||||
customEventTTL?: number;
|
||||
prefix?: string;
|
||||
customEvents?: TCE;
|
||||
// Derive the hocuspocus context once per socket instead of re-deriving it in a
|
||||
// per-document hook like onConnect/onAuthenticate. Runs on the origin server when
|
||||
// the socket opens and on the doc owner when the first proxied message arrives.
|
||||
deriveContext?: (
|
||||
serializedHTTPRequest: SerializedHTTPRequest,
|
||||
) => Record<string, any>;
|
||||
}
|
||||
|
||||
// Hocuspocus expects a web-standard Request, so rehydrate one from what crossed the wire
|
||||
export const toWebRequest = (serializedHTTPRequest: SerializedHTTPRequest) => {
|
||||
const { method, url, headers } = serializedHTTPRequest;
|
||||
const webHeaders = new Headers();
|
||||
Object.entries(headers).forEach(([name, value]) => {
|
||||
if (Array.isArray(value)) {
|
||||
value.forEach((v) => {
|
||||
webHeaders.append(name, v);
|
||||
});
|
||||
} else if (value !== undefined) {
|
||||
webHeaders.set(name, value);
|
||||
}
|
||||
});
|
||||
return new Request(new URL(url, 'http://localhost'), {
|
||||
method,
|
||||
headers: webHeaders,
|
||||
});
|
||||
export type BaseWebSocket = EventEmitter & {
|
||||
readyState: number;
|
||||
close(code?: number, reason?: string): void;
|
||||
ping(): void;
|
||||
send(message: Uint8Array): void;
|
||||
};
|
||||
|
||||
@@ -1,17 +1,20 @@
|
||||
import { EventEmitter } from 'events';
|
||||
import type WebSocket from 'ws';
|
||||
import type { WebSocketLike } from '@hocuspocus/server';
|
||||
|
||||
/**
|
||||
* Wrapper around ws WebSocket that Hocuspocus only writes to.
|
||||
* Incoming socket events are forwarded separately by the gateway,
|
||||
* which prevents double-handling with RedisSyncExtension.
|
||||
* Wrapper around ws WebSocket that only receives events via emit().
|
||||
* This prevents double-handling when used with RedisSyncExtension.
|
||||
*/
|
||||
export class WsSocketWrapper implements WebSocketLike {
|
||||
export class WsSocketWrapper extends EventEmitter {
|
||||
private ws: WebSocket;
|
||||
readyState = 1;
|
||||
|
||||
constructor(ws: WebSocket) {
|
||||
super();
|
||||
this.ws = ws;
|
||||
this.once('close', () => {
|
||||
this.readyState = 3;
|
||||
});
|
||||
}
|
||||
|
||||
close(code?: number, reason?: string) {
|
||||
@@ -24,6 +27,15 @@ export class WsSocketWrapper implements WebSocketLike {
|
||||
}
|
||||
}
|
||||
|
||||
ping() {
|
||||
if (this.readyState !== 1) return;
|
||||
try {
|
||||
this.ws.ping();
|
||||
} catch (e) {
|
||||
// Socket already closed
|
||||
}
|
||||
}
|
||||
|
||||
send(message: Uint8Array) {
|
||||
if (this.readyState !== 1) return;
|
||||
try {
|
||||
|
||||
@@ -446,9 +446,10 @@ export class PageService {
|
||||
}
|
||||
|
||||
if (pageIdsToMove.length > 0) {
|
||||
// Clear page-level permissions - moved pages inherit destination space permissions
|
||||
// (page_permissions cascade deletes via foreign key)
|
||||
await trx
|
||||
.updateTable('pageAccess')
|
||||
.set({ spaceId: spaceId })
|
||||
.deleteFrom('pageAccess')
|
||||
.where('pageId', 'in', pageIdsToMove)
|
||||
.execute();
|
||||
|
||||
@@ -810,10 +811,6 @@ export class PageService {
|
||||
throw new BadRequestException('Invalid move position');
|
||||
}
|
||||
|
||||
if (dto.parentPageId && dto.parentPageId === dto.pageId) {
|
||||
throw new BadRequestException('A page cannot be its own parent');
|
||||
}
|
||||
|
||||
let parentPageId = null;
|
||||
if (movedPage.parentPageId === dto.parentPageId) {
|
||||
parentPageId = undefined;
|
||||
|
||||
+1
-1
Submodule apps/server/src/ee updated: c7b77ffb9e...4669109a18
@@ -102,10 +102,8 @@ export class ImportService {
|
||||
throw new BadRequestException(message);
|
||||
}
|
||||
|
||||
const { title, prosemirrorJson } = this.extractTitleAndRemoveHeading(
|
||||
prosemirrorState,
|
||||
{ anyHeadingLevel: true },
|
||||
);
|
||||
const { title, prosemirrorJson } =
|
||||
this.extractTitleAndRemoveHeading(prosemirrorState);
|
||||
|
||||
const pageTitle = title || fileName;
|
||||
|
||||
@@ -248,29 +246,18 @@ export class ImportService {
|
||||
return null;
|
||||
}
|
||||
|
||||
extractTitleAndRemoveHeading(
|
||||
prosemirrorState: any,
|
||||
opts?: { anyHeadingLevel?: boolean },
|
||||
) {
|
||||
extractTitleAndRemoveHeading(prosemirrorState: any) {
|
||||
let title: string | null = null;
|
||||
|
||||
const content = prosemirrorState.content ?? [];
|
||||
const firstNode = content[0];
|
||||
|
||||
const isTitleHeading =
|
||||
firstNode?.type === 'heading' &&
|
||||
(opts?.anyHeadingLevel || firstNode.attrs?.level === 1);
|
||||
|
||||
if (isTitleHeading) {
|
||||
const headingText = (firstNode.content ?? [])
|
||||
.map((node: any) => node.text ?? '')
|
||||
.join('')
|
||||
.trim();
|
||||
|
||||
if (headingText) {
|
||||
title = headingText;
|
||||
content.shift();
|
||||
}
|
||||
if (
|
||||
content.length > 0 &&
|
||||
content[0].type === 'heading' &&
|
||||
content[0].attrs?.level === 1
|
||||
) {
|
||||
title = content[0].content?.[0]?.text ?? null;
|
||||
content.shift();
|
||||
}
|
||||
|
||||
// ensure at least one paragraph
|
||||
|
||||
@@ -15,21 +15,13 @@ import { getMimeType } from '../../../common/helpers';
|
||||
import { Upload } from '@aws-sdk/lib-storage';
|
||||
import { Logger } from '@nestjs/common';
|
||||
|
||||
const S3_MAX_SOCKETS = parseInt(process.env.AWS_S3_MAX_SOCKETS) || 200;
|
||||
|
||||
export class S3Driver implements StorageDriver {
|
||||
private readonly s3Client: S3Client;
|
||||
private readonly config: S3StorageConfig;
|
||||
|
||||
constructor(config: S3StorageConfig) {
|
||||
this.config = {
|
||||
...config,
|
||||
requestHandler: {
|
||||
httpAgent: { maxSockets: S3_MAX_SOCKETS },
|
||||
httpsAgent: { maxSockets: S3_MAX_SOCKETS },
|
||||
},
|
||||
};
|
||||
this.s3Client = new S3Client(this.config as any);
|
||||
this.config = config;
|
||||
this.s3Client = new S3Client(config as any);
|
||||
}
|
||||
|
||||
async upload(filePath: string, file: Buffer | Readable): Promise<void> {
|
||||
|
||||
+83
-40
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "docmost",
|
||||
"homepage": "https://docmost.com",
|
||||
"version": "0.95.0",
|
||||
"version": "0.90.1",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"build": "nx run-many -t build",
|
||||
@@ -23,49 +23,47 @@
|
||||
"@casl/ability": "6.8.0",
|
||||
"@docmost/editor-ext": "workspace:*",
|
||||
"@floating-ui/dom": "1.7.3",
|
||||
"@hocuspocus/common": "4.5.0",
|
||||
"@hocuspocus/provider": "4.5.0",
|
||||
"@hocuspocus/provider-react": "4.5.0",
|
||||
"@hocuspocus/server": "4.5.0",
|
||||
"@hocuspocus/transformer": "4.5.0",
|
||||
"@hocuspocus/provider": "3.4.4",
|
||||
"@hocuspocus/server": "3.4.4",
|
||||
"@hocuspocus/transformer": "3.4.4",
|
||||
"@joplin/turndown": "4.0.82",
|
||||
"@joplin/turndown-plugin-gfm": "1.0.64",
|
||||
"@sindresorhus/slugify": "3.0.0",
|
||||
"@tiptap/core": "3.29.2",
|
||||
"@tiptap/extension-audio": "3.29.2",
|
||||
"@tiptap/extension-code-block": "3.29.2",
|
||||
"@tiptap/extension-collaboration": "3.29.2",
|
||||
"@tiptap/extension-collaboration-caret": "3.29.2",
|
||||
"@tiptap/extension-color": "3.29.2",
|
||||
"@tiptap/extension-document": "3.29.2",
|
||||
"@tiptap/extension-heading": "3.29.2",
|
||||
"@tiptap/extension-highlight": "3.29.2",
|
||||
"@tiptap/extension-history": "3.29.2",
|
||||
"@tiptap/extension-image": "3.29.2",
|
||||
"@tiptap/extension-link": "3.29.2",
|
||||
"@tiptap/extension-list": "3.29.2",
|
||||
"@tiptap/extension-placeholder": "3.29.2",
|
||||
"@tiptap/extension-subscript": "3.29.2",
|
||||
"@tiptap/extension-superscript": "3.29.2",
|
||||
"@tiptap/extension-table": "3.29.2",
|
||||
"@tiptap/extension-text": "3.29.2",
|
||||
"@tiptap/extension-text-align": "3.29.2",
|
||||
"@tiptap/extension-text-style": "3.29.2",
|
||||
"@tiptap/extension-typography": "3.29.2",
|
||||
"@tiptap/extension-unique-id": "3.29.2",
|
||||
"@tiptap/extension-youtube": "3.29.2",
|
||||
"@tiptap/html": "3.29.2",
|
||||
"@tiptap/pm": "3.29.2",
|
||||
"@tiptap/react": "3.29.2",
|
||||
"@tiptap/starter-kit": "3.29.2",
|
||||
"@tiptap/suggestion": "3.29.2",
|
||||
"@tiptap/y-tiptap": "3.0.7",
|
||||
"@tiptap/core": "3.27.1",
|
||||
"@tiptap/extension-audio": "3.27.1",
|
||||
"@tiptap/extension-code-block": "3.27.1",
|
||||
"@tiptap/extension-collaboration": "3.27.1",
|
||||
"@tiptap/extension-collaboration-caret": "3.27.1",
|
||||
"@tiptap/extension-color": "3.27.1",
|
||||
"@tiptap/extension-document": "3.27.1",
|
||||
"@tiptap/extension-heading": "3.27.1",
|
||||
"@tiptap/extension-highlight": "3.27.1",
|
||||
"@tiptap/extension-history": "3.27.1",
|
||||
"@tiptap/extension-image": "3.27.1",
|
||||
"@tiptap/extension-link": "3.27.1",
|
||||
"@tiptap/extension-list": "3.27.1",
|
||||
"@tiptap/extension-placeholder": "3.27.1",
|
||||
"@tiptap/extension-subscript": "3.27.1",
|
||||
"@tiptap/extension-superscript": "3.27.1",
|
||||
"@tiptap/extension-table": "3.27.1",
|
||||
"@tiptap/extension-text": "3.27.1",
|
||||
"@tiptap/extension-text-align": "3.27.1",
|
||||
"@tiptap/extension-text-style": "3.27.1",
|
||||
"@tiptap/extension-typography": "3.27.1",
|
||||
"@tiptap/extension-unique-id": "3.27.1",
|
||||
"@tiptap/extension-youtube": "3.27.1",
|
||||
"@tiptap/html": "3.27.1",
|
||||
"@tiptap/pm": "3.27.1",
|
||||
"@tiptap/react": "3.27.1",
|
||||
"@tiptap/starter-kit": "3.27.1",
|
||||
"@tiptap/suggestion": "3.27.1",
|
||||
"@tiptap/y-tiptap": "3.0.5",
|
||||
"bytes": "3.1.2",
|
||||
"cross-env": "10.1.0",
|
||||
"date-fns": "4.1.0",
|
||||
"diff": "8.0.3",
|
||||
"docx": "9.7.1",
|
||||
"dompurify": "3.4.13",
|
||||
"dompurify": "3.4.11",
|
||||
"fractional-indexing-jittered": "1.0.0",
|
||||
"highlight.js": "11.11.1",
|
||||
"image-dimensions": "2.5.0",
|
||||
@@ -81,12 +79,12 @@
|
||||
"yjs": "^13.6.30"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nx/js": "23.1.1",
|
||||
"@nx/js": "22.6.1",
|
||||
"@types/bytes": "3.1.5",
|
||||
"@types/qrcode": "1.5.6",
|
||||
"@types/turndown": "5.0.6",
|
||||
"concurrently": "10.0.4",
|
||||
"nx": "23.1.1",
|
||||
"concurrently": "9.2.3",
|
||||
"nx": "22.6.1",
|
||||
"tsx": "^4.21.0"
|
||||
},
|
||||
"workspaces": {
|
||||
@@ -95,5 +93,50 @@
|
||||
"packages/*"
|
||||
]
|
||||
},
|
||||
"packageManager": "pnpm@11.15.1"
|
||||
"packageManager": "pnpm@10.4.0",
|
||||
"pnpm": {
|
||||
"patchedDependencies": {
|
||||
"scimmy@1.3.5": "patches/scimmy@1.3.5.patch"
|
||||
},
|
||||
"overrides": {
|
||||
"prosemirror-changeset": "2.4.0",
|
||||
"y-prosemirror": "1.3.7",
|
||||
"glob": "13.0.6",
|
||||
"ws": "8.21.0",
|
||||
"dompurify": "3.4.11",
|
||||
"tmp": "0.2.7",
|
||||
"hono": "4.12.25",
|
||||
"mermaid": "11.15.0",
|
||||
"nanoid@^3": "3.3.8",
|
||||
"socket.io-parser": "4.2.6",
|
||||
"serialize-javascript": "7.0.3",
|
||||
"lodash-es": "4.18.1",
|
||||
"lodash": "4.18.1",
|
||||
"@hono/node-server": "1.19.13",
|
||||
"undici": "7.28.0",
|
||||
"ajv@^6": "6.14.0",
|
||||
"ajv@^8": "8.18.0",
|
||||
"underscore": "1.13.8",
|
||||
"immutable": "4.3.8",
|
||||
"express-rate-limit": "8.2.2",
|
||||
"minimatch@^3": "3.1.5",
|
||||
"minimatch@^5": "5.1.8",
|
||||
"flatted": "3.4.2",
|
||||
"picomatch@<2.3.2": "2.3.2",
|
||||
"picomatch@>=4.0.0 <4.0.4": "4.0.4",
|
||||
"fastify": "5.8.5",
|
||||
"yaml@>=1.0.0 <1.10.3": "1.10.3",
|
||||
"yaml@>=2.0.0 <2.8.3": "2.8.3",
|
||||
"path-to-regexp@^8": "8.4.0",
|
||||
"brace-expansion@^5": "5.0.6",
|
||||
"@xmldom/xmldom": "0.8.13",
|
||||
"handlebars": "4.7.9",
|
||||
"axios": "1.16.0",
|
||||
"langsmith": "0.7.0",
|
||||
"follow-redirects": "1.16.0",
|
||||
"protobufjs": "7.5.8",
|
||||
"ip-address": "10.1.1"
|
||||
},
|
||||
"neverBuiltDependencies": []
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,7 +32,6 @@ export * from "./lib/columns";
|
||||
export * from "./lib/status";
|
||||
export * from "./lib/pdf";
|
||||
export * from "./lib/page-break";
|
||||
export * from "./lib/footnotes";
|
||||
export * from "./lib/resizable-nodeview";
|
||||
export {
|
||||
pageNodeToDocxBuffer,
|
||||
|
||||
@@ -1,189 +0,0 @@
|
||||
//Source MIT - https://github.com/buttondown/tiptap-footnotes
|
||||
import { mergeAttributes } from "@tiptap/core";
|
||||
import ListItem, { ListItemOptions } from "@tiptap/extension-list-item";
|
||||
|
||||
declare module "@tiptap/core" {
|
||||
interface Commands<ReturnType> {
|
||||
footnote: {
|
||||
/**
|
||||
* scrolls to & sets the text selection at the end of the footnote with the given id
|
||||
* @param id the id of the footote (i.e. the `data-id` attribute value of the footnote)
|
||||
* @example editor.commands.focusFootnote("a43956c1-1ab8-462f-96e4-be3a4b27fd50")
|
||||
*/
|
||||
focusFootnote: (id: string) => ReturnType;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
export interface FootnoteOptions extends ListItemOptions {
|
||||
/**
|
||||
* Content expression for this node
|
||||
* @default "paragraph+"
|
||||
*/
|
||||
content: string;
|
||||
}
|
||||
|
||||
const Footnote = ListItem.extend<FootnoteOptions>({
|
||||
name: "footnote",
|
||||
content() {
|
||||
return this.options.content;
|
||||
},
|
||||
isolating: true,
|
||||
defining: true,
|
||||
draggable: false,
|
||||
|
||||
addOptions() {
|
||||
return {
|
||||
HTMLAttributes: {},
|
||||
bulletListTypeName: 'bulletList',
|
||||
orderedListTypeName: 'orderedList',
|
||||
...this.parent?.(),
|
||||
content: "paragraph+",
|
||||
};
|
||||
},
|
||||
|
||||
addAttributes() {
|
||||
return {
|
||||
id: {
|
||||
isRequired: true,
|
||||
},
|
||||
// the data-id field should match the data-id field of a footnote reference.
|
||||
// it's used to link footnotes and references together.
|
||||
"data-id": {
|
||||
isRequired: true,
|
||||
},
|
||||
};
|
||||
},
|
||||
parseHTML() {
|
||||
return [
|
||||
{
|
||||
tag: "li",
|
||||
getAttrs(node) {
|
||||
const id = node.getAttribute("data-id");
|
||||
if (id) {
|
||||
return {
|
||||
"data-id": node.getAttribute("data-id"),
|
||||
};
|
||||
}
|
||||
return false;
|
||||
},
|
||||
priority: 1000,
|
||||
},
|
||||
];
|
||||
},
|
||||
renderHTML({ HTMLAttributes }) {
|
||||
return [
|
||||
"li",
|
||||
mergeAttributes(this.options.HTMLAttributes, HTMLAttributes),
|
||||
0,
|
||||
];
|
||||
},
|
||||
|
||||
addCommands() {
|
||||
return {
|
||||
focusFootnote:
|
||||
(id: string) =>
|
||||
({ editor, chain }) => {
|
||||
const matchedFootnote = editor.$node("footnote", {
|
||||
"data-id": id,
|
||||
});
|
||||
if (matchedFootnote) {
|
||||
// sets the text selection to the end of the footnote definition and scroll to it.
|
||||
chain()
|
||||
.focus()
|
||||
.setTextSelection(
|
||||
matchedFootnote.from + matchedFootnote.content.size
|
||||
)
|
||||
.run();
|
||||
|
||||
matchedFootnote.element.scrollIntoView();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
};
|
||||
},
|
||||
addKeyboardShortcuts() {
|
||||
return {
|
||||
// when inside a footnote, Mod-a should select only the footnote content
|
||||
"Mod-a": ({ editor }) => {
|
||||
try {
|
||||
const { selection } = editor.state;
|
||||
const { $from } = selection;
|
||||
|
||||
for (let depth = $from.depth; depth >= 0; depth--) {
|
||||
const node = $from.node(depth);
|
||||
if (node.type.name === "footnote") {
|
||||
const start = $from.start(depth);
|
||||
const end = $from.end(depth);
|
||||
|
||||
editor.commands.setTextSelection({
|
||||
from: start + 1,
|
||||
to: end - 1,
|
||||
});
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
} catch (e) {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
// when the user presses tab, adjust the text selection to be at the end of the next footnote
|
||||
Tab: ({ editor }) => {
|
||||
try {
|
||||
const { selection } = editor.state;
|
||||
const pos = editor.$pos(selection.anchor);
|
||||
if (!pos.after) return false;
|
||||
// if the next node is "footnotes", place the text selection at the end of the first footnote
|
||||
if (pos.after.node.type.name == "footnotes") {
|
||||
const firstChild = pos.after.node.child(0);
|
||||
editor
|
||||
.chain()
|
||||
.setTextSelection(pos.after.from + firstChild.content.size)
|
||||
.scrollIntoView()
|
||||
.run();
|
||||
return true;
|
||||
} else {
|
||||
const startPos = selection.$from.start(2);
|
||||
if (Number.isNaN(startPos)) return false;
|
||||
const parent = editor.$pos(startPos);
|
||||
if (parent.node.type.name != "footnote" || !parent.after) {
|
||||
return false;
|
||||
}
|
||||
// if the next node is a footnote, place the text selection at the end of it
|
||||
editor
|
||||
.chain()
|
||||
.setTextSelection(parent.after.to - 1)
|
||||
.scrollIntoView()
|
||||
.run();
|
||||
return true;
|
||||
}
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
// inverse of the tab command - place the text selection at the end of the previous footnote
|
||||
"Shift-Tab": ({ editor }) => {
|
||||
const { selection } = editor.state;
|
||||
const startPos = selection.$from.start(2);
|
||||
if (Number.isNaN(startPos)) return false;
|
||||
const parent = editor.$pos(startPos);
|
||||
if (parent.node.type.name != "footnote" || !parent.before) {
|
||||
return false;
|
||||
}
|
||||
|
||||
editor
|
||||
.chain()
|
||||
.setTextSelection(parent.before.to - 1)
|
||||
.scrollIntoView()
|
||||
.run();
|
||||
return true;
|
||||
},
|
||||
};
|
||||
},
|
||||
|
||||
});
|
||||
|
||||
export default Footnote;
|
||||
@@ -1,46 +0,0 @@
|
||||
//Source MIT - https://github.com/buttondown/tiptap-footnotes
|
||||
import OrderedList from "@tiptap/extension-ordered-list";
|
||||
import FootnoteRules from "./rules";
|
||||
|
||||
const Footnotes = OrderedList.extend({
|
||||
name: "footnotes",
|
||||
group: "", // removed the default group of the ordered list extension
|
||||
isolating: true,
|
||||
defining: true,
|
||||
draggable: false,
|
||||
|
||||
content() {
|
||||
return "footnote*";
|
||||
},
|
||||
addAttributes() {
|
||||
return {
|
||||
class: {
|
||||
default: "footnotes",
|
||||
},
|
||||
};
|
||||
},
|
||||
parseHTML() {
|
||||
return [
|
||||
{
|
||||
tag: "ol.footnotes",
|
||||
priority: 1000,
|
||||
},
|
||||
];
|
||||
},
|
||||
|
||||
addKeyboardShortcuts() {
|
||||
return {};
|
||||
},
|
||||
addCommands() {
|
||||
return {};
|
||||
},
|
||||
addInputRules() {
|
||||
return [];
|
||||
},
|
||||
|
||||
addExtensions() {
|
||||
return [FootnoteRules];
|
||||
},
|
||||
});
|
||||
|
||||
export default Footnotes;
|
||||
@@ -1,4 +0,0 @@
|
||||
export { default as Footnotes } from "./footnotes";
|
||||
export { default as Footnote } from "./footnote";
|
||||
export type { FootnoteOptions } from "./footnote";
|
||||
export { default as FootnoteReference } from "./reference";
|
||||
@@ -1,221 +0,0 @@
|
||||
//Source MIT - https://github.com/buttondown/tiptap-footnotes
|
||||
import { mergeAttributes, Node } from "@tiptap/core";
|
||||
import {
|
||||
Fragment as PMFragment,
|
||||
Node as PMNode,
|
||||
Slice,
|
||||
} from "@tiptap/pm/model";
|
||||
import { NodeSelection, Plugin, PluginKey } from "@tiptap/pm/state";
|
||||
import { generateNodeId } from "../utils";
|
||||
|
||||
|
||||
const REFNUM_ATTR = "data-reference-number";
|
||||
const REF_CLASS = "footnote-ref";
|
||||
|
||||
declare module "@tiptap/core" {
|
||||
interface Commands<ReturnType> {
|
||||
footnoteReference: {
|
||||
/**
|
||||
* add a new footnote reference
|
||||
* @example editor.commands.addFootnote()
|
||||
*/
|
||||
addFootnote: () => ReturnType;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
const FootnoteReference = Node.create({
|
||||
name: "footnoteReference",
|
||||
inline: true,
|
||||
content: "text*",
|
||||
group: "inline",
|
||||
atom: true,
|
||||
draggable: true,
|
||||
|
||||
parseHTML() {
|
||||
return [
|
||||
{
|
||||
tag: `sup`,
|
||||
priority: 1000,
|
||||
getAttrs(node) {
|
||||
const anchor = node.querySelector<HTMLAnchorElement>(
|
||||
`a.${REF_CLASS}:first-child`
|
||||
);
|
||||
|
||||
if (!anchor) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const id = anchor.getAttribute("data-id");
|
||||
const ref = anchor.getAttribute(REFNUM_ATTR);
|
||||
|
||||
return {
|
||||
"data-id": id ?? generateNodeId(),
|
||||
referenceNumber: ref ?? anchor.innerText,
|
||||
};
|
||||
},
|
||||
contentElement(node) {
|
||||
return node.firstChild as HTMLElement;
|
||||
},
|
||||
},
|
||||
];
|
||||
},
|
||||
|
||||
addAttributes() {
|
||||
return {
|
||||
class: {
|
||||
default: REF_CLASS,
|
||||
},
|
||||
"data-id": {
|
||||
renderHTML(attributes) {
|
||||
return {
|
||||
"data-id": attributes["data-id"] || generateNodeId(),
|
||||
};
|
||||
},
|
||||
},
|
||||
referenceNumber: {},
|
||||
|
||||
href: {
|
||||
renderHTML(attributes) {
|
||||
return {
|
||||
href: `#fn:${attributes["referenceNumber"]}`,
|
||||
};
|
||||
},
|
||||
},
|
||||
};
|
||||
},
|
||||
|
||||
renderHTML({ HTMLAttributes }) {
|
||||
const { referenceNumber, ...attributes } = HTMLAttributes;
|
||||
const attrs = mergeAttributes(this.options.HTMLAttributes, attributes);
|
||||
attrs[REFNUM_ATTR] = referenceNumber;
|
||||
|
||||
return [
|
||||
"sup",
|
||||
{ id: `fnref:${referenceNumber}` },
|
||||
["a", attrs, HTMLAttributes.referenceNumber],
|
||||
];
|
||||
},
|
||||
|
||||
addProseMirrorPlugins() {
|
||||
const { editor } = this;
|
||||
|
||||
// Ensures pasted footnote references get unique IDs.
|
||||
const mapNode = (node: PMNode): PMNode => {
|
||||
if (node.type.name === this.name) {
|
||||
const newAttrs = { ...node.attrs, "data-id": generateNodeId() };
|
||||
return node.type.create(newAttrs, node.content, node.marks);
|
||||
}
|
||||
|
||||
if (node.content && node.content.size > 0) {
|
||||
const newChildren: PMNode[] = [];
|
||||
let changed = false;
|
||||
|
||||
node.content.forEach((child) => {
|
||||
const mapped = mapNode(child);
|
||||
if (mapped !== child) {
|
||||
changed = true;
|
||||
}
|
||||
|
||||
newChildren.push(mapped);
|
||||
});
|
||||
|
||||
if (changed) {
|
||||
return node.copy(PMFragment.from(newChildren));
|
||||
}
|
||||
}
|
||||
|
||||
return node;
|
||||
};
|
||||
|
||||
return [
|
||||
new Plugin({
|
||||
key: new PluginKey("footnotePasteHandler"),
|
||||
props: {
|
||||
transformPasted(slice) {
|
||||
const mappedNodes: PMNode[] = [];
|
||||
let changed = false;
|
||||
|
||||
slice.content.forEach((node) => {
|
||||
const mapped = mapNode(node);
|
||||
if (mapped !== node) {
|
||||
changed = true;
|
||||
}
|
||||
mappedNodes.push(mapped);
|
||||
});
|
||||
|
||||
if (!changed) {
|
||||
return slice;
|
||||
}
|
||||
|
||||
return new Slice(
|
||||
PMFragment.from(mappedNodes),
|
||||
slice.openStart,
|
||||
slice.openEnd
|
||||
);
|
||||
},
|
||||
},
|
||||
}),
|
||||
new Plugin({
|
||||
key: new PluginKey("footnoteRefClick"),
|
||||
|
||||
props: {
|
||||
// on double-click, focus on the footnote
|
||||
handleDoubleClickOn(view, pos, node, nodePos, event) {
|
||||
if (node.type.name != "footnoteReference") return false;
|
||||
event.preventDefault();
|
||||
const id = node.attrs["data-id"];
|
||||
return editor.commands.focusFootnote(id);
|
||||
},
|
||||
// click the footnote reference once to get focus, click twice to scroll to the footnote
|
||||
handleClickOn(view, pos, node, nodePos, event) {
|
||||
if (node.type.name != "footnoteReference") return false;
|
||||
event.preventDefault();
|
||||
const { selection } = editor.state.tr;
|
||||
if (selection instanceof NodeSelection && selection.node.eq(node)) {
|
||||
const id = node.attrs["data-id"];
|
||||
return editor.commands.focusFootnote(id);
|
||||
} else {
|
||||
editor.chain().setNodeSelection(nodePos).run();
|
||||
return true;
|
||||
}
|
||||
},
|
||||
},
|
||||
}),
|
||||
];
|
||||
},
|
||||
|
||||
addCommands() {
|
||||
return {
|
||||
addFootnote:
|
||||
() =>
|
||||
({ state, tr }) => {
|
||||
const node = this.type.create({
|
||||
"data-id": generateNodeId(),
|
||||
});
|
||||
tr.insert(state.selection.anchor, node);
|
||||
return true;
|
||||
},
|
||||
};
|
||||
},
|
||||
|
||||
addInputRules() {
|
||||
// when a user types [^text], add a new footnote
|
||||
return [
|
||||
{
|
||||
find: /\[\^(.*?)\]/,
|
||||
type: this.type,
|
||||
undoable: true,
|
||||
handler({ range, match, chain }) {
|
||||
const start = range.from;
|
||||
let end = range.to;
|
||||
if (match[1]) {
|
||||
chain().deleteRange({ from: start, to: end }).addFootnote().run();
|
||||
}
|
||||
},
|
||||
},
|
||||
];
|
||||
},
|
||||
});
|
||||
|
||||
export default FootnoteReference;
|
||||
@@ -1,90 +0,0 @@
|
||||
//Source MIT - https://github.com/buttondown/tiptap-footnotes
|
||||
import { Plugin, PluginKey } from "@tiptap/pm/state";
|
||||
import { ReplaceStep } from "@tiptap/pm/transform";
|
||||
import { Extension } from "@tiptap/core";
|
||||
import { updateFootnotesList } from "./utils";
|
||||
|
||||
const FootnoteRules = Extension.create({
|
||||
name: "footnoteRules",
|
||||
priority: 1000,
|
||||
addProseMirrorPlugins() {
|
||||
return [
|
||||
new Plugin({
|
||||
key: new PluginKey("footnoteRules"),
|
||||
filterTransaction(tr) {
|
||||
const { from, to } = tr.selection;
|
||||
|
||||
// Allow full document selections (Mod-a/Ctrl-a)
|
||||
if (from === 0 && to === tr.doc.content.size) return true;
|
||||
|
||||
let selectedFootnotes = false;
|
||||
let selectedContent = false;
|
||||
let footnoteCount = 0;
|
||||
tr.doc.nodesBetween(from, to, (node, _, parent) => {
|
||||
if (parent?.type.name == "doc" && node.type.name != "footnotes") {
|
||||
selectedContent = true;
|
||||
} else if (node.type.name == "footnote") {
|
||||
footnoteCount += 1;
|
||||
} else if (node.type.name == "footnotes") {
|
||||
selectedFootnotes = true;
|
||||
}
|
||||
});
|
||||
const overSelected = selectedContent && selectedFootnotes;
|
||||
/*
|
||||
* Here, we don't allow any transaction that spans between the "content" nodes and the "footnotes" node. This also rejects any transaction that spans between more than 1 footnote.
|
||||
*/
|
||||
return !overSelected && footnoteCount <= 1;
|
||||
},
|
||||
|
||||
// if there are some to the footnote references (added/deleted/dragged), append a transaction that updates the footnotes list accordingly
|
||||
appendTransaction(transactions, oldState, newState) {
|
||||
let newTr = newState.tr;
|
||||
let refsChanged = false; // true if the footnote references have been changed, false otherwise
|
||||
for (let tr of transactions) {
|
||||
if (!tr.docChanged) continue;
|
||||
if (refsChanged) break;
|
||||
|
||||
for (let step of tr.steps) {
|
||||
if (!(step instanceof ReplaceStep)) continue;
|
||||
if (refsChanged) break;
|
||||
|
||||
const isDelete = step.from != step.to; // the user deleted items from the document (from != to & the step is a replace step)
|
||||
const isInsert = step.slice.size > 0;
|
||||
|
||||
// check if any footnote references have been inserted
|
||||
if (isInsert) {
|
||||
step.slice.content.descendants((node) => {
|
||||
if (node?.type.name == "footnoteReference") {
|
||||
refsChanged = true;
|
||||
return false;
|
||||
}
|
||||
});
|
||||
}
|
||||
if (isDelete && !refsChanged) {
|
||||
// check if any footnote references have been deleted
|
||||
tr.before.nodesBetween(
|
||||
step.from,
|
||||
Math.min(tr.before.content.size, step.to), // make sure to not go over the old document's limit
|
||||
(node) => {
|
||||
if (node.type.name == "footnoteReference") {
|
||||
refsChanged = true;
|
||||
return false;
|
||||
}
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (refsChanged) {
|
||||
updateFootnotesList(newTr, newState);
|
||||
return newTr;
|
||||
}
|
||||
|
||||
return null;
|
||||
},
|
||||
}),
|
||||
];
|
||||
},
|
||||
});
|
||||
export default FootnoteRules;
|
||||
@@ -1,123 +0,0 @@
|
||||
//Source MIT - https://github.com/buttondown/tiptap-footnotes
|
||||
import { EditorState, Transaction } from "@tiptap/pm/state";
|
||||
import { Fragment, Node } from "@tiptap/pm/model";
|
||||
|
||||
// update the reference number of all the footnote references in the document
|
||||
export function updateFootnoteReferences(tr: Transaction) {
|
||||
let count = 1;
|
||||
|
||||
const nodes: any[] = [];
|
||||
|
||||
tr.doc.descendants((node, pos) => {
|
||||
if (node.type.name == "footnoteReference") {
|
||||
tr.setNodeAttribute(pos, "referenceNumber", `${count}`);
|
||||
|
||||
nodes.push(node);
|
||||
count += 1;
|
||||
}
|
||||
});
|
||||
// return the updated footnote references (in the order that they appear in the document)
|
||||
return nodes;
|
||||
}
|
||||
|
||||
function getFootnotes(tr: Transaction) {
|
||||
let footnotesRange: { from: number; to: number } | undefined;
|
||||
const footnotes: Node[] = [];
|
||||
tr.doc.descendants((node, pos) => {
|
||||
if (node.type.name == "footnote") {
|
||||
footnotes.push(node);
|
||||
} else if (node.type.name == "footnotes") {
|
||||
footnotesRange = { from: pos, to: pos + node.nodeSize };
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
});
|
||||
return { footnotesRange, footnotes };
|
||||
}
|
||||
|
||||
// update the "footnotes" ordered list based on the footnote references in the document
|
||||
export function updateFootnotesList(tr: Transaction, state: EditorState) {
|
||||
const footnoteReferences = updateFootnoteReferences(tr);
|
||||
|
||||
const footnoteType = state.schema.nodes.footnote;
|
||||
const footnotesType = state.schema.nodes.footnotes;
|
||||
|
||||
const emptyParagraph = state.schema.nodeFromJSON({
|
||||
type: "paragraph",
|
||||
content: [],
|
||||
});
|
||||
|
||||
const { footnotesRange, footnotes } = getFootnotes(tr);
|
||||
|
||||
// a mapping of footnote id -> footnote node
|
||||
const footnoteIds: { [key: string]: Node } = footnotes.reduce(
|
||||
(obj, footnote) => {
|
||||
obj[footnote.attrs["data-id"]] = footnote;
|
||||
return obj;
|
||||
},
|
||||
{} as any,
|
||||
);
|
||||
|
||||
const newFootnotes: Node[] = [];
|
||||
|
||||
let footnoteRefIds = new Set(
|
||||
footnoteReferences.map((ref) => ref.attrs["data-id"]),
|
||||
);
|
||||
const deleteFootnoteIds: Set<string> = new Set();
|
||||
for (let footnote of footnotes) {
|
||||
const id = footnote.attrs["data-id"];
|
||||
if (!footnoteRefIds.has(id) || deleteFootnoteIds.has(id)) {
|
||||
deleteFootnoteIds.add(id);
|
||||
// we traverse through this footnote's content because it may contain footnote references.
|
||||
// we want to delete the footnotes associated with these references, so we add them to the delete set.
|
||||
footnote.content.descendants((node) => {
|
||||
if (node.type.name == "footnoteReference")
|
||||
deleteFootnoteIds.add(node.attrs["data-id"]);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
for (let i = 0; i < footnoteReferences.length; i++) {
|
||||
let refId = footnoteReferences[i].attrs["data-id"];
|
||||
|
||||
if (deleteFootnoteIds.has(refId)) continue;
|
||||
// if there is a footnote w/ the same id as this `ref`, we preserve its content and update its id attribute
|
||||
if (refId in footnoteIds) {
|
||||
let footnote = footnoteIds[refId];
|
||||
newFootnotes.push(
|
||||
footnoteType.create(
|
||||
{ ...footnote.attrs, id: `fn:${i + 1}` },
|
||||
footnote.content,
|
||||
),
|
||||
);
|
||||
} else {
|
||||
let newNode = footnoteType.create(
|
||||
{
|
||||
"data-id": refId,
|
||||
id: `fn:${i + 1}`,
|
||||
},
|
||||
[emptyParagraph],
|
||||
);
|
||||
newFootnotes.push(newNode);
|
||||
}
|
||||
}
|
||||
|
||||
if (newFootnotes.length == 0) {
|
||||
// no footnotes in the doc, delete the "footnotes" node
|
||||
if (footnotesRange) {
|
||||
tr.delete(footnotesRange.from, footnotesRange.to);
|
||||
}
|
||||
} else if (!footnotesRange) {
|
||||
// there is no footnotes node present in the doc, add it
|
||||
tr.insert(
|
||||
tr.doc.content.size,
|
||||
footnotesType.create(undefined, Fragment.from(newFootnotes)),
|
||||
);
|
||||
} else {
|
||||
tr.replaceWith(
|
||||
footnotesRange!.from + 1, // add 1 to point at the position after the opening ol tag
|
||||
footnotesRange!.to - 1, // substract 1 to point to the position before the closing ol tag
|
||||
Fragment.from(newFootnotes),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,110 +0,0 @@
|
||||
import { Token, marked } from 'marked';
|
||||
import { generateNodeId } from '../../utils';
|
||||
|
||||
interface FootnoteRefToken {
|
||||
type: 'footnoteRef';
|
||||
label: string;
|
||||
raw: string;
|
||||
}
|
||||
|
||||
interface FootnoteDefToken {
|
||||
type: 'footnoteDef';
|
||||
label: string;
|
||||
text: string;
|
||||
raw: string;
|
||||
}
|
||||
|
||||
// Parse-scoped state: markdownToHtml resets before the top-level parse and
|
||||
// appends the collected list after it. Nested marked.parse calls (callout,
|
||||
// footnote definitions) share this state, so hooks cannot be used here.
|
||||
let footnoteRefs: { label: string; id: string; number: number }[] = [];
|
||||
let footnoteDefs = new Map<string, string>();
|
||||
|
||||
export function resetFootnotes() {
|
||||
footnoteRefs = [];
|
||||
footnoteDefs = new Map();
|
||||
}
|
||||
|
||||
export function renderFootnotesList(): string {
|
||||
if (!footnoteRefs.length) return '';
|
||||
const items = footnoteRefs.map(({ label, id, number }) => {
|
||||
const body = footnoteDefs.get(label) || '<p></p>';
|
||||
return `<li id="fn:${number}" data-id="${id}">${body}</li>`;
|
||||
});
|
||||
return `<ol class="footnotes">\n${items.join('\n')}\n</ol>\n`;
|
||||
}
|
||||
|
||||
export const footnoteRefExtension = {
|
||||
name: 'footnoteRef',
|
||||
level: 'inline',
|
||||
start(src: string) {
|
||||
return src.indexOf('[^');
|
||||
},
|
||||
tokenizer(src: string): FootnoteRefToken | undefined {
|
||||
const match = /^\[\^([^\]\s]+)\]/.exec(src);
|
||||
if (match) {
|
||||
return {
|
||||
type: 'footnoteRef',
|
||||
raw: match[0],
|
||||
label: match[1].toLowerCase(),
|
||||
};
|
||||
}
|
||||
},
|
||||
renderer(token: Token) {
|
||||
const refToken = token as FootnoteRefToken;
|
||||
const number = footnoteRefs.length + 1;
|
||||
const id = generateNodeId();
|
||||
footnoteRefs.push({ label: refToken.label, id, number });
|
||||
return `<sup id="fnref:${number}"><a class="footnote-ref" data-id="${id}" data-reference-number="${number}" href="#fn:${number}">${number}</a></sup>`;
|
||||
},
|
||||
};
|
||||
|
||||
export const footnoteDefExtension = {
|
||||
name: 'footnoteDef',
|
||||
level: 'block',
|
||||
start(src: string) {
|
||||
return src.match(/^\[\^[^\]\s]+\]:/m)?.index ?? -1;
|
||||
},
|
||||
tokenizer(src: string): FootnoteDefToken | undefined {
|
||||
const firstLine = /^\[\^([^\]\s]+)\]:[ \t]*/.exec(src);
|
||||
if (!firstLine) return undefined;
|
||||
|
||||
const lines = src.split('\n');
|
||||
const contentLines = [lines[0].slice(firstLine[0].length)];
|
||||
let consumed = 1;
|
||||
while (consumed < lines.length) {
|
||||
const line = lines[consumed];
|
||||
if (/^[ \t]{2,}\S/.test(line)) {
|
||||
contentLines.push(line.replace(/^[ \t]{1,4}/, ''));
|
||||
consumed += 1;
|
||||
} else if (
|
||||
/^[ \t]*$/.test(line) &&
|
||||
consumed + 1 < lines.length &&
|
||||
/^[ \t]{2,}\S/.test(lines[consumed + 1])
|
||||
) {
|
||||
contentLines.push('');
|
||||
consumed += 1;
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
const raw =
|
||||
lines.slice(0, consumed).join('\n') +
|
||||
(consumed < lines.length ? '\n' : '');
|
||||
return {
|
||||
type: 'footnoteDef',
|
||||
raw,
|
||||
label: firstLine[1].toLowerCase(),
|
||||
text: contentLines.join('\n').trim(),
|
||||
};
|
||||
},
|
||||
renderer(token: Token) {
|
||||
const defToken = token as FootnoteDefToken;
|
||||
const body = defToken.text
|
||||
? marked.parse(defToken.text).toString()
|
||||
: '<p></p>';
|
||||
footnoteDefs.set(defToken.label, body);
|
||||
return '';
|
||||
},
|
||||
};
|
||||
@@ -2,12 +2,6 @@ import { marked } from "marked";
|
||||
import { calloutExtension } from "./callout.marked";
|
||||
import { mathBlockExtension } from "./math-block.marked";
|
||||
import { mathInlineExtension } from "./math-inline.marked";
|
||||
import {
|
||||
footnoteDefExtension,
|
||||
footnoteRefExtension,
|
||||
renderFootnotesList,
|
||||
resetFootnotes,
|
||||
} from "./footnotes.marked";
|
||||
|
||||
marked.use({
|
||||
renderer: {
|
||||
@@ -40,13 +34,7 @@ marked.use({
|
||||
});
|
||||
|
||||
marked.use({
|
||||
extensions: [
|
||||
calloutExtension,
|
||||
mathBlockExtension,
|
||||
mathInlineExtension,
|
||||
footnoteDefExtension,
|
||||
footnoteRefExtension,
|
||||
],
|
||||
extensions: [calloutExtension, mathBlockExtension, mathInlineExtension],
|
||||
});
|
||||
|
||||
marked.setOptions({ breaks: true });
|
||||
@@ -60,7 +48,5 @@ export function markdownToHtml(
|
||||
.replace(YAML_FONT_MATTER_REGEX, "")
|
||||
.trimStart();
|
||||
|
||||
resetFootnotes();
|
||||
const html = marked.parse(markdown).toString();
|
||||
return html + renderFootnotesList();
|
||||
return marked.parse(markdown).toString();
|
||||
}
|
||||
|
||||
@@ -34,8 +34,6 @@ export function htmlToMarkdown(html: string): string {
|
||||
iframeEmbed,
|
||||
image,
|
||||
video,
|
||||
footnoteRef,
|
||||
footnotesList,
|
||||
]);
|
||||
return turndownService.turndown(html).replaceAll('<br>', ' ');
|
||||
}
|
||||
@@ -205,56 +203,6 @@ function image(turndownService: _TurndownService) {
|
||||
});
|
||||
}
|
||||
|
||||
function getFootnoteAnchor(node: HTMLElement): HTMLElement | null {
|
||||
const child = node.firstElementChild as HTMLElement | null;
|
||||
return child?.nodeName === 'A' && child.classList.contains('footnote-ref')
|
||||
? child
|
||||
: null;
|
||||
}
|
||||
|
||||
function footnoteRef(turndownService: _TurndownService) {
|
||||
turndownService.addRule('footnoteRef', {
|
||||
filter: function (node: HTMLInputElement) {
|
||||
return node.nodeName === 'SUP' && !!getFootnoteAnchor(node);
|
||||
},
|
||||
replacement: function (_content: string, node: HTMLInputElement) {
|
||||
const anchor = getFootnoteAnchor(node);
|
||||
const number =
|
||||
anchor.getAttribute('data-reference-number') || anchor.textContent;
|
||||
return `[^${number}]`;
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function footnotesList(turndownService: _TurndownService) {
|
||||
turndownService.addRule('footnotesList', {
|
||||
filter: function (node: HTMLInputElement) {
|
||||
return node.nodeName === 'OL' && node.classList.contains('footnotes');
|
||||
},
|
||||
replacement: function (_content: string, node: HTMLInputElement) {
|
||||
const items = Array.from(node.children).filter(
|
||||
(child) => child.nodeName === 'LI',
|
||||
);
|
||||
const definitions = items.map((li, index) => {
|
||||
const number =
|
||||
(li.getAttribute('id') || '').replace('fn:', '') ||
|
||||
String(index + 1);
|
||||
const markdown = turndownService
|
||||
.turndown((li as HTMLElement).innerHTML)
|
||||
.trim();
|
||||
// continuation lines need a 4-space indent to stay in the footnote
|
||||
const [first, ...rest] = markdown.split('\n');
|
||||
const body = [
|
||||
first,
|
||||
...rest.map((line: string) => (line.trim() ? ` ${line}` : line)),
|
||||
].join('\n');
|
||||
return `[^${number}]: ${body}`;
|
||||
});
|
||||
return `\n\n${definitions.join('\n')}\n\n`;
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function video(turndownService: _TurndownService) {
|
||||
turndownService.addRule('video', {
|
||||
filter: function (node: HTMLInputElement) {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { FootnoteReferenceRun, HeadingLevel, Paragraph, ShadingType } from 'docx';
|
||||
import { HeadingLevel, ShadingType } from 'docx';
|
||||
import { Node } from 'prosemirror-model';
|
||||
import {
|
||||
DocxSerializerAsync,
|
||||
@@ -168,27 +168,6 @@ export const defaultAsyncNodes: NodeSerializerAsync = {
|
||||
pageBreak(state, node) {
|
||||
state.closeBlock(node, { pageBreakBefore: true });
|
||||
},
|
||||
footnoteReference(state, node) {
|
||||
const number =
|
||||
Number(node.attrs?.referenceNumber) || state.$footnoteCounter + 1;
|
||||
state.$footnoteCounter = Math.max(state.$footnoteCounter, number);
|
||||
// seed an empty body so the reference stays valid even if the trailing
|
||||
// footnotes list is missing; the footnotes node overwrites it with content
|
||||
if (!state.footnotes[number]) {
|
||||
state.footnotes[number] = { children: [new Paragraph('')] };
|
||||
}
|
||||
state.current.push(new FootnoteReferenceRun(number));
|
||||
},
|
||||
async footnotes(state, node) {
|
||||
for (let i = 0; i < node.childCount; i += 1) {
|
||||
const item = node.child(i);
|
||||
const number =
|
||||
Number(String(item.attrs?.id ?? '').replace('fn:', '')) || i + 1;
|
||||
await state.footnoteDefinition(item, number);
|
||||
}
|
||||
},
|
||||
// items are consumed by the footnotes handler above
|
||||
footnote() {},
|
||||
// No usable static export representation: skip without failing.
|
||||
subpages() {},
|
||||
transclusionReference() {},
|
||||
|
||||
@@ -824,29 +824,6 @@ export class DocxSerializerStateAsync {
|
||||
this.current.push(new FootnoteReferenceRun(this.$footnoteCounter));
|
||||
}
|
||||
|
||||
// Fills the footnote body for an already-referenced footnote number from a
|
||||
// node holding block content (Docmost keeps footnote text in a trailing
|
||||
// list, separate from the inline reference).
|
||||
async footnoteDefinition(node: Node, number: number) {
|
||||
const { current, children, nextRunOpts, nextParentParagraphOpts } = this;
|
||||
this.current = [];
|
||||
this.children = [];
|
||||
delete this.nextRunOpts;
|
||||
delete this.nextParentParagraphOpts;
|
||||
|
||||
await this.renderContent(node);
|
||||
this.footnotes[number] = {
|
||||
children: this.children.filter(
|
||||
(child): child is Paragraph => child instanceof Paragraph,
|
||||
),
|
||||
};
|
||||
|
||||
this.current = current;
|
||||
this.children = children;
|
||||
this.nextRunOpts = nextRunOpts;
|
||||
this.nextParentParagraphOpts = nextParentParagraphOpts;
|
||||
}
|
||||
|
||||
closeBlock(node: Node, props?: IParagraphOptions) {
|
||||
const paragraph = new Paragraph({
|
||||
children: this.current,
|
||||
|
||||
@@ -422,8 +422,6 @@ export const SearchAndReplace = Extension.create<
|
||||
state: {
|
||||
init: () => DecorationSet.empty,
|
||||
apply({ doc, docChanged }, oldState) {
|
||||
const storage = editor.storage.searchAndReplace;
|
||||
if (!storage) return oldState;
|
||||
const {
|
||||
searchTerm,
|
||||
lastSearchTerm,
|
||||
@@ -431,7 +429,7 @@ export const SearchAndReplace = Extension.create<
|
||||
lastCaseSensitive,
|
||||
resultIndex,
|
||||
lastResultIndex,
|
||||
} = storage;
|
||||
} = editor.storage.searchAndReplace;
|
||||
|
||||
if (
|
||||
!docChanged &&
|
||||
|
||||
@@ -7,19 +7,9 @@ export interface TrailingNodeExtensionOptions {
|
||||
}
|
||||
|
||||
function nodeEqualsType({ types, node }: { types: any, node: any }) {
|
||||
if (!node) return false
|
||||
return (Array.isArray(types) && types.includes(node.type)) || node.type === types
|
||||
}
|
||||
|
||||
// footnotes must stay the last doc child, so the trailing node goes before it
|
||||
function lastNodeBeforeFootnotes(doc: any) {
|
||||
const lastChild = doc.lastChild
|
||||
if (lastChild?.type.name === 'footnotes') {
|
||||
return doc.childCount > 1 ? doc.child(doc.childCount - 2) : null
|
||||
}
|
||||
return lastChild
|
||||
}
|
||||
|
||||
// @ts-ignore
|
||||
/**
|
||||
* Extension based on:
|
||||
@@ -50,23 +40,19 @@ export const TrailingNode = Extension.create<TrailingNodeExtensionOptions>({
|
||||
appendTransaction: (_, __, state) => {
|
||||
const { doc, tr, schema } = state;
|
||||
const shouldInsertNodeAtEnd = plugin.getState(state);
|
||||
const endPosition = doc.content.size;
|
||||
const type = schema.nodes[this.options.node]
|
||||
|
||||
if (!shouldInsertNodeAtEnd) {
|
||||
return;
|
||||
}
|
||||
|
||||
const lastChild = doc.lastChild
|
||||
const endPosition = lastChild?.type.name === 'footnotes'
|
||||
? doc.content.size - lastChild.nodeSize
|
||||
: doc.content.size
|
||||
|
||||
return tr.insert(endPosition, type.create());
|
||||
},
|
||||
state: {
|
||||
init: (_, state) => {
|
||||
try {
|
||||
const lastNode = lastNodeBeforeFootnotes(state.tr.doc)
|
||||
const lastNode = state.tr.doc.lastChild
|
||||
return !nodeEqualsType({ node: lastNode, types: disabledNodes })
|
||||
} catch (err){
|
||||
console.log(err)
|
||||
@@ -84,7 +70,7 @@ export const TrailingNode = Extension.create<TrailingNodeExtensionOptions>({
|
||||
return value
|
||||
}
|
||||
|
||||
const lastNode = lastNodeBeforeFootnotes(tr.doc)
|
||||
const lastNode = tr.doc.lastChild
|
||||
return !nodeEqualsType({ node: lastNode, types: disabledNodes })
|
||||
},
|
||||
},
|
||||
|
||||
Generated
+2858
-2534
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user