Minor enhancements (#314)

Some minor enhancements - fixed a typo - table highlighting works on the cell and not the input to avoid flickering when moving around the mouse - highlight row when on the delete button on the right Internal changes - use template element instead of a hidden row that gets removed - use let instead of varin js files where applicable
jenkinsci · Jul 8, 2023 · 4d4f871 · 4d4f871
1 parent e141973
commit 4d4f871
Show file tree

Hide file tree

Showing 10 changed files with 150 additions and 125 deletions.
diff --git a/.../com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-agent-roles.jelly b/.../com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-agent-roles.jelly
@@ -36,25 +36,30 @@
 
       <!-- The first row will show grouping -->
     <local:thead roles="${agentGrantedRoles}" showPattern="true"/>
-    <tr name="[USER:anonymous]" class="highlight-row">
-      <local:userRow sid="anonymous" title="${%Anonymous}" type="${it.strategy.SLAVE}" permissionType="USER" typedescription="User" noremove="true"/>
-    </tr>
-    <tr name="[GROUP:authenticated]" class="highlight-row">
-      <local:userRow sid="authenticated" title="authenticated" type="${it.strategy.SLAVE}" permissionType="GROUP" typedescription="Group" noremove="true"/>
-    </tr>
-    <j:forEach var="entry" items="${agentSIDs}">
-      <j:if test="${entry.sid != 'authenticated' or entry.type.toString() != 'GROUP'}">
-        <tr name="[${entry.type}:${entry.sid}]" class="permission-row highlight-row" data-descriptor-url="${descriptorPath}">
-          <local:userRow sid="${entry.sid}" title="${entry.sid}" permissionType="${entry.type.toString()}" typedescription="${entry.type.getDescription()}" type="${it.strategy.SLAVE}"/>
-        </tr>
-      </j:if>
-    </j:forEach>
-    <tr name="__unused__" id="newAgentRowTemplate" style="display:none" class="permission-row highlight-row" data-descriptor-url="${descriptorPath}">
-      <local:userRow title="{{USER}}" type="${it.strategy.SLAVE}" typedescription="{{USERGROUP}}"/>
-    </tr>
+    <tbody>
+      <tr name="[USER:anonymous]" class="highlight-row">
+        <local:userRow sid="anonymous" title="${%Anonymous}" type="${it.strategy.SLAVE}" permissionType="USER" typedescription="User" noremove="true"/>
+      </tr>
+      <tr name="[GROUP:authenticated]" class="highlight-row">
+        <local:userRow sid="authenticated" title="authenticated" type="${it.strategy.SLAVE}" permissionType="GROUP" typedescription="Group" noremove="true"/>
+      </tr>
+      <j:forEach var="entry" items="${agentSIDs}">
+        <j:if test="${entry.sid != 'authenticated' or entry.type.toString() != 'GROUP'}">
+          <tr name="[${entry.type}:${entry.sid}]" class="permission-row highlight-row" data-descriptor-url="${descriptorPath}">
+            <local:userRow sid="${entry.sid}" title="${entry.sid}" permissionType="${entry.type.toString()}" typedescription="${entry.type.getDescription()}" type="${it.strategy.SLAVE}"/>
+          </tr>
+        </j:if>
+      </j:forEach>
+    </tbody>
     <local:tfoot roles="${agentGrantedRoles}" sids="${agentSIDs}"/>
   </table>
 
+  <template id="newAgentRowTemplate">
+    <tr class="permission-row highlight-row" data-descriptor-url="${descriptorPath}">
+      <local:userRow title="{{USER}}" type="${it.strategy.SLAVE}" typedescription="{{USERGROUP}}"/>
+    </tr>
+  </template>
+
   <l:isAdmin>
     <br/>
     <local:addButtons sids="${agentSIDs}" tableid="${tableid}" id="newAgentRowTemplate" roles="${agentGrantedRoles}" highlighter="agentTableHighlighter"/>

diff --git a/...com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-global-roles.jelly b/...com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-global-roles.jelly
@@ -44,26 +44,31 @@
 
       <!-- The first row will show grouping -->
       <local:thead roles="${globalGrantedRoles}" showPattern="false"/>
-      <tr name="[USER:anonymous]" class="highlight-row">
-        <local:userRow sid="anonymous" title="${%Anonymous}" type="${it.strategy.GLOBAL}" permissionType="USER" typedescription="User" noremove="true"/>
-      </tr>
-      <tr name="[GROUP:authenticated]" class="highlight-row">
-        <local:userRow sid="authenticated" title="authenticated" type="${it.strategy.GLOBAL}" permissionType="GROUP" typedescription="Group" noremove="true"/>
-      </tr>
-      <j:forEach var="entry" items="${globalSIDs}">
-        <j:if test="${entry.sid != 'authenticated' or entry.type.toString() != 'GROUP'}">
-	        <tr name="[${entry.type}:${entry.sid}]" class="permission-row highlight-row" data-descriptor-url="${descriptorPath}">
-	          <local:userRow sid="${entry.sid}" title="${entry.sid}" permissionType="${entry.type.toString()}" typedescription="${entry.type.getDescription()}" type="${it.strategy.GLOBAL}"/>
-	        </tr>
-	      </j:if>
-      </j:forEach>
-      <tr name="__unused__" id="newGlobalRowTemplate" style="display:none" class="permission-row highlight-row" data-descriptor-url="${descriptorPath}">
-        <local:userRow title="{{USER}}" type="${it.strategy.GLOBAL}" typedescription="{{USERGROUP}}"/>
-      </tr>
+      <tbody>
+        <tr name="[USER:anonymous]" class="highlight-row">
+          <local:userRow sid="anonymous" title="${%Anonymous}" type="${it.strategy.GLOBAL}" permissionType="USER" typedescription="User" noremove="true"/>
+        </tr>
+        <tr name="[GROUP:authenticated]" class="highlight-row">
+          <local:userRow sid="authenticated" title="authenticated" type="${it.strategy.GLOBAL}" permissionType="GROUP" typedescription="Group" noremove="true"/>
+        </tr>
+        <j:forEach var="entry" items="${globalSIDs}">
+          <j:if test="${entry.sid != 'authenticated' or entry.type.toString() != 'GROUP'}">
+            <tr name="[${entry.type}:${entry.sid}]" class="permission-row highlight-row" data-descriptor-url="${descriptorPath}">
+              <local:userRow sid="${entry.sid}" title="${entry.sid}" permissionType="${entry.type.toString()}" typedescription="${entry.type.getDescription()}" type="${it.strategy.GLOBAL}"/>
+            </tr>
+          </j:if>
+        </j:forEach>
+      </tbody>
       <local:tfoot roles="${globalGrantedRoles}" sids="${globalSIDs}"/>
     </table>
 
-    <l:isAdmin>
+    <template id="newGlobalRowTemplate">
+      <tr class="permission-row highlight-row" data-descriptor-url="${descriptorPath}">
+        <local:userRow title="{{USER}}" type="${it.strategy.GLOBAL}" typedescription="{{USERGROUP}}"/>
+      </tr>
+    </template>
+
+  <l:isAdmin>
       <br/>
       <local:addButtons sids="${globalSIDs}" tableid="${tableid}" id="newGlobalRowTemplate" roles="${globalGrantedRoles}" highlighter="globalTableHighlighter"/>
     </l:isAdmin>

diff --git a/...om/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-project-roles.jelly b/...om/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-project-roles.jelly
@@ -44,25 +44,30 @@
 
     <!-- The first row will show grouping -->
     <local:thead roles="${itemGrantedRoles}" showPattern="true"/>
-    <tr name="[USER:anonymous]" class="highlight-row">
-      <local:userRow sid="anonymous" title="${%Anonymous}" type="${it.strategy.PROJECT}" permissionType="USER" typedescription="User" noremove="true"/>
-    </tr>
-    <tr name="[GROUP:authenticated]" class="highlight-row">
-      <local:userRow sid="authenticated" title="authenticated" type="${it.strategy.PROJECT}" permissionType="GROUP" typedescription="Group" noremove="true"/>
-    </tr>
-    <j:forEach var="entry" items="${projectSIDs}">
-      <j:if test="${entry.sid != 'authenticated' or entry.type.toString() != 'GROUP'}">
-        <tr name="[${entry.type}:${entry.sid}]" class="permission-row highlight-row" data-descriptor-url="${descriptorPath}">
-          <local:userRow sid="${entry.sid}" title="${entry.sid}" permissionType="${entry.type.toString()}" typedescription="${entry.type.getDescription()}" type="${it.strategy.PROJECT}"/>
-        </tr>
-      </j:if>
-    </j:forEach>
-    <tr name="__unused__" id="newItemRowTemplate" style="display:none" class="permission-row highlight-row" data-descriptor-url="${descriptorPath}">
-      <local:userRow title="{{USER}}" type="${it.strategy.PROJECT}" typedescription="{{USERGROUP}}"/>
-    </tr>
+    <tbody>
+      <tr name="[USER:anonymous]" class="highlight-row">
+        <local:userRow sid="anonymous" title="${%Anonymous}" type="${it.strategy.PROJECT}" permissionType="USER" typedescription="User" noremove="true"/>
+      </tr>
+      <tr name="[GROUP:authenticated]" class="highlight-row">
+        <local:userRow sid="authenticated" title="authenticated" type="${it.strategy.PROJECT}" permissionType="GROUP" typedescription="Group" noremove="true"/>
+      </tr>
+      <j:forEach var="entry" items="${projectSIDs}">
+        <j:if test="${entry.sid != 'authenticated' or entry.type.toString() != 'GROUP'}">
+          <tr name="[${entry.type}:${entry.sid}]" class="permission-row highlight-row" data-descriptor-url="${descriptorPath}">
+            <local:userRow sid="${entry.sid}" title="${entry.sid}" permissionType="${entry.type.toString()}" typedescription="${entry.type.getDescription()}" type="${it.strategy.PROJECT}"/>
+          </tr>
+        </j:if>
+      </j:forEach>
+    </tbody>
     <local:tfoot roles="${itemGrantedRoles}" sids="${projectSIDs}"/>
   </table>
 
+  <template id="newItemRowTemplate">
+    <tr class="permission-row highlight-row" data-descriptor-url="${descriptorPath}">
+      <local:userRow title="{{USER}}" type="${it.strategy.PROJECT}" typedescription="{{USERGROUP}}"/>
+    </tr>
+  </template>
+
   <l:isAdmin>
     <br/>
     <local:addButtons sids="${projectSIDs}" tableid="${tableid}" id="newItemRowTemplate" roles="${itemGrantedRoles}" highlighter="itemTableHighlighter"/>

diff --git a/.../com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-agent-roles.jelly b/.../com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-agent-roles.jelly
@@ -43,12 +43,16 @@
                          project="${false}"/>
         </tr>
       </j:forEach>
-      <tr id="newAgentRoleTemplate" style="display:none" class="permission-row highlight-row">
-        <local:roleRow title="{{ROLE}}" pattern="{{PATTERN}}" global="${false}" type="${it.strategy.SLAVE}" />
-      </tr>
     </tbody>
     <local:tfoot permissionGroups="${agentGroups}" strategy="${it.strategy.SLAVE}" roles="${agentGrantedRoles}" showPattern="true"/>
   </table>
+
+  <template id="newAgentRoleTemplate">
+    <tr class="permission-row highlight-row">
+      <local:roleRow title="{{ROLE}}" pattern="{{PATTERN}}" global="${false}" type="${it.strategy.SLAVE}" />
+    </tr>
+  </template>
+
   <l:isAdmin>
     <br/>
     <f:entry title="${%Role to add}">

diff --git a/...com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-global-roles.jelly b/...com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-global-roles.jelly
@@ -46,13 +46,16 @@
           <local:roleRow title="${role.key.name}" role="${role.key}" global="${true}" type="${it.strategy.GLOBAL}" />
         </tr>
       </j:forEach>
-      <tr id="newGlobalRoleTemplate" style="display:none" class="permission-row highlight-row">
-        <local:roleRow title="{{ROLE}}" global="${true}" type="${it.strategy.GLOBAL}" />
-      </tr>
     </tbody>
     <local:tfoot permissionGroups="${globalPermissionGroups}" strategy="${it.strategy.GLOBAL}" roles="${globalGrantedRoles}" showPattern="false"/>
   </table>
 
+  <template id="newGlobalRoleTemplate">
+    <tr class="permission-row highlight-row">
+      <local:roleRow title="{{ROLE}}" global="${true}" type="${it.strategy.GLOBAL}" />
+    </tr>
+  </template>
+
   <l:isAdmin>
     <br />
     <f:entry title="${%Role to add}">

diff --git a/...om/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-project-roles.jelly b/...om/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-project-roles.jelly
@@ -45,12 +45,16 @@
                          project="${true}"/>
         </tr>
       </j:forEach>
-      <tr id="newItemRoleTemplate" style="display:none" class="permission-row highlight-row">
-        <local:roleRow title="{{ROLE}}" global="${false}" pattern="{{PATTERN}}" type="${it.strategy.PROJECT}" />
-      </tr>
     </tbody>
     <local:tfoot permissionGroups="${itemPermissionGroups}" strategy="${it.strategy.PROJECT}" roles="${itemGrantedRoles}" showPattern="true"/>
   </table>
+
+  <template id="newItemRoleTemplate">
+    <tr class="permission-row highlight-row">
+      <local:roleRow title="{{ROLE}}" global="${false}" pattern="{{PATTERN}}" type="${it.strategy.PROJECT}" />
+    </tr>
+  </template>
+
   <l:isAdmin>
     <br />
     <f:entry title="${%Role to add}">

diff --git a/...resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/sidepanel.jelly b/...resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/sidepanel.jelly
@@ -27,7 +27,7 @@
         <l:tasks>
             <l:task href="${rootURL}/manage/role-strategy/" icon="symbol-finger-print-outline plugin-ionicons-api" title="${%Manage Roles}"/>
             <l:task href="${rootURL}/manage/role-strategy/assign-roles" icon="symbol-people-outline plugin-ionicons-api" title="${%Assign Roles}"/>
-            <l:task href="${rootURL}/manage/role-strategy/list-macros" icon="symbol-extension-puzzle-outline plugin-ionicons-api" title="${%Role Stategy Macros}"/>
+            <l:task href="${rootURL}/manage/role-strategy/list-macros" icon="symbol-extension-puzzle-outline plugin-ionicons-api" title="${%Role Strategy Macros}"/>
         </l:tasks>
     </l:side-panel>
 </j:jelly>
diff --git a/src/main/webapp/js/table.js b/src/main/webapp/js/table.js
@@ -23,13 +23,14 @@
  */
 
 function getPreviousSiblings(elem, filter) {
-    var sibs = [];
+    let sibs = [];
     while (elem = elem.previousSibling) {
         if (elem.nodeType === 3) continue; // text node
         sibs.push(elem);
     }
     return sibs;
 }
+
 class TableHighlighter {
 
   constructor(id, decalx) {
@@ -42,19 +43,34 @@ class TableHighlighter {
   };
 
   scan(tr) {
-    let element = tr
-    let descendants = element.getElementsByTagName('input');
-    for (let td of descendants) {
-      if (td.nextSibling != null) {
-        td.nextSibling.addEventListener('mouseover', this.highlight);
-        td.nextSibling.addEventListener('mouseout', this.highlight);
-      }
+    let descendants = tr.getElementsByTagName('input');
+    for (let input of descendants) {
+        let td = input.closest('td');
+        td.addEventListener('mouseover', this.highlight);
+        td.addEventListener('mouseout', this.highlight);
+    }
+    let stopNodes = tr.querySelectorAll("div.rsp-remove");
+    let lastStop = stopNodes[stopNodes.length - 1];
+    if (lastStop != null) {
+      let td = lastStop.closest('td');
+      td.addEventListener('mouseover', this.highlightRowOnly);
+      td.addEventListener('mouseout', this.highlightRowOnly);
     }
   };
 
+  highlightRowOnly = e => {
+    let enable = e.type === 'mouseover';
+    let tr = findAncestor(e.target, "TR")
+    if (enable) {
+      tr.classList.add('highlighted');
+    } else {
+      tr.classList.remove('highlighted');
+    }
+  }
+
   highlight = e => {
     let enable = e.type === 'mouseover';
-    let td = findAncestor(Event.element(e), "TD")
+    let td = findAncestor(e.target, "TD")
     let tr = td.parentNode;
     let trs = this.table.querySelectorAll('tr.highlight-row');
     let position = getPreviousSiblings(td).length;