appease tsc / eslint

src/actions/recomputeReduxState.js

@@ -1006,7 +1006,8 @@ export const createStateFromQueryOrJSONs = ({
       'none';
   }
   tree.streams = partitionIntoStreams(controls.showStreamTrees, controls.streamTreeBranchLabel, tree.nodes, tree.visibility, controls.colorScale, controls.absoluteDateMinNumeric, controls.absoluteDateMaxNumeric, controls.distanceMeasure)
-  console.log("tree.streams", tree.streams)
+  // eslint-disable-next-line
+  console.log("tree.streams", tree.streams); // TODO - remove console log
 
   /* calculate entropy in view */
   if (entropy.loaded) {

src/components/controls/choose-metric.js

@@ -1,7 +1,6 @@
 import React from "react";
 import { connect } from "react-redux";
 import { withTranslation } from "react-i18next";
-import { CHANGE_DISTANCE_MEASURE } from "../../actions/types";
 import { analyticsControlsEvent } from "../../util/googleAnalytics";
 import { toggleTemporalConfidence } from "../../actions/tree";
 import { toggleStreamTree, changeDistanceMeasure } from "../../actions/streamTrees";

src/components/tree/phyloTree/change.ts

@@ -423,7 +423,6 @@ export const change = function change(
       this.streamLayout(); // recompute displayOrder values across pivots
       mapStreamsToScreen(this.streams, this.phyloStreams, this.xScale, this.yScale); // recompute pixels (unneeded for branches/tips)
       this.drawStreams(); // remove & redraw
-      this.drawStreamConnectors(); // remove & redraw
     }
     // don't have good methods to remove tips etc (yet)
     for (const name of ['branchLabels', 'branchTee', 'branchStem', 'tips', 'tipLabels', 'vaccines']) {
@@ -453,7 +452,6 @@ export const change = function change(
     this.streamLayout(); // recompute displayOrder values across pivots
     mapStreamsToScreen(this.streams, this.phyloStreams, this.xScale, this.yScale); // recompute pixels (unneeded for branches/tips)
     this.drawStreams(); // remove & redraw
-    this.drawStreamConnectors(); // remove & redraw
   }
   // recalculate existing regression if needed
   if (changeVisibility && this.regression) {

src/components/tree/phyloTree/layouts.ts

@@ -658,9 +658,9 @@ export function mapStreamsToScreen(streams, phyloStreams, xScale, yScale) {
     /* it's important we only set this up once, as DOM elements will bind to data within, so we need to mutate it */
     if (!phyloStream.ripples) {
       const _area = area()
-        .x((d) => d.x)
-        .y0((d) => d.y0)
-        .y1((d) => d.y1)
+        .x((d: any) => d.x) // TODO XXX fix types
+        .y0((d: any) => d.y0) // TODO XXX fix types
+        .y1((d: any) => d.y1) // TODO XXX fix types
         .curve(curveCatmullRom.alpha(0.5))
 
       phyloStream.ripples = phyloStream.displayOrderByCategory.map((displayOrderByPivot) => {

src/components/tree/phyloTree/phyloTree.ts

@@ -67,7 +67,6 @@ PhyloTree.prototype.drawRegression = renderers.drawRegression;
 PhyloTree.prototype.removeRegression = renderers.removeRegression;
 PhyloTree.prototype.updateColorBy = renderers.updateColorBy;
 PhyloTree.prototype.drawStreams = renderers.drawStreams;
-PhyloTree.prototype.drawStreamConnectors = renderers.drawStreamConnectors;
 
 /* C A L C U L A T E    G E O M E T R I E S  E T C   ( M O D I F I E S    N O D E S ,    N O T    S V G ) */
 PhyloTree.prototype.setDistance = layouts.setDistance;

src/components/tree/phyloTree/renderers.ts

@@ -119,7 +119,6 @@ export const render = function render(
   this.updateTipLabels();
   this.drawTips();
   this.drawStreams();
-  this.drawStreamConnectors();
   if (this.params.branchLabelKey) this.drawBranchLabels(this.params.branchLabelKey);
   if (this.vaccines) this.drawVaccines();
   if (this.regression) this.drawRegression();
@@ -357,15 +356,10 @@ export function drawStreams(this: PhyloTreeType): void {
       .style("fill", "none")
       .style('visibility', 'visible')
       .style('cursor', 'pointer') // using a dashed line doesn't play nicely with onhover/onclick behaviour :(
-      .on("click", this.callbacks.onStreamConnectorClick);
+      .on("click", this.callbacks.onStreamConnectorClick as any); // TODO - fix type
   }
 }
 
-export function drawStreamConnectors() {
-  console.log("drawStreamConnectors is currently a no-op")
-}
-
-
 /**
  * draws the regression line in the svg and adds a text with the rate estimate
  */

src/components/tree/phyloTree/types.ts

@@ -2,6 +2,7 @@ import { Selection } from "d3";
 import { Layout, PerformanceFlags, ScatterVariables } from "../../../reducers/controls";
 import { ReduxNode, Visibility } from "../../../reducers/tree/types";
 import { change, modifySVG, modifySVGInStages } from "./change";
+import { TreeComponent } from "../tree";
 
 import * as confidence from "./confidence";
 import * as grid from "./grid";
@@ -47,6 +48,7 @@ export interface Callbacks {
   onTipHover: NodeCallback
   onTipLeave: NodeCallback
   tipLabel: NodeCallback
+  onStreamConnectorClick: (this: TreeComponent, phyloStream: any) =>  void
 }
 
 // ---------- PhyloNode ---------- //

src/components/tree/reactD3Interface/callbacks.ts

@@ -102,9 +102,8 @@ export const onBranchClick = function onBranchClick(this: TreeComponent, d: Phyl
   this.props.dispatch(updateVisibleTipsAndBranchThicknesses({root, cladeSelected}));
 };
 
-export function onStreamConnectorClick(phyloStream) {
-  console.log("CLICK", phyloStream, this)
-  const root = [this.state.tree.streams.streams[phyloStream.streamIdx].founderIdx, undefined];
+export function onStreamConnectorClick(this: TreeComponent, phyloStream: any) {
+  const root = [this.state.tree.streams.streams[phyloStream.streamIdx].founderIdx, undefined] as [number, undefined]; // TODO fix type
   this.props.dispatch(updateVisibleTipsAndBranchThicknesses({root, cladeSelected: undefined}));
 
   // TODO - this zoom is wrong because underneath it all we're zooming to the display Order values of the subtree

src/reducers/controls.ts

@@ -467,10 +467,8 @@ const Controls = (state: ControlsState = getDefaultControlsState(), action): Con
     case types.TOGGLE_LEGEND:
       return Object.assign({}, state, { legendOpen: action.value });
     case types.TOGGLE_STREAM_TREE:
-      console.log("Controls reducer. Show?", action.showStreamTrees, "Label (unchanged):", state.streamTreeBranchLabel);
       return {...state, showStreamTrees: action.showStreamTrees};
     case types.CHANGE_STREAM_TREE_BRANCH_LABEL:
-      console.log("Controls reducer. Show?", action.showStreamTrees, "Label", action.streamTreeBranchLabel);
       return {...state, showStreamTrees: action.showStreamTrees, streamTreeBranchLabel: action.streamTreeBranchLabel};
     case types.ADD_EXTRA_METADATA: {
       for (const colorBy of Object.keys(action.newColorings)) {

src/util/partitionIntoStreams.js

@@ -250,6 +250,6 @@ function getFounderTree(treeNodes, branchLabel) {
   })
 
 
-  console.log({founderTree, founderIndiciesToDescendantFounderIndicies, foundersPostorder, streamGroups})
+  // console.log({founderTree, founderIndiciesToDescendantFounderIndicies, foundersPostorder, streamGroups})
   return {founderTree, founderIndiciesToDescendantFounderIndicies, foundersPostorder, streamGroups};
 }

tsconfig.json

@@ -14,6 +14,7 @@ Visit https://aka.ms/tsconfig.json for a detailed list of options.
     /* Language and Environment */
     "jsx": "react",                                      /* Specify what JSX code is generated. */
     "target": "es2015",
+    "lib": ["esnext", "dom"],
 
     /* Modules */
     "moduleResolution": "node",                          /* Specify how TypeScript looks up a file from a given module specifier. */