Skip to content

The only tool you need to know what is happening and how to fix it.

Minor delete flow improvements

ddux7e868a51229f
diff --git a/backend/app/controllers/project.controller.go b/backend/app/controllers/project.controller.go
index db280081..9eff298c 100644
--- a/backend/app/controllers/project.controller.go
+++ b/backend/app/controllers/project.controller.go
@@ -61,6 +61,10 @@ type UpdateProjectRequest struct {
Framework string `json:"framework" binding:"required"`
}
+type DeleteProjectRequest struct {
+ Name string `json:"name" binding:"required"`
+}
+
func (p projectController) ListProjects(c *gin.Context) {
userId := middleware.GetUserId(c)
@@ -153,8 +157,9 @@ func (p projectController) UpdateProject(c *gin.Context) {
return
}
- tx := middleware.GetTx(c)
- project, err := repositories.ProjectRepository.Update(tx, projectId, request.Name, request.Framework)
+ project, err := db.ExecuteTransaction(func(tx *sql.Tx) (*models.Project, error) {
+ return repositories.ProjectRepository.Update(tx, projectId, request.Name, request.Framework)
+ })
if err != nil {
c.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("error updating project: %w", err))
return
@@ -166,17 +171,42 @@ func (p projectController) UpdateProject(c *gin.Context) {
}
func (p projectController) DeleteProject(c *gin.Context) {
+ var request DeleteProjectRequest
+ if err := c.ShouldBindJSON(&request); err != nil {
+ c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+ return
+ }
+
projectId, err := middleware.GetProjectId(c)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("RequireProjectAccess middleware must be applied: %w", err))
return
}
- tx := middleware.GetTx(c)
- if err := repositories.ProjectRepository.Delete(tx, projectId); err != nil {
+ nameMatched, err := db.ExecuteTransaction(func(tx *sql.Tx) (bool, error) {
+ project, err := repositories.ProjectRepository.FindById(tx, projectId)
+ if err != nil {
+ return false, err
+ }
+ if project == nil {
+ return false, fmt.Errorf("project not found: %s", projectId)
+ }
+ if project.Name != request.Name {
+ return false, nil
+ }
+ if err := repositories.ProjectRepository.Delete(tx, projectId); err != nil {
+ return false, err
+ }
+ return true, nil
+ })
+ if err != nil {
c.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("error deleting project: %w", err))
return
}
+ if !nameMatched {
+ c.JSON(http.StatusUnprocessableEntity, gin.H{"error": "Project name does not match"})
+ return
+ }
cache.ProjectCache.RemoveProject(projectId)
diff --git a/backend/app/controllers/routes.go b/backend/app/controllers/routes.go
index 2fd43f5b..9cebc639 100644
--- a/backend/app/controllers/routes.go
+++ b/backend/app/controllers/routes.go
@@ -41,8 +41,8 @@ func RegisterControllers(router *gin.RouterGroup) {
// Project management
router.GET("/projects", middleware.UseAppAuth, ProjectController.ListProjects)
router.POST("/projects", middleware.UseAppAuth, middleware.RequireProjectAccess, middleware.RequireWriteAccess, ProjectController.CreateProject)
- router.PUT("/projects", middleware.UseAppAuth, middleware.RequireProjectAccess, middleware.RequireWriteAccess, middleware.Transactional, ProjectController.UpdateProject)
- router.DELETE("/projects", middleware.UseAppAuth, middleware.RequireProjectAccess, middleware.RequireWriteAccess, middleware.Transactional, ProjectController.DeleteProject)
+ router.PUT("/projects", middleware.UseAppAuth, middleware.RequireProjectAccess, middleware.RequireWriteAccess, ProjectController.UpdateProject)
+ router.DELETE("/projects", middleware.UseAppAuth, middleware.RequireProjectAccess, middleware.RequireWriteAccess, ProjectController.DeleteProject)
// Dashboard endpoints (projectId in query param)
router.POST("/stats", middleware.UseAppAuth, middleware.RequireProjectAccess, MetricRecordController.FindHomepageStats)
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
index 06cb12a0..c6ea8366 100644
--- a/frontend/src/lib/api.ts
+++ b/frontend/src/lib/api.ts
@@ -74,5 +74,5 @@ export const api = {
get: (endpoint: string, options?: RequestOptions) => request('GET', endpoint, undefined, options),
post: (endpoint: string, data: unknown, options?: RequestOptions) => request('POST', endpoint, data, options),
put: (endpoint: string, data: unknown, options?: RequestOptions) => request('PUT', endpoint, data, options),
- delete: (endpoint: string, options?: RequestOptions) => request('DELETE', endpoint, undefined, options)
+ delete: (endpoint: string, options?: RequestOptions, data?: unknown) => request('DELETE', endpoint, data, options)
};
diff --git a/frontend/src/lib/components/edit-project-modal.svelte b/frontend/src/lib/components/edit-project-modal.svelte
index 6805f7b4..3a0f06fb 100644
--- a/frontend/src/lib/components/edit-project-modal.svelte
+++ b/frontend/src/lib/components/edit-project-modal.svelte
@@ -5,7 +5,7 @@
import { Input } from "$lib/components/ui/input";
import { Label } from "$lib/components/ui/label";
import { projectsState, type Project, type Framework } from '$lib/state/projects.svelte';
- import { Check, Trash2 } from 'lucide-svelte';
+ import { Check, Trash2, Copy, CircleAlert } from 'lucide-svelte';
import FrameworkCombobox from './framework-combobox.svelte';
import { toast } from 'svelte-sonner';
import { goto } from '$app/navigation';
@@ -24,6 +24,8 @@
let error = $state('');
let showDeleteConfirm = $state(false);
let deleting = $state(false);
+ let deleteConfirmName = $state('');
+ let nameCopied = $state(false);
$effect(() => {
if (open && project) {
@@ -33,6 +35,24 @@
}
});
+ $effect(() => {
+ if (!showDeleteConfirm) {
+ deleteConfirmName = '';
+ nameCopied = false;
+ }
+ });
+
+ async function copyProjectName() {
+ if (!project) return;
+ await navigator.clipboard.writeText(project.name);
+ nameCopied = true;
+ setTimeout(() => nameCopied = false, 2000);
+ }
+
+ let deleteConfirmMatches = $derived(
+ !!project && deleteConfirmName === project.name
+ );
+
async function handleSubmit(e: Event) {
e.preventDefault();
if (!projectName.trim()) {
@@ -56,11 +76,11 @@
}
async function handleDelete() {
- if (!project) return;
+ if (!project || !deleteConfirmMatches) return;
deleting = true;
try {
- await projectsState.deleteProject(project.id);
+ await projectsState.deleteProject(project.id, project.name);
toast.success('Successfully deleted the project', { position: 'top-center' });
showDeleteConfirm = false;
onOpenChange(false);
@@ -137,8 +157,7 @@
<p class="text-sm text-muted-foreground mb-3">Danger zone</p>
<Button
type="button"
- variant="outline"
- class="border-destructive text-destructive hover:bg-destructive hover:text-destructive-foreground"
+ variant="destructiveOutline"
onclick={() => showDeleteConfirm = true}
>
<Trash2 class="mr-2 h-4 w-4" />
@@ -154,17 +173,53 @@
<AlertDialog.Header>
<AlertDialog.Title>Delete Project</AlertDialog.Title>
<AlertDialog.Description>
- Are you sure you want to delete this project? This action cannot be undone and all associated data will become inaccessible.
+ This project will be permanently deleted along with all of its data, including transactions, exceptions, logs, metrics, and dashboards.
</AlertDialog.Description>
</AlertDialog.Header>
- <div class="rounded-md border px-4 py-3 mx-6">
- <p class="text-sm font-semibold">{project?.name}</p>
+
+ <div class="rounded-md bg-destructive/10 border border-destructive/30 px-3 py-2">
+ <p class="text-sm">
+ <span class="font-semibold text-destructive">Warning:</span>
+ <span class="text-destructive/90">This action is not reversible. Please be certain.</span>
+ </p>
</div>
- <AlertDialog.Footer>
+
+ <div class="space-y-2">
+ <Label for="delete-confirm-name" class="text-sm font-normal text-muted-foreground leading-relaxed">
+ Enter the project name <span class="font-semibold text-foreground">{project?.name}</span><button
+ type="button"
+ onclick={copyProjectName}
+ class="inline-flex items-center align-middle ml-1 rounded p-0.5 text-muted-foreground hover:bg-accent hover:text-foreground"
+ title="Copy project name"
+ aria-label="Copy project name"
+ >
+ {#if nameCopied}
+ <Check class="h-3.5 w-3.5" />
+ {:else}
+ <Copy class="h-3.5 w-3.5" />
+ {/if}
+ </button> to continue:
+ </Label>
+ <Input
+ id="delete-confirm-name"
+ type="text"
+ autocomplete="off"
+ bind:value={deleteConfirmName}
+ disabled={deleting}
+ />
+ {#if deleteConfirmName.length > 0 && !deleteConfirmMatches}
+ <p class="text-xs text-destructive flex items-center gap-1">
+ <CircleAlert class="h-3.5 w-3.5" />
+ The project name does not match
+ </p>
+ {/if}
+ </div>
+
+ <AlertDialog.Footer class="sm:justify-between">
<Button variant="outline" onclick={() => showDeleteConfirm = false} disabled={deleting}>
Cancel
</Button>
- <Button variant="destructive" onclick={handleDelete} disabled={deleting}>
+ <Button variant="destructive" onclick={handleDelete} disabled={deleting || !deleteConfirmMatches}>
{deleting ? 'Deleting...' : 'Delete Project'}
</Button>
</AlertDialog.Footer>
diff --git a/frontend/src/lib/state/projects.svelte.ts b/frontend/src/lib/state/projects.svelte.ts
index 7338e8ac..32bdf0e8 100644
--- a/frontend/src/lib/state/projects.svelte.ts
+++ b/frontend/src/lib/state/projects.svelte.ts
@@ -156,8 +156,8 @@ class ProjectsState {
return response;
}
- async deleteProject(id: string): Promise<void> {
- await api.delete('/projects', { projectId: id });
+ async deleteProject(id: string, name: string): Promise<void> {
+ await api.delete('/projects', { projectId: id }, { name });
await this.loadProjects();
}