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.

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

[Lens] Stack as percentage #70703

Merged
merged 34 commits into from
Sep 15, 2020
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
9e1088a
implement percentage mode
flash1293 Jul 3, 2020
9ec510a
Merge branch 'master' into lens/stack-as-percentage
elasticmachine Jul 13, 2020
6542e56
Merge remote-tracking branch 'upstream/master' into lens/stack-as-per…
flash1293 Jul 16, 2020
c30290a
Merge branch 'lens/stack-as-percentage' of github.com:flash1293/kiban…
flash1293 Jul 16, 2020
a973618
Merge remote-tracking branch 'upstream/master' into lens/stack-as-per…
flash1293 Jul 27, 2020
70d4833
fix percentage stacked
flash1293 Jul 27, 2020
91d9ec0
Merge remote-tracking branch 'upstream/master' into lens/stack-as-per…
flash1293 Aug 11, 2020
7aedf89
fix transitions
flash1293 Aug 12, 2020
5251dcc
Merge remote-tracking branch 'upstream/master' into lens/stack-as-per…
flash1293 Aug 17, 2020
c43572c
Merge remote-tracking branch 'upstream/master' into lens/stack-as-per…
flash1293 Aug 18, 2020
0bf5fe6
fix tests
flash1293 Aug 18, 2020
2b629b0
fix transitions
flash1293 Aug 18, 2020
cdfbf75
Adding new chart type icons and converting to React components
Aug 5, 2020
d64ed98
Fixing a test?
Aug 18, 2020
5acbbf7
Fix sizing of current suggestion button with label when using an icon
Aug 18, 2020
c8f0983
fix types and tests
flash1293 Aug 19, 2020
57f82a9
Merge remote-tracking branch 'upstream/master' into lens/stack-as-per…
flash1293 Aug 19, 2020
95946bc
Merge branch 'master' into lens/stack-as-percentage
elasticmachine Aug 21, 2020
6308107
Merge remote-tracking branch 'upstream/master' into lens/stack-as-per…
flash1293 Aug 21, 2020
cfe907b
fix suggestions for single metric tables
flash1293 Aug 21, 2020
9b5fda2
fix snapshots
flash1293 Aug 21, 2020
fe97375
Merge branch 'master' into lens/stack-as-percentage
elasticmachine Aug 21, 2020
875d1d7
Merge remote-tracking branch 'origin/master' into HEAD
wylieconlon Aug 21, 2020
ad8d757
Merge remote-tracking branch 'upstream/master' into lens/stack-as-per…
flash1293 Sep 7, 2020
e1221b8
fix merge conflicts and adjust percentage format pattern
flash1293 Sep 7, 2020
dad644e
i18nify
flash1293 Sep 7, 2020
bba2adc
fix test failures and adjust label of pie percentage formatter
flash1293 Sep 7, 2020
d8e2289
Merge branch 'lens/stack-as-percentage' of github.com:flash1293/kiban…
flash1293 Sep 7, 2020
47b0d62
Merge remote-tracking branch 'upstream/master' into lens/stack-as-per…
flash1293 Sep 9, 2020
c2555e2
review comments
flash1293 Sep 9, 2020
b0fcbf6
Merge branch 'master' into lens/stack-as-percentage
elasticmachine Sep 10, 2020
dac1661
Merge branch 'master' into lens/stack-as-percentage
elasticmachine Sep 14, 2020
5827c0d
Merge remote-tracking branch 'upstream/master' into lens/stack-as-per…
flash1293 Sep 15, 2020
dc040fe
Merge branch 'lens/stack-as-percentage' of github.com:flash1293/kiban…
flash1293 Sep 15, 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/app_plugin/_app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,17 @@
flex-direction: column;
flex-grow: 1;
}

.lensChartIcon__subdued {
fill: $euiTextSubduedColor;

// Not great, but the easiest way to fix the gray fill when stuck in a button with a fill
// Like when selected in a button group
.euiButton--fill & {
fill: currentColor;
}
}

.lensChartIcon__accent {
fill: $euiColorVis0;
}
6 changes: 0 additions & 6 deletions x-pack/plugins/lens/public/assets/chart_area.svg

This file was deleted.

30 changes: 30 additions & 0 deletions x-pack/plugins/lens/public/assets/chart_area.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import React from 'react';
import { EuiIconProps } from '@elastic/eui';

