Merge pull request #263 from UW-Macrostrat/feedback-updates

Feedback updates

Author: davenquinn

deps/web-components

@@ -41,8 +41,6 @@
     "chalk": "^5.3.0",
     "http-proxy-middleware": "^3.0.3",
     "prettier": "^2.7.1",
-    "react-arborist": "^3.4.0",
-    "react-text-annotate-blend": "^1.2.0",
     "sass": "^1.49.0",
     "sass-embedded": "^1.79.1",
     "stylus": "^0.55.0",

package.json

@@ -1,7 +1,7 @@
 import h from "@macrostrat/hyper";
 import { DocumentationPage } from "~/layouts";
 import { AuthStatus, useAuth } from "@macrostrat/auth-components";
-import { usePostgresQuery } from "#/integrations/xdd/extractions/lib/data-service";
+import { usePostgresQuery } from "#/integrations/xdd/extractions/data-service";
 
 export function Page() {
   return h(DocumentationPage, { title: "Login" }, [

pages/dev/me/+Page.client.ts

@@ -3,12 +3,16 @@ import h from "@macrostrat/hyper";
 import { ContentPage } from "~/layouts";
 import { PageBreadcrumbs } from "~/components";
 import { usePageContext } from "vike-react/usePageContext";
-import { ExtractionContext, enhanceData } from "../lib";
+import {
+  ExtractionContext,
+  enhanceData,
+} from "@macrostrat/feedback-components";
 import {
   useEntityTypeIndex,
   useModelIndex,
   usePostgresQuery,
-} from "../lib/data-service";
+} from "../data-service";
+import { MatchedEntityLink } from "../match";
 
 export function Page() {
   return h(ContentPage, [h(PageBreadcrumbs), h(PageMain)]);
@@ -46,6 +50,7 @@ function ExtractionIndex() {
         h(ExtractionContext, {
           data: enhanceData(d, models, entityTypes),
           entityTypes,
+          matchComponent: MatchedEntityLink,
         }),
       ]);
     }),

pages/integrations/xdd/extractions/@paperId/+Page.ts

@@ -16,6 +16,10 @@ export function usePostgresQuery(
 ) {
   const [data, setData] = useState(null);
 
+  useEffect(() => {
+    console.warn("usePostgresQuery should be moved to a separate package");
+  }, []);
+
   let _filters: FilterDef[] = [];
   if (filters != null) {
     if (!Array.isArray(filters)) {

…ions/xdd/extractions/lib/data-service.ts …grations/xdd/extractions/data-service.tspages/integrations/xdd/extractions/lib/data-service.ts renamed to pages/integrations/xdd/extractions/data-service.ts pages/integrations/xdd/extractions/lib/data-service.ts renamed to pages/integrations/xdd/extractions/data-service.ts

@@ -0,0 +1,46 @@
+import h from "@macrostrat/hyper";
+
+type MacrostratMatchData = {
+  /** Data for Macrostrat matches from the matching service */
+  strat_name_id?: number;
+  lith_id?: number;
+  lith_att_id?: number;
+};
+
+export function MatchedEntityLink({ data }: { data: MacrostratMatchData }) {
+  if (data == null) return null;
+  const href = buildHref(data);
+  return h([" ", h("a.match", { href }, `#${matchID(data)}`)]);
+}
+
+function buildHref(match) {
+  /** Build a URL for a matched term
+   * TODO: this is specific to Macrostrat's UI
+   * */
+  if (match == null) return null;
+
+  if (match.strat_name_id != null) {
+    return `/lex/strat-names/${match.strat_name_id}`;
+  }
+
+  if (match.lith_id != null) {
+    return `/lex/lithologies`;
+  }
+
+  if (match.lith_att_id != null) {
+    return `/lex/lithologies`;
+  }
+
+  return null;
+}
+
+function matchID(match: MacrostratMatchData) {
+  if (match == null) return null;
+
+  for (const id of ["strat_name_id", "lith_id", "lith_att_id"]) {
+    if (match[id]) {
+      return match[id];
+    }
+  }
+  return null;
+}

pages/integrations/xdd/extractions/lib/index.ts

@@ -1,9 +1,12 @@
 import { FullscreenPage } from "~/layouts";
-import h from "./main.module.sass";
+import styles from "./main.module.sass";
+import hyper from "@macrostrat/hyper";
 import { PageBreadcrumbs } from "~/components";
 import { PostgRESTTableView } from "@macrostrat/data-sheet2";
 import { postgrestPrefix } from "@macrostrat-web/settings";
 
+const h = hyper.styled(styles);
+
 export function Page() {
   return h(FullscreenPage, { className: "main" }, [
     h(PageBreadcrumbs),