mdl published by org

src/app/(private)/(dashboards)/superadmin/data-sources/[id]/components/DefaultInspectorPreview.tsx

@@ -3,6 +3,7 @@
 import { useQuery } from "@tanstack/react-query";
 import DataRecordsPanel from "@/app/(private)/map/[id]/components/InspectorPanel/DataRecordsPanel";
 import { useInspectorDataSourceConfig } from "@/app/(private)/map/[id]/hooks/useInspectorDataSourceConfig";
+import { useDataSources } from "@/hooks/useDataSources";
 import { useTRPC } from "@/services/trpc/react";
 import { cn } from "@/shadcn/utils";
 
@@ -16,6 +17,8 @@ export function DefaultInspectorPreview({
   const trpc = useTRPC();
 
   const inspectorConfig = useInspectorDataSourceConfig(dataSourceId);
+  const { getDataSourceById } = useDataSources();
+  const dataSource = getDataSourceById(dataSourceId);
 
   const selectedCount =
     inspectorConfig?.items.filter((i) => i.type === "column").length ?? 0;
@@ -58,6 +61,11 @@ export function DefaultInspectorPreview({
           />
         )}
       </div>
+      <div className="shrink-0 px-3 py-2 border-t border-neutral-200">
+        <p className="text-xs text-muted-foreground">
+          Organisation: {dataSource?.organisationName ?? "—"}
+        </p>
+      </div>
     </div>
   );
 }

src/app/(private)/(dashboards)/superadmin/data-sources/[id]/page.tsx

@@ -162,6 +162,9 @@ export default function DataSourceConfigPage() {
         <h1 className="text-3xl font-medium tracking-tight mt-3 min-w-0">
           {dataSource.name}
         </h1>
+        <p className="text-sm text-muted-foreground mt-1">
+          Organisation: {dataSource.organisationName ?? "—"}
+        </p>
         <p className="text-sm text-muted-foreground mt-1">
           Configure default inspector settings for this public data source.
         </p>

src/app/(private)/(dashboards)/superadmin/page.tsx

@@ -311,6 +311,7 @@ export default function SuperadminPage() {
             <TableHeader>
               <TableRow>
                 <TableHead>Name</TableHead>
+                <TableHead>Organisation</TableHead>
                 <TableHead>Record type</TableHead>
                 <TableHead>Records</TableHead>
                 <TableHead>Inspector config</TableHead>
@@ -331,6 +332,7 @@ export default function SuperadminPage() {
                 publicDataSources?.map((ds) => (
                   <TableRow key={ds.id}>
                     <TableCell className="font-medium">{ds.name}</TableCell>
+                    <TableCell>{ds.organisationName ?? "-"}</TableCell>
                     <TableCell>{ds.recordType}</TableCell>
                     <TableCell>{ds.recordCount.toLocaleString()}</TableCell>
                     <TableCell>

src/app/(private)/hooks/useDataSourceListCache.ts

@@ -58,15 +58,29 @@ export function useDataSourceListCache() {
         (old: DataSourceByOrganisation[] | undefined) =>
           old?.map((ds) =>
             ds.id === dataSourceId
-              ? { ...ds, ...updater({ ...ds, organisationOverride: null }) }
+              ? {
+                  ...ds,
+                  ...updater({
+                    ...ds,
+                    organisationName: "",
+                    organisationOverride: null,
+                  }),
+                }
               : ds,
           ),
       );
       queryClient.setQueriesData(
         { queryKey: trpc.dataSource.byId.queryKey() },
         (old: DataSourceById | undefined) => {
           if (!old || old.id !== dataSourceId) return old;
-          return { ...old, ...updater({ ...old, organisationOverride: null }) };
+          return {
+            ...old,
+            ...updater({
+              ...old,
+              organisationName: "",
+              organisationOverride: null,
+            }),
+          };
         },
       );
     },

src/app/(private)/map/[id]/components/InspectorPanel/DataRecordsPanel.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { Settings } from "lucide-react";
+import { BookOpen, Settings } from "lucide-react";
 import TogglePanel from "@/app/(private)/map/[id]/components/TogglePanel";
 import DataSourceIcon from "@/components/DataSourceIcon";
 import IconButtonWithTooltip from "@/components/IconButtonWithTooltip";
@@ -102,6 +102,16 @@ export default function DataRecordsPanel({
             ))}
           </ul>
         )}
+
+        {dataSource?.organisationName && (
+          <div className="flex items-center gap-1 pt-2 border-t border-neutral-200/70 text-muted-foreground">
+            <BookOpen className="w-3 h-3 shrink-0" />
+            <p className="text-[11px] truncate">
+              Published by <span className="text-neutral-400">•</span>{" "}
+              {dataSource.organisationName}
+            </p>
+          </div>
+        )}
       </div>
     </TogglePanel>
   );

