From e936045b7d1489d1c41b9a5b97abec6a098191f2 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 16 Dec 2020 11:29:12 +0100
Subject: [PATCH] More support panel improvements

---
 www/admin/app-admin.less | 16 +++++++++++++++
 www/admin/inner.js       | 42 ++++++++++++++++++++++++++++++++--------
 www/support/ui.js        |  2 +-
 3 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/www/admin/app-admin.less b/www/admin/app-admin.less
index 7ffc2a062..7f8f2416c 100644
--- a/www/admin/app-admin.less
+++ b/www/admin/app-admin.less
@@ -69,6 +69,21 @@
         .cp-support-column {
             min-width: 700px;
             flex: 1 0 50%;
+            h1 {
+                display: flex;
+                align-items: center;
+                button {
+                    margin-left: 50px !important;
+                }
+            }
+            .cp-support-count {
+                margin-left: 10px;
+            }
+            &.cp-support-column-collapsed {
+                .cp-support-list-ticket {
+                    display: none;
+                }
+            }
         }
     }
 
@@ -94,6 +109,7 @@
             display: flex;
             justify-content: space-between;
             flex-wrap: wrap;
+            color: #666;
         }
     }
 
diff --git a/www/admin/inner.js b/www/admin/inner.js
index bf139a870..afd743911 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -552,18 +552,34 @@ define([
         var $div = $(h('div.cp-support-container')).appendTo($container);
 
         var catContainer = h('div.cp-dropdown-container');
-        Messages.admin_support_premium = "Premium tickets"; // XXX
-        Messages.admin_support_normal = "Unanswered tickets";
-        Messages.admin_support_answered = "Answered tickets";
-        Messages.admin_support_closed = "Closed tickets";
+        Messages.admin_support_premium = "Premium tickets:"; // XXX
+        Messages.admin_support_normal = "Unanswered tickets:";
+        Messages.admin_support_answered = "Answered tickets:";
+        Messages.admin_support_closed = "Closed tickets:";
         Messages.admin_support_open = "Show";
         Messages.admin_support_collapse = "Collapse";
         Messages.admin_support_first = "Created on: ";
         Messages.admin_support_last = "Updated on: ";
-        var col1 = h('div.cp-support-column', h('h1', Messages.admin_support_premium));
-        var col2 = h('div.cp-support-column', h('h1', Messages.admin_support_normal));
-        var col3 = h('div.cp-support-column', h('h1', Messages.admin_support_answered));
-        var col4 = h('div.cp-support-column', h('h1', Messages.admin_support_closed));
+        var col1 = h('div.cp-support-column', h('h1', [
+            h('span', Messages.admin_support_premium),
+            h('span.cp-support-count'),
+            h('button.btn.cp-support-column-button', Messages.admin_support_collapse)
+        ]));
+        var col2 = h('div.cp-support-column', h('h1', [
+            h('span', Messages.admin_support_normal),
+            h('span.cp-support-count'),
+            h('button.btn.cp-support-column-button', Messages.admin_support_collapse)
+        ]));
+        var col3 = h('div.cp-support-column', h('h1', [
+            h('span', Messages.admin_support_answered),
+            h('span.cp-support-count'),
+            h('button.btn.cp-support-column-button', Messages.admin_support_collapse)
+        ]));
+        var col4 = h('div.cp-support-column', h('h1', [
+            h('span', Messages.admin_support_closed),
+            h('span.cp-support-count'),
+            h('button.btn.cp-support-column-button', Messages.admin_support_collapse)
+        ]));
         var $col1 = $(col1), $col2 = $(col2), $col3 = $(col3), $col4 = $(col4);
         $div.append([
             //catContainer
@@ -572,6 +588,15 @@ define([
             col3,
             col4
         ]);
+        $div.find('.cp-support-column-button').click(function (e) {
+            var $col = $(this).closest('.cp-support-column');
+            $col.toggleClass('cp-support-column-collapsed');
+            if ($col.hasClass('cp-support-column-collapsed')) {
+                $(this).text(Messages.admin_support_open);
+            } else {
+                $(this).text(Messages.admin_support_collapse);
+            }
+        });
         var category = 'all';
         var $drop = APP.support.makeCategoryDropdown(catContainer, function (key) {
             category = key;
@@ -699,6 +724,7 @@ define([
                     cols[j].hide();
                 } else {
                     cols[j].show();
+                    cols[j].find('.cp-support-count').text(list.length);
                 }
             });
         };
diff --git a/www/support/ui.js b/www/support/ui.js
index 2b07dc346..6fd118d0d 100644
--- a/www/support/ui.js
+++ b/www/support/ui.js
@@ -230,7 +230,7 @@ define([
         var form = h('div.cp-support-form-container', content);
 
         $(cancel).click(function () {
-            $(form).closest('.cp-support-list-ticket').find('.cp-support-list-actions').show();
+            $(form).closest('.cp-support-list-ticket').find('.cp-support-list-actions').css('display', '');
             $(form).remove();
         });