Merge pull request #75 from groundup-dev/feat/new-plot-types

Feat/new plot types

Author: jamesholcombe

package-lock.json

@@ -18,6 +18,15 @@
     "rename:query-to-query": "node scripts/rename-query-to-query.js"
   },
   "dependencies": {
+    "@visx/axis": "^3.12.0",
+    "@visx/group": "^3.12.0",
+    "@visx/legend": "^3.12.0",
+    "@visx/responsive": "^3.12.0",
+    "@visx/scale": "^3.12.0",
+    "@visx/shape": "^3.12.0",
+    "@visx/stats": "^3.12.0",
+    "@visx/tooltip": "^3.12.0",
+    "@visx/visx": "^3.12.0",
     "drizzle-kit": "^0.30.0",
     "drizzle-orm": "^0.40.0",
     "wkx": "^0.5.0"

package.json

@@ -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/.gitignore

@@ -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/package.json

@@ -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/addComputedColumn.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/deleteComputedColumn.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/queries/updateComputedColumn.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/applyTemplate.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/actions/data/templates/createTemplate.ts

@@ -2,8 +2,7 @@ import { getServerUser } from "@/lib/auth";
 import { getProjectForUser } from "@/lib/dal/projects";
 import { parseStringParam } from "@/lib/routing";
 import { notFound } from "next/navigation";
-import { QueryData } from "@/components/data/query/query-data";
-import { schemaConfig } from "@common/db/schema/common";
+
 import { Button } from "@/components/ui/button";
 import { QueryDefinition } from "@/components/data/query/query-definition";
 import Link from "next/link";
@@ -15,6 +14,27 @@ import {
 } from "@/lib/dal/queries";
 import { getProjectTableCounts } from "@/lib/dal/data";
 import { readZones, readQueryZones } from "@/db/crud/zone";
+import { schemaConfig } from "@common/db/schema/common";
+import { Query } from "@common/db/schema/query";
+
+function getCompletions(query: Query) {
+  const columns = Object.entries(query.definition ?? {}).flatMap(
+    ([table, columns]) => {
+      const tableConfig = schemaConfig.find(
+        (config) => config.dbName === table,
+      );
+      return columns.columns.map((column) => {
+        const columnConfig = tableConfig?.columns.find(
+          (c) => c.dbName === column,
+        );
+        return columnConfig?.nameCamelCase ?? column;
+      });
+    },
+  );
+
+  return columns;
+}
+
 type Props = {
   params: { projectId: string; queryId: string };
 };
@@ -46,39 +66,28 @@ export default async function Page({ params }: Props) {
     readQueryZones(queryId),
   ]);
 
-  const zonesWithIsSelected = zones.map((zone) => ({
+  const completions = getCompletions(query);
+
+  const zonesWithIsSelected = zones.map((zone: any) => ({
     ...zone,
-    isSelected: queryZones.some((z) => z.zoneId === zone.id),
+    isSelected: queryZones.some((z: any) => z.zoneId === zone.id),
   }));
 
   return (
-    <div className="space-y-12 overflow-auto pb-6">
+    <div className="h-full overflow-auto pb-6">
       <QueryDefinition
         projectId={projectId}
         query={query}
         schemaConfig={schemaConfig}
         tableCounts={tableCounts}
+        completions={completions}
+        columns={columns}
+        zones={zonesWithIsSelected}
+        totalRowCount={totalRowCount}
+        maxRows={5}
       />
 
-      {definitionConfigured && (
-        <div className="space-y-2">
-          <div className="flex items-center justify-between">
-            <h2 className="px-6 text-lg font-semibold">Data preview</h2>
-          </div>
-          <div className="h-[480px]">
-            <QueryData
-              projectId={projectId}
-              query={query}
-              columns={columns}
-              totalRowCount={totalRowCount}
-              maxRows={10}
-              zones={zonesWithIsSelected}
-            />
-          </div>
-        </div>
-      )}
-
-      <div className="flex items-center justify-end px-6">
+      <div className="flex items-center justify-end px-6 pt-4">
         <Link href={`/projects/${projectId}/data/queries/${queryId}/data`}>
           <Button disabled={!definitionConfigured} variant="default" asChild>
             Show full table