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

Time series/scatter bugs fixed #1113

Merged
merged 6 commits into from
Oct 12, 2022
Merged

Time series/scatter bugs fixed #1113

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
b28643d
Fixed threshold crashes and color theme not applying on bar, line, sc…
ruchika-narang Oct 3, 2022
14358fd
bugs fixed testing: in progress
ramneet-persistent Oct 11, 2022
8de1dc4
testing + fixing done
ramneet-persistent Oct 11, 2022
9745048
bar crash fixed
ramneet-persistent Oct 12, 2022
dd32bcb
histogrm color theme options fixed
ramneet-persistent Oct 12, 2022
4a883aa
log removed
ramneet-persistent Oct 12, 2022
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
10 changes: 6 additions & 4 deletions .../explorer/visualizations/config_panel/config_panes/config_controls/config_color_theme.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ import {
EuiComboBox,
} from '@elastic/eui';
import { isEmpty } from 'lodash';
import { ADD_BUTTON_TEXT } from '../../../../../../../../common/constants/explorer';
import { ADD_BUTTON_TEXT, AGGREGATIONS } from '../../../../../../../../common/constants/explorer';
import { VIS_CHART_TYPES } from '../../../../../../../../common/constants/shared';
import { getPropName } from '../../../../../../../components/event_analytics/utils/utils';

