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

[Metrics UI] Fix inventory footer misalignment #74707

Merged
merged 2 commits into from
Aug 13, 2020
Merged

[Metrics UI] Fix inventory footer misalignment #74707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ed87d8
[Metrics UI] Fix inventory footer misalignment
Zacqary Aug 10, 2020
bc6e2b1
Merge remote-tracking branch 'upstream/master' into 67881-inventory-f…
Zacqary Aug 13, 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
72 changes: 40 additions & 32 deletions x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import React, { useCallback, useEffect } from 'react';
import { useInterval } from 'react-use';

import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import { AutoSizer } from '../../../../components/auto_sizer';
import { convertIntervalToString } from '../../../../utils/convert_interval_to_string';
import { NodesOverview } from './nodes_overview';
import { calculateBoundsFromNodes } from '../lib/calculate_bounds_from_nodes';
Expand Down Expand Up @@ -110,37 +111,44 @@ export const Layout = () => {
</EuiFlexItem>
</EuiFlexGroup>
</TopActionContainer>
<NodesOverview
nodes={nodes}
options={options}
nodeType={nodeType}
loading={loading}
reload={reload}
onDrilldown={applyFilterQuery}
currentTime={currentTime}
view={view}
autoBounds={autoBounds}
boundsOverride={boundsOverride}
formatter={formatter}
/>
<BottomActionContainer>
<EuiFlexGroup justifyContent="spaceBetween">
<EuiFlexItem grow={false}>
<SavedViewsToolbarControls viewState={viewState} />
</EuiFlexItem>
<EuiFlexItem grow={false} style={{ position: 'relative', minWidth: 400 }}>
<Legend
<AutoSizer bounds>
{({ measureRef, bounds: { height = 0 } }) => (
<>
<NodesOverview
nodes={nodes}
options={options}
nodeType={nodeType}
loading={loading}
reload={reload}
onDrilldown={applyFilterQuery}
currentTime={currentTime}
view={view}
autoBounds={autoBounds}
boundsOverride={boundsOverride}
formatter={formatter}
bounds={bounds}
dataBounds={dataBounds}
legend={options.legend}
bottomMargin={height}
/>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<IntervalLabel intervalAsString={intervalAsString} />
</EuiFlexItem>
</EuiFlexGroup>
</BottomActionContainer>
<BottomActionContainer ref={measureRef}>
<EuiFlexGroup justifyContent="spaceBetween">
<EuiFlexItem grow={false}>
<SavedViewsToolbarControls viewState={viewState} />
</EuiFlexItem>
<EuiFlexItem grow={false} style={{ position: 'relative', minWidth: 400 }}>
<Legend
formatter={formatter}
bounds={bounds}
dataBounds={dataBounds}
legend={options.legend}
/>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<IntervalLabel intervalAsString={intervalAsString} />
</EuiFlexItem>
</EuiFlexGroup>
</BottomActionContainer>
</>
)}
</AutoSizer>
</MainContainer>
</PageContent>
</>
Expand All @@ -159,9 +167,9 @@ const TopActionContainer = euiStyled.div`
const BottomActionContainer = euiStyled.div`
background-color: ${(props) => props.theme.eui.euiPageBackgroundColor};
padding: ${(props) => props.theme.eui.paddingSizes.m} ${(props) =>
props.theme.eui.paddingSizes.m} ${(props) => props.theme.eui.paddingSizes.s};
position: absolute;
props.theme.eui.paddingSizes.m};
position: fixed;
left: 0;
bottom: 4px;
bottom: 0;
right: 0;
`;
3 changes: 3 additions & 0 deletions x-pack/plugins/infra/public/pages/metrics/inventory_view/components/nodes_overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ interface Props {
boundsOverride: InfraWaffleMapBounds;
autoBounds: boolean;
formatter: InfraFormatter;
bottomMargin: number;
}

export const NodesOverview = ({
Expand All @@ -48,6 +49,7 @@ export const NodesOverview = ({
options,
formatter,
onDrilldown,
bottomMargin,
}: Props) => {
const handleDrilldown = useCallback(
(filter: string) => {
Expand Down Expand Up @@ -118,6 +120,7 @@ export const NodesOverview = ({
onFilter={handleDrilldown}
bounds={bounds}
dataBounds={dataBounds}
bottomMargin={bottomMargin}
/>
</MapContainer>
);
Expand Down
11 changes: 9 additions & 2 deletions x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/map.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ interface Props {
onFilter: (filter: string) => void;
bounds: InfraWaffleMapBounds;
dataBounds: InfraWaffleMapBounds;
bottomMargin: number;
}

export const Map: React.FC<Props> = ({
Expand All @@ -37,6 +38,7 @@ export const Map: React.FC<Props> = ({
bounds,
nodeType,
dataBounds,
bottomMargin,
}) => {
const sortedNodes = sortNodes(options.sort, nodes);
const map = nodesToWaffleMap(sortedNodes);
Expand All @@ -45,7 +47,11 @@ export const Map: React.FC<Props> = ({
{({ measureRef, content: { width = 0, height = 0 } }) => {
const groupsWithLayout = applyWaffleMapLayout(map, width, height);
return (
<WaffleMapOuterContainer ref={(el: any) => measureRef(el)} data-test-subj="waffleMap">
<WaffleMapOuterContainer
ref={(el: any) => measureRef(el)}
bottomMargin={bottomMargin}
data-test-subj="waffleMap"
>
<WaffleMapInnerContainer>
{groupsWithLayout.map((group) => {
if (isWaffleMapGroupWithGroups(group)) {
Expand Down Expand Up @@ -86,13 +92,14 @@ export const Map: React.FC<Props> = ({
);
};

const WaffleMapOuterContainer = euiStyled.div`
const WaffleMapOuterContainer = euiStyled.div<{ bottomMargin: number }>`
flex: 1 0 0%;
display: flex;
justify-content: flex-start;
flex-direction: column;
overflow-x: hidden;
overflow-y: auto;
margin-bottom: ${(props) => props.bottomMargin}px;
`;

const WaffleMapInnerContainer = euiStyled.div`
Expand Down