export const LensIconChartArea = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
<svg
viewBox="0 0 30 22"
width={30}
height={22}
fill="none"
xmlns="http://www.w3.org/2000/svg"
aria-labelledby={titleId}
{...props}
>
{title ? <title id={titleId}>{title}</title> : null}
<path
d="M30 6v15a1 1 0 01-1 1H1a1 1 0 01-1-1v-2c1 0 3.5-4 6-4s5 3 6 3 3.23-6.994 5.865-6.997C20.5 11 23 11 24 11s3-5 6-5z"
className="lensChartIcon__accent"
/>
<path
d="M6 1c3 0 5 6 6 6s3.5-3 6-3c1.667 0 2.944 2.333 3.833 6.999l.309.001c-1.013 0-2.27 0-3.593.002h-.684C15.231 11.007 13 18 12 18s-3.5-3-6-3-5 4-6 4V7c1-1.5 3-6 6-6z"
className="lensChartIcon__subdued"
/>
</svg>
);
34 changes: 34 additions & 0 deletions x-pack/plugins/lens/public/assets/chart_area_percentage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import React from 'react';
import { EuiIconProps } from '@elastic/eui';

export const LensIconChartAreaPercentage = ({
title,
titleId,
...props
}: Omit<EuiIconProps, 'type'>) => (
<svg
viewBox="0 0 30 22"
width={30}
height={22}
fill="none"
xmlns="http://www.w3.org/2000/svg"
aria-labelledby={titleId}
{...props}
>
{title ? <title id={titleId}>{title}</title> : null}
<path
d="M0 13v8a1 1 0 001 1h28a1 1 0 001-1V9.25c-1.251-.929-2.45-1.734-3.493-2.313a11.028 11.028 0 00-1.478-.703C24.592 6.072 24.25 6 24 6c-.262 0-.63.212-1.126.77-.472.53-.952 1.249-1.458 2.007l-.013.02c-.49.736-1.006 1.51-1.53 2.098C19.37 11.462 18.739 12 18 12c-1.062 0-2.112-.263-3.092-.508l-.03-.007C13.869 11.232 12.929 11 12 11c-.337 0-.729.171-1.2.525-.466.35-.94.822-1.446 1.329l-.015.015c-.49.489-1.01 1.01-1.539 1.406-.529.396-1.137.725-1.8.725-.657 0-1.57-.212-2.48-.424l-.058-.014C2.275 14.287 1.032 14 0 14v-1z"
className="lensChartIcon__accent"
/>
<path
d="M29 0a1 1 0 011 1v6.012c-1.06-.764-2.085-1.437-3.007-1.95a11.93 11.93 0 00-1.616-.765C24.887 4.115 24.418 4 24 4c-.738 0-1.369.538-1.874 1.105-.523.589-1.039 1.362-1.529 2.098l-.013.02c-.506.758-.985 1.476-1.458 2.007-.495.558-.864.77-1.126.77-.928 0-1.867-.232-2.879-.485l-.029-.007C14.112 9.263 13.062 9 12 9c-.663 0-1.271.328-1.8.725-.528.396-1.05.917-1.538 1.406l-.015.015c-.507.507-.98.98-1.447 1.329-.471.354-.863.525-1.2.525-.528 0-1.328-.183-2.311-.412l-.034-.007C2.507 12.314 1.159 12 .001 12V1a1 1 0 011-1h28z"
className="lensChartIcon__subdued"
/>
</svg>
);
6 changes: 0 additions & 6 deletions x-pack/plugins/lens/public/assets/chart_area_stacked.svg

This file was deleted.

34 changes: 34 additions & 0 deletions x-pack/plugins/lens/public/assets/chart_area_stacked.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import React from 'react';
import { EuiIconProps } from '@elastic/eui';

