minor updates to welcome flow

onyx-dot-app · Oct 27, 2024 · 623f651 · 623f651
1 parent c75c156
commit 623f651
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/web/src/app/chat/ChatPage.tsx b/web/src/app/chat/ChatPage.tsx
@@ -135,7 +135,9 @@ export function ChatPage({
 
   const { assistants: availableAssistants, finalAssistants } = useAssistants();
 
-  const [showApiKeyModal, setShowApiKeyModal] = useState(true);
+  const [showApiKeyModal, setShowApiKeyModal] = useState(
+    !shouldShowWelcomeModal
+  );
 
   const { user, isAdmin, isLoadingUser } = useUser();
 

diff --git a/web/src/app/search/page.tsx b/web/src/app/search/page.tsx
@@ -32,7 +32,10 @@ import { fetchLLMProvidersSS } from "@/lib/llm/fetchLLMs";
 import { LLMProviderDescriptor } from "../admin/configuration/llm/interfaces";
 import { AssistantsProvider } from "@/components/context/AssistantsContext";
 import { headers } from "next/headers";
-import { hasCompletedWelcomeFlowSS } from "@/components/initialSetup/welcome/WelcomeModalWrapper";
+import {
+  hasCompletedWelcomeFlowSS,
+  WelcomeModal,
+} from "@/components/initialSetup/welcome/WelcomeModalWrapper";
 
 export default async function Home({
   searchParams,
@@ -180,6 +183,7 @@ export default async function Home({
     <>
       <HealthCheckBanner />
       <InstantSSRAutoRefresh />
+      {shouldShowWelcomeModal && <WelcomeModal user={user} />}
       {/* ChatPopup is a custom popup that displays a admin-specified message on initial user visit. 
       Only used in the EE version of the app. */}
       <ChatPopup />

diff --git a/web/src/components/initialSetup/welcome/WelcomeModal.tsx b/web/src/components/initialSetup/welcome/WelcomeModal.tsx
@@ -58,6 +58,10 @@ export function _WelcomeModal({ user }: { user: User | null }) {
       {popup}
 
       <Modal
+        onOutsideClick={() => {
+          setWelcomeFlowComplete();
+          router.refresh();
+        }}
         title={"Welcome to Danswer!"}
         width="w-full max-h-[900px] overflow-y-scroll max-w-3xl"
       >

diff --git a/web/src/components/search/SearchSection.tsx b/web/src/components/search/SearchSection.tsx
@@ -44,6 +44,7 @@ import UnconfiguredProviderText from "../chat_search/UnconfiguredProviderText";
 import { DateRangePickerValue } from "@tremor/react";
 import { Tag } from "@/lib/types";
 import { isEqual } from "lodash";
+import { WelcomeModal } from "../initialSetup/welcome/WelcomeModalWrapper";
 
 export type searchState =
   | "input"