Skip to content

Commit ff42415

Browse files
committed
Updates the modal layout and tweaks copy
1 parent eec2536 commit ff42415

1 file changed

Lines changed: 44 additions & 49 deletions

File tree

  • apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx

Lines changed: 44 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -964,24 +964,20 @@ function QueueOverrideConcurrencyButton({
964964
</DialogHeader>
965965
<div className="flex flex-col gap-3 pt-3">
966966
{isOverridden ? (
967-
<>
968-
<Paragraph variant="small">
969-
This queue's concurrency limit is currently overridden to {currentLimit}.
970-
{queue.concurrencyLimit !== null &&
971-
` The original limit set in code was ${queue.concurrencyLimit}.`}
972-
</Paragraph>
973-
<Paragraph variant="small">
974-
You can update the override or remove it to restore the{" "}
975-
{queue.concurrencyLimit !== null
976-
? "limit set in code"
977-
: "environment concurrency limit"}
978-
.
979-
</Paragraph>
980-
</>
967+
<Paragraph>
968+
This queue's concurrency limit is currently overridden to {currentLimit}.
969+
{queue.concurrencyLimit !== null &&
970+
` The original limit set in code was ${queue.concurrencyLimit}.`}{" "}
971+
You can update the override or remove it to restore the{" "}
972+
{queue.concurrencyLimit !== null
973+
? "limit set in code"
974+
: "environment concurrency limit"}
975+
.
976+
</Paragraph>
981977
) : (
982-
<Paragraph variant="small">
983-
Override this queue's concurrency limit. The current limit is {currentLimit}{" "}
984-
{queue.concurrencyLimit !== null ? "(set in code)" : "(from environment)"}.
978+
<Paragraph>
979+
Override this queue's concurrency limit. The current limit is {currentLimit}, which is
980+
set {queue.concurrencyLimit !== null ? "in code" : "by the environment"}.
985981
</Paragraph>
986982
)}
987983
<Form method="post" onSubmit={() => setIsOpen(false)} className="space-y-3">
@@ -1001,43 +997,42 @@ function QueueOverrideConcurrencyButton({
1001997
autoFocus
1002998
/>
1003999
</div>
1004-
<div className="flex items-center justify-between gap-2">
1005-
<div>
1006-
{isOverridden && (
1007-
<Button
1008-
type="submit"
1009-
name="action"
1010-
value="queue-remove-override"
1011-
disabled={isLoading}
1012-
variant="danger/medium"
1013-
>
1014-
Remove override
1015-
</Button>
1016-
)}
1017-
</div>
1018-
<FormButtons
1019-
confirmButton={
1020-
<Button
1021-
type="submit"
1022-
name="action"
1023-
value="queue-override"
1024-
disabled={isLoading || !concurrencyLimit}
1025-
variant="primary/medium"
1026-
LeadingIcon={isLoading ? <Spinner color="white" /> : WrenchScrewdriverIcon}
1027-
shortcut={{ modifiers: ["mod"], key: "enter" }}
1028-
>
1029-
{isOverridden ? "Update override" : "Override limit"}
1030-
</Button>
1031-
}
1032-
cancelButton={
1000+
1001+
<FormButtons
1002+
confirmButton={
1003+
<Button
1004+
type="submit"
1005+
name="action"
1006+
value="queue-override"
1007+
disabled={isLoading || !concurrencyLimit}
1008+
variant="primary/medium"
1009+
LeadingIcon={isLoading && <Spinner color="white" />}
1010+
shortcut={{ modifiers: ["mod"], key: "enter" }}
1011+
>
1012+
{isOverridden ? "Update override" : "Override limit"}
1013+
</Button>
1014+
}
1015+
cancelButton={
1016+
<div className="flex items-center justify-between gap-2">
1017+
{isOverridden && (
1018+
<Button
1019+
type="submit"
1020+
name="action"
1021+
value="queue-remove-override"
1022+
disabled={isLoading}
1023+
variant="danger/medium"
1024+
>
1025+
Remove override
1026+
</Button>
1027+
)}
10331028
<DialogClose asChild>
10341029
<Button type="button" variant="tertiary/medium">
10351030
Cancel
10361031
</Button>
10371032
</DialogClose>
1038-
}
1039-
/>
1040-
</div>
1033+
</div>
1034+
}
1035+
/>
10411036
</Form>
10421037
</div>
10431038
</DialogContent>

0 commit comments

Comments
 (0)