Merge branch 'columns-correlation-diagram' into correlation-chart

* columns-correlation-diagram:
  Moved correlation diagram to within columns section

src/components/page-header.ts

@@ -1,7 +1,8 @@
 import hyper from "@macrostrat/hyper";
 import { MacrostratIcon } from "./macrostrat-icon";
-import { Link } from "./buttons";
+import { DevLinkButton, Link } from "./buttons";
 import styles from "./icon.module.sass";
+import { AnchorButton, ButtonGroup } from "@blueprintjs/core";
 
 const h = hyper.styled(styles);
 
@@ -49,3 +50,9 @@ export function Icon(props) {
     children,
   ]);
 }
+
+export function AssistantLinks({ children }) {
+  return h("div.float-right.padding.stick-to-top", [
+    h(ButtonGroup, { vertical: true, large: true }, [children]),
+  ]);
+}

src/pages/columns/+Page.ts

@@ -1,13 +1,17 @@
 import h from "@macrostrat/hyper";
 import { ContentPage } from "~/layouts";
-import { PageHeader, Link } from "~/components";
-import { Tag } from "@blueprintjs/core";
+import { PageHeader, Link, AssistantLinks, DevLinkButton } from "~/components";
+import { AnchorButton, Tag } from "@blueprintjs/core";
 import { usePageProps } from "~/renderer";
 
 export function Page() {
   const { columnGroups, title, linkPrefix } = usePageProps();
 
   return h(ContentPage, [
+    h(AssistantLinks, [
+      h(AnchorButton, { href: "/projects", minimal: true }, "Projects"),
+      h(DevLinkButton, { href: "/columns/correlation" }, "Correlation chart"),
+    ]),
     h(PageHeader, { title }),
     columnGroups.map((d) => h(ColumnGroup, { data: d, key: d.id, linkPrefix })),
   ]);

src/pages/correlation/+Page.ts → src/pages/columns/correlation/+Page.ts

@@ -27,7 +27,7 @@ import {
   UnitSelectionProvider,
   useSelectedUnit,
 } from "@macrostrat/column-views";
-import { UnitDescription } from "~/pages/correlation/column";
+import { UnitDescription } from "~/pages/columns/correlation/column";
 
 export function Page() {
   const startup = useCorrelationDiagramStore((state) => state.startup);

src/pages/correlation/+config.ts → src/pages/columns/correlation/+config.ts

@@ -10,5 +10,5 @@ export default {
       },
     },
   },
-  title: "Correlation diagram",
+  title: "Correlation chart",
 };

src/pages/correlation/column.ts → src/pages/columns/correlation/column.ts

@@ -5,7 +5,7 @@ import {
   useColumn,
 } from "@macrostrat/column-components";
 import { Timescale, TimescaleOrientation } from "@macrostrat/timescale";
-import { JSONView, useDarkMode } from "@macrostrat/ui-components";
+import { useDarkMode } from "@macrostrat/ui-components";
 import classNames from "classnames";
 import { useContext, useEffect, useMemo, useRef } from "react";
 import { AgeAxis, useSelectedUnit } from "@macrostrat/column-views";
@@ -25,7 +25,7 @@ import {
   LegendPanelHeader,
   UnitDetailsPopover,
 } from "~/components/unit-details";
-import { useCorrelationDiagramStore } from "~/pages/correlation/state";
+import { useCorrelationDiagramStore } from "~/pages/columns/correlation/state";
 
 export function MacrostratColumnProvider(props) {
   // A column provider specialized the Macrostrat API

src/pages/correlation/correlation-chart.ts → src/pages/columns/correlation/correlation-chart.ts

@@ -9,7 +9,7 @@ import { UnitLong } from "@macrostrat/api-types";
 import { GapBoundPackage, SectionRenderData, AgeComparable } from "./types";
 
 import h from "./main.module.sass";
-import { useCorrelationDiagramStore } from "~/pages/correlation/state";
+import { useCorrelationDiagramStore } from "~/pages/columns/correlation/state";
 
 export interface ColumnIdentifier {
   col_id: number;

src/pages/maps/+Page.ts

@@ -1,23 +1,21 @@
 import h from "./main.module.scss";
 import { AnchorButton, ButtonGroup } from "@blueprintjs/core";
 import { ContentPage } from "~/layouts";
-import { PageHeader, DevLinkButton } from "~/components";
+import { PageHeader, DevLinkButton, AssistantLinks } from "~/components";
 import { usePageProps } from "~/renderer";
 
 export function Page() {
   const { sources } = usePageProps();
 
   return h(ContentPage, [
-    h("div.float-right.padding.stick-to-top", [
-      h(ButtonGroup, { vertical: true, large: true }, [
-        h(
-          AnchorButton,
-          { icon: "flows", href: "/maps/ingestion" },
-          "Ingestion system"
-        ),
-        h(AnchorButton, { icon: "map", href: "/map/sources" }, "Show on map"),
-        h(DevLinkButton, { href: "/maps/legend" }, "Legend table"),
-      ]),
+    h(AssistantLinks, [
+      h(
+        AnchorButton,
+        { icon: "flows", href: "/maps/ingestion" },
+        "Ingestion system"
+      ),
+      h(AnchorButton, { icon: "map", href: "/map/sources" }, "Show on map"),
+      h(DevLinkButton, { href: "/maps/legend" }, "Legend table"),
     ]),
     h(PageHeader, { title: "Maps" }),
     h(