Feat/table reuse

package.json

@@ -16,7 +16,6 @@
     "lint": "cd packages/app && npm run lint"
   },
   "dependencies": {
-    "deck.gl": "^9.1.11",
     "drizzle-kit": "^0.30.0",
     "drizzle-orm": "^0.40.0",
     "wkx": "^0.5.0"

packages/app/package.json

@@ -52,13 +52,15 @@
     "@vercel/blob": "^0.23.4",
     "@vercel/postgres": "^0.9.0",
     "@vercel/speed-insights": "^1.2.0",
+    "autoprefixer": "^10.4.21",
     "aws-sdk": "^2.1692.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.0.0",
     "codemirror": "^6.0.1",
     "d3": "^7.9.0",
     "date-fns": "^3.6.0",
+    "deck.gl": "^9.1.11",
     "dotenv": "^16.4.5",
     "drizzle-zod": "^0.5.1",
     "html2canvas": "^1.4.1",
@@ -84,6 +86,7 @@
     "server-only": "^0.0.1",
     "sonner": "^1.7.1",
     "tailwind-merge": "^2.5.2",
+    "tailwindcss": "^3.4.17",
     "tailwindcss-animate": "^1.0.7",
     "use-debounce": "^10.0.4",
     "uuid": "^11.0.5",

packages/app/postcss.config.mjs

@@ -2,6 +2,7 @@
 const config = {
   plugins: {
     tailwindcss: {},
+    autoprefixer: {},
   },
 };
 

packages/app/src/actions/data/custom-tables/createCustomTable.ts

@@ -9,7 +9,10 @@ import { redirect } from "next/navigation";
 import { getProjectForUser } from "@/lib/dal/projects";
 import { revalidateCustomTableCache } from "@/lib/dal/custom-tables";
 
-export async function createCustomTableAction(projectId: number) {
+export async function createCustomTableAction(
+  projectId: number,
+  folderId?: number | null,
+) {
   const user = await getServerUser();
   const userProject = await getProjectForUser(user, projectId);
 
@@ -21,6 +24,7 @@ export async function createCustomTableAction(projectId: number) {
   const newCustomTable = await createCustomTable({
     name,
     projectId,
+    folderId: folderId || null,
   });
 
   revalidateCustomTableCache(newCustomTable.id, projectId);

packages/app/src/actions/data/custom-tables/moveCustomTable.ts

@@ -0,0 +1,28 @@
+"use server";
+
+import { getServerUser } from "@/lib/auth";
+import { updateCustomTable } from "@/db/crud/custom_table";
+import { getProjectForUser } from "@/lib/dal/projects";
+import { revalidateTag } from "next/cache";
+
+export async function moveCustomTableAction(
+  projectId: number,
+  customTableId: number,
+  newFolderId: number | null,
+) {
+  const user = await getServerUser();
+  const userProject = await getProjectForUser(user, projectId);
+
+  if (!userProject) {
+    throw new Error("Project not found");
+  }
+
+  const updatedCustomTable = await updateCustomTable(customTableId, {
+    folderId: newFolderId,
+  });
+
+  revalidateTag(`project-${projectId}-custom-tables`);
+  revalidateTag(`project-${projectId}-data`);
+
+  return updatedCustomTable;
+}

packages/app/src/actions/data/folders/createFolder.ts

@@ -0,0 +1,38 @@
+"use server";
+
+import { getServerUser } from "@/lib/auth";
+import { createFolder, generateUniqueFolderName } from "@/db/crud/folder";
+import { getProjectForUser } from "@/lib/dal/projects";
+import { revalidateTag } from "next/cache";
+
+export async function createFolderAction(
+  projectId: number,
+  parentFolderId: number | null = null,
+  type: "customTable" | "plot" = "customTable",
+  name?: string,
+) {
+  const user = await getServerUser();
+  const userProject = await getProjectForUser(user, projectId);
+
+  if (!userProject) {
+    throw new Error("Project not found");
+  }
+
+  const folderName =
+    name || (await generateUniqueFolderName(projectId, parentFolderId, type));
+
+  const insertData = {
+    name: folderName,
+    projectId,
+    parentFolderId,
+    type,
+  };
+
+  const newFolder = await createFolder(insertData);
+
+  // More aggressive cache revalidation
+  revalidateTag(`project-${projectId}-folders-${type}`);
+  revalidateTag(`project-${projectId}-data`);
+
+  return newFolder;
+}

packages/app/src/actions/data/folders/deleteFolder.ts

@@ -0,0 +1,25 @@
+"use server";
+
+import { getServerUser } from "@/lib/auth";
+import { deleteFolder, readFolder } from "@/db/crud/folder";
+import { getProjectForUser } from "@/lib/dal/projects";
+import { revalidateTag } from "next/cache";
+
+export async function deleteFolderAction(projectId: number, folderId: number) {
+  const user = await getServerUser();
+  const userProject = await getProjectForUser(user, projectId);
+
+  if (!userProject) {
+    throw new Error("Project not found");
+  }
+
+  const folder = await readFolder(folderId);
+  if (!folder) {
+    throw new Error("Folder not found");
+  }
+
+  await deleteFolder(folderId);
+
+  revalidateTag(`project-${projectId}-folders-${folder.type}`);
+  revalidateTag(`project-${projectId}-data`);
+}

packages/app/src/actions/data/folders/moveFolder.ts

@@ -0,0 +1,33 @@
+"use server";
+
+import { getServerUser } from "@/lib/auth";
+import { updateFolder, readFolder } from "@/db/crud/folder";
+import { getProjectForUser } from "@/lib/dal/projects";
+import { revalidateTag } from "next/cache";
+
+export async function moveFolderAction(
+  projectId: number,
+  folderId: number,
+  newParentFolderId: number | null,
+) {
+  const user = await getServerUser();
+  const userProject = await getProjectForUser(user, projectId);
+
+  if (!userProject) {
+    throw new Error("Project not found");
+  }
+
+  const folder = await readFolder(folderId);
+  if (!folder) {
+    throw new Error("Folder not found");
+  }
+
+  const updatedFolder = await updateFolder(folderId, {
+    parentFolderId: newParentFolderId,
+  });
+
+  revalidateTag(`project-${projectId}-folders-${folder.type}`);
+  revalidateTag(`project-${projectId}-data`);
+
+  return updatedFolder;
+}

packages/app/src/actions/data/folders/updateFolder.ts

@@ -0,0 +1,31 @@
+"use server";
+
+import { getServerUser } from "@/lib/auth";
+import { updateFolder, readFolder } from "@/db/crud/folder";
+import { getProjectForUser } from "@/lib/dal/projects";
+import { revalidateTag } from "next/cache";
+
+export async function updateFolderAction(
+  projectId: number,
+  folderId: number,
+  data: { name?: string; parentFolderId?: number | null },
+) {
+  const user = await getServerUser();
+  const userProject = await getProjectForUser(user, projectId);
+
+  if (!userProject) {
+    throw new Error("Project not found");
+  }
+
+  const folder = await readFolder(folderId);
+  if (!folder) {
+    throw new Error("Folder not found");
+  }
+
+  const updatedFolder = await updateFolder(folderId, data);
+
+  revalidateTag(`project-${projectId}-folders-${folder.type}`);
+  revalidateTag(`project-${projectId}-data`);
+
+  return updatedFolder;
+}

packages/app/src/actions/data/plots/createPlot.ts

@@ -7,7 +7,10 @@ import { getProjectForUser } from "@/lib/dal/projects";
 
 import { createPlot, generateUniquePlotName } from "@/db/crud/plot";
 
-export async function createPlotAction(projectId: number) {
+export async function createPlotAction(
+  projectId: number,
+  folderId?: number | null,
+) {
   const user = await getServerUser();
   const userProject = await getProjectForUser(user, projectId);
 
@@ -19,6 +22,7 @@ export async function createPlotAction(projectId: number) {
   const newPlot = await createPlot({
     name,
     projectId,
+    folderId: folderId || null,
   });
 
   revalidateTag(`project-${projectId}-plots`);

packages/app/src/actions/data/plots/deletePlot.ts

@@ -1,7 +1,7 @@
 "use server";
 
 import { getServerUser } from "@/lib/auth";
-import { deletePlot } from "@/db/crud/plot";
+import { deletePlot, readPlotForProject } from "@/db/crud/plot";
 import { redirect } from "next/navigation";
 import { getProjectForUser } from "@/lib/dal/projects";
 import { revalidatePlotCache } from "@/lib/dal/plots";
@@ -14,6 +14,12 @@ export async function deletePlotAction(projectId: number, plotId: number) {
     throw new Error("Project not found");
   }
 
+  const plot = await readPlotForProject(projectId, plotId);
+
+  if (!plot) {
+    throw new Error("Plot not found");
+  }
+
   await deletePlot(plotId);
 
   revalidatePlotCache(plotId, projectId);

packages/app/src/actions/data/plots/movePlot.ts

@@ -0,0 +1,34 @@
+"use server";
+
+import { getServerUser } from "@/lib/auth";
+import { readPlotForProject, updatePlot } from "@/db/crud/plot";
+import { getProjectForUser } from "@/lib/dal/projects";
+import { revalidateTag } from "next/cache";
+
+export async function movePlotAction(
+  projectId: number,
+  plotId: number,
+  newFolderId: number | null,
+) {
+  const user = await getServerUser();
+  const userProject = await getProjectForUser(user, projectId);
+
+  if (!userProject) {
+    throw new Error("Project not found");
+  }
+
+  const plot = await readPlotForProject(projectId, plotId);
+
+  if (!plot) {
+    throw new Error("Plot not found");
+  }
+
+  const updatedPlot = await updatePlot(plotId, {
+    folderId: newFolderId,
+  });
+
+  revalidateTag(`project-${projectId}-plots`);
+  revalidateTag(`project-${projectId}-data`);
+
+  return updatedPlot;
+}

packages/app/src/actions/data/plots/updatePlot.ts

@@ -2,7 +2,7 @@
 
 import { getServerUser } from "@/lib/auth";
 import { getProjectForUser } from "@/lib/dal/projects";
-import { updatePlot } from "@/db/crud/plot";
+import { readPlotForProject, updatePlot } from "@/db/crud/plot";
 import { PlotInsert } from "@common/db/schema/plot";
 import { revalidatePlotCache } from "@/lib/dal/plots";
 
@@ -18,6 +18,12 @@ export async function updatePlotAction(
     throw new Error("Project not found");
   }
 
+  const plot = await readPlotForProject(projectId, plotId);
+
+  if (!plot) {
+    throw new Error("Plot not found");
+  }
+
   await updatePlot(plotId, data);
 
   revalidatePlotCache(plotId, projectId);