ingestion page works now. fixing points table

Author: amyfromandi

Dockerfile

@@ -36,8 +36,6 @@ RUN apt-get remove -y rsync
 
 COPY . ./
 
-ENV NODE_ENV=production
-
 RUN yarn run build
 
 EXPOSE 3000

pages/maps/ingestion/+Page.ts

@@ -11,10 +11,23 @@ import { ContentPage } from "~/layouts";
 import Tag from "./components/Tag";
 
 const h = hyper.styled(styles);
-
+type MapSource = {
+  source_id: number;
+  name: string | null;
+};
+interface IngestProcess {
+  id: number;
+  source_id: number | null;
+  slug: string;
+  name: string;
+  scale: string | null;
+  raster_url: string | null;
+  tags?: string[] | { tag: string }[];
+  state?: string;
+}
 export function Page() {
   const { user } = useAuth();
-
+  const [mapSources, setMapSources] = useState<Record<number, MapSource>>({});
   const [ingestProcess, setIngestProcess] = useState<IngestProcess[]>([]);
   const [ingestFilter, setIngestFilter] = useState<URLSearchParams>(undefined);
   const [tags, setTags] = useState<string[]>([]);
@@ -23,6 +36,15 @@ export function Page() {
     getTags().then((tags) => setTags(tags));
   }, []);
 
+  const getMapSources = async (): Promise<Record<number, MapSource>> => {
+    const res = await fetch(
+      "https://dev.macrostrat.org/api/pg/maps_sources?select=source_id,name"
+    );
+    const rows: MapSource[] = await res.json();
+
+    return Object.fromEntries(rows.map((r) => [r.source_id, r]));
+  };
+
   const updateIngestProcesses = useCallback(() => {
     getIngestProcesses(ingestFilter).then((ingestProcesses) => {
       setIngestProcess(ingestProcesses);
@@ -44,6 +66,9 @@ export function Page() {
       updateIngestProcesses();
     };
   }, []);
+  useEffect(() => {
+    getMapSources().then(setMapSources);
+  }, []);
 
   // Re-fetch data when the filter changes
   react.useEffect(() => {
@@ -72,9 +97,13 @@ export function Page() {
       h(
         "div.ingestion-body",
         ingestProcess.map((d) => {
+          const name =
+            d.source_id != null ? mapSources[d.source_id]?.name : undefined;
+
           return h(IngestProcessCard, {
             key: d.id,
             ingestProcess: d,
+            refTitle: name,
             user: user,
             onUpdate: () => {
               updateTags();

pages/maps/ingestion/@id/_data.ts

@@ -1,4 +1,4 @@
-import { apiV2Prefix, ingestPrefix } from "@macrostrat-web/settings";
+import { apiV2Prefix, postgrestPrefix } from "@macrostrat-web/settings";
 
 const apiAddress = apiV2Prefix + "/defs/sources/";
 
@@ -23,11 +23,16 @@ export async function getIngestProcessData(
 
   // API v3 query
   const ingest_processes_response = await fetch(
-    `${ingestPrefix}/ingest-process?source_id=eq.${source_id}`
+    `${postgrestPrefix}/map_ingest?source_id=eq.${source_id}`
   );
   const ingestProcesses = await ingest_processes_response.json();
   const ingestProcess = ingestProcesses[0];
-  const source = ingestProcess["source"];
+
+  const source_response = await fetch(
+    `${postgrestPrefix}/maps_sources?source_id=eq.${source_id}&select=*`
+  );
+  const sources = await source_response.json();
+  const source = sources[0];
 
   return {
     source,

pages/maps/ingestion/components/ingest-process-card.ts

@@ -22,14 +22,16 @@ interface IngestProcess {
 
 export function IngestProcessCard({
   ingestProcess,
+  refTitle,
   user,
   onUpdate,
 }: {
   ingestProcess: IngestProcess;
+  refTitle?: string | null;
   user: any | undefined;
   onUpdate: () => void;
 }) {
-  const { slug, name, source_id, scale, raster_url } = ingestProcess;
+  const { slug, source_id, scale, raster_url } = ingestProcess;
   const edit_href = `/maps/ingestion/${source_id}`;
 
   return h(
@@ -39,7 +41,7 @@ export function IngestProcessCard({
     },
     [
       h("div.flex.row", [
-        h("h3.map-card-title", name),
+        h("h3.map-card-title", refTitle),
         h("div.spacer"),
         h.if(user !== undefined)(AnchorButton, {
           href: edit_href,