Skip to content

[Metrics UI] remove middle number in legend and adjust calculation of max number #89020

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

Merged
merged 5 commits into from
Feb 1, 2021
Merged

[Metrics UI] remove middle number in legend and adjust calculation of max number #89020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f15490e
get midpoint of max and min instead of half of max number
neptunian Jan 21, 2021
121cad5
Merge branch 'master' into 82313-fix-legend-tick-values
neptunian Jan 28, 2021
e76e490
remove middle tick from stepped gradient legend
neptunian Jan 28, 2021
3797b20
use value instead of max values to calculate bounds
neptunian Jan 28, 2021
fe1550f
Merge branch 'master' into 82313-fix-legend-tick-values
kibanamachine Feb 1, 2021
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
5 changes: 2 additions & 3 deletions ...s/infra/public/pages/metrics/inventory_view/components/waffle/stepped_gradient_legend.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@ interface Props {
bounds: InfraWaffleMapBounds;
formatter: InfraFormatter;
}

type TickValue = 0 | 1;
export const SteppedGradientLegend: React.FC<Props> = ({ legend, bounds, formatter }) => {
return (
<LegendContainer>
<Ticks>
<TickLabel value={0} bounds={bounds} formatter={formatter} />
<TickLabel value={0.5} bounds={bounds} formatter={formatter} />
<TickLabel value={1} bounds={bounds} formatter={formatter} />
</Ticks>
<GradientContainer>
Expand All @@ -39,7 +38,7 @@ export const SteppedGradientLegend: React.FC<Props> = ({ legend, bounds, formatt

interface TickProps {
bounds: InfraWaffleMapBounds;
value: number;
value: TickValue;
formatter: InfraFormatter;
}

Expand Down
4 changes: 2 additions & 2 deletions ...plugins/infra/public/pages/metrics/inventory_view/lib/calculate_bounds_from_nodes.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ describe('calculateBoundsFromNodes', () => {
const bounds = calculateBoundsFromNodes(nodes);
expect(bounds).toEqual({
min: 0.2,
max: 1.5,
max: 0.5,
});
});
it('should have a minimum of 0 for only a single node', () => {
const bounds = calculateBoundsFromNodes([nodes[0]]);
expect(bounds).toEqual({
min: 0,
max: 1.5,
max: 0.5,
});
});
it('should return zero for empty nodes', () => {
Expand Down
18 changes: 6 additions & 12 deletions x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/calculate_bounds_from_nodes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,17 @@ import { SnapshotNode } from '../../../../../common/http_api/snapshot_api';
import { InfraWaffleMapBounds } from '../../../../lib/lib';

export const calculateBoundsFromNodes = (nodes: SnapshotNode[]): InfraWaffleMapBounds => {
const maxValues = nodes.map((node) => {
const values = nodes.map((node) => {
const metric = first(node.metrics);
if (!metric) return 0;
return metric.max;
});
const minValues = nodes.map((node) => {
const metric = first(node.metrics);
if (!metric) return 0;
return metric.value;
return !metric || !metric.value ? 0 : metric.value;
});
// if there is only one value then we need to set the bottom range to zero for min
// otherwise the legend will look silly since both values are the same for top and
// bottom.
if (minValues.length === 1) {
minValues.unshift(0);
if (values.length === 1) {
values.unshift(0);
}
const maxValue = max(maxValues) || 0;
const minValue = min(minValues) || 0;
const maxValue = max(values) || 0;
const minValue = min(values) || 0;
return { min: isFinite(minValue) ? minValue : 0, max: isFinite(maxValue) ? maxValue : 0 };
};