From 4863da215059f8c39ef66a001efbcb9294d0d4a2 Mon Sep 17 00:00:00 2001
From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
Date: Tue, 3 May 2022 13:18:04 +0200
Subject: [PATCH] Fix type in tooltip of newly added rows (#121)

Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>
---
 .../matrixauth/AuthorizationContainerDescriptor.java     | 2 +-
 .../GlobalMatrixAuthorizationStrategy/config.jelly       | 2 ++
 src/main/resources/hudson/security/table.js              | 9 +++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationContainerDescriptor.java b/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationContainerDescriptor.java
index 9a46fd56..522b9d9e 100644
--- a/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationContainerDescriptor.java
+++ b/src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationContainerDescriptor.java
@@ -132,7 +132,7 @@ default PermissionEntry entryFor(String type, String sid) {
     @Restricted(DoNotUse.class) // Jelly only; cf. UpdateCenter#getCategoryDisplayName in core
     default String getTypeLabel(String type) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         if (type == null) {
-            return null;
+            return "__TYPE__"; // placeholder
         }
         return Messages.class.getMethod("TypeLabel_" + type).invoke(null).toString();
     }
diff --git a/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly b/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly
index 99dc9a95..38be4d34 100644
--- a/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly
+++ b/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly
@@ -181,6 +181,7 @@ THE SOFTWARE.
       <input type="button" class="matrix-auth-add-button" value="${%Add user…}" id="${id}UserButton"
             data-table-id="${id}"
             data-type="USER"
+            data-type-label="${%user}"
             data-message-prompt="${%userPrompt}"
             data-message-empty="${%userEmpty}"
             data-message-error="${%userError}"
@@ -188,6 +189,7 @@ THE SOFTWARE.
       <input type="button" class="matrix-auth-add-button" value="${%Add group…}" id="${id}GroupButton"
             data-table-id="${id}"
             data-type="GROUP"
+            data-type-label="${%group}"
             data-message-prompt="${%groupPrompt}"
             data-message-empty="${%groupEmpty}"
             data-message-error="${%groupError}"
diff --git a/src/main/resources/hudson/security/table.js b/src/main/resources/hudson/security/table.js
index cdff8a0b..c59bf63e 100644
--- a/src/main/resources/hudson/security/table.js
+++ b/src/main/resources/hudson/security/table.js
@@ -7,6 +7,7 @@ Behaviour.specify(".matrix-auth-add-button", 'GlobalMatrixAuthorizationStrategy'
     var master = document.getElementById(dataReference.getAttribute('data-table-id'));
     var table = master.parentNode;
     var type = dataReference.getAttribute('data-type');
+    var typeLabel = dataReference.getAttribute('data-type-label');
 
     var name = prompt(dataReference.getAttribute('data-message-prompt'));
     if (name == null) {
@@ -32,15 +33,15 @@ Behaviour.specify(".matrix-auth-add-button", 'GlobalMatrixAuthorizationStrategy'
 
     for(var child = copy.firstChild; child !== null; child = child.nextSibling) {
       if (child.hasAttribute('data-permission-id')) {
-        child.setAttribute("data-tooltip-enabled", child.getAttribute("data-tooltip-enabled").replace("__SID__", name));
-        child.setAttribute("data-tooltip-disabled", child.getAttribute("data-tooltip-disabled").replace("__SID__", name));
+        child.setAttribute("data-tooltip-enabled", child.getAttribute("data-tooltip-enabled").replace("__SID__", name).replace("__TYPE__", typeLabel));
+        child.setAttribute("data-tooltip-disabled", child.getAttribute("data-tooltip-disabled").replace("__SID__", name).replace("__TYPE__", typeLabel));
       }
     }
     findElementsBySelector(copy, ".stop img").each(function(item) {
-      item.setAttribute("title", item.getAttribute("title").replace("__SID__", name));
+      item.setAttribute("title", item.getAttribute("title").replace("__SID__", name).replace("__TYPE__", typeLabel));
     });
     findElementsBySelector(copy, "input[type=checkbox]").each(function(item) {
-      item.setAttribute("title", item.getAttribute("title").replace("__SID__", name));
+      item.setAttribute("title", item.getAttribute("title").replace("__SID__", name).replace("__TYPE__", typeLabel));
     });
     table.appendChild(copy);
     Behaviour.applySubtree(findAncestor(table,"TABLE"),true);