github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-01 14:14:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Don't include blank option for required selects (#30316)

Browse Source 
When using FK select, we include a "None" option automatically. However, for required select fields, "None" isn't a valid option, so we exclude it instead.
This commit is contained in:
Ted Johansson 2024-12-17 18:35:47 +08:00 committed by GitHub
parent f9e07ff9d2
commit e04f535601
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/javascripts/discourse/app/components/d-select.gjs
View File

@ -46,6 +46,10 @@ export default class DSelect extends Component {
return this.args.value && this.args.value !== NO_VALUE_OPTION;
}
get includeNone() {
return this.args.includeNone ?? true;
}
<template>
<select
value={{@value}}
@ -53,13 +57,15 @@ export default class DSelect extends Component {
class="d-select"
{{on "input" this.handleInput}}
>
<DSelectOption @value={{NO_VALUE_OPTION}}>
{{#if this.hasSelectedValue}}
{{i18n "none_placeholder"}}
{{else}}
{{i18n "select_placeholder"}}
{{/if}}
</DSelectOption>
{{#if this.includeNone}}
<DSelectOption @value={{NO_VALUE_OPTION}}>
{{#if this.hasSelectedValue}}
{{i18n "none_placeholder"}}
{{else}}
{{i18n "select_placeholder"}}
{{/if}}
</DSelectOption>
{{/if}}
{{yield (hash Option=(component DSelectOption selected=@value))}}
</select>

5
app/assets/javascripts/discourse/app/form-kit/components/fk/control/select.gjs
View File

@ -15,12 +15,17 @@ const SelectOption = <template>
export default class FKControlSelect extends Component {
static controlType = "select";
get includeNone() {
return this.args.field.validation !== "required";
}
<template>
<DSelect
class="form-kit__control-select"
disabled={{@field.disabled}}
@value={{@field.value}}
@onChange={{@field.set}}
@includeNone={{this.includeNone}}
...attributes
>
{{yield (hash Option=(component SelectOption selected=@field.value))}}

4
app/assets/javascripts/discourse/tests/integration/components/create-invite-test.gjs
View File

@ -166,7 +166,7 @@ module("Integration | Component | CreateInvite", function (hooks) {
assert.deepEqual(
formKit().field("expiresAfterDays").options(),
["__NONE__", "1", "3", "7", "30", "90", "999999"],
["1", "3", "7", "30", "90", "999999"],
"the value of invite_expiry_days is added to the dropdown"
);
@ -179,7 +179,7 @@ module("Integration | Component | CreateInvite", function (hooks) {
assert.deepEqual(
formKit().field("expiresAfterDays").options(),
["__NONE__", "1", "7", "30", "90", "999999"],
["1", "7", "30", "90", "999999"],
"the value of invite_expiry_days is not added to the dropdown if it's already one of the options"
);
});

10
app/assets/javascripts/discourse/tests/integration/components/d-select-test.gjs
View File

@ -50,6 +50,16 @@ module("Integration | Component | d-select", function (hooks) {
});
});
test("required field", async function (assert) {
await render(<template>
<DSelect @includeNone={{false}} as |s|>
<s.Option @value="foo">The real foo</s.Option>
</DSelect>
</template>);
assert.dselect().hasNoOption(NO_VALUE_OPTION);
});
test("select attributes", async function (assert) {
await render(<template><DSelect class="test" /></template>);