Input field and form field error state (#1132)
Fix other small consistencies: password spacing, dropdown error, error messages, pack form order
This commit is contained in:
@@ -138,6 +138,13 @@ export class ConfigurePackQueryForm extends Component {
|
||||
<form className={baseClass} onSubmit={handleSubmit}>
|
||||
<h2 className={`${baseClass}__title`}>Configuration</h2>
|
||||
<div className={`${baseClass}__fields`}>
|
||||
<Dropdown
|
||||
{...fields.logging_type}
|
||||
options={loggingTypeOptions}
|
||||
placeholder="- - -"
|
||||
label="Logging"
|
||||
wrapperClassName={`${baseClass}__form-field ${baseClass}__form-field--logging`}
|
||||
/>
|
||||
<InputField
|
||||
{...fields.interval}
|
||||
inputWrapperClass={`${baseClass}__form-field ${baseClass}__form-field--frequency`}
|
||||
@@ -162,13 +169,6 @@ export class ConfigurePackQueryForm extends Component {
|
||||
label="Minimum osquery version"
|
||||
wrapperClassName={`${baseClass}__form-field ${baseClass}__form-field--osquer-vers`}
|
||||
/>
|
||||
<Dropdown
|
||||
{...fields.logging_type}
|
||||
options={loggingTypeOptions}
|
||||
placeholder="- - -"
|
||||
label="Logging"
|
||||
wrapperClassName={`${baseClass}__form-field ${baseClass}__form-field--logging`}
|
||||
/>
|
||||
<InputField
|
||||
{...fields.shard}
|
||||
inputWrapperClass={`${baseClass}__form-field ${baseClass}__form-field--shard`}
|
||||
|
||||
@@ -10,11 +10,11 @@ const validate = (formData) => {
|
||||
}
|
||||
|
||||
if (!formData.interval) {
|
||||
errors.interval = "Interval must be present";
|
||||
errors.interval = "Frequency (seconds) must be present";
|
||||
}
|
||||
|
||||
if (formData.interval && !validateNumericality(formData.interval)) {
|
||||
errors.interval = "Interval must be a number";
|
||||
errors.interval = "Frequency must be a number";
|
||||
}
|
||||
|
||||
if (!formData.logging_type) {
|
||||
|
||||
Reference in New Issue
Block a user