From b027a0c3422b8ed098901d3d079042cf043acd49 Mon Sep 17 00:00:00 2001
From: Ridhwana <Ridhwana.Khan16@gmail.com>
Date: Wed, 28 Apr 2021 21:33:29 +0200
Subject: [PATCH] fix: change aria-page to aria-current (#13558)

---
 .../controllers/sidebar_controller.test.js     | 18 +++++++++---------
 .../admin/shared/_nested_sidebar.html.erb      |  4 ++--
 app/views/layouts/admin.html.erb               |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/javascript/admin/__tests__/controllers/sidebar_controller.test.js b/app/javascript/admin/__tests__/controllers/sidebar_controller.test.js
index c783a90a1..1c3aaeedc 100644
--- a/app/javascript/admin/__tests__/controllers/sidebar_controller.test.js
+++ b/app/javascript/admin/__tests__/controllers/sidebar_controller.test.js
@@ -13,7 +13,7 @@ describe('SidebarController', () => {
       <nav class="hidden m:block">
         <ul>
           <li>
-              <a class="crayons-link crayons-link--block " href="/admin/permissions" aria-page="" data-action="click->sidebar#expandDropdown">
+              <a class="crayons-link crayons-link--block " href="/admin/permissions" data-action="click->sidebar#expandDropdown">
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="dropdown-icon crayons-icon" role="img"><path d="M4 22a8 8 0 1 1 16 0h-2a6 6 0 1 0-12 0H4zm8-9c-3.315 0-6-2.685-6-6s2.685-6 6-6 6 2.685 6 6-2.685 6-6 6zm0-2c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4z"></path></svg>
                 Admin Team
               </a>
@@ -25,22 +25,22 @@ describe('SidebarController', () => {
             </button>
             <ul id="advanced" data-sidebar-target="submenu" class="collapse hide">
               <li>
-                <a class="crayons-link crayons-link--block ml-7 " href="/admin/advanced/broadcasts" aria-page="">
+                <a class="crayons-link crayons-link--block ml-7 " href="/admin/advanced/broadcasts">
                   Broadcasts
                 </a>
               </li>
               <li>
-                <a class="crayons-link crayons-link--block ml-7 " href="/admin/advanced/response_templates" aria-page="">
+                <a class="crayons-link crayons-link--block ml-7 " href="/admin/advanced/response_templates">
                   Response Templates
                 </a>
               </li>
               <li>
-                <a class="crayons-link crayons-link--block ml-7 " href="/admin/advanced/sponsorships" aria-page="">
+                <a class="crayons-link crayons-link--block ml-7 " href="/admin/advanced/sponsorships">
                   Sponsorships
                 </a>
               </li>
               <li>
-                <a class="crayons-link crayons-link--block ml-7 " href="/admin/advanced/tools" aria-page="">
+                <a class="crayons-link crayons-link--block ml-7 " href="/admin/advanced/tools">
                   Developer Tools
                 </a>
               </li>
@@ -54,22 +54,22 @@ describe('SidebarController', () => {
             </button>
             <ul id="apps" data-sidebar-target="submenu" class="expand show">
               <li>
-                <a class="crayons-link crayons-link--block ml-7 fw-bold" href="/admin/apps/chat_channels" aria-page="page">
+                <a class="crayons-link crayons-link--block ml-7 fw-bold" href="/admin/apps/chat_channels">
                   Chat Channels
                 </a>
               </li>
               <li>
-                <a class="crayons-link crayons-link--block ml-7 " href="/admin/apps/events" aria-page="">
+                <a class="crayons-link crayons-link--block ml-7 " href="/admin/apps/events">
                   Events
                 </a>
               </li>
               <li>
-                <a class="crayons-link crayons-link--block ml-7 " href="/admin/apps/listings" aria-page="">
+                <a class="crayons-link crayons-link--block ml-7 " href="/admin/apps/listings">
                   Listings
                 </a>
               </li>
               <li>
-                <a class="crayons-link crayons-link--block ml-7 " href="/admin/apps/welcome" aria-page="">
+                <a class="crayons-link crayons-link--block ml-7 " href="/admin/apps/welcome">
                   Welcome
                 </a>
               </li>
diff --git a/app/views/admin/shared/_nested_sidebar.html.erb b/app/views/admin/shared/_nested_sidebar.html.erb
index dcfd18570..38512f4a0 100644
--- a/app/views/admin/shared/_nested_sidebar.html.erb
+++ b/app/views/admin/shared/_nested_sidebar.html.erb
@@ -4,7 +4,7 @@
       <% if group[:children][0][:visible] %>
         <a class="crayons-link crayons-link--block <%= "crayons-link--current" if deduced_scope(request) == group[:children][0][:controller] %>"
            href="/admin/<%= group[:children][0][:controller] %>"
-           aria-page="<%= "page" if deduced_controller(request) == group[:children][0][:controller] %>"
+           aria-current="<%= "page" if deduced_controller(request) == group[:children][0][:controller] %>"
            data-action="click->sidebar#expandDropdown">
           <%= inline_svg_tag(group[:svg], aria_hidden: true, class: "dropdown-icon crayons-icon") %>
           <%= display_name(group_name) %>
@@ -30,7 +30,7 @@
             <li>
               <a class="crayons-link crayons-link--block ml-7 <%= "fw-bold" if deduced_controller(request) == item[:controller].to_s %>"
                  href="/admin/<%= group_name %>/<%= item[:controller] %>"
-                 aria-page="<%= "page" if deduced_controller(request) == item[:controller].to_s %>">
+                 aria-current="<%= "page" if deduced_controller(request) == item[:controller].to_s %>">
                 <%= item[:name].to_s.titleize %>
               </a>
             </li>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index c1f04b529..09bfff613 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -56,7 +56,7 @@
         <% if FeatureFlag.enabled?(:admin_restructure) %>
           <ul>
             <li>
-              <a class="crayons-link crayons-link--block <%= "crayons-link--current" if controller.controller_name == "overview" %>" href="<%= admin_path %>" aria-page="<%= "page" if controller.controller_name == "overview" %>">
+              <a class="crayons-link crayons-link--block <%= "crayons-link--current" if controller.controller_name == "overview" %>" href="<%= admin_path %>" aria-current"<%= "page" if controller.controller_name == "overview" %>">
                 <%= inline_svg_tag("stack-line.svg", aria: true, class: "dropdown-icon crayons-icon") %>
                 Overview
               </a>