#464 Final touches, bump version

NASA-AMMOS · Jul 8, 2024 · 4f80fe8 · 4f80fe8
1 parent 171eb09
commit 4f80fe8
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 10 deletions.
diff --git a/configure/public/toolConfigs.json b/configure/public/toolConfigs.json
diff --git a/configure/src/components/ColorButton/ColorButton.js b/configure/src/components/ColorButton/ColorButton.js
@@ -1,6 +1,8 @@
 import React, { useCallback, useRef, useState } from "react";
 import { ChromePicker } from "react-color";
 
+import Button from "@mui/material/Button";
+
 import useClickOutside from "./useClickOutside";
 
 import { makeStyles } from "@mui/styles";
@@ -36,6 +38,12 @@ const useStyles = makeStyles((theme) => ({
       fontFamily: "Roboto !important",
     },
   },
+  clear: {
+    width: "225px",
+    boxShadow:
+      "rgba(0, 0, 0, 0.3) 0px 0px 2px, rgba(0, 0, 0, 0.3) 0px 4px 8px !important",
+    background: "white !important",
+  },
 }));
 
 const ColorButton = ({ label, color, onChange }) => {
@@ -72,6 +80,16 @@ const ColorButton = ({ label, color, onChange }) => {
               }, 50);
             }}
           />
+          <Button
+            className={c.clear}
+            variant="contained"
+            disableElevation
+            onClick={() => {
+              onChange(null);
+            }}
+          >
+            Clear Selection
+          </Button>
         </div>
       )}
     </div>

diff --git a/configure/src/core/Maker.js b/configure/src/core/Maker.js
@@ -627,6 +627,8 @@ const getComponent = (
                 colorStr = `rgba(${color.rgb.r}, ${color.rgb.g}, ${color.rgb.b}, ${color.rgb.a})`;
               }
               updateConfiguration(forceField || com.field, colorStr, layer);
+            } else {
+              updateConfiguration(forceField || com.field, null, layer);
             }
           }}
         />

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mmgis",
-  "version": "2.11.0",
+  "version": "3.0.0",
   "description": "A web-based mapping and localization solution for science operation on planetary missions.",
   "homepage": "build",
   "repository": {

diff --git a/src/essence/Tools/Identifier/IdentifierTool.js b/src/essence/Tools/Identifier/IdentifierTool.js
@@ -34,21 +34,17 @@ var IdentifierTool = {
         //Get tool variables and UI adjustments
         this.justification = L_.getToolVars('identifier')['justification']
         var toolContent = d3.select('#toolSeparated_Identifier')
-        toolContent.style('bottom', '2px')
-        if (this.justification == 'right') {
-            var toolController = d3.select('#toolcontroller_sepdiv')
+        var toolController = d3.select('#toolcontroller_sepdiv')
+        if (this.justification === 'right') {
             toolController.style('top', '110px')
             toolController.style('left', null)
             toolController.style('right', '5px')
             toolContent.style('left', null)
             toolContent.style('right', '0px')
         } else if (
-            this.justification != L_.getToolVars('legend')['justification']
+            this.justification !== L_.getToolVars('legend')['justification']
         ) {
-            var toolController = d3
-                .select('#toolcontroller_sepdiv')
-                .clone(false)
-                .attr('id', 'toolcontroller_sepdiv_left')
+            toolController.clone(false).attr('id', 'toolcontroller_sepdiv_left')
             $('#toolSeparated_Identifier').appendTo(
                 '#toolcontroller_sepdiv_left'
             )