DRAFT: Mdl 72188 master seb js integration dev

.grunt/babel-plugin-add-module-to-define.js

@@ -111,8 +111,22 @@ module.exports = ({template, types}) => {
                             if (!this.seenDefine && path.get('callee').isIdentifier({name: 'define'})) {
                                 // We only want to modify the first instance of define that we find.
                                 this.seenDefine = true;
+
                                 // Get the Moodle component for the file being processed.
                                 var moduleName = getModuleNameFromFileName(this.file.opts.filename);
+
+                                // The function signature of `define()` is:
+                                // define = function (name, deps, callback) {...}
+                                // Ensure that if the moduel supplied its own name that it is replaced.
+                                if (path.node.arguments.length > 0) {
+                                    // Ensure that there is only one name.
+                                    if (path.node.arguments[0].type === 'StringLiteral') {
+                                        // eslint-disable-next-line
+                                        console.log(`Replacing module name '${path.node.arguments[0].extra.rawValue}' with ${moduleName}`);
+                                        path.node.arguments.shift();
+                                    }
+                                }
+
                                 // Add the module name as the first argument to the define function.
                                 path.node.arguments.unshift(types.stringLiteral(moduleName));
                                 // Add a space after the define function in the built file so that previous versions

admin/purgecaches.php

@@ -38,12 +38,11 @@
 if ($data = $form->get_data()) {
 
     // Valid request. Purge, and redirect the user back to where they came from.
-    $selected = $data->purgeselectedoptions;
-    purge_caches($selected);
-
     if (isset($data->all)) {
+        purge_caches();
         $message = get_string('purgecachesfinished', 'admin');
     } else {
+        purge_caches($data->purgeselectedoptions);
         $message = get_string('purgeselectedcachesfinished', 'admin');
     }
 

admin/repository.php

@@ -142,6 +142,8 @@ function repository_action_url($repository) {
             $success = true;
             if (!$repoid = $type->create()) {
                 $success = false;
+            } else {
+                add_to_config_log('repository_visibility', '', (int)$visible, $plugin);
             }
             $data = data_submitted();
         }
@@ -184,14 +186,14 @@ function repository_action_url($repository) {
         print_error('confirmsesskeybad', '', $baseurl);
     }
     $class = \core_plugin_manager::resolve_plugininfo_class('repository');
-    $class::enable_plugin($repository, true);
+    $class::enable_plugin($repository, 1);
     $return = true;
 } else if ($action == 'hide') {
     if (!confirm_sesskey()) {
         print_error('confirmsesskeybad', '', $baseurl);
     }
     $class = \core_plugin_manager::resolve_plugininfo_class('repository');
-    $class::enable_plugin($repository, false);
+    $class::enable_plugin($repository, 0);
     $return = true;
 } else if ($action == 'delete') {
     $repositorytype = repository::get_type_by_typename($repository);
@@ -202,6 +204,8 @@ function repository_action_url($repository) {
         }
 
         if ($repositorytype->delete($downloadcontents)) {
+            // Include this information into config changes table.
+            add_to_config_log('repository_visibility', $repositorytype->get_visible(), '', $repository);
             core_plugin_manager::reset_caches();
             redirect($baseurl);
         } else {

admin/search.php

@@ -60,7 +60,6 @@
 }
 
 $PAGE->has_secondary_navigation_setter(false);
-$PAGE->set_primary_active_tab('siteadminnode');
 
 // and finally, if we get here, then there are matching settings and we have to print a form
 // to modify them

admin/templates/setting_configcolourpicker.mustache

@@ -48,6 +48,6 @@
     </div>
     <input type="text" name="{{name}}" id="{{id}}" value="{{value}}" size="12" class="form-control text-ltr" {{#readonly}}disabled{{/readonly}}>
     {{#haspreviewconfig}}
-        <input type="button" id="{{id}}_preview" value={{#quote}}{{#str}}preview{{/str}}{{/quote}} class="admin_colourpicker_preview">
+        <input type="button" id="{{id}}_preview" value="{{#cleanstr}}preview{{/cleanstr}}" class="admin_colourpicker_preview">
     {{/haspreviewconfig}}
 </div>

admin/tool/behat/tests/behat/i_am_on_page.feature

@@ -71,9 +71,9 @@ Feature: Use core page resolvers for the I am on the page steps
     Then I should see "<shouldsee>"
 
     Examples:
-      | description | identifier | shouldsee                   |
-      | Admin page  | "Admin notifications"      | Check for available updates |
-      | Home page   | Homepage   | Course overview   |
+      | description | identifier              | shouldsee                   |
+      | Admin page  | "Admin notifications"   | Check for available updates |
+      | Home page   | Homepage                | Calendar                    |
 
   Scenario Outline: When I am on a named page logged in as
     When I am on the <identifier> page logged in as admin
@@ -82,4 +82,4 @@ Feature: Use core page resolvers for the I am on the page steps
     Examples:
       | description | identifier            | shouldsee                   |
       | Admin page  | "Admin notifications" | Check for available updates |
-      | Home page   | Homepage              | Course overview   |
+      | Home page   | Homepage              | Calendar                    |

admin/tool/dataprivacy/tests/behat/dataexport.feature

@@ -54,7 +54,7 @@ Feature: Data export from the privacy API
     And I reload the page
     And I should see "Download ready" in the "Victim User 1" "table_row"
     And I open the action menu in "Victim User 1" "table_row"
-    And following "Download" should download between "1" and "146000" bytes
+    And following "Download" should download between "1" and "150000" bytes
     And the following config values are set as admin:
       | privacyrequestexpiry | 1 | tool_dataprivacy |
     And I wait "1" seconds
@@ -89,7 +89,7 @@ Feature: Data export from the privacy API
     And I reload the page
     And I should see "Download ready" in the "Export all of my personal data" "table_row"
     And I open the action menu in "Victim User 1" "table_row"
-    And following "Download" should download between "1" and "146000" bytes
+    And following "Download" should download between "1" and "150000" bytes
 
     And the following config values are set as admin:
       | privacyrequestexpiry | 1 | tool_dataprivacy |
@@ -126,7 +126,7 @@ Feature: Data export from the privacy API
     And I reload the page
     And I should see "Download ready" in the "Victim User 1" "table_row"
     And I open the action menu in "Victim User 1" "table_row"
-    And following "Download" should download between "1" and "146000" bytes
+    And following "Download" should download between "1" and "150000" bytes
 
     And the following config values are set as admin:
       | privacyrequestexpiry | 1 | tool_dataprivacy |

admin/tool/policy/templates/page_agreedocs.mustache

@@ -134,9 +134,9 @@
 {{# str }}somefieldsrequired, form, <i class="icon fa fa-exclamation-circle text-danger fa-fw" title="{{# str }} required {{/ str }}" ></i>{{/ str }}
 <hr>
 
-<input type="submit" class="btn btn-primary" name="submit" value={{#quote}}{{#str}} next {{/str}}{{/quote}}>
+<input type="submit" class="btn btn-primary" name="submit" value="{{#cleanstr}} next {{/cleanstr}}">
 {{#cancancel}}
-<input type="submit" class="btn btn-secondary" name="cancel" value={{#quote}}{{#str}} cancel {{/str}}{{/quote}}>
+<input type="submit" class="btn btn-secondary" name="cancel" value="{{#cleanstr}} cancel {{/cleanstr}}">
 {{/cancancel}}
 </form>
 

admin/tool/policy/tests/behat/acceptances.feature

@@ -36,7 +36,7 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
     And I press "Next"
     And I set the field "I agree to the This site policy" to "1"
     And I press "Next"
-    And I should see "Course overview"
+    And I should see "Calendar"
     And I log out
     And I log in as "manager"
     And I press "Next"
@@ -82,7 +82,7 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
     And I press "Next"
     And I set the field "I agree to the This site policy" to "1"
     And I press "Next"
-    And I should see "Course overview"
+    And I should see "Calendar"
     And I navigate to "Users > Privacy and policies > Manage policies" in site administration
     And I click on "1 of 4 (25%)" "link" in the "This site policy" "table_row"
     And I click on "Accept This site policy" "link" in the "User One" "table_row"
@@ -111,7 +111,7 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
     And I set the field "I agree to the This site policy" to "1"
     And I set the field "I agree to the This privacy policy" to "1"
     And I press "Next"
-    And I should see "Course overview"
+    And I should see "Calendar"
     And I log out
     And I log in as "manager"
     And I press "Next"
@@ -300,7 +300,7 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
     And I press "Next"
     And I set the field "I agree to the This site policy" to "1"
     And I press "Next"
-    And I should see "Course overview"
+    And I should see "Calendar"
     And I log out
     And I log in as "admin"
     And I navigate to "Users > Privacy and policies > Manage policies" in site administration
@@ -311,4 +311,4 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
     And I press "Continue"
     And I log out
     When I log in as "user1"
-    Then I should see "Course overview"
+    Then I should see "Calendar"

admin/tool/usertours/tests/behat/create_tour.feature

@@ -20,15 +20,15 @@ Feature: Add a new user tour
       | Display in middle of page   | Welcome           | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful |
     And I add steps to the "First tour" tour:
       | targettype                  | targetvalue_block | Title             | Content |
-      | Block                       | Course overview   | Course overview   | This area shows you what's happening in some of your courses  |
+      | Block                       | Timeline          | Timeline          | This is the Timeline. All of your upcoming activities can be found here |
       | Block                       | Calendar          | Calendar          | This is the Calendar. All of your assignments and due dates can be found here |
     And I add steps to the "First tour" tour:
       | targettype                  | targetvalue_selector | Title             | Content |
       | Selector                    | .usermenu            | User menu         | This is your personal user menu. You'll find your personal preferences and your user profile here. |
     When I am on homepage
     Then I should see "Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful"
     And I click on "Next" "button" in the "[data-role='flexitour-step']" "css_element"
-    And I should see "This area shows you what's happening in some of your courses"
+    And I should see "This is the Timeline. All of your upcoming activities can be found here"
     And I should not see "This is the Calendar. All of your assignments and due dates can be found here"
     And I click on "Next" "button" in the "[data-role='flexitour-step']" "css_element"
     And I should see "This is the Calendar. All of your assignments and due dates can be found here"
@@ -95,7 +95,7 @@ Feature: Add a new user tour
       | Display in middle of page | Welcome | First step of the Tour |
     And I add steps to the "Steps tour" tour:
       | targettype | targetvalue_block | Title           | Content                 |
-      | Block      | Course overview   | Course overview | Second step of the Tour |
+      | Block      | Timeline          | Timeline        | Second step of the Tour |
       | Block      | Calendar          | Calendar        | Third step of the Tour  |
     When I am on homepage
     Then I should see "First step of the Tour"
@@ -129,7 +129,7 @@ Feature: Add a new user tour
       | Display in middle of page | Welcome | First step of the Tour |
     And I add steps to the "Steps tour" tour:
       | targettype | targetvalue_block | Title           | Content                 |
-      | Block      | Course overview   | Course overview | Second step of the Tour |
+      | Block      | Timeline          | Timeline        | Second step of the Tour |
       | Block      | Calendar          | Calendar        | Third step of the Tour  |
     When I am on homepage
     Then I should see "First step of the Tour"

admin/tool/usertours/tests/behat/tour_accessibility.feature

@@ -14,7 +14,7 @@ Feature: Apply accessibility to a tour
     And I add steps to the tour:
       | targettype | targetvalue_selector | Title       | Content   |
       | Selector   | .usermenu            | User menu   | Next page |
-      | Selector   | input,button         | Page 2      | Next page |
+      | Selector   | .navbar-brand         | Page 2      | Next page |
     And I add steps to the tour:
       | targettype                  | Title   | Content     |
       | Display in middle of page   | Page 3  | Final page. |
@@ -66,11 +66,11 @@ Feature: Apply accessibility to a tour
     And I am on site homepage
     When I click on "Next" "button"
     And I click on "Next" "button"
-    Then "input[aria-describedby^='tour-step-tool_usertours'],button[aria-describedby^='tour-step-tool_usertours']" "css_element" should exist
-    And "input[tabindex],button[tabindex]" "css_element" should exist
+    Then ".navbar-brand[aria-describedby^='tour-step-tool_usertours']" "css_element" should exist
+    And ".navbar-brand[tabindex]" "css_element" should exist
     When I click on "Next" "button"
-    Then "input[aria-describedby^='tour-step-tool_usertours'],button[aria-describedby^='tour-step-tool_usertours']" "css_element" should not exist
-    And "input[tabindex]:not([tabindex='-1']),button[tabindex]:not([tabindex='-1'])" "css_element" should not exist
+    Then ".navbar-brand[aria-describedby^='tour-step-tool_usertours']" "css_element" should not exist
+    And ".navbar-brand[tabindex]:not([tabindex='-1'])" "css_element" should not exist
     When I click on "End tour" "button"
-    Then "input[aria-describedby^='tour-step-tool_usertours'],button[aria-describedby^='tour-step-tool_usertours']" "css_element" should not exist
-    And "input[tabindex]:not([tabindex='0']),button[tabindex]:not([tabindex='0'])" "css_element" should not exist
+    Then ".navbar-brand[aria-describedby^='tour-step-tool_usertours']" "css_element" should not exist
+    And ".navbar-brand[tabindex]:not([tabindex='0'])" "css_element" should not exist

admin/tool/usertours/tests/behat/tour_navigation.feature

@@ -53,14 +53,14 @@ Feature: Steps can be navigated within a tour
       | Display in middle of page   | Welcome           | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful |
     And I add steps to the "First tour" tour:
       | targettype                  | targetvalue_block | Title             | Content |
-      | Block                       | Course overview   | Course overview   | This area shows you what's happening in some of your courses  |
+      | Block                       | Timeline          | Timeline          | This is the Timeline. All of your upcoming activities can be found here |
       | Block                       | Calendar          | Calendar          | This is the Calendar. All of your assignments and due dates can be found here |
     When I am on homepage
     Then I should see "Skip tour"
     And I should see "Next (1/3)"
     And I click on "Next (1/3)" "button" in the "Welcome" "dialogue"
     And I should see "Skip tour"
-    And I click on "Next (2/3)" "button" in the "Course overview" "dialogue"
+    And I click on "Next (2/3)" "button" in the "Timeline" "dialogue"
     And I should see "End tour"
 
   @javascript

badges/renderer.php

@@ -59,7 +59,8 @@ public function print_badges_list($badges, $userid, $profile = false, $external
 
             $name = html_writer::tag('span', $bname, array('class' => 'badge-name'));
 
-            $image = html_writer::empty_tag('img', ['src' => $imageurl, 'class' => 'badge-image', 'alt' => $badge->imagecaption]);
+            $imagecaption = $badge->imagecaption ?? '';
+            $image = html_writer::empty_tag('img', ['src' => $imageurl, 'class' => 'badge-image', 'alt' => $imagecaption]);
             if (!empty($badge->dateexpire) && $badge->dateexpire < time()) {
                 $image .= $this->output->pix_icon('i/expired',
                         get_string('expireddate', 'badges', userdate($badge->dateexpire)),

blocks/calendar_month/block_calendar_month.php

@@ -59,10 +59,6 @@ public function get_content() {
         $renderer = $this->page->get_renderer('core_calendar');
         $this->content->text .= $renderer->render_from_template($template, $data);
 
-        if ($this->page->course->id != SITEID) {
-            $this->content->text .= $renderer->event_filter();
-        }
-
         $options = [
             'showfullcalendarlink' => true
         ];