Merge branch 'master' into metadata_expiration

Author: Dominik František Bučík

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [6.0.7](https://github.com/CESNET/perun-simplesamlphp-module/compare/v6.0.6...v6.0.7) (2021-09-10)
+
+
+### Bug Fixes
+
+* bugfixes in list of SPs ([1cd84a8](https://github.com/CESNET/perun-simplesamlphp-module/commit/1cd84a8bdbe879bdec568b1952b8756f29d99f94))
+
 ## [6.0.6](https://github.com/CESNET/perun-simplesamlphp-module/compare/v6.0.5...v6.0.6) (2021-08-19)
 
 
@@ -41,11 +48,6 @@
 
 * fix processing attr val  of map type in LDAP ([d892ca9](https://github.com/CESNET/perun-simplesamlphp-module/commit/d892ca944d92b0de2e821d4a4421cce84bc5b514))
 
-# Change Log
-All notable changes to this project will be documented in this file.
-
-## [Unreleased]
-
 ## [v6.0.0]
 #### Changed
 - Improve WAYF searching by localized name and domain

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": "*",

lib/ListOfSps.php

@@ -8,7 +8,10 @@ class ListOfSps
 {
     public static function sortByName($a, $b)
     {
-        return strcmp(strtolower($a['name']['value']), strtolower($b['name']['value']));
+        return strnatcasecmp(
+            transliterator_transliterate('Any-Latin; Latin-ASCII', $a['name']['value']),
+            transliterator_transliterate('Any-Latin; Latin-ASCII', $b['name']['value'])
+        );
     }
 
     public static function getClass($type)

lib/NagiosStatusConnector.php

@@ -64,7 +64,7 @@ public function getStatus()
         $result = [];
 
         $key = file_get_contents($this->keyPath);
-        if ($key === false) {
+        if (! $key) {
             throw new Exception('Cannot load ket from path:  \'' . $this->keyPath . '\' !');
         }
 

templates/listOfSps-tpl.php

@@ -24,7 +24,25 @@
 $samlServices = $this->data['samlServices'];
 $oidcServices = $this->data['oidcServices'];
 $allServices = $this->data['allServices'];
-
+if ($this->data['isNameMultilingual']) {
+    // translate service name for sorting
+    $allServices = array_map(function ($service) {
+        if (empty($service['name']) || empty($service['name']['value']) || ! is_array($service['name']['value'])) {
+            $service['name'] = [
+                'type' => 'java.lang.String',
+                'value' => '-',
+            ];
+        } else {
+            $service['name']['type'] = 'java.lang.String';
+            $service['name']['value'] = ListOfSps::getPreferredTranslation(
+                $service['name']['value'],
+                $this->getLanguage()
+            );
+        }
+        return $service;
+    }, $allServices);
+}
+usort($allServices, ['\\SimpleSAML\\Module\\perun\\ListOfSps', 'sortByName']);
 
 $productionServicesCount = $statistics['samlServicesCount'] - $statistics['samlTestServicesCount'] +
     $statistics['oidcServicesCount'] - $statistics['oidcTestServicesCount'];
@@ -150,6 +168,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;
-                }
             }
         }
     }

www/listOfSps.php

@@ -164,7 +164,6 @@
 }
 
 $allServices = array_merge($samlServices, $oidcServices);
-usort($allServices, 'ListOfSps::sortByName');
 
 if (isset($_GET['output']) && $_GET['output'] === 'json') {
     $json = [];
@@ -201,6 +200,7 @@
     $t->data['statistics'] = $statistics;
     $t->data['attributesToShow'] = $attributesToShow;
     $t->data['multilingualAttributes'] = $multilingualAttributes;
+    $t->data['isNameMultilingual'] = in_array($perunServiceNameAttr, $multilingualAttributes, true);
     $t->data['samlServices'] = $samlServices;
     $t->data['oidcServices'] = $oidcServices;
     $t->data['allServices'] = $allServices;