feat: implement Markdown and HTML page imports (#85)

* page import feature
* make file interceptor common

* replace @tiptap/html
* update tiptap version

* reduce table margin

* update tiptap version

* switch to upstream drag handle lib (fixes table dragging)

* WIP

* Page import module and other fixes

* working page imports

* extract page title from h1 heading

* finalize page imports

* cleanup unused imports

* add menu arrow

apps/client/package.json

@@ -42,10 +42,12 @@
     "react-router-dom": "^6.24.0",
     "socket.io-client": "^4.7.5",
     "tippy.js": "^6.3.7",
+    "tiptap-extension-global-drag-handle": "^0.1.10",
     "zod": "^3.23.8"
   },
   "devDependencies": {
     "@tanstack/eslint-plugin-query": "^5.47.0",
+    "@types/file-saver": "^2.0.7",
     "@types/js-cookie": "^3.0.6",
     "@types/katex": "^0.16.7",
     "@types/node": "20.14.9",

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

@@ -1,9 +1,4 @@
-import {
+import { NodeViewContent, NodeViewProps, NodeViewWrapper } from "@tiptap/react";
-  Editor,
-  NodeViewContent,
-  NodeViewProps,
-  NodeViewWrapper,
-} from "@tiptap/react";
 import {
   IconAlertTriangleFilled,
   IconCircleCheckFilled,

apps/client/src/features/editor/extensions/drag-handle.ts

@@ -1,371 +0,0 @@
-// MIT - source: https://github.com/NiclasDev63/tiptap-extension-global-drag-handle
-import { Extension } from "@tiptap/core";
-import {
-  NodeSelection,
-  Plugin,
-  PluginKey,
-  TextSelection,
-} from "@tiptap/pm/state";
-import { Fragment, Slice, Node } from "@tiptap/pm/model";
-
-// @ts-ignore
-import { __serializeForClipboard, EditorView } from "@tiptap/pm/view";
-
-export interface GlobalDragHandleOptions {
-  /**
-   * The width of the drag handle
-   */
-  dragHandleWidth: number;
-
-  /**
-   * The treshold for scrolling
-   */
-  scrollTreshold: number;
-
-  /*
-   * The css selector to query for the drag handle. (eg: '.custom-handle').
-   * If handle element is found, that element will be used as drag handle. If not, a default handle will be created
-   */
-  dragHandleSelector?: string;
-}
-function absoluteRect(node: Element) {
-  const data = node.getBoundingClientRect();
-  const modal = node.closest('[role="dialog"]');
-
-  if (modal && window.getComputedStyle(modal).transform !== "none") {
-    const modalRect = modal.getBoundingClientRect();
-
-    return {
-      top: data.top - modalRect.top,
-      left: data.left - modalRect.left,
-      width: data.width,
-    };
-  }
-  return {
-    top: data.top,
-    left: data.left,
-    width: data.width,
-  };
-}
-
-function nodeDOMAtCoords(coords: { x: number; y: number }) {
-  return document
-    .elementsFromPoint(coords.x, coords.y)
-    .find(
-      (elem: Element) =>
-        elem.parentElement?.matches?.(".ProseMirror") ||
-        elem.matches(
-          [
-            "li",
-            "p:not(:first-child)",
-            "pre",
-            "blockquote",
-            "h1, h2, h3, h4, h5, h6",
-            ".tableWrapper",
-          ].join(", "),
-        ),
-    );
-}
-
-function nodePosAtDOM(
-  node: Element,
-  view: EditorView,
-  options: GlobalDragHandleOptions,
-) {
-  const boundingRect = node.getBoundingClientRect();
-
-  return view.posAtCoords({
-    left: boundingRect.left + 50 + options.dragHandleWidth,
-    top: boundingRect.top + 1,
-  })?.inside;
-}
-
-function calcNodePos(pos: number, view: EditorView) {
-  const $pos = view.state.doc.resolve(pos);
-  if ($pos.depth > 1) return $pos.before($pos.depth);
-  return pos;
-}
-
-export function DragHandlePlugin(
-  options: GlobalDragHandleOptions & { pluginKey: string },
-) {
-  let listType = "";
-  function handleDragStart(event: DragEvent, view: EditorView) {
-    view.focus();
-
-    if (!event.dataTransfer) return;
-
-    const node = nodeDOMAtCoords({
-      x: event.clientX + 50 + options.dragHandleWidth,
-      y: event.clientY,
-    });
-
-    if (!(node instanceof Element)) return;
-
-    let draggedNodePos = nodePosAtDOM(node, view, options);
-    if (draggedNodePos == null || draggedNodePos < 0) return;
-    draggedNodePos = calcNodePos(draggedNodePos, view);
-
-    const { from, to } = view.state.selection;
-    const diff = from - to;
-
-    const fromSelectionPos = calcNodePos(from, view);
-    let differentNodeSelected = false;
-
-    const nodePos = view.state.doc.resolve(fromSelectionPos);
-
-    // Check if nodePos points to the top level node
-    if (nodePos.node().type.name === "doc") differentNodeSelected = true;
-    else {
-      const nodeSelection = NodeSelection.create(
-        view.state.doc,
-        nodePos.before(),
-      );
-      // Check if the node where the drag event started is part of the current selection
-      differentNodeSelected = !(
-        draggedNodePos + 1 >= nodeSelection.$from.pos &&
-        draggedNodePos <= nodeSelection.$to.pos
-      );
-    }
-
-    if (
-      !differentNodeSelected &&
-      diff !== 0 &&
-      !(view.state.selection instanceof NodeSelection)
-    ) {
-      const endSelection = NodeSelection.create(view.state.doc, to - 1);
-      const multiNodeSelection = TextSelection.create(
-        view.state.doc,
-        draggedNodePos,
-        endSelection.$to.pos,
-      );
-      view.dispatch(view.state.tr.setSelection(multiNodeSelection));
-    } else {
-      const nodeSelection = NodeSelection.create(
-        view.state.doc,
-        draggedNodePos,
-      );
-      view.dispatch(view.state.tr.setSelection(nodeSelection));
-    }
-
-    // If the selected node is a list item, we need to save the type of the wrapping list e.g. OL or UL
-    if (
-      view.state.selection instanceof NodeSelection &&
-      view.state.selection.node.type.name === "listItem"
-    ) {
-      listType = node.parentElement!.tagName;
-    }
-
-    const slice = view.state.selection.content();
-    const { dom, text } = __serializeForClipboard(view, slice);
-
-    event.dataTransfer.clearData();
-    event.dataTransfer.setData("text/html", dom.innerHTML);
-    event.dataTransfer.setData("text/plain", text);
-    event.dataTransfer.effectAllowed = "copyMove";
-
-    event.dataTransfer.setDragImage(node, 0, 0);
-
-    view.dragging = { slice, move: event.ctrlKey };
-  }
-
-  let dragHandleElement: HTMLElement | null = null;
-
-  function hideDragHandle() {
-    if (dragHandleElement) {
-      dragHandleElement.classList.add("hide");
-    }
-  }
-
-  function showDragHandle() {
-    if (dragHandleElement) {
-      dragHandleElement.classList.remove("hide");
-    }
-  }
-
-  return new Plugin({
-    key: new PluginKey(options.pluginKey),
-    view: (view) => {
-      const handleBySelector = options.dragHandleSelector
-        ? document.querySelector<HTMLElement>(options.dragHandleSelector)
-        : null;
-      dragHandleElement = handleBySelector ?? document.createElement("div");
-      dragHandleElement.draggable = true;
-      dragHandleElement.dataset.dragHandle = "";
-      dragHandleElement.classList.add("drag-handle");
-
-      function onDragHandleDragStart(e: DragEvent) {
-        handleDragStart(e, view);
-      }
-
-      dragHandleElement.addEventListener("dragstart", onDragHandleDragStart);
-
-      function onDragHandleDrag(e: DragEvent) {
-        hideDragHandle();
-        let scrollY = window.scrollY;
-        if (e.clientY < options.scrollTreshold) {
-          window.scrollTo({ top: scrollY - 30, behavior: "smooth" });
-        } else if (window.innerHeight - e.clientY < options.scrollTreshold) {
-          window.scrollTo({ top: scrollY + 30, behavior: "smooth" });
-        }
-      }
-
-      dragHandleElement.addEventListener("drag", onDragHandleDrag);
-
-      hideDragHandle();
-
-      if (!handleBySelector) {
-        view?.dom?.parentElement?.appendChild(dragHandleElement);
-      }
-
-      return {
-        destroy: () => {
-          if (!handleBySelector) {
-            dragHandleElement?.remove?.();
-          }
-          dragHandleElement?.removeEventListener("drag", onDragHandleDrag);
-          dragHandleElement?.removeEventListener(
-            "dragstart",
-            onDragHandleDragStart,
-          );
-          dragHandleElement = null;
-        },
-      };
-    },
-    props: {
-      handleDOMEvents: {
-        mousemove: (view, event) => {
-          if (!view.editable) {
-            return;
-          }
-
-          const node = nodeDOMAtCoords({
-            x: event.clientX + 50 + options.dragHandleWidth,
-            y: event.clientY,
-          });
-
-          const notDragging = node?.closest(".not-draggable");
-
-          //const isNodeInTable = node?.closest("td") || node?.closest("th");
-
-          if (
-            !(node instanceof Element) ||
-            node.matches("ul, ol") ||
-            notDragging ||
-            node.matches(".tableWrapper")
-          ) {
-            hideDragHandle();
-            return;
-          }
-
-          const compStyle = window.getComputedStyle(node);
-          const parsedLineHeight = parseInt(compStyle.lineHeight, 10);
-          const lineHeight = isNaN(parsedLineHeight)
-            ? parseInt(compStyle.fontSize) * 1.2
-            : parsedLineHeight;
-          const paddingTop = parseInt(compStyle.paddingTop, 10);
-
-          const rect = absoluteRect(node);
-
-          rect.top += (lineHeight - 24) / 2;
-          rect.top += paddingTop;
-          // Li markers
-          if (node.matches("ul:not([data-type=taskList]) li, ol li")) {
-            rect.left -= options.dragHandleWidth;
-          }
-          rect.width = options.dragHandleWidth;
-
-          if (!dragHandleElement) return;
-
-          dragHandleElement.style.left = `${rect.left - rect.width}px`;
-          dragHandleElement.style.top = `${rect.top}px`;
-          showDragHandle();
-        },
-        keydown: () => {
-          hideDragHandle();
-        },
-        mousewheel: () => {
-          hideDragHandle();
-        },
-        // dragging class is used for CSS
-        dragstart: (view) => {
-          view.dom.classList.add("dragging");
-        },
-        drop: (view, event) => {
-          view.dom.classList.remove("dragging");
-          hideDragHandle();
-          let droppedNode: Node | null = null;
-          const dropPos = view.posAtCoords({
-            left: event.clientX,
-            top: event.clientY,
-          });
-
-          if (!dropPos) return;
-
-          if (view.state.selection instanceof NodeSelection) {
-            droppedNode = view.state.selection.node;
-          }
-          if (!droppedNode) return;
-
-          const resolvedPos = view.state.doc.resolve(dropPos.pos);
-
-          const isDroppedInsideList =
-            resolvedPos.parent.type.name === "listItem";
-
-          // If the selected node is a list item and is not dropped inside a list, we need to wrap it inside <ol> tag otherwise ol list items will be transformed into ul list item when dropped
-          if (
-            view.state.selection instanceof NodeSelection &&
-            view.state.selection.node.type.name === "listItem" &&
-            !isDroppedInsideList &&
-            listType == "OL"
-          ) {
-            const text = droppedNode.textContent;
-            if (!text) return;
-            const paragraph = view.state.schema.nodes.paragraph?.createAndFill(
-              {},
-              view.state.schema.text(text),
-            );
-            const listItem = view.state.schema.nodes.listItem?.createAndFill(
-              {},
-              paragraph,
-            );
-
-            const newList = view.state.schema.nodes.orderedList?.createAndFill(
-              null,
-              listItem,
-            );
-            const slice = new Slice(Fragment.from(newList), 0, 0);
-            view.dragging = { slice, move: event.ctrlKey };
-          }
-        },
-        dragend: (view) => {
-          view.dom.classList.remove("dragging");
-        },
-      },
-    },
-  });
-}
-
-const GlobalDragHandle = Extension.create({
-  name: "globalDragHandle",
-
-  addOptions() {
-    return {
-      dragHandleWidth: 20,
-      scrollTreshold: 100,
-    };
-  },
-
-  addProseMirrorPlugins() {
-    return [
-      DragHandlePlugin({
-        pluginKey: "globalDragHandle",
-        dragHandleWidth: this.options.dragHandleWidth,
-        scrollTreshold: this.options.scrollTreshold,
-        dragHandleSelector: this.options.dragHandleSelector,
-      }),
-    ];
-  },
-});
-
-export default GlobalDragHandle;

apps/client/src/features/editor/extensions/extensions.ts

@@ -41,7 +41,7 @@ import {
 import { IUser } from "@/features/user/types/user.types.ts";
 import MathInlineView from "@/features/editor/components/math/math-inline.tsx";
 import MathBlockView from "@/features/editor/components/math/math-block.tsx";
-import GlobalDragHandle from "@/features/editor/extensions/drag-handle.ts";
+import GlobalDragHandle from "tiptap-extension-global-drag-handle";
 import { Youtube } from "@tiptap/extension-youtube";
 import ImageView from "@/features/editor/components/image/image-view.tsx";
 import CalloutView from "@/features/editor/components/callout/callout-view.tsx";

apps/client/src/features/editor/styles/table.css

@@ -1,6 +1,6 @@
 .tableWrapper {
-  margin-top: 3rem;
+  margin-top: 1rem;
-  margin-bottom: 3rem;
+  margin-bottom: 1rem;
   overflow-x: auto;
   & table {
     overflow-x: hidden;

apps/client/src/features/group/components/add-group-member-modal.tsx

@@ -1,4 +1,4 @@
-import { Button, Divider, Group, Modal, ScrollArea } from "@mantine/core";
+import { Button, Divider, Group, Modal } from "@mantine/core";
 import { useDisclosure } from "@mantine/hooks";
 import React, { useState } from "react";
 import { MultiUserSelect } from "@/features/group/components/multi-user-select.tsx";

apps/client/src/features/page-history/components/history-list.tsx

@@ -2,7 +2,6 @@ import {
   usePageHistoryListQuery,
   usePageHistoryQuery,
 } from "@/features/page-history/queries/page-history-query";
-import { useParams } from "react-router-dom";
 import HistoryItem from "@/features/page-history/components/history-item";
 import {
   activeHistoryIdAtom,

apps/client/src/features/page/components/header/page-header-menu.tsx

@@ -60,7 +60,7 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
   });
   const { openDeleteModal } = useDeletePageModal();
   const [tree] = useAtom(treeApiAtom);
-  const [opened, { open: openExportModal, close: closeExportModal }] =
+  const [exportOpened, { open: openExportModal, close: closeExportModal }] =
     useDisclosure(false);
 
   const handleCopyLink = () => {
@@ -156,7 +156,7 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
 
       <PageExportModal
         pageId={page.id}
-        open={opened}
+        open={exportOpened}
         onClose={closeExportModal}
       />
     </>

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

@@ -36,29 +36,38 @@ export default function PageExportModal({
   };
 
   return (
-    <>
+    <Modal.Root
-      <Modal
+      opened={open}
-        opened={open}
+      onClose={onClose}
-        onClose={onClose}
+      size={500}
-        size="350"
+      padding="xl"
-        centered
+      yOffset="10vh"
-        withCloseButton={false}
+      xOffset={0}
-      >
+      mah={400}
-        <Group justify="space-between" wrap="nowrap">
+    >
-          <div>
+      <Modal.Overlay />
-            <Text size="md">Export format</Text>
+      <Modal.Content style={{ overflow: "hidden" }}>
-          </div>
+        <Modal.Header py={0}>
-          <ExportFormatSelection onChange={handleChange} />
+          <Modal.Title fw={500}>Export page</Modal.Title>
-        </Group>
+          <Modal.CloseButton />
+        </Modal.Header>
+        <Modal.Body>
+          <Group justify="space-between" wrap="nowrap">
+            <div>
+              <Text size="md">Format</Text>
+            </div>
+            <ExportFormatSelection onChange={handleChange} />
+          </Group>
 
-        <Group justify="flex-start" mt="md">
+          <Group justify="center" mt="md">
-          <Button onClick={onClose} variant="default">
+            <Button onClick={onClose} variant="default">
-            Cancel
+              Cancel
-          </Button>
+            </Button>
-          <Button onClick={handleExport}>Export</Button>
+            <Button onClick={handleExport}>Export</Button>
-        </Group>
+          </Group>
-      </Modal>
+        </Modal.Body>
-    </>
+      </Modal.Content>
+    </Modal.Root>
   );
 }
 

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

@@ -0,0 +1,148 @@
+import { Modal, Button, SimpleGrid, FileButton } from "@mantine/core";
+import {
+  IconCheck,
+  IconFileCode,
+  IconMarkdown,
+  IconX,
+} from "@tabler/icons-react";
+import { importPage } from "@/features/page/services/page-service.ts";
+import { notifications } from "@mantine/notifications";
+import { treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom.ts";
+import { useAtom } from "jotai";
+import { buildTree } from "@/features/page/tree/utils";
+import { IPage } from "@/features/page/types/page.types.ts";
+import React from "react";
+
+interface PageImportModalProps {
+  spaceId: string;
+  open: boolean;
+  onClose: () => void;
+}
+
+export default function PageImportModal({
+  spaceId,
+  open,
+  onClose,
+}: PageImportModalProps) {
+  return (
+    <>
+      <Modal.Root
+        opened={open}
+        onClose={onClose}
+        size={600}
+        padding="xl"
+        yOffset="10vh"
+        xOffset={0}
+        mah={400}
+      >
+        <Modal.Overlay />
+        <Modal.Content style={{ overflow: "hidden" }}>
+          <Modal.Header py={0}>
+            <Modal.Title fw={500}>Import pages</Modal.Title>
+            <Modal.CloseButton />
+          </Modal.Header>
+          <Modal.Body>
+            <ImportFormatSelection spaceId={spaceId} onClose={onClose} />
+          </Modal.Body>
+        </Modal.Content>
+      </Modal.Root>
+    </>
+  );
+}
+
+interface ImportFormatSelection {
+  spaceId: string;
+  onClose: () => void;
+}
+function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
+  const [treeData, setTreeData] = useAtom(treeDataAtom);
+
+  const handleFileUpload = async (selectedFiles: File[]) => {
+    if (!selectedFiles) {
+      return;
+    }
+
+    onClose();
+
+    const alert = notifications.show({
+      title: "Importing pages",
+      message: "Page import is in progress. Please do not close this tab.",
+      loading: true,
+      autoClose: false,
+    });
+
+    const pages: IPage[] = [];
+    let pageCount = 0;
+
+    for (const file of selectedFiles) {
+      try {
+        const page = await importPage(file, spaceId);
+        pages.push(page);
+        pageCount += 1;
+      } catch (err) {
+        console.log("Failed to import page", err);
+      }
+    }
+
+    const newTreeNodes = buildTree(pages);
+    const fullTree = treeData.concat(newTreeNodes);
+
+    if (newTreeNodes?.length && fullTree?.length > 0) {
+      setTreeData(fullTree);
+    }
+
+    if (pageCount > 0) {
+      notifications.update({
+        id: alert,
+        color: "teal",
+        title: `Successfully imported ${pageCount} pages`,
+        message: "Your import is complete.",
+        icon: <IconCheck size={18} />,
+        loading: false,
+        autoClose: 5000,
+      });
+    } else {
+      notifications.update({
+        id: alert,
+        color: "red",
+        title: `Failed to import pages`,
+        message: "Unable to import pages. Please try again.",
+        icon: <IconX size={18} />,
+        loading: false,
+        autoClose: 5000,
+      });
+    }
+  };
+
+  return (
+    <>
+      <SimpleGrid cols={2}>
+        <FileButton onChange={handleFileUpload} accept="text/markdown" multiple>
+          {(props) => (
+            <Button
+              justify="start"
+              variant="default"
+              leftSection={<IconMarkdown size={18} />}
+              {...props}
+            >
+              Markdown
+            </Button>
+          )}
+        </FileButton>
+
+        <FileButton onChange={handleFileUpload} accept="text/html" multiple>
+          {(props) => (
+            <Button
+              justify="start"
+              variant="default"
+              leftSection={<IconFileCode size={18} />}
+              {...props}
+            >
+              HTML
+            </Button>
+          )}
+        </FileButton>
+      </SimpleGrid>
+    </>
+  );
+}

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

@@ -67,6 +67,20 @@ export async function exportPage(data: IExportPageParams): Promise<void> {
   saveAs(req.data, fileName);
 }
 
+export async function importPage(file: File, spaceId: string) {
+  const formData = new FormData();
+  formData.append("spaceId", spaceId);
+  formData.append("file", file);
+
+  const req = await api.post<IPage>("/pages/import", formData, {
+    headers: {
+      "Content-Type": "multipart/form-data",
+    },
+  });
+
+  return req.data;
+}
+
 export async function uploadFile(file: File, pageId: string) {
   const formData = new FormData();
   formData.append("pageId", pageId);

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

@@ -447,9 +447,11 @@ function NodeMenu({ node, treeApi }: NodeMenuProps) {
               leftSection={
                 <IconTrash style={{ width: rem(14), height: rem(14) }} />
               }
-              onClick={() =>
+              onClick={(e) => {
-                openDeleteModal({ onConfirm: () => treeApi?.delete(node) })
+                e.preventDefault();
-              }
+                e.stopPropagation();
+                openDeleteModal({ onConfirm: () => treeApi?.delete(node) });
+              }}
             >
               Delete
             </Menu.Item>

apps/client/src/features/search/search-spotlight.tsx

@@ -2,7 +2,7 @@ import { Group, Center, Text } from "@mantine/core";
 import { Spotlight } from "@mantine/spotlight";
 import { IconFileDescription, IconSearch } from "@tabler/icons-react";
 import React, { useState } from "react";
-import { useNavigate, useParams } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import { useDebouncedValue } from "@mantine/hooks";
 import { usePageSearchQuery } from "@/features/search/queries/search-query";
 import { buildPageUrl } from "@/features/page/page.utils.ts";

apps/client/src/features/space/components/settings-modal.tsx

@@ -1,4 +1,4 @@
-import { Modal, Tabs, rem, Group, Divider, ScrollArea } from "@mantine/core";
+import { Modal, Tabs, rem, Group, ScrollArea } from "@mantine/core";
 import SpaceMembersList from "@/features/space/components/space-members.tsx";
 import AddSpaceMembersModal from "@/features/space/components/add-space-members-modal.tsx";
 import React, { useMemo } from "react";

apps/client/src/features/space/components/sidebar/space-name.tsx

@@ -1,4 +1,4 @@
-import { UnstyledButton, Group, Avatar, Text, rem } from "@mantine/core";
+import { UnstyledButton, Group, Text } from "@mantine/core";
 import classes from "./space-name.module.css";
 
 interface SpaceNameProps {

apps/client/src/features/space/components/sidebar/space-sidebar.tsx

@@ -1,13 +1,15 @@
 import {
   ActionIcon,
   Group,
-  rem,
+  Menu,
   Text,
   Tooltip,
   UnstyledButton,
 } from "@mantine/core";
 import { spotlight } from "@mantine/spotlight";
 import {
+  IconArrowDown,
+  IconDots,
   IconHome,
   IconPlus,
   IconSearch,
@@ -32,6 +34,7 @@ import {
   SpaceCaslAction,
   SpaceCaslSubject,
 } from "@/features/space/permissions/permissions.type.ts";
+import PageImportModal from "@/features/page/components/page-import-modal.tsx";
 
 export function SpaceSidebar() {
   const [tree] = useAtom(treeApiAtom);
@@ -140,18 +143,20 @@ export function SpaceSidebar() {
               SpaceCaslAction.Manage,
               SpaceCaslSubject.Page,
             ) && (
-              <Tooltip label="Create page" withArrow position="right">
+              <Group gap="xs">
-                <ActionIcon
+                <SpaceMenu spaceId={space.id} onSpaceSettings={openSettings} />
-                  variant="default"
+
-                  size={18}
+                <Tooltip label="Create page" withArrow position="right">
-                  onClick={handleCreatePage}
+                  <ActionIcon
-                >
+                    variant="default"
-                  <IconPlus
+                    size={18}
-                    style={{ width: rem(12), height: rem(12) }}
+                    onClick={handleCreatePage}
-                    stroke={1.5}
+                    aria-label="Create page"
-                  />
+                  >
-                </ActionIcon>
+                    <IconPlus />
-              </Tooltip>
+                  </ActionIcon>
+                </Tooltip>
+              </Group>
             )}
           </Group>
 
@@ -177,3 +182,54 @@ export function SpaceSidebar() {
     </>
   );
 }
+
+interface SpaceMenuProps {
+  spaceId: string;
+  onSpaceSettings: () => void;
+}
+function SpaceMenu({ spaceId, onSpaceSettings }: SpaceMenuProps) {
+  const [importOpened, { open: openImportModal, close: closeImportModal }] =
+    useDisclosure(false);
+
+  return (
+    <>
+      <Menu width={200} shadow="md" withArrow>
+        <Menu.Target>
+          <Tooltip
+            label="Import pages & space settings"
+            withArrow
+            position="top"
+          >
+            <ActionIcon variant="default" size={18} aria-label="Space menu">
+              <IconDots />
+            </ActionIcon>
+          </Tooltip>
+        </Menu.Target>
+
+        <Menu.Dropdown>
+          <Menu.Item
+            onClick={openImportModal}
+            leftSection={<IconArrowDown size={16} />}
+          >
+            Import pages
+          </Menu.Item>
+
+          <Menu.Divider />
+
+          <Menu.Item
+            onClick={onSpaceSettings}
+            leftSection={<IconSettings size={16} />}
+          >
+            Space settings
+          </Menu.Item>
+        </Menu.Dropdown>
+      </Menu>
+
+      <PageImportModal
+        spaceId={spaceId}
+        open={importOpened}
+        onClose={closeImportModal}
+      />
+    </>
+  );
+}

apps/client/src/features/space/components/space-members.tsx

@@ -1,5 +1,4 @@
 import { Group, Table, Text, Menu, ActionIcon } from "@mantine/core";
-import { useParams } from "react-router-dom";
 import React from "react";
 import { IconDots } from "@tabler/icons-react";
 import { modals } from "@mantine/modals";

apps/client/src/features/workspace/components/members/components/workspace-invites-table.tsx

@@ -1,4 +1,4 @@
-import { Group, Table, Avatar, Text, Badge, Alert } from "@mantine/core";
+import { Group, Table, Avatar, Text, Alert } from "@mantine/core";
 import { useWorkspaceInvitationsQuery } from "@/features/workspace/queries/workspace-query.ts";
 import React from "react";
 import { getUserRoleLabel } from "@/features/workspace/types/user-role-data.ts";

apps/client/src/features/workspace/components/members/components/workspace-members-table.tsx

@@ -1,4 +1,4 @@
-import { Group, Table, Avatar, Text, Badge } from "@mantine/core";
+import { Group, Table, Text, Badge } from "@mantine/core";
 import {
   useChangeMemberRoleMutation,
   useWorkspaceMembersQuery,

apps/server/package.json

@@ -58,8 +58,10 @@
     "fastify": "^4.28.0",
     "fix-esm": "^1.0.1",
     "fs-extra": "^11.2.0",
+    "happy-dom": "^14.12.3",
     "kysely": "^0.27.3",
     "kysely-migration-cli": "^0.4.2",
+    "marked": "^13.0.2",
     "mime-types": "^2.1.35",
     "nanoid": "^5.0.7",
     "nestjs-kysely": "^1.0.0",

apps/server/src/app.module.ts

@@ -13,6 +13,7 @@ import { StaticModule } from './integrations/static/static.module';
 import { EventEmitterModule } from '@nestjs/event-emitter';
 import { HealthModule } from './integrations/health/health.module';
 import { ExportModule } from './integrations/export/export.module';
+import { ImportModule } from './integrations/import/import.module';
 
 @Module({
   imports: [
@@ -24,6 +25,7 @@ import { ExportModule } from './integrations/export/export.module';
     QueueModule,
     StaticModule,
     HealthModule,
+    ImportModule,
     ExportModule,
     StorageModule.forRootAsync({
       imports: [EnvironmentModule],

apps/server/src/collaboration/collaboration.util.ts

@@ -27,8 +27,8 @@ import {
   TiptapVideo,
   TrailingNode,
 } from '@docmost/editor-ext';
-import { generateHTML, generateJSON } from '@tiptap/html';
 import { generateText, JSONContent } from '@tiptap/core';
+import { generateHTML, generateJSON } from '../common/helpers/prosemirror/html';
 
 export const tiptapExtensions = [
   StarterKit,

apps/server/src/common/helpers/prosemirror/html/generateHTML.ts

@@ -0,0 +1,21 @@
+import { Extensions, getSchema, JSONContent } from '@tiptap/core';
+import { DOMSerializer, Node } from '@tiptap/pm/model';
+import { Window } from 'happy-dom';
+
+export function generateHTML(doc: JSONContent, extensions: Extensions): string {
+  const schema = getSchema(extensions);
+  const contentNode = Node.fromJSON(schema, doc);
+
+  const window = new Window();
+
+  const fragment = DOMSerializer.fromSchema(schema).serializeFragment(
+    contentNode.content,
+    {
+      document: window.document as unknown as Document,
+    },
+  );
+
+  const serializer = new window.XMLSerializer();
+  // @ts-ignore
+  return serializer.serializeToString(fragment as unknown as Node);
+}

apps/server/src/common/helpers/prosemirror/html/generateJSON.ts

@@ -0,0 +1,20 @@
+import { Extensions, getSchema } from '@tiptap/core';
+import { DOMParser, ParseOptions } from '@tiptap/pm/model';
+import { Window, DOMParser as HappyDomParser } from 'happy-dom';
+
+export function generateJSON(
+  html: string,
+  extensions: Extensions,
+  options?: ParseOptions,
+): Record<string, any> {
+  const schema = getSchema(extensions);
+
+  const window = new Window();
+  const dom = new HappyDomParser(window).parseFromString(
+    html,
+    'text/html',
+  ).body;
+
+  // @ts-ignore
+  return DOMParser.fromSchema(schema).parse(dom, options).toJSON();
+}

apps/server/src/common/helpers/prosemirror/html/index.ts

@@ -0,0 +1,2 @@
+export * from './generateHTML.js';
+export * from './generateJSON.js';

apps/server/src/common/interceptors/file.interceptor.ts

@@ -9,7 +9,7 @@ import { Observable } from 'rxjs';
 import { FastifyRequest } from 'fastify';
 
 @Injectable()
-export class AttachmentInterceptor implements NestInterceptor {
+export class FileInterceptor implements NestInterceptor {
   public intercept(
     context: ExecutionContext,
     next: CallHandler,

apps/server/src/core/attachment/attachment.controller.ts

@@ -16,7 +16,7 @@ import {
 } from '@nestjs/common';
 import { AttachmentService } from './services/attachment.service';
 import { FastifyReply } from 'fastify';
-import { AttachmentInterceptor } from './interceptors/attachment.interceptor';
+import { FileInterceptor } from '../../common/interceptors/file.interceptor';
 import * as bytes from 'bytes';
 import { AuthUser } from '../../common/decorators/auth-user.decorator';
 import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
@@ -63,7 +63,7 @@ export class AttachmentController {
   @UseGuards(JwtAuthGuard)
   @HttpCode(HttpStatus.OK)
   @Post('files/upload')
-  @UseInterceptors(AttachmentInterceptor)
+  @UseInterceptors(FileInterceptor)
   async uploadFile(
     @Req() req: any,
     @Res() res: FastifyReply,
@@ -176,7 +176,7 @@ export class AttachmentController {
   @UseGuards(JwtAuthGuard)
   @HttpCode(HttpStatus.OK)
   @Post('attachments/upload-image')
-  @UseInterceptors(AttachmentInterceptor)
+  @UseInterceptors(FileInterceptor)
   async uploadAvatarOrLogo(
     @Req() req: any,
     @Res() res: FastifyReply,

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

@@ -28,7 +28,7 @@ import { getMimeType } from '../../common/helpers';
 @Controller()
 export class ImportController {
   constructor(
-    private readonly importService: ExportService,
+    private readonly exportService: ExportService,
     private readonly pageRepo: PageRepo,
     private readonly spaceAbility: SpaceAbilityFactory,
   ) {}
@@ -54,7 +54,7 @@ export class ImportController {
       throw new ForbiddenException();
     }
 
-    const rawContent = await this.importService.exportPage(dto.format, page);
+    const rawContent = await this.exportService.exportPage(dto.format, page);
 
     const fileExt = getExportExtension(dto.format);
     const fileName = sanitize(page.title || 'Untitled') + fileExt;

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

@@ -0,0 +1,4 @@
+export enum ImportFormat {
+  HTML = 'html',
+  Markdown = 'markdown',
+}

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

@@ -0,0 +1,78 @@
+import {
+  BadRequestException,
+  Controller,
+  ForbiddenException,
+  HttpCode,
+  HttpStatus,
+  Logger,
+  Post,
+  Req,
+  UseGuards,
+  UseInterceptors,
+} from '@nestjs/common';
+import SpaceAbilityFactory from '../../core/casl/abilities/space-ability.factory';
+import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
+import { AuthUser } from '../../common/decorators/auth-user.decorator';
+import { User, Workspace } from '@docmost/db/types/entity.types';
+import {
+  SpaceCaslAction,
+  SpaceCaslSubject,
+} from '../../core/casl/interfaces/space-ability.type';
+import { FileInterceptor } from '../../common/interceptors/file.interceptor';
+import * as bytes from 'bytes';
+import { MAX_FILE_SIZE } from '../../core/attachment/attachment.constants';
+import { ImportService } from './import.service';
+import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
+
+@Controller()
+export class ImportController {
+  private readonly logger = new Logger(ImportController.name);
+
+  constructor(
+    private readonly importService: ImportService,
+    private readonly spaceAbility: SpaceAbilityFactory,
+  ) {}
+
+  @UseInterceptors(FileInterceptor)
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  @Post('pages/import')
+  async importPage(
+    @Req() req: any,
+    @AuthUser() user: User,
+    @AuthWorkspace() workspace: Workspace,
+  ) {
+    const maxFileSize = bytes(MAX_FILE_SIZE);
+
+    let file = null;
+    try {
+      file = await req.file({
+        limits: { fileSize: maxFileSize, fields: 3, files: 1 },
+      });
+    } catch (err: any) {
+      this.logger.error(err.message);
+      if (err?.statusCode === 413) {
+        throw new BadRequestException(
+          `File too large. Exceeds the ${MAX_FILE_SIZE} limit`,
+        );
+      }
+    }
+
+    if (!file) {
+      throw new BadRequestException('Failed to upload file');
+    }
+
+    const spaceId = file.fields?.spaceId?.value;
+
+    if (!spaceId) {
+      throw new BadRequestException('spaceId or format not found');
+    }
+
+    const ability = await this.spaceAbility.createForUser(user, spaceId);
+    if (ability.cannot(SpaceCaslAction.Edit, SpaceCaslSubject.Page)) {
+      throw new ForbiddenException();
+    }
+
+    return this.importService.importPage(file, user.id, spaceId, workspace.id);
+  }
+}

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

@@ -0,0 +1,9 @@
+import { Module } from '@nestjs/common';
+import { ImportService } from './import.service';
+import { ImportController } from './import.controller';
+
+@Module({
+  providers: [ImportService],
+  controllers: [ImportController]
+})
+export class ImportModule {}

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

@@ -0,0 +1,126 @@
+import { BadRequestException, Injectable, Logger } from '@nestjs/common';
+import { PageRepo } from '@docmost/db/repos/page/page.repo';
+import { MultipartFile } from '@fastify/multipart';
+import { sanitize } from 'sanitize-filename-ts';
+import * as path from 'path';
+import { htmlToJson } from '../../collaboration/collaboration.util';
+import { marked } from 'marked';
+import { InjectKysely } from 'nestjs-kysely';
+import { KyselyDB } from '@docmost/db/types/kysely.types';
+import { generateSlugId } from '../../common/helpers';
+import { generateJitteredKeyBetween } from 'fractional-indexing-jittered';
+import { transformHTML } from './utils/html.utils';
+
+@Injectable()
+export class ImportService {
+  private readonly logger = new Logger(ImportService.name);
+
+  constructor(
+    private readonly pageRepo: PageRepo,
+    @InjectKysely() private readonly db: KyselyDB,
+  ) {}
+
+  async importPage(
+    filePromise: Promise<MultipartFile>,
+    userId: string,
+    spaceId: string,
+    workspaceId: string,
+  ): Promise<void> {
+    const file = await filePromise;
+    const fileBuffer = await file.toBuffer();
+    const fileName = sanitize(file.filename).slice(0, 255).split('.')[0];
+    const fileExtension = path.extname(file.filename).toLowerCase();
+    const fileMimeType = file.mimetype;
+    const fileContent = fileBuffer.toString();
+
+    let prosemirrorState = null;
+    let createdPage = null;
+
+    if (fileExtension.endsWith('.md') && fileMimeType === 'text/markdown') {
+      prosemirrorState = await this.processMarkdown(fileContent);
+    }
+
+    if (fileExtension.endsWith('.html') && fileMimeType === 'text/html') {
+      prosemirrorState = await this.processHTML(fileContent);
+    }
+
+    if (!prosemirrorState) {
+      const message = 'Unsupported file format or mime type';
+      this.logger.error(message);
+      throw new BadRequestException(message);
+    }
+
+    const { title, prosemirrorJson } =
+      this.extractTitleAndRemoveHeading(prosemirrorState);
+
+    const pageTitle = title || fileName;
+
+    if (prosemirrorJson) {
+      try {
+        const pagePosition = await this.getNewPagePosition(spaceId);
+
+        createdPage = await this.pageRepo.insertPage({
+          slugId: generateSlugId(),
+          title: pageTitle,
+          content: prosemirrorJson,
+          position: pagePosition,
+          spaceId: spaceId,
+          creatorId: userId,
+          workspaceId: workspaceId,
+          lastUpdatedById: userId,
+        });
+      } catch (err) {
+        const message = 'Failed to create page';
+        this.logger.error(message, err);
+        throw new BadRequestException(message);
+      }
+    }
+
+    return createdPage;
+  }
+
+  async processMarkdown(markdownInput: string): Promise<any> {
+    // turn markdown to html
+    const html = await marked.parse(markdownInput);
+    return await this.processHTML(html);
+  }
+
+  async processHTML(htmlInput: string): Promise<any> {
+    // turn html to prosemirror state
+    return htmlToJson(transformHTML(htmlInput));
+  }
+
+  extractTitleAndRemoveHeading(prosemirrorState: any) {
+    let title = null;
+
+    if (
+      prosemirrorState?.content?.length > 0 &&
+      prosemirrorState.content[0].type === 'heading' &&
+      prosemirrorState.content[0].attrs?.level === 1
+    ) {
+      title = prosemirrorState.content[0].content[0].text;
+
+      // remove h1 header node from state
+      prosemirrorState.content.shift();
+    }
+
+    return { title, prosemirrorJson: prosemirrorState };
+  }
+
+  async getNewPagePosition(spaceId: string): Promise<string> {
+    const lastPage = await this.db
+      .selectFrom('pages')
+      .select(['id', 'position'])
+      .where('spaceId', '=', spaceId)
+      .orderBy('position', 'desc')
+      .limit(1)
+      .where('parentPageId', 'is', null)
+      .executeTakeFirst();
+
+    if (lastPage) {
+      return generateJitteredKeyBetween(lastPage.position, null);
+    } else {
+      return generateJitteredKeyBetween(null, null);
+    }
+  }
+}

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

@@ -0,0 +1,80 @@
+import { Window, DOMParser } from 'happy-dom';
+
+function transformTaskList(html: string): string {
+  const window = new Window();
+  const doc = new DOMParser(window).parseFromString(html, 'text/html');
+
+  const ulElements = doc.querySelectorAll('ul');
+  ulElements.forEach((ul) => {
+    let isTaskList = false;
+
+    const liElements = ul.querySelectorAll('li');
+    liElements.forEach((li) => {
+      const checkbox = li.querySelector('input[type="checkbox"]');
+
+      if (checkbox) {
+        isTaskList = true;
+        // Add taskItem data type
+        li.setAttribute('data-type', 'taskItem');
+        // Set data-checked attribute based on the checkbox state
+        // @ts-ignore
+        li.setAttribute('data-checked', checkbox.checked ? 'true' : 'false');
+        // Remove the checkbox from the li
+        checkbox.remove();
+
+        // Move the content of <p> out of the <p> and remove <p>
+        const pElements = li.querySelectorAll('p');
+        pElements.forEach((p) => {
+          // Append the content of the <p> element to its parent (the <li> element)
+          while (p.firstChild) {
+            li.appendChild(p.firstChild);
+          }
+          // Remove the now empty <p> element
+          p.remove();
+        });
+      }
+    });
+
+    // If any <li> contains a checkbox, mark the <ul> as a task list
+    if (isTaskList) {
+      ul.setAttribute('data-type', 'taskList');
+    }
+  });
+
+  return doc.body.innerHTML;
+}
+
+function transformCallouts(html: string): string {
+  const window = new Window();
+  const doc = new DOMParser(window).parseFromString(html, 'text/html');
+
+  const calloutRegex = /:::(\w+)\s*([\s\S]*?)\s*:::/g;
+
+  const createCalloutDiv = (type: string, content: string): HTMLElement => {
+    const div = doc.createElement('div');
+    div.setAttribute('data-type', 'callout');
+    div.setAttribute('data-callout-type', type);
+    const p = doc.createElement('p');
+    p.textContent = content.trim();
+    div.appendChild(p);
+    return div as unknown as HTMLElement;
+  };
+
+  const pElements = doc.querySelectorAll('p');
+
+  pElements.forEach((p) => {
+    if (calloutRegex.test(p.innerHTML) && !p.closest('ul, ol')) {
+      calloutRegex.lastIndex = 0;
+      const [, type, content] = calloutRegex.exec(p.innerHTML) || [];
+      const calloutDiv = createCalloutDiv(type, content);
+      // @ts-ignore
+      p.replaceWith(calloutDiv);
+    }
+  });
+
+  return doc.body.innerHTML;
+}
+
+export function transformHTML(html: string): string {
+  return transformTaskList(transformCallouts(html));
+}

package.json

@@ -24,40 +24,39 @@
     "@joplin/turndown": "^4.0.74",
     "@joplin/turndown-plugin-gfm": "^1.0.56",
     "@sindresorhus/slugify": "^2.2.1",
-    "@tiptap/core": "^2.4.0",
+    "@tiptap/core": "^2.5.4",
-    "@tiptap/extension-code-block": "^2.4.0",
+    "@tiptap/extension-code-block": "^2.5.4",
-    "@tiptap/extension-collaboration": "^2.4.0",
+    "@tiptap/extension-collaboration": "^2.5.4",
-    "@tiptap/extension-collaboration-cursor": "^2.4.0",
+    "@tiptap/extension-collaboration-cursor": "^2.5.4",
-    "@tiptap/extension-color": "^2.4.0",
+    "@tiptap/extension-color": "^2.5.4",
-    "@tiptap/extension-document": "^2.4.0",
+    "@tiptap/extension-document": "^2.5.4",
-    "@tiptap/extension-heading": "^2.4.0",
+    "@tiptap/extension-heading": "^2.5.4",
-    "@tiptap/extension-highlight": "^2.4.0",
+    "@tiptap/extension-highlight": "^2.5.4",
-    "@tiptap/extension-history": "^2.4.0",
+    "@tiptap/extension-history": "^2.5.4",
-    "@tiptap/extension-image": "^2.4.0",
+    "@tiptap/extension-image": "^2.5.4",
-    "@tiptap/extension-link": "^2.4.0",
+    "@tiptap/extension-link": "^2.5.4",
-    "@tiptap/extension-list-item": "^2.4.0",
+    "@tiptap/extension-list-item": "^2.5.4",
-    "@tiptap/extension-list-keymap": "^2.4.0",
+    "@tiptap/extension-list-keymap": "^2.5.4",
-    "@tiptap/extension-mention": "^2.4.0",
+    "@tiptap/extension-mention": "^2.5.4",
-    "@tiptap/extension-placeholder": "^2.4.0",
+    "@tiptap/extension-placeholder": "^2.5.4",
-    "@tiptap/extension-subscript": "^2.4.0",
+    "@tiptap/extension-subscript": "^2.5.4",
-    "@tiptap/extension-superscript": "^2.4.0",
+    "@tiptap/extension-superscript": "^2.5.4",
-    "@tiptap/extension-table": "^2.4.0",
+    "@tiptap/extension-table": "^2.5.4",
-    "@tiptap/extension-table-cell": "^2.4.0",
+    "@tiptap/extension-table-cell": "^2.5.4",
-    "@tiptap/extension-table-header": "^2.4.0",
+    "@tiptap/extension-table-header": "^2.5.4",
-    "@tiptap/extension-table-row": "^2.4.0",
+    "@tiptap/extension-table-row": "^2.5.4",
-    "@tiptap/extension-task-item": "^2.4.0",
+    "@tiptap/extension-task-item": "^2.5.4",
-    "@tiptap/extension-task-list": "^2.4.0",
+    "@tiptap/extension-task-list": "^2.5.4",
-    "@tiptap/extension-text": "^2.4.0",
+    "@tiptap/extension-text": "^2.5.4",
-    "@tiptap/extension-text-align": "^2.4.0",
+    "@tiptap/extension-text-align": "^2.5.4",
-    "@tiptap/extension-text-style": "^2.4.0",
+    "@tiptap/extension-text-style": "^2.5.4",
-    "@tiptap/extension-typography": "^2.4.0",
+    "@tiptap/extension-typography": "^2.5.4",
-    "@tiptap/extension-underline": "^2.4.0",
+    "@tiptap/extension-underline": "^2.5.4",
-    "@tiptap/extension-youtube": "^2.4.0",
+    "@tiptap/extension-youtube": "^2.5.4",
-    "@tiptap/html": "^2.4.0",
+    "@tiptap/pm": "^2.5.4",
-    "@tiptap/pm": "^2.4.0",
+    "@tiptap/react": "^2.5.4",
-    "@tiptap/react": "^2.4.0",
+    "@tiptap/starter-kit": "^2.5.4",
-    "@tiptap/starter-kit": "^2.4.0",
+    "@tiptap/suggestion": "^2.5.4",
-    "@tiptap/suggestion": "^2.4.0",
     "cross-env": "^7.0.3",
     "fractional-indexing-jittered": "^0.9.1",
     "ioredis": "^5.4.1",