Mff updates

migrations/1770299199726_area_geom.ts

@@ -12,9 +12,10 @@ import { type Kysely, sql } from "kysely";
  */
 
 export async function up(db: Kysely<any>): Promise<void> {
+  // Use Geometry (not MultiPolygon) so rows with Point geography don't fail
   await sql`
     ALTER TABLE area 
-    ADD COLUMN geom geometry(MultiPolygon, 4326) NOT NULL
+    ADD COLUMN geom geometry(Geometry, 4326) NOT NULL
     GENERATED ALWAYS AS (geography::geometry) STORED
   `.execute(db);
 

migrations/1772020000000_data_source_default_inspector_config.ts

@@ -0,0 +1,17 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { sql } from "kysely";
+import type { Kysely } from "kysely";
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`
+    ALTER TABLE "data_source"
+    ADD COLUMN "default_inspector_config" jsonb DEFAULT NULL
+  `.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`
+    ALTER TABLE "data_source"
+    DROP COLUMN "default_inspector_config"
+  `.execute(db);
+}

migrations/1772030000000_data_source_default_inspector_config_updated_at.ts

@@ -0,0 +1,18 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import type { Kysely } from "kysely";
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .alterTable("dataSource")
+    .addColumn("defaultInspectorConfigUpdatedAt", "timestamptz", (col) =>
+      col.defaultTo(null),
+    )
+    .execute();
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .alterTable("dataSource")
+    .dropColumn("defaultInspectorConfigUpdatedAt")
+    .execute();
+}

migrations/1772203924531_data_source_default_inspector_config.ts

@@ -0,0 +1,17 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { sql } from "kysely";
+import type { Kysely } from "kysely";
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`
+    ALTER TABLE "data_source"
+    ADD COLUMN "default_inspector_config" jsonb DEFAULT NULL
+  `.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`
+    ALTER TABLE "data_source"
+    DROP COLUMN "default_inspector_config"
+  `.execute(db);
+}

migrations/1772203924532_data_source_default_inspector_config_updated_at.ts

@@ -0,0 +1,18 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import type { Kysely } from "kysely";
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .alterTable("dataSource")
+    .addColumn("defaultInspectorConfigUpdatedAt", "timestamptz", (col) =>
+      col.defaultTo(null),
+    )
+    .execute();
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .alterTable("dataSource")
+    .dropColumn("defaultInspectorConfigUpdatedAt")
+    .execute();
+}

src/app/(private)/data-sources/[id]/DataSourceDashboard.tsx

@@ -30,15 +30,17 @@ import {
 } from "@/shadcn/ui/breadcrumb";
 import { Button } from "@/shadcn/ui/button";
 import { Separator } from "@/shadcn/ui/separator";
-import ColumnMetadataForm from "./components/ColumnMetadataForm";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/shadcn/ui/tabs";
 import ConfigurationForm from "./components/ConfigurationForm";
+import { DefaultInspectorConfigSection } from "./components/DefaultInspectorConfigSection";
 import type { RouterOutputs } from "@/services/trpc/react";
 
 export function DataSourceDashboard({
   dataSource,
 }: {
   dataSource: NonNullable<RouterOutputs["dataSource"]["byId"]>;
 }) {
+  const [dataSourceTab, setDataSourceTab] = useState("datasource");
   const [importing, setImporting] = useState(isImporting(dataSource));
   const [importError, setImportError] = useState("");
   const [lastImported, setLastImported] = useState(
@@ -222,39 +224,54 @@ export function DataSourceDashboard({
         </Alert>
       )}
 
-      <div className="grid grid-cols-2 gap-20 pb-10">
-        <div className="flex flex-col gap-6">
-          <h2 className="font-medium text-xl">About this data source</h2>
-          <DefinitionList
-            items={
-              lastImported
-                ? [
-                    ...mappedInformation,
-                    {
-                      label: "Last imported",
-                      value: `${lastImportedDateReadable} (${lastImportedFormattedFromNow})`,
-                    },
-                  ]
-                : mappedInformation
-            }
-          />
-          <ColumnMetadataForm dataSource={dataSource} />
-        </div>
-
-        <div className="flex flex-col gap-6">
-          <h2 className="font-medium text-xl">Configuration</h2>
-          <ConfigurationForm
-            dataSource={dataSource}
-            onAutoImportChange={setAutoImportEnabled}
-            webhookStatus={webhookStatus}
-          />
-          <Separator />
-          <h2 className="font-medium text-xl">Danger zone</h2>
-          <div>
-            <DeleteDataSourceButton dataSource={dataSource} />
+      <Tabs
+        value={dataSourceTab}
+        onValueChange={setDataSourceTab}
+        className="w-full"
+      >
+        <TabsList>
+          <TabsTrigger value="datasource">
+            Datasource import settings
+          </TabsTrigger>
+          <TabsTrigger value="inspector">Inspector settings</TabsTrigger>
+        </TabsList>
+        <TabsContent value="datasource" className="mt-6">
+          <div className="grid grid-cols-2 gap-20 pb-10">
+            <div className="flex flex-col gap-6">
+              <h2 className="font-medium text-xl">Configuration</h2>
+              <ConfigurationForm
+                dataSource={dataSource}
+                onAutoImportChange={setAutoImportEnabled}
+                webhookStatus={webhookStatus}
+              />
+              <Separator />
+              <h2 className="font-medium text-xl">Danger zone</h2>
+              <div>
+                <DeleteDataSourceButton dataSource={dataSource} />
+              </div>
+            </div>
+            <div className="flex flex-col gap-6">
+              <h2 className="font-medium text-xl">About this data source</h2>
+              <DefinitionList
+                items={
+                  lastImported
+                    ? [
+                        ...mappedInformation,
+                        {
+                          label: "Last imported",
+                          value: `${lastImportedDateReadable} (${lastImportedFormattedFromNow})`,
+                        },
+                      ]
+                    : mappedInformation
+                }
+              />
+            </div>
           </div>
-        </div>
-      </div>
+        </TabsContent>
+        <TabsContent value="inspector" className="mt-6 w-full pb-10">
+          <DefaultInspectorConfigSection dataSource={dataSource} />
+        </TabsContent>
+      </Tabs>
     </div>
   );
 }