Merge branch 'MDL-73495-master' of https://github.com/dravek/moodle

lib/amd/src/dynamic_tabs.js

@@ -128,29 +128,24 @@ const getFirstTabName = () => {
  * Loads contents of a tab using an AJAX request
  *
  * @param {String} tabName
- * @param {Object} additionalData additional data to pass to WS
  */
-const loadTab = (tabName, additionalData = {}) => {
+const loadTab = (tabName) => {
     // If tabName is not specified find the active tab, or if is not defined, the first available tab.
     tabName = tabName ?? getActiveTabName() ?? getFirstTabName();
-
     const tab = document.querySelector(SELECTORS.forTabName(tabName));
     if (!tab) {
         return;
     }
 
     const pendingPromise = new Pending('core/dynamic_tabs:loadTab:' + tabName);
-    const tabdata = tab.closest(SELECTORS.dynamicTabs);
-    const wsData = {
-        'reportid': tabdata.dataset.reportid,
-        'id': tabdata.dataset.id,
-        ...additionalData
-    };
     let tabjs = '';
 
     addIconToContainer(tab)
     .then(() => {
-        return getContent(tab.dataset.tabClass, JSON.stringify(wsData));
+        let tabArgs = {...tab.dataset};
+        delete tabArgs.tabClass;
+        delete tabArgs.tabContent;
+        return getContent(tab.dataset.tabClass, JSON.stringify(tabArgs));
     })
     .then((data) => {
         tabjs = data.javascript;