@lobehub/lobehub 2.0.0-next.255 → 2.0.0-next.256

package/src/store/file/slices/document/action.ts

@@ -6,7 +6,6 @@ import { useClientDataSWRWithSync } from '@/libs/swr';
 import { documentService } from '@/services/document';
 import { useGlobalStore } from '@/store/global';
 import { DocumentSourceType, type LobeDocument } from '@/types/document';
-import { standardizeIdentifier } from '@/utils/identifier';
 import { setNamespace } from '@/utils/storeDebug';
 
 import { type FileStore } from '../../store';
@@ -18,13 +17,6 @@ const ALLOWED_DOCUMENT_SOURCE_TYPES = new Set(['editor', 'file', 'api']);
 const ALLOWED_DOCUMENT_FILE_TYPES = new Set(['custom/document', 'application/pdf']);
 const EDITOR_DOCUMENT_FILE_TYPE = 'custom/document';
 
-const updateUrl = (docId: string | null) => {
-  const dryPageId = standardizeIdentifier(docId ?? '') ?? '';
-
-  const newPath = dryPageId ? `/page/${dryPageId}` : '/page';
-  window.history.replaceState({}, '', newPath);
-};
-
 /**
  * Check if a page should be displayed in the page list
  */
@@ -36,7 +28,6 @@ const isAllowedDocument = (page: { fileType: string; sourceType: string }) => {
 };
 
 export interface DocumentAction {
-  closeAllPagesDrawer: () => void;
   /**
    * Create a new document with markdown content (not optimistic, waits for server response)
    * Returns the created document
@@ -52,20 +43,11 @@ export interface DocumentAction {
    * Returns the created folder's ID
    */
   createFolder: (name: string, parentId?: string, knowledgeBaseId?: string) => Promise<string>;
-  /**
-   * Create a new page with optimistic update (for page explorer)
-   * Returns the ID of the created page
-   */
-  createNewPage: (title: string) => Promise<string>;
   /**
    * Create a new optimistic document immediately in local map
    * Returns the temporary ID for the new document
    */
   createOptimisticDocument: (title?: string) => string;
-  /**
-   * Delete a page and update selection if needed
-   */
-  deletePage: (documentId: string) => Promise<void>;
   /**
    * Duplicate an existing document
    * Returns the created document
@@ -87,7 +69,6 @@ export interface DocumentAction {
    * Load more documents (next page)
    */
   loadMoreDocuments: () => Promise<void>;
-  openAllPagesDrawer: () => void;
   /**
    * Remove a document (deletes from documents table)
    */
@@ -96,34 +77,10 @@ export interface DocumentAction {
    * Remove a temp document from local map
    */
   removeTempDocument: (tempId: string) => void;
-  /**
-   * Rename a page
-   */
-  renamePage: (documentId: string, title: string, emoji?: string) => Promise<void>;
   /**
    * Replace a temp document with real document data (for smooth UX when creating documents)
    */
   replaceTempDocumentWithReal: (tempId: string, realDocument: LobeDocument) => void;
-  /**
-   * Select or deselect a page
-   */
-  selectPage: (documentId: string) => void;
-  /**
-   * Set the ID of the page being renamed
-   */
-  setRenamingPageId: (pageId: string | null) => void;
-  /**
-   * Set search keywords
-   */
-  setSearchKeywords: (keywords: string) => void;
-  /**
-   * Set selected page ID (used for external navigation)
-   */
-  setSelectedPageId: (pageId: string | null, updateHistory?: boolean) => void;
-  /**
-   * Toggle filter to show only pages not in any library
-   */
-  setShowOnlyPagesNotInLibrary: (show: boolean) => void;
   /**
    * Update document directly (no optimistic update)
    */
@@ -147,10 +104,6 @@ export const createDocumentSlice: StateCreator<
   [],
   DocumentAction
 > = (set, get) => ({
-  closeAllPagesDrawer: () => {
-    set({ allPagesDrawerOpen: false }, false, n('closeAllPagesDrawer'));
-  },
-
   createDocument: async ({ title, content, knowledgeBaseId, parentId }) => {
     const now = Date.now();
 
@@ -201,58 +154,6 @@ export const createDocumentSlice: StateCreator<
     return folder.id;
   },
 
-  // Page explorer actions
-  createNewPage: async (title: string) => {
-    const { createOptimisticDocument, createDocument, replaceTempDocumentWithReal } = get();
-
-    // Create optimistic page immediately
-    const tempPageId = createOptimisticDocument(title);
-    set({ isCreatingNew: true, selectedPageId: tempPageId }, false, n('createNewPage/start'));
-
-    try {
-      // Create real page
-      const newPage = await createDocument({
-        content: '',
-        title,
-      });
-
-      // Convert to LobeDocument
-      const realPage: LobeDocument = {
-        content: newPage.content || '',
-        createdAt: newPage.createdAt ? new Date(newPage.createdAt) : new Date(),
-        editorData:
-          typeof newPage.editorData === 'string'
-            ? JSON.parse(newPage.editorData)
-            : newPage.editorData || null,
-        fileType: 'custom/document',
-        filename: newPage.title || title,
-        id: newPage.id,
-        metadata: newPage.metadata || {},
-        source: 'document',
-        sourceType: DocumentSourceType.EDITOR,
-        title: newPage.title || title,
-        totalCharCount: newPage.content?.length || 0,
-        totalLineCount: 0,
-        updatedAt: newPage.updatedAt ? new Date(newPage.updatedAt) : new Date(),
-      };
-
-      // Replace optimistic with real
-      replaceTempDocumentWithReal(tempPageId, realPage);
-      set({ isCreatingNew: false, selectedPageId: newPage.id }, false, n('createNewPage/success'));
-
-      // Update URL to navigate to the new page
-      updateUrl(newPage.id);
-
-      return newPage.id;
-    } catch (error) {
-      console.error('Failed to create page:', error);
-      get().removeTempDocument(tempPageId);
-      set({ isCreatingNew: false, selectedPageId: null }, false, n('createNewPage/error'));
-      updateUrl(null);
-      throw error;
-    }
-  },
-
   createOptimisticDocument: (title = 'Untitled') => {
     const { localDocumentMap } = get();
 
@@ -284,15 +185,6 @@ export const createDocumentSlice: StateCreator<
     return tempId;
   },
 
-  deletePage: async (documentId: string) => {
-    const { selectedPageId } = get();
-
-    if (selectedPageId === documentId) {
-      set({ isCreatingNew: false, selectedPageId: null }, false, n('deletePage'));
-      window.history.replaceState({}, '', '/page');
-    }
-  },
-
   duplicateDocument: async (documentId) => {
     // Fetch the source page
     const sourcePage = await documentService.getDocumentById(documentId);
@@ -512,48 +404,37 @@ export const createDocumentSlice: StateCreator<
     }
   },
 
-  openAllPagesDrawer: () => {
-    set({ allPagesDrawerOpen: true }, false, n('openAllPagesDrawer'));
-  },
-
   removeDocument: async (documentId) => {
     // Remove from local optimistic map first (optimistic update)
-    const { localDocumentMap, documents, selectedPageId } = get();
+    const { localDocumentMap, documents } = get();
     const newMap = new Map(localDocumentMap);
     newMap.delete(documentId);
 
-    // Also remove from pages array to update the list immediately
-    const newPages = documents.filter((doc) => doc.id !== documentId);
+    // Also remove from documents array to update the list immediately
+    const newDocuments = documents.filter((doc) => doc.id !== documentId);
 
-    // Clear selected page ID if the deleted page is currently selected
-    const updates: Partial<FileStore> = {
-      documents: newPages,
-      localDocumentMap: newMap,
-    };
-    if (selectedPageId === documentId) {
-      updates.selectedPageId = null;
-      updateUrl(null);
-    }
-
-    set(updates, false, n('removeDocument/optimistic'));
+    set(
+      { documents: newDocuments, localDocumentMap: newMap },
+      false,
+      n('removeDocument/optimistic'),
+    );
 
     try {
-      // Delete from pages table
+      // Delete from documents table
       await documentService.deleteDocument(documentId);
       // No need to call fetchDocuments() - optimistic update is enough
     } catch (error) {
-      console.error('Failed to delete page:', error);
-      // Restore the page in local map and pages array on error
+      console.error('Failed to delete document:', error);
+      // Restore the document in local map and documents array on error
       const restoredMap = new Map(localDocumentMap);
-      const restoreUpdates: Partial<FileStore> = {
-        documents,
-        localDocumentMap: restoredMap,
-      };
-      if (selectedPageId === documentId) {
-        restoreUpdates.selectedPageId = documentId;
-        updateUrl(documentId);
-      }
-      set(restoreUpdates, false, n('removeDocument/restore'));
+      set(
+        {
+          documents,
+          localDocumentMap: restoredMap,
+        },
+        false,
+        n('removeDocument/restore'),
+      );
       throw error;
     }
   },
@@ -565,21 +446,6 @@ export const createDocumentSlice: StateCreator<
     set({ localDocumentMap: newMap }, false, n('removeTempDocument'));
   },
 
-  renamePage: async (documentId: string, title: string, emoji?: string) => {
-    const { updateDocumentOptimistically } = get();
-
-    try {
-      await updateDocumentOptimistically(documentId, {
-        metadata: { emoji },
-        title,
-      });
-    } catch (error) {
-      console.error('Failed to rename page:', error);
-    } finally {
-      set({ renamingPageId: null }, false, n('renamePage'));
-    }
-  },
-
   replaceTempDocumentWithReal: (tempId, realPage) => {
     const { localDocumentMap } = get();
     const newMap = new Map(localDocumentMap);
@@ -593,41 +459,6 @@ export const createDocumentSlice: StateCreator<
     set({ localDocumentMap: newMap }, false, n('replaceTempDocumentWithReal'));
   },
 
-  selectPage: (documentId: string) => {
-    const { selectedPageId } = get();
-
-    if (selectedPageId === documentId) {
-      // Don't allow deselecting the current page, required from @canisminor
-      //
-      // set({ isCreatingNew: false, selectedPageId: null }, false, n('selectPage/deselect'));
-      // updateUrl(null);
-    } else {
-      // Select
-      set({ isCreatingNew: false, selectedPageId: documentId }, false, n('selectPage/select'));
-      updateUrl(documentId);
-    }
-  },
-
-  setRenamingPageId: (pageId: string | null) => {
-    set({ renamingPageId: pageId }, false, n('setRenamingPageId'));
-  },
-
-  setSearchKeywords: (keywords: string) => {
-    set({ searchKeywords: keywords }, false, n('setSearchKeywords'));
-  },
-
-  setSelectedPageId: (pageId: string | null, updateHistory = true) => {
-    set({ selectedPageId: pageId }, false, n('setSelectedPageId'));
-    if (updateHistory) {
-      const newPath = pageId ? `/page/${pageId}` : '/page';
-      window.history.replaceState({}, '', newPath);
-    }
-  },
-
-  setShowOnlyPagesNotInLibrary: (show: boolean) => {
-    set({ showOnlyPagesNotInLibrary: show }, false, n('setShowOnlyPagesNotInLibrary'));
-  },
-
   updateDocument: async (id, updates) => {
     await documentService.updateDocument({
       content: updates.content ?? undefined,

package/src/store/file/slices/document/initialState.ts

@@ -6,10 +6,6 @@ export interface DocumentQueryFilter {
 }
 
 export interface DocumentState {
-  /**
-   * whether all pages drawer is open
-   */
-  allPagesDrawerOpen: boolean;
   /**
    * current page number (0-based)
    */
@@ -30,10 +26,6 @@ export interface DocumentState {
    * whether there are more documents to load
    */
   hasMoreDocuments: boolean;
-  /**
-   * Whether currently creating a new document
-   */
-  isCreatingNew: boolean;
   /**
    * Loading state for document fetching
    */
@@ -46,37 +38,15 @@ export interface DocumentState {
    * Local optimistic document map for immediate UI updates
    */
   localDocumentMap: Map<string, LobeDocument>;
-  /**
-   * ID of the page being renamed (null if none)
-   */
-  renamingPageId: string | null;
-  /**
-   * Search keywords for filtering pages
-   */
-  searchKeywords: string;
-  /**
-   * Currently selected page ID
-   */
-  selectedPageId: string | null;
-  /**
-   * Filter to show only pages not in any library (false = show all pages)
-   */
-  showOnlyPagesNotInLibrary: boolean;
 }
 
 export const initialDocumentState: DocumentState = {
-  allPagesDrawerOpen: false,
   currentPage: 0,
   documentQueryFilter: undefined,
   documents: [],
   documentsTotal: 0,
   hasMoreDocuments: false,
-  isCreatingNew: false,
   isDocumentListLoading: false,
   isLoadingMoreDocuments: false,
   localDocumentMap: new Map(),
-  renamingPageId: null,
-  searchKeywords: '',
-  selectedPageId: null,
-  showOnlyPagesNotInLibrary: false,
 };

package/src/store/file/slices/document/selectors.ts

@@ -1,4 +1,3 @@
-import { useGlobalStore } from '@/store/global';
 import { type LobeDocument } from '@/types/document';
 
 import { type FilesStoreState } from '../../initialState';
@@ -23,51 +22,33 @@ const getDocumentById = (documentId: string | undefined) => (s: FilesStoreState)
   return localDocument || serverDocument;
 };
 
-const getFilteredPages = (s: FilesStoreState): LobeDocument[] => {
-  // Merge local optimistic map with server documents
-  const localPages = Array.from(s.localDocumentMap.values());
-  const serverPages = s.documents.filter((doc) => !s.localDocumentMap.has(doc.id));
-  const pages = [...localPages, ...serverPages];
-
-  const { searchKeywords, showOnlyPagesNotInLibrary } = s;
-
-  let result = pages;
-
-  // Filter out documents with sourceType='file'
-  result = result.filter((page: LobeDocument) => page.sourceType !== 'file');
-
-  // Filter by library membership
-  if (showOnlyPagesNotInLibrary) {
-    result = result.filter((page: LobeDocument) => {
-      // Show only pages that are NOT in any library
-      // Pages in a library have metadata.knowledgeBaseId set
-      return !page.metadata?.knowledgeBaseId;
-    });
-  }
+/**
+ * Get all documents merged from local optimistic map and server data
+ */
+const getOptimisticDocuments = (s: FilesStoreState): LobeDocument[] => {
+  // Track which documents we've added
+  const addedIds = new Set<string>();
+
+  // Create result array - start with server documents
+  const result: LobeDocument[] = s.documents.map((doc) => {
+    addedIds.add(doc.id);
+    // Check if we have a local optimistic update for this document
+    const localUpdate = s.localDocumentMap.get(doc.id);
+    // If local update exists and is newer, use it; otherwise use server version
+    if (localUpdate && new Date(localUpdate.updatedAt) >= new Date(doc.updatedAt)) {
+      return localUpdate;
+    }
+    return doc;
+  });
 
-  // Filter by search keywords
-  if (searchKeywords.trim()) {
-    const lowerKeywords = searchKeywords.toLowerCase();
-    result = result.filter((page: LobeDocument) => {
-      const content = page.content?.toLowerCase() || '';
-      const title = page.title?.toLowerCase() || '';
-      return content.includes(lowerKeywords) || title.includes(lowerKeywords);
-    });
+  // Add any optimistic documents that aren't in server list yet (e.g., newly created temp documents)
+  for (const [id, doc] of s.localDocumentMap.entries()) {
+    if (!addedIds.has(id)) {
+      result.unshift(doc); // Add new documents to the beginning
+    }
   }
 
-  // Sort by creation date (newest first)
-  return result.sort((a: LobeDocument, b: LobeDocument) => {
-    const dateA = a.createdAt ? new Date(a.createdAt).getTime() : 0;
-    const dateB = b.createdAt ? new Date(b.createdAt).getTime() : 0;
-    return dateB - dateA;
-  });
-};
-
-// Limited filtered pages for sidebar display
-const getFilteredPagesLimited = (s: FilesStoreState): LobeDocument[] => {
-  const pageSize = useGlobalStore.getState().status.pagePageSize || 20;
-  const allPages = getFilteredPages(s);
-  return allPages.slice(0, pageSize);
+  return result;
 };
 
 const hasMoreDocuments = (s: FilesStoreState): boolean => s.hasMoreDocuments;
@@ -76,25 +57,10 @@ const isLoadingMoreDocuments = (s: FilesStoreState): boolean => s.isLoadingMoreD
 
 const documentsTotal = (s: FilesStoreState): number => s.documentsTotal;
 
-// Check if filtered pages have more than displayed
-const hasMoreFilteredPages = (s: FilesStoreState): boolean => {
-  const pageSize = useGlobalStore.getState().status.pagePageSize || 20;
-  const allPages = getFilteredPages(s);
-  return allPages.length > pageSize;
-};
-
-// Get total count of filtered pages
-const filteredPagesCount = (s: FilesStoreState): number => {
-  return getFilteredPages(s).length;
-};
-
 export const documentSelectors = {
   documentsTotal,
-  filteredPagesCount,
   getDocumentById,
-  getFilteredPages,
-  getFilteredPagesLimited,
+  getOptimisticDocuments,
   hasMoreDocuments,
-  hasMoreFilteredPages,
   isLoadingMoreDocuments,
 };

package/src/store/notebook/index.ts

@@ -1,4 +1,5 @@
-/**
- * @deprecated Use `@/store/document` instead. This is a compatibility layer.
- */
-export { notebookSelectors, useDocumentStore as useNotebookStore } from '../document';
+export type { NotebookAction } from './action';
+export type { NotebookState } from './initialState';
+export { notebookSelectors } from './selectors';
+export type { NotebookStore } from './store';
+export { getNotebookStoreState, useNotebookStore } from './store';

package/src/store/page/index.ts

@@ -0,0 +1,2 @@
+export * from './selectors';
+export { getPageStoreState, type PageStore,usePageStore } from './store';

package/src/store/page/initialState.ts

@@ -0,0 +1,92 @@
+import { NavigateFunction } from 'react-router-dom';
+
+import { type LobeDocument } from '@/types/document';
+
+export interface PageQueryFilter {
+  fileTypes?: string[];
+  sourceTypes?: string[];
+}
+
+export interface PageState {
+  // ===== Selection & Navigation =====
+  /**
+   * Whether all pages drawer is open
+   */
+  allPagesDrawerOpen: boolean;
+  // ===== List Management =====
+  /**
+   * Current page number (0-based) for pagination
+   */
+  currentPage: number;
+  /**
+   * Server documents fetched from document service
+   * undefined means not yet loaded (loading state)
+   */
+  documents?: LobeDocument[];
+  /**
+   * Total count of documents
+   */
+  documentsTotal: number;
+  /**
+   * Whether there are more documents to load
+   */
+  hasMoreDocuments: boolean;
+  // ===== UI State =====
+  /**
+   * Whether currently creating a new page
+   */
+  isCreatingNew: boolean;
+  /**
+   * Loading state for pagination (load more)
+   */
+  isLoadingMoreDocuments: boolean;
+
+  navigate?: NavigateFunction;
+  /**
+   * Filters used in the last query
+   */
+  queryFilter?: PageQueryFilter;
+
+  /**
+   * ID of the page being renamed (null if none)
+   */
+  renamingPageId: string | null;
+  /**
+   * Search keywords for filtering pages
+   */
+  searchKeywords: string;
+  /**
+   * Currently selected page ID
+   */
+  selectedPageId: string | null;
+  /**
+   * Filter to show only pages not in any library
+   */
+  showOnlyPagesNotInLibrary: boolean;
+}
+
+export const initialState: PageState = {
+  // Selection & Navigation
+  allPagesDrawerOpen: false,
+
+  // List Management
+  currentPage: 0,
+
+  documents: undefined,
+
+  documentsTotal: 0,
+
+  hasMoreDocuments: false,
+
+  // UI State
+  isCreatingNew: false,
+
+  isLoadingMoreDocuments: false,
+
+  queryFilter: undefined,
+
+  renamingPageId: null,
+  searchKeywords: '',
+  selectedPageId: null,
+  showOnlyPagesNotInLibrary: false,
+};

package/src/store/page/selectors.ts

@@ -0,0 +1,5 @@
+import { listSelectors } from './slices/list';
+
+export const pageSelectors = {
+  ...listSelectors,
+};