Small improvements

Author: Weves

web/src/app/admin/add-connector/page.tsx

@@ -15,7 +15,11 @@ import {
   TooltipTrigger,
 } from "@/components/ui/tooltip";
 import { useFederatedConnectors } from "@/lib/hooks";
-import { FederatedConnectorInfo, ValidSources } from "@/lib/types";
+import {
+  FederatedConnectorInfo,
+  federatedSourceToRegularSource,
+  ValidSources,
+} from "@/lib/types";
 import useSWR from "swr";
 import { errorHandlingFetcher } from "@/lib/fetcher";
 import { buildSimilarCredentialInfoURL } from "@/app/admin/connector/[ccPairId]/lib";
@@ -40,7 +44,8 @@ function SourceTile({
 
     return federatedConnectors.find(
       (connector) =>
-        connector.source === `federated_${sourceMetadata.internalName}`
+        federatedSourceToRegularSource(connector.source) ===
+        sourceMetadata.internalName
     );
   }, [sourceMetadata, federatedConnectors]);
 

web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx

@@ -511,6 +511,7 @@ export default function AddConnector({
               includeDivider={false}
               icon={<SourceIcon iconSize={32} sourceType={connector} />}
               title={displayName}
+              farRightElement={undefined}
             />
 
             {formStep == 0 && (

web/src/app/admin/connectors/[connector]/ConnectorWrapper.tsx

@@ -8,12 +8,26 @@ import { HeaderTitle } from "@/components/header/HeaderTitle";
 import { Button } from "@/components/ui/button";
 import { isValidSource, getSourceMetadata } from "@/lib/sources";
 import { FederatedConnectorForm } from "@/components/admin/federated/FederatedConnectorForm";
+import { useSearchParams } from "next/navigation";
+import useSWR from "swr";
+import { errorHandlingFetcher } from "@/lib/fetcher";
+import { buildSimilarCredentialInfoURL } from "@/app/admin/connector/[ccPairId]/lib";
+import { Credential } from "@/lib/connectors/credentials";
 
 export default function ConnectorWrapper({
   connector,
 }: {
   connector: ConfigurableSources;
 }) {
+  const searchParams = useSearchParams();
+  const mode = searchParams?.get("mode"); // 'federated' or 'regular'
+
+  // Fetch existing credentials for this connector type
+  const { data: existingCredentials } = useSWR<Credential<any>[]>(
+    buildSimilarCredentialInfoURL(connector),
+    errorHandlingFetcher
+  );
+
   // Check if the connector is valid
   if (!isValidSource(connector)) {
     return (
@@ -39,12 +53,34 @@ export default function ConnectorWrapper({
     );
   }
 
-  // Check if the connector is federated
   const sourceMetadata = getSourceMetadata(connector);
-  const isFederated = sourceMetadata.federated;
+  const supportsFederated = sourceMetadata.federated === true;
+  const hasExistingCredentials =
+    existingCredentials && existingCredentials.length > 0;
+
+  // Determine which form to show based on:
+  // 1. URL parameter mode (takes priority)
+  // 2. If no mode specified and existing credentials exist, show regular form
+  // 3. If no mode specified and no credentials, show federated form for federated-supported sources
+  let showFederatedForm = false;
+
+  if (mode === "federated") {
+    showFederatedForm = supportsFederated;
+  } else if (mode === "regular") {
+    showFederatedForm = false;
+  } else {
+    // No mode specified - use default logic
+    if (hasExistingCredentials) {
+      // Default to regular form if existing credentials exist
+      showFederatedForm = false;
+    } else {
+      // Default to federated for federated-supported sources with no existing credentials
+      showFederatedForm = supportsFederated;
+    }
+  }
 
-  // For federated connectors, use the specialized form without FormProvider
-  if (isFederated) {
+  // For federated form, use the specialized form without FormProvider
+  if (showFederatedForm) {
     return (
       <div className="flex justify-center w-full h-full">
         <div className="mt-12 w-full max-w-4xl mx-auto">

web/src/app/admin/indexing/status/CCPairIndexingStatusTable.tsx

@@ -18,6 +18,7 @@ import {
   ValidSources,
   ValidStatuses,
   FederatedConnectorInfo,
+  federatedSourceToRegularSource,
 } from "@/lib/types";
 import { useRouter } from "next/navigation";
 import {
@@ -245,7 +246,7 @@ border border-border dark:border-neutral-700
           {federatedConnector.name}
         </p>
       </TableCell>
-      <TableCell>n/a</TableCell>
+      <TableCell>N/A</TableCell>
       <TableCell>
         <Badge variant="success">Indexed</Badge>
       </TableCell>
@@ -256,7 +257,7 @@ border border-border dark:border-neutral-700
           </Badge>
         </TableCell>
       )}
-      <TableCell>n/a</TableCell>
+      <TableCell>N/A</TableCell>
       <TableCell>
         <TooltipProvider>
           <Tooltip>
@@ -357,7 +358,7 @@ export function CCPairIndexingStatusTable({
     sorted.forEach((source) => {
       const statuses = grouped[source];
       const federatedForSource = federatedConnectors.filter(
-        (fc) => fc.source.replace(/^federated_/, "") === source
+        (fc) => federatedSourceToRegularSource(fc.source) === source
       );
 
       summaries[source] = {
@@ -446,7 +447,9 @@ export function CCPairIndexingStatusTable({
   const allSourcesWithFederated = useMemo(() => {
     const federatedSources = Array.from(
       new Set(
-        federatedConnectors.map((fc) => fc.source.replace(/^federated_/, ""))
+        federatedConnectors.map((fc) =>
+          federatedSourceToRegularSource(fc.source)
+        )
       )
     ) as ValidSources[];
 
@@ -696,7 +699,7 @@ export function CCPairIndexingStatusTable({
               );
 
               const federatedForSource = federatedConnectors.filter(
-                (fc) => fc.source.replace(/^federated_/, "") === source
+                (fc) => federatedSourceToRegularSource(fc.source) === source
               );
 
               const hasFederatedMatches = federatedForSource.some((fc) =>

web/src/app/chat/ChatPage.tsx

@@ -484,7 +484,17 @@ export function ChatPage({
         return getSourceMetadata(connector.source as ValidSources);
       }) || [];
 
-    return [...regularSources, ...federatedSources];
+    // Combine sources and deduplicate based on internalName
+    const allSources = [...regularSources, ...federatedSources];
+    const deduplicatedSources = allSources.reduce((acc, source) => {
+      const existing = acc.find((s) => s.internalName === source.internalName);
+      if (!existing) {
+        acc.push(source);
+      }
+      return acc;
+    }, [] as SourceMetadata[]);
+
+    return deduplicatedSources;
   }, [availableSources, federatedConnectorsData]);
 
   const stopGenerating = () => {

web/src/app/chat/modal/UserSettingsModal.tsx

@@ -296,12 +296,12 @@ export function UserSettingsModal({
         showPasswordSection || hasConnectors ? "max-w-3xl" : "max-w-xl"
       }`}
     >
-      <div className="p-2">
+      <div className="p-2 max-h-[80vh] flex flex-col">
         <h2 className="text-xl font-bold mb-4">User Settings</h2>
         <Separator className="mb-6" />
-        <div className="flex">
+        <div className="flex flex-1 min-h-0">
           {(showPasswordSection || hasConnectors) && (
-            <div className="w-1/4 pr-4">
+            <div className="w-1/4 pr-4 flex-shrink-0">
               <nav>
                 <ul className="space-y-2">
                   <li>
@@ -350,8 +350,10 @@ export function UserSettingsModal({
           )}
           <div
             className={`${
-              showPasswordSection || hasConnectors ? "w-3/4 pl-4" : "w-full"
-            }`}
+              showPasswordSection || hasConnectors
+                ? "w-3/4 pl-4 pr-3"
+                : "w-full pr-3"
+            } overflow-y-scroll default-scrollbar`}
           >
             {activeSection === "settings" && (
               <div className="space-y-6">

web/src/components/FederatedConnectorSelector.tsx

@@ -1,5 +1,10 @@
 import React, { useState, useRef, useEffect } from "react";
-import { FederatedConnectorInfo, FederatedConnectorConfig } from "@/lib/types";
+import {
+  FederatedConnectorInfo,
+  FederatedConnectorConfig,
+  federatedSourceToRegularSource,
+  ValidSources,
+} from "@/lib/types";
 import { SourceIcon } from "@/components/SourceIcon";
 import { X, Search, Settings } from "lucide-react";
 import { Label } from "@/components/ui/label";
@@ -28,7 +33,7 @@ interface FederatedConnectorSelectorProps {
 interface EntityConfigDialogProps {
   connectorId: number;
   connectorName: string;
-  connectorSource: string;
+  connectorSource: ValidSources | null;
   currentEntities: Record<string, any>;
   onSave: (entities: Record<string, any>) => void;
   onClose: () => void;
@@ -92,13 +97,17 @@ const EntityConfigDialog = ({
     }));
   };
 
+  if (!connectorSource) {
+    return null;
+  }
+
   return (
     <Dialog open={isOpen} onOpenChange={onClose}>
       <DialogContent className="max-w-md">
         <DialogHeader>
           <DialogTitle className="flex items-center gap-2">
             <SourceIcon
-              sourceType={connectorSource.replace(/^federated_/, "") as any}
+              sourceType={federatedSourceToRegularSource(connectorSource)}
               iconSize={20}
             />
             Configure {connectorName}
@@ -219,13 +228,13 @@ export const FederatedConnectorSelector = ({
     isOpen: boolean;
     connectorId: number | null;
     connectorName: string;
-    connectorSource: string;
+    connectorSource: ValidSources | null;
     currentEntities: Record<string, any>;
   }>({
     isOpen: false,
     connectorId: null,
     connectorName: "",
-    connectorSource: "",
+    connectorSource: null,
     currentEntities: {},
   });
   const dropdownRef = useRef<HTMLDivElement>(null);
@@ -410,9 +419,9 @@ export const FederatedConnectorSelector = ({
                     <div className="flex items-center truncate mr-2">
                       <div className="mr-2">
                         <SourceIcon
-                          sourceType={
-                            connector.source.replace(/^federated_/, "") as any
-                          }
+                          sourceType={federatedSourceToRegularSource(
+                            connector.source
+                          )}
                           iconSize={16}
                         />
                       </div>
@@ -444,9 +453,9 @@ export const FederatedConnectorSelector = ({
                   <div className="flex items-center overflow-hidden">
                     <div className="mr-1 flex-shrink-0">
                       <SourceIcon
-                        sourceType={
-                          connector.source.replace(/^federated_/, "") as any
-                        }
+                        sourceType={federatedSourceToRegularSource(
+                          connector.source
+                        )}
                         iconSize={14}
                       />
                     </div>

web/src/components/admin/federated/FederatedConnectorForm.tsx

@@ -33,6 +33,7 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from "@/components/ui/tooltip";
+import { Badge } from "@/components/ui/badge";
 
 export interface FederatedConnectorFormProps {
   connector: ConfigurableSources;
@@ -467,9 +468,11 @@ export function FederatedConnectorForm({
         <div className="ml-2 overflow-hidden text-ellipsis whitespace-nowrap flex-1 mr-4">
           <div className="text-2xl font-bold text-text-default flex items-center gap-2">
             <span>
-              {isEditMode ? "Edit" : "Setup"} {sourceMetadata.displayName}{" "}
-              (Federated)
+              {isEditMode ? "Edit" : "Setup"} {sourceMetadata.displayName}
             </span>
+            <Badge variant="outline" className="text-xs">
+              Federated
+            </Badge>
             <TooltipProvider>
               <Tooltip>
                 <TooltipTrigger asChild>

web/src/lib/types.ts

@@ -177,7 +177,7 @@ export interface ConnectorIndexingStatus<
 
 export interface FederatedConnectorInfo {
   id: number;
-  source: string;
+  source: ValidSources;
   name: string;
   status: string;
   last_success: string | null;
@@ -434,6 +434,15 @@ export enum ValidSources {
   FederatedSlack = "federated_slack",
 }
 
+export const federatedSourceToRegularSource = (
+  maybeFederatedSource: ValidSources
+): ValidSources => {
+  if (maybeFederatedSource === ValidSources.FederatedSlack) {
+    return ValidSources.Slack;
+  }
+  return maybeFederatedSource;
+};
+
 export const validAutoSyncSources = [
   ValidSources.Confluence,
   ValidSources.GoogleDrive,