From 606de4c38d7df263743c27b7eb9c18608eaae7bf Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 21 Mar 2024 16:29:52 +0100
Subject: [PATCH] Hide empty tables

---
 .../src/less2/include/sidebar-layout.less          |  6 ++++--
 www/admin/app-admin.less                           |  4 ++++
 www/admin/inner.js                                 | 14 ++++++++++++--
 www/common/inner/sidebar-layout.js                 |  5 ++++-
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less
index 4b564b35a..5b616e0e8 100644
--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -189,8 +189,10 @@
                                 margin-right: @sidebar_base-margin;
                             }
                         }
-                        tr:nth-child(odd) {
-                            background-color: @cp_sidebar-left-item-bg;
+                        tbody {
+                            tr:nth-child(odd) {
+                                background-color: @cp_sidebar-left-item-bg;
+                            }
                         }
                     }
                     .cp-sidebar-input-block {
diff --git a/www/admin/app-admin.less b/www/admin/app-admin.less
index ab2859d9e..2f68690b0 100644
--- a/www/admin/app-admin.less
+++ b/www/admin/app-admin.less
@@ -75,5 +75,9 @@
             }
         }
     }
+    .cp-limit-key {
+        padding: @sidebar_base-margin 0;
+        cursor: pointer;
+    }
 }
 
diff --git a/www/admin/inner.js b/www/admin/inner.js
index 2132ec102..56a495935 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -1047,6 +1047,11 @@ define([
                 });
             };
 
+            let sort = all => {
+                return (k1, k2) => {
+                    return all[k1].time - all[k2].time;
+                };
+            };
             refreshInvite = function () {
                 sFrameChan.query('Q_ADMIN_RPC', {
                     cmd: 'GET_ALL_INVITATIONS',
@@ -1060,7 +1065,7 @@ define([
                     var all = response[0];
                     var newEntries = [];
 
-                    Object.keys(all).forEach(function (key) {
+                    Object.keys(all).sort(sort(all)).forEach(function (key) {
                         var data = all[key];
                         var url = privateData.origin + Hash.hashToHref(key, 'register');
 
@@ -1368,6 +1373,11 @@ define([
                     refreshUsers();
                 });
             };
+            let sort = all => {
+                return (k1, k2) => {
+                    return all[k2].time - all[k1].time;
+                };
+            };
             refreshUsers = function () {
                 sFrameChan.query('Q_ADMIN_RPC', {
                     cmd: 'GET_ALL_USERS',
@@ -1380,7 +1390,7 @@ define([
                     if (!Array.isArray(response)) { return; }
                     var all = response[0];
                     var newEntries = [];
-                    Object.keys(all).forEach(function (key) {
+                    Object.keys(all).sort(sort(all)).forEach(function (key) {
                         var data = all[key];
                         var editUser = () => {};
                         var del = blocks.button('danger', 'fa fa-trash', Messages.admin_usersRemove);
diff --git a/www/common/inner/sidebar-layout.js b/www/common/inner/sidebar-layout.js
index 586ea4f9b..f6adcb66c 100644
--- a/www/common/inner/sidebar-layout.js
+++ b/www/common/inner/sidebar-layout.js
@@ -165,7 +165,10 @@ define([
                 }));
             };
             table.updateContent = (newEntries) => {
-                $(table).find('tbody').remove();
+                $(table).show().find('tbody').remove();
+                if (!newEntries.length) {
+                    return void $(table).hide();
+                }
                 let bodyContent = [];
                 newEntries.forEach(line => {
                     const row = getRow(line);