Fix computed cols

packages/app/.gitignore

@@ -42,4 +42,6 @@ next-env.d.ts
 # Sentry Config File
 .env.sentry-build-plugin
 
-.env.local
+.env.local
+# clerk configuration (can include secrets)
+/.clerk/

packages/app/package.json

@@ -13,7 +13,15 @@
     "@aws-sdk/client-s3": "^3.716.0",
     "@aws-sdk/s3-request-presigner": "^3.716.0",
     "@clerk/nextjs": "^6.12.10",
-    "@codemirror/view": "^6.33.0",
+    "@codemirror/autocomplete": "^6.18.6",
+    "@codemirror/basic-setup": "^0.20.0",
+    "@codemirror/commands": "^6.8.1",
+    "@codemirror/lang-javascript": "^6.2.4",
+    "@codemirror/language": "^6.11.2",
+    "@codemirror/search": "^6.5.11",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/theme-one-dark": "^6.1.3",
+    "@codemirror/view": "^6.38.0",
     "@dnd-kit/core": "^6.3.1",
     "@glideapps/glide-data-grid": "^6.0.3",
     "@groundup-dev/ags": "^0.2.2",
@@ -61,7 +69,7 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.0.0",
-    "codemirror": "^6.0.1",
+    "codemirror": "^6.0.2",
     "d3": "^7.9.0",
     "date-fns": "^3.6.0",
     "deck.gl": "^9.1.11",

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

@@ -0,0 +1,36 @@
+"use server";
+
+import { getServerUser } from "@/lib/auth";
+import { getProjectForUser } from "@/lib/dal/projects";
+import { revalidateQueryCache } from "@/lib/dal/queries";
+import { addComputedColumn } from "@/db/crud/query";
+import { ComputedColumn } from "@common/db/schema/query";
+
+import {
+  actionError,
+  actionResult,
+  runActionServer,
+} from "@/lib/actions/utils";
+
+export async function addComputedColumnAction(
+  projectId: string,
+  queryId: string,
+  column: Omit<ComputedColumn, "id">,
+) {
+  return runActionServer(async () => {
+    const user = await getServerUser();
+    const userProject = await getProjectForUser(user, projectId);
+
+    if (!userProject) {
+      return actionError("Project not found");
+    }
+
+    const newComputedColumn = await addComputedColumn(queryId, {
+      ...column,
+    });
+
+    revalidateQueryCache(queryId, projectId);
+
+    return actionResult(newComputedColumn);
+  });
+}

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/actions/data/queries/updateComputedColumn.ts

@@ -0,0 +1,38 @@
+"use server";
+
+import { getServerUser } from "@/lib/auth";
+import { getProjectForUser } from "@/lib/dal/projects";
+import { revalidateQueryCache } from "@/lib/dal/queries";
+import { updateComputedColumn } from "@/db/crud/query";
+import { ComputedColumn } from "@common/db/schema/query";
+import {
+  runActionServer,
+  actionError,
+  actionResult,
+} from "@/lib/actions/utils";
+
+export async function updateComputedColumnAction(
+  projectId: string,
+  queryId: string,
+  columnId: string,
+  column: Omit<ComputedColumn, "id">,
+) {
+  return runActionServer(async () => {
+    const user = await getServerUser();
+    const userProject = await getProjectForUser(user, projectId);
+
+    if (!userProject) {
+      return actionError("Project not found");
+    }
+
+    const updatedComputedColumn = await updateComputedColumn(
+      queryId,
+      columnId,
+      column,
+    );
+
+    revalidateQueryCache(queryId, projectId);
+
+    return actionResult(updatedComputedColumn);
+  });
+}

packages/app/src/actions/data/templates/applyTemplate.ts

@@ -16,6 +16,7 @@ import {
   actionResult,
   runActionServer,
 } from "@/lib/actions/utils";
+import { ComputedColumn } from "@common/db/schema/query";
 
 type ApplyTemplateParams = {
   projectId: string;
@@ -24,6 +25,7 @@ type ApplyTemplateParams = {
   plotName?: string;
   plotDefinition?: PlotDefinitionWithoutSource;
   folderId?: string | null;
+  queryCustomColumns?: ComputedColumn[];
 };
 
 export async function applyTemplateAction({
@@ -33,6 +35,7 @@ export async function applyTemplateAction({
   plotName,
   plotDefinition,
   folderId,
+  queryCustomColumns,
 }: ApplyTemplateParams) {
   return runActionServer(async () => {
     const user = await getServerUser();
@@ -56,6 +59,7 @@ export async function applyTemplateAction({
           },
         ]),
       ),
+      computedColumns: queryCustomColumns || [],
     });
 
     revalidateQueryCache(newQuery.id, projectId);