Merge branch 'develop' into feature-1758-data-table-previews-3

NCEAS · Sep 25, 2024 · b417482 · b417482
2 parents 72b0634 + 337975e
commit b417482
Show file tree

Hide file tree

Showing 11 changed files with 410 additions and 1,163 deletions.
diff --git a/docs/screenshots/views/maps/LegendView.png b/docs/screenshots/views/maps/LegendView.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "@actions/core": "^1.9.1",
     "cheerio": "^1.0.0-rc.11",
-    "express": "^4.19.2",
+    "express": "^4.21.0",
     "fomantic-ui": "^2.9.4-beta.65",
     "puppeteer": "^22.11.2",
     "sinon": "^17.0.1"

diff --git a/src/css/map-view.css b/src/css/map-view.css
@@ -888,7 +888,7 @@ represents 1 unit of the given distance measurement. */
       background-color: var(--portal-col-primary-1, #15324e);
     }
 
-    .layer-item__legend-and-settings {
+    .layer-item__settings {
       /* Show button when layer is hovered. */
       display: flex;
       border: 1px solid var(--portal-col-neutral-4);
@@ -919,19 +919,14 @@ represents 1 unit of the given distance measurement. */
       }
     }
 
-    .layer-item__legend-and-settings {
+    .layer-item__settings {
       /* Show button when layer is shown. */
       display: flex;
       border: 1px solid var(--portal-col-primary-2);
-
-      /* Only show legend when layer is shown. */
-      .layer-item__legend-container {
-        display: block;
-      }
     }
   }
 
-  .layer-item__legend-and-settings {
+  .layer-item__settings {
     /* By default, don't show button. */
     display: none;
     align-items: center;
@@ -948,12 +943,6 @@ represents 1 unit of the given distance measurement. */
       color: var(--portal-col-neutral-6, currentColor);
     }
 
-    .layer-item__legend-container {
-      /* By default, don't show legend. */
-      display: none;
-      margin-left: -0.5rem;
-    }
-
     /* Use the same style on button hover and when selected. */
     &.layer-item--selected,
     &:hover {

diff --git a/src/js/templates/maps/layer-item.html b/src/js/templates/maps/layer-item.html
@@ -7,7 +7,6 @@
     <%= label %>
   </span>
 </span>
-<span class="<%= classes.legendAndSettings %>">
+<span class="<%= classes.settings %>">
   <i class="icon-gear layer-item__settings-toggle"></i>
-  <span class="layer-item__legend-container"></span>
 </span>
diff --git a/src/js/themes/arctic/config.js b/src/js/themes/arctic/config.js
@@ -101,6 +101,8 @@ MetacatUI.AppConfig = Object.assign(
 
     // CesiumMap
     enableCesium: true,
+    cesiumToken:
+      "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJiMTE3MTBiYy1iODY1LTQxNjMtODUzNS0yMzM1NGE3M2JhMWIiLCJpZCI6NjkzOTcsImlhdCI6MTY3ODkwMDg5M30.xzIlG_tPIzB9FmYPzPTzOJ49R2J4yIG2y0ittFqdbMc",
     useDeprecatedDataCatalogView: false,
     catalogSearchMapOptions: {
       clickFeatureAction: "zoom",

diff --git a/src/js/themes/dataone/config.js b/src/js/themes/dataone/config.js
@@ -6,7 +6,7 @@ MetacatUI.AppConfig = Object.assign(
     title: "DataONE Data Catalog",
     theme: "dataone",
     baseUrl: "https://search.dataone.org",
-    mapKey: "AIzaSyDuQ9r_7EeSfspKYs2SET7sv4c8FysLIk4",
+    mapKey: "AIzaSyB61wRRIFZngUXO81ipq3ljUjsClKcT9mk",
     repositoryName: "DataONE Data Catalog",
     emailContact: "support@dataone.org",
     nodeId: "urn:node:CN",

diff --git a/src/js/views/filters/FilterEditorView.js b/src/js/views/filters/FilterEditorView.js
@@ -291,7 +291,7 @@ define([
           description:
             "Allow people to select a search term from a list of options",
           filterTypes: ["filter"],
-          blockedFields: [...MetacatUI.appModel.get("querySemanticFields")],
+          blockedFields: [],
           modelFunction: function (attrs) {
             return new ChoiceFilter(attrs);
           },