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

[Visualize] Horizontal Bar Graph Visualizations have Vertical Bar Graph Type #78536

Merged
merged 6 commits into from
Oct 5, 2020
Merged

[Visualize] Horizontal Bar Graph Visualizations have Vertical Bar Graph Type #78536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
23634a6
Fixed useEffect in metric_axes. Update type in params instead of type…
VladLasitsa Sep 25, 2020
a96d784
Fixed tests
VladLasitsa Sep 25, 2020
aee2b2e
Fixed tests
VladLasitsa Sep 28, 2020
600b909
Merge remote-tracking branch 'upstream/master' into #77936
Oct 1, 2020
7d95bf6
Update current chart type definition
Oct 1, 2020
afd996e
Merge branch 'master' into #77936
kibanamachine Oct 5, 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
28 changes: 0 additions & 28 deletions src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,34 +134,6 @@ describe('MetricsAxisOptions component', () => {
const updatedSeries = [{ ...chart, data: { id: agg.id, label: agg.makeLabel() } }];
expect(setValue).toHaveBeenCalledWith(SERIES_PARAMS, updatedSeries);
});

it('should update visType when one seriesParam', () => {
const comp = mount(<MetricsAxisOptions {...defaultProps} />);
expect(defaultProps.vis.type.type).toBe(ChartTypes.AREA);

comp.setProps({
stateParams: {
...defaultProps.stateParams,
seriesParams: [{ ...chart, type: ChartTypes.LINE }],
},
});

expect(defaultProps.vis.setState).toHaveBeenLastCalledWith({ type: ChartTypes.LINE });
});

it('should set histogram visType when multiple seriesParam', () => {
const comp = mount(<MetricsAxisOptions {...defaultProps} />);
expect(defaultProps.vis.type.type).toBe(ChartTypes.AREA);

comp.setProps({
stateParams: {
...defaultProps.stateParams,
seriesParams: [chart, { ...chart, type: ChartTypes.LINE }],
},
});

expect(defaultProps.vis.setState).toHaveBeenLastCalledWith({ type: ChartTypes.HISTOGRAM });
});
});

describe('updateAxisTitle', () => {
Expand Down
11 changes: 1 addition & 10 deletions src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

import React, { useState, useEffect, useCallback, useMemo } from 'react';
import { cloneDeep, uniq, get } from 'lodash';
import { cloneDeep, get } from 'lodash';
import { EuiSpacer } from '@elastic/eui';

import { IAggConfig } from 'src/plugins/data/public';
Expand Down Expand Up @@ -293,15 +293,6 @@ function MetricsAxisOptions(props: ValidationVisOptionsProps<BasicVislibParams>)
updateAxisTitle(updatedSeries);
}, [metrics, firstValueAxesId, setValue, stateParams.seriesParams, updateAxisTitle]);

const visType = useMemo(() => {
const types = uniq(stateParams.seriesParams.map(({ type }) => type));
return types.length === 1 ? types[0] : 'histogram';
}, [stateParams.seriesParams]);

useEffect(() => {
vis.setState({ ...vis.serialize(), type: visType });
}, [vis, visType]);

return isTabSelected ? (
<>
<SeriesPanel
Expand Down
9 changes: 7 additions & 2 deletions src/plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
import React from 'react';
import React, { useMemo } from 'react';
import { EuiPanel, EuiTitle, EuiSpacer } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
import { uniq } from 'lodash';

import { ValidationVisOptionsProps } from '../../common';
import { BasicOptions, SwitchOption } from '../../../../../charts/public';
Expand All @@ -31,6 +32,10 @@ import { ChartTypes } from '../../../utils/collections';
function PointSeriesOptions(props: ValidationVisOptionsProps<BasicVislibParams>) {
const { stateParams, setValue, vis } = props;

const currentChartTypes = useMemo(() => uniq(stateParams.seriesParams.map(({ type }) => type)), [
stateParams.seriesParams,
]);

return (
<>
<EuiPanel paddingSize="s">
Expand Down Expand Up @@ -68,7 +73,7 @@ function PointSeriesOptions(props: ValidationVisOptionsProps<BasicVislibParams>)
/>
)}

{vis.type.name === ChartTypes.HISTOGRAM && (
{currentChartTypes.includes(ChartTypes.HISTOGRAM) && (
<SwitchOption
data-test-subj="showValuesOnChart"
label={i18n.translate('visTypeVislib.editors.pointSeries.showLabels', {
Expand Down
1 change: 1 addition & 0 deletions src/plugins/vis_type_vislib/public/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,5 @@ export interface BasicVislibParams extends CommonVislibParams {
};
seriesParams: SeriesParam[];
times: TimeMarker[];
type: string;
}