deletion functionality

Author: kushagra0304

packages/app/src/actions/data/queries/deleteComputedColumn.ts

@@ -0,0 +1,23 @@
+"use server";
+
+import { getServerUser } from "@/lib/auth";
+import { getProjectForUser } from "@/lib/dal/projects";
+import { revalidateQueryCache } from "@/lib/dal/queries";
+import { deleteComputedColumn } from "@/db/crud/query";
+
+export async function deleteComputedColumnAction(
+  projectId: string,
+  queryId: string,
+  columnName: string,
+): Promise<void> {
+  const user = await getServerUser();
+  const userProject = await getProjectForUser(user, projectId);
+
+  if (!userProject) {
+    throw new Error("Project not found");
+  }
+
+  await deleteComputedColumn(queryId, columnName);
+
+  revalidateQueryCache(queryId, projectId);
+}

packages/app/src/components/data/query/query-sidebar.tsx

@@ -11,6 +11,7 @@ import { autocompletion } from "@codemirror/autocomplete";
 import { EditorState } from "@codemirror/state";
 import { addComputedColumnAction } from "@/actions/data/queries/addComputedColumn";
 import { updateComputedColumnAction } from "@/actions/data/queries/updateComputedColumn";
+import { deleteComputedColumnAction } from "@/actions/data/queries/deleteComputedColumn";
 import { ComputedColumn } from "@common/db/schema/query";
 
 type QuerySidebarProps = {
@@ -245,6 +246,27 @@ export function QuerySidebar({
     }
   };
 
+  const handleDeleteColumn = async (columnName: string) => {
+    if (confirm(`Are you sure you want to delete the computed column "${columnName}"?`)) {
+      try {
+        await deleteComputedColumnAction(projectId, query.id, columnName);
+        console.log("Deleted computed column:", columnName);
+        
+        // Clear editor state after successful deletion
+        setEditingColumn(null);
+        setColumnName("");
+        if (viewRef.current) {
+          const transaction = viewRef.current.state.update({
+            changes: { from: 0, to: viewRef.current.state.doc.length, insert: "" },
+          });
+          viewRef.current.dispatch(transaction);
+        }
+      } catch (error) {
+        console.error("Failed to delete computed column:", error);
+      }
+    }
+  };
+
   const handleSave = async () => {
     if (!columnName.trim()) {
       console.warn("Column name is required");
@@ -365,6 +387,17 @@ export function QuerySidebar({
                 Cancel
               </Button>
             )}
+            {editingColumn && (
+              <Button
+                variant="outline"
+                size="sm"
+                onClick={() => handleDeleteColumn(editingColumn)}
+                className="flex items-center gap-2 text-destructive hover:text-destructive hover:bg-destructive/10"
+              >
+                <Trash2 className="h-4 w-4" />
+                Delete
+              </Button>
+            )}
             <Button
               variant="outline"
               size="sm"

packages/app/src/db/crud/query.ts

@@ -155,3 +155,25 @@ export async function updateComputedColumn(
 
   return updated;
 }
+
+export async function deleteComputedColumn(
+  queryId: string,
+  columnName: string,
+): Promise<Query> {
+  const existing = await readQuery(queryId);
+  if (!existing) {
+    throw new Error("Query not found");
+  }
+
+  const updatedComputedColumns = (existing.computedColumns ?? []).filter(
+    (col) => col.name !== columnName
+  );
+
+  const [updated] = await db
+    .update(query)
+    .set({ computedColumns: updatedComputedColumns })
+    .where(eq(query.id, queryId))
+    .returning();
+
+  return updated;
+}