vmui: use uPlot as default engine for graph (#1683)

* feat: initial uPlot graph

* feat: add zoom/pan for graph

* fix: add zoom by ctrl/mac

* fix: remove unused code

app/vmui/packages/vmui/config-overrides.js

@@ -0,0 +1,7 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires,no-undef
+const {override, addExternalBabelPlugin} = require("customize-cra");
+
+// eslint-disable-next-line no-undef
+module.exports = override(
+  addExternalBabelPlugin("@babel/plugin-proposal-nullish-coalescing-operator")
+);

app/vmui/packages/vmui/package.json

@@ -18,6 +18,7 @@
     "@types/lodash.debounce": "^4.0.6",
     "@types/lodash.get": "^4.4.6",
     "@types/node": "^12.19.4",
+    "@types/numeral": "^2.0.2",
     "@types/qs": "^6.9.6",
     "@types/react": "^16.9.56",
     "@types/react-dom": "^16.9.9",
@@ -30,6 +31,7 @@
     "dayjs": "^1.10.4",
     "lodash.debounce": "^4.0.8",
     "lodash.get": "^4.4.2",
+    "numeral": "^2.0.6",
     "qs": "^6.5.2",
     "react": "^17.0.1",
     "react-chartjs-2": "^3.0.5",
@@ -37,12 +39,14 @@
     "react-measure": "^2.5.2",
     "react-scripts": "4.0.0",
     "typescript": "~4.0.5",
+    "uplot": "^1.6.16",
+    "uplot-react": "^1.1.1",
     "web-vitals": "^0.2.4"
   },
   "scripts": {
-    "start": "react-scripts start",
+    "start": "react-app-rewired start",
-    "build": "GENERATE_SOURCEMAP=false react-scripts build",
+    "build": "GENERATE_SOURCEMAP=false react-app-rewired build",
-    "test": "react-scripts test",
+    "test": "react-app-rewired test",
     "eject": "react-scripts eject",
     "lint": "eslint src --ext tsx,ts",
     "lint:fix": "eslint src --ext tsx,ts --fix"
@@ -66,9 +70,12 @@
     ]
   },
   "devDependencies": {
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
     "@typescript-eslint/eslint-plugin": "^4.14.2",
     "@typescript-eslint/parser": "^4.14.2",
+    "customize-cra": "^1.0.0",
     "eslint": "^7.14.0",
-    "eslint-plugin-react": "^7.22.0"
+    "eslint-plugin-react": "^7.22.0",
+    "react-app-rewired": "^2.1.8"
   }
 }

app/vmui/packages/vmui/src/components/Home/HomeLayout.tsx

@@ -69,7 +69,7 @@ const HomeLayout: FC = () => {
               <CircularProgress/>
             </Box>
           </Fade>}
