A platform for community discussion. Free, open, simple.
DEV: moves field type on the field (#38552)
Joffrey JAFFEUXe8d63c944881
diff --git a/docs/developer-guides/docs/03-code-internals/21-form-kit.md b/docs/developer-guides/docs/03-code-internals/21-form-kit.mdindex 40c8e7f21a6..becd0c4f1ce 100644--- a/docs/developer-guides/docs/03-code-internals/21-form-kit.md+++ b/docs/developer-guides/docs/03-code-internals/21-form-kit.md@@ -10,7 +10,7 @@ id: form-kitFormKit exposes a single component as its public API: `<Form />`. All other elements are yielded as contextual components, modifiers, or plain data.-Every form is composed of one or multiple fields, representing the value, validation, and metadata of a control. Each field encapsulates a control, which is the form element the user interacts with to enter data, such as an input or select. Other utilities, like submit or alert, are also provided.+Every form is composed of one or multiple fields, representing the value, validation, and metadata of a control. Each field encapsulates a control, which is the form element the user interacts with to enter data, such as an input or select. The control type is specified via `@type` on the field. Other utilities, like submit or alert, are also provided.Here is the most basic example of a form:@@ -31,13 +31,14 @@ export default class MyForm extends Component {@name="username"@title="Username"@validation="required"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field>- <form.Field @name="age" @title="Age" as |field|>- <field.Input @type="number" />+ <form.Field @name="age" @title="Age" @type="input-number" as |field|>+ <field.Control /></form.Field><form.Submit />@@ -74,13 +75,13 @@ The `Form` component yields a `form` object containing components and helpers.```hbs<Form as |form transientData|>- <form.Field @name="amount" as |field|>- <field.Input @type="number" />+ <form.Field @name="amount" @type="input-number" as |field|>+ <field.Control /></form.Field>{{#if (gt transientData.amount 200)}}- <form.Field @name="confirmed" as |field|>- <field.Checkbox>I know what I'm doing</field.Checkbox>+ <form.Field @name="confirmed" @type="checkbox" as |field|>+ <field.Control>I know what I'm doing</field.Control></form.Field>{{/if}}</Form>@@ -113,9 +114,9 @@ get formData() {```hbs<Form @data={{hash foo="bar"}} as |form|>- <form.Field @name="foo" as |field|>+ <form.Field @name="foo" @type="input" as |field|><!-- This input will have "bar" as its initial value -->- <field.Input />+ <field.Control /></form.Field></Form>```@@ -166,11 +167,11 @@ handleSubmit({ username, age }) {```hbs<Form @onSubmit={{this.handleSubmit}} as |form|>- <form.Field @name="username" as |field|>- <field.Input />+ <form.Field @name="username" @type="input" as |field|>+ <field.Control /></form.Field>- <form.Field @name="age" as |field|>- <field.Input @type="number" />+ <form.Field @name="age" @type="input-number" as |field|>+ <field.Control /></form.Field><form.Submit /></Form>@@ -233,6 +234,19 @@ A field must have a title. It will be displayed above the control and is also us<form.Field @title="Foo" />```+## @type++A field must have a type. This determines which control component is rendered. The available types are:++- **Input types**: `input` (defaults to text), `input-number`, `input-email`, `input-password`, `input-url`, `input-tel`, `input-date`, `input-time`, `input-datetime-local`, `input-color`, `input-month`, `input-week`, `input-range`, `input-search`, `input-hidden`+- **Other controls**: `checkbox`, `code`, `calendar`, `color`, `composer`, `custom`, `emoji`, `icon`, `image`, `menu`, `password`, `question`, `radio-group`, `select`, `tag-chooser`, `textarea`, `toggle`++**Example**++```hbs+<form.Field @name="foo" @type="input" />+```+## @descriptionThe description is optional and will be shown under the title when set.@@ -275,15 +289,21 @@ A field can be disabled to prevent any changes to it.## @tooltip-Allows to display a tooltip next to the field’s title. Won't display if title is not shown.+Allows to display a tooltip next to the field's title. Won't display if title is not shown.You can pass a string or a `<DTooltip />` component.**Example**```hbs<Form as |form|>- <form.Field @name="foo" @title="Foo" @tooltip="a nice input" as |field|>- <field.Input />+ <form.Field+ @name="foo"+ @title="Foo"+ @type="input"+ @tooltip="a nice input"+ as |field|+ >+ <field.Control /></form.Field></Form>```@@ -293,10 +313,11 @@ You can pass a string or a `<DTooltip />` component.<form.Field@name="foo"@title="Foo"+ @type="input"@tooltip={{component DTooltip content="a nice input"}}as |field|>- <field.Input />+ <field.Control /></form.Field></Form>```@@ -323,8 +344,13 @@ handleFooChange(value, { set }) {``````hbs-<form.Field @name="foo" @onSet={{this.handleFooChange}} as |field|>- <field.Input />+<form.Field+ @name="foo"+ @type="input"+ @onSet={{this.handleFooChange}}+ as |field|+>+ <field.Control /></form.Field>```@@ -342,15 +368,46 @@ handleFooChange(value, { set }) {```hbs<Form @data={{this.model}} as |form|>- <form.Field @name="foo" @onSet={{this.handleFooChange}} as |field|>- <field.Input />+ <form.Field+ @name="foo"+ @type="input"+ @onSet={{this.handleFooChange}}+ as |field|+ >+ <field.Control /></form.Field></Form>```+## Yielded Parameters++The field yields a single field object. The control component determined by `@type` is available as `field.Control`.++```hbs+<form.Field @name="foo" @type="input" as |field|>+ <field.Control />+</form.Field>+```++### field.Control++`field.Control` is the control component determined by `@type`. You can pass control-specific attributes directly to it (e.g., `@height`, `@lang`, `placeholder`).++### field++The yielded `field` object provides access to the field's data and helpers:++| Name | Description |+| --------- | --------------------------------------------------- |+| `Control` | Contextual component for the control set by `@type` |+| `id` | ID to be used on the control for accessibility |+| `name` | Name of the field |+| `value` | The value of the field |+| `set` | Function to set the field's value |+# Controls-Controls, as we use the term here, refer to the UI widgets that allow a user to enter data. In its most basic form, this would be an input.+Controls, as we use the term here, refer to the UI widgets that allow a user to enter data. In its most basic form, this would be an input. The control type is specified via `@type` on the field.> :information_source: You can pass down HTML attributes to the underlying control.@@ -361,10 +418,11 @@ Controls, as we use the term here, refer to the UI widgets that allow a user to<form.Field@name="query"@title="Query"- @description="You should make sure the query doesn’t include bots."+ @type="input"+ @description="You should make sure the query doesn't include bots."as |field|>- <field.Input placeholder="Foo" />+ <field.Control placeholder="Foo" /></form.Field></Form>```@@ -399,14 +457,14 @@ Allows to override `@format` for the description. See `@format` for details.Renders an `<input type="checkbox">` element.> :information_source: When to use a single checkbox-> There are only 2 options: yes/no. It feels like agreeing to something. Checking the box doesn’t save; there is a submit button further down.+> There are only 2 options: yes/no. It feels like agreeing to something. Checking the box doesn't save; there is a submit button further down.**Example**```hbs<Form as |form|>- <form.Field @name="approved" @title="Approved" as |field|>- <field.Checkbox />+ <form.Field @name="approved" @title="Approved" @type="checkbox" as |field|>+ <field.Control /></form.Field></Form>```@@ -427,8 +485,8 @@ Sets the language of the editor.```hbs<Form as |form|>- <form.Field @name="query" @title="Query" as |field|>- <field.Code @lang="sql" @height={{400}} />+ <form.Field @name="query" @title="Query" @type="code" as |field|>+ <field.Control @lang="sql" @height={{400}} /></form.Field></Form>```@@ -445,8 +503,8 @@ Displays the time input or not. Defaults to true.```hbs<Form as |form|>- <form.Field @name="start" @title="Start" as |field|>- <field.Calendar @includeTime={{false}} />+ <form.Field @name="start" @title="Start" @type="calendar" as |field|>+ <field.Control @includeTime={{false}} /></form.Field></Form>```@@ -459,8 +517,8 @@ Displays date picker expanded on desktop. Defaults to true.```hbs<Form as |form|>- <form.Field @name="start" @title="Start" as |field|>- <field.Calendar @expandedDatePickerOnDesktop={{false}} />+ <form.Field @name="start" @title="Start" @type="calendar" as |field|>+ <field.Control @expandedDatePickerOnDesktop={{false}} /></form.Field></Form>```@@ -477,8 +535,8 @@ Sets the height of the composer.```hbs<Form as |form|>- <form.Field @name="message" @title="Message" as |field|>- <field.Composer @height={{400}} />+ <form.Field @name="message" @title="Message" @type="composer" as |field|>+ <field.Control @height={{400}} /></form.Field></Form>```@@ -491,8 +549,8 @@ Controls the display the composer preview. Defaults to `false`.```hbs<Form as |form|>- <form.Field @name="message" @title="Message" as |field|>- <field.Composer @preview={{true}} />+ <form.Field @name="message" @title="Message" @type="composer" as |field|>+ <field.Control @preview={{true}} /></form.Field></Form>```@@ -505,8 +563,8 @@ Renders an `<IconPicker />` component.```hbs<Form as |form|>- <form.Field @name="icon" @title="Icon" as |field|>- <field.Icon />+ <form.Field @name="icon" @title="Icon" @type="icon" as |field|>+ <field.Control /></form.Field></Form>```@@ -532,10 +590,11 @@ handleUpload(upload, { set }) {<form.Field@name="upload"@title="Upload"+ @type="image"@onSet={{this.handleUpload}}as |field|>- <field.Image />+ <field.Control /></form.Field></Form>```@@ -544,8 +603,8 @@ handleUpload(upload, { set }) {```hbs<Form as |form|>- <form.Field @name="upload" @title="Upload" as |field|>- <field.Image />+ <form.Field @name="upload" @title="Upload" @type="image" as |field|>+ <field.Control /></form.Field></Form>```@@ -556,25 +615,25 @@ Renders an `<input>` element.### @type-Optional property which will default to `text`. Maps to `<input>` types.+The input variant is specified as part of the field's `@type` using the `input-` prefix. For example, `@type="input"`, `@type="input-number"`, etc. `@type="input"` defaults to text.### Allowed Types-- `color`-- `date`-- `datetime-local`-- `email`-- `hidden`-- `month`-- `number`-- `password`-- `range`-- `search`-- `tel`-- `text`-- `time`-- `url`-- `week`+- `input` (defaults to text)+- `input-color`+- `input-date`+- `input-datetime-local`+- `input-email`+- `input-hidden`+- `input-month`+- `input-number`+- `input-password`+- `input-range`+- `input-search`+- `input-tel`+- `input-time`+- `input-url`+- `input-week`### Special Cases@@ -585,12 +644,12 @@ Optional property which will default to `text`. Maps to `<input>` types.```hbs<Form as |form|>- <form.Field @name="email" @title="Email" as |field|>- <field.Input />+ <form.Field @name="email" @title="Email" @type="input" as |field|>+ <field.Control /></form.Field>- <form.Field @name="age" @title="Age" @type="number" as |field|>- <field.Input />+ <form.Field @name="age" @title="Age" @type="input-number" as |field|>+ <field.Control /></form.Field></Form>```@@ -603,8 +662,8 @@ Renders text before the input```hbs<Form as |form|>- <form.Field @name="email" @title="Email" @before="mailto:" as |field|>- <field.Input />+ <form.Field @name="email" @title="Email" @type="input" as |field|>+ <field.Control @before="mailto:" /></form.Field></Form>```@@ -617,8 +676,8 @@ Renders text after the input```hbs<Form as |form|>- <form.Field @name="email" @title="Email" @after=".com" as |field|>- <field.Input />+ <form.Field @name="email" @title="Email" @type="input" as |field|>+ <field.Control @after=".com" /></form.Field></Form>```@@ -655,15 +714,15 @@ Renders a div which will have for content the yielded content.```hbs<Form as |form|>- <form.Field @name="email" @title="Email" as |field|>- <field.Menu as |menu|>+ <form.Field @name="email" @title="Email" @type="menu" as |field|>+ <field.Control as |menu|><menu.Item @value={{1}} @icon="pencil-alt">Edit</menu.Item><menu.Divider /><menu.Container class="foo">Bar</menu.Container><menu.Item @action={{this.doSomething}}>Something</menu.Item>- </field.Menu>+ </field.Control></form.Field></Form>```@@ -676,8 +735,8 @@ Renders an `<input />` of type password. This control also includes a button whi```hbs<Form as |form|>- <form.Field @name="secret" @title="Secret" as |field|>- <field.Password />+ <form.Field @name="secret" @title="Secret" @type="password" as |field|>+ <field.Control /></form.Field></Form>```@@ -698,8 +757,8 @@ Allows to customize the negative label.```hbs<Form as |form|>- <form.Field @name="email" @title="Email" as |field|>- <field.Question @yesLabel="Correct" @noLabel="Wrong" />+ <form.Field @name="email" @title="Email" @type="question" as |field|>+ <field.Control @yesLabel="Correct" @noLabel="Wrong" /></form.Field></Form>```@@ -712,12 +771,12 @@ Renders a list of radio buttons sharing a common name.```hbs<Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.RadioGroup as |radioGroup|>+ <form.Field @name="foo" @title="Foo" @type="radio-group" as |field|>+ <field.Control as |radioGroup|><radioGroup.Radio @value="one">One</radioGroup.Radio><radioGroup.Radio @value="two">Two</radioGroup.Radio><radioGroup.Radio @value="three">Three</radioGroup.Radio>- </field.RadioGroup>+ </field.Control></form.Field></Form>```@@ -732,12 +791,12 @@ Allows to render a title.```hbs<Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.RadioGroup as |RadioGroup|>+ <form.Field @name="foo" @title="Foo" @type="radio-group" as |field|>+ <field.Control as |RadioGroup|><RadioGroup.Radio @value="one" as |radio|><radio.Title>One title</radio.Title></RadioGroup.Radio>- </field.RadioGroup>+ </field.Control></form.Field></Form>```@@ -750,12 +809,12 @@ Allows to render a description.```hbs<Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.RadioGroup as |RadioGroup|>+ <form.Field @name="foo" @title="Foo" @type="radio-group" as |field|>+ <field.Control as |RadioGroup|><RadioGroup.Radio @value="one" as |radio|><radio.Description>One description</radio.Description></RadioGroup.Radio>- </field.RadioGroup>+ </field.Control></form.Field></Form>```@@ -768,12 +827,12 @@ Renders a `<select>` element.```hbs<Form as |form|>- <form.Field @name="fruits" @title="Fruits" as |field|>- <field.Select as |select|>+ <form.Field @name="fruits" @title="Fruits" @type="select" as |field|>+ <field.Control as |select|><select.Option @value="1">Mango</select.Option><select.Option @value="2">Apple</select.Option><select.Option @value="3">Coconut</select.Option>- </field.Select>+ </field.Control></form.Field></Form>```@@ -790,8 +849,13 @@ Sets the height of the textarea.```hbs<Form as |form|>- <form.Field @name="description" @title="Description" as |field|>- <field.Textarea @height={{120}} />+ <form.Field+ @name="description"+ @title="Description"+ @type="textarea"+ as |field|+ >+ <field.Control @height={{120}} /></form.Field></Form>```@@ -806,8 +870,8 @@ Renders a `<DToggleSwitch />` component.```hbs<Form as |form|>- <form.Field @name="allowed" @title="Allowed" as |field|>- <field.Toggle />+ <form.Field @name="allowed" @title="Allowed" @type="toggle" as |field|>+ <field.Control /></form.Field></Form>```@@ -868,11 +932,16 @@ Specifies the type of alert. Allowed types: `success`, `error`, `warning`, or `i```hbs<form.CheckboxGroup @title="Preferences" as |group|>- <group.Field @name="editable" @title="Editable" as |field|>- <field.Checkbox />+ <group.Field @name="editable" @title="Editable" @type="checkbox" as |field|>+ <field.Control /></group.Field>- <group.Field @name="searchable" @title="Searchable" as |field|>- <field.Checkbox />+ <group.Field+ @name="searchable"+ @title="Searchable"+ @type="checkbox"+ as |field|+ >+ <field.Control /></group.Field></form.CheckboxGroup>```@@ -948,11 +1017,11 @@ Input group allows to group multiple inputs together on one line.```hbs<Form as |form|><form.InputGroup as |inputGroup|>- <inputGroup.Field @title="Foo" @name="foo" as |field|>- <field.Input />+ <inputGroup.Field @title="Foo" @name="foo" @type="input" as |field|>+ <field.Control /></inputGroup.Field>- <inputGroup.Field @title="Bar" @name="bar" as |field|>- <field.Input />+ <inputGroup.Field @title="Bar" @name="bar" @type="input" as |field|>+ <field.Control /></inputGroup.Field></form.InputGroup></Form>@@ -986,13 +1055,13 @@ To customize the `Reset` button further, you can pass additional parameters as n<Form as |form|><form.Row as |row|><row.Col @size={{4}}>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Input />+ <form.Field @name="foo" @title="Foo" @type="input" as |field|>+ <field.Control /></form.Field></row.Col><row.Col @size={{8}}>- <form.Field @name="bar" @title="Bar" as |field|>- <field.Input />+ <form.Field @name="bar" @title="Bar" @type="input" as |field|>+ <field.Control /></form.Field></row.Col></form.Row>@@ -1040,11 +1109,11 @@ The object component allows to handle an object in your form.```hbs<Form @data={{hash foo=(hash bar=1 baz=2)}} as |form|><form.Object @name="foo" as |object data|>- <object.Field @name="bar" @title="Bar" as |field|>- <field.Input />+ <object.Field @name="bar" @title="Bar" @type="input" as |field|>+ <field.Control /></object.Field>- <object.Field @name="baz" @title="Baz" as |field|>- <field.Input />+ <object.Field @name="baz" @title="Baz" @type="input" as |field|>+ <field.Control /></object.Field></form.Object></Form>@@ -1070,8 +1139,8 @@ An object can accept a nested Object or Collection.<Form @data={{hash foo=(hash bar=(hash baz=1 bol=2))}} as |form|><form.Object @name="foo" as |parentObject|><parentObject.Object @name="bar" as |childObject data|>- <childObject.Field @name="baz" @title="Baz" as |field|>- <field.Input />+ <childObject.Field @name="baz" @title="Baz" @type="input" as |field|>+ <field.Control /></childObject.Field></parentObject.Object></form.Object>@@ -1080,8 +1149,8 @@ An object can accept a nested Object or Collection.<Form @data={{hash foo=(hash bar=(array 1 2))}} as |form|><form.Object @name="foo" as |parentObject|><parentObject.Collection @name="bar" as |collection index|>- <collection.Field @title="Baz" as |field|>- <field.Input />+ <collection.Field @title="Baz" @type="input" as |field|>+ <field.Control /></collection.Field><form.Buttonclass={{concat "remove-" index}}@@ -1101,8 +1170,8 @@ The collection component allows to handle array of objects in your form.```hbs<Form @data={{hash foo=(array (hash bar=1) (hash bar=2))}} as |form|><form.Collection @name="foo" as |collection index|>- <collection.Field @name="bar" @title="Bar" as |field|>- <field.Input placeholder={{concat "item-" index}} />+ <collection.Field @name="bar" @title="Bar" @type="input" as |field|>+ <field.Control placeholder={{concat "item-" index}} /></collection.Field></form.Collection></Form>@@ -1139,10 +1208,10 @@ If the shape of your data is an array of primitives, eg: [1, 2, 3], form-kit is```hbs<Form @data={{hash foo=(array 1 2)}} as |form|><form.Collection @name="foo" as |collection|>- <collection.Field @title="Baz" as |field|>- <field.Input />+ <collection.Field @title="Baz" @type="input" as |field|>+ <field.Control /></collection.Field>- </form.Object>+ </form.Collection></Form>```@@ -1159,8 +1228,8 @@ A collection can accept a nested Object or Collection.><form.Collection @name="foo" as |collection|><collection.Object @name="bar" as |object|>- <object.Field @name="baz" @title="Baz" as |field|>- <field.Input />+ <object.Field @name="baz" @title="Baz" @type="input" as |field|>+ <field.Control /></object.Field></collection.Object></form.Collection>@@ -1174,8 +1243,8 @@ A collection can accept a nested Object or Collection.><form.Collection @name="foo" as |parent parentIndex|><parent.Collection @name="bar" as |child childIndex|>- <child.Field @name="baz" @title="Baz" as |field|>- <field.Input />+ <child.Field @name="baz" @title="Baz" @type="input" as |field|>+ <field.Control /></child.Field></parent.Collection></form.Collection>@@ -1195,8 +1264,8 @@ The `<Form />` component yielded object has a `addItemToCollection` function tha</form.Button><form.Collection @name="foo" as |collection index|>- <collection.Field @name="bar" @title="Bar" as |field|>- <field.Input placeholder={{concat "item-" index}} />+ <collection.Field @name="bar" @title="Bar" @type="input" as |field|>+ <field.Control placeholder={{concat "item-" index}} /></collection.Field></form.Collection></Form>@@ -1211,8 +1280,8 @@ The `<Collection />` component yielded object has a `remove` function that you c```hbs<Form @data={{hash foo=(array (hash bar=1) (hash bar=2))}} as |form|><form.Collection @name="foo" as |collection index|>- <collection.Field @name="bar" @title="Bar" as |field|>- <field.Input />+ <collection.Field @name="bar" @title="Bar" @type="input" as |field|>+ <field.Control /><form.Button @action={{fn collection.remove index}}>Remove</form.Button>@@ -1234,29 +1303,35 @@ The value must be `"yes"`, `"on"`, `true`, `1`, or `"true"`. Useful for checkbox**Example**```hbs-<field.Checkbox @name="terms" @validation="accepted" />+<form.Field @name="terms" @type="checkbox" @validation="accepted" as |field|>+ <field.Control />+</form.Field>```### Length-Checks that the input’s value is over a given length, or between two length values.+Checks that the input's value is over a given length, or between two length values.**Example**```hbs-<field.Input @name="username" @validation="length:5,16" />+<form.Field @name="username" @type="input" @validation="length:5,16" as |field|>+ <field.Control />+</form.Field>```### NumberChecks if the input is a valid number as evaluated by `isNaN()`.-> :information_source: When applicable, prefer to use the number input: `<field.Input @type="number" />`.+> :information_source: When applicable, prefer to use the number input: `@type="input-number"`.**Example**```hbs-<field.Input @name="amount" @validation="number" />+<form.Field @name="amount" @type="input" @validation="number" as |field|>+ <field.Control />+</form.Field>```### Required@@ -1266,7 +1341,9 @@ Checks if the input is empty.**Example**```hbs-<field.Input @name="username" @validation="required" />+<form.Field @name="username" @type="input" @validation="required" as |field|>+ <field.Control />+</form.Field>```### URL@@ -1276,7 +1353,9 @@ Checks if the input value appears to be a properly formatted URL including the p**Example**```hbs-<field.Input @name="endpoint" @validation="url" />+<form.Field @name="endpoint" @type="input-url" @validation="url" as |field|>+ <field.Control />+</form.Field>```### integer@@ -1286,7 +1365,9 @@ Checks if the input value is an integer.**Example**```hbs-<field.Input @name="age" @validation="integer" />+<form.Field @name="age" @type="input-number" @validation="integer" as |field|>+ <field.Control />+</form.Field>```### dateAfterOrEqual@@ -1296,7 +1377,14 @@ Checks if the calendar data is after or equal to the specified date. Format must**Example**```hbs-<field.Calendar @name="start" @validation="dateAfterOrEqual:2022-02-01" />+<form.Field+ @name="start"+ @type="calendar"+ @validation="dateAfterOrEqual:2022-02-01"+ as |field|+>+ <field.Control />+</form.Field>```### dateBeforeOrEqual@@ -1306,7 +1394,14 @@ Checks if the calendar data is before or equal to the specified date. Format mus**Example**```hbs-<field.Calendar @name="start" @validation="dateBeforeOrEqual:2022-02-01" />+<form.Field+ @name="start"+ @type="calendar"+ @validation="dateBeforeOrEqual:2022-02-01"+ as |field|+>+ <field.Control />+</form.Field>```## Combining Rules@@ -1316,7 +1411,14 @@ Rules can be combined using the pipe operator: `|`.**Example**```hbs-<field.Input @name="username" @validation="required|length:5,16" />+<form.Field+ @name="username"+ @type="input"+ @validation="required|length:5,16"+ as |field|+>+ <field.Control />+</form.Field>```## Custom Validation@@ -1430,7 +1532,7 @@ Using the `setProperties` helper yielded by the form:**Parameters**- `name` (string): The name of the field that is invalid.-- `error` (object): The error’s data+- `error` (object): The error's data- `title` (string): The title of the error, usually the translated name of the field- `message` (string): The error message@@ -1455,8 +1557,8 @@ FormKit works seamlessly with `<PluginOutlet />`. You can use plugin outlets insThen, in your connector, you can use the outlet arguments to add custom fields:```hbs title="connectors/above-foo-form/bar-input.hbs"-<@outletArgs.form.Field @name="bar" as |field|>- <field.Input />+<@outletArgs.form.Field @name="bar" @type="input" as |field|>+ <field.Control /></@outletArgs.form.Field>```@@ -1466,8 +1568,8 @@ All FormKit components propagate attributes, allowing you to set classes and dat```hbs<Form class="my-form" as |form|>- <form.Field class="my-field" as |field|>- <field.Input class="my-control" />+ <form.Field @name="foo" @type="input" class="my-field" as |field|>+ <field.Control class="my-control" /></form.Field></Form>```@@ -1478,10 +1580,10 @@ Creating a custom control is straightforward with the properties yielded by `for```hbs<Form as |form|>- <form.Field class="my-field" as |field|>- <field.Custom>+ <form.Field @type="custom" class="my-field" as |field|>+ <field.Control><MyCustomControl id={{field.id}} @onChange={{field.set}} />- </field.Custom>+ </field.Control></form.Field></Form>```@@ -1492,14 +1594,6 @@ Creating a custom control is straightforward with the properties yielded by `for| ----- | ----------------------------------------------------------------- || `set` | Allows you to set the value of any field by name: `set("bar", 1)` |-### Available Parameters on `field`--| Name | Description |-| ------- | ---------------------------------------------- |-| `id` | ID to be used on the control for accessibility |-| `name` | Name of the field |-| `value` | The value of the field |-# Custom Validation## Field@@ -1783,8 +1877,8 @@ test("fill in input", async function (assert) {await render(<template><Form class="my-form" as |form data|>- <form.Field @name="foo" as |field|>- <field.Input />+ <form.Field @name="foo" @type="input" as |field|>+ <field.Control /></form.Field></Form></template>@@ -1822,7 +1916,7 @@ formKit().reset();### fillIn()-Can be used on [`<field.Input @type="text" />`](/docs/guides/frontend/form-kit/controls/input), [`<field.Code />`](/docs/guides/frontend/form-kit/controls/code), [`<field.Textarea />`](/docs/guides/frontend/form-kit/controls/textarea), and [`<field.Composer />`](/docs/guides/frontend/form-kit/controls/composer).+Can be used on `@type="input"`, `@type="code"`, `@type="textarea"`, and `@type="composer"` fields.**Parameters**@@ -1836,7 +1930,7 @@ await formKit().field("foo").fillIn("bar");### toggle()-Can be used on [`<field.Checkbox />`](/docs/guides/frontend/form-kit/controls/checkbox), [`<field.Toggle />`](/docs/guides/frontend/form-kit/controls/toggle) or [`<field.Password />`](/docs/guides/frontend/form-kit/controls/password)+Can be used on `@type="checkbox"`, `@type="toggle"`, or `@type="password"` fields.Will toggle the state of the control. In the case of the password control it will actually toggle the visibility of the field.@@ -1848,7 +1942,7 @@ await formKit().field("foo").toggle();### accept()-Can be used on [`<field.Checkbox />`](/docs/guides/frontend/form-kit/controls/question).+Can be used on `@type="question"` fields.**Example**@@ -1858,7 +1952,7 @@ await formKit().field("foo").accept();### refuse()-Can be used on [`<field.Checkbox />`](/docs/guides/frontend/form-kit/controls/question).+Can be used on `@type="question"` fields.**Example**@@ -1868,7 +1962,7 @@ await formKit().field("foo").refuse();### select()-Can be used on [`<field.Select />`](/docs/guides/frontend/form-kit/controls/select), [`<field.Menu />`](/docs/guides/frontend/form-kit/controls/menu), [`<field.Icon />`](/docs/guides/frontend/form-kit/controls/icon), and [`<field.RadioGroup />`](/docs/guides/frontend/form-kit/controls/radio-group).+Can be used on `@type="select"`, `@type="menu"`, `@type="icon"`, and `@type="radio-group"` fields.Will select the given value.@@ -2022,7 +2116,7 @@ expect(field).to be_enabled### toggle-Allows toggling a field. Only available for: [checkbox](/docs/guides/frontend/form-kit/controls/checkbox).+Allows toggling a field. Only available for: `@type="checkbox"`.**Example**@@ -2032,7 +2126,7 @@ field.toggle### fill_in-Allows filling a field with a given value. Only available for: [input](/docs/guides/frontend/form-kit/controls/input), [text](/docs/guides/frontend/form-kit/controls/text), [code](/docs/guides/frontend/form-kit/controls/code), and [composer](/docs/guides/frontend/form-kit/controls/composer).+Allows filling a field with a given value. Only available for: `@type="input"`, `@type="textarea"`, `@type="code"`, and `@type="composer"`.**Example**@@ -2042,7 +2136,7 @@ field.fill_in("bar")### select-Allows selecting a specified value in a field. Only available for: [select](/docs/guides/frontend/form-kit/controls/select), [icon](/docs/guides/frontend/form-kit/controls/icon), [menu](/docs/guides/frontend/form-kit/controls/menu), [radio-group](/docs/guides/frontend/form-kit/controls/radio-group), and [question](/docs/guides/frontend/form-kit/controls/question).+Allows selecting a specified value in a field. Only available for: `@type="select"`, `@type="icon"`, `@type="menu"`, `@type="radio-group"`, and `@type="question"`.**Example**@@ -2052,7 +2146,7 @@ field.select("bar")### accept-Allows accepting a field. Only available for: [question](/docs/guides/frontend/form-kit/controls/question).+Allows accepting a field. Only available for: `@type="question"`.**Example**@@ -2062,7 +2156,7 @@ field.accept### refuse-Allows refusing a field. Only available for: [question](/docs/guides/frontend/form-kit/controls/question).+Allows refusing a field. Only available for: `@type="question"`.**Example**@@ -2072,7 +2166,7 @@ field.refuse### upload_image-Takes an image path on the filesystem and uploads it for the field. Only available for the `Image` control.+Takes an image path on the filesystem and uploads it for the field. Only available for the `@type="image"` control.**Example**diff --git a/frontend/discourse/admin/components/admin-badges-show.gjs b/frontend/discourse/admin/components/admin-badges-show.gjsindex acd397c91a2..ad9ddefb589 100644--- a/frontend/discourse/admin/components/admin-badges-show.gjs+++ b/frontend/discourse/admin/components/admin-badges-show.gjs@@ -259,9 +259,10 @@ export default class AdminBadgesShow extends Component {@name="enabled"@validation="required"@title={{i18n "admin.badges.status"}}+ @type="question"as |field|>- <field.Question+ <field.Control@yesLabel={{i18n "admin.badges.enabled"}}@noLabel={{i18n "admin.badges.disabled"}}/>@@ -285,9 +286,10 @@ export default class AdminBadgesShow extends Component {@name="name"@disabled={{this.readOnly}}@validation="required"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field>{{/if}}@@ -297,15 +299,16 @@ export default class AdminBadgesShow extends Component {@title={{i18n "admin.badges.badge_type"}}@validation="required"@disabled={{this.readOnly}}+ @type="select"as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each this.badgeTypes as |badgeType|}}<select.Option @value={{badgeType.id}}>{{badgeType.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field><form.ConditionalContent@@ -328,9 +331,10 @@ export default class AdminBadgesShow extends Component {@name="icon"@onSet={{this.onSetIcon}}@format="small"+ @type="icon"as |field|>- <field.Icon />+ <field.Control /></form.Field></Content><Content @name="upload-image">@@ -339,9 +343,10 @@ export default class AdminBadgesShow extends Component {@showTitle={{false}}@title={{i18n "admin.badges.image"}}@onSet={{this.onSetImage}}+ @type="image"as |field|>- <field.Image @type="badge_image" />+ <field.Control @type="badge_image" /></form.Field></Content></cc.Contents>@@ -369,9 +374,10 @@ export default class AdminBadgesShow extends Component {@title={{i18n "admin.badges.description"}}@name="description"@disabled={{this.readOnly}}+ @type="textarea"as |field|>- <field.Textarea />+ <field.Control /></form.Field>{{/if}}@@ -398,9 +404,10 @@ export default class AdminBadgesShow extends Component {@name="long_description"@title={{i18n "admin.badges.long_description"}}@disabled={{this.readOnly}}+ @type="textarea"as |field|>- <field.Textarea />+ <field.Control /></form.Field>{{/if}}</form.Section>@@ -412,9 +419,10 @@ export default class AdminBadgesShow extends Component {@title={{i18n "admin.badges.query"}}@disabled={{this.readOnly}}@format="full"+ @type="code"as |field|>- <field.Code @lang="sql" />+ <field.Control @lang="sql" /></form.Field>{{#if (this.hasQuery data.query)}}@@ -439,9 +447,10 @@ export default class AdminBadgesShow extends Component {@disabled={{this.readOnly}}@showTitle={{false}}@title={{i18n "admin.badges.auto_revoke"}}+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></group.Field><group.Field@@ -449,9 +458,10 @@ export default class AdminBadgesShow extends Component {@disabled={{this.readOnly}}@title={{i18n "admin.badges.target_posts"}}@showTitle={{false}}+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></group.Field></form.CheckboxGroup>@@ -460,15 +470,16 @@ export default class AdminBadgesShow extends Component {@disabled={{this.readOnly}}@validation="required"@title={{i18n "admin.badges.trigger"}}+ @type="select"as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each this.badgeTriggers as |badgeTrigger|}}<select.Option @value={{badgeTrigger.id}}>{{badgeTrigger.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field>{{/if}}</form.Section>@@ -479,13 +490,17 @@ export default class AdminBadgesShow extends Component {@name="badge_grouping_id"@validation="required"@title={{i18n "admin.badges.badge_grouping"}}+ @type="menu"as |field|>- <field.Menu @selection={{this.currentBadgeGrouping data}} as |menu|>+ <field.Control+ @selection={{this.currentBadgeGrouping data}}+ as |menu|+ >{{#each this.badgeGroupings as |grouping|}}<menu.Item @value={{grouping.id}}>{{grouping.name}}</menu.Item>{{/each}}- </field.Menu>+ </field.Control></form.Field><form.CheckboxGroup@@ -497,9 +512,10 @@ export default class AdminBadgesShow extends Component {@showTitle={{false}}@name="allow_title"@format="full"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></group.Field><group.Field@@ -508,9 +524,10 @@ export default class AdminBadgesShow extends Component {@name="multiple_grant"@disabled={{this.readOnly}}@format="full"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></group.Field></form.CheckboxGroup>@@ -524,9 +541,10 @@ export default class AdminBadgesShow extends Component {@name="listable"@disabled={{this.readOnly}}@format="full"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></group.Field><group.Field@@ -535,9 +553,10 @@ export default class AdminBadgesShow extends Component {@name="show_posts"@disabled={{this.readOnly}}@format="full"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></group.Field><group.Field@@ -546,13 +565,14 @@ export default class AdminBadgesShow extends Component {@name="show_in_post_header"@disabled={{this.disableBadgeOnPosts data}}@format="full"+ @type="checkbox"as |field|>- <field.Checkbox>+ <field.Control>{{#if (this.postHeaderDescription data)}}{{i18n "admin.badges.show_in_post_header_disabled"}}{{/if}}- </field.Checkbox>+ </field.Control></group.Field></form.CheckboxGroup></form.Section>diff --git a/frontend/discourse/admin/components/admin-config-area-cards/about/contact-information.gjs b/frontend/discourse/admin/components/admin-config-area-cards/about/contact-information.gjsindex 69e59a57775..bb8d46f1a13 100644--- a/frontend/discourse/admin/components/admin-config-area-cards/about/contact-information.gjs+++ b/frontend/discourse/admin/components/admin-config-area-cards/about/contact-information.gjs@@ -80,9 +80,10 @@ export default class AdminConfigAreasAboutContactInformation extends Component {@title={{i18n "admin.config_areas.about.community_owner"}}@description={{i18n "admin.config_areas.about.community_owner_help"}}@format="large"+ @type="input"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n"admin.config_areas.about.community_owner_placeholder"}}@@ -93,11 +94,11 @@ export default class AdminConfigAreasAboutContactInformation extends Component {@name="contactEmail"@title={{i18n "admin.config_areas.about.contact_email"}}@description={{i18n "admin.config_areas.about.contact_email_help"}}- @type="email"+ @type="input-email"@format="large"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n"admin.config_areas.about.contact_email_placeholder"}}@@ -108,11 +109,11 @@ export default class AdminConfigAreasAboutContactInformation extends Component {@name="contactURL"@title={{i18n "admin.config_areas.about.contact_url"}}@description={{i18n "admin.config_areas.about.contact_url_help"}}- @type="url"+ @type="input-url"@format="large"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n"admin.config_areas.about.contact_url_placeholder"}}@@ -125,15 +126,16 @@ export default class AdminConfigAreasAboutContactInformation extends Component {@description={{i18n "admin.config_areas.about.site_contact_name_help"}}@onSet={{this.setContactUsername}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><UserChooser@value={{field.value}}@options={{hash maximum=1}}@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field><form.Field@@ -142,16 +144,17 @@ export default class AdminConfigAreasAboutContactInformation extends Component {@description={{i18n "admin.config_areas.about.site_contact_group_help"}}@onSet={{this.setContactGroup}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><GroupChooser@content={{this.site.groups}}@value={{this.contactGroupId}}@options={{hash maximum=1}}@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field><form.Submitdiff --git a/frontend/discourse/admin/components/admin-config-area-cards/about/extra-groups.gjs b/frontend/discourse/admin/components/admin-config-area-cards/about/extra-groups.gjsindex 9629a1c1d49..455cee54d39 100644--- a/frontend/discourse/admin/components/admin-config-area-cards/about/extra-groups.gjs+++ b/frontend/discourse/admin/components/admin-config-area-cards/about/extra-groups.gjs@@ -67,15 +67,16 @@ export default class AdminConfigAreasAboutExtraGroups extends Component {@name="aboutPageExtraGroups"@title={{i18n "admin.config_areas.about.extra_groups.groups"}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><GroupChooser@content={{this.site.groups}}@value={{field.value}}@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field><form.Field@@ -86,9 +87,10 @@ export default class AdminConfigAreasAboutExtraGroups extends Component {}}@validation="required"@format="large"+ @type="input-number"as |field|>- <field.Input @type="number" />+ <field.Control /></form.Field><form.Field@@ -96,24 +98,26 @@ export default class AdminConfigAreasAboutExtraGroups extends Component {@title={{i18n "admin.config_areas.about.extra_groups.order"}}@validation="required"@format="large"+ @type="select"as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each this.orderings as |ordering|}}<select.Option @value={{ordering}}>{{ordering}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field><form.Field@name="aboutPageExtraGroupsShowDescription"@title={{i18n "admin.config_areas.about.extra_groups.show_description"}}@format="large"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></form.Field><form.Submitdiff --git a/frontend/discourse/admin/components/admin-config-area-cards/about/general-settings.gjs b/frontend/discourse/admin/components/admin-config-area-cards/about/general-settings.gjsindex a8aaf82556f..c29e644e852 100644--- a/frontend/discourse/admin/components/admin-config-area-cards/about/general-settings.gjs+++ b/frontend/discourse/admin/components/admin-config-area-cards/about/general-settings.gjs@@ -65,9 +65,10 @@ export default class AdminConfigAreasAboutGeneralSettings extends Component {@title={{i18n "admin.config_areas.about.community_name"}}@validation="required"@format="large"+ @type="input"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n"admin.config_areas.about.community_name_placeholder"}}@@ -78,17 +79,19 @@ export default class AdminConfigAreasAboutGeneralSettings extends Component {@name="summary"@title={{i18n "admin.config_areas.about.community_summary"}}@format="large"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@name="extendedDescription"@title={{i18n "admin.config_areas.about.community_description"}}+ @type="composer"as |field|>- <field.Composer />+ <field.Control /></form.Field><form.Field@@ -96,9 +99,10 @@ export default class AdminConfigAreasAboutGeneralSettings extends Component {@title={{i18n "admin.config_areas.about.community_title"}}@description={{i18n "admin.config_areas.about.community_title_help"}}@format="large"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@@ -106,9 +110,10 @@ export default class AdminConfigAreasAboutGeneralSettings extends Component {@title={{i18n "admin.config_areas.about.banner_image"}}@helpText={{i18n "admin.config_areas.about.banner_image_help"}}@onSet={{this.setImage}}+ @type="image"as |field|>- <field.Image @type="site_setting" />+ <field.Control @type="site_setting" /></form.Field><form.Submitdiff --git a/frontend/discourse/admin/components/admin-config-area-cards/about/your-organization.gjs b/frontend/discourse/admin/components/admin-config-area-cards/about/your-organization.gjsindex 0ceec60b0cd..4a12b3e57ef 100644--- a/frontend/discourse/admin/components/admin-config-area-cards/about/your-organization.gjs+++ b/frontend/discourse/admin/components/admin-config-area-cards/about/your-organization.gjs@@ -54,9 +54,10 @@ export default class AdminConfigAreasAboutYourOrganization extends Component {@name="companyName"@title={{i18n "admin.config_areas.about.company_name"}}@format="large"+ @type="input"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n"admin.config_areas.about.company_name_placeholder"}}@@ -71,9 +72,10 @@ export default class AdminConfigAreasAboutYourOrganization extends Component {@title={{i18n "admin.config_areas.about.governing_law"}}@description={{i18n "admin.config_areas.about.governing_law_help"}}@format="large"+ @type="input"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n"admin.config_areas.about.governing_law_placeholder"}}@@ -85,9 +87,10 @@ export default class AdminConfigAreasAboutYourOrganization extends Component {@title={{i18n "admin.config_areas.about.city_for_disputes"}}@description={{i18n "admin.config_areas.about.city_for_disputes_help"}}@format="large"+ @type="input"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n"admin.config_areas.about.city_for_disputes_placeholder"}}diff --git a/frontend/discourse/admin/components/admin-config-areas/api-keys-new.gjs b/frontend/discourse/admin/components/admin-config-areas/api-keys-new.gjsindex ae84bd0948c..3391b0efd1f 100644--- a/frontend/discourse/admin/components/admin-config-areas/api-keys-new.gjs+++ b/frontend/discourse/admin/components/admin-config-areas/api-keys-new.gjs@@ -280,9 +280,10 @@ export default class AdminConfigAreasApiKeysNew extends Component {@title={{i18n "admin.api.description"}}@format="large"@validation="required"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@@ -290,15 +291,16 @@ export default class AdminConfigAreasApiKeysNew extends Component {@title={{i18n "admin.api.user_mode"}}@format="large"@validation="required"+ @type="select"as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each this.userModes as |userMode|}}<select.Option@value={{userMode.id}}>{{userMode.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field>{{#if (eq transientData.user_mode "single")}}@@ -307,9 +309,10 @@ export default class AdminConfigAreasApiKeysNew extends Component {@title={{i18n "admin.api.user"}}@format="large"@validation="required"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><EmailGroupUserChooser@value={{this.username}}@onChange={{fn this.updateUsername field}}@@ -318,7 +321,7 @@ export default class AdminConfigAreasApiKeysNew extends Component {filterPlaceholder="admin.api.user_placeholder"}}/>- </field.Custom>+ </field.Control></form.Field>{{/if}}@@ -327,15 +330,16 @@ export default class AdminConfigAreasApiKeysNew extends Component {@title={{i18n "admin.api.scope_mode"}}@format="large"@validation="required"+ @type="select"as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each this.scopeModes as |scopeMode|}}<select.Option@value={{scopeMode.id}}>{{scopeMode.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field>{{#if (eq transientData.scope_mode "granular")}}@@ -385,9 +389,10 @@ export default class AdminConfigAreasApiKeysNew extends Component {collectionData.key)}}+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></topicsCollection.Field></td><td>@@ -413,9 +418,10 @@ export default class AdminConfigAreasApiKeysNew extends Component {@name={{name}}@title={{name}}@showTitle={{false}}+ @type="input"as |field|>- <field.Input placeholder={{name}} />+ <field.Control placeholder={{name}} /></paramsObject.Field>{{/each}}</topicsCollection.Object>diff --git a/frontend/discourse/admin/components/admin-config-areas/color-palette.gjs b/frontend/discourse/admin/components/admin-config-areas/color-palette.gjsindex 7d44ac729b5..a8538fd916d 100644--- a/frontend/discourse/admin/components/admin-config-areas/color-palette.gjs+++ b/frontend/discourse/admin/components/admin-config-areas/color-palette.gjs@@ -282,10 +282,11 @@ export default class AdminConfigAreasColorPalette extends Component {@validation="required"@format="full"@onSet={{this.handleNameChange}}+ @type="input"as |field|><div class="admin-config-color-palettes__name-control">- <field.Input />+ <field.Control /><DButtonclass="btn-primary admin-config-color-palettes__save-name"@icon="check"@@ -359,9 +360,10 @@ export default class AdminConfigAreasColorPalette extends Component {}}@format="full"@onSet={{this.handleDefaultLightOnThemeChange}}+ @type="toggle"as |field|>- <field.Toggle />+ <field.Control /></form.Field></form.Row><form.Row>@@ -377,9 +379,10 @@ export default class AdminConfigAreasColorPalette extends Component {}}@format="full"@onSet={{this.handleDefaultDarkOnThemeChange}}+ @type="toggle"as |field|>- <field.Toggle />+ <field.Control /></form.Field></form.Row><form.Row>@@ -394,9 +397,10 @@ export default class AdminConfigAreasColorPalette extends Component {}}@format="full"@onSet={{this.handleUserSelectableChange}}+ @type="toggle"as |field|>- <field.Toggle />+ <field.Control /></form.Field></form.Row></:content>@@ -410,14 +414,15 @@ export default class AdminConfigAreasColorPalette extends Component {@title={{i18n "admin.config_areas.color_palettes.colors.title"}}@showTitle={{false}}@format="full"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><ColorPaletteEditor@colors={{transientData.colors}}@onColorChange={{this.onColorChange}}/>- </field.Custom>+ </field.Control></form.Field></:content></AdminConfigAreaCard>diff --git a/frontend/discourse/admin/components/admin-config-areas/webhooks-form.gjs b/frontend/discourse/admin/components/admin-config-areas/webhooks-form.gjsindex 7b48ec9f2f5..d36a4ac0a39 100644--- a/frontend/discourse/admin/components/admin-config-areas/webhooks-form.gjs+++ b/frontend/discourse/admin/components/admin-config-areas/webhooks-form.gjs@@ -126,9 +126,10 @@ export default class AdminConfigAreasWebhookForm extends Component {@title={{i18n "admin.web_hooks.payload_url"}}@format="large"@validation="required|url"+ @type="input"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n"admin.web_hooks.payload_url_placeholder"}}@@ -140,15 +141,16 @@ export default class AdminConfigAreasWebhookForm extends Component {@title={{i18n "admin.web_hooks.content_type"}}@format="large"@validation="required"+ @type="select"as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each this.contentTypes as |contentType|}}<select.Option@value={{contentType.id}}>{{contentType.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field><form.Field@@ -157,9 +159,10 @@ export default class AdminConfigAreasWebhookForm extends Component {@description={{i18n "admin.web_hooks.secret_placeholder"}}@format="large"@validation="length:12"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@@ -168,9 +171,10 @@ export default class AdminConfigAreasWebhookForm extends Component {@validation="required"@onSet={{this.setRequirement}}@format="full"+ @type="radio-group"as |field|>- <field.RadioGroup as |radioGroup|>+ <field.Control as |radioGroup|><radioGroup.Radio @value="individual">{{i18n "admin.web_hooks.individual_event"}}</radioGroup.Radio>@@ -200,7 +204,7 @@ export default class AdminConfigAreasWebhookForm extends Component {<radioGroup.Radio @value="wildcard">{{i18n "admin.web_hooks.wildcard_event"}}</radioGroup.Radio>- </field.RadioGroup>+ </field.Control></form.Field><form.Field@@ -210,14 +214,15 @@ export default class AdminConfigAreasWebhookForm extends Component {"admin.web_hooks.categories_filter_instructions"}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><CategorySelector@categories={{field.value}}@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field>{{#if this.showTagsFilter}}@@ -228,9 +233,10 @@ export default class AdminConfigAreasWebhookForm extends Component {"admin.web_hooks.tags_filter_instructions"}}@format="large"+ @type="tag-chooser"as |field|>- <field.TagChooser+ <field.Control@showAllTags={{true}}@excludeSynonyms={{true}}/>@@ -244,15 +250,16 @@ export default class AdminConfigAreasWebhookForm extends Component {"admin.web_hooks.groups_filter_instructions"}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><GroupSelector@groupNames={{field.value}}@groupFinder={{this.webhook.groupFinder}}@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field><PluginOutlet@@ -266,9 +273,10 @@ export default class AdminConfigAreasWebhookForm extends Component {@title={{i18n "admin.web_hooks.verify_certificate"}}@showTitle={{false}}@format="large"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></form.Field><form.Field@@ -276,9 +284,10 @@ export default class AdminConfigAreasWebhookForm extends Component {@title={{i18n "admin.web_hooks.active"}}@showTitle={{false}}@format="large"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></form.Field><form.Actions>diff --git a/frontend/discourse/admin/components/admin-embedding-host-form.gjs b/frontend/discourse/admin/components/admin-embedding-host-form.gjsindex 5e5cb1aa20a..4fc8872c791 100644--- a/frontend/discourse/admin/components/admin-embedding-host-form.gjs+++ b/frontend/discourse/admin/components/admin-embedding-host-form.gjs@@ -74,37 +74,41 @@ export default class AdminEmbeddingHostForm extends Component {@title={{i18n "admin.embedding.host"}}@validation="required"@format="large"+ @type="input"as |field|>- <field.Input placeholder="example.com" />+ <field.Control placeholder="example.com" /></form.Field><form.Field@name="allowed_paths"@title={{i18n "admin.embedding.allowed_paths"}}@format="large"+ @type="input"as |field|>- <field.Input placeholder="/blog/.*" />+ <field.Control placeholder="/blog/.*" /></form.Field><form.Field@name="category"@title={{i18n "admin.embedding.category"}}+ @type="custom"as |field|>- <field.Custom>+ <field.Control><CategoryChooser@value={{field.value}}@onChange={{field.set}}class="admin-embedding-host-form__category"/>- </field.Custom>+ </field.Control></form.Field><form.Field@name="tags"@title={{i18n "admin.embedding.tags"}}+ @type="custom"as |field|>- <field.Custom>+ <field.Control><TagChooser@tags={{field.value}}@everyTag={{true}}@@ -116,22 +120,23 @@ export default class AdminEmbeddingHostForm extends Component {}}class="admin-embedding-host-form__tags"/>- </field.Custom>+ </field.Control></form.Field><form.Field@name="user"@title={{i18n "admin.embedding.post_author"}}@description={{i18n "admin.embedding.post_author_description"}}+ @type="custom"as |field|>- <field.Custom>+ <field.Control><UserChooser@value={{field.value}}@onChange={{field.set}}@options={{hash maximum=1 excludeCurrentUser=false}}class="admin-embedding-host-form__post_author"/>- </field.Custom>+ </field.Control></form.Field><form.Submit @label="admin.embedding.host_form.save" />diff --git a/frontend/discourse/admin/components/admin-flags-form.gjs b/frontend/discourse/admin/components/admin-flags-form.gjsindex 9b26f8ea586..5c0d0138573 100644--- a/frontend/discourse/admin/components/admin-flags-form.gjs+++ b/frontend/discourse/admin/components/admin-flags-form.gjs@@ -146,9 +146,10 @@ export default class AdminFlagsForm extends Component {@title={{i18n "admin.config_areas.flags.form.name"}}@validation="required|length:3,200"@format="large"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@@ -156,9 +157,10 @@ export default class AdminFlagsForm extends Component {@title={{i18n "admin.config_areas.flags.form.description"}}@validation="required|length:3,1000"@format="large"+ @type="textarea"as |field|>- <field.Textarea @height={{60}} />+ <field.Control @height={{60}} /></form.Field><form.Field@@ -167,9 +169,10 @@ export default class AdminFlagsForm extends Component {@validation="required"@validate={{this.validateAppliesTo}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><MultiSelect@id={{field.id}}@value={{field.value}}@@ -178,7 +181,7 @@ export default class AdminFlagsForm extends Component {@options={{hash allowAny=false}}class="admin-flag-form__applies-to"/>- </field.Custom>+ </field.Control></form.Field><form.CheckboxGroup as |checkboxGroup|>@@ -188,22 +191,24 @@ export default class AdminFlagsForm extends Component {"admin.config_areas.flags.form.require_message"}}@format="full"+ @type="checkbox"as |field|>- <field.Checkbox>+ <field.Control>{{i18n"admin.config_areas.flags.form.require_message_description"}}- </field.Checkbox>+ </field.Control></checkboxGroup.Field><checkboxGroup.Field@name="enabled"@title={{i18n "admin.config_areas.flags.form.enabled"}}@format="full"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></checkboxGroup.Field><checkboxGroup.Field@@ -212,9 +217,10 @@ export default class AdminFlagsForm extends Component {"admin.config_areas.flags.form.auto_action_type"}}@format="full"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></checkboxGroup.Field></form.CheckboxGroup>diff --git a/frontend/discourse/admin/components/admin-font-chooser.gjs b/frontend/discourse/admin/components/admin-font-chooser.gjsindex c082b3102a7..45a64914399 100644--- a/frontend/discourse/admin/components/admin-font-chooser.gjs+++ b/frontend/discourse/admin/components/admin-font-chooser.gjs@@ -25,8 +25,18 @@ export default class AdminFontChooser extends Component {}<template>- <@field.Custom>- {{#each MAIN_FONTS as |font|}}+ {{#each MAIN_FONTS as |font|}}+ <DButton+ @action={{fn this.setButtonValue @field.set font.key}}+ class={{concatClass+ "admin-fonts-form__button-option font btn-flat"+ (concat "body-font-" (dasherize font.key))+ (if (eq @selectedFont font.key) "active")+ }}+ >{{font.name}}</DButton>+ {{/each}}+ {{#if this.showMoreFonts}}+ {{#each MORE_FONTS as |font|}}<DButton@action={{fn this.setButtonValue @field.set font.key}}class={{concatClass@@ -36,28 +46,16 @@ export default class AdminFontChooser extends Component {}}>{{font.name}}</DButton>{{/each}}+ {{/if}}+ <DButton+ @action={{this.toggleMoreFonts}}+ class="btn-default admin-fonts-form__more"+ >{{#if this.showMoreFonts}}- {{#each MORE_FONTS as |font|}}- <DButton- @action={{fn this.setButtonValue @field.set font.key}}- class={{concatClass- "admin-fonts-form__button-option font btn-flat"- (concat "body-font-" (dasherize font.key))- (if (eq @selectedFont font.key) "active")- }}- >{{font.name}}</DButton>- {{/each}}+ {{i18n "admin.config.fonts.form.fewer_fonts"}}+ {{else}}+ {{i18n "admin.config.fonts.form.more_fonts"}}{{/if}}- <DButton- @action={{this.toggleMoreFonts}}- class="btn-default admin-fonts-form__more"- >- {{#if this.showMoreFonts}}- {{i18n "admin.config.fonts.form.fewer_fonts"}}- {{else}}- {{i18n "admin.config.fonts.form.more_fonts"}}- {{/if}}- </DButton>- </@field.Custom>+ </DButton></template>}diff --git a/frontend/discourse/admin/components/admin-fonts-form.gjs b/frontend/discourse/admin/components/admin-fonts-form.gjsindex 8e6e4c12dfa..0f0d2264c9d 100644--- a/frontend/discourse/admin/components/admin-fonts-form.gjs+++ b/frontend/discourse/admin/components/admin-fonts-form.gjs@@ -123,24 +123,30 @@ export default class AdminFontsForm extends Component {@title={{i18n "admin.config.fonts.form.base_font.title"}}@validation="required"@format="full"+ @type="custom"as |field|>- <AdminFontChooser- @field={{field}}- @selectedFont={{transientData.base_font}}- />+ <field.Control>+ <AdminFontChooser+ @field={{field}}+ @selectedFont={{transientData.base_font}}+ />+ </field.Control></form.Field><form.Field@name="heading_font"@title={{i18n "admin.config.fonts.form.heading_font.title"}}@validation="required"@format="full"+ @type="custom"as |field|>- <AdminFontChooser- @field={{field}}- @selectedFont={{transientData.heading_font}}- />+ <field.Control>+ <AdminFontChooser+ @field={{field}}+ @selectedFont={{transientData.heading_font}}+ />+ </field.Control></form.Field><form.Field@name="default_text_size"@@ -150,9 +156,10 @@ export default class AdminFontsForm extends Component {}}@validation="required"@format="full"+ @type="custom"as |field|>- <field.Custom>+ <field.Control>{{#each DEFAULT_TEXT_SIZES as |textSize|}}<DButton@action={{fn this.setButtonValue field.set textSize}}@@ -163,7 +170,7 @@ export default class AdminFontsForm extends Component {}}>{{textSize}}</DButton>{{/each}}- </field.Custom>+ </field.Control></form.Field><form.Submit /></Form>diff --git a/frontend/discourse/admin/components/admin-logo-form.gjs b/frontend/discourse/admin/components/admin-logo-form.gjsindex b76e0faf9f6..5644ad310a8 100644--- a/frontend/discourse/admin/components/admin-logo-form.gjs+++ b/frontend/discourse/admin/components/admin-logo-form.gjs@@ -136,17 +136,19 @@ export default class AdminLogoForm extends Component {@description={{i18n "admin.config.logo.form.logo.description"}}@helpText={{i18n "admin.config.logo.form.logo.help_text"}}@onSet={{fn this.handleUpload "logo"}}+ @type="image"as |field|>- <field.Image @type="branding" />+ <field.Control @type="branding" /></form.Field><form.Field@name="logo_dark_required"@title={{i18n "admin.config.logo.form.logo_dark.required"}}@format="full"+ @type="toggle"as |field|>- <field.Toggle />+ <field.Control /></form.Field>{{#if transientData.logo_dark_required}}<form.Section>@@ -155,9 +157,10 @@ export default class AdminLogoForm extends Component {@title={{i18n "admin.config.logo.form.logo_dark.title"}}@helpText={{i18n "admin.config.logo.form.logo_dark.help_text"}}@onSet={{fn this.handleUpload "logo_dark"}}+ @type="image"as |field|>- <field.Image @type="branding" />+ <field.Control @type="branding" /></form.Field></form.Section>{{/if}}@@ -167,9 +170,10 @@ export default class AdminLogoForm extends Component {@description={{i18n "admin.config.logo.form.large_icon.description"}}@helpText={{i18n "admin.config.logo.form.large_icon.help_text"}}@onSet={{fn this.handleUpload "large_icon"}}+ @type="image"as |field|>- <field.Image+ <field.Control@type="branding"@placeholderUrl={{this.placeholders.large_icon}}/>@@ -179,9 +183,10 @@ export default class AdminLogoForm extends Component {@title={{i18n "admin.config.logo.form.favicon.title"}}@description={{i18n "admin.config.logo.form.favicon.description"}}@onSet={{fn this.handleUpload "favicon"}}+ @type="image"as |field|>- <field.Image+ <field.Control@type="branding"@placeholderUrl={{this.placeholders.favicon}}/>@@ -192,17 +197,19 @@ export default class AdminLogoForm extends Component {@description={{i18n "admin.config.logo.form.logo_small.description"}}@helpText={{i18n "admin.config.logo.form.logo_small.help_text"}}@onSet={{fn this.handleUpload "logo_small"}}+ @type="image"as |field|>- <field.Image @type="branding" />+ <field.Control @type="branding" /></form.Field><form.Field@name="logo_small_dark_required"@title={{i18n "admin.config.logo.form.logo_small_dark.required"}}@format="full"+ @type="toggle"as |field|>- <field.Toggle />+ <field.Control /></form.Field>{{#if transientData.logo_small_dark_required}}<form.Section>@@ -213,9 +220,10 @@ export default class AdminLogoForm extends Component {"admin.config.logo.form.logo_small_dark.help_text"}}@onSet={{fn this.handleUpload "logo_small_dark"}}+ @type="image"as |field|>- <field.Image @type="branding" />+ <field.Control @type="branding" /></form.Field></form.Section>{{/if}}@@ -235,9 +243,10 @@ export default class AdminLogoForm extends Component {}}@helpText={{i18n "admin.config.logo.form.mobile_logo.help_text"}}@onSet={{fn this.handleUpload "mobile_logo"}}+ @type="image"as |field|>- <field.Image+ <field.Control@type="branding"@placeholderUrl={{this.placeholders.mobile_logo}}/>@@ -246,9 +255,10 @@ export default class AdminLogoForm extends Component {@name="mobile_logo_dark_required"@title={{i18n "admin.config.logo.form.mobile_logo_dark.required"}}@format="full"+ @type="toggle"as |field|>- <field.Toggle />+ <field.Control /></form.Field>{{#if transientData.mobile_logo_dark_required}}<form.Section>@@ -261,9 +271,10 @@ export default class AdminLogoForm extends Component {"admin.config.logo.form.mobile_logo_dark.help_text"}}@onSet={{fn this.handleUpload "mobile_logo_dark"}}+ @type="image"as |field|>- <field.Image @type="branding" />+ <field.Control @type="branding" /></form.Field></form.Section>{{/if}}@@ -277,9 +288,10 @@ export default class AdminLogoForm extends Component {"admin.config.logo.form.manifest_icon.help_text"}}@onSet={{fn this.handleUpload "manifest_icon"}}+ @type="image"as |field|>- <field.Image @type="branding" />+ <field.Control @type="branding" /></form.Field><form.Field@name="manifest_screenshots"@@ -290,9 +302,10 @@ export default class AdminLogoForm extends Component {"admin.config.logo.form.manifest_screenshots.description"}}@format="full"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><SimpleList@onChange={{fn this.updateManifestScreenshots field}}@inputDelimiter="|"@@ -300,7 +313,7 @@ export default class AdminLogoForm extends Component {@allowAny={{true}}id={{field.id}}/>- </field.Custom>+ </field.Control></form.Field><form.Field@name="apple_touch_icon"@@ -312,9 +325,10 @@ export default class AdminLogoForm extends Component {"admin.config.logo.form.apple_touch_icon.help_text"}}@onSet={{fn this.handleUpload "apple_touch_icon"}}+ @type="image"as |field|>- <field.Image+ <field.Control@type="branding"@placeholderUrl={{this.placeholders.apple_touch_icon}}/>@@ -336,9 +350,10 @@ export default class AdminLogoForm extends Component {}}@helpText={{i18n "admin.config.logo.form.digest_logo.help_text"}}@onSet={{fn this.handleUpload "digest_logo"}}+ @type="image"as |field|>- <field.Image+ <field.Control@type="branding"@placeholderUrl={{this.placeholders.digest_logo}}/>@@ -359,9 +374,10 @@ export default class AdminLogoForm extends Component {"admin.config.logo.form.opengraph_image.description"}}@onSet={{fn this.handleUpload "opengraph_image"}}+ @type="image"as |field|>- <field.Image+ <field.Control@type="branding"@placeholderUrl={{this.placeholders.opengraph_image}}/>diff --git a/frontend/discourse/admin/components/admin-permalink-form.gjs b/frontend/discourse/admin/components/admin-permalink-form.gjsindex 10ae30474e3..0e4d235b7d5 100644--- a/frontend/discourse/admin/components/admin-permalink-form.gjs+++ b/frontend/discourse/admin/components/admin-permalink-form.gjs@@ -136,18 +136,20 @@ export default class AdminFlagsForm extends Component {@title={{i18n "admin.permalink.form.url"}}@validation="required"@format="large"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@name="permalinkType"@title={{i18n "admin.permalink.form.permalink_type"}}@validation="required"+ @type="select"as |field|>- <field.Select as |select|>+ <field.Control as |select|><select.Option @value="topic">{{i18n"admin.permalink.topic_title"}}</select.Option>@@ -166,7 +168,7 @@ export default class AdminFlagsForm extends Component {<select.Option @value="user">{{i18n"admin.permalink.user_title"}}</select.Option>- </field.Select>+ </field.Control></form.Field>{{#if (eq transientData.permalinkType "topic")}}<form.Field@@ -174,9 +176,10 @@ export default class AdminFlagsForm extends Component {@title={{i18n "admin.permalink.topic_id"}}@format="small"@validation="required"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field>{{/if}}{{#if (eq transientData.permalinkType "post")}}@@ -185,9 +188,10 @@ export default class AdminFlagsForm extends Component {@title={{i18n "admin.permalink.post_id"}}@format="small"@validation="required"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field>{{/if}}{{#if (eq transientData.permalinkType "category")}}@@ -196,9 +200,10 @@ export default class AdminFlagsForm extends Component {@title={{i18n "admin.permalink.category_id"}}@format="small"@validation="required"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field>{{/if}}{{#if (eq transientData.permalinkType "tag")}}@@ -207,9 +212,10 @@ export default class AdminFlagsForm extends Component {@title={{i18n "admin.permalink.tag_name"}}@format="small"@validation="required"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field>{{/if}}{{#if (eq transientData.permalinkType "external_url")}}@@ -218,9 +224,10 @@ export default class AdminFlagsForm extends Component {@title={{i18n "admin.permalink.external_url"}}@format="large"@validation="required"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field>{{/if}}{{#if (eq transientData.permalinkType "user")}}@@ -229,9 +236,10 @@ export default class AdminFlagsForm extends Component {@title={{i18n "admin.permalink.user_id"}}@format="small"@validation="required"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field>{{/if}}diff --git a/frontend/discourse/admin/components/admin-user-fields-form.gjs b/frontend/discourse/admin/components/admin-user-fields-form.gjsindex 25c39c7a5df..5a8b73f0275 100644--- a/frontend/discourse/admin/components/admin-user-fields-form.gjs+++ b/frontend/discourse/admin/components/admin-user-fields-form.gjs@@ -146,15 +146,16 @@ export default class AdminUserFieldsForm extends Component {@title={{i18n "admin.user_fields.type"}}@format="large"@validation="required"+ @type="select"as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each this.fieldTypes as |fieldType|}}<select.Option@value={{fieldType.id}}>{{fieldType.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field><form.Field@@ -162,9 +163,10 @@ export default class AdminUserFieldsForm extends Component {@title={{i18n "admin.user_fields.name"}}@format="large"@validation="required"+ @type="input"as |field|>- <field.Input class="user-field-name" maxlength="255" />+ <field.Control class="user-field-name" maxlength="255" /></form.Field><form.Field@@ -172,9 +174,10 @@ export default class AdminUserFieldsForm extends Component {@title={{i18n "admin.user_fields.description"}}@format="large"@validation="required"+ @type="input"as |field|>- <field.Input class="user-field-desc" maxlength="1000" />+ <field.Control class="user-field-desc" maxlength="1000" /></form.Field>{{#if@@ -188,15 +191,16 @@ export default class AdminUserFieldsForm extends Component {@title={{i18n "admin.user_fields.options"}}@format="large"@validation="required"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><ValueList@values={{transientData.options}}@inputType="array"@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field>{{/if}}@@ -206,9 +210,10 @@ export default class AdminUserFieldsForm extends Component {@validation="required"@onSet={{this.setRequirement}}@format="full"+ @type="radio-group"as |field|>- <field.RadioGroup as |radioGroup|>+ <field.Control as |radioGroup|><radioGroup.Radio @value="optional">{{i18n "admin.user_fields.requirement.optional.title"}}</radioGroup.Radio>@@ -224,7 +229,7 @@ export default class AdminUserFieldsForm extends Component {"admin.user_fields.requirement.on_signup.description"}}</radio.Description></radioGroup.Radio>- </field.RadioGroup>+ </field.Control></form.Field><div class="user-field-preferences">@@ -237,41 +242,46 @@ export default class AdminUserFieldsForm extends Component {@showTitle={{false}}@onSet={{this.setEditable}}@title={{i18n "admin.user_fields.editable.title"}}+ @type="checkbox"as |field|>- <field.Checkbox disabled={{this.editableDisabled}} />+ <field.Control disabled={{this.editableDisabled}} /></group.Field><group.Field@name="show_on_profile"@showTitle={{false}}@title={{i18n "admin.user_fields.show_on_profile.title"}}+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></group.Field><group.Field@name="show_on_user_card"@showTitle={{false}}@title={{i18n "admin.user_fields.show_on_user_card.title"}}+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></group.Field><group.Field@name="searchable"@showTitle={{false}}@title={{i18n "admin.user_fields.searchable.title"}}+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></group.Field><group.Field@name="show_on_signup"@showTitle={{false}}@title={{i18n "admin.user_fields.show_on_signup.title"}}+ @type="checkbox"as |field|>- <field.Checkbox+ <field.Controldisabled={{this.showOnSignupDisabled transientData}}/></group.Field>diff --git a/frontend/discourse/admin/components/admin-welcome-banner-form.gjs b/frontend/discourse/admin/components/admin-welcome-banner-form.gjsindex 685154c458b..737b6b10209 100644--- a/frontend/discourse/admin/components/admin-welcome-banner-form.gjs+++ b/frontend/discourse/admin/components/admin-welcome-banner-form.gjs@@ -368,9 +368,10 @@ export default class AdminWelcomeBannerForm extends Component {"admin.config.welcome_banner.form.enabled_themes.description"}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><DMultiSelect@loadFn={{this.loadThemes}}@selection={{field.value}}@@ -386,7 +387,7 @@ export default class AdminWelcomeBannerForm extends Component {{{theme.name}}</:result></DMultiSelect>- </field.Custom>+ </field.Control></form.Field><form.Field@@ -398,9 +399,10 @@ export default class AdminWelcomeBannerForm extends Component {"admin.config.welcome_banner.form.background_image.description"}}@onSet={{fn this.handleUpload "welcomeBannerImage"}}+ @type="image"as |field|>- <field.Image @type="site_setting" />+ <field.Control @type="site_setting" /></form.Field><form.Field@@ -410,9 +412,10 @@ export default class AdminWelcomeBannerForm extends Component {"admin.config.welcome_banner.form.text_color.description"}}@format="large"+ @type="color"as |field|>- <field.Color @allowNamedColors={{true}} />+ <field.Control @allowNamedColors={{true}} /></form.Field><form.Field@@ -423,9 +426,10 @@ export default class AdminWelcomeBannerForm extends Component {@description={{i18n"admin.config.welcome_banner.form.page_visibility.description"}}+ @type="select"as |field|>- <field.Select @includeNone={{false}} as |select|>+ <field.Control @includeNone={{false}} as |select|><select.Option @value="top_menu_pages">{{i18n"admin.config.welcome_banner.form.page_visibility.options.top_menu_pages"}}</select.Option>@@ -438,7 +442,7 @@ export default class AdminWelcomeBannerForm extends Component {<select.Option @value="all_pages">{{i18n"admin.config.welcome_banner.form.page_visibility.options.all_pages"}}</select.Option>- </field.Select>+ </field.Control></form.Field><form.Field@@ -447,16 +451,17 @@ export default class AdminWelcomeBannerForm extends Component {@description={{i18n"admin.config.welcome_banner.form.location.description"}}+ @type="select"as |field|>- <field.Select @includeNone={{false}} as |select|>+ <field.Control @includeNone={{false}} as |select|><select.Option @value="above_topic_content">{{i18n"admin.config.welcome_banner.form.location.options.above_topic_content"}}</select.Option><select.Option @value="below_site_header">{{i18n"admin.config.welcome_banner.form.location.options.below_site_header"}}</select.Option>- </field.Select>+ </field.Control></form.Field><form.Section@@ -469,9 +474,10 @@ export default class AdminWelcomeBannerForm extends Component {}}@format="large"@validation="required"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><ComboBox@valueProperty="value"@content={{this.availableLocales}}@@ -480,7 +486,7 @@ export default class AdminWelcomeBannerForm extends Component {@options={{hash filterable=true}}class="translation-selector"/>- </field.Custom>+ </field.Control></form.Field><form.Field@@ -496,9 +502,10 @@ export default class AdminWelcomeBannerForm extends Component {@format="large"@validation="required"@disabled={{this.isLoadingLocale}}+ @type="input"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n"admin.config.welcome_banner.form.header_new_members.placeholder"site_name="%{site_name}"@@ -520,9 +527,10 @@ export default class AdminWelcomeBannerForm extends Component {@format="large"@validation="required"@disabled={{this.isLoadingLocale}}+ @type="input"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n"admin.config.welcome_banner.form.header_logged_in.placeholder"site_name="%{site_name}"@@ -544,9 +552,10 @@ export default class AdminWelcomeBannerForm extends Component {@format="large"@validation="required"@disabled={{this.isLoadingLocale}}+ @type="input"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n"admin.config.welcome_banner.form.header_anonymous.placeholder"site_name="%{site_name}"@@ -564,9 +573,10 @@ export default class AdminWelcomeBannerForm extends Component {}}@format="large"@disabled={{this.isLoadingLocale}}+ @type="textarea"as |field|>- <field.Textarea />+ <field.Control /></form.Field><form.Field@@ -579,9 +589,10 @@ export default class AdminWelcomeBannerForm extends Component {}}@format="large"@disabled={{this.isLoadingLocale}}+ @type="textarea"as |field|>- <field.Textarea />+ <field.Control /></form.Field><form.Field@@ -595,9 +606,10 @@ export default class AdminWelcomeBannerForm extends Component {@format="large"@validation="required"@disabled={{this.isLoadingLocale}}+ @type="input"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n"admin.config.welcome_banner.form.search_placeholder.placeholder"}}diff --git a/frontend/discourse/admin/components/edit-category-general.gjs b/frontend/discourse/admin/components/edit-category-general.gjsindex 0e6c45d7146..c7196de4424 100644--- a/frontend/discourse/admin/components/edit-category-general.gjs+++ b/frontend/discourse/admin/components/edit-category-general.gjs@@ -230,9 +230,10 @@ export default class EditCategoryGeneral extends Component {@title={{i18n "category.name"}}@format="large"@validation="required"+ @type="input"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n "category.name_placeholder"}}@maxlength="50"class="category-name"@@ -244,9 +245,10 @@ export default class EditCategoryGeneral extends Component {@name="slug"@title={{i18n "category.slug"}}@format="large"+ @type="input"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n "category.slug_placeholder"}}@maxlength="255"/>@@ -259,9 +261,10 @@ export default class EditCategoryGeneral extends Component {@title={{i18n "category.parent"}}@format="large"class="parent-category"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><CategoryChooser@value={{@transientData.parent_category_id}}@allowSubCategories={{true}}@@ -274,7 +277,7 @@ export default class EditCategoryGeneral extends Component {none=true}}/>- </field.Custom>+ </field.Control></@form.Field>{{/if}}@@ -312,16 +315,17 @@ export default class EditCategoryGeneral extends Component {@title={{i18n "category.styles.type"}}@format="large"@validation="required"+ @type="select"as |field|>{{trustHTML (this.categoryBadgePreview @transientData)}}- <field.Select as |select|>+ <field.Control as |select|>{{#each this.styleTypes as |styleType|}}<select.Option @value={{styleType.id}}>{{styleType.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></@form.Field>{{#if (eq @transientData.style_type "emoji")}}@@ -330,9 +334,10 @@ export default class EditCategoryGeneral extends Component {@title={{i18n "category.styles.emoji"}}@format="small"@validation="required"+ @type="emoji"as |field|>- <field.Emoji />+ <field.Control /></@form.Field>{{else if (eq @transientData.style_type "icon")}}<@form.Field@@ -340,9 +345,10 @@ export default class EditCategoryGeneral extends Component {@title={{i18n "category.styles.icon"}}@format="small"@validation="required"+ @type="icon"as |field|>- <field.Icon />+ <field.Control /></@form.Field>{{/if}}@@ -353,9 +359,10 @@ export default class EditCategoryGeneral extends Component {@validate={{this.validateColor}}@validation="required"@onSet={{this.setBackgroundColor}}+ @type="color"as |field|>- <field.Color+ <field.Control@colors={{this.backgroundColors}}@usedColors={{this.usedBackgroundColors}}/>@@ -367,9 +374,10 @@ export default class EditCategoryGeneral extends Component {@format="full"@validate={{this.validateColor}}@validation="required"+ @type="color"as |field|>- <field.Color @colors={{CATEGORY_TEXT_COLORS}} />+ <field.Control @colors={{CATEGORY_TEXT_COLORS}} /></@form.Field></@form.Section></div>diff --git a/frontend/discourse/admin/components/edit-category-localizations.gjs b/frontend/discourse/admin/components/edit-category-localizations.gjsindex df890b03071..1b51af8761b 100644--- a/frontend/discourse/admin/components/edit-category-localizations.gjs+++ b/frontend/discourse/admin/components/edit-category-localizations.gjs@@ -40,15 +40,16 @@ export default class EditCategoryLocalizations extends buildCategoryPanel(@title={{i18n "category.localization.locale"}}@format="full"@validation="required"+ @type="select"as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each this.selectableLocales as |locale|}}<select.Option@value={{locale.value}}>{{locale.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></collection.Field></row.Col>@@ -57,9 +58,10 @@ export default class EditCategoryLocalizations extends buildCategoryPanel(@name="name"@title={{i18n "category.localization.name"}}@validation="required|length:1,50"+ @type="input"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n "category.name_placeholder"}}@maxlength="50"class="category-name"@@ -71,9 +73,10 @@ export default class EditCategoryLocalizations extends buildCategoryPanel(<collection.Field@name="description"@title={{i18n "category.localization.description"}}+ @type="textarea"as |field|>- <field.Textarea @height={{60}} />+ <field.Control @height={{60}} /></collection.Field></row.Col>diff --git a/frontend/discourse/admin/components/upsert-category/appearance.gjs b/frontend/discourse/admin/components/upsert-category/appearance.gjsindex f06be41947d..a5557a46392 100644--- a/frontend/discourse/admin/components/upsert-category/appearance.gjs+++ b/frontend/discourse/admin/components/upsert-category/appearance.gjs@@ -211,18 +211,20 @@ export default class UpsertCategoryAppearance extends Component {@name="text_color"@title={{i18n "category.foreground_color"}}@format="max"+ @type="color"as |field|>- <field.Color @colors={{CATEGORY_TEXT_COLORS}} />+ <field.Control @colors={{CATEGORY_TEXT_COLORS}} /></@form.Field><@form.Field@name="default_view"@title={{i18n "category.default_view"}}@format="max"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><ComboBox@id="category-default-view"@content={{this.availableViews}}@@ -231,16 +233,17 @@ export default class UpsertCategoryAppearance extends Component {@onChange={{field.set}}@options={{hash none="category.sort_options.default"}}/>- </field.Custom>+ </field.Control></@form.Field><@form.Field@name="default_top_period"@title={{i18n "category.default_top_period"}}@format="max"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><ComboBox@id="category-default-top-period"@content={{this.topPeriods}}@@ -249,16 +252,17 @@ export default class UpsertCategoryAppearance extends Component {@onChange={{field.set}}@options={{hash none="category.sort_options.default"}}/>- </field.Custom>+ </field.Control></@form.Field><@form.Field@name="sort_order"@title={{i18n "category.sort_order"}}@format="max"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><ComboBox@id="category-sort-order"@content={{this.sortOrders}}@@ -278,16 +282,17 @@ export default class UpsertCategoryAppearance extends Component {@options={{hash none="category.sort_options.default"}}/>{{/unless}}- </field.Custom>+ </field.Control></@form.Field><@form.Field@name="default_list_filter"@title={{i18n "category.default_list_filter"}}@format="max"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><ComboBox@id="category-default-list-filter"@content={{this.listFilters}}@@ -296,7 +301,7 @@ export default class UpsertCategoryAppearance extends Component {@onChange={{field.set}}@options={{hash none="category.sort_options.default"}}/>- </field.Custom>+ </field.Control></@form.Field>{{#if this.isParentCategory}}@@ -304,9 +309,10 @@ export default class UpsertCategoryAppearance extends Component {@name="show_subcategory_list"@title={{i18n "category.show_subcategory_list"}}@format="max"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></@form.Field>{{#if @transientData.show_subcategory_list}}@@ -314,9 +320,10 @@ export default class UpsertCategoryAppearance extends Component {@name="subcategory_list_style"@title={{i18n "category.subcategory_list_style"}}@format="max"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><ComboBox@id="subcategory-list-style"@content={{this.subcategoryListStyles}}@@ -324,7 +331,7 @@ export default class UpsertCategoryAppearance extends Component {@valueProperty="value"@onChange={{field.set}}/>- </field.Custom>+ </field.Control></@form.Field>{{/if}}{{/if}}@@ -333,9 +340,10 @@ export default class UpsertCategoryAppearance extends Component {@name="read_only_banner"@title={{i18n "category.read_only_banner"}}@format="max"+ @type="input"as |field|>- <field.Input @maxlength="255" />+ <field.Control @maxlength="255" /></@form.Field><PluginOutletdiff --git a/frontend/discourse/admin/components/upsert-category/general.gjs b/frontend/discourse/admin/components/upsert-category/general.gjsindex 4c812dfb6e9..bd2553f09b3 100644--- a/frontend/discourse/admin/components/upsert-category/general.gjs+++ b/frontend/discourse/admin/components/upsert-category/general.gjs@@ -358,9 +358,10 @@ export default class UpsertCategoryGeneral extends Component {@title={{i18n "category.name"}}@format="max"@validation="required"+ @type="input"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n "category.name_placeholder"}}@maxlength="50"class="category-name"@@ -375,9 +376,10 @@ export default class UpsertCategoryGeneral extends Component {@format="max"@validation="required"@onSet={{this.onBackgroundColorSet}}+ @type="color"as |field|>- <field.Color+ <field.Control@colors={{this.backgroundColors}}@usedColors={{this.usedBackgroundColors}}@collapseSwatches={{true}}@@ -390,9 +392,10 @@ export default class UpsertCategoryGeneral extends Component {@name="style_type"@title={{i18n "category.style"}}@format="max"+ @type="custom"as |styleField|>- <styleField.Custom>+ <styleField.Control><@form.ConditionalContent@activeName={{or styleField.value @category.styleType "square"}}@onChange={{this.onStyleTypeChange}}@@ -418,9 +421,10 @@ export default class UpsertCategoryGeneral extends Component {@showTitle={{false}}@format="max"@validate={{this.validateIcon}}+ @type="custom"as |field|>- <field.Custom>+ <field.Control><IconPicker@value={{readonly field.value}}@onlyAvailable={{true}}@@ -437,7 +441,7 @@ export default class UpsertCategoryGeneral extends Component {(concat "--icon-color: #" @transientData.color ";")}}/>- </field.Custom>+ </field.Control></@form.Field></Content>@@ -448,9 +452,10 @@ export default class UpsertCategoryGeneral extends Component {@showTitle={{false}}@format="max"@validate={{this.validateEmoji}}+ @type="custom"as |field|>- <field.Custom>+ <field.Control><EmojiPicker@emoji={{field.value}}@didSelectEmoji={{field.set}}@@ -461,7 +466,7 @@ export default class UpsertCategoryGeneral extends Component {(i18n "category.select_emoji")}}/>- </field.Custom>+ </field.Control></@form.Field></Content>@@ -474,7 +479,7 @@ export default class UpsertCategoryGeneral extends Component {</Content></cc.Contents></@form.ConditionalContent>- </styleField.Custom>+ </styleField.Control></@form.Field>{{#unless @category.isUncategorizedCategory}}@@ -483,9 +488,10 @@ export default class UpsertCategoryGeneral extends Component {@title={{i18n "category.subcategory_of"}}@format="max"@onSet={{this.onParentCategorySet}}+ @type="custom"as |field|>- <field.Custom>+ <field.Control><CategoryChooser@value={{@transientData.parent_category_id}}@onChange={{field.set}}@@ -501,7 +507,7 @@ export default class UpsertCategoryGeneral extends Component {displayCategoryDescription=false}}/>- </field.Custom>+ </field.Control></@form.Field>{{/unless}}diff --git a/frontend/discourse/admin/components/upsert-category/settings.gjs b/frontend/discourse/admin/components/upsert-category/settings.gjsindex 244637f0652..655bbb36b59 100644--- a/frontend/discourse/admin/components/upsert-category/settings.gjs+++ b/frontend/discourse/admin/components/upsert-category/settings.gjs@@ -118,9 +118,10 @@ export default class UpsertCategorySettings extends Component {@name="slug"@title={{i18n "category.slug"}}@format="max"+ @type="input"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n "category.slug_placeholder"}}@maxlength="255"/>@@ -131,9 +132,10 @@ export default class UpsertCategorySettings extends Component {@name="position"@title={{i18n "category.position"}}@format="max"+ @type="input-number"as |field|>- <field.Input type="number" min="0" />+ <field.Control min="0" /></@form.Field>{{/if}}@@ -145,18 +147,20 @@ export default class UpsertCategorySettings extends Component {(i18n "category.num_featured_topics")}}@format="max"+ @type="input-number"as |field|>- <field.Input type="number" min="1" />+ <field.Control min="1" /></@form.Field><@form.Field@name="search_priority"@title={{i18n "category.search_priority.label"}}@format="max"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><ComboBox@valueProperty="value"@id="category-search-priority"@@ -165,7 +169,7 @@ export default class UpsertCategorySettings extends Component {@onChange={{field.set}}@options={{hash placementStrategy="absolute"}}/>- </field.Custom>+ </field.Control></@form.Field>{{#if this.siteSettings.enable_badges}}@@ -173,9 +177,10 @@ export default class UpsertCategorySettings extends Component {@name="allow_badges"@title={{i18n "category.allow_badges_label"}}@format="max"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></@form.Field>{{/if}}@@ -184,9 +189,10 @@ export default class UpsertCategorySettings extends Component {@name="topic_featured_link_allowed"@title={{i18n "category.topic_featured_link_allowed"}}@format="max"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></@form.Field>{{/if}}@@ -194,27 +200,30 @@ export default class UpsertCategorySettings extends Component {@name="navigate_to_first_post_after_read"@title={{i18n "category.navigate_to_first_post_after_read"}}@format="max"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></@form.Field><@form.Field@name="all_topics_wiki"@title={{i18n "category.all_topics_wiki"}}@format="max"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></@form.Field><@form.Field@name="allow_unlimited_owner_edits_on_first_post"@title={{i18n "category.allow_unlimited_owner_edits_on_first_post"}}@format="max"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></@form.Field><@form.Section @title={{i18n "category.settings_sections.moderation"}}>@@ -232,17 +241,19 @@ export default class UpsertCategorySettings extends Component {<object.Field@name="require_topic_approval"@title={{i18n "category.require_topic_approval"}}+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></object.Field><object.Field@name="require_reply_approval"@title={{i18n "category.require_reply_approval"}}+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></object.Field></@form.Object>@@ -266,9 +277,10 @@ export default class UpsertCategorySettings extends Component {<@form.Field@name="auto_close_based_on_last_post"@title={{i18n "topic.auto_close.based_on_last_post"}}+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></@form.Field><@form.Container @title={{i18n "category.num_auto_bump_daily"}}>@@ -298,27 +310,30 @@ export default class UpsertCategorySettings extends Component {@name="email_in"@title={{i18n "category.email_in"}}@format="max"+ @type="input"as |field|>- <field.Input @maxlength="255" />+ <field.Control @maxlength="255" /></@form.Field><@form.Field@name="email_in_allow_strangers"@title={{i18n "category.email_in_allow_strangers"}}@format="max"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></@form.Field><@form.Field@name="mailinglist_mirror"@title={{i18n "category.mailinglist_mirror"}}@format="max"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></@form.Field><PluginOutletdiff --git a/frontend/discourse/admin/components/upsert-category/tags.gjs b/frontend/discourse/admin/components/upsert-category/tags.gjsindex 26d29feec9b..f89ffd5e246 100644--- a/frontend/discourse/admin/components/upsert-category/tags.gjs+++ b/frontend/discourse/admin/components/upsert-category/tags.gjs@@ -45,9 +45,10 @@ export default class UpsertCategoryTags extends Component {@name="minimum_required_tags"@title={{i18n "category.minimum_required_tags"}}@format="max"+ @type="input-number"as |field|>- <field.Input type="number" min="0" id="category-minimum-tags" />+ <field.Control min="0" id="category-minimum-tags" /></@form.Field><@form.Field@@ -58,9 +59,10 @@ export default class UpsertCategoryTags extends Component {(i18n "category.tags_allowed_tags_new_category")}}@format="max"+ @type="tag-chooser"as |field|>- <field.TagChooser+ <field.Control@showAllTags={{true}}@excludeSynonyms={{true}}@unlimited={{true}}@@ -92,9 +94,10 @@ export default class UpsertCategoryTags extends Component {@title={{i18n "category.allow_global_tags_label"}}@format="max"@disabled={{this.disableAllowGlobalTags}}+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></@form.Field><@form.Alert @type="info">@@ -109,9 +112,10 @@ export default class UpsertCategoryTags extends Component {@name="min_count"@title={{i18n "category.required_tag_group.min_count"}}@validation="required"+ @type="input-number"as |field|>- <field.Input @type="number" min="1" />+ <field.Control min="1" /></collection.Field></row.Col>@@ -120,9 +124,10 @@ export default class UpsertCategoryTags extends Component {@name="name"@title={{i18n "category.required_tag_group.tag_group"}}@validation="required"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><TagGroupChooser@tagGroups={{if field.value (array field.value) (array)}}@onChange={{fn this.onTagGroupFieldChange field}}@@ -131,7 +136,7 @@ export default class UpsertCategoryTags extends Component {filterPlaceholder="category.required_tag_group.placeholder"}}/>- </field.Custom>+ </field.Control></collection.Field></row.Col>diff --git a/frontend/discourse/admin/templates/admin-embedding/crawlers.gjs b/frontend/discourse/admin/templates/admin-embedding/crawlers.gjsindex 794b8c29e4c..f5232b1f808 100644--- a/frontend/discourse/admin/templates/admin-embedding/crawlers.gjs+++ b/frontend/discourse/admin/templates/admin-embedding/crawlers.gjs@@ -13,25 +13,28 @@ export default <template>@name="allowed_embed_selectors"@title={{i18n "admin.embedding.allowed_embed_selectors"}}@format="large"+ @type="input"as |field|>- <field.Input placeholder="article, #story, .post" />+ <field.Control placeholder="article, #story, .post" /></form.Field><form.Field@name="blocked_embed_selectors"@title={{i18n "admin.embedding.blocked_embed_selectors"}}@format="large"+ @type="input"as |field|>- <field.Input placeholder=".ad-unit, header" />+ <field.Control placeholder=".ad-unit, header" /></form.Field><form.Field@name="allowed_embed_classnames"@title={{i18n "admin.embedding.allowed_embed_classnames"}}@format="large"+ @type="input"as |field|>- <field.Input placeholder="emoji, classname" />+ <field.Control placeholder="emoji, classname" /></form.Field><form.Submit @label="admin.embedding.save" /></Form>diff --git a/frontend/discourse/admin/templates/admin-embedding/posts-and-topics.gjs b/frontend/discourse/admin/templates/admin-embedding/posts-and-topics.gjsindex 8037e5b6a97..76964031163 100644--- a/frontend/discourse/admin/templates/admin-embedding/posts-and-topics.gjs+++ b/frontend/discourse/admin/templates/admin-embedding/posts-and-topics.gjs@@ -12,48 +12,53 @@ export default <template>@name="embed_by_username"@title={{i18n "admin.embedding.embed_by_username"}}@validation="required"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><UserChooser@value={{field.value}}@onChange={{field.set}}@options={{hash maximum=1 excludeCurrentUser=false}}class="admin-embedding-posts-and-topics-form__embed_by_username"/>- </field.Custom>+ </field.Control></form.Field><form.Field@name="embed_post_limit"@title={{i18n "admin.embedding.embed_post_limit"}}@format="large"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@name="embed_title_scrubber"@title={{i18n "admin.embedding.embed_title_scrubber"}}@format="large"+ @type="input"as |field|>- <field.Input placeholder="- site.com$" />+ <field.Control placeholder="- site.com$" /></form.Field><form.CheckboxGroup as |checkboxGroup|><checkboxGroup.Field@name="embed_truncate"@title={{i18n "admin.embedding.embed_truncate"}}+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></checkboxGroup.Field><checkboxGroup.Field@name="embed_unlisted"@title={{i18n "admin.embedding.embed_unlisted"}}+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></checkboxGroup.Field></form.CheckboxGroup><form.Submit @label="admin.embedding.save" />diff --git a/frontend/discourse/app/components/edit-category-type-schema-fields.gjs b/frontend/discourse/app/components/edit-category-type-schema-fields.gjsindex 9c471981691..e22a82eeeac 100644--- a/frontend/discourse/app/components/edit-category-type-schema-fields.gjs+++ b/frontend/discourse/app/components/edit-category-type-schema-fields.gjs@@ -12,13 +12,32 @@ const SchemaFormField = <template>{{#if (eq @entry.type "bool")}}<@formObject.Field@name={{@entry.key}}+ @type="checkbox"@title={{@entry.label}}@validation={{if @entry.required "required"}}@format="full"@showTitle={{false}}as |field|>- <field.Checkbox>{{@entry.description}}</field.Checkbox>+ <field.Control>{{@entry.description}}</field.Control>+ </@formObject.Field>+ {{else if (eq @entry.subtype "duration")}}+ <@formObject.Field+ @name={{@entry.key}}+ @title={{@entry.label}}+ @description={{@entry.description}}+ @validation={{if @entry.required "required"}}+ @titleFormat="full"+ @descriptionFormat="full"+ @format="full"+ @type="custom"+ as |field|+ >+ <RelativeTimePicker+ @durationHours={{field.value}}+ @durationOutputUnit="hours"+ @onChange={{field.set}}+ /></@formObject.Field>{{else if (eq @entry.type "integer")}}<@formObject.Field@@ -29,21 +48,15 @@ const SchemaFormField = <template>@titleFormat="full"@descriptionFormat="full"@format="full"+ @type="input-number"as |field|>- {{#if (eq @entry.subtype "duration")}}- <RelativeTimePicker- @durationHours={{field.value}}- @durationOutputUnit="hours"- @onChange={{field.set}}- />- {{else}}- <field.Input @type="number" />- {{/if}}+ <field.Control /></@formObject.Field>{{else}}<@formObject.Field@name={{@entry.key}}+ @type="input"@title={{@entry.label}}@description={{@entry.description}}@validation={{if @entry.required "required"}}@@ -52,7 +65,7 @@ const SchemaFormField = <template>@format="large"as |field|>- <field.Input />+ <field.Control /></@formObject.Field>{{/if}}</template>;diff --git a/frontend/discourse/app/components/group-smtp-email-settings.gjs b/frontend/discourse/app/components/group-smtp-email-settings.gjsindex a9ef5f628d7..eda5a129dee 100644--- a/frontend/discourse/app/components/group-smtp-email-settings.gjs+++ b/frontend/discourse/app/components/group-smtp-email-settings.gjs@@ -116,76 +116,82 @@ export default class GroupSmtpEmailSettings extends Component {<row.Col @size={{6}}><form.Field@name="smtp_server"+ @type="input"@title={{i18n "groups.manage.email.credentials.smtp_server"}}@validation="required"@onSet={{fn this.resetTestingSettings "smtp_server"}}as |field|>- <field.Input />+ <field.Control /></form.Field></row.Col><row.Col @size={{6}}><form.Field@name="email_username"+ @type="input"@title={{i18n "groups.manage.email.credentials.username"}}@validation="required"@onSet={{fn this.resetTestingSettings "email_username"}}as |field|>- <field.Input />+ <field.Control /></form.Field></row.Col><row.Col @size={{6}}><form.Field@name="smtp_port"+ @type="input-number"@title={{i18n "groups.manage.email.credentials.smtp_port"}}@validation="required|integer"@onSet={{fn this.resetTestingSettings "smtp_port"}}as |field|>- <field.Input @type="number" />+ <field.Control /></form.Field></row.Col><row.Col @size={{6}}><form.Field@name="email_password"+ @type="password"@title={{i18n "groups.manage.email.credentials.password"}}@validation="required"@onSet={{fn this.resetTestingSettings "email_password"}}as |field|>- <field.Password />+ <field.Control /></form.Field></row.Col><row.Col @size={{6}}><form.Field@name="smtp_ssl_mode"+ @type="select"@title={{i18n "groups.manage.email.credentials.smtp_ssl_mode"}}@validation="required"@onSet={{fn this.resetTestingSettings "smtp_ssl_mode"}}as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each this.sslModes as |sslMode|}}<select.Option@value={{sslMode.value}}>{{sslMode.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field></row.Col><row.Col @size={{6}}><form.Field@name="email_from_alias"+ @type="input"@title={{i18n "groups.manage.email.settings.from_alias"}}@description={{i18n"groups.manage.email.settings.from_alias_hint"}}as |field|>- <field.Input />+ <field.Control /></form.Field></row.Col></form.Row>diff --git a/frontend/discourse/app/components/modal/create-invite.gjs b/frontend/discourse/app/components/modal/create-invite.gjsindex c92f3351d03..3d688fbc9f1 100644--- a/frontend/discourse/app/components/modal/create-invite.gjs+++ b/frontend/discourse/app/components/modal/create-invite.gjs@@ -351,21 +351,23 @@ export default class CreateInvite extends Component {><form.Field@name="description"+ @type="input"@title={{i18n "user.invited.invite.description"}}@format="large"@validation={{this.descriptionValidation}}as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@name="restrictTo"+ @type="input"@title={{i18n "user.invited.invite.restrict"}}@format="large"@onSet={{this.handleRestrictToChange}}as |field|>- <field.Input+ <field.Controlplaceholder={{i18n"user.invited.invite.email_or_domain_placeholder"}}@@ -376,13 +378,12 @@ export default class CreateInvite extends Component {<form.Field@name="maxRedemptions"@title={{i18n "user.invited.invite.max_redemptions_allowed"}}- @type="number"+ @type="input-number"@format="small"@validation="required"as |field|>- <field.Input- @type="number"+ <field.Controlmin="1"max={{this.maxRedemptionsAllowedLimit}}/>@@ -392,82 +393,87 @@ export default class CreateInvite extends Component {{{#if this.inviteCreated}}<form.Field@name="expiresAt"+ @type="custom"@title={{i18n "user.invited.invite.expires_at"}}@format="large"@validation="required"as |field|>- <field.Custom>+ <field.Control><FutureDateInput@clearable={{true}}@input={{field.value}}@noRelativeOptions={{true}}@onChangeInput={{field.set}}/>- </field.Custom>+ </field.Control></form.Field>{{else}}<form.Field@name="expiresAfterDays"+ @type="select"@title={{i18n "user.invited.invite.expires_after"}}@format="large"@validation="required"as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each this.expireAfterOptions as |option|}}<select.Option@value={{option.value}}>{{option.text}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field>{{/if}}{{#if this.canArriveAtTopic}}<form.Field@name="inviteToTopic"+ @type="custom"@title={{i18n "user.invited.invite.invite_to_topic"}}@format="large"as |field|>- <field.Custom>+ <field.Control><TopicChooser@value={{field.value}}@content={{this.topics}}@onChange={{fn this.onChangeTopic field.set}}@options={{hash additionalFilters="status:public"}}/>- </field.Custom>+ </field.Control></form.Field>{{/if}}{{#if this.canInviteToGroup}}<form.Field@name="inviteToGroups"+ @type="custom"@title={{i18n "user.invited.invite.add_to_groups"}}@format="large"as |field|>- <field.Custom>+ <field.Control><GroupChooser@content={{this.allGroups}}@value={{field.value}}@labelProperty="name"@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field>{{/if}}{{#if this.canSendEmailInvite}}<form.Field@name="customMessage"+ @type="textarea"@title={{i18n "user.invited.invite.custom_message"}}@format="full"as |field|>- <field.Textarea+ <field.Controlheight={{100}}placeholder={{i18n"user.invited.invite.custom_message_placeholder"diff --git a/frontend/discourse/app/components/modal/upsert-hyperlink.gjs b/frontend/discourse/app/components/modal/upsert-hyperlink.gjsindex 4b84d2d7a80..eda87954b7b 100644--- a/frontend/discourse/app/components/modal/upsert-hyperlink.gjs+++ b/frontend/discourse/app/components/modal/upsert-hyperlink.gjs@@ -223,13 +223,14 @@ export default class UpsertHyperlink extends Component {><form.Field@name="linkUrl"+ @type="input"@title={{i18n "composer.link_url_label"}}@format="full"@validation="required"@onSet={{this.search}}as |field|>- <field.Input+ <field.Controlplaceholder={{i18n "composer.link_url_placeholder"}}class="link-url"autofocus="autofocus"@@ -265,11 +266,12 @@ export default class UpsertHyperlink extends Component {<form.Field@name="linkText"+ @type="input"@title={{i18n "composer.link_text_label"}}@format="full"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n "composer.link_optional_text"}}class="link-text"/>diff --git a/frontend/discourse/app/components/reviewable/note-form.gjs b/frontend/discourse/app/components/reviewable/note-form.gjsindex a55f484a58c..154fafdab10 100644--- a/frontend/discourse/app/components/reviewable/note-form.gjs+++ b/frontend/discourse/app/components/reviewable/note-form.gjs@@ -90,13 +90,14 @@ export default class ReviewableNoteForm extends Component {><form.Field@name="content"+ @type="textarea"@title={{i18n "review.notes.add_note_description"}}@format="full"@validation="required:trim|length:1,2000"as |field|><div class="reviewable-note-form__textarea-wrapper">- <field.Textarea+ <field.Control@height={{80}}placeholder={{i18n "review.notes.placeholder"}}class="reviewable-note-form__textarea"diff --git a/frontend/discourse/app/components/tag-settings.gjs b/frontend/discourse/app/components/tag-settings.gjsindex c97c81ce9fc..3520c0a8e2a 100644--- a/frontend/discourse/app/components/tag-settings.gjs+++ b/frontend/discourse/app/components/tag-settings.gjs@@ -302,12 +302,13 @@ export default class TagSettings extends Component {{{#if (eq @selectedTab "general")}}<form.Field@name="name"+ @type="input"@title={{i18n "tagging.settings.name"}}@format="large"@validation="required"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n "tagging.settings.name_placeholder"}}@maxlength={{this.siteSettings.max_tag_length}}class="tag-name-input"@@ -316,27 +317,30 @@ export default class TagSettings extends Component {<form.Field@name="slug"+ @type="input"@title={{i18n "tagging.settings.slug"}}@format="large"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n "tagging.settings.slug_placeholder"}}/></form.Field><form.Field@name="description"+ @type="textarea"@title={{i18n "tagging.description"}}@format="large"@validation="length:0,1000"as |field|>- <field.Textarea @height={{80}} />+ <field.Control @height={{80}} /></form.Field><form.Field@name="synonyms"+ @type="custom"@title={{i18n "tagging.synonyms"}}@description={{i18n"tagging.settings.synonyms_subtitle"@@ -345,7 +349,7 @@ export default class TagSettings extends Component {@format="large"as |field|>- <field.Custom>+ <field.Control><MiniTagChooser@value={{transientData.synonyms}}@onChange={{this.handleSynonymChange}}@@ -357,7 +361,7 @@ export default class TagSettings extends Component {maximum=200}}/>- </field.Custom>+ </field.Control></form.Field>{{else if (eq @selectedTab "localizations")}}<TagSettingsLocalizationsdiff --git a/frontend/discourse/app/components/tag-settings/localizations.gjs b/frontend/discourse/app/components/tag-settings/localizations.gjsindex 5c2e7821c63..577a5f8b09b 100644--- a/frontend/discourse/app/components/tag-settings/localizations.gjs+++ b/frontend/discourse/app/components/tag-settings/localizations.gjs@@ -34,40 +34,43 @@ export default class TagSettingsLocalizations extends Component {<@form.Collection @name="localizations" as |collection index|><collection.Field@name="tag_id"+ @type="input-hidden"@title="tag_id"@showTitle={{false}}@disabled={{true}}as |field|>- <field.Input @value={{@tagId}} @type="hidden" />+ <field.Control @value={{@tagId}} /></collection.Field><@form.Row as |row|><row.Col @size={{2}}><collection.Field@name="locale"+ @type="select"@title={{i18n "tagging.localization.locale"}}@validation="required"as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each this.selectableLocales as |locale|}}<select.Option@value={{locale.value}}>{{locale.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></collection.Field></row.Col><row.Col @size={{3}}><collection.Field@name="name"+ @type="input"@title={{i18n "tagging.localization.name"}}@validation="required|length:1,50"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n "tagging.settings.name_placeholder"}}@maxlength="50"/>@@ -77,11 +80,12 @@ export default class TagSettingsLocalizations extends Component {<row.Col @size={{6}}><collection.Field@name="description"+ @type="textarea"@title={{i18n "tagging.localization.description"}}@validation="length:0,1000"as |field|>- <field.Textarea @height={{80}} />+ <field.Control @height={{80}} /></collection.Field></row.Col>diff --git a/frontend/discourse/app/components/wrap-attributes-modal.gjs b/frontend/discourse/app/components/wrap-attributes-modal.gjsindex bee3e698fe1..d13ada49221 100644--- a/frontend/discourse/app/components/wrap-attributes-modal.gjs+++ b/frontend/discourse/app/components/wrap-attributes-modal.gjs@@ -90,9 +90,10 @@ export default class WrapAttributesModal extends Component {<form.Field@name="name"@title={{i18n "composer.wrap_modal.name_label"}}+ @type="input"as |field|>- <field.Input @type="text" autocomplete="off" />+ <field.Control autocomplete="off" /></form.Field><form.Section @title={{i18n "composer.wrap_modal.attributes_label"}}>@@ -107,20 +108,22 @@ export default class WrapAttributesModal extends Component {<div class="wrap-modal__attribute-row"><object.Field@name="key"+ @type="input"@title="Key"@validation="required"as |field|>- <field.Input @type="text" />+ <field.Control /></object.Field><object.Field@name="value"+ @type="input"@title="Value"@validation="required"as |field|>- <field.Input @type="text" />+ <field.Control /></object.Field><DButtondiff --git a/frontend/discourse/app/form-kit/components/fk/control/base.gjs b/frontend/discourse/app/form-kit/components/fk/control/base.gjsindex eb4e751d4c1..05a323e00f1 100644--- a/frontend/discourse/app/form-kit/components/fk/control/base.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/base.gjs@@ -4,6 +4,14 @@ export default class FKBaseControl extends Component {constructor(owner, args) {super(owner, args);- args.field.type = this.constructor.controlType;+ // Legacy path: when @type is not set on <form.Field />,+ // controls set field.type via their static controlType property.+ if (!args.field.hasExplicitType) {+ args.field.type = this.constructor.controlType;+ }+ }++ get field() {+ return this.args.field;}}diff --git a/frontend/discourse/app/form-kit/components/fk/control/input.gjs b/frontend/discourse/app/form-kit/components/fk/control/input.gjsindex d0e3a858e0f..c5732701fa2 100644--- a/frontend/discourse/app/form-kit/components/fk/control/input.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/input.gjs@@ -41,7 +41,11 @@ export default class FKControlInput extends FKBaseControl {);}- args.field.type = "input-" + (args.type ?? "text");+ // Legacy path: when @type is not set on <form.Field />,+ // set the specific input type (e.g. "input-number") on the field.+ if (!args.field.hasExplicitType) {+ args.field.type = "input-" + (args.type ?? "text");+ }}get type() {diff --git a/frontend/discourse/app/form-kit/components/fk/field-data.gjs b/frontend/discourse/app/form-kit/components/fk/field-data.gjsindex e1e3123b22d..0f0ee5e3e36 100644--- a/frontend/discourse/app/form-kit/components/fk/field-data.gjs+++ b/frontend/discourse/app/form-kit/components/fk/field-data.gjs@@ -1,6 +1,9 @@import Component from "@glimmer/component";-import { tracked } from "@glimmer/tracking";+import { cached } from "@glimmer/tracking";import { action } from "@ember/object";+import { getOwner } from "@ember/owner";+import curryComponent from "ember-curry-component";+import { resolveFieldControl } from "discourse/form-kit/lib/field-control";import ValidationParser from "discourse/form-kit/lib/validation-parser";import Validator from "discourse/form-kit/lib/validator";import uniqueId from "discourse/helpers/unique-id";@@ -9,10 +12,6 @@ import uniqueId from "discourse/helpers/unique-id";* Represents a field in a form with validation, registration, and field data management capabilities.*/export default class FKFieldData extends Component {- // Set by `FKBaseControl` and its subclasses- // eslint-disable-next-line discourse/no-unnecessary-tracked- @tracked type;-/*** Unique identifier for the field.* @type {string}@@ -25,6 +24,10 @@ export default class FKFieldData extends Component {*/errorId = uniqueId();+ // Set by legacy controls in their constructor (during render),+ // read by the applyControlType modifier (post-render)+ _legacyControlType;+/*** Initializes the FKFieldData component.* Validates the presence of required arguments and registers the field.@@ -87,6 +90,29 @@ export default class FKFieldData extends Component {return this.args.title;}+ get hasExplicitType() {+ return this.args.type !== undefined;+ }++ get type() {+ return this.args.type ?? this._legacyControlType;+ }++ set type(value) {+ this._legacyControlType = value;+ }++ /**+ * Contextual component for the control set by `@type`.+ * @type {Component}+ */+ @cached+ get Control() {+ const { component, args } = resolveFieldControl(this.type);++ return curryComponent(component, { field: this, ...args }, getOwner(this));+ }+/*** Format of the field.* @type {string}diff --git a/frontend/discourse/app/form-kit/components/fk/field.gjs b/frontend/discourse/app/form-kit/components/fk/field.gjsindex 9f7c45319e8..9ef030712c0 100644--- a/frontend/discourse/app/form-kit/components/fk/field.gjs+++ b/frontend/discourse/app/form-kit/components/fk/field.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import { concat, fn, hash } from "@ember/helper";+import { concat, fn } from "@ember/helper";import { action } from "@ember/object";import { getOwner } from "@ember/owner";import didInsert from "@ember/render-modifiers/modifiers/did-insert";@@ -32,7 +32,8 @@ import FKRow from "discourse/form-kit/components/fk/row";import FKText from "discourse/form-kit/components/fk/text";import FKTooltip from "discourse/form-kit/components/fk/tooltip";import concatClass from "discourse/helpers/concat-class";-import { eq } from "discourse/truth-helpers";+import deprecated from "discourse/lib/deprecated";+import { and, eq, not } from "discourse/truth-helpers";const RowColWrapper = <template><FKRow as |row|>@@ -48,6 +49,9 @@ const EmptyWrapper = <template></template>;export default class FKField extends Component {+ // Modifier for setting control type class/data-attribute.+ // Used by legacy path where type is set post-render by the control constructor.+ // Also runs on the new path where type is set via @type, will be removed when legacy path is removed.applyControlType = modifierFn((element, [field]) => {const type = field.type;@@ -66,7 +70,7 @@ export default class FKField extends Component {}@action- componentFor(component, field) {+ legacyComponentFor(component, field) {if (!component.controlType) {throw new Error(`Static property \`controlType\` is required on component:\n\n ${component}`@@ -76,6 +80,45 @@ export default class FKField extends Component {return curryComponent(component, { field }, getOwner(this));}+ @action+ legacyYield(field) {+ deprecated(+ '<form.Field> without @type is deprecated. Use `<form.Field @type="..." as |field|><field.Control />` instead of `<form.Field as |field|><field.Input />`.',+ {+ id: "discourse.form-kit.legacy-field-yield",+ since: "2026.3",+ }+ );++ return {+ Custom: this.legacyComponentFor(FKControlCustom, field),+ Code: this.legacyComponentFor(FKControlCode, field),+ Question: this.legacyComponentFor(FKControlQuestion, field),+ Textarea: this.legacyComponentFor(FKControlTextarea, field),+ Checkbox: this.legacyComponentFor(FKControlCheckbox, field),+ Color: this.legacyComponentFor(FKControlColor, field),+ Image: this.legacyComponentFor(FKControlImage, field),+ Password: this.legacyComponentFor(FKControlPassword, field),+ Composer: this.legacyComponentFor(FKControlComposer, field),+ Icon: this.legacyComponentFor(FKControlIcon, field),+ Emoji: this.legacyComponentFor(FKControlEmoji, field),+ Toggle: this.legacyComponentFor(FKControlToggle, field),+ Menu: this.legacyComponentFor(FKControlMenu, field),+ Select: this.legacyComponentFor(FKControlSelect, field),+ TagChooser: this.legacyComponentFor(FKControlTagChooser, field),+ Input: this.legacyComponentFor(FKControlInput, field),+ RadioGroup: this.legacyComponentFor(FKControlRadioGroup, field),+ Calendar: this.legacyComponentFor(FKControlCalendar, field),+ errorId: field.errorId,+ id: field.id,+ name: field.name,+ set: field.set,+ get value() {+ return field.value;+ },+ };+ }+<template>{{#let (curryComponent FKFieldData this.args) as |FieldData|}}<FieldData as |field|>@@ -96,7 +139,7 @@ export default class FKField extends Component {{{didInsert (fn @registerField field.name field)}}{{willDestroy (fn @unregisterField field.name)}}>- {{#if field.showTitle}}+ {{#if (and field.showTitle (not (eq field.type "checkbox")))}}<FKLabelclass={{concatClass"form-kit__container-title"@@ -129,33 +172,11 @@ export default class FKField extends Component {(if field.format (concat "--" field.format))}}>- {{yield- (hash- Custom=(this.componentFor FKControlCustom field)- Code=(this.componentFor FKControlCode field)- Question=(this.componentFor FKControlQuestion field)- Textarea=(this.componentFor FKControlTextarea field)- Checkbox=(this.componentFor FKControlCheckbox field)- Color=(this.componentFor FKControlColor field)- Image=(this.componentFor FKControlImage field)- Password=(this.componentFor FKControlPassword field)- Composer=(this.componentFor FKControlComposer field)- Icon=(this.componentFor FKControlIcon field)- Emoji=(this.componentFor FKControlEmoji field)- Toggle=(this.componentFor FKControlToggle field)- Menu=(this.componentFor FKControlMenu field)- Select=(this.componentFor FKControlSelect field)- TagChooser=(this.componentFor FKControlTagChooser field)- Input=(this.componentFor FKControlInput field)- RadioGroup=(this.componentFor FKControlRadioGroup field)- Calendar=(this.componentFor FKControlCalendar field)- errorId=field.errorId- id=field.id- name=field.name- set=field.set- value=field.value- )- }}+ {{#if field.hasExplicitType}}+ {{yield field}}+ {{else}}+ {{yield (this.legacyYield field)}}+ {{/if}}{{#if field.helpText}}<FKTextdiff --git a/frontend/discourse/app/form-kit/lib/field-control.js b/frontend/discourse/app/form-kit/lib/field-control.jsnew file mode 100644index 00000000000..b756b0fce82--- /dev/null+++ b/frontend/discourse/app/form-kit/lib/field-control.js@@ -0,0 +1,62 @@+import FKControlCalendar from "discourse/form-kit/components/fk/control/calendar";+import FKControlCheckbox from "discourse/form-kit/components/fk/control/checkbox";+import FKControlCode from "discourse/form-kit/components/fk/control/code";+import FKControlColor from "discourse/form-kit/components/fk/control/color";+import FKControlComposer from "discourse/form-kit/components/fk/control/composer";+import FKControlCustom from "discourse/form-kit/components/fk/control/custom";+import FKControlEmoji from "discourse/form-kit/components/fk/control/emoji";+import FKControlIcon from "discourse/form-kit/components/fk/control/icon";+import FKControlImage from "discourse/form-kit/components/fk/control/image";+import FKControlInput from "discourse/form-kit/components/fk/control/input";+import FKControlMenu from "discourse/form-kit/components/fk/control/menu";+import FKControlPassword from "discourse/form-kit/components/fk/control/password";+import FKControlQuestion from "discourse/form-kit/components/fk/control/question";+import FKControlRadioGroup from "discourse/form-kit/components/fk/control/radio-group";+import FKControlSelect from "discourse/form-kit/components/fk/control/select";+import FKControlTagChooser from "discourse/form-kit/components/fk/control/tag-chooser";+import FKControlTextarea from "discourse/form-kit/components/fk/control/textarea";+import FKControlToggle from "discourse/form-kit/components/fk/control/toggle";++const CONTROL_COMPONENTS = {+ calendar: FKControlCalendar,+ checkbox: FKControlCheckbox,+ code: FKControlCode,+ color: FKControlColor,+ composer: FKControlComposer,+ custom: FKControlCustom,+ emoji: FKControlEmoji,+ icon: FKControlIcon,+ image: FKControlImage,+ input: FKControlInput,+ menu: FKControlMenu,+ password: FKControlPassword,+ question: FKControlQuestion,+ "radio-group": FKControlRadioGroup,+ select: FKControlSelect,+ "tag-chooser": FKControlTagChooser,+ textarea: FKControlTextarea,+ toggle: FKControlToggle,+};++export function resolveFieldControl(type) {+ if (!type) {+ throw new Error("@type is required on `<form.Field />`.");+ }++ if (type.startsWith("input-")) {+ return {+ component: FKControlInput,+ args: {+ type: type.slice("input-".length),+ },+ };+ }++ const component = CONTROL_COMPONENTS[type];++ if (!component) {+ throw new Error(`Unsupported \`<form.Field @type>\` value: "${type}".`);+ }++ return { component, args: {} };+}diff --git a/frontend/discourse/app/form-kit/lib/validator.js b/frontend/discourse/app/form-kit/lib/validator.jsindex 810df42d0a0..281cb028496 100644--- a/frontend/discourse/app/form-kit/lib/validator.js+++ b/frontend/discourse/app/form-kit/lib/validator.js@@ -121,6 +121,7 @@ export default class Validator {let error = false;switch (type) {+ case "input":case "input-text":if (rule.trim) {value = value?.trim();diff --git a/frontend/discourse/tests/helpers/form-kit-assertions.js b/frontend/discourse/tests/helpers/form-kit-assertions.jsindex 4fd1c464c7f..0ea4d464137 100644--- a/frontend/discourse/tests/helpers/form-kit-assertions.js+++ b/frontend/discourse/tests/helpers/form-kit-assertions.js@@ -57,6 +57,7 @@ class FieldHelper {}case "password":return this.element.querySelector(".form-kit__control-password").value;+ case "input":case "input-number":case "input-text":return this.element.querySelector(".form-kit__control-input").value;diff --git a/frontend/discourse/tests/helpers/form-kit-helper.js b/frontend/discourse/tests/helpers/form-kit-helper.jsindex 9f2befaaa87..fd8d7fd9108 100644--- a/frontend/discourse/tests/helpers/form-kit-helper.js+++ b/frontend/discourse/tests/helpers/form-kit-helper.js@@ -23,6 +23,7 @@ class Field {*/get inputElement() {switch (this.controlType) {+ case "input":case "input-text":case "input-number":case "password":@@ -48,6 +49,7 @@ class Field {case "input-number":return parseInt(this.inputElement.value, 10);// String-based controls fall through to return raw value+ case "input":case "input-text":case "password":case "code":diff --git a/frontend/discourse/tests/integration/components/form-kit/collection-test.gjs b/frontend/discourse/tests/integration/components/form-kit/collection-test.gjsindex 7a819aa39ab..9a16f0e9b36 100644--- a/frontend/discourse/tests/integration/components/form-kit/collection-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/collection-test.gjs@@ -26,8 +26,8 @@ module("Integration | Component | FormKit | Collection", function (hooks) {<Form @data={{hash foo=(array (hash bar=1) (hash bar=2))}} as |form|><form.Collection @name="foo" as |collection|><collection.Object as |object|>- <object.Field @name="bar" @title="Bar" as |field|>- <field.Input />+ <object.Field @type="input" @name="bar" @title="Bar" as |field|>+ <field.Control /></object.Field></collection.Object></form.Collection>@@ -42,8 +42,8 @@ module("Integration | Component | FormKit | Collection", function (hooks) {<template><Form @data={{hash foo=(array 1 2)}} as |form|><form.Collection @name="foo" as |collection|>- <collection.Field @title="Bar" as |field|>- <field.Input />+ <collection.Field @type="input" @title="Bar" as |field|>+ <field.Control /></collection.Field></form.Collection></Form>@@ -60,8 +60,8 @@ module("Integration | Component | FormKit | Collection", function (hooks) {<Form @data={{hash foo=(array (hash bar=1) (hash bar=2))}} as |form|><form.Collection @name="foo" as |collection index|><collection.Object as |object|>- <object.Field @name="bar" @title="Bar" as |field|>- <field.Input />+ <object.Field @type="input" @name="bar" @title="Bar" as |field|>+ <field.Control /></object.Field><form.Button@@ -94,8 +94,8 @@ module("Integration | Component | FormKit | Collection", function (hooks) {><form.Collection @name="foo" as |collection index|><collection.Object @name="bar" as |object|>- <object.Field @name="baz" @title="Baz" as |field|>- <field.Input />+ <object.Field @type="input" @name="baz" @title="Baz" as |field|>+ <field.Control /></object.Field><form.Button@@ -138,8 +138,13 @@ module("Integration | Component | FormKit | Collection", function (hooks) {<third.Object @name="three" as |fourth|><fourth.Collection as |fifth thirdIndex|><fifth.Object as |sixth|>- <sixth.Field @name="foo" @title="Foo" as |field|>- <field.Input />+ <sixth.Field+ @type="input"+ @name="foo"+ @title="Foo"+ as |field|+ >+ <field.Control /></sixth.Field></fifth.Object>@@ -181,8 +186,8 @@ module("Integration | Component | FormKit | Collection", function (hooks) {<template><Form @data={{hash foo=(array)}} as |form|><form.Collection @name="foo" @tagName="ul" as |collection|>- <collection.Field @title="Bar" as |field|>- <field.Input />+ <collection.Field @type="input" @title="Bar" as |field|>+ <field.Control /></collection.Field></form.Collection></Form>@@ -209,8 +214,8 @@ module("Integration | Component | FormKit | Collection", function (hooks) {as |form|><form.Collection @name="animals" as |collection|>- <collection.Field @title="cat" as |field|>- <field.Input />+ <collection.Field @type="input" @title="cat" as |field|>+ <field.Control /></collection.Field></form.Collection><form.Submit />diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/calendar-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/calendar-test.gjsindex af13f1f77bd..898598de0a6 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/calendar-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/calendar-test.gjs@@ -27,8 +27,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Calendar />+ <form.Field @type="calendar" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -47,8 +47,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Calendar />+ <form.Field @type="calendar" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -59,8 +59,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Calendar @includeTime={{false}} />+ <form.Field @type="calendar" @name="foo" @title="Foo" as |field|>+ <field.Control @includeTime={{false}} /></form.Field></Form></template>@@ -73,8 +73,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Calendar />+ <form.Field @type="calendar" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -86,8 +86,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Calendar @expandedDatePickerOnDesktop={{false}} />+ <form.Field @type="calendar" @name="foo" @title="Foo" as |field|>+ <field.Control @expandedDatePickerOnDesktop={{false}} /></form.Field></Form></template>@@ -107,12 +107,13 @@ module(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|><form.Field+ @type="calendar"@validation={{validation}}@name="foo"@title="Foo"as |field|>- <field.Calendar />+ <field.Control /></form.Field></Form></template>@@ -140,12 +141,13 @@ module(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|><form.Field+ @type="calendar"@validation={{validation}}@name="foo"@title="Foo"as |field|>- <field.Calendar />+ <field.Control /></form.Field></Form></template>@@ -167,8 +169,14 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" @disabled={{true}} as |field|>- <field.Calendar />+ <form.Field+ @type="calendar"+ @name="foo"+ @title="Foo"+ @disabled={{true}}+ as |field|+ >+ <field.Control /></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/char-counter-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/char-counter-test.gjsindex 0e5e2d73ca8..6c9d9aae1a7 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/char-counter-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/char-counter-test.gjs@@ -17,12 +17,13 @@ module(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|><form.Field+ @type="input"@name="foo"@title="Foo"@validation="length:0,5"as |field|>- <field.Input />+ <field.Control /></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/checkbox-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/checkbox-test.gjsindex ceaec4b6324..255a336bfa8 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/checkbox-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/checkbox-test.gjs@@ -16,8 +16,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Checkbox />+ <form.Field @type="checkbox" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -42,8 +42,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Checkbox />+ <form.Field @type="checkbox" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -64,8 +64,14 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" @disabled={{true}} as |field|>- <field.Checkbox />+ <form.Field+ @type="checkbox"+ @name="foo"+ @title="Foo"+ @disabled={{true}}+ as |field|+ >+ <field.Control /></form.Field></Form></template>@@ -78,8 +84,14 @@ module(await render(<template><Form as |form|>- <form.Field @tooltip="test" @name="foo" @title="Foo" as |field|>- <field.Checkbox />+ <form.Field+ @type="checkbox"+ @tooltip="test"+ @name="foo"+ @title="Foo"+ as |field|+ >+ <field.Control /></form.Field></Form></template>@@ -94,8 +106,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Checkbox />+ <form.Field @type="checkbox" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -108,8 +120,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Checkbox @title="Bar" />+ <form.Field @type="checkbox" @name="foo" @title="Foo" as |field|>+ <field.Control @title="Bar" /></form.Field></Form></template>@@ -125,8 +137,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Checkbox />+ <form.Field @type="checkbox" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -148,12 +160,13 @@ module(<template><Form as |form|><form.Field+ @type="checkbox"@name="foo"@title="Foo"@validation="required"as |field|>- <field.Checkbox />+ <field.Control /></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/code-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/code-test.gjsindex 6aa468475fb..d3f969f25c1 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/code-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/code-test.gjs@@ -14,8 +14,8 @@ module("Integration | Component | FormKit | Controls | Code", function (hooks) {await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Code @height={{100}} style="width: 200px" />+ <form.Field @type="code" @name="foo" @title="Foo" as |field|>+ <field.Control @height={{100}} style="width: 200px" /></form.Field></Form></template>@@ -35,8 +35,8 @@ module("Integration | Component | FormKit | Controls | Code", function (hooks) {await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Code @height={{100}} />+ <form.Field @type="code" @name="foo" @title="Foo" as |field|>+ <field.Control @height={{100}} /></form.Field></Form></template>@@ -52,8 +52,8 @@ module("Integration | Component | FormKit | Controls | Code", function (hooks) {await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Code @lang="sql" />+ <form.Field @type="code" @name="foo" @title="Foo" as |field|>+ <field.Control @lang="sql" /></form.Field></Form></template>@@ -72,8 +72,14 @@ module("Integration | Component | FormKit | Controls | Code", function (hooks) {await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" @disabled={{true}} as |field|>- <field.Code />+ <form.Field+ @type="code"+ @name="foo"+ @title="Foo"+ @disabled={{true}}+ as |field|+ >+ <field.Control /></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/color-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/color-test.gjsindex 600f59ed27b..e59fadd08a1 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/color-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/color-test.gjs@@ -16,8 +16,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="color" @title="Color" as |field|>- <field.Color />+ <form.Field @type="color" @name="color" @title="Color" as |field|>+ <field.Control /></form.Field></Form></template>@@ -35,8 +35,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="color" @title="Color" as |field|>- <field.Color />+ <form.Field @type="color" @name="color" @title="Color" as |field|>+ <field.Control /></form.Field></Form></template>@@ -49,8 +49,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="color" @title="Color" as |field|>- <field.Color @allowNamedColors={{true}} />+ <form.Field @type="color" @name="color" @title="Color" as |field|>+ <field.Control @allowNamedColors={{true}} /></form.Field></Form></template>@@ -67,8 +67,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="color" @title="Color" as |field|>- <field.Color @colors={{colors}} />+ <form.Field @type="color" @name="color" @title="Color" as |field|>+ <field.Control @colors={{colors}} /></form.Field></Form></template>@@ -90,8 +90,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="color" @title="Color" as |field|>- <field.Color @colors={{colors}} @usedColors={{usedColors}} />+ <form.Field @type="color" @name="color" @title="Color" as |field|>+ <field.Control @colors={{colors}} @usedColors={{usedColors}} /></form.Field></Form></template>@@ -110,8 +110,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="color" @title="Color" as |field|>- <field.Color @colors={{colors}} @usedColors={{usedColors}} />+ <form.Field @type="color" @name="color" @title="Color" as |field|>+ <field.Control @colors={{colors}} @usedColors={{usedColors}} /></form.Field></Form></template>@@ -131,12 +131,13 @@ module(<template><Form as |form|><form.Field+ @type="color"@name="color"@title="Color"@disabled={{true}}as |field|>- <field.Color @colors={{colors}} />+ <field.Control @colors={{colors}} /></form.Field></Form></template>@@ -155,8 +156,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="color" @title="Color" as |field|>- <field.Color />+ <form.Field @type="color" @name="color" @title="Color" as |field|>+ <field.Control /></form.Field></Form></template>@@ -177,8 +178,8 @@ module(await render(<template><Form @data={{data}} as |form|>- <form.Field @name="color" @title="Color" as |field|>- <field.Color @allowNamedColors={{true}} />+ <form.Field @type="color" @name="color" @title="Color" as |field|>+ <field.Control @allowNamedColors={{true}} /></form.Field></Form></template>@@ -195,8 +196,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="color" @title="Color" as |field|>- <field.Color @fallbackValue="AABBCC" />+ <form.Field @type="color" @name="color" @title="Color" as |field|>+ <field.Control @fallbackValue="AABBCC" /></form.Field></Form></template>@@ -217,8 +218,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="color" @title="Color" as |field|>- <field.Color+ <form.Field @type="color" @name="color" @title="Color" as |field|>+ <field.Control@colors={{colors}}@collapseSwatches={{true}}@collapseSwatchesLabel="Pick a preset"diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/composer-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/composer-test.gjsindex a8b446f024d..93c9ccc30b8 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/composer-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/composer-test.gjs@@ -16,8 +16,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Composer />+ <form.Field @type="composer" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -39,8 +39,14 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" @disabled={{true}} as |field|>- <field.Composer />+ <form.Field+ @type="composer"+ @name="foo"+ @title="Foo"+ @disabled={{true}}+ as |field|+ >+ <field.Control /></form.Field></Form></template>@@ -53,8 +59,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Composer @height={{42}} />+ <form.Field @type="composer" @name="foo" @title="Foo" as |field|>+ <field.Control @height={{42}} /></form.Field></Form></template>@@ -69,8 +75,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Composer />+ <form.Field @type="composer" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -81,8 +87,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Composer @preview={{true}} />+ <form.Field @type="composer" @name="foo" @title="Foo" as |field|>+ <field.Control @preview={{true}} /></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/custom-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/custom-test.gjsindex c741b9fb305..cb93f6b7394 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/custom-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/custom-test.gjs@@ -12,10 +12,16 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" @description="Bar" as |field|>- <field.Custom>+ <form.Field+ @type="custom"+ @name="foo"+ @title="Foo"+ @description="Bar"+ as |field|+ >+ <field.Control><input class="custom-test" />- </field.Custom>+ </field.Control></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/emoji-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/emoji-test.gjsindex fe58c813d1a..7fc8561ed1d 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/emoji-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/emoji-test.gjs@@ -28,8 +28,8 @@ module(await render(<template><Form @data={{data}} @onSubmit={{mutateData}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Emoji />+ <form.Field @type="emoji" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/icon-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/icon-test.gjsindex 23254f61a2e..693e42de8f5 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/icon-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/icon-test.gjs@@ -21,8 +21,8 @@ module("Integration | Component | FormKit | Controls | Icon", function (hooks) {await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Icon />+ <form.Field @type="icon" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -39,8 +39,14 @@ module("Integration | Component | FormKit | Controls | Icon", function (hooks) {await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" @disabled={{true}} as |field|>- <field.Icon />+ <form.Field+ @type="icon"+ @name="foo"+ @title="Foo"+ @disabled={{true}}+ as |field|+ >+ <field.Control /></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/image-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/image-test.gjsindex 1a8717b7458..25cd08ecd33 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/image-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/image-test.gjs@@ -37,8 +37,8 @@ module(await render(<template><Form @data={{data}} as |form|>- <form.Field @name="image_url" @title="Foo" as |field|>- <field.Image @type="site_setting" />+ <form.Field @type="image" @name="image_url" @title="Foo" as |field|>+ <field.Control @type="site_setting" /></form.Field></Form></template>@@ -55,8 +55,8 @@ module(await render(<template><Form @data={{data}} as |form|>- <form.Field @name="image_url" @title="Foo" as |field|>- <field.Image @type="site_setting" />+ <form.Field @type="image" @name="image_url" @title="Foo" as |field|>+ <field.Control @type="site_setting" /></form.Field><form.Button@@ -83,12 +83,13 @@ module(<template><Form @data={{data}} as |form|><form.Field+ @type="image"@name="image_url"@title="Foo"@disabled={{true}}as |field|>- <field.Image @type="site_setting" />+ <field.Control @type="site_setting" /></form.Field></Form></template>@@ -102,8 +103,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="image_url" @title="Foo" as |field|>- <field.Image+ <form.Field @type="image" @name="image_url" @title="Foo" as |field|>+ <field.Control@type="site_setting"@placeholderUrl="/images/avatar.png"/>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/input-number-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/input-number-test.gjsindex 323df85623f..616ae5ad1fa 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/input-number-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/input-number-test.gjs@@ -16,8 +16,13 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Input @type="number" step="any" lang="en" />+ <form.Field+ @type="input-number"+ @name="foo"+ @title="Foo"+ as |field|+ >+ <field.Control step="any" lang="en" /></form.Field></Form></template>@@ -41,9 +46,14 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>+ <form.Field+ @type="input-number"+ @name="foo"+ @title="Foo"+ as |field|+ >- <field.Input @type="number" />+ <field.Control /></form.Field></Form></template>@@ -63,12 +73,13 @@ module(<template><Form as |form|><form.Field+ @type="input-number"@name="foo"@title="Foo"@validation="required"as |field|>- <field.Input @type="number" />+ <field.Control /></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/input-text-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/input-text-test.gjsindex 302eacc3ba0..3b961356c0f 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/input-text-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/input-text-test.gjs@@ -16,8 +16,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Input />+ <form.Field @type="input" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -38,8 +38,14 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" @disabled={{true}} as |field|>- <field.Input />+ <form.Field+ @type="input"+ @name="foo"+ @title="Foo"+ @disabled={{true}}+ as |field|+ >+ <field.Control /></form.Field></Form></template>@@ -55,8 +61,8 @@ module(await render(<template><Form @data={{data}} @onSubmit={{mutateData}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Input />+ <form.Field @type="input" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -72,8 +78,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Input @before="https://" @after=".com" />+ <form.Field @type="input" @name="foo" @title="Foo" as |field|>+ <field.Control @before="https://" @after=".com" /></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/menu-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/menu-test.gjsindex bf88e05b59c..4be9248b226 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/menu-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/menu-test.gjs@@ -14,12 +14,12 @@ module("Integration | Component | FormKit | Controls | Menu", function (hooks) {await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Menu as |menu|>+ <form.Field @type="menu" @name="foo" @title="Foo" as |field|>+ <field.Control as |menu|><menu.Item @value="item-1">Item 1</menu.Item><menu.Item @value="item-2">Item 2</menu.Item><menu.Item @value="item-3">Item 3</menu.Item>- </field.Menu>+ </field.Control></form.Field></Form></template>@@ -39,8 +39,14 @@ module("Integration | Component | FormKit | Controls | Menu", function (hooks) {await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" @disabled={{true}} as |field|>- <field.Menu />+ <form.Field+ @type="menu"+ @name="foo"+ @title="Foo"+ @disabled={{true}}+ as |field|+ >+ <field.Control /></form.Field></Form></template>@@ -53,10 +59,10 @@ module("Integration | Component | FormKit | Controls | Menu", function (hooks) {await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Menu @selection="Current item" as |menu|>+ <form.Field @type="menu" @name="foo" @title="Foo" as |field|>+ <field.Control @selection="Current item" as |menu|><menu.Item @value="item-1">Item 1</menu.Item>- </field.Menu>+ </field.Control></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/password-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/password-test.gjsindex deed1cc9534..7ef778bee04 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/password-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/password-test.gjs@@ -16,8 +16,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Password />+ <form.Field @type="password" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -40,8 +40,8 @@ module(await render(<template><Form @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Password />+ <form.Field @type="password" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/question-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/question-test.gjsindex 150fc377048..1af8e5c2e43 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/question-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/question-test.gjs@@ -16,8 +16,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Question />+ <form.Field @type="question" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -39,8 +39,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Question @yesLabel="Correct" />+ <form.Field @type="question" @name="foo" @title="Foo" as |field|>+ <field.Control @yesLabel="Correct" /></form.Field></Form></template>@@ -53,8 +53,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Question @noLabel="Wrong" />+ <form.Field @type="question" @name="foo" @title="Foo" as |field|>+ <field.Control @noLabel="Wrong" /></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/radio-group-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/radio-group-test.gjsindex 1b94324687d..5605ade7262 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/radio-group-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/radio-group-test.gjs@@ -16,12 +16,12 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.RadioGroup as |RadioGroup|>+ <form.Field @type="radio-group" @name="foo" @title="Foo" as |field|>+ <field.Control as |RadioGroup|><RadioGroup.Radio @value="one">One</RadioGroup.Radio><RadioGroup.Radio @value="two">Two</RadioGroup.Radio><RadioGroup.Radio @value="three">Three</RadioGroup.Radio>- </field.RadioGroup>+ </field.Control></form.Field></Form></template>@@ -42,14 +42,14 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.RadioGroup+ <form.Field @type="radio-group" @name="foo" @title="Foo" as |field|>+ <field.Control@title="Pick one"@description="Choose carefully"as |RadioGroup|><RadioGroup.Radio @value="one">One</RadioGroup.Radio>- </field.RadioGroup>+ </field.Control></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/radio-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/radio-test.gjsindex 92656d10ba6..8018de99b57 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/radio-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/radio-test.gjs@@ -12,10 +12,10 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.RadioGroup as |RadioGroup|>+ <form.Field @type="radio-group" @name="foo" @title="Foo" as |field|>+ <field.Control as |RadioGroup|><RadioGroup.Radio @value="one">One</RadioGroup.Radio>- </field.RadioGroup>+ </field.Control></form.Field></Form></template>@@ -28,13 +28,13 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.RadioGroup as |RadioGroup|>+ <form.Field @type="radio-group" @name="foo" @title="Foo" as |field|>+ <field.Control as |RadioGroup|><RadioGroup.Radio @value="one" as |radio|><radio.Title>One title</radio.Title><radio.Description>One description</radio.Description></RadioGroup.Radio>- </field.RadioGroup>+ </field.Control></form.Field></Form></template>@@ -50,12 +50,18 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" @disabled={{true}} as |field|>- <field.RadioGroup as |RadioGroup|>+ <form.Field+ @type="radio-group"+ @name="foo"+ @title="Foo"+ @disabled={{true}}+ as |field|+ >+ <field.Control as |RadioGroup|><RadioGroup.Radio @value="one" as |radio|><radio.Title>One title</radio.Title></RadioGroup.Radio>- </field.RadioGroup>+ </field.Control></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/select-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/select-test.gjsindex f5f6217adba..98aae50e137 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/select-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/select-test.gjs@@ -18,12 +18,12 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Select as |select|>+ <form.Field @type="select" @name="foo" @title="Foo" as |field|>+ <field.Control as |select|><select.Option @value="option-1">Option 1</select.Option><select.Option @value="option-2">Option 2</select.Option><select.Option @value="option-3">Option 3</select.Option>- </field.Select>+ </field.Control></form.Field></Form></template>@@ -45,10 +45,16 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" @disabled={{true}} as |field|>- <field.Select as |select|>+ <form.Field+ @type="select"+ @name="foo"+ @title="Foo"+ @disabled={{true}}+ as |field|+ >+ <field.Control as |select|><select.Option @value="option-1">Option 1</select.Option>- </field.Select>+ </field.Control></form.Field></Form></template>@@ -62,12 +68,13 @@ module(<template><Form as |form|><form.Field+ @type="select"@name="foo"@title="Foo"@validation="required"as |field|>- <field.Select />+ <field.Control /></form.Field></Form></template>@@ -82,12 +89,13 @@ module(<template><Form @data={{hash foo="1"}} as |form|><form.Field+ @type="select"@name="foo"@title="Foo"@validation="required"as |field|>- <field.Select />+ <field.Control /></form.Field></Form></template>@@ -104,8 +112,8 @@ module(await render(<template><Form @data={{hash foo="1"}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Select />+ <form.Field @type="select" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -122,8 +130,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Select />+ <form.Field @type="select" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -140,8 +148,8 @@ module(await render(<template><Form @data={{hash foo="1"}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Select @includeNone={{false}} />+ <form.Field @type="select" @name="foo" @title="Foo" as |field|>+ <field.Control @includeNone={{false}} /></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/tag-chooser-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/tag-chooser-test.gjsindex fa5d7df0deb..1966acb52a0 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/tag-chooser-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/tag-chooser-test.gjs@@ -19,8 +19,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.TagChooser />+ <form.Field @type="tag-chooser" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -41,8 +41,14 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" @disabled={{true}} as |field|>- <field.TagChooser />+ <form.Field+ @type="tag-chooser"+ @name="foo"+ @title="Foo"+ @disabled={{true}}+ as |field|+ >+ <field.Control /></form.Field></Form></template>@@ -65,8 +71,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.TagChooser+ <form.Field @type="tag-chooser" @name="foo" @title="Foo" as |field|>+ <field.Control@showAllTags={{true}}@excludeSynonyms={{true}}@excludeTagsWithSynonyms={{true}}@@ -89,8 +95,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.TagChooser @placeholder="groups.selector_placeholder" />+ <form.Field @type="tag-chooser" @name="foo" @title="Foo" as |field|>+ <field.Control @placeholder="groups.selector_placeholder" /></form.Field></Form></template>@@ -110,8 +116,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.TagChooser />+ <form.Field @type="tag-chooser" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -127,8 +133,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.TagChooser @allowCreate={{true}} />+ <form.Field @type="tag-chooser" @name="foo" @title="Foo" as |field|>+ <field.Control @allowCreate={{true}} /></form.Field></Form></template>@@ -150,8 +156,8 @@ module(await render(<template><Form @data={{data}} @onSubmit={{mutateData}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.TagChooser @unlimited={{true}} />+ <form.Field @type="tag-chooser" @name="foo" @title="Foo" as |field|>+ <field.Control @unlimited={{true}} /></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/textarea-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/textarea-test.gjsindex 961036b6cc8..342b7518105 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/textarea-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/textarea-test.gjs@@ -17,8 +17,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Textarea />+ <form.Field @type="textarea" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -40,8 +40,14 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" @disabled={{true}} as |field|>- <field.Textarea />+ <form.Field+ @type="textarea"+ @name="foo"+ @title="Foo"+ @disabled={{true}}+ as |field|+ >+ <field.Control /></form.Field></Form></template>@@ -61,8 +67,13 @@ module(@onRegisterApi={{registerApi}}as |form|>- <form.Field @name="content" @title="Content" as |field|>- <field.Textarea />+ <form.Field+ @type="textarea"+ @name="content"+ @title="Content"+ as |field|+ >+ <field.Control /></form.Field></Form></template>@@ -100,8 +111,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Textarea />+ <form.Field @type="textarea" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -121,8 +132,8 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Textarea @height={{42}} />+ <form.Field @type="textarea" @name="foo" @title="Foo" as |field|>+ <field.Control @height={{42}} /></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/toggle-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/toggle-test.gjsindex 94efe76d6a4..5c665122191 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/toggle-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/toggle-test.gjs@@ -16,8 +16,8 @@ module(await render(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Toggle />+ <form.Field @type="toggle" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -47,8 +47,14 @@ module(await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" @disabled={{true}} as |field|>- <field.Toggle />+ <form.Field+ @type="toggle"+ @name="foo"+ @title="Foo"+ @disabled={{true}}+ as |field|+ >+ <field.Control /></form.Field></Form></template>diff --git a/frontend/discourse/tests/integration/components/form-kit/field-test.gjs b/frontend/discourse/tests/integration/components/form-kit/field-test.gjsindex d313432530f..989537f15a8 100644--- a/frontend/discourse/tests/integration/components/form-kit/field-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/field-test.gjs@@ -12,6 +12,7 @@ import { module, test } from "qunit";import sinon from "sinon";import Form from "discourse/components/form";import DTooltip from "discourse/float-kit/components/d-tooltip";+import { withSilencedDeprecationsAsync } from "discourse/lib/deprecated";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import formKit from "discourse/tests/helpers/form-kit-helper";@@ -30,7 +31,7 @@ module("Integration | Component | FormKit | Field", function (hooks) {await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" @size={{8}}>+ <form.Field @type="input" @name="foo" @title="Foo" @size={{8}}>Test</form.Field></Form>@@ -45,12 +46,13 @@ module("Integration | Component | FormKit | Field", function (hooks) {<template><Form @data={{hash disabled=true}} as |form data|><form.Field+ @type="input"@name="foo"@title="Foo"@disabled={{data.disabled}}as |field|>- <field.Input />+ <field.Control /></form.Field><form.Button class="test" @action={{fn form.set "disabled" false}} />@@ -74,12 +76,13 @@ module("Integration | Component | FormKit | Field", function (hooks) {<template><Form as |form|><form.Field+ @type="input"@name="foo"@title="Foo"@description="foo foo"as |field|>- <field.Input />+ <field.Control /></form.Field></Form></template>@@ -96,8 +99,14 @@ module("Integration | Component | FormKit | Field", function (hooks) {await render(<template><Form as |form|>- <form.Field @name="foo.bar" @title="Foo" @size={{8}} as |field|>- <field.Input />+ <form.Field+ @type="input"+ @name="foo.bar"+ @title="Foo"+ @size={{8}}+ as |field|+ >+ <field.Control /></form.Field></Form></template>@@ -117,8 +126,8 @@ module("Integration | Component | FormKit | Field", function (hooks) {await render(<template><Form as |form|>- <form.Field @name="foo" @size={{8}} as |field|>- <field.Input />+ <form.Field @type="input" @name="foo" @size={{8}} as |field|>+ <field.Control /></form.Field></Form></template>@@ -133,8 +142,13 @@ module("Integration | Component | FormKit | Field", function (hooks) {await render(<template><Form as |form|>- <form.Field @name="foo" @title={{htmlTitle}} as |field|>- <field.Checkbox />+ <form.Field+ @name="foo"+ @type="checkbox"+ @title={{htmlTitle}}+ as |field|+ >+ <field.Control /></form.Field></Form></template>@@ -151,20 +165,22 @@ module("Integration | Component | FormKit | Field", function (hooks) {<template><Form as |form|><form.Field+ @type="input"@name="foo"@title="Foo"@validation="required"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field+ @type="input"@name="bar"@title="Bar"@validation="required"as |field|>- <field.Input />+ <field.Control /></form.Field></Form></template>@@ -194,12 +210,13 @@ module("Integration | Component | FormKit | Field", function (hooks) {<template><Form @data={{hash foo="bar"}} as |form|><form.Field+ @type="input"@name="foo"@title="Foo"@validate={{validate}}as |field|>- <field.Input />+ <field.Control /></form.Field><form.Submit />@@ -220,11 +237,12 @@ module("Integration | Component | FormKit | Field", function (hooks) {<template><Form as |form|><form.Field+ @type="input"@name="foo"@title="Foo"@showTitle={{false}}as |field|- ><field.Input /></form.Field>+ ><field.Control /></form.Field></Form></template>);@@ -237,12 +255,13 @@ module("Integration | Component | FormKit | Field", function (hooks) {<template><Form as |form|><form.Field+ @type="input"@name="foo"@title="Foo"@description="foo description"@format="full"as |field|- ><field.Input /></form.Field>+ ><field.Control /></form.Field></Form></template>);@@ -263,13 +282,14 @@ module("Integration | Component | FormKit | Field", function (hooks) {<template><Form as |form|><form.Field+ @type="input"@name="foo"@title="Foo"@description="foo description"@format="full"@descriptionFormat="large"as |field|- ><field.Input /></form.Field>+ ><field.Control /></form.Field></Form></template>);@@ -287,12 +307,13 @@ module("Integration | Component | FormKit | Field", function (hooks) {<template><Form as |form|><form.Field+ @type="input"@name="foo"@title="Foo"@format="full"@titleFormat="large"as |field|- ><field.Input /></form.Field>+ ><field.Control /></form.Field></Form></template>);@@ -325,8 +346,14 @@ module("Integration | Component | FormKit | Field", function (hooks) {<template><Form @data={{hash something=(hash foo=1)}} as |form|><form.Object @name="something" as |object|>- <object.Field @name="foo" @title="Foo" @onSet={{onSet}} as |field|>- <field.Input />+ <object.Field+ @type="input"+ @name="foo"+ @title="Foo"+ @onSet={{onSet}}+ as |field|+ >+ <field.Control /></object.Field></form.Object></Form>@@ -340,8 +367,14 @@ module("Integration | Component | FormKit | Field", function (hooks) {await render(<template><Form as |form|>- <form.Field @name="foo" @title="Foo" @tooltip="text" as |field|>- <field.Input />+ <form.Field+ @type="input"+ @name="foo"+ @title="Foo"+ @tooltip="text"+ as |field|+ >+ <field.Control /></form.Field></Form></template>@@ -355,12 +388,13 @@ module("Integration | Component | FormKit | Field", function (hooks) {<template><Form as |form|><form.Field+ @type="input"@name="foo"@title="Foo"@tooltip={{component DTooltip content="component"}}as |field|>- <field.Input />+ <field.Control /></form.Field></Form></template>@@ -370,4 +404,38 @@ module("Integration | Component | FormKit | Field", function (hooks) {assert.dom(".fk-d-tooltip__inner-content").hasText("component");});++ test("legacy yield does not rerender input on keystroke", async function (assert) {+ let data = { foo: "" };+ const mutateData = (x) => (data = x);++ await withSilencedDeprecationsAsync(+ "discourse.form-kit.legacy-field-yield",+ async () => {+ await render(+ <template>+ <Form @data={{data}} @onSubmit={{mutateData}} as |form|>+ <form.Field @name="foo" @title="Foo" as |field|>+ <field.Input />+ </form.Field>+ </Form>+ </template>+ );++ const input = document.querySelector(".form-kit__control-input");+ await fillIn(input, "bar");++ assert.strictEqual(+ document.querySelector(".form-kit__control-input"),+ input,+ "the input element is the same DOM node after typing"+ );+ assert.form().field("foo").hasValue("bar");++ await formKit().submit();++ assert.deepEqual(data.foo, "bar");+ }+ );+ });});diff --git a/frontend/discourse/tests/integration/components/form-kit/form-test.gjs b/frontend/discourse/tests/integration/components/form-kit/form-test.gjsindex d06bbb1ff6d..92af2e0da94 100644--- a/frontend/discourse/tests/integration/components/form-kit/form-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/form-test.gjs@@ -30,8 +30,8 @@ module("Integration | Component | FormKit | Form", function (hooks) {>Add</form.Button><form.Collection @name="foo" as |collection|>- <collection.Field @name="bar" @title="Bar" as |field|>- <field.Input />+ <collection.Field @type="input" @name="bar" @title="Bar" as |field|>+ <field.Control /></collection.Field></form.Collection></Form>@@ -57,8 +57,8 @@ module("Integration | Component | FormKit | Form", function (hooks) {await render(<template><Form @data={{hash foo=1 bar=2}} @validate={{validate}} as |form|>- <form.Field @name="foo" @title="Foo" />- <form.Field @name="bar" @title="Bar" />+ <form.Field @type="input" @name="foo" @title="Foo" />+ <form.Field @type="input" @name="bar" @title="Bar" /></Form></template>);@@ -78,20 +78,22 @@ module("Integration | Component | FormKit | Form", function (hooks) {<template><Form @data={{data}} as |form|><form.Field+ @type="input"@name="foo"@title="Foo"@validation="required"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field+ @type="input"@name="bar"@title="Bar"@validation="required"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Submit /></Form>@@ -187,8 +189,8 @@ module("Integration | Component | FormKit | Form", function (hooks) {await render(<template><Form @data={{model}} @onRegisterApi={{registerApi}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Input />+ <form.Field @type="input" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field></Form></template>@@ -231,15 +233,16 @@ module("Integration | Component | FormKit | Form", function (hooks) {<template><Form @data={{hash bar=1}} @onReset={{onReset}} as |form|><form.Field+ @type="input"@title="Foo"@name="foo"@validation="required"as |field|>- <field.Input />+ <field.Control /></form.Field>- <form.Field @title="Bar" @name="bar" as |field|>- <field.Input />+ <form.Field @type="input" @title="Bar" @name="bar" as |field|>+ <field.Control /></form.Field><form.Button class="set-bar" @action={{fn form.set "bar" 2}} /></Form>@@ -265,8 +268,8 @@ module("Integration | Component | FormKit | Form", function (hooks) {await render(<template><Form @data={{data}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Input />+ <form.Field @type="input" @name="foo" @title="Foo" as |field|>+ <field.Control /></form.Field><form.Button class="set-foo" @action={{fn form.set "foo" 2}} /></Form>@@ -348,12 +351,13 @@ module("Integration | Component | FormKit | Form", function (hooks) {<Form @data={{hash visible=true}} as |form data|>{{#if data.visible}}<form.Field+ @type="input"@title="Foo"@name="foo"@validation="required"as |field|>- <field.Input />+ <field.Control /></form.Field>{{/if}}@@ -403,12 +407,13 @@ module("Integration | Component | FormKit | Form", function (hooks) {<template><Form as |form|><form.Field+ @type="input"@name="foo"@title="Foo"@validation="required"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Submit /></Form>@@ -430,10 +435,10 @@ module("Integration | Component | FormKit | Form", function (hooks) {await render(<template><Form @validate={{validate}} as |form|>- <form.Field @name="foo" @title="Foo" as |field|>- <field.Custom>+ <form.Field @name="foo" @type="custom" @title="Foo" as |field|>+ <field.Control><div class="not-focusable">Custom content</div>- </field.Custom>+ </field.Control></form.Field><form.Submit /></Form>diff --git a/frontend/discourse/tests/integration/components/form-kit/input-group-test.gjs b/frontend/discourse/tests/integration/components/form-kit/input-group-test.gjsindex bdcf97bee89..0bc99c3e533 100644--- a/frontend/discourse/tests/integration/components/form-kit/input-group-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/input-group-test.gjs@@ -17,11 +17,21 @@ module(<template><Form @onSubmit={{mutateData}} @data={{data}} as |form|><form.InputGroup as |inputGroup|>- <inputGroup.Field @title="Foo" @name="foo" as |field|>- <field.Input />+ <inputGroup.Field+ @type="input"+ @title="Foo"+ @name="foo"+ as |field|+ >+ <field.Control /></inputGroup.Field>- <inputGroup.Field @title="Bar" @name="bar" as |field|>- <field.Input />+ <inputGroup.Field+ @type="input"+ @title="Bar"+ @name="bar"+ as |field|+ >+ <field.Control /></inputGroup.Field></form.InputGroup></Form>diff --git a/frontend/discourse/tests/integration/components/form-kit/layout/checkbox-group-test.gjs b/frontend/discourse/tests/integration/components/form-kit/layout/checkbox-group-test.gjsindex 3ba56136565..da59f28aa78 100644--- a/frontend/discourse/tests/integration/components/form-kit/layout/checkbox-group-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/layout/checkbox-group-test.gjs@@ -13,11 +13,21 @@ module(<template><Form as |form|><form.CheckboxGroup as |checkboxGroup|>- <checkboxGroup.Field @name="foo" @title="Foo" as |field|>- <field.Checkbox />+ <checkboxGroup.Field+ @type="checkbox"+ @name="foo"+ @title="Foo"+ as |field|+ >+ <field.Control /></checkboxGroup.Field>- <checkboxGroup.Field @name="bar" @title="Bar" as |field|>- <field.Checkbox>A description</field.Checkbox>+ <checkboxGroup.Field+ @type="checkbox"+ @name="bar"+ @title="Bar"+ as |field|+ >+ <field.Control>A description</field.Control></checkboxGroup.Field></form.CheckboxGroup></Form>@@ -34,8 +44,13 @@ module(<template><Form as |form|><form.CheckboxGroup @title="bar" as |checkboxGroup|>- <checkboxGroup.Field @name="foo" @title="Foo" as |field|>- <field.Checkbox />+ <checkboxGroup.Field+ @type="checkbox"+ @name="foo"+ @title="Foo"+ as |field|+ >+ <field.Control /></checkboxGroup.Field></form.CheckboxGroup></Form>@@ -52,8 +67,13 @@ module(<template><Form as |form|><form.CheckboxGroup @description="bar" as |checkboxGroup|>- <checkboxGroup.Field @name="foo" @title="Foo" as |field|>- <field.Checkbox />+ <checkboxGroup.Field+ @type="checkbox"+ @name="foo"+ @title="Foo"+ as |field|+ >+ <field.Control /></checkboxGroup.Field></form.CheckboxGroup></Form>diff --git a/frontend/discourse/tests/integration/components/form-kit/object-test.gjs b/frontend/discourse/tests/integration/components/form-kit/object-test.gjsindex 00b071bb77b..2905aea9f30 100644--- a/frontend/discourse/tests/integration/components/form-kit/object-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/object-test.gjs@@ -13,11 +13,11 @@ module("Integration | Component | FormKit | Object", function (hooks) {<template><Form @data={{hash foo=(hash bar=1 baz=2)}} as |form|><form.Object @name="foo" as |object|>- <object.Field @name="bar" @title="bar" as |field|>- <field.Input />+ <object.Field @type="input" @name="bar" @title="bar" as |field|>+ <field.Control /></object.Field>- <object.Field @name="baz" @title="baz" as |field|>- <field.Input />+ <object.Field @type="input" @name="baz" @title="baz" as |field|>+ <field.Control /></object.Field></form.Object></Form>@@ -50,11 +50,11 @@ module("Integration | Component | FormKit | Object", function (hooks) {<form.Object @name="one" as |one|><one.Object @name="two" as |two|><two.Object @name="three" as |three|>- <three.Field @name="foo" @title="foo" as |field|>- <field.Input />+ <three.Field @type="input" @name="foo" @title="foo" as |field|>+ <field.Control /></three.Field>- <three.Field @name="bar" @title="bar" as |field|>- <field.Input />+ <three.Field @type="input" @name="bar" @title="bar" as |field|>+ <field.Control /></three.Field></two.Object></one.Object>@@ -80,8 +80,8 @@ module("Integration | Component | FormKit | Object", function (hooks) {><form.Object @name="one" as |one|><one.Collection @name="two" as |two twoIndex|>- <two.Field @name="foo" @title="foo" as |field|>- <field.Input />+ <two.Field @type="input" @name="foo" @title="foo" as |field|>+ <field.Control /></two.Field><form.Buttonclass={{concat "remove-" twoIndex}}diff --git a/frontend/discourse/tests/unit/lib/form-kit/validator-test.js b/frontend/discourse/tests/unit/lib/form-kit/validator-test.jsindex 5e13e12a1d0..463558bc4bb 100644--- a/frontend/discourse/tests/unit/lib/form-kit/validator-test.js+++ b/frontend/discourse/tests/unit/lib/form-kit/validator-test.js@@ -332,7 +332,7 @@ module("Unit | Lib | FormKit | Validator", function (hooks) {test("required", async function (assert) {let errors = await new Validator(" ", {required: { trim: true },- }).validate("input-text");+ }).validate("input");assert.deepEqual(errors,@@ -342,7 +342,7 @@ module("Unit | Lib | FormKit | Validator", function (hooks) {errors = await new Validator(undefined, {required: {},- }).validate("input-text");+ }).validate("input");assert.deepEqual(errors,@@ -352,7 +352,7 @@ module("Unit | Lib | FormKit | Validator", function (hooks) {errors = await new Validator(null, {required: {},- }).validate("input-text");+ }).validate("input");assert.deepEqual(errors,@@ -362,7 +362,7 @@ module("Unit | Lib | FormKit | Validator", function (hooks) {errors = await new Validator(" ", {required: { trim: false },- }).validate("input-text");+ }).validate("input");assert.deepEqual(errors,diff --git a/plugins/chat/admin/assets/javascripts/admin/components/chat-incoming-webhook-edit-form.gjs b/plugins/chat/admin/assets/javascripts/admin/components/chat-incoming-webhook-edit-form.gjsindex 77e8b761092..3ea15724ef2 100644--- a/plugins/chat/admin/assets/javascripts/admin/components/chat-incoming-webhook-edit-form.gjs+++ b/plugins/chat/admin/assets/javascripts/admin/components/chat-incoming-webhook-edit-form.gjs@@ -84,41 +84,45 @@ export default class ChatIncomingWebhookEditForm extends Component {@name="name"@title={{i18n "chat.incoming_webhooks.name"}}@validation="required"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@name="description"@title={{i18n "chat.incoming_webhooks.description"}}+ @type="textarea"as |field|>- <field.Textarea />+ <field.Control /></form.Field><form.Field@name="username"@title={{i18n "chat.incoming_webhooks.username"}}@description={{i18n "chat.incoming_webhooks.username_instructions"}}+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@name="chat_channel_id"@title={{i18n "chat.incoming_webhooks.post_to"}}@validation="required"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><ChatChannelChooser@content={{@chatChannels}}@value={{field.value}}@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field><form.Field@@ -126,9 +130,10 @@ export default class ChatIncomingWebhookEditForm extends Component {@title={{i18n "chat.incoming_webhooks.emoji"}}@description={{i18n "chat.incoming_webhooks.emoji_instructions"}}@size="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control>{{#if field.value}}{{i18n "chat.incoming_webhooks.current_emoji"}}@@ -150,7 +155,7 @@ export default class ChatIncomingWebhookEditForm extends Component {/></row.Col></form.Row>- </field.Custom>+ </field.Control></form.Field>{{#if @webhook.url}}diff --git a/plugins/chat/assets/javascripts/discourse/templates/preferences/chat.gjs b/plugins/chat/assets/javascripts/discourse/templates/preferences/chat.gjsindex 802821a069c..4937b92e30d 100644--- a/plugins/chat/assets/javascripts/discourse/templates/preferences/chat.gjs+++ b/plugins/chat/assets/javascripts/discourse/templates/preferences/chat.gjs@@ -178,9 +178,10 @@ export default class Chat extends Component {@title={{i18n "chat.enable"}}@name="chat_enabled"@format="large"+ @type="checkbox"as |field|>- <field.Checkbox @value={{field.value}} />+ <field.Control @value={{field.value}} /></form.Field><form.Section @title={{i18n "chat.chat_notifications_title"}}>@@ -188,17 +189,19 @@ export default class Chat extends Component {@title={{i18n "chat.only_chat_push_notifications.title"}}@name="only_chat_push_notifications"@format="large"+ @type="checkbox"as |field|>- <field.Checkbox @value={{field.value}} />+ <field.Control @value={{field.value}} /></form.Field><form.Field@title={{i18n "chat.ignore_channel_wide_mention.title"}}@name="ignore_channel_wide_mention"@format="large"+ @type="checkbox"as |field|>- <field.Checkbox @value={{field.value}} />+ <field.Control @value={{field.value}} /></form.Field><form.Field@@ -206,44 +209,47 @@ export default class Chat extends Component {@name="chat_sound"@format="large"@onSet={{this.handleChatSoundSet}}+ @type="select"as |field|>- <field.Select @includeNone={{true}} as |select|>+ <field.Control @includeNone={{true}} as |select|>{{#each this.chatSounds as |sound|}}<select.Option @value={{sound.value}}>{{sound.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field><form.Field@title={{i18n "chat.header_indicator_preference.title"}}@name="chat_header_indicator_preference"@format="large"+ @type="select"as |field|>- <field.Select @includeNone={{false}} as |select|>+ <field.Control @includeNone={{false}} as |select|>{{#each this.headerIndicatorOptions as |option|}}<select.Option @value={{option.value}}>{{option.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field><form.Field@title={{i18n "chat.separate_sidebar_mode.title"}}@name="chat_separate_sidebar_mode"@format="large"+ @type="select"as |field|>- <field.Select @includeNone={{false}} as |select|>+ <field.Control @includeNone={{false}} as |select|>{{#each this.chatSeparateSidebarModeOptions as |option|}}<select.Option @value={{option.value}}>{{option.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field></form.Section><form.Section @title={{i18n "chat.personalization_title"}}>@@ -251,15 +257,16 @@ export default class Chat extends Component {@title={{i18n "chat.quick_reaction_type.title"}}@name="chat_quick_reaction_type"@format="large"+ @type="radio-group"as |field|>- <field.RadioGroup as |radioGroup|>+ <field.Control as |radioGroup|>{{#each this.chatQuickReactionTypes as |option|}}<radioGroup.Radio @value={{option.value}}>{{option.label}}</radioGroup.Radio>{{/each}}- </field.RadioGroup>+ </field.Control></form.Field>{{#if (eq data.chat_quick_reaction_type "custom")}}@@ -267,10 +274,10 @@ export default class Chat extends Component {@title={{i18n "chat.quick_reaction_type.options.custom"}}@name="chat_quick_reactions_custom"@format="large"+ @type="custom"as |field|>- <field.Custom>-+ <field.Control>{{#each data.chat_quick_reactions_custom as |emoji index|}}<EmojiPicker@emoji={{emoji}}@@ -279,22 +286,23 @@ export default class Chat extends Component {@didSelectEmoji={{fn this.handleEmojiSet index field}}/>{{/each}}- </field.Custom>+ </field.Control></form.Field>{{/if}}<form.Field@title={{i18n "chat.send_shortcut.title"}}@name="chat_send_shortcut"@format="large"+ @type="radio-group"as |field|>- <field.RadioGroup as |radioGroup|>+ <field.Control as |radioGroup|>{{#each this.chatSendShortcutOptions as |option|}}<radioGroup.Radio @value={{option.value}}>{{option.label}}</radioGroup.Radio>{{/each}}- </field.RadioGroup>+ </field.Control></form.Field></form.Section><div class="save-controls">diff --git a/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ad-form.gjs b/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ad-form.gjsindex 11ea2a4072a..f380b2e0694 100644--- a/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ad-form.gjs+++ b/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ad-form.gjs@@ -174,9 +174,10 @@ export default class HouseAdForm extends Component {@title={{i18n "admin.adplugin.house_ads.name"}}@validation="required"@format="large"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@@ -184,25 +185,28 @@ export default class HouseAdForm extends Component {@title={{i18n "admin.adplugin.house_ads.html"}}@validation="required"@format="full"+ @type="code"as |field|>- <field.Code @lang="html" @height={{270}} />+ <field.Control @lang="html" @height={{270}} /></form.Field><form.Field@name="visible_to_logged_in_users"@title={{i18n "admin.adplugin.house_ads.show_to_logged_in_users"}}+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></form.Field><form.Field@name="visible_to_anons"@title={{i18n "admin.adplugin.house_ads.show_to_anons"}}+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></form.Field><form.Field@@ -210,15 +214,16 @@ export default class HouseAdForm extends Component {@title={{i18n "admin.adplugin.house_ads.categories"}}@description={{this.categoryDescription}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><HouseAdsCategorySelector@categories={{this.site.categories}}@selectedCategories={{field.value}}@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field>{{#if this.routesEnabled}}@@ -229,14 +234,15 @@ export default class HouseAdForm extends Component {"admin.adplugin.house_ads.route_chooser_description"}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><HouseAdsRouteSelector@value={{field.value}}@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field>{{/if}}@@ -247,15 +253,16 @@ export default class HouseAdForm extends Component {"admin.adplugin.house_ads.group_chooser_description"}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><GroupChooser@content={{this.site.groups}}@value={{field.value}}@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field><form.Actions>diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-editor.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-editor.gjsindex 866221bb7e6..110b0ca6770 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-editor.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-editor.gjs@@ -409,9 +409,10 @@ export default class AgentEditor extends Component {@validation="required|length:1,100"@disabled={{data.system}}@format="large"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@@ -420,9 +421,10 @@ export default class AgentEditor extends Component {@validation="required|length:1,100"@disabled={{data.system}}@format="large"+ @type="textarea"as |field|>- <field.Textarea />+ <field.Control /></form.Field><form.Field@@ -431,9 +433,10 @@ export default class AgentEditor extends Component {@validation="required|length:1,100000"@disabled={{data.system}}@format="large"+ @type="textarea"as |field|>- <field.Textarea />+ <field.Control /></form.Field><AiAgentResponseFormatEditor @form={{form}} @data={{data}} />@@ -443,31 +446,33 @@ export default class AgentEditor extends Component {@title={{i18n "discourse_ai.ai_agent.default_llm"}}@tooltip={{i18n "discourse_ai.ai_agent.default_llm_help"}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><AiLlmSelector@value={{field.value}}@llms={{@agents.resultSetMeta.llms}}@onChange={{field.set}}class="ai-agent-editor__llms"/>- </field.Custom>+ </field.Control></form.Field><form.Field@name="allowed_group_ids"@title={{i18n "discourse_ai.ai_agent.allowed_groups"}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><GroupChooser@value={{data.allowed_group_ids}}@content={{this.allGroups}}@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field><form.Field@@ -476,9 +481,10 @@ export default class AgentEditor extends Component {@tooltip={{i18n "discourse_ai.ai_agent.vision_enabled_help"}}@showTitle={{false}}@format="large"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></form.Field>{{#if data.vision_enabled}}@@ -487,15 +493,16 @@ export default class AgentEditor extends Component {@title={{i18n "discourse_ai.ai_agent.vision_max_pixels"}}@onSet={{this.onChangeMaxPixels}}@format="large"+ @type="select"as |field|>- <field.Select @includeNone={{false}} as |select|>+ <field.Control @includeNone={{false}} as |select|>{{#each this.maxPixelValues as |pixelValue|}}<select.Option@value={{pixelValue.id}}>{{pixelValue.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field>{{/if}}@@ -510,9 +517,10 @@ export default class AgentEditor extends Component {@tooltip={{i18n "discourse_ai.ai_agent.temperature_help"}}@disabled={{data.system}}@format="large"+ @type="input-number"as |field|>- <field.Input @type="number" step="any" lang="en" />+ <field.Control step="any" lang="en" /></form.Field><form.Field@@ -521,9 +529,10 @@ export default class AgentEditor extends Component {@tooltip={{i18n "discourse_ai.ai_agent.top_p_help"}}@disabled={{data.system}}@format="large"+ @type="input-number"as |field|>- <field.Input @type="number" step="any" lang="en" />+ <field.Control step="any" lang="en" /></form.Field>{{/if}}@@ -558,16 +567,17 @@ export default class AgentEditor extends Component {@name="tools"@title={{i18n "discourse_ai.ai_agent.tools"}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><AiToolSelector@value={{field.value}}@disabled={{data.system}}@onChange={{fn this.updateToolNames form data}}@content={{@agents.resultSetMeta.tools}}/>- </field.Custom>+ </field.Control></form.Field>{{#if (gt data.tools.length 0)}}@@ -646,16 +656,17 @@ export default class AgentEditor extends Component {@name="forcedTools"@title={{i18n "discourse_ai.ai_agent.forced_tools"}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><AiToolSelector@value={{field.value}}@disabled={{data.system}}@onChange={{field.set}}@content={{this.availableForcedTools data.tools}}/>- </field.Custom>+ </field.Control></form.Field>{{/if}}@@ -664,13 +675,14 @@ export default class AgentEditor extends Component {@name="forced_tool_count"@title={{i18n "discourse_ai.ai_agent.forced_tool_strategy"}}@format="large"+ @type="select"as |field|>- <field.Select @includeNone={{false}} as |select|>+ <field.Control @includeNone={{false}} as |select|>{{#each this.forcedToolStrategies as |fts|}}<select.Option @value={{fts.id}}>{{fts.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field>{{/if}}@@ -680,13 +692,14 @@ export default class AgentEditor extends Component {@tooltip={{i18n "discourse_ai.ai_agent.execution_mode_help"}}@format="large"@onSet={{this.onExecutionModeChange}}+ @type="select"as |field|>- <field.Select @includeNone={{false}} as |select|>+ <field.Control @includeNone={{false}} as |select|>{{#each this.executionModes as |mode|}}<select.Option @value={{mode.id}}>{{mode.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field>{{#if (eq data.execution_mode "agentic")}}@@ -695,9 +708,10 @@ export default class AgentEditor extends Component {@title={{i18n "discourse_ai.ai_agent.max_turn_tokens"}}@tooltip={{i18n "discourse_ai.ai_agent.max_turn_tokens_help"}}@format="large"+ @type="input-number"as |field|>- <field.Input @type="number" @min={{1}} lang="en" />+ <field.Control @min={{1}} lang="en" /></form.Field><form.Field@@ -707,9 +721,10 @@ export default class AgentEditor extends Component {"discourse_ai.ai_agent.compression_threshold_help"}}@format="large"+ @type="input-number"as |field|>- <field.Input @type="number" @min={{20}} @max={{99}} lang="en" />+ <field.Control @min={{20}} @max={{99}} lang="en" /></form.Field>{{/if}}@@ -719,9 +734,10 @@ export default class AgentEditor extends Component {@title={{i18n "discourse_ai.ai_agent.max_context_posts"}}@tooltip={{i18n "discourse_ai.ai_agent.max_context_posts_help"}}@format="large"+ @type="input-number"as |field|>- <field.Input @type="number" lang="en" />+ <field.Control lang="en" /></form.Field>{{/unless}}@@ -740,9 +756,10 @@ export default class AgentEditor extends Component {@tooltip={{i18n "discourse_ai.ai_agent.show_thinking_help"}}@showTitle={{false}}@format="large"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></form.Field></form.Section>@@ -752,9 +769,10 @@ export default class AgentEditor extends Component {@name="rag_uploads"@title={{i18n "discourse_ai.rag.uploads.title"}}@format="full"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><RagUploader@target={{data}}@targetName="AiAgent"@@ -762,7 +780,7 @@ export default class AgentEditor extends Component {@onRemove={{fn this.removeUpload form data field.value}}@allowImages={{@agents.resultSetMeta.settings.rag_images_enabled}}/>- </field.Custom>+ </field.Control></form.Field><RagOptionsFk@@ -778,9 +796,10 @@ export default class AgentEditor extends Component {"discourse_ai.ai_agent.rag_conversation_chunks_help"}}@format="large"+ @type="input-number"as |field|>- <field.Input @type="number" step="any" lang="en" />+ <field.Control step="any" lang="en" /></form.Field><form.Field@@ -792,16 +811,17 @@ export default class AgentEditor extends Component {"discourse_ai.ai_agent.question_consolidator_llm_help"}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><AiLlmSelector@value={{field.value}}@llms={{@agents.resultSetMeta.llms}}@onChange={{field.set}}class="ai-agent-editor__llms"/>- </field.Custom>+ </field.Control></form.Field></RagOptionsFk></form.Section>@@ -812,9 +832,10 @@ export default class AgentEditor extends Component {@name="enabled"@title={{i18n "discourse_ai.ai_agent.enabled"}}@onSet={{fn this.toggleEnabled data}}+ @type="toggle"as |field|>- <field.Toggle />+ <field.Control /></form.Field><form.Field@@ -822,9 +843,10 @@ export default class AgentEditor extends Component {@title={{i18n "discourse_ai.ai_agent.priority"}}@onSet={{fn this.togglePriority data}}@tooltip={{i18n "discourse_ai.ai_agent.priority_help"}}+ @type="toggle"as |field|>- <field.Toggle />+ <field.Control /></form.Field>{{#if @model.isNew}}@@ -836,9 +858,10 @@ export default class AgentEditor extends Component {@title={{i18n "discourse_ai.ai_agent.force_default_llm"}}@showTitle={{false}}@format="large"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></form.Field>{{/if}}@@ -879,9 +902,10 @@ export default class AgentEditor extends Component {}}@showTitle={{false}}@format="large"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></form.Field><form.Field@@ -892,9 +916,10 @@ export default class AgentEditor extends Component {}}@showTitle={{false}}@format="large"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></form.Field>{{#if this.chatPluginEnabled}}@@ -908,9 +933,10 @@ export default class AgentEditor extends Component {}}@showTitle={{false}}@format="large"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></form.Field><form.Field@@ -923,9 +949,10 @@ export default class AgentEditor extends Component {}}@showTitle={{false}}@format="large"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></form.Field>{{/if}}{{/if}}diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-embedding-editor.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-embedding-editor.gjsindex a6a80b7746f..29a62d76c1f 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-embedding-editor.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-embedding-editor.gjs@@ -108,6 +108,17 @@ export default class AiEmbeddingEditor extends Component {return !this.selectedPreset && this.args.model.isNew;}+ fieldTypeForProviderParam(type) {+ switch (type) {+ case "enum":+ return "select";+ case "checkbox":+ return "checkbox";+ default:+ return `input-${type}`;+ }+ }+get metaProviderParams() {const provider = this.currentProvider;if (!provider) {@@ -359,9 +370,10 @@ export default class AiEmbeddingEditor extends Component {@validation="required|length:1,100"@format="large"class="ai-embedding-editor__display-name"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@@ -371,15 +383,16 @@ export default class AiEmbeddingEditor extends Component {@format="large"@onSet={{this.setProvider}}class="ai-embedding-editor__provider"+ @type="select"as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each this.selectedProviders as |provider|}}<select.Option@value={{provider.id}}>{{provider.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field><form.Field@@ -388,9 +401,10 @@ export default class AiEmbeddingEditor extends Component {@validation="required"@format="large"class="ai-embedding-editor__url"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@@ -398,15 +412,16 @@ export default class AiEmbeddingEditor extends Component {@title={{i18n "discourse_ai.embeddings.api_key"}}@format="large"class="ai-embedding-editor__api-key"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><AiSecretSelector@value={{data.ai_secret_id}}@secrets={{this.availableSecrets}}@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field><form.Field@@ -415,15 +430,16 @@ export default class AiEmbeddingEditor extends Component {@validation="required"@format="large"class="ai-embedding-editor__tokenizer"+ @type="select"as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each @embeddings.resultSetMeta.tokenizers as |tokenizer|}}<select.Option@value={{tokenizer.id}}>{{tokenizer.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field><form.Field@@ -436,10 +452,10 @@ export default class AiEmbeddingEditor extends Component {(i18n "discourse_ai.embeddings.hints.dimensions_warning")}}class="ai-embedding-editor__dimensions"+ @type="input-number"as |field|>- <field.Input- @type="number"+ <field.Controlstep="any"min="0"lang="en"@@ -455,9 +471,10 @@ export default class AiEmbeddingEditor extends Component {}}@format="large"class="ai-embedding-editor__matryoshka_dimensions"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></form.Field><form.Field@@ -466,9 +483,10 @@ export default class AiEmbeddingEditor extends Component {@tooltip={{i18n "discourse_ai.embeddings.hints.embed_prompt"}}@format="large"class="ai-embedding-editor__embed_prompt"+ @type="textarea"as |field|>- <field.Textarea />+ <field.Control /></form.Field><form.Field@@ -477,9 +495,10 @@ export default class AiEmbeddingEditor extends Component {@tooltip={{i18n "discourse_ai.embeddings.hints.search_prompt"}}@format="large"class="ai-embedding-editor__search_prompt"+ @type="textarea"as |field|>- <field.Textarea />+ <field.Control /></form.Field><form.Field@@ -489,9 +508,10 @@ export default class AiEmbeddingEditor extends Component {@validation="required"@format="large"class="ai-embedding-editor__max_sequence_length"+ @type="input-number"as |field|>- <field.Input @type="number" step="any" min="0" lang="en" />+ <field.Control step="any" min="0" lang="en" /></form.Field><form.Field@@ -501,13 +521,14 @@ export default class AiEmbeddingEditor extends Component {@format="large"@validation="required"class="ai-embedding-editor__distance_functions"+ @type="select"as |field|>- <field.Select @includeNone={{false}} as |select|>+ <field.Control @includeNone={{false}} as |select|>{{#each this.distanceFunctions as |df|}}<select.Option @value={{df.id}}>{{df.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field>{{! provider-specific content }}@@ -524,20 +545,21 @@ export default class AiEmbeddingEditor extends Component {@format="large"@validation="required"class="ai-embedding-editor-provider-param__{{params.type}}"+ @type={{this.fieldTypeForProviderParam params.type}}as |field|>{{#if (eq params.type "enum")}}- <field.Select @includeNone={{false}} as |select|>+ <field.Control @includeNone={{false}} as |select|>{{#each params.values as |option|}}<select.Option@value={{option.id}}>{{option.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control>{{else if (eq params.type "checkbox")}}- <field.Checkbox />+ <field.Control />{{else}}- <field.Input @type={{params.type}} />+ <field.Control />{{/if}}</object.Field>{{/if}}diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-llm-editor-form.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-llm-editor-form.gjsindex 9d89432f8e3..6711cd448ba 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-llm-editor-form.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-llm-editor-form.gjs@@ -119,6 +119,19 @@ export default class AiLlmEditorForm extends Component {);}+ fieldTypeForProviderParam(type) {+ switch (type) {+ case "enum":+ return "select";+ case "checkbox":+ return "checkbox";+ case "secret":+ return "custom";+ default:+ return `input-${type}`;+ }+ }+get adminUser() {return AdminUser.create(this.args.model?.user);}@@ -311,9 +324,10 @@ export default class AiLlmEditorForm extends Component {@format="large"@tooltip={{i18n "discourse_ai.llms.hints.display_name"}}@disabled={{@model.seeded}}+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@@ -323,9 +337,10 @@ export default class AiLlmEditorForm extends Component {@validation="required"@format="large"@disabled={{@model.seeded}}+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field>{{#unless @model.seeded}}@@ -335,15 +350,16 @@ export default class AiLlmEditorForm extends Component {@format="large"@validation="required"@onSet={{this.setProvider}}+ @type="select"as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each this.selectedProviders as |provider|}}<select.Option@value={{provider.id}}>{{provider.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field>{{#if (this.canEditURL data.provider)}}@@ -352,9 +368,10 @@ export default class AiLlmEditorForm extends Component {@title={{i18n "discourse_ai.llms.url"}}@validation="required"@format="large"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field>{{/if}}@@ -362,15 +379,16 @@ export default class AiLlmEditorForm extends Component {@name="ai_secret_id"@title={{i18n "discourse_ai.llms.api_key"}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><AiSecretSelector@value={{data.ai_secret_id}}@secrets={{this.availableSecrets}}@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field><form.Object @name="provider_params" as |object providerParamsData|>@@ -389,28 +407,29 @@ export default class AiLlmEditorForm extends Component {}}@showTitle={{not (eq params.type "checkbox")}}@format="large"+ @type={{this.fieldTypeForProviderParam params.type}}as |field|>{{#if (eq params.type "enum")}}- <field.Select @includeNone={{false}} as |select|>+ <field.Control @includeNone={{false}} as |select|>{{#each params.values as |option|}}<select.Option@value={{option.id}}>{{option.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control>{{else if (eq params.type "checkbox")}}- <field.Checkbox />+ <field.Control />{{else if (eq params.type "secret")}}- <field.Custom>+ <field.Control><AiSecretSelector@value={{field.value}}@secrets={{this.availableSecrets}}@onChange={{field.set}}/>- </field.Custom>+ </field.Control>{{else}}- <field.Input @type={{params.type}} />+ <field.Control />{{/if}}</object.Field>{{/if}}@@ -423,15 +442,16 @@ export default class AiLlmEditorForm extends Component {@title={{i18n "discourse_ai.llms.tokenizer"}}@format="large"@validation="required"+ @type="select"as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each this.tokenizers as |tokenizer|}}<select.Option@value={{tokenizer.id}}>{{tokenizer.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></form.Field><form.Field@@ -440,9 +460,10 @@ export default class AiLlmEditorForm extends Component {@tooltip={{i18n "discourse_ai.llms.hints.max_prompt_tokens"}}@validation="required"@format="large"+ @type="input-number"as |field|>- <field.Input @type="number" step="any" min="0" lang="en" />+ <field.Control step="any" min="0" lang="en" /></form.Field><form.InputGroup as |inputGroup|>@@ -451,9 +472,10 @@ export default class AiLlmEditorForm extends Component {@title={{i18n "discourse_ai.llms.cost_input"}}@tooltip={{i18n "discourse_ai.llms.hints.cost_input"}}@helpText={{i18n "discourse_ai.llms.hints.cost_measure"}}+ @type="input-number"as |field|>- <field.Input @type="number" step="any" min="0" lang="en" />+ <field.Control step="any" min="0" lang="en" /></inputGroup.Field><inputGroup.Field@@ -461,9 +483,10 @@ export default class AiLlmEditorForm extends Component {@title={{i18n "discourse_ai.llms.cost_output"}}@tooltip={{i18n "discourse_ai.llms.hints.cost_output"}}@helpText={{i18n "discourse_ai.llms.hints.cost_measure"}}+ @type="input-number"as |field|>- <field.Input @type="number" step="any" min="0" lang="en" />+ <field.Control step="any" min="0" lang="en" /></inputGroup.Field></form.InputGroup>@@ -473,9 +496,10 @@ export default class AiLlmEditorForm extends Component {@title={{i18n "discourse_ai.llms.cost_cached_input"}}@tooltip={{i18n "discourse_ai.llms.hints.cost_cached_input"}}@helpText={{i18n "discourse_ai.llms.hints.cost_measure"}}+ @type="input-number"as |field|>- <field.Input @type="number" step="any" min="0" lang="en" />+ <field.Control step="any" min="0" lang="en" /></inputGroup.Field><inputGroup.Field@@ -483,9 +507,10 @@ export default class AiLlmEditorForm extends Component {@title={{i18n "discourse_ai.llms.cost_cache_write"}}@tooltip={{i18n "discourse_ai.llms.hints.cost_cache_write"}}@helpText={{i18n "discourse_ai.llms.hints.cost_measure"}}+ @type="input-number"as |field|>- <field.Input @type="number" step="any" min="0" lang="en" />+ <field.Control step="any" min="0" lang="en" /></inputGroup.Field></form.InputGroup>@@ -494,9 +519,10 @@ export default class AiLlmEditorForm extends Component {@title={{i18n "discourse_ai.llms.max_output_tokens"}}@tooltip={{i18n "discourse_ai.llms.hints.max_output_tokens"}}@format="large"+ @type="input-number"as |field|>- <field.Input @type="number" step="any" min="0" lang="en" />+ <field.Control step="any" min="0" lang="en" /></form.Field><form.Field@@ -505,9 +531,10 @@ export default class AiLlmEditorForm extends Component {@tooltip={{i18n "discourse_ai.llms.hints.vision_enabled"}}@showTitle={{false}}@format="large"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></form.Field><form.Field@@ -515,16 +542,15 @@ export default class AiLlmEditorForm extends Component {@title={{i18n "discourse_ai.llms.allowed_attachment_types"}}@tooltip={{i18n "discourse_ai.llms.hints.allowed_attachment_types"}}@format="large"+ @type="custom"as |field|>- <field.Label />- <field.Custom>+ <field.Control><AiLlmAttachmentTypes@value={{field.value}}@onChange={{field.set}}/>- </field.Custom>- <field.Hint />+ </field.Control></form.Field>{{#if @model.user}}@@ -581,13 +607,10 @@ export default class AiLlmEditorForm extends Component {@name="max_tokens"@title="max_tokens"@showTitle={{false}}+ @type="input-number"as |field|>- <field.Input- @type="number"- class="ai-llm-quotas__input"- min="1"- />+ <field.Control class="ai-llm-quotas__input" min="1" /></collection.Field></td><td class="ai-llm-quotas__cell">@@ -595,13 +618,10 @@ export default class AiLlmEditorForm extends Component {@name="max_usages"@title="max_usages"@showTitle={{false}}+ @type="input-number"as |field|>- <field.Input- @type="number"- class="ai-llm-quotas__input"- min="1"- />+ <field.Control class="ai-llm-quotas__input" min="1" /></collection.Field></td><td class="ai-llm-quotas__cell">@@ -609,14 +629,15 @@ export default class AiLlmEditorForm extends Component {@name="duration_seconds"@title="duration_seconds"@showTitle={{false}}+ @type="custom"as |field|>- <field.Custom>+ <field.Control><DurationSelector@value={{collectionData.duration_seconds}}@onChange={{field.set}}/>- </field.Custom>+ </field.Control></collection.Field></td><td>diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-features/edit.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-features/edit.gjsindex 1685149b599..a8545af91e2 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-features/edit.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-features/edit.gjs@@ -30,9 +30,23 @@ export default <template>}}@format="large"@validation={{@controller.getValidationFor setting}}+ @type={{if+ (eq setting.type "bool")+ "checkbox"+ (if+ (eq setting.type "integer")+ "input-number"+ (if+ (eq setting.type "enum")+ "select"+ (if (eq setting.type "list") "custom" "input")+ )+ )+ }}as |field|><AiFeatureSettingField+ @Control={{field.Control}}@setting={{setting}}@field={{field}}/>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-agent-example.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-agent-example.gjsindex 1584207eb94..da7c56c585f 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-agent-example.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-agent-example.gjs@@ -47,9 +47,10 @@ export default class AiAgentCollapsableExample extends Component {}}@validation="required|length:1,5000"@disabled={{@system}}+ @type="textarea"as |field|>- <field.Textarea />+ <field.Control /></exPair.Field></@examplesCollection.Collection>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-agent-tool-options.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-agent-tool-options.gjsindex 1cce3d7036f..9e380843f07 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-agent-tool-options.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-agent-tool-options.gjs@@ -46,6 +46,21 @@ export default class AiAgentToolOptions extends Component {return availableOptions;}+ fieldTypeForOption(type) {+ switch (type) {+ case "enum":+ return "select";+ case "llm":+ return "custom";+ case "boolean":+ return "checkbox";+ case "text":+ return "textarea";+ default:+ return "input";+ }+ }+<template>{{#if this.showToolOptions}}<@form.Container@@ -72,29 +87,30 @@ export default class AiAgentToolOptions extends Component {@title={{optionMeta.name}}@helpText={{optionMeta.description}}@format="full"+ @type={{this.fieldTypeForOption optionMeta.type}}as |field|>{{#if (eq optionMeta.type "enum")}}- <field.Select @includeNone={{false}} as |select|>+ <field.Control @includeNone={{false}} as |select|>{{#each optionMeta.values as |v|}}<select.Option @value={{v}}>{{v}}</select.Option>{{/each}}- </field.Select>+ </field.Control>{{else if (eq optionMeta.type "llm")}}- <field.Custom>+ <field.Control><AiLlmSelector@value={{field.value}}@llms={{@llms}}@onChange={{field.set}}class="ai-agent-tool-option-editor__llms"/>- </field.Custom>+ </field.Control>{{else if (eq optionMeta.type "boolean")}}- <field.Checkbox />+ <field.Control />{{else if (eq optionMeta.type "text")}}- <field.Textarea />+ <field.Control />{{else}}- <field.Input />+ <field.Control />{{/if}}</optionsObj.Field>{{/let}}diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-feature-setting-field.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-feature-setting-field.gjsindex 1a8f4917e60..de22d8ccd46 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-feature-setting-field.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-feature-setting-field.gjs@@ -48,21 +48,21 @@ export default class AiFeatureSettingField extends Component {<template>{{#if (eq this.controlType "bool")}}- <@field.Checkbox>+ <@Control>{{@setting.description}}- </@field.Checkbox>+ </@Control>{{else if (eq this.controlType "integer")}}- <@field.Input @type="number" />+ <@Control />{{else if (eq this.controlType "enum")}}- <@field.Select as |select|>+ <@Control as |select|>{{#each @setting.valid_values as |option|}}<select.Option @value={{option.value}}>{{option.name}}</select.Option>{{/each}}- </@field.Select>+ </@Control>{{else if (eq this.controlType "group_list")}}- <@field.Custom>+ <@Control><ListSetting@value={{this.parseList @field.value}}@choices={{this.groupChoices}}@@ -71,9 +71,9 @@ export default class AiFeatureSettingField extends Component {@valueProperty="id"@onChange={{this.serializeList @field.set}}/>- </@field.Custom>+ </@Control>{{else if (eq this.controlType "compact_list")}}- <@field.Custom>+ <@Control><ListSetting@value={{this.parseList @field.value}}@choices={{this.compactListChoices}}@@ -82,9 +82,9 @@ export default class AiFeatureSettingField extends Component {@valueProperty={{if this.hasEnumChoices "value"}}@onChange={{this.serializeList @field.set}}/>- </@field.Custom>+ </@Control>{{else}}- <@field.Input />+ <@Control />{{/if}}</template>}diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-secret-editor-form.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-secret-editor-form.gjsindex eb94e0eb2bf..b4f4827691e 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-secret-editor-form.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-secret-editor-form.gjs@@ -106,9 +106,10 @@ export default class AiSecretEditorForm extends Component {@title={{i18n "discourse_ai.secrets.name"}}@validation="required|length:1,100"@format="large"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@@ -116,9 +117,10 @@ export default class AiSecretEditorForm extends Component {@title={{i18n "discourse_ai.secrets.secret"}}@validation="required"@format="large"+ @type="password"as |field|>- <field.Password autocomplete="off" />+ <field.Control autocomplete="off" /></form.Field><form.Actions>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-tool-editor-form.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-tool-editor-form.gjsindex f33071e949f..d7837b276e0 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-tool-editor-form.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-tool-editor-form.gjs@@ -241,9 +241,10 @@ export default class AiToolEditorForm extends Component {@validation="required|length:1,100"@format="large"@tooltip={{i18n "discourse_ai.tools.name_help"}}+ @type="input"as |field|>- <field.Input class="ai-tool-editor__name" />+ <field.Control class="ai-tool-editor__name" /></form.Field>{{! TOOL NAME }}@@ -253,9 +254,10 @@ export default class AiToolEditorForm extends Component {@validation="required|length:1,100"@format="large"@tooltip={{i18n "discourse_ai.tools.tool_name_help"}}+ @type="input"as |field|>- <field.Input class="ai-tool-editor__tool_name" />+ <field.Control class="ai-tool-editor__tool_name" /></form.Field>{{! DESCRIPTION }}@@ -265,9 +267,10 @@ export default class AiToolEditorForm extends Component {@validation="required|length:1,1000"@format="full"@tooltip={{i18n "discourse_ai.tools.description_help"}}+ @type="textarea"as |field|>- <field.Textarea+ <field.Control@height={{60}}class="ai-tool-editor__description"placeholder={{i18n "discourse_ai.tools.description_help"}}@@ -281,9 +284,10 @@ export default class AiToolEditorForm extends Component {@validation="required|length:1,255"@format="large"@tooltip={{i18n "discourse_ai.tools.summary_help"}}+ @type="input"as |field|>- <field.Input class="ai-tool-editor__summary" />+ <field.Control class="ai-tool-editor__summary" /></form.Field>{{! PARAMETERS }}@@ -296,9 +300,10 @@ export default class AiToolEditorForm extends Component {@title={{i18n "discourse_ai.tools.parameter_name"}}@validation="required|length:1,100"@format="full"+ @type="input"as |field|>- <field.Input />+ <field.Control /></collection.Field></row.Col>@@ -308,15 +313,16 @@ export default class AiToolEditorForm extends Component {@title={{i18n "discourse_ai.tools.parameter_type"}}@validation="required"@format="full"+ @type="select"as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each this.PARAMETER_TYPES as |type|}}<select.Option@value={{type.id}}>{{type.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></collection.Field></row.Col>@@ -326,15 +332,16 @@ export default class AiToolEditorForm extends Component {@name="item_type"@title={{i18n "discourse_ai.tools.parameter_item_type"}}@format="full"+ @type="select"as |field|>- <field.Select as |select|>+ <field.Control as |select|>{{#each this.ITEM_TYPES as |type|}}<select.Option@value={{type.id}}>{{type.name}}</select.Option>{{/each}}- </field.Select>+ </field.Control></collection.Field></row.Col>{{/if}}@@ -347,9 +354,10 @@ export default class AiToolEditorForm extends Component {@title={{i18n "discourse_ai.tools.parameter_description"}}@validation="required|length:1,1000"@format="full"+ @type="input"as |field|>- <field.Input class="ai-tool-editor__parameter-description" />+ <field.Control class="ai-tool-editor__parameter-description" /></collection.Field></row.Col></form.Row>@@ -359,9 +367,10 @@ export default class AiToolEditorForm extends Component {<collection.Field@name="required"@title={{i18n "discourse_ai.tools.parameter_required"}}+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></collection.Field></row.Col>@@ -370,9 +379,10 @@ export default class AiToolEditorForm extends Component {@name="isEnum"@title={{i18n "discourse_ai.tools.parameter_enum"}}@onSet={{this.toggleIsEnum}}+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></collection.Field></row.Col>@@ -383,9 +393,10 @@ export default class AiToolEditorForm extends Component {<child.Field@title={{i18n "discourse_ai.tools.enum_value"}}@validation="required"+ @type="input"as |field|>- <field.Input />+ <field.Control />{{#if(and@@ -453,9 +464,10 @@ export default class AiToolEditorForm extends Component {@validation="required|length:1,100"@format="full"@tooltip={{i18n "discourse_ai.tools.secret_alias_help"}}+ @type="input"as |field|>- <field.Input />+ <field.Control /></collection.Field></row.Col>@@ -464,15 +476,16 @@ export default class AiToolEditorForm extends Component {@name="ai_secret_id"@title={{i18n "discourse_ai.tools.secret_credential"}}@format="full"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><AiSecretSelector@value={{field.value}}@secrets={{this.secretOptions}}@onChange={{field.set}}/>- </field.Custom>+ </field.Control></collection.Field></row.Col></form.Row>@@ -507,9 +520,10 @@ export default class AiToolEditorForm extends Component {@title={{i18n "discourse_ai.tools.script"}}@validation="required|length:1,100000"@format="full"+ @type="code"as |field|>- <field.Code @lang="javascript" @height={{600}} />+ <field.Control @lang="javascript" @height={{600}} /></form.Field>{{! UPLOADS }}@@ -519,9 +533,10 @@ export default class AiToolEditorForm extends Component {@title={{i18n "discourse_ai.rag.uploads.title"}}@tooltip={{this.ragUploadsDescription}}@format="full"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><RagUploader@target={{@editingModel}}@updateUploads={{fn this.updateUploads form.addItemToCollection}}@@ -534,7 +549,7 @@ export default class AiToolEditorForm extends Component {@llms={{@llms}}@allowImages={{@settings.rag_images_enabled}}/>- </field.Custom>+ </field.Control></form.Field>{{/if}}diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-llm-quota-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-llm-quota-modal.gjsindex 7a587af5cdd..859ad30afa3 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-llm-quota-modal.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-llm-quota-modal.gjs@@ -91,16 +91,17 @@ export default class AiLlmQuotaModal extends Component {@title={{i18n "discourse_ai.llms.quotas.group"}}@validation="required"@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><GroupChooser@value={{data.group_id}}@content={{this.availableGroups}}@onChange={{fn this.setGroupId field}}@options={{hash maximum=1}}/>- </field.Custom>+ </field.Control></form.Field><form.Field@@ -108,9 +109,10 @@ export default class AiLlmQuotaModal extends Component {@title={{i18n "discourse_ai.llms.quotas.max_tokens"}}@tooltip={{i18n "discourse_ai.llms.quotas.max_tokens_help"}}@format="large"+ @type="input-number"as |field|>- <field.Input @type="number" min="1" />+ <field.Control min="1" /></form.Field><form.Field@@ -118,9 +120,10 @@ export default class AiLlmQuotaModal extends Component {@title={{i18n "discourse_ai.llms.quotas.max_usages"}}@tooltip={{i18n "discourse_ai.llms.quotas.max_usages_help"}}@format="large"+ @type="input-number"as |field|>- <field.Input @type="number" min="1" />+ <field.Control min="1" /></form.Field><form.Field@@ -128,14 +131,15 @@ export default class AiLlmQuotaModal extends Component {@title={{i18n "discourse_ai.llms.quotas.duration"}}@validation="required"@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><DurationSelector@value={{data.duration_seconds}}@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field><form.Submitdiff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-secret-create-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-secret-create-modal.gjsindex 3448fe2f7a0..8e1af668f51 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-secret-create-modal.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-secret-create-modal.gjs@@ -48,9 +48,10 @@ export default class AiSecretCreateModal extends Component {@title={{i18n "discourse_ai.secrets.name"}}@validation="required|length:1,100"@format="large"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@@ -58,9 +59,10 @@ export default class AiSecretCreateModal extends Component {@title={{i18n "discourse_ai.secrets.secret"}}@validation="required"@format="large"+ @type="password"as |field|>- <field.Password autocomplete="off" />+ <field.Control autocomplete="off" /></form.Field><form.Actions>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/rag-options-fk.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/rag-options-fk.gjsindex f2bdfe9cdc1..35e24472c0d 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/rag-options-fk.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/rag-options-fk.gjs@@ -40,9 +40,10 @@ export default class RagOptionsFk extends Component {@title={{i18n "discourse_ai.rag.options.rag_chunk_tokens"}}@tooltip={{i18n "discourse_ai.rag.options.rag_chunk_tokens_help"}}@format="large"+ @type="input-number"as |field|>- <field.Input @type="number" step="any" lang="en" />+ <field.Control step="any" lang="en" /></@form.Field><@form.Field@@ -52,9 +53,10 @@ export default class RagOptionsFk extends Component {"discourse_ai.rag.options.rag_chunk_overlap_tokens_help"}}@format="large"+ @type="input-number"as |field|>- <field.Input @type="number" step="any" lang="en" />+ <field.Control step="any" lang="en" /></@form.Field>{{#if @allowImages}}@@ -63,16 +65,17 @@ export default class RagOptionsFk extends Component {@title={{i18n "discourse_ai.rag.options.rag_llm_model"}}@tooltip={{i18n "discourse_ai.rag.options.rag_llm_model_help"}}@format="large"+ @type="custom"as |field|>- <field.Custom>+ <field.Control><AiLlmSelector@value={{field.value}}@llms={{this.visionLlms}}@onChange={{field.set}}class="ai-agent-editor__llms"/>- </field.Custom>+ </field.Control></@form.Field>{{/if}}{{yield}}diff --git a/plugins/discourse-assign/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings-upsert.gjs b/plugins/discourse-assign/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings-upsert.gjsindex 348353108b0..cb696a26214 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings-upsert.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings-upsert.gjs@@ -27,9 +27,10 @@ export default class AssignSettingsUpsert extends Component {@name="enable_unassigned_filter"@title={{i18n "discourse_assign.add_unassigned_filter"}}@onSet={{this.onToggleUnassignedFilter}}+ @type="checkbox"as |field|>- <field.Checkbox checked={{this.enableUnassignedFilter}} />+ <field.Control checked={{this.enableUnassignedFilter}} /></customFields.Field></form.Object></form.Section>diff --git a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjsindex ad3281eeb7d..56a529b1204 100644--- a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs+++ b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs@@ -60,9 +60,10 @@ export default <template>@title={{i18n "explorer.create_placeholder"}}@validation="required"@format="large"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Actions><form.Submit @label="explorer.create" @icon="plus" />diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input-form.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input-form.gjsindex 31290fc5d82..dcaaccb3fb4 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input-form.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input-form.gjs@@ -101,25 +101,17 @@ function validationOf(info) {}const components = {- int: <template>- <@field.Input @type="number" name={{@info.identifier}} />- </template>,- boolean: <template><@field.Checkbox name={{@info.identifier}} /></template>,+ int: <template><@Control name={{@info.identifier}} /></template>,+ boolean: <template><@Control name={{@info.identifier}} /></template>,boolean_three: BooleanThree,category_id: CategoryIdInput, // TODOuser_id: UserIdInput,user_list: UserListInput,group_list: GroupInput,- date: <template>- <@field.Input @type="date" name={{@info.identifier}} />- </template>,- time: <template>- <@field.Input @type="time" name={{@info.identifier}} />- </template>,- datetime: <template>- <@field.Input @type="datetime-local" name={{@info.identifier}} />- </template>,- default: <template><@field.Input name={{@info.identifier}} /></template>,+ date: <template><@Control name={{@info.identifier}} /></template>,+ time: <template><@Control name={{@info.identifier}} /></template>,+ datetime: <template><@Control name={{@info.identifier}} /></template>,+ default: <template><@Control name={{@info.identifier}} /></template>,};function componentOf(info) {@@ -134,11 +126,15 @@ export default class ParamInputForm extends Component {@service site;data = {};+paramInfo = [];+infoOf = {};+form = null;promiseNormalizations = [];+formLoaded = new Promise((res) => {this.__form_load_callback = res;});@@ -153,6 +149,34 @@ export default class ParamInputForm extends Component {});}+ fieldTypeFor(info) {+ let type = layoutMap[info.type] || "generic";++ if (info.nullable && type === "boolean") {+ return "select";+ }++ switch (type) {+ case "int":+ return "input-number";+ case "boolean":+ return "checkbox";+ case "date":+ return "input-date";+ case "time":+ return "input-time";+ case "datetime":+ return "input-datetime-local";+ case "category_id":+ case "user_id":+ case "user_list":+ case "group_list":+ return "custom";+ default:+ return "input";+ }+ }+initializeParams() {this.args.paramInfo.forEach((info) => {// Skip internal types - they are auto-injected server-side@@ -447,9 +471,14 @@ export default class ParamInputForm extends Component {@title={{info.identifier}}@validation={{info.validation}}@validate={{info.validate}}+ @type={{this.fieldTypeFor info}}as |field|>- <info.component @field={{field}} @info={{info}} />+ <info.component+ @Control={{field.Control}}+ @field={{field}}+ @info={{info}}+ /><ConditionalLoadingSpinner@condition={{info.loading}}@size="small"diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/boolean-three.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/boolean-three.gjsindex 70951ca644c..edf5175d1ec 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/boolean-three.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/boolean-three.gjs@@ -1,7 +1,7 @@import { i18n } from "discourse-i18n";const BooleanThree = <template>- <@field.Select name={{@info.identifier}} as |select|>+ <@Control name={{@info.identifier}} as |select|><select.Option @value="Y">{{i18n "explorer.types.bool.true"}}</select.Option>@@ -11,7 +11,7 @@ const BooleanThree = <template><select.Option @value="#null">{{i18n "explorer.types.bool.null_"}}</select.Option>- </@field.Select>+ </@Control></template>;export default BooleanThree;diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/category-id-input.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/category-id-input.gjsindex 4b6439b39ad..f92555ae3b6 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/category-id-input.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/category-id-input.gjs@@ -12,7 +12,7 @@ export default class CategoryIdInput extends Component {}<template>- <@field.Custom id={{@field.id}}>+ <@Control id={{@field.id}}><CategoryChooser@value={{this.data.value}}@onChange={{@field.set}}@@ -23,6 +23,6 @@ export default class CategoryIdInput extends Component {}}name={{@info.identifier}}/>- </@field.Custom>+ </@Control></template>}diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/group-input.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/group-input.gjsindex e13ac9d64ee..e7b8d0685ec 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/group-input.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/group-input.gjs@@ -18,7 +18,7 @@ export default class GroupInput extends Component {}<template>- <@field.Custom id={{@field.id}}>+ <@Control id={{@field.id}}><GroupChooser@content={{this.allGroups}}@value={{@field.value}}@@ -28,6 +28,6 @@ export default class GroupInput extends Component {@options={{this.groupChooserOption}}name={{@info.identifier}}/>- </@field.Custom>+ </@Control></template>}diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/user-id-input.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/user-id-input.gjsindex 7a196b3b86f..4ad3359d982 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/user-id-input.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/user-id-input.gjs@@ -2,14 +2,14 @@ import { hash } from "@ember/helper";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";const UserIdInput = <template>- <@field.Custom id={{@field.id}}>+ <@Control id={{@field.id}}><EmailGroupUserChooser@value={{@field.value}}@options={{hash maximum=1}}@onChange={{@field.set}}name={{@info.identifier}}/>- </@field.Custom>+ </@Control></template>;export default UserIdInput;diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/user-list-input.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/user-list-input.gjsindex 9b5a1fc23fc..1ccc7c17a5f 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/user-list-input.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input/user-list-input.gjs@@ -1,13 +1,13 @@import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";const UserListInput = <template>- <@field.Custom id={{@field.id}}>+ <@Control id={{@field.id}}><EmailGroupUserChooser@value={{@field.value}}@onChange={{@field.set}}name={{@info.identifier}}/>- </@field.Custom>+ </@Control></template>;export default UserListInput;diff --git a/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-create-leaderboard.gjs b/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-create-leaderboard.gjsindex db307065615..f9de3f98879 100644--- a/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-create-leaderboard.gjs+++ b/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-create-leaderboard.gjs@@ -67,9 +67,10 @@ export default class AdminCreateLeaderboard extends Component {@showTitle={{false}}class="new-leaderboard__name"@validation="required"+ @type="input"as |field|>- <field.Input+ <field.Controlplaceholder={{i18n "gamification.leaderboard.name_placeholder"}}/></form.Field>diff --git a/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-edit-leaderboard.gjs b/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-edit-leaderboard.gjsindex 9398a0ca6b8..abf29897500 100644--- a/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-edit-leaderboard.gjs+++ b/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-edit-leaderboard.gjs@@ -76,9 +76,10 @@ export default class AdminEditLeaderboard extends Component {@name="name"@title={{i18n "gamification.leaderboard.name"}}@validation="required"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Row as |row|>@@ -86,9 +87,10 @@ export default class AdminEditLeaderboard extends Component {<form.Field@name="from_date"@title={{i18n "gamification.leaderboard.date.from"}}+ @type="input-date"as |field|>- <field.Input @type="date" />+ <field.Control /></form.Field></row.Col>@@ -96,9 +98,10 @@ export default class AdminEditLeaderboard extends Component {<form.Field@name="to_date"@title={{i18n "gamification.leaderboard.date.to"}}+ @type="input-date"as |field|>- <field.Input @type="date" />+ <field.Control /></form.Field></row.Col></form.Row>@@ -106,9 +109,10 @@ export default class AdminEditLeaderboard extends Component {<form.Field@name="included_groups_ids"@title={{i18n "gamification.leaderboard.included_groups"}}+ @type="custom"as |field|>- <field.Custom>+ <field.Control><GroupChooser@id="leaderboard-edit__included-groups"@content={{this.siteGroups}}@@ -116,15 +120,16 @@ export default class AdminEditLeaderboard extends Component {@labelProperty="name"@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field><form.Field@name="excluded_groups_ids"@title={{i18n "gamification.leaderboard.excluded_groups"}}+ @type="custom"as |field|>- <field.Custom>+ <field.Control><GroupChooser@id="leaderboard-edit__excluded-groups"@content={{this.siteGroups}}@@ -132,15 +137,16 @@ export default class AdminEditLeaderboard extends Component {@labelProperty="name"@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field><form.Field@name="visible_to_groups_ids"@title={{i18n "gamification.leaderboard.visible_to_groups"}}+ @type="custom"as |field|>- <field.Custom>+ <field.Control><GroupChooser@id="leaderboard-edit__visible-groups"@content={{this.siteGroups}}@@ -148,26 +154,28 @@ export default class AdminEditLeaderboard extends Component {@labelProperty="name"@onChange={{field.set}}/>- </field.Custom>+ </field.Control></form.Field><form.Field@name="default_period"@title={{i18n "gamification.leaderboard.default_period"}}+ @type="custom"as |field|>- <field.Custom>+ <field.Control><PeriodInput @value={{field.value}} @onChange={{field.set}} />- </field.Custom>+ </field.Control></form.Field><form.Field@name="period_filter_disabled"@title={{i18n "gamification.leaderboard.period_filter_disabled"}}@showTitle={{false}}+ @type="checkbox"as |field|>- <field.Checkbox @value={{field.value}} />+ <field.Control @value={{field.value}} /></form.Field><form.Submit /></Form>diff --git a/plugins/discourse-math/assets/javascripts/discourse/components/modal/math-edit.gjs b/plugins/discourse-math/assets/javascripts/discourse/components/modal/math-edit.gjsindex 3d69f24fb27..212000d0812 100644--- a/plugins/discourse-math/assets/javascripts/discourse/components/modal/math-edit.gjs+++ b/plugins/discourse-math/assets/javascripts/discourse/components/modal/math-edit.gjs@@ -53,9 +53,10 @@ export default class MathEditModal extends Component {@name="text"@title={{i18n "discourse_math.edit_modal.label"}}@format="full"+ @type="textarea"as |field|>- <field.Textarea+ <field.Controlclass="math-edit-modal__textarea"autofocus={{true}}/>diff --git a/plugins/discourse-math/assets/javascripts/discourse/components/modal/math-insert.gjs b/plugins/discourse-math/assets/javascripts/discourse/components/modal/math-insert.gjsindex 0a412c9b6a5..392ff37726a 100644--- a/plugins/discourse-math/assets/javascripts/discourse/components/modal/math-insert.gjs+++ b/plugins/discourse-math/assets/javascripts/discourse/components/modal/math-insert.gjs@@ -83,9 +83,10 @@ export default class MathInsertModal extends Component {@title={{i18n "discourse_math.insert_modal.label"}}@format="full"@validation="required"+ @type="textarea"as |field|>- <field.Textarea+ <field.Controlclass="math-insert-modal__textarea"placeholder={{i18n "discourse_math.insert_modal.placeholder"}}autofocus={{true}}diff --git a/plugins/discourse-solved/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings-upsert.gjs b/plugins/discourse-solved/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings-upsert.gjsindex 8b816e20204..e2fbdad3943 100644--- a/plugins/discourse-solved/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings-upsert.gjs+++ b/plugins/discourse-solved/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings-upsert.gjs@@ -61,36 +61,40 @@ export default class SolvedSettingsUpsert extends Component {@name="enable_accepted_answers"@title={{i18n "solved.allow_accepted_answers"}}@onSet={{this.onToggleAcceptedAnswers}}+ @type="checkbox"as |field|>- <field.Checkbox checked={{this.enableAcceptedAnswers}} />+ <field.Control checked={{this.enableAcceptedAnswers}} /></customFields.Field>{{/unless}}<customFields.Field@name="solved_topics_auto_close_hours"@title={{i18n "solved.solved_topics_auto_close_hours"}}+ @type="input-number"as |field|>- <field.Input @type="number" min="0" />+ <field.Control min="0" /></customFields.Field><customFields.Field@name="notify_on_staff_accept_solved"@title={{i18n "solved.notify_on_staff_accept_solved"}}@onSet={{this.onToggleNotifyOnStaffAcceptSolved}}+ @type="checkbox"as |field|>- <field.Checkbox checked={{this.notifyOnStaffAcceptSolved}} />+ <field.Control checked={{this.notifyOnStaffAcceptSolved}} /></customFields.Field><customFields.Field@name="empty_box_on_unsolved"@title={{i18n "solved.empty_box_on_unsolved"}}@onSet={{this.onToggleEmptyBoxOnUnsolved}}+ @type="checkbox"as |field|>- <field.Checkbox checked={{this.emptyBoxOnUnsolved}} />+ <field.Control checked={{this.emptyBoxOnUnsolved}} /></customFields.Field></form.Object></form.Section>diff --git a/plugins/discourse-topic-voting/assets/javascripts/discourse/connectors/category-custom-settings/feature-voting-settings-upsert.gjs b/plugins/discourse-topic-voting/assets/javascripts/discourse/connectors/category-custom-settings/feature-voting-settings-upsert.gjsindex 8b528c63237..0ad19d0ef49 100644--- a/plugins/discourse-topic-voting/assets/javascripts/discourse/connectors/category-custom-settings/feature-voting-settings-upsert.gjs+++ b/plugins/discourse-topic-voting/assets/javascripts/discourse/connectors/category-custom-settings/feature-voting-settings-upsert.gjs@@ -26,9 +26,10 @@ export default class FeatureVotingSettingsUpsert extends Component {@name="enable_topic_voting"@title={{i18n "topic_voting.allow_topic_voting"}}@onSet={{this.onToggleTopicVoting}}+ @type="checkbox"as |field|>- <field.Checkbox checked={{this.enableTopicVoting}} />+ <field.Control checked={{this.enableTopicVoting}} /></customFields.Field></form.Object></form.Section>diff --git a/plugins/discourse-user-notes/assets/javascripts/discourse/components/modal/user-notes.gjs b/plugins/discourse-user-notes/assets/javascripts/discourse/components/modal/user-notes.gjsindex f9111b26680..49963cf6a1e 100644--- a/plugins/discourse-user-notes/assets/javascripts/discourse/components/modal/user-notes.gjs+++ b/plugins/discourse-user-notes/assets/javascripts/discourse/components/modal/user-notes.gjs@@ -94,9 +94,10 @@ export default class UserNotesModal extends Component {@title={{i18n "user_notes.attach_note_description"}}@format="full"@validation="required:trim"+ @type="textarea"as |field|>- <field.Textarea />+ <field.Control /></form.Field><form.Actions>diff --git a/plugins/discourse-user-notes/assets/javascripts/discourse/connectors/reviewable-note-form-after-note/copy-reviewable-note-to-user-option.gjs b/plugins/discourse-user-notes/assets/javascripts/discourse/connectors/reviewable-note-form-after-note/copy-reviewable-note-to-user-option.gjsindex 1de1657be01..17d3706ac7d 100644--- a/plugins/discourse-user-notes/assets/javascripts/discourse/connectors/reviewable-note-form-after-note/copy-reviewable-note-to-user-option.gjs+++ b/plugins/discourse-user-notes/assets/javascripts/discourse/connectors/reviewable-note-form-after-note/copy-reviewable-note-to-user-option.gjs@@ -17,9 +17,10 @@ export default class CopyReviewableNoteToUserOption extends Component {@name="copy_note_to_user"@title={{i18n "user_notes.copy_reviewable_note" username=this.username}}@format="full"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></@form.Field></template>}diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-forms.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-forms.gjsindex b58a775dfe2..d9e118c0f27 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-forms.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-forms.gjs@@ -9,28 +9,28 @@ export default class Forms extends Component {<template><Form as |form|>- <form.Field @title="Username" @name="username" as |field|>- <field.Input placeholder="Username" />+ <form.Field @title="Username" @name="username" @type="input" as |field|>+ <field.Control placeholder="Username" /></form.Field>- <form.Field @title="Age" @name="age" as |field|>- <field.Input placeholder="Age" @type="number" @format="small" />+ <form.Field @title="Age" @name="age" @type="input-number" as |field|>+ <field.Control placeholder="Age" @format="small" /></form.Field>- <form.Field @title="Website" @name="website" as |field|>- <field.Input @before="https://" @after=".com" @format="large" />+ <form.Field @title="Website" @name="website" @type="input" as |field|>+ <field.Control @before="https://" @after=".com" @format="large" /></form.Field>- <form.Field @title="After" @name="after" as |field|>- <field.Input @after=".com" />+ <form.Field @title="After" @name="after" @type="input" as |field|>+ <field.Control @after=".com" /></form.Field>- <form.Field @title="Before" @name="before" as |field|>- <field.Input @before="https://" />+ <form.Field @title="Before" @name="before" @type="input" as |field|>+ <field.Control @before="https://" /></form.Field><form.Field@title="Secret"@name="secret"@description="An important password"- as |field|+ @type="password" as |field|>- <field.Password />+ <field.Control /></form.Field></Form></template>`;@@ -41,8 +41,8 @@ export default class Forms extends Component {<template><Form as |form|>- <form.Field @title="Enabled" @name="enabled" as |field|>- <field.Question />+ <form.Field @title="Enabled" @name="enabled" @type="question" as |field|>+ <field.Control /></form.Field></Form></template>`;@@ -53,8 +53,8 @@ export default class Forms extends Component {<template><Form as |form|>- <form.Field @title="Enabled" @name="enabled" as |field|>- <field.Toggle />+ <form.Field @title="Enabled" @name="enabled" @type="toggle" as |field|>+ <field.Control /></form.Field></Form></template>`;@@ -65,8 +65,8 @@ export default class Forms extends Component {<template><Form as |form|>- <form.Field @title="Query" @name="query" as |field|>- <field.Composer />+ <form.Field @title="Query" @name="query" @type="composer" as |field|>+ <field.Control /></form.Field></Form></template>`;@@ -77,8 +77,8 @@ export default class Forms extends Component {<template><Form as |form|>- <form.Field @title="Query" @name="query" as |field|>- <field.Code />+ <form.Field @title="Query" @name="query" @type="code" as |field|>+ <field.Control /></form.Field></Form></template>`;@@ -89,8 +89,8 @@ export default class Forms extends Component {<template><Form as |form|>- <form.Field @title="Query" @name="query" as |field|>- <field.Textarea />+ <form.Field @title="Query" @name="query" @type="textarea" as |field|>+ <field.Control /></form.Field></Form></template>`;@@ -101,11 +101,11 @@ export default class Forms extends Component {<template><Form as |form|>- <form.Field @title="Enabled" @name="enabled" as |field|>- <field.Select as |select|>+ <form.Field @title="Enabled" @name="enabled" @type="select" as |field|>+ <field.Control as |select|><select.Option @value="true">Yes</select.Option><select.Option @value="false">No</select.Option>- </field.Select>+ </field.Control></form.Field></Form></template>`;@@ -123,17 +123,17 @@ export default class Forms extends Component {<checkboxGroup.Field@title="Use my email for any purpose."@name="contract"- as |field|+ @type="checkbox" as |field|>- <field.Checkbox>Including signing up for services I can't unsubscribe- to.</field.Checkbox>+ <field.Control>Including signing up for services I can't unsubscribe+ to.</field.Control></checkboxGroup.Field><checkboxGroup.Field@title="Sign my soul away."@name="contract2"- as |field|+ @type="checkbox" as |field|>- <field.Checkbox>Will severly impact the afterlife experience.</field.Checkbox>+ <field.Control>Will severly impact the afterlife experience.</field.Control></checkboxGroup.Field></form.CheckboxGroup></Form>@@ -145,8 +145,8 @@ export default class Forms extends Component {<template><Form as |form|>- <form.Field @title="Image" @name="image" as |field|>- <field.Image @type="avatar" />+ <form.Field @title="Image" @name="image" @type="image" as |field|>+ <field.Control @type="avatar" /></form.Field></Form></template>`;@@ -157,8 +157,8 @@ export default class Forms extends Component {<template><Form as |form|>- <form.Field @title="Icon" @name="icon" as |field|>- <field.Icon />+ <form.Field @title="Icon" @name="icon" @type="icon" as |field|>+ <field.Control /></form.Field></Form></template>`;@@ -169,8 +169,8 @@ export default class Forms extends Component {<template><Form as |form|>- <form.Field @title="Tags" @name="tags" as |field|>- <field.TagChooser />+ <form.Field @title="Tags" @name="tags" @type="tag-chooser" as |field|>+ <field.Control /></form.Field></Form></template>`;@@ -181,12 +181,12 @@ export default class Forms extends Component {<template><Form as |form data|>- <form.Field @title="Enabled" @name="enabled" as |field|>- <field.Menu @selection={{data.enabled}} as |menu|>+ <form.Field @title="Enabled" @name="enabled" @type="menu" as |field|>+ <field.Control @selection={{data.enabled}} as |menu|><menu.Item @value="true">Yes</menu.Item><menu.Divider /><menu.Item @value="false">No</menu.Item>- </field.Menu>+ </field.Control></form.Field></Form></template>`;@@ -197,8 +197,8 @@ export default class Forms extends Component {<template><Form as |form|>- <form.Field @title="Enabled" @name="enabled" @format="full" as |field|>- <field.RadioGroup as |radioGroup|>+ <form.Field @title="Enabled" @name="enabled" @format="full" @type="radio-group" as |field|>+ <field.Control as |radioGroup|><radioGroup.Radio @value="true">Yes</radioGroup.Radio><radioGroup.Radio @value="false" as |radio|><radio.Title>No</radio.Title>@@ -206,7 +206,7 @@ export default class Forms extends Component {Choosing no, will make you ineligible for the contest.</radio.Description></radioGroup.Radio>- </field.RadioGroup>+ </field.Control></form.Field></Form></template>`;@@ -217,8 +217,8 @@ export default class Forms extends Component {<template><Form as |form|>- <form.Field @title="Color" @name="color" as |field|>- <field.Color placeholder="RRGGBB" />+ <form.Field @title="Color" @name="color" @type="color" as |field|>+ <field.Control placeholder="RRGGBB" /></form.Field></Form></template>`;@@ -233,8 +233,8 @@ const USED_COLORS = ["00FF00"];<template><Form as |form|>- <form.Field @title="Color" @name="color" as |field|>- <field.Color+ <form.Field @title="Color" @name="color" @type="color" as |field|>+ <field.Control@colors={{COLORS}}@usedColors={{USED_COLORS}}placeholder="RRGGBB"@@ -249,8 +249,8 @@ const USED_COLORS = ["00FF00"];<template><Form as |form|>- <form.Field @title="Color" @name="color" as |field|>- <field.Color @allowNamedColors={{true}} placeholder="red, FF0000" />+ <form.Field @title="Color" @name="color" @type="color" as |field|>+ <field.Control @allowNamedColors={{true}} placeholder="red, FF0000" /></form.Field></Form></template>`;@@ -286,11 +286,11 @@ const USED_COLORS = ["00FF00"];<template><Form as |form|><form.InputGroup as |inputGroup|>- <inputGroup.Field @title="Username" @name="username" as |field|>- <field.Input />+ <inputGroup.Field @title="Username" @name="username" @type="input" as |field|>+ <field.Control /></inputGroup.Field>- <inputGroup.Field @title="Email" @name="email" as |field|>- <field.Input />+ <inputGroup.Field @title="Email" @name="email" @type="input" as |field|>+ <field.Control /></inputGroup.Field></form.InputGroup></Form>@@ -311,14 +311,14 @@ import Form from "discourse/components/form";<form.Collection @name="foo" as |collection index|><form.Row as |row|><row.Col @size={{6}}>- <collection.Field @title="Bar" @name="bar" as |field|>- <field.Input />+ <collection.Field @title="Bar" @name="bar" @type="input" as |field|>+ <field.Control /></collection.Field></row.Col><row.Col @size={{4}}>- <collection.Field @title="Baz" @name="baz" as |field|>- <field.Input />+ <collection.Field @title="Baz" @name="baz" @type="input" as |field|>+ <field.Control /></collection.Field></row.Col>@@ -343,14 +343,14 @@ import Form from "discourse/components/form";@title="Username"@name="username"@validation="required"- as |field|+ @type="input" as |field|>- <field.Input />+ <field.Control /></form.Field></row.Col><row.Col @size={{4}}>- <form.Field @title="Email" @name="email" as |field|>- <field.Input />+ <form.Field @title="Email" @name="email" @type="input" as |field|>+ <field.Control /></form.Field></row.Col><row.Col @size={{2}}>@@ -372,20 +372,20 @@ import Form from "discourse/components/form";@title="Username"@name="username"@validation="required"- as |field|+ @type="input" as |field|>- <field.Input />+ <field.Control /></form.Field></row.Col><row.Col @size={{6}}>- <form.Field @title="Email" @name="email" as |field|>- <field.Input />+ <form.Field @title="Email" @name="email" @type="input" as |field|>+ <field.Control /></form.Field></row.Col><row.Col @size={{12}}>- <form.Field @title="Address" @name="address" as |field|>- <field.Input />+ <form.Field @title="Address" @name="address" @type="input" as |field|>+ <field.Control /></form.Field></row.Col></form.Row>@@ -402,9 +402,9 @@ import Form from "discourse/components/form";@title="Username"@name="username"@validation="required"- as |field|+ @type="input" as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@@ -412,9 +412,9 @@ import Form from "discourse/components/form";@title="Accept terms"@validation="required"@format="large"- as |field|+ @type="checkbox" as |field|>- <field.Checkbox />+ <field.Control /></form.Field><form.Submit />@@ -426,79 +426,85 @@ import Form from "discourse/components/form";<h2>Controls</h2><StyleguideExample @title="Input" @code={{this.inputCode}}><Form as |form|>- <form.Field @title="Username" @name="username" as |field|>- <field.Input placeholder="Username" />+ <form.Field @title="Username" @name="username" @type="input" as |field|>+ <field.Control placeholder="Username" /></form.Field>- <form.Field @title="Age" @name="age" as |field|>- <field.Input placeholder="Age" @type="number" @format="small" />+ <form.Field @title="Age" @name="age" @type="input-number" as |field|>+ <field.Control placeholder="Age" @format="small" /></form.Field>- <form.Field @title="Website" @name="website" as |field|>- <field.Input @before="https://" @after=".com" @format="large" />+ <form.Field @title="Website" @name="website" @type="input" as |field|>+ <field.Control @before="https://" @after=".com" @format="large" /></form.Field>- <form.Field @title="After" @name="after" as |field|>- <field.Input @after=".com" />+ <form.Field @title="After" @name="after" @type="input" as |field|>+ <field.Control @after=".com" /></form.Field>- <form.Field @title="Before" @name="before" as |field|>- <field.Input @before="https://" />+ <form.Field @title="Before" @name="before" @type="input" as |field|>+ <field.Control @before="https://" /></form.Field><form.Field@title="Secret"@name="secret"@description="An important password"+ @type="password"as |field|>- <field.Password />+ <field.Control /></form.Field></Form></StyleguideExample><StyleguideExample @title="Question" @code={{this.questionCode}}><Form as |form|>- <form.Field @title="Enabled" @name="enabled" as |field|>- <field.Question />+ <form.Field+ @title="Enabled"+ @name="enabled"+ @type="question"+ as |field|+ >+ <field.Control /></form.Field></Form></StyleguideExample><StyleguideExample @title="Toggle" @code={{this.toggleCode}}><Form as |form|>- <form.Field @title="Enabled" @name="enabled" as |field|>- <field.Toggle />+ <form.Field @title="Enabled" @name="enabled" @type="toggle" as |field|>+ <field.Control /></form.Field></Form></StyleguideExample><StyleguideExample @title="Composer" @code={{this.composerCode}}><Form as |form|>- <form.Field @title="Query" @name="query" as |field|>- <field.Composer />+ <form.Field @title="Query" @name="query" @type="composer" as |field|>+ <field.Control /></form.Field></Form></StyleguideExample><StyleguideExample @title="Code" @code={{this.codeCode}}><Form as |form|>- <form.Field @title="Query" @name="query" as |field|>- <field.Code />+ <form.Field @title="Query" @name="query" @type="code" as |field|>+ <field.Control /></form.Field></Form></StyleguideExample><StyleguideExample @title="Textarea" @code={{this.textareaCode}}><Form as |form|>- <form.Field @title="Query" @name="query" as |field|>- <field.Textarea />+ <form.Field @title="Query" @name="query" @type="textarea" as |field|>+ <field.Control /></form.Field></Form></StyleguideExample><StyleguideExample @title="Select" @code={{this.selectCode}}><Form as |form|>- <form.Field @title="Enabled" @name="enabled" as |field|>- <field.Select as |select|>+ <form.Field @title="Enabled" @name="enabled" @type="select" as |field|>+ <field.Control as |select|><select.Option @value="true">Yes</select.Option><select.Option @value="false">No</select.Option>- </field.Select>+ </field.Control></form.Field></Form></StyleguideExample>@@ -512,17 +518,19 @@ import Form from "discourse/components/form";<checkboxGroup.Field@title="Use my email for any purpose."@name="contract"+ @type="checkbox"as |field|>- <field.Checkbox>Including signing up for services I can't- unsubscribe to.</field.Checkbox>+ <field.Control>Including signing up for services I can't unsubscribe+ to.</field.Control></checkboxGroup.Field><checkboxGroup.Field@title="Sign my soul away."@name="contract2"+ @type="checkbox"as |field|>- <field.Checkbox>Will severly impact the afterlife experience.</field.Checkbox>+ <field.Control>Will severly impact the afterlife experience.</field.Control></checkboxGroup.Field></form.CheckboxGroup></Form>@@ -530,44 +538,50 @@ import Form from "discourse/components/form";<StyleguideExample @title="Image" @code={{this.imageCode}}><Form as |form|>- <form.Field @title="Image" @name="image" as |field|>- <field.Image @type="avatar" />+ <form.Field @title="Image" @name="image" @type="image" as |field|>+ <field.Control @type="avatar" /></form.Field></Form></StyleguideExample><StyleguideExample @title="Icon" @code={{this.iconCode}}><Form as |form|>- <form.Field @title="Icon" @name="icon" as |field|>- <field.Icon />+ <form.Field @title="Icon" @name="icon" @type="icon" as |field|>+ <field.Control /></form.Field></Form></StyleguideExample><StyleguideExample @title="TagChooser" @code={{this.tagChooserCode}}><Form as |form|>- <form.Field @title="Tags" @name="tags" as |field|>- <field.TagChooser />+ <form.Field @title="Tags" @name="tags" @type="tag-chooser" as |field|>+ <field.Control /></form.Field></Form></StyleguideExample><StyleguideExample @title="Menu" @code={{this.menuCode}}><Form as |form data|>- <form.Field @title="Enabled" @name="enabled" as |field|>- <field.Menu @selection={{data.enabled}} as |menu|>+ <form.Field @title="Enabled" @name="enabled" @type="menu" as |field|>+ <field.Control @selection={{data.enabled}} as |menu|><menu.Item @value="true">Yes</menu.Item><menu.Divider /><menu.Item @value="false">No</menu.Item>- </field.Menu>+ </field.Control></form.Field></Form></StyleguideExample><StyleguideExample @title="RadioGroup" @code={{this.radioGroupCode}}><Form as |form|>- <form.Field @title="Enabled" @name="enabled" @format="full" as |field|>- <field.RadioGroup as |radioGroup|>+ <form.Field+ @title="Enabled"+ @name="enabled"+ @format="full"+ @type="radio-group"+ as |field|+ >+ <field.Control as |radioGroup|><radioGroup.Radio @value="true">Yes</radioGroup.Radio><radioGroup.Radio @value="false" as |radio|><radio.Title>No</radio.Title>@@ -575,15 +589,15 @@ import Form from "discourse/components/form";Choosing no, will make you ineligible for the contest.</radio.Description></radioGroup.Radio>- </field.RadioGroup>+ </field.Control></form.Field></Form></StyleguideExample><StyleguideExample @title="Color" @code={{this.colorCode}}><Form as |form|>- <form.Field @title="Color" @name="color" as |field|>- <field.Color placeholder="RRGGBB" />+ <form.Field @title="Color" @name="color" @type="color" as |field|>+ <field.Control placeholder="RRGGBB" /></form.Field></Form></StyleguideExample>@@ -593,8 +607,8 @@ import Form from "discourse/components/form";@code={{this.colorWithSwatchesCode}}><Form as |form|>- <form.Field @title="Color" @name="color" as |field|>- <field.Color+ <form.Field @title="Color" @name="color" @type="color" as |field|>+ <field.Control@colors={{array"FF0000""00FF00"@@ -615,8 +629,8 @@ import Form from "discourse/components/form";@code={{this.colorNamedCode}}><Form as |form|>- <form.Field @title="Color" @name="color" as |field|>- <field.Color @allowNamedColors={{true}} placeholder="red, FF0000" />+ <form.Field @title="Color" @name="color" @type="color" as |field|>+ <field.Control @allowNamedColors={{true}} placeholder="red, FF0000" /></form.Field></Form></StyleguideExample>@@ -642,11 +656,21 @@ import Form from "discourse/components/form";<StyleguideExample @title="InputGroup" @code={{this.inputGroupCode}}><Form as |form|><form.InputGroup as |inputGroup|>- <inputGroup.Field @title="Username" @name="username" as |field|>- <field.Input />+ <inputGroup.Field+ @title="Username"+ @name="username"+ @type="input"+ as |field|+ >+ <field.Control /></inputGroup.Field>- <inputGroup.Field @title="Email" @name="email" as |field|>- <field.Input />+ <inputGroup.Field+ @title="Email"+ @name="email"+ @type="input"+ as |field|+ >+ <field.Control /></inputGroup.Field></form.InputGroup></Form>@@ -665,14 +689,24 @@ import Form from "discourse/components/form";<form.Collection @name="foo" as |collection index|><form.Row as |row|><row.Col @size={{6}}>- <collection.Field @title="Bar" @name="bar" as |field|>- <field.Input />+ <collection.Field+ @title="Bar"+ @name="bar"+ @type="input"+ as |field|+ >+ <field.Control /></collection.Field></row.Col><row.Col @size={{4}}>- <collection.Field @title="Baz" @name="baz" as |field|>- <field.Input />+ <collection.Field+ @title="Baz"+ @name="baz"+ @type="input"+ as |field|+ >+ <field.Control /></collection.Field></row.Col>@@ -696,14 +730,15 @@ import Form from "discourse/components/form";@title="Username"@name="username"@validation="required"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field></row.Col><row.Col @size={{4}}>- <form.Field @title="Email" @name="email" as |field|>- <field.Input />+ <form.Field @title="Email" @name="email" @type="input" as |field|>+ <field.Control /></form.Field></row.Col><row.Col @size={{2}}>@@ -721,20 +756,26 @@ import Form from "discourse/components/form";@title="Username"@name="username"@validation="required"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field></row.Col><row.Col @size={{6}}>- <form.Field @title="Email" @name="email" as |field|>- <field.Input />+ <form.Field @title="Email" @name="email" @type="input" as |field|>+ <field.Control /></form.Field></row.Col><row.Col @size={{12}}>- <form.Field @title="Address" @name="address" as |field|>- <field.Input />+ <form.Field+ @title="Address"+ @name="address"+ @type="input"+ as |field|+ >+ <field.Control /></form.Field></row.Col></form.Row>@@ -749,9 +790,10 @@ import Form from "discourse/components/form";@title="Username"@name="username"@validation="required"+ @type="input"as |field|>- <field.Input />+ <field.Control /></form.Field><form.Field@@ -759,9 +801,10 @@ import Form from "discourse/components/form";@title="Accept terms"@validation="required"@format="large"+ @type="checkbox"as |field|>- <field.Checkbox />+ <field.Control /></form.Field><form.Submit />diff --git a/spec/system/page_objects/components/form_kit.rb b/spec/system/page_objects/components/form_kit.rbindex 5b07deb652c..0e9e97161f3 100644--- a/spec/system/page_objects/components/form_kit.rb+++ b/spec/system/page_objects/components/form_kit.rb@@ -31,7 +31,7 @@ module PageObjectsdef valuecase control_type- when /input-/, "password"+ when "input", /input-/, "password"component.find("input").valuewhen "color"component.find("input[type='text']").value@@ -117,7 +117,7 @@ module PageObjectsdef fill_in(value)case control_type- when "input-text", "password", "input-date", "input-number"+ when "input", /input-/, "password"component.find("input").fill_in(with: value)when "color"component.find("input[type='text']").fill_in(with: value)