Fix type in tooltip of newly added rows (#121)

Co-authored-by: Daniel Beck <[email protected]>
jenkinsci · May 3, 2022 · 4863da2 · 4863da2
1 parent 18f92c8
commit 4863da2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -181,13 +181,15 @@ 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}"
       />
       <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
@@ -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);