Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a033e89
Add Rill Slots UI to project status overview
royendo Mar 20, 2026
1b7bb22
View only; remove CTA
royendo Mar 20, 2026
1e8707c
code qual
royendo Mar 20, 2026
8deed0c
deployments page; naive wait for RD in RC
royendo Mar 25, 2026
fc1daee
deployments fill in page; wait for DES
royendo Mar 27, 2026
91aa5cf
Merge branch 'main' into pricing/slots-phase-2-deployment-page
royendo Mar 27, 2026
df0bc92
code qual
royendo Mar 27, 2026
2dcfac1
Merge branch 'pricing/slots-phase-2-deployment-page' of https://githu…
royendo Mar 27, 2026
0d60097
fix: remove undefined devModalOpen reference in DeploymentsPage
royendo Apr 1, 2026
501be0f
Merge remote-tracking branch 'origin/main' into pricing/slots-phase-2…
royendo Apr 6, 2026
f0caf17
Migrate new pricing/deployment Svelte files to Svelte 5 patterns
royendo Apr 6, 2026
5cdeafc
chore: format with prettier
royendo Apr 6, 2026
1155c20
Merge branch 'main' into pricing/slots-phase-2-deployment-page
royendo Apr 7, 2026
c15fc87
local code review
royendo Apr 7, 2026
78848ea
further clean up
royendo Apr 7, 2026
f673f4b
Update DeploymentsPage.svelte
royendo Apr 7, 2026
3c2795e
Update ManageSlotsModal.svelte
royendo Apr 7, 2026
c680d96
Update DeploymentsPage.svelte
royendo Apr 8, 2026
1f6b57c
Update DeploymentsPage.svelte
royendo Apr 8, 2026
695165d
Merge branch 'main' into pricing/slots-phase-2-deployment-page
royendo Apr 13, 2026
0b435a2
updated designs
royendo Apr 13, 2026
67cf06d
prettier dev slots 1,
royendo Apr 13, 2026
3085ebe
update designs
royendo Apr 15, 2026
f830c5a
Merge branch 'main' into pricing/slots-phase-2-deployment-page
royendo Apr 15, 2026
899ccd6
dev dynamic pricing
royendo Apr 15, 2026
7500998
prettier
royendo Apr 15, 2026
e3553c7
web code qual
royendo Apr 15, 2026
068eea1
show deployment for certain plans
royendo Apr 15, 2026
c726aff
Manage Units(same CTA as Production Slots} with TODO for deployment API
royendo Apr 15, 2026
6507a72
Merge branch 'main' into pricing/slots-phase-2-deployment-page
royendo Apr 20, 2026
817bb5f
proper devSlots, cant manage yet, fix some views in branch mode
royendo Apr 20, 2026
615caed
Update DeploymentSection.svelte
royendo Apr 20, 2026
c447e13
remove monthly estimate, show hourly for development
royendo Apr 20, 2026
71b4a16
Update DeploymentsPage.svelte
royendo Apr 20, 2026
4451508
design on call changes
royendo Apr 20, 2026
da7bb45
Update ManageSlotsModal.svelte
royendo Apr 20, 2026
d1d7f23
Merge branch 'main' into pricing/slots-phase-2-deployment-page
royendo Apr 21, 2026
c98fa2b
add dev_slots API, clean up code
royendo Apr 21, 2026
945c59f
code review, wrong API tied; this is project default API
royendo Apr 21, 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
1 change: 1 addition & 0 deletions admin/server/projects.go
Original file line number Diff line number Diff line change
Expand Up @@ -2218,6 +2218,7 @@ func (s *Server) projToDTO(p *database.Project, orgName string) *adminv1.Project
Provisioner: p.Provisioner,
ProdVersion: p.ProdVersion,
ProdSlots: int64(p.ProdSlots),
DevSlots: int64(p.DevSlots),
PrimaryBranch: p.PrimaryBranch,
Subpath: p.Subpath,
GitRemote: safeStr(p.GitRemote),
Expand Down
23 changes: 0 additions & 23 deletions web-admin/src/components/layout/ContentContainer.svelte

This file was deleted.

85 changes: 63 additions & 22 deletions web-admin/src/features/branches/BranchesSection.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,12 @@
EyeIcon,
GitBranchIcon,
PlayIcon,
SlidersHorizontalIcon,
StopCircleIcon,
Trash2Icon,
} from "lucide-svelte";
import { eventBus } from "@rilldata/web-common/lib/event-bus/event-bus";
import ManageSlotsModal from "@rilldata/web-admin/features/projects/status/overview/ManageSlotsModal.svelte";

