fix(desktop,shared): stop calling an already-run schedule invalid

apps/desktop/src/renderer/routes/_authenticated/_dashboard/automations/$automationId/components/TriggersCard/TriggersCard.tsx

@@ -55,23 +55,28 @@ export function TriggersCard({
 		// The zone travels with the date: schedules on one automation can sit in
 		// different timezones, so formatting them all in the automation-level one
 		// would label the tooltip wrongly for every schedule but the soonest.
-		const entries = new Map<string, { at: Date; timezone: string }>();
+		const entries = new Map<
+			string,
+			{ at: Date; timezone: string; exhausted: boolean }
+		>();
 
 		for (const trigger of automation.triggers) {
 			const config = trigger.config as DraftTrigger["config"];
 			if (config.kind !== "schedule") continue;
 
-			// A paused automation keeps a stale nextRunAt, so compute what this
-			// schedule would fire next — the row is previewable before resuming.
-			if (automation.enabled) {
-				if (trigger.nextRunAt) {
-					entries.set(trigger.id, {
-						at: new Date(trigger.nextRunAt),
-						timezone: config.timezone,
-					});
-				}
+			// The evaluator disables a schedule once its last occurrence fires
+			// (COUNT/UNTIL) and leaves nextRunAt at that final time — so a
+			// disabled trigger's nextRunAt is when it last ran, not when it will.
+			if (automation.enabled && trigger.nextRunAt) {
+				entries.set(trigger.id, {
+					at: new Date(trigger.nextRunAt),
+					timezone: config.timezone,
+					exhausted: !trigger.enabled,
+				});
 				continue;
 			}
+			// A paused automation keeps a stale nextRunAt, so compute what this
+			// schedule would fire next — the row is previewable before resuming.
 			try {
 				const next = nextOccurrenceAfter({
 					rrule: config.rrule,
@@ -80,7 +85,11 @@ export function TriggersCard({
 					after: new Date(),
 				});
 				if (next)
-					entries.set(trigger.id, { at: next, timezone: config.timezone });
+					entries.set(trigger.id, {
+						at: next,
+						timezone: config.timezone,
+						exhausted: false,
+					});
 			} catch (error) {
 				console.warn(
 					`[TriggersCard] failed to compute next occurrence for trigger ${trigger.id}`,
@@ -107,7 +116,11 @@ export function TriggersCard({
 			<Tooltip>
 				<TooltipTrigger asChild>
 					<span>
-						{automation.enabled ? "Next run " : "Would run "}
+						{run.exhausted
+							? "Ran "
+							: automation.enabled
+								? "Next run "
+								: "Would run "}
 						{formatDistanceStrict(run.at, new Date(), { addSuffix: true })}
 					</span>
 				</TooltipTrigger>

apps/desktop/src/renderer/routes/_authenticated/_dashboard/automations/components/ScheduleSentence/ScheduleSentence.tsx

@@ -1,5 +1,5 @@
 import {
-	isValidRrule,
+	rruleProblem,
 	timezoneAbbreviation,
 	type Weekday,
 } from "@superset/shared/rrule";
@@ -77,10 +77,14 @@ export function ScheduleSentence({
 	};
 
 	const customDraft = state.customRrule.trim();
-	const customValid = useMemo(() => isValidRrule(customDraft), [customDraft]);
+	const customProblem = useMemo(() => rruleProblem(customDraft), [customDraft]);
+	// The saved rule itself can be exhausted (a run-once schedule that already
+	// ran); that is history, not an edit gone wrong, so only a changed draft
+	// gets the complaint.
+	const draftEdited = customDraft !== "" && customDraft !== rrule;
 
 	const commitCustom = () => {
-		if (!customDraft || customDraft === rrule || !customValid) return;
+		if (!draftEdited || customProblem) return;
 		emit(customDraft);
 	};
 
@@ -161,9 +165,11 @@ export function ScheduleSentence({
 							if (event.key === "Enter") commitCustom();
 						}}
 					/>
-					{customDraft && !customValid && (
+					{draftEdited && customProblem && (
 						<span className="select-text cursor-text text-xs text-destructive">
-							Invalid recurrence rule — changes aren't saved
+							{customProblem === "exhausted"
+								? "No upcoming runs — changes aren't saved"
+								: "Invalid recurrence rule — changes aren't saved"}
 						</span>
 					)}
 				</div>

packages/shared/src/rrule.ts

@@ -397,18 +397,29 @@ export function parseRrule(args: {
  * editors can gate saves instead of persisting rules the server will reject.
  */
 export function isValidRrule(rrule: string): boolean {
-	if (!parseRruleParts(rrule)) return false;
+	return rruleProblem(rrule) === null;
+}
+
+/**
+ * Why a rule can't be saved: `unparseable` (not an RRULE at all) or
+ * `exhausted` (well-formed, but COUNT/UNTIL leaves nothing in the future —
+ * a run-once schedule that already ran looks exactly like this). Null when
+ * the rule is fine.
+ */
+export function rruleProblem(
+	rrule: string,
+): "unparseable" | "exhausted" | null {
+	if (!parseRruleParts(rrule)) return "unparseable";
 	try {
-		return (
-			nextOccurrenceAfter({
-				rrule,
-				dtstart: new Date(),
-				timezone: "UTC",
-				after: new Date(),
-			}) !== null
-		);
+		const next = nextOccurrenceAfter({
+			rrule,
+			dtstart: new Date(),
+			timezone: "UTC",
+			after: new Date(),
+		});
+		return next === null ? "exhausted" : null;
 	} catch {
-		return false;
+		return "unparseable";
 	}
 }