add computed cols to templates

Author: jamesholcombe

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);

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

@@ -11,6 +11,7 @@ import {
   QueryWithoutFilters,
   PlotDefinitionWithoutSource,
 } from "@common/db/schema/template";
+import { ComputedColumn } from "@common/db/schema/query";
 import {
   runActionServer,
   actionError,
@@ -45,6 +46,7 @@ export async function createTemplateAction({
 
     let queryDefinition: QueryWithoutFilters | null = null;
     let plotDefinition: PlotDefinitionWithoutSource | null = null;
+    let computedColumns: ComputedColumn[] = [];
 
     // Get query definition if provided
     if (queryId) {
@@ -53,7 +55,10 @@ export async function createTemplateAction({
         return actionError("Query not found or has no definition");
       }
 
+      computedColumns = query.computedColumns || [];
+
       // Remove filters from the definition for the template
+      // Create a partial record without filters
       queryDefinition = Object.fromEntries(
         Object.entries(query.definition).map(([tableName, tableDef]) => [
           tableName,
@@ -62,7 +67,7 @@ export async function createTemplateAction({
             filters: undefined, // Remove filters
           },
         ]),
-      ) as Record<TableName, any>;
+      ) as Partial<Record<TableName, any>> as QueryWithoutFilters;
     }
 
     // Get plot definition if provided
@@ -89,7 +94,7 @@ export async function createTemplateAction({
               filters: undefined, // Remove filters
             },
           ]),
-        ) as Record<TableName, any>;
+        ) as Partial<Record<TableName, any>> as QueryWithoutFilters;
       }
 
       // If we still don't have a query definition, try to get it from the plot's definition.dataSource
@@ -143,7 +148,10 @@ export async function createTemplateAction({
     const newTemplate = await createTemplate({
       name,
       ownerId: user.id,
-      queryDefinition: queryDefinition || ({} as QueryWithoutFilters),
+      queryDefinition:
+        queryDefinition ||
+        ({} as Partial<Record<TableName, any>> as QueryWithoutFilters),
+      queryCustomColumns: computedColumns,
       plotDefinition: plotDefinition || null,
       scope,
     });

packages/app/src/components/data/templates/templates-modal.tsx

@@ -115,6 +115,7 @@ export function TemplatesModal({
         ? selectedTemplate.plotDefinition || undefined
         : undefined,
       folderId: undefined,
+      queryCustomColumns: selectedTemplate.queryCustomColumns,
     });
 
     toast.success(
@@ -252,7 +253,7 @@ export function TemplatesModal({
                 <ul className="ml-6 space-y-1 text-sm text-muted-foreground">
                   <li>• All configuration settings from the template</li>
                   <li>• Custom name and description</li>
-                  <li>• No data source (you'll need to select one)</li>
+
                   {selectedTemplate.isPlot && (
                     <li>• Plot type and visualization settings</li>
                   )}

packages/common/drizzle/0013_shiny_risque.sql

@@ -0,0 +1 @@
+ALTER TABLE "template" ADD COLUMN "query_custom_columns" jsonb DEFAULT '[]'::jsonb NOT NULL;