-          {<Box height={"100%"} py={3} px={6} bgcolor={"#fff"}>
+          {<Box height={"100%"} p={3} bgcolor={"#fff"}>
             {error &&
             <Alert color="error" severity="error" style={{fontSize: "14px"}}>
               {error}

app/vmui/packages/vmui/src/components/LineChart/LineChart.tsx

@@ -1,20 +1,22 @@
-import React, {FC, useEffect, useRef, useState} from "react";
+import React, {FC, useEffect, useMemo, useRef, useState} from "react";
-import {Line} from "react-chartjs-2";
-import {Chart, ChartData, ChartOptions, ScatterDataPoint} from "chart.js";
 import {getNameForMetric} from "../../utils/metric";
 import "chartjs-adapter-date-fns";
-import debounce from "lodash.debounce";
 import {useAppDispatch, useAppState} from "../../state/common/StateContext";
-import {dateFromSeconds, getTimeperiodForDuration} from "../../utils/time";
 import {GraphViewProps} from "../Home/Views/GraphView";
-import {limitsDurations} from "../../utils/time";
+import uPlot, {AlignedData as uPlotData, Options as uPlotOptions, Series as uPlotSeries} from "uplot";
+import UplotReact from "uplot-react";
+import "uplot/dist/uPlot.min.css";
+import numeral from "numeral";
+import "./legend.css";
 
 const LineChart: FC<GraphViewProps> = ({data = []}) => {
 
-  const {time: {duration, period}} = useAppState();
   const dispatch = useAppDispatch();
-  const [series, setSeries] = useState<ChartData<"line", (ScatterDataPoint)[]>>();
+  const {time: {period}} = useAppState();
-  const refLine = useRef<Chart>(null);
+  const [dataChart, setDataChart] = useState<uPlotData>();
+  const [series, setSeries] = useState<uPlotSeries[]>([]);
+  const [scale, setScale] = useState({min: period.start, max: period.end});
+  const refContainer = useRef<HTMLDivElement>(null);
 
   const getColorByName = (str: string): string => {
     let hash = 0;
@@ -29,113 +31,117 @@ const LineChart: FC<GraphViewProps> = ({data = []}) => {
     return colour;
   };
 
-  useEffect(() => {
+  const times = useMemo(() => {
-    setSeries({
+    const allTimes = data.map(d => d.values.map(v => v[0])).flat();
-      datasets: data?.map(d => {
+    const start = Math.min(...allTimes);
-        const label = getNameForMetric(d);
+    const end = Math.max(...allTimes);
-        const color = getColorByName(label);
+    const output = [];
-        return {
+    for (let i = start; i < end; i += period.step || 1) {
-          label,
+      output.push(i);
-          data: d.values.map(v => ({y: +v[1], x: v[0] * 1000})),
-          borderColor: color,
-          backgroundColor: color,
-        };
-      })
-    });
-    if (refLine.current) {
-      refLine.current.stop(); // make sure animations are not running
-      refLine.current.update("none");
     }
+    return output;
   }, [data]);
 
-  const onZoomComplete = ({chart}: {chart: Chart}) => {
+  useEffect(() => {
-    let {min, max} = chart.scales.x;
+    const values = data.map(d => times.map(t => {
-    if (!min || !max) return;
+      const v = d.values.find(v => v[0] === t);
-    const duration = max - min;
+      return v ? +v[1] : null;
-    if (duration < limitsDurations.min) max = min + limitsDurations.min;
+    }));
-    if (duration > limitsDurations.max) min = max - limitsDurations.max;
+    const seriesValues = data.map(d => ({
-    dispatch({type: "SET_PERIOD", payload: {from: new Date(min), to: new Date(max)}});
+      label: getNameForMetric(d),
+      width: 1,
+      font: "11px Arial",
+      stroke: getColorByName(getNameForMetric(d))}));
+    setSeries([{}, ...seriesValues]);
+    setDataChart([times, ...values]);
+  }, [data]);
+
+  const onReadyChart = (u: uPlot) => {
+    const factor = 0.85;
+
+    // wheel drag pan
+    u.over.addEventListener("mousedown", e => {
+      if (e.button !== 0) return;
+      e.preventDefault();
+      const left0 = e.clientX;
+      const scXMin0 = u.scales.x.min || 1;
+      const scXMax0 = u.scales.x.max || 1;
+      const xUnitsPerPx = u.posToVal(1, "x") - u.posToVal(0, "x");
+
+      const onmove = (e: MouseEvent) => {
+        e.preventDefault();
+        const dx = xUnitsPerPx * (e.clientX - left0);
+        const min = scXMin0 - dx;
+        const max = scXMax0 - dx;
+        u.setScale("x", {min, max});
+        setScale({min, max});
       };
 
-  const onPanComplete = ({chart}: {chart: Chart}) => {
+      const onup = () => {
-    const {min, max} = chart.scales.x;
+        document.removeEventListener("mousemove", onmove);
-    if (!min || !max) return;
+        document.removeEventListener("mouseup", onup);
-    const {start,  end} = getTimeperiodForDuration(duration, new Date(max));
-    dispatch({type: "SET_PERIOD", payload: {from: dateFromSeconds(start), to: dateFromSeconds(end)}});
       };
 
-  const options: ChartOptions = {
+      document.addEventListener("mousemove", onmove);
-    animation: {duration: 0},
+      document.addEventListener("mouseup", onup);
-    parsing: false,
+    });
-    normalized: true,
+
-    scales: {
+    // wheel scroll zoom
-      x: {
+    u.over.addEventListener("wheel", e => {
-        type: "time",
+      if (!e.ctrlKey && !e.metaKey) return;
-        position: "bottom",
+      e.preventDefault();
-        min: (period.start * 1000),
+      const {width} = u.over.getBoundingClientRect();
-        max: (period.end * 1000),
+      const {left = width/2} = u.cursor;
-        time: {
+      const leftPct = left/width;
-          tooltipFormat: "yyyy-MM-dd HH:mm:ss.SSS",
+      const xVal = u.posToVal(left, "x");
-          displayFormats: {millisecond: ":ss.SSS", second: "HH:mm:ss", minute: "HH:mm", hour: "HH:mm"}
+      const oxRange = (u.scales.x.max || 0) - (u.scales.x.min || 0);
-        },
+      const nxRange = e.deltaY < 0 ? oxRange * factor : oxRange / factor;
-        ticks: {
+      const min = xVal - leftPct * nxRange;
-          source: "auto",
+      const max = min + nxRange;
-          autoSkip: true,
+      u.batch(() => {
-          autoSkipPadding: 105,
+        u.setScale("x", {min, max});
-          crossAlign: "center",
+        setScale({min, max});
-          maxRotation: 0,
+      });
-          minRotation: 0,
+    });
-          sampleSize: 1,
-          color: "#000",
-          font: {size: 10}
-        },
-      },
-      y: {
-        type: "linear",
-        position: "left",
-        ticks: {
-          maxRotation: 0,
-          minRotation: 0,
-          color: "#000",
-          font: {size: 10}
-        }
-      }
-    },
-    elements: {
-      line: {
-        tension: 0,
-        stepped: false,
-        borderDash: [],
-        borderWidth: 1,
-        capBezierPoints: false
-      },
-      point: {radius: 0, hitRadius: 10}
-    },
-    plugins: {
-      legend: {
-        position: "bottom",
-        align: "start",
-        labels: {padding: 20, color: "#000"}
-      },
-      zoom: {
-        pan: {
-          enabled: true,
-          mode: "x",
-          onPan: debounce(onPanComplete, 750)
-        },
-        zoom: {
-          pinch: {enabled: true},
-          wheel: {enabled: true, speed: 0.05},
-          mode: "x",
-          onZoom: debounce(onZoomComplete, 250)
-        }
-      },
-    }
   };
 
-  return <>
+  useEffect(() => {setScale({min: period.start, max: period.end});}, [period]);
-    {series && <Line data={series} options={options} ref={refLine}/>}
+
-  </>;
+  useEffect(() => {
+    const duration = (period.end - period.start)/3;
+    const factor = duration / (scale.max - scale.min);
+    if (scale.max > period.end + duration || scale.min < period.start - duration || factor >= 0.7) {
+      dispatch({type: "SET_PERIOD", payload: {from: new Date(scale.min * 1000), to: new Date(scale.max * 1000)}});
+    }
+  }, [scale]);
+
+  const options: uPlotOptions = {
+    width: refContainer.current ? refContainer.current.offsetWidth : 400,
+    height: 500,
+    series: series,
+    plugins: [{
+      hooks: {
+        ready: onReadyChart
+      }
+    }],
+    cursor: {drag: {x: false, y: false}},
+    axes: [
+      {space: 80},
+      {
+        show: true,
+        font: "10px Arial",
+        values: (self, ticks) => ticks.map(n => n > 1000 ? numeral(n).format("0.0a") : n)
+      }
+    ],
+    scales: {x: {range: () => [scale.min, scale.max]}}
+  };
+
+  return <div ref={refContainer}>
+    {dataChart && <UplotReact
+      options={options}
+      data={dataChart}
+    />}
+  </div>;
 };
 
 export default LineChart;

app/vmui/packages/vmui/src/components/LineChart/legend.css

@@ -0,0 +1,11 @@
+.uplot .u-legend {
+    display: grid;
+    align-items: center;
+    justify-content: start;
+    text-align: left;
+    margin-top: 25px;
+}
+
+.uplot .u-legend .u-series {
+    font-size: 12px;
+}

app/vmui/packages/vmui/src/utils/time.ts

@@ -7,7 +7,7 @@ import utc from "dayjs/plugin/utc";
 dayjs.extend(duration);
 dayjs.extend(utc);
 
-const MAX_ITEMS_PER_CHART = window.screen.availWidth / 7.68;
+const MAX_ITEMS_PER_CHART = window.screen.availWidth / 2;
 
 export const limitsDurations = {min: 1000, max: 1.578e+11}; // min: 1 seconds, max: 5 years
 
@@ -74,12 +74,13 @@ export const formatDateForNativeInput = (date: Date): string => dayjs(date).form
 export const getDateNowUTC = (): Date => new Date(dayjs().utc().format(dateIsoFormat));
 
 const getDurationFromMilliseconds = (ms: number): string => {
+  const milliseconds = Math.floor(ms  % 1000);
   const seconds = Math.floor((ms / 1000) % 60);
   const minutes = Math.floor((ms / 1000 / 60) % 60);
   const hours = Math.floor((ms / 1000 / 3600 ) % 24);
   const days = Math.floor(ms / (1000 * 60 * 60 * 24));
-  const durs: UnitTypeShort[] = ["d", "h", "m", "s"];
+  const durs: UnitTypeShort[] = ["d", "h", "m", "s", "ms"];
-  const values = [days, hours, minutes, seconds].map((t, i) => t ? `${t}${durs[i]}` : "");
+  const values = [days, hours, minutes, seconds, milliseconds].map((t, i) => t ? `${t}${durs[i]}` : "");
   return values.filter(t => t).join(" ");
 };