k

quick nit
add back package.json
2026-02-21 01:35:46 +00:00 · 2025-04-01 14:02:05 -07:00 · 2025-04-01 14:01:07 -07:00 · 2025-04-01 11:48:36 -07:00 · 2025-04-01 11:48:04 -07:00 · 2025-04-01 11:47:45 -07:00
30 changed files with 144 additions and 3471 deletions
--- a/backend/alembic/versions/e995bdf0d6f7_max_length_for_instruction_system_prompt.py
+++ b/backend/alembic/versions/e995bdf0d6f7_max_length_for_instruction_system_prompt.py
@@ -1,52 +0,0 @@
-"""max_length_for_instruction_system_prompt
-
-Revision ID: e995bdf0d6f7
-Revises: 8e1ac4f39a9f
-Create Date: 2025-04-01 18:32:45.123456
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = "e995bdf0d6f7"
-down_revision = "8e1ac4f39a9f"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    # Alter system_prompt and task_prompt columns to have a maximum length of 8000 characters
-    op.alter_column(
-        "prompt",
-        "system_prompt",
-        existing_type=sa.Text(),
-        type_=sa.String(8000),
-        existing_nullable=False,
-    )
-    op.alter_column(
-        "prompt",
-        "task_prompt",
-        existing_type=sa.Text(),
-        type_=sa.String(8000),
-        existing_nullable=False,
-    )
-
-
-def downgrade() -> None:
-    # Revert system_prompt and task_prompt columns back to Text type
-    op.alter_column(
-        "prompt",
-        "system_prompt",
-        existing_type=sa.String(8000),
-        type_=sa.Text(),
-        existing_nullable=False,
-    )
-    op.alter_column(
-        "prompt",
-        "task_prompt",
-        existing_type=sa.String(8000),
-        type_=sa.Text(),
-        existing_nullable=False,
-    )
--- a/backend/ee/onyx/server/saml.py
+++ b/backend/ee/onyx/server/saml.py
@@ -36,9 +36,6 @@ from onyx.utils.logger import setup_logger
 logger = setup_logger()
 router = APIRouter(prefix="/auth/saml")

-# Define non-authenticated user roles that should be re-created during SAML login
-NON_AUTHENTICATED_ROLES = {UserRole.SLACK_USER, UserRole.EXT_PERM_USER}
-

 async def upsert_saml_user(email: str) -> User:
    logger.debug(f"Attempting to upsert SAML user with email: {email}")
@@ -54,7 +51,7 @@ async def upsert_saml_user(email: str) -> User:
                try:
                    user = await user_manager.get_by_email(email)
                    # If user has a non-authenticated role, treat as non-existent
-                    if user.role in NON_AUTHENTICATED_ROLES:
+                    if not user.role.is_web_login():
                        raise exceptions.UserNotExists()
                    return user
                except exceptions.UserNotExists:
--- a/backend/onyx/auth/email_utils.py
+++ b/backend/onyx/auth/email_utils.py
@@ -23,6 +23,7 @@ from onyx.utils.url import add_url_params
 from onyx.utils.variable_functionality import fetch_versioned_implementation
 from shared_configs.configs import MULTI_TENANT

+
 HTML_EMAIL_TEMPLATE = """\
 <!DOCTYPE html>
 <html lang="en">
--- a/backend/onyx/background/celery/tasks/doc_permission_syncing/tasks.py
+++ b/backend/onyx/background/celery/tasks/doc_permission_syncing/tasks.py
@@ -886,11 +886,8 @@ def monitor_ccpair_permissions_taskset(
        record_type=RecordType.PERMISSION_SYNC_PROGRESS,
        data={
            "cc_pair_id": cc_pair_id,
-            "id": payload.id if payload else None,
-            "total_docs": initial if initial is not None else 0,
-            "remaining_docs": remaining,
-            "synced_docs": (initial - remaining) if initial is not None else 0,
-            "is_complete": remaining == 0,
+            "total_docs_synced": initial if initial is not None else 0,
+            "remaining_docs_to_sync": remaining,
        },
        tenant_id=tenant_id,
    )
@@ -906,6 +903,13 @@ def monitor_ccpair_permissions_taskset(
        f"num_synced={initial}"
    )

