vitalitymailg/shorturl-analytics
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix team pro tag

Browse Source
This commit is contained in:
William Tso
2025-04-23 20:04:37 +08:00
parent bee8369a6b
commit ed01b88e04
5 changed files with 404 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
app/components/ui/ProjectSelector.tsx
View File

@@ -99,32 +99,42 @@ export function ProjectSelector({
setLoading(true);
setError(null);
console.log(`开始获取项目数据，用户ID: ${userId}, 团队ID过滤: ${effectiveTeamIds?.join(', ') || '无'}`);
try {
const supabase = getSupabaseClient();
console.log('Supabase客户端已创建，准备获取项目数据');
if (effectiveTeamIds && effectiveTeamIds.length > 0) {
// If team IDs are provided, get projects for those teams
console.log(`通过团队ID获取项目: ${effectiveTeamIds.join(', ')}`);
const { data: projectsData, error: projectsError } = await supabase
.from('team_projects')
.select('project_id, projects:project_id(*), teams:team_id(name)')
.in('team_id', effectiveTeamIds)
.is('projects.deleted_at', null);
console.log(`团队项目查询结果:`, projectsData ? `找到${projectsData.length}个` : '无数据',
projectsError ? `错误: ${projectsError.message}` : '无错误');
if (projectsError) throw projectsError;
if (!projectsData || projectsData.length === 0) {
console.log('未找到团队项目，返回空列表');
if (isMounted) setProjects([]);
return;
}
// Extract projects from response with team info
if (isMounted) {
console.log('处理团队项目数据');
const projectList: Project[] = [];
for (const item of projectsData as ProjectWithTeam[]) {
for (const item of projectsData as unknown as ProjectWithTeam[]) {
if (item.projects && typeof item.projects === 'object' && 'id' in item.projects && 'name' in item.projects) {
const project = item.projects as Project;
if (item.teams && 'name' in item.teams) {
if (item.teams && typeof item.teams === 'object' && 'name' in item.teams) {
project.team_name = item.teams.name;
}
// Avoid duplicate projects from different teams
@@ -134,32 +144,42 @@ export function ProjectSelector({
}
}
console.log(`处理后的项目数据: ${projectList.length}个`);
setProjects(projectList);
}
} else {
// If no team IDs, get all user's projects
console.log(`获取用户所有项目，用户ID: ${userId}`);
const { data: projectsData, error: projectsError } = await supabase
.from('user_projects')
.select('project_id, projects:project_id(*)')
.eq('user_id', userId)
.is('projects.deleted_at', null);
console.log(`用户项目查询结果:`, projectsData ? `找到${projectsData.length}个` : '无数据',
projectsError ? `错误: ${projectsError.message}` : '无错误');
if (projectsError) throw projectsError;
if (!projectsData || projectsData.length === 0) {
console.log('未找到用户项目，返回空列表');
if (isMounted) setProjects([]);
return;
}
// Fetch team info for these projects
const projectIds = projectsData.map(item => item.project_id);
console.log(`获取项目的团队信息，项目IDs: ${projectIds.join(', ')}`);
// Get team info for each project
const { data: teamProjectsData, error: teamProjectsError } = await supabase
.from('team_projects')
.select('project_id, teams:team_id(name)')
.in('project_id', projectIds);
console.log(`项目团队关系查询结果:`, teamProjectsData ? `找到${teamProjectsData.length}个` : '无数据');
if (teamProjectsError) throw teamProjectsError;
// Create project ID to team name mapping
@@ -174,6 +194,7 @@ export function ProjectSelector({
// Extract projects with team names
if (isMounted && projectsData) {
console.log('处理用户项目数据');
const projectList: Project[] = [];
for (const item of projectsData) {
@@ -184,12 +205,14 @@ export function ProjectSelector({
}
}
console.log(`处理后的项目数据: ${projectList.length}个`);
setProjects(projectList);
}
}
} catch (err) {
console.error('获取项目数据出错:', err);
if (isMounted) {
setError(err instanceof Error ? err.message : 'Failed to load projects');
setError(err instanceof Error ? err.message : '获取项目数据失败');
}
} finally {
if (isMounted) {
@@ -198,27 +221,51 @@ export function ProjectSelector({
}
};
const supabase = getSupabaseClient();
const { data: { subscription } } = supabase.auth.onAuthStateChange((event: AuthChangeEvent, session: Session | null) => {
if (event === 'SIGNED_IN' && session?.user?.id) {
fetchProjects(session.user.id);
} else if (event === 'SIGNED_OUT') {
setProjects([]);
setError(null);
}
});
// 获取Supabase客户端实例并订阅认证状态变化
try {
const supabase = getSupabaseClient();
console.log('注册项目选择器认证状态变化监听器');
const { data: { subscription } } = supabase.auth.onAuthStateChange((event: AuthChangeEvent, session: Session | null) => {
console.log(`项目选择器认证状态变化: ${event}`, session ? `用户ID: ${session.user.id}` : '无会话');
if (event === 'SIGNED_IN' && session?.user?.id) {
fetchProjects(session.user.id);
} else if (event === 'SIGNED_OUT') {
setProjects([]);
setError(null);
}
});
supabase.auth.getSession().then(({ data: { session } }) => {
if (session?.user?.id) {
fetchProjects(session.user.id);
}
});
// 初始化时获取当前会话
console.log('项目选择器获取当前会话状态');
supabase.auth.getSession().then(({ data: { session } }) => {
console.log('项目选择器当前会话状态:', session ? `用户已登录，ID: ${session.user.id}` : '用户未登录');
if (session?.user?.id) {
fetchProjects(session.user.id);
} else {
// 如果没有会话但组件需要初始化，可以设置加载完成
setLoading(false);
}
}).catch(err => {
console.error('项目选择器获取会话状态失败:', err);
// 确保即使获取会话失败也停止加载状态
setLoading(false);
});
return () => {
isMounted = false;
subscription.unsubscribe();
};
return () => {
console.log('ProjectSelector组件卸载，清理订阅');
isMounted = false;
subscription.unsubscribe();
};
} catch (initError) {
console.error('初始化ProjectSelector出错:', initError);
// 确保在初始化出错时也停止加载状态
setLoading(false);
setError('初始化失败，请刷新页面重试');
return () => {
isMounted = false;
};
}
}, [effectiveTeamIds]);
const handleToggle = () => {

67
app/components/ui/TagSelector.tsx
View File

@@ -123,31 +123,48 @@ export function TagSelector({
setLoading(true);
setError(null);
console.log(`开始获取标签数据, 团队ID过滤: ${effectiveTeamIds?.join(', ') || '无'}`);
try {
const supabase = getSupabaseClient();
console.log('Supabase客户端已创建，准备获取标签数据');
let query = supabase.from('tags').select('*').is('deleted_at', null);
// Filter by team if teamId is provided
if (effectiveTeamIds) {
console.log(`通过团队ID过滤标签: ${effectiveTeamIds.join(', ')}`);
query = query.in('team_id', effectiveTeamIds);
}
const { data: tagsData, error: tagsError } = await query;
console.log(`标签查询结果:`, tagsData ? `找到${tagsData.length}个` : '无数据',
tagsError ? `错误: ${tagsError.message}` : '无错误');
if (tagsError) throw tagsError;
if (!tagsData || tagsData.length === 0) {
console.log('未找到标签，返回空列表');
if (isMounted) setTags([]);
return;
}
if (isMounted) {
console.log(`设置${tagsData.length}个标签数据`);
setTags(tagsData as Tag[]);
// 如果已有value但tags刚加载好，重新设置selectedIds
if (value && tagsData.length > 0) {
const ids = nameToId(value);
console.log(`根据名称设置选中的标签ID: ${ids.join(', ')}`);
setSelectedIds(ids);
}
}
} catch (err) {
console.error('获取标签数据出错:', err);
if (isMounted) {
setError(err instanceof Error ? err.message : 'Failed to load tags');
setError(err instanceof Error ? err.message : '获取标签数据失败');
}
} finally {
if (isMounted) {
@@ -156,26 +173,40 @@ export function TagSelector({
}
};
const supabase = getSupabaseClient();
const { data: { subscription } } = supabase.auth.onAuthStateChange((event: AuthChangeEvent) => {
if (event === 'SIGNED_IN') {
fetchTags();
} else if (event === 'SIGNED_OUT') {
setTags([]);
setError(null);
}
});
// 获取Supabase客户端实例并订阅认证状态变化
try {
const supabase = getSupabaseClient();
console.log('注册标签选择器认证状态变化监听器');
const { data: { subscription } } = supabase.auth.onAuthStateChange((event: AuthChangeEvent) => {
console.log(`标签选择器认证状态变化: ${event}`);
if (event === 'SIGNED_IN') {
fetchTags();
} else if (event === 'SIGNED_OUT') {
setTags([]);
setError(null);
}
});
supabase.auth.getSession().then(() => {
// 初始化时获取标签数据
console.log('标签选择器初始化，获取标签数据');
fetchTags();
});
return () => {
isMounted = false;
subscription.unsubscribe();
};
}, [effectiveTeamIds]);
return () => {
console.log('TagSelector组件卸载，清理订阅');
isMounted = false;
subscription.unsubscribe();
};
} catch (initError) {
console.error('初始化TagSelector出错:', initError);
// 确保在初始化出错时也停止加载状态
setLoading(false);
setError('初始化失败，请刷新页面重试');
return () => {
isMounted = false;
};
}
}, [effectiveTeamIds, nameToId, value]);
const handleToggle = () => {
if (!loading && !error && tags.length > 0) {

168
app/components/ui/TeamSelector.tsx
View File

@@ -68,44 +68,98 @@ export function TeamSelector({
setLoading(true);
setError(null);
console.log(`开始获取团队数据，用户ID: ${userId}`);
try {
const supabase = getSupabaseClient();
console.log('Supabase客户端已创建，准备获取团队数据');
// 尝试创建默认团队和项目（如果用户还没有）
// 先尝试直接获取团队数据，不等待create-default
try {
const response = await limqRequest('team/create-default', 'POST');
console.log('Default team creation response:', response);
} catch (teamError) {
console.error('Error creating default team:', teamError);
}
const { data: memberships, error: membershipError } = await supabase
.from('team_membership')
.select('team_id')
.eq('user_id', userId);
const { data: memberships, error: membershipError } = await supabase
.from('team_membership')
.select('team_id')
.eq('user_id', userId);
if (membershipError) throw membershipError;
console.log(`团队成员关系查询结果:`, memberships ? `找到${memberships.length}个` : '无数据', membershipError ? `错误: ${membershipError.message}` : '无错误');
if (!memberships || memberships.length === 0) {
if (isMounted) setTeams([]);
return;
}
if (membershipError) throw membershipError;
const teamIds = memberships.map(m => m.team_id);
const { data: teamsData, error: teamsError } = await supabase
.from('teams')
.select('*')
.in('id', teamIds)
.is('deleted_at', null);
if (!memberships || memberships.length === 0) {
console.log('未找到团队成员关系，尝试创建默认团队');
// 尝试创建默认团队和项目（如果用户还没有）
try {
const response = await limqRequest('team/create-default', 'POST');
console.log('默认团队创建成功:', response);
// 创建默认团队后重新获取团队列表
const { data: refreshedMemberships, error: refreshError } = await supabase
.from('team_membership')
.select('team_id')
.eq('user_id', userId);
console.log(`刷新后的团队成员关系:`, refreshedMemberships ? `找到${refreshedMemberships.length}个` : '无数据');
if (refreshError) throw refreshError;
if (!refreshedMemberships || refreshedMemberships.length === 0) {
if (isMounted) {
console.log('创建默认团队后仍未找到团队，设置空团队列表');
setTeams([]);
}
return;
}
const teamIds = refreshedMemberships.map(m => m.team_id);
console.log('获取到团队IDs:', teamIds);
const { data: teamsData, error: teamsError } = await supabase
.from('teams')
.select('*')
.in('id', teamIds)
.is('deleted_at', null);
console.log(`团队数据查询结果:`, teamsData ? `找到${teamsData.length}个` : '无数据');
if (teamsError) throw teamsError;
if (teamsError) throw teamsError;
if (isMounted && teamsData) {
setTeams(teamsData);
if (isMounted && teamsData) {
setTeams(teamsData);
}
return;
} catch (teamError) {
console.error('创建默认团队失败:', teamError);
// 创建失败也继续，返回空列表
if (isMounted) setTeams([]);
return;
}
}
const teamIds = memberships.map(m => m.team_id);
console.log('获取到团队IDs:', teamIds);
const { data: teamsData, error: teamsError } = await supabase
.from('teams')
.select('*')
.in('id', teamIds)
.is('deleted_at', null);
console.log(`团队数据查询结果:`, teamsData ? `找到${teamsData.length}个` : '无数据');
if (teamsError) throw teamsError;
if (isMounted && teamsData) {
setTeams(teamsData);
}
} catch (dataError) {
console.error('获取团队数据失败:', dataError);
throw dataError;
}
} catch (err) {
console.error('获取团队数据出错:', err);
if (isMounted) {
setError(err instanceof Error ? err.message : 'Failed to load teams');
setError(err instanceof Error ? err.message : '获取团队数据失败');
}
} finally {
if (isMounted) {
@@ -114,27 +168,51 @@ export function TeamSelector({
}
};
const supabase = getSupabaseClient();
const { data: { subscription } } = supabase.auth.onAuthStateChange((event: AuthChangeEvent, session: Session | null) => {
if (event === 'SIGNED_IN' && session?.user?.id) {
fetchTeams(session.user.id);
} else if (event === 'SIGNED_OUT') {
setTeams([]);
setError(null);
}
});
// 获取Supabase客户端实例并订阅认证状态变化
try {
const supabase = getSupabaseClient();
console.log('注册认证状态变化监听器');
const { data: { subscription } } = supabase.auth.onAuthStateChange((event: AuthChangeEvent, session: Session | null) => {
console.log(`认证状态变化: ${event}`, session ? `用户ID: ${session.user.id}` : '无会话');
if (event === 'SIGNED_IN' && session?.user?.id) {
fetchTeams(session.user.id);
} else if (event === 'SIGNED_OUT') {
setTeams([]);
setError(null);
}
});
supabase.auth.getSession().then(({ data: { session } }) => {
if (session?.user?.id) {
fetchTeams(session.user.id);
}
});
// 初始化时获取当前会话
console.log('获取当前会话状态');
supabase.auth.getSession().then(({ data: { session } }) => {
console.log('当前会话状态:', session ? `用户已登录，ID: ${session.user.id}` : '用户未登录');
if (session?.user?.id) {
fetchTeams(session.user.id);
} else {
// 如果没有会话但组件需要初始化，可以设置加载完成
setLoading(false);
}
}).catch(err => {
console.error('获取会话状态失败:', err);
// 确保即使获取会话失败也停止加载状态
setLoading(false);
});
return () => {
isMounted = false;
subscription.unsubscribe();
};
return () => {
console.log('TeamSelector组件卸载，清理订阅');
isMounted = false;
subscription.unsubscribe();
};
} catch (initError) {
console.error('初始化TeamSelector出错:', initError);
// 确保在初始化出错时也停止加载状态
setLoading(false);
setError('初始化失败，请刷新页面重试');
return () => {
isMounted = false;
};
}
}, []);
const handleToggle = () => {