optimize search query and ts_headline usage

apps/client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "client",
   "private": true,
-  "version": "0.25.0-beta.1",
+  "version": "0.24.1",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",

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

@@ -123,11 +123,6 @@
   "page": "page",
   "Page deleted successfully": "Page deleted successfully",
   "Page history": "Page history",
-  "Version history for": "Version history for",
-  "document": "document",
-  "Select version": "Select version",
-  "Close": "Close",
-  "Highlight changes": "Highlight changes",
   "Page import is in progress. Please do not close this tab.": "Page import is in progress. Please do not close this tab.",
   "Pages": "Pages",
   "pages": "pages",

apps/client/src/components/common/paginate.tsx

@@ -2,17 +2,17 @@ import { Button, Group } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 
 export interface PagePaginationProps {
+  currentPage: number;
   hasPrevPage: boolean;
   hasNextPage: boolean;
-  onPrev: () => void;
-  onNext: () => void;
+  onPageChange: (newPage: number) => void;
 }
 
 export default function Paginate({
+  currentPage,
   hasPrevPage,
   hasNextPage,
-  onPrev,
-  onNext,
+  onPageChange,
 }: PagePaginationProps) {
   const { t } = useTranslation();
 
@@ -25,7 +25,7 @@ export default function Paginate({
       <Button
         variant="default"
         size="compact-sm"
-        onClick={onPrev}
+        onClick={() => onPageChange(currentPage - 1)}
         disabled={!hasPrevPage}
       >
         {t("Prev")}
@@ -34,7 +34,7 @@ export default function Paginate({
       <Button
         variant="default"
         size="compact-sm"
-        onClick={onNext}
+        onClick={() => onPageChange(currentPage + 1)}
         disabled={!hasNextPage}
       >
         {t("Next")}

apps/client/src/components/settings/settings-queries.tsx

@@ -13,7 +13,7 @@ import { getShares } from "@/features/share/services/share-service.ts";
 import { getApiKeys } from "@/ee/api-key";
 
 export const prefetchWorkspaceMembers = () => {
-  const params: QueryParams = { limit: 100, query: "" };
+  const params = { limit: 100, page: 1, query: "" } as QueryParams;
   queryClient.prefetchQuery({
     queryKey: ["workspaceMembers", params],
     queryFn: () => getWorkspaceMembers(params),
@@ -22,15 +22,15 @@ export const prefetchWorkspaceMembers = () => {
 
 export const prefetchSpaces = () => {
   queryClient.prefetchQuery({
-    queryKey: ["spaces", {}],
-    queryFn: () => getSpaces({}),
+    queryKey: ["spaces", { page: 1 }],
+    queryFn: () => getSpaces({ page: 1 }),
   });
 };
 
 export const prefetchGroups = () => {
   queryClient.prefetchQuery({
-    queryKey: ["groups", {}],
-    queryFn: () => getGroups({}),
+    queryKey: ["groups", { page: 1 }],
+    queryFn: () => getGroups({ page: 1 }),
   });
 };
 
@@ -62,21 +62,21 @@ export const prefetchSsoProviders = () => {
 
 export const prefetchShares = () => {
   queryClient.prefetchQuery({
-    queryKey: ["share-list", {}],
-    queryFn: () => getShares({}),
+    queryKey: ["share-list", { page: 1 }],
+    queryFn: () => getShares({ page: 1, limit: 100 }),
   });
 };
 
 export const prefetchApiKeys = () => {
   queryClient.prefetchQuery({
-    queryKey: ["api-key-list", {}],
-    queryFn: () => getApiKeys({}),
+    queryKey: ["api-key-list", { page: 1 }],
+    queryFn: () => getApiKeys({ page: 1 }),
   });
 };
 
 export const prefetchApiKeyManagement = () => {
   queryClient.prefetchQuery({
-    queryKey: ["api-key-list", { adminView: true }],
-    queryFn: () => getApiKeys({ adminView: true }),
+    queryKey: ["api-key-list", { page: 1 }],
+    queryFn: () => getApiKeys({ page: 1, adminView: true }),
   });
 };

apps/client/src/ee/api-key/pages/user-api-keys.tsx

@@ -10,19 +10,19 @@ import { ApiKeyCreatedModal } from "@/ee/api-key/components/api-key-created-moda
 import { UpdateApiKeyModal } from "@/ee/api-key/components/update-api-key-modal";
 import { RevokeApiKeyModal } from "@/ee/api-key/components/revoke-api-key-modal";
 import Paginate from "@/components/common/paginate";
-import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
+import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search";
 import { useGetApiKeysQuery } from "@/ee/api-key/queries/api-key-query.ts";
 import { IApiKey } from "@/ee/api-key";
 
 export default function UserApiKeys() {
   const { t } = useTranslation();
-  const { cursor, goNext, goPrev } = useCursorPaginate();
+  const { page, setPage } = usePaginateAndSearch();
   const [createModalOpened, setCreateModalOpened] = useState(false);
   const [createdApiKey, setCreatedApiKey] = useState<IApiKey | null>(null);
   const [updateModalOpened, setUpdateModalOpened] = useState(false);
   const [revokeModalOpened, setRevokeModalOpened] = useState(false);
   const [selectedApiKey, setSelectedApiKey] = useState<IApiKey | null>(null);
-  const { data, isLoading } = useGetApiKeysQuery({ cursor });
+  const { data, isLoading } = useGetApiKeysQuery({ page });
 
   const handleCreateSuccess = (response: IApiKey) => {
     setCreatedApiKey(response);
@@ -65,10 +65,10 @@ export default function UserApiKeys() {
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
-          hasNextPage={data?.meta?.hasNextPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
-          onPrev={goPrev}
+          currentPage={page}
+          hasPrevPage={data?.meta.hasPrevPage}
+          hasNextPage={data?.meta.hasNextPage}
+          onPageChange={setPage}
         />
       )}
 

apps/client/src/ee/api-key/pages/workspace-api-keys.tsx

@@ -10,20 +10,20 @@ import { ApiKeyCreatedModal } from "@/ee/api-key/components/api-key-created-moda
 import { UpdateApiKeyModal } from "@/ee/api-key/components/update-api-key-modal";
 import { RevokeApiKeyModal } from "@/ee/api-key/components/revoke-api-key-modal";
 import Paginate from "@/components/common/paginate";
-import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
+import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search";
 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';
 
 export default function WorkspaceApiKeys() {
   const { t } = useTranslation();
-  const { cursor, goNext, goPrev } = useCursorPaginate();
+  const { page, setPage } = usePaginateAndSearch();
   const [createModalOpened, setCreateModalOpened] = useState(false);
   const [createdApiKey, setCreatedApiKey] = useState<IApiKey | null>(null);
   const [updateModalOpened, setUpdateModalOpened] = useState(false);
   const [revokeModalOpened, setRevokeModalOpened] = useState(false);
   const [selectedApiKey, setSelectedApiKey] = useState<IApiKey | null>(null);
-  const { data, isLoading } = useGetApiKeysQuery({ cursor, adminView: true });
+  const { data, isLoading } = useGetApiKeysQuery({ page, adminView: true });
   const { isAdmin } = useUserRole();
 
   if (!isAdmin) {
@@ -76,10 +76,10 @@ export default function WorkspaceApiKeys() {
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
-          hasNextPage={data?.meta?.hasNextPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
-          onPrev={goPrev}
+          currentPage={page}
+          hasPrevPage={data?.meta.hasPrevPage}
+          hasNextPage={data?.meta.hasNextPage}
+          onPageChange={setPage}
         />
       )}
 

apps/client/src/ee/security/components/sso-provider-list.tsx

@@ -43,7 +43,7 @@ export default function SsoProviderList() {
     return null;
   }
 
-  if (data?.items.length === 0) {
+  if (data?.length === 0) {
     return <Text c="dimmed">{t("No SSO providers found.")}</Text>;
   }
 
@@ -81,7 +81,7 @@ export default function SsoProviderList() {
               </Table.Tr>
             </Table.Thead>
             <Table.Tbody>
-              {data?.items
+              {data
                 .sort((a, b) => {
                   const enabledDiff = Number(b.isEnabled) - Number(a.isEnabled);
                   if (enabledDiff !== 0) return enabledDiff;
@@ -104,11 +104,7 @@ export default function SsoProviderList() {
                       </Group>
                     </Table.Td>
                     <Table.Td>
-                      <Badge
-                        color={"gray"}
-                        variant="light"
-                        style={{ whiteSpace: "nowrap" }}
-                      >
+                      <Badge color={"gray"} variant="light" style={{ whiteSpace: "nowrap" }}>
                         {provider.type.toUpperCase()}
                       </Badge>
                     </Table.Td>
@@ -138,41 +134,41 @@ export default function SsoProviderList() {
                     </Table.Td>
                     <Table.Td>
                       <Group gap="xs" wrap="nowrap">
-                        <ActionIcon
-                          variant="subtle"
-                          color="gray"
-                          onClick={() => handleEdit(provider)}
-                        >
-                          <IconPencil size={16} />
-                        </ActionIcon>
-                        <Menu
-                          transitionProps={{ transition: "pop" }}
-                          withArrow
-                          position="bottom-end"
-                          withinPortal
-                        >
-                          <Menu.Target>
-                            <ActionIcon variant="subtle" color="gray">
-                              <IconDots size={16} />
-                            </ActionIcon>
-                          </Menu.Target>
-                          <Menu.Dropdown>
-                            <Menu.Item
-                              onClick={() => handleEdit(provider)}
-                              leftSection={<IconPencil size={16} />}
-                            >
-                              {t("Edit")}
-                            </Menu.Item>
-                            <Menu.Item
-                              onClick={() => openDeleteModal(provider.id)}
-                              leftSection={<IconTrash size={16} />}
-                              color="red"
-                              disabled={provider.type === SSO_PROVIDER.GOOGLE}
-                            >
-                              {t("Delete")}
-                            </Menu.Item>
-                          </Menu.Dropdown>
-                        </Menu>
+                      <ActionIcon
+                        variant="subtle"
+                        color="gray"
+                        onClick={() => handleEdit(provider)}
+                      >
+                        <IconPencil size={16} />
+                      </ActionIcon>
+                      <Menu
+                        transitionProps={{ transition: "pop" }}
+                        withArrow
+                        position="bottom-end"
+                        withinPortal
+                      >
+                        <Menu.Target>
+                          <ActionIcon variant="subtle" color="gray">
+                            <IconDots size={16} />
+                          </ActionIcon>
+                        </Menu.Target>
+                        <Menu.Dropdown>
+                          <Menu.Item
+                            onClick={() => handleEdit(provider)}
+                            leftSection={<IconPencil size={16} />}
+                          >
+                            {t("Edit")}
+                          </Menu.Item>
+                          <Menu.Item
+                            onClick={() => openDeleteModal(provider.id)}
+                            leftSection={<IconTrash size={16} />}
+                            color="red"
+                            disabled={provider.type === SSO_PROVIDER.GOOGLE}
+                          >
+                            {t("Delete")}
+                          </Menu.Item>
+                        </Menu.Dropdown>
+                      </Menu>
                       </Group>
                     </Table.Td>
                   </Table.Tr>

apps/client/src/ee/security/queries/security-query.ts

@@ -13,9 +13,8 @@ import {
 } from "@/ee/security/services/security-service.ts";
 import { notifications } from "@mantine/notifications";
 import { IAuthProvider } from "@/ee/security/types/security.types.ts";
-import { IPagination } from "@/lib/types.ts";
 
-export function useGetSsoProviders(): UseQueryResult<IPagination<IAuthProvider>, Error> {
+export function useGetSsoProviders(): UseQueryResult<IAuthProvider[], Error> {
   return useQuery({
     queryKey: ["sso-providers"],
     queryFn: () => getSsoProviders(),

apps/client/src/ee/security/services/security-service.ts

@@ -1,6 +1,5 @@
 import api from "@/lib/api-client.ts";
 import { IAuthProvider } from "@/ee/security/types/security.types.ts";
-import { IPagination } from "@/lib/types.ts";
 
 export async function getSsoProviderById(data: {
   providerId: string;
@@ -9,8 +8,8 @@ export async function getSsoProviderById(data: {
   return req.data;
 }
 
-export async function getSsoProviders(): Promise<IPagination<IAuthProvider>> {
-  const req = await api.post<IPagination<IAuthProvider>>("/sso/providers");
+export async function getSsoProviders(): Promise<IAuthProvider[]> {
+  const req = await api.post<IAuthProvider[]>("/sso/providers");
   return req.data;
 }
 

apps/client/src/features/group/components/group-list.tsx

@@ -1,25 +1,26 @@
 import { Table, Group, Text, Anchor } from "@mantine/core";
 import { useGetGroupsQuery } from "@/features/group/queries/group-query";
+import { useState } from "react";
 import { Link } from "react-router-dom";
-import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import { IconGroupCircle } from "@/components/icons/icon-people-circle.tsx";
 import { useTranslation } from "react-i18next";
 import { formatMemberCount } from "@/lib";
 import { IGroup } from "@/features/group/types/group.types.ts";
 import Paginate from "@/components/common/paginate.tsx";
 import { queryClient } from "@/main.tsx";
+import { getSpaces } from "@/features/space/services/space-service.ts";
 import { getGroupMembers } from "@/features/group/services/group-service.ts";
 import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx";
 
 export default function GroupList() {
   const { t } = useTranslation();
-  const { cursor, goNext, goPrev } = useCursorPaginate();
-  const { data, isLoading } = useGetGroupsQuery({ cursor });
+  const [page, setPage] = useState(1);
+  const { data, isLoading } = useGetGroupsQuery({ page });
 
   const prefetchGroupMembers = (groupId: string) => {
     queryClient.prefetchQuery({
-      queryKey: ["groupMembers", groupId, {}],
-      queryFn: () => getGroupMembers(groupId, {}),
+      queryKey: ["groupMembers", groupId, { page: 1 }],
+      queryFn: () => getGroupMembers(groupId, { page: 1 }),
     });
   };
 
@@ -84,10 +85,10 @@ export default function GroupList() {
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
-          hasNextPage={data?.meta?.hasNextPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
-          onPrev={goPrev}
+          currentPage={page}
+          hasPrevPage={data?.meta.hasPrevPage}
+          hasNextPage={data?.meta.hasNextPage}
+          onPageChange={setPage}
         />
       )}
     </>

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

@@ -4,7 +4,7 @@ import {
   useRemoveGroupMemberMutation,
 } from "@/features/group/queries/group-query";
 import { useParams } from "react-router-dom";
-import React from "react";
+import React, { useState } from "react";
 import { IconDots } from "@tabler/icons-react";
 import { modals } from "@mantine/modals";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
@@ -12,13 +12,12 @@ import useUserRole from "@/hooks/use-user-role.tsx";
 import { useTranslation } from "react-i18next";
 import { IUser } from "@/features/user/types/user.types.ts";
 import Paginate from "@/components/common/paginate.tsx";
-import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 
 export default function GroupMembersList() {
   const { t } = useTranslation();
   const { groupId } = useParams();
-  const { cursor, goNext, goPrev } = useCursorPaginate();
-  const { data, isLoading } = useGroupMembersQuery(groupId, { cursor });
+  const [page, setPage] = useState(1);
+  const { data, isLoading } = useGroupMembersQuery(groupId, { page });
   const removeGroupMember = useRemoveGroupMemberMutation();
   const { isAdmin } = useUserRole();
 
@@ -108,10 +107,10 @@ export default function GroupMembersList() {
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
-          hasNextPage={data?.meta?.hasNextPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
-          onPrev={goPrev}
+          currentPage={page}
+          hasPrevPage={data?.meta.hasPrevPage}
+          hasNextPage={data?.meta.hasNextPage}
+          onPageChange={setPage}
         />
       )}
     </>

apps/client/src/features/page-history/atoms/history-atoms.ts

@@ -1,9 +1,4 @@
 import { atom } from "jotai";
 
 export const historyAtoms = atom<boolean>(false);
-export const activeHistoryIdAtom = atom<string>("");
-export const activeHistoryPrevIdAtom = atom<string>("");
-export const highlightChangesAtom = atom<boolean>(true);
-
-export type DiffCounts = { added: number; deleted: number; total: number };
-export const diffCountsAtom = atom<DiffCounts | null>(null);
+export const activeHistoryIdAtom = atom<string>('');

apps/client/src/features/page-history/components/css/history-diff.module.css

@@ -1,38 +0,0 @@
-.diffSummary {
-  border: rem(1px) solid
-    light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
-  border-radius: rem(10px);
-  padding: rem(12px);
-  background: light-dark(
-    var(--mantine-color-gray-0),
-    var(--mantine-color-dark-7)
-  );
-}
-
-:global(.history-diff-added) {
-  background: light-dark(#e1f3f2, #01654a) !important;
-  color: light-dark(#007b69, #cafff7) !important;
-  -webkit-box-decoration-break: clone;
-  box-decoration-break: clone;
-}
-
-:global(.history-diff-deleted) {
-  text-decoration: line-through;
-  color: light-dark(var(--mantine-color-red-7), var(--mantine-color-red-4));
-  background: light-dark(var(--mantine-color-red-0), rgba(255, 0, 0, 0.1));
-  border-radius: rem(2px);
-  padding: 0 rem(2px);
-}
-
-:global(.history-diff-node-added) {
-  outline: rem(2px) solid light-dark(var(--mantine-color-teal-5), var(--mantine-color-teal-7));
-  outline-offset: rem(2px);
-  border-radius: rem(4px);
-}
-
-:global(.history-diff-node-deleted) {
-  opacity: 0.5;
-  outline: rem(2px) dashed light-dark(var(--mantine-color-red-4), var(--mantine-color-red-6));
-  outline-offset: rem(4px);
-  border-radius: rem(4px);
-}

apps/client/src/features/page-history/components/css/history-mobile.module.css

@@ -1,69 +0,0 @@
-.container {
-  display: flex;
-  flex-direction: column;
-  height: calc(100vh - 60px);
-  position: relative;
-  overflow: hidden;
-}
-
-.selectorWrapper {
-  padding: var(--mantine-spacing-sm);
-  border-bottom: rem(1px) solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
-  flex-shrink: 0;
-}
-
-.selector {
-  width: 100%;
-  text-align: left;
-  background-color: light-dark(var(--mantine-color-white), var(--mantine-color-dark-6));
-  padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm);
-  cursor: pointer;
-
-  &:hover {
-    background-color: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-5));
-  }
-}
-
-.dropdown {
-  max-height: rem(300px);
-}
-
-.option {
-  padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm);
-
-  &[data-combobox-selected] {
-    background-color: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-5));
-  }
-
-  &:hover {
-    background-color: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-5));
-  }
-}
-
-.editorArea {
-  flex: 1;
-  min-height: 0;
-}
-
-.editorContent {
-  padding: var(--mantine-spacing-md);
-  padding-bottom: rem(60px);
-}
-
-.actionButtons {
-  padding: var(--mantine-spacing-sm) var(--mantine-spacing-md);
-  padding-bottom: rem(70px);
-  border-top: rem(1px) solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
-  background-color: light-dark(var(--mantine-color-white), var(--mantine-color-dark-7));
-  flex-shrink: 0;
-}
-
-.floatingBar {
-  position: fixed;
-  bottom: var(--mantine-spacing-md);
-  left: 50%;
-  transform: translateX(-50%);
-  z-index: 100;
-  background-color: light-dark(var(--mantine-color-white), var(--mantine-color-dark-6));
-  white-space: nowrap;
-}

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

@@ -1,204 +1,36 @@
 import "@/features/editor/styles/index.css";
-import "./css/history-diff.module.css";
-import { useEffect } from "react";
+import React, { useEffect } from "react";
 import { EditorContent, useEditor } from "@tiptap/react";
 import { mainExtensions } from "@/features/editor/extensions/extensions";
 import { Title } from "@mantine/core";
-import { Decoration, DecorationSet } from "@tiptap/pm/view";
-import historyClasses from "./css/history.module.css";
-import { recreateTransform } from "@docmost/editor-ext";
-import { DOMSerializer, Node } from "@tiptap/pm/model";
-import { ChangeSet, simplifyChanges } from "@tiptap/pm/changeset";
-import { useAtom } from "jotai";
-import {
-  diffCountsAtom,
-  highlightChangesAtom,
-} from "@/features/page-history/atoms/history-atoms";
+import classes from "./history.module.css";
 
 export interface HistoryEditorProps {
   title: string;
   content: any;
-  previousContent?: any;
 }
 
-export function HistoryEditor({
-  title,
-  content,
-  previousContent,
-}: HistoryEditorProps) {
-  const [highlightChanges] = useAtom(highlightChangesAtom);
-  const [, setDiffCounts] = useAtom(diffCountsAtom);
-
+export function HistoryEditor({ title, content }: HistoryEditorProps) {
   const editor = useEditor({
     extensions: mainExtensions,
     editable: false,
   });
 
   useEffect(() => {
-    if (!editor || !content) return;
-
-    let decorationSet = DecorationSet.empty;
-    let addedCount = 0;
-    let deletedCount = 0;
-
-    if (previousContent) {
-      try {
-        const schema = editor.schema;
-        const docOld = Node.fromJSON(schema, previousContent);
-        const docNew = Node.fromJSON(schema, content);
-
-        const tr = recreateTransform(docOld, docNew, {
-          complexSteps: true,
-          wordDiffs: true,
-          simplifyDiff: true,
-        });
-
-        const changeSet = ChangeSet.create(docOld).addSteps(
-          tr.doc,
-          tr.mapping.maps,
-          [],
-        );
-        const changes = simplifyChanges(changeSet.changes, docNew);
-
-        editor.commands.setContent(content);
-
-        const specialNodeTypes = new Set([
-          "image",
-          "attachment",
-          "video",
-          "excalidraw",
-          "drawio",
-          "mermaid",
-          "mathBlock",
-          "mathInline",
-          "table",
-          "details",
-          "callout",
-        ]);
-
-        const decorations: Decoration[] = [];
-        let changeIndex = 0;
-
-        for (const change of changes) {
-          if (change.toB > change.fromB) {
-            changeIndex++;
-            const currentIndex = changeIndex;
-            let foundSpecialNode: { node: Node; pos: number } | null = null;
-            docNew.nodesBetween(change.fromB, change.toB, (node, pos) => {
-              if (specialNodeTypes.has(node.type.name)) {
-                const nodeEnd = pos + node.nodeSize;
-                if (change.fromB <= pos && change.toB >= nodeEnd) {
-                  foundSpecialNode = { node, pos };
-                  return false;
-                }
-              }
-            });
-
-            if (foundSpecialNode) {
-              const nodeEnd =
-                foundSpecialNode.pos + foundSpecialNode.node.nodeSize;
-              decorations.push(
-                Decoration.node(foundSpecialNode.pos, nodeEnd, {
-                  class: "history-diff-node-added",
-                  "data-diff-index": String(currentIndex),
-                }),
-              );
-            } else {
-              decorations.push(
-                Decoration.inline(change.fromB, change.toB, {
-                  class: "history-diff-added",
-                  "data-diff-index": String(currentIndex),
-                }),
-              );
-            }
-            addedCount += 1;
-          }
-          if (change.toA > change.fromA) {
-            changeIndex++;
-            const currentIndex = changeIndex;
-            let foundDeletedNode: { node: Node; pos: number } | null = null;
-            docOld.nodesBetween(change.fromA, change.toA, (node, pos) => {
-              if (specialNodeTypes.has(node.type.name)) {
-                const nodeEnd = pos + node.nodeSize;
-                if (change.fromA <= pos && change.toA >= nodeEnd) {
-                  foundDeletedNode = { node, pos };
-                  return false;
-                }
-              }
-            });
-
-            if (foundDeletedNode) {
-              decorations.push(
-                Decoration.widget(change.fromB, () => {
-                  const wrapper = document.createElement("div");
-                  wrapper.className = "history-diff-node-deleted";
-                  wrapper.setAttribute("data-diff-index", String(currentIndex));
-                  const serializer = DOMSerializer.fromSchema(schema);
-                  const dom = serializer.serializeNode(foundDeletedNode!.node);
-                  wrapper.appendChild(dom);
-                  return wrapper;
-                }),
-              );
-            } else {
-              const deletedText = docOld.textBetween(
-                change.fromA,
-                change.toA,
-                "",
-              );
-              if (deletedText) {
-                decorations.push(
-                  Decoration.widget(change.fromB, () => {
-                    const span = document.createElement("span");
-                    span.className = "history-diff-deleted";
-                    span.setAttribute("data-diff-index", String(currentIndex));
-                    span.textContent = deletedText;
-                    return span;
-                  }),
-                );
-              }
-            }
-            deletedCount += 1;
-          }
-        }
-
-        decorationSet = DecorationSet.create(docNew, decorations);
-      } catch (e) {
-        console.error("History diff failed:", e);
-        editor.commands.setContent(content);
-      }
-    } else {
+    if (editor && content) {
       editor.commands.setContent(content);
     }
-
-    const total = addedCount + deletedCount;
-    // @ts-ignore
-    setDiffCounts({ added: addedCount, deleted: deletedCount, total });
-
-    editor.setOptions({
-      editorProps: {
-        ...editor.options.editorProps,
-        decorations: () =>
-          highlightChanges ? decorationSet : DecorationSet.empty,
-      },
-    });
-  }, [
-    title,
-    content,
-    editor,
-    previousContent,
-    highlightChanges,
-    setDiffCounts,
-  ]);
+  }, [title, content, editor]);
 
   return (
-    <div>
-      <Title order={1}>{title}</Title>
-      {editor && (
-        <EditorContent
-          editor={editor}
-          className={historyClasses.historyEditor}
-        />
-      )}
-    </div>
+    <>
+      <div>
+        <Title order={1}>{title}</Title>
+
+        {editor && (
+          <EditorContent editor={editor} className={classes.historyEditor} />
+        )}
+      </div>
+    </>
   );
 }

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

@@ -1,42 +1,20 @@
 import { Text, Group, UnstyledButton } from "@mantine/core";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
 import { formattedDate } from "@/lib/time";
-import classes from "./css/history.module.css";
+import classes from "./history.module.css";
 import clsx from "clsx";
-import { IPageHistory } from "@/features/page-history/types/page.types";
-import { memo, useCallback } from "react";
 
 interface HistoryItemProps {
-  historyItem: IPageHistory;
-  index: number;
-  onSelect: (id: string, index: number) => void;
-  onHover?: (id: string, index: number) => void;
-  onHoverEnd?: () => void;
+  historyItem: any;
+  onSelect: (id: string) => void;
   isActive: boolean;
 }
 
-const HistoryItem = memo(function HistoryItem({
-  historyItem,
-  index,
-  onSelect,
-  onHover,
-  onHoverEnd,
-  isActive,
-}: HistoryItemProps) {
-  const handleClick = useCallback(() => {
-    onSelect(historyItem.id, index);
-  }, [onSelect, historyItem.id, index]);
-
-  const handleMouseEnter = useCallback(() => {
-    onHover?.(historyItem.id, index);
-  }, [onHover, historyItem.id, index]);
-
+function HistoryItem({ historyItem, onSelect, isActive }: HistoryItemProps) {
   return (
     <UnstyledButton
       p="xs"
-      onClick={handleClick}
-      onMouseEnter={handleMouseEnter}
-      onMouseLeave={onHoverEnd}
+      onClick={() => onSelect(historyItem.id)}
       className={clsx(classes.history, { [classes.active]: isActive })}
     >
       <Group wrap="nowrap">
@@ -49,11 +27,11 @@ const HistoryItem = memo(function HistoryItem({
             <Group gap={4} wrap="nowrap">
               <CustomAvatar
                 size="sm"
-                avatarUrl={historyItem.lastUpdatedBy?.avatarUrl}
-                name={historyItem.lastUpdatedBy?.name}
+                avatarUrl={historyItem.lastUpdatedBy.avatarUrl}
+                name={historyItem.lastUpdatedBy.name}
               />
               <Text size="sm" c="dimmed" lineClamp={1}>
-                {historyItem.lastUpdatedBy?.name}
+                {historyItem.lastUpdatedBy.name}
               </Text>
             </Group>
           </div>
@@ -61,6 +39,6 @@ const HistoryItem = memo(function HistoryItem({
       </Group>
     </UnstyledButton>
   );
-});
+}
 
 export default HistoryItem;

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

@@ -1,27 +1,29 @@
 import {
   usePageHistoryListQuery,
-  prefetchPageHistory,
+  usePageHistoryQuery,
 } from "@/features/page-history/queries/page-history-query";
 import HistoryItem from "@/features/page-history/components/history-item";
 import {
   activeHistoryIdAtom,
-  activeHistoryPrevIdAtom,
   historyAtoms,
 } from "@/features/page-history/atoms/history-atoms";
-import { useAtom, useSetAtom } from "jotai";
-import { useCallback, useEffect, useMemo, useRef } from "react";
+import { useAtom } from "jotai";
+import { useCallback, useEffect } from "react";
+import { Button, ScrollArea, Group, Divider, Text } from "@mantine/core";
 import {
-  Button,
-  ScrollArea,
-  Group,
-  Divider,
-  Loader,
-  Center,
-} from "@mantine/core";
+  pageEditorAtom,
+  titleEditorAtom,
+} from "@/features/editor/atoms/editor-atoms";
+import { modals } from "@mantine/modals";
+import { notifications } from "@mantine/notifications";
 import { useTranslation } from "react-i18next";
-import { useHistoryRestore } from "@/features/page-history/hooks";
-
-const PREFETCH_DELAY_MS = 150;
+import { useSpaceAbility } from "@/features/space/permissions/use-space-ability.ts";
+import { useSpaceQuery } from "@/features/space/queries/space-query.ts";
+import { useParams } from "react-router-dom";
+import {
+  SpaceCaslAction,
+  SpaceCaslSubject,
+} from "@/features/space/permissions/permissions.type.ts";
 
 interface Props {
   pageId: string;
@@ -30,89 +32,62 @@ interface Props {
 function HistoryList({ pageId }: Props) {
   const { t } = useTranslation();
   const [activeHistoryId, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
-  const setActiveHistoryPrevId = useSetAtom(activeHistoryPrevIdAtom);
-  const setHistoryModalOpen = useSetAtom(historyAtoms);
-
   const {
-    data: pageHistoryData,
+    data: pageHistoryList,
     isLoading,
     isError,
-    fetchNextPage,
-    hasNextPage,
-    isFetchingNextPage,
   } = usePageHistoryListQuery(pageId);
+  const { data: activeHistoryData } = usePageHistoryQuery(activeHistoryId);
 
-  const historyItems = useMemo(
-    () => pageHistoryData?.pages.flatMap((page) => page.items) ?? [],
-    [pageHistoryData],
-  );
+  const [mainEditor] = useAtom(pageEditorAtom);
+  const [mainEditorTitle] = useAtom(titleEditorAtom);
+  const [, setHistoryModalOpen] = useAtom(historyAtoms);
 
-  const loadMoreRef = useRef<HTMLDivElement>(null);
-  const prefetchTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const { spaceSlug } = useParams();
+  const { data: space } = useSpaceQuery(spaceSlug);
+  const spaceRules = space?.membership?.permissions;
+  const spaceAbility = useSpaceAbility(spaceRules);
 
-  const { canRestore, confirmRestore } = useHistoryRestore();
+  const confirmModal = () =>
+    modals.openConfirmModal({
+      title: t("Please confirm your action"),
+      children: (
+        <Text size="sm">
+          {t(
+            "Are you sure you want to restore this version? Any changes not versioned will be lost.",
+          )}
+        </Text>
+      ),
+      labels: { confirm: t("Confirm"), cancel: t("Cancel") },
+      onConfirm: handleRestore,
+    });
 
-  const clearPrefetchTimeout = useCallback(() => {
-    if (prefetchTimeoutRef.current) {
-      clearTimeout(prefetchTimeoutRef.current);
-      prefetchTimeoutRef.current = null;
+  const handleRestore = useCallback(() => {
+    if (activeHistoryData) {
+      mainEditorTitle
+        .chain()
+        .clearContent()
+        .setContent(activeHistoryData.title, { emitUpdate: true })
+        .run();
+      mainEditor
+        .chain()
+        .clearContent()
+        .setContent(activeHistoryData.content)
+        .run();
+      setHistoryModalOpen(false);
+      notifications.show({ message: t("Successfully restored") });
     }
-  }, []);
-
-  const handleHover = useCallback(
-    (historyId: string, index: number) => {
-      clearPrefetchTimeout();
-      prefetchTimeoutRef.current = setTimeout(() => {
-        prefetchPageHistory(historyId);
-        const prevId = historyItems[index + 1]?.id;
-        if (prevId) {
-          prefetchPageHistory(prevId);
-        }
-      }, PREFETCH_DELAY_MS);
-    },
-    [clearPrefetchTimeout, historyItems],
-  );
+  }, [activeHistoryData]);
 
   useEffect(() => {
-    return clearPrefetchTimeout;
-  }, [clearPrefetchTimeout]);
-
-  const handleSelect = useCallback(
-    (id: string, index: number) => {
-      setActiveHistoryId(id);
-      setActiveHistoryPrevId(historyItems[index + 1]?.id ?? "");
-    },
-    [historyItems, setActiveHistoryId, setActiveHistoryPrevId],
-  );
-
-  useEffect(() => {
-    if (historyItems.length > 0 && !activeHistoryId) {
-      setActiveHistoryId(historyItems[0].id);
-      setActiveHistoryPrevId(historyItems[1]?.id ?? "");
+    if (
+      pageHistoryList &&
+      pageHistoryList.items.length > 0 &&
+      !activeHistoryId
+    ) {
+      setActiveHistoryId(pageHistoryList.items[0].id);
     }
-  }, [
-    historyItems,
-    activeHistoryId,
-    setActiveHistoryId,
-    setActiveHistoryPrevId,
-  ]);
-
-  useEffect(() => {
-    const sentinel = loadMoreRef.current;
-    if (!sentinel || !hasNextPage) return;
-
-    const observer = new IntersectionObserver(
-      (entries) => {
-        if (entries[0].isIntersecting && !isFetchingNextPage) {
-          fetchNextPage();
-        }
-      },
-      { threshold: 0.1 },
-    );
-
-    observer.observe(sentinel);
-    return () => observer.disconnect();
-  }, [fetchNextPage, hasNextPage, isFetchingNextPage]);
+  }, [pageHistoryList]);
 
   if (isLoading) {
     return <></>;
@@ -122,45 +97,40 @@ function HistoryList({ pageId }: Props) {
     return <div>{t("Error loading page history.")}</div>;
   }
 
-  if (historyItems.length === 0) {
+  if (!pageHistoryList || pageHistoryList.items.length === 0) {
     return <>{t("No page history saved yet.")}</>;
   }
 
   return (
     <div>
       <ScrollArea h={620} w="100%" type="scroll" scrollbarSize={5}>
-        {historyItems.map((historyItem, index) => (
-          <HistoryItem
-            key={historyItem.id}
-            historyItem={historyItem}
-            index={index}
-            onSelect={handleSelect}
-            onHover={handleHover}
-            onHoverEnd={clearPrefetchTimeout}
-            isActive={historyItem.id === activeHistoryId}
-          />
-        ))}
-        {hasNextPage && <div ref={loadMoreRef} style={{ height: 1 }} />}
-        {isFetchingNextPage && (
-          <Center py="sm">
-            <Loader size="sm" />
-          </Center>
-        )}
+        {pageHistoryList &&
+          pageHistoryList.items.map((historyItem, index) => (
+            <HistoryItem
+              key={index}
+              historyItem={historyItem}
+              onSelect={setActiveHistoryId}
+              isActive={historyItem.id === activeHistoryId}
+            />
+          ))}
       </ScrollArea>
 
-      {canRestore && (
+      {spaceAbility.cannot(
+        SpaceCaslAction.Manage,
+        SpaceCaslSubject.Page,
+      ) ? null : (
         <>
           <Divider />
           <Group p="xs" wrap="nowrap">
+            <Button size="compact-md" onClick={confirmModal}>
+              {t("Restore")}
+            </Button>
             <Button
               variant="default"
               size="compact-md"
               onClick={() => setHistoryModalOpen(false)}
             >
-              {t("Close")}
-            </Button>
-            <Button size="compact-md" onClick={confirmRestore}>
-              {t("Restore")}
+              {t("Cancel")}
             </Button>
           </Group>
         </>

apps/client/src/features/page-history/components/history-modal-body.tsx

@@ -1,45 +1,21 @@
-import {
-  ActionIcon,
-  Group,
-  Paper,
-  ScrollArea,
-  Switch,
-  Text,
-} from "@mantine/core";
+import { ScrollArea } from "@mantine/core";
 import HistoryList from "@/features/page-history/components/history-list";
-import classes from "./css/history.module.css";
-import { useAtom, useAtomValue } from "jotai";
-import {
-  activeHistoryIdAtom,
-  activeHistoryPrevIdAtom,
-  diffCountsAtom,
-  highlightChangesAtom,
-} from "@/features/page-history/atoms/history-atoms";
+import classes from "./history.module.css";
+import { useAtom } from "jotai";
+import { activeHistoryIdAtom } from "@/features/page-history/atoms/history-atoms";
 import HistoryView from "@/features/page-history/components/history-view";
-import { useRef } from "react";
-import { IconChevronUp, IconChevronDown } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import {
-  useDiffNavigation,
-  useHistoryReset,
-} from "@/features/page-history/hooks";
+import { useEffect } from "react";
 
 interface Props {
   pageId: string;
 }
 
 export default function HistoryModalBody({ pageId }: Props) {
-  const { t } = useTranslation();
-  const scrollViewportRef = useRef<HTMLDivElement>(null);
+  const [activeHistoryId, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
 
-  const activeHistoryId = useAtomValue(activeHistoryIdAtom);
-  const activeHistoryPrevId = useAtomValue(activeHistoryPrevIdAtom);
-  const [highlightChanges, setHighlightChanges] = useAtom(highlightChangesAtom);
-  const diffCounts = useAtomValue(diffCountsAtom);
-
-  useHistoryReset(pageId);
-  const { currentChangeIndex, handlePrevChange, handleNextChange } =
-    useDiffNavigation(scrollViewportRef);
+  useEffect(() => {
+    setActiveHistoryId("");
+  }, [pageId]);
 
   return (
     <div className={classes.sidebarFlex}>
@@ -49,63 +25,11 @@ export default function HistoryModalBody({ pageId }: Props) {
         </div>
       </nav>
 
-      <div style={{ position: "relative", flex: 1 }}>
-        <ScrollArea
-          h={650}
-          w="100%"
-          scrollbarSize={5}
-          viewportRef={scrollViewportRef}
-        >
-          <div className={classes.sidebarRightSection}>
-            {activeHistoryId && <HistoryView />}
-          </div>
-        </ScrollArea>
-
-        {activeHistoryId && activeHistoryPrevId && (
-          <Paper
-            shadow="md"
-            radius="xl"
-            px="md"
-            py="xs"
-            style={{
-              position: "absolute",
-              bottom: 16,
-              left: "50%",
-              transform: "translateX(-50%)",
-            }}
-          >
-            <Group gap="md" wrap="nowrap">
-              <Switch
-                label={t("Highlight changes")}
-                checked={highlightChanges}
-                onChange={(e) => setHighlightChanges(e.currentTarget.checked)}
-                styles={{ label: { userSelect: "none", whiteSpace: "nowrap" } }}
-              />
-              {highlightChanges && diffCounts && diffCounts.total > 0 && (
-                <Group gap="xs" wrap="nowrap">
-                  <Text size="sm" c="dimmed" style={{ whiteSpace: "nowrap" }}>
-                    {currentChangeIndex} of {diffCounts.total}
-                  </Text>
-                  <ActionIcon
-                    variant="subtle"
-                    size="sm"
-                    onClick={handlePrevChange}
-                  >
-                    <IconChevronUp size={16} />
-                  </ActionIcon>
-                  <ActionIcon
-                    variant="subtle"
-                    size="sm"
-                    onClick={handleNextChange}
-                  >
-                    <IconChevronDown size={16} />
-                  </ActionIcon>
-                </Group>
-              )}
-            </Group>
-          </Paper>
-        )}
-      </div>
+      <ScrollArea h="650" w="100%" scrollbarSize={5}>
+        <div className={classes.sidebarRightSection}>
+          {activeHistoryId && <HistoryView historyId={activeHistoryId} />}
+        </div>
+      </ScrollArea>
     </div>
   );
 }

apps/client/src/features/page-history/components/history-modal-mobile.tsx

@@ -1,208 +0,0 @@
-import {
-  ActionIcon,
-  Box,
-  Button,
-  Group,
-  Paper,
-  ScrollArea,
-  Select,
-  Switch,
-  Text,
-} from "@mantine/core";
-import { useAtom, useAtomValue, useSetAtom } from "jotai";
-import {
-  activeHistoryIdAtom,
-  activeHistoryPrevIdAtom,
-  diffCountsAtom,
-  highlightChangesAtom,
-  historyAtoms,
-} from "@/features/page-history/atoms/history-atoms";
-import HistoryView from "@/features/page-history/components/history-view";
-import { useCallback, useEffect, useMemo, useRef } from "react";
-import { IconCheck, IconChevronDown, IconChevronUp } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { usePageHistoryListQuery } from "@/features/page-history/queries/page-history-query";
-import { formattedDate } from "@/lib/time";
-import {
-  useDiffNavigation,
-  useHistoryReset,
-  useHistoryRestore,
-} from "@/features/page-history/hooks";
-import classes from "./css/history-mobile.module.css";
-
-interface Props {
-  pageId: string;
-  pageTitle?: string;
-}
-
-export default function HistoryModalMobile({ pageId, pageTitle }: Props) {
-  const { t } = useTranslation();
-
-  const [activeHistoryId, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
-  const setActiveHistoryPrevId = useSetAtom(activeHistoryPrevIdAtom);
-  const [highlightChanges, setHighlightChanges] = useAtom(highlightChangesAtom);
-  const diffCounts = useAtomValue(diffCountsAtom);
-  const setHistoryModalOpen = useSetAtom(historyAtoms);
-
-  const scrollViewportRef = useRef<HTMLDivElement>(null);
-  const dropdownViewportRef = useRef<HTMLDivElement>(null);
-
-  const {
-    data: pageHistoryData,
-    isLoading,
-    fetchNextPage,
-    hasNextPage,
-    isFetchingNextPage,
-  } = usePageHistoryListQuery(pageId);
-
-  const historyItems = useMemo(
-    () => pageHistoryData?.pages.flatMap((page) => page.items) ?? [],
-    [pageHistoryData],
-  );
-
-  const selectData = useMemo(
-    () =>
-      historyItems.map((item) => ({
-        value: item.id,
-        label: formattedDate(new Date(item.createdAt)),
-        userName: item.lastUpdatedBy?.name,
-      })),
-    [historyItems],
-  );
-
-  useHistoryReset(pageId);
-  const { canRestore, confirmRestore } = useHistoryRestore();
-  const { currentChangeIndex, handlePrevChange, handleNextChange } =
-    useDiffNavigation(scrollViewportRef);
-
-  useEffect(() => {
-    if (historyItems.length > 0 && !activeHistoryId) {
-      setActiveHistoryId(historyItems[0].id);
-      setActiveHistoryPrevId(historyItems[1]?.id ?? "");
-    }
-  }, [
-    historyItems,
-    activeHistoryId,
-    setActiveHistoryId,
-    setActiveHistoryPrevId,
-  ]);
-
-  const handleDropdownScroll = useCallback(() => {
-    const viewport = dropdownViewportRef.current;
-    if (!viewport || !hasNextPage || isFetchingNextPage) return;
-
-    const { scrollTop, scrollHeight, clientHeight } = viewport;
-    const isNearBottom = scrollTop + clientHeight >= scrollHeight - 50;
-
-    if (isNearBottom) {
-      fetchNextPage();
-    }
-  }, [fetchNextPage, hasNextPage, isFetchingNextPage]);
-
-  const handleSelectVersion = useCallback(
-    (value: string | null) => {
-      if (!value) return;
-      const index = historyItems.findIndex((item) => item.id === value);
-      if (index >= 0) {
-        setActiveHistoryId(value);
-        setActiveHistoryPrevId(historyItems[index + 1]?.id ?? "");
-      }
-    },
-    [historyItems, setActiveHistoryId, setActiveHistoryPrevId],
-  );
-
-  if (isLoading) {
-    return null;
-  }
-
-  return (
-    <Box className={classes.container}>
-      <Box className={classes.selectorWrapper}>
-        <Select
-          data={selectData}
-          value={activeHistoryId}
-          onChange={handleSelectVersion}
-          placeholder={t("Select version")}
-          checkIconPosition="right"
-          maxDropdownHeight={300}
-          renderOption={({ option, checked }) => (
-            <Group justify="space-between" wrap="nowrap" w="100%">
-              <div>
-                <Text size="sm">{option.label}</Text>
-                <Text size="xs" c="dimmed">
-                  {(option as { userName?: string }).userName}
-                </Text>
-              </div>
-              {checked && <IconCheck size={16} />}
-            </Group>
-          )}
-          comboboxProps={{ withinPortal: false }}
-          scrollAreaProps={{
-            viewportRef: dropdownViewportRef,
-            onScrollPositionChange: handleDropdownScroll,
-          }}
-        />
-      </Box>
-
-      <ScrollArea
-        className={classes.editorArea}
-        viewportRef={scrollViewportRef}
-        scrollbarSize={5}
-      >
-        <Box className={classes.editorContent}>
-          {activeHistoryId && <HistoryView />}
-        </Box>
-      </ScrollArea>
-
-      {canRestore && (
-        <Group className={classes.actionButtons} justify="flex-end" gap="sm">
-          <Button variant="default" onClick={() => setHistoryModalOpen(false)}>
-            {t("Close")}
-          </Button>
-          <Button onClick={confirmRestore}>{t("Restore")}</Button>
-        </Group>
-      )}
-
-      {activeHistoryId && (
-        <Paper
-          shadow="sm"
-          radius="xl"
-          px="md"
-          py="xs"
-          className={classes.floatingBar}
-        >
-          <Group gap="sm" wrap="nowrap">
-            <Switch
-              label={t("Highlight changes")}
-              checked={highlightChanges}
-              onChange={(e) => setHighlightChanges(e.currentTarget.checked)}
-              size="sm"
-              styles={{ label: { userSelect: "none", whiteSpace: "nowrap" } }}
-            />
-            {highlightChanges && diffCounts && diffCounts.total > 0 && (
-              <Group gap={4} wrap="nowrap">
-                <Text size="sm" c="dimmed" style={{ whiteSpace: "nowrap" }}>
-                  {currentChangeIndex} of {diffCounts.total}
-                </Text>
-                <ActionIcon
-                  variant="subtle"
-                  size="sm"
-                  onClick={handlePrevChange}
-                >
-                  <IconChevronUp size={16} />
-                </ActionIcon>
-                <ActionIcon
-                  variant="subtle"
-                  size="sm"
-                  onClick={handleNextChange}
-                >
-                  <IconChevronDown size={16} />
-                </ActionIcon>
-              </Group>
-            )}
-          </Group>
-        </Paper>
-      )}
-    </Box>
-  );
-}

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

@@ -2,26 +2,21 @@ import { Modal, Text } from "@mantine/core";
 import { useAtom } from "jotai";
 import { historyAtoms } from "@/features/page-history/atoms/history-atoms";
 import HistoryModalBody from "@/features/page-history/components/history-modal-body";
-import HistoryModalMobile from "@/features/page-history/components/history-modal-mobile";
 import { useTranslation } from "react-i18next";
-import { useMediaQuery } from "@mantine/hooks";
 
 interface Props {
   pageId: string;
-  pageTitle?: string;
 }
-
-export default function HistoryModal({ pageId, pageTitle }: Props) {
+export default function HistoryModal({ pageId }: Props) {
   const { t } = useTranslation();
   const [isModalOpen, setModalOpen] = useAtom(historyAtoms);
-  const isMobile = useMediaQuery("(max-width: 800px)");
 
-  if (isMobile) {
-    return (
+  return (
+    <>
       <Modal.Root
+        size={1200}
         opened={isModalOpen}
         onClose={() => setModalOpen(false)}
-        fullScreen
       >
         <Modal.Overlay />
         <Modal.Content style={{ overflow: "hidden" }}>
@@ -33,37 +28,11 @@ export default function HistoryModal({ pageId, pageTitle }: Props) {
             </Modal.Title>
             <Modal.CloseButton />
           </Modal.Header>
-          <Modal.Body
-            p={0}
-            style={{ height: "calc(100vh - 60px)", overflow: "hidden" }}
-          >
-            <HistoryModalMobile pageId={pageId} pageTitle={pageTitle} />
+          <Modal.Body>
+            <HistoryModalBody pageId={pageId} />
           </Modal.Body>
         </Modal.Content>
       </Modal.Root>
-    );
-  }
-
-  return (
-    <Modal.Root
-      size={1400}
-      opened={isModalOpen}
-      onClose={() => setModalOpen(false)}
-    >
-      <Modal.Overlay />
-      <Modal.Content style={{ overflow: "hidden" }}>
-        <Modal.Header>
-          <Modal.Title>
-            <Text size="md" fw={500}>
-              {t("Page history")}
-            </Text>
-          </Modal.Title>
-          <Modal.CloseButton />
-        </Modal.Header>
-        <Modal.Body>
-          <HistoryModalBody pageId={pageId} />
-        </Modal.Body>
-      </Modal.Content>
-    </Modal.Root>
+    </>
   );
 }

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

@@ -1,44 +1,29 @@
 import { usePageHistoryQuery } from "@/features/page-history/queries/page-history-query";
 import { HistoryEditor } from "@/features/page-history/components/history-editor";
 import { useTranslation } from "react-i18next";
-import { useAtomValue } from "jotai";
-import {
-  activeHistoryIdAtom,
-  activeHistoryPrevIdAtom,
-} from "@/features/page-history/atoms/history-atoms";
 
-function HistoryView() {
+interface HistoryProps {
+  historyId: string;
+}
+
+function HistoryView({ historyId }: HistoryProps) {
   const { t } = useTranslation();
-  const historyId = useAtomValue(activeHistoryIdAtom);
-  const prevHistoryId = useAtomValue(activeHistoryPrevIdAtom);
+  const { data, isLoading, isError } = usePageHistoryQuery(historyId);
 
-  const {
-    data,
-    isLoading: isLoadingCurrent,
-    isError: isErrorCurrent,
-  } = usePageHistoryQuery(historyId);
-  const {
-    data: prevData,
-    isLoading: isLoadingPrev,
-    isError: isErrorPrev,
-  } = usePageHistoryQuery(prevHistoryId);
-
-  if (isLoadingCurrent || isLoadingPrev) {
+  if (isLoading) {
     return <></>;
   }
 
-  if (isErrorCurrent || !data) {
+  if (isError || !data) {
     return <div>{t("Error fetching page data.")}</div>;
   }
 
   return (
-    <div>
-      <HistoryEditor
-        content={data.content}
-        title={data.title}
-        previousContent={!isErrorPrev ? prevData?.content : undefined}
-      />
-    </div>
+    data && (
+      <div>
+        <HistoryEditor content={data.content} title={data.title} />
+      </div>
+    )
   );
 }
 

apps/client/src/features/page-history/hooks/index.ts

@@ -1,3 +0,0 @@
-export { useDiffNavigation } from "./use-diff-navigation";
-export { useHistoryRestore } from "./use-history-restore";
-export { useHistoryReset } from "./use-history-reset";

apps/client/src/features/page-history/hooks/use-diff-navigation.ts

@@ -1,58 +0,0 @@
-import { useAtomValue } from "jotai";
-import { RefObject, useCallback, useEffect, useState } from "react";
-import { diffCountsAtom } from "@/features/page-history/atoms/history-atoms";
-
-/**
- * Manages navigation between diff changes in the history view.
- * Provides prev/next handlers and auto-scrolls to the current change.
- */
-export function useDiffNavigation(
-  scrollViewportRef: RefObject<HTMLDivElement>,
-) {
-  const diffCounts = useAtomValue(diffCountsAtom);
-  const [currentChangeIndex, setCurrentChangeIndex] = useState(0);
-
-  const scrollToChangeIndex = useCallback(
-    (index: number) => {
-      const viewport = scrollViewportRef.current;
-      if (!viewport || index < 1) return;
-
-      const element = viewport.querySelector(`[data-diff-index="${index}"]`);
-      if (element instanceof HTMLElement) {
-        const elementTop = element.offsetTop;
-        const viewportHeight = viewport.clientHeight;
-        const scrollTarget =
-          elementTop - viewportHeight / 2 + element.offsetHeight / 2;
-        viewport.scrollTo({ top: scrollTarget, behavior: "smooth" });
-      }
-    },
-    [scrollViewportRef],
-  );
-
-  useEffect(() => {
-    if (diffCounts && diffCounts.total > 0) {
-      setCurrentChangeIndex(1);
-      requestAnimationFrame(() => scrollToChangeIndex(1));
-    } else {
-      setCurrentChangeIndex(0);
-    }
-  }, [diffCounts, scrollToChangeIndex]);
-
-  const handlePrevChange = useCallback(() => {
-    if (!diffCounts || diffCounts.total === 0) return;
-    const newIndex =
-      currentChangeIndex <= 1 ? diffCounts.total : currentChangeIndex - 1;
-    setCurrentChangeIndex(newIndex);
-    scrollToChangeIndex(newIndex);
-  }, [diffCounts, currentChangeIndex, scrollToChangeIndex]);
-
-  const handleNextChange = useCallback(() => {
-    if (!diffCounts || diffCounts.total === 0) return;
-    const newIndex =
-      currentChangeIndex >= diffCounts.total ? 1 : currentChangeIndex + 1;
-    setCurrentChangeIndex(newIndex);
-    scrollToChangeIndex(newIndex);
-  }, [diffCounts, currentChangeIndex, scrollToChangeIndex]);
-
-  return { currentChangeIndex, handlePrevChange, handleNextChange };
-}

apps/client/src/features/page-history/hooks/use-history-reset.ts

@@ -1,24 +0,0 @@
-import { useAtom } from "jotai";
-import { useEffect } from "react";
-import {
-  activeHistoryIdAtom,
-  activeHistoryPrevIdAtom,
-  diffCountsAtom,
-} from "@/features/page-history/atoms/history-atoms";
-
-/**
- * Resets history state when pageId changes.
- * Clears active selection and diff counts.
- */
-export function useHistoryReset(pageId: string) {
-  const [, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
-  const [, setActiveHistoryPrevId] = useAtom(activeHistoryPrevIdAtom);
-  const [, setDiffCounts] = useAtom(diffCountsAtom);
-
-  useEffect(() => {
-    setActiveHistoryId("");
-    setActiveHistoryPrevId("");
-    // @ts-ignore
-    setDiffCounts(null);
-  }, [pageId, setActiveHistoryId, setActiveHistoryPrevId, setDiffCounts]);
-}

apps/client/src/features/page-history/hooks/use-history-restore.tsx

@@ -1,78 +0,0 @@
-import { useAtom, useAtomValue, useSetAtom } from "jotai";
-import { useCallback } from "react";
-import { useTranslation } from "react-i18next";
-import { Text } from "@mantine/core";
-import { modals } from "@mantine/modals";
-import { notifications } from "@mantine/notifications";
-import { useParams } from "react-router-dom";
-import {
-  activeHistoryIdAtom,
-  historyAtoms,
-} from "@/features/page-history/atoms/history-atoms";
-import { usePageHistoryQuery } from "@/features/page-history/queries/page-history-query";
-import {
-  pageEditorAtom,
-  titleEditorAtom,
-} from "@/features/editor/atoms/editor-atoms";
-import { useSpaceAbility } from "@/features/space/permissions/use-space-ability";
-import { useSpaceQuery } from "@/features/space/queries/space-query";
-import {
-  SpaceCaslAction,
-  SpaceCaslSubject,
-} from "@/features/space/permissions/permissions.type";
-
-export function useHistoryRestore() {
-  const { t } = useTranslation();
-
-  const activeHistoryId = useAtomValue(activeHistoryIdAtom);
-  const { data: activeHistoryData } = usePageHistoryQuery(activeHistoryId);
-
-  const mainEditor = useAtomValue(pageEditorAtom);
-  const mainEditorTitle = useAtomValue(titleEditorAtom);
-  const setHistoryModalOpen = useSetAtom(historyAtoms);
-
-  const { spaceSlug } = useParams();
-  const { data: space } = useSpaceQuery(spaceSlug);
-  const spaceAbility = useSpaceAbility(space?.membership?.permissions);
-
-  const canRestore = spaceAbility.can(
-    SpaceCaslAction.Manage,
-    SpaceCaslSubject.Page,
-  );
-
-  const handleRestore = useCallback(() => {
-    if (!activeHistoryData) return;
-
-    mainEditorTitle
-      .chain()
-      .clearContent()
-      .setContent(activeHistoryData.title, { emitUpdate: true })
-      .run();
-
-    mainEditor
-      .chain()
-      .clearContent()
-      .setContent(activeHistoryData.content)
-      .run();
-
-    setHistoryModalOpen(false);
-    notifications.show({ message: t("Successfully restored") });
-  }, [activeHistoryData, mainEditor, mainEditorTitle, setHistoryModalOpen, t]);
-
-  const confirmRestore = useCallback(() => {
-    modals.openConfirmModal({
-      title: t("Please confirm your action"),
-      children: (
-        <Text size="sm">
-          {t(
-            "Are you sure you want to restore this version? Any changes not versioned will be lost.",
-          )}
-        </Text>
-      ),
-      labels: { confirm: t("Confirm"), cancel: t("Cancel") },
-      onConfirm: handleRestore,
-    });
-  }, [t, handleRestore]);
-
-  return { canRestore, confirmRestore };
-}

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

@@ -1,38 +1,19 @@
-import {
-  InfiniteData,
-  useInfiniteQuery,
-  UseInfiniteQueryResult,
-  useQuery,
-  UseQueryResult,
-} from "@tanstack/react-query";
+import { useQuery, UseQueryResult } from "@tanstack/react-query";
 import {
   getPageHistoryById,
   getPageHistoryList,
 } from "@/features/page-history/services/page-history-service";
 import { IPageHistory } from "@/features/page-history/types/page.types";
 import { IPagination } from "@/lib/types.ts";
-import { queryClient } from "@/main";
-
-const HISTORY_STALE_TIME = 60 * 60 * 1000;
-
-export function prefetchPageHistory(historyId: string) {
-  return queryClient.prefetchQuery({
-    queryKey: ["page-history", historyId],
-    queryFn: () => getPageHistoryById(historyId),
-    staleTime: HISTORY_STALE_TIME,
-  });
-}
 
 export function usePageHistoryListQuery(
   pageId: string,
-): UseInfiniteQueryResult<InfiniteData<IPagination<IPageHistory>, unknown>> {
-  return useInfiniteQuery({
+): UseQueryResult<IPagination<IPageHistory>, Error> {
+  return useQuery({
     queryKey: ["page-history-list", pageId],
-    queryFn: ({ pageParam }) => getPageHistoryList(pageId, pageParam),
+    queryFn: () => getPageHistoryList(pageId),
     enabled: !!pageId,
     gcTime: 0,
-    initialPageParam: undefined,
-    getNextPageParam: (lastPage) => lastPage.meta?.nextCursor ?? undefined,
   });
 }
 
@@ -43,6 +24,6 @@ export function usePageHistoryQuery(
     queryKey: ["page-history", historyId],
     queryFn: () => getPageHistoryById(historyId),
     enabled: !!historyId,
-    staleTime: HISTORY_STALE_TIME,
+    staleTime: 10 * 60 * 1000,
   });
 }

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

@@ -4,11 +4,9 @@ import { IPagination } from "@/lib/types.ts";
 
 export async function getPageHistoryList(
   pageId: string,
-  cursor?: string,
 ): Promise<IPagination<IPageHistory>> {
   const req = await api.post("/pages/history", {
     pageId,
-    cursor,
   });
   return req.data;
 }

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

@@ -250,10 +250,12 @@ export function useGetSidebarPagesQuery(
   return useInfiniteQuery({
     queryKey: ["sidebar-pages", data],
     enabled: !!data?.pageId || !!data?.spaceId,
-    queryFn: ({ pageParam }) => getSidebarPages({ ...data, cursor: pageParam }),
-    initialPageParam: undefined,
+    queryFn: ({ pageParam }) => getSidebarPages({ ...data, page: pageParam }),
+    initialPageParam: 1,
+    getPreviousPageParam: (firstPage) =>
+      firstPage.meta.hasPrevPage ? firstPage.meta.page - 1 : undefined,
     getNextPageParam: (lastPage) =>
-      lastPage.meta?.nextCursor ?? undefined,
+      lastPage.meta.hasNextPage ? lastPage.meta.page + 1 : undefined,
   });
 }
 
@@ -261,11 +263,13 @@ export function useGetRootSidebarPagesQuery(data: SidebarPagesParams) {
   return useInfiniteQuery({
     queryKey: ["root-sidebar-pages", data.spaceId],
     queryFn: async ({ pageParam }) => {
-      return getSidebarPages({ spaceId: data.spaceId, cursor: pageParam });
+      return getSidebarPages({ spaceId: data.spaceId, page: pageParam });
     },
-    initialPageParam: undefined,
+    initialPageParam: 1,
+    getPreviousPageParam: (firstPage) =>
+      firstPage.meta.hasPrevPage ? firstPage.meta.page - 1 : undefined,
     getNextPageParam: (lastPage) =>
-      lastPage.meta?.nextCursor ?? undefined,
+      lastPage.meta.hasNextPage ? lastPage.meta.page + 1 : undefined,
   });
 }
 

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

@@ -72,19 +72,22 @@ export async function getSidebarPages(
 export async function getAllSidebarPages(
   params: SidebarPagesParams,
 ): Promise<InfiniteData<IPagination<IPage>, unknown>> {
-  let cursor: string | undefined = undefined;
+  let page = 1;
+  let hasNextPage = false;
   const pages: IPagination<IPage>[] = [];
-  const pageParams: (string | undefined)[] = [];
+  const pageParams: number[] = [];
 
   do {
-    const req = await api.post("/pages/sidebar-pages", { ...params, cursor });
+    const req = await api.post("/pages/sidebar-pages", { ...params, page: page });
 
     const data: IPagination<IPage> = req.data;
     pages.push(data);
-    pageParams.push(cursor);
+    pageParams.push(page);
 
-    cursor = data.meta.nextCursor ?? undefined;
-  } while (cursor);
+    hasNextPage = data.meta.hasNextPage;
+
+    page += 1;
+  } while (hasNextPage);
 
   return {
     pageParams,

apps/client/src/features/page/trash/components/trash.tsx

@@ -30,15 +30,15 @@ import { useState } from "react";
 import TrashPageContentModal from "@/features/page/trash/components/trash-page-content-modal";
 import { UserInfo } from "@/components/common/user-info.tsx";
 import Paginate from "@/components/common/paginate.tsx";
-import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
+import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search";
 
 export default function Trash() {
   const { t } = useTranslation();
   const { spaceSlug } = useParams();
-  const { cursor, goNext, goPrev } = useCursorPaginate();
+  const { page, setPage } = usePaginateAndSearch();
   const { data: space } = useGetSpaceBySlugQuery(spaceSlug);
   const { data: deletedPages, isLoading } = useDeletedPagesQuery(space?.id, {
-    cursor, limit: 50
+    page, limit: 50
   });
   const restorePageMutation = useRestorePageMutation();
   const deletePageMutation = useDeletePageMutation();
@@ -206,10 +206,10 @@ export default function Trash() {
 
         {deletedPages && deletedPages.items.length > 0 && (
           <Paginate
-            hasPrevPage={deletedPages.meta?.hasPrevPage}
-            hasNextPage={deletedPages.meta?.hasNextPage}
-            onNext={() => goNext(deletedPages.meta?.nextCursor)}
-            onPrev={goPrev}
+            currentPage={page}
+            hasPrevPage={deletedPages.meta.hasPrevPage}
+            hasNextPage={deletedPages.meta.hasNextPage}
+            onPageChange={setPage}
           />
         )}
       </Stack>

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

@@ -62,7 +62,7 @@ export interface ICopyPageToSpace {
 export interface SidebarPagesParams {
   spaceId?: string;
   pageId?: string;
-  cursor?: string;
+  page?: number; // pagination
 }
 
 export interface IPageInput {

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

@@ -18,6 +18,7 @@ import {
   IconFileDescription,
   IconSearch,
   IconCheck,
+  IconSparkles,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { useDebouncedValue } from "@mantine/hooks";
@@ -25,7 +26,7 @@ import { useGetSpacesQuery } from "@/features/space/queries/space-query";
 import { useLicense } from "@/ee/hooks/use-license";
 import classes from "./search-spotlight-filters.module.css";
 import { isCloud } from "@/lib/config.ts";
-import { useAtom } from "jotai";
+import { useAtom } from "jotai/index";
 import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
 
 interface SearchSpotlightFiltersProps {
@@ -52,6 +53,7 @@ export function SearchSpotlightFilters({
   const [workspace] = useAtom(workspaceAtom);
 
   const { data: spacesData } = useGetSpacesQuery({
+    page: 1,
     limit: 100,
     query: debouncedSpaceQuery,
   });
@@ -263,9 +265,7 @@ export function SearchSpotlightFilters({
                 contentType !== option.value &&
                 handleFilterChange("contentType", option.value)
               }
-              disabled={
-                option.disabled || (isAiMode && option.value === "attachment")
-              }
+              disabled={option.disabled || (isAiMode && option.value === "attachment")}
             >
               <Group flex="1" gap="xs">
                 <div>
@@ -275,13 +275,11 @@ export function SearchSpotlightFilters({
                       {t("Enterprise")}
                     </Badge>
                   )}
-                  {!option.disabled &&
-                    isAiMode &&
-                    option.value === "attachment" && (
-                      <Text size="xs" mt={4}>
-                        {t("Ask AI not available for attachments")}
-                      </Text>
-                    )}
+                  {!option.disabled && isAiMode && option.value === "attachment" && (
+                    <Text size="xs" mt={4}>
+                      {t("Ask AI not available for attachments")}
+                    </Text>
+                  )}
                 </div>
                 {contentType === option.value && <IconCheck size={20} />}
               </Group>

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

@@ -10,8 +10,8 @@ import {
 export async function searchPage(
   params: IPageSearchParams,
 ): Promise<IPageSearch[]> {
-  const req = await api.post<{ items: IPageSearch[] }>("/search", params);
-  return req.data.items;
+  const req = await api.post<IPageSearch[]>("/search", params);
+  return req.data;
 }
 
 export async function searchSuggestions(
@@ -24,13 +24,13 @@ export async function searchSuggestions(
 export async function searchShare(
   params: IPageSearchParams,
 ): Promise<IPageSearch[]> {
-  const req = await api.post<{ items: IPageSearch[] }>("/search/share-search", params);
-  return req.data.items;
+  const req = await api.post<IPageSearch[]>("/search/share-search", params);
+  return req.data;
 }
 
 export async function searchAttachments(
   params: IPageSearchParams,
 ): Promise<IAttachmentSearch[]> {
-  const req = await api.post<{ items: IAttachmentSearch[] }>("/search-attachments", params);
-  return req.data.items;
+  const req = await api.post<IAttachmentSearch[]>("/search-attachments", params);
+  return req.data;
 }

apps/client/src/features/share/components/share-list.tsx

@@ -1,9 +1,8 @@
 import { Table, Group, Text, Anchor } from "@mantine/core";
-import React from "react";
+import React, { useState } from "react";
 import { Link } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import Paginate from "@/components/common/paginate.tsx";
-import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import { useGetSharesQuery } from "@/features/share/queries/share-query.ts";
 import { ISharedItem } from "@/features/share/types/share.types.ts";
 import { format } from "date-fns";
@@ -15,8 +14,8 @@ import classes from "./share.module.css";
 
 export default function ShareList() {
   const { t } = useTranslation();
-  const { cursor, goNext, goPrev } = useCursorPaginate();
-  const { data, isLoading } = useGetSharesQuery({ cursor });
+  const [page, setPage] = useState(1);
+  const { data, isLoading } = useGetSharesQuery({ page });
 
   return (
     <>
@@ -87,10 +86,10 @@ export default function ShareList() {
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
-          hasNextPage={data?.meta?.hasNextPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
-          onPrev={goPrev}
+          currentPage={page}
+          hasPrevPage={data?.meta.hasPrevPage}
+          hasNextPage={data?.meta.hasNextPage}
+          onPageChange={setPage}
         />
       )}
     </>

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

@@ -33,7 +33,7 @@ export function useGetSharesQuery(
   params?: QueryParams,
 ): UseQueryResult<IPagination<ISharedItem>, Error> {
   return useQuery({
-    queryKey: ["share-list", params],
+    queryKey: ["share-list"],
     queryFn: () => getShares(params),
     placeholderData: keepPreviousData,
   });

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

@@ -15,7 +15,7 @@ import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts
 
 export default function SpaceGrid() {
   const { t } = useTranslation();
-  const { data, isLoading } = useGetSpacesQuery({ limit: 10 });
+  const { data, isLoading } = useGetSpacesQuery({ page: 1, limit: 10 });
 
   const cards = data?.items.slice(0, 9).map((space, index) => (
     <Card

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

@@ -1,6 +1,5 @@
 import { Group, Table, Text } from "@mantine/core";
 import React, { useState } from "react";
-import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query.ts";
 import SpaceSettingsModal from "@/features/space/components/settings-modal.tsx";
 import { useDisclosure } from "@mantine/hooks";
@@ -13,8 +12,8 @@ import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx";
 
 export default function SpaceList() {
   const { t } = useTranslation();
-  const { cursor, goNext, goPrev } = useCursorPaginate();
-  const { data, isLoading } = useGetSpacesQuery({ cursor });
+  const [page, setPage] = useState(1);
+  const { data, isLoading } = useGetSpacesQuery({ page });
   const [opened, { open, close }] = useDisclosure(false);
   const [selectedSpaceId, setSelectedSpaceId] = useState<string>(null);
 
@@ -73,10 +72,10 @@ export default function SpaceList() {
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
-          hasNextPage={data?.meta?.hasNextPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
-          onPrev={goPrev}
+          currentPage={page}
+          hasPrevPage={data?.meta.hasPrevPage}
+          hasNextPage={data?.meta.hasNextPage}
+          onPageChange={setPage}
         />
       )}
 

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

@@ -41,9 +41,9 @@ export default function SpaceMembersList({
   readOnly,
 }: SpaceMembersProps) {
   const { t } = useTranslation();
-  const { search, cursor, goNext, goPrev, handleSearch } = usePaginateAndSearch();
+  const { search, page, setPage, handleSearch } = usePaginateAndSearch();
   const { data, isLoading } = useSpaceMembersQuery(spaceId, {
-    cursor,
+    page,
     limit: 100,
     query: search,
   });
@@ -206,10 +206,10 @@ export default function SpaceMembersList({
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
-          hasNextPage={data?.meta?.hasNextPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
-          onPrev={goPrev}
+          currentPage={page}
+          hasPrevPage={data?.meta.hasPrevPage}
+          hasNextPage={data?.meta.hasNextPage}
+          onPageChange={setPage}
         />
       )}
     </>

apps/client/src/features/space/components/spaces-page/all-spaces-list.tsx

@@ -28,19 +28,19 @@ import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx";
 interface AllSpacesListProps {
   spaces: any[];
   onSearch: (query: string) => void;
+  page: number;
   hasPrevPage?: boolean;
   hasNextPage?: boolean;
-  onNext: () => void;
-  onPrev: () => void;
+  onPageChange: (page: number) => void;
 }
 
 export default function AllSpacesList({
   spaces,
   onSearch,
+  page,
   hasPrevPage,
   hasNextPage,
-  onNext,
-  onPrev,
+  onPageChange,
 }: AllSpacesListProps) {
   const { t } = useTranslation();
   const [settingsOpened, { open: openSettings, close: closeSettings }] =
@@ -145,10 +145,10 @@ export default function AllSpacesList({
 
       {spaces.length > 0 && (
         <Paginate
+          currentPage={page}
           hasPrevPage={hasPrevPage}
           hasNextPage={hasNextPage}
-          onNext={onNext}
-          onPrev={onPrev}
+          onPageChange={onPageChange}
         />
       )}
 

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

@@ -1,6 +1,6 @@
 import { Group, Table, Avatar, Text, Alert } from "@mantine/core";
 import { useWorkspaceInvitationsQuery } from "@/features/workspace/queries/workspace-query.ts";
-import React from "react";
+import React, { useState } from "react";
 import { getUserRoleLabel } from "@/features/workspace/types/user-role-data.ts";
 import InviteActionMenu from "@/features/workspace/components/members/components/invite-action-menu.tsx";
 import { IconInfoCircle } from "@tabler/icons-react";
@@ -8,13 +8,12 @@ import { timeAgo } from "@/lib/time.ts";
 import useUserRole from "@/hooks/use-user-role.tsx";
 import { useTranslation } from "react-i18next";
 import Paginate from "@/components/common/paginate.tsx";
-import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 
 export default function WorkspaceInvitesTable() {
   const { t } = useTranslation();
-  const { cursor, goNext, goPrev } = useCursorPaginate();
+  const [page, setPage] = useState(1);
   const { data, isLoading } = useWorkspaceInvitationsQuery({
-    cursor,
+    page,
     limit: 100,
   });
   const { isAdmin } = useUserRole();
@@ -66,10 +65,10 @@ export default function WorkspaceInvitesTable() {
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
-          hasNextPage={data?.meta?.hasNextPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
-          onPrev={goPrev}
+          currentPage={page}
+          hasPrevPage={data?.meta.hasPrevPage}
+          hasNextPage={data?.meta.hasNextPage}
+          onPageChange={setPage}
         />
       )}
     </>

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

@@ -21,9 +21,9 @@ import MemberActionMenu from "@/features/workspace/components/members/components
 
 export default function WorkspaceMembersTable() {
   const { t } = useTranslation();
-  const { search, cursor, goNext, goPrev, handleSearch } = usePaginateAndSearch();
+  const { search, page, setPage, handleSearch } = usePaginateAndSearch();
   const { data, isLoading } = useWorkspaceMembersQuery({
-    cursor,
+    page,
     limit: 100,
     query: search,
   });
@@ -111,10 +111,10 @@ export default function WorkspaceMembersTable() {
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
-          hasNextPage={data?.meta?.hasNextPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
-          onPrev={goPrev}
+          currentPage={page}
+          hasPrevPage={data?.meta.hasPrevPage}
+          hasNextPage={data?.meta.hasNextPage}
+          onPageChange={setPage}
         />
       )}
     </>

apps/client/src/hooks/use-cursor-paginate.tsx

@@ -1,28 +0,0 @@
-import { useState, useCallback } from "react";
-
-export function useCursorPaginate() {
-  const [cursor, setCursor] = useState<string | undefined>(undefined);
-  const [cursorStack, setCursorStack] = useState<(string | undefined)[]>([]);
-
-  const goNext = useCallback((nextCursor: string | null | undefined) => {
-    if (nextCursor) {
-      setCursorStack((prev) => [...prev, cursor]);
-      setCursor(nextCursor);
-    }
-  }, [cursor]);
-
-  const goPrev = useCallback(() => {
-    setCursorStack((prev) => {
-      const next = prev.slice(0, -1);
-      setCursor(prev[prev.length - 1]);
-      return next;
-    });
-  }, []);
-
-  const resetCursor = useCallback(() => {
-    setCursor(undefined);
-    setCursorStack([]);
-  }, []);
-
-  return { cursor, goNext, goPrev, resetCursor };
-}

apps/client/src/hooks/use-paginate-and-search.tsx

@@ -2,33 +2,16 @@ import { useState, useRef, useCallback } from "react";
 
 export function usePaginateAndSearch(initialQuery: string = "") {
   const [search, setSearch] = useState(initialQuery);
-  const [cursor, setCursor] = useState<string | undefined>(undefined);
-  const [cursorStack, setCursorStack] = useState<(string | undefined)[]>([]);
+  const [page, setPage] = useState(1);
   const prevSearchRef = useRef(search);
 
   const handleSearch = useCallback((newQuery: string) => {
     if (prevSearchRef.current !== newQuery) {
       prevSearchRef.current = newQuery;
       setSearch(newQuery);
-      setCursor(undefined);
-      setCursorStack([]);
+      setPage(1);
     }
   }, []);
 
-  const goNext = useCallback((nextCursor: string | null | undefined) => {
-    if (nextCursor) {
-      setCursorStack((prev) => [...prev, cursor]);
-      setCursor(nextCursor);
-    }
-  }, [cursor]);
-
-  const goPrev = useCallback(() => {
-    setCursorStack((prev) => {
-      const next = prev.slice(0, -1);
-      setCursor(prev[prev.length - 1]);
-      return next;
-    });
-  }, []);
-
-  return { search, cursor, goNext, goPrev, handleSearch };
+  return { search, page, setPage, handleSearch };
 }

apps/client/src/lib/types.ts

@@ -1,7 +1,6 @@
 export interface QueryParams {
   query?: string;
-  cursor?: string;
-  beforeCursor?: string;
+  page?: number;
   limit?: number;
   adminView?: boolean;
 }
@@ -30,10 +29,9 @@ export interface ApiResponse<T> {
 
 export type IPaginationMeta = {
   limit: number;
+  page: number;
   hasNextPage: boolean;
   hasPrevPage: boolean;
-  nextCursor: string | null;
-  prevCursor: string | null;
 };
 export type IPagination<T> = {
   items: T[];

apps/client/src/pages/spaces/spaces.tsx

@@ -11,10 +11,10 @@ import useUserRole from "@/hooks/use-user-role";
 export default function Spaces() {
   const { t } = useTranslation();
   const { isAdmin } = useUserRole();
-  const { search, cursor, goNext, goPrev, handleSearch } = usePaginateAndSearch();
+  const { search, page, setPage, handleSearch } = usePaginateAndSearch();
 
   const { data, isLoading } = useGetSpacesQuery({
-    cursor,
+    page,
     limit: 30,
     query: search,
   });
@@ -41,10 +41,10 @@ export default function Spaces() {
           <AllSpacesList
             spaces={data?.items || []}
             onSearch={handleSearch}
+            page={page}
             hasPrevPage={data?.meta?.hasPrevPage}
             hasNextPage={data?.meta?.hasNextPage}
-            onNext={() => goNext(data?.meta?.nextCursor)}
-            onPrev={goPrev}
+            onPageChange={setPage}
           />
         </Box>
       </Container>

apps/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "0.25.0-beta.1",
+  "version": "0.24.1",
   "description": "",
   "author": "",
   "private": true,

apps/server/src/collaboration/listeners/history.listener.ts

@@ -3,7 +3,6 @@ import { OnEvent } from '@nestjs/event-emitter';
 import { PageHistoryRepo } from '@docmost/db/repos/page/page-history.repo';
 import { Page } from '@docmost/db/types/entity.types';
 import { isDeepStrictEqual } from 'node:util';
-import { EnvironmentService } from '../../integrations/environment/environment.service';
 
 export class UpdatedPageEvent {
   page: Page;
@@ -13,10 +12,7 @@ export class UpdatedPageEvent {
 export class HistoryListener {
   private readonly logger = new Logger(HistoryListener.name);
 
-  constructor(
-    private readonly pageHistoryRepo: PageHistoryRepo,
-    private readonly environmentService: EnvironmentService,
-  ) {}
+  constructor(private readonly pageHistoryRepo: PageHistoryRepo) {}
 
   @OnEvent('collab.page.updated')
   async handleCreatePageHistory(event: UpdatedPageEvent) {
@@ -24,9 +20,7 @@ export class HistoryListener {
 
     const pageCreationTime = new Date(page.createdAt).getTime();
     const currentTime = Date.now();
-    const FIVE_MINUTES = this.environmentService.isDevelopment()
-      ? 60 * 1000
-      : 5 * 60 * 1000;
+    const FIVE_MINUTES = 5 * 60 * 1000;
 
     if (currentTime - pageCreationTime < FIVE_MINUTES) {
       return;

apps/server/src/collaboration/server/collab-main.ts

@@ -37,8 +37,7 @@ async function bootstrap() {
   const logger = new Logger('CollabServer');
 
   const port = process.env.COLLAB_PORT || 3001;
-  const host = process.env.HOST || '0.0.0.0';
-  await app.listen(port, host, () => {
+  await app.listen(port, '0.0.0.0', () => {
     logger.log(`Listening on http://127.0.0.1:${port}`);
   });
 }

apps/server/src/core/comment/comment.service.ts

@@ -9,14 +9,16 @@ import { UpdateCommentDto } from './dto/update-comment.dto';
 import { CommentRepo } from '@docmost/db/repos/comment/comment.repo';
 import { Comment, Page, User } from '@docmost/db/types/entity.types';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
+import { PaginationResult } from '@docmost/db/pagination/pagination';
 import { PageRepo } from '@docmost/db/repos/page/page.repo';
-import { CursorPaginationResult } from '@docmost/db/pagination/cursor-pagination';
+import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';
 
 @Injectable()
 export class CommentService {
   constructor(
     private commentRepo: CommentRepo,
     private pageRepo: PageRepo,
+    private spaceMemberRepo: SpaceMemberRepo,
   ) {}
 
   async findById(commentId: string) {
@@ -66,14 +68,14 @@ export class CommentService {
   async findByPageId(
     pageId: string,
     pagination: PaginationOptions,
-  ): Promise<CursorPaginationResult<Comment>> {
+  ): Promise<PaginationResult<Comment>> {
     const page = await this.pageRepo.findById(pageId);
 
     if (!page) {
       throw new BadRequestException('Page not found');
     }
 
-    return this.commentRepo.findPageComments(pageId, pagination);
+    return await this.commentRepo.findPageComments(pageId, pagination);
   }
 
   async update(

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

@@ -11,7 +11,7 @@ import { UpdateGroupDto } from '../dto/update-group.dto';
 import { KyselyTransaction } from '@docmost/db/types/kysely.types';
 import { GroupRepo } from '@docmost/db/repos/group/group.repo';
 import { Group, InsertableGroup, User } from '@docmost/db/types/entity.types';
-import { CursorPaginationResult } from '@docmost/db/pagination/cursor-pagination';
+import { PaginationResult } from '@docmost/db/pagination/pagination';
 import { GroupUserService } from './group-user.service';
 
 @Injectable()
@@ -132,8 +132,12 @@ export class GroupService {
   async getWorkspaceGroups(
     workspaceId: string,
     paginationOptions: PaginationOptions,
-  ): Promise<CursorPaginationResult<Group>> {
-    return this.groupRepo.getGroupsPaginated(workspaceId, paginationOptions);
+  ): Promise<PaginationResult<Group>> {
+    const groups = await this.groupRepo.getGroupsPaginated(
+      workspaceId,
+      paginationOptions,
+    );
+    return groups;
   }
 
   async deleteGroup(groupId: string, workspaceId: string): Promise<void> {

apps/server/src/core/page/services/page-history.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { PageHistoryRepo } from '@docmost/db/repos/page/page-history.repo';
 import { PageHistory } from '@docmost/db/types/entity.types';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
-import { CursorPaginationResult } from '@docmost/db/pagination/cursor-pagination';
+import { PaginationResult } from '@docmost/db/pagination/pagination';
 
 @Injectable()
 export class PageHistoryService {
@@ -15,10 +15,12 @@ export class PageHistoryService {
   async findHistoryByPageId(
     pageId: string,
     paginationOptions: PaginationOptions,
-  ): Promise<CursorPaginationResult<PageHistory>> {
-    return this.pageHistoryRepo.findPageHistoryByPageId(
+  ): Promise<PaginationResult<any>> {
+    const pageHistory = await this.pageHistoryRepo.findPageHistoryByPageId(
       pageId,
       paginationOptions,
     );
+
+    return pageHistory;
   }
 }

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

@@ -10,9 +10,9 @@ import { PageRepo } from '@docmost/db/repos/page/page.repo';
 import { InsertablePage, Page, User } from '@docmost/db/types/entity.types';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import {
-  CursorPaginationResult,
-  executeWithCursorPagination,
-} from '@docmost/db/pagination/cursor-pagination';
+  executeWithPagination,
+  PaginationResult,
+} from '@docmost/db/pagination/pagination';
 import { InjectKysely } from 'nestjs-kysely';
 import { KyselyDB } from '@docmost/db/types/kysely.types';
 import { generateJitteredKeyBetween } from 'fractional-indexing-jittered';
@@ -180,7 +180,7 @@ export class PageService {
     spaceId: string,
     pagination: PaginationOptions,
     pageId?: string,
-  ): Promise<CursorPaginationResult<Partial<Page> & { hasChildren: boolean }>> {
+  ): Promise<any> {
     let query = this.db
       .selectFrom('pages')
       .select([
@@ -195,6 +195,7 @@ export class PageService {
         'deletedAt',
       ])
       .select((eb) => this.pageRepo.withHasChildren(eb))
+      .orderBy('position', (ob) => ob.collate('C').asc())
       .where('deletedAt', 'is', null)
       .where('spaceId', '=', spaceId);
 
@@ -204,19 +205,12 @@ export class PageService {
       query = query.where('parentPageId', 'is', null);
     }
 
-    return executeWithCursorPagination(query, {
+    const result = executeWithPagination(query, {
+      page: pagination.page,
       perPage: 250,
-      cursor: pagination.cursor,
-      beforeCursor: pagination.beforeCursor,
-      fields: [
-        { expression: 'position', direction: 'asc', orderModifier: (ob) => ob.collate('C').asc() },
-        { expression: 'id', direction: 'asc' },
-      ],
-      parseCursor: (cursor) => ({
-        position: cursor.position,
-        id: cursor.id,
-      }),
     });
+
+    return result;
   }
 
   async movePageToSpace(rootPage: Page, spaceId: string) {
@@ -265,7 +259,7 @@ export class PageService {
 
         await this.aiQueue.add(QueueJob.PAGE_MOVED_TO_SPACE, {
           pageId: pageIds,
-          workspaceId: rootPage.workspaceId,
+          workspaceId: rootPage.workspaceId
         });
       }
     });
@@ -393,14 +387,9 @@ export class PageService {
           workspaceId: page.workspaceId,
           creatorId: authUser.id,
           lastUpdatedById: authUser.id,
-          parentPageId:
-            page.id === rootPage.id
-              ? isDuplicateInSameSpace
-                ? rootPage.parentPageId
-                : null
-              : page.parentPageId
-                ? pageMap.get(page.parentPageId)?.newPageId
-                : null,
+          parentPageId: page.id === rootPage.id
+            ? (isDuplicateInSameSpace ? rootPage.parentPageId : null)
+            : (page.parentPageId ? pageMap.get(page.parentPageId)?.newPageId : null),
         };
       }),
     );
@@ -580,22 +569,22 @@ export class PageService {
   async getRecentSpacePages(
     spaceId: string,
     pagination: PaginationOptions,
-  ): Promise<CursorPaginationResult<Page>> {
-    return this.pageRepo.getRecentPagesInSpace(spaceId, pagination);
+  ): Promise<PaginationResult<Page>> {
+    return await this.pageRepo.getRecentPagesInSpace(spaceId, pagination);
   }
 
   async getRecentPages(
     userId: string,
     pagination: PaginationOptions,
-  ): Promise<CursorPaginationResult<Page>> {
-    return this.pageRepo.getRecentPages(userId, pagination);
+  ): Promise<PaginationResult<Page>> {
+    return await this.pageRepo.getRecentPages(userId, pagination);
   }
 
   async getDeletedSpacePages(
     spaceId: string,
     pagination: PaginationOptions,
-  ): Promise<CursorPaginationResult<Page>> {
-    return this.pageRepo.getDeletedPagesInSpace(spaceId, pagination);
+  ): Promise<PaginationResult<Page>> {
+    return await this.pageRepo.getDeletedPagesInSpace(spaceId, pagination);
   }
 
   async forceDelete(pageId: string, workspaceId: string): Promise<void> {

apps/server/src/core/search/search.service.ts

@@ -26,108 +26,114 @@ export class SearchService {
       userId?: string;
       workspaceId: string;
     },
-  ): Promise<{ items: SearchResponseDto[] }> {
+  ): Promise<SearchResponseDto[]> {
     const { query } = searchParams;
 
     if (query.length < 1) {
-      return { items: [] };
+      return [];
     }
     const searchQuery = tsquery(query.trim() + '*');
+    const limit = searchParams.limit || 25;
+    const offset = searchParams.offset || 0;
+    const includeSpace = !searchParams.shareId;
 
-    let queryResults = this.db
-      .selectFrom('pages')
-      .select([
-        'id',
-        'slugId',
-        'title',
-        'icon',
-        'parentPageId',
-        'creatorId',
-        'createdAt',
-        'updatedAt',
-        sql<number>`ts_rank(tsv, to_tsquery('english', f_unaccent(${searchQuery})))`.as(
-          'rank',
-        ),
-        sql<string>`ts_headline('english', text_content, to_tsquery('english', f_unaccent(${searchQuery})),'MinWords=9, MaxWords=10, MaxFragments=3')`.as(
-          'highlight',
-        ),
-      ])
-      .where(
-        'tsv',
-        '@@',
-        sql<string>`to_tsquery('english', f_unaccent(${searchQuery}))`,
-      )
-      .$if(Boolean(searchParams.creatorId), (qb) =>
-        qb.where('creatorId', '=', searchParams.creatorId),
-      )
-      .where('deletedAt', 'is', null)
-      .orderBy('rank', 'desc')
-      .limit(searchParams.limit || 25)
-      .offset(searchParams.offset || 0);
-
-    if (!searchParams.shareId) {
-      queryResults = queryResults.select((eb) => this.pageRepo.withSpace(eb));
-    }
-
-    if (searchParams.spaceId) {
-      // search by spaceId
-      queryResults = queryResults.where('spaceId', '=', searchParams.spaceId);
-    } else if (opts.userId && !searchParams.spaceId) {
-      // only search spaces the user is a member of
-      queryResults = queryResults
-        .where(
-          'spaceId',
-          'in',
-          this.spaceMemberRepo.getUserSpaceIdsQuery(opts.userId),
-        )
-        .where('workspaceId', '=', opts.workspaceId);
-    } else if (searchParams.shareId && !searchParams.spaceId && !opts.userId) {
-      // search in shares
-      const shareId = searchParams.shareId;
-      const share = await this.shareRepo.findById(shareId);
+    // Handle share search - resolve page IDs first
+    let sharePageIds: string[] | null = null;
+    if (searchParams.shareId && !searchParams.spaceId && !opts.userId) {
+      const share = await this.shareRepo.findById(searchParams.shareId);
       if (!share || share.workspaceId !== opts.workspaceId) {
-        return { items: [] };
+        return [];
       }
 
-      const pageIdsToSearch = [];
       if (share.includeSubPages) {
         const pageList = await this.pageRepo.getPageAndDescendants(
           share.pageId,
-          {
-            includeContent: false,
-          },
+          { includeContent: false },
         );
-
-        pageIdsToSearch.push(...pageList.map((page) => page.id));
+        sharePageIds = pageList.map((page) => page.id);
       } else {
-        pageIdsToSearch.push(share.pageId);
+        sharePageIds = [share.pageId];
       }
 
-      if (pageIdsToSearch.length > 0) {
-        queryResults = queryResults
-          .where('id', 'in', pageIdsToSearch)
-          .where('workspaceId', '=', opts.workspaceId);
-      } else {
-        return { items: [] };
+      if (sharePageIds.length === 0) {
+        return [];
       }
-    } else {
-      return { items: [] };
+    } else if (!searchParams.spaceId && !opts.userId) {
+      return [];
     }
 
-    //@ts-ignore
-    queryResults = await queryResults.execute();
+    // CTE to get top N page IDs by rank (without expensive ts_headline)
+    // Join back to compute ts_headline only for those N rows
+    const tsQuery = sql<string>`to_tsquery('english', f_unaccent(${searchQuery}))`;
 
-    //@ts-ignore
-    const searchResults = queryResults.map((result: SearchResponseDto) => {
-      if (result.highlight) {
-        result.highlight = result.highlight
+    const queryResults = await this.db
+      .with('ranked_pages', (db) => {
+        let rankQuery = db
+          .selectFrom('pages')
+          .select(['id', sql<number>`ts_rank(tsv, ${tsQuery})`.as('rank')])
+          .where('tsv', '@@', tsQuery)
+          .where('deletedAt', 'is', null)
+          .$if(Boolean(searchParams.creatorId), (qb) =>
+            qb.where('creatorId', '=', searchParams.creatorId),
+          );
+
+        if (searchParams.spaceId) {
+          rankQuery = rankQuery.where('spaceId', '=', searchParams.spaceId);
+        } else if (opts.userId) {
+          rankQuery = rankQuery
+            .where(
+              'spaceId',
+              'in',
+              this.spaceMemberRepo.getUserSpaceIdsQuery(opts.userId),
+            )
+            .where('workspaceId', '=', opts.workspaceId);
+        } else if (sharePageIds) {
+          rankQuery = rankQuery
+            .where('id', 'in', sharePageIds)
+            .where('workspaceId', '=', opts.workspaceId);
+        }
+
+        return rankQuery.orderBy('rank', 'desc').limit(limit).offset(offset);
+      })
+      .selectFrom('ranked_pages')
+      .innerJoin('pages', 'pages.id', 'ranked_pages.id')
+      .select([
+        'pages.id',
+        'pages.slugId',
+        'pages.title',
+        'pages.icon',
+        'pages.parentPageId',
+        'pages.creatorId',
+        'pages.createdAt',
+        'pages.updatedAt',
+        'ranked_pages.rank',
+        sql<string>`ts_headline('english', pages.text_content, ${tsQuery}, 'MinWords=9, MaxWords=10, MaxFragments=3')`.as(
+          'highlight',
+        ),
+      ])
+      .$if(includeSpace, (qb) =>
+        qb.innerJoin('spaces', 'spaces.id', 'pages.spaceId').select(
+          sql<{
+            id: string;
+            name: string;
+            slug: string;
+          }>`jsonb_build_object('id', spaces.id, 'name', spaces.name, 'slug', spaces.slug)`.as(
+            'space',
+          ),
+        ),
+      )
+      .orderBy('ranked_pages.rank', 'desc')
+      .execute();
+
+    return queryResults.map((result) => {
+      const mapped = result as unknown as SearchResponseDto;
+      if (mapped.highlight) {
+        mapped.highlight = mapped.highlight
           .replace(/\r\n|\r|\n/g, ' ')
           .replace(/\s+/g, ' ');
       }
-      return result;
+      return mapped;
     });
-
-    return { items: searchResults };
   }
 
   async searchSuggestions(

apps/server/src/core/space/services/space-member.service.ts

@@ -13,7 +13,7 @@ import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
 import { RemoveSpaceMemberDto } from '../dto/remove-space-member.dto';
 import { UpdateSpaceMemberRoleDto } from '../dto/update-space-member-role.dto';
 import { SpaceRole } from '../../../common/helpers/types/permission';
-import { CursorPaginationResult } from '@docmost/db/pagination/cursor-pagination';
+import { PaginationResult } from '@docmost/db/pagination/pagination';
 
 @Injectable()
 export class SpaceMemberService {
@@ -68,16 +68,18 @@ export class SpaceMemberService {
     spaceId: string,
     workspaceId: string,
     pagination: PaginationOptions,
-  ): Promise<CursorPaginationResult<any>> {
+  ) {
     const space = await this.spaceRepo.findById(spaceId, workspaceId);
     if (!space) {
       throw new NotFoundException('Space not found');
     }
 
-    return await this.spaceMemberRepo.getSpaceMembersPaginated(
+    const members = await this.spaceMemberRepo.getSpaceMembersPaginated(
       spaceId,
       pagination,
     );
+
+    return members;
   }
 
   async addMembersToSpaceBatch(
@@ -274,7 +276,7 @@ export class SpaceMemberService {
   async getUserSpaces(
     userId: string,
     pagination: PaginationOptions,
-  ): Promise<CursorPaginationResult<Space>> {
-    return this.spaceMemberRepo.getUserSpaces(userId, pagination);
+  ): Promise<PaginationResult<Space>> {
+    return await this.spaceMemberRepo.getUserSpaces(userId, pagination);
   }
 }

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

@@ -8,6 +8,7 @@ import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
 import { KyselyDB, KyselyTransaction } from '@docmost/db/types/kysely.types';
 import { Space, User } from '@docmost/db/types/entity.types';
+import { PaginationResult } from '@docmost/db/pagination/pagination';
 import { UpdateSpaceDto } from '../dto/update-space.dto';
 import { executeTx } from '@docmost/db/utils';
 import { InjectKysely } from 'nestjs-kysely';
@@ -16,7 +17,6 @@ import { SpaceRole } from '../../../common/helpers/types/permission';
 import { QueueJob, QueueName } from 'src/integrations/queue/constants';
 import { Queue } from 'bullmq';
 import { InjectQueue } from '@nestjs/bullmq';
-import { CursorPaginationResult } from '@docmost/db/pagination/cursor-pagination';
 
 @Injectable()
 export class SpaceService {
@@ -130,8 +130,13 @@ export class SpaceService {
   async getWorkspaceSpaces(
     workspaceId: string,
     pagination: PaginationOptions,
-  ): Promise<CursorPaginationResult<Space>> {
-    return this.spaceRepo.getSpacesInWorkspace(workspaceId, pagination);
+  ): Promise<PaginationResult<Space>> {
+    const spaces = await this.spaceRepo.getSpacesInWorkspace(
+      workspaceId,
+      pagination,
+    );
+
+    return spaces;
   }
 
   async deleteSpace(spaceId: string, workspaceId: string): Promise<void> {

apps/server/src/core/workspace/services/workspace-invitation.service.ts

@@ -23,7 +23,7 @@ import InvitationAcceptedEmail from '@docmost/transactional/emails/invitation-ac
 import { TokenService } from '../../auth/services/token.service';
 import { nanoIdGen } from '../../../common/helpers';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
-import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination';
+import { executeWithPagination } from '@docmost/db/pagination/pagination';
 import { DomainService } from 'src/integrations/environment/domain.service';
 import { InjectQueue } from '@nestjs/bullmq';
 import { QueueJob, QueueName } from '../../../integrations/queue/constants';
@@ -64,13 +64,12 @@ export class WorkspaceInvitationService {
       );
     }
 
-    return executeWithCursorPagination(query, {
+    const result = executeWithPagination(query, {
+      page: pagination.page,
       perPage: pagination.limit,
-      cursor: pagination.cursor,
-      beforeCursor: pagination.beforeCursor,
-      fields: [{ expression: 'id', direction: 'asc' }],
-      parseCursor: (cursor) => ({ id: cursor.id }),
     });
+
+    return result;
   }
 
   async getInvitationById(invitationId: string, workspace: Workspace) {

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

@@ -19,6 +19,7 @@ import { User } from '@docmost/db/types/entity.types';
 import { GroupUserRepo } from '@docmost/db/repos/group/group-user.repo';
 import { GroupRepo } from '@docmost/db/repos/group/group.repo';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
+import { PaginationResult } from '@docmost/db/pagination/pagination';
 import { UpdateWorkspaceUserRoleDto } from '../dto/update-workspace-user-role.dto';
 import { UserRepo } from '@docmost/db/repos/user/user.repo';
 import { EnvironmentService } from '../../../integrations/environment/environment.service';
@@ -27,12 +28,12 @@ import { jsonArrayFrom } from 'kysely/helpers/postgres';
 import { addDays } from 'date-fns';
 import { DISALLOWED_HOSTNAMES, WorkspaceStatus } from '../workspace.constants';
 import { v4 } from 'uuid';
+import { AttachmentType } from 'src/core/attachment/attachment.constants';
 import { InjectQueue } from '@nestjs/bullmq';
 import { QueueJob, QueueName } from '../../../integrations/queue/constants';
 import { Queue } from 'bullmq';
 import { generateRandomSuffixNumbers } from '../../../common/helpers';
 import { isPageEmbeddingsTableExists } from '@docmost/db/helpers/helpers';
-import { CursorPaginationResult } from '@docmost/db/pagination/cursor-pagination';
 
 @Injectable()
 export class WorkspaceService {
@@ -375,8 +376,13 @@ export class WorkspaceService {
   async getWorkspaceUsers(
     workspaceId: string,
     pagination: PaginationOptions,
-  ): Promise<CursorPaginationResult<User>> {
-    return this.userRepo.getUsersPaginated(workspaceId, pagination);
+  ): Promise<PaginationResult<User>> {
+    const users = await this.userRepo.getUsersPaginated(
+      workspaceId,
+      pagination,
+    );
+
+    return users;
   }
 
   async updateWorkspaceUserRole(

apps/server/src/database/pagination/cursor-pagination.ts

@@ -1,348 +0,0 @@
-// adapted from https://github.com/charlie-hadden/kysely-paginate/blob/main/src/cursor.ts - MIT
-import {
-  OrderByDirection,
-  OrderByModifiers,
-  ReferenceExpression,
-  SelectQueryBuilder,
-  StringReference,
-} from 'kysely';
-
-type SortField<DB, TB extends keyof DB, O> =
-  | {
-      expression:
-        | (StringReference<DB, TB> & keyof O & string)
-        | (StringReference<DB, TB> & `${string}.${keyof O & string}`);
-      direction: OrderByDirection;
-      orderModifier?: OrderByModifiers;
-      key?: keyof O & string;
-    }
-  | {
-      expression: ReferenceExpression<DB, TB>;
-      direction: OrderByDirection;
-      orderModifier?: OrderByModifiers;
-      key: keyof O & string;
-    };
-
-type ExtractSortFieldKey<
-  DB,
-  TB extends keyof DB,
-  O,
-  T extends SortField<DB, TB, O>,
-> = T['key'] extends keyof O & string
-  ? T['key']
-  : T['expression'] extends keyof O & string
-    ? T['expression']
-    : T['expression'] extends `${string}.${infer K}`
-      ? K extends keyof O & string
-        ? K
-        : never
-      : never;
-
-type Fields<DB, TB extends keyof DB, O> = ReadonlyArray<
-  Readonly<SortField<DB, TB, O>>
->;
-
-type FieldNames<DB, TB extends keyof DB, O, T extends Fields<DB, TB, O>> = {
-  [TIndex in keyof T]: ExtractSortFieldKey<DB, TB, O, T[TIndex]>;
-};
-
-type EncodeCursorValues<
-  DB,
-  TB extends keyof DB,
-  O,
-  T extends Fields<DB, TB, O>,
-> = {
-  [TIndex in keyof T]: [
-    ExtractSortFieldKey<DB, TB, O, T[TIndex]>,
-    O[ExtractSortFieldKey<DB, TB, O, T[TIndex]>],
-  ];
-};
-
-export type CursorEncoder<
-  DB,
-  TB extends keyof DB,
-  O,
-  T extends Fields<DB, TB, O>,
-> = (values: EncodeCursorValues<DB, TB, O, T>) => string;
-
-type DecodedCursor<DB, TB extends keyof DB, O, T extends Fields<DB, TB, O>> = {
-  [TField in ExtractSortFieldKey<DB, TB, O, T[number]>]: string;
-};
-
-export type CursorDecoder<
-  DB,
-  TB extends keyof DB,
-  O,
-  T extends Fields<DB, TB, O>,
-> = (
-  cursor: string,
-  fields: FieldNames<DB, TB, O, T>,
-) => DecodedCursor<DB, TB, O, T>;
-
-type ParsedCursorValues<
-  DB,
-  TB extends keyof DB,
-  O,
-  T extends Fields<DB, TB, O>,
-> = {
-  [TField in ExtractSortFieldKey<DB, TB, O, T[number]>]: O[TField];
-};
-
-export type CursorParser<
-  DB,
-  TB extends keyof DB,
-  O,
-  T extends Fields<DB, TB, O>,
-> = (cursor: DecodedCursor<DB, TB, O, T>) => ParsedCursorValues<DB, TB, O, T>;
-
-type CursorPaginationResultRow<
-  TRow,
-  TCursorKey extends string | boolean | undefined,
-> = TRow & {
-  [K in TCursorKey extends undefined
-    ? never
-    : TCursorKey extends false
-      ? never
-      : TCursorKey extends true
-        ? '$cursor'
-        : TCursorKey]: string;
-};
-
-type CursorPaginationMeta = {
-  limit: number;
-  hasNextPage: boolean;
-  hasPrevPage: boolean;
-  nextCursor: string | null;
-  prevCursor: string | null;
-};
-
-export type CursorPaginationResult<
-  TRow,
-  TCursorKey extends string | boolean | undefined = undefined,
-> = {
-  meta: CursorPaginationMeta;
-  items: CursorPaginationResultRow<TRow, TCursorKey>[];
-};
-
-export async function executeWithCursorPagination<
-  DB,
-  TB extends keyof DB,
-  O,
-  const TFields extends Fields<DB, TB, O>,
-  TCursorKey extends string | boolean | undefined = undefined,
->(
-  qb: SelectQueryBuilder<DB, TB, O>,
-  opts: {
-    perPage: number;
-    cursor?: string;
-    beforeCursor?: string;
-    cursorPerRow?: TCursorKey;
-    fields: TFields;
-    encodeCursor?: CursorEncoder<DB, TB, O, TFields>;
-    decodeCursor?: CursorDecoder<DB, TB, O, TFields>;
-    parseCursor:
-      | CursorParser<DB, TB, O, TFields>
-      | { parse: CursorParser<DB, TB, O, TFields> };
-  },
-): Promise<CursorPaginationResult<O, TCursorKey>> {
-  const encodeCursor = opts.encodeCursor ?? defaultEncodeCursor;
-  const decodeCursor = opts.decodeCursor ?? defaultDecodeCursor;
-
-  const parseCursor =
-    typeof opts.parseCursor === 'function'
-      ? opts.parseCursor
-      : opts.parseCursor.parse;
-
-  const fields = opts.fields.map((field) => {
-    let key = field.key;
-
-    if (!key && typeof field.expression === 'string') {
-      const expressionParts = field.expression.split('.');
-
-      key = (expressionParts[1] ?? expressionParts[0]) as
-        | (keyof O & string)
-        | undefined;
-    }
-
-    if (!key) throw new Error('missing key');
-
-    return { ...field, key };
-  });
-
-  function generateCursor(row: O): string {
-    const cursorFieldValues = fields.map(({ key }) => [
-      key,
-      row[key],
-    ]) as EncodeCursorValues<DB, TB, O, TFields>;
-
-    return encodeCursor(cursorFieldValues);
-  }
-
-  const fieldNames = fields.map((field) => field.key) as FieldNames<
-    DB,
-    TB,
-    O,
-    TFields
-  >;
-
-  function applyCursor(
-    qb: SelectQueryBuilder<DB, TB, O>,
-    encoded: string,
-    defaultDirection: OrderByDirection,
-  ) {
-    const decoded = decodeCursor(encoded, fieldNames);
-    const cursor = parseCursor(decoded);
-
-    return qb.where(({ and, or, eb }) => {
-      let expression;
-
-      for (let i = fields.length - 1; i >= 0; --i) {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const field = fields[i]!;
-
-        const comparison = field.direction === defaultDirection ? '>' : '<';
-        const value = cursor[field.key as keyof typeof cursor];
-
-        const conditions = [eb(field.expression, comparison, value)];
-
-        if (expression) {
-          conditions.push(and([eb(field.expression, '=', value), expression]));
-        }
-
-        expression = or(conditions);
-      }
-
-      if (!expression) {
-        throw new Error('Error building cursor expression');
-      }
-
-      return expression;
-    });
-  }
-
-  if (opts.cursor) qb = applyCursor(qb, opts.cursor, 'asc');
-  if (opts.beforeCursor) qb = applyCursor(qb, opts.beforeCursor, 'desc');
-
-  const reversed = !!opts.beforeCursor && !opts.cursor;
-
-  for (const { expression, direction, orderModifier } of fields) {
-    qb = qb.orderBy(
-      expression,
-      orderModifier ??
-        (reversed ? (direction === 'asc' ? 'desc' : 'asc') : direction),
-    );
-  }
-
-  const rows = await qb.limit(opts.perPage + 1).execute();
-
-  const hasNextPage = rows.length > opts.perPage;
-
-  // If we fetched an extra row to determine if we have a next page, that
-  // shouldn't be in the returned results
-  if (rows.length > opts.perPage) rows.pop();
-
-  if (reversed) rows.reverse();
-
-  const startRow = rows[0];
-  const endRow = rows[rows.length - 1];
-
-  const hasPrevPage = !!opts.cursor;
-  const prevCursor = hasPrevPage && startRow ? generateCursor(startRow) : null;
-  const nextCursor = hasNextPage && endRow ? generateCursor(endRow) : null;
-
-  return {
-    items: rows.map((row) => {
-      if (opts.cursorPerRow) {
-        const cursorKey =
-          typeof opts.cursorPerRow === 'string' ? opts.cursorPerRow : '$cursor';
-
-        (row as any)[cursorKey] = generateCursor(row);
-      }
-
-      return row as CursorPaginationResultRow<O, TCursorKey>;
-    }),
-    meta: {
-      limit: opts.perPage,
-      hasNextPage,
-      hasPrevPage,
-      nextCursor,
-      prevCursor,
-    },
-  };
-}
-
-export function defaultEncodeCursor<
-  DB,
-  TB extends keyof DB,
-  O,
-  T extends Fields<DB, TB, O>,
->(values: EncodeCursorValues<DB, TB, O, T>) {
-  const cursor = new URLSearchParams();
-
-  for (const [key, value] of values) {
-    switch (typeof value) {
-      case 'string':
-        cursor.set(key, value);
-        break;
-
-      case 'number':
-      case 'bigint':
-        cursor.set(key, value.toString(10));
-        break;
-
-      case 'object': {
-        if (value instanceof Date) {
-          cursor.set(key, value.toISOString());
-          break;
-        }
-      }
-
-      // eslint-disable-next-line no-fallthrough
-      default:
-        throw new Error(`Unable to encode '${key.toString()}'`);
-    }
-  }
-
-  return Buffer.from(cursor.toString(), 'utf8').toString('base64url');
-}
-
-export function defaultDecodeCursor<
-  DB,
-  TB extends keyof DB,
-  O,
-  T extends Fields<DB, TB, O>,
->(
-  cursor: string,
-  fields: FieldNames<DB, TB, O, T>,
-): DecodedCursor<DB, TB, O, T> {
-  let parsed;
-
-  try {
-    parsed = [
-      ...new URLSearchParams(
-        Buffer.from(cursor, 'base64url').toString('utf8'),
-      ).entries(),
-    ];
-  } catch {
-    throw new Error('Unparsable cursor');
-  }
-
-  if (parsed.length !== fields.length) {
-    throw new Error('Unexpected number of fields');
-  }
-
-  for (let i = 0; i < fields.length; i++) {
-    const field = parsed[i];
-    const expectedName = fields[i];
-
-    if (!field) {
-      throw new Error('Unable to find field');
-    }
-
-    if (field[0] !== expectedName) {
-      throw new Error('Unexpected field name');
-    }
-  }
-
-  return Object.fromEntries(parsed) as DecodedCursor<DB, TB, O, T>;
-}

apps/server/src/database/pagination/pagination-options.ts

@@ -9,6 +9,11 @@ import {
 } from 'class-validator';
 
 export class PaginationOptions {
+  @IsOptional()
+  @IsNumber()
+  @Min(1)
+  page = 1;
+
   @IsOptional()
   @IsNumber()
   @IsPositive()
@@ -16,14 +21,6 @@ export class PaginationOptions {
   @Max(100)
   limit = 20;
 
-  @IsOptional()
-  @IsString()
-  cursor?: string;
-
-  @IsOptional()
-  @IsString()
-  beforeCursor?: string;
-
   @IsOptional()
   @IsString()
   query: string;

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

@@ -8,7 +8,7 @@ import {
   UpdatableComment,
 } from '@docmost/db/types/entity.types';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
-import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination';
+import { executeWithPagination } from '@docmost/db/pagination/pagination';
 import { ExpressionBuilder } from 'kysely';
 import { DB } from '@docmost/db/types/db';
 import { jsonObjectFrom } from 'kysely/helpers/postgres';
@@ -37,15 +37,15 @@ export class CommentRepo {
       .selectAll('comments')
       .select((eb) => this.withCreator(eb))
       .select((eb) => this.withResolvedBy(eb))
-      .where('pageId', '=', pageId);
+      .where('pageId', '=', pageId)
+      .orderBy('createdAt', 'asc');
 
-    return executeWithCursorPagination(query, {
+    const result = executeWithPagination(query, {
+      page: pagination.page,
       perPage: pagination.limit,
-      cursor: pagination.cursor,
-      beforeCursor: pagination.beforeCursor,
-      fields: [{ expression: 'id', direction: 'asc' }],
-      parseCursor: (cursor) => ({ id: cursor.id }),
     });
+
+    return result;
   }
 
   async updateComment(

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

@@ -9,7 +9,7 @@ import { dbOrTx, executeTx } from '@docmost/db/utils';
 import { sql } from 'kysely';
 import { GroupUser, InsertableGroupUser } from '@docmost/db/types/entity.types';
 import { PaginationOptions } from '../../pagination/pagination-options';
-import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination';
+import { executeWithPagination } from '@docmost/db/pagination/pagination';
 import { GroupRepo } from '@docmost/db/repos/group/group.repo';
 import { UserRepo } from '@docmost/db/repos/user/user.repo';
 
@@ -52,7 +52,8 @@ export class GroupUserRepo {
       .selectFrom('groupUsers')
       .innerJoin('users', 'users.id', 'groupUsers.userId')
       .selectAll('users')
-      .where('groupId', '=', groupId);
+      .where('groupId', '=', groupId)
+      .orderBy('createdAt', 'asc');
 
     if (pagination.query) {
       query = query.where((eb) =>
@@ -60,12 +61,9 @@ export class GroupUserRepo {
       );
     }
 
-    const result = await executeWithCursorPagination(query, {
+    const result = await executeWithPagination(query, {
+      page: pagination.page,
       perPage: pagination.limit,
-      cursor: pagination.cursor,
-      beforeCursor: pagination.beforeCursor,
-      fields: [{ expression: 'users.id', direction: 'asc', key: 'id' }],
-      parseCursor: (cursor) => ({ id: cursor.id }),
     });
 
     result.items.map((user) => {

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

@@ -10,8 +10,8 @@ import {
 import { ExpressionBuilder, sql } from 'kysely';
 import { PaginationOptions } from '../../pagination/pagination-options';
 import { DB } from '@docmost/db/types/db';
+import { executeWithPagination } from '@docmost/db/pagination/pagination';
 import { DefaultGroup } from '../../../core/group/dto/create-group.dto';
-import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination';
 
 @Injectable()
 export class GroupRepo {
@@ -104,19 +104,17 @@ export class GroupRepo {
   }
 
   async getGroupsPaginated(workspaceId: string, pagination: PaginationOptions) {
-    let baseQuery = this.db
+    let query = this.db
       .selectFrom('groups')
       .selectAll('groups')
       .select((eb) => this.withMemberCount(eb))
-      .where('workspaceId', '=', workspaceId);
+      .where('workspaceId', '=', workspaceId)
+      .orderBy('memberCount', 'desc')
+      .orderBy('createdAt', 'asc');
 
     if (pagination.query) {
-      baseQuery = baseQuery.where((eb) =>
-        eb(
-          sql`f_unaccent(name)`,
-          'ilike',
-          sql`f_unaccent(${'%' + pagination.query + '%'})`,
-        ).or(
+      query = query.where((eb) =>
+        eb(sql`f_unaccent(name)`, 'ilike', sql`f_unaccent(${'%' + pagination.query + '%'})`).or(
           sql`f_unaccent(description)`,
           'ilike',
           sql`f_unaccent(${'%' + pagination.query + '%'})`,
@@ -124,24 +122,12 @@ export class GroupRepo {
       );
     }
 
-    const query = this.db.selectFrom(baseQuery.as('sub')).selectAll('sub');
-    return executeWithCursorPagination(query, {
+    const result = executeWithPagination(query, {
+      page: pagination.page,
       perPage: pagination.limit,
-      cursor: pagination.cursor,
-      beforeCursor: pagination.beforeCursor,
-      fields: [
-        {
-          expression: 'sub.memberCount',
-          direction: 'desc',
-          key: 'memberCount',
-        },
-        { expression: 'sub.id', direction: 'asc', key: 'id' },
-      ],
-      parseCursor: (cursor) => ({
-        memberCount: parseInt(cursor.memberCount, 10),
-        id: cursor.id,
-      }),
     });
+
+    return result;
   }
 
   withMemberCount(eb: ExpressionBuilder<DB, 'groups'>) {

apps/server/src/database/repos/page/page-history.repo.ts

@@ -8,7 +8,7 @@ import {
   PageHistory,
 } from '@docmost/db/types/entity.types';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
-import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination';
+import { executeWithPagination } from '@docmost/db/pagination/pagination';
 import { jsonObjectFrom } from 'kysely/helpers/postgres';
 import { ExpressionBuilder } from 'kysely';
 import { DB } from '@docmost/db/types/db';
@@ -65,15 +65,15 @@ export class PageHistoryRepo {
       .selectFrom('pageHistory')
       .selectAll()
       .select((eb) => this.withLastUpdatedBy(eb))
-      .where('pageId', '=', pageId);
+      .where('pageId', '=', pageId)
+      .orderBy('createdAt', 'desc');
 
-    return executeWithCursorPagination(query, {
+    const result = executeWithPagination(query, {
+      page: pagination.page,
       perPage: pagination.limit,
-      cursor: pagination.cursor,
-      beforeCursor: pagination.beforeCursor,
-      fields: [{ expression: 'id', direction: 'desc' }],
-      parseCursor: (cursor) => ({ id: cursor.id }),
     });
+
+    return result;
   }
 
   async findPageLastHistory(pageId: string, trx?: KyselyTransaction) {

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

@@ -8,7 +8,7 @@ import {
   UpdatablePage,
 } from '@docmost/db/types/entity.types';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
-import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination';
+import { executeWithPagination } from '@docmost/db/pagination/pagination';
 import { validate as isValidUUID } from 'uuid';
 import { ExpressionBuilder, sql } from 'kysely';
 import { DB } from '@docmost/db/types/db';
@@ -281,21 +281,15 @@ export class PageRepo {
       .select(this.baseFields)
       .select((eb) => this.withSpace(eb))
       .where('spaceId', '=', spaceId)
-      .where('deletedAt', 'is', null);
+      .where('deletedAt', 'is', null)
+      .orderBy('updatedAt', 'desc');
 
-    return executeWithCursorPagination(query, {
+    const result = executeWithPagination(query, {
+      page: pagination.page,
       perPage: pagination.limit,
-      cursor: pagination.cursor,
-      beforeCursor: pagination.beforeCursor,
-      fields: [
-        { expression: 'updatedAt', direction: 'desc' },
-        { expression: 'id', direction: 'desc' },
-      ],
-      parseCursor: (cursor) => ({
-        updatedAt: new Date(cursor.updatedAt),
-        id: cursor.id,
-      }),
     });
+
+    return result;
   }
 
   async getRecentPages(userId: string, pagination: PaginationOptions) {
@@ -304,20 +298,12 @@ export class PageRepo {
       .select(this.baseFields)
       .select((eb) => this.withSpace(eb))
       .where('spaceId', 'in', this.spaceMemberRepo.getUserSpaceIdsQuery(userId))
-      .where('deletedAt', 'is', null);
+      .where('deletedAt', 'is', null)
+      .orderBy('updatedAt', 'desc');
 
-    return executeWithCursorPagination(query, {
+    return executeWithPagination(query, {
+      page: pagination.page,
       perPage: pagination.limit,
-      cursor: pagination.cursor,
-      beforeCursor: pagination.beforeCursor,
-      fields: [
-        { expression: 'updatedAt', direction: 'desc' },
-        { expression: 'id', direction: 'desc' },
-      ],
-      parseCursor: (cursor) => ({
-        updatedAt: new Date(cursor.updatedAt),
-        id: cursor.id,
-      }),
     });
   }
 
@@ -345,21 +331,15 @@ export class PageRepo {
             ),
           ),
         ]),
-      );
+      )
+      .orderBy('deletedAt', 'desc');
 
-    return executeWithCursorPagination(query, {
+    const result = executeWithPagination(query, {
+      page: pagination.page,
       perPage: pagination.limit,
-      cursor: pagination.cursor,
-      beforeCursor: pagination.beforeCursor,
-      fields: [
-        { expression: 'deletedAt', direction: 'desc' },
-        { expression: 'id', direction: 'desc' },
-      ],
-      parseCursor: (cursor) => ({
-        deletedAt: new Date(cursor.deletedAt),
-        id: cursor.id,
-      }),
     });
+
+    return result;
   }
 
   withSpace(eb: ExpressionBuilder<DB, 'pages'>) {

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

@@ -8,7 +8,7 @@ import {
   UpdatableShare,
 } from '@docmost/db/types/entity.types';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
-import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination';
+import { executeWithPagination } from '@docmost/db/pagination/pagination';
 import { validate as isValidUUID } from 'uuid';
 import { ExpressionBuilder, sql } from 'kysely';
 import { DB } from '@docmost/db/types/db';
@@ -143,20 +143,12 @@ export class ShareRepo {
       .select((eb) => this.withPage(eb))
       .select((eb) => this.withSpace(eb, userId))
       .select((eb) => this.withCreator(eb))
-      .where('spaceId', 'in', this.spaceMemberRepo.getUserSpaceIdsQuery(userId));
+      .where('spaceId', 'in', this.spaceMemberRepo.getUserSpaceIdsQuery(userId))
+      .orderBy('updatedAt', 'desc');
 
-    return executeWithCursorPagination(query, {
+    return executeWithPagination(query, {
+      page: pagination.page,
       perPage: pagination.limit,
-      cursor: pagination.cursor,
-      beforeCursor: pagination.beforeCursor,
-      fields: [
-        { expression: 'updatedAt', direction: 'desc' },
-        { expression: 'id', direction: 'desc' },
-      ],
-      parseCursor: (cursor) => ({
-        updatedAt: new Date(cursor.updatedAt),
-        id: cursor.id,
-      }),
     });
   }
 

apps/server/src/database/repos/space/space-member.repo.ts

@@ -10,7 +10,7 @@ import {
 } from '@docmost/db/types/entity.types';
 import { PaginationOptions } from '../../pagination/pagination-options';
 import { MemberInfo, UserSpaceRole } from './types';
-import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination';
+import { executeWithPagination } from '@docmost/db/pagination/pagination';
 import { GroupRepo } from '@docmost/db/repos/group/group.repo';
 import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
 
@@ -98,7 +98,7 @@ export class SpaceMemberRepo {
     spaceId: string,
     pagination: PaginationOptions,
   ) {
-    let baseQuery = this.db
+    let query = this.db
       .selectFrom('spaceMembers')
       .leftJoin('users', 'users.id', 'spaceMembers.userId')
       .leftJoin('groups', 'groups.id', 'spaceMembers.groupId')
@@ -114,11 +114,12 @@ export class SpaceMemberRepo {
         'spaceMembers.createdAt',
       ])
       .select((eb) => this.groupRepo.withMemberCount(eb))
-      .select(sql<number>`case when groups.id is not null then 1 else 0 end`.as('isGroup'))
-      .where('spaceId', '=', spaceId);
+      .where('spaceId', '=', spaceId)
+      .orderBy((eb) => eb('groups.id', 'is not', null), 'desc')
+      .orderBy('spaceMembers.createdAt', 'asc');
 
     if (pagination.query) {
-      baseQuery = baseQuery.where((eb) =>
+      query = query.where((eb) =>
         eb(
           sql`f_unaccent(users.name)`,
           'ilike',
@@ -137,20 +138,9 @@ export class SpaceMemberRepo {
       );
     }
 
-    const query = this.db.selectFrom(baseQuery.as('sub')).selectAll('sub');
-
-    const result = await executeWithCursorPagination(query, {
+    const result = await executeWithPagination(query, {
+      page: pagination.page,
       perPage: pagination.limit,
-      cursor: pagination.cursor,
-      beforeCursor: pagination.beforeCursor,
-      fields: [
-        { expression: 'sub.isGroup', direction: 'desc', key: 'isGroup' },
-        { expression: 'sub.createdAt', direction: 'asc', key: 'createdAt' },
-      ],
-      parseCursor: (cursor) => ({
-        isGroup: parseInt(cursor.isGroup, 10),
-        createdAt: new Date(cursor.createdAt),
-      }),
     });
 
     let memberInfo: MemberInfo;
@@ -245,7 +235,8 @@ export class SpaceMemberRepo {
       .selectFrom('spaces')
       .selectAll()
       .select((eb) => [this.spaceRepo.withMemberCount(eb)])
-      .where('id', 'in', this.getUserSpaceIdsQuery(userId));
+      .where('id', 'in', this.getUserSpaceIdsQuery(userId))
+      .orderBy('createdAt', 'asc');
 
     if (pagination.query) {
       query = query.where((eb) =>
@@ -261,12 +252,9 @@ export class SpaceMemberRepo {
       );
     }
 
-    return executeWithCursorPagination(query, {
+    return executeWithPagination(query, {
+      page: pagination.page,
       perPage: pagination.limit,
-      cursor: pagination.cursor,
-      beforeCursor: pagination.beforeCursor,
-      fields: [{ expression: 'id', direction: 'asc' }],
-      parseCursor: (cursor) => ({ id: cursor.id }),
     });
   }
 }

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

@@ -9,7 +9,7 @@ import {
 } from '@docmost/db/types/entity.types';
 import { ExpressionBuilder, sql } from 'kysely';
 import { PaginationOptions } from '../../pagination/pagination-options';
-import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination';
+import { executeWithPagination } from '@docmost/db/pagination/pagination';
 import { DB } from '@docmost/db/types/db';
 import { validate as isValidUUID } from 'uuid';
 import { EventEmitter2 } from '@nestjs/event-emitter';
@@ -110,7 +110,8 @@ export class SpaceRepo {
       .selectFrom('spaces')
       .selectAll('spaces')
       .select((eb) => [this.withMemberCount(eb)])
-      .where('workspaceId', '=', workspaceId);
+      .where('workspaceId', '=', workspaceId)
+      .orderBy('createdAt', 'asc');
 
     if (pagination.query) {
       query = query.where((eb) =>
@@ -126,13 +127,12 @@ export class SpaceRepo {
       );
     }
 
-    return executeWithCursorPagination(query, {
+    const result = executeWithPagination(query, {
+      page: pagination.page,
       perPage: pagination.limit,
-      cursor: pagination.cursor,
-      beforeCursor: pagination.beforeCursor,
-      fields: [{ expression: 'id', direction: 'asc' }],
-      parseCursor: (cursor) => ({ id: cursor.id }),
     });
+
+    return result;
   }
 
   withMemberCount(eb: ExpressionBuilder<DB, 'spaces'>) {

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

@@ -10,7 +10,7 @@ import {
   User,
 } from '@docmost/db/types/entity.types';
 import { PaginationOptions } from '../../pagination/pagination-options';
-import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination';
+import { executeWithPagination } from '@docmost/db/pagination/pagination';
 import { ExpressionBuilder, sql } from 'kysely';
 import { jsonObjectFrom } from 'kysely/helpers/postgres';
 
@@ -145,7 +145,8 @@ export class UserRepo {
       .selectFrom('users')
       .select(this.baseFields)
       .where('workspaceId', '=', workspaceId)
-      .where('deletedAt', 'is', null);
+      .where('deletedAt', 'is', null)
+      .orderBy('createdAt', 'asc');
 
     if (pagination.query) {
       query = query.where((eb) =>
@@ -161,13 +162,12 @@ export class UserRepo {
       );
     }
 
-    return executeWithCursorPagination(query, {
+    const result = executeWithPagination(query, {
+      page: pagination.page,
       perPage: pagination.limit,
-      cursor: pagination.cursor,
-      beforeCursor: pagination.beforeCursor,
-      fields: [{ expression: 'id', direction: 'asc' }],
-      parseCursor: (cursor) => ({ id: cursor.id }),
     });
+
+    return result;
   }
 
   async updatePreference(

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

@@ -27,7 +27,7 @@ import { AuthUser } from '../../common/decorators/auth-user.decorator';
 import { FileTaskIdDto } from './dto/file-task-dto';
 import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
-import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination';
+import { executeWithPagination } from '@docmost/db/pagination/pagination';
 
 @Controller('file-tasks')
 export class FileTaskController {
@@ -56,14 +56,12 @@ export class FileTaskController {
     const query = this.db
       .selectFrom('fileTasks')
       .selectAll()
-      .where('spaceId', 'in', this.spaceMemberRepo.getUserSpaceIdsQuery(user.id));
+      .where('spaceId', 'in', this.spaceMemberRepo.getUserSpaceIdsQuery(user.id))
+      .orderBy('createdAt', 'desc');
 
-    return executeWithCursorPagination(query, {
+    return executeWithPagination(query, {
+      page: pagination.page,
       perPage: pagination.limit,
-      cursor: pagination.cursor,
-      beforeCursor: pagination.beforeCursor,
-      fields: [{ expression: 'id', direction: 'desc' }],
-      parseCursor: (cursor) => ({ id: cursor.id }),
     });
   }
 

apps/server/src/main.ts

@@ -104,8 +104,7 @@ async function bootstrap() {
   });
 
   const port = process.env.PORT || 3000;
-  const host = process.env.HOST || '0.0.0.0';
-  await app.listen(port, host, () => {
+  await app.listen(port, '0.0.0.0', () => {
     logger.log(
       `Listening on http://127.0.0.1:${port} / ${process.env.APP_URL}`,
     );

package.json

@@ -1,7 +1,7 @@
 {
   "name": "docmost",
   "homepage": "https://docmost.com",
-  "version": "0.25.0-beta.1",
+  "version": "0.24.1",
   "private": true,
   "scripts": {
     "build": "nx run-many -t build",
@@ -60,7 +60,6 @@
     "bytes": "^3.1.2",
     "cross-env": "^7.0.3",
     "date-fns": "^4.1.0",
-    "diff": "8.0.3",
     "dompurify": "^3.2.6",
     "fractional-indexing-jittered": "^1.0.0",
     "highlight.js": "^11.11.1",
@@ -71,7 +70,6 @@
     "marked": "13.0.3",
     "ms": "3.0.0-canary.1",
     "qrcode": "^1.5.4",
-    "rfc6902": "5.1.2",
     "uuid": "^11.1.0",
     "y-indexeddb": "^9.0.12",
     "y-prosemirror": "1.3.7",
@@ -100,7 +98,6 @@
     "overrides": {
       "jsdom": "25.0.1",
       "jsonwebtoken": "9.0.3",
-      "prosemirror-changeset": "2.3.1",
       "y-prosemirror": "1.3.7"
     },
     "neverBuiltDependencies": []

packages/editor-ext/package.json

@@ -8,6 +8,5 @@
   },
   "main": "dist/index.js",
   "module": "./src/index.ts",
-  "types": "dist/index.d.ts",
-  "dependencies": {}
+  "types": "dist/index.d.ts"
 }

packages/editor-ext/src/index.ts

@@ -24,4 +24,3 @@ export * from "./lib/highlight";
 export * from "./lib/heading/heading";
 export * from "./lib/unique-id";
 export * from "./lib/shared-storage";
-export * from "./lib/recreate-transform";

packages/editor-ext/src/lib/docs/changeset.md

@@ -1,145 +0,0 @@
-# prosemirror-changeset
-
-This is a helper module that can turn a sequence of document changes
-into a set of insertions and deletions, for example to display them in
-a change-tracking interface. Such a set can be built up incrementally,
-in order to do such change tracking in a halfway performant way during
-live editing.
-
-This code is licensed under an [MIT
-licence](https://github.com/ProseMirror/prosemirror-changeset/blob/master/LICENSE).
-
-## Programming interface
-
-Insertions and deletions are represented as ‘spans’—ranges in the
-document. The deleted spans refer to the original document, whereas
-the inserted ones point into the current document.
-
-It is possible to associate arbitrary data values with such spans, for
-example to track the user that made the change, the timestamp at which
-it was made, or the step data necessary to invert it again.
-
-### class Change`<Data = any>`
-
-A replaced range with metadata associated with it.
-
-* **`fromA`**`: number`\
-  The start of the range deleted/replaced in the old document.
-
-* **`toA`**`: number`\
-  The end of the range in the old document.
-
-* **`fromB`**`: number`\
-  The start of the range inserted in the new document.
-
-* **`toB`**`: number`\
-  The end of the range in the new document.
-
-* **`deleted`**`: readonly Span[]`\
-  Data associated with the deleted content. The length of these
-  spans adds up to `this.toA - this.fromA`.
-
-* **`inserted`**`: readonly Span[]`\
-  Data associated with the inserted content. Length adds up to
-  `this.toB - this.fromB`.
-
-* `static `**`merge`**`<Data>(x: readonly Change[], y: readonly Change[], combine: fn(dataA: Data, dataB: Data) → Data) → readonly Change[]`\
-  This merges two changesets (the end document of x should be the
-  start document of y) into a single one spanning the start of x to
-  the end of y.
-
-
-### class Span`<Data = any>`
-
-Stores metadata for a part of a change.
-
-* **`length`**`: number`\
-  The length of this span.
-
-* **`data`**`: Data`\
-  The data associated with this span.
-
-
-### class ChangeSet`<Data = any>`
-
-A change set tracks the changes to a document from a given point
-in the past. It condenses a number of step maps down to a flat
-sequence of replacements, and simplifies replacments that
-partially undo themselves by comparing their content.
-
-* **`changes`**`: readonly Change[]`\
-  Replaced regions.
-
-* **`addSteps`**`(newDoc: Node, maps: readonly StepMap[], data: Data | readonly Data[]) → ChangeSet`\
-  Computes a new changeset by adding the given step maps and
-  metadata (either as an array, per-map, or as a single value to be
-  associated with all maps) to the current set. Will not mutate the
-  old set.
-
-  Note that due to simplification that happens after each add,
-  incrementally adding steps might create a different final set
-  than adding all those changes at once, since different document
-  tokens might be matched during simplification depending on the
-  boundaries of the current changed ranges.
-
-* **`startDoc`**`: Node`\
-  The starting document of the change set.
-
-* **`map`**`(f: fn(range: Span) → Data) → ChangeSet`\
-  Map the span's data values in the given set through a function
-  and construct a new set with the resulting data.
-
-* **`changedRange`**`(b: ChangeSet, maps?: readonly StepMap[]) → {from: number, to: number}`\
-  Compare two changesets and return the range in which they are
-  changed, if any. If the document changed between the maps, pass
-  the maps for the steps that changed it as second argument, and
-  make sure the method is called on the old set and passed the new
-  set. The returned positions will be in new document coordinates.
-
-* `static `**`create`**`<Data = any>(doc: Node, combine?: fn(dataA: Data, dataB: Data) → Data = (a, b) => a === b ? a : null as any, tokenEncoder?: TokenEncoder = DefaultEncoder) → ChangeSet`\
-  Create a changeset with the given base object and configuration.
-
-  The `combine` function is used to compare and combine metadata—it
-  should return null when metadata isn't compatible, and a combined
-  version for a merged range when it is.
-
-  When given, a token encoder determines how document tokens are
-  serialized and compared when diffing the content produced by
-  changes. The default is to just compare nodes by name and text
-  by character, ignoring marks and attributes.
-
-
-* **`simplifyChanges`**`(changes: readonly Change[], doc: Node) → Change[]`\
-  Simplifies a set of changes for presentation. This makes the
-  assumption that having both insertions and deletions within a word
-  is confusing, and, when such changes occur without a word boundary
-  between them, they should be expanded to cover the entire set of
-  words (in the new document) they touch. An exception is made for
-  single-character replacements.
-
-
-### interface TokenEncoder`<T>`
-
-A token encoder can be passed when creating a `ChangeSet` in order
-to influence the way the library runs its diffing algorithm. The
-encoder determines how document tokens (such as nodes and
-characters) are encoded and compared.
-
-Note that both the encoding and the comparison may run a lot, and
-doing non-trivial work in these functions could impact
-performance.
-
-* **`encodeCharacter`**`(char: number, marks: readonly Mark[]) → T`\
-  Encode a given character, with the given marks applied.
-
-* **`encodeNodeStart`**`(node: Node) → T`\
-  Encode the start of a node or, if this is a leaf node, the
-  entire node.
-
-* **`encodeNodeEnd`**`(node: Node) → T`\
-  Encode the end token for the given node. It is valid to encode
-  every end token in the same way.
-
-* **`compareTokens`**`(a: T, b: T) → boolean`\
-  Compare the given tokens. Should return true when they count as
-  equal.

packages/editor-ext/src/lib/docs/recreate.md

@@ -1,30 +0,0 @@
-# prosemirror-recreate-transform
-
-> reduced and modified fork of https://gitlab.com/mpapp-public/prosemirror-recreate-steps
-
-This is a non-core module of [ProseMirror](http://prosemirror.net).
-ProseMirror is a well-behaved rich semantic content editor based on
-contentEditable, with support for collaborative editing and custom
-document schemas.
-
-Every change to the document is recorded by ProseMirror as a step.
-This module allows recreating the steps needed to go from document
-A to B should these not be available otherwise. Recreating steps
-can be interesting for example in order to show the changes between
-two document versions without having access to the original steps.
-
-Recreating a `Transform` works this way:
-
-```js
-import { recreateTransform } from "@technik-sde/prosemirror-recreate-transform";
-
-let tr = recreateTransform(
-    startDoc, 
-    endDoc, 
-    {
-        complexSteps: true, // Whether step types other than ReplaceStep are allowed.
-        wordDiffs: false, // Whether diffs in text nodes should cover entire words.
-        simplifyDiffs: true // Whether steps should be merged, where possible
-    }
-);
-```

packages/editor-ext/src/lib/recreate-transform/copy.ts

@@ -1,3 +0,0 @@
-export function copy<T>(value: T): T {
-  return JSON.parse(JSON.stringify(value));
-}

packages/editor-ext/src/lib/recreate-transform/getFromPath.ts

@@ -1,17 +0,0 @@
-import { AnyObject } from "./types";
-
-/**
- * get target value from json-pointer (e.g. /content/0/content)
- * @param  {AnyObject} obj  object to resolve path into
- * @param  {string}    path json-pointer
- * @return {any} target value
- */
-export function getFromPath(obj: AnyObject, path: string): any {
-  const pathParts = path.split("/");
-  pathParts.shift(); // remove root-entry
-  while (pathParts.length) {
-    const property = pathParts.shift();
-    obj = obj[property];
-  }
-  return obj;
-}

packages/editor-ext/src/lib/recreate-transform/getReplaceStep.ts

@@ -1,29 +0,0 @@
-import { ReplaceStep } from "@tiptap/pm/transform";
-import { Node } from "@tiptap/pm/model";
-
-export function getReplaceStep(fromDoc: Node, toDoc: Node) {
-  let start = toDoc.content.findDiffStart(fromDoc.content);
-  if (start === null) {
-    return false;
-  }
-
-  // @ts-ignore property access to content
-  let { a: endA, b: endB } = toDoc.content.findDiffEnd(fromDoc.content);
-  const overlap = start - Math.min(endA, endB);
-  if (overlap > 0) {
-    // If there is an overlap, there is some freedom of choice in how to calculate the
-    // start/end boundary. for an inserted/removed slice. We choose the extreme with
-    // the lowest depth value.
-    if (
-      fromDoc.resolve(start - overlap).depth <
-      toDoc.resolve(endA + overlap).depth
-    ) {
-      start -= overlap;
-    } else {
-      endA += overlap;
-      endB += overlap;
-    }
-  }
-
-  return new ReplaceStep(start, endB, toDoc.slice(start, endA));
-}

packages/editor-ext/src/lib/recreate-transform/index.ts

@@ -1,4 +0,0 @@
-// https://gitlab.com/mpapp-public/prosemirror-recreate-steps
-// https://github.com/sueddeutsche/prosemirror-recreate-transform
-export { recreateTransform, RecreateTransform } from "./recreateTransform";
-export type { Options } from "./recreateTransform";

packages/editor-ext/src/lib/recreate-transform/recreateTransform.ts

@@ -1,279 +0,0 @@
-import { Transform } from "@tiptap/pm/transform";
-import { Node, Schema } from "@tiptap/pm/model";
-import { applyPatch, createPatch, Operation } from "rfc6902";
-import { diffWordsWithSpace, diffChars } from "diff";
-import { AnyObject } from "./types";
-import { getReplaceStep } from "./getReplaceStep";
-import { simplifyTransform } from "./simplifyTransform";
-import { removeMarks } from "./removeMarks";
-import { getFromPath } from "./getFromPath";
-import { copy } from "./copy";
-
-export interface Options {
-  complexSteps?: boolean;
-  wordDiffs?: boolean;
-  simplifyDiff?: boolean;
-}
-
-export class RecreateTransform {
-  fromDoc: Node;
-  toDoc: Node;
-  complexSteps: boolean;
-  wordDiffs: boolean;
-  simplifyDiff: boolean;
-  schema: Schema;
-  tr: Transform;
-  /* current working document data, may get updated while recalculating node steps */
-  currentJSON: AnyObject;
-  /* final document as json data */
-  finalJSON: AnyObject;
-  ops: Array<Operation>;
-
-  constructor(fromDoc: Node, toDoc: Node, options: Options = {}) {
-    const o = {
-      complexSteps: true,
-      wordDiffs: false,
-      simplifyDiff: true,
-      ...options,
-    };
-
-    this.fromDoc = fromDoc;
-    this.toDoc = toDoc;
-    this.complexSteps = o.complexSteps; // Whether to return steps other than ReplaceSteps
-    this.wordDiffs = o.wordDiffs; // Whether to make text diffs cover entire words
-    this.simplifyDiff = o.simplifyDiff;
-    this.schema = fromDoc.type.schema;
-    this.tr = new Transform(fromDoc);
-  }
-
-  init() {
-    if (this.complexSteps) {
-      // For First steps: we create versions of the documents without marks as
-      // these will only confuse the diffing mechanism and marks won't cause
-      // any mapping changes anyway.
-      this.currentJSON = removeMarks(this.fromDoc).toJSON();
-      this.finalJSON = removeMarks(this.toDoc).toJSON();
-      this.ops = createPatch(this.currentJSON, this.finalJSON);
-      this.recreateChangeContentSteps();
-      this.recreateChangeMarkSteps();
-    } else {
-      // We don't differentiate between mark changes and other changes.
-      this.currentJSON = this.fromDoc.toJSON();
-      this.finalJSON = this.toDoc.toJSON();
-      this.ops = createPatch(this.currentJSON, this.finalJSON);
-      this.recreateChangeContentSteps();
-    }
-
-    if (this.simplifyDiff) {
-      this.tr = simplifyTransform(this.tr) || this.tr;
-    }
-
-    return this.tr;
-  }
-
-  /** convert json-diff to prosemirror steps */
-  recreateChangeContentSteps() {
-    // First step: find content changing steps.
-    let ops = [];
-    while (this.ops.length) {
-      // get next
-      let op = this.ops.shift();
-      ops.push(op);
-
-      let toDoc;
-      const afterStepJSON = copy(this.currentJSON); // working document receiving patches
-      const pathParts = op.path.split("/");
-
-      // collect operations until we receive a valid document:
-      // apply ops-patches until a valid prosemirror document is retrieved,
-      // then try to create a transformation step or retry with next operation
-      while (toDoc == null) {
-        applyPatch(afterStepJSON, [op]);
-
-        try {
-          toDoc = this.schema.nodeFromJSON(afterStepJSON);
-          toDoc.check();
-        } catch (error) {
-          toDoc = null;
-          if (this.ops.length > 0) {
-            op = this.ops.shift();
-            ops.push(op);
-          } else {
-            throw new Error(`No valid diff possible applying ${op.path}`);
-          }
-        }
-      }
-
-      // apply operation (ignoring afterStepJSON)
-      if (
-        this.complexSteps &&
-        ops.length === 1 &&
-        (pathParts.includes("attrs") || pathParts.includes("type"))
-      ) {
-        // Node markup is changing
-        this.addSetNodeMarkup(); // a lost update is ignored
-        ops = [];
-        // console.log("%cop", logStyle, "- update node", ops);
-      } else if (
-        ops.length === 1 &&
-        op.op === "replace" &&
-        pathParts[pathParts.length - 1] === "text"
-      ) {
-        // Text is being replaced, we apply text diffing to find the smallest possible diffs.
-        this.addReplaceTextSteps(op, afterStepJSON);
-        ops = [];
-        // console.log("%cop", logStyle, "- replace", ops);
-      } else if (this.addReplaceStep(toDoc, afterStepJSON)) {
-        // operations have been applied
-        ops = [];
-        // console.log("%cop", logStyle, "- other", ops);
-      }
-    }
-  }
-
-  /** update node with attrs and marks, may also change type */
-  addSetNodeMarkup() {
-    // first diff in document is supposed to be a node-change (in type and/or attributes)
-    // thus simply find the first change and apply a node change step, then recalculate the diff
-    // after updating the document
-    const fromDoc = this.schema.nodeFromJSON(this.currentJSON);
-    const toDoc = this.schema.nodeFromJSON(this.finalJSON);
-    const start = toDoc.content.findDiffStart(fromDoc.content);
-    // @note start is the same (first) position for current and target document
-    const fromNode = fromDoc.nodeAt(start);
-    const toNode = toDoc.nodeAt(start);
-
-    if (start != null) {
-      // @note this completly updates all attributes in one step, by completely replacing node
-      const nodeType = fromNode.type === toNode.type ? null : toNode.type;
-      try {
-        this.tr.setNodeMarkup(start, nodeType, toNode.attrs, toNode.marks);
-      } catch (e) {
-        // if nodetypes differ, the updated node-type and contents might not be compatible
-        // with schema and requires a replace
-        if (nodeType && e.message.includes("Invalid content")) {
-          // @todo add test-case for this scenario
-          this.tr.replaceWith(start, start + fromNode.nodeSize, toNode);
-        } else {
-          throw e;
-        }
-      }
-      this.currentJSON = removeMarks(this.tr.doc).toJSON();
-      // setting the node markup may have invalidated the following ops, so we calculate them again.
-      this.ops = createPatch(this.currentJSON, this.finalJSON);
-      return true;
-    }
-    return false;
-  }
-
-  recreateChangeMarkSteps() {
-    // Now the documents should be the same, except their marks, so everything should map 1:1.
-    // Second step: Iterate through the toDoc and make sure all marks are the same in tr.doc
-    this.toDoc.descendants((tNode, tPos) => {
-      if (!tNode.isInline) {
-        return true;
-      }
-
-      this.tr.doc.nodesBetween(tPos, tPos + tNode.nodeSize, (fNode, fPos) => {
-        if (!fNode.isInline) {
-          return true;
-        }
-        const from = Math.max(tPos, fPos);
-        const to = Math.min(tPos + tNode.nodeSize, fPos + fNode.nodeSize);
-        fNode.marks.forEach((nodeMark) => {
-          if (!nodeMark.isInSet(tNode.marks)) {
-            this.tr.removeMark(from, to, nodeMark);
-          }
-        });
-        tNode.marks.forEach((nodeMark) => {
-          if (!nodeMark.isInSet(fNode.marks)) {
-            this.tr.addMark(from, to, nodeMark);
-          }
-        });
-      });
-    });
-  }
-
-  /**
-   * retrieve and possibly apply replace-step based from doc changes
-   * From http://prosemirror.net/examples/footnote/
-   */
-  addReplaceStep(toDoc: Node, afterStepJSON: AnyObject) {
-    const fromDoc = this.schema.nodeFromJSON(this.currentJSON);
-    const step = getReplaceStep(fromDoc, toDoc);
-
-    if (!step) {
-      return false;
-    } else if (!this.tr.maybeStep(step).failed) {
-      this.currentJSON = afterStepJSON;
-      return true; // @change previously null
-    }
-
-    throw new Error("No valid step found.");
-  }
-
-  /** retrieve and possibly apply text replace-steps based from doc changes */
-  addReplaceTextSteps(op, afterStepJSON) {
-    // We find the position number of the first character in the string
-    const op1 = { ...op, value: "xx" };
-    const op2 = { ...op, value: "yy" };
-    const afterOP1JSON = copy(this.currentJSON);
-    const afterOP2JSON = copy(this.currentJSON);
-    applyPatch(afterOP1JSON, [op1]);
-    applyPatch(afterOP2JSON, [op2]);
-    const op1Doc = this.schema.nodeFromJSON(afterOP1JSON);
-    const op2Doc = this.schema.nodeFromJSON(afterOP2JSON);
-
-    // get text diffs
-    const finalText = op.value;
-    const currentText = getFromPath(this.currentJSON, op.path);
-    const textDiffs = this.wordDiffs
-      ? diffWordsWithSpace(currentText, finalText)
-      : diffChars(currentText, finalText);
-
-    let offset = op1Doc.content.findDiffStart(op2Doc.content);
-    const marks = op1Doc.resolve(offset + 1).marks();
-
-    while (textDiffs.length) {
-      const diff = textDiffs.shift();
-
-      if (diff.added) {
-        const textNode = this.schema
-          .nodeFromJSON({ type: "text", text: diff.value })
-          .mark(marks);
-
-        if (textDiffs.length && textDiffs[0].removed) {
-          const nextDiff = textDiffs.shift();
-          this.tr.replaceWith(offset, offset + nextDiff.value.length, textNode);
-        } else {
-          this.tr.insert(offset, textNode);
-        }
-        offset += diff.value.length;
-      } else if (diff.removed) {
-        if (textDiffs.length && textDiffs[0].added) {
-          const nextDiff = textDiffs.shift();
-          const textNode = this.schema
-            .nodeFromJSON({ type: "text", text: nextDiff.value })
-            .mark(marks);
-          this.tr.replaceWith(offset, offset + diff.value.length, textNode);
-          offset += nextDiff.value.length;
-        } else {
-          this.tr.delete(offset, offset + diff.value.length);
-        }
-      } else {
-        offset += diff.value.length;
-      }
-    }
-
-    this.currentJSON = afterStepJSON;
-  }
-}
-
-export function recreateTransform(
-  fromDoc: Node,
-  toDoc: Node,
-  options: Options = {},
-): Transform {
-  const recreator = new RecreateTransform(fromDoc, toDoc, options);
-  return recreator.init();
-}

packages/editor-ext/src/lib/recreate-transform/removeMarks.ts

@@ -1,8 +0,0 @@
-import { Transform } from "@tiptap/pm/transform";
-import { Node } from "@tiptap/pm/model";
-
-export function removeMarks(doc: Node) {
-  const tr = new Transform(doc);
-  tr.removeMark(0, doc.nodeSize - 2);
-  return tr.doc;
-}

packages/editor-ext/src/lib/recreate-transform/simplifyTransform.ts

@@ -1,30 +0,0 @@
-import { Transform, ReplaceStep, Step } from "@tiptap/pm/transform";
-import { getReplaceStep } from "./getReplaceStep";
-
-// join adjacent ReplaceSteps
-export function simplifyTransform(tr: Transform) {
-  if (!tr.steps.length) {
-    return undefined;
-  }
-
-  const newTr = new Transform(tr.docs[0]);
-  const oldSteps = tr.steps.slice();
-
-  while (oldSteps.length) {
-    let step = oldSteps.shift();
-    while (oldSteps.length && step.merge(oldSteps[0])) {
-      const addedStep = oldSteps.shift();
-      if (step instanceof ReplaceStep && addedStep instanceof ReplaceStep) {
-        step = getReplaceStep(
-          newTr.doc,
-          addedStep.apply(step.apply(newTr.doc).doc).doc,
-          // @ts-ignore
-        ) as Step<any>;
-      } else {
-        step = step.merge(addedStep);
-      }
-    }
-    newTr.step(step);
-  }
-  return newTr;
-}

packages/editor-ext/src/lib/recreate-transform/types.ts

@@ -1,3 +0,0 @@
-export interface AnyObject {
-    [p: string]: any;
-}

packages/editor-ext/src/lib/search-and-replace/search-and-replace.ts

@@ -197,15 +197,11 @@ const replace = (
     });
 
     const marks = Array.from(marksSet);
-    
-    // Delete the old text
-    tr.delete(from, to);
 
-    // Only insert new text if replaceTerm is not empty (allows for deletion when replaceTerm is empty)
-    if (replaceTerm) {
-      tr.insert(from, state.schema.text(replaceTerm, marks));
-    }
-    
+    // Delete the old text and insert new text with preserved marks
+    tr.delete(from, to);
+    tr.insert(from, state.schema.text(replaceTerm, marks));
+
     dispatch(tr);
   }
 };
@@ -232,14 +228,10 @@ const replaceAll = (
     });
 
     const marks = Array.from(marksSet);
-    
-    // Delete the old text
-    tr.delete(from, to);
 
-    // Only insert new text if replaceTerm is not empty (allows for deletion when replaceTerm is empty)
-    if (replaceTerm) {
-      tr.insert(from, tr.doc.type.schema.text(replaceTerm, marks));
-    }
+    // Delete and insert with preserved marks
+    tr.delete(from, to);
+    tr.insert(from, tr.doc.type.schema.text(replaceTerm, marks));
   }
 
   dispatch(tr);

pnpm-lock.yaml

@@ -7,7 +7,6 @@ settings:
 overrides:
   jsdom: 25.0.1
   jsonwebtoken: 9.0.3
-  prosemirror-changeset: 2.3.1
   y-prosemirror: 1.3.7
 
 patchedDependencies:
@@ -142,9 +141,6 @@ importers:
       date-fns:
         specifier: ^4.1.0
         version: 4.1.0
-      diff:
-        specifier: 8.0.3
-        version: 8.0.3
       dompurify:
         specifier: ^3.2.6
         version: 3.2.6
@@ -175,9 +171,6 @@ importers:
       qrcode:
         specifier: ^1.5.4
         version: 1.5.4
-      rfc6902:
-        specifier: 5.1.2
-        version: 5.1.2
       uuid:
         specifier: ^11.1.0
         version: 11.1.0
@@ -6117,10 +6110,6 @@ packages:
     resolution: {integrity: sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==}
     engines: {node: '>=0.3.1'}
 
-  diff@8.0.3:
-    resolution: {integrity: sha512-qejHi7bcSD4hQAZE0tNAawRK1ZtafHDmMTMkrrIGgSLl7hTnQHmKCeB45xAcbfTqK2zowkM3j3bHt/4b/ARbYQ==}
-    engines: {node: '>=0.3.1'}
-
   dijkstrajs@1.0.3:
     resolution: {integrity: sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==}
 
@@ -9067,9 +9056,6 @@ packages:
     resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
-  rfc6902@5.1.2:
-    resolution: {integrity: sha512-zxcb+PWlE8PwX0tiKE6zP97THQ8/lHmeiwucRrJ3YFupWEmp25RmFSlB1dNTqjkovwqG4iq+u1gzJMBS3um8mA==}
-
   rfdc@1.3.1:
     resolution: {integrity: sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==}
 
@@ -16761,8 +16747,6 @@ snapshots:
 
   diff@5.2.0: {}
 
-  diff@8.0.3: {}
-
   dijkstrajs@1.0.3: {}
 
   dingbat-to-unicode@1.0.1: {}
@@ -20334,8 +20318,6 @@ snapshots:
 
   reusify@1.1.0: {}
 
-  rfc6902@5.1.2: {}
-
   rfdc@1.3.1: {}
 
   rimraf@3.0.2: