Merge branch 'MDL-68951-master' of git://github.com/andrewnicols/moodle

enrol/manual/amd/build/quickenrolment.min.js

@@ -1,2 +1,2 @@
-function _typeof(a){"@babel/helpers - typeof";if("function"==typeof Symbol&&"symbol"==typeof Symbol.iterator){_typeof=function(a){return typeof a}}else{_typeof=function(a){return a&&"function"==typeof Symbol&&a.constructor===Symbol&&a!==Symbol.prototype?"symbol":typeof a}}return _typeof(a)}define ("enrol_manual/quickenrolment",["exports","core_table/dynamic","core/str","core/toast","core/config","core/fragment","core/modal_events","core/modal_factory","core/notification","jquery","core/prefetch"],function(a,b,c,d,e,f,g,h,i,j,k){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.init=void 0;b=n(b);c=n(c);d=n(d);e=l(e);f=l(f);g=l(g);h=l(h);i=l(i);j=l(j);k=l(k);function l(a){return a&&a.__esModule?a:{default:a}}function m(){if("function"!=typeof WeakMap)return null;var a=new WeakMap;m=function(){return a};return a}function n(a){if(a&&a.__esModule){return a}if(null===a||"object"!==_typeof(a)&&"function"!=typeof a){return{default:a}}var b=m();if(b&&b.has(a)){return b.get(a)}var c={},d=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var e in a){if(Object.prototype.hasOwnProperty.call(a,e)){var f=d?Object.getOwnPropertyDescriptor(a,e):null;if(f&&(f.get||f.set)){Object.defineProperty(c,e,f)}else{c[e]=a[e]}}}c.default=a;if(b){b.set(a,c)}return c}var o={cohortSelector:"#id_cohortlist",triggerButtons:".enrolusersbutton.enrol_manual_plugin [type='submit']",unwantedHiddenFields:"input[value='_qf__force_multiselect_submission']",buttonWrapper:"[data-region=\"wrapper\"]"},p=function(a){return f.default.loadFragment("enrol_manual","enrol_users_form",a,{})},q=function(a){var c=a.closest(o.buttonWrapper);return b.getTableFromId(c.dataset.tableUniqueid)},r=function(a){document.addEventListener("click",function(b){if(b.target.closest(o.triggerButtons)){b.preventDefault();s(q(b.target),a)}})},s=function(a,b){return h.default.create({type:h.default.types.SAVE_CANCEL,large:!0,title:c.get_string("enrolusers","enrol_manual"),body:p(b)}).then(function(b){b.getRoot().on(g.default.save,function(a){a.preventDefault();b.getRoot().find("form").submit()});b.getRoot().on("submit","form",function(c){c.preventDefault();t(a,b)});b.getRoot().on(g.default.hidden,function(){b.destroy()});return b}).then(function(a){a.show();return a}).then(function(a){a.setSaveButtonText(c.get_string("enrolusers","enrol_manual"));a.getBodyPromise().then(function(b){if(b.get(0).querySelector(o.cohortSelector)){a.setSaveButtonText(c.get_string("enroluserscohorts","enrol_manual"))}return b}).catch();return a}).catch(i.default.exception)},t=function(a,f){var g=f.getRoot().find("form");g.get(0).querySelectorAll(o.unwantedHiddenFields).forEach(function(a){return a.remove()});f.hide();f.destroy();j.default.ajax("".concat(e.default.wwwroot,"/enrol/manual/ajax.php?").concat(g.serialize()),{type:"GET",processData:!1,contentType:"application/json"}).then(function(d){if(d.error){throw new Error(d.error)}b.refreshTableContent(a);return c.get_string("totalenrolledusers","enrol",d.count)}).then(function(a){return d.add(a)}).catch(function(a){i.default.addNotification({message:a.message,type:"error"})})},u=function(a){var b=a.contextid;r(b);k.default.prefetchStrings("enrol_manual",["enrolusers","enroluserscohorts"]);k.default.prefetchString("enrol","totalenrolledusers")};a.init=u});
+function _typeof(a){"@babel/helpers - typeof";if("function"==typeof Symbol&&"symbol"==typeof Symbol.iterator){_typeof=function(a){return typeof a}}else{_typeof=function(a){return a&&"function"==typeof Symbol&&a.constructor===Symbol&&a!==Symbol.prototype?"symbol":typeof a}}return _typeof(a)}define ("enrol_manual/quickenrolment",["exports","core_table/dynamic","core/str","core/toast","core/config","core/fragment","core/modal_events","core/modal_factory","core/notification","jquery","core/prefetch"],function(a,b,c,d,e,f,g,h,i,j,k){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.init=void 0;b=n(b);c=n(c);d=n(d);e=l(e);f=l(f);g=l(g);h=l(h);i=l(i);j=l(j);k=l(k);function l(a){return a&&a.__esModule?a:{default:a}}function m(){if("function"!=typeof WeakMap)return null;var a=new WeakMap;m=function(){return a};return a}function n(a){if(a&&a.__esModule){return a}if(null===a||"object"!==_typeof(a)&&"function"!=typeof a){return{default:a}}var b=m();if(b&&b.has(a)){return b.get(a)}var c={},d=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var e in a){if(Object.prototype.hasOwnProperty.call(a,e)){var f=d?Object.getOwnPropertyDescriptor(a,e):null;if(f&&(f.get||f.set)){Object.defineProperty(c,e,f)}else{c[e]=a[e]}}}c.default=a;if(b){b.set(a,c)}return c}function o(a,b){return t(a)||s(a,b)||q(a,b)||p()}function p(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function q(a,b){if(!a)return;if("string"==typeof a)return r(a,b);var c=Object.prototype.toString.call(a).slice(8,-1);if("Object"===c&&a.constructor)c=a.constructor.name;if("Map"===c||"Set"===c)return Array.from(c);if("Arguments"===c||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(c))return r(a,b)}function r(a,b){if(null==b||b>a.length)b=a.length;for(var c=0,d=Array(b);c<b;c++){d[c]=a[c]}return d}function s(a,b){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(a)))return;var c=[],d=!0,e=!1,f=void 0;try{for(var g=a[Symbol.iterator](),h;!(d=(h=g.next()).done);d=!0){c.push(h.value);if(b&&c.length===b)break}}catch(a){e=!0;f=a}finally{try{if(!d&&null!=g["return"])g["return"]()}finally{if(e)throw f}}return c}function t(a){if(Array.isArray(a))return a}var u={cohortSelector:"#id_cohortlist",triggerButtons:".enrolusersbutton.enrol_manual_plugin [type='submit']",unwantedHiddenFields:"input[value='_qf__force_multiselect_submission']",buttonWrapper:"[data-region=\"wrapper\"]"},v=function(a){return f.default.loadFragment("enrol_manual","enrol_users_form",a,{})},w=function(a){var c=a.closest(u.buttonWrapper);return b.getTableFromId(c.dataset.tableUniqueid)},x=function(a){document.addEventListener("click",function(b){if(b.target.closest(u.triggerButtons)){b.preventDefault();y(w(b.target),a)}})},y=function(a,b){return h.default.create({type:h.default.types.SAVE_CANCEL,large:!0,title:c.get_string("enrolusers","enrol_manual"),body:v(b)}).then(function(b){b.getRoot().on(g.default.save,function(a){a.preventDefault();b.getRoot().find("form").submit()});b.getRoot().on("submit","form",function(c){c.preventDefault();z(a,b)});b.getRoot().on(g.default.hidden,function(){b.destroy()});return b}).then(function(a){a.show();return a}).then(function(a){a.setSaveButtonText(c.get_string("enrolusers","enrol_manual"));a.getBodyPromise().then(function(b){if(b.get(0).querySelector(u.cohortSelector)){a.setSaveButtonText(c.get_string("enroluserscohorts","enrol_manual"))}return b}).catch();return a}).catch(i.default.exception)},z=function(a,f){var g=f.getRoot().find("form");g.get(0).querySelectorAll(u.unwantedHiddenFields).forEach(function(a){return a.remove()});f.hide();f.destroy();j.default.ajax("".concat(e.default.wwwroot,"/enrol/manual/ajax.php?").concat(g.serialize()),{type:"GET",processData:!1,contentType:"application/json"}).then(function(a){if(a.error){throw new Error(a.error)}return a.count}).then(function(d){return Promise.all([c.get_string("totalenrolledusers","enrol",d),b.refreshTableContent(a)])}).then(function(a){var b=o(a,1),c=b[0];return c}).then(function(a){return d.add(a)}).catch(function(a){i.default.addNotification({message:a.message,type:"error"})})},A=function(a){var b=a.contextid;x(b);k.default.prefetchStrings("enrol_manual",["enrolusers","enroluserscohorts"]);k.default.prefetchString("enrol","totalenrolledusers")};a.init=A});
 //# sourceMappingURL=quickenrolment.min.js.map

