diff --git a/apps/webapp/app/components/billing/PricingCalculator.tsx b/apps/webapp/app/components/billing/PricingCalculator.tsx index 561358f41..35379116a 100644 --- a/apps/webapp/app/components/billing/PricingCalculator.tsx +++ b/apps/webapp/app/components/billing/PricingCalculator.tsx @@ -69,10 +69,10 @@ function ConcurrentRunsSlider({
- Concurrent Runs + Concurrent runs Up to {selectedOption.upto} @@ -89,7 +89,7 @@ function ConcurrentRunsSlider({
@@ -162,7 +162,7 @@ function RunsSlider({
diff --git a/apps/webapp/app/components/billing/PricingTiers.tsx b/apps/webapp/app/components/billing/PricingTiers.tsx index 9da1f8d7d..cdd08553a 100644 --- a/apps/webapp/app/components/billing/PricingTiers.tsx +++ b/apps/webapp/app/components/billing/PricingTiers.tsx @@ -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 @@ -194,7 +194,7 @@ export function TierFree({ title={pricingDefinitions.tasks.title} content={pricingDefinitions.tasks.content} > - Tasks + tasks @@ -203,13 +203,13 @@ export function TierFree({ title={pricingDefinitions.events.title} content={pricingDefinitions.events.content} > - Events + events Unlimited team members 24 hour log retention Community support - Custom Integrations + Custom integrations Role-based access control SSO On-prem option @@ -326,7 +326,7 @@ export function TierPro({ } > - {"<"} ${(mostExpensiveRunCost * 1000).toFixed(2)}/1K Runs + {"<"} ${(mostExpensiveRunCost * 1000).toFixed(2)}/1K runs @@ -335,7 +335,7 @@ export function TierPro({ title={pricingDefinitions.jobs.title} content={pricingDefinitions.jobs.content} > - Jobs + jobs @@ -344,7 +344,7 @@ export function TierPro({ title={pricingDefinitions.tasks.title} content={pricingDefinitions.tasks.content} > - Tasks + tasks @@ -353,13 +353,13 @@ export function TierPro({ title={pricingDefinitions.events.title} content={pricingDefinitions.events.content} > - Events + events Unlimited team members 7 day log retention Dedicated Slack support - Custom Integrations + Custom integrations Role-based access control SSO On-prem option @@ -408,7 +408,7 @@ export function TierEnterprise() { title={pricingDefinitions.jobs.title} content={pricingDefinitions.jobs.content} > - Jobs + jobs @@ -417,7 +417,7 @@ export function TierEnterprise() { title={pricingDefinitions.tasks.title} content={pricingDefinitions.tasks.content} > - Tasks + tasks @@ -426,7 +426,7 @@ export function TierEnterprise() { title={pricingDefinitions.events.title} content={pricingDefinitions.events.content} > - Events + events Unlimited team members diff --git a/apps/webapp/app/components/billing/UpgradePrompt.tsx b/apps/webapp/app/components/billing/UpgradePrompt.tsx index cdbf94916..e2ab76a87 100644 --- a/apps/webapp/app/components/billing/UpgradePrompt.tsx +++ b/apps/webapp/app/components/billing/UpgradePrompt.tsx @@ -20,7 +20,7 @@ export function UpgradePrompt({ organization }: UpgradePromptProps) { return (
- You have exceeded the monthly {formatNumberCompact(currentPlan.usage.runCountCap)} Runs + You have exceeded the monthly {formatNumberCompact(currentPlan.usage.runCountCap)} runs limit )} @@ -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)}` }`} /> @@ -90,7 +90,7 @@ export function UsageBar({ value={formatNumberCompact(projectedRuns)} position="topRow2" percentage={projectedRunsPercentage} - tooltipContent={`Projected Runs: ${formatNumberCompact(projectedRuns)}`} + tooltipContent={`Projected runs: ${formatNumberCompact(projectedRuns)}`} /> )} @@ -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)}`} /> {total === 0 && !hasFilters ? ( - + ) : runs.length === 0 ? ( - + ) : ( runs.map((run) => { diff --git a/apps/webapp/app/components/runs/WebhookDeliveryRunsTable.tsx b/apps/webapp/app/components/runs/WebhookDeliveryRunsTable.tsx index 46160052c..de72c81a0 100644 --- a/apps/webapp/app/components/runs/WebhookDeliveryRunsTable.tsx +++ b/apps/webapp/app/components/runs/WebhookDeliveryRunsTable.tsx @@ -61,11 +61,11 @@ export function WebhookDeliveryRunsTable({ {total === 0 && !hasFilters ? ( - + ) : runs.length === 0 ? ( - + ) : ( runs.map((run) => { diff --git a/apps/webapp/app/components/stories/PricingCallout.stories.tsx b/apps/webapp/app/components/stories/PricingCallout.stories.tsx index 6f46d52ba..ddcc038f3 100644 --- a/apps/webapp/app/components/stories/PricingCallout.stories.tsx +++ b/apps/webapp/app/components/stories/PricingCallout.stories.tsx @@ -32,7 +32,7 @@ function PricingCallouts() { } > - 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.
); diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing._index/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing._index/route.tsx index 435b81084..f36a49602 100644 --- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing._index/route.tsx +++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing._index/route.tsx @@ -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() { } > - You have exceeded the monthly{" "} - {formatNumberCompact(currentPlan?.subscription?.limits.runs ?? 0)} runs limit. Upgrade - to a paid plan before{" "} - . + + You have exceeded the monthly{" "} + {formatNumberCompact(currentPlan?.subscription?.limits.runs ?? 0)} runs limit. + Upgrade to a paid plan before{" "} + . + )}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing.plans/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing.plans/route.tsx index 1d8850d56..613cca3ed 100644 --- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing.plans/route.tsx +++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing.plans/route.tsx @@ -60,15 +60,15 @@ export default function Page() {
{hitConcurrencyLimit && ( - 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}. )} {hitRunLimit && ( {`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.`} )} diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.runs/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.runs/route.tsx index 261178118..f29e8a5e2 100644 --- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.runs/route.tsx +++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.runs/route.tsx @@ -53,7 +53,7 @@ export default function Page() { - + - All Job Runs in this project + All job runs in this project diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.subscribed/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.subscribed/route.tsx index 8a70ea011..27b30e014 100644 --- a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.subscribed/route.tsx +++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.subscribed/route.tsx @@ -62,7 +62,7 @@ export default function Subscribed() {