merging main into this branch

Author: amyfromandi

.prettierignore

@@ -1 +1 @@
-packages/maplibre-gl-js
+*.mdx

.yarnrc.yml

@@ -10,6 +10,10 @@ packageExtensions:
     dependencies:
       supports-color: "*"
 
+  '@next/react-dev-overlay@*':
+    peerDependencies:
+      react: '*'
+
 pnpFallbackMode: all
 
 pnpMode: loose

package.json

@@ -9,17 +9,15 @@
     "dev": "NODE_NO_WARNINGS=1 yarn run server:dev",
     "build": "vite build",
     "server": "tsx ./server/index.ts",
-    "server:dev": "tsx ./server/index.ts",
+    "server:dev": "tsx --env-file=.env ./server/index.ts",
     "format": "prettier --write src packages",
     "server:prod": "NODE_NO_WARNINGS=1 NODE_ENV=production yarn run server",
-    "dev:storybook": "yarn workspace @macrostrat/storybook run dev",
     "start": "yarn run build && yarn run server",
     "test:runtime": "tsx tests/test-urls.ts",
     "test": "vitest"
   },
   "workspaces": [
     "deps/web-components/packages/*",
-    "deps/web-components/storybook",
     "deps/cesium-viewer",
     "deps/cesium-martini",
     "packages/*"
@@ -35,15 +33,16 @@
     "@babel/preset-env": "^7.19.4",
     "@babel/preset-typescript": "^7.18.6",
     "@macrostrat/revision-info-webpack": "^1.0.0",
-    "@macrostrat/storybook": "workspace:*",
     "@mdx-js/rollup": "^2.3.0",
-    "@types/esprima": "^4",
-    "@types/prop-types": "^15",
     "@types/underscore": "^1",
     "@typescript-eslint/eslint-plugin": "^6.3.0",
     "@typescript-eslint/parser": "^6.3.0",
     "@yarnpkg/sdks": "^3.1.0",
+    "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",
@@ -53,12 +52,11 @@
   },
   "dependencies": {
     "@blueprintjs/core": "^5.10.2",
-    "@blueprintjs/icons": "^5.13.0",
     "@blueprintjs/select": "^5.1.4",
-    "@blueprintjs/table": "^5.2.2",
+    "@blueprintjs/table": "^5.1.4",
     "@lagunovsky/redux-react-router": "^3.2.0",
     "@loadable/component": "^5.14.1",
-    "@macrostrat-web/data-sheet-test": "workspace:*",
+    "@macrostrat-web/column-builder": "workspace:*",
     "@macrostrat-web/globe": "workspace:*",
     "@macrostrat-web/lithology-hierarchy": "workspace:*",
     "@macrostrat-web/map-utils": "workspace:*",
@@ -72,17 +70,15 @@
     "@macrostrat/api-utils": "workspace:*",
     "@macrostrat/api-views": "workspace:*",
     "@macrostrat/auth-components": "workspace:*",
-    "@macrostrat/cesium-viewer": "workspace:^",
     "@macrostrat/color-utils": "workspace:*",
     "@macrostrat/column-components": "workspace:*",
     "@macrostrat/column-views": "workspace:*",
-    "@macrostrat/concept-app-helpers": "workspace:^",
     "@macrostrat/corelle": "^2.0.1",
-    "@macrostrat/data-components": "workspace:^",
+    "@macrostrat/data-components": "workspace:*",
     "@macrostrat/data-sheet2": "workspace:*",
     "@macrostrat/feedback-components": "workspace:*",
     "@macrostrat/hyper": "^2.2.1",
-    "@macrostrat/map-components": "workspace:^",
+    "@macrostrat/map-components": "workspace:*",
     "@macrostrat/map-interface": "workspace:*",
     "@macrostrat/mapbox-react": "workspace:^2.1.0",
     "@macrostrat/mapbox-styles": "workspace:*",
@@ -108,17 +104,10 @@
     "@types/react-redux": "^7.1.7",
     "@universal-middleware/express": "^0.0.2",
     "@visx/axis": "^2.14.0",
-    "@visx/group": "^3.3.0",
     "@visx/scale": "^2.2.2",
-    "@visx/shape": "^3.5.0",
     "@vitejs/plugin-react": "^4.0.4",
-    "@vx/axis": "^0.0.199",
-    "@vx/scale": "^0.0.199",
-    "@vx/shape": "^0.0.199",
-    "@znemz/cesium-navigation": "^4.0.0",
     "axios": "^0.25.0",
-    "cesium": "^1.122.0",
-    "chroma-js": "^2.4.2",
+    "chroma-js": "^3.0.0",
     "classnames": "^2.2.6",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
@@ -135,17 +124,16 @@
     "esprima": "^4.0.1",
     "express": "^4.18.2",
     "express-http-proxy": "^2.0.0",
-    "gl-matrix": "^3.4.3",
+    "fuse.js": "^7.0.0",
     "hex-to-css-filter": "^5.4.0",
     "history": "^5.3.0",
     "immutability-helper": "^3.1.1",
     "jose": "^5.1.2",
     "mapbox-gl": "^2.15.0",
     "new-github-issue-url": "^1.0.0",
-    "prop-types": "^15.8.1",
+    "part-regex": "^0.1.2",
     "react": "^18.3.0",
     "react-cookie": "^3.0.4",
-    "react-datasheet": "^1.4.12",
     "react-dom": "^18.3.0",
     "react-intersection-observer": "^9.4.3",
     "react-redux": "^7.2.0",
@@ -156,24 +144,24 @@
     "reduce-reducers": "^1.0.4",
     "redux": "^4.0.5",
     "sirv": "^2.0.3",
-    "supercluster": "^8.0.1",
     "swagger-ui-react": "^5.12.3",
     "topojson-client": "^3.0.0",
     "transition-hook": "^1.5.2",
     "tsx": "^4.11.2",
     "underscore": "^1.13.6",
     "use-debounce": "^9.0.4",
+    "use-element-dimensions": "^2.1.3",
     "use-react-router-breadcrumbs": "^3.2.1",
     "use-resize-observer": "^9.1.0",
-    "vike": "^0.4.177",
-    "vike-react": "^0.4.15",
-    "vite": "5.4.11",
+    "vike": "^0.4.199",
+    "vike-react": "^0.5.7",
+    "vite": "^5.3.2",
     "vite-plugin-cesium": "^1.2.22",
     "vite-plugin-inspect": "^0.8.4",
     "zustand": "^4.5.1"
   },
   "prettier": {
     "proseWrap": "always"
   },
