Make WelcomeModal only appear for admins + only if no connectors are …

…setup
Nibezak · Feb 20, 2024 · cc69ba0 · cc69ba0
1 parent db21d82
commit cc69ba0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/web/src/app/chat/page.tsx b/web/src/app/chat/page.tsx
@@ -25,12 +25,7 @@ import { cookies } from "next/headers";
 import { DOCUMENT_SIDEBAR_WIDTH_COOKIE_NAME } from "@/components/resizable/contants";
 import { personaComparator } from "../admin/personas/lib";
 import { ChatLayout } from "./ChatPage";
-import {
-  FullEmbeddingModelResponse,
-  checkModelNameIsValid,
-} from "../admin/models/embedding/embeddingModels";
-import { SwitchModelModal } from "@/components/SwitchModelModal";
-import { NoSourcesModal } from "@/components/initialSetup/search/NoSourcesModal";
+import { FullEmbeddingModelResponse } from "../admin/models/embedding/embeddingModels";
 import { NoCompleteSourcesModal } from "@/components/initialSetup/search/NoCompleteSourceModal";
 
 export default async function Page({
@@ -156,8 +151,11 @@ export default async function Page({
     ? parseInt(documentSidebarCookieInitialWidth.value)
     : undefined;
 
-  const shouldShowWelcomeModal = !hasCompletedWelcomeFlowSS();
   const hasAnyConnectors = ccPairs.length > 0;
+  const shouldShowWelcomeModal =
+    !hasCompletedWelcomeFlowSS() &&
+    !hasAnyConnectors &&
+    (!user || user.role === "admin");
   const shouldDisplaySourcesIncompleteModal =
     hasAnyConnectors &&
     !shouldShowWelcomeModal &&

diff --git a/web/src/app/search/page.tsx b/web/src/app/search/page.tsx
@@ -127,7 +127,11 @@ export default async function Home() {
       ? (storedSearchType as SearchType)
       : SearchType.SEMANTIC; // default to semantic
 
-  const shouldShowWelcomeModal = !hasCompletedWelcomeFlowSS();
+  const hasAnyConnectors = ccPairs.length > 0;
+  const shouldShowWelcomeModal =
+    !hasCompletedWelcomeFlowSS() &&
+    !hasAnyConnectors &&
+    (!user || user.role === "admin");
   const shouldDisplayNoSourcesModal =
     ccPairs.length === 0 && !shouldShowWelcomeModal;
   const shouldDisplaySourcesIncompleteModal =