Merge branch 'MDL-77020' of https://github.com/paulholden/moodle

contentbank/amd/build/selectors.min.js

@@ -6,6 +6,6 @@ define("core_contentbank/selectors",["exports"],(function(_exports){Object.defin
    * @copyright  2020 Sara Arjona <sara@moodle.com>
    * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
    */
-const getDataSelector=(name,value)=>"[data-".concat(name,'="').concat(value,'"]');var _default={regions:{cbcontentname:getDataSelector("region","cb-content-name"),contentbank:getDataSelector("region","contentbank"),filearea:getDataSelector("region","filearea")},actions:{search:getDataSelector("action","searchcontent"),clearSearch:getDataSelector("action","clearsearch"),viewgrid:getDataSelector("action","viewgrid"),viewlist:getDataSelector("action","viewlist"),sortname:getDataSelector("action","sortname"),sortuses:getDataSelector("action","sortuses"),sortdate:getDataSelector("action","sortdate"),sortsize:getDataSelector("action","sortsize"),sorttype:getDataSelector("action","sorttype"),sortauthor:getDataSelector("action","sortauthor")},elements:{listitem:".cb-listitem",heading:".cb-heading",cell:".cb-column",cbnavbarbreadcrumb:".cb-navbar-breadbrumb",cbnavbartotalsearch:".cb-navbar-totalsearch",searchinput:"#searchinput",sortbutton:".cb-btnsort"}};return _exports.default=_default,_exports.default}));
+const getDataSelector=(name,value)=>"[data-".concat(name,'="').concat(value,'"]');var _default={regions:{cbcontentname:getDataSelector("region","cb-content-name"),contentbank:getDataSelector("region","contentbank"),filearea:getDataSelector("region","filearea")},actions:{search:getDataSelector("action","searchcontent"),clearSearch:getDataSelector("action","clearsearch"),viewgrid:getDataSelector("action","viewgrid"),viewlist:getDataSelector("action","viewlist"),sortname:getDataSelector("action","sortname"),sortuses:getDataSelector("action","sortuses"),sortdate:getDataSelector("action","sortdate"),sortsize:getDataSelector("action","sortsize"),sorttype:getDataSelector("action","sorttype"),sortauthor:getDataSelector("action","sortauthor")},elements:{listitem:".cb-listitem",heading:".cb-heading",cell:".cb-column",cbnavbarbreadcrumb:".cb-navbar-breadbrumb",cbnavbartotalsearch:".cb-navbar-totalsearch",searchinput:'[role="searchbox"]',sortbutton:".cb-btnsort"}};return _exports.default=_default,_exports.default}));
 
 //# sourceMappingURL=selectors.min.js.map

contentbank/amd/build/selectors.min.js.map

