Skip to content

DEV: Replace <Input /> text usage in plugins #34352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 20, 2025
Merged

DEV: Replace <Input /> text usage in plugins #34352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18639aa
DEV: Replace <Input /> text usage in plugins
martin-brennan Aug 15, 2025
ea7a4c6
Merge branch 'main' into dev/replace-input-usage-plugins
martin-brennan Aug 18, 2025
0c53bdf
Merge branch 'main' into dev/replace-input-usage-plugins
martin-brennan Aug 19, 2025
daf4eec
DEV: Review fixes
martin-brennan Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions ...ns/discourse-subscriptions/assets/javascripts/discourse/components/create-coupon-form.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/* eslint-disable ember/no-classic-components */
import Component, { Input } from "@ember/component";
import { fn } from "@ember/helper";
import { on } from "@ember/modifier";
import { action } from "@ember/object";
import DButton from "discourse/components/d-button";
import withEventValue from "discourse/helpers/with-event-value";
import discourseComputed from "discourse/lib/decorators";
import { i18n } from "discourse-i18n";
import ComboBox from "select-kit/components/combo-box";
Expand Down Expand Up @@ -45,7 +47,12 @@ export default class CreateCouponForm extends Component {
<label for="promo_code">
{{i18n "discourse_subscriptions.admin.coupons.promo_code"}}
</label>
<Input @type="text" name="promo_code" @value={{this.promoCode}} />
<input
{{on "input" (withEventValue (fn (mut this.promoCode)))}}
type="text"
name="promo_code"
value={{this.promoCode}}
/>
</p>

<p>
Expand All @@ -57,11 +64,12 @@ export default class CreateCouponForm extends Component {
@value={{this.discountType}}
@onChange={{fn (mut this.discountType)}}
/>
<Input
<input
{{on "input" (withEventValue (fn (mut this.discount)))}}
class="discount-amount"
@type="text"
type="text"
name="amount"
@value={{this.discount}}
value={{this.discount}}
/>
</p>

Expand Down
56 changes: 38 additions & 18 deletions ...ts/discourse/templates/admin/plugins-discourse-subscriptions-products-show-plans-show.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { fn } from "@ember/helper";
import { on } from "@ember/modifier";
import RouteTemplate from "ember-route-template";
import DButton from "discourse/components/d-button";
import withEventValue from "discourse/helpers/with-event-value";
import { i18n } from "discourse-i18n";
import ComboBox from "select-kit/components/combo-box";

Expand All @@ -16,11 +17,11 @@ export default RouteTemplate(
{{i18n "discourse_subscriptions.admin.products.product.name"}}
</label>

<Input
@type="text"
<input
type="text"
name="product_name"
@value={{@controller.model.product.name}}
disabled={{true}}
value={{@controller.model.product.name}}
disabled
/>
</p>

Expand All @@ -29,10 +30,14 @@ export default RouteTemplate(
{{i18n "discourse_subscriptions.admin.plans.plan.nickname"}}
</label>

<Input
@type="text"
<input
{{on
"input"
(withEventValue (fn (mut @controller.model.plan.nickname)))
}}
type="text"
name="name"
@value={{@controller.model.plan.nickname}}
value={{@controller.model.plan.nickname}}
/>

<div class="control-instructions">
Expand Down Expand Up @@ -63,10 +68,11 @@ export default RouteTemplate(
</label>

{{#if @controller.planFieldDisabled}}
<Input
<input
class="plan-amount plan-currency"
disabled={{true}}
@value={{@controller.model.plan.currency}}
disabled
type="text"
value={{@controller.model.plan.currency}}
/>
{{else}}
<ComboBox
Expand All @@ -77,11 +83,15 @@ export default RouteTemplate(
/>
{{/if}}

<Input
<input
{{on
"input"
(withEventValue (fn (mut @controller.model.plan.amountDollars)))
}}
class="plan-amount"
@type="text"
type="text"
name="name"
@value={{@controller.model.plan.amountDollars}}
value={{@controller.model.plan.amountDollars}}
disabled={{@controller.planFieldDisabled}}
/>
</p>
Expand All @@ -96,7 +106,7 @@ export default RouteTemplate(
@type="checkbox"
name="recurring"
@checked={{@controller.model.plan.isRecurring}}
disabled={{true}}
disabled
/>
{{else}}
<Input
Expand All @@ -115,7 +125,11 @@ export default RouteTemplate(
</label>

{{#if @controller.planFieldDisabled}}
<Input disabled={{true}} @value={{@controller.selectedInterval}} />
<input
disabled
type="text"
value={{@controller.selectedInterval}}
/>
{{else}}
<ComboBox
@valueProperty="name"
Expand All @@ -132,10 +146,16 @@ export default RouteTemplate(
({{i18n "discourse_subscriptions.optional"}})
</label>

<Input
@type="text"
<input
{{on
"input"
(withEventValue
(fn (mut @controller.model.plan.trial_period_days))
)
}}
type="text"
name="trial"
@value={{@controller.model.plan.trial_period_days}}
value={{@controller.model.plan.trial_period_days}}
/>

<div class="control-instructions">
Expand Down
30 changes: 19 additions & 11 deletions plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable ember/no-classic-components */
import Component, { Input, Textarea } from "@ember/component";
import Component, { Textarea } from "@ember/component";
import { fn } from "@ember/helper";
import { on } from "@ember/modifier";
import EmberObject, { action } from "@ember/object";
Expand All @@ -15,6 +15,7 @@ import InputTip from "discourse/components/input-tip";
import RadioButton from "discourse/components/radio-button";
import concatClass from "discourse/helpers/concat-class";
import icon from "discourse/helpers/d-icon";
import withEventValue from "discourse/helpers/with-event-value";
import discourseComputed from "discourse/lib/decorators";
import autoFocus from "discourse/modifiers/auto-focus";
import { i18n } from "discourse-i18n";
Expand Down Expand Up @@ -476,7 +477,11 @@ export default class PollUiBuilderModal extends Component {
<label class="input-group-label">{{i18n
"poll.ui_builder.poll_title.label"
}}</label>
<Input @value={{this.pollTitle}} />
<input
{{on "input" (withEventValue (fn (mut this.pollTitle)))}}
type="text"
value={{this.pollTitle}}
/>
</div>
{{/if}}

Expand Down Expand Up @@ -540,9 +545,10 @@ export default class PollUiBuilderModal extends Component {
<label class="input-group-label">{{i18n
"poll.ui_builder.poll_config.min"
}}</label>
<Input
@type="number"
@value={{this.pollMin}}
<input
{{on "input" (withEventValue (fn (mut this.pollMin)))}}
type="number"
value={{this.pollMin}}
class="poll-options-min"
min="1"
/>
Expand All @@ -552,9 +558,10 @@ export default class PollUiBuilderModal extends Component {
<label class="input-group-label">{{i18n
"poll.ui_builder.poll_config.max"
}}</label>
<Input
@type="number"
@value={{this.pollMax}}
<input
{{on "input" (withEventValue (fn (mut this.pollMax)))}}
type="number"
value={{this.pollMax}}
class="poll-options-max"
min="1"
/>
Expand All @@ -565,9 +572,10 @@ export default class PollUiBuilderModal extends Component {
<label class="input-group-label">{{i18n
"poll.ui_builder.poll_config.step"
}}</label>
<Input
@type="number"
@value={{this.pollStep}}
<input
{{on "input" (withEventValue (fn (mut this.pollStep)))}}
type="number"
value={{this.pollStep}}
min="1"
class="poll-options-step"
/>
Expand Down
45 changes: 37 additions & 8 deletions plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/menus.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import Component from "@glimmer/component";
import { tracked } from "@glimmer/tracking";
import { Input } from "@ember/component";
import { fn } from "@ember/helper";
import { on } from "@ember/modifier";
import { action } from "@ember/object";
import { service } from "@ember/service";
import { htmlSafe } from "@ember/template";
import DButton from "discourse/components/d-button";
import DToggleSwitch from "discourse/components/d-toggle-switch";
import withEventValue from "discourse/helpers/with-event-value";
import DMenu from "float-kit/components/d-menu";
import { MENU } from "float-kit/lib/constants";
import DummyComponent from "discourse/plugins/styleguide/discourse/components/dummy-component";
Expand Down Expand Up @@ -189,25 +190,53 @@ export default class Menus extends Component {

<Controls>
<Row @name="Example label">
<Input @value={{this.label}} />
<input
{{on "input" (withEventValue (fn (mut this.label)))}}
type="text"
value={{this.label}}
/>
</Row>
<Row @name="[@content]">
<Input @value={{this.content}} />
<input
{{on "input" (withEventValue (fn (mut this.content)))}}
type="text"
value={{this.content}}
/>
</Row>
<Row @name="[@identifier]">
<Input @value={{this.identifier}} />
<input
{{on "input" (withEventValue (fn (mut this.identifier)))}}
type="text"
value={{this.identifier}}
/>
</Row>
<Row @name="[@offset]">
<Input @value={{this.offset}} @type="number" />
<input
{{on "input" (withEventValue (fn (mut this.offset)))}}
type="number"
value={{this.offset}}
/>
</Row>
<Row @name="[@triggers]">
<Input @value={{this.triggers}} />
<input
{{on "input" (withEventValue (fn (mut this.triggers)))}}
type="text"
value={{this.triggers}}
/>
</Row>
<Row @name="[@untriggers]">
<Input @value={{this.untriggers}} />
<input
{{on "input" (withEventValue (fn (mut this.untriggers)))}}
type="text"
value={{this.untriggers}}
/>
</Row>
<Row @name="[@maxWidth]">
<Input @value={{this.maxWidth}} @type="number" />
<input
{{on "input" (withEventValue (fn (mut this.maxWidth)))}}
type="number"
value={{this.maxWidth}}
/>
</Row>
<Row @name="[@interactive]">
<DToggleSwitch
Expand Down
26 changes: 21 additions & 5 deletions plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/toasts.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import Component from "@glimmer/component";
import { tracked } from "@glimmer/tracking";
import { Input } from "@ember/component";
import { fn, hash } from "@ember/helper";
import { on } from "@ember/modifier";
import { action } from "@ember/object";
import { service } from "@ember/service";
import DButton from "discourse/components/d-button";
import DToggleSwitch from "discourse/components/d-toggle-switch";
import withEventValue from "discourse/helpers/with-event-value";
import IconPicker from "select-kit/components/icon-picker";
import { TOAST } from "float-kit/lib/constants";
import DummyComponent from "discourse/plugins/styleguide/discourse/components/dummy-component";
Expand Down Expand Up @@ -157,20 +157,36 @@ export default class Toasts extends Component {
</Row>
{{#if this.autoClose}}
<Row @name="[@options.duration] ms">
<Input @value={{this.duration}} @type="number" />
<input
{{on "input" (withEventValue (fn (mut this.duration)))}}
type="number"
value={{this.duration}}
/>
</Row>
{{/if}}
<Row @name="[@options.class]">
<Input @value={{this.class}} />
<input
{{on "input" (withEventValue (fn (mut this.class)))}}
type="text"
value={{this.class}}
/>
</Row>
<Row>
<b>Model props for default:</b>
</Row>
<Row @name="[@options.data.title]">
<Input @value={{this.title}} />
<input
{{on "input" (withEventValue (fn (mut this.title)))}}
type="text"
value={{this.title}}
/>
</Row>
<Row @name="[@options.data.message]">
<Input @value={{this.message}} />
<input
{{on "input" (withEventValue (fn (mut this.message)))}}
type="text"
value={{this.message}}
/>
</Row>
<Row @name="[@options.data.icon]">
<IconPicker
Expand Down
Loading
Loading