From 423bd3f2230081be3c8bce2f953483c22bf24191 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Thu, 11 Nov 2021 11:44:06 +0100
Subject: [PATCH] chart.js upgrade, title plugin works

---
 packages/web/package.json                |  3 +-
 packages/web/src/charts/ChartCore.svelte | 15 ++++++++--
 packages/web/src/charts/DataChart.svelte | 34 ++++++++++-----------
 yarn.lock                                | 38 +++++++-----------------
 4 files changed, 40 insertions(+), 50 deletions(-)

diff --git a/packages/web/package.json b/packages/web/package.json
index 3d94243f6..07378ab5e 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -20,7 +20,7 @@
     "@rollup/plugin-typescript": "^8.2.5",
     "@tsconfig/svelte": "^1.0.0",
     "ace-builds": "^1.4.8",
-    "chart.js": "^2.9.4",
+    "chart.js": "^3.6.0",
     "cross-env": "^7.0.3",
     "dbgate-datalib": "^4.1.1",
     "dbgate-sqltree": "^4.1.1",
@@ -51,6 +51,7 @@
     "uuid": "^3.4.0"
   },
   "dependencies": {
+    "chartjs-adapter-moment": "^1.0.0",
     "diff": "^5.0.0",
     "diff2html": "^3.4.13"
   }
diff --git a/packages/web/src/charts/ChartCore.svelte b/packages/web/src/charts/ChartCore.svelte
index 9e2f289bc..db9e46065 100644
--- a/packages/web/src/charts/ChartCore.svelte
+++ b/packages/web/src/charts/ChartCore.svelte
@@ -1,6 +1,11 @@
+<script lang="ts" context="module">
+  import Chart from 'chart.js/auto';
+  import 'chartjs-adapter-moment';
+</script>
+
 <script lang="ts">
   import { onMount, afterUpdate, onDestroy } from 'svelte';
-  import Chart from 'chart.js';
+
   import contextMenu from '../utility/contextMenu';
 
   export let data;
@@ -27,10 +32,14 @@
     if (!chart) return;
     chart.data = data;
     chart.type = type;
-    chart.options = options;
-    chart.plugins = plugins;
+    chart.options = {
+      ...options,
+      plugins,
+    };
+    // chart.plugins = plugins;
     chart.update();
   });
+
   onDestroy(() => {
     chart = null;
   });
diff --git a/packages/web/src/charts/DataChart.svelte b/packages/web/src/charts/DataChart.svelte
index fa2578352..edbb763b5 100644
--- a/packages/web/src/charts/DataChart.svelte
+++ b/packages/web/src/charts/DataChart.svelte
@@ -23,27 +23,25 @@
     };
     if (timeAxis && chartType === 'line') {
       res.scales = {
-        xAxes: [
-          {
-            type: 'time',
-            distribution: 'linear',
+        x: {
+          type: 'time',
+          distribution: 'linear',
 
-            time: {
-              tooltipFormat: 'D. M. YYYY HH:mm',
-              displayFormats: {
-                millisecond: 'HH:mm:ss.SSS',
-                second: 'HH:mm:ss',
-                minute: 'HH:mm',
-                hour: 'D.M hA',
-                day: 'D. M.',
-                week: 'D. M. YYYY',
-                month: 'MM-YYYY',
-                quarter: '[Q]Q - YYYY',
-                year: 'YYYY',
-              },
+          time: {
+            tooltipFormat: 'D. M. YYYY HH:mm',
+            displayFormats: {
+              millisecond: 'HH:mm:ss.SSS',
+              second: 'HH:mm:ss',
+              minute: 'HH:mm',
+              hour: 'D.M hA',
+              day: 'D. M.',
+              week: 'D. M. YYYY',
+              month: 'MM-YYYY',
+              quarter: '[Q]Q - YYYY',
+              year: 'YYYY',
             },
           },
-        ],
+        },
       };
     }
     return res;
diff --git a/yarn.lock b/yarn.lock
index 0489be315..2a51fe99d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2563,28 +2563,15 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chart.js@^2.9.4:
-  version "2.9.4"
-  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684"
-  integrity sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==
-  dependencies:
-    chartjs-color "^2.1.0"
-    moment "^2.10.2"
+chart.js@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.6.0.tgz#a87fce8431d4e7c5523d721f487f53aada1e42fe"
+  integrity sha512-iOzzDKePL+bj+ccIsVAgWQehCXv8xOKGbaU2fO/myivH736zcx535PGJzQGanvcSGVOqX6yuLZsN3ygcQ35UgQ==
 
-chartjs-color-string@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
-  integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
-  dependencies:
-    color-name "^1.0.0"
-
-chartjs-color@^2.1.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0"
-  integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==
-  dependencies:
-    chartjs-color-string "^0.6.0"
-    color-convert "^1.9.3"
+chartjs-adapter-moment@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/chartjs-adapter-moment/-/chartjs-adapter-moment-1.0.0.tgz#9174b1093c68bcfe285aff24f7388ad60d44e8f7"
+  integrity sha512-PqlerEvQcc5hZLQ/NQWgBxgVQ4TRdvkW3c/t+SUEQSj78ia3hgLkf2VZ2yGJtltNbEEFyYGm+cA6XXevodYvWA==
 
 chokidar@^2.0.2:
   version "2.1.8"
@@ -2766,7 +2753,7 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-color-convert@^1.9.0, color-convert@^1.9.3:
+color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -2785,7 +2772,7 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-name@^1.0.0, color-name@~1.1.4:
+color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -7319,11 +7306,6 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-moment@^2.10.2:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
-  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
-
 moment@^2.24.0:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"