- (@GermanBluefox) Correcting locale for x-axis

- (@GermanBluefox) Correcting widget
ioBroker · Jan 13, 2025 · 7e09c8d · 7e09c8d
1 parent e356c83
commit 7e09c8d
Show file tree

Hide file tree

Showing 32 changed files with 1,430 additions and 1,353 deletions.
diff --git a/admin/assets/index-VBHizqvZ.js → admin/assets/index-DIG665pI.js b/admin/assets/index-VBHizqvZ.js → admin/assets/index-DIG665pI.js
diff --git a/admin/chart/assets/index-DCgeF7hH.js b/admin/chart/assets/index-DCgeF7hH.js
diff --git a/admin/chart/assets/index-ZF2lF8gx.js b/admin/chart/assets/index-ZF2lF8gx.js
diff --git a/admin/chart/index.html b/admin/chart/index.html
@@ -20,7 +20,7 @@
         />
         <script type="text/javascript" src="./../../lib/js/socket.io.js"></script>
         <title>Echarts [ioBroker]</title>
-      <script type="module" crossorigin src="./assets/index-DCgeF7hH.js"></script>
+      <script type="module" crossorigin src="./assets/index-ZF2lF8gx.js"></script>
       <link rel="stylesheet" crossorigin href="./assets/index-VI9R7d-i.css">
     </head>
     <body>

diff --git a/www/preview/assets/index-CgqD6xas.js → admin/preview/assets/index-pOd0B7Ce.js b/www/preview/assets/index-CgqD6xas.js → admin/preview/assets/index-pOd0B7Ce.js
diff --git a/admin/preview/index.html b/admin/preview/index.html
@@ -45,7 +45,7 @@
             document.head.appendChild(script);
         </script>
         <title>Echarts preview [ioBroker]</title>
-      <script type="module" crossorigin src="./assets/index-CgqD6xas.js"></script>
+      <script type="module" crossorigin src="./assets/index-pOd0B7Ce.js"></script>
       <link rel="stylesheet" crossorigin href="./assets/index-VI9R7d-i.css">
     </head>
     <body>

diff --git a/admin/tab.html b/admin/tab.html
@@ -45,7 +45,7 @@
             document.head.appendChild(script);
         </script>
         <title>Echarts [ioBroker]</title>
-      <script type="module" crossorigin src="./assets/index-VBHizqvZ.js"></script>
+      <script type="module" crossorigin src="./assets/index-DIG665pI.js"></script>
       <link rel="stylesheet" crossorigin href="./assets/index-D5BB0j0i.css">
     </head>
     <body>

diff --git a/build-backend/lib/ChartModel.js b/build-backend/lib/ChartModel.js
diff --git a/build-backend/lib/ChartModel.js.map b/build-backend/lib/ChartModel.js.map
diff --git a/build-backend/main.js b/build-backend/main.js
diff --git a/build-backend/main.js.map b/build-backend/main.js.map
diff --git a/package.json b/package.json
@@ -21,9 +21,9 @@
     "url": "https://github.com/ioBroker/ioBroker.echarts"
   },
   "optionalDependencies": {
-    "canvas": "^2.11.2",
+    "canvas": "^3.0.1",
     "echarts": "^5.6.0",
-    "jsdom": "^25.0.1"
+    "jsdom": "^26.0.0"
   },
   "dependencies": {
     "moment": "^2.30.1",
@@ -33,22 +33,22 @@
     "@alcalzone/release-script": "^3.8.0",
     "@alcalzone/release-script-plugin-iobroker": "^3.7.2",
     "@alcalzone/release-script-plugin-license": "^3.7.0",
-    "@iobroker/adapter-react-v5": "^7.4.10",
+    "@iobroker/adapter-react-v5": "^7.4.12",
     "@iobroker/build-tools": "^2.0.14",
     "@iobroker/eslint-config": "^1.0.0",
     "@iobroker/legacy-testing": "^2.0.1",
     "@iobroker/testing": "^5.0.0",
     "@iobroker/vis-2-widgets-react-dev": "^4.0.4",
-    "@mui/icons-material": "^6.3.0",
-    "@mui/material": "^6.3.0",
+    "@mui/icons-material": "^6.3.1",
+    "@mui/material": "^6.3.1",
     "@types/jsdom": "^21.1.7",
     "@types/react": "^18.3.18",
     "@types/react-dom": "^18.3.5",
     "axios": "^1.7.9",
     "chai": "^4.5.0",
     "colorette": "^2.0.20",
     "mocha": "^11.0.1",
-    "puppeteer": "^23.11.1",
+    "puppeteer": "^24.0.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },

diff --git a/src-chart/package.json b/src-chart/package.json
@@ -11,7 +11,7 @@
         "moment": "^2.30.1",
         "react-i18next": "^15.4.0",
         "react-icons": "^5.4.0",
-        "typescript": "^5.7.2"
+        "typescript": "^5.7.3"
     },
     "homepage": ".",
     "_proxy": "http://localhost:8081",

diff --git a/src-preview/package.json b/src-preview/package.json
@@ -5,7 +5,7 @@
     "dependencies": {
         "@vitejs/plugin-react": "^4.3.4",
         "react-icons": "^5.4.0",
-        "typescript": "^5.7.2"
+        "typescript": "^5.7.3"
     },
     "homepage": ".",
     "proxy": "http://localhost:8081",

