From cc15134c7bef8ceb43df72681463b2ed45f37b8b Mon Sep 17 00:00:00 2001
From: Michael Hawkins <michaelh@moodle.com>
Date: Tue, 8 Oct 2019 12:46:26 +0800
Subject: [PATCH] MDL-66076 forumreport_summary: Groups filter made accessible

---
 .../report/summary/amd/build/filters.min.js   | Bin 1728 -> 2413 bytes
 .../summary/amd/build/filters.min.js.map      | Bin 6659 -> 9528 bytes
 mod/forum/report/summary/amd/src/filters.js   |  63 ++++++++++++++----
 .../summary/lang/en/forumreport_summary.php   |   1 +
 .../report/summary/templates/filters.mustache |  14 ++--
 5 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/mod/forum/report/summary/amd/build/filters.min.js b/mod/forum/report/summary/amd/build/filters.min.js
index 123433ea14b310886d293049d9f30aa539b596c1..af21835c4bb83c74bdc708168ad6fda7d028df38 100644
GIT binary patch
delta 776
zcmZ`%J#W-N5S8zatB8<5M5I9CHd3^U?A3)d$2l%Ypg^LdjDj@wj(t{qUT3|&aJrn*
zQh~@;ln6Q+enG@vK>P?QD*gcLi$UhAvE+I0?aX^KpVq!z|9I~7XQ1wgz+5<Q%xmYq
zdEdEVzIJcFlO4xFQ*=kG?@e>jWmk~`TQa{^#O8bVeC#GcT;-8YWp1Gb9l9YG7(<n5
zW(ypI*w3IWDVd}~U{08ibg<2qzB%r!n`ixN=0k7OyzQ(zvH9G4<%9;V>?NVQC^Cp}
zin$(>P--owq-iVyA)~5Bc!K&-wj%A#9}7z2G}EZOM9Hcsy|A(}+tJ1UDQw4$Gaq?W
zkN6}lHCH&5Gi*&Oc!~Of)+)8nSpZZD9zHK17bu837&2e9^wuvWq0T*7=`79BD^xlK
zHMhRow4ZG(^KOfR{J26je~KAKS}ID?yr?u`JhqNYYF;`6bF0tmxOxdCo90VzbXLg1
zj;t)p?tmQOT*#B0xP&)pz-l`saodYZV@kJof*=4MO+f8Sfv2ZU!9H>MzjN;oLQ`l6
zY-?+{3x`~TvWsYikYS$a30nX!6wd6T9$sDqWqx^*>S#jYFVVs9kS!u8k(4X<9%LCA
t*Eg|o;D-v~$X}t2sVGBGWGw8B{R1swhGbkP^!r8pimK5pm*z!(^aI|*4!QsU

delta 187
zcmaDWbbxomB*w``Ocs-uF!oNKz$meJ784_Libmq(L{{O+8<>^h?3c`%lWUn|C+o8`
zPJYSa$*ftOI{6@n<m4mlij&W?a!l@K^<_+%e3R8lJVmFvASW?7H8(Y{#7ZeCzoaBT
zSE*JLs7p;sNmH*VH8;O3)j21zxL89eBQqr>HBU(sC~e3jH#wDEk4dw7@+%fqX`sr)
SloT{&)+ri_hMJR2IV}Jc<vim6

diff --git a/mod/forum/report/summary/amd/build/filters.min.js.map b/mod/forum/report/summary/amd/build/filters.min.js.map
index 4b9132aeeeb64e50ae23dd9c4da268c5219806c5..41efa75b4afb0093c7dc8b1b7234744b9b249d71 100644
GIT binary patch
delta 3421
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
E2Z;va9RL6T

delta 924
zcmah{Jxo(k6wZS_N@-}2-&9)K1_5iXBtnfko_F7CDV0`2D<YcspbrEeeWgGA=%9wx
zL2?EcCr#W*7dH|U2L}_`T^*c^qYmIbx5a=AzTxENobP_;`@Z|$PwvECt~EJ@-D+X?
z*NCrJvNo(jMYopBs$IdLvX1-8M5~$4bK5MJvE1~nV-diZWE>#Q41nnr-ggama%yC$
zENh|~t2*v9e{3@#2P^@Q<aprf?UMkVP_v@&RW4^aJalQw9R&4!+Z<a2NQ<_C>9)SU
z1;VDNaDz?JL>$dIL^XQuCY>{+A<2>eQwjX6_A7A=sl9ll4k%MN&@$Ats$sw#4gI5!
z-{3QJeT~Ed&*F=g3yO|=EyHJ!TW65{UbA6-Mbn8r{vUSQL9Tg)*2Q(9IaQBkMeYY6
z#0)-f?Z&rmfBTlkrbV*U<lFek9aHjn=pJa7(Lzr4m+(@n@$?qa&H;sHFh}6!n{4td
z#j+)3jd7L%7?)>9XSqi9<N71HTgJdyRclDRD+rGjN>-Xk)-lc2h<04wyRHdZ-1hh*
z)e|1-3KIhI*Fa3en&+bL+UeGJ&$2G*H;?IK+EtCs0*ESnY;t0d4)}y<WGS?U(NjO)
z2k+o?!;@hf^&n1g#^l;M=ep!9alw=T;YF+w@1JZuOPZq0(5}bv+Pv?bim!vdj*1gr
zv@Np~URtp$R;i4mkr2M=VW@W>;ctI?t*duI#aDqV9)Wyl7V@@*Ujw(Bqv0pD`QR7D
vJ$kPY79ai$1aYtHGX98kVleVRiQ<00-&b^s&W2Sw0a8ZL8+e92LxX<+iD?EN

diff --git a/mod/forum/report/summary/amd/src/filters.js b/mod/forum/report/summary/amd/src/filters.js
index cac7f920763..3aa22142650 100644
--- a/mod/forum/report/summary/amd/src/filters.js
+++ b/mod/forum/report/summary/amd/src/filters.js
@@ -37,14 +37,20 @@ export const init = (root) => {
 
     // Generic filter handlers.
 
-    // Event handler to clear filters.
-    $(root).on("click", ".filter-clear", function(event) {
+    // Called to clear filters.
+    var clearAll = (event) => {
         // Clear checkboxes.
         let selected = event.target.parentNode.parentNode.parentElement.querySelectorAll('input[type="checkbox"]:checked');
 
         selected.forEach(function(checkbox) {
             checkbox.checked = false;
         });
+    };
+
+    // Event handler for clearing filter by clicking option.
+    $(root).on("click", ".filter-clear", function(event) {
+        event.preventDefault();
+        clearAll(event);
     });
 
     // Called to override click event to trigger a proper generate request with filtering.
@@ -87,10 +93,20 @@ export const init = (root) => {
         });
     };
 
+    // Submit report via filter
+    var submitWithFilter = (containerelement) => {
+        // Close the container (eg popover).
+        $(containerelement).addClass('hidden');
+
+        // Submit the filter values and re-generate report.
+        generateWithFilters(false);
+    };
+
     // Groups filter specific handlers.
 
-    // Event to handle select all groups.
-    $('#filter-groups-popover .select-all').on('click', function() {
+    // Event handler for clicking select all groups.
+    $('#filter-groups-popover .select-all').on('click', function(event) {
+        event.preventDefault();
         selectAll('filter-groups-popover');
     });
 
@@ -102,16 +118,39 @@ export const init = (root) => {
 
         new Popper(referenceElement, popperContent, {placement: 'bottom'});
 
-        // Show popover.
-        $('#filter-groups-popover').removeClass('hidden');
+        // Show popover and switch focus.
+        var groupsbutton = document.getElementById('filter-groups-button'),
+            groupspopover = document.getElementById('filter-groups-popover');
+        groupspopover.classList.remove('hidden');
+        groupsbutton.setAttribute('aria-expanded', true);
+        groupsbutton.classList.add('btn-outline-primary');
+        groupsbutton.classList.remove('btn-primary');
+        groupspopover.querySelector('input').focus();
     });
 
-    // Event handler to save groups filter.
-    $(root).on("click", "#filter-groups-popover .filter-save", function() {
-        // Close the popover.
-        $('#filter-groups-popover').addClass('hidden');
+    // Event handler to click save groups filter.
+    $(root).on("click", "#filter-groups-popover .filter-save", function(event) {
+        event.preventDefault();
+        submitWithFilter('#filter-groups-popover');
+    });
 
-        // Submit the filter values and re-generate report.
-        generateWithFilters(false);
+    // Event handler to support pressing enter/space on groups filter popover actions.
+    $('#filter-groups-popover').on("keydown", ".filter-actions", function(event) {
+    if ((event.charCode === 13 || event.keyCode === 13 || event.charCode === 32 || event.keyCode === 32)
+                && event.target.classList.length > 0) {
+            event.preventDefault();
+
+            switch(event.target.classList[0]) {
+                case 'select-all':
+                    selectAll('filter-groups-popover');
+                    break;
+                case 'filter-clear':
+                    clearAll(event);
+                    break;
+                case 'filter-save':
+                    submitWithFilter('#filter-groups-popover');
+                    break;
+            }
+        }
     });
 };
diff --git a/mod/forum/report/summary/lang/en/forumreport_summary.php b/mod/forum/report/summary/lang/en/forumreport_summary.php
index 97cebba2376..d3bb447dc47 100644
--- a/mod/forum/report/summary/lang/en/forumreport_summary.php
+++ b/mod/forum/report/summary/lang/en/forumreport_summary.php
@@ -25,6 +25,7 @@
 $string['attachmentcount'] = 'Number of attachments';
 $string['viewcount'] = 'Number of views';
 $string['earliestpost'] = 'Earliest post';
+$string['filter:groupsbuttonlabel'] = 'Open the groups filter';
 $string['filter:groupsname'] = 'Groups';
 $string['filter:groupscountall'] = 'Groups (all)';
 $string['filter:groupscountnumber'] = 'Groups ({$a})';
diff --git a/mod/forum/report/summary/templates/filters.mustache b/mod/forum/report/summary/templates/filters.mustache
index 426b19dc187..ec243aea056 100644
--- a/mod/forum/report/summary/templates/filters.mustache
+++ b/mod/forum/report/summary/templates/filters.mustache
@@ -44,7 +44,8 @@
         <input type="hidden" name="submitted" value="true">
         <div id="filtersbuttons">
             {{#hasgroups}}
-            <button type="button" id="filter-groups-button" class="btn btn-primary filter-button">
+            <button type="button" id="filter-groups-button" class="btn btn-primary rounded p-1" aria-expanded="false"
+                    aria-haspopup="true" aria-label="{{# str}} filter:groupsbuttonlabel, forumreport_summary {{/ str}}">
                 {{filtergroupsname}}
             </button>
 
@@ -61,10 +62,13 @@
                         {{/filtergroups}}
                         <br>
                     </div>
-                    <a href="#"><span class="select-all">{{# str}} selectall {{/ str}}</span></a>
-                    <div class="float-right">
-                        <a href="#"><span class="filter-clear p-1">{{# str}} clear {{/ str}}</span></a>
-                        <a href="#"><span class="filter-save"><strong>{{# str}} save {{/ str}}</strong></span></a>
+                    <div class="filter-actions">
+                        <button type="button" class="select-all btn btn-link p-0 p-r-1" aria-label="{{# str}} selectall {{/ str}}">{{# str}} selectall {{/ str}}</button>
+                        <div class="float-right">
+                            <button type="button" class="filter-clear btn btn-link p-0 p-r-1" aria-label="{{# str}} clear {{/ str}}">{{# str}} clear {{/ str}}</button>
+                            <button type="button" class="filter-save btn btn-link p-0" aria-label="{{# str}} save {{/ str}}">
+                                    <strong>{{# str}} save {{/ str}}</strong></button>
+                        </div>
                     </div>
                 </div>
             </div>
-- 
2.43.0