mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-68977 core_user: Refresh table after removing all filters

Browse Source 
Previously the update function was called for each row as it was
removed. This patch changes the behaviouro to only remove one row at at
ime.
This commit is contained in:
Andrew Nicols 2020-06-09 15:15:24 +08:00
parent cb2f672525
commit 7b3026fabe
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
user/amd/build/participantsfilter.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
user/amd/build/participantsfilter.min.js.map
View File

File diff suppressed because one or more lines are too long

29
user/amd/src/participantsfilter.js
View File

@ -156,14 +156,15 @@ export const init = participantsRegionId => {
* that it is replaced instead of being removed.
*
* @param {HTMLElement} filterRow
* @param {Bool} refreshContent Whether to refresh the table content when removing
*/
const removeOrReplaceFilterRow = filterRow => {
const removeOrReplaceFilterRow = (filterRow, refreshContent) => {
const filterCount = getFilterRegion().querySelectorAll(Selectors.filter.region).length;
if (filterCount === 1) {
replaceFilterRow(filterRow);
replaceFilterRow(filterRow, refreshContent);
} else {
removeFilterRow(filterRow);
removeFilterRow(filterRow, refreshContent);
}
};
@ -171,8 +172,9 @@ export const init = participantsRegionId => {
* Remove the specified filter row and associated class.
*
* @param {HTMLElement} filterRow
* @param {Bool} refreshContent Whether to refresh the table content when removing
*/
const removeFilterRow = async filterRow => {
const removeFilterRow = async(filterRow, refreshContent = true) => {
const filterType = filterRow.querySelector(Selectors.filter.fields.type);
const hasFilterValue = !!filterType.value;
@ -185,7 +187,7 @@ export const init = participantsRegionId => {
// Update the list of available filter types.
updateFiltersOptions();
if (hasFilterValue) {
if (hasFilterValue && refreshContent) {
// Refresh the table if there was any content in this row.
updateTableFromFilter();
}
@ -203,10 +205,11 @@ export const init = participantsRegionId => {
* Replace the specified filter row with a new one.
*
* @param {HTMLElement} filterRow
* @param {Bool} refreshContent Whether to refresh the table content when removing
* @param {Number} rowNum The number used to label the filter fieldset legend (eg Row 1). Defaults to 1 (the first filter).
* @return {Promise}
*/
const replaceFilterRow = (filterRow, rowNum = 1) => {
const replaceFilterRow = (filterRow, refreshContent = true, rowNum = 1) => {
// Remove the filter object.
removeFilterObject(filterRow.dataset.filterType);
@ -240,9 +243,11 @@ export const init = participantsRegionId => {
})
.then(filterRow => {
// Refresh the table.
updateTableFromFilter();
return filterRow;
if (refreshContent) {
return updateTableFromFilter();
} else {
return filterRow;
}
})
.catch(Notification.exception);
};
@ -273,7 +278,7 @@ export const init = participantsRegionId => {
const pendingPromise = new Pending('core_user/participantsfilter:setFilterFromConfig');
const filters = getFilterRegion().querySelectorAll(Selectors.filter.region);
filters.forEach(filterRow => removeOrReplaceFilterRow(filterRow));
filters.forEach(filterRow => removeOrReplaceFilterRow(filterRow, false));
// Refresh the table.
return updateTableFromFilter()
@ -292,7 +297,7 @@ export const init = participantsRegionId => {
filters.forEach(filterRow => {
const filterType = filterRow.querySelector(Selectors.filter.fields.type);
if (!filterType.value) {
removeOrReplaceFilterRow(filterRow);
removeOrReplaceFilterRow(filterRow, false);
}
});
};
@ -464,7 +469,7 @@ export const init = participantsRegionId => {
if (e.target.closest(Selectors.filter.actions.remove)) {
e.preventDefault();
removeOrReplaceFilterRow(e.target.closest(Selectors.filter.region));
removeOrReplaceFilterRow(e.target.closest(Selectors.filter.region), true);
}
});