diff --git a/Makefile b/Makefile index 9bca9b68..0ea46a9b 100644 --- a/Makefile +++ b/Makefile @@ -35,6 +35,10 @@ $(BIN): $(BIN)/%: | $(BIN) ; $(info $(M) building $(@F)…) $Q GOBIN=$(BIN) $(GO) install $(shell $(GO) list tool | grep $(@F)) +# Pin specific tool versions to avoid generator mismatches in CI +$(BIN)/oapi-codegen: | $(BIN) ; $(info $(M) building oapi-codegen v2.7.0…) + $Q GOBIN=$(BIN) $(GO) install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.7.0 + $(BIN)/tailwindcss: | $(BIN) ; $(info $(M) building tailwindcss…) $Q ./etc/install-tailwindcss.sh $(BIN) diff --git a/console/src/components/scheduled-detail-table.tsx b/console/src/components/scheduled-detail-table.tsx index 56cc8748..7e8719d9 100644 --- a/console/src/components/scheduled-detail-table.tsx +++ b/console/src/components/scheduled-detail-table.tsx @@ -77,6 +77,7 @@ interface ScheduledItem { anchor_at: string | null interval: string | null paused_at: string | null + has_pending_events: boolean | null data: Record | null created_at: string updated_at: string @@ -128,9 +129,7 @@ function ScheduledExpandedRow({ item, patchUrl, onSaved }: ScheduledExpandedRowP {formatDate(preferences, item.scheduled_at, "PPpp")} - {!item.paused_at && - item.scheduled_at && - new Date(item.scheduled_at) <= new Date() && ( + {!item.paused_at && item.has_pending_events && ( @@ -484,10 +483,7 @@ export default function ScheduledDetailTable({ {t("paused", "Paused")} )} - {!item.paused_at && - item.scheduled_at && - new Date(item.scheduled_at) <= - new Date() && ( + {!item.paused_at && item.has_pending_events && (