Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 28 additions & 12 deletions src/Routes/SidebarRight/BarChartMonitors.react.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,11 @@ import { Form } from 'components/common';
const { Collapsible } = Form;

const Container = styled.div`
display: flex;

margin-top: 50px;

height: ${({ $height }) => ($height ? `${($height)+300}px` : '70vh')};

svg + div {
color: #000000;
}
`;
const PieContainer = styled.div`
width: 100%;
Expand All @@ -29,6 +26,7 @@ const PieContainer = styled.div`

const ResponsiveBarStyle = styled(ResponsiveBar)`
width: 85%;

`;

const typeName = {
Expand Down Expand Up @@ -208,9 +206,15 @@ const BarChartLayer = React.memo(
});
}}
onMouseLeave={() => {
setTooltipData(null);
handleLegendMouseLeave();

}}
onMouseOut={() => {
setTooltipData(null);
}}>
handleLegendMouseLeave();
}}
>
<rect
x="0"
y="5"
Expand Down Expand Up @@ -260,7 +264,7 @@ const BarChartMonitors = ({ metric }) => {
() => buildPieDataFromTotals(data, legend, Theme.GRAPH_PALETTE),
[data, legend]
);
const rowPieData = useMemo(() => (pieData.length / 5) * 60 + 60, [pieData]);
const rowPieData = useMemo(() => (pieData.length / 5) * 50 + 70, [pieData]);

const handleLegendMouseEnter = useCallback(legendItem => {
// const idToHighlight = legendItem;
Expand All @@ -270,12 +274,19 @@ const BarChartMonitors = ({ metric }) => {

const handleLegendMouseLeave = useCallback(() => {
setHighlightedBars('');
setTooltipData(null);
}, []);

return (
<>
<Header>{typeName[metric]}</Header>
<Container $height={rowPieData}>
<Header onMouseEnter={() => setTooltipData(null)} >{typeName[metric]}</Header>
<Container $height={rowPieData}
onMouseLeave={() => setTooltipData(null)}
onMouseOut={handleLegendMouseLeave}
onPointerLeave={handleLegendMouseLeave}
onPointerOut={handleLegendMouseLeave}

>
<ResponsiveBarStyle
data={data}
keys={legend}
Expand Down Expand Up @@ -328,12 +339,17 @@ const BarChartMonitors = ({ metric }) => {
),
]}
/>




{tooltipData && <Tooltip dataTip={tooltipData} />}



{tooltipData && <Tooltip dataTip={tooltipData} />}


</Container>
<Collapsible title="Total Resource Pie Chart">
</Container>
<Collapsible title="Total Resource Pie Chart" onMouseEnter={() => setTooltipData(null)} >
<PieContainer>
<BarChartTotalsPie pieData={pieData} defs={designBar} fill={fillBar} />
</PieContainer>
Expand Down
3 changes: 2 additions & 1 deletion src/Routes/SidebarRight/CpuBarChartMonitors.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import BarChartMonitors from './BarChartMonitors.react';

const ContainerCPU = styled.div`
height: 100vh;
position: relative;


`;

const CpuBarChartMonitors = ({metric}) => (
Expand Down