From ca9d305593f0d32d3d692bb813820c21f44f1b99 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Thu, 1 Sep 2022 01:56:23 +0200
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=B0=20=D0=BC?=
 =?UTF-8?q?=D1=83=D0=BB=D1=8C=D1=82=D0=B8=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80?=
 =?UTF-8?q?=D1=84=D0=B5=D0=B9=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html        |  2 +-
 src/App.svelte           |  2 +-
 src/widgets/Chart.svelte | 43 +++++++++++++++++++++-------------------
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/public/index.html b/public/index.html
index 1d798a9..71e902e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width,initial-scale=1" />
 
-    <title>IoT Manager 4.2.1</title>
+    <title>IoT Manager 4.2.2</title>
 
     <link rel="icon" type="image/png" href="/favicon.ico" />
     <link rel="stylesheet" href="/build/bundle.css" />
diff --git a/src/App.svelte b/src/App.svelte
index 7038490..fce0b20 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -468,7 +468,7 @@
             if (IsJsonParse(data)) {
               let statusJson = JSON.parse(data);
               udateStatusOfWidget(statusJson);
-              if (debug) console.log("[i]", statusJson);
+              if (debug) console.log("[i] status:", statusJson);
             }
           }
         }
diff --git a/src/widgets/Chart.svelte b/src/widgets/Chart.svelte
index 73d2cc7..2fbbb67 100644
--- a/src/widgets/Chart.svelte
+++ b/src/widgets/Chart.svelte
@@ -1,6 +1,5 @@
 <script>
   import Chart from "svelte-frappe-charts";
-  import Modal from "../components/Modal.svelte";
 
   export let widget;
 
@@ -33,27 +32,31 @@
   $: widget.status, collectDataToArr();
 
   function collectDataToArr() {
-    //отсекаем лишние события изменения переменной widget
-    if (prevSatus !== widget.status) {
-      console.log("[i]", "collecting chart data");
-      let incomingDataArr = widget.status;
-      collectingDataArray = [...collectingDataArray, ...incomingDataArr];
+    if (Array.isArray(widget.status)) {
+      //отсекаем лишние события изменения переменной widget
+      if (prevSatus !== widget.status) {
+        console.log("[i]", "collecting chart data, topic:", widget.topic);
+        let incomingDataArr = widget.status;
+        //console.log("[i]", incomingDataArr);
+        collectingDataArray = [...collectingDataArray, ...incomingDataArr];
 
-      for (let i = 0; i < collectingDataArray.length; i++) {
-        labels[i] = getHHMM(collectingDataArray[i].x);
-        values[i] = [collectingDataArray[i].y1];
+        for (let i = 0; i < collectingDataArray.length; i++) {
+          labels[i] = getHHMM(collectingDataArray[i].x);
+          values[i] = [collectingDataArray[i].y1];
+        }
+
+        datachart = {
+          labels: labels,
+          datasets: [
+            {
+              name: widget.descr,
+              values: values,
+            },
+          ],
+        };
+        prevSatus = widget.status;
+        datachart = datachart;
       }
-
-      datachart = {
-        labels: labels,
-        datasets: [
-          {
-            name: widget.descr,
-            values: values,
-          },
-        ],
-      };
-      prevSatus = widget.status;
     }
   }