Skip to content

Create Team Form: Disallow selecting 'All Proxy Models' when organization is selected #10269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Create Team Form: Disallow selecting 'All Proxy Models' when organization is selected #10269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions ui/litellm-dashboard/src/components/teams.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, useEffect } from "react";
import React, { useState, useEffect, useMemo } from "react";
import Link from "next/link";
import { Typography } from "antd";
import { teamDeleteCall, teamUpdateCall, teamInfoCall, Organization, DEFAULT_ORGANIZATION } from "./networking";
Expand Down Expand Up @@ -118,7 +118,6 @@ const Teams: React.FC<TeamProps> = ({
}) => {
const [lastRefreshed, setLastRefreshed] = useState("");
const [currentOrg, setCurrentOrg] = useState<Organization | null>(null);
const [currentOrgForCreateTeam, setCurrentOrgForCreateTeam] = useState<Organization | null>(null);

useEffect(() => {
console.log(`inside useeffect - ${lastRefreshed}`)
Expand Down Expand Up @@ -149,7 +148,11 @@ const Teams: React.FC<TeamProps> = ({
const [teamToDelete, setTeamToDelete] = useState<string | null>(null);
const [modelsToPick, setModelsToPick] = useState<string[]>([]);

const selectedOrganizationId = Form.useWatch('organization_id', form)

const currentOrgForCreateTeam = useMemo<Organization | null>(() => {
return organizations?.find((org) => org.organization_id === selectedOrganizationId) || null
}, [selectedOrganizationId])

const [perTeamInfo, setPerTeamInfo] = useState<Record<string, any>>({});

Expand Down Expand Up @@ -665,7 +668,12 @@ const Teams: React.FC<TeamProps> = ({
placeholder="Search or select an Organization"
onChange={(value) => {
form.setFieldValue('organization_id', value);
setCurrentOrgForCreateTeam(organizations?.find((org) => org.organization_id === value) || null);
if (value) {
const selectedModels = form.getFieldValue('models') as (string[] | undefined)
if (selectedModels) {
form.setFieldValue('models', selectedModels.filter(m => m !== 'all-proxy-models'))
}
}
}}
filterOption={(input, option) => {
if (!option) return false;
Expand Down Expand Up @@ -695,12 +703,14 @@ const Teams: React.FC<TeamProps> = ({
placeholder="Select models"
style={{ width: "100%" }}
>
<Select2.Option
key="all-proxy-models"
value="all-proxy-models"
>
All Proxy Models
</Select2.Option>
{selectedOrganizationId ? null : (
<Select2.Option
key="all-proxy-models"
value="all-proxy-models"
>
All Proxy Models
</Select2.Option>
)}
{modelsToPick.map((model) => (
<Select2.Option key={model} value={model}>
{getModelDisplayName(model)}
Expand Down
Loading