Skip to content

Removed the inaccurate usage prediction bar #1326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samejr merged 1 commit into from
Sep 19, 2024
Merged

Removed the inaccurate usage prediction bar #1326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 3 additions & 36 deletions apps/webapp/app/components/billing/v3/UsageBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,16 @@ type UsageBarProps = {
current: number;
billingLimit?: number;
tierLimit?: number;
projectedUsage?: number;
isPaying: boolean;
};

const startFactor = 4;

export function UsageBar({
current,
billingLimit,
tierLimit,
projectedUsage,
isPaying,
}: UsageBarProps) {
const getLargestNumber = Math.max(
current,
tierLimit ?? -Infinity,
projectedUsage ?? -Infinity,
billingLimit ?? -Infinity,
5
);
export function UsageBar({ current, billingLimit, tierLimit, isPaying }: UsageBarProps) {
const getLargestNumber = Math.max(current, tierLimit ?? -Infinity, billingLimit ?? -Infinity, 5);
//creates a maximum range for the progress bar, add 10% to the largest number so the bar doesn't reach the end
const maxRange = Math.round(getLargestNumber * 1.1);
const tierRunLimitPercentage = tierLimit ? Math.round((tierLimit / maxRange) * 100) : 0;
const projectedRunsPercentage = projectedUsage
? Math.round((projectedUsage / maxRange) * 100)
: 0;
const billingLimitPercentage =
billingLimit !== undefined ? Math.round((billingLimit / maxRange) * 100) : 0;
const usagePercentage = Math.round((current / maxRange) * 100);
Expand All @@ -42,7 +26,7 @@ export function UsageBar({
const usageCappedToLimitPercentage = Math.min(usagePercentage, tierRunLimitPercentage);

return (
<div className="h-fit w-full py-12">
<div className="h-fit w-full py-6">
<div className="relative h-3 w-full rounded-sm bg-background-bright">
{billingLimit !== undefined && (
<motion.div
Expand Down Expand Up @@ -93,23 +77,6 @@ export function UsageBar({
/>
</motion.div>
)}
{projectedUsage !== undefined && projectedUsage !== 0 && (
<motion.div
initial={{ width: projectedRunsPercentage / startFactor + "%" }}
animate={{ width: projectedRunsPercentage + "%" }}
transition={{ duration: 1.5, type: "spring" }}
style={{ width: `${projectedRunsPercentage}%` }}
className="absolute h-3 rounded-l-sm"
>
<Legend
text="Projected:"
value={formatCurrency(projectedUsage, false)}
position="topRow2"
percentage={projectedRunsPercentage}
/>
</motion.div>
)}

<motion.div
initial={{ width: usageCappedToLimitPercentage / startFactor + "%" }}
animate={{ width: usageCappedToLimitPercentage + "%" }}
Expand Down
32 changes: 9 additions & 23 deletions apps/webapp/app/routes/_app.orgs.$organizationSlug.v3.usage/route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,39 +139,25 @@ export default function Page() {
}
>
{(usage) => (
<>
<div className="flex w-full items-center gap-6">
<div className="flex flex-col gap-2">
<Header3 className="">
{isCurrentMonth ? "Month-to-date" : "Usage"}
</Header3>
<p className="text-3xl font-medium text-text-bright">
{formatCurrency(usage.overall.current, false)}
</p>
</div>
{isCurrentMonth ? (
<>
<ArrowRightIcon className="h-6 w-6 text-text-dimmed/50" />
<div className="flex flex-col gap-2 text-text-dimmed">
<Header3 className="text-text-dimmed">Projected</Header3>
<p className="text-3xl font-medium">
{formatCurrency(usage.overall.projected, false)}
</p>
</div>
</>
) : null}
<div className="flex items-center gap-8">
<div className="flex flex-col gap-2">
<Header3 className="whitespace-nowrap">
{isCurrentMonth ? "Month-to-date" : "Usage"}
</Header3>
<p className="whitespace-nowrap text-3xl font-medium text-text-bright">
{formatCurrency(usage.overall.current, false)}
</p>
</div>
<UsageBar
current={usage.overall.current}
projectedUsage={isCurrentMonth ? usage.overall.projected : undefined}
isPaying={currentPlan?.v3Subscription?.isPaying ?? false}
tierLimit={
isCurrentMonth
? (currentPlan?.v3Subscription?.plan?.limits.includedUsage ?? 0) / 100
: undefined
}
/>
</>
</div>
)}
</Await>
</Suspense>
Expand Down