Skip to content

Add current team selection logic in AdminMemberProperties #24

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

Merged
akshaykumar2505 merged 1 commit into from
Mar 18, 2026
Merged

Add current team selection logic in AdminMemberProperties #24

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
14 changes: 14 additions & 0 deletions src/pages/AdminMemberProperties/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
import { useMutation, useQuery } from "urql";

import usePortalAdmin from "@/hooks/usePortalAdmin";
import CurrentUserStore from "@/stores/CurrentUserStore";

const { Title, Text } = Typography;

Expand Down Expand Up @@ -78,6 +79,7 @@ interface TeamOption {

const AdminMemberProperties: React.FC = () => {
const { isPortalAdmin } = usePortalAdmin();
const { currentTeam } = CurrentUserStore();
const [teams, setTeams] = useState<TeamOption[]>([]);
const [selectedTeamId, setSelectedTeamId] = useState<string | null>(null);
const [editingMember, setEditingMember] = useState<MemberInfo | null>(null);
Expand Down Expand Up @@ -105,6 +107,18 @@ const AdminMemberProperties: React.FC = () => {
if (isPortalAdmin) fetchTeams();
}, [isPortalAdmin]);

useEffect(() => {
// Default to the user's active team once team options are available.
// Keep manual selection untouched.
if (selectedTeamId || teams.length === 0) return;
const currentTeamId = currentTeam?.id;
if (currentTeamId && teams.some((team) => team.id === currentTeamId)) {
setSelectedTeamId(currentTeamId);
return;
}
setSelectedTeamId(teams[0].id);
}, [teams, currentTeam?.id, selectedTeamId]);

if (!isPortalAdmin) {
return (
<Card>
Expand Down