From f4b417462bbfcd9298981a5aed2cff116612a3b6 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Fri, 10 Jan 2025 11:03:07 +1000
Subject: [PATCH] UX: Final pass of admin setting pages (#30682)

This commit finalises the admin setting page consistency
efforts by:

* Converting all route templates into .gjs
* Adding `@hideTabs={{true}}` for all the page headers so we
  don't show a border line when it's not needed
* Introduce `@showBreadcrumb` and default to true for
  AdminAreaSettings, for all these pages the Settings part of
  the breadcrumb is redundant
---
 .../addon/components/admin-area-settings.gjs  |  5 ++-
 .../templates/config-developer-settings.gjs   |  2 ++
 .../config-experimental-settings.gjs          |  2 ++
 .../addon/templates/config-files-settings.gjs |  2 ++
 .../addon/templates/config-fonts-settings.gjs | 31 +++++++++++++++++
 .../addon/templates/config-fonts-settings.hbs | 21 ------------
 .../config-group-permissions-settings.gjs     |  2 ++
 .../addon/templates/config-legal-settings.gjs | 31 +++++++++++++++++
 .../addon/templates/config-legal-settings.hbs | 21 ------------
 ...nfig-login-and-authentication-settings.gjs | 33 +++++++++++++++++++
 ...nfig-login-and-authentication-settings.hbs | 23 -------------
 .../addon/templates/config-logo-settings.gjs  | 31 +++++++++++++++++
 .../addon/templates/config-logo-settings.hbs  | 21 ------------
 .../templates/config-navigation-settings.gjs  | 31 +++++++++++++++++
 .../templates/config-navigation-settings.hbs  | 21 ------------
 .../config-notifications-settings.gjs         | 31 +++++++++++++++++
 .../config-notifications-settings.hbs         | 21 ------------
 .../templates/config-onebox-settings.gjs      |  2 ++
 .../addon/templates/config-other-settings.gjs |  2 ++
 .../templates/config-rate-limits-settings.gjs |  2 ++
 .../templates/config-search-settings.gjs      | 31 +++++++++++++++++
 .../templates/config-search-settings.hbs      | 21 ------------
 .../templates/config-security-settings.gjs    |  2 ++
 .../addon/templates/config-spam-settings.gjs  |  2 ++
 .../config-trust-levels-settings.gjs          | 32 ++++++++++++++++++
 .../config-trust-levels-settings.hbs          | 22 -------------
 .../templates/config-user-api-settings.gjs    |  2 ++
 config/locales/client.en.yml                  |  2 +-
 28 files changed, 276 insertions(+), 173 deletions(-)
 create mode 100644 app/assets/javascripts/admin/addon/templates/config-fonts-settings.gjs
 delete mode 100644 app/assets/javascripts/admin/addon/templates/config-fonts-settings.hbs
 create mode 100644 app/assets/javascripts/admin/addon/templates/config-legal-settings.gjs
 delete mode 100644 app/assets/javascripts/admin/addon/templates/config-legal-settings.hbs
 create mode 100644 app/assets/javascripts/admin/addon/templates/config-login-and-authentication-settings.gjs
 delete mode 100644 app/assets/javascripts/admin/addon/templates/config-login-and-authentication-settings.hbs
 create mode 100644 app/assets/javascripts/admin/addon/templates/config-logo-settings.gjs
 delete mode 100644 app/assets/javascripts/admin/addon/templates/config-logo-settings.hbs
 create mode 100644 app/assets/javascripts/admin/addon/templates/config-navigation-settings.gjs
 delete mode 100644 app/assets/javascripts/admin/addon/templates/config-navigation-settings.hbs
 create mode 100644 app/assets/javascripts/admin/addon/templates/config-notifications-settings.gjs
 delete mode 100644 app/assets/javascripts/admin/addon/templates/config-notifications-settings.hbs
 create mode 100644 app/assets/javascripts/admin/addon/templates/config-search-settings.gjs
 delete mode 100644 app/assets/javascripts/admin/addon/templates/config-search-settings.hbs
 create mode 100644 app/assets/javascripts/admin/addon/templates/config-trust-levels-settings.gjs
 delete mode 100644 app/assets/javascripts/admin/addon/templates/config-trust-levels-settings.hbs

diff --git a/app/assets/javascripts/admin/addon/components/admin-area-settings.gjs b/app/assets/javascripts/admin/addon/components/admin-area-settings.gjs
index 65cd42794bc..b3f5fc08844 100644
--- a/app/assets/javascripts/admin/addon/components/admin-area-settings.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-area-settings.gjs
@@ -17,6 +17,7 @@ export default class AdminAreaSettings extends Component {
   @tracked settings = [];
   @tracked filter = "";
   @tracked loading = false;
+  @tracked showBreadcrumb = this.args.showBreadcrumb ?? true;
 
   constructor() {
     super(...arguments);
@@ -62,7 +63,9 @@ export default class AdminAreaSettings extends Component {
   }
 
   <template>
-    <DBreadcrumbsItem @path={{@path}} @label={{i18n "settings"}} />
+    {{#if this.showBreadcrumb}}
+      <DBreadcrumbsItem @path={{@path}} @label={{i18n "settings"}} />
+    {{/if}}
 
     <div
       class="content-body admin-config-area__settings admin-detail pull-left"
diff --git a/app/assets/javascripts/admin/addon/templates/config-developer-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-developer-settings.gjs
index b6baa7d0861..37f1c846d5f 100644
--- a/app/assets/javascripts/admin/addon/templates/config-developer-settings.gjs
+++ b/app/assets/javascripts/admin/addon/templates/config-developer-settings.gjs
@@ -6,6 +6,7 @@ import AdminAreaSettings from "admin/components/admin-area-settings";
 
 export default RouteTemplate(<template>
   <DPageHeader
+    @hideTabs={{true}}
     @titleLabel={{i18n "admin.config.developer.title"}}
     @descriptionLabel={{i18n "admin.config.developer.header_description"}}
   >
@@ -20,6 +21,7 @@ export default RouteTemplate(<template>
 
   <div class="admin-config-page__main-area">
     <AdminAreaSettings
+      @showBreadcrumb={{false}}
       @categories="developer"
       @path="/admin/config/developer"
       @filter={{@controller.filter}}
diff --git a/app/assets/javascripts/admin/addon/templates/config-experimental-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-experimental-settings.gjs
index 334fd15ebb5..cca6087317e 100644
--- a/app/assets/javascripts/admin/addon/templates/config-experimental-settings.gjs
+++ b/app/assets/javascripts/admin/addon/templates/config-experimental-settings.gjs
@@ -6,6 +6,7 @@ import AdminAreaSettings from "admin/components/admin-area-settings";
 
 export default RouteTemplate(<template>
   <DPageHeader
+    @hideTabs={{true}}
     @titleLabel={{i18n "admin.config.experimental.title"}}
     @descriptionLabel={{i18n "admin.config.experimental.header_description"}}
   >
@@ -20,6 +21,7 @@ export default RouteTemplate(<template>
 
   <div class="admin-config-page__main-area">
     <AdminAreaSettings
+      @showBreadcrumb={{false}}
       @categories="experimental"
       @path="/admin/config/experimental"
       @filter={{@controller.filter}}
diff --git a/app/assets/javascripts/admin/addon/templates/config-files-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-files-settings.gjs
index 04dc8796d1c..9e408a389b9 100644
--- a/app/assets/javascripts/admin/addon/templates/config-files-settings.gjs
+++ b/app/assets/javascripts/admin/addon/templates/config-files-settings.gjs
@@ -6,6 +6,7 @@ import AdminAreaSettings from "admin/components/admin-area-settings";
 
 export default RouteTemplate(<template>
   <DPageHeader
+    @hideTabs={{true}}
     @titleLabel={{i18n "admin.config.files.title"}}
     @descriptionLabel={{i18n "admin.config.files.header_description"}}
   >
@@ -20,6 +21,7 @@ export default RouteTemplate(<template>
 
   <div class="admin-config-page__main-area">
     <AdminAreaSettings
+      @showBreadcrumb={{false}}
       @categories="files"
       @path="/admin/config/files"
       @filter={{@controller.filter}}
diff --git a/app/assets/javascripts/admin/addon/templates/config-fonts-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-fonts-settings.gjs
new file mode 100644
index 00000000000..95cec4b8ae2
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/config-fonts-settings.gjs
@@ -0,0 +1,31 @@
+import RouteTemplate from "ember-route-template";
+import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
+import DPageHeader from "discourse/components/d-page-header";
+import { i18n } from "discourse-i18n";
+import AdminAreaSettings from "admin/components/admin-area-settings";
+
+export default RouteTemplate(<template>
+  <DPageHeader
+    @hideTabs={{true}}
+    @titleLabel={{i18n "admin.config.font_style.title"}}
+    @descriptionLabel={{i18n "admin.config.font_style.header_description"}}
+  >
+    <:breadcrumbs>
+      <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
+      <DBreadcrumbsItem
+        @path="/admin/config/fonts"
+        @label={{i18n "admin.config.font_style.title"}}
+      />
+    </:breadcrumbs>
+  </DPageHeader>
+
+  <div class="admin-config-page__main-area">
+    <AdminAreaSettings
+      @showBreadcrumb={{false}}
+      @area="fonts"
+      @path="/admin/config/fonts"
+      @filter={{@controller.filter}}
+      @adminSettingsFilterChangedCallback={{@controller.adminSettingsFilterChangedCallback}}
+    />
+  </div>
+</template>);
diff --git a/app/assets/javascripts/admin/addon/templates/config-fonts-settings.hbs b/app/assets/javascripts/admin/addon/templates/config-fonts-settings.hbs
deleted file mode 100644
index 2f1f01a89f9..00000000000
--- a/app/assets/javascripts/admin/addon/templates/config-fonts-settings.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-<DPageHeader
-  @titleLabel={{i18n "admin.config.font_style.title"}}
-  @descriptionLabel={{i18n "admin.config.font_style.header_description"}}
->
-  <:breadcrumbs>
-    <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
-    <DBreadcrumbsItem
-      @path="/admin/config/fonts"
-      @label={{i18n "admin.config.font_style.title"}}
-    />
-  </:breadcrumbs>
-</DPageHeader>
-
-<div class="admin-config-page__main-area">
-  <AdminAreaSettings
-    @area="fonts"
-    @path="/admin/config/fonts"
-    @filter={{this.filter}}
-    @adminSettingsFilterChangedCallback={{this.adminSettingsFilterChangedCallback}}
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/config-group-permissions-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-group-permissions-settings.gjs
index 163a167e54e..1faf5ac420d 100644
--- a/app/assets/javascripts/admin/addon/templates/config-group-permissions-settings.gjs
+++ b/app/assets/javascripts/admin/addon/templates/config-group-permissions-settings.gjs
@@ -6,6 +6,7 @@ import AdminAreaSettings from "admin/components/admin-area-settings";
 
 export default RouteTemplate(<template>
   <DPageHeader
+    @hideTabs={{true}}
     @titleLabel={{i18n "admin.config.group_permissions.title"}}
     @descriptionLabel={{i18n
       "admin.config.group_permissions.header_description"
@@ -22,6 +23,7 @@ export default RouteTemplate(<template>
 
   <div class="admin-config-page__main-area">
     <AdminAreaSettings
+      @showBreadcrumb={{false}}
       @area="group_permissions"
       @path="/admin/config/group-permissions"
       @filter={{@controller.filter}}
diff --git a/app/assets/javascripts/admin/addon/templates/config-legal-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-legal-settings.gjs
new file mode 100644
index 00000000000..159fa6913b2
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/config-legal-settings.gjs
@@ -0,0 +1,31 @@
+import RouteTemplate from "ember-route-template";
+import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
+import DPageHeader from "discourse/components/d-page-header";
+import { i18n } from "discourse-i18n";
+import AdminAreaSettings from "admin/components/admin-area-settings";
+
+export default RouteTemplate(<template>
+  <DPageHeader
+    @hideTabs={{true}}
+    @titleLabel={{i18n "admin.config.legal.title"}}
+    @descriptionLabel={{i18n "admin.config.legal.header_description"}}
+  >
+    <:breadcrumbs>
+      <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
+      <DBreadcrumbsItem
+        @path="/admin/config/legal"
+        @label={{i18n "admin.config.legal.title"}}
+      />
+    </:breadcrumbs>
+  </DPageHeader>
+
+  <div class="admin-config-page__main-area">
+    <AdminAreaSettings
+      @showBreadcrumb={{false}}
+      @area="legal"
+      @path="/admin/config/legal"
+      @filter={{@controller.filter}}
+      @adminSettingsFilterChangedCallback={{@controller.adminSettingsFilterChangedCallback}}
+    />
+  </div>
+</template>);
diff --git a/app/assets/javascripts/admin/addon/templates/config-legal-settings.hbs b/app/assets/javascripts/admin/addon/templates/config-legal-settings.hbs
deleted file mode 100644
index 29611a8462f..00000000000
--- a/app/assets/javascripts/admin/addon/templates/config-legal-settings.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-<DPageHeader
-  @titleLabel={{i18n "admin.config.legal.title"}}
-  @descriptionLabel={{i18n "admin.config.legal.header_description"}}
->
-  <:breadcrumbs>
-    <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
-    <DBreadcrumbsItem
-      @path="/admin/config/legal"
-      @label={{i18n "admin.config.legal.title"}}
-    />
-  </:breadcrumbs>
-</DPageHeader>
-
-<div class="admin-config-page__main-area">
-  <AdminAreaSettings
-    @area="legal"
-    @path="/admin/config/legal"
-    @filter={{this.filter}}
-    @adminSettingsFilterChangedCallback={{this.adminSettingsFilterChangedCallback}}
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/config-login-and-authentication-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-login-and-authentication-settings.gjs
new file mode 100644
index 00000000000..836cadb5f34
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/config-login-and-authentication-settings.gjs
@@ -0,0 +1,33 @@
+import RouteTemplate from "ember-route-template";
+import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
+import DPageHeader from "discourse/components/d-page-header";
+import { i18n } from "discourse-i18n";
+import AdminAreaSettings from "admin/components/admin-area-settings";
+
+export default RouteTemplate(<template>
+  <DPageHeader
+    @hideTabs={{true}}
+    @titleLabel={{i18n "admin.config.login_and_authentication.title"}}
+    @descriptionLabel={{i18n
+      "admin.config.login_and_authentication.header_description"
+    }}
+  >
+    <:breadcrumbs>
+      <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
+      <DBreadcrumbsItem
+        @path="/admin/config/login-and-authentication"
+        @label={{i18n "admin.config.login_and_authentication.title"}}
+      />
+    </:breadcrumbs>
+  </DPageHeader>
+
+  <div class="admin-config-page__main-area">
+    <AdminAreaSettings
+      @showBreadcrumb={{false}}
+      @categories="login"
+      @path="/admin/config/login-and-authentication"
+      @filter={{@controller.filter}}
+      @adminSettingsFilterChangedCallback={{@controller.adminSettingsFilterChangedCallback}}
+    />
+  </div>
+</template>);
diff --git a/app/assets/javascripts/admin/addon/templates/config-login-and-authentication-settings.hbs b/app/assets/javascripts/admin/addon/templates/config-login-and-authentication-settings.hbs
deleted file mode 100644
index 24adeec9b47..00000000000
--- a/app/assets/javascripts/admin/addon/templates/config-login-and-authentication-settings.hbs
+++ /dev/null
@@ -1,23 +0,0 @@
-<DPageHeader
-  @titleLabel={{i18n "admin.config.login_and_authentication.title"}}
-  @descriptionLabel={{i18n
-    "admin.config.login_and_authentication.header_description"
-  }}
->
-  <:breadcrumbs>
-    <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
-    <DBreadcrumbsItem
-      @path="/admin/config/login-and-authentication"
-      @label={{i18n "admin.config.login_and_authentication.title"}}
-    />
-  </:breadcrumbs>
-</DPageHeader>
-
-<div class="admin-config-page__main-area">
-  <AdminAreaSettings
-    @categories="login"
-    @path="/admin/config/login-and-authentication"
-    @filter={{this.filter}}
-    @adminSettingsFilterChangedCallback={{this.adminSettingsFilterChangedCallback}}
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/config-logo-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-logo-settings.gjs
new file mode 100644
index 00000000000..d4931b8a074
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/config-logo-settings.gjs
@@ -0,0 +1,31 @@
+import RouteTemplate from "ember-route-template";
+import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
+import DPageHeader from "discourse/components/d-page-header";
+import { i18n } from "discourse-i18n";
+import AdminAreaSettings from "admin/components/admin-area-settings";
+
+export default RouteTemplate(<template>
+  <DPageHeader
+    @hideTabs={{true}}
+    @titleLabel={{i18n "admin.config.logo.title"}}
+    @descriptionLabel={{i18n "admin.config.logo.header_description"}}
+  >
+    <:breadcrumbs>
+      <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
+      <DBreadcrumbsItem
+        @path="/admin/config/logo"
+        @label={{i18n "admin.config.logo.title"}}
+      />
+    </:breadcrumbs>
+  </DPageHeader>
+
+  <div class="admin-config-page__main-area">
+    <AdminAreaSettings
+      @showBreadcrumb={{false}}
+      @categories="branding"
+      @path="/admin/config/logo"
+      @filter={{@controller.filter}}
+      @adminSettingsFilterChangedCallback={{@controller.adminSettingsFilterChangedCallback}}
+    />
+  </div>
+</template>);
diff --git a/app/assets/javascripts/admin/addon/templates/config-logo-settings.hbs b/app/assets/javascripts/admin/addon/templates/config-logo-settings.hbs
deleted file mode 100644
index ebe1a00209e..00000000000
--- a/app/assets/javascripts/admin/addon/templates/config-logo-settings.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-<DPageHeader
-  @titleLabel={{i18n "admin.config.logo.title"}}
-  @descriptionLabel={{i18n "admin.config.logo.header_description"}}
->
-  <:breadcrumbs>
-    <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
-    <DBreadcrumbsItem
-      @path="/admin/config/logo"
-      @label={{i18n "admin.config.logo.title"}}
-    />
-  </:breadcrumbs>
-</DPageHeader>
-
-<div class="admin-config-page__main-area">
-  <AdminAreaSettings
-    @categories="branding"
-    @path="/admin/config/logo"
-    @filter={{this.filter}}
-    @adminSettingsFilterChangedCallback={{this.adminSettingsFilterChangedCallback}}
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/config-navigation-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-navigation-settings.gjs
new file mode 100644
index 00000000000..67cff05da3a
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/config-navigation-settings.gjs
@@ -0,0 +1,31 @@
+import RouteTemplate from "ember-route-template";
+import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
+import DPageHeader from "discourse/components/d-page-header";
+import { i18n } from "discourse-i18n";
+import AdminAreaSettings from "admin/components/admin-area-settings";
+
+export default RouteTemplate(<template>
+  <DPageHeader
+    @hideTabs={{true}}
+    @titleLabel={{i18n "admin.config.navigation.title"}}
+    @descriptionLabel={{i18n "admin.config.navigation.header_description"}}
+  >
+    <:breadcrumbs>
+      <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
+      <DBreadcrumbsItem
+        @path="/admin/config/navigation"
+        @label={{i18n "admin.config.navigation.title"}}
+      />
+    </:breadcrumbs>
+  </DPageHeader>
+
+  <div class="admin-config-page__main-area">
+    <AdminAreaSettings
+      @showBreadcrumb={{false}}
+      @area="navigation"
+      @path="/admin/config/navigation"
+      @filter={{@controller.filter}}
+      @adminSettingsFilterChangedCallback={{@controller.adminSettingsFilterChangedCallback}}
+    />
+  </div>
+</template>);
diff --git a/app/assets/javascripts/admin/addon/templates/config-navigation-settings.hbs b/app/assets/javascripts/admin/addon/templates/config-navigation-settings.hbs
deleted file mode 100644
index 72666186866..00000000000
--- a/app/assets/javascripts/admin/addon/templates/config-navigation-settings.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-<DPageHeader
-  @titleLabel={{i18n "admin.config.navigation.title"}}
-  @descriptionLabel={{i18n "admin.config.navigation.header_description"}}
->
-  <:breadcrumbs>
-    <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
-    <DBreadcrumbsItem
-      @path="/admin/config/navigation"
-      @label={{i18n "admin.config.navigation.title"}}
-    />
-  </:breadcrumbs>
-</DPageHeader>
-
-<div class="admin-config-page__main-area">
-  <AdminAreaSettings
-    @area="navigation"
-    @path="/admin/config/navigation"
-    @filter={{this.filter}}
-    @adminSettingsFilterChangedCallback={{this.adminSettingsFilterChangedCallback}}
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/config-notifications-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-notifications-settings.gjs
new file mode 100644
index 00000000000..959bdd24dc1
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/config-notifications-settings.gjs
@@ -0,0 +1,31 @@
+import RouteTemplate from "ember-route-template";
+import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
+import DPageHeader from "discourse/components/d-page-header";
+import { i18n } from "discourse-i18n";
+import AdminAreaSettings from "admin/components/admin-area-settings";
+
+export default RouteTemplate(<template>
+  <DPageHeader
+    @hideTabs={{true}}
+    @titleLabel={{i18n "admin.config.notifications.title"}}
+    @descriptionLabel={{i18n "admin.config.notifications.header_description"}}
+  >
+    <:breadcrumbs>
+      <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
+      <DBreadcrumbsItem
+        @path="/admin/config/notifications"
+        @label={{i18n "admin.config.notifications.title"}}
+      />
+    </:breadcrumbs>
+  </DPageHeader>
+
+  <div class="admin-config-page__main-area">
+    <AdminAreaSettings
+      @showBreadcrumb={{false}}
+      @area="notifications"
+      @path="/admin/config/notifications"
+      @filter={{@controller.filter}}
+      @adminSettingsFilterChangedCallback={{@controller.adminSettingsFilterChangedCallback}}
+    />
+  </div>
+</template>);
diff --git a/app/assets/javascripts/admin/addon/templates/config-notifications-settings.hbs b/app/assets/javascripts/admin/addon/templates/config-notifications-settings.hbs
deleted file mode 100644
index 2a5340c0799..00000000000
--- a/app/assets/javascripts/admin/addon/templates/config-notifications-settings.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-<DPageHeader
-  @titleLabel={{i18n "admin.config.notifications.title"}}
-  @descriptionLabel={{i18n "admin.config.notifications.header_description"}}
->
-  <:breadcrumbs>
-    <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
-    <DBreadcrumbsItem
-      @path="/admin/config/notifications"
-      @label={{i18n "admin.config.notifications.title"}}
-    />
-  </:breadcrumbs>
-</DPageHeader>
-
-<div class="admin-config-page__main-area">
-  <AdminAreaSettings
-    @area="notifications"
-    @path="/admin/config/notifications"
-    @filter={{this.filter}}
-    @adminSettingsFilterChangedCallback={{this.adminSettingsFilterChangedCallback}}
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/config-onebox-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-onebox-settings.gjs
index ea51f5ef5d1..79088228a14 100644
--- a/app/assets/javascripts/admin/addon/templates/config-onebox-settings.gjs
+++ b/app/assets/javascripts/admin/addon/templates/config-onebox-settings.gjs
@@ -6,6 +6,7 @@ import AdminAreaSettings from "admin/components/admin-area-settings";
 
 export default RouteTemplate(<template>
   <DPageHeader
+    @hideTabs={{true}}
     @titleLabel={{i18n "admin.config.onebox.title"}}
     @descriptionLabel={{i18n "admin.config.onebox.header_description"}}
   >
@@ -20,6 +21,7 @@ export default RouteTemplate(<template>
 
   <div class="admin-config-page__main-area">
     <AdminAreaSettings
+      @showBreadcrumb={{false}}
       @categories="onebox"
       @path="/admin/config/onebox"
       @filter={{@controller.filter}}
diff --git a/app/assets/javascripts/admin/addon/templates/config-other-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-other-settings.gjs
index a7829954099..86141112e9c 100644
--- a/app/assets/javascripts/admin/addon/templates/config-other-settings.gjs
+++ b/app/assets/javascripts/admin/addon/templates/config-other-settings.gjs
@@ -6,6 +6,7 @@ import AdminAreaSettings from "admin/components/admin-area-settings";
 
 export default RouteTemplate(<template>
   <DPageHeader
+    @hideTabs={{true}}
     @titleLabel={{i18n "admin.config.other.title"}}
     @descriptionLabel={{i18n "admin.config.other.header_description"}}
   >
@@ -20,6 +21,7 @@ export default RouteTemplate(<template>
 
   <div class="admin-config-page__main-area">
     <AdminAreaSettings
+      @showBreadcrumb={{false}}
       @categories="uncategorized"
       @path="/admin/config/other"
       @filter={{@controller.filter}}
diff --git a/app/assets/javascripts/admin/addon/templates/config-rate-limits-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-rate-limits-settings.gjs
index fbda2c2731b..21f1beb0037 100644
--- a/app/assets/javascripts/admin/addon/templates/config-rate-limits-settings.gjs
+++ b/app/assets/javascripts/admin/addon/templates/config-rate-limits-settings.gjs
@@ -6,6 +6,7 @@ import AdminAreaSettings from "admin/components/admin-area-settings";
 
 export default RouteTemplate(<template>
   <DPageHeader
+    @hideTabs={{true}}
     @titleLabel={{i18n "admin.config.rate_limits.title"}}
     @descriptionLabel={{i18n "admin.config.rate_limits.header_description"}}
   >
@@ -20,6 +21,7 @@ export default RouteTemplate(<template>
 
   <div class="admin-config-page__main-area">
     <AdminAreaSettings
+      @showBreadcrumb={{false}}
       @categories="rate_limits"
       @path="/admin/config/rate-limits"
       @filter={{@controller.filter}}
diff --git a/app/assets/javascripts/admin/addon/templates/config-search-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-search-settings.gjs
new file mode 100644
index 00000000000..216fe0f9d56
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/config-search-settings.gjs
@@ -0,0 +1,31 @@
+import RouteTemplate from "ember-route-template";
+import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
+import DPageHeader from "discourse/components/d-page-header";
+import { i18n } from "discourse-i18n";
+import AdminAreaSettings from "admin/components/admin-area-settings";
+
+export default RouteTemplate(<template>
+  <DPageHeader
+    @hideTabs={{true}}
+    @titleLabel={{i18n "admin.config.search.title"}}
+    @descriptionLabel={{i18n "admin.config.search.header_description"}}
+  >
+    <:breadcrumbs>
+      <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
+      <DBreadcrumbsItem
+        @path="/admin/config/search"
+        @label={{i18n "admin.config.search.title"}}
+      />
+    </:breadcrumbs>
+  </DPageHeader>
+
+  <div class="admin-config-page__main-area">
+    <AdminAreaSettings
+      @showBreadcrumb={{false}}
+      @categories="search"
+      @path="/admin/config/search"
+      @filter={{@controller.filter}}
+      @adminSettingsFilterChangedCallback={{@controller.adminSettingsFilterChangedCallback}}
+    />
+  </div>
+</template>);
diff --git a/app/assets/javascripts/admin/addon/templates/config-search-settings.hbs b/app/assets/javascripts/admin/addon/templates/config-search-settings.hbs
deleted file mode 100644
index 78d39f97b11..00000000000
--- a/app/assets/javascripts/admin/addon/templates/config-search-settings.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-<DPageHeader
-  @titleLabel={{i18n "admin.config.search.title"}}
-  @descriptionLabel={{i18n "admin.config.search.header_description"}}
->
-  <:breadcrumbs>
-    <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
-    <DBreadcrumbsItem
-      @path="/admin/config/search"
-      @label={{i18n "admin.config.search.title"}}
-    />
-  </:breadcrumbs>
-</DPageHeader>
-
-<div class="admin-config-page__main-area">
-  <AdminAreaSettings
-    @categories="search"
-    @path="/admin/config/search"
-    @filter={{this.filter}}
-    @adminSettingsFilterChangedCallback={{this.adminSettingsFilterChangedCallback}}
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/config-security-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-security-settings.gjs
index 4206053e475..b3b9c9d9c78 100644
--- a/app/assets/javascripts/admin/addon/templates/config-security-settings.gjs
+++ b/app/assets/javascripts/admin/addon/templates/config-security-settings.gjs
@@ -6,6 +6,7 @@ import AdminAreaSettings from "admin/components/admin-area-settings";
 
 export default RouteTemplate(<template>
   <DPageHeader
+    @hideTabs={{true}}
     @titleLabel={{i18n "admin.config.security.title"}}
     @descriptionLabel={{i18n "admin.config.security.header_description"}}
   >
@@ -20,6 +21,7 @@ export default RouteTemplate(<template>
 
   <div class="admin-config-page__main-area">
     <AdminAreaSettings
+      @showBreadcrumb={{false}}
       @categories="security"
       @path="/admin/config/security"
       @filter={{@controller.filter}}
diff --git a/app/assets/javascripts/admin/addon/templates/config-spam-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-spam-settings.gjs
index f060171027d..ca902c547c2 100644
--- a/app/assets/javascripts/admin/addon/templates/config-spam-settings.gjs
+++ b/app/assets/javascripts/admin/addon/templates/config-spam-settings.gjs
@@ -6,6 +6,7 @@ import AdminAreaSettings from "admin/components/admin-area-settings";
 
 export default RouteTemplate(<template>
   <DPageHeader
+    @hideTabs={{true}}
     @titleLabel={{i18n "admin.config.spam.title"}}
     @descriptionLabel={{i18n "admin.config.spam.header_description"}}
   >
@@ -20,6 +21,7 @@ export default RouteTemplate(<template>
 
   <div class="admin-config-page__main-area">
     <AdminAreaSettings
+      @showBreadcrumb={{false}}
       @categories="spam"
       @path="/admin/config/spam"
       @filter={{@controller.filter}}
diff --git a/app/assets/javascripts/admin/addon/templates/config-trust-levels-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-trust-levels-settings.gjs
new file mode 100644
index 00000000000..f34facd0df6
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/config-trust-levels-settings.gjs
@@ -0,0 +1,32 @@
+import RouteTemplate from "ember-route-template";
+import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
+import DPageHeader from "discourse/components/d-page-header";
+import { i18n } from "discourse-i18n";
+import AdminAreaSettings from "admin/components/admin-area-settings";
+
+export default RouteTemplate(<template>
+  <DPageHeader
+    @hideTabs={{true}}
+    @titleLabel={{i18n "admin.config.trust_levels.title"}}
+    @descriptionLabel={{i18n "admin.config.trust_levels.header_description"}}
+    @learnMoreUrl="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
+  >
+    <:breadcrumbs>
+      <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
+      <DBreadcrumbsItem
+        @path="/admin/config/trust-levels"
+        @label={{i18n "admin.config.trust_levels.title"}}
+      />
+    </:breadcrumbs>
+  </DPageHeader>
+
+  <div class="admin-config-page__main-area">
+    <AdminAreaSettings
+      @showBreadcrumb={{false}}
+      @area="trust_levels"
+      @path="/admin/config/trust-levels"
+      @filter={{@controller.filter}}
+      @adminSettingsFilterChangedCallback={{@controller.adminSettingsFilterChangedCallback}}
+    />
+  </div>
+</template>);
diff --git a/app/assets/javascripts/admin/addon/templates/config-trust-levels-settings.hbs b/app/assets/javascripts/admin/addon/templates/config-trust-levels-settings.hbs
deleted file mode 100644
index 76b6e99a50e..00000000000
--- a/app/assets/javascripts/admin/addon/templates/config-trust-levels-settings.hbs
+++ /dev/null
@@ -1,22 +0,0 @@
-<DPageHeader
-  @titleLabel={{i18n "admin.config.trust_levels.title"}}
-  @descriptionLabel={{i18n "admin.config.trust_levels.header_description"}}
-  @learnMoreUrl="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
->
-  <:breadcrumbs>
-    <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
-    <DBreadcrumbsItem
-      @path="/admin/config/trust-levels"
-      @label={{i18n "admin.config.trust_levels.title"}}
-    />
-  </:breadcrumbs>
-</DPageHeader>
-
-<div class="admin-config-page__main-area">
-  <AdminAreaSettings
-    @area="trust_levels"
-    @path="/admin/config/trust-levels"
-    @filter={{this.filter}}
-    @adminSettingsFilterChangedCallback={{this.adminSettingsFilterChangedCallback}}
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/config-user-api-settings.gjs b/app/assets/javascripts/admin/addon/templates/config-user-api-settings.gjs
index 043156d32b7..775e910a31c 100644
--- a/app/assets/javascripts/admin/addon/templates/config-user-api-settings.gjs
+++ b/app/assets/javascripts/admin/addon/templates/config-user-api-settings.gjs
@@ -6,6 +6,7 @@ import AdminAreaSettings from "admin/components/admin-area-settings";
 
 export default RouteTemplate(<template>
   <DPageHeader
+    @hideTabs={{true}}
     @titleLabel={{i18n "admin.config.user_api.title"}}
     @descriptionLabel={{i18n "admin.config.user_api.header_description"}}
   >
@@ -20,6 +21,7 @@ export default RouteTemplate(<template>
 
   <div class="admin-config-page__main-area">
     <AdminAreaSettings
+      @showBreadcrumb={{false}}
       @categories="user_api"
       @path="/admin/config/user-api"
       @filter={{@controller.filter}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 0c470888999..b240b3fee66 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -7091,7 +7091,7 @@ en:
           confirm_delete: "Are you sure you would like to delete this DiscourseConnect record?"
 
       user_fields:
-        title: "User Fields"
+        title: "User fields"
         help: "Create custom user fields to collect extra details about your community members. You can choose what information is required during sign-up, what shows on profiles, and what users can update."
         no_user_fields: "You don't have any custom user fields yet."
         add: "Add user field"