From 6dff749479d15248bbc7db7c182df94377836815 Mon Sep 17 00:00:00 2001 From: Varun Date: Tue, 7 Apr 2026 21:14:56 +0530 Subject: [PATCH] feat: redesign workflow list with enriched data - API returns node counts, total runs, and last run status per workflow - List view with status icon, trigger badges, stats, and last run info - Human-readable schedule labels (Every 6h, Every 30m) - Last run shows status icon, asset count, and relative time - Actions appear on hover for cleaner default state - Improved empty state --- src/pages/api/workflows/index.ts | 36 +++++- src/pages/workflows/index.tsx | 211 ++++++++++++++++++++++--------- 2 files changed, 184 insertions(+), 63 deletions(-) diff --git a/src/pages/api/workflows/index.ts b/src/pages/api/workflows/index.ts index 3245468..c0c5e9b 100644 --- a/src/pages/api/workflows/index.ts +++ b/src/pages/api/workflows/index.ts @@ -1,7 +1,7 @@ import { appDb } from "@/db"; -import { workflows } from "@/db/schema/workflows.schema"; +import { workflows, workflowNodes, workflowRuns } from "@/db/schema/workflows.schema"; import { getCurrentUser } from "@/handlers/serverUtils/user.utils"; -import { eq, desc } from "drizzle-orm"; +import { eq, desc, count, sql } from "drizzle-orm"; import { NextApiRequest, NextApiResponse } from "next"; import { randomUUID } from "crypto"; @@ -15,7 +15,37 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) .from(workflows) .where(eq(workflows.ownerId, currentUser.id)) .orderBy(desc(workflows.updatedAt)); - return res.status(200).json(rows); + + // Enrich with node counts and last run info + const enriched = await Promise.all(rows.map(async (w) => { + const nodes = await appDb + .select({ type: workflowNodes.type }) + .from(workflowNodes) + .where(eq(workflowNodes.workflowId, w.id)); + + const [lastRun] = await appDb + .select() + .from(workflowRuns) + .where(eq(workflowRuns.workflowId, w.id)) + .orderBy(desc(workflowRuns.startedAt)) + .limit(1); + + const [runCountRow] = await appDb + .select({ count: count() }) + .from(workflowRuns) + .where(eq(workflowRuns.workflowId, w.id)); + + return { + ...w, + nodeCount: nodes.length, + triggerCount: nodes.filter(n => n.type === "trigger").length, + actionCount: nodes.filter(n => n.type === "action").length, + totalRuns: runCountRow?.count || 0, + lastRun: lastRun || null, + }; + })); + + return res.status(200).json(enriched); } if (req.method === "POST") { diff --git a/src/pages/workflows/index.tsx b/src/pages/workflows/index.tsx index 188a1b2..e204cf9 100644 --- a/src/pages/workflows/index.tsx +++ b/src/pages/workflows/index.tsx @@ -1,21 +1,74 @@ import PageLayout from "@/components/layouts/PageLayout"; import Header from "@/components/shared/Header"; import { Button } from "@/components/ui/button"; -import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"; import { Badge } from "@/components/ui/badge"; import { AlertDialog } from "@/components/ui/alert-dialog"; import Loader from "@/components/ui/loader"; import { listWorkflows, createWorkflow, deleteWorkflow, exportWorkflow, importWorkflow } from "@/handlers/api/workflow.handler"; -import { IWorkflow } from "@/types/workflow"; -import { Plus, Download, Upload, Trash2, Pencil, Workflow } from "lucide-react"; +import { IWorkflow, IWorkflowRun } from "@/types/workflow"; +import { + Plus, Download, Upload, Trash2, Workflow, + Clock, Webhook, GitBranch, Zap, Play, + CheckCircle, XCircle, AlertCircle, +} from "lucide-react"; import { useEffect, useRef, useState } from "react"; import { useRouter } from "next/router"; -import { toast } from "@/components/ui/use-toast"; -import { format } from "date-fns"; +import hotToast from "react-hot-toast"; +import { formatDistanceToNow, format } from "date-fns"; + +interface IWorkflowEnriched extends IWorkflow { + nodeCount: number; + triggerCount: number; + actionCount: number; + totalRuns: number; + lastRun: IWorkflowRun | null; +} + +function parseCronLabel(cron: string): string { + if (!cron) return ""; + const parts = cron.split(" "); + if (parts.length !== 5) return cron; + if (parts[0].startsWith("*/") && parts[1] === "*") return `Every ${parts[0].slice(2)}m`; + if (parts[0] === "0" && parts[1].startsWith("*/")) return `Every ${parts[1].slice(2)}h`; + if (parts[0] === "0" && parts[1] === "0" && parts[2].startsWith("*/")) return `Every ${parts[2].slice(2)}d`; + return cron; +} + +function LastRunStatus({ run }: { run: IWorkflowRun | null }) { + if (!run) return Never run; + + const result = run.result ? (typeof run.result === "string" ? JSON.parse(run.result) : run.result) : {}; + const timeAgo = run.startedAt ? formatDistanceToNow(new Date(run.startedAt), { addSuffix: true }) : ""; + + if (run.status === "completed") { + return ( +
+ + + {result.matchedAssets || 0} assets {timeAgo} + +
+ ); + } + if (run.status === "failed") { + return ( +
+ + Failed {timeAgo} +
+ ); + } + return ( +
+ + Running... +
+ ); +} export default function WorkflowsPage() { const router = useRouter(); - const [workflows, setWorkflows] = useState([]); + const [workflows, setWorkflows] = useState([]); const [loading, setLoading] = useState(true); const fileInputRef = useRef(null); @@ -23,9 +76,9 @@ export default function WorkflowsPage() { setLoading(true); try { const data = await listWorkflows(); - setWorkflows(data); + setWorkflows(data as IWorkflowEnriched[]); } catch { - toast({ title: "Error", description: "Failed to load workflows", variant: "destructive" }); + hotToast.error("Failed to load workflows"); } setLoading(false); }; @@ -39,7 +92,7 @@ export default function WorkflowsPage() { const workflow = await createWorkflow({ name: "Untitled Workflow" }); router.push(`/workflows/${workflow.id}`); } catch { - toast({ title: "Error", description: "Failed to create workflow", variant: "destructive" }); + hotToast.error("Failed to create workflow"); } }; @@ -47,9 +100,9 @@ export default function WorkflowsPage() { try { await deleteWorkflow(id); setWorkflows((prev) => prev.filter((w) => w.id !== id)); - toast({ title: "Deleted", description: "Workflow deleted" }); + hotToast.success("Workflow deleted"); } catch { - toast({ title: "Error", description: "Failed to delete workflow", variant: "destructive" }); + hotToast.error("Failed to delete workflow"); } }; @@ -64,7 +117,7 @@ export default function WorkflowsPage() { a.click(); URL.revokeObjectURL(url); } catch { - toast({ title: "Error", description: "Failed to export workflow", variant: "destructive" }); + hotToast.error("Failed to export workflow"); } }; @@ -75,10 +128,10 @@ export default function WorkflowsPage() { const text = await file.text(); const data = JSON.parse(text); const workflow = await importWorkflow(data); - setWorkflows((prev) => [workflow, ...prev]); - toast({ title: "Imported", description: `Workflow "${workflow.name}" imported` }); + setWorkflows((prev) => [workflow as IWorkflowEnriched, ...prev]); + hotToast.success(`Workflow "${workflow.name}" imported`); } catch { - toast({ title: "Error", description: "Failed to import workflow. Check the file format.", variant: "destructive" }); + hotToast.error("Failed to import workflow"); } if (fileInputRef.current) fileInputRef.current.value = ""; }; @@ -112,10 +165,12 @@ export default function WorkflowsPage() {
) : workflows.length === 0 ? (
- -

No workflows yet

-

- Create your first workflow to start automating your library organization. +

+ +
+

No workflows yet

+

+ Automate your library with visual workflows. Create rules to organize, tag, and manage assets automatically.

) : ( -
+
{workflows.map((w) => ( - - -
-
- {w.name} - {w.description && ( - {w.description} - )} -
- - {w.enabled ? "Enabled" : "Disabled"} - -
-
- -
- {w.cronSchedule && Scheduled} - {w.webhookToken && Webhook} - - {w.updatedAt ? format(new Date(w.updatedAt), "MMM d, yyyy") : ""} - -
+
router.push(`/workflows/${w.id}`)} + > + {/* Status indicator */} +
+ +
+ + {/* Main info */} +
- - - handleDelete(w.id)} - > - - + {w.name} + {w.enabled ? ( + + ) : ( + + )}
- - + {w.description ? ( +

{w.description}

+ ) : ( +

No description

+ )} +
+ + {/* Triggers */} +
+ {w.cronSchedule && ( + + + {parseCronLabel(w.cronSchedule)} + + )} + {w.webhookToken && ( + + + Webhook + + )} +
+ + {/* Stats */} +
+
+ + {w.nodeCount || 0} +
+
+ + {w.totalRuns || 0} +
+
+ + {/* Last run */} +
+ +
+ + {/* Actions */} +
e.stopPropagation()}> + + handleDelete(w.id)} + > + + +
+
))}
)}