-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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] Euification of heatmap options tab (#45766)
* EUIficate heatmap options * Move collections * Split labels in a panel * Remove angular templates * Remove unused translations * Fix functional tests * Fix validation * Fix UI details * Compress color picker * Improve types * Replace headings h2 with h3 * Add functional tests * Create setCustomRangeByIndex
- Loading branch information
Showing
31 changed files
with
772 additions
and
827 deletions.
There are no files selected for viewing
81 changes: 81 additions & 0 deletions
81
src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/color_ranges.tsx
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,81 @@ | ||
| /* | ||
| * 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, { useCallback } from 'react'; | ||
| import { last } from 'lodash'; | ||
| import { i18n } from '@kbn/i18n'; | ||
|
|
||
| import { RangeValues, RangesParamEditor } from 'ui/vis/editors/default/controls/ranges'; | ||
|
|
||
| interface ColorRangesProps { | ||
| 'data-test-subj'?: string; | ||
| colorsRange: RangeValues[]; | ||
| setValue(paramName: string, value: RangeValues[]): void; | ||
| setValidity?(isValid: boolean): void; | ||
| setTouched?(isTouched: boolean): void; | ||
| } | ||
|
|
||
| function ColorRanges({ | ||
| 'data-test-subj': dataTestSubj, | ||
| colorsRange, | ||
| setValue, | ||
| setValidity, | ||
| setTouched, | ||
| }: ColorRangesProps) { | ||
| const addRangeValues = useCallback(() => { | ||
| const previousRange = last(colorsRange) || {}; | ||
| const from = previousRange.to ? previousRange.to : 0; | ||
| const to = previousRange.to ? from + (previousRange.to - (previousRange.from || 0)) : 100; | ||
|
|
||
| return { from, to }; | ||
| }, [colorsRange]); | ||
|
|
||
| const validateRange = useCallback( | ||
| ({ from, to }, index) => { | ||
| const leftBound = index === 0 ? -Infinity : colorsRange[index - 1].to || 0; | ||
| const isFromValid = from >= leftBound; | ||
| const isToValid = to >= from; | ||
|
|
||
| return [isFromValid, isToValid]; | ||
| }, | ||
| [colorsRange] | ||
| ); | ||
|
|
||
| const setColorRanges = useCallback((value: RangeValues[]) => setValue('colorsRange', value), [ | ||
| setValue, | ||
| ]); | ||
|
|
||
| return ( | ||
| <RangesParamEditor | ||
| data-test-subj={dataTestSubj} | ||
| error={i18n.translate('kbnVislibVisTypes.controls.colorRanges.errorText', { | ||
| defaultMessage: 'Each range should be greater than previous.', | ||
| })} | ||
| hidePlaceholders={true} | ||
| value={colorsRange} | ||
| setValue={setColorRanges} | ||
| setValidity={setValidity} | ||
| setTouched={setTouched} | ||
| addRangeValues={addRangeValues} | ||
| validateRange={validateRange} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| export { ColorRanges }; |
108 changes: 108 additions & 0 deletions
108
src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/color_schema.tsx
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,108 @@ | ||
| /* | ||
| * 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, { useEffect, useState } from 'react'; | ||
| import { i18n } from '@kbn/i18n'; | ||
| import { EuiLink, EuiText } from '@elastic/eui'; | ||
| import { FormattedMessage } from '@kbn/i18n/react'; | ||
|
|
||
| import { VisOptionsProps } from 'ui/vis/editors/default'; | ||
| import { ColorSchema } from 'ui/vislib/components/color/colormaps'; | ||
| import { SelectOption } from './select'; | ||
| import { SwitchOption } from './switch'; | ||
| import { ColorSchemaVislibParams } from '../../types'; | ||
|
|
||
| export type SetColorSchemaOptionsValue = <T extends keyof ColorSchemaVislibParams>( | ||
| paramName: T, | ||
| value: ColorSchemaVislibParams[T] | ||
| ) => void; | ||
|
|
||
| interface ColorSchemaOptionsProps extends ColorSchemaVislibParams { | ||
| disabled?: boolean; | ||
| colorSchemas: ColorSchema[]; | ||
| uiState: VisOptionsProps['uiState']; | ||
| setValue: SetColorSchemaOptionsValue; | ||
| } | ||
|
|
||
| function ColorSchemaOptions({ | ||
| disabled, | ||
| colorSchema, | ||
| colorSchemas, | ||
| invertColors, | ||
| uiState, | ||
| setValue, | ||
| }: ColorSchemaOptionsProps) { | ||
| const [isCustomColors, setIsCustomColors] = useState(() => !!uiState.get('vis.colors')); | ||
|
|
||
| useEffect(() => { | ||
| uiState.on('colorChanged', () => { | ||
| setIsCustomColors(true); | ||
| }); | ||
| }, [uiState]); | ||
|
|
||
| const resetColorsButton = ( | ||
| <EuiText size="xs"> | ||
| <EuiLink | ||
| onClick={() => { | ||
| uiState.set('vis.colors', null); | ||
| setIsCustomColors(false); | ||
| }} | ||
| > | ||
| <FormattedMessage | ||
| id="kbnVislibVisTypes.controls.colorSchema.resetColorsButtonLabel" | ||
| defaultMessage="Reset colors" | ||
| /> | ||
| </EuiLink> | ||
| </EuiText> | ||
| ); | ||
|
|
||
| return ( | ||
| <> | ||
| <SelectOption | ||
| disabled={disabled} | ||
| helpText={i18n.translate( | ||
| 'kbnVislibVisTypes.controls.colorSchema.howToChangeColorsDescription', | ||
| { | ||
| defaultMessage: 'Individual colors can be changed in the legend.', | ||
| } | ||
| )} | ||
| label={i18n.translate('kbnVislibVisTypes.controls.colorSchema.colorSchemaLabel', { | ||
| defaultMessage: 'Color schema', | ||
| })} | ||
| labelAppend={isCustomColors && resetColorsButton} | ||
| options={colorSchemas} | ||
| paramName="colorSchema" | ||
| value={colorSchema} | ||
| setValue={setValue} | ||
| /> | ||
|
|
||
| <SwitchOption | ||
| disabled={disabled} | ||
| label={i18n.translate('kbnVislibVisTypes.controls.colorSchema.reverseColorSchemaLabel', { | ||
| defaultMessage: 'Reverse schema', | ||
| })} | ||
| paramName="invertColors" | ||
| value={invertColors} | ||
| setValue={setValue} | ||
| /> | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
| export { ColorSchemaOptions }; |
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 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
Oops, something went wrong.