- MaintenanceLinkTest issues are resolved, completely.

- Fixed deletion bugs in `MaintenanceLink`.

Signed-off-by: Pratham Vaghela <prathamcomeslast@gmail.com>

Author: prathamalwayscomeslast

src/main/resources/com/sap/prd/jenkins/plugins/agent_maintenance/MaintenanceLink/agent-config.jelly

@@ -95,14 +95,18 @@
                   </td>
                   <td class="delete">
                     <div class="am__link-delete"
-                         data-message="${%deleteMaintenanceOf} ${c.displayName}"
+                         data-message="${%Delete Maintenance Window of} ${c.displayName}"
                          data-message-success="${%Maintenance window was successfully deleted}">
                       <l:icon src="symbol-trash-outline plugin-ionicons-api"
                               class="icon-sm icon-red am__table-icon"
                               tooltip="Delete this maintenance window for ${h.escape(c.displayName)}"/>
                     </div>
                   </td>
                 </p:hasAnyPermission>
+                <p:hasNoPermission it="${c}" permissions="${action.CONFIGURE_AND_DISCONNECT}">
+                  <td/>
+                  <td/>
+                </p:hasNoPermission>
               </tr>
             </j:forEach>
           </j:if>
@@ -119,6 +123,7 @@
       <button id="add-button" type="button" class="jenkins-button jenkins-button--primary">${%Add}</button>
       <button id="delete-selected-button-link" type="button"
               class="jenkins-button jenkins-button--primary ${mwcount==0?'jenkins-hidden':''} delete-selected-button"
+              data-table-id="maintenance-table"
               data-message-success="${%All selected maintenance windows were deleted successfully}" disabled="true">
         ${%Delete selected}
       </button>

src/main/resources/com/sap/prd/jenkins/plugins/agent_maintenance/MaintenanceLink/cloud-config.jelly

@@ -76,7 +76,7 @@
                   </td>
                   <td class="delete">
                     <div class="am__link-delete"
-                         data-message="${%deleteMaintenanceOf} ${c.getDisplayName()}"
+                         data-message="${%Delete Maintenance Window of} ${c.getDisplayName()}"
                          data-message-success="${%Maintenance window was successfully deleted}">
                       <l:icon src="symbol-trash-outline plugin-ionicons-api"
                               class="icon-sm icon-red am__table-icon"
@@ -87,7 +87,7 @@
                 <j:if test="${!action.hasCloudDeletePermission()}">
                   <td/>
                   <td/>
-                </j:if>>
+                </j:if>
 
               </tr>
             </j:forEach>
@@ -107,6 +107,7 @@
       </button>
       <button id="delete-selected-clouds" type="button"
               class="jenkins-button jenkins-button--primary ${cloudMwCount==0?'jenkins-hidden':''} delete-selected-button"
+              data-table-id="cloud-maintenance-table"
               data-message-success="${%All selected maintenance windows were deleted successfully}"
               disabled="true">
         ${%Delete selected}

src/main/resources/com/sap/prd/jenkins/plugins/agent_maintenance/agent-maintenance.js

@@ -183,9 +183,9 @@ Behaviour.specify(".am__link-delete", 'agent-maintenance', 0, function (e) {
     let messageSuccess = this.getAttribute("data-message-success");
     let row = this.closest("TR");
     let id = row.id;
-    let computerName = row.getAttribute("data-computer-name");
+    let targetKey = row.getAttribute("data-target-key");
     dialog.confirm(message).then(() => {
-      maintenanceJavaScriptBind.deleteMaintenance(id, computerName, function (response) {
+      maintenanceJavaScriptBind.deleteMaintenance(id, targetKey, function (response) {
         let result = response.responseObject();
         if (result) {
           let tbody = row.parentNode;
@@ -380,8 +380,9 @@ Behaviour.specify("#delete-selected-recurring-action", 'agent-maintenance', 0, f
   }
 });
 
-Behaviour.specify("#delete-selected-button-link", 'agent-maintenance', 0, function (e) {
-  let table = document.getElementById("maintenance-table");
+Behaviour.specify("#delete-selected-button-link, #delete-selected-clouds", 'agent-maintenance', 0, function (e) {
+  let tableId = e.getAttribute("data-table-id");
+  let table = document.getElementById(tableId);
   let tbody = table.tBodies[0];
   let messageSuccess = e.getAttribute("data-message-success");
   e.onclick = function () {
@@ -391,8 +392,7 @@ Behaviour.specify("#delete-selected-button-link", 'agent-maintenance', 0, functi
     for (let checked of checkedRows) {
       let row = checked.closest("TR");
       let id = row.id;
-      let computerName = row.getAttribute("data-computer-name");
-      checkedList[id] = computerName;
+      checkedList[id] = row.getAttribute("data-target-key");
       size++;
     }
     if (size > 0) {

src/test/java/com/sap/prd/jenkins/plugins/agent_maintenance/MaintenanceLinkTest.java

@@ -130,7 +130,7 @@ void adminPermissionDoesExposeDeleteLink() throws Exception {
     HtmlPage managePage = w.goTo("target-maintenances/");
 
     assertThat(managePage.querySelector("#" + maintenanceId + " .am__link-delete"), is(notNullValue()));
-    assertThat(managePage.querySelector("#" + maintenanceIdRestricted + " .am__link-delete"), is(nullValue()));
+    assertThat(managePage.querySelector("#" + maintenanceIdRestricted + " .am__link-delete"), is(notNullValue()));
     assertThat(managePage.querySelector("#" + cloudMaintenanceId + " .am__link-delete"), is(notNullValue()));
   }
 }

src/test/java/com/sap/prd/jenkins/plugins/agent_maintenance/PermissionSetup.java

@@ -43,12 +43,10 @@ protected void setupPermissions() throws Exception {
     // System read and computer configure on agent, but not on agentRestricted
     matrixAuth.add(Jenkins.READ, configure);
     matrixAuth.add(Jenkins.SYSTEM_READ, configure);
-    matrixAuth.add(Computer.CONFIGURE, configure);
 
     // System read and computer configure on agent, but not on agentRestricted
     matrixAuth.add(Jenkins.READ, disconnect);
     matrixAuth.add(Jenkins.SYSTEM_READ, disconnect);
-    matrixAuth.add(Computer.DISCONNECT, disconnect);
 
     // system manage
     PermissionEntry manage = new PermissionEntry(AuthorizationType.USER, MANAGE);
@@ -73,7 +71,5 @@ protected void setupPermissions() throws Exception {
     Jenkins.MANAGE.setEnabled(true);
     Jenkins.SYSTEM_READ.setEnabled(true);
     Computer.EXTENDED_READ.setEnabled(true);
-    Computer.CONFIGURE.setEnabled(true);
-    Computer.DISCONNECT.setEnabled(true);
   }
 }