export const ConfigColorTheme = ({
visualizations,
Expand All @@ -38,15 +39,16 @@ export const ConfigColorTheme = ({
color: '#FC0505',
});

const options = (dataConfig?.valueOptions?.metrics && dataConfig.valueOptions.metrics.length !== 0
? dataConfig.valueOptions.metrics
const options = (dataConfig[AGGREGATIONS] && dataConfig[AGGREGATIONS].length !== 0
? dataConfig[AGGREGATIONS]
: vis.name === VIS_CHART_TYPES.Histogram
? defaultAxes.yaxis ?? []
: fields
).map((item) => ({
...item,
label: item.name,
label: vis.name === VIS_CHART_TYPES.Histogram ? item.name : getPropName(item),
}));

const getUpdatedOptions = () =>
options.filter((option) => !vizState.some((vizOpt) => option.name === vizOpt?.name?.name));

Expand Down
17 changes: 7 additions & 10 deletions dashboards-observability/public/components/visualizations/charts/bar/bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { IVisualizationContainerProps } from '../../../../../common/types/explor
import { AvailabilityUnitType } from '../../../event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/config_availability';
import { ThresholdUnitType } from '../../../event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/config_thresholds';
import { EmptyPlaceholder } from '../../../event_analytics/explorer/visualizations/shared_components/empty_placeholder';
import { getPropName } from '../../../event_analytics/utils/utils';
import { getPropName, hexToRgb } from '../../../event_analytics/utils/utils';
import { Plt } from '../../plotly/plot';

export const Bar = ({ visualizations, layout, config }: any) => {
Expand Down Expand Up @@ -62,23 +62,18 @@ export const Bar = ({ visualizations, layout, config }: any) => {
const fillOpacity =
dataConfig?.chartStyles?.fillOpacity !== undefined
? dataConfig?.chartStyles?.fillOpacity / FILLOPACITY_DIV_FACTOR
: visMetaData.fillOpacity / FILLOPACITY_DIV_FACTOR;
: visMetaData.fillopacity / FILLOPACITY_DIV_FACTOR;
const barWidth = 1 - (dataConfig?.chartStyles?.barWidth || visMetaData.barwidth);
const groupWidth = 1 - (dataConfig?.chartStyles?.groupWidth || visMetaData.groupwidth);
const showLegend = !(
dataConfig?.legend?.showLegend && dataConfig.legend.showLegend !== visMetaData.showlegend
);
const legendPosition = dataConfig?.legend?.position || visMetaData.legendposition;

visualizations.data?.rawVizData?.dataConfig?.metrics
? visualizations.data.rawVizData.dataConfig.metrics
: [];
const labelSize = dataConfig?.chartStyles?.labelSize || DEFAULT_BAR_CHART_STYLES.LabelSize;
const legendSize = dataConfig?.legend?.legendSize;
const getSelectedColorTheme = (field: any, index: number) =>
(dataConfig?.colorTheme?.length > 0 &&
dataConfig.colorTheme.find((colorSelected) => colorSelected.name.name === field.label)
?.color) ||
dataConfig.colorTheme.find((colorSelected) => colorSelected.name.name === field)?.color) ||
PLOTLY_COLOR[index % PLOTLY_COLOR.length];

let bars;
Expand Down Expand Up @@ -131,14 +126,16 @@ export const Bar = ({ visualizations, layout, config }: any) => {
}, [queriedVizData, xaxes, yaxes]);

bars = yaxes?.map((yMetric, idx) => {
const selectedColor = getSelectedColorTheme(yMetric.name, idx);
const fillColor = hexToRgb(selectedColor, fillOpacity);
return {
y: isVertical ? queriedVizData[getPropName(yMetric)] : chartAxis,
x: isVertical ? chartAxis : queriedVizData[getPropName(yMetric)],
type: visMetaData.type,
marker: {
color: getSelectedColorTheme(yMetric, idx),
color: fillColor,
line: {
color: getSelectedColorTheme(yMetric, idx),
color: selectedColor,
width: lineWidth,
},
},
Expand Down
10 changes: 4 additions & 6 deletions dashboards-observability/public/components/visualizations/charts/histogram/histogram.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,10 @@ export const Histogram = ({ visualizations, layout, config }: any) => {
xbins.start = dataConfig[GROUPBY][0].bucketOffset;
}

const selectedColorTheme = (field: any, index: number, opacity?: number) => {
const selectedColorTheme = (field: string, index: number, opacity?: number) => {
let newColor;
if (dataConfig?.colorTheme && dataConfig?.colorTheme.length !== 0) {
newColor = dataConfig.colorTheme.find(
(colorSelected) => colorSelected.name.name === field.name
);
newColor = dataConfig.colorTheme.find((colorSelected) => colorSelected.name.name === field);
}
return hexToRgb(newColor ? newColor.color : PLOTLY_COLOR[index % PLOTLY_COLOR.length], opacity);
};
Expand All @@ -75,9 +73,9 @@ export const Histogram = ({ visualizations, layout, config }: any) => {
name: field.name,
hoverinfo: tooltipMode === 'hidden' ? 'none' : tooltipText,
marker: {
color: selectedColorTheme(field, index, fillOpacity),
color: selectedColorTheme(field.name, index, fillOpacity),
line: {
color: selectedColorTheme(field, index),
color: selectedColorTheme(field.name, index),
width: lineWidth,
},
},
Expand Down
71 changes: 30 additions & 41 deletions dashboards-observability/public/components/visualizations/charts/lines/line.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ export const Line = ({ visualizations, layout, config }: any) => {
} = DEFAULT_CHART_STYLES;
const {
data: {
defaultAxes,
indexFields,
query,
rawVizData: {
data: queriedVizData,
metadata: { fields },
Expand All @@ -46,9 +43,7 @@ export const Line = ({ visualizations, layout, config }: any) => {
}: IVisualizationContainerProps = visualizations;
const { dataConfig = {}, layoutConfig = {}, availabilityConfig = {} } = userConfigs;

const yaxis = dataConfig[AGGREGATIONS]
? dataConfig[AGGREGATIONS].filter((item) => item.label)
: [];
const yaxis = dataConfig[AGGREGATIONS] ? dataConfig[AGGREGATIONS] : [];
ramneet-persistent marked this conversation as resolved.
Show resolved Hide resolved
const tooltipMode =
dataConfig?.tooltipOptions?.tooltipMode !== undefined
? dataConfig.tooltipOptions.tooltipMode
Expand Down Expand Up @@ -81,8 +76,7 @@ export const Line = ({ visualizations, layout, config }: any) => {

const getSelectedColorTheme = (field: any, index: number) =>
(dataConfig?.colorTheme?.length > 0 &&
dataConfig.colorTheme.find((colorSelected) => colorSelected.name.name === field.name)
?.color) ||
dataConfig.colorTheme.find((colorSelected) => colorSelected.name.name === field)?.color) ||
PLOTLY_COLOR[index % PLOTLY_COLOR.length];
let xaxis;
const timestampField = find(fields, (field) => field.type === 'timestamp');
Expand All @@ -93,26 +87,14 @@ export const Line = ({ visualizations, layout, config }: any) => {
xaxis = dataConfig[GROUPBY];
}

if (isEmpty(xaxis) || isEmpty(yaxis)) return <EmptyPlaceholder icon={visMetaData?.icontype} />;

let valueSeries;
if (!isEmpty(xaxis) && !isEmpty(yaxis)) {
valueSeries = [...yaxis];
} else {
valueSeries = (
defaultAxes.yaxis || take(fields, lastIndex > 0 ? lastIndex : 1)
).map((item, i) => ({ ...item, side: i === 0 ? 'left' : 'right' }));
}

const isDimensionTimestamp = isEmpty(xaxis)
? defaultAxes?.xaxis?.length && defaultAxes.xaxis[0].type === 'timestamp'
: xaxis.length === 1 && xaxis[0].type === 'timestamp';
if (!timestampField || xaxis.length !== 1 || isEmpty(yaxis))
return <EmptyPlaceholder icon={visMetaData?.icontype} />;

let multiMetrics = {};
const [calculatedLayout, lineValues] = useMemo(() => {
const isBarMode = mode === 'bar';
let calculatedLineValues = valueSeries.map((field: any, index: number) => {
const selectedColor = getSelectedColorTheme(field, index);
let calculatedLineValues = yaxis.map((field: any, index: number) => {
const selectedColor = getSelectedColorTheme(field.name, index);
const fillColor = hexToRgb(selectedColor, fillOpacity);
const barMarker = {
color: fillColor,
Expand Down Expand Up @@ -144,7 +126,7 @@ export const Line = ({ visualizations, layout, config }: any) => {
};

return {
x: queriedVizData[!isEmpty(xaxis) ? xaxis[0]?.label : fields[lastIndex].name],
x: queriedVizData[!isEmpty(xaxis) ? xaxis[0]?.name : fields[lastIndex].name],
y: queriedVizData[getPropName(field)],
type: isBarMode ? 'bar' : 'scatter',
name: getPropName(field),
Expand All @@ -167,6 +149,14 @@ export const Line = ({ visualizations, layout, config }: any) => {
const layoutForBarMode = {
barmode: 'group',
};
const axisLabelsStyle = {
automargin: true,
tickfont: {
...(labelSize && {
size: labelSize,
}),
},
};
const mergedLayout = {
...layout,
...layoutConfig.layout,
Expand All @@ -180,14 +170,13 @@ export const Line = ({ visualizations, layout, config }: any) => {
},
}),
},
autosize: true,
xaxis: {
tickangle: tickAngle,
automargin: true,
tickfont: {
...(labelSize && {
size: labelSize,
}),
},
...axisLabelsStyle,
},
yaxis: {
...axisLabelsStyle,
},
showlegend: showLegend,
...(isBarMode && layoutForBarMode),
Expand All @@ -200,6 +189,7 @@ export const Line = ({ visualizations, layout, config }: any) => {
y: [],
mode: 'text',
text: [],
showlegend: false,
};
const thresholds = dataConfig.thresholds ? dataConfig.thresholds : [];
const levels = availabilityConfig.level ? availabilityConfig.level : [];
Expand All @@ -208,16 +198,16 @@ export const Line = ({ visualizations, layout, config }: any) => {
return list.map((thr: ThresholdUnitType) => {
thresholdTraces.x.push(
queriedVizData[
!isEmpty(xaxis) ? xaxis[xaxis.length - 1]?.label : fields[lastIndex].name
!isEmpty(xaxis) ? xaxis[xaxis.length - 1]?.name : fields[lastIndex].name
][0]
);
thresholdTraces.y.push(thr.value * (1 + 0.06));
thresholdTraces.text.push(thr.name);
return {
type: 'line',
x0: queriedVizData[!isEmpty(xaxis) ? xaxis[0]?.label : fields[lastIndex].name][0],
x0: queriedVizData[!isEmpty(xaxis) ? xaxis[0]?.name : fields[lastIndex].name][0],
y0: thr.value,
x1: last(queriedVizData[!isEmpty(xaxis) ? xaxis[0]?.label : fields[lastIndex].name]),
x1: last(queriedVizData[!isEmpty(xaxis) ? xaxis[0]?.name : fields[lastIndex].name]),
y1: thr.value,
name: thr.name || '',
opacity: 0.7,
Expand All @@ -231,13 +221,16 @@ export const Line = ({ visualizations, layout, config }: any) => {
};

mergedLayout.shapes = [
...mapToLine(thresholds, { dash: 'dashdot' }),
...mapToLine(
thresholds.filter((i: ThresholdUnitType) => i.value !== ''),
{ dash: 'dashdot' }
),
...mapToLine(levels, {}),
];
calculatedLineValues = [...calculatedLineValues, thresholdTraces];
}
return [mergedLayout, calculatedLineValues];
}, [queriedVizData, fields, lastIndex, layout, layoutConfig, xaxis, yaxis, mode, valueSeries]);
}, [queriedVizData, fields, lastIndex, layout, layoutConfig, xaxis, mode, yaxis, labelSize]);

const mergedConfigs = useMemo(
() => ({
Expand All @@ -247,9 +240,5 @@ export const Line = ({ visualizations, layout, config }: any) => {
[config, layoutConfig.config]
);

return isDimensionTimestamp ? (
<Plt data={lineValues} layout={calculatedLayout} config={mergedConfigs} />
) : (
<EmptyPlaceholder icon={visMetaData?.icontype} />
);
return <Plt data={lineValues} layout={calculatedLayout} config={mergedConfigs} />;
};