Set default colorings in getDefaultControlsState

Centralize the defaults for consistency. Also, this avoids the need to mark the property as optional on the state.
nextstrain · Nov 6, 2024 · b4f1e59 · b4f1e59
1 parent 4fea29e
commit b4f1e59
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/actions/recomputeReduxState.js b/src/actions/recomputeReduxState.js
@@ -400,8 +400,6 @@ const modifyControlsStateViaTree = (state, tree, treeToo, colorings) => {
    * only when a file is dropped. (I've gone down too many rabbit holes in this PR to
    * do this now, unfortunately.)                                           james, 2023
    */
-  state.coloringsPresentOnTree = new Set();
-  state.coloringsPresentOnTreeWithConfidence = new Set(); // subset of above
 
   let coloringsToCheck = [];
   if (colorings) {

diff --git a/src/reducers/controls.ts b/src/reducers/controls.ts
@@ -106,8 +106,11 @@ export interface BasicControlsState {
   canTogglePanelLayout: boolean
   colorBy: string
   colorByConfidence: boolean
-  coloringsPresentOnTree?: Set<string>
-  coloringsPresentOnTreeWithConfidence?: Set<string>
+  coloringsPresentOnTree: Set<string>
+
+  /** subset of coloringsPresentOnTree */
+  coloringsPresentOnTreeWithConfidence: Set<string>
+
   colorScale?: ColorScale
   dateMax: string
   dateMaxNumeric: number
@@ -204,6 +207,8 @@ export const getDefaultControlsState = (): ControlsState => {
     colorBy: defaults.colorBy,
     colorByConfidence: false,
     colorScale: undefined,
+    coloringsPresentOnTree: new Set(),
+    coloringsPresentOnTreeWithConfidence: new Set(),
     explodeAttr: undefined,
     selectedBranchLabel: "none",
     showAllBranchLabels: false,