forked from elastic/kibana
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Vis: Default editor] EUIficate ranges param editor (elastic#38531)
* EUIficate ranges control * Remove unused translations * Fix screenreader issue * Add an initial case for safety * Remove labels, add icon between ranges * Add title for delete btn # Conflicts: # x-pack/plugins/translations/translations/zh-CN.json
- Loading branch information
Showing
6 changed files
with
173 additions
and
87 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import React, { Fragment, useState, useEffect } from 'react'; | ||
| import { | ||
| htmlIdGenerator, | ||
| EuiButtonIcon, | ||
| EuiFieldNumber, | ||
| EuiFlexItem, | ||
| EuiFlexGroup, | ||
| EuiIcon, | ||
| EuiSpacer, | ||
| EuiButtonEmpty, | ||
| } from '@elastic/eui'; | ||
| import { FormattedMessage } from '@kbn/i18n/react'; | ||
| import { i18n } from '@kbn/i18n'; | ||
| import { isEqual, omit } from 'lodash'; | ||
| import { AggParamEditorProps } from 'ui/vis/editors/default'; | ||
|
|
||
| const FROM_PLACEHOLDER = '\u2212\u221E'; | ||
| const TO_PLACEHOLDER = '+\u221E'; | ||
|
|
||
| const generateId = htmlIdGenerator(); | ||
| const isEmpty = (value: any) => value === undefined || value === null; | ||
|
|
||
| interface RangeValues { | ||
| from?: number; | ||
| to?: number; | ||
| } | ||
|
|
||
| interface RangeValuesModel extends RangeValues { | ||
| id: string; | ||
| } | ||
|
|
||
| function RangesParamEditor({ agg, value = [], setValue }: AggParamEditorProps<RangeValues[]>) { | ||
| const [ranges, setRanges] = useState(() => value.map(range => ({ ...range, id: generateId() }))); | ||
|
|
||
| // set up an initial range when there is no default range | ||
| useEffect(() => { | ||
| if (!value.length) { | ||
| onAddRange(); | ||
| } | ||
| }, []); | ||
|
|
||
| useEffect( | ||
| () => { | ||
| // responsible for discarding changes | ||
| if ( | ||
| value.length !== ranges.length || | ||
| value.some((range, index) => !isEqual(range, omit(ranges[index], 'id'))) | ||
| ) { | ||
| setRanges(value.map(range => ({ ...range, id: generateId() }))); | ||
| } | ||
| }, | ||
| [value] | ||
| ); | ||
|
|
||
| const updateRanges = (rangeValues: RangeValuesModel[]) => { | ||
| // do not set internal id parameter into saved object | ||
| setValue(rangeValues.map(range => omit(range, 'id'))); | ||
| setRanges(rangeValues); | ||
| }; | ||
| const onAddRange = () => updateRanges([...ranges, { id: generateId() }]); | ||
| const onRemoveRange = (id: string) => updateRanges(ranges.filter(range => range.id !== id)); | ||
| const onChangeRange = (id: string, key: string, newValue: string) => | ||
| updateRanges( | ||
| ranges.map(range => | ||
| range.id === id | ||
| ? { | ||
| ...range, | ||
| [key]: newValue === '' ? undefined : parseFloat(newValue), | ||
| } | ||
| : range | ||
| ) | ||
| ); | ||
|
|
||
| return ( | ||
| <> | ||
| {ranges.map(({ from, to, id }) => { | ||
| const deleteBtnTitle = i18n.translate( | ||
| 'common.ui.aggTypes.ranges.removeRangeButtonAriaLabel', | ||
| { | ||
| defaultMessage: 'Remove the range of {from} to {to}', | ||
| values: { | ||
| from: isEmpty(from) ? FROM_PLACEHOLDER : from, | ||
| to: isEmpty(to) ? TO_PLACEHOLDER : to, | ||
| }, | ||
| } | ||
| ); | ||
|
|
||
| return ( | ||
| <Fragment key={id}> | ||
| <EuiFlexGroup gutterSize="s" alignItems="center"> | ||
| <EuiFlexItem> | ||
| <EuiFieldNumber | ||
| aria-label={i18n.translate('common.ui.aggTypes.ranges.fromLabel', { | ||
| defaultMessage: 'From', | ||
| })} | ||
| value={isEmpty(from) ? '' : from} | ||
| placeholder={FROM_PLACEHOLDER} | ||
| onChange={ev => onChangeRange(id, 'from', ev.target.value)} | ||
| fullWidth={true} | ||
| compressed={true} | ||
| /> | ||
| </EuiFlexItem> | ||
| <EuiFlexItem grow={false}> | ||
| <EuiIcon type="sortRight" color="subdued" /> | ||
| </EuiFlexItem> | ||
| <EuiFlexItem> | ||
| <EuiFieldNumber | ||
| aria-label={i18n.translate('common.ui.aggTypes.ranges.toLabel', { | ||
| defaultMessage: 'To', | ||
| })} | ||
| value={isEmpty(to) ? '' : to} | ||
| placeholder={TO_PLACEHOLDER} | ||
| onChange={ev => onChangeRange(id, 'to', ev.target.value)} | ||
| fullWidth={true} | ||
| compressed={true} | ||
| /> | ||
| </EuiFlexItem> | ||
| <EuiFlexItem grow={false}> | ||
| <EuiButtonIcon | ||
| title={deleteBtnTitle} | ||
| aria-label={deleteBtnTitle} | ||
| disabled={value.length === 1} | ||
| color="danger" | ||
| iconType="trash" | ||
| onClick={() => onRemoveRange(id)} | ||
| /> | ||
| </EuiFlexItem> | ||
| </EuiFlexGroup> | ||
| <EuiSpacer size="xs" /> | ||
| </Fragment> | ||
| ); | ||
| })} | ||
|
|
||
| <EuiSpacer size="s" /> | ||
| <EuiFlexItem> | ||
| <EuiButtonEmpty iconType="plusInCircleFilled" onClick={onAddRange} size="xs"> | ||
| <FormattedMessage | ||
| id="common.ui.aggTypes.ranges.addRangeButtonLabel" | ||
| defaultMessage="Add range" | ||
| /> | ||
| </EuiButtonEmpty> | ||
| </EuiFlexItem> | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
| export { RangesParamEditor }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters