Revert "Added filter in Teams and fixed spacing & height issues in Teams tabs…" (#8416)

This reverts commit 352cfaa12c.
This commit is contained in:
Krish Dholakia 2025-02-08 23:25:56 -08:00 committed by GitHub
parent 33327813b9
commit ab83bc0ec0
2 changed files with 12 additions and 37 deletions

View file

@ -25,13 +25,11 @@ interface AvailableTeam {
interface AvailableTeamsProps { interface AvailableTeamsProps {
accessToken: string | null; accessToken: string | null;
userID: string | null; userID: string | null;
searchTerm : string | null;
} }
const AvailableTeamsPanel: React.FC<AvailableTeamsProps> = ({ const AvailableTeamsPanel: React.FC<AvailableTeamsProps> = ({
accessToken, accessToken,
userID, userID,
searchTerm,
}) => { }) => {
const [availableTeams, setAvailableTeams] = useState<AvailableTeam[]>([]); const [availableTeams, setAvailableTeams] = useState<AvailableTeam[]>([]);
@ -72,7 +70,7 @@ const AvailableTeamsPanel: React.FC<AvailableTeamsProps> = ({
return ( return (
<Card className="w-full mx-auto flex-auto overflow-y-auto max-h-[70vh]"> <Card className="w-full mx-auto flex-auto overflow-y-auto max-h-[50vh]">
<Table> <Table>
<TableHead> <TableHead>
<TableRow> <TableRow>
@ -84,9 +82,7 @@ const AvailableTeamsPanel: React.FC<AvailableTeamsProps> = ({
</TableRow> </TableRow>
</TableHead> </TableHead>
<TableBody> <TableBody>
{availableTeams {availableTeams.map((team) => (
?.filter((team) => team["team_alias"].toLowerCase().includes(searchTerm?.toLowerCase() || ''))
?.map((team) => (
<TableRow key={team.team_id}> <TableRow key={team.team_id}>
<TableCell> <TableCell>
<Text>{team.team_alias}</Text> <Text>{team.team_alias}</Text>

View file

@ -140,7 +140,6 @@ const Team: React.FC<TeamProps> = ({
const [userModels, setUserModels] = useState<string[]>([]); const [userModels, setUserModels] = useState<string[]>([]);
const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false); const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
const [teamToDelete, setTeamToDelete] = useState<string | null>(null); const [teamToDelete, setTeamToDelete] = useState<string | null>(null);
const [searchTerm,setSearchTerm] = useState<string>()
@ -363,24 +362,6 @@ const Team: React.FC<TeamProps> = ({
/> />
) : ( ) : (
<TabGroup className="gap-2 p-8 h-[75vh] w-full mt-2"> <TabGroup className="gap-2 p-8 h-[75vh] w-full mt-2">
<div className="flex items-center justify-between mb-4">
<h1 className="text-xl font-semibold">Teams</h1>
<div className="flex space-x-2">
<input
type="text"
placeholder="Search by team name"
className=" py-2 px-3 custom-border rounded-md text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
value={searchTerm}
onChange={(e) => setSearchTerm(e.target.value)}
/>
<Button
className="mx-auto"
onClick={() => setIsTeamModalVisible(true)}
>
+ Create New Team
</Button>
</div>
</div>
<TabList className="flex justify-between mt-2 w-full items-center"> <TabList className="flex justify-between mt-2 w-full items-center">
<div className="flex"> <div className="flex">
<Tab>Your Teams</Tab> <Tab>Your Teams</Tab>
@ -404,7 +385,7 @@ const Team: React.FC<TeamProps> = ({
</Text> </Text>
<Grid numItems={1} className="gap-2 pt-2 pb-2 h-[75vh] w-full mt-2"> <Grid numItems={1} className="gap-2 pt-2 pb-2 h-[75vh] w-full mt-2">
<Col numColSpan={1}> <Col numColSpan={1}>
<Card className="w-full mx-auto flex-auto overflow-y-auto max-h-[70vh]"> <Card className="w-full mx-auto flex-auto overflow-y-auto max-h-[50vh]">
<Table> <Table>
<TableHead> <TableHead>
<TableRow> <TableRow>
@ -422,8 +403,7 @@ const Team: React.FC<TeamProps> = ({
<TableBody> <TableBody>
{teams && teams.length > 0 {teams && teams.length > 0
? teams ? teams
?.sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime()) .sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime())
?.filter((team) => team["team_alias"].toLowerCase().includes(searchTerm?.toLowerCase() || ''))
.map((team: any) => ( .map((team: any) => (
<TableRow key={team.team_id}> <TableRow key={team.team_id}>
<TableCell <TableCell
@ -435,6 +415,7 @@ const Team: React.FC<TeamProps> = ({
> >
{team["team_alias"]} {team["team_alias"]}
</TableCell> </TableCell>
<TableRow>
<TableCell> <TableCell>
<div className="overflow-hidden"> <div className="overflow-hidden">
<Tooltip title={team.team_id}> <Tooltip title={team.team_id}>
@ -453,6 +434,7 @@ const Team: React.FC<TeamProps> = ({
</Tooltip> </Tooltip>
</div> </div>
</TableCell> </TableCell>
</TableRow>
<TableCell <TableCell
style={{ style={{
@ -584,14 +566,6 @@ const Team: React.FC<TeamProps> = ({
</TableRow> </TableRow>
)) ))
: null} : null}
{teams && teams?.length === 0 && (
<TableRow>
<TableCell colSpan={12} className="text-center">
<Text>No available teams</Text>
</TableCell>
</TableRow>
)}
</TableBody> </TableBody>
</Table> </Table>
{isDeleteModalOpen && ( {isDeleteModalOpen && (
@ -646,6 +620,12 @@ const Team: React.FC<TeamProps> = ({
</Col> </Col>
{userRole == "Admin"? ( {userRole == "Admin"? (
<Col numColSpan={1}> <Col numColSpan={1}>
<Button
className="mx-auto"
onClick={() => setIsTeamModalVisible(true)}
>
+ Create New Team
</Button>
<Modal <Modal
title="Create Team" title="Create Team"
visible={isTeamModalVisible} visible={isTeamModalVisible}
@ -788,7 +768,6 @@ const Team: React.FC<TeamProps> = ({
<AvailableTeamsPanel <AvailableTeamsPanel
accessToken={accessToken} accessToken={accessToken}
userID={userID} userID={userID}
searchTerm={searchTerm || null}
/> />
</TabPanel> </TabPanel>
</TabPanels> </TabPanels>