chore: code review tweaks

v3/src/components/data-display/components/legend/categorical-legend.tsx

@@ -2,7 +2,7 @@ import {observer} from "mobx-react-lite"
 import {mstReaction} from "../../../../utilities/mst-reaction"
 import {comparer, reaction} from "mobx"
 import {drag, range, select} from "d3"
-import React, {useCallback, useEffect, useMemo, useRef, useState} from "react"
+import React, {useCallback, useEffect, useMemo, useRef} from "react"
 import { logMessageWithReplacement } from "../../../../lib/log-message"
 // import { setOrExtendSelection } from "../../../../models/data/data-set-utils"
 import {isSelectionAction} from "../../../../models/data/data-set-actions"

v3/src/components/data-display/inspector/display-item-format-control.tsx

@@ -136,7 +136,7 @@ export const DisplayItemFormatControl = observer(function PointFormatControl(pro
                   return (
                     <Flex direction="row" key={category} className="palette-row color-picker-row cat-color-picker">
                       <FormLabel className="form-label color-picker">{category}</FormLabel>
-                      <PointColorSetting key={category} attrType={"categorical"} propertyLabel={category}
+                      <PointColorSetting key={category} propertyLabel={category}
                         onColorChange={(color) => handleCatPointColorChange(color, category)}
                         swatchBackgroundColor={dataConfiguration.getLegendColorForCategory(category)}/>
                     </Flex>
@@ -149,10 +149,10 @@ export const DisplayItemFormatControl = observer(function PointFormatControl(pro
                       <FormLabel className="form-label color-picker">{t("DG.Inspector.legendColor")}</FormLabel>
                       {/* Sets the min and max colors for numeric legend. Currently not implemented so
                                     this sets the same color for all the points*/}
-                      <PointColorSetting propertyLabel={t("DG.Inspector.legendColor")} attrType={"numeric"}
+                      <PointColorSetting propertyLabel={t("DG.Inspector.legendColor")}
                                         onColorChange={(color) => handlePointColorChange(color)}
                                         swatchBackgroundColor={displayItemDescription.pointColor}/>
-                      <PointColorSetting propertyLabel={t("DG.Inspector.legendColor")} attrType={"numeric"}
+                      <PointColorSetting propertyLabel={t("DG.Inspector.legendColor")}
                                         onColorChange={(color) => handlePointColorChange(color)}
                                         swatchBackgroundColor={displayItemDescription.pointColor}/>
                     </Flex>

v3/src/components/data-display/inspector/point-color-setting.tsx

@@ -13,16 +13,13 @@ import styles from "./point-color-setting-shared.scss"
 import "./point-color-setting.scss"
 
 interface ColorPickerIProps {
-  onColorChange: (color: string) => void | ((color: string, cat: string) => void) |
-                  ((color: string, quantile: number) => void)
+  onColorChange: (color: string) => void
   propertyLabel: string
   swatchBackgroundColor: string
-  attrType?: string
-  quantile?: number
 }
 
 export const PointColorSetting = observer(function PointColorSetting({onColorChange,
-      propertyLabel, swatchBackgroundColor, attrType, quantile=0}: ColorPickerIProps) {
+      propertyLabel, swatchBackgroundColor}: ColorPickerIProps) {
   const [showColorPicker, setShowColorPicker] = useState(false)
   const [inputValue, setInputValue] = useState(missingColor)
   const popoverRef = useRef<HTMLDivElement>(null)
@@ -34,7 +31,6 @@ export const PointColorSetting = observer(function PointColorSetting({onColorCha
   const paletteColors = ["#000000", "#a9a9a9", "#d3d3d3", "#FFFFFF", "#ad2323", "#ff9632", "#ffee33", "#1d6914",
     "#2a4bd7", "#814a19", "#8126c0", "#29d0d0", "#e9debb", "#ffcdf3", "#9dafff", "#81c57a"]
 
-
   useOutsidePointerDown({ref: popoverContainerRef, handler: () => setOpenPopover?.(null)})
 
   const handleSwatchClick = (cat: string) => {
@@ -44,14 +40,8 @@ export const PointColorSetting = observer(function PointColorSetting({onColorCha
   const updateValue = useCallback((value: string) => {
     setInputValue(value)
     setNonStandardColorSelected(true)
-    if (attrType === "categorical") {
-      (onColorChange as (color: string, cat: string) => void)(value, propertyLabel)
-    } else if (attrType === "numeric") {
-      (onColorChange as (color: string, quantile: number) => void)(value, quantile)
-    } else {
-      (onColorChange as (color: string) => void)(value)
-    }
-  }, [attrType, propertyLabel])
+    onColorChange(value)
+  }, [onColorChange])
 
   const rejectValue = useCallback(() => {
     setShowColorPicker(false)

v3/src/models/shared/shared-case-metadata.ts

@@ -1,5 +1,5 @@
 import { observable } from "mobx"
-import { getSnapshot, getType, Instance, ISerializedActionCall, onAction, types } from "mobx-state-tree"
+import { getSnapshot, getType, Instance, ISerializedActionCall, types } from "mobx-state-tree"
 import { onAnyAction } from "../../utilities/mst-utils"
 import { CategorySet, createProvisionalCategorySet, ICategorySet } from "../data/category-set"
 import { DataSet, IDataSet } from "../data/data-set"