From 6fd7a3ec766278e962f8512694bf1951cf861e37 Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Wed, 8 Apr 2026 17:13:50 -0700
Subject: [PATCH 01/11] [Feature] UI - Teams: Add router settings to team
 Settings tab

Add RouterSettingsAccordion to the team edit form and a read-only
display of router settings (routing strategy, retries, fallbacks,
cooldown, timeout, tag filtering) in the Settings tab.
---
 .../src/components/team/TeamInfo.tsx          | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
index 6308be65860..722c5218ce6 100644
--- a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
+++ b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
@@ -41,6 +41,7 @@ import ObjectPermissionsView from "../object_permissions_view";
 import NumericalInput from "../shared/numerical_input";
 import VectorStoreSelector from "../vector_store_management/VectorStoreSelector";
 import EditLoggingSettings from "./EditLoggingSettings";
+import RouterSettingsAccordion, { RouterSettingsAccordionValue } from "../common_components/RouterSettingsAccordion";
 import MemberModal from "./EditMembership";
 import MemberPermissions from "./member_permissions";
 import {
@@ -98,6 +99,7 @@ export interface TeamData {
     access_group_models?: string[];
     access_group_mcp_server_ids?: string[];
     access_group_agent_ids?: string[];
+    router_settings?: Record<string, any>;
     guardrails?: string[];
     policies?: string[];
     object_permission?: {
@@ -187,6 +189,7 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
   const [isDeleting, setIsDeleting] = useState(false);
   const [isTeamSaving, setIsTeamSaving] = useState(false);
+  const [routerSettings, setRouterSettings] = useState<RouterSettingsAccordionValue | null>(null);
   const [organization, setOrganization] = useState<Organization | null>(null);
   const { userRole, userId } = useAuthorized();
   const { data: userOrganizations = [] } = useOrganizations();
@@ -588,10 +591,21 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
         updateData.access_group_ids = values.access_group_ids;
       }
 
+      // Handle router_settings
+      if (routerSettings?.router_settings) {
+        const hasValues = Object.values(routerSettings.router_settings).some(
+          (value) => value !== null && value !== undefined && value !== "",
+        );
+        if (hasValues) {
+          updateData.router_settings = routerSettings.router_settings;
+        }
+      }
+
       const response = await teamUpdateCall(accessToken, updateData);
 
       NotificationsManager.success("Team settings updated successfully");
       setIsEditing(false);
+      setRouterSettings(null);
       fetchTeamInfo();
     } catch (error) {
       console.error("Error updating team:", error);
@@ -1086,6 +1100,15 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
                       </Form.List>
                     </Form.Item>
 
+                    <Form.Item label="Router Settings">
+                      <RouterSettingsAccordion
+                        accessToken={accessToken || ""}
+                        value={routerSettings || (info.router_settings ? { router_settings: info.router_settings } : undefined)}
+                        onChange={setRouterSettings}
+                        modelData={userModels.length > 0 ? { data: userModels.map((model) => ({ model_name: model })) } : undefined}
+                      />
+                    </Form.Item>
+
                     <Form.Item
                       label={
                         <span>
@@ -1373,6 +1396,44 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
                       <div>TPM Limit: {info.team_member_budget_table?.tpm_limit || "No Limit"}</div>
                       <div>RPM Limit: {info.team_member_budget_table?.rpm_limit || "No Limit"}</div>
                     </div>
+                    <div>
+                      <Text className="font-medium">Router Settings</Text>
+                      {info.router_settings && Object.values(info.router_settings).some(
+                        (v) => v !== null && v !== undefined && v !== "" && !(Array.isArray(v) && v.length === 0)
+                      ) ? (
+                        <div className="mt-1 space-y-1">
+                          {info.router_settings.routing_strategy && (
+                            <div>
+                              Routing Strategy:{" "}
+                              <Badge color="blue">{info.router_settings.routing_strategy}</Badge>
+                            </div>
+                          )}
+                          {info.router_settings.num_retries != null && (
+                            <div>Number of Retries: {info.router_settings.num_retries}</div>
+                          )}
+                          {info.router_settings.allowed_fails != null && (
+                            <div>Allowed Failures: {info.router_settings.allowed_fails}</div>
+                          )}
+                          {info.router_settings.cooldown_time != null && (
+                            <div>Cooldown Time: {info.router_settings.cooldown_time}s</div>
+                          )}
+                          {info.router_settings.timeout != null && (
+                            <div>Timeout: {info.router_settings.timeout}s</div>
+                          )}
+                          {info.router_settings.retry_after != null && (
+                            <div>Retry After: {info.router_settings.retry_after}s</div>
+                          )}
+                          {info.router_settings.fallbacks && Array.isArray(info.router_settings.fallbacks) && info.router_settings.fallbacks.length > 0 && (
+                            <div>Fallbacks: {info.router_settings.fallbacks.length} configured</div>
+                          )}
+                          {info.router_settings.enable_tag_filtering && (
+                            <div>Tag Filtering: Enabled</div>
+                          )}
+                        </div>
+                      ) : (
+                        <div className="text-gray-400">No router settings configured</div>
+                      )}
+                    </div>
                     <div>
                       <Text className="font-medium">Organization ID</Text>
                       <div>{info.organization_id}</div>

From a449cf801f6b2976cc3e4a9e29cc01a91e41ac60 Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Wed, 8 Apr 2026 17:17:45 -0700
Subject: [PATCH 02/11] fix: reset router settings state on cancel to prevent
 stale data

---
 ui/litellm-dashboard/src/components/team/TeamInfo.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
index 722c5218ce6..1459f323a64 100644
--- a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
+++ b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
@@ -1308,7 +1308,7 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
 
                     <div className="sticky z-10 bg-white p-4 pr-0 border-t border-gray-200 bottom-[-1.5rem] inset-x-[-1.5rem]">
                       <div className="flex justify-end items-center gap-2">
-                        <Button onClick={() => setIsEditing(false)} disabled={isTeamSaving}>
+                        <Button onClick={() => { setIsEditing(false); setRouterSettings(null); }} disabled={isTeamSaving}>
                           Cancel
                         </Button>
                         <Button icon={<SaveOutlined className="h-4 w-4" />} type="primary" htmlType="submit" loading={isTeamSaving}>

From 7654234f20d76a5c77512a17b029207ff9501309 Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Wed, 8 Apr 2026 17:49:37 -0700
Subject: [PATCH 03/11] fix: use ref to read router settings at save time
 instead of stale state

The RouterSettingsAccordion uses uncontrolled DOM inputs for numeric fields.
The onChange effect only fires when formValue or fallbacks change, not when
the user types into uncontrolled inputs. Using the ref's getValue() method
at save time ensures we read fresh values from the DOM.
---
 .../src/components/team/TeamInfo.tsx                | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
index 1459f323a64..9ed04580667 100644
--- a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
+++ b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
@@ -41,7 +41,7 @@ import ObjectPermissionsView from "../object_permissions_view";
 import NumericalInput from "../shared/numerical_input";
 import VectorStoreSelector from "../vector_store_management/VectorStoreSelector";
 import EditLoggingSettings from "./EditLoggingSettings";
-import RouterSettingsAccordion, { RouterSettingsAccordionValue } from "../common_components/RouterSettingsAccordion";
+import RouterSettingsAccordion, { RouterSettingsAccordionRef, RouterSettingsAccordionValue } from "../common_components/RouterSettingsAccordion";
 import MemberModal from "./EditMembership";
 import MemberPermissions from "./member_permissions";
 import {
@@ -190,6 +190,7 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
   const [isDeleting, setIsDeleting] = useState(false);
   const [isTeamSaving, setIsTeamSaving] = useState(false);
   const [routerSettings, setRouterSettings] = useState<RouterSettingsAccordionValue | null>(null);
+  const routerSettingsRef = React.useRef<RouterSettingsAccordionRef>(null);
   const [organization, setOrganization] = useState<Organization | null>(null);
   const { userRole, userId } = useAuthorized();
   const { data: userOrganizations = [] } = useOrganizations();
@@ -591,13 +592,14 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
         updateData.access_group_ids = values.access_group_ids;
       }
 
-      // Handle router_settings
-      if (routerSettings?.router_settings) {
-        const hasValues = Object.values(routerSettings.router_settings).some(
+      // Handle router_settings - use ref to get fresh values from DOM at save time
+      const currentRouterSettings = routerSettingsRef.current?.getValue() ?? routerSettings;
+      if (currentRouterSettings?.router_settings) {
+        const hasValues = Object.values(currentRouterSettings.router_settings).some(
           (value) => value !== null && value !== undefined && value !== "",
         );
         if (hasValues) {
-          updateData.router_settings = routerSettings.router_settings;
+          updateData.router_settings = currentRouterSettings.router_settings;
         }
       }
 
@@ -1102,6 +1104,7 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
 
                     <Form.Item label="Router Settings">
                       <RouterSettingsAccordion
+                        ref={routerSettingsRef}
                         accessToken={accessToken || ""}
                         value={routerSettings || (info.router_settings ? { router_settings: info.router_settings } : undefined)}
                         onChange={setRouterSettings}

From f93db822fd15c369f235ac6df9a00bd885c7bcf2 Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Wed, 8 Apr 2026 17:53:53 -0700
Subject: [PATCH 04/11] fix: treat empty router settings inputs as null instead
 of preserving old values

When a user clears a numeric field in the RouterSettingsAccordion, the empty
input should result in null, not fall through to the previous value from state.
---
 .../common_components/RouterSettingsAccordion.tsx      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx b/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx
index ae4b87a3587..18c5d52b4f7 100644
--- a/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx
+++ b/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx
@@ -241,9 +241,13 @@ const RouterSettingsAccordion = forwardRef<RouterSettingsAccordionRef, RouterSet
               key !== "fallbacks"
             ) {
               const inputEl = document.querySelector(`input[name="${key}"]`) as HTMLInputElement | null;
-              if (inputEl && inputEl.value !== undefined && inputEl.value !== "") {
-                const parsed = parseInputValue(key, inputEl.value, value);
-                return [key, parsed];
+              if (inputEl) {
+                if (inputEl.value !== undefined && inputEl.value !== "") {
+                  const parsed = parseInputValue(key, inputEl.value, value);
+                  return [key, parsed];
+                }
+                // Input exists but is empty — user cleared it, set to null
+                return [key, null];
               }
               return [key, value];
             } else if (key === "routing_strategy") {

From 25dd4f3e7a58a7c97548427e3ab1f583827d8acb Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Wed, 8 Apr 2026 17:59:23 -0700
Subject: [PATCH 05/11] fix: make RouterSettingsAccordion tabs controlled to
 prevent tab reset

The uncontrolled TabGroup reset to the first tab whenever the component
re-rendered due to onChange state updates. Using controlled index/onIndexChange
keeps the user on the current tab during fallback selection.
---
 .../common_components/RouterSettingsAccordion.tsx        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx b/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx
index 18c5d52b4f7..fe7fcd9a67f 100644
--- a/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx
+++ b/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx
@@ -47,6 +47,7 @@ const RouterSettingsAccordion = forwardRef<RouterSettingsAccordionRef, RouterSet
     const [modelInfo, setModelInfo] = useState<ModelGroup[]>([]);
     const [availableRoutingStrategies, setAvailableRoutingStrategies] = useState<string[]>([]);
     const [routerFieldsMetadata, setRouterFieldsMetadata] = useState<{ [key: string]: any }>({});
+    const [selectedTabIndex, setSelectedTabIndex] = useState(0);
     const [routingStrategyDescriptions, setRoutingStrategyDescriptions] = useState<{ [key: string]: string }>({});
     const isInternalUpdateRef = useRef(false);
     const lastInitializedValueRef = useRef<string | null>(null);
@@ -342,10 +343,10 @@ const RouterSettingsAccordion = forwardRef<RouterSettingsAccordionRef, RouterSet
 
     return (
       <div className="w-full">
-        <TabGroup className="w-full">
-          <TabList variant="line" defaultValue="1" className="px-8 pt-4">
-            <Tab value="1">Loadbalancing</Tab>
-            <Tab value="2">Fallbacks</Tab>
+        <TabGroup className="w-full" index={selectedTabIndex} onIndexChange={setSelectedTabIndex}>
+          <TabList variant="line" className="px-8 pt-4">
+            <Tab>Loadbalancing</Tab>
+            <Tab>Fallbacks</Tab>
           </TabList>
           <TabPanels className="px-8 py-6">
             <TabPanel>

From aa9319128e10b5c70d40e46ef2c27c883e34bde2 Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Wed, 8 Apr 2026 18:00:59 -0700
Subject: [PATCH 06/11] Revert "fix: make RouterSettingsAccordion tabs
 controlled to prevent tab reset"

This reverts commit 9ff4bf66b03912f2c1ab893d2bdb31fba0ea9488.
---
 .../common_components/RouterSettingsAccordion.tsx        | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx b/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx
index fe7fcd9a67f..18c5d52b4f7 100644
--- a/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx
+++ b/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx
@@ -47,7 +47,6 @@ const RouterSettingsAccordion = forwardRef<RouterSettingsAccordionRef, RouterSet
     const [modelInfo, setModelInfo] = useState<ModelGroup[]>([]);
     const [availableRoutingStrategies, setAvailableRoutingStrategies] = useState<string[]>([]);
     const [routerFieldsMetadata, setRouterFieldsMetadata] = useState<{ [key: string]: any }>({});
-    const [selectedTabIndex, setSelectedTabIndex] = useState(0);
     const [routingStrategyDescriptions, setRoutingStrategyDescriptions] = useState<{ [key: string]: string }>({});
     const isInternalUpdateRef = useRef(false);
     const lastInitializedValueRef = useRef<string | null>(null);
@@ -343,10 +342,10 @@ const RouterSettingsAccordion = forwardRef<RouterSettingsAccordionRef, RouterSet
 
     return (
       <div className="w-full">
-        <TabGroup className="w-full" index={selectedTabIndex} onIndexChange={setSelectedTabIndex}>
-          <TabList variant="line" className="px-8 pt-4">
-            <Tab>Loadbalancing</Tab>
-            <Tab>Fallbacks</Tab>
+        <TabGroup className="w-full">
+          <TabList variant="line" defaultValue="1" className="px-8 pt-4">
+            <Tab value="1">Loadbalancing</Tab>
+            <Tab value="2">Fallbacks</Tab>
           </TabList>
           <TabPanels className="px-8 py-6">
             <TabPanel>

From 7d3c0b1cacd0d106ea9d69f7ff47d05304173258 Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Wed, 8 Apr 2026 18:02:44 -0700
Subject: [PATCH 07/11] fix: prevent internal onChange from re-initializing
 fallback groups

When a fallback model was selected, the onChange effect fired, parent
re-rendered with new value prop, and the useEffect re-initialized the
groups with new IDs from fallbacksToGroups. This caused the active
fallback group tab to reset to Group 1. Now internal updates always
skip re-initialization regardless of value key changes.
---
 .../common_components/RouterSettingsAccordion.tsx      | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx b/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx
index 18c5d52b4f7..b1bcf3029b3 100644
--- a/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx
+++ b/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx
@@ -92,17 +92,13 @@ const RouterSettingsAccordion = forwardRef<RouterSettingsAccordionRef, RouterSet
         })
         : null;
 
-      // Skip if this is an internal update (from our own onChange) and the value hasn't actually changed
-      if (isInternalUpdateRef.current && valueKey === lastInitializedValueRef.current) {
+      // Skip if this is an internal update (from our own onChange)
+      if (isInternalUpdateRef.current) {
         isInternalUpdateRef.current = false;
+        lastInitializedValueRef.current = valueKey;
         return;
       }
 
-      // Reset the flag if value actually changed externally
-      if (isInternalUpdateRef.current && valueKey !== lastInitializedValueRef.current) {
-        isInternalUpdateRef.current = false;
-      }
-
       // Only update if the value actually changed from an external source
       if (valueKey === lastInitializedValueRef.current) {
         return;

From f6d5d709037c76553b939961f1cd2a5d6a71c4b9 Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Wed, 8 Apr 2026 18:04:50 -0700
Subject: [PATCH 08/11] refactor: simplify router settings integration - use
 ref-only, no onChange loop

Remove the onChange/value feedback loop between TeamInfo and
RouterSettingsAccordion. The parent passes initial value once and reads
current values at save time via ref.getValue(). This eliminates the
circular data flow that caused stale state and fallback tab resets.
---
 .../common_components/RouterSettingsAccordion.tsx   | 10 +++++++---
 .../src/components/team/TeamInfo.tsx                | 13 +++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx b/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx
index b1bcf3029b3..18c5d52b4f7 100644
--- a/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx
+++ b/ui/litellm-dashboard/src/components/common_components/RouterSettingsAccordion.tsx
@@ -92,13 +92,17 @@ const RouterSettingsAccordion = forwardRef<RouterSettingsAccordionRef, RouterSet
         })
         : null;
 
-      // Skip if this is an internal update (from our own onChange)
-      if (isInternalUpdateRef.current) {
+      // Skip if this is an internal update (from our own onChange) and the value hasn't actually changed
+      if (isInternalUpdateRef.current && valueKey === lastInitializedValueRef.current) {
         isInternalUpdateRef.current = false;
-        lastInitializedValueRef.current = valueKey;
         return;
       }
 
+      // Reset the flag if value actually changed externally
+      if (isInternalUpdateRef.current && valueKey !== lastInitializedValueRef.current) {
+        isInternalUpdateRef.current = false;
+      }
+
       // Only update if the value actually changed from an external source
       if (valueKey === lastInitializedValueRef.current) {
         return;
diff --git a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
index 9ed04580667..d0aa2ebf26f 100644
--- a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
+++ b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
@@ -41,7 +41,7 @@ import ObjectPermissionsView from "../object_permissions_view";
 import NumericalInput from "../shared/numerical_input";
 import VectorStoreSelector from "../vector_store_management/VectorStoreSelector";
 import EditLoggingSettings from "./EditLoggingSettings";
-import RouterSettingsAccordion, { RouterSettingsAccordionRef, RouterSettingsAccordionValue } from "../common_components/RouterSettingsAccordion";
+import RouterSettingsAccordion, { RouterSettingsAccordionRef } from "../common_components/RouterSettingsAccordion";
 import MemberModal from "./EditMembership";
 import MemberPermissions from "./member_permissions";
 import {
@@ -189,7 +189,6 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
   const [isDeleting, setIsDeleting] = useState(false);
   const [isTeamSaving, setIsTeamSaving] = useState(false);
-  const [routerSettings, setRouterSettings] = useState<RouterSettingsAccordionValue | null>(null);
   const routerSettingsRef = React.useRef<RouterSettingsAccordionRef>(null);
   const [organization, setOrganization] = useState<Organization | null>(null);
   const { userRole, userId } = useAuthorized();
@@ -592,8 +591,8 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
         updateData.access_group_ids = values.access_group_ids;
       }
 
-      // Handle router_settings - use ref to get fresh values from DOM at save time
-      const currentRouterSettings = routerSettingsRef.current?.getValue() ?? routerSettings;
+      // Handle router_settings - read fresh values from DOM at save time
+      const currentRouterSettings = routerSettingsRef.current?.getValue();
       if (currentRouterSettings?.router_settings) {
         const hasValues = Object.values(currentRouterSettings.router_settings).some(
           (value) => value !== null && value !== undefined && value !== "",
@@ -607,7 +606,6 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
 
       NotificationsManager.success("Team settings updated successfully");
       setIsEditing(false);
-      setRouterSettings(null);
       fetchTeamInfo();
     } catch (error) {
       console.error("Error updating team:", error);
@@ -1106,8 +1104,7 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
                       <RouterSettingsAccordion
                         ref={routerSettingsRef}
                         accessToken={accessToken || ""}
-                        value={routerSettings || (info.router_settings ? { router_settings: info.router_settings } : undefined)}
-                        onChange={setRouterSettings}
+                        value={info.router_settings ? { router_settings: info.router_settings } : undefined}
                         modelData={userModels.length > 0 ? { data: userModels.map((model) => ({ model_name: model })) } : undefined}
                       />
                     </Form.Item>
@@ -1311,7 +1308,7 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
 
                     <div className="sticky z-10 bg-white p-4 pr-0 border-t border-gray-200 bottom-[-1.5rem] inset-x-[-1.5rem]">
                       <div className="flex justify-end items-center gap-2">
-                        <Button onClick={() => { setIsEditing(false); setRouterSettings(null); }} disabled={isTeamSaving}>
+                        <Button onClick={() => setIsEditing(false)} disabled={isTeamSaving}>
                           Cancel
                         </Button>
                         <Button icon={<SaveOutlined className="h-4 w-4" />} type="primary" htmlType="submit" loading={isTeamSaving}>

From ce6973109a5b56894ec8e1ffb470885223031ce1 Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Wed, 8 Apr 2026 21:08:44 -0700
Subject: [PATCH 09/11] fix: add getRouterSettingsCall mock to TeamInfo tests

---
 ui/litellm-dashboard/src/components/team/TeamInfo.test.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/litellm-dashboard/src/components/team/TeamInfo.test.tsx b/ui/litellm-dashboard/src/components/team/TeamInfo.test.tsx
index fb149458f61..c01a33ad78d 100644
--- a/ui/litellm-dashboard/src/components/team/TeamInfo.test.tsx
+++ b/ui/litellm-dashboard/src/components/team/TeamInfo.test.tsx
@@ -17,6 +17,7 @@ vi.mock("@/components/networking", () => ({
   fetchMCPAccessGroups: vi.fn(),
   getTeamPermissionsCall: vi.fn(),
   organizationInfoCall: vi.fn(),
+  getRouterSettingsCall: vi.fn().mockResolvedValue({ fields: [] }),
 }));
 
 vi.mock("@/components/utils/dataUtils", () => ({

From 4ba9219e1dc63c8043cf8c4db6d039d86f7cdc96 Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Wed, 8 Apr 2026 22:15:38 -0700
Subject: [PATCH 10/11] fix: exclude defaults from hasValues check to avoid
 overwriting router settings

enable_tag_filtering: false (the default) passed the hasValues guard,
causing every team save to send router_settings even for teams that
never had them configured. This could silently overwrite backend-set
values. Now exclude false and empty arrays from the check.
---
 ui/litellm-dashboard/src/components/team/TeamInfo.tsx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
index d0aa2ebf26f..96cde701f7d 100644
--- a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
+++ b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
@@ -591,11 +591,18 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
         updateData.access_group_ids = values.access_group_ids;
       }
 
-      // Handle router_settings - read fresh values from DOM at save time
+      // Handle router_settings - read fresh values from DOM at save time.
+      // Only include if the user actually configured something meaningful
+      // (exclude defaults like enable_tag_filtering: false and empty arrays).
       const currentRouterSettings = routerSettingsRef.current?.getValue();
       if (currentRouterSettings?.router_settings) {
         const hasValues = Object.values(currentRouterSettings.router_settings).some(
-          (value) => value !== null && value !== undefined && value !== "",
+          (value) =>
+            value !== null &&
+            value !== undefined &&
+            value !== "" &&
+            value !== false &&
+            !(Array.isArray(value) && value.length === 0),
         );
         if (hasValues) {
           updateData.router_settings = currentRouterSettings.router_settings;

From e8c51ecd7c61f871ed044eb8f22bee98c51821eb Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Wed, 8 Apr 2026 22:24:21 -0700
Subject: [PATCH 11/11] fix: address PR review - allow clearing router
 settings, remove unused modelData prop

- Send router_settings when clearing existing settings (so backend
  updates instead of silently retaining old values)
- Remove unused modelData prop from RouterSettingsAccordion (it fetches
  models internally via fetchAvailableModels)
---
 .../src/components/team/TeamInfo.tsx          | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
index 96cde701f7d..a4008e08342 100644
--- a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
+++ b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
@@ -592,19 +592,21 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
       }
 
       // Handle router_settings - read fresh values from DOM at save time.
-      // Only include if the user actually configured something meaningful
-      // (exclude defaults like enable_tag_filtering: false and empty arrays).
       const currentRouterSettings = routerSettingsRef.current?.getValue();
       if (currentRouterSettings?.router_settings) {
-        const hasValues = Object.values(currentRouterSettings.router_settings).some(
-          (value) =>
-            value !== null &&
-            value !== undefined &&
-            value !== "" &&
-            value !== false &&
-            !(Array.isArray(value) && value.length === 0),
-        );
-        if (hasValues) {
+        const isMeaningfulValue = (value: unknown) =>
+          value !== null &&
+          value !== undefined &&
+          value !== "" &&
+          value !== false &&
+          !(Array.isArray(value) && value.length === 0);
+
+        const hasNewValues = Object.values(currentRouterSettings.router_settings).some(isMeaningfulValue);
+        const hadExistingSettings = info.router_settings &&
+          Object.values(info.router_settings).some(isMeaningfulValue);
+
+        // Send if there are new values OR if the user is clearing existing ones
+        if (hasNewValues || hadExistingSettings) {
           updateData.router_settings = currentRouterSettings.router_settings;
         }
       }
@@ -1112,7 +1114,6 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
                         ref={routerSettingsRef}
                         accessToken={accessToken || ""}
                         value={info.router_settings ? { router_settings: info.router_settings } : undefined}
-                        modelData={userModels.length > 0 ? { data: userModels.map((model) => ({ model_name: model })) } : undefined}
                       />
                     </Form.Item>