export const LensIconChartAreaStacked = ({
title,
titleId,
...props
}: Omit<EuiIconProps, 'type'>) => (
<svg
viewBox="0 0 30 22"
width={31}
height={22}
fill="none"
xmlns="http://www.w3.org/2000/svg"
aria-labelledby={titleId}
{...props}
>
{title ? <title id={titleId}>{title}</title> : null}
<path
d="M0 15.213l.484.091.813.146.762.129C3.779 15.859 5.09 16 6 16c.986 0 1.712-.25 3.166-.966l.281-.14C10.802 14.217 11.381 14 12 14c.507 0 .988.146 1.89.571l1.209.592c1.28.617 1.977.837 2.901.837 1.028 0 1.75-.349 3.119-1.344l.89-.659C23.034 13.252 23.535 13 24 13c.581 0 1.232.185 2.598.718l1.1.436.568.217c.72.27 1.256.438 1.736.532L30 21a1 1 0 01-1 1H1a1 1 0 01-1-1v-5.787z"
className="lensChartIcon__accent"
/>
<path
d="M24 1c1.334 0 3.334 1 6 3v8.842l-.324-.098c-.346-.11-.759-.262-1.273-.462l-1.101-.436-.568-.217-.536-.193C25.277 11.118 24.676 11 24 11c-1.028 0-1.75.349-3.119 1.344l-.89.659c-1.024.745-1.524.997-1.99.997-.508 0-.989-.146-1.89-.571l-1.21-.592c-1.28-.617-1.977-.837-2.9-.837-.987 0-1.713.25-3.167.966l-.281.14C7.198 13.783 6.619 14 6 14l-.334-.007c-1.182-.045-3.08-.317-5.665-.815V9c2 0 4.666 1 6 1 2 0 4-4 6-4s4 1 6 1 4-6 6-6z"
className="lensChartIcon__subdued"
/>
</svg>
);
6 changes: 0 additions & 6 deletions x-pack/plugins/lens/public/assets/chart_bar.svg

This file was deleted.

30 changes: 30 additions & 0 deletions x-pack/plugins/lens/public/assets/chart_bar.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import React from 'react';
import { EuiIconProps } from '@elastic/eui';

export const LensIconChartBar = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
<svg
viewBox="0 0 30 22"
width={30}
height={22}
fill="none"
xmlns="http://www.w3.org/2000/svg"
aria-labelledby={titleId}
{...props}
>
{title ? <title id={titleId}>{title}</title> : null}
<path
d="M5 7a1 1 0 011 1v13a1 1 0 01-1 1H1a1 1 0 01-1-1V8a1 1 0 011-1h4zm16-7a1 1 0 011 1v20a1 1 0 01-1 1h-4a1 1 0 01-1-1V1a1 1 0 011-1h4z"
className="lensChartIcon__subdued"
/>
<path
d="M13 11a1 1 0 011 1v9a1 1 0 01-1 1H9a1 1 0 01-1-1v-9a1 1 0 011-1h4zm16-7a1 1 0 011 1v16a1 1 0 01-1 1h-4a1 1 0 01-1-1V5a1 1 0 011-1h4z"
className="lensChartIcon__accent"
/>
</svg>
);
6 changes: 0 additions & 6 deletions x-pack/plugins/lens/public/assets/chart_bar_horizontal.svg

This file was deleted.

34 changes: 34 additions & 0 deletions x-pack/plugins/lens/public/assets/chart_bar_horizontal.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import React from 'react';
import { EuiIconProps } from '@elastic/eui';

export const LensIconChartBarHorizontal = ({
title,
titleId,
...props
}: Omit<EuiIconProps, 'type'>) => (
<svg
viewBox="0 0 30 22"
width={30}
height={22}
fill="none"
xmlns="http://www.w3.org/2000/svg"
aria-labelledby={titleId}
{...props}
>
{title ? <title id={titleId}>{title}</title> : null}
<path
d="M29 16a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1v-4a1 1 0 011-1h28zM22 0a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1V1a1 1 0 011-1h21z"
className="lensChartIcon__subdued"
/>
<path
d="M0 9a1 1 0 011-1h15a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1V9z"
className="lensChartIcon__accent"
/>
</svg>
);
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import React from 'react';
import { EuiIconProps } from '@elastic/eui';

export const LensIconChartBarHorizontalPercentage = ({
title,
titleId,
...props
}: Omit<EuiIconProps, 'type'>) => (
<svg
viewBox="0 0 30 22"
width={30}
height={22}
fill="none"
xmlns="http://www.w3.org/2000/svg"
aria-labelledby={titleId}
{...props}
>
{title ? <title id={titleId}>{title}</title> : null}
<path
d="M20 16v6H1a1 1 0 01-1-1v-4a1 1 0 011-1h19zm-3-8v6H1.222C.547 14 0 13.552 0 13V9c0-.552.547-1 1.222-1H17zm1-8v6H1.042C.466 6 0 5.552 0 5V1c0-.552.466-1 1.042-1H18z"
className="lensChartIcon__subdued"
/>
<path
d="M29 16a1 1 0 011 1v4a1 1 0 01-1 1h-7v-6h7zm-.222-8C29.453 8 30 8.448 30 9v4c0 .552-.547 1-1.222 1H19V8h9.778zm.18-8C29.534 0 30 .448 30 1v4c0 .552-.466 1-1.042 1H20V0h8.958z"
className="lensChartIcon__accent"
/>
</svg>
);

