Skip to content

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

DEV: Update Site texts layout and filtering (#44027)

Natalie Tay81527436b8a0
diff --git a/app/assets/stylesheets/admin/admin_base.scss b/app/assets/stylesheets/admin/admin_base.scss
index 02f71a837ed..9f23cccd60e 100644
--- a/app/assets/stylesheets/admin/admin_base.scss
+++ b/app/assets/stylesheets/admin/admin_base.scss
@@ -232,90 +232,194 @@ $mobile-breakpoint: 700px;
.site-texts {
.search-area {
- margin-bottom: 2em;
+ margin-bottom: var(--space-5);
- p {
- margin-top: 0;
+ .d-filter-controls__inputs {
+ align-items: end;
+ flex-wrap: wrap;
+ gap: var(--space-4);
}
- .site-text-search {
- padding: 0.5em;
- font-size: var(--font-0);
- width: 50%;
+ .site-texts__search {
+ flex: 1 1 16em;
+ min-width: 0;
}
- .reseed {
- float: right;
+ .site-texts__language {
+ flex: 0 1 14em;
+ min-width: 0;
}
- .locale {
- margin-bottom: 0.5em;
+ label {
+ display: block;
+ margin-bottom: var(--space-2);
+ font-weight: bold;
+ font-size: var(--font-down-1);
}
.locale-search {
- width: 50%;
+ width: 100%;
+ }
+
+ .filter-input-container {
+ padding: 0;
+ }
+
+ .site-text-search {
+ width: 100%;
+ margin: 0;
+ }
+
+ .d-filter-controls__dropdowns {
+ display: flex;
+ gap: var(--space-4);
+ align-items: start;
+ padding: var(--space-4);
+ margin-top: var(--space-2);
+ border: 1px solid var(--content-border-color);
+ border-radius: var(--d-border-radius);
+ background: var(--primary-very-low);
+ }
+
+ .filter-options {
+ display: flex;
+ flex: 1;
+ flex-wrap: wrap;
+ gap: var(--space-3) var(--space-5);
+ }
+
+ .checkbox-label {
+ display: flex;
+ align-items: center;
+ gap: var(--space-2);
+ margin: 0;
+ font-weight: normal;
+
+ input {
+ margin: 0;
+ }
+ }
+
+ .site-texts__reset-filters {
+ padding: 0;
+ font-size: var(--font-down-1);
}
}
+ &__recommended {
+ color: var(--primary-high);
+ font-size: var(--font-down-1);
+ }
+
.text-highlight {
font-weight: bold;
}
+ .site-text-list {
+ border-top: 1px solid var(--content-border-color);
+ }
+
.site-text {
- cursor: pointer;
+ display: grid;
+ grid-template-columns: minmax(0, 1fr) auto;
+ align-items: start;
+ gap: var(--space-2) var(--space-5);
+ padding-block: var(--space-5);
border-bottom: 1px solid var(--content-border-color);
- margin-bottom: 0.5em;
- &.overridden {
- background-color: var(--highlight-bg);
+ &__details {
+ grid-column: 1;
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ gap: var(--space-2);
}
- h3 {
- font-weight: normal;
- font-size: var(--font-0);
+ .site-text-id {
+ padding: 0;
+ background: transparent;
+ color: var(--primary-high);
+ font-size: var(--font-down-2);
+ overflow-wrap: anywhere;
+ }
+
+ &__status {
+ padding: var(--space-half) var(--space-2);
+ border-radius: var(--d-border-radius);
+ color: var(--primary-high);
+ background: var(--primary-very-low);
+ font-size: var(--font-down-2);
+
+ &[data-status="outdated"] {
+ background: var(--highlight-bg);
+ color: var(--primary);
+ }
+
+ &[data-status="invalid_interpolation_keys"] {
+ background: var(--danger-low);
+ color: var(--danger);
+ }
+ }
+
+ .site-text-value {
+ grid-column: 1;
+ grid-row: 2;
+ color: var(--primary);
+ overflow-wrap: anywhere;
+ white-space: pre-wrap;
+ background: var(--primary-very-low);
+ border: 1px solid var(--content-border-color);
+ border-radius: var(--d-border-radius);
+ padding: var(--space-4);
+ line-height: var(--line-height-large);
@include viewport.until(sm) {
- overflow-wrap: break-word;
+ padding: var(--space-3);
}
}
.site-text-edit {
- float: right;
+ grid-column: 2;
+ grid-row: 2;
}
+ }
- $maxHeight: 8 * 1.4em;
- $gradientHeight: 2.2em;
+ .edit-site-text {
+ &__key {
+ display: block;
+ overflow-wrap: anywhere;
+ color: var(--primary-high);
+ background: transparent;
+ padding: 0;
+ margin-block: var(--space-5);
+ }
- .site-text-value {
- margin: 0.5em 5em 0.5em 0;
- max-height: $maxHeight;
- overflow: hidden;
- position: relative;
- color: var(--primary-medium);
+ &__default {
+ max-width: 800px;
+ padding: var(--space-4);
+ border: 1px solid var(--content-border-color);
+ border-radius: var(--d-border-radius);
+ background: var(--primary-very-low);
+ margin-bottom: var(--space-5);
- @include viewport.until(sm) {
- overflow-wrap: break-word;
- max-width: 80vw;
- margin-right: 3em;
+ h2 {
+ font-size: var(--font-down-1);
+ margin: 0 0 var(--space-2);
}
- &::after {
- content: " ";
- position: absolute;
- left: 0;
- right: 0;
- top: $maxHeight - $gradientHeight;
- height: $gradientHeight;
- background: linear-gradient(
- to top,
- rgb(var(--secondary-rgb), 1),
- rgb(var(--secondary-rgb), 0.15)
- );
+ p {
+ margin: 0;
+ white-space: pre-wrap;
+ overflow-wrap: anywhere;
}
}
- }
- .edit-site-text {
+ &__value-label {
+ display: block;
+ font-weight: bold;
+ margin-bottom: var(--space-2);
+ }
+
textarea {
display: block;
width: 100%;
@@ -346,7 +450,9 @@ $mobile-breakpoint: 700px;
}
.go-back {
- margin-top: 1em;
+ display: inline-flex;
+ align-items: center;
+ gap: var(--space-2);
}
.outdated {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 8542cf38aa1..9c86b21b32b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -10393,13 +10393,27 @@ en:
site_text:
description: "You can customize any of the text on your forum."
- search: "Search for the text you'd like to edit"
+ search: "Search text or translation keys"
+ search_label: "Search"
+ filters: "Filters"
+ filters_active:
+ one: "Filters (%{count})"
+ other: "Filters (%{count})"
+ edit_title: "Edit site text"
+ default_text: "Default text"
+ value_label: "Your text · %{language}"
+ invalid_title: "Invalid interpolation placeholders"
+ invalid_description: "This text uses unrecognized placeholders. Use the available interpolation keys below."
+ status:
+ customized: "Customized"
+ outdated: "Outdated"
+ invalid: "Invalid"
title: "Site texts"
edit: "Edit"
- revert: "Revert Changes"
+ revert: "Revert to default"
revert_confirm: "Are you sure you want to revert your changes?"
- go_back: "Back to Search"
- recommended: "We recommend customizing the following text to suit your needs:"
+ go_back: "Back to results"
+ recommended: "Suggested texts to customize"
show_overriden: "Only show overridden"
show_outdated: "Only show outdated/invalid"
show_untranslated: "Only show untranslated"
diff --git a/frontend/discourse/admin/components/site-text-summary.gjs b/frontend/discourse/admin/components/site-text-summary.gjs
index 93ba6f82875..5cce85bed7f 100644
--- a/frontend/discourse/admin/components/site-text-summary.gjs
+++ b/frontend/discourse/admin/components/site-text-summary.gjs
@@ -2,33 +2,38 @@ import Component from "@glimmer/component";
import { fn } from "@ember/helper";
import { action } from "@ember/object";
import didInsert from "@ember/render-modifiers/modifiers/did-insert";
-import { bind } from "discourse/lib/decorators";
import highlightHTML from "discourse/lib/highlight-html";
import DButton from "discourse/ui-kit/d-button";
import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";
+import { i18n } from "discourse-i18n";
export default class SiteTextSummary extends Component {
+ get statusLabel() {
+ switch (this.args.siteText.status) {
+ case "outdated":
+ return i18n("admin.site_text.status.outdated");
+ case "invalid_interpolation_keys":
+ return i18n("admin.site_text.status.invalid");
+ default:
+ return this.args.siteText.overridden
+ ? i18n("admin.site_text.status.customized")
+ : null;
+ }
+ }
+
@action
highlightSearchTerm(element) {
const term = this.#searchTerm();
if (term) {
- highlightHTML(
- element.querySelector(".site-text-id, .site-text-value"),
- term,
- {
- className: "text-highlight",
- }
- );
+ for (const target of element.querySelectorAll(
+ ".site-text-id, .site-text-value"
+ )) {
+ highlightHTML(target, term, { className: "text-highlight" });
+ }
}
}
- @action
- onClick() {
- this.args.editAction(this.siteText);
- }
-
- @bind
#searchTerm() {
const regex = this.args.searchRegex;
const siteText = this.args.siteText;
@@ -49,15 +54,21 @@ export default class SiteTextSummary extends Component {
data-site-text-id={{@siteText.id}}
{{didInsert this.highlightSearchTerm}}
>
+ <div class="site-text__details">
+ <code class="site-text-id">{{@siteText.id}}</code>
+ {{#if this.statusLabel}}
+ <span
+ class="site-text__status"
+ data-status={{@siteText.status}}
+ >{{this.statusLabel}}</span>
+ {{/if}}
+ </div>
+ <div class="site-text-value">{{@siteText.value}}</div>
<DButton
class="btn-default site-text-edit"
@action={{fn @editAction @siteText}}
@label="admin.site_text.edit"
/>
- <h3 class="site-text-id">{{@siteText.id}}</h3>
- <div class="site-text-value">{{@siteText.value}}</div>
-
- <div class="clearfix"></div>
</div>
</template>
}
diff --git a/frontend/discourse/admin/controllers/admin-site-text/edit.js b/frontend/discourse/admin/controllers/admin-site-text/edit.js
index 40766f781ef..be6002868a8 100644
--- a/frontend/discourse/admin/controllers/admin-site-text/edit.js
+++ b/frontend/discourse/admin/controllers/admin-site-text/edit.js
@@ -31,6 +31,25 @@ export default class AdminSiteTextEdit extends Controller {
return this.siteText.value === this.get("buffered.value"); // TODO (devxp) we need a buffered proxy that works with tracked properties
}
+ @computed("siteText.{new_default,value,overridden,can_revert}")
+ get defaultText() {
+ if (
+ this.siteText.new_default !== null &&
+ this.siteText.new_default !== undefined
+ ) {
+ return this.siteText.new_default;
+ }
+ if (!this.siteText.overridden && !this.siteText.can_revert) {
+ return this.siteText.value;
+ }
+ return null;
+ }
+
+ @computed("siteText.status")
+ get isInvalid() {
+ return this.siteText?.status === "invalid_interpolation_keys";
+ }
+
@computed("siteText.status")
get isOutdated() {
return this.siteText?.status === "outdated";
diff --git a/frontend/discourse/admin/controllers/admin-site-text/index.js b/frontend/discourse/admin/controllers/admin-site-text/index.js
index 4af9fcf695d..6d59ee5773c 100644
--- a/frontend/discourse/admin/controllers/admin-site-text/index.js
+++ b/frontend/discourse/admin/controllers/admin-site-text/index.js
@@ -6,6 +6,7 @@ import { service } from "@ember/service";
import ReseedModal from "discourse/admin/components/modal/reseed";
import discourseDebounce from "discourse/lib/debounce";
import { disableImplicitInjections } from "discourse/lib/implicit-injections";
+import { i18n } from "discourse-i18n";
let lastSearch;
@@ -41,6 +42,27 @@ export default class AdminSiteTextIndexController extends Controller {
#page = 0;
#results = trackedArray();
+ get activeFilterCount() {
+ return [
+ this.resolvedOverridden,
+ this.resolvedOutdated,
+ this.resolvedOnlySelectedLocale,
+ this.resolvedUntranslated,
+ ].filter(Boolean).length;
+ }
+
+ get hasActiveFilters() {
+ return this.activeFilterCount > 0;
+ }
+
+ get filterLabel() {
+ return this.hasActiveFilters
+ ? i18n("admin.site_text.filters_active", {
+ count: this.activeFilterCount,
+ })
+ : i18n("admin.site_text.filters");
+ }
+
get siteTexts() {
return this.#results.flat();
}
@@ -129,6 +151,21 @@ export default class AdminSiteTextIndexController extends Controller {
this.resetSearch();
}
+ @action
+ resetFilters() {
+ this.overridden = null;
+ this.outdated = null;
+ this.untranslated = null;
+ this.onlySelectedLocale = null;
+ this.resetSearch();
+ }
+
+ @action
+ updateSearch(event) {
+ this.q = event.target.value;
+ this.search();
+ }
+
@action
search() {
const q = this.q;
diff --git a/frontend/discourse/admin/models/site-text.js b/frontend/discourse/admin/models/site-text.js
index d35352c3cc1..b93792677f3 100644
--- a/frontend/discourse/admin/models/site-text.js
+++ b/frontend/discourse/admin/models/site-text.js
@@ -6,7 +6,18 @@ export default class SiteText extends RestModel {
revert(locale) {
return ajax(`/admin/customize/site_texts/${this.id}?locale=${locale}`, {
type: "DELETE",
- }).then((result) => getProperties(result.site_text, "value", "can_revert"));
+ }).then((result) =>
+ getProperties(
+ result.site_text,
+ "value",
+ "can_revert",
+ "overridden",
+ "status",
+ "old_default",
+ "new_default",
+ "interpolation_keys"
+ )
+ );
}
dismissOutdated(locale) {
diff --git a/frontend/discourse/admin/templates/admin-site-text.gjs b/frontend/discourse/admin/templates/admin-site-text.gjs
index fd8927cb8a1..629afc79dd7 100644
--- a/frontend/discourse/admin/templates/admin-site-text.gjs
+++ b/frontend/discourse/admin/templates/admin-site-text.gjs
@@ -1,23 +1,5 @@
-import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";
-import DPageHeader from "discourse/ui-kit/d-page-header";
-import { i18n } from "discourse-i18n";
-
export default <template>
- <DPageHeader
- @descriptionLabel={{i18n "admin.config.site_texts.header_description"}}
- @hideTabs={{true}}
- @titleLabel={{i18n "admin.config.site_texts.title"}}
- >
- <:breadcrumbs>
- <DBreadcrumbsItem @label={{i18n "admin_title"}} @path="/admin" />
- <DBreadcrumbsItem
- @label={{i18n "admin.config.site_texts.title"}}
- @path="/admin/customize/site_texts"
- />
- </:breadcrumbs>
- </DPageHeader>
-
- <div class="row site-texts">
+ <div class="site-texts">
{{outlet}}
</div>
</template>
diff --git a/frontend/discourse/admin/templates/admin-site-text/edit.gjs b/frontend/discourse/admin/templates/admin-site-text/edit.gjs
index a709c7d88cc..62ccec26b34 100644
--- a/frontend/discourse/admin/templates/admin-site-text/edit.gjs
+++ b/frontend/discourse/admin/templates/admin-site-text/edit.gjs
@@ -4,22 +4,45 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";
import { LinkTo } from "@ember/routing";
import AdminInterpolationKeys from "discourse/admin/components/admin-interpolation-keys";
import withEventValue from "discourse/helpers/with-event-value";
+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";
import DButton from "discourse/ui-kit/d-button";
import DExpandingTextArea from "discourse/ui-kit/d-expanding-text-area";
+import DPageHeader from "discourse/ui-kit/d-page-header";
import DSaveControls from "discourse/ui-kit/d-save-controls";
import dIcon from "discourse/ui-kit/helpers/d-icon";
import { i18n } from "discourse-i18n";
export default <template>
<div class="edit-site-text">
- <div class="title">
- <h3>{{@controller.siteText.id}}</h3>
- </div>
+ <DPageHeader
+ @hideTabs={{true}}
+ @shouldDisplay={{true}}
+ @titleLabel={{i18n "admin.site_text.edit_title"}}
+ >
+ <:breadcrumbs>
+ <DBreadcrumbsItem @label={{i18n "admin_title"}} @path="/admin" />
+ <DBreadcrumbsItem
+ @label={{i18n "admin.config.site_texts.title"}}
+ @path="/admin/customize/site_texts"
+ />
+ </:breadcrumbs>
+ </DPageHeader>
+ <LinkTo
+ class="go-back"
+ @query={{hash [email protected]}}
+ @route="adminSiteText.index"
+ >
+ {{dIcon "arrow-left"}}
+ {{i18n "admin.site_text.go_back"}}
+ </LinkTo>
+ <code class="edit-site-text__key">{{@controller.siteText.id}}</code>
- <div class="title">
- <h4>{{i18n "admin.site_text.locale"}}
- {{@controller.localeFullName}}</h4>
- </div>
+ {{#if @controller.isInvalid}}
+ <div class="outdated" role="status">
+ <h4>{{i18n "admin.site_text.invalid_title"}}</h4>
+ <p>{{i18n "admin.site_text.invalid_description"}}</p>
+ </div>
+ {{/if}}
{{#if @controller.isOutdated}}
<div class="outdated">
@@ -37,9 +60,23 @@ export default <template>
</div>
{{/if}}
+ {{#unless @controller.isOutdated}}
+ {{#if @controller.defaultText}}
+ <div class="edit-site-text__default">
+ <h2>{{i18n "admin.site_text.default_text"}}</h2>
+ <p>{{@controller.defaultText}}</p>
+ </div>
+ {{/if}}
+ {{/unless}}
+
+ <label class="edit-site-text__value-label" for="site-text-value">{{i18n
+ "admin.site_text.value_label"
+ }}</label>
<DExpandingTextArea
class="site-text-value"
- rows="1"
+ id="site-text-value"
+ rows="5"
value={{@controller.buffered.value}}
{{didInsert @controller.registerTextarea}}
{{on "input" (withEventValue (fn (mut @controller.buffered.value)))}}
@@ -66,14 +103,5 @@ export default <template>
/>
{{/if}}
</DSaveControls>
-
- <LinkTo
- class="go-back"
- @query={{hash [email protected]}}
- @route="adminSiteText.index"
- >
- {{dIcon "arrow-left"}}
- {{i18n "admin.site_text.go_back"}}
- </LinkTo>
</div>
</template>
diff --git a/frontend/discourse/admin/templates/admin-site-text/index.gjs b/frontend/discourse/admin/templates/admin-site-text/index.gjs
index 955bf59c164..00c4d55b875 100644
--- a/frontend/discourse/admin/templates/admin-site-text/index.gjs
+++ b/frontend/discourse/admin/templates/admin-site-text/index.gjs
@@ -2,91 +2,138 @@ import { hash } from "@ember/helper";
import { on } from "@ember/modifier";
import SiteTextSummary from "discourse/admin/components/site-text-summary";
import ComboBox from "discourse/select-kit/components/combo-box";
+import { not } from "discourse/truth-helpers";
+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";
import DButton from "discourse/ui-kit/d-button";
import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";
+import DFilterControls from "discourse/ui-kit/d-filter-controls";
+import DFilterInput from "discourse/ui-kit/d-filter-input";
import DLoadMore from "discourse/ui-kit/d-load-more";
-import DTextField from "discourse/ui-kit/d-text-field";
+import DPageHeader from "discourse/ui-kit/d-page-header";
import { i18n } from "discourse-i18n";
export default <template>
- <div class="search-area">
- <DTextField
- class="no-blur site-text-search"
- @autofocus="true"
- @key-up={{@controller.search}}
- @placeholderKey="admin.site_text.search"
- @value={{@controller.q}}
- />
-
- <div class="reseed">
- <DButton
- class="btn-default"
+ <DPageHeader
+ @descriptionLabel={{i18n "admin.config.site_texts.header_description"}}
+ @hideTabs={{true}}
+ @titleLabel={{i18n "admin.config.site_texts.title"}}
+ >
+ <:breadcrumbs>
+ <DBreadcrumbsItem @label={{i18n "admin_title"}} @path="/admin" />
+ <DBreadcrumbsItem
+ @label={{i18n "admin.config.site_texts.title"}}
+ @path="/admin/customize/site_texts"
+ />
+ </:breadcrumbs>
+ <:actions as |actions|>
+ <actions.Default
@action={{@controller.showReseedModal}}
@icon="arrows-rotate"
@label="admin.reseed.action.label"
@title="admin.reseed.action.title"
/>
- </div>
+ </:actions>
+ </DPageHeader>
- <p class="filter-options">
- <div class="locale">
- <label>{{i18n "admin.site_text.locale"}}</label>
- <ComboBox
- class="locale-search"
- @content={{@controller.availableLocales}}
- @onChange={{@controller.updateLocale}}
- @options={{hash filterable=true}}
- @value={{@controller.resolvedLocale}}
- @valueProperty="value"
- />
- </div>
+ <div class="search-area">
+ <DFilterControls
+ @additionalFiltersActive={{@controller.hasActiveFilters}}
+ @filterDropdownsExpanded={{@controller.hasActiveFilters}}
+ @forceShowDropdownFilterToggle={{true}}
+ @showNoResults={{false}}
+ @showResetButton={{false}}
+ @showTextFilter={{false}}
+ @toggleLabel={{@controller.filterLabel}}
+ >
+ <:inlineFilters>
+ <div class="site-texts__search">
+ <label for="site-text-search">{{i18n
+ "admin.site_text.search_label"
+ }}</label>
+ <DFilterInput
+ class="no-blur site-text-search"
+ id="site-text-search"
+ placeholder={{i18n "admin.site_text.search"}}
+ @filterAction={{@controller.updateSearch}}
+ @icons={{hash left="magnifying-glass"}}
+ @value={{@controller.q}}
+ />
+ </div>
+ <div class="site-texts__language">
+ <label id="site-text-language-label">{{i18n
+ "admin.site_text.locale"
+ }}</label>
+ <ComboBox
+ class="locale-search"
+ @content={{@controller.availableLocales}}
+ @onChange={{@controller.updateLocale}}
+ @options={{hash
+ filterable=true
+ headerAriaLabel=(i18n "admin.site_text.locale")
+ }}
+ @value={{@controller.resolvedLocale}}
+ @valueProperty="value"
+ />
+ </div>
+ </:inlineFilters>
+ <:additionalFilters>
+ <div class="filter-options">
+ <label class="checkbox-label">
+ <input
+ checked={{@controller.resolvedOverridden}}
+ id="toggle-overridden"
+ type="checkbox"
+ {{on "click" @controller.toggleOverridden}}
+ />
+ {{i18n "admin.site_text.show_overriden"}}
+ </label>
- <label class="checkbox-label">
- <input
- checked={{@controller.resolvedOverridden}}
- id="toggle-overridden"
- type="checkbox"
- {{on "click" @controller.toggleOverridden}}
- />
- {{i18n "admin.site_text.show_overriden"}}
- </label>
+ <label class="checkbox-label">
+ <input
+ checked={{@controller.resolvedOutdated}}
+ id="toggle-outdated"
+ type="checkbox"
+ {{on "click" @controller.toggleOutdated}}
+ />
+ {{i18n "admin.site_text.show_outdated"}}
+ </label>
- <label class="checkbox-label">
- <input
- checked={{@controller.resolvedOutdated}}
- id="toggle-outdated"
- type="checkbox"
- {{on "click" @controller.toggleOutdated}}
- />
- {{i18n "admin.site_text.show_outdated"}}
- </label>
+ <label class="checkbox-label">
+ <input
+ checked={{@controller.resolvedOnlySelectedLocale}}
+ id="toggle-only-locale"
+ type="checkbox"
+ {{on "click" @controller.toggleOnlySelectedLocale}}
+ />
+ {{i18n "admin.site_text.only_show_selected_locale"}}
+ </label>
- <label class="checkbox-label">
- <input
- checked={{@controller.resolvedOnlySelectedLocale}}
- id="toggle-only-locale"
- type="checkbox"
- {{on "click" @controller.toggleOnlySelectedLocale}}
+ {{#if @controller.showUntranslated}}
+ <label class="checkbox-label">
+ <input
+ checked={{@controller.resolvedUntranslated}}
+ id="toggle-untranslated"
+ type="checkbox"
+ {{on "click" @controller.toggleUntranslated}}
+ />
+ {{i18n "admin.site_text.show_untranslated"}}
+ </label>
+ {{/if}}
+ </div>
+ <DButton
+ class="btn-flat site-texts__reset-filters"
+ @action={{@controller.resetFilters}}
+ @disabled={{not @controller.hasActiveFilters}}
+ @label="filter_controls.reset"
/>
- {{i18n "admin.site_text.only_show_selected_locale"}}
- </label>
-
- {{#if @controller.showUntranslated}}
- <label class="checkbox-label">
- <input
- checked={{@controller.resolvedUntranslated}}
- id="toggle-untranslated"
- type="checkbox"
- {{on "click" @controller.toggleUntranslated}}
- />
- {{i18n "admin.site_text.show_untranslated"}}
- </label>
- {{/if}}
- </p>
+ </:additionalFilters>
+ </DFilterControls>
</div>
{{#if @controller.extras.recommended}}
- <p><b>{{i18n "admin.site_text.recommended"}}</b></p>
+ <p class="site-texts__recommended">{{i18n
+ "admin.site_text.recommended"
+ }}</p>
{{/if}}
<DLoadMore
diff --git a/frontend/discourse/app/ui-kit/d-filter-controls.gjs b/frontend/discourse/app/ui-kit/d-filter-controls.gjs
index a6cd4493e28..843ce21cb90 100644
--- a/frontend/discourse/app/ui-kit/d-filter-controls.gjs
+++ b/frontend/discourse/app/ui-kit/d-filter-controls.gjs
@@ -38,6 +38,8 @@ const ResetButton = <template>
* client: provide searchableProps and filterFn in dropdownOptions
* server: provide onTextFilterChange or onDropdownFilterChange callbacks
*
+ * The inlineFilters block places controls beside the search input, outside the drawer.
+ *
* @component DFilterControls
* @param {Array} array - The dataset to display
* @param {Array} [searchableProps] - Property names to search for client-side text filtering, can be dot-separated
@@ -63,6 +65,7 @@ const ResetButton = <template>
* @param {Function} [onResetFilters] - Callback for reset action (server-side mode)
* @param {Function} [onFilterDropdownsToggle] - Callback fired when the dropdown drawer is opened or
* closed, receiving the new expanded state as a boolean
+ * @param {String} [toggleLabel] - Optional translated label for the filter drawer button.
* @param {Boolean} [additionalFiltersActive=false] - Whether filters rendered in the additionalFilters block are active.
* The block renders alongside the dropdowns, sharing the drawer
* @param {String} [initialTextFilter] - Initial value to seed the text filter input on mount
@@ -497,8 +500,11 @@ export default class DFilterControls extends Component {
/>
{{/if}}
+ {{yield to="inlineFilters"}}
+
{{#if this.showDropdownFilterToggle}}
<DButton
+ aria-expanded={{if this.showFilterDropdowns "true" "false"}}
class="btn-default d-filter-controls__toggle-filters"
@action={{this.toggleFilters}}
@icon={{if
@@ -507,6 +513,7 @@ export default class DFilterControls extends Component {
"filter"
}}
@title="filter_controls.toggle"
+ @translatedLabel={{@toggleLabel}}
/>
{{#if this.showResetButton}}
<ResetButton
@@ -547,7 +554,7 @@ export default class DFilterControls extends Component {
{{/each}}
</DNativeSelect>
{{/each-in}}
- {{else}}
+ {{else if this.dropdownOptions.length}}
<DNativeSelect
aria-label={{this.singleDropdownLabel}}
class={{dConcatClass
diff --git a/frontend/discourse/tests/acceptance/admin-site-text-test.js b/frontend/discourse/tests/acceptance/admin-site-text-test.js
index 783811c1236..39daf64afa4 100644
--- a/frontend/discourse/tests/acceptance/admin-site-text-test.js
+++ b/frontend/discourse/tests/acceptance/admin-site-text-test.js
@@ -1,5 +1,6 @@
import { click, currentURL, fillIn, visit } from "@ember/test-helpers";
import { test } from "qunit";
+import pretender, { response } from "discourse/tests/helpers/create-pretender";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Admin - Site Texts", function (needs) {
@@ -19,6 +20,8 @@ acceptance("Admin - Site Texts", function (needs) {
assert.dom(".site-text:not(.overridden)").exists();
assert.dom(".site-text.overridden").exists();
+ await click(".d-filter-controls__toggle-filters");
+
// Only show overridden
await click(".search-area .filter-options #toggle-overridden");
assert.strictEqual(
@@ -41,7 +44,7 @@ acceptance("Admin - Site Texts", function (needs) {
test("edit and revert a site text by key", async function (assert) {
await visit("/admin/customize/site_texts/site.test?locale=en");
- assert.dom(".title h3").hasText("site.test");
+ assert.dom(".edit-site-text__key").hasText("site.test");
assert.dom(".saved").doesNotExist();
assert.dom(".revert-site-text").doesNotExist();
@@ -77,3 +80,130 @@ acceptance("Admin - Site Texts", function (needs) {
assert.dom(".save-changes").doesNotHaveAttribute("disabled");
});
});
+
+acceptance("Admin - Site Texts - baseline", function (needs) {
+ needs.user();
+ needs.settings({
+ available_locales: [{ name: "English", value: "en" }],
+ default_locale: "en",
+ });
+ needs.pretender((server, helper) => {
+ server.get("/admin/customize/site_texts", (request) => {
+ let texts = [
+ {
+ id: "sample.outdated",
+ value: "Old custom text",
+ status: "outdated",
+ overridden: true,
+ },
+ {
+ id: "sample.invalid",
+ value: "Invalid %{unknown}",
+ status: "invalid_interpolation_keys",
+ overridden: true,
+ },
+ {
+ id: "sample.default",
+ value: "Default text",
+ status: "up_to_date",
+ overridden: false,
+ },
+ ];
+ if (request.queryParams.overridden === "true") {
+ texts = texts.filter((text) => text.overridden);
+ }
+ return helper.response({ site_texts: texts, extras: {} });
+ });
+ });
+
+ test("reverting invalid text clears its warning and restores the default preview", async function (assert) {
+ const siteText = {
+ id: "sample.invalid",
+ value: "Invalid %{unknown}",
+ status: "invalid_interpolation_keys",
+ overridden: true,
+ can_revert: true,
+ new_default: "Original text",
+ interpolation_keys: [],
+ };
+ pretender.get("/admin/customize/site_texts/sample.invalid", () =>
+ response({ site_text: siteText })
+ );
+ pretender.delete("/admin/customize/site_texts/sample.invalid", () =>
+ response({
+ site_text: {
+ ...siteText,
+ value: "Original text",
+ status: "up_to_date",
+ overridden: false,
+ can_revert: false,
+ new_default: null,
+ },
+ })
+ );
+ await visit("/admin/customize/site_texts/sample.invalid?locale=en");
+ assert
+ .dom('.edit-site-text .outdated[role="status"]')
+ .exists("invalid text displays a warning");
+ await click(".revert-site-text");
+ await click("#dialog-holder .btn-primary");
+ assert
+ .dom('.edit-site-text .outdated[role="status"]')
+ .doesNotExist("reverting clears the warning");
+ assert
+ .dom(".edit-site-text__default p")
+ .hasText("Original text", "the default preview remains available");
+ assert
+ .dom(".site-text-value")
+ .hasValue("Original text", "the editor uses the default");
+ });
+
+ test("can reset an active filter hidden for the selected language", async function (assert) {
+ await visit("/admin/customize/site_texts?q=sample&untranslated=true");
+ assert
+ .dom("#toggle-untranslated")
+ .doesNotExist("English has no untranslated checkbox");
+ assert
+ .dom(".d-filter-controls__toggle-filters")
+ .hasText("Filters (1)", "the active query filter is counted");
+ await click(".site-texts__reset-filters");
+ assert.false(
+ currentURL().includes("untranslated=true"),
+ "reset removes the hidden filter"
+ );
+ assert
+ .dom(".site-text-search")
+ .hasValue("sample", "reset preserves search");
+ });
+
+ test("shows distinct statuses and preserves combined filters when resetting", async function (assert) {
+ await visit("/admin/customize/site_texts?q=sample");
+ assert
+ .dom('[data-site-text-id="sample.outdated"] .site-text__status')
+ .hasText("Outdated", "outdated status is explicit");
+ assert
+ .dom('[data-site-text-id="sample.invalid"] .site-text__status')
+ .hasText("Invalid", "invalid status is explicit");
+ assert.dom("#toggle-overridden").doesNotExist("filters start collapsed");
+ await click(".d-filter-controls__toggle-filters");
+ await click("#toggle-overridden");
+ await click("#toggle-outdated");
+ assert.dom("#toggle-overridden").isChecked("overridden remains selected");
+ assert.dom("#toggle-outdated").isChecked("outdated can be combined");
+ assert.true(
+ currentURL().includes("overridden=true"),
+ "overridden is stored in the URL"
+ );
+ assert.true(
+ currentURL().includes("outdated=true"),
+ "outdated is stored in the URL"
+ );
+ await click(".site-texts__reset-filters");
+ assert.dom("#toggle-overridden").isNotChecked("overridden is reset");
+ assert.dom("#toggle-outdated").isNotChecked("outdated is reset");
+ assert
+ .dom(".site-text-search")
+ .hasValue("sample", "reset preserves search");
+ assert.dom(".site-text").exists({ count: 3 }, "reset restores all rows");
+ });
+});
diff --git a/frontend/discourse/tests/integration/ui-kit/d-filter-controls-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-filter-controls-test.gjs
index e15c200222b..1d24bcdbc30 100644
--- a/frontend/discourse/tests/integration/ui-kit/d-filter-controls-test.gjs
+++ b/frontend/discourse/tests/integration/ui-kit/d-filter-controls-test.gjs
@@ -57,6 +57,36 @@ class RouterStub extends Service.extend(Evented) {
module("Integration | ui-kit | DFilterControls", function (hooks) {
setupRenderingTest(hooks);
+ test("supports inline controls and a checkbox-only filter drawer", async function (assert) {
+ await render(
+ <template>
+ <DFilterControls
+ @filterDropdownsExpanded={{false}}
+ @forceShowDropdownFilterToggle={{true}}
+ @showTextFilter={{false}}
+ @toggleLabel="Filters"
+ >
+ <:inlineFilters><input aria-label="Inline control" /></:inlineFilters>
+ <:additionalFilters><label><input type="checkbox" />Only customized</label></:additionalFilters>
+ </DFilterControls>
+ </template>
+ );
+ assert
+ .dom('[aria-label="Inline control"]')
+ .exists("inline controls stay visible");
+ assert
+ .dom(".d-filter-controls__toggle-filters")
+ .hasText("Filters", "toggle accepts a label");
+ assert.dom('input[type="checkbox"]').doesNotExist("drawer starts closed");
+ await click(".d-filter-controls__toggle-filters");
+ assert
+ .dom('input[type="checkbox"]')
+ .exists("drawer exposes additional filters");
+ assert
+ .dom(".d-filter-controls__dropdown")
+ .doesNotExist("no empty select is rendered");
+ });
+
test("renders text filter input", async function (assert) {
this.set("data", SAMPLE_DATA);
diff --git a/spec/system/page_objects/pages/admin_site_texts.rb b/spec/system/page_objects/pages/admin_site_texts.rb
index 35848f8ea9d..bbdb8aadfa6 100644
--- a/spec/system/page_objects/pages/admin_site_texts.rb
+++ b/spec/system/page_objects/pages/admin_site_texts.rb
@@ -29,14 +29,17 @@ module PageObjects
end
def toggle_only_show_overridden
+ expand_filters
find("#toggle-overridden").click
end
def toggle_only_show_outdated
+ expand_filters
find("#toggle-outdated").click
end
def toggle_only_show_results_in_selected_locale
+ expand_filters
find("#toggle-only-locale").click
end
@@ -53,8 +56,15 @@ module PageObjects
find(".save-changes").click
end
+ def expand_filters
+ if find(".d-filter-controls__toggle-filters")["aria-expanded"] == "false"
+ find(".d-filter-controls__toggle-filters").click
+ end
+ self
+ end
+
def click_replace_text_button
- find(".reseed button").click
+ click_button(I18n.t("admin_js.admin.reseed.action.label"))
end
end
end