Merge pull request #185 from CESNET/chartjs3

chore(deps): update chartjs to 3.5.1

Author: Dominik František Bučík

composer.json

@@ -25,7 +25,6 @@
     "require": {
         "simplesamlphp/simplesamlphp": "~1.17",
         "simplesamlphp/composer-module-installer": "~1.0",
-        "cesnet/simplesamlphp-module-chartjs": "~2.8.0",
         "symfony/var-exporter": "^5.0",
         "phpseclib/phpseclib": "~3.0",
         "ext-curl": "*",

templates/listOfSps-tpl.php

@@ -150,6 +150,6 @@
 
 ?>
 
-<script src="<?php echo htmlspecialchars(Module::getModuleURL('chartjs/Chart.bundle.min.js')); ?>"></script>
+<script src="<?php echo htmlspecialchars(Module::getModuleURL('perun/res/js/chart.min.js')); ?>"></script>
 
 <script src="<?php echo htmlspecialchars(Module::getModuleURL('perun/listOfSps.js')); ?>"></script>

www/listOfSps.js

@@ -6,9 +6,7 @@ function getDataItem(name) {
     return JSON.parse(document.getElementById('data').getAttribute('content'))[name];
 }
 
-Chart.platform.disableCSSInjection = true;
-
-var ctx = document.getElementById("myChart").getContext('2d');
+var ctx = "myChart";
 new Chart(ctx, { // eslint-disable-line no-new
     type: 'bar',
     data: {
@@ -42,26 +40,28 @@ new Chart(ctx, { // eslint-disable-line no-new
         }]
     },
     options: {
+        plugins: {
+            legend: {
+                display: false
+            },
+            tooltip: {
+                callbacks: {
+                    label: function (tooltipItem) {
+                        return tooltipItem.yLabel;
+                    }
+                }
+            }
+        },
         scales: {
-            yAxes: [{
+            y: {
+                beginAtZero: true,
                 ticks: {
-                    beginAtZero: true,
                     callback: function (value) {
                         if (Number.isInteger(value)) {
                             return value;
                         }
                     }
                 }
-            }]
-        },
-        legend: {
-            display: false
-        },
-        tooltips: {
-            callbacks: {
-                label: function (tooltipItem) {
-                    return tooltipItem.yLabel;
-                }
             }
         }
     }