Skip to content

feat: add rebuild template option with dialog confirmation #217

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

Open
jakubno wants to merge 1 commit into
base: main
Choose a base branch
from
+157 −11
Open

feat: add rebuild template option with dialog confirmation #217

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
8 changes: 4 additions & 4 deletions bun.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"date-fns": "^4.1.0",
"date-fns-tz": "^3.2.0",
"deepmerge": "^4.3.1",
"e2b": "^2.7.0",
"e2b": "^2.10.2",
"echarts": "^6.0.0",
"echarts-for-react": "^3.0.2",
"fast-xml-parser": "^4.5.1",
Expand Down
96 changes: 90 additions & 6 deletions src/features/dashboard/templates/list/table-cells.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ import {
import { Loader } from '@/ui/primitives/loader_d'
import { useMutation, useQueryClient } from '@tanstack/react-query'
import { CellContext } from '@tanstack/react-table'
import { Lock, LockOpen, MoreVertical } from 'lucide-react'
import { useParams } from 'next/navigation'
import { Hammer, Lock, LockOpen, MoreVertical } from 'lucide-react'
import { useParams, useRouter } from 'next/navigation'
import { PROTECTED_URLS } from '@/configs/urls'
import { useMemo, useState } from 'react'
import ResourceUsage from '../../common/resource-usage'
import { useDashboard } from '../../context'
Expand Down Expand Up @@ -55,7 +56,9 @@ export function ActionsCell({
const { toast } = useToast()
const trpc = useTRPC()
const queryClient = useQueryClient()
const router = useRouter()
const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false)
const [isRebuildDialogOpen, setIsRebuildDialogOpen] = useState(false)

const updateTemplateMutation = useMutation(
trpc.templates.updateTemplate.mutationOptions({
Expand Down Expand Up @@ -172,8 +175,40 @@ export function ActionsCell({
})
)

const rebuildTemplateMutation = useMutation(
trpc.templates.rebuildTemplate.mutationOptions({
onSuccess: async (data) => {
const templateName = template.aliases[0] || template.templateID
toast(
defaultSuccessToast(
<>
Rebuild started for template{' '}
<span className="prose-body-highlight">{templateName}</span>.
</>
)
)

router.push(
PROTECTED_URLS.TEMPLATE_BUILD(teamIdOrSlug, data.templateID, data.buildID)
)
},
onError: (error) => {
const templateName = template.aliases[0] || template.templateID
toast(
defaultErrorToast(
error.message || `Failed to rebuild template ${templateName}.`
)
)
},
onSettled: () => {
setIsRebuildDialogOpen(false)
},
})
)

const isUpdating = updateTemplateMutation.isPending
const isDeleting = deleteTemplateMutation.isPending
const isRebuilding = rebuildTemplateMutation.isPending

const togglePublish = () => {
updateTemplateMutation.mutate({
Expand All @@ -190,6 +225,15 @@ export function ActionsCell({
})
}

const rebuildTemplate = () => {
rebuildTemplateMutation.mutate({
teamIdOrSlug: team.slug ?? team.id,
alias: template.aliases[0] || template.templateID,
cpuCount: template.cpuCount,
memoryMB: template.memoryMB,
})
}

return (
<>
<AlertDialog
Expand Down Expand Up @@ -221,15 +265,48 @@ export function ActionsCell({
}}
/>

<AlertDialog
open={isRebuildDialogOpen}
onOpenChange={setIsRebuildDialogOpen}
title="Rebuild Template"
description={
<>
You are about to rebuild the template{' '}
{template.aliases[0] && (
<>
<span className="prose-body-highlight">
{template.aliases[0]}
</span>{' '}
(
</>
)}
<code className="text-fg-tertiary font-mono">
{template.templateID}
</code>
{template.aliases[0] && <>)</>}. This will create a new build with
the same configuration.
</>
}
confirm="Rebuild"
onConfirm={() => rebuildTemplate()}
confirmProps={{
variant: 'default',
disabled: isRebuilding,
loading: isRebuilding,
}}
/>

<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
variant="ghost"
size="icon"
className="text-fg-tertiary size-5"
disabled={isUpdating || isDeleting || 'isDefault' in template}
disabled={
isUpdating || isDeleting || isRebuilding || 'isDefault' in template
}
>
{isUpdating ? (
{isUpdating || isRebuilding ? (
<Loader className="size-4" />
) : (
<MoreVertical className="size-4" />
Expand All @@ -241,7 +318,7 @@ export function ActionsCell({
<DropdownMenuLabel>General</DropdownMenuLabel>
<DropdownMenuItem
onClick={togglePublish}
disabled={isUpdating || isDeleting}
disabled={isUpdating || isDeleting || isRebuilding}
>
{template.public ? (
<>
Expand All @@ -255,6 +332,13 @@ export function ActionsCell({
</>
)}
</DropdownMenuItem>
<DropdownMenuItem
onClick={() => setIsRebuildDialogOpen(true)}
disabled={isUpdating || isDeleting || isRebuilding}
>
<Hammer className="!size-3" />
Rebuild
</DropdownMenuItem>
</DropdownMenuGroup>

<DropdownMenuSeparator />
Expand All @@ -264,7 +348,7 @@ export function ActionsCell({
<DropdownMenuItem
variant="error"
onClick={() => setIsDeleteDialogOpen(true)}
disabled={isUpdating || isDeleting}
disabled={isUpdating || isDeleting || isRebuilding}
>
X Delete
</DropdownMenuItem>
Expand Down
62 changes: 62 additions & 0 deletions src/server/api/routers/templates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { l } from '@/lib/clients/logger/logger'
import { supabaseAdmin } from '@/lib/clients/supabase/admin'
import { DefaultTemplate } from '@/types/api.types'
import { TRPCError } from '@trpc/server'
import { Template } from 'e2b'
import { cacheLife, cacheTag } from 'next/cache'
import { z } from 'zod'
import { apiError } from '../errors'
Expand Down Expand Up @@ -188,6 +189,67 @@ export const templatesRouter = createTRPCRouter({

return { success: true, public: isPublic }
}),

rebuildTemplate: protectedTeamProcedure
.input(
z.object({
alias: z.string(),
cpuCount: z.number(),
memoryMB: z.number(),
})
)
.mutation(async ({ ctx, input }) => {
const { session, teamId } = ctx
const { alias, cpuCount, memoryMB } = input

try {
const template = Template().fromTemplate(alias)

const buildInfo = await Template.buildInBackground(template, {
alias,
cpuCount,
memoryMB,
domain: process.env.NEXT_PUBLIC_E2B_DOMAIN,
headers: {
...SUPABASE_AUTH_HEADERS(session.access_token, teamId),
},
})

return {
templateID: buildInfo.templateId,
buildID: buildInfo.buildId,
}
} catch (error) {
l.error(
{
key: 'trpc:templates:rebuild_template:e2b_error',
error,
user_id: session.user.id,
team_id: teamId,
alias,
},
`failed to rebuild template: ${error instanceof Error ? error.message : 'Unknown error'}`
)

if (
error instanceof Error &&
error.message.toLowerCase().includes('not found')
) {
throw new TRPCError({
code: 'NOT_FOUND',
message: 'Template not found',
})
}

throw new TRPCError({
code: 'INTERNAL_SERVER_ERROR',
message:
error instanceof Error
? error.message
: 'Failed to rebuild template',
})
}
}),
})

async function getDefaultTemplatesCached() {
Expand Down
Loading