making selectedMode or numberofShades required

Author: nakul-py

packages/base/src/dialogs/symbology/components/color_ramp/CanvasSelectComponent.tsx

@@ -1,7 +1,10 @@
 import { Button } from '@jupyterlab/ui-components';
 import React, { useEffect, useRef, useState } from 'react';
 
-import { useColorMapList } from '@/src/dialogs/symbology/colorRampUtils';
+import {
+  ColorRampName,
+  useColorMapList,
+} from '@/src/dialogs/symbology/colorRampUtils';
 import ColorRampEntry from './ColorRampEntry';
 
 export interface IColorMap {
@@ -10,7 +13,7 @@ export interface IColorMap {
 }
 
 interface ICanvasSelectComponentProps {
-  selectedRamp: string;
+  selectedRamp: ColorRampName;
   setSelected: (item: any) => void;
 }
 

packages/base/src/dialogs/symbology/components/color_ramp/ColorRamp.tsx

@@ -6,29 +6,28 @@ import { LoadingIcon } from '@/src/shared/components/loading';
 import { ClassificationMode } from '@/src/types';
 import CanvasSelectComponent from './CanvasSelectComponent';
 import ModeSelectRow from './ModeSelectRow';
+import { ColorRampName } from '../../colorRampUtils';
 
 interface IColorRampProps {
   modeOptions: ClassificationMode[];
   layerParams: IDict;
   classifyFunc: (
-    selectedMode: ClassificationMode | undefined,
-    numberOfShades: number | undefined,
-    selectedRamp: string,
+    selectedMode: ClassificationMode,
+    numberOfShades: number,
+    selectedRamp: ColorRampName,
     setIsLoading: (isLoading: boolean) => void,
   ) => void;
   showModeRow: boolean;
   showRampSelector: boolean;
 }
 
 export type ColorRampOptions = {
-  selectedRamp: string;
-  numberOfShades: number | undefined;
-  selectedMode: ClassificationMode | undefined;
+  selectedRamp: ColorRampName;
+  numberOfShades: number;
+  selectedMode: ClassificationMode;
 };
 
-const isValidNumberOfShades = (value: number | undefined) => {
-  return value !== undefined && !isNaN(value) && value > 0;
-};
+const isValidNumberOfShades = (value: number) => !isNaN(value) && value > 0;
 
 const ColorRamp: React.FC<IColorRampProps> = ({
   layerParams,
@@ -37,34 +36,27 @@ const ColorRamp: React.FC<IColorRampProps> = ({
   showModeRow,
   showRampSelector,
 }) => {
-  const [selectedRamp, setSelectedRamp] = useState('');
-  const [selectedMode, setSelectedMode] = useState<
-    ClassificationMode | undefined
-  >();
-  const [numberOfShades, setNumberOfShades] = useState<number | undefined>();
+  const [selectedRamp, setSelectedRamp] = useState<ColorRampName>('viridis');
+  const [selectedMode, setSelectedMode] =
+    useState<ClassificationMode>('equal interval');
+  const [numberOfShades, setNumberOfShades] = useState<number>(9);
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
   useEffect(() => {
-    if (
-      selectedRamp === '' &&
-      selectedMode === undefined &&
-      numberOfShades === undefined
-    ) {
+    if (layerParams.symbologyState) {
       populateOptions();
     }
-  }, [layerParams]);
+  }, [
+    layerParams.symbologyState.nClasses,
+    layerParams.symbologyState.mode,
+    layerParams.symbologyState.colorRamp,
+  ]);
 
   const populateOptions = () => {
-    let nClasses, singleBandMode, colorRamp;
-
-    if (layerParams.symbologyState) {
-      nClasses = layerParams.symbologyState.nClasses;
-      singleBandMode = layerParams.symbologyState.mode;
-      colorRamp = layerParams.symbologyState.colorRamp;
-    }
-    setNumberOfShades(nClasses ? nClasses : 9);
-    setSelectedMode((singleBandMode as ClassificationMode) ?? 'equal interval');
-    setSelectedRamp(colorRamp ? colorRamp : 'viridis');
+    const { nClasses, mode, colorRamp } = layerParams.symbologyState ?? {};
+    setNumberOfShades(nClasses ?? 9);
+    setSelectedMode((mode as ClassificationMode) ?? 'equal interval');
+    setSelectedRamp((colorRamp as ColorRampName) ?? 'viridis');
   };
 
   return (
@@ -92,7 +84,7 @@ const ColorRamp: React.FC<IColorRampProps> = ({
       ) : (
         <Button
           className="jp-Dialog-button jp-mod-accept jp-mod-styled"
-          disabled={!isValidNumberOfShades(numberOfShades)}
+          disabled={!isValidNumberOfShades(numberOfShades) || !selectedMode}
           onClick={() =>
             classifyFunc(
               selectedMode,

packages/base/src/dialogs/symbology/components/color_ramp/ModeSelectRow.tsx

@@ -2,12 +2,10 @@ import React from 'react';
 
 import { ClassificationMode } from '@/src/types';
 interface IModeSelectRowProps {
-  numberOfShades: number | undefined;
-  setNumberOfShades: React.Dispatch<React.SetStateAction<number | undefined>>;
-  selectedMode: ClassificationMode | undefined;
-  setSelectedMode: React.Dispatch<
-    React.SetStateAction<ClassificationMode | undefined>
-  >;
+  numberOfShades: number;
+  setNumberOfShades: React.Dispatch<React.SetStateAction<number>>;
+  selectedMode: ClassificationMode;
+  setSelectedMode: React.Dispatch<React.SetStateAction<ClassificationMode>>;
   modeOptions: ClassificationMode[];
 }
 const ModeSelectRow: React.FC<IModeSelectRowProps> = ({
@@ -25,10 +23,12 @@ const ModeSelectRow: React.FC<IModeSelectRowProps> = ({
           className="jp-mod-styled"
           name="class-number-input"
           type="number"
-          value={selectedMode === 'continuous' ? 52 : (numberOfShades ?? '')}
+          value={selectedMode === 'continuous' ? 52 : numberOfShades}
           onChange={event => {
-            const value = event.target.value;
-            setNumberOfShades(value === '' ? undefined : Number(value));
+            const value = Number(event.target.value);
+            if (!isNaN(value) && value > 0) {
+              setNumberOfShades(value);
+            }
           }}
           disabled={selectedMode === 'continuous'}
         />

packages/base/src/dialogs/symbology/symbologyUtils.ts

@@ -1,6 +1,7 @@
 import { IJGISLayer } from '@jupytergis/schema';
 import colormap from 'colormap';
 
+import { ColorRampName } from './colorRampUtils';
 import { IStopRow } from './symbologyDialog';
 
 const COLOR_EXPR_STOPS_START = 3;
@@ -101,7 +102,7 @@ export namespace VectorUtils {
 export namespace Utils {
   export const getValueColorPairs = (
     stops: number[],
-    selectedRamp: string,
+    selectedRamp: ColorRampName,
     nClasses: number,
     reverse = false,
   ) => {

packages/base/src/dialogs/symbology/tiff_layer/types/SingleBandPseudoColor.tsx

@@ -21,6 +21,7 @@ import BandRow from '@/src/dialogs/symbology/tiff_layer/components/BandRow';
 import { LoadingOverlay } from '@/src/shared/components/loading';
 import { GlobalStateDbManager } from '@/src/store';
 import { ClassificationMode } from '@/src/types';
+import { ColorRampName } from '../../colorRampUtils';
 
 export type InterpolationType = 'discrete' | 'linear' | 'exact';
 
@@ -287,9 +288,9 @@ const SingleBandPseudoColor: React.FC<ISymbologyDialogProps> = ({
   };
 
   const buildColorInfoFromClassification = async (
-    selectedMode: ClassificationMode | undefined,
-    numberOfShades: number | undefined,
-    selectedRamp: string,
+    selectedMode: ClassificationMode,
+    numberOfShades: number,
+    selectedRamp: ColorRampName,
     setIsLoading: (isLoading: boolean) => void,
   ) => {
     // Update layer state with selected options
@@ -304,8 +305,7 @@ const SingleBandPseudoColor: React.FC<ISymbologyDialogProps> = ({
     const currentBand = bandRows[selectedBand - 1];
     const source = model.getSource(layer?.parameters?.source);
     const sourceInfo = source?.parameters?.urls[0];
-    const nClasses =
-      selectedMode === 'continuous' ? 52 : (numberOfShades as number);
+    const nClasses = selectedMode === 'continuous' ? 52 : numberOfShades;
 
     setIsLoading(true);
     switch (selectedMode) {

packages/base/src/dialogs/symbology/vector_layer/types/Categorized.tsx

@@ -12,6 +12,7 @@ import {
 import { Utils, VectorUtils } from '@/src/dialogs/symbology/symbologyUtils';
 import ValueSelect from '@/src/dialogs/symbology/vector_layer/components/ValueSelect';
 import { SymbologyTab, ClassificationMode } from '@/src/types';
+import { ColorRampName } from '../../colorRampUtils';
 
 const Categorized: React.FC<ISymbologyTabbedDialogWithAttributesProps> = ({
   model,
@@ -117,16 +118,16 @@ const Categorized: React.FC<ISymbologyTabbedDialogWithAttributesProps> = ({
   }, [selectedAttribute, stopRows, colorRampOptions]);
 
   const buildColorInfoFromClassification = (
-    selectedMode: ClassificationMode | undefined,
-    numberOfShades: number | undefined,
-    selectedRamp: string,
+    selectedMode: ClassificationMode,
+    numberOfShades: number,
+    selectedRamp: ColorRampName,
     setIsLoading: (isLoading: boolean) => void,
   ) => {
     setColorRampOptions({
       selectedFunction: '',
       selectedRamp,
-      numberOfShades: '',
-      selectedMode: '',
+      numberOfShades,
+      selectedMode,
     });
 
     const stops = Array.from(

packages/base/src/dialogs/symbology/vector_layer/types/Graduated.tsx

@@ -14,6 +14,7 @@ import {
 import { Utils, VectorUtils } from '@/src/dialogs/symbology/symbologyUtils';
 import ValueSelect from '@/src/dialogs/symbology/vector_layer/components/ValueSelect';
 import { ClassificationMode } from '@/src/types';
+import { ColorRampName } from '../../colorRampUtils';
 
 const Graduated: React.FC<ISymbologyTabbedDialogWithAttributesProps> = ({
   model,
@@ -216,9 +217,9 @@ const Graduated: React.FC<ISymbologyTabbedDialogWithAttributesProps> = ({
   };
 
   const buildColorInfoFromClassification = (
-    selectedMode: ClassificationMode | undefined,
-    numberOfShades: number | undefined,
-    selectedRamp: string,
+    selectedMode: ClassificationMode,
+    numberOfShades: number,
+    selectedRamp: ColorRampName,
   ) => {
     setColorRampOptions({
       selectedRamp,
@@ -234,31 +235,31 @@ const Graduated: React.FC<ISymbologyTabbedDialogWithAttributesProps> = ({
       case 'quantile':
         stops = VectorClassifications.calculateQuantileBreaks(
           values,
-          numberOfShades as number,
+          numberOfShades,
         );
         break;
       case 'equal interval':
         stops = VectorClassifications.calculateEqualIntervalBreaks(
           values,
-          numberOfShades as number,
+          numberOfShades,
         );
         break;
       case 'jenks':
         stops = VectorClassifications.calculateJenksBreaks(
           values,
-          numberOfShades as number,
+          numberOfShades,
         );
         break;
       case 'pretty':
         stops = VectorClassifications.calculatePrettyBreaks(
           values,
-          numberOfShades as number,
+          numberOfShades,
         );
         break;
       case 'logarithmic':
         stops = VectorClassifications.calculateLogarithmicBreaks(
           values,
-          numberOfShades as number,
+          numberOfShades,
         );
         break;
       default:
@@ -272,7 +273,7 @@ const Graduated: React.FC<ISymbologyTabbedDialogWithAttributesProps> = ({
         : Utils.getValueColorPairs(
             stops,
             selectedRamp,
-            numberOfShades as number,
+            numberOfShades,
             reverseRamp,
           );
 

packages/base/src/dialogs/symbology/vector_layer/types/Heatmap.tsx

@@ -3,6 +3,7 @@ import React, { useEffect, useRef, useState } from 'react';
 
 import CanvasSelectComponent from '@/src/dialogs/symbology/components/color_ramp/CanvasSelectComponent';
 import { ISymbologyDialogProps } from '@/src/dialogs/symbology/symbologyDialog';
+import { ColorRampName } from '../../colorRampUtils';
 
 const Heatmap: React.FC<ISymbologyDialogProps> = ({
   model,
@@ -18,7 +19,7 @@ const Heatmap: React.FC<ISymbologyDialogProps> = ({
   if (!layer?.parameters) {
     return;
   }
-  const [selectedRamp, setSelectedRamp] = useState('');
+  const [selectedRamp, setSelectedRamp] = useState<ColorRampName>('viridis');
   const [heatmapOptions, setHetamapOptions] = useState({
     radius: 8,
     blur: 15,