From a69dca49e261b67023c0f31eb831dfd92bb4644c Mon Sep 17 00:00:00 2001 From: io53 Date: Wed, 2 Oct 2024 22:40:56 +0300 Subject: [PATCH] fixed compare sensor label mixup --- src/components/CompareView.jsx | 11 +++++------ src/states/SensorCompare.jsx | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/components/CompareView.jsx b/src/components/CompareView.jsx index d5b241c..049a98d 100644 --- a/src/components/CompareView.jsx +++ b/src/components/CompareView.jsx @@ -39,11 +39,10 @@ function CompareView(props) { const getUniqueKeys = () => { let uniqueKeysSet = new Set(); - gdata.forEach(obj => { - Object.keys(obj).forEach(key => { - if (key !== "t") uniqueKeysSet.add(key); - }); - }); + for (let i = 0; i < sensorData.length; i++) { + let key = sensorData[i].name || sensorData[i].mac; + uniqueKeysSet.add(key); + } return Array.from(uniqueKeysSet); } @@ -263,7 +262,7 @@ export const useContainerDimensions = myRef => { return dimensions; }; -export function EmtpyGraph() { +export function EmptyGraph() { const ref = useRef(null); const { width } = useContainerDimensions(ref) const colorMode = useColorMode().colorMode; diff --git a/src/states/SensorCompare.jsx b/src/states/SensorCompare.jsx index 5c5f47d..d0af45b 100644 --- a/src/states/SensorCompare.jsx +++ b/src/states/SensorCompare.jsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from "react"; import NetworkApi from "../NetworkApi"; import { Button, Flex, Box, useBreakpointValue } from "@chakra-ui/react"; -import CompairView, { EmtpyGraph } from "../components/CompareView"; +import CompairView, { EmptyGraph } from "../components/CompareView"; import DurationPicker from "../components/DurationPicker"; import i18next, { t } from "i18next"; import { SensorPicker } from '../components/SensorPicker'; @@ -224,7 +224,7 @@ function SensorCompare(props) {
{viewData && setLoading(s)} setData={d => data = d} />} - {!viewData && } + {!viewData && }