Merge branch 'main' of https://github.com/UW-Macrostrat/web

* 'main' of https://github.com/UW-Macrostrat/web:
  Fixed correlation spacing
  Updated modules to fix correlation chart page
  Remove log
  Remove console log
  Fix feedback
  Map buttons highlight on click

Author: davenquinn

package.json

@@ -61,23 +61,23 @@
     "@macrostrat-web/sift": "workspace:*",
     "@macrostrat-web/text-toolchain": "workspace:*",
     "@macrostrat-web/utility-functions": "workspace:*",
-    "@macrostrat/api-types": "^1.1.3",
+    "@macrostrat/api-types": "^1.1.4",
     "@macrostrat/color-utils": "^1.1.2",
-    "@macrostrat/column-components": "^1.4.0",
-    "@macrostrat/column-views": "^2.3.1",
+    "@macrostrat/column-components": "^1.4.2",
+    "@macrostrat/column-views": "^2.4.3",
     "@macrostrat/data-components": "^0.2.2",
-    "@macrostrat/data-sheet": "^2.2.1",
+    "@macrostrat/data-sheet": "^2.2.2",
     "@macrostrat/feedback-components": "^1.1.10",
     "@macrostrat/form-components": "^0.2.5",
     "@macrostrat/hyper": "^3.0.6",
     "@macrostrat/map-interface": "^1.6.0",
     "@macrostrat/map-styles": "^1.2.4",
     "@macrostrat/mapbox-react": "^2.6.4",
     "@macrostrat/mapbox-utils": "^1.6.1",
-    "@macrostrat/style-system": "^0.2.3",
-    "@macrostrat/svg-map-components": "^1.0.6",
-    "@macrostrat/timescale": "^2.3.0",
-    "@macrostrat/ui-components": "^4.5.2",
+    "@macrostrat/style-system": "^0.2.4",
+    "@macrostrat/svg-map-components": "^1.0.7",
+    "@macrostrat/timescale": "^2.3.2",
+    "@macrostrat/ui-components": "^4.5.3",
     "@react-hook/size": "^2.1.2",
     "@supabase/postgrest-js": "^1.18.1",
     "@turf/bbox": "^6.5.0",

packages/column-builder/package.json

@@ -13,11 +13,11 @@
     "@blueprintjs/popover2": "^1.2.1",
     "@blueprintjs/select": "^5.2.1",
     "@macrostrat-web/settings": "workspace:*",
-    "@macrostrat/column-components": "^1.4.0",
-    "@macrostrat/data-components": "^0.0.6",
-    "@macrostrat/form-components": "^0.2.2",
+    "@macrostrat/column-components": "^1.4.2",
+    "@macrostrat/data-components": "^0.2.2",
+    "@macrostrat/form-components": "^0.2.5",
     "@macrostrat/hyper": "^3.0.6",
-    "@macrostrat/ui-components": "^4.1.2",
+    "@macrostrat/ui-components": "^4.5.3",
     "@mapbox/mapbox-gl-draw": "^1.3.0",
     "@supabase/postgrest-js": "^1.18.1",
     "@types/mapbox__mapbox-gl-draw": "^1.2.3",

packages/globe-dev/package.json

@@ -18,8 +18,8 @@
     "@macrostrat/cesium-vector-provider": "2.0.2",
     "@macrostrat/cesium-viewer": "^1.2.1",
     "@macrostrat/hyper": "^3.0.6",
-    "@macrostrat/mapbox-react": "^2.6.0",
-    "@macrostrat/mapbox-utils": "^1.5.0",
+    "@macrostrat/mapbox-react": "^2.6.4",
+    "@macrostrat/mapbox-utils": "^1.6.1",
     "cesium": "^1.135.0",
     "resium": "^1.19.0"
   }

packages/lithology-hierarchy/package.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "@macrostrat-web/settings": "workspace:^",
     "@macrostrat/hyper": "^3.0.6",
-    "@macrostrat/ui-components": "^4.1.2",
+    "@macrostrat/ui-components": "^4.5.3",
     "@visx/gradient": "^3.3.0",
     "@visx/group": "^3.3.0",
     "@visx/hierarchy": "^3.3.0",

packages/section-editor/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@blueprintjs/core": "^5.10.3",
     "@macrostrat/hyper": "^3.0.6",
-    "@macrostrat/ui-components": "^4.1.2",
+    "@macrostrat/ui-components": "^4.5.3",
     "chroma-js": "^2.0.6",
     "d3": "^5.12.0",
     "labella": "^1.1.4",

pages/columns/correlation/main.module.sass

@@ -102,6 +102,8 @@ $map-size-inset: 12em
   height: 100%
   display: flex
   flex-direction: column
+  // Padding should be included in the fullscreen page, probably
+  padding: 2em
 
 
 .correlation-chart-inner

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