+    # Add telemetry for permission syncing complete
+    optional_telemetry(
+        record_type=RecordType.PERMISSION_SYNC_COMPLETE,
+        data={"cc_pair_id": cc_pair_id},
+        tenant_id=tenant_id,
+    )
+
    update_sync_record_status(
        db_session=db_session,
        entity_id=cc_pair_id,
--- a/backend/onyx/background/indexing/run_indexing.py
+++ b/backend/onyx/background/indexing/run_indexing.py
@@ -56,7 +56,6 @@ from onyx.indexing.indexing_pipeline import build_indexing_pipeline
 from onyx.natural_language_processing.search_nlp_models import (
    InformationContentClassificationModel,
 )
-from onyx.redis.redis_connector import RedisConnector
 from onyx.utils.logger import setup_logger
 from onyx.utils.logger import TaskAttemptSingleton
 from onyx.utils.telemetry import create_milestone_and_report
@@ -578,11 +577,8 @@ def _run_indexing(
                    data={
                        "index_attempt_id": index_attempt_id,
                        "cc_pair_id": ctx.cc_pair_id,
-                        "connector_id": ctx.connector_id,
-                        "credential_id": ctx.credential_id,
-                        "total_docs_indexed": document_count,
-                        "total_chunks": chunk_count,
-                        "batch_num": batch_num,
+                        "current_docs_indexed": document_count,
+                        "current_chunks_indexed": chunk_count,
                        "source": ctx.source.value,
                    },
                    tenant_id=tenant_id,
@@ -603,26 +599,15 @@ def _run_indexing(
                    checkpoint=checkpoint,
                )

-        # Add telemetry for completed indexing
-        redis_connector = RedisConnector(tenant_id, ctx.cc_pair_id)
-        redis_connector_index = redis_connector.new_index(
-            index_attempt_start.search_settings_id
-        )
-        final_progress = redis_connector_index.get_progress() or 0
-
        optional_telemetry(
            record_type=RecordType.INDEXING_COMPLETE,
            data={
                "index_attempt_id": index_attempt_id,
                "cc_pair_id": ctx.cc_pair_id,
-                "connector_id": ctx.connector_id,
-                "credential_id": ctx.credential_id,
                "total_docs_indexed": document_count,
                "total_chunks": chunk_count,
-                "batch_count": batch_num,
                "time_elapsed_seconds": time.monotonic() - start_time,
                "source": ctx.source.value,
-                "redis_progress": final_progress,
            },
            tenant_id=tenant_id,
        )
--- a/backend/onyx/db/index_attempt.py
+++ b/backend/onyx/db/index_attempt.py
@@ -217,7 +217,6 @@ def mark_attempt_in_progress(
                "index_attempt_id": index_attempt.id,
                "status": IndexingStatus.IN_PROGRESS.value,
                "cc_pair_id": index_attempt.connector_credential_pair_id,
-                "search_settings_id": index_attempt.search_settings_id,
            },
        )
    except Exception:
@@ -246,9 +245,6 @@ def mark_attempt_succeeded(
                "index_attempt_id": index_attempt_id,
                "status": IndexingStatus.SUCCESS.value,
                "cc_pair_id": attempt.connector_credential_pair_id,
-                "search_settings_id": attempt.search_settings_id,
-                "total_docs_indexed": attempt.total_docs_indexed,
-                "new_docs_indexed": attempt.new_docs_indexed,
            },
        )
    except Exception:
@@ -277,9 +273,6 @@ def mark_attempt_partially_succeeded(
                "index_attempt_id": index_attempt_id,
                "status": IndexingStatus.COMPLETED_WITH_ERRORS.value,
                "cc_pair_id": attempt.connector_credential_pair_id,
-                "search_settings_id": attempt.search_settings_id,
-                "total_docs_indexed": attempt.total_docs_indexed,
-                "new_docs_indexed": attempt.new_docs_indexed,
            },
        )
    except Exception:
@@ -312,10 +305,6 @@ def mark_attempt_canceled(
                "index_attempt_id": index_attempt_id,
                "status": IndexingStatus.CANCELED.value,
                "cc_pair_id": attempt.connector_credential_pair_id,
-                "search_settings_id": attempt.search_settings_id,
-                "reason": reason,
-                "total_docs_indexed": attempt.total_docs_indexed,
-                "new_docs_indexed": attempt.new_docs_indexed,
            },
        )
    except Exception:
