Replace recharts with Chartkick + remove all the d3 utils

web/pages/components/chart.tsx

@@ -1,13 +1,6 @@
-import { LineChart, XAxis, YAxis, Line, Tooltip, Legend } from "recharts";
-import { timeFormat } from "d3-time-format";
-import useWindowSize from '../../utils/hook-windowresize';
 import styles from '../../styles/styles.module.css';
-
-interface ToolTipProps {
-  active?: boolean,
-  payload?: {name: string, payload: {value: string, time: Date}}[],
-  unit?: string
-}
+import { LineChart } from 'react-chartkick'
+import 'chart.js'
 
 const defaultProps = {
   active: false,
@@ -28,102 +21,35 @@ interface ChartProps {
   dataCollections?: any[],
 }
 
-function CustomizedTooltip(props: ToolTipProps) {
-  const { active, payload, unit } = props;
-  if (active && payload && payload[0]) {
-    const time = payload[0].payload ? timeFormat("%I:%M")(new Date(payload[0].payload.time)) : "";
-
-    const tooltipDetails = payload.map(data => {
-      return <div className="label" key={data.name}>
-        {data.payload.value}{unit} {data.name}
-        </div>
-    });
-    return (
-      <span className="custom-tooltip">
-        <strong>{time}</strong>
-        {tooltipDetails}
-      </span>
-    );
-  }
-  return null;
-}
-CustomizedTooltip.defaultProps = defaultProps;
-
 export default function Chart({ data, title, color, unit, dataCollections }: ChartProps) {
-  if (!data && !dataCollections) {
-    return null;
-  }
-  
-  const windowSize = useWindowSize();
-  const chartWidth = windowSize.width * .68;
-  const chartHeight = chartWidth * .333;
+  var renderData = [];
 
-  const timeFormatter = (tick: string) => {
-    return timeFormat("%I:%M")(new Date(tick));
-  };
-
-  let ticks = [];
-  if (dataCollections.length > 0) {
-    ticks = dataCollections[0].data?.map((collection) => {
-      return collection?.time;
-    })
-  } else if (data?.length > 0){
-    ticks = data?.map(item => {
-      return item?.time;
+  if (data && data.length > 0) {
+    renderData.push({
+      name: title,
+      color: color,
+      data: createGraphDatasetFromObject(data)
     });
   }
 
-  const line = data && data?.length > 0 ? (
-    <Line
-    key="line"
-    type="basis"
-    dataKey="value"
-    stroke={color}
-    dot={null}
-    strokeWidth={3}
-    legendType="square"
-    name={title}
-    data={data}
-  />
-  ) : null;
+  dataCollections.forEach(collection => {
+    renderData.push(
+      {name: collection.name, data: createGraphDatasetFromObject(collection.data), color: collection.color}
+    )
+  });
 
   return (
-    <div className={styles.lineChartContainer}>
-      <LineChart width={chartWidth} height={chartHeight}>
-        <XAxis
-          dataKey="time"
-          tickFormatter={timeFormatter}
-          interval="preserveStartEnd"
-          tickCount={5}
-          minTickGap={15}
-          domain={["dataMin", "dataMax"]}
-          ticks={ticks}
-        />
-        <YAxis
-          dataKey="value"
-          interval="preserveStartEnd"
-          unit={unit}
-          domain={["dataMin", "dataMax"]}
-        />
-        <Tooltip content={<CustomizedTooltip unit={unit} />} />
-        <Legend />
-        {line}
-        {dataCollections?.map((s) => (
-          <Line
-            dataKey="value"
-            data={s.data}
-            name={s.name}
-            key={s.name}
-            type="basis"
-            stroke={s.color}
-            dot={null}
-            strokeWidth={3}
-            legendType="square"
-          />
-        ))}
-      </LineChart>
-    </div>
-  );
+    <LineChart
+    className={styles.lineChartContainer}
+    xtitle="Time"
+    ytitle={title}
+    suffix={unit}
+    legend={"bottom"}
+    color={color}
+    data={renderData}
+    download={title}
+    />
+  )
 }
 
 Chart.defaultProps = {
@@ -131,3 +57,13 @@ Chart.defaultProps = {
   data: [],
   title: '',
 };
+
+function createGraphDatasetFromObject(dataArray) {
+  var dataValues = {};
+  dataArray.forEach(item => {
+    const dateObject = new Date(item.time);
+    const dateString = dateObject.getFullYear() + '-' + dateObject.getMonth() + '-' + dateObject.getDay() + ' ' + dateObject.getHours() + ':' + dateObject.getMinutes();
+    dataValues[dateString] = item.value;
+  })
+  return dataValues;
+}

web/pages/components/log-table.tsx

@@ -1,5 +1,4 @@
 import React from "react";
-import { timeFormat } from "d3-time-format";
 import { Table, Tag, Typography } from "antd";
 import Linkify from "react-linkify";
 import { SortOrder } from "antd/lib/table/interface";
@@ -59,8 +58,10 @@ export default function LogTable({ logs, pageSize }: Props) {
       title: "Timestamp",
       dataIndex: "time",
       key: "time",
-      render: (timestamp) =>
-        timeFormat("%H:%M:%S %m/%d/%Y")(new Date(timestamp)),
+      render: (timestamp) => {
+        const dateObject = new Date(timestamp);
+        return dateObject.getHours() + ":" + dateObject.getMinutes() + ":" + dateObject.getSeconds() + ' ' + dateObject.getFullYear() + "-" + (dateObject.getMonth() + 1) + "-" + dateObject.getDate();
+      },
       sorter: (a, b) => new Date(a.time).getTime() - new Date(b.time).getTime(),
       sortDirections: ["descend", "ascend"] as SortOrder[],
       defaultSortOrder: "descend" as SortOrder,

web/pages/components/main-layout.tsx

@@ -60,7 +60,6 @@ export default function MainLayout(props) {
   useEffect(() => {
     if (!performedUpgradeCheck && !context.disableUpgradeChecks) {
       checkForUpgrade();
-      console.log('checking')
       performedUpgradeCheck = true
     }
   });