diff --git a/web/src/app/assistants/SidebarWrapper.tsx b/web/src/app/assistants/SidebarWrapper.tsx index c94cce370..ad819a66c 100644 --- a/web/src/app/assistants/SidebarWrapper.tsx +++ b/web/src/app/assistants/SidebarWrapper.tsx @@ -9,7 +9,7 @@ import { Folder } from "@/app/chat/folders/interfaces"; import { User } from "@/lib/types"; import { Persona } from "@/app/admin/assistants/interfaces"; import Cookies from "js-cookie"; -import { SIDEBAR_TOGGLED_COOKIE_NAME } from "@/components/resizable/contants"; +import { SIDEBAR_TOGGLED_COOKIE_NAME } from "@/components/resizable/constants"; import { ReactNode, useEffect, useRef, useState } from "react"; import { useSidebarVisibility } from "@/components/chat_search/hooks"; import FunctionalHeader from "@/components/chat_search/Header"; diff --git a/web/src/app/chat/ChatPage.tsx b/web/src/app/chat/ChatPage.tsx index a24a7cc05..68cb40c8b 100644 --- a/web/src/app/chat/ChatPage.tsx +++ b/web/src/app/chat/ChatPage.tsx @@ -72,7 +72,7 @@ import { ChatBanner } from "./ChatBanner"; import FunctionalHeader from "@/components/chat_search/Header"; import { useSidebarVisibility } from "@/components/chat_search/hooks"; -import { SIDEBAR_TOGGLED_COOKIE_NAME } from "@/components/resizable/contants"; +import { SIDEBAR_TOGGLED_COOKIE_NAME } from "@/components/resizable/constants"; import FixedLogo from "./shared_chat_search/FixedLogo"; const TEMP_USER_MESSAGE_ID = -1; diff --git a/web/src/app/search/page.tsx b/web/src/app/search/page.tsx index 8bfc07f55..dfc9dd38c 100644 --- a/web/src/app/search/page.tsx +++ b/web/src/app/search/page.tsx @@ -30,7 +30,7 @@ import { } from "@/lib/assistants/fetchAssistantsSS"; import FunctionalWrapper from "../chat/shared_chat_search/FunctionalWrapper"; import { ChatSession } from "../chat/interfaces"; -import { SIDEBAR_TOGGLED_COOKIE_NAME } from "@/components/resizable/contants"; +import { SIDEBAR_TOGGLED_COOKIE_NAME } from "@/components/resizable/constants"; import ToggleSearch from "./WrappedSearch"; import { AGENTIC_SEARCH_TYPE_COOKIE_NAME, diff --git a/web/src/components/admin/Layout.tsx b/web/src/components/admin/Layout.tsx index 652821a5d..7d3d869a5 100644 --- a/web/src/components/admin/Layout.tsx +++ b/web/src/components/admin/Layout.tsx @@ -329,17 +329,10 @@ export async function Layout({ children }: { children: React.ReactNode }) { />
-
- - - Back to Danswer - +
-
+
{children}
diff --git a/web/src/components/admin/connectors/AdminSidebar.tsx b/web/src/components/admin/connectors/AdminSidebar.tsx index c9289c3c4..e26e47af4 100644 --- a/web/src/components/admin/connectors/AdminSidebar.tsx +++ b/web/src/components/admin/connectors/AdminSidebar.tsx @@ -6,6 +6,7 @@ import { Logo } from "@/components/Logo"; import { NEXT_PUBLIC_DO_NOT_USE_TOGGLE_OFF_DANSWER_POWERED } from "@/lib/constants"; import { HeaderTitle } from "@/components/header/Header"; import { SettingsContext } from "@/components/settings/SettingsProvider"; +import { BackIcon } from "@/components/icons/icons"; interface Item { name: string | JSX.Element; @@ -62,6 +63,12 @@ export function AdminSidebar({ collections }: { collections: Collection[] }) {
+ + + {collections.map((collection, collectionInd) => (

@@ -70,7 +77,7 @@ export function AdminSidebar({ collections }: { collections: Collection[] }) { {collection.items.map((item) => ( ))} diff --git a/web/src/components/resizable/ResizableSection.tsx b/web/src/components/resizable/ResizableSection.tsx index edfcc9fbe..98a877792 100644 --- a/web/src/components/resizable/ResizableSection.tsx +++ b/web/src/components/resizable/ResizableSection.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react"; import Cookies from "js-cookie"; -import { DOCUMENT_SIDEBAR_WIDTH_COOKIE_NAME } from "./contants"; +import { DOCUMENT_SIDEBAR_WIDTH_COOKIE_NAME } from "./constants"; function applyMinAndMax( width: number, diff --git a/web/src/components/resizable/contants.ts b/web/src/components/resizable/constants.ts similarity index 100% rename from web/src/components/resizable/contants.ts rename to web/src/components/resizable/constants.ts diff --git a/web/src/components/search/SearchSection.tsx b/web/src/components/search/SearchSection.tsx index a355691d0..1c07dd177 100644 --- a/web/src/components/search/SearchSection.tsx +++ b/web/src/components/search/SearchSection.tsx @@ -29,7 +29,7 @@ import { HistorySidebar } from "@/app/chat/sessionSidebar/HistorySidebar"; import { ChatSession, SearchSession } from "@/app/chat/interfaces"; import FunctionalHeader from "../chat_search/Header"; import { useSidebarVisibility } from "../chat_search/hooks"; -import { SIDEBAR_TOGGLED_COOKIE_NAME } from "../resizable/contants"; +import { SIDEBAR_TOGGLED_COOKIE_NAME } from "../resizable/constants"; import { AGENTIC_SEARCH_TYPE_COOKIE_NAME } from "@/lib/constants"; import Cookies from "js-cookie"; import FixedLogo from "@/app/chat/shared_chat_search/FixedLogo"; @@ -110,9 +110,9 @@ export const SearchSection = ({ SIDEBAR_TOGGLED_COOKIE_NAME, String(!toggledSidebar).toLocaleLowerCase() ), - { - path: "/", - }; + { + path: "/", + }; toggle(); }; @@ -494,9 +494,10 @@ export const SearchSection = ({ bg-opacity-80 duration-300 ease-in-out - ${showDocSidebar || toggledSidebar - ? "opacity-100 w-[300px] translate-x-0" - : "opacity-0 w-[200px] pointer-events-none -translate-x-10" + ${ + showDocSidebar || toggledSidebar + ? "opacity-100 w-[300px] translate-x-0" + : "opacity-0 w-[200px] pointer-events-none -translate-x-10" } `} > @@ -550,9 +551,10 @@ export const SearchSection = ({
diff --git a/web/src/lib/chat/fetchChatData.ts b/web/src/lib/chat/fetchChatData.ts index 0625b2eeb..61223e56d 100644 --- a/web/src/lib/chat/fetchChatData.ts +++ b/web/src/lib/chat/fetchChatData.ts @@ -23,7 +23,7 @@ import { cookies } from "next/headers"; import { SIDEBAR_TOGGLED_COOKIE_NAME, DOCUMENT_SIDEBAR_WIDTH_COOKIE_NAME, -} from "@/components/resizable/contants"; +} from "@/components/resizable/constants"; import { hasCompletedWelcomeFlowSS } from "@/components/initialSetup/welcome/WelcomeModalWrapper"; import { fetchAssistantsSS } from "../assistants/fetchAssistantsSS";