palmier 0.7.8 → 0.8.0

package/palmier-server/pwa/src/components/TaskCard.tsx

@@ -23,8 +23,9 @@ export default function TaskCard({ task, lastEvent, onEdit, onDelete, onViewRun
   const menuRef = useRef<HTMLDivElement>(null);
 
   const isRunning = lastEvent?.running_state === "started";
+  const scheduleActive = !!task.schedule_enabled && !!task.schedule_type && (task.schedule_values?.length ?? 0) > 0;
   const stateColor =
-    !task.triggers_enabled || task.triggers.length === 0
+    !scheduleActive
       ? "var(--color-text-secondary)"
       : isRunning
         ? "var(--color-success)"
@@ -99,34 +100,14 @@ export default function TaskCard({ task, lastEvent, onEdit, onDelete, onViewRun
   };
 
 
-  function formatTriggersGrouped(triggers: { type: string; value: string }[]): string {
-    if (triggers.length === 0) return "";
-    if (triggers.length === 1) return formatSingleTrigger(triggers[0]);
-
-    // Detect the shared schedule type
-    const classified = triggers.map(classifyTrigger);
-    const types = new Set(classified.map((c) => c.kind));
-
-    // If all the same type, group them
-    if (types.size === 1) {
-      const kind = classified[0].kind;
-      if (kind === "hourly") return "Every hour";
-      const details = classified.map((c) => c.detail);
-      return `${kind.charAt(0).toUpperCase() + kind.slice(1)}: ${details.join(", ")}`;
-    }
-
-    // Mixed types — fall back to listing each
-    return triggers.map(formatSingleTrigger).join(", ");
-  }
-
-  function classifyTrigger(t: { type: string; value: string }): { kind: string; detail: string } {
-    if (t.type === "once") {
-      const d = new Date(t.value);
-      const label = isNaN(d.getTime()) ? t.value : `${d.toLocaleDateString(undefined, { month: "short", day: "numeric", year: "numeric" })} at ${d.toLocaleTimeString(undefined, { hour: "numeric", minute: "2-digit" })}`;
-      return { kind: "once", detail: label };
+  function classifyValue(scheduleType: "crons" | "specific_times", value: string): { kind: string; detail: string } {
+    if (scheduleType === "specific_times") {
+      const d = new Date(value);
+      const label = isNaN(d.getTime()) ? value : `${d.toLocaleDateString(undefined, { month: "short", day: "numeric", year: "numeric" })} at ${d.toLocaleTimeString(undefined, { hour: "numeric", minute: "2-digit" })}`;
+      return { kind: "specific_times", detail: label };
     }
-    const parts = t.value.split(" ");
-    if (parts.length !== 5) return { kind: "unknown", detail: t.value };
+    const parts = value.split(" ");
+    if (parts.length !== 5) return { kind: "unknown", detail: value };
     const [min, hour, dom, , dow] = parts;
     const DAYS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
     if (hour === "*") return { kind: "hourly", detail: "" };
@@ -138,14 +119,31 @@ export default function TaskCard({ task, lastEvent, onEdit, onDelete, onViewRun
     return { kind: "daily", detail: time };
   }
 
-  function formatSingleTrigger(t: { type: string; value: string }): string {
-    const c = classifyTrigger(t);
+  function formatSingleValue(scheduleType: "crons" | "specific_times", value: string): string {
+    const c = classifyValue(scheduleType, value);
     if (c.kind === "hourly") return "Every hour";
-    if (c.kind === "once") return `Once on ${c.detail}`;
+    if (c.kind === "specific_times") return `Once on ${c.detail}`;
     return `${c.kind.charAt(0).toUpperCase() + c.kind.slice(1)}: ${c.detail}`;
   }
 
-  const triggersText = formatTriggersGrouped(task.triggers);
+  function formatScheduleGrouped(scheduleType: "crons" | "specific_times" | undefined, values: string[] | undefined): string {
+    if (!scheduleType || !values || values.length === 0) return "";
+    if (values.length === 1) return formatSingleValue(scheduleType, values[0]);
+
+    const classified = values.map((v) => classifyValue(scheduleType, v));
+    const kinds = new Set(classified.map((c) => c.kind));
+
+    if (kinds.size === 1) {
+      const kind = classified[0].kind;
+      if (kind === "hourly") return "Every hour";
+      const details = classified.map((c) => c.detail);
+      return `${kind.charAt(0).toUpperCase() + kind.slice(1)}: ${details.join(", ")}`;
+    }
+
+    return values.map((v) => formatSingleValue(scheduleType, v)).join(", ");
+  }
+
+  const scheduleText = formatScheduleGrouped(task.schedule_type, task.schedule_values);
 
   const actionItems = (
     <>
@@ -174,7 +172,7 @@ export default function TaskCard({ task, lastEvent, onEdit, onDelete, onViewRun
 
   return (
     <>
-      <div className="task-card" onClick={() => isRunning ? onViewRun(task.id, "latest") : onViewRun(task.id)}>
+      <div className="task-card" onClick={() => onViewRun(task.id, "latest")}>
         <div className="task-card-header">
           <div className="task-card-title-row">
             {isRunning ? (
@@ -216,9 +214,9 @@ export default function TaskCard({ task, lastEvent, onEdit, onDelete, onViewRun
               {" "}{formatTime(lastEvent.time_stamp)}
             </span>
           )}
-          {task.triggers.length > 0 && (
+          {task.schedule_type && (task.schedule_values?.length ?? 0) > 0 && (
             <span className="task-card-triggers">
-              {task.triggers_enabled ? triggersText : "Triggers disabled"}
+              {task.schedule_enabled ? scheduleText : "Schedule disabled"}
             </span>
           )}
         </div>