DeCAPITALIZED some things
🚀 Publish Trigger.dev Docker / e2e (push) Failing after 12m54s
🚀 Publish Trigger.dev Docker / units (push) Failing after 12m54s
🚀 Publish Trigger.dev Docker / typecheck (push) Failing after 12m55s
🚀 Publish Trigger.dev Docker / publish (push) Has been skipped

This commit is contained in:
Matt Aitken
2023-12-12 17:50:44 +00:00
parent 08ed4b0ff7
commit 266c2790e6
11 changed files with 46 additions and 44 deletions
@@ -69,10 +69,10 @@ function ConcurrentRunsSlider({
<div className="flex items-center justify-between">
<Header2>
<DefinitionTip
content="The number of Runs that can be executed at the same time. Get in touch if you need more than 100."
title="Concurrent Runs"
content="The number of runs that can be executed at the same time. Get in touch if you need more than 100."
title="Concurrent runs"
>
Concurrent Runs
Concurrent runs
</DefinitionTip>
</Header2>
<Header2>Up to {selectedOption.upto}</Header2>
@@ -89,7 +89,7 @@ function ConcurrentRunsSlider({
</Slider.Track>
<Slider.Thumb
className="block h-5 w-5 rounded-full border-4 border-indigo-500 bg-slate-850 shadow-[0_1px_3px_4px_rgb(0_0_0_/_0.2),_0_1px_2px_-1px_rgb(0_0_0_/_0.1)] transition hover:border-indigo-400 hover:bg-slate-800 focus:shadow-[0_1px_3px_4px_rgb(0_0_0_/_0.2),_0_1px_2px_-1px_rgb(0_0_0_/_0.1)] focus:outline-none"
aria-label="Concurrent Runs slider"
aria-label="Concurrent runs slider"
/>
</Slider.Root>
<div className="ml-1.5 flex w-[99.85%] items-center justify-between">
@@ -162,7 +162,7 @@ function RunsSlider({
</Slider.Track>
<Slider.Thumb
className="block h-5 w-5 rounded-full border-4 border-indigo-500 bg-slate-850 shadow-[0_1px_3px_4px_rgb(0_0_0_/_0.2),_0_1px_2px_-1px_rgb(0_0_0_/_0.1)] transition hover:border-indigo-400 hover:bg-slate-800 focus:shadow-[0_1px_3px_4px_rgb(0_0_0_/_0.2),_0_1px_2px_-1px_rgb(0_0_0_/_0.1)] focus:outline-none"
aria-label="Concurrent Runs slider"
aria-label="Concurrent runs slider"
/>
</Slider.Root>
<div className="relative w-full">
@@ -16,12 +16,12 @@ import { Spinner } from "../primitives/Spinner";
const pricingDefinitions = {
concurrentRuns: {
title: "Concurrent Runs",
content: "The number of Runs that can be executed at the same time.",
title: "Concurrent runs",
content: "The number of runs that can be executed at the same time.",
},
jobRuns: {
title: "Job Runs",
content: "A single execution of a Job.",
title: "Job runs",
content: "A single execution of a job.",
},
jobs: {
title: "Jobs",
@@ -29,11 +29,11 @@ const pricingDefinitions = {
},
tasks: {
title: "Tasks",
content: "The individual building blocks of a Job Run.",
content: "The individual building blocks of a job run.",
},
events: {
title: "Events",
content: "Events trigger Jobs to start running.",
content: "Events trigger jobs to start running.",
},
integrations: {
title: "Integrations",
@@ -185,7 +185,7 @@ export function TierFree({
title={pricingDefinitions.jobs.title}
content={pricingDefinitions.jobs.content}
>
Jobs
jobs
</DefinitionTip>
</FeatureItem>
<FeatureItem checked>
@@ -194,7 +194,7 @@ export function TierFree({
title={pricingDefinitions.tasks.title}
content={pricingDefinitions.tasks.content}
>
Tasks
tasks
</DefinitionTip>
</FeatureItem>
<FeatureItem checked>
@@ -203,13 +203,13 @@ export function TierFree({
title={pricingDefinitions.events.title}
content={pricingDefinitions.events.content}
>
Events
events
</DefinitionTip>
</FeatureItem>
<FeatureItem checked>Unlimited team members</FeatureItem>
<FeatureItem checked>24 hour log retention</FeatureItem>
<FeatureItem checked>Community support</FeatureItem>
<FeatureItem>Custom Integrations</FeatureItem>
<FeatureItem>Custom integrations</FeatureItem>
<FeatureItem>Role-based access control</FeatureItem>
<FeatureItem>SSO</FeatureItem>
<FeatureItem>On-prem option</FeatureItem>
@@ -326,7 +326,7 @@ export function TierPro({
<RunsVolumeDiscountTable hideHeader brackets={plan.runs?.pricing?.brackets ?? []} />
}
>
{"<"} ${(mostExpensiveRunCost * 1000).toFixed(2)}/1K Runs
{"<"} ${(mostExpensiveRunCost * 1000).toFixed(2)}/1K runs
</DefinitionTip>
</FeatureItem>
<FeatureItem checked>
@@ -335,7 +335,7 @@ export function TierPro({
title={pricingDefinitions.jobs.title}
content={pricingDefinitions.jobs.content}
>
Jobs
jobs
</DefinitionTip>
</FeatureItem>
<FeatureItem checked>
@@ -344,7 +344,7 @@ export function TierPro({
title={pricingDefinitions.tasks.title}
content={pricingDefinitions.tasks.content}
>
Tasks
tasks
</DefinitionTip>
</FeatureItem>
<FeatureItem checked>
@@ -353,13 +353,13 @@ export function TierPro({
title={pricingDefinitions.events.title}
content={pricingDefinitions.events.content}
>
Events
events
</DefinitionTip>
</FeatureItem>
<FeatureItem checked>Unlimited team members</FeatureItem>
<FeatureItem checked>7 day log retention</FeatureItem>
<FeatureItem checked>Dedicated Slack support</FeatureItem>
<FeatureItem>Custom Integrations</FeatureItem>
<FeatureItem>Custom integrations</FeatureItem>
<FeatureItem>Role-based access control</FeatureItem>
<FeatureItem>SSO</FeatureItem>
<FeatureItem>On-prem option</FeatureItem>
@@ -408,7 +408,7 @@ export function TierEnterprise() {
title={pricingDefinitions.jobs.title}
content={pricingDefinitions.jobs.content}
>
Jobs
jobs
</DefinitionTip>
</FeatureItem>
<FeatureItem checked>
@@ -417,7 +417,7 @@ export function TierEnterprise() {
title={pricingDefinitions.tasks.title}
content={pricingDefinitions.tasks.content}
>
Tasks
tasks
</DefinitionTip>
</FeatureItem>
<FeatureItem checked>
@@ -426,7 +426,7 @@ export function TierEnterprise() {
title={pricingDefinitions.events.title}
content={pricingDefinitions.events.content}
>
Events
events
</DefinitionTip>
</FeatureItem>
<FeatureItem checked>Unlimited team members</FeatureItem>
@@ -20,7 +20,7 @@ export function UpgradePrompt({ organization }: UpgradePromptProps) {
return (
<div className="flex h-full w-full items-center gap-4 bg-gradient-to-r from-transparent to-indigo-900/50 pr-1.5">
<Paragraph variant="extra-small" className="text-rose-500">
You have exceeded the monthly {formatNumberCompact(currentPlan.usage.runCountCap)} Runs
You have exceeded the monthly {formatNumberCompact(currentPlan.usage.runCountCap)} runs
limit
</Paragraph>
<LinkButton
@@ -52,7 +52,7 @@ export function UsageBar({
value={formatNumberCompact(billingLimit)}
position="bottomRow2"
percentage={billingLimitPercentage}
tooltipContent={`Billing Limit: ${formatNumberCompact(billingLimit)}`}
tooltipContent={`Billing limit: ${formatNumberCompact(billingLimit)}`}
/>
</motion.div>
)}
@@ -72,7 +72,7 @@ export function UsageBar({
tooltipContent={`${
subscribedToPaidTier
? `Runs included free: ${formatNumberCompact(tierRunLimit)}`
: `Free Tier Runs Limit: ${formatNumberCompact(tierRunLimit)}`
: `Free tier runs limit: ${formatNumberCompact(tierRunLimit)}`
}`}
/>
</motion.div>
@@ -90,7 +90,7 @@ export function UsageBar({
value={formatNumberCompact(projectedRuns)}
position="topRow2"
percentage={projectedRunsPercentage}
tooltipContent={`Projected Runs: ${formatNumberCompact(projectedRuns)}`}
tooltipContent={`Projected runs: ${formatNumberCompact(projectedRuns)}`}
/>
</motion.div>
)}
@@ -109,7 +109,7 @@ export function UsageBar({
value={formatNumberCompact(numberOfCurrentRuns)}
position="topRow1"
percentage={usagePercentage}
tooltipContent={`Current Run count: ${formatNumberCompact(numberOfCurrentRuns)}`}
tooltipContent={`Current run count: ${formatNumberCompact(numberOfCurrentRuns)}`}
/>
</motion.div>
<motion.div
@@ -73,11 +73,11 @@ export function RunsTable({
<TableBody>
{total === 0 && !hasFilters ? (
<TableBlankRow colSpan={showJob ? 10 : 9}>
<NoRuns title="No Runs found" />
<NoRuns title="No runs found" />
</TableBlankRow>
) : runs.length === 0 ? (
<TableBlankRow colSpan={showJob ? 10 : 9}>
<NoRuns title="No Runs match your filters" />
<NoRuns title="No runs match your filters" />
</TableBlankRow>
) : (
runs.map((run) => {
@@ -61,11 +61,11 @@ export function WebhookDeliveryRunsTable({
<TableBody>
{total === 0 && !hasFilters ? (
<TableBlankRow colSpan={8}>
<NoRuns title="No Runs found for this Job" />
<NoRuns title="No runs found for this job" />
</TableBlankRow>
) : runs.length === 0 ? (
<TableBlankRow colSpan={8}>
<NoRuns title="No Runs match your filters" />
<NoRuns title="No runs match your filters" />
</TableBlankRow>
) : (
runs.map((run) => {
@@ -32,7 +32,7 @@ function PricingCallouts() {
</LinkButton>
}
>
Some of your Runs are being queued because your Run concurrency is limited to 50.
Some of your runs are being queued because your run concurrency is limited to 50.
</Callout>
</div>
);
@@ -15,7 +15,7 @@ import { requireUserId } from "~/services/session.server";
import { formatCurrency, formatNumberCompact } from "~/utils/numberFormatter";
import { OrganizationParamsSchema, plansPath } from "~/utils/pathBuilder";
import { useCurrentPlan } from "../_app.orgs.$organizationSlug/route";
import { DateTime } from "~/components/primitives/DateTime";
import { DateTime, formatDateTime } from "~/components/primitives/DateTime";
export async function loader({ params, request }: LoaderFunctionArgs) {
const userId = await requireUserId(request);
@@ -108,10 +108,12 @@ export default function Page() {
</LinkButton>
}
>
You have exceeded the monthly{" "}
{formatNumberCompact(currentPlan?.subscription?.limits.runs ?? 0)} runs limit. Upgrade
to a paid plan before{" "}
<DateTime date={loaderData.periodEnd} includeSeconds={false} includeTime={false} />.
<Paragraph variant="small">
You have exceeded the monthly{" "}
{formatNumberCompact(currentPlan?.subscription?.limits.runs ?? 0)} runs limit.
Upgrade to a paid plan before{" "}
<DateTime date={loaderData.periodEnd} includeSeconds={false} includeTime={false} />.
</Paragraph>
</Callout>
)}
<div className="flex flex-col gap-x-8 @4xl:flex-row">
@@ -60,15 +60,15 @@ export default function Page() {
<div className="flex flex-col gap-4">
{hitConcurrencyLimit && (
<Callout variant={"pricing"}>
Some of your Runs are being queued because your Run concurrency is limited to{" "}
Some of your runs are being queued because your run concurrency is limited to{" "}
{currentPlan?.subscription?.limits.concurrentRuns}.
</Callout>
)}
{hitRunLimit && (
<Callout variant={"pricing"}>
{`You have exceeded the monthly
${formatNumberCompact(currentPlan!.subscription!.limits.runs!)} Runs limit. Upgrade so you
can continue to perform Runs.`}
${formatNumberCompact(currentPlan!.subscription!.limits.runs!)} runs limit. Upgrade so you
can continue to perform runs.`}
</Callout>
)}
<PricingTiers organizationSlug={organizationSlug} plans={plans} />
@@ -53,7 +53,7 @@ export default function Page() {
<PageContainer>
<PageHeader>
<PageTitleRow>
<PageTitle title={`${project.name} Runs`} />
<PageTitle title={`${project.name} runs`} />
<PageButtons>
<LinkButton
LeadingIcon={"docs"}
@@ -64,7 +64,7 @@ export default function Page() {
</LinkButton>
</PageButtons>
</PageTitleRow>
<PageDescription>All Job Runs in this project</PageDescription>
<PageDescription>All job runs in this project</PageDescription>
</PageHeader>
<PageBody scrollable={false}>
@@ -62,7 +62,7 @@ export default function Subscribed() {
<ul>
<PlanItem item="Your plan" value={currentPlan?.subscription?.plan.title ?? ""} />
<PlanItem
item="Concurrent Runs/mo"
item="Concurrent runs/mo"
value={`${currentPlan?.subscription?.plan.concurrentRuns.pricing?.upto}`}
/>
<PlanItem item="Runs/mo" value="Volume discounted" />