From 54fba2005fba800d3e10b3f2d0feafe53bf3b71b Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Wed, 10 Jul 2024 11:58:52 +1000 Subject: [PATCH] DEV: Remove findBy usage in admin-sidebar (#27813) We prefer not to use these Ember array extensions anymore --- .../app/lib/sidebar/admin-sidebar.js | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/admin-sidebar.js b/app/assets/javascripts/discourse/app/lib/sidebar/admin-sidebar.js index 4388645144b..d8b12ba63f8 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/admin-sidebar.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/admin-sidebar.js @@ -184,7 +184,9 @@ export function useAdminNavConfig(navMap) { for (const [sectionName, additionalLinks] of Object.entries( additionalAdminSidebarSectionLinks )) { - const section = navMap.findBy("name", sectionName); + const section = navMap.find( + (navSection) => navSection.name === sectionName + ); if (section && additionalLinks.length) { section.links.push(...additionalLinks); } @@ -286,7 +288,9 @@ export default class AdminSidebarPanel extends BaseCustomSidebarPanel { const navMap = savedConfig || ADMIN_NAV_MAP; if (!session.get("safe_mode")) { - const pluginLinks = navMap.findBy("name", "plugins").links; + const pluginLinks = navMap.find( + (section) => section.name === "plugins" + ).links; pluginAdminRouteLinks().forEach((pluginLink) => { if (!pluginLinks.mapBy("name").includes(pluginLink.name)) { pluginLinks.push(pluginLink); @@ -311,21 +315,25 @@ export default class AdminSidebarPanel extends BaseCustomSidebarPanel { }); if (siteSettings.experimental_form_templates) { - navMap.findBy("name", "appearance").links.push({ - name: "admin_customize_form_templates", - route: "adminCustomizeFormTemplates", - label: "admin.form_templates.nav_title", - icon: "list", - }); + navMap + .find((section) => section.name === "appearance") + .links.push({ + name: "admin_customize_form_templates", + route: "adminCustomizeFormTemplates", + label: "admin.form_templates.nav_title", + icon: "list", + }); } if (currentUser.show_experimental_flags_admin_page) { - navMap.findBy("name", "community").links.push({ - name: "admin_moderation_flags", - route: "adminConfig.flags", - label: "admin.community.sidebar_link.moderation_flags", - icon: "flag", - }); + navMap + .find((section) => section.name === "community") + .links.push({ + name: "admin_moderation_flags", + route: "adminConfig.flags", + label: "admin.community.sidebar_link.moderation_flags", + icon: "flag", + }); } navMap.forEach((section) =>