diff --git a/src-widgets/package.json b/src-widgets/package.json
@@ -5,11 +5,11 @@
     "dependencies": {
         "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
         "@craco/craco": "^7.1.0",
-        "@iobroker/adapter-react-v5": "^7.1.4",
+        "@iobroker/adapter-react-v5": "^7.4.12",
         "@iobroker/vis-2-widgets-react-dev": "^4.0.4",
-        "@mui/icons-material": "^6.1.8",
-        "@mui/material": "^6.1.8",
-        "@sentry/browser": "^8.40.0",
+        "@mui/icons-material": "^6.3.1",
+        "@mui/material": "^6.3.1",
+        "@sentry/browser": "^8.48.0",
         "craco-esbuild": "^0.6.1",
         "craco-module-federation": "^1.1.0",
         "node-sass": "^9.0.0",
@@ -19,10 +19,10 @@
         "react-scripts": "^5.0.1",
         "eslint": "^8.57.0",
         "eslint-config-airbnb": "^19.0.4",
-        "eslint-plugin-import": "^2.30.0",
-        "eslint-plugin-jsx-a11y": "^6.10.0",
-        "eslint-plugin-react": "^7.36.1",
-        "eslint-plugin-react-hooks": "^4.6.2",
+        "eslint-plugin-import": "^2.31.0",
+        "eslint-plugin-jsx-a11y": "^6.10.2",
+        "eslint-plugin-react": "^7.37.4",
+        "eslint-plugin-react-hooks": "^5.1.0",
         "eslint-plugin-eqeqeq-fix": "^1.0.3",
         "eslint-plugin-only-warn": "^1.1.0",
         "sass": "^1.83.1"

diff --git a/src/lib/ChartModel.ts b/src/lib/ChartModel.ts
@@ -1213,7 +1213,9 @@ class ChartModel {
                     convert = `return ${convert}`;
                 }
                 try {
-                    this.convertFunctions[line.convert.trim()] = new Function('val', convert) as (val: number) => number;
+                    this.convertFunctions[line.convert.trim()] = new Function('val', convert) as (
+                        val: number,
+                    ) => number;
                 } catch (e) {
                     console.error(`[ChartModel] Cannot parse convert function: ${e}`);
                 }
@@ -1253,8 +1255,18 @@ class ChartModel {
 
         // add start and end
         if (line.chartType !== 'bar' && line.chartType !== 'polar') {
-            let end: number = typeof option.end === 'number' ? option.end : (option.end as Date).getTime();
-            const start: number = typeof option.start === 'number' ? option.start : (option.start as Date).getTime();
+            let end: number =
+                typeof option.end === 'number'
+                    ? option.end
+                    : typeof option.end === 'string'
+                      ? new Date(option.end).getTime()
+                      : (option.end as Date).getTime();
+            const start: number =
+                typeof option.start === 'number'
+                    ? option.start
+                    : typeof option.start === 'string'
+                      ? new Date(option.start).getTime()
+                      : (option.start as Date).getTime();
             // End cannot be in the future
             if (end > this.now) {
                 end = this.now;

diff --git a/src/main.ts b/src/main.ts
@@ -2,7 +2,7 @@
  *
  *      ioBroker echarts Adapter
  *
- *      (c) 2020-2024 bluefox <[email protected]>
+ *      (c) 2020-2025 bluefox <[email protected]>
  *
  *      MIT License
  *
@@ -25,7 +25,7 @@ import 'moment/locale/de';
 import type { EchartsOptions, Connection, ChartConfigMore } from './types';
 import { getSocket } from './lib/socketSimulator';
 import { type EChartsType, init as echartsInit } from 'echarts';
-import type { Canvas, JpegConfig, PdfConfig, PngConfig } from 'canvas';
+import { Canvas, type JpegConfig, type PdfConfig, type PngConfig } from 'canvas';
 import { type JSDOM } from 'jsdom';
 
 // let echartsInit:
@@ -132,7 +132,7 @@ class EchartsAdapter extends Adapter {
                             data = `data:image/png;base64,${canvas
                                 .toBuffer('image/png', {
                                     compressionLevel: options.compressionLevel || 3,
-                                    filters: options.filters || canvas.PNG_FILTER_NONE,
+                                    filters: options.filters || Canvas.PNG_FILTER_NONE,
                                 } as PngConfig)
                                 .toString('base64')}`;
                             break;

diff --git a/tasksChart.js b/tasksChart.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018-2024 bluefox <[email protected]>
+ * Copyright 2018-2025 bluefox <[email protected]>
  *
  * MIT License
  *

diff --git a/tasksEdit.js b/tasksEdit.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018-2024 bluefox <[email protected]>
+ * Copyright 2018-2025 bluefox <[email protected]>
  *
  * MIT License
  *

diff --git a/tasksPreview.js b/tasksPreview.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018-2024 bluefox <[email protected]>
+ * Copyright 2018-2025 bluefox <[email protected]>
  *
  * MIT License
  *

diff --git a/tasksWidgets.js b/tasksWidgets.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2023-2024 bluefox <[email protected]>
+ * Copyright 2023-2025 bluefox <[email protected]>
  *
  * MIT License
  *

diff --git a/widgets/echarts.html b/widgets/echarts.html
@@ -1,9 +1,9 @@
 <!--
     ioBroker.echarts high quality Widget-Set
 
-    version: "1.9.0"
+    version: "2.0.4"
 
-    Copyright 2019-2024 bluefox <[email protected]>
+    Copyright 2019-2025 bluefox <[email protected]>
 
 -->
 <script type="text/javascript" >