let { organization, project }: { organization: string; project: string } =
$props();
Expand Down Expand Up @@ -89,6 +91,9 @@
),
);

let canManage = $derived(
$projectQuery.data?.projectPermissions?.manageProject ?? false,
);
let prodSlots = $derived(
$projectQuery.data?.project?.prodSlots != null
? parseInt($projectQuery.data.project.prodSlots, 10)
Expand Down Expand Up @@ -142,6 +147,8 @@
let pendingId = $state("");
let deleteDialogOpen = $state(false);
let pendingDelete = $state<{ id: string; branch: string } | null>(null);
let prodSlotsModalOpen = $state(false);
let devSlotsModalOpen = $state(false);

async function mutateDeployment(
deploymentId: string,
Expand Down Expand Up @@ -202,9 +209,7 @@
}
</script>

<section class="flex flex-col gap-y-5">
<h2 class="text-lg font-medium">Branches</h2>

<section class="flex flex-col gap-y-3">
{#if $allDeployments.isLoading}
<div class="empty-container">
<DelayedSpinner isLoading={true} size="20px" />
Expand All @@ -221,22 +226,12 @@
{:else}
<div class="table-wrapper">
<div class="header-row">
<div class="pl-4 py-2 font-semibold text-fg-secondary text-sm">
Branch
</div>
<div class="pl-4 py-2 font-semibold text-fg-secondary text-sm">
Author
</div>
<div class="pl-4 py-2 font-semibold text-fg-secondary text-sm">
Status
</div>
<div class="pl-4 py-2 font-semibold text-fg-secondary text-sm">
Slots
</div>
<div class="pl-4 py-2 font-semibold text-fg-secondary text-sm">
Last updated
</div>
<div class="pl-4 py-2 font-semibold text-fg-secondary text-sm"></div>
<div class="pl-4 py-2">Branch</div>
<div class="pl-4 py-2">Author</div>
<div class="pl-4 py-2">Status</div>
<div class="pl-4 py-2">Units</div>
<div class="pl-4 py-2">Last updated</div>
<div class="pl-4 py-2"></div>
</div>
{#each visibleDeployments as deployment, i (deployment.id ?? i)}
{@const prod = isProdDeployment(deployment)}
Expand Down Expand Up @@ -308,6 +303,34 @@
<span class="ml-2">{prod ? "View" : "Preview"}</span>
</div>
</DropdownMenu.Item>
{#if prod && canManage && isActiveDeployment(deployment)}
<DropdownMenu.Item
class="font-normal flex items-center"
onclick={() => {
openDropdownId = "";
prodSlotsModalOpen = true;
}}
>
<div class="flex items-center">
<SlidersHorizontalIcon size="12px" />
<span class="ml-2">Manage units</span>
</div>
</DropdownMenu.Item>
{/if}
{#if !prod && canManage && isActiveDeployment(deployment)}
<DropdownMenu.Item
class="font-normal flex items-center"
onclick={() => {
openDropdownId = "";
devSlotsModalOpen = true;
}}
>
<div class="flex items-center">
<SlidersHorizontalIcon size="12px" />
<span class="ml-2">Manage units</span>
</div>
</DropdownMenu.Item>
{/if}
{#if canStart}
<DropdownMenu.Item
class="font-normal flex items-center"
Expand Down Expand Up @@ -378,13 +401,31 @@
onConfirm={handleDelete}
/>

<ManageSlotsModal
bind:open={prodSlotsModalOpen}
{organization}
{project}
currentSlots={prodSlots ?? 0}
title="Manage Prod Cluster Size"
/>

<ManageSlotsModal
bind:open={devSlotsModalOpen}
{organization}
{project}
currentSlots={devSlots ?? 0}
title="Manage Dev Cluster Size"
minSlots={0}
slotType="dev"
/>

<style lang="postcss">
.empty-container {
@apply border border-border rounded-sm py-10 flex flex-col items-center gap-y-2;
@apply border border-border rounded-xl py-10 flex flex-col items-center gap-y-2;
}

.table-wrapper {
@apply flex flex-col border rounded-sm overflow-x-auto;
@apply flex flex-col border border-border rounded-xl bg-surface-background overflow-x-auto;
}

.header-row,
Expand All @@ -397,7 +438,7 @@
}

.header-row {
@apply w-full bg-surface-subtle;
@apply w-full bg-surface-subtle text-xs font-semibold text-fg-secondary uppercase tracking-wide;
}

.data-row {
Expand Down
Loading
Loading