Merge branch 'MDL-68612-master-integration' of git://github.com/mickhawkins/moodle

lib/table/amd/src/dynamic.js

@@ -158,6 +158,18 @@ export const updateTable = (tableRoot, {
     }
 };
 
+/**
+ * Get the table dataset for the specified tableRoot, ensuring that the provided table is a dynamic table.
+ *
+ * @param {HTMLElement} tableRoot
+ * @returns {DOMStringMap}
+ */
+const getTableData = tableRoot => {
+    checkTableIsDynamic(tableRoot);
+
+    return tableRoot.dataset;
+};
+
 /**
  * Update the specified table using the new filters.
  *
@@ -169,6 +181,18 @@ export const updateTable = (tableRoot, {
 export const setFilters = (tableRoot, filters, refreshContent = true) =>
     updateTable(tableRoot, {filters}, refreshContent);
 
+/**
+ * Get the filter data for the specified table.
+ *
+ * @param {HTMLElement} tableRoot
+ * @returns {Object}
+ */
+export const getFilters = tableRoot => {
+    checkTableIsDynamic(tableRoot);
+
+    return getFiltersetFromTable(tableRoot);
+};
+
 /**
  * Update the sort order.
  *
@@ -192,6 +216,14 @@ export const setSortOrder = (tableRoot, sortBy, sortOrder, refreshContent = true
 export const setPageNumber = (tableRoot, pageNumber, refreshContent = true) =>
     updateTable(tableRoot, {pageNumber}, refreshContent);
 
+/**
+ * Get the current page number.
+ *
+ * @param {HTMLElement} tableRoot
+ * @returns {Number}
+ */
+export const getPageNumber = tableRoot => getTableData(tableRoot).tablePageNumber;
+
 /**
  * Set the page size.
  *
@@ -203,6 +235,14 @@ export const setPageNumber = (tableRoot, pageNumber, refreshContent = true) =>
 export const setPageSize = (tableRoot, pageSize, refreshContent = true) =>
     updateTable(tableRoot, {pageSize, pageNumber: 0}, refreshContent);
 
+/**
+ * Get the current page size.
+ *
+ * @param {HTMLElement} tableRoot
+ * @returns {Number}
+ */
+export const getPageSize = tableRoot => getTableData(tableRoot).tablePageSize;
+
 /**
  * Update the first initial to show.
  *
@@ -214,6 +254,14 @@ export const setPageSize = (tableRoot, pageSize, refreshContent = true) =>
 export const setFirstInitial = (tableRoot, firstInitial, refreshContent = true) =>
     updateTable(tableRoot, {firstInitial}, refreshContent);
 
+/**
+ * Get the current first initial filter.
+ *
+ * @param {HTMLElement} tableRoot
+ * @returns {String}
+ */
+export const getFirstInitial = tableRoot => getTableData(tableRoot).tableFirstInitial;
+
 /**
  * Update the last initial to show.
  *
@@ -225,6 +273,14 @@ export const setFirstInitial = (tableRoot, firstInitial, refreshContent = true)
 export const setLastInitial = (tableRoot, lastInitial, refreshContent = true) =>
     updateTable(tableRoot, {lastInitial}, refreshContent);
 
+/**
+ * Get the current last initial filter.
+ *
+ * @param {HTMLElement} tableRoot
+ * @returns {String}
+ */
+export const getLastInitial = tableRoot => getTableData(tableRoot).tableLastInitial;
+
 /**
  * Hide a column in the participants table.
  *

lib/table/classes/local/filter/filter.php

@@ -41,11 +41,8 @@ use Iterator;
  */
 class filter implements Countable, Iterator, JsonSerializable {
 
-    /**
-     * @var in The default filter type (ALL)
-     * Note: This is for backwards compatibility with the old UI behaviour and will be set to JOINTYPE_ANY as part of MDL-68612.
-     */
-    const JOINTYPE_DEFAULT = 2;
+    /** @var in The default filter type (ANY) */
+    const JOINTYPE_DEFAULT = 1;
 
     /** @var int None of the following match */
     const JOINTYPE_NONE = 0;

lib/table/classes/local/filter/filterset.php

@@ -40,11 +40,8 @@ use moodle_exception;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 abstract class filterset implements JsonSerializable {
-    /**
-     * @var in The default filter type (ALL)
-     * Note: This is for backwards compatibility with the old UI behaviour and will be set to JOINTYPE_ANY as part of MDL-68612.
-     */
-    const JOINTYPE_DEFAULT = 2;
+    /** @var in The default filter type (ANY) */
+    const JOINTYPE_DEFAULT = 1;
 
     /** @var int None of the following match */
     const JOINTYPE_NONE = 0;