From 9f90df16b444d9b5ff53ca46f9262310c6c2c447 Mon Sep 17 00:00:00 2001 From: James Ritchie Date: Thu, 21 Aug 2025 10:51:12 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Switches=20=E2=80=9Creplay=E2=80=9D=20and?= =?UTF-8?q?=20=E2=80=9Ccancel=E2=80=9D=20options=20in=20the=20list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ectParam.env.$envParam.runs.bulkaction.tsx | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.tsx index 5877f2972a..26386795e0 100644 --- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.tsx +++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.tsx @@ -340,25 +340,25 @@ export function CreateBulkActionInspector({ }} > - Replay runs + Cancel runs } - description="Replays all selected runs, regardless of current status." - value={"replay"} + description="Cancels all runs still in progress. Any finished runs won’t be canceled." + value={"cancel"} variant="description" /> - Cancel runs + Replay runs } - description="Cancels all runs still in progress. Any finished runs won’t be canceled." - value={"cancel"} + description="Replays all selected runs, regardless of current status." + value={"replay"} variant="description" /> @@ -466,8 +466,8 @@ function bulkActionModeFromString(value: string | undefined): BulkActionMode { } function bulkActionActionFromString(value: string | undefined): BulkActionAction { - if (!value) return "replay"; + if (!value) return "cancel"; const parsed = BulkActionAction.safeParse(value); - if (!parsed.success) return "replay"; + if (!parsed.success) return "cancel"; return parsed.data; } From 8999d04c543a1936bf72ec49297822b8ca6670e5 Mon Sep 17 00:00:00 2001 From: James Ritchie Date: Thu, 21 Aug 2025 10:51:34 +0100 Subject: [PATCH 2/3] Fixed incorrect cancel icon being used --- apps/webapp/app/components/BulkActionFilterSummary.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/webapp/app/components/BulkActionFilterSummary.tsx b/apps/webapp/app/components/BulkActionFilterSummary.tsx index b00d77d438..51f9149e4d 100644 --- a/apps/webapp/app/components/BulkActionFilterSummary.tsx +++ b/apps/webapp/app/components/BulkActionFilterSummary.tsx @@ -11,6 +11,7 @@ import { appliedSummary, dateFromString, timeFilterRenderValues } from "./runs/v import { formatNumber } from "~/utils/numberFormatter"; import { SpinnerWhite } from "./primitives/Spinner"; import { ArrowPathIcon, CheckIcon, XCircleIcon } from "@heroicons/react/20/solid"; +import { XCircleIcon as XCircleIconOutline } from "@heroicons/react/24/outline"; import assertNever from "assert-never"; import { AppliedFilter } from "./primitives/AppliedFilter"; import { runStatusTitle } from "./runs/v3/TaskRunStatus"; @@ -244,7 +245,7 @@ function Action({ action }: { action: BulkActionAction }) { case "cancel": return ( - + Canceled ); From de534781a272c174048703942fa0d51b97d7f6a8 Mon Sep 17 00:00:00 2001 From: James Ritchie Date: Thu, 21 Aug 2025 10:51:55 +0100 Subject: [PATCH 3/3] Fixes the alignment of the radiobuttons --- apps/webapp/app/components/primitives/RadioButton.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/webapp/app/components/primitives/RadioButton.tsx b/apps/webapp/app/components/primitives/RadioButton.tsx index 6ea04f3b56..87fb7a59f1 100644 --- a/apps/webapp/app/components/primitives/RadioButton.tsx +++ b/apps/webapp/app/components/primitives/RadioButton.tsx @@ -39,7 +39,7 @@ const variants = { description: { button: "w-full p-2.5 hover:data-[state=checked]:bg-white/[4%] data-[state=checked]:bg-white/[4%] transition data-[disabled]:opacity-70 hover:border-charcoal-600 border-charcoal-650 hover:data-[state=checked]:border-charcoal-600 border rounded-md", - label: "text-text-bright font-semibold -mt-1 text-left text-sm", + label: "text-text-bright font-semibold -mt-0.5 text-left text-sm", description: "text-text-dimmed -mt-0 text-left", inputPosition: "mt-0", icon: "w-8 h-8 mb-2",