-  "packageManager": "yarn@4.3.1"
+  "packageManager": "yarn@4.5.1"
 }

packages/column-builder/.eslintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": "next/core-web-vitals"
+}

packages/column-builder/.gitignore

@@ -0,0 +1,44 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+_node_modules
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+.yarn/cache
+.yarn/install-state.gz
+.yarn/unplugged
+
+.pnp*
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+.env.production
+.env.development
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo

packages/column-builder/README.md

@@ -0,0 +1,33 @@
+This web application is based on [Next.js](https://nextjs.org/) and installed using Yarn PnP.
+
+
+## Getting Started
+
+**You should use Yarn (>v2), not NPM, to install this application.
+Everything is set up for "Plug'n'Play" modules.**
+
+1. Install modules: `yarn`
+2. Run the development server: `yarn run dev`.
+
+Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+
+You can start editing the page by modifying `pages/index.tsx`. The page auto-updates as you edit the file.
+
+[API routes](https://nextjs.org/docs/api-routes/introduction) can be accessed on [http://localhost:3000/api/hello](http://localhost:3000/api/hello). This endpoint can be edited in `pages/api/hello.ts`.
+
+The `pages/api` directory is mapped to `/api/*`. Files in this directory are treated as [API routes](https://nextjs.org/docs/api-routes/introduction) instead of React pages.
+
+## Learn More
+
+To learn more about Next.js, take a look at the following resources:
+
+- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
+- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
+
+You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
+
+## Deploy on Vercel
+
+The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
+
+Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.

packages/column-builder/__archive/.dockerignore

@@ -0,0 +1,8 @@
+Dockerfile
+.dockerignore
+node_modules
+npm-debug.log
+README.md
+.next
+docker
+.git

packages/column-builder/__archive/Dockerfile

@@ -0,0 +1,14 @@
+FROM node:14.19
+
+WORKDIR /app/dacite
+
+COPY package*.json ./
+COPY deps/web-components/packages/ui-components/package.json ./deps/web-components/packages/ui-components/
+COPY deps/web-components/packages/form-components/package.json ./deps/web-components/packages/form-components/
+COPY deps/web-components/packages/data-components/package.json ./deps/web-components/packages/data-components/
+
+RUN npm install
+
+EXPOSE 1234
+
+CMD ["npm", "run", "dev"]

packages/column-builder/__archive/prod.Dockerfile

@@ -0,0 +1,30 @@
+FROM node:16-alpine AS builder
+
+WORKDIR /app/
+COPY . .
+
+RUN npm install
+
+# This will do the trick, use the corresponding env file for each environment.
+COPY ./.env.production .
+
+RUN npm run build
+
+# 3. Production image, copy all the files and run next
+FROM node:16-alpine AS runner
+WORKDIR /app/
+
+ENV NODE_ENV=production
+
+# # You only need to copy next.config.js if you are NOT using the default configuration
+COPY --from=builder /app/.env.production ./
+COPY --from=builder /app/next.config.js ./
+COPY --from=builder /app/package.json ./package.json
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/.next ./.next
+
+EXPOSE 1234
+
+ENV PORT 1234
+
+CMD ["npm", "run", "start"]

packages/column-builder/env.example

@@ -0,0 +1,11 @@
+## place this into an .env.development file in this directory!!
+NEXT_PUBLIC_SERVER_URL=http://localhost:3001
+NEXT_PUBLIC_CLIENT_URL=http://localhost:3001
+NEXT_PUBLIC_TOPOLOGY_URL=http://localhost:1235
+NEXT_PUBLIC_BASE_URL=
+
+## .env.production
+NEXT_PUBLIC_SERVER_URL=http://postgrest:3001
+NEXT_PUBLIC_CLIENT_URL=http://localhost:3001
+NEXT_PUBLIC_TOPOLOGY_URL=http://localhost:1235
+NEXT_PUBLIC_BASE_URL=/dacite