Merge branch 'ag-325650-admin-license-nav-bar-does-not-display-active-status' into 'master'

Add controller path to helper to display active state

See merge request gitlab-org/gitlab!57214

ee/app/helpers/admin/navbar_helper.rb

@@ -2,6 +2,10 @@
 
 module Admin
   module NavbarHelper
+    def navbar_controller_path
+      cloud_license_enabled? ? 'admin/cloud_licenses' : 'admin/licenses'
+    end
+
     def navbar_item_name
       cloud_license_enabled? ? _('Cloud License') : _('License')
     end

ee/app/views/layouts/nav/sidebar/_licenses_link.html.haml

-= nav_link(controller: controller) do
+= nav_link(controller: navbar_controller_path) do
   = link_to navbar_item_path, class: "qa-link-license-menu" do
     .nav-icon-container
       = sprite_icon('license')

ee/changelogs/unreleased/ag-325650-admin-license-nav-bar-does-not-display-active-status.yml

+---
+title: Fix active state for license link in navigation bar
+merge_request: 57214
+author:
+type: fixed

ee/spec/helpers/admin/navbar_helper_spec.rb

@@ -10,6 +10,10 @@ RSpec.describe Admin::NavbarHelper do
       stub_application_setting(cloud_license_enabled: true)
     end
 
+    it 'returns the correct controller path' do
+      expect(helper.navbar_controller_path).to eq('admin/cloud_licenses')
+    end
+
     it 'returns the correct navbar item name' do
       expect(helper.navbar_item_name).to eq('Cloud License')
     end
@@ -24,6 +28,10 @@ RSpec.describe Admin::NavbarHelper do
       stub_application_setting(cloud_license_enabled: false)
     end
 
+    it 'returns the correct controller path' do
+      expect(helper.navbar_controller_path).to eq('admin/licenses')
+    end
+
     it 'returns the correct navbar item name' do
       expect(helper.navbar_item_name).to eq('License')
     end