Merge pull request #293 from UW-Macrostrat/data-handler

Lex Pages Data Handlers

Author: davenquinn

packages/column-builder/src/types.ts

@@ -178,4 +178,4 @@ export interface ColSectionI {
   unit_count: number;
   top: string;
   bottom: string;
-}
+}

pages/+Page.client.ts pages/+Page.tspages/+Page.client.ts renamed to pages/+Page.ts

@@ -1,8 +1,15 @@
-import { usePageContext } from "vike-react/usePageContext";
-import { IndividualPage } from "../../../../src/components/lex/index";
+import { useData } from "vike-react/useData";
+import { LexItemPage } from "~/components/lex";
 
 export function Page() {
-  const pageContext = usePageContext();
-  const id = parseInt(pageContext.urlParsed.pathname.split("/")[3]);
-  return IndividualPage(id, "col_group_id", "groups");
+  const { resData, colData, taxaData, refs } = useData();
+
+  return LexItemPage({
+    id: resData.col_group_id,
+    header: "groups",
+    resData,
+    colData,
+    taxaData,
+    refs
+  });
 }

pages/about/+Page.client.ts pages/about/+Page.tspages/about/+Page.client.ts renamed to pages/about/+Page.ts

@@ -0,0 +1,32 @@
+import { pbdbDomain } from "@macrostrat-web/settings";
+import { fetchAPIData, fetchAPIRefs } from "~/_utils";
+
+export async function data(pageContext) {
+  const col_group_id = parseInt(pageContext.urlParsed.pathname.split("/")[3]);
+
+  // Await all API calls
+  const [resData, colData, refs1, refs2] = await Promise.all([
+    fetchAPIData("/defs/groups", { col_group_id }),
+    fetchAPIData("/columns", { col_group_id, response: "long", format: "geojson" }),
+    fetchAPIRefs("/fossils", { col_group_id }),
+    fetchAPIRefs("/columns", { col_group_id }),
+  ]);
+
+  const refValues1 = Object.values(refs1)
+  const refValues2 = Object.values(refs2)
+  const refs = [...refValues1, ...refValues2]
+
+  const cols = colData?.features
+    ?.map((feature) => feature.properties.col_id)
+    ?.join(",");
+
+  let taxaData = null;
+  if (cols) {
+    const response = await fetch(
+      `${pbdbDomain}/data1.2/occs/prevalence.json?limit=5&coll_id=${cols}`
+    );
+    taxaData = await response.json();
+  }
+
+  return { resData: resData[0], colData, taxaData, refs };
+}

pages/columns/groups/@group/+Page.client.ts

@@ -3,12 +3,11 @@ import { ContentPage } from "~/layouts";
 import { apiV2Prefix } from "@macrostrat-web/settings";
 import { useAPIResult } from "@macrostrat/ui-components";
 import h from "./+Page.module.sass";
+import { useData } from "vike-react/useData";
 import { Loading, Footer } from "~/components/general";
 
 export function Page() {
-  const res = useAPIResult(apiV2Prefix + "/stats?all")?.success?.data;
-
-  if (!res) return h(ContentPage, Loading);
+  const { res } = useData();
 
   const seen = new Set();
   const stats = res.filter((project) => {
@@ -17,8 +16,6 @@ export function Page() {
     return true;
   });
 
-  console.log("Lexicon stats", stats);
-
   let columns = 0,
     packages = 0,
     units = 0,

pages/columns/groups/@group/+data.ts

@@ -0,0 +1,7 @@
+import { fetchAPIData } from "~/_utils";
+
+export async function data() {
+  const res = await fetchAPIData(`/stats`, { all: true });
+
+  return { res };
+}

pages/donate/+Page.client.ts pages/donate/+Page.tspages/donate/+Page.client.ts renamed to pages/donate/+Page.ts

@@ -1,21 +1,15 @@
 import h from "./main.module.scss";
-import { useAPIResult } from "@macrostrat/ui-components";
-import { SETTINGS } from "@macrostrat-web/settings";
 import { PageBreadcrumbs, StickyHeader } from "~/components";
-import { Card, Popover } from "@blueprintjs/core";
+import { Popover } from "@blueprintjs/core";
 import { useState } from "react";
 import { ContentPage } from "~/layouts";
 import { asChromaColor } from "@macrostrat/color-utils";
+import { useData } from "vike-react/useData";
 import { Loading, SearchBar } from "~/components/general";
 
 export function Page() {
   const [input, setInput] = useState("");
-  const res = useAPIResult(SETTINGS.apiV2Prefix + "/defs/econs?all")?.success
-    .data;
-
-  if (res == null) return h(Loading);
-
-  console.log(res);
+  const { res } = useData();
 
   const handleChange = (event) => {
     setInput(event.toLowerCase());

pages/lex/+Page.ts

@@ -0,0 +1,7 @@
+import { fetchAPIData } from "~/_utils";
+
+export async function data() {
+  const res = await fetchAPIData(`/defs/econs`, { all: true });
+
+  return { res };
+}