Even more eslint fixes for #101

src/algorithms/model.ts

@@ -508,7 +508,7 @@ export function exportSimulation(result: UserResult) {
   // TODO: Make the down sampling interval a parameter
 
   const header = keys(result.trajectory[0].current)
-  const tsvHeader: string[] = header.map((x) => (x == 'critical' ? 'ICU' : x))
+  const tsvHeader: string[] = header.map((x) => (x === 'critical' ? 'ICU' : x))
 
   const headerCumulative = keys(result.trajectory[0].cumulative)
   const tsvHeaderCumulative = headerCumulative.map((x) => `cumulative_${x}`)

src/components/Main/Results/AgeBarChart.tsx

@@ -4,7 +4,7 @@ import ReactResizeDetector from 'react-resize-detector'
 
 import { useTranslation } from 'react-i18next'
 
-import { Bar, BarChart, CartesianGrid, Legend, Tooltip, XAxis, YAxis, TooltipPayload } from 'recharts'
+import { Bar, BarChart, CartesianGrid, Legend, Tooltip, XAxis, YAxis } from 'recharts'
 
 import { AlgorithmResult } from '../../../algorithms/types/Result.types'
 
@@ -34,7 +34,6 @@ export function AgeBarChart({ showHumanized, data, rates }: SimProps) {
     return null
   }
 
-  const formatNumber = numberFormatter(!!showHumanized, false)
   const formatNumberRounded = numberFormatter(!!showHumanized, true)
 
   const t = (...args: Parameters<typeof unsafeT>) => {
@@ -43,7 +42,9 @@ export function AgeBarChart({ showHumanized, data, rates }: SimProps) {
       return translation
     }
 
-    process.env.NODE_ENV !== 'production' && console.warn('Translation incomatible in AgeBarChart.tsx', ...args)
+    if (process.env.NODE_ENV !== 'production') {
+      console.warn('Translation incomatible in AgeBarChart.tsx', ...args)
+    }
     return String(translation)
   }
 
@@ -58,13 +59,6 @@ export function AgeBarChart({ showHumanized, data, rates }: SimProps) {
     totalFatalities: Math.round(lastDataPoint.cumulative.fatality[age]),
   }))
 
-  const tooltipFormatter = (
-    value: string | number | Array<string | number>,
-    name: string,
-    entry: TooltipPayload,
-    index: number,
-  ) => <span>{formatNumber(Number(value))}</span>
-
   const tickFormatter = (value: number) => formatNumberRounded(value)
 
   return (

src/components/Main/Results/DeterministicLinePlot.tsx

@@ -8,6 +8,7 @@ import {
   ComposedChart,
   Legend,
   Line,
+  LineProps as RechartsLineProps,
   Label,
   ReferenceArea,
   Scatter,
@@ -16,7 +17,6 @@ import {
   XAxis,
   YAxis,
   YAxisProps,
-  LineProps as RechartsLineProps,
 } from 'recharts'
 
 import { useTranslation } from 'react-i18next'
@@ -97,6 +97,8 @@ function legendFormatter(enabledPlots: string[], value: string, entry: any) {
   return <span className={activeClassName}>{value}</span>
 }
 
+const verifyPositive = (x: number) => (x > 0 ? x : undefined)
+
 export function DeterministicLinePlot({
   data,
   userResult,
@@ -128,8 +130,6 @@ export function DeterministicLinePlot({
 
   const { mitigationIntervals } = mitigation
 
-  const verifyPositive = (x: number) => (x > 0 ? x : undefined)
-
   const nHospitalBeds = verifyPositive(data.params.hospitalBeds)
   const nICUBeds = verifyPositive(data.params.ICUBeds)
 
@@ -215,7 +215,8 @@ export function DeterministicLinePlot({
   const tMin = _.minBy(plotData, 'time')!.time // eslint-disable-line @typescript-eslint/no-non-null-assertion
   const tMax = _.maxBy(plotData, 'time')!.time // eslint-disable-line @typescript-eslint/no-non-null-assertion
 
-  const scatterToPlot: LineProps[] = observations.length
+  const hasObservations = observations.length > 0
+  const scatterToPlot: LineProps[] = hasObservations
     ? [
         // Append empirical data
         ...(countObservations.observedDeaths

src/components/Main/Results/ResponsiveTooltipContent.tsx

@@ -12,8 +12,8 @@ interface TooltipContentProps {
   active: boolean
   label?: string | number
   payload: TooltipItem[]
-  formatter?: Function
-  labelFormatter?: Function
+  formatter?: (value: string | number) => string | number
+  labelFormatter?: (label: string | number) => string | number
 }
 
 function ToolTipContentItem({ name, value, color }: TooltipItem) {

src/types/Intl.d.ts

@@ -1,7 +1,6 @@
 // merge missing fields for Intl.NumberFormatOptions
 // https://github.com/microsoft/TypeScript/issues/36533
 
-// eslint-disable-next-line @typescript-eslint/tslint/config
 namespace Intl {
   interface NumberFormatOptions {
     notation?: string