enrol/manual/amd/src/quickenrolment.js

@@ -165,9 +165,15 @@ const submitFormAjax = (dynamicTable, modal) => {
             throw new Error(response.error);
         }
 
-        DynamicTable.refreshTableContent(dynamicTable);
-        return Str.get_string('totalenrolledusers', 'enrol', response.count);
+        return response.count;
     })
+    .then(count => {
+        return Promise.all([
+            Str.get_string('totalenrolledusers', 'enrol', count),
+            DynamicTable.refreshTableContent(dynamicTable),
+        ]);
+    })
+    .then(([notificationBody]) => notificationBody)
     .then(notificationBody => Toast.add(notificationBody))
     .catch(error => {
         Notification.addNotification({

lib/table/amd/src/dynamic.js

@@ -26,6 +26,7 @@ import Events from './local/dynamic/events';
 import Pending from 'core/pending';
 import {addIconToContainer} from 'core/loadingicon';
 import {fetch as fetchTableData} from 'core_table/local/dynamic/repository';
+import Notification from 'core/notification';
 
 let watching = false;
 
@@ -248,7 +249,7 @@ export const getPageNumber = tableRoot => getTableData(tableRoot).tablePageNumbe
  * @returns {Promise}
  */
 export const setPageSize = (tableRoot, pageSize, refreshContent = true) =>
-    updateTable(tableRoot, {pageSize, pageNumber: 0}, refreshContent);
+    updateTable(tableRoot, {pageSize, pageNumber: 1}, refreshContent);
 
 /**
  * Get the current page size.
@@ -353,49 +354,50 @@ export const init = () => {
         if (sortableLink) {
             e.preventDefault();
 
-            setSortOrder(tableRoot, sortableLink.dataset.sortby, sortableLink.dataset.sortorder);
+            setSortOrder(tableRoot, sortableLink.dataset.sortby, sortableLink.dataset.sortorder)
+            .catch(Notification.exception);
         }
 
         const firstInitialLink = e.target.closest(Selectors.initialsBar.links.firstInitial);
         if (firstInitialLink !== null) {
             e.preventDefault();
 
-            setFirstInitial(tableRoot, firstInitialLink.dataset.initial);
+            setFirstInitial(tableRoot, firstInitialLink.dataset.initial).catch(Notification.exception);
         }
 
         const lastInitialLink = e.target.closest(Selectors.initialsBar.links.lastInitial);
         if (lastInitialLink !== null) {
             e.preventDefault();
 
-            setLastInitial(tableRoot, lastInitialLink.dataset.initial);
+            setLastInitial(tableRoot, lastInitialLink.dataset.initial).catch(Notification.exception);
         }
 
         const pageItem = e.target.closest(Selectors.paginationBar.links.pageItem);
         if (pageItem) {
             e.preventDefault();
 
-            setPageNumber(tableRoot, pageItem.dataset.pageNumber);
+            setPageNumber(tableRoot, pageItem.dataset.pageNumber).catch(Notification.exception);
         }
 
         const hide = e.target.closest(Selectors.table.links.hide);
         if (hide) {
             e.preventDefault();
 
-            hideColumn(tableRoot, hide.dataset.column);
+            hideColumn(tableRoot, hide.dataset.column).catch(Notification.exception);
         }
 
         const show = e.target.closest(Selectors.table.links.show);
         if (show) {
             e.preventDefault();
 
-            showColumn(tableRoot, show.dataset.column);
+            showColumn(tableRoot, show.dataset.column).catch(Notification.exception);
         }
 
         const resetTablePreferencesLink = e.target.closest('.resettable a');
         if (resetTablePreferencesLink) {
             e.preventDefault();
 
-            resetTablePreferences(tableRoot);
+            resetTablePreferences(tableRoot).catch(Notification.exception);
         }
     });
 };

user/amd/src/participantsfilter.js

@@ -371,7 +371,8 @@ export const init = participantsRegionId => {
                 filters: Object.values(activeFilters).map(filter => filter.filterValue),
                 jointype: filterSet.querySelector(Selectors.filterset.fields.join).value,
             }
-        );
+        )
+        .catch(Notification.exception);
     };
 
     /**

user/amd/src/status_field.js

@@ -280,7 +280,8 @@ const submitEditFormAjax = (clickedLink, getBody, modal, userEnrolmentId, userDa
         return data;
     })
     .then(() => {
-        DynamicTable.refreshTableContent(getDynamicTableFromLink(clickedLink));
+        DynamicTable.refreshTableContent(getDynamicTableFromLink(clickedLink))
+        .catch(Notification.exception);
 
         return Str.get_string('enrolmentupdatedforuser', 'core_enrol', userData);
     })
@@ -321,7 +322,8 @@ const submitUnenrolFormAjax = (clickedLink, modal, args, userData) => {
         return data;
     })
     .then(() => {
-        DynamicTable.refreshTableContent(getDynamicTableFromLink(clickedLink));
+        DynamicTable.refreshTableContent(getDynamicTableFromLink(clickedLink))
+        .catch(Notification.exception);
 
         return Str.get_string('unenrolleduser', 'core_enrol', userData);
     })