From 267fe027f50f7cda9693dc8f87ba2ad8dc492ad2 Mon Sep 17 00:00:00 2001 From: Chris Weaver <25087905+Weves@users.noreply.github.com> Date: Fri, 30 May 2025 15:19:52 -0700 Subject: [PATCH] Fix failed docs table (#4800) * Fix initial LLM provider set up * Fix IndexAttemptErrorsModal pagination --- backend/onyx/server/documents/cc_pair.py | 6 +++--- .../admin/connector/[ccPairId]/IndexAttemptErrorsModal.tsx | 4 ++-- web/src/app/chat/ChatPage.tsx | 3 +++ web/src/app/chat/input/ChatInputBar.tsx | 6 ++++-- ...uredProviderText.tsx => UnconfiguredLlmProviderText.tsx} | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) rename web/src/components/chat/{UnconfiguredProviderText.tsx => UnconfiguredLlmProviderText.tsx} (95%) diff --git a/backend/onyx/server/documents/cc_pair.py b/backend/onyx/server/documents/cc_pair.py index ce4c826f30..ee528a1d31 100644 --- a/backend/onyx/server/documents/cc_pair.py +++ b/backend/onyx/server/documents/cc_pair.py @@ -403,7 +403,7 @@ def get_docs_sync_status( def get_cc_pair_indexing_errors( cc_pair_id: int, include_resolved: bool = Query(False), - page: int = Query(0, ge=0), + page_num: int = Query(0, ge=0), page_size: int = Query(10, ge=1, le=100), _: User = Depends(current_curator_or_admin_user), db_session: Session = Depends(get_session), @@ -413,7 +413,7 @@ def get_cc_pair_indexing_errors( Args: cc_pair_id: ID of the connector-credential pair to get errors for include_resolved: Whether to include resolved errors in the results - page: Page number for pagination, starting at 0 + page_num: Page number for pagination, starting at 0 page_size: Number of errors to return per page _: Current user, must be curator or admin db_session: Database session @@ -431,7 +431,7 @@ def get_cc_pair_indexing_errors( db_session=db_session, cc_pair_id=cc_pair_id, unresolved_only=not include_resolved, - page=page, + page=page_num, page_size=page_size, ) return PaginatedReturn( diff --git a/web/src/app/admin/connector/[ccPairId]/IndexAttemptErrorsModal.tsx b/web/src/app/admin/connector/[ccPairId]/IndexAttemptErrorsModal.tsx index dfee4a174e..427d7f7538 100644 --- a/web/src/app/admin/connector/[ccPairId]/IndexAttemptErrorsModal.tsx +++ b/web/src/app/admin/connector/[ccPairId]/IndexAttemptErrorsModal.tsx @@ -114,8 +114,8 @@ export default function IndexAttemptErrorsModal({
onPageChange(page - 1)} + currentPage={currentPage} + onPageChange={(page) => onPageChange(page)} />
)} diff --git a/web/src/app/chat/ChatPage.tsx b/web/src/app/chat/ChatPage.tsx index 67458b917b..18adfe8416 100644 --- a/web/src/app/chat/ChatPage.tsx +++ b/web/src/app/chat/ChatPage.tsx @@ -136,6 +136,7 @@ import { import { ChatSearchModal } from "./chat_search/ChatSearchModal"; import { ErrorBanner } from "./message/Resubmit"; import MinimalMarkdown from "@/components/chat/MinimalMarkdown"; +import { WelcomeModal } from "@/components/initialSetup/welcome/WelcomeModal"; const TEMP_USER_MESSAGE_ID = -1; const TEMP_ASSISTANT_MESSAGE_ID = -2; @@ -2327,6 +2328,8 @@ export function ChatPage({ /> )} + {shouldShowWelcomeModal && } + {/* ChatPopup is a custom popup that displays a admin-specified message on initial user visit. Only used in the EE version of the app. */} {popup} diff --git a/web/src/app/chat/input/ChatInputBar.tsx b/web/src/app/chat/input/ChatInputBar.tsx index 5b05240928..2c3d1598fa 100644 --- a/web/src/app/chat/input/ChatInputBar.tsx +++ b/web/src/app/chat/input/ChatInputBar.tsx @@ -25,7 +25,7 @@ import { } from "@/components/ui/tooltip"; import { Hoverable } from "@/components/Hoverable"; import { ChatState } from "../types"; -import UnconfiguredProviderText from "@/components/chat/UnconfiguredProviderText"; +import { UnconfiguredLlmProviderText } from "@/components/chat/UnconfiguredLlmProviderText"; import { useAssistants } from "@/components/context/AssistantsContext"; import { CalendarIcon, TagIcon, XIcon, FolderIcon } from "lucide-react"; import { FilterPopup } from "@/components/search/filtering/FilterPopup"; @@ -582,7 +582,9 @@ export function ChatInputBar({ )} - +