From 870c5c06f2b4a8187c0febde2593ddbc6eb956ba Mon Sep 17 00:00:00 2001 From: Alma Date: Sat, 12 Apr 2025 14:19:14 +0200 Subject: [PATCH] working leantime widget 31 --- app/api/leantime/status-labels/route.ts | 211 +++++++++++++++--------- components/flow.tsx | 107 +++++------- 2 files changed, 172 insertions(+), 146 deletions(-) diff --git a/app/api/leantime/status-labels/route.ts b/app/api/leantime/status-labels/route.ts index 465f456b..bfdfc006 100644 --- a/app/api/leantime/status-labels/route.ts +++ b/app/api/leantime/status-labels/route.ts @@ -1,3 +1,4 @@ +import { NextRequest } from "next/server"; import { getServerSession } from "next-auth/next"; import { authOptions } from "@/app/api/auth/[...nextauth]/route"; import { NextResponse } from "next/server"; @@ -5,14 +6,12 @@ import { NextResponse } from "next/server"; interface StatusLabel { id: string; name: string; - class: string; statusType: string; - kanbanCol: boolean | string; - sortKey: number | string; + class: string; } interface Project { - id: number; + id: string; name: string; labels: StatusLabel[]; } @@ -20,52 +19,93 @@ interface Project { // Cache for user IDs to avoid repeated lookups const userCache = new Map(); -export async function GET() { +async function getLeantimeUserId(email: string): Promise { + // Check cache first + if (userCache.has(email)) { + return userCache.get(email)!; + } + + try { + const response = await fetch('https://agilite.slm-lab.net/api/jsonrpc', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'X-API-Key': process.env.LEANTIME_TOKEN || '', + }, + body: JSON.stringify({ + jsonrpc: '2.0', + method: 'leantime.rpc.users.getAll', + id: 1, + }), + }); + + if (!response.ok) { + throw new Error('Failed to fetch users from Leantime'); + } + + const data = await response.json(); + const user = data.result.find((u: any) => u.email === email); + + if (user) { + // Cache the user ID + userCache.set(email, user.id); + // Clear cache after 5 minutes + setTimeout(() => userCache.delete(email), 5 * 60 * 1000); + return user.id; + } + + return null; + } catch (error) { + console.error('Error getting Leantime user ID:', error); + return null; + } +} + +export async function GET(request: NextRequest) { try { const session = await getServerSession(authOptions); - if (!session?.user?.email) { + if (!session || !session.user?.email) { return NextResponse.json({ error: "Unauthorized" }, { status: 401 }); } - // Check cache first - let leantimeUserId = userCache.get(session.user.email); - - // If not in cache, fetch from API + // Get Leantime user ID + const leantimeUserId = await getLeantimeUserId(session.user.email); + if (!leantimeUserId) { - const userResponse = await fetch('https://agilite.slm-lab.net/api/jsonrpc', { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - 'X-API-Key': process.env.LEANTIME_TOKEN || '', - }, - body: JSON.stringify({ - jsonrpc: '2.0', - method: 'leantime.rpc.Users.Users.getUserByEmail', - id: 1, - params: { - email: session.user.email - } - }) - }); - - if (!userResponse.ok) { - throw new Error('Failed to fetch user from Leantime'); - } - - const userData = await userResponse.json(); - - if (!userData.result || !userData.result.id) { - return NextResponse.json({ error: "User not found in Leantime" }, { status: 404 }); - } - - leantimeUserId = userData.result.id; - // Cache the user ID for 5 minutes - userCache.set(session.user.email, leantimeUserId); - setTimeout(() => userCache.delete(session.user.email!), 5 * 60 * 1000); + return NextResponse.json({ error: "User not found in Leantime" }, { status: 404 }); } - // Get projects + // Get all tasks assigned to the user + const response = await fetch('https://agilite.slm-lab.net/api/jsonrpc', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'X-API-Key': process.env.LEANTIME_TOKEN || '', + }, + body: JSON.stringify({ + jsonrpc: '2.0', + method: 'leantime.rpc.Tickets.Tickets.getAllByUserId', + id: 1, + params: { + userId: leantimeUserId, + status: "all", + limit: 100 + } + }) + }); + + if (!response.ok) { + throw new Error('Failed to fetch tasks from Leantime'); + } + + const data = await response.json(); + + if (!data.result) { + return NextResponse.json({ projects: [] }); + } + + // Get project details to include project names const projectsResponse = await fetch('https://agilite.slm-lab.net/api/jsonrpc', { method: 'POST', headers: { @@ -85,47 +125,60 @@ export async function GET() { const projectsData = await projectsResponse.json(); - // Get status labels - const labelsResponse = await fetch('https://agilite.slm-lab.net/api/jsonrpc', { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - 'X-API-Key': process.env.LEANTIME_TOKEN || '', - }, - body: JSON.stringify({ - jsonrpc: '2.0', - method: 'leantime.rpc.Tickets.Tickets.getAllStatusLabelsByUserId', - id: 1, - params: { - userId: leantimeUserId + // Create a map of projects with their tasks grouped by status + const projectMap = new Map(); + + data.result.forEach((task: any) => { + const project = projectsData.result.find((p: any) => p.id === task.projectId); + const projectName = project ? project.name : `Project ${task.projectId}`; + const projectId = task.projectId.toString(); + + if (!projectMap.has(projectId)) { + projectMap.set(projectId, { + id: projectId, + name: projectName, + labels: [] + }); + } + + const currentProject = projectMap.get(projectId)!; + + // Check if this status label already exists for this project + const existingLabel = currentProject.labels.find(label => label.name === task.status); + + if (!existingLabel) { + let statusType; + let statusClass; + + switch (task.status.toLowerCase()) { + case 'new': + statusType = 'NEW'; + statusClass = 'bg-blue-100 text-blue-800'; + break; + case 'in_progress': + statusType = 'INPROGRESS'; + statusClass = 'bg-yellow-100 text-yellow-800'; + break; + case 'done': + statusType = 'DONE'; + statusClass = 'bg-green-100 text-green-800'; + break; + default: + statusType = 'NONE'; + statusClass = 'bg-gray-100 text-gray-800'; } - }) + + currentProject.labels.push({ + id: `${projectId}-${task.status}`, + name: task.status, + statusType: statusType, + class: statusClass + }); + } }); - if (!labelsResponse.ok) { - throw new Error('Failed to fetch status labels from Leantime'); - } - - const labelsData = await labelsResponse.json(); - - // Transform the data into the required format - const projects: Project[] = projectsData.result.map((project: any) => { - const projectLabels = labelsData.result[project.id]; - const labels: StatusLabel[] = projectLabels ? Object.entries(projectLabels).map(([key, value]: [string, any]) => ({ - id: key, - name: value.name, - class: value.class, - statusType: value.statusType, - kanbanCol: value.kanbanCol, - sortKey: value.sortKey - })).sort((a: StatusLabel, b: StatusLabel) => Number(a.sortKey) - Number(b.sortKey)) : []; - - return { - id: project.id, - name: project.name, - labels - }; - }).filter((project: Project) => project.labels.length > 0); + // Convert the map to an array and sort projects by name + const projects = Array.from(projectMap.values()).sort((a, b) => a.name.localeCompare(b.name)); return NextResponse.json({ projects }); } catch (error) { diff --git a/components/flow.tsx b/components/flow.tsx index 5570923b..622bd5cb 100644 --- a/components/flow.tsx +++ b/components/flow.tsx @@ -5,51 +5,55 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { Button } from "@/components/ui/button"; import { RefreshCw } from "lucide-react"; -interface Task { +interface StatusLabel { id: string; - headline: string; - projectName: string; - status: string; - dueDate: string | null; - milestone: string | null; + name: string; + statusType: string; + class: string; +} + +interface Project { + id: string; + name: string; + labels: StatusLabel[]; } export function Flow() { - const [tasks, setTasks] = useState([]); + const [projects, setProjects] = useState([]); const [error, setError] = useState(null); const [loading, setLoading] = useState(true); const [refreshing, setRefreshing] = useState(false); const [retryTimeout, setRetryTimeout] = useState(null); - const fetchTasks = async (isRefresh = false) => { + const fetchProjects = async (isRefresh = false) => { try { if (isRefresh) { setRefreshing(true); } - const response = await fetch('/api/leantime/tasks'); + const response = await fetch('/api/leantime/status-labels'); if (response.status === 429) { const retryAfter = parseInt(response.headers.get('retry-after') || '60'); - const timeout = setTimeout(() => fetchTasks(), retryAfter * 1000); + const timeout = setTimeout(() => fetchProjects(), retryAfter * 1000); setRetryTimeout(timeout); setError(`Rate limit exceeded. Retrying in ${retryAfter} seconds...`); return; } if (!response.ok) { - throw new Error('Failed to fetch tasks'); + throw new Error('Failed to fetch projects'); } const data = await response.json(); - if (data.tasks && Array.isArray(data.tasks)) { - setTasks(data.tasks); + if (data.projects && Array.isArray(data.projects)) { + setProjects(data.projects); } else { - setTasks([]); + setProjects([]); } setError(null); } catch (err) { - console.error('Error fetching tasks:', err); - setError('Failed to fetch tasks'); + console.error('Error fetching projects:', err); + setError('Failed to fetch projects'); } finally { setLoading(false); setRefreshing(false); @@ -57,7 +61,7 @@ export function Flow() { }; useEffect(() => { - fetchTasks(); + fetchProjects(); return () => { if (retryTimeout) { clearTimeout(retryTimeout); @@ -65,29 +69,6 @@ export function Flow() { }; }, []); - const getStatusClass = (status: string): string => { - switch (status.toLowerCase()) { - case 'new': - return 'bg-blue-100 text-blue-800'; - case 'in_progress': - return 'bg-yellow-100 text-yellow-800'; - case 'done': - return 'bg-green-100 text-green-800'; - default: - return 'bg-gray-100 text-gray-800'; - } - }; - - const formatDate = (dateString: string | null): string => { - if (!dateString) return 'No due date'; - const date = new Date(dateString); - return date.toLocaleDateString('en-US', { - month: '2-digit', - day: '2-digit', - year: 'numeric' - }); - }; - return ( @@ -95,7 +76,7 @@ export function Flow() {