@@ -350,10 +339,6 @@ def mark_attempt_failed(
                "index_attempt_id": index_attempt_id,
                "status": IndexingStatus.FAILED.value,
                "cc_pair_id": attempt.connector_credential_pair_id,
-                "search_settings_id": attempt.search_settings_id,
-                "reason": failure_reason,
-                "total_docs_indexed": attempt.total_docs_indexed,
-                "new_docs_indexed": attempt.new_docs_indexed,
            },
        )
    except Exception:
--- a/backend/onyx/utils/telemetry.py
+++ b/backend/onyx/utils/telemetry.py
@@ -39,6 +39,7 @@ class RecordType(str, Enum):
    INDEXING_PROGRESS = "indexing_progress"
    INDEXING_COMPLETE = "indexing_complete"
    PERMISSION_SYNC_PROGRESS = "permission_sync_progress"
+    PERMISSION_SYNC_COMPLETE = "permission_sync_complete"
    INDEX_ATTEMPT_STATUS = "index_attempt_status"


--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -42,7 +42,6 @@ ENV NEXT_PUBLIC_DISABLE_STREAMING=${NEXT_PUBLIC_DISABLE_STREAMING}
 ARG NEXT_PUBLIC_NEW_CHAT_DIRECTS_TO_SAME_PERSONA
 ENV NEXT_PUBLIC_NEW_CHAT_DIRECTS_TO_SAME_PERSONA=${NEXT_PUBLIC_NEW_CHAT_DIRECTS_TO_SAME_PERSONA}

-# allow user to specify custom feedback options
 ARG NEXT_PUBLIC_POSITIVE_PREDEFINED_FEEDBACK_OPTIONS
 ENV NEXT_PUBLIC_POSITIVE_PREDEFINED_FEEDBACK_OPTIONS=${NEXT_PUBLIC_POSITIVE_PREDEFINED_FEEDBACK_OPTIONS}

