mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-68977 user: Add pendingPromise to interactions

Browse Source
This commit is contained in:
Andrew Nicols 2020-06-09 11:13:00 +08:00
parent 8503e0ee53
commit cb2f672525
3 changed files with 34 additions and 9 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

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

@ -27,6 +27,7 @@ import * as DynamicTable from 'core_table/dynamic';
import GenericFilter from './local/participantsfilter/filter';
import {get_strings as getStrings} from 'core/str';
import Notification from 'core/notification';
import Pending from 'core/pending';
import Selectors from './local/participantsfilter/selectors';
import Templates from 'core/templates';
@ -57,6 +58,8 @@ export const init = participantsRegionId => {
* @return {Promise}
*/
const addFilterRow = () => {
const pendingPromise = new Pending('core_user/participantsfilter:addFilterRow');
const rownum = 1 + getFilterRegion().querySelectorAll(Selectors.filter.region).length;
return Templates.renderForPromise('core_user/local/participantsfilter/filterrow', {"rownumber": rownum})
.then(({html, js}) => {
@ -86,6 +89,11 @@ export const init = participantsRegionId => {
return filterRow;
})
.then(result => {
pendingPromise.resolve();
return result;
})
.catch(Notification.exception);
};
@ -262,11 +270,18 @@ export const init = participantsRegionId => {
* @returns {Promise}
*/
const removeAllFilters = () => {
const pendingPromise = new Pending('core_user/participantsfilter:setFilterFromConfig');
const filters = getFilterRegion().querySelectorAll(Selectors.filter.region);
filters.forEach(filterRow => removeOrReplaceFilterRow(filterRow));
// Refresh the table.
return updateTableFromFilter();
return updateTableFromFilter()
.then(result => {
pendingPromise.resolve();
return result;
});
};
/**
@ -327,13 +342,14 @@ export const init = participantsRegionId => {
* @param {Object} config
* @param {Number} config.jointype
* @param {Object} config.filters
* @returns {Promise}
*/
const setFilterFromConfig = config => {
const filterConfig = Object.entries(config.filters);
if (!filterConfig.length) {
// There are no filters to set from.
return;
return Promise.resolve();
}
// Set the main join type.
@ -357,15 +373,14 @@ export const init = participantsRegionId => {
}).filter(promise => promise);
if (!filterPromises.length) {
return;
return Promise.resolve();
}
Promise.all(filterPromises).then(() => {
return Promise.all(filterPromises).then(() => {
return removeEmptyFilters();
})
.then(updateFiltersOptions)
.then(updateTableFromFilter)
.catch();
.then(updateTableFromFilter);
};
/**
@ -374,6 +389,8 @@ export const init = participantsRegionId => {
* @return {Promise}
*/
const updateTableFromFilter = () => {
const pendingPromise = new Pending('core_user/participantsfilter:updateTableFromFilter');
const filters = {};
Object.values(activeFilters).forEach(filter => {
filters[filter.filterValue.name] = filter.filterValue;
@ -386,6 +403,11 @@ export const init = participantsRegionId => {
filters,
}
)
.then(result => {
pendingPromise.resolve();
return result;
})
.catch(Notification.exception);
};
@ -463,7 +485,10 @@ export const init = participantsRegionId => {
const tableRoot = DynamicTable.getTableFromId(filterSet.dataset.tableRegion);
const initialFilters = DynamicTable.getFilters(tableRoot);
if (initialFilters) {
const initialFilterPromise = new Pending('core_user/participantsfilter:setFilterFromConfig');
// Apply the initial filter configuration.
setFilterFromConfig(initialFilters);
setFilterFromConfig(initialFilters)
.then(() => initialFilterPromise.resolve())
.catch();
}
};