Merge pull request #399 from UW-Macrostrat/fixes

Random bugs

Author: davidsklar99

pages/integrations/xdd/feedback/@sourceTextID/+Page.client.ts

@@ -123,7 +123,7 @@ function ExtractionIndex({setPaperID, customFeedback, selectedFeedbackType}) {
 
   const data = getPGData("/kg_context_entities", {
     source_text: "eq." + sourceTextID,
-    user_id: "is.null"
+    version_id: "gt.0"
   });
 
   if (data == null || models == null || entityTypes == null) {

pages/integrations/xdd/feedback/@sourceTextID/human/+Page.client.ts

@@ -30,7 +30,7 @@ export function Page() {
 
   useEffect(() => {
     if (paper_id) {
-      fetchPGData("kg_publication_entities", { paper_id: "eq." + paper_id })
+      fetchPGData("/kg_publication_entities", { paper_id: "eq." + paper_id })
         .then((paper) => {
           setTitle(paper[0]?.citation?.title);
         });
@@ -99,13 +99,13 @@ function ExtractionIndex({setPaperID, title}) {
 function MultiFeedbackInterface({ data, models, entityTypes, title, ix, setIX }) {
   const currentData = data[ix];
 
-  const { feedback_id } = currentData;
+  const { model_run } = currentData;
 
   const autoSelect = window.location.href.split('autoselect=')[1]?.split(",");
 
   return h("div.feedback-interface", [
     h('h1', title),
-    h(FeedbackNotes, { feedback_id }),
+    h(FeedbackNotes, { feedback_id: model_run }),
     h(FeedbackInterface, {
       data: currentData,
       models,

src/components/lex/map.client.ts

@@ -64,9 +64,9 @@ function ColumnsMapInner({
 
     return h('div.lex-controls', [
       h.if(mapUrl !== "")('div.btn', { onClick: () => navigate(map) }, h(Icon, { icon: "map", className: 'icon' })),
-      h.if(fossilsExist)('div.btn', { onClick: handleFossils }, h(Icon, { icon: "mountain", className: 'icon' })),
-      h.if(filters.length > 0)('div.btn', { onClick: handleOutcrop }, h(Icon, { icon: "excavator", className: 'icon' })),
-      h('div.btn', { onClick: handleSatellite }, h(Icon, { icon: "satellite", className: 'icon' })),
+      h.if(fossilsExist)('div.' + (showFossils ? 'selected' : 'btn'), { onClick: handleFossils }, h(Icon, { icon: "mountain", className: 'icon' })),
+      h.if(filters.length > 0)('div.' + (showOutcrop ? 'selected' : 'btn'), { onClick: handleOutcrop }, h(Icon, { icon: "excavator", className: 'icon' })),
+      h('div.' + (showSatellite ? 'selected' : 'btn'), { onClick: handleSatellite }, h(Icon, { icon: "satellite", className: 'icon' })),
     ])
   }
 

src/components/lex/map.module.sass

@@ -19,5 +19,15 @@
     justify-content: center
     cursor: pointer
 
+.selected
+    border-radius: 50%
+    background-color: var(--secondary-color)
+    width: 50px
+    height: 50px
+    display: flex
+    align-items: center
+    justify-content: center
+    cursor: pointer
+
 .icon
     cursor: pointer