Merge pull request #6958 from TerriaJS/minmax-exceed-stack

Fix maximum call stack size exceeded on Math.min/max when creating Charts

CHANGES.md

@@ -2,6 +2,8 @@
 
 #### next release (8.3.8)
 
+- Fix maximum call stack size exceeded on Math.min/max when creating Charts
+- Fix boolean flag in `MyDataTab` displaying number
 - Remove `jsx-control-statements` dependency
 - Fix WMS nested group IDs - nested groups with the same name were not being created
 - WMS `isEsri` default value will now check for case-insensitive `mapserver/wmsserver` (instead of `MapServer/WMSServer`)

lib/Core/math.ts

@@ -0,0 +1,23 @@
+export function getMax(nums: number[]) {
+  let len = nums.length;
+  if (len === 0) return undefined;
+
+  let max = -Infinity;
+
+  while (len--) {
+    max = nums[len] > max ? nums[len] : max;
+  }
+  return max;
+}
+
+export function getMin(nums: number[]) {
+  let len = nums.length;
+  if (len === 0) return undefined;
+
+  let min = Infinity;
+
+  while (len--) {
+    min = nums[len] < min ? nums[len] : min;
+  }
+  return min;
+}

lib/ModelMixins/ChartableMixin.ts

@@ -1,6 +1,7 @@
 import { maxBy, minBy } from "lodash-es";
 import AbstractConstructor from "../Core/AbstractConstructor";
 import LatLonHeight from "../Core/LatLonHeight";
+import { getMax, getMin } from "../Core/math";
 import Model from "../Models/Definition/Model";
 import { GlyphStyle } from "../ReactViews/Custom/Chart/Glyphs";
 import ModelTraits from "../Traits/ModelTraits";
@@ -22,8 +23,8 @@ export function calculateDomain(points: ChartPoint[]): ChartDomain {
   const ys = points.map((p) => p.y);
   const asNum = (x: Date | number) => (x instanceof Date ? x.getTime() : x);
   return {
-    x: [minBy(xs, asNum) || 0, maxBy(xs, asNum) || 0],
-    y: [Math.min(...ys), Math.max(...ys)]
+    x: [minBy(xs, asNum) ?? 0, maxBy(xs, asNum) ?? 0],
+    y: [getMin(ys) ?? 0, getMax(ys) ?? 0]
   };
 }
 

lib/ReactViews/ExplorerWindow/Tabs/MyDataTab/MyDataTab.jsx

@@ -123,7 +123,7 @@ class MyDataTab extends React.Component {
   }
 
   render() {
-    const showTwoColumn = this.hasUserAddedData() & !this.state.activeTab;
+    const showTwoColumn = !!(this.hasUserAddedData() && !this.state.activeTab);
     const { t, className } = this.props;
     return (
       <Box