Skip to content

A platform for community discussion. Free, open, simple.

UI: Show theme IDs and disabled status in Site texts filter (#44066)

Natalie Tay4abc00f560c8
diff --git a/app/assets/stylesheets/admin/admin_base.scss b/app/assets/stylesheets/admin/admin_base.scss
index 0f458d512e5..8e428e6972c 100644
--- a/app/assets/stylesheets/admin/admin_base.scss
+++ b/app/assets/stylesheets/admin/admin_base.scss
@@ -314,6 +314,29 @@ $mobile-breakpoint: 700px;
}
}
+ .site-text-theme-row {
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ gap: var(--space-2);
+
+ &__name {
+ overflow-wrap: anywhere;
+ }
+
+ &__badge {
+ padding: var(--space-half) var(--space-2);
+ border-radius: var(--d-button-border-radius);
+ color: var(--primary-high);
+ font-size: var(--font-down-2);
+ white-space: nowrap;
+
+ &.--disabled {
+ background: var(--primary-low);
+ }
+ }
+ }
+
&__recommended {
color: var(--primary-high);
font-size: var(--font-down-1);
diff --git a/app/controllers/admin/site_texts_controller.rb b/app/controllers/admin/site_texts_controller.rb
index af7f6e0c815..af6149edd29 100644
--- a/app/controllers/admin/site_texts_controller.rb
+++ b/app/controllers/admin/site_texts_controller.rb
@@ -28,7 +28,13 @@ class Admin::SiteTextsController < Admin::AdminController
outdated = params[:outdated] == "true"
untranslated = params[:untranslated] == "true"
only_selected_locale = params[:only_selected_locale] == "true"
- extras = { themes: Theme.order(:name).pluck(:id, :name).map { |id, name| { id:, name: } } }
+ extras = {
+ themes:
+ Theme
+ .order(:name, :id)
+ .pluck(:id, :name, :enabled)
+ .map { |id, name, enabled| { id:, name:, enabled: } },
+ }
theme = Theme.find(params[:theme_id]) if params[:theme_id].present?
query = params[:q] || ""
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 1fc2a71df53..8b2d220d8ca 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -10398,6 +10398,7 @@ en:
search_label: "Search"
theme: "Theme or component"
all_themes: "All site texts"
+ theme_disabled: "Disabled"
filters: "Filters"
filters_active:
one: "Filters (%{count})"
diff --git a/frontend/discourse/admin/components/site-text-theme-row.gjs b/frontend/discourse/admin/components/site-text-theme-row.gjs
new file mode 100644
index 00000000000..1cb08988c67
--- /dev/null
+++ b/frontend/discourse/admin/components/site-text-theme-row.gjs
@@ -0,0 +1,19 @@
+import SelectKitRow from "discourse/select-kit/components/select-kit/select-kit-row";
+import { eq } from "discourse/truth-helpers";
+import { i18n } from "discourse-i18n";
+
+export default class SiteTextThemeRow extends SelectKitRow {
+ <template>
+ <span class="site-text-theme-row">
+ <span class="site-text-theme-row__name">{{this.item.name}}</span>
+ {{#unless this.isNone}}
+ <span class="site-text-theme-row__badge --id">#{{this.item.id}}</span>
+ {{#if (eq this.item.enabled false)}}
+ <span class="site-text-theme-row__badge --disabled">
+ {{i18n "admin.site_text.theme_disabled"}}
+ </span>
+ {{/if}}
+ {{/unless}}
+ </span>
+ </template>
+}
diff --git a/frontend/discourse/admin/components/site-text-theme-selector.js b/frontend/discourse/admin/components/site-text-theme-selector.js
new file mode 100644
index 00000000000..b7c3a3170eb
--- /dev/null
+++ b/frontend/discourse/admin/components/site-text-theme-selector.js
@@ -0,0 +1,15 @@
+import SiteTextThemeRow from "discourse/admin/components/site-text-theme-row";
+import ComboBox from "discourse/select-kit/components/combo-box";
+
+export default class SiteTextThemeSelector extends ComboBox {
+ modifyComponentForRow() {
+ return SiteTextThemeRow;
+ }
+
+ modifySelection(item) {
+ if (item?.id == null) {
+ return item;
+ }
+ return { ...item, name: `${item.name} #${item.id}` };
+ }
+}
diff --git a/frontend/discourse/admin/templates/admin-site-text/index.gjs b/frontend/discourse/admin/templates/admin-site-text/index.gjs
index 9031d28f354..cf807b5e0ec 100644
--- a/frontend/discourse/admin/templates/admin-site-text/index.gjs
+++ b/frontend/discourse/admin/templates/admin-site-text/index.gjs
@@ -1,6 +1,7 @@
import { hash } from "@ember/helper";
import { on } from "@ember/modifier";
import SiteTextSummary from "discourse/admin/components/site-text-summary";
+import SiteTextThemeSelector from "discourse/admin/components/site-text-theme-selector";
import ComboBox from "discourse/select-kit/components/combo-box";
import { not } from "discourse/truth-helpers";
import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";
@@ -128,7 +129,7 @@ export default <template>
/>
<div class="site-texts__theme">
<label>{{i18n "admin.site_text.theme"}}</label>
- <ComboBox
+ <SiteTextThemeSelector
class="theme-search"
@content={{@controller.availableThemes}}
@onChange={{@controller.updateTheme}}
diff --git a/spec/requests/admin/theme_site_texts_controller_spec.rb b/spec/requests/admin/theme_site_texts_controller_spec.rb
index b955f4aaffb..f58fee4bdd4 100644
--- a/spec/requests/admin/theme_site_texts_controller_spec.rb
+++ b/spec/requests/admin/theme_site_texts_controller_spec.rb
@@ -45,6 +45,7 @@ RSpec.describe Admin::SiteTextsController do
expect(response.parsed_body["extras"]["themes"]).to include(
"id" => theme.id,
"name" => theme.name,
+ "enabled" => true,
)
end
diff --git a/spec/system/admin_site_texts_spec.rb b/spec/system/admin_site_texts_spec.rb
index ab7b282240f..e7a3b7dbbd5 100644
--- a/spec/system/admin_site_texts_spec.rb
+++ b/spec/system/admin_site_texts_spec.rb
@@ -127,7 +127,8 @@ describe "Admin Site Texts Page" do
end
it "can filter, edit, and revert a component translation in the selected language" do
- theme = Fabricate(:theme, component: true)
+ theme = Fabricate(:theme, component: true, enabled: false)
+ duplicate = Fabricate(:theme, component: true, name: theme.name)
theme.set_field(
target: :translations,
name: "en",
@@ -143,6 +144,10 @@ describe "Admin Site Texts Page" do
site_texts_page.visit
expect(site_texts_page).to have_no_theme_filter
+ site_texts_page.open_theme_filter
+ expect(site_texts_page).to have_theme_option(theme, disabled: true)
+ expect(site_texts_page).to have_theme_option(duplicate)
+ page.send_keys(:escape)
site_texts_page.select_theme(theme)
site_texts_page.select_locale("it")
site_texts_page.search("resource_intro")
diff --git a/spec/system/page_objects/pages/admin_site_texts.rb b/spec/system/page_objects/pages/admin_site_texts.rb
index 00038d0ddf3..8ce88dbc043 100644
--- a/spec/system/page_objects/pages/admin_site_texts.rb
+++ b/spec/system/page_objects/pages/admin_site_texts.rb
@@ -36,12 +36,37 @@ module PageObjects
selector.collapse
end
+ def open_theme_filter
+ expand_filters
+ PageObjects::Components::SelectKit.new(".theme-search").expand
+ end
+
+ def has_theme_option?(theme, disabled: false)
+ row = ".theme-search .select-kit-row[data-value='#{theme.id}']"
+ return false unless has_css?("#{row} .site-text-theme-row__name", exact_text: theme.name)
+ unless has_css?("#{row} .site-text-theme-row__badge.--id", exact_text: "##{theme.id}")
+ return false
+ end
+
+ if disabled
+ has_css?(
+ "#{row} .site-text-theme-row__badge.--disabled",
+ exact_text: I18n.t("admin_js.admin.site_text.theme_disabled"),
+ )
+ else
+ has_no_css?("#{row} .site-text-theme-row__badge.--disabled")
+ end
+ end
+
def has_no_theme_filter?
has_no_css?(".theme-search")
end
def has_selected_theme?(theme)
- has_css?(".d-filter-controls__dropdowns .theme-search .select-kit-header", text: theme.name)
+ has_css?(
+ ".d-filter-controls__dropdowns .theme-search .select-kit-header",
+ text: "#{theme.name} ##{theme.id}",
+ )
end
def has_all_site_texts_selected?