A platform for community discussion. Free, open, simple.
FIX: Admin sidebar links corrupted when toggling upcoming changes (#38828)
Régis Hanol27d59a339e0b
diff --git a/frontend/discourse/admin/services/admin-nav-manager.js b/frontend/discourse/admin/services/admin-nav-manager.jsindex 0e9c9fa6320..7edcc928939 100644--- a/frontend/discourse/admin/services/admin-nav-manager.js+++ b/frontend/discourse/admin/services/admin-nav-manager.js@@ -6,8 +6,18 @@ import { ADMIN_NAV_MAP } from "discourse/lib/sidebar/admin-nav-map";export default class AdminNavManager extends Service {@service currentUser;- #adminNavMap = cloneJSON(ADMIN_NAV_MAP);- #filteredNavMap = null;+ #adminNavMap;+ #filteredNavMap;++ constructor() {+ super(...arguments);+ this.resetNavMap();+ }++ resetNavMap() {+ this.#adminNavMap = cloneJSON(ADMIN_NAV_MAP);+ this.#filteredNavMap = null;+ }get filteredNavMap() {if (this.#filteredNavMap) {diff --git a/frontend/discourse/app/lib/sidebar/admin-sidebar.js b/frontend/discourse/app/lib/sidebar/admin-sidebar.jsindex 4170e9d78e9..b531a380e5f 100644--- a/frontend/discourse/app/lib/sidebar/admin-sidebar.js+++ b/frontend/discourse/app/lib/sidebar/admin-sidebar.js@@ -359,18 +359,13 @@ export default class AdminSidebarPanel extends BaseCustomSidebarPanel {"service:admin-nav-manager");+ this.adminNavManager.resetNavMap();+if (!session.get("safe_mode")) {- const existingPluginLinkNames = this.adminNavManager- .findSection("plugins")- .links.map((link) => link.name);- const pluginLinksToAdd = pluginAdminRouteLinks(router)- .map((pluginLink) => {- if (!existingPluginLinkNames.includes(pluginLink.name)) {- return pluginLink;- }- })- .filter((item) => item != null);- this.adminNavManager.amendLinksToSection("plugins", pluginLinksToAdd);+ this.adminNavManager.amendLinksToSection(+ "plugins",+ pluginAdminRouteLinks(router)+ );this.adminSidebarStateManager.setLinkKeywords("admin_installed_plugins",@@ -378,25 +373,16 @@ export default class AdminSidebarPanel extends BaseCustomSidebarPanel {);if (site.admin_config_login_routes) {- const adminLoginRoutesToAdd = () => {- const routes = [];-- site.admin_config_login_routes.forEach((routeName) => {- routes.push({- name: `admin_login_${routeName}`,- route: `adminConfig.login.plugin-tab`,- routeModels: [routeName],- icon: "unlock",- label: `admin.config.login.sub_pages.${routeName}`,- settings_area: routeName,- });- });- return routes;- };-this.adminNavManager.amendLinksToSubSection("admin_login",- adminLoginRoutesToAdd()+ site.admin_config_login_routes.map((routeName) => ({+ name: `admin_login_${routeName}`,+ route: `adminConfig.login.plugin-tab`,+ routeModels: [routeName],+ icon: "unlock",+ label: `admin.config.login.sub_pages.${routeName}`,+ settings_area: routeName,+ })));}}@@ -431,22 +417,16 @@ export default class AdminSidebarPanel extends BaseCustomSidebarPanel {]);}- const rootSection = this.adminNavManager.findSection("root");- const linkExists = rootSection?.links.some(- (link) => link.name === "admin_upcoming_changes"- );- if (!linkExists) {- this.adminNavManager.amendLinksToSection("root", [- {- name: "admin_upcoming_changes",- route: "adminConfig.upcomingChanges",- label: "admin.config.upcoming_changes.title",- description: "admin.config.upcoming_changes.header_description",- icon: "flask",- keywords: "admin.config.upcoming_changes.keywords",- },- ]);- }+ this.adminNavManager.amendLinksToSection("root", [+ {+ name: "admin_upcoming_changes",+ route: "adminConfig.upcomingChanges",+ label: "admin.config.upcoming_changes.title",+ description: "admin.config.upcoming_changes.header_description",+ icon: "flask",+ keywords: "admin.config.upcoming_changes.keywords",+ },+ ]);for (const [sectionName, additionalLinks] of Object.entries(additionalAdminSidebarSectionLinksdiff --git a/spec/system/admin_upcoming_changes_sidebar_spec.rb b/spec/system/admin_upcoming_changes_sidebar_spec.rbnew file mode 100644index 00000000000..90042c2b55d--- /dev/null+++ b/spec/system/admin_upcoming_changes_sidebar_spec.rb@@ -0,0 +1,51 @@+# frozen_string_literal: true++describe "Admin upcoming changes sidebar interaction" do+ fab!(:current_user, :admin)+ let(:upcoming_changes_page) { PageObjects::Pages::AdminUpcomingChanges.new }+ let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }+ let(:form_templates_link_css) do+ ".sidebar-section-link[data-link-name='admin_customize_form_templates']"+ end++ before do+ mock_upcoming_change_metadata(+ {+ enable_form_templates: {+ impact: "feature,all_members",+ status: :experimental,+ impact_type: "feature",+ impact_role: "all_members",+ },+ },+ )++ SiteSetting.enable_form_templates = false+ sign_in(current_user)+ end++ it "adds the form templates sidebar link when the upcoming change is enabled" do+ upcoming_changes_page.visit++ upcoming_changes_page.change_item(:enable_form_templates).select_enabled_for("everyone")+ expect(upcoming_changes_page).to have_enabled_for_success_toast("everyone")++ upcoming_changes_page.visit+ sidebar.toggle_all_sections++ expect(page).to have_css(form_templates_link_css)+ end++ it "removes the form templates sidebar link when the upcoming change is disabled" do+ SiteSetting.enable_form_templates = true+ upcoming_changes_page.visit++ upcoming_changes_page.change_item(:enable_form_templates).select_enabled_for("no_one")+ expect(upcoming_changes_page).to have_disabled_success_toast++ upcoming_changes_page.visit+ sidebar.toggle_all_sections++ expect(page).to have_no_css(form_templates_link_css)+ end+end