src/components/DataSourceItem.tsx

@@ -66,6 +66,29 @@ function LastImportedOrDateAddedMeta({
   return null;
 }
 
+function OrganisationMeta({
+  organisationName,
+  compact,
+}: {
+  organisationName: string | null | undefined;
+  compact?: boolean;
+}) {
+  const name = organisationName?.trim();
+  if (!name) return null;
+  return (
+    <span
+      className={cn(
+        "inline-flex items-center gap-1 whitespace-nowrap text-muted-foreground",
+        compact ? "text-[11px]" : "text-xs",
+      )}
+    >
+      Published by
+      <span className="text-neutral-400">•</span>
+      <span className="truncate">{name}</span>
+    </span>
+  );
+}
+
 export interface DataSourceItemProps {
   dataSource: DataSourceWithImportInfo;
   className?: string;
@@ -235,15 +258,23 @@ export function DataSourceItem({
             </p>
           )}
 
-          {(lastImportedText || dataSource.createdAt) && (
+          <div className="flex items-center gap-4">
             <div className="mt-1">
-              <LastImportedOrDateAddedMeta
-                lastImportedText={lastImportedText}
-                createdAt={dataSource.createdAt}
+              <OrganisationMeta
+                organisationName={dataSource.organisationName}
                 compact
               />
             </div>
-          )}
+            {(lastImportedText || dataSource.createdAt) && (
+              <div className="mt-1">
+                <LastImportedOrDateAddedMeta
+                  lastImportedText={lastImportedText}
+                  createdAt={dataSource.createdAt}
+                  compact
+                />
+              </div>
+            )}
+          </div>
 
           {columnPills.length > 0 && columnPreviewVariant === "pills" && (
             <div className="flex flex-wrap gap-1.5 mt-2">
@@ -405,6 +436,13 @@ export function DataSourceItem({
               )}
             </div>
           ) : null}
+
+          <div className="col-span-2 pt-1">
+            <OrganisationMeta
+              organisationName={dataSource.organisationName}
+              compact
+            />
+          </div>
         </div>
       </div>
     );
@@ -463,6 +501,8 @@ export function DataSourceItem({
             </span>
           )}
         </div>
+
+        <OrganisationMeta organisationName={dataSource.organisationName} />
       </div>
 
       {showColumnPreview && columnPreviewVariant === "text" ? (

src/server/repositories/DataSource.ts

@@ -179,14 +179,6 @@ export async function updateDefaultChoroplethConfig(
     .execute();
 }
 
-export async function findPublicDataSources() {
-  return await db
-    .selectFrom("dataSource")
-    .where("public", "=", true)
-    .selectAll()
-    .execute();
-}
-
 export async function updateColumnDefsWithEnrichment(
   dataSourceId: string,
   enrichedColumnDefs: ColumnDef[],

src/server/trpc/routers/dataSource.ts

@@ -28,7 +28,6 @@ import {
   deleteDataSource,
   findDataSourceById,
   findDataSourcesByIds,
-  findPublicDataSources,
   getJobInfo,
   getUniqueColumnValues,
   updateDataSource,
@@ -57,15 +56,25 @@ import {
   router,
   superadminProcedure,
 } from "../index";
-import type { DataSource } from "@/models/DataSource";
 import type { DataSourceEvent } from "@/server/events";
 import type { DataSourceUpdate } from "@/server/models/DataSource";
 
 export const dataSourceRouter = router({
   listPublic: superadminProcedure.query(async () => {
-    const dataSources = await findPublicDataSources();
+    const dataSources = await db
+      .selectFrom("dataSource")
+      .leftJoin("organisation", "dataSource.organisationId", "organisation.id")
+      .where("dataSource.public", "=", true)
+      .selectAll("dataSource")
+      .select(["organisation.name as organisationName"])
+      .execute();
+
     const withImportInfo = await addImportInfo(dataSources);
-    return withImportInfo.map((ds) => ({ ...ds, organisationOverride: null }));
+    return withImportInfo.map((ds) => ({
+      ...ds,
+      organisationName: ds.organisationName ?? "",
+      organisationOverride: null,
+    }));
   }),
   updateDefaultInspectorConfig: superadminProcedure
     .input(
@@ -100,7 +109,26 @@ export const dataSourceRouter = router({
       const ids = getVisualisedDataSourceIds(map.config, view);
       if (!ids.length) return [];
       const dataSources = await findDataSourcesByIds(ids);
-      const withImportInfo = await addImportInfo(dataSources);
+      const organisationIds = [
+        ...new Set(dataSources.map((ds) => ds.organisationId).filter(Boolean)),
+      ];
+      const organisations =
+        organisationIds.length > 0
+          ? await db
+              .selectFrom("organisation")
+              .where("id", "in", organisationIds)
+              .select(["id", "name"])
+              .execute()
+          : [];
+      const organisationNameById = new Map(
+        organisations.map((o) => [o.id, o.name ?? null]),
+      );
+      const withOrg = dataSources.map((ds) => ({
+        ...ds,
+        organisationName: organisationNameById.get(ds.organisationId) ?? "",
+      }));
+
+      const withImportInfo = await addImportInfo(withOrg);
       return withImportInfo.map((ds) => ({
         ...ds,
         organisationOverride: null,
@@ -137,6 +165,7 @@ export const dataSourceRouter = router({
           return eb.or(filter);
         })
         .selectAll("dataSource")
+        .select(["organisation.name as organisationName"])
         .execute();
 
       const orgId = input?.activeOrganisationId;
@@ -162,6 +191,7 @@ export const dataSourceRouter = router({
       const withImportInfo = await addImportInfo(filteredDataSources);
       return withImportInfo.map((ds) => ({
         ...ds,
+        organisationName: ds.organisationName ?? "",
         organisationOverride: overrideMap.get(ds.id) ?? null,
       }));
     }),
@@ -172,9 +202,20 @@ export const dataSourceRouter = router({
       .selectAll("dataSource")
       .execute();
 
-    return addImportInfo(dataSources);
+    const withOrg = dataSources.map((ds) => ({
+      ...ds,
+      organisationName: ctx.organisation.name ?? "",
+    }));
+
+    return addImportInfo(withOrg);
   }),
   byId: dataSourceOwnerProcedure.query(async ({ ctx }) => {
+    const organisation = await db
+      .selectFrom("organisation")
+      .where("id", "=", ctx.dataSource.organisationId)
+      .select(["name"])
+      .executeTakeFirst();
+
     const recordCount = await db
       .selectFrom("dataRecord")
       .where("dataSourceId", "=", ctx.dataSource.id)
@@ -196,6 +237,7 @@ export const dataSourceRouter = router({
       ]);
     return {
       ...ctx.dataSource,
+      organisationName: organisation?.name ?? "",
       config: {
         ...ctx.dataSource.config,
         __SERIALIZE_CREDENTIALS: true,
@@ -760,7 +802,7 @@ export const dataSourceRouter = router({
   }),
 });
 
-const addImportInfo = async (dataSources: DataSource[]) => {
+const addImportInfo = async <T extends { id: string }>(dataSources: T[]) => {
   // Get import info for all data sources
   const importInfos = await Promise.all(
     dataSources.map((dataSource) =>