OpenRAG is a comprehensive, single package Retrieval-Augmented Generation platform built on Langflow, Docling, and Opensearch.
Python
feat: restyling active task in task panel (#1752)
Wallgau4f42398a34dd
diff --git a/frontend/components/task-notification-menu.tsx b/frontend/components/task-notification-menu.tsxindex 9efa3378f..37f914ef3 100644--- a/frontend/components/task-notification-menu.tsx+++ b/frontend/components/task-notification-menu.tsx@@ -6,7 +6,6 @@ import {CheckCircle,Clock,Loader2,- X,XCircle,} from "lucide-react";import { useEffect, useMemo, useRef, useState } from "react";@@ -14,6 +13,10 @@ import { IncidentReporterIcon } from "@/components/icons/incident-reporter-icon"import { TaskCollapsibleSection } from "@/components/task-collapsible-section";import { TaskErrorContent } from "@/components/task-error-content";import { TaskPanelHeader } from "@/components/task-panel-header";+import {+ type TaskProgressDetailed,+ TaskProgressDetails,+} from "@/components/task-progress-details";import { Badge } from "@/components/ui/badge";import { Button } from "@/components/ui/button";import {@@ -246,7 +249,9 @@ export function TaskNotificationMenu() {}};- const formatTaskProgress = (task: Task) => {+ const formatTaskProgress = (+ task: Task,+ ): { basic: string; detailed: TaskProgressDetailed } | null => {const total = task.total_files || 0;const processed = task.processed_files || 0;const successful = task.successful_files || 0;@@ -326,6 +331,13 @@ export function TaskNotificationMenu() {return `${diffDays}d ago`;};+ const cancelTaskButtonClass = cn(+ "h-10 w-full shrink-0 shadow-none",+ isCloudBrand+ ? "justify-start rounded-none bg-border px-4 text-left text-muted-foreground hover:bg-accent hover:text-muted-foreground"+ : "justify-center rounded-lg border border-muted-foreground bg-task-dialog-oss-selected py-2.5 px-3 text-foreground hover:!bg-accent hover:text-foreground",+ );+return (<divclassName={cn("h-full bg-background", isCloudBrand && "ibm-tasks-panel")}@@ -399,48 +411,24 @@ export function TaskNotificationMenu() {Progress: {progress.basic}</div>{progress.detailed && (- <div className="grid grid-cols-2 gap-2 text-xs">- <div className="flex items-center gap-1">- <div className="w-2 h-2 bg-green-500 rounded-full"></div>- <span className="text-green-600">- {progress.detailed.successful} success- </span>- </div>- <div className="flex items-center gap-1">- <div className="w-2 h-2 bg-red-500 rounded-full"></div>- <span className="text-red-600">- {progress.detailed.failed} failed- </span>- </div>- <div className="flex items-center gap-1">- <div className="w-2 h-2 bg-blue-500 rounded-full"></div>- <span className="text-blue-600">- {progress.detailed.running} running- </span>- </div>- <div className="flex items-center gap-1">- <div className="w-2 h-2 bg-yellow-500 rounded-full"></div>- <span className="text-yellow-600">- {progress.detailed.pending} pending- </span>- </div>- </div>+ <TaskProgressDetails+ detailed={progress.detailed}+ isCloudBrand={isCloudBrand}+ />)}</div>)}{showCancel && (- <div- className={`flex justify-end ${progress ? "mt-3" : ""}`}- >+ <div className={cn(progress && "mt-3")}><Button- variant="destructive"- size="sm"+ type="button"+ variant="ghost"+ ignoreTitleCaseonClick={() => cancelTask(task.task_id)}- className="h-7 px-3 text-xs"title="Cancel task"+ className={cancelTaskButtonClass}>- <X className="h-3 w-3 mr-1" />- Cancel+ Cancel task</Button></div>)}diff --git a/frontend/components/task-progress-details.tsx b/frontend/components/task-progress-details.tsxnew file mode 100644index 000000000..61e9e8d0b--- /dev/null+++ b/frontend/components/task-progress-details.tsx@@ -0,0 +1,80 @@+import { Circle } from "lucide-react";+import { cn } from "@/lib/utils";++export interface TaskProgressDetailed {+ total: number;+ processed: number;+ successful: number;+ failed: number;+ running: number;+ pending: number;+ remaining: number;+}++interface TaskProgressDetailsProps {+ detailed: TaskProgressDetailed;+ isCloudBrand: boolean;+}++const PROGRESS_STATS = [+ {+ key: "successful" as const,+ label: "Complete",+ colorClass: "text-green-500",+ },+ {+ key: "failed" as const,+ label: "Failed",+ colorClass: "text-red-500",+ },+ {+ key: "running" as const,+ label: "Running",+ colorClass: "text-blue-500",+ },+ {+ key: "pending" as const,+ label: "Pending",+ colorClass: "text-yellow-500",+ },+] as const;++export function TaskProgressDetails({+ detailed,+ isCloudBrand,+}: TaskProgressDetailsProps) {+ return (+ <div className={cn("grid grid-cols-2", isCloudBrand ? "gap-2" : "gap-3")}>+ {PROGRESS_STATS.map(({ key, label, colorClass }) => (+ <div+ key={key}+ className={cn(+ "flex w-full shrink-0 flex-col items-start gap-3 pt-0.5 pr-1.5 pb-0.5 pl-1 text-xs",+ isCloudBrand+ ? "col-span-1 row-span-1 justify-center self-stretch justify-self-stretch rounded-none bg-border"+ : "min-h-header rounded-md bg-muted",+ )}+ >+ <span+ className={cn(+ "block pt-1.5 px-1.5 pb-0 text-base font-semibold tabular-nums leading-none",+ isCloudBrand ? "text-muted-foreground" : "text-foreground",+ )}+ >+ {detailed[key]}+ </span>+ <span className="inline-flex items-center gap-1 px-1.5 pb-1.5">+ <Circle className={cn("size-2 fill-current", colorClass)} />+ <span+ className={+ isCloudBrand ? "text-placeholder" : "text-muted-foreground"+ }+ >+ {label}+ </span>+ </span>+ </div>+ ))}+ </div>+ );+}diff --git a/frontend/tailwind.config.ts b/frontend/tailwind.config.tsindex d6e37d9c8..dd408a309 100644--- a/frontend/tailwind.config.ts+++ b/frontend/tailwind.config.ts@@ -29,6 +29,9 @@ const config = {height: {"task-dialog": "var(--task-dialog-max-height)",},+ minHeight: {+ header: "var(--header-height)",+ },maxHeight: {"task-dialog": "var(--task-dialog-max-height)",},@@ -185,6 +188,7 @@ const config = {"component-icon": "var(--component-icon)","flow-icon": "var(--flow-icon)","placeholder-foreground": "hsl(var(--placeholder-foreground))",+ placeholder: "hsl(var(--placeholder))","function-call-header": {DEFAULT: "var(--function-call-header)",hover: "var(--function-call-header-hover)",