@@ -1 +1 @@
-{"version":3,"file":"selectors.min.js","sources":["../src/selectors.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Define all of the selectors we will be using on the contentbank interface.\n *\n * @module     core_contentbank/selectors\n * @copyright  2020 Sara Arjona <sara@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\n/**\n * A small helper function to build queryable data selectors.\n *\n * @method getDataSelector\n * @param {String} name\n * @param {String} value\n * @return {string}\n */\nconst getDataSelector = (name, value) => {\n    return `[data-${name}=\"${value}\"]`;\n};\n\nexport default {\n    regions: {\n        cbcontentname: getDataSelector('region', 'cb-content-name'),\n        contentbank: getDataSelector('region', 'contentbank'),\n        filearea: getDataSelector('region', 'filearea')\n    },\n    actions: {\n        search: getDataSelector('action', 'searchcontent'),\n        clearSearch: getDataSelector('action', 'clearsearch'),\n        viewgrid: getDataSelector('action', 'viewgrid'),\n        viewlist: getDataSelector('action', 'viewlist'),\n        sortname: getDataSelector('action', 'sortname'),\n        sortuses: getDataSelector('action', 'sortuses'),\n        sortdate: getDataSelector('action', 'sortdate'),\n        sortsize: getDataSelector('action', 'sortsize'),\n        sorttype: getDataSelector('action', 'sorttype'),\n        sortauthor: getDataSelector('action', 'sortauthor'),\n    },\n    elements: {\n        listitem: '.cb-listitem',\n        heading: '.cb-heading',\n        cell: '.cb-column',\n        cbnavbarbreadcrumb: '.cb-navbar-breadbrumb',\n        cbnavbartotalsearch: '.cb-navbar-totalsearch',\n        searchinput: '#searchinput',\n        sortbutton: '.cb-btnsort'\n    },\n};\n"],"names":["getDataSelector","name","value","regions","cbcontentname","contentbank","filearea","actions","search","clearSearch","viewgrid","viewlist","sortname","sortuses","sortdate","sortsize","sorttype","sortauthor","elements","listitem","heading","cell","cbnavbarbreadcrumb","cbnavbartotalsearch","searchinput","sortbutton"],"mappings":";;;;;;;;MA+BMA,gBAAkB,CAACC,KAAMC,wBACXD,kBAASC,yBAGd,CACXC,QAAS,CACLC,cAAeJ,gBAAgB,SAAU,mBACzCK,YAAaL,gBAAgB,SAAU,eACvCM,SAAUN,gBAAgB,SAAU,aAExCO,QAAS,CACLC,OAAQR,gBAAgB,SAAU,iBAClCS,YAAaT,gBAAgB,SAAU,eACvCU,SAAUV,gBAAgB,SAAU,YACpCW,SAAUX,gBAAgB,SAAU,YACpCY,SAAUZ,gBAAgB,SAAU,YACpCa,SAAUb,gBAAgB,SAAU,YACpCc,SAAUd,gBAAgB,SAAU,YACpCe,SAAUf,gBAAgB,SAAU,YACpCgB,SAAUhB,gBAAgB,SAAU,YACpCiB,WAAYjB,gBAAgB,SAAU,eAE1CkB,SAAU,CACNC,SAAU,eACVC,QAAS,cACTC,KAAM,aACNC,mBAAoB,wBACpBC,oBAAqB,yBACrBC,YAAa,eACbC,WAAY"}
+{"version":3,"file":"selectors.min.js","sources":["../src/selectors.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Define all of the selectors we will be using on the contentbank interface.\n *\n * @module     core_contentbank/selectors\n * @copyright  2020 Sara Arjona <sara@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\n/**\n * A small helper function to build queryable data selectors.\n *\n * @method getDataSelector\n * @param {String} name\n * @param {String} value\n * @return {string}\n */\nconst getDataSelector = (name, value) => {\n    return `[data-${name}=\"${value}\"]`;\n};\n\nexport default {\n    regions: {\n        cbcontentname: getDataSelector('region', 'cb-content-name'),\n        contentbank: getDataSelector('region', 'contentbank'),\n        filearea: getDataSelector('region', 'filearea')\n    },\n    actions: {\n        search: getDataSelector('action', 'searchcontent'),\n        clearSearch: getDataSelector('action', 'clearsearch'),\n        viewgrid: getDataSelector('action', 'viewgrid'),\n        viewlist: getDataSelector('action', 'viewlist'),\n        sortname: getDataSelector('action', 'sortname'),\n        sortuses: getDataSelector('action', 'sortuses'),\n        sortdate: getDataSelector('action', 'sortdate'),\n        sortsize: getDataSelector('action', 'sortsize'),\n        sorttype: getDataSelector('action', 'sorttype'),\n        sortauthor: getDataSelector('action', 'sortauthor'),\n    },\n    elements: {\n        listitem: '.cb-listitem',\n        heading: '.cb-heading',\n        cell: '.cb-column',\n        cbnavbarbreadcrumb: '.cb-navbar-breadbrumb',\n        cbnavbartotalsearch: '.cb-navbar-totalsearch',\n        searchinput: '[role=\"searchbox\"]',\n        sortbutton: '.cb-btnsort'\n    },\n};\n"],"names":["getDataSelector","name","value","regions","cbcontentname","contentbank","filearea","actions","search","clearSearch","viewgrid","viewlist","sortname","sortuses","sortdate","sortsize","sorttype","sortauthor","elements","listitem","heading","cell","cbnavbarbreadcrumb","cbnavbartotalsearch","searchinput","sortbutton"],"mappings":";;;;;;;;MA+BMA,gBAAkB,CAACC,KAAMC,wBACXD,kBAASC,yBAGd,CACXC,QAAS,CACLC,cAAeJ,gBAAgB,SAAU,mBACzCK,YAAaL,gBAAgB,SAAU,eACvCM,SAAUN,gBAAgB,SAAU,aAExCO,QAAS,CACLC,OAAQR,gBAAgB,SAAU,iBAClCS,YAAaT,gBAAgB,SAAU,eACvCU,SAAUV,gBAAgB,SAAU,YACpCW,SAAUX,gBAAgB,SAAU,YACpCY,SAAUZ,gBAAgB,SAAU,YACpCa,SAAUb,gBAAgB,SAAU,YACpCc,SAAUd,gBAAgB,SAAU,YACpCe,SAAUf,gBAAgB,SAAU,YACpCgB,SAAUhB,gBAAgB,SAAU,YACpCiB,WAAYjB,gBAAgB,SAAU,eAE1CkB,SAAU,CACNC,SAAU,eACVC,QAAS,cACTC,KAAM,aACNC,mBAAoB,wBACpBC,oBAAqB,yBACrBC,YAAa,qBACbC,WAAY"}

