From 8a8c8ab2755ed9233dd6c64b0654eea8ec09fdfd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mikel=20Mart=C3=ADn?= <mikel@moodle.com>
Date: Mon, 20 Jan 2025 13:01:13 +0100
Subject: [PATCH] MDL-75669 block_timeline: Fix sorting feature for BS5

- Because of the new BS5 syntax and changes in event listeners the sorting
  filter for block timeline was now working. This commit fixes the incorrect
  behaviour.
---
 blocks/timeline/amd/build/view_nav.min.js     | Bin 4993 -> 4943 bytes
 blocks/timeline/amd/build/view_nav.min.js.map | Bin 10031 -> 9957 bytes
 blocks/timeline/amd/src/view_nav.js           |   5 ++---
 .../templates/nav-view-selector.mustache      |  16 +++++++++-------
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/blocks/timeline/amd/build/view_nav.min.js b/blocks/timeline/amd/build/view_nav.min.js
index c406ce347865fb8cea64af051cf548964bb0cd34..95c65475de792bf45349da551c73ec71de8446de 100644
GIT binary patch
delta 33
pcmZovKd-i74;Pb$=H$Ix@|y*?<ykn2Q*%<2OHxxdoAG<I006s}3TXfU

delta 83
zcmX@F)~LQ=4;N$V<b7Q7#yT1XI`LVBrKv@gdMT-CiKRIuni{EkC5c7psU@0vMX9;@
nWvR|NiN(blN{PuOnPsU;o9}Qbu&^hW78RxDm276=_htbA*u5O{

diff --git a/blocks/timeline/amd/build/view_nav.min.js.map b/blocks/timeline/amd/build/view_nav.min.js.map
index 5c1c749bb884cf7dc393a48f434d8720d88effea..7f823c474ceb45b8d695aebfe9373172238a87d0 100644
GIT binary patch
delta 547
zcmZvZJx>Bb5QcMw9|>AvWrGM<=om~i#KdZ5TrPqK0U{u=IpG4xhsq%!i7~OUvD?JP
zAE60_zes<9jh(v-1%=Jd?z=NP&%FDd`EovDfo0!od)2;In?T@aNrr<*lb7Hmu;4eY
zhh3Qq9ax@x3Vkm2-Co`6PZAp!mUSm(_|4jv@y(i3CrBe-aZv?Km%u@EE@4RMbg2q1
zqRWs)%;xpJ3XI5EBMT!ll#mC<MI)8u?`C9OU+`EkoU3B!5TZB+p;jRik)+j^50Us|
zouPpHCtXqj3j+;-PDc0TF&`2nRM`%VjGh*TtqePaBF;^k!}3g~D$rn!>CHTua7{vj
zDqyRpDK%x6+tHQX8v>t^(IEJw8EqTRP^6OovWMhT6v`Ddiwil#9Gmrq;hs_0`q1Fk
z)GymGgHM>QXp_)Q8N+6}t6_v{hUceKT`tF-m-4gyYb?8_i1e4V2&&3?hFij>{Ef9&
d$E0RK)2^^5ds}X>GgGves)$E)FTb}={s7X0pV0sS

delta 623
zcmZvZK~EY%6vwkC(vV(?r(O^QrQuaBYD{~2?>SPy1?kq7<u+MXBmycdi}liDKfoN@
z@1O~u_0xFlt@n0jc9S+~_cD|J%)Iw|zkPCV+jr$`CRog7;WS#k&i>3ep(^Cwme%!G
zs)XB-oDIY1)%Gl$T*M)d<$PY*l0h_z!>!eE?lJo!EJAU9cCno5HMy<U@;mA%f4_RR
z?mNy>1%+?UuKHCNoQ{a0fjs6Ov=Cc9xQOlm=8XJ7f<P1kx`^EY_=r9X3EeXeK_W_q
z4r1q{*$2Rg?Ach@nBfz0e9*U%RCmRVmu-E(H==7QNtlqX{oZ!))Q{q!6RVw#+LsZ7
zhr5j_=>@%OGE{CGmZYC@m0(XltJ00lTf#E;ph_reJfXj^0(*0xEZFHkV8XZOd(?xv
zu1wAJ#=aTJAn+wcWHq2A8InP*pTG%<=HY)w$g4Lc=xg#n*3QYwyJYyxsmU5m5^)JU
zToJbV#umzV)?AuPgC%r3^qWbp9!g&`$Lap4+*w;B7Dfbt{snAGovYjO_<2lvDy*B{
X-cnUIW$r3Xj8rX+uW6yaZ#I4dp+vT}

diff --git a/blocks/timeline/amd/src/view_nav.js b/blocks/timeline/amd/src/view_nav.js
index 49cf234c5a3..626f35d19df 100644
--- a/blocks/timeline/amd/src/view_nav.js
+++ b/blocks/timeline/amd/src/view_nav.js
@@ -61,7 +61,7 @@ const registerTimelineDaySelector = function(root, timelineViewRoot) {
 
             var option = $(e.target).closest(SELECTORS.TIMELINE_DAY_FILTER_OPTION);
 
-            if (option.attr('aria-current') == 'true') {
+            if (option.attr('aria-selected') == 'true') {
                 // If it's already active then we don't need to do anything.
                 return;
             }
@@ -109,9 +109,8 @@ const registerViewSelector = function(root, timelineViewRoot) {
     // Listen for when the user changes tab so that we can show the first set of courses
     // and load their events when they request the sort by courses view for the first time.
     getFirst(viewSelector).querySelectorAll('[data-bs-toggle="tab"]').forEach((tab) => {
-        tab.addEventListener('shown.bs.tab', (e) => {
+        tab.addEventListener('shown.bs.tab', () => {
             View.shown(timelineViewRoot);
-            $(e.target).removeClass('active');
         });
     });
 
diff --git a/blocks/timeline/templates/nav-view-selector.mustache b/blocks/timeline/templates/nav-view-selector.mustache
index 73900a485c8..4699cc9b7ad 100644
--- a/blocks/timeline/templates/nav-view-selector.mustache
+++ b/blocks/timeline/templates/nav-view-selector.mustache
@@ -31,26 +31,28 @@
             {{#sorttimelinedates}}{{#str}} sortbydates, block_timeline {{/str}}{{/sorttimelinedates}}
         </span>
     </button>
-    <div id="menusortby" role="menu" class="dropdown-menu dropdown-menu-end list-group hidden" data-show-active-item data-skip-active-class="true">
+    <div id="menusortby" role="tablist" class="dropdown-menu dropdown-menu-end list-group hidden" data-show-active-item data-skip-active-class="true">
         <a
-            class="dropdown-item"
+            class="dropdown-item {{#sorttimelinedates}}active{{/sorttimelinedates}}"
             href="#view_dates_{{uniqid}}-{{timelineinstanceid}}"
             data-bs-toggle="tab"
             data-filtername="sortbydates"
-            {{#sorttimelinedates}}aria-current="true"{{/sorttimelinedates}}
+            {{#sorttimelinedates}}aria-selected="true"{{/sorttimelinedates}}
             aria-label="{{#str}} ariaviewselectoroption, block_timeline, {{#str}} sortbydates, block_timeline {{/str}}{{/str}}"
-            role="menuitem"
+            aria-controls="view_dates_{{uniqid}}-{{timelineinstanceid}}"
+            role="tab"
         >
             {{#str}} sortbydates, block_timeline {{/str}}
         </a>
         <a
-            class="dropdown-item"
+            class="dropdown-item {{#sorttimelinecourses}}active{{/sorttimelinecourses}}"
             href="#view_courses_{{uniqid}}-{{timelineinstanceid}}"
             data-bs-toggle="tab"
             data-filtername="sortbycourses"
-            {{#sorttimelinecourses}}aria-current="true"{{/sorttimelinecourses}}
+            {{#sorttimelinecourses}}aria-selected="true"{{/sorttimelinecourses}}
             aria-label="{{#str}} ariaviewselectoroption, block_timeline, {{#str}} sortbycourses, block_timeline {{/str}}{{/str}}"
-            role="menuitem"
+            aria-controls="view_courses_{{uniqid}}-{{timelineinstanceid}}"
+            role="tab"
         >
             {{#str}} sortbycourses, block_timeline {{/str}}
         </a>
-- 
2.43.0