Skip to content

Commit 8d262df

Browse files
authored
[JENKINS-75848] Fix pagination issue for agent role assignment (#415)
2 parents e14e9f6 + 33753c1 commit 8d262df

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/main/webapp/js/tableAssign.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ const roleStrategyEntries = {};
3838
function filterUsers(filter, tableId, page) {
3939
const json = roleStrategyEntries[tableId];
4040
const table= document.getElementById(tableId);
41-
const filtered = json.filter((entry) => entry["name"].toUpperCase().indexOf(filter) > -1);
41+
const filtered = filter != null ? json.filter((entry) => entry["name"].toUpperCase().indexOf(filter) > -1) : json;
4242
showEntries(tableId, filtered, page);
4343
const container = table.closest(".rsp-roles-container");
4444
const roleInputFilter = container.querySelector(".role-input-filter");
45-
const roleFilter = roleInputFilter.value.toUpperCase();
45+
const roleFilter = roleInputFilter != null ? roleInputFilter.value.toUpperCase() : "";
4646
filterRoles(roleFilter, table);
4747
}
4848

@@ -53,7 +53,7 @@ function filterRoles(filter, table) {
5353
const endColumn = headerRow.cells.length; // last column is the delete button
5454
for (let c = 0; c < endColumn; c++) {
5555
let shouldFilter = true;
56-
if (!headerRow.cells[c].classList.contains("rsp-table--header-th") || headerRow.cells[c].textContent.toUpperCase().indexOf(filter) > -1) {
56+
if (filter==null||!headerRow.cells[c].classList.contains("rsp-table--header-th") || headerRow.cells[c].textContent.toUpperCase().indexOf(filter) > -1) {
5757
shouldFilter = false;
5858
}
5959
for (let r = 0; r < rowCount; r++) {
@@ -345,7 +345,7 @@ Behaviour.specify(".rsp-navigation__button-entry-down", "RoleBasedAuthorizationS
345345
const select = navgiationDiv.querySelector(".rsp-navigation__select");
346346
const page = parseInt(select.value) + 1;
347347
const userInputFilter = container.querySelector(".user-input-filter");
348-
const userFilter = userInputFilter.value.toUpperCase();
348+
const userFilter = userInputFilter != null ? userInputFilter.value.toUpperCase() : "";
349349
filterUsers(userFilter, tableId, page);
350350
}
351351
});
@@ -359,7 +359,7 @@ Behaviour.specify(".rsp-navigation__button-entry-up", "RoleBasedAuthorizationStr
359359
const select = navgiationDiv.querySelector(".rsp-navigation__select");
360360
const page = parseInt(select.value) - 1;
361361
const userInputFilter = container.querySelector(".user-input-filter");
362-
const userFilter = userInputFilter.value.toUpperCase();
362+
const userFilter = userInputFilter != null ? userInputFilter.value.toUpperCase() : "";
363363
filterUsers(userFilter, tableId, page);
364364
}
365365
});
@@ -371,7 +371,7 @@ Behaviour.specify(".rsp-navigation__select", "RoleBasedAuthorizationStrategy", 0
371371
const tableId = table.id;
372372
const page = parseInt(select.value);
373373
const userInputFilter = container.querySelector(".user-input-filter");
374-
const userFilter = userInputFilter.value.toUpperCase();
374+
const userFilter = userInputFilter != null ? userInputFilter.value.toUpperCase() : "";
375375
filterUsers(userFilter, tableId, page);
376376
}
377377
});

0 commit comments

Comments
 (0)