From fd02856f8069031240b20bd84c6ddbf468665327 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Wed, 29 Jul 2020 14:57:05 +0300
Subject: [PATCH] FIX: Keep category name in URL when filtering (#10317)

---
 .../admin/controllers/admin-site-settings.js  |  2 +-
 .../acceptance/admin-site-settings-test.js    | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js b/app/assets/javascripts/admin/controllers/admin-site-settings.js
index 04826ca1331..cfb40d34d03 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings.js
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js
@@ -105,7 +105,7 @@ export default Controller.extend({
     if (this._skipBounce) {
       this.set("_skipBounce", false);
     } else {
-      this.filterContentNow();
+      this.filterContentNow(this.categoryNameKey);
     }
   }, INPUT_DELAY),
 
diff --git a/test/javascripts/acceptance/admin-site-settings-test.js b/test/javascripts/acceptance/admin-site-settings-test.js
index f02d093b392..15778ecddf1 100644
--- a/test/javascripts/acceptance/admin-site-settings-test.js
+++ b/test/javascripts/acceptance/admin-site-settings-test.js
@@ -10,7 +10,7 @@ acceptance("Admin - Site Settings", {
   },
 
   pretend(server, helper) {
-    server.put("/admin/site_settings/title", (body) => {
+    server.put("/admin/site_settings/title", body => {
       titleOverride = body.requestBody.split("=")[1];
       return helper.response({ success: "OK" });
     });
@@ -22,14 +22,14 @@ acceptance("Admin - Site Settings", {
         titleSetting.value = titleOverride;
       }
       const response = {
-        site_settings: [titleSetting, ...fixtures.slice(1)],
+        site_settings: [titleSetting, ...fixtures.slice(1)]
       };
       return helper.response(response);
     });
-  },
+  }
 });
 
-QUnit.test("upload site setting", async (assert) => {
+QUnit.test("upload site setting", async assert => {
   await visit("/admin/site_settings");
 
   assert.ok(
@@ -40,7 +40,7 @@ QUnit.test("upload site setting", async (assert) => {
   assert.ok(exists(".row.setting.upload .undo"), "undo button is present");
 });
 
-QUnit.test("changing value updates dirty state", async (assert) => {
+QUnit.test("changing value updates dirty state", async assert => {
   await visit("/admin/site_settings");
   await fillIn("#setting-filter", " title ");
   assert.equal(count(".row.setting"), 1, "filter returns 1 site setting");
@@ -89,7 +89,7 @@ QUnit.test("changing value updates dirty state", async (assert) => {
 
 QUnit.test(
   "always shows filtered site settings if a filter is set",
-  async (assert) => {
+  async assert => {
     await visit("/admin/site_settings");
     await fillIn("#setting-filter", "title");
     assert.equal(count(".row.setting"), 1);
@@ -104,7 +104,7 @@ QUnit.test(
   }
 );
 
-QUnit.test("filter settings by plugin name", async (assert) => {
+QUnit.test("filter settings by plugin name", async assert => {
   await visit("/admin/site_settings");
 
   await fillIn("#setting-filter", "plugin:discourse-logo");
@@ -114,3 +114,8 @@ QUnit.test("filter settings by plugin name", async (assert) => {
   await fillIn("#setting-filter", "plugin:discourse-plugin");
   assert.equal(count(".row.setting"), 0);
 });
+
+QUnit.test("category name is preserved", async assert => {
+  await visit("admin/site_settings/category/login?filter=test");
+  assert.equal(currentURL(), "admin/site_settings/category/login?filter=test");
+});