pricing: phase 2: estimate billing page by royendo · Pull Request #9249 · rilldata/rill · GitHub
Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
d066379
tempoarry rmeove usage; was not a great page; move to invoice for non…
royendo Mar 20, 2026
704db52
prettier
royendo Mar 20, 2026
868c5ee
Update +layout.svelte
royendo Mar 20, 2026
6d1d9b7
Merge remote-tracking branch 'origin/main' into pricing-1/fix-org-bil…
royendo Apr 6, 2026
4a7ae2d
Migrate billing plan components to Svelte 5 runes
royendo Apr 6, 2026
10c050c
chore: format with prettier
royendo Apr 6, 2026
5de0624
Update CancelledTeamPlan.svelte
royendo Apr 6, 2026
c21121a
Merge branch 'main' into pricing-1/fix-org-billing-page
royendo Apr 9, 2026
b47204d
fisrt pass on new design
royendo Apr 9, 2026
2475972
ne wlook
royendo Apr 13, 2026
685073d
Merge branch 'main' into pricing-1/fix-org-billing-page
royendo Apr 13, 2026
6868db6
first pass
royendo Apr 13, 2026
ca641e0
second pass
royendo Apr 13, 2026
317e597
entperirse nite
royendo Apr 13, 2026
57bf2a9
prettier
royendo Apr 13, 2026
b2830fc
web code qual
royendo Apr 13, 2026
81d8a96
code qual
royendo Apr 13, 2026
11a59a7
Remove unused `subscriptionQuery` to fix ESLint error
royendo Apr 13, 2026
dd5affb
Merge branch 'main' into pricing-1/fix-org-billing-page
royendo Apr 15, 2026
1d0af49
fix duplicate OLAP/AI Connector
royendo Apr 15, 2026
ce5ae8c
new design update
royendo Apr 15, 2026
8416791
nit
royendo Apr 15, 2026
f82cbde
follow up to https://github.com/rilldata/rill/pull/9088
royendo Apr 15, 2026
df0d27c
prettier, code qual
royendo Apr 15, 2026
483de69
asreq
royendo Apr 20, 2026
4b18f9f
prettier
royendo Apr 20, 2026
3356d73
Merge branch 'main' into pricing-2-org-billing-estimate-costs
royendo Apr 21, 2026
2c559fc
as req
royendo Apr 21, 2026
b970dc0
separating for visual clarity
royendo Apr 21, 2026
1a9ea20
Update +page.svelte
royendo Apr 23, 2026
bfaf3db
Scope PR to estimate page only
royendo Apr 23, 2026
29dbf76
Update +page.svelte
royendo Apr 23, 2026
bba9ce7
Merge remote-tracking branch 'origin/main' into pricing-2-org-billing…
royendo Apr 23, 2026
8fd30b3
web cdoe wual
royendo Apr 23, 2026
d20c969
fix width, light/dark mode
royendo Apr 28, 2026
844cc35
remove orb credit logic
royendo Apr 29, 2026
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
Prev Previous commit
Next Next commit
entperirse nite
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
  • Loading branch information
royendo and claude committed Apr 13, 2026
commit 317e597819880111414c0e4e7bb46dff55f2494e
88 changes: 43 additions & 45 deletions web-admin/src/features/billing/plans/Plan.svelte
16 changes: 15 additions & 1 deletion web-admin/src/routes/[organization]/-/settings/+layout.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
<script lang="ts">
import type { Snippet } from "svelte";
import { page } from "$app/stores";
import { V1BillingPlanType } from "@rilldata/web-admin/client";
import LeftNav from "@rilldata/web-admin/components/nav/LeftNav.svelte";
import {
isEnterprisePlan,
isManagedPlan,
} from "@rilldata/web-admin/features/billing/plans/utils";
import type { PageData } from "./$types";
import ContentContainer from "@rilldata/web-common/components/layout/ContentContainer.svelte";

Expand All @@ -18,6 +23,15 @@
let organization = $derived($page.params.organization);
let basePage = $derived(`/${organization}/-/settings`);

let planType = $derived(data.subscription?.plan?.planType);
let planName = $derived(data.subscription?.plan?.name ?? "");
let isEnterprise = $derived(
planType === V1BillingPlanType.BILLING_PLAN_TYPE_ENTERPRISE ||
planType === V1BillingPlanType.BILLING_PLAN_TYPE_MANAGED ||
isManagedPlan(planName) ||
isEnterprisePlan(planName),
);

let navItems = $derived([
{ label: "General", route: "", hasPermission: true },
{
Expand All @@ -28,7 +42,7 @@
{
label: "Usage",
route: "/billing/usage",
hasPermission: true,
hasPermission: !isEnterprise,
},
]);
</script>
Expand Down
Loading