github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Updated forms usage.

Browse Source
This commit is contained in:
Mike Cao
2023-01-05 22:56:36 -08:00
parent fcb1767eb1
commit d827b79c72
14 changed files with 205 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
components/forms/EventDataForm.js
View File

@@ -168,20 +168,19 @@ export default function EventDataForm({ websiteId, onClose, className }) {
handleAddTag({ ...value, value: type }, columns, setColumns, columnRef, true)
}
>
<FormInput
name="field"
label={<FormattedMessage id="label.field-name" defaultMessage="Field Name" />}
rules={{ required: 'Required' }}
>
<TextField />
</FormInput>
<FormRow
name="value"
label={<FormattedMessage id="label.type" defaultMessage="Type" />}
label={<FormattedMessage id="label.field-name" defaultMessage="Field Name" />}
>
<Dropdown items={filterOptions} value={type} onChange={setType}>
{({ value, label }) => <Item key={value}>{label}</Item>}
</Dropdown>
<FormInput name="field" rules={{ required: 'Required' }}>
<TextField />
</FormInput>
</FormRow>
<FormRow label={<FormattedMessage id="label.type" defaultMessage="Type" />}>
<FormInput name="value">
<Dropdown items={filterOptions} value={type} onChange={setType}>
{({ value, label }) => <Item key={value}>{label}</Item>}
</Dropdown>
</FormInput>
</FormRow>
<FormButtons className={styles.formButtons}>
<Button variant="action" type="submit">
@@ -200,19 +199,19 @@ export default function EventDataForm({ websiteId, onClose, className }) {
ref={filterRef}
onSubmit={value => handleAddTag(value, filters, setFilters, filterRef)}
>
<FormInput
name="field"
<FormRow
label={<FormattedMessage id="label.field-name" defaultMessage="Field Name" />}
>
<TextField />
</FormInput>
<FormInput
name="value"
label={<FormattedMessage id="label.value" defaultMessage="Value" />}
>
<TextField />
</FormInput>
<FormInput name="field">
<TextField />
</FormInput>
</FormRow>
<FormRow label={<FormattedMessage id="label.value" defaultMessage="Value" />}>
<FormInput name="value">
<TextField />
</FormInput>
</FormRow>
+
<FormButtons className={styles.formButtons}>
<Button variant="action" type="submit">
<FormattedMessage id="label.add-filter" defaultMessage="Add Filter" />