Merge branch 'main' into fossils

Author: davidsklar99

.idea/vcs.xml

@@ -1,6 +1,6 @@
 compressionLevel: mixed
 
-enableGlobalCache: false
+enableGlobalCache: true
 
 packageExtensions:
   "@next/react-dev-overlay@*":

.yarnrc.yml

@@ -69,17 +69,17 @@
     "@macrostrat/column-views": "^2.1.2",
     "@macrostrat/data-components": "^0.2.0",
     "@macrostrat/data-sheet": "^2.0.2",
-    "@macrostrat/feedback-components": "^1.1.4",
+    "@macrostrat/feedback-components": "^1.1.7",
     "@macrostrat/form-components": "^0.2.1",
     "@macrostrat/hyper": "^3.0.6",
-    "@macrostrat/map-interface": "^1.5.1",
+    "@macrostrat/map-interface": "^1.5.2",
     "@macrostrat/map-styles": "^1.2.0",
     "@macrostrat/mapbox-react": "^2.6.0",
     "@macrostrat/mapbox-utils": "^1.5.0",
     "@macrostrat/style-system": "^0.2.1",
     "@macrostrat/svg-map-components": "^1.0.4",
     "@macrostrat/timescale": "^2.2.1",
-    "@macrostrat/ui-components": "^4.4.0",
+    "@macrostrat/ui-components": "^4.4.4",
     "@react-hook/size": "^2.1.2",
     "@supabase/postgrest-js": "^1.18.1",
     "@turf/bbox": "^6.5.0",
@@ -123,7 +123,7 @@
     "history": "^5.3.0",
     "immutability-helper": "^3.1.1",
     "jose": "^5.1.2",
-    "mapbox-gl": "^2.15.0",
+    "mapbox-gl": "^3.13.0",
     "new-github-issue-url": "^1.0.0",
     "part-regex": "^0.1.2",
     "react": "^18.3.0",

package.json

@@ -15,15 +15,15 @@
     "@macrostrat-web/settings": "workspace:*",
     "@macrostrat/column-components": "^1.0.3",
     "@macrostrat/data-components": "^0.0.6",
-    "@macrostrat/form-components": "^0.1.2",
+    "@macrostrat/form-components": "^0.2.2",
     "@macrostrat/hyper": "^3.0.6",
     "@macrostrat/ui-components": "^4.1.2",
     "@mapbox/mapbox-gl-draw": "^1.3.0",
     "@supabase/postgrest-js": "^1.18.1",
     "@types/mapbox__mapbox-gl-draw": "^1.2.3",
     "axios": "^1.7.9",
     "cross-fetch": "^3.1.5",
-    "mapbox-gl": "^2.8.2",
+    "mapbox-gl": "^3.0.0",
     "react": "^18",
     "react-beautiful-dnd": "^13.1.0",
     "react-color": "^2.19.3"

packages/column-builder/package.json

@@ -7,13 +7,17 @@ import {
   StickyHeader,
 } from "~/components";
 import { AnchorButton, ButtonGroup } from "@blueprintjs/core";
-import { Tag } from "@macrostrat/data-components";
-import h from "./main.module.sass";
+import { Tag } from "@blueprintjs/core";
+import hyper from "@macrostrat/hyper";
+import styles from "./main.module.sass";
+
 import { useData } from "vike-react/useData";
 import { ClientOnly } from "vike-react/ClientOnly";
 import { navigate } from "vike/client/router";
 import { SearchBar } from "~/components/general";
 
+const h = hyper.styled(styles);
+
 export function Page(props) {
   return h(ColumnListPage, props);
 }

pages/columns/+Page.ts

@@ -44,7 +44,7 @@ export async function data(pageContext) {
   const col = columns?.[0] ?? {};
 
   if (!columns?.[0]?.properties) {
-  console.warn("Column has no properties:", columns);
+    console.warn("Column has no properties:", columns);
   }
 
   const columnInfo: ColumnSummary = {
@@ -79,8 +79,6 @@ async function getData(
     assembleURL(entity, { ...args, status_code: "active" })
   );
   let data = unwrapResponse(res);
-  console.log("Received", entity, "data:", data);
-
 
   if (data.length > 0) {
     return data;

pages/columns/@column/+data.ts

@@ -62,15 +62,15 @@ export function ModalUnitPanel(props) {
       }
 
       if(unit?.environ_id) {
-        window.open('/lex/environments/' + unit.environ_id, '_self');
+        window.open('/lex/environment/' + unit.environ_id, '_self');
       }
 
       if(unit?.int_id) {
         window.open('/lex/intervals/' + unit.int_id, '_self');
       }
 
       if(unit?.strat_name_id) {
-        window.open('/lex/strat-names/' + unit.strat_name_id, '_self');
+        window.open('/lex/strat-name/' + unit.strat_name_id, '_self');
       }
     },
   });

pages/columns/@column/column-inspector/modal-panel.ts

@@ -10,8 +10,8 @@ import {
 
 export function Page() {
   const { resData, colData, taxaData, refs } = useData();
-
-  const id = resData.environ_id;
+  
+  const id = resData.col_group_id;
   const features = colData?.features || [];
   const timescales = resData?.timescales || [];
 
@@ -25,5 +25,5 @@ export function Page() {
     h(Timescales, { timescales }),
   ];
 
-  return LexItemPage({ children, id, refs, resData, siftLink: "environment" });
+  return LexItemPage({ children, id, refs, resData, siftLink: "groups" });
 }

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

@@ -74,7 +74,7 @@ export function Page() {
     h(
       APIProvider,
       {
-        baseURL: "https://dev2.macrostrat.org/api/v2",
+        baseURL: "https://dev.macrostrat.org/api/v2",
         unwrapResponse: (res) => {
           return res.success.data;
         },

pages/dev/concepts/detrital-zircon/+Page.ts

@@ -39,7 +39,7 @@ export function SpotsPanel({ onSelectPosition, map }) {
     const fetchFeatures = async () => {
       try {
         const response = await fetch(
-          "https://dev2.macrostrat.org/api/pg/saved_locations"
+          "https://dev.macrostrat.org/api/pg/saved_locations"
         );
         if (!response.ok) {
           throw new Error(`Error ${response.status}: ${response.statusText}`);