diff --git a/app/assets/javascripts/admin/addon/components/admin-config-area-cards/about/contact-information.gjs b/app/assets/javascripts/admin/addon/components/admin-config-area-cards/about/contact-information.gjs index db75ec52aa7..e0bf32ec63c 100644 --- a/app/assets/javascripts/admin/addon/components/admin-config-area-cards/about/contact-information.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-config-area-cards/about/contact-information.gjs @@ -82,7 +82,7 @@ export default class AdminConfigAreasAboutContactInformation extends Component { @@ -96,7 +96,7 @@ export default class AdminConfigAreasAboutContactInformation extends Component { diff --git a/app/assets/javascripts/admin/addon/components/admin-config-area-cards/about/your-organization.gjs b/app/assets/javascripts/admin/addon/components/admin-config-area-cards/about/your-organization.gjs index 6a023333c48..3047874d07c 100644 --- a/app/assets/javascripts/admin/addon/components/admin-config-area-cards/about/your-organization.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-config-area-cards/about/your-organization.gjs @@ -58,7 +58,7 @@ export default class AdminConfigAreasAboutYourOrganization extends Component { @@ -75,7 +75,7 @@ export default class AdminConfigAreasAboutYourOrganization extends Component { @@ -89,7 +89,7 @@ export default class AdminConfigAreasAboutYourOrganization extends Component { diff --git a/app/assets/javascripts/discourse/app/form-kit/components/fk/control-wrapper.gjs b/app/assets/javascripts/discourse/app/form-kit/components/fk/control-wrapper.gjs index 58c33e26a40..05c764f27e0 100644 --- a/app/assets/javascripts/discourse/app/form-kit/components/fk/control-wrapper.gjs +++ b/app/assets/javascripts/discourse/app/form-kit/components/fk/control-wrapper.gjs @@ -3,7 +3,7 @@ import { concat } from "@ember/helper"; import { action } from "@ember/object"; import FKLabel from "discourse/form-kit/components/fk/label"; import FKMeta from "discourse/form-kit/components/fk/meta"; -import FormText from "discourse/form-kit/components/fk/text"; +import FKText from "discourse/form-kit/components/fk/text"; import concatClass from "discourse/helpers/concat-class"; import i18n from "discourse-common/helpers/i18n"; @@ -60,10 +60,10 @@ export default class FKControlWrapper extends Component { {{/if}} - {{#if @field.subtitle}} - {{@field.subtitle}} + {{#if @field.description}} + {{@field.description}} {{/if}}
- +
diff --git a/app/assets/javascripts/discourse/app/form-kit/components/fk/control/radio-group.gjs b/app/assets/javascripts/discourse/app/form-kit/components/fk/control/radio-group.gjs index d5431746481..634904f032f 100644 --- a/app/assets/javascripts/discourse/app/form-kit/components/fk/control/radio-group.gjs +++ b/app/assets/javascripts/discourse/app/form-kit/components/fk/control/radio-group.gjs @@ -3,7 +3,6 @@ import { hash } from "@ember/helper"; import FKFieldset from "discourse/form-kit/components/fk/fieldset"; import FKControlRadioGroupRadio from "./radio-group/radio"; -// eslint-disable-next-line ember/no-empty-glimmer-component-classes export default class FKControlRadioGroup extends Component { static controlType = "radio-group"; diff --git a/app/assets/javascripts/discourse/app/form-kit/components/fk/field.gjs b/app/assets/javascripts/discourse/app/form-kit/components/fk/field.gjs index 9a1c3f04e97..ac66e6b85e9 100644 --- a/app/assets/javascripts/discourse/app/form-kit/components/fk/field.gjs +++ b/app/assets/javascripts/discourse/app/form-kit/components/fk/field.gjs @@ -49,7 +49,6 @@ export default class FKField extends Component { this.field = this.args.registerField(this.name, { triggerRevalidationFor: this.args.triggerRevalidationFor, title: this.args.title, - subtitle: this.args.subtitle, description: this.args.description, showTitle: this.args.showTitle, collectionIndex: this.args.collectionIndex, diff --git a/app/assets/javascripts/discourse/app/form-kit/components/fk/meta.gjs b/app/assets/javascripts/discourse/app/form-kit/components/fk/meta.gjs index 9adcf4b5e3c..799a5439a4f 100644 --- a/app/assets/javascripts/discourse/app/form-kit/components/fk/meta.gjs +++ b/app/assets/javascripts/discourse/app/form-kit/components/fk/meta.gjs @@ -1,7 +1,6 @@ import Component from "@glimmer/component"; import FKCharCounter from "discourse/form-kit/components/fk/char-counter"; import FKErrors from "discourse/form-kit/components/fk/errors"; -import FKText from "discourse/form-kit/components/fk/text"; export default class FKMeta extends Component { get shouldRenderCharCounter() { @@ -9,12 +8,7 @@ export default class FKMeta extends Component { } get shouldRenderMeta() { - return ( - this.showMeta && - (this.shouldRenderCharCounter || - this.args.error || - this.args.description?.length) - ); + return this.showMeta && (this.shouldRenderCharCounter || this.args.error); } get showMeta() { @@ -26,8 +20,6 @@ export default class FKMeta extends Component {
{{#if @error}} - {{else if @description}} - {{@description}} {{/if}} {{#if this.shouldRenderCharCounter}} diff --git a/app/assets/javascripts/discourse/tests/helpers/form-kit-assertions.js b/app/assets/javascripts/discourse/tests/helpers/form-kit-assertions.js index acdd8bc02b1..7d6c3733414 100644 --- a/app/assets/javascripts/discourse/tests/helpers/form-kit-assertions.js +++ b/app/assets/javascripts/discourse/tests/helpers/form-kit-assertions.js @@ -142,12 +142,6 @@ class FieldHelper { } } - hasSubtitle(subtitle, message) { - this.context - .dom(this.element.querySelector(".form-kit__container-subtitle")) - .hasText(subtitle, message); - } - hasDescription(description, message) { switch (this.element.dataset.controlType) { case "checkbox": { @@ -162,7 +156,7 @@ class FieldHelper { } default: { this.context - .dom(this.element.querySelector(".form-kit__meta-description")) + .dom(this.element.querySelector(".form-kit__container-description")) .hasText(description, message); } } diff --git a/app/assets/javascripts/discourse/tests/integration/components/form-kit/controls/custom-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/form-kit/controls/custom-test.gjs index 615e38d0139..6407f4b2ef6 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/form-kit/controls/custom-test.gjs +++ b/app/assets/javascripts/discourse/tests/integration/components/form-kit/controls/custom-test.gjs @@ -11,7 +11,7 @@ module( test("default", async function (assert) { await render(); assert.dom(".form-kit__container-title").hasText("Foo (optional)"); - assert.dom(".form-kit__container-subtitle").hasText("Bar"); + assert.dom(".form-kit__container-description").hasText("Bar"); }); } ); diff --git a/app/assets/javascripts/discourse/tests/integration/components/form-kit/field-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/form-kit/field-test.gjs index 414a3ab7dd1..31e05d091e2 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/form-kit/field-test.gjs +++ b/app/assets/javascripts/discourse/tests/integration/components/form-kit/field-test.gjs @@ -35,18 +35,6 @@ module("Integration | Component | FormKit | Field", function (hooks) { assert.dom(".form-kit__row .form-kit__col.--col-8").hasText("Test"); }); - test("@subtitle", async function (assert) { - await render(); - - assert.form().field("foo").hasSubtitle("foo foo"); - }); - test("@description", async function (assert) { await render(