This file was deleted.

34 changes: 34 additions & 0 deletions x-pack/plugins/lens/public/assets/chart_bar_horizontal_stacked.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import React from 'react';
import { EuiIconProps } from '@elastic/eui';

export const LensIconChartBarHorizontalStacked = ({
title,
titleId,
...props
}: Omit<EuiIconProps, 'type'>) => (
<svg
viewBox="0 0 30 22"
width={30}
height={22}
fill="none"
xmlns="http://www.w3.org/2000/svg"
aria-labelledby={titleId}
{...props}
>
{title ? <title id={titleId}>{title}</title> : null}
<path
d="M18 16v6H1a1 1 0 01-1-1v-4a1 1 0 011-1h17zm-3-8v6H1.222C.547 14 0 13.552 0 13V9c0-.552.547-1 1.222-1H15zm1-8v6H1.042C.466 6 0 5.552 0 5V1c0-.552.466-1 1.042-1H16z"
className="lensChartIcon__subdued"
/>
<path
d="M29 16a1 1 0 011 1v4a1 1 0 01-1 1h-9v-6h9zm-9.222-8C20.453 8 21 8.448 21 9v4c0 .552-.547 1-1.222 1H17V8h2.778zm3.18-8C23.534 0 24 .448 24 1v4c0 .552-.466 1-1.042 1H18V0h4.958z"
className="lensChartIcon__accent"
/>
</svg>
);
34 changes: 34 additions & 0 deletions x-pack/plugins/lens/public/assets/chart_bar_percentage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import React from 'react';
import { EuiIconProps } from '@elastic/eui';

export const LensIconChartBarPercentage = ({
title,
titleId,
...props
}: Omit<EuiIconProps, 'type'>) => (
<svg
viewBox="0 0 30 22"
width={30}
height={22}
fill="none"
xmlns="http://www.w3.org/2000/svg"
aria-labelledby={titleId}
{...props}
>
{title ? <title id={titleId}>{title}</title> : null}
<path
d="M6 13v8a1 1 0 01-1 1H1a1 1 0 01-1-1v-8h6zm8-4v12a1 1 0 01-1 1H9a1 1 0 01-1-1V9h6zm8 4v8a1 1 0 01-1 1h-4a1 1 0 01-1-1v-8h6zm8 1v7a1 1 0 01-1 1h-4a1 1 0 01-1-1v-7h6z"
className="lensChartIcon__subdued"
/>
<path
d="M29 0a1 1 0 011 1v11h-6V1a1 1 0 011-1h4zM5 0a1 1 0 011 1v10H0V1a1 1 0 011-1h4zm16 0a1 1 0 011 1v10h-6V1a1 1 0 011-1h4zm-8 0a1 1 0 011 1v6H8V1a1 1 0 011-1h4z"
className="lensChartIcon__accent"
/>
</svg>
);
6 changes: 0 additions & 6 deletions x-pack/plugins/lens/public/assets/chart_bar_stacked.svg

This file was deleted.

34 changes: 34 additions & 0 deletions x-pack/plugins/lens/public/assets/chart_bar_stacked.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import React from 'react';
import { EuiIconProps } from '@elastic/eui';

export const LensIconChartBarStacked = ({
title,
titleId,
...props
}: Omit<EuiIconProps, 'type'>) => (
<svg
viewBox="0 0 30 22"
width={30}
height={22}
fill="none"
xmlns="http://www.w3.org/2000/svg"
aria-labelledby={titleId}
{...props}
>
{title ? <title id={titleId}>{title}</title> : null}
<path
className="lensChartIcon__subdued"
d="M6 13v8a1 1 0 01-1 1H1a1 1 0 01-1-1v-8h6zm8-4v12a1 1 0 01-1 1H9a1 1 0 01-1-1V9h6zm8 4v8a1 1 0 01-1 1h-4a1 1 0 01-1-1v-8h6zm8 1v7a1 1 0 01-1 1h-4a1 1 0 01-1-1v-7h6z"
/>
<path
d="M29 1a1 1 0 011 1v10h-6V2a1 1 0 011-1h4zM5 7a1 1 0 011 1v3H0V8a1 1 0 011-1h4zm16-4a1 1 0 011 1v7h-6V4a1 1 0 011-1h4zm-8-3a1 1 0 011 1v6H8V1a1 1 0 011-1h4z"
className="lensChartIcon__accent"
/>
</svg>
);
6 changes: 0 additions & 6 deletions x-pack/plugins/lens/public/assets/chart_datatable.svg

This file was deleted.

Loading