discourse · lis2 · Apr 28, 2025 · Apr 28, 2025 · Apr 28, 2025 · tgxworld
diff --git a/app/assets/javascripts/admin/addon/components/admin-search.gjs b/app/assets/javascripts/admin/addon/components/admin-search.gjs
@@ -6,11 +6,13 @@ import didUpdate from "@ember/render-modifiers/modifiers/did-update";
 import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
 import { TrackedObject } from "@ember-compat/tracked-built-ins";
+import { and, not } from "truth-helpers";
 import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
 import DButton from "discourse/components/d-button";
 import icon from "discourse/helpers/d-icon";
 import discourseDebounce from "discourse/lib/debounce";
 import { INPUT_DELAY } from "discourse/lib/environment";
+import { escapeExpression } from "discourse/lib/utilities";
 import autoFocus from "discourse/modifiers/auto-focus";
 import { i18n } from "discourse-i18n";
 import AdminSearchFilters from "admin/components/admin-search-filters";
@@ -62,6 +64,12 @@ export default class AdminSearch extends Component {
     return !this.adminSearchDataSource.isLoaded || this.loading;
   }
 
+  get noResultsDescription() {
+    return i18n("admin.search.no_results", {
+      filter: escapeExpression(this.filter),
+    });
+  }
+
   @action
   toggleFilters() {
     this.showFilters = !this.showFilters;
@@ -91,7 +99,9 @@ export default class AdminSearch extends Component {
   changeSearchTerm(event) {
     this.searchResults = [];
     this.filter = event.target.value;
-    this.runSearch();
+    if (this.filter.length > 0) {
+      this.runSearch();
+    }
   }
 
   @action
@@ -219,6 +229,11 @@ export default class AdminSearch extends Component {
             </a>
           </div>
         {{/each}}
+        {{#if (and (not this.searchResults) this.filter)}}
+          <p class="admin-search__no-results">
+            {{this.noResultsDescription}}
+          </p>
+        {{/if}}
       </ConditionalLoadingSpinner>
     </div>
   </template>

diff --git a/app/assets/javascripts/discourse/app/components/sidebar/filter-no-results.gjs b/app/assets/javascripts/discourse/app/components/sidebar/filter-no-results.gjs
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/filter.gjs b/app/assets/javascripts/discourse/app/components/sidebar/filter.gjs
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/panel-header.gjs b/app/assets/javascripts/discourse/app/components/sidebar/panel-header.gjs
@@ -1,8 +1,6 @@
 import Component from "@glimmer/component";
 import { service } from "@ember/service";
 import BackToForum from "./back-to-forum";
-import Filter from "./filter";
-import FilterNoResults from "./filter-no-results";
 import ToggleAllSections from "./toggle-all-sections";
 
 export default class PanelHeader extends Component {
@@ -19,11 +17,7 @@ export default class PanelHeader extends Component {
           <BackToForum />
           <ToggleAllSections @sections={{@sections}} />
         </div>
-        <div class="sidebar-panel-header__row">
-          <Filter />
-        </div>
       </div>
-      <FilterNoResults @sections={{@sections}} />
     {{/if}}
   </template>
 }
diff --git a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
@@ -50,8 +50,6 @@ const DEFAULT_BINDINGS = {
   "!": { postAction: "showFlags" },
   "#": { handler: "goToPost", anonymous: true },
   "/": { handler: "toggleSearch", anonymous: true },
-  "meta+/": { handler: "filterSidebar", anonymous: true },
-  [`${PLATFORM_KEY_MODIFIER}+/`]: { handler: "filterSidebar", anonymous: true },
   "ctrl+alt+f": { handler: "toggleSearch", anonymous: true, global: true },
   "=": { handler: "toggleHamburgerMenu", anonymous: true },
   "?": { handler: "showHelpModal", anonymous: true },
@@ -495,14 +493,6 @@ export default {
     composer.focusComposer(event);
   },
 
-  filterSidebar() {
-    const filterInput = document.querySelector(".sidebar-filter__input");
-
-    if (filterInput) {
-      this._scrollTo(0);
-    }
-  },
-
   fullscreenComposer() {
     const composer = getOwner(this).lookup("service:composer");
     if (composer.get("model")) {

diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/admin-nav-map.js b/app/assets/javascripts/discourse/app/lib/sidebar/admin-nav-map.js
@@ -12,14 +12,6 @@ export const ADMIN_NAV_MAP = [
         icon: "house",
         moderator: true,
       },
-      {
-        name: "admin_users",
-        route: "adminUsers",
-        label: "admin.config.users.title",
-        description: "admin.config.users.header_description",
-        icon: "users",
-        moderator: true,
-      },
       {
         name: "admin_search",
         route: "adminSearch",
@@ -28,6 +20,14 @@ export const ADMIN_NAV_MAP = [
         icon: "magnifying-glass",
         moderator: true,
       },
+      {
+        name: "admin_users",
+        route: "adminUsers",
+        label: "admin.config.users.title",
+        description: "admin.config.users.header_description",
+        icon: "users",
+        moderator: true,
+      },
       {
         name: "admin_groups",
         route: "adminGroups",

diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/admin-sidebar.js b/app/assets/javascripts/discourse/app/lib/sidebar/admin-sidebar.js
@@ -1,6 +1,5 @@
 import { cached } from "@glimmer/tracking";
 import { warn } from "@ember/debug";
-import { htmlSafe } from "@ember/template";
 import { configNavForPlugin } from "discourse/lib/admin-plugin-config-nav";
 import { adminRouteValid } from "discourse/lib/admin-utilities";
 import { getOwnerWithFallback } from "discourse/lib/get-owner";
@@ -11,7 +10,6 @@ import BaseCustomSidebarPanel from "discourse/lib/sidebar/base-custom-sidebar-pa
 import BaseCustomSidebarSection from "discourse/lib/sidebar/base-custom-sidebar-section";
 import BaseCustomSidebarSectionLink from "discourse/lib/sidebar/base-custom-sidebar-section-link";
 import { ADMIN_PANEL } from "discourse/lib/sidebar/panels";
-import { escapeExpression } from "discourse/lib/utilities";
 import I18n, { i18n } from "discourse-i18n";
 
 let additionalAdminSidebarSectionLinks = {};
@@ -409,21 +407,4 @@ export default class AdminSidebarPanel extends BaseCustomSidebarPanel {
       );
     });
   }
-
-  get filterable() {
-    return true;
-  }
-
-  filterNoResultsDescription(filter) {
-    const escapedFilter = escapeExpression(filter);
-
-    return htmlSafe(
-      i18n("sidebar.no_results.description_admin_search", {
-        filter: escapedFilter,
-        admin_search_url: getURL(
-          `/admin/search?filter=${encodeURIComponent(filter)}`
-        ),
-      })
-    );
-  }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-panel.js b/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-panel.js
@@ -50,13 +50,6 @@ export default class BaseCustomSidebarPanel {
     return false;
   }
 
-  /**
-   * @returns {boolean} Controls whether the filter is shown
-   */
-  get filterable() {
-    return false;
-  }
-
   get expandActiveSection() {
     return false;
   }
@@ -65,17 +58,6 @@ export default class BaseCustomSidebarPanel {
     return false;
   }
 
-  /**
-   * @param {string} filter filter applied
-   *
-   * @returns {string | SafeString} Description displayed when the applied filter has no results.
-   * Use `htmlSafe` from `from "@ember/template` to use HTML strings.
-   */
-  // eslint-disable-next-line no-unused-vars
-  filterNoResultsDescription(filter) {
-    return null;
-  }
-
   #notImplemented() {
     throw "not implemented";
   }

diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-sidebar-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-sidebar-section-test.js
@@ -1,4 +1,4 @@
-import { click, fillIn, triggerKeyEvent, visit } from "@ember/test-helpers";
+import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import { AUTO_GROUPS } from "discourse/lib/constants";
 import { withPluginApi } from "discourse/lib/plugin-api";
@@ -64,25 +64,6 @@ acceptance("Admin Sidebar - Sections", function (needs) {
       .exists("advanced section is displayed");
   });
 
-  test("filter sections and clear filter with ESC", async function (assert) {
-    await visit("/admin");
-    await fillIn(".sidebar-filter__input", "advanced");
-    assert
-      .dom(".sidebar-section[data-section-name='admin-plugins']")
-      .doesNotExist("plugins section is hidden");
-    assert
-      .dom(".sidebar-section[data-section-name='admin-advanced']")
-      .exists("advanced section is displayed");
-
-    await triggerKeyEvent(".sidebar-filter__input", "keydown", "Escape");
-    assert
-      .dom(".sidebar-section[data-section-name='admin-plugins']")
-      .exists("plugins section is displayed");
-    assert
-      .dom(".sidebar-section[data-section-name='admin-advanced']")
-      .exists("advanced section is displayed");
-  });
-
   test("enabled plugin admin routes have links added", async function (assert) {
     await visit("/admin");
     await click(".sidebar-toggle-all-sections");

diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -229,10 +229,6 @@
   .badge-notification {
     vertical-align: text-bottom;
   }
-
-  .sidebar-filter {
-    width: 100%;
-  }
 }
 
 .search-menu .menu-panel {