contentbank/amd/src/selectors.js

@@ -57,7 +57,7 @@ export default {
         cell: '.cb-column',
         cbnavbarbreadcrumb: '.cb-navbar-breadbrumb',
         cbnavbartotalsearch: '.cb-navbar-totalsearch',
-        searchinput: '#searchinput',
+        searchinput: '[role="searchbox"]',
         sortbutton: '.cb-btnsort'
     },
 };

grade/report/grader/tests/behat/groupsearch.feature

@@ -42,7 +42,7 @@ Feature: Group searching functionality within the grader report.
     Given I click on ".search-widget[data-searchtype='group']" "css_element"
     And I confirm "Tutor group" in "group" search within the gradebook widget exists
     And I confirm "Marker group" in "group" search within the gradebook widget exists
-    When I set the field "searchinput" to "tutor"
+    When I set the field "Search groups" to "tutor"
     And I wait "1" seconds
     Then I confirm "Tutor group" in "group" search within the gradebook widget exists
     And I confirm "Marker group" in "group" search within the gradebook widget does not exist

grade/report/singleview/tests/behat/gradeitemsearch.feature

@@ -25,7 +25,7 @@ Feature: Given we have opted to search for a grade item, Lets find and search th
     When I click on ".search-widget[data-searchtype='grade']" "css_element"
     Then I confirm "Test assignment one" in "grade" search within the gradebook widget exists
     And I confirm "Test assignment two" in "grade" search within the gradebook widget exists
-    And I set the field "searchinput" to "two"
+    And I set the field "Search grade items" to "two"
     And I wait "1" seconds
     And I confirm "Test assignment two" in "grade" search within the gradebook widget exists
     And I confirm "Test assignment one" in "grade" search within the gradebook widget does not exist

grade/report/singleview/tests/behat/usersearch.feature

@@ -27,7 +27,7 @@ Feature: Within the singleview report, a teacher can search for users.
     Then I confirm "Student 1" in "user" search within the gradebook widget exists
     And I confirm "Student 2" in "user" search within the gradebook widget exists
     And I confirm "Student 32" in "user" search within the gradebook widget exists
-    And I set the field "searchinput" to "2"
+    And I set the field "Search users" to "2"
     And I wait "1" seconds
     And I confirm "Student 2" in "user" search within the gradebook widget exists
     And I confirm "Student 32" in "user" search within the gradebook widget exists

grade/report/user/tests/behat/groupsearch.feature

@@ -44,7 +44,7 @@ Feature: Group searching functionality within the user report.
     And I click on ".search-widget[data-searchtype='group']" "css_element"
     And I confirm "Tutor group" in "group" search within the gradebook widget exists
     And I confirm "Marker group" in "group" search within the gradebook widget exists
-    When I set the field "searchinput" to "tutor"
+    When I set the field "Search groups" to "tutor"
     And I wait "1" seconds
     Then I confirm "Tutor group" in "group" search within the gradebook widget exists
     And I confirm "Marker group" in "group" search within the gradebook widget does not exist

grade/report/user/tests/behat/usersearch.feature

@@ -25,7 +25,7 @@ Feature: Within the User report, a teacher can search for users.
     Then I confirm "Student 1" in "user" search within the gradebook widget exists
     And I confirm "Student 2" in "user" search within the gradebook widget exists
     And I confirm "Student 32" in "user" search within the gradebook widget exists
-    And I set the field "searchinput" to "2"
+    And I set the field "Search users" to "2"
     And I wait "1" seconds
     And I confirm "Student 2" in "user" search within the gradebook widget exists
     And I confirm "Student 32" in "user" search within the gradebook widget exists

lib/templates/search_input_auto.mustache

@@ -38,7 +38,7 @@
 }}
 <div id="searchform-auto-{{uniqid}}" class="form-inline simplesearchform">
     <div class="input-group searchbar w-100" role="search">
-        <label for="searchinput">
+        <label for="searchinput-{{uniqid}}">
             <span class="sr-only">{{$label}}{{#str}} search, core {{/str}}{{/label}}</span>
         </label>
         <input
@@ -46,7 +46,7 @@
            role="searchbox"
            data-region="input"
            data-action="search"
-           id="searchinput"
+           id="searchinput-{{uniqid}}"
            class="form-control withclear rounded"
            placeholder="{{$placeholder}}{{#str}} search, core {{/str}}{{/placeholder}}"
            name="search"