Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Lens] Add ability to set colors for y-axis series #70311

Merged
merged 20 commits into from
Jul 3, 2020
Merged

[Lens] Add ability to set colors for y-axis series #70311

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
446eb18
axis colors
mbondyra Jun 30, 2020
9287271
refactor: don't read palette yourself
mbondyra Jun 30, 2020
8febc84
compressed picker
mbondyra Jun 30, 2020
cf54304
feat: custom color Picker
mbondyra Jul 1, 2020
6ab4f36
typecheck
mbondyra Jul 1, 2020
9aa3fca
refactoring & tests
mbondyra Jul 1, 2020
8b80ff1
removing caret-color
mbondyra Jul 1, 2020
9cf9232
aaand back to ColorPicker
mbondyra Jul 1, 2020
9f42172
expression fix
mbondyra Jul 1, 2020
4720a98
color fix
mbondyra Jul 1, 2020
6a54049
tests added to xy_expression
mbondyra Jul 1, 2020
144cf1b
types
mbondyra Jul 1, 2020
71ce160
design review
mbondyra Jul 2, 2020
a3fb6b7
types
mbondyra Jul 2, 2020
b8aa364
addressing Joe's comment
mbondyra Jul 2, 2020
81c0ba9
+memo
mbondyra Jul 2, 2020
d2179b8
Merge commit '1cfc9356bd36c54b8005089decc36970c11c101d' into lens/axi…
mbondyra Jul 2, 2020
952fa77
tooltip design change
mbondyra Jul 2, 2020
20a9a40
cr
mbondyra Jul 2, 2020
212effa
removing non existing prop
mbondyra Jul 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions x-pack/plugins/lens/public/xy_visualization/__snapshots__/xy_expression.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion x-pack/plugins/lens/public/xy_visualization/state_helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { EuiIconType } from '@elastic/eui/src/components/icon/icon';
import { SeriesType, visualizationTypes } from './types';
import { SeriesType, visualizationTypes, LayerConfig, YConfig } from './types';

export function isHorizontalSeries(seriesType: SeriesType) {
return seriesType === 'bar_horizontal' || seriesType === 'bar_horizontal_stacked';
Expand All @@ -24,3 +24,12 @@ export function getIconForSeries(type: SeriesType): EuiIconType {

return (definition.icon as EuiIconType) || 'empty';
}

export const getSeriesColor = (layer: LayerConfig, accessor: string) => {
if (layer.splitAccessor) {
return null;
}
return (
layer?.yConfig?.find((yConfig: YConfig) => yConfig.forAccessor === accessor)?.color || null
);
};
3 changes: 2 additions & 1 deletion x-pack/plugins/lens/public/xy_visualization/to_expression.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ export const buildExpression = (
function: 'lens_xy_yConfig',
arguments: {
forAccessor: [yConfig.forAccessor],
axisMode: [yConfig.axisMode],
axisMode: yConfig.axisMode ? [yConfig.axisMode] : [],
color: yConfig.color ? [yConfig.color] : [],
},
},
],
Expand Down
5 changes: 5 additions & 0 deletions x-pack/plugins/lens/public/xy_visualization/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ export const yAxisConfig: ExpressionFunctionDefinition<
options: ['auto', 'left', 'right'],
help: 'The axis mode of the metric',
},
color: {
types: ['string'],
help: 'The color of the series',
},
},
fn: function fn(input: unknown, args: YConfig) {
return {
Expand Down Expand Up @@ -195,6 +199,7 @@ export type YAxisMode = 'auto' | 'left' | 'right';
export interface YConfig {
forAccessor: string;
axisMode?: YAxisMode;
color?: string;
}

export interface LayerConfig {
Expand Down
Loading