From f4f3dd479e67267ca0f407195d64693a4409d93e Mon Sep 17 00:00:00 2001
From: pablodanswer <pablo@danswer.ai>
Date: Wed, 28 Aug 2024 08:45:55 -0700
Subject: [PATCH 01/11] ux improvements

---
 web/src/app/admin/add-connector/page.tsx      |   2 +-
 .../status/CCPairIndexingStatusTable.tsx      |   2 +-
 web/src/app/chat/ChatBanner.tsx               |   1 -
 web/src/components/IsPublicGroupSelector.tsx  | 121 +++++++++---------
 web/src/components/chat_search/Header.tsx     |   6 +-
 .../components/search/filtering/Filters.tsx   |  26 ++--
 .../components/search/filtering/TagFilter.tsx |   2 +-
 7 files changed, 82 insertions(+), 78 deletions(-)

diff --git a/web/src/app/admin/add-connector/page.tsx b/web/src/app/admin/add-connector/page.tsx
index bf7032b5f90..8d73131e69a 100644
--- a/web/src/app/admin/add-connector/page.tsx
+++ b/web/src/app/admin/add-connector/page.tsx
@@ -112,7 +112,7 @@ export default function Page() {
         value={searchTerm}
         onChange={(e) => setSearchTerm(e.target.value)}
         onKeyDown={handleKeyPress}
-        className="flex mt-2 max-w-sm h-9 w-full rounded-md border-2 border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+        className="ml-1 w-96 h-9 flex-none rounded-md border border-border bg-background-50 px-3 py-1 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
       />
 
       {Object.entries(categorizedSources)
diff --git a/web/src/app/admin/indexing/status/CCPairIndexingStatusTable.tsx b/web/src/app/admin/indexing/status/CCPairIndexingStatusTable.tsx
index a797933ced7..5e5eb04379d 100644
--- a/web/src/app/admin/indexing/status/CCPairIndexingStatusTable.tsx
+++ b/web/src/app/admin/indexing/status/CCPairIndexingStatusTable.tsx
@@ -457,7 +457,7 @@ export function CCPairIndexingStatusTable({
               placeholder="Search connectors..."
               value={searchTerm}
               onChange={(e) => setSearchTerm(e.target.value)}
-              className="ml-2 w-96 h-9 flex-none rounded-md border border-border bg-background-50 px-3 py-1 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+              className="ml-1 w-96 h-9 flex-none rounded-md border border-border bg-background-50 px-3 py-1 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
             />
 
             <Button className="h-9" onClick={() => toggleSources()}>
diff --git a/web/src/app/chat/ChatBanner.tsx b/web/src/app/chat/ChatBanner.tsx
index 4cf0f5fb586..25209890de3 100644
--- a/web/src/app/chat/ChatBanner.tsx
+++ b/web/src/app/chat/ChatBanner.tsx
@@ -65,7 +65,6 @@ export function ChatBanner() {
         w-full
         mx-auto
         relative
-        bg-background-100
         shadow-sm
         rounded
         border-l-8 border-l-400
diff --git a/web/src/components/IsPublicGroupSelector.tsx b/web/src/components/IsPublicGroupSelector.tsx
index 63d47e506a6..094a51b9a49 100644
--- a/web/src/components/IsPublicGroupSelector.tsx
+++ b/web/src/components/IsPublicGroupSelector.tsx
@@ -88,41 +88,45 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
 
       {(!formikProps.values.is_public ||
         !isAdmin ||
-        formikProps.values.groups.length > 0) && (
-        <>
-          <div className="flex mt-4 gap-x-2 items-center">
-            <div className="block font-medium text-base">
-              Assign group access for this {objectName}
+        formikProps.values.groups.length > 0) &&
+        userGroups &&
+        userGroups.length > 0 && (
+          <>
+            <div className="flex mt-4 gap-x-2 items-center">
+              <div className="block font-medium text-base">
+                Assign group access for this {objectName}
+              </div>
             </div>
-          </div>
-          <Text className="mb-3">
-            {isAdmin || !enforceGroupSelection ? (
-              <>
-                This {objectName} will be visible/accessible by the groups
-                selected below
-              </>
-            ) : (
-              <>
-                Curators must select one or more groups to give access to this{" "}
-                {objectName}
-              </>
-            )}
-          </Text>
-          <FieldArray
-            name="groups"
-            render={(arrayHelpers: ArrayHelpers) => (
-              <div className="flex gap-2 flex-wrap mb-4">
-                {userGroupsIsLoading ? (
-                  <div className="animate-pulse bg-gray-200 h-8 w-32 rounded"></div>
-                ) : (
-                  userGroups &&
-                  userGroups.map((userGroup: UserGroup) => {
-                    const ind = formikProps.values.groups.indexOf(userGroup.id);
-                    let isSelected = ind !== -1;
-                    return (
-                      <div
-                        key={userGroup.id}
-                        className={`
+            <Text className="mb-3">
+              {isAdmin || !enforceGroupSelection ? (
+                <>
+                  This {objectName} will be visible/accessible by the groups
+                  selected below
+                </>
+              ) : (
+                <>
+                  Curators must select one or more groups to give access to this{" "}
+                  {objectName}
+                </>
+              )}
+            </Text>
+            <FieldArray
+              name="groups"
+              render={(arrayHelpers: ArrayHelpers) => (
+                <div className="flex gap-2 flex-wrap mb-4">
+                  {userGroupsIsLoading ? (
+                    <div className="animate-pulse bg-gray-200 h-8 w-32 rounded"></div>
+                  ) : (
+                    userGroups &&
+                    userGroups.map((userGroup: UserGroup) => {
+                      const ind = formikProps.values.groups.indexOf(
+                        userGroup.id
+                      );
+                      let isSelected = ind !== -1;
+                      return (
+                        <div
+                          key={userGroup.id}
+                          className={`
                         px-3 
                         py-1
                         rounded-lg 
@@ -133,31 +137,32 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
                         cursor-pointer 
                         ${isSelected ? "bg-background-strong" : "hover:bg-hover"}
                       `}
-                        onClick={() => {
-                          if (isSelected) {
-                            arrayHelpers.remove(ind);
-                          } else {
-                            arrayHelpers.push(userGroup.id);
-                          }
-                        }}
-                      >
-                        <div className="my-auto flex">
-                          <FiUsers className="my-auto mr-2" /> {userGroup.name}
+                          onClick={() => {
+                            if (isSelected) {
+                              arrayHelpers.remove(ind);
+                            } else {
+                              arrayHelpers.push(userGroup.id);
+                            }
+                          }}
+                        >
+                          <div className="my-auto flex">
+                            <FiUsers className="my-auto mr-2" />{" "}
+                            {userGroup.name}
+                          </div>
                         </div>
-                      </div>
-                    );
-                  })
-                )}
-              </div>
-            )}
-          />
-          <ErrorMessage
-            name="groups"
-            component="div"
-            className="text-error text-sm mt-1"
-          />
-        </>
-      )}
+                      );
+                    })
+                  )}
+                </div>
+              )}
+            />
+            <ErrorMessage
+              name="groups"
+              component="div"
+              className="text-error text-sm mt-1"
+            />
+          </>
+        )}
     </div>
   );
 };
diff --git a/web/src/components/chat_search/Header.tsx b/web/src/components/chat_search/Header.tsx
index 0480d463736..5fd54e5c410 100644
--- a/web/src/components/chat_search/Header.tsx
+++ b/web/src/components/chat_search/Header.tsx
@@ -65,7 +65,7 @@ export default function FunctionalHeader({
     router.push(newChatUrl);
   };
   return (
-    <div className="pb-6 left-0 sticky top-0 z-20 w-full relative flex">
+    <div className="left-0 sticky bg-transparent top-0 z-20 w-full relative flex">
       <div className="mt-2 mx-2.5 cursor-pointer text-text-700 relative flex w-full">
         <LogoType
           assistantId={currentChatSession?.persona_id}
@@ -129,9 +129,9 @@ export default function FunctionalHeader({
         </div>
       </div>
 
-      {page != "assistants" && (
+      {/* {page != "assistants" && (
         <div className="h-24 left-0 absolute top-0 z-10 w-full bg-gradient-to-b via-50% z-[-1] from-background via-background to-background/10 flex" />
-      )}
+      )} */}
     </div>
   );
 }
diff --git a/web/src/components/search/filtering/Filters.tsx b/web/src/components/search/filtering/Filters.tsx
index f38ff4f59c7..30391e3c021 100644
--- a/web/src/components/search/filtering/Filters.tsx
+++ b/web/src/components/search/filtering/Filters.tsx
@@ -111,6 +111,19 @@ export function SourceSelector({
         <DateRangeSelector value={timeRange} onValueChange={setTimeRange} />
       </div>
 
+      {availableTags.length > 0 && (
+        <>
+          <div className="mt-4 mb-2">
+            <SectionTitle>Tags</SectionTitle>
+          </div>
+          <TagFilter
+            tags={availableTags}
+            selectedTags={selectedTags}
+            setSelectedTags={setSelectedTags}
+          />
+        </>
+      )}
+
       {existingSources.length > 0 && (
         <div className="mt-4">
           <div className="flex w-full gap-x-2 items-center">
@@ -191,19 +204,6 @@ export function SourceSelector({
           </div>
         </>
       )}
-
-      {availableTags.length > 0 && (
-        <>
-          <div className="mt-4 mb-2">
-            <SectionTitle>Tags</SectionTitle>
-          </div>
-          <TagFilter
-            tags={availableTags}
-            selectedTags={selectedTags}
-            setSelectedTags={setSelectedTags}
-          />
-        </>
-      )}
     </div>
   );
 }
diff --git a/web/src/components/search/filtering/TagFilter.tsx b/web/src/components/search/filtering/TagFilter.tsx
index ec3a7f38bb4..03e9f0baa33 100644
--- a/web/src/components/search/filtering/TagFilter.tsx
+++ b/web/src/components/search/filtering/TagFilter.tsx
@@ -115,7 +115,7 @@ export function TagFilter({
               <FiTag className="mr-1 my-auto" />
               Tags
             </div>
-            <div className="flex flex-wrap gap-x-1 gap-y-1">
+            <div className="flex overflow-y-scroll max-h-96 flex-wrap gap-x-1 gap-y-1">
               {filteredTags.length > 0 ? (
                 filteredTags.map((tag) => (
                   <div

From 1fa324b1359d6f6eb19dc759260843120a8fbe04 Mon Sep 17 00:00:00 2001
From: pablodanswer <pablo@danswer.ai>
Date: Wed, 28 Aug 2024 08:52:30 -0700
Subject: [PATCH 02/11] proper padding

---
 web/src/app/chat/ChatBanner.tsx              | 26 --------------------
 web/src/components/IsPublicGroupSelector.tsx | 18 +++++++-------
 web/src/components/chat_search/Header.tsx    | 11 ++++-----
 3 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/web/src/app/chat/ChatBanner.tsx b/web/src/app/chat/ChatBanner.tsx
index 25209890de3..bcaa72049b0 100644
--- a/web/src/app/chat/ChatBanner.tsx
+++ b/web/src/app/chat/ChatBanner.tsx
@@ -1,12 +1,9 @@
 "use client";
 
-import ReactMarkdown from "react-markdown";
 import { SettingsContext } from "@/components/settings/SettingsProvider";
 import { useContext, useState, useRef, useLayoutEffect } from "react";
-import remarkGfm from "remark-gfm";
 import { Popover } from "@/components/popover/Popover";
 import { ChevronDownIcon } from "@/components/icons/icons";
-import { Divider } from "@tremor/react";
 import { MinimalMarkdown } from "@/components/chat_search/MinimalMarkdown";
 
 export function ChatBanner() {
@@ -34,27 +31,6 @@ export function ChatBanner() {
     return null;
   }
 
-  const renderMarkdown = (className: string) => (
-    <ReactMarkdown
-      className={`w-full text-wrap break-word ${className}`}
-      components={{
-        a: ({ node, ...props }) => (
-          <a
-            {...props}
-            className="text-sm text-link hover:text-link-hover"
-            target="_blank"
-            rel="noopener noreferrer"
-          />
-        ),
-        p: ({ node, ...props }) => (
-          <p {...props} className="text-wrap break-word text-sm m-0 w-full" />
-        ),
-      }}
-      remarkPlugins={[remarkGfm]}
-    >
-      {settings.enterpriseSettings?.custom_header_content}
-    </ReactMarkdown>
-  );
   return (
     <div
       className={`
@@ -80,7 +56,6 @@ export function ChatBanner() {
             className="line-clamp-2 text-center w-full overflow-hidden pr-8"
           >
             <MinimalMarkdown
-              className=""
               content={settings.enterpriseSettings.custom_header_content}
             />
           </div>
@@ -89,7 +64,6 @@ export function ChatBanner() {
             className="absolute top-0 left-0 invisible w-full"
           >
             <MinimalMarkdown
-              className=""
               content={settings.enterpriseSettings.custom_header_content}
             />
           </div>
diff --git a/web/src/components/IsPublicGroupSelector.tsx b/web/src/components/IsPublicGroupSelector.tsx
index 094a51b9a49..096d7bda79e 100644
--- a/web/src/components/IsPublicGroupSelector.tsx
+++ b/web/src/components/IsPublicGroupSelector.tsx
@@ -127,15 +127,15 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
                         <div
                           key={userGroup.id}
                           className={`
-                        px-3 
-                        py-1
-                        rounded-lg 
-                        border
-                        border-border 
-                        w-fit 
-                        flex 
-                        cursor-pointer 
-                        ${isSelected ? "bg-background-strong" : "hover:bg-hover"}
+                          px-3 
+                          py-1
+                          rounded-lg 
+                          border
+                          border-border 
+                          w-fit 
+                          flex 
+                          cursor-pointer 
+                          ${isSelected ? "bg-background-strong" : "hover:bg-hover"}
                       `}
                           onClick={() => {
                             if (isSelected) {
diff --git a/web/src/components/chat_search/Header.tsx b/web/src/components/chat_search/Header.tsx
index 5fd54e5c410..0ef2b8f129f 100644
--- a/web/src/components/chat_search/Header.tsx
+++ b/web/src/components/chat_search/Header.tsx
@@ -7,7 +7,6 @@ import { NewChatIcon } from "../icons/icons";
 import { NEXT_PUBLIC_NEW_CHAT_DIRECTS_TO_SAME_PERSONA } from "@/lib/constants";
 import { ChatSession } from "@/app/chat/interfaces";
 import Link from "next/link";
-import { SettingsContext } from "../settings/SettingsProvider";
 import { pageType } from "@/app/chat/sessionSidebar/types";
 import { useRouter } from "next/navigation";
 import { ChatBanner } from "@/app/chat/ChatBanner";
@@ -65,7 +64,7 @@ export default function FunctionalHeader({
     router.push(newChatUrl);
   };
   return (
-    <div className="left-0 sticky bg-transparent top-0 z-20 w-full relative flex">
+    <div className="left-0 sticky bg-black top-0 z-20 w-full relative flex">
       <div className="mt-2 mx-2.5 cursor-pointer text-text-700 relative flex w-full">
         <LogoType
           assistantId={currentChatSession?.persona_id}
@@ -87,7 +86,7 @@ export default function FunctionalHeader({
             ${sidebarToggled ? "w-[250px]" : "w-[0px]"}
             `}
         />
-        <div className="w-full mobile:-mx-20 desktop:px-4">
+        <div className="w-full  mobile:-mx-20 desktop:px-4">
           <ChatBanner />
         </div>
 
@@ -129,9 +128,9 @@ export default function FunctionalHeader({
         </div>
       </div>
 
-      {/* {page != "assistants" && (
-        <div className="h-24 left-0 absolute top-0 z-10 w-full bg-gradient-to-b via-50% z-[-1] from-background via-background to-background/10 flex" />
-      )} */}
+      {page != "assistants" && (
+        <div className="h-20 left-0 absolute top-0 z-10 w-full bg-gradient-to-b via-50% z-[-1] from-background via-background to-background/10 flex" />
+      )}
     </div>
   );
 }

From e547cd6a7985310bc60c0a7d0b28aa7935ef7b49 Mon Sep 17 00:00:00 2001
From: pablodanswer <pablo@danswer.ai>
Date: Wed, 28 Aug 2024 08:53:36 -0700
Subject: [PATCH 03/11] minor formatting

---
 web/src/components/IsPublicGroupSelector.tsx | 20 ++++++++++----------
 web/src/components/chat_search/Header.tsx    |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/web/src/components/IsPublicGroupSelector.tsx b/web/src/components/IsPublicGroupSelector.tsx
index 096d7bda79e..448dbcf4ec3 100644
--- a/web/src/components/IsPublicGroupSelector.tsx
+++ b/web/src/components/IsPublicGroupSelector.tsx
@@ -127,16 +127,16 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
                         <div
                           key={userGroup.id}
                           className={`
-                          px-3 
-                          py-1
-                          rounded-lg 
-                          border
-                          border-border 
-                          w-fit 
-                          flex 
-                          cursor-pointer 
-                          ${isSelected ? "bg-background-strong" : "hover:bg-hover"}
-                      `}
+                        px-3 
+                        py-1
+                        rounded-lg 
+                        border
+                        border-border 
+                        w-fit 
+                        flex 
+                        cursor-pointer 
+                        ${isSelected ? "bg-background-strong" : "hover:bg-hover"}
+                    `}
                           onClick={() => {
                             if (isSelected) {
                               arrayHelpers.remove(ind);
diff --git a/web/src/components/chat_search/Header.tsx b/web/src/components/chat_search/Header.tsx
index 0ef2b8f129f..0c37d678225 100644
--- a/web/src/components/chat_search/Header.tsx
+++ b/web/src/components/chat_search/Header.tsx
@@ -86,7 +86,7 @@ export default function FunctionalHeader({
             ${sidebarToggled ? "w-[250px]" : "w-[0px]"}
             `}
         />
-        <div className="w-full  mobile:-mx-20 desktop:px-4">
+        <div className="w-full mobile:-mx-20 desktop:px-4">
           <ChatBanner />
         </div>
 

From fb29c70f37688334b2448432ecc139dc2c272b22 Mon Sep 17 00:00:00 2001
From: pablodanswer <pablo@danswer.ai>
Date: Wed, 28 Aug 2024 08:56:48 -0700
Subject: [PATCH 04/11] squash

---
 web/src/components/chat_search/Header.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/components/chat_search/Header.tsx b/web/src/components/chat_search/Header.tsx
index 0c37d678225..3f1881a2769 100644
--- a/web/src/components/chat_search/Header.tsx
+++ b/web/src/components/chat_search/Header.tsx
@@ -64,7 +64,7 @@ export default function FunctionalHeader({
     router.push(newChatUrl);
   };
   return (
-    <div className="left-0 sticky bg-black top-0 z-20 w-full relative flex">
+    <div className="left-0 sticky top-0 z-20 w-full relative flex">
       <div className="mt-2 mx-2.5 cursor-pointer text-text-700 relative flex w-full">
         <LogoType
           assistantId={currentChatSession?.persona_id}

From 3112a9df9d6ace4f90303ba362c36e9187dc3dc3 Mon Sep 17 00:00:00 2001
From: pablodanswer <pablo@danswer.ai>
Date: Wed, 28 Aug 2024 10:26:24 -0700
Subject: [PATCH 05/11] extract loading

---
 web/src/components/IsPublicGroupSelector.tsx | 54 +++++++++-----------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/web/src/components/IsPublicGroupSelector.tsx b/web/src/components/IsPublicGroupSelector.tsx
index 448dbcf4ec3..b729a412537 100644
--- a/web/src/components/IsPublicGroupSelector.tsx
+++ b/web/src/components/IsPublicGroupSelector.tsx
@@ -89,6 +89,9 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
       {(!formikProps.values.is_public ||
         !isAdmin ||
         formikProps.values.groups.length > 0) &&
+      userGroupsIsLoading ? (
+        <div className="animate-pulse bg-gray-200 h-8 w-32 rounded"></div>
+      ) : (
         userGroups &&
         userGroups.length > 0 && (
           <>
@@ -114,19 +117,13 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
               name="groups"
               render={(arrayHelpers: ArrayHelpers) => (
                 <div className="flex gap-2 flex-wrap mb-4">
-                  {userGroupsIsLoading ? (
-                    <div className="animate-pulse bg-gray-200 h-8 w-32 rounded"></div>
-                  ) : (
-                    userGroups &&
-                    userGroups.map((userGroup: UserGroup) => {
-                      const ind = formikProps.values.groups.indexOf(
-                        userGroup.id
-                      );
-                      let isSelected = ind !== -1;
-                      return (
-                        <div
-                          key={userGroup.id}
-                          className={`
+                  {userGroups.map((userGroup: UserGroup) => {
+                    const ind = formikProps.values.groups.indexOf(userGroup.id);
+                    let isSelected = ind !== -1;
+                    return (
+                      <div
+                        key={userGroup.id}
+                        className={`
                         px-3 
                         py-1
                         rounded-lg 
@@ -137,22 +134,20 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
                         cursor-pointer 
                         ${isSelected ? "bg-background-strong" : "hover:bg-hover"}
                     `}
-                          onClick={() => {
-                            if (isSelected) {
-                              arrayHelpers.remove(ind);
-                            } else {
-                              arrayHelpers.push(userGroup.id);
-                            }
-                          }}
-                        >
-                          <div className="my-auto flex">
-                            <FiUsers className="my-auto mr-2" />{" "}
-                            {userGroup.name}
-                          </div>
+                        onClick={() => {
+                          if (isSelected) {
+                            arrayHelpers.remove(ind);
+                          } else {
+                            arrayHelpers.push(userGroup.id);
+                          }
+                        }}
+                      >
+                        <div className="my-auto flex">
+                          <FiUsers className="my-auto mr-2" /> {userGroup.name}
                         </div>
-                      );
-                    })
-                  )}
+                      </div>
+                    );
+                  })}
                 </div>
               )}
             />
@@ -162,7 +157,8 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
               className="text-error text-sm mt-1"
             />
           </>
-        )}
+        )
+      )}
     </div>
   );
 };

From 3838908e702e27abec0da3fa2483f016078ff972 Mon Sep 17 00:00:00 2001
From: pablodanswer <pablo@danswer.ai>
Date: Wed, 28 Aug 2024 10:34:33 -0700
Subject: [PATCH 06/11] proper parentheses

---
 web/src/components/IsPublicGroupSelector.tsx | 123 ++++++++++---------
 web/src/components/user/UserProvider.tsx     |   9 +-
 2 files changed, 71 insertions(+), 61 deletions(-)

diff --git a/web/src/components/IsPublicGroupSelector.tsx b/web/src/components/IsPublicGroupSelector.tsx
index b729a412537..6cac2744733 100644
--- a/web/src/components/IsPublicGroupSelector.tsx
+++ b/web/src/components/IsPublicGroupSelector.tsx
@@ -22,7 +22,7 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
   enforceGroupSelection?: boolean;
 }) => {
   const { data: userGroups, isLoading: userGroupsIsLoading } = useUserGroups();
-  const { isAdmin, user, isLoadingUser } = useUser();
+  const { isAdmin, user, isLoadingUser, isCurator } = useUser();
   const [shouldHideContent, setShouldHideContent] = useState(false);
 
   useEffect(() => {
@@ -87,43 +87,45 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
       )}
 
       {(!formikProps.values.is_public ||
-        !isAdmin ||
+        isCurator ||
         formikProps.values.groups.length > 0) &&
-      userGroupsIsLoading ? (
-        <div className="animate-pulse bg-gray-200 h-8 w-32 rounded"></div>
-      ) : (
-        userGroups &&
-        userGroups.length > 0 && (
-          <>
-            <div className="flex mt-4 gap-x-2 items-center">
-              <div className="block font-medium text-base">
-                Assign group access for this {objectName}
+        (userGroupsIsLoading ? (
+          <div className="animate-pulse bg-gray-200 h-8 w-32 rounded"></div>
+        ) : (
+          userGroups &&
+          userGroups.length > 0 && (
+            <>
+              <div className="flex mt-4 gap-x-2 items-center">
+                <div className="block font-medium text-base">
+                  Assign group access for this {objectName}
+                </div>
               </div>
-            </div>
-            <Text className="mb-3">
-              {isAdmin || !enforceGroupSelection ? (
-                <>
-                  This {objectName} will be visible/accessible by the groups
-                  selected below
-                </>
-              ) : (
-                <>
-                  Curators must select one or more groups to give access to this{" "}
-                  {objectName}
-                </>
-              )}
-            </Text>
-            <FieldArray
-              name="groups"
-              render={(arrayHelpers: ArrayHelpers) => (
-                <div className="flex gap-2 flex-wrap mb-4">
-                  {userGroups.map((userGroup: UserGroup) => {
-                    const ind = formikProps.values.groups.indexOf(userGroup.id);
-                    let isSelected = ind !== -1;
-                    return (
-                      <div
-                        key={userGroup.id}
-                        className={`
+              <Text className="mb-3">
+                {isAdmin || !enforceGroupSelection ? (
+                  <>
+                    This {objectName} will be visible/accessible by the groups
+                    selected below
+                  </>
+                ) : (
+                  <>
+                    Curators must select one or more groups to give access to
+                    this {objectName}
+                  </>
+                )}
+              </Text>
+              <FieldArray
+                name="groups"
+                render={(arrayHelpers: ArrayHelpers) => (
+                  <div className="flex gap-2 flex-wrap mb-4">
+                    {userGroups.map((userGroup: UserGroup) => {
+                      const ind = formikProps.values.groups.indexOf(
+                        userGroup.id
+                      );
+                      let isSelected = ind !== -1;
+                      return (
+                        <div
+                          key={userGroup.id}
+                          className={`
                         px-3 
                         py-1
                         rounded-lg 
@@ -134,31 +136,32 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
                         cursor-pointer 
                         ${isSelected ? "bg-background-strong" : "hover:bg-hover"}
                     `}
-                        onClick={() => {
-                          if (isSelected) {
-                            arrayHelpers.remove(ind);
-                          } else {
-                            arrayHelpers.push(userGroup.id);
-                          }
-                        }}
-                      >
-                        <div className="my-auto flex">
-                          <FiUsers className="my-auto mr-2" /> {userGroup.name}
+                          onClick={() => {
+                            if (isSelected) {
+                              arrayHelpers.remove(ind);
+                            } else {
+                              arrayHelpers.push(userGroup.id);
+                            }
+                          }}
+                        >
+                          <div className="my-auto flex">
+                            <FiUsers className="my-auto mr-2" />{" "}
+                            {userGroup.name}
+                          </div>
                         </div>
-                      </div>
-                    );
-                  })}
-                </div>
-              )}
-            />
-            <ErrorMessage
-              name="groups"
-              component="div"
-              className="text-error text-sm mt-1"
-            />
-          </>
-        )
-      )}
+                      );
+                    })}
+                  </div>
+                )}
+              />
+              <ErrorMessage
+                name="groups"
+                component="div"
+                className="text-error text-sm mt-1"
+              />
+            </>
+          )
+        ))}
     </div>
   );
 };
diff --git a/web/src/components/user/UserProvider.tsx b/web/src/components/user/UserProvider.tsx
index d2cf0f2c94f..67777277c27 100644
--- a/web/src/components/user/UserProvider.tsx
+++ b/web/src/components/user/UserProvider.tsx
@@ -8,6 +8,7 @@ interface UserContextType {
   user: User | null;
   isLoadingUser: boolean;
   isAdmin: boolean;
+  isCurator: boolean;
   refreshUser: () => Promise<void>;
 }
 
@@ -17,12 +18,16 @@ export function UserProvider({ children }: { children: React.ReactNode }) {
   const [user, setUser] = useState<User | null>(null);
   const [isLoadingUser, setIsLoadingUser] = useState(true);
   const [isAdmin, setIsAdmin] = useState(false);
+  const [isCurator, setIsCurator] = useState(false);
 
   const fetchUser = async () => {
     try {
       const user = await getCurrentUser();
       setUser(user);
       setIsAdmin(user?.role === UserRole.ADMIN);
+      setIsCurator(
+        user?.role === UserRole.CURATOR || user?.role == UserRole.GLOBAL_CURATOR
+      );
     } catch (error) {
       console.error("Error fetching current user:", error);
     } finally {
@@ -40,7 +45,9 @@ export function UserProvider({ children }: { children: React.ReactNode }) {
   };
 
   return (
-    <UserContext.Provider value={{ user, isLoadingUser, isAdmin, refreshUser }}>
+    <UserContext.Provider
+      value={{ user, isLoadingUser, isAdmin, refreshUser, isCurator }}
+    >
       {children}
     </UserContext.Provider>
   );

From f5b4a86fdfa3eab49c69e4644db2820e86e5df56 Mon Sep 17 00:00:00 2001
From: pablodanswer <pablo@danswer.ai>
Date: Thu, 29 Aug 2024 10:34:24 -0700
Subject: [PATCH 07/11] fix default to public

---
 backend/danswer/server/documents/cc_pair.py   |  2 +-
 backend/danswer/server/documents/connector.py |  1 +
 backend/shared_configs/configs.py             |  2 +-
 .../[connector]/AddConnectorPage.tsx          |  5 +++++
 web/src/components/admin/connectors/Field.tsx | 20 ++++++++++++++-----
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/backend/danswer/server/documents/cc_pair.py b/backend/danswer/server/documents/cc_pair.py
index 69ae9916348..37c7cbfd0b1 100644
--- a/backend/danswer/server/documents/cc_pair.py
+++ b/backend/danswer/server/documents/cc_pair.py
@@ -170,7 +170,7 @@ def associate_credential_to_connector(
             connector_id=connector_id,
             credential_id=credential_id,
             cc_pair_name=metadata.name,
-            is_public=metadata.is_public or True,
+            is_public=True if metadata.is_public is None else metadata.is_public,
             groups=metadata.groups,
         )
 
diff --git a/backend/danswer/server/documents/connector.py b/backend/danswer/server/documents/connector.py
index 8d6b0ffc773..a742e246491 100644
--- a/backend/danswer/server/documents/connector.py
+++ b/backend/danswer/server/documents/connector.py
@@ -552,6 +552,7 @@ def create_connector_from_model(
     try:
         _validate_connector_allowed(connector_data.source)
         connector_base = _check_connector_permissions(connector_data, user)
+
         return create_connector(
             db_session=db_session,
             connector_data=connector_base,
diff --git a/backend/shared_configs/configs.py b/backend/shared_configs/configs.py
index 5ad36cc93c4..413c8671829 100644
--- a/backend/shared_configs/configs.py
+++ b/backend/shared_configs/configs.py
@@ -53,7 +53,7 @@
 # Enable generating persistent log files for local dev environments
 DEV_LOGGING_ENABLED = os.environ.get("DEV_LOGGING_ENABLED", "").lower() == "true"
 # notset, debug, info, notice, warning, error, or critical
-LOG_LEVEL = os.environ.get("LOG_LEVEL", "notice")
+LOG_LEVEL = os.environ.get("LOG_LEVEL", "debug")
 
 
 # Fields which should only be set on new search setting
diff --git a/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx b/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx
index dd8d19ca720..7758127b2ef 100644
--- a/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx
+++ b/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx
@@ -214,6 +214,10 @@ export default function AddConnector({
 
     // file-specific handling
     if (connector == "file" && selectedFiles.length > 0) {
+      console.log("CREATING NEW FIEL");
+      console.log(formValues);
+      console.log(isPublic);
+      // return
       const response = await submitFiles(
         selectedFiles,
         setPopup,
@@ -489,6 +493,7 @@ export default function AddConnector({
               }}
             >
               {(formikProps) => {
+                console.log(formikProps.values);
                 setFormValues(formikProps.values);
                 handleFormStatusChange(
                   formikProps.isValid && isFormSubmittable(formikProps.values)
diff --git a/web/src/components/admin/connectors/Field.tsx b/web/src/components/admin/connectors/Field.tsx
index 2dfcda222c1..25e5fc94fec 100644
--- a/web/src/components/admin/connectors/Field.tsx
+++ b/web/src/components/admin/connectors/Field.tsx
@@ -396,17 +396,27 @@ export const BooleanFormField = ({
   alignTop,
   checked,
 }: BooleanFormFieldProps) => {
+  const [field, meta, helpers] = useField<boolean>(name);
+  const { setValue } = helpers;
+
+  const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    setValue(e.target.checked);
+    if (onChange) {
+      onChange(e);
+    }
+  };
+
   return (
     <div>
       <label className="flex text-sm">
         <Field
-          disabled={disabled}
-          name={name}
-          checked={checked}
           type="checkbox"
+          {...field}
+          checked={checked !== undefined ? checked : field.value}
+          disabled={disabled}
+          onChange={handleChange}
           className={`${removeIndent ? "mr-2" : "mx-3"}     
-            px-5 w-3.5 h-3.5 ${alignTop ? "mt-1" : "my-auto"}`}
-          {...(onChange ? { onChange } : {})}
+              px-5 w-3.5 h-3.5 ${alignTop ? "mt-1" : "my-auto"}`}
         />
         {!noLabel && (
           <div>

From 51a5bd7614056733c2fd5ddaa900690e6b7ee418 Mon Sep 17 00:00:00 2001
From: pablodanswer <pablo@danswer.ai>
Date: Thu, 29 Aug 2024 10:41:14 -0700
Subject: [PATCH 08/11] validated

---
 .../app/admin/connectors/[connector]/AddConnectorPage.tsx    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx b/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx
index 7758127b2ef..dd359bda9a1 100644
--- a/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx
+++ b/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx
@@ -44,7 +44,6 @@ import {
   IsPublicGroupSelectorFormType,
 } from "@/components/IsPublicGroupSelector";
 import { usePaidEnterpriseFeaturesEnabled } from "@/components/settings/usePaidEnterpriseFeaturesEnabled";
-import { AdminBooleanFormField } from "@/components/credentials/CredentialFields";
 
 export type AdvancedConfigFinal = {
   pruneFreq: number | null;
@@ -214,10 +213,6 @@ export default function AddConnector({
 
     // file-specific handling
     if (connector == "file" && selectedFiles.length > 0) {
-      console.log("CREATING NEW FIEL");
-      console.log(formValues);
-      console.log(isPublic);
-      // return
       const response = await submitFiles(
         selectedFiles,
         setPopup,

From 90fc30d1faea89691b0ab28c22b86af2d57c4fda Mon Sep 17 00:00:00 2001
From: pablodanswer <pablo@danswer.ai>
Date: Thu, 29 Aug 2024 19:36:52 -0700
Subject: [PATCH 09/11] undo log change

---
 backend/shared_configs/configs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/shared_configs/configs.py b/backend/shared_configs/configs.py
index 413c8671829..5ad36cc93c4 100644
--- a/backend/shared_configs/configs.py
+++ b/backend/shared_configs/configs.py
@@ -53,7 +53,7 @@
 # Enable generating persistent log files for local dev environments
 DEV_LOGGING_ENABLED = os.environ.get("DEV_LOGGING_ENABLED", "").lower() == "true"
 # notset, debug, info, notice, warning, error, or critical
-LOG_LEVEL = os.environ.get("LOG_LEVEL", "debug")
+LOG_LEVEL = os.environ.get("LOG_LEVEL", "notice")
 
 
 # Fields which should only be set on new search setting

From c59c17e3967dcff6a8c6b4c48e2b2a9bff0c188c Mon Sep 17 00:00:00 2001
From: pablodanswer <pablo@danswer.ai>
Date: Fri, 30 Aug 2024 09:04:18 -0700
Subject: [PATCH 10/11] push locally stored change + rm log

---
 web/src/app/admin/embeddings/RerankingFormPage.tsx  | 12 ++++++++----
 web/src/app/admin/embeddings/interfaces.ts          |  2 +-
 .../admin/embeddings/pages/EmbeddingFormPage.tsx    |  8 ++++----
 web/src/components/admin/connectors/Field.tsx       | 13 ++++++++++++-
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/web/src/app/admin/embeddings/RerankingFormPage.tsx b/web/src/app/admin/embeddings/RerankingFormPage.tsx
index 8c02fe643eb..733c5ebd9af 100644
--- a/web/src/app/admin/embeddings/RerankingFormPage.tsx
+++ b/web/src/app/admin/embeddings/RerankingFormPage.tsx
@@ -192,15 +192,19 @@ const RerankingDetailsForm = forwardRef<
                 >
                   <div className="w-full px-4">
                     <TextFormField
-                      placeholder={values.api_key || undefined}
+                      placeholder={values.rerank_api_key || undefined}
                       onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                         const value = e.target.value;
-                        setRerankingDetails({ ...values, api_key: value });
-                        setFieldValue("api_key", value);
+                        setRerankingDetails({
+                          ...values,
+                          rerank_api_key: value,
+                        });
+                        setFieldValue("rerank_api_key", value);
+                        console.log("HIII");
                       }}
                       type="password"
                       label="Cohere API Key"
-                      name="api_key"
+                      name="rerank_api_key"
                     />
                     <div className="mt-4 flex justify-between">
                       <Button
diff --git a/web/src/app/admin/embeddings/interfaces.ts b/web/src/app/admin/embeddings/interfaces.ts
index 335292f73e6..c3dec13e6cc 100644
--- a/web/src/app/admin/embeddings/interfaces.ts
+++ b/web/src/app/admin/embeddings/interfaces.ts
@@ -4,7 +4,7 @@ import { NonNullChain } from "typescript";
 export interface RerankingDetails {
   rerank_model_name: string | null;
   rerank_provider_type: RerankerProvider | null;
-  api_key: string | null;
+  rerank_api_key: string | null;
   num_rerank: number;
 }
 
diff --git a/web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx b/web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx
index c0e8781e53e..3cd28287519 100644
--- a/web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx
+++ b/web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx
@@ -44,7 +44,7 @@ export default function EmbeddingForm() {
     });
 
   const [rerankingDetails, setRerankingDetails] = useState<RerankingDetails>({
-    api_key: "",
+    rerank_api_key: "",
     num_rerank: 0,
     rerank_provider_type: null,
     rerank_model_name: "",
@@ -118,7 +118,7 @@ export default function EmbeddingForm() {
           searchSettings.disable_rerank_for_streaming,
       });
       setRerankingDetails({
-        api_key: searchSettings.api_key,
+        rerank_api_key: searchSettings.rerank_api_key,
         num_rerank: searchSettings.num_rerank,
         rerank_provider_type: searchSettings.rerank_provider_type,
         rerank_model_name: searchSettings.rerank_model_name,
@@ -128,13 +128,13 @@ export default function EmbeddingForm() {
 
   const originalRerankingDetails: RerankingDetails = searchSettings
     ? {
-        api_key: searchSettings.api_key,
+        rerank_api_key: searchSettings.rerank_api_key,
         num_rerank: searchSettings.num_rerank,
         rerank_provider_type: searchSettings.rerank_provider_type,
         rerank_model_name: searchSettings.rerank_model_name,
       }
     : {
-        api_key: "",
+        rerank_api_key: "",
         num_rerank: 0,
         rerank_provider_type: null,
         rerank_model_name: "",
diff --git a/web/src/components/admin/connectors/Field.tsx b/web/src/components/admin/connectors/Field.tsx
index 25e5fc94fec..fc749296faf 100644
--- a/web/src/components/admin/connectors/Field.tsx
+++ b/web/src/components/admin/connectors/Field.tsx
@@ -149,6 +149,17 @@ export function TextFormField({
   if (isTextArea && !heightString) {
     heightString = "h-28";
   }
+  const [field, , helpers] = useField(name);
+  const { setValue } = helpers;
+
+  const handleChange = (
+    e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>
+  ) => {
+    setValue(e.target.value);
+    if (onChange) {
+      onChange(e as React.ChangeEvent<HTMLInputElement>);
+    }
+  };
 
   return (
     <div className="w-full">
@@ -200,7 +211,7 @@ export function TextFormField({
           disabled={disabled}
           placeholder={placeholder}
           autoComplete={autoCompleteDisabled ? "off" : undefined}
-          // onChange={onChange}
+          onChange={handleChange}
         />
         {includeRevert && (
           <div className="flex-none mt-auto">

From e7f8defb57a12c3e168f61ca1cc981c93688942c Mon Sep 17 00:00:00 2001
From: pablodanswer <pablo@danswer.ai>
Date: Fri, 30 Aug 2024 09:32:43 -0700
Subject: [PATCH 11/11] squash

---
 .../pages/ConnectorInput/NumberInput.tsx           | 14 +++++++++++++-
 web/src/app/admin/embeddings/RerankingFormPage.tsx |  4 ++--
 .../embeddings/pages/AdvancedEmbeddingFormPage.tsx | 12 +++++++++++-
 .../admin/embeddings/pages/EmbeddingFormPage.tsx   |  6 ++++++
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/web/src/app/admin/connectors/[connector]/pages/ConnectorInput/NumberInput.tsx b/web/src/app/admin/connectors/[connector]/pages/ConnectorInput/NumberInput.tsx
index 5a9f5041b5d..a62864495ef 100644
--- a/web/src/app/admin/connectors/[connector]/pages/ConnectorInput/NumberInput.tsx
+++ b/web/src/app/admin/connectors/[connector]/pages/ConnectorInput/NumberInput.tsx
@@ -1,5 +1,5 @@
 import { SubLabel } from "@/components/admin/connectors/Field";
-import { Field } from "formik";
+import { Field, useFormikContext } from "formik";
 
 export default function NumberInput({
   label,
@@ -8,6 +8,7 @@ export default function NumberInput({
   description,
   name,
   showNeverIfZero,
+  onChange,
 }: {
   value?: number;
   label: string;
@@ -15,7 +16,10 @@ export default function NumberInput({
   optional?: boolean;
   description?: string;
   showNeverIfZero?: boolean;
+  onChange?: (value: number) => void;
 }) {
+  const { setFieldValue } = useFormikContext();
+
   return (
     <div className="w-full flex flex-col">
       <label className="block text-base font-medium text-text-700 mb-1">
@@ -29,6 +33,14 @@ export default function NumberInput({
         name={name}
         min="-1"
         value={value === 0 && showNeverIfZero ? "Never" : value}
+        onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+          const newValue =
+            e.target.value === "Never" ? 0 : Number(e.target.value);
+          setFieldValue(name, newValue);
+          if (onChange) {
+            onChange(newValue);
+          }
+        }}
         className={`mt-2 block w-full px-3 py-2 
                 bg-white border border-gray-300 rounded-md 
                 text-sm shadow-sm placeholder-gray-400
diff --git a/web/src/app/admin/embeddings/RerankingFormPage.tsx b/web/src/app/admin/embeddings/RerankingFormPage.tsx
index 733c5ebd9af..7e9b538fcf4 100644
--- a/web/src/app/admin/embeddings/RerankingFormPage.tsx
+++ b/web/src/app/admin/embeddings/RerankingFormPage.tsx
@@ -92,7 +92,7 @@ const RerankingDetailsForm = forwardRef<
               .nullable()
               .oneOf(Object.values(RerankerProvider))
               .optional(),
-            api_key: Yup.string().nullable(),
+            rerank_api_key: Yup.string().nullable(),
             num_rerank: Yup.number().min(1, "Must be at least 1"),
           })}
           onSubmit={async (_, { setSubmitting }) => {
@@ -132,6 +132,7 @@ const RerankingDetailsForm = forwardRef<
                           ...values,
                           rerank_provider_type: card.rerank_provider_type!,
                           rerank_model_name: card.modelName,
+                          rerank_api_key: null,
                         });
                         setFieldValue(
                           "rerank_provider_type",
@@ -200,7 +201,6 @@ const RerankingDetailsForm = forwardRef<
                           rerank_api_key: value,
                         });
                         setFieldValue("rerank_api_key", value);
-                        console.log("HIII");
                       }}
                       type="password"
                       label="Cohere API Key"
diff --git a/web/src/app/admin/embeddings/pages/AdvancedEmbeddingFormPage.tsx b/web/src/app/admin/embeddings/pages/AdvancedEmbeddingFormPage.tsx
index 89d885a1368..3d519e63491 100644
--- a/web/src/app/admin/embeddings/pages/AdvancedEmbeddingFormPage.tsx
+++ b/web/src/app/admin/embeddings/pages/AdvancedEmbeddingFormPage.tsx
@@ -15,6 +15,7 @@ interface AdvancedEmbeddingFormPageProps {
   ) => void;
   advancedEmbeddingDetails: AdvancedSearchConfiguration;
   numRerank: number;
+  updateNumRerank: (value: number) => void;
 }
 
 const AdvancedEmbeddingFormPage = forwardRef<
@@ -22,7 +23,12 @@ const AdvancedEmbeddingFormPage = forwardRef<
   AdvancedEmbeddingFormPageProps
 >(
   (
-    { updateAdvancedEmbeddingDetails, advancedEmbeddingDetails, numRerank },
+    {
+      updateAdvancedEmbeddingDetails,
+      advancedEmbeddingDetails,
+      numRerank,
+      updateNumRerank,
+    },
     ref
   ) => {
     return (
@@ -154,6 +160,10 @@ const AdvancedEmbeddingFormPage = forwardRef<
                 name="disableRerankForStreaming"
               />
               <NumberInput
+                onChange={(value: number) => {
+                  updateNumRerank(value);
+                  setFieldValue("num_rerank", value);
+                }}
                 description="Number of results to rerank"
                 optional={false}
                 value={values.num_rerank}
diff --git a/web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx b/web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx
index 3cd28287519..8f87b7a5162 100644
--- a/web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx
+++ b/web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx
@@ -415,6 +415,12 @@ export default function EmbeddingForm() {
           <>
             <Card>
               <AdvancedEmbeddingFormPage
+                updateNumRerank={(value: number) =>
+                  setRerankingDetails({
+                    ...rerankingDetails,
+                    num_rerank: value,
+                  })
+                }
                 numRerank={rerankingDetails.num_rerank}
                 advancedEmbeddingDetails={advancedEmbeddingDetails}
                 updateAdvancedEmbeddingDetails={updateAdvancedEmbeddingDetails}