--- a/web/package-lock.json
+++ b/web/package-lock.json
--- a/web/package.json
+++ b/web/package.json
@@ -93,11 +93,12 @@
  },
  "devDependencies": {
    "@chromatic-com/playwright": "^0.10.2",
+    "@playwright/test": "^1.39.0",
    "@tailwindcss/typography": "^0.5.10",
    "@types/chrome": "^0.0.287",
    "@types/jest": "^29.5.14",
    "chromatic": "^11.25.2",
-    "eslint": "^8.48.0",
+    "eslint": "^8.57.1",
    "eslint-config-next": "^14.1.0",
    "jest": "^29.7.0",
    "prettier": "2.8.8",
--- a/web/src/app/PostHogPageView.tsx
+++ b/web/src/app/PostHogPageView.tsx
@@ -17,7 +17,7 @@ export default function PostHogPageView(): null {
    // Track pageviews
    if (pathname) {
      let url = window.origin + pathname;
-      if (searchParams.toString()) {
+      if (searchParams?.toString()) {
        url = url + `?${searchParams.toString()}`;
      }
      posthog.capture("$pageview", {
--- a/web/src/app/admin/assistants/AssistantEditor.tsx
+++ b/web/src/app/admin/assistants/AssistantEditor.tsx
@@ -149,7 +149,7 @@ export function AssistantEditor({
  const { refreshAssistants, isImageGenerationAvailable } = useAssistants();
  const router = useRouter();
  const searchParams = useSearchParams();
-  const isAdminPage = searchParams.get("admin") === "true";
+  const isAdminPage = searchParams?.get("admin") === "true";

  const { popup, setPopup } = usePopup();
  const { labels, refreshLabels, createLabel, updateLabel, deleteLabel } =
--- a/web/src/app/admin/connectors/[connector]/oauth/callback/page.tsx
+++ b/web/src/app/admin/connectors/[connector]/oauth/callback/page.tsx
@@ -26,8 +26,8 @@ export default function OAuthCallbackPage() {
  );

  // Extract query parameters
-  const code = searchParams.get("code");
-  const state = searchParams.get("state");
+  const code = searchParams?.get("code");
+  const state = searchParams?.get("state");

  const pathname = usePathname();
  const connector = pathname?.split("/")[3];
--- a/web/src/app/admin/connectors/[connector]/oauth/finalize/page.tsx
+++ b/web/src/app/admin/connectors/[connector]/oauth/finalize/page.tsx
@@ -4,7 +4,6 @@ import { useEffect, useState } from "react";
 import { usePathname, useRouter, useSearchParams } from "next/navigation";
 import { AdminPageTitle } from "@/components/admin/Title";
 import { Button } from "@/components/ui/button";
-import Title from "@/components/ui/title";
 import { KeyIcon } from "@/components/icons/icons";
 import { getSourceMetadata, isValidSource } from "@/lib/sources";
 import { ConfluenceAccessibleResource, ValidSources } from "@/lib/types";
@@ -74,7 +73,7 @@ export default function OAuthFinalizePage() {
  >([]);

  // Extract query parameters
-  const credentialParam = searchParams.get("credential");
+  const credentialParam = searchParams?.get("credential");
  const credential = credentialParam ? parseInt(credentialParam, 10) : NaN;
  const pathname = usePathname();
  const connector = pathname?.split("/")[3];
@@ -85,7 +84,7 @@ export default function OAuthFinalizePage() {
      // connector (url segment)= "google-drive"
      // sourceType (for looking up metadata) = "google_drive"

-      if (isNaN(credential)) {
+      if (isNaN(credential) || !connector) {
        setStatusMessage("Improperly formed OAuth finalization request.");
        setStatusDetails("Invalid or missing credential id.");
        setIsError(true);
--- a/web/src/app/auth/reset-password/page.tsx
+++ b/web/src/app/auth/reset-password/page.tsx
@@ -23,8 +23,8 @@ const ResetPasswordPage: React.FC = () => {
  const { popup, setPopup } = usePopup();
  const [isWorking, setIsWorking] = useState(false);
  const searchParams = useSearchParams();
-  const token = searchParams.get("token");
-  const tenantId = searchParams.get(TENANT_ID_COOKIE_NAME);
+  const token = searchParams?.get("token");
+  const tenantId = searchParams?.get(TENANT_ID_COOKIE_NAME);
  // Keep search param same name as cookie for simplicity

  useEffect(() => {
--- a/web/src/app/auth/verify-email/Verify.tsx
+++ b/web/src/app/auth/verify-email/Verify.tsx
@@ -15,9 +15,9 @@ export function Verify({ user }: { user: User | null }) {
  const [error, setError] = useState("");

  const verify = useCallback(async () => {
-    const token = searchParams.get("token");
+    const token = searchParams?.get("token");
    const firstUser =
-      searchParams.get("first_user") && NEXT_PUBLIC_CLOUD_ENABLED;
+      searchParams?.get("first_user") && NEXT_PUBLIC_CLOUD_ENABLED;
    if (!token) {
      setError(
        "Missing verification token. Try requesting a new verification email."
--- a/web/src/app/chat/ChatPage.tsx
+++ b/web/src/app/chat/ChatPage.tsx
@@ -196,7 +196,9 @@ export function ChatPage({
    setCurrentMessageFiles,
  } = useDocumentsContext();

-  const defaultAssistantIdRaw = searchParams.get(SEARCH_PARAM_NAMES.PERSONA_ID);
+  const defaultAssistantIdRaw = searchParams?.get(
+    SEARCH_PARAM_NAMES.PERSONA_ID
+  );
  const defaultAssistantId = defaultAssistantIdRaw
    ? parseInt(defaultAssistantIdRaw)
    : undefined;
@@ -252,8 +254,8 @@ export function ChatPage({
  );

  const { user, isAdmin } = useUser();
-  const slackChatId = searchParams.get("slackChatId");
-  const existingChatIdRaw = searchParams.get("chatId");
+  const slackChatId = searchParams?.get("slackChatId");
+  const existingChatIdRaw = searchParams?.get("chatId");

  const [showHistorySidebar, setShowHistorySidebar] = useState(false);

@@ -275,7 +277,7 @@ export function ChatPage({

  const processSearchParamsAndSubmitMessage = (searchParamsString: string) => {
    const newSearchParams = new URLSearchParams(searchParamsString);
-    const message = newSearchParams.get("user-prompt");
+    const message = newSearchParams?.get("user-prompt");

    filterManager.buildFiltersFromQueryString(
      newSearchParams.toString(),
@@ -284,7 +286,7 @@ export function ChatPage({
      tags
    );

-    const fileDescriptorString = newSearchParams.get(SEARCH_PARAM_NAMES.FILES);
+    const fileDescriptorString = newSearchParams?.get(SEARCH_PARAM_NAMES.FILES);
    const overrideFileDescriptors: FileDescriptor[] = fileDescriptorString
      ? JSON.parse(decodeURIComponent(fileDescriptorString))
      : [];
@@ -324,7 +326,7 @@ export function ChatPage({
        : undefined
  );
  // Gather default temperature settings
-  const search_param_temperature = searchParams.get(
+  const search_param_temperature = searchParams?.get(
    SEARCH_PARAM_NAMES.TEMPERATURE
  );

@@ -551,7 +553,7 @@ export function ChatPage({
      if (
        newMessageHistory.length === 1 &&
        !submitOnLoadPerformed.current &&
-        searchParams.get(SEARCH_PARAM_NAMES.SEEDED) === "true"
+        searchParams?.get(SEARCH_PARAM_NAMES.SEEDED) === "true"
      ) {
        submitOnLoadPerformed.current = true;
        const seededMessage = newMessageHistory[0].message;
@@ -572,11 +574,11 @@ export function ChatPage({

    initialSessionFetch();
    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [existingChatSessionId, searchParams.get(SEARCH_PARAM_NAMES.PERSONA_ID)]);
+  }, [existingChatSessionId, searchParams?.get(SEARCH_PARAM_NAMES.PERSONA_ID)]);

  useEffect(() => {
-    const userFolderId = searchParams.get(SEARCH_PARAM_NAMES.USER_FOLDER_ID);
-    const allMyDocuments = searchParams.get(
+    const userFolderId = searchParams?.get(SEARCH_PARAM_NAMES.USER_FOLDER_ID);
+    const allMyDocuments = searchParams?.get(
      SEARCH_PARAM_NAMES.ALL_MY_DOCUMENTS
    );

@@ -599,14 +601,14 @@ export function ChatPage({
    }
  }, [
    userFolders,
-    searchParams.get(SEARCH_PARAM_NAMES.USER_FOLDER_ID),
-    searchParams.get(SEARCH_PARAM_NAMES.ALL_MY_DOCUMENTS),
+    searchParams?.get(SEARCH_PARAM_NAMES.USER_FOLDER_ID),
+    searchParams?.get(SEARCH_PARAM_NAMES.ALL_MY_DOCUMENTS),
    addSelectedFolder,
    clearSelectedItems,
  ]);

  const [message, setMessage] = useState(
-    searchParams.get(SEARCH_PARAM_NAMES.USER_PROMPT) || ""
+    searchParams?.get(SEARCH_PARAM_NAMES.USER_PROMPT) || ""
  );

  const [completeMessageDetail, setCompleteMessageDetail] = useState<
@@ -1048,7 +1050,7 @@ export function ChatPage({

  // Equivalent to `loadNewPageLogic`
  useEffect(() => {
-    if (searchParams.get(SEARCH_PARAM_NAMES.SEND_ON_LOAD)) {
+    if (searchParams?.get(SEARCH_PARAM_NAMES.SEND_ON_LOAD)) {
      processSearchParamsAndSubmitMessage(searchParams.toString());
    }
  }, [searchParams, router]);
@@ -1231,7 +1233,7 @@ export function ChatPage({
    const isNewSession = chatSessionIdRef.current === null;

    const searchParamBasedChatSessionName =
-      searchParams.get(SEARCH_PARAM_NAMES.TITLE) || null;
+      searchParams?.get(SEARCH_PARAM_NAMES.TITLE) || null;

    if (isNewSession) {
      currChatSessionId = await createChatSession(
@@ -1409,11 +1411,11 @@ export function ChatPage({
        modelVersion:
          modelOverride?.modelName ||
          llmManager.currentLlm.modelName ||
-          searchParams.get(SEARCH_PARAM_NAMES.MODEL_VERSION) ||
+          searchParams?.get(SEARCH_PARAM_NAMES.MODEL_VERSION) ||
          undefined,
        temperature: llmManager.temperature || undefined,
        systemPromptOverride:
-          searchParams.get(SEARCH_PARAM_NAMES.SYSTEM_PROMPT) || undefined,
+          searchParams?.get(SEARCH_PARAM_NAMES.SYSTEM_PROMPT) || undefined,
        useExistingUserMessage: isSeededChat,
        useLanggraph:
          settings?.settings.pro_search_enabled &&
--- a/web/src/app/chat/lib.tsx
+++ b/web/src/app/chat/lib.tsx
@@ -668,7 +668,7 @@ const PARAMS_TO_SKIP = [
 ];

 export function buildChatUrl(
-  existingSearchParams: ReadonlyURLSearchParams,
+  existingSearchParams: ReadonlyURLSearchParams | null,
  chatSessionId: string | null,
  personaId: number | null,
  search?: boolean
@@ -685,7 +685,7 @@ export function buildChatUrl(
    finalSearchParams.push(`${SEARCH_PARAM_NAMES.PERSONA_ID}=${personaId}`);
  }

-  existingSearchParams.forEach((value, key) => {
+  existingSearchParams?.forEach((value, key) => {
    if (!PARAMS_TO_SKIP.includes(key)) {
      finalSearchParams.push(`${key}=${value}`);
    }
@@ -719,7 +719,7 @@ export async function uploadFilesForChat(
  return [responseJson.files as FileDescriptor[], null];
 }

-export async function useScrollonStream({
+export function useScrollonStream({
  chatState,
  scrollableDivRef,
  scrollDist,
@@ -817,5 +817,5 @@ export async function useScrollonStream({
        });
      }
    }
-  }, [chatState, distance, scrollDist, scrollableDivRef]);
+  }, [chatState, distance, scrollDist, scrollableDivRef, enableAutoScroll]);
 }
--- a/web/src/app/chat/searchParams.ts
+++ b/web/src/app/chat/searchParams.ts
@@ -23,8 +23,10 @@ export const SEARCH_PARAM_NAMES = {
  SEND_ON_LOAD: "send-on-load",
 };

-export function shouldSubmitOnLoad(searchParams: ReadonlyURLSearchParams) {
-  const rawSubmitOnLoad = searchParams.get(SEARCH_PARAM_NAMES.SUBMIT_ON_LOAD);
+export function shouldSubmitOnLoad(
+  searchParams: ReadonlyURLSearchParams | null
+) {
+  const rawSubmitOnLoad = searchParams?.get(SEARCH_PARAM_NAMES.SUBMIT_ON_LOAD);
  if (rawSubmitOnLoad === "true" || rawSubmitOnLoad === "1") {
    return true;
  }
--- a/web/src/components/UserDropdown.tsx
+++ b/web/src/components/UserDropdown.tsx
@@ -104,7 +104,7 @@ export function UserDropdown({

      // Construct the current URL
      const currentUrl = `${pathname}${
-        searchParams.toString() ? `?${searchParams.toString()}` : ""
+        searchParams?.toString() ? `?${searchParams.toString()}` : ""
      }`;

      // Encode the current URL to use as a redirect parameter
--- a/web/src/components/admin/ClientLayout.tsx
+++ b/web/src/components/admin/ClientLayout.tsx
@@ -59,8 +59,8 @@ export function ClientLayout({
  const { llmProviders } = useChatContext();
  const { popup, setPopup } = usePopup();
  if (
-    pathname.startsWith("/admin/connectors") ||
-    pathname.startsWith("/admin/embeddings")
+    (pathname && pathname.startsWith("/admin/connectors")) ||
+    (pathname && pathname.startsWith("/admin/embeddings"))
  ) {
    return <>{children}</>;
  }
--- a/web/src/components/context/ChatContext.tsx
+++ b/web/src/components/context/ChatContext.tsx
@@ -76,7 +76,7 @@ export const ChatProvider: React.FC<{
      const { sessions } = await response.json();
      setChatSessions(sessions);

-      const currentSessionId = searchParams.get("chatId");
+      const currentSessionId = searchParams?.get("chatId");
      if (
        currentSessionId &&
        !sessions.some(
--- a/web/src/components/context/EmbeddingContext.tsx
+++ b/web/src/components/context/EmbeddingContext.tsx
@@ -34,7 +34,7 @@ export const EmbeddingFormProvider: React.FC<{
  const pathname = usePathname();

  // Initialize formStep based on the URL parameter
-  const initialStep = parseInt(searchParams.get("step") || "0", 10);
+  const initialStep = parseInt(searchParams?.get("step") || "0", 10);
  const [formStep, setFormStep] = useState(initialStep);
  const [formValues, setFormValues] = useState<Record<string, any>>({});

@@ -56,8 +56,10 @@ export const EmbeddingFormProvider: React.FC<{

  useEffect(() => {
    // Update URL when formStep changes
-    const updatedSearchParams = new URLSearchParams(searchParams.toString());
-    const existingStep = updatedSearchParams.get("step");
+    const updatedSearchParams = new URLSearchParams(
+      searchParams?.toString() || ""
+    );
+    const existingStep = updatedSearchParams?.get("step");
    updatedSearchParams.set("step", formStep.toString());
    const newUrl = `${pathname}?${updatedSearchParams.toString()}`;

@@ -70,7 +72,7 @@ export const EmbeddingFormProvider: React.FC<{

  // Update formStep when URL changes
  useEffect(() => {
-    const stepFromUrl = parseInt(searchParams.get("step") || "0", 10);
+    const stepFromUrl = parseInt(searchParams?.get("step") || "0", 10);
    if (stepFromUrl !== formStep) {
      setFormStep(stepFromUrl);
    }
--- a/web/src/components/context/FormContext.tsx
+++ b/web/src/components/context/FormContext.tsx
@@ -34,7 +34,7 @@ export const FormProvider: React.FC<{
  const pathname = usePathname();

  // Initialize formStep based on the URL parameter
-  const initialStep = parseInt(searchParams.get("step") || "0", 10);
+  const initialStep = parseInt(searchParams?.get("step") || "0", 10);
  const [formStep, setFormStep] = useState(initialStep);
  const [formValues, setFormValues] = useState<Record<string, any>>({});

@@ -56,8 +56,10 @@ export const FormProvider: React.FC<{

  useEffect(() => {
    // Update URL when formStep changes
-    const updatedSearchParams = new URLSearchParams(searchParams.toString());
-    const existingStep = updatedSearchParams.get("step");
+    const updatedSearchParams = new URLSearchParams(
+      searchParams?.toString() || ""
+    );
+    const existingStep = updatedSearchParams?.get("step");
    updatedSearchParams.set("step", formStep.toString());
    const newUrl = `${pathname}?${updatedSearchParams.toString()}`;

@@ -69,7 +71,7 @@ export const FormProvider: React.FC<{
  }, [formStep, router, pathname, searchParams]);

  useEffect(() => {
-    const stepFromUrl = parseInt(searchParams.get("step") || "0", 10);
+    const stepFromUrl = parseInt(searchParams?.get("step") || "0", 10);
    if (stepFromUrl !== formStep) {
      setFormStep(stepFromUrl);
    }
--- a/web/src/components/health/healthcheck.tsx
+++ b/web/src/components/health/healthcheck.tsx
@@ -35,7 +35,7 @@ export const HealthCheckBanner = () => {
  useEffect(() => {
    if (userError && userError.status === 403) {
      logout().then(() => {
-        if (!pathname.includes("/auth")) {
+        if (!pathname?.includes("/auth")) {
          setShowLoggedOutModal(true);
        }
      });
@@ -61,7 +61,7 @@ export const HealthCheckBanner = () => {
      expirationTimeoutRef.current = setTimeout(() => {
        setExpired(true);

-        if (!pathname.includes("/auth")) {
+        if (!pathname?.includes("/auth")) {
          setShowLoggedOutModal(true);
        }
      }, timeUntilExpire);
@@ -205,7 +205,7 @@ export const HealthCheckBanner = () => {
  }

  if (error instanceof RedirectError || expired) {
-    if (!pathname.includes("/auth")) {
+    if (!pathname?.includes("/auth")) {
      setShowLoggedOutModal(true);
    }
    return null;
--- a/web/src/components/initialSetup/welcome/WelcomeModal.tsx
+++ b/web/src/components/initialSetup/welcome/WelcomeModal.tsx
@@ -19,12 +19,12 @@ function setWelcomeFlowComplete() {
  Cookies.set(COMPLETED_WELCOME_FLOW_COOKIE, "true", { expires: 365 });
 }

-export function _CompletedWelcomeFlowDummyComponent() {
+export function CompletedWelcomeFlowDummyComponent() {
  setWelcomeFlowComplete();
  return null;
 }

-export function _WelcomeModal({ user }: { user: User | null }) {
+export function WelcomeModal({ user }: { user: User | null }) {
  const router = useRouter();

  const [providerOptions, setProviderOptions] = useState<
--- a/web/src/components/initialSetup/welcome/WelcomeModalWrapper.tsx
+++ b/web/src/components/initialSetup/welcome/WelcomeModalWrapper.tsx
@@ -1,6 +1,6 @@
 import {
-  _CompletedWelcomeFlowDummyComponent,
-  _WelcomeModal,
+  CompletedWelcomeFlowDummyComponent,
+  WelcomeModal as WelcomeModalComponent,
 } from "./WelcomeModal";
 import { COMPLETED_WELCOME_FLOW_COOKIE } from "./constants";
 import { User } from "@/lib/types";
@@ -24,8 +24,8 @@ export function WelcomeModal({
 }) {
  const hasCompletedWelcomeFlow = hasCompletedWelcomeFlowSS(requestCookies);
  if (hasCompletedWelcomeFlow) {
-    return <_CompletedWelcomeFlowDummyComponent />;
+    return <CompletedWelcomeFlowDummyComponent />;
  }

-  return <_WelcomeModal user={user} />;
+  return <WelcomeModalComponent user={user} />;
 }
--- a/web/src/components/modals/NewTeamModal.tsx
+++ b/web/src/components/modals/NewTeamModal.tsx
@@ -31,13 +31,13 @@ export function NewTeamModal() {
  const { setPopup } = usePopup();

  useEffect(() => {
-    const hasNewTeamParam = searchParams.has("new_team");
+    const hasNewTeamParam = searchParams?.has("new_team");
    if (hasNewTeamParam) {
      setShowNewTeamModal(true);
      fetchTenantInfo();

      // Remove the new_team parameter from the URL without page reload
-      const newParams = new URLSearchParams(searchParams.toString());
+      const newParams = new URLSearchParams(searchParams?.toString() || "");
      newParams.delete("new_team");
      const newUrl =
        window.location.pathname +
--- a/web/src/components/popup/PopupFromQuery.tsx
+++ b/web/src/components/popup/PopupFromQuery.tsx
@@ -16,7 +16,7 @@ export const usePopupFromQuery = (messages: PopupMessages) => {
    const searchParams = new URLSearchParams(window.location.search);

    // Get the value for search param with key "message"
-    const messageValue = searchParams.get("message");
+    const messageValue = searchParams?.get("message");

    // Check if any key from messages object is present in search params
    if (messageValue && messageValue in messages) {
--- a/web/src/hooks/usePaginatedFetch.tsx
+++ b/web/src/hooks/usePaginatedFetch.tsx
@@ -148,7 +148,7 @@ function usePaginatedFetch<T extends PaginatedType>({
  // Updates the URL with the current page number
  const updatePageUrl = useCallback(
    (page: number) => {
-      if (currentPath) {
+      if (currentPath && searchParams) {
        const params = new URLSearchParams(searchParams);
        params.set("page", page.toString());
        router.replace(`${currentPath}?${params.toString()}`, {
Author	SHA1	Message	Date
pablonyx	de42d8b423	k	2025-04-01 14:02:05 -07:00
pablonyx	76b7461c05	quick nit	2025-04-01 14:01:07 -07:00
pablonyx	812dae6ac7	add back package.json	2025-04-01 11:48:36 -07:00
pablonyx	ecc82cd49c	k	2025-04-01 11:48:04 -07:00
pablonyx	9ed6153996	make ruff happy	2025-04-01 11:47:45 -07:00
pablonyx	f541e16306	add telemetry	2025-04-01 11:47:45 -07:00
pablonyx	f055cbcbad	Very minor auth standardization (#4400 )	2025-04-01 11:46:49 -07:00