* Fix system console defaults

* Fix tests
Этот коммит содержится в:
Daniel Espino García
2024-05-08 12:23:40 +02:00
коммит произвёл GitHub
родитель cd28902984
Коммит f00efe58fd
3 изменённых файлов: 9 добавлений и 9 удалений

Просмотреть файл

@@ -150,7 +150,7 @@ exports[`components/admin_console/SchemaAdminSettings should match snapshot with
id="admin.true" id="admin.true"
/> />
} }
value={true} value={false}
/> />
<Memo(DropdownSetting) <Memo(DropdownSetting)
disabled={false} disabled={false}

Просмотреть файл

@@ -371,7 +371,7 @@ exports[`components/admin_console/CustomPluginSettings should match snapshot wit
id="admin.true" id="admin.true"
/> />
} }
value={true} value={false}
/> />
<Memo(DropdownSetting) <Memo(DropdownSetting)
disabled={false} disabled={false}

Просмотреть файл

@@ -578,7 +578,7 @@ export class SchemaAdminSettings extends React.PureComponent<Props, State> {
id={setting.key} id={setting.key}
label={this.renderLabel(setting)} label={this.renderLabel(setting)}
helpText={this.renderSettingHelpText(setting)} helpText={this.renderSettingHelpText(setting)}
value={this.state[setting.key] || setting.default || false} value={this.state[setting.key] ?? (setting.default || false)}
disabled={this.isDisabled(setting)} disabled={this.isDisabled(setting)}
setByEnv={this.isSetByEnv(setting.key)} setByEnv={this.isSetByEnv(setting.key)}
onChange={this.handleChange} onChange={this.handleChange}
@@ -618,7 +618,7 @@ export class SchemaAdminSettings extends React.PureComponent<Props, State> {
}); });
const values = options.map((o) => ({value: o.value, text: descriptorOrStringToString(o.display_name, this.props.intl)!})); const values = options.map((o) => ({value: o.value, text: descriptorOrStringToString(o.display_name, this.props.intl)!}));
const selectedValue = this.state[setting.key] || values[0].value; const selectedValue = this.state[setting.key] ?? values[0].value;
let selectedOptionForHelpText = null; let selectedOptionForHelpText = null;
for (const option of options) { for (const option of options) {
@@ -696,7 +696,7 @@ export class SchemaAdminSettings extends React.PureComponent<Props, State> {
label={this.renderLabel(setting)} label={this.renderLabel(setting)}
values={values} values={values}
helpText={this.renderSettingHelpText(setting)} helpText={this.renderSettingHelpText(setting)}
value={this.state[setting.key] || values[0].value} value={this.state[setting.key] ?? values[0].value}
disabled={this.isDisabled(setting)} disabled={this.isDisabled(setting)}
setByEnv={this.isSetByEnv(setting.key)} setByEnv={this.isSetByEnv(setting.key)}
onChange={this.handleChange} onChange={this.handleChange}
@@ -738,7 +738,7 @@ export class SchemaAdminSettings extends React.PureComponent<Props, State> {
label={this.renderLabel(setting)} label={this.renderLabel(setting)}
values={values} values={values}
helpText={this.renderSettingHelpText(setting)} helpText={this.renderSettingHelpText(setting)}
value={this.state[setting.key] || values[0].value} value={this.state[setting.key] ?? values[0].value}
disabled={this.isDisabled(setting)} disabled={this.isDisabled(setting)}
setByEnv={this.isSetByEnv(setting.key)} setByEnv={this.isSetByEnv(setting.key)}
onChange={this.handleChange} onChange={this.handleChange}
@@ -762,7 +762,7 @@ export class SchemaAdminSettings extends React.PureComponent<Props, State> {
values={values} values={values}
label={this.renderLabel(setting)} label={this.renderLabel(setting)}
helpText={this.renderSettingHelpText(setting)} helpText={this.renderSettingHelpText(setting)}
value={this.state[setting.key] || defaultOption} value={this.state[setting.key] ?? defaultOption}
disabled={this.isDisabled(setting)} disabled={this.isDisabled(setting)}
setByEnv={this.isSetByEnv(setting.key)} setByEnv={this.isSetByEnv(setting.key)}
onChange={this.handleChange} onChange={this.handleChange}
@@ -803,7 +803,7 @@ export class SchemaAdminSettings extends React.PureComponent<Props, State> {
helpText={this.renderSettingHelpText(setting)} helpText={this.renderSettingHelpText(setting)}
regenerateHelpText={setting.regenerate_help_text} regenerateHelpText={setting.regenerate_help_text}
placeholder={descriptorOrStringToString(setting.placeholder, this.props.intl)} placeholder={descriptorOrStringToString(setting.placeholder, this.props.intl)}
value={this.state[setting.key] || setting.default || ''} value={this.state[setting.key] ?? (setting.default || '')}
disabled={this.isDisabled(setting)} disabled={this.isDisabled(setting)}
setByEnv={this.isSetByEnv(setting.key)} setByEnv={this.isSetByEnv(setting.key)}
onChange={this.handleGeneratedChange} onChange={this.handleGeneratedChange}
@@ -870,7 +870,7 @@ export class SchemaAdminSettings extends React.PureComponent<Props, State> {
label={this.renderLabel(setting)} label={this.renderLabel(setting)}
helpText={this.renderSettingHelpText(setting)} helpText={this.renderSettingHelpText(setting)}
placeholder={setting.placeholder} placeholder={setting.placeholder}
value={this.state[setting.key] || setting.default || ''} value={this.state[setting.key] ?? (setting.default || '')}
disabled={this.isDisabled(setting)} disabled={this.isDisabled(setting)}
onChange={this.handleChange} onChange={this.handleChange}
/> />