Skip to content

Commit 3a53068

Browse files
committed
Working on bargraph hover
1 parent 60760a7 commit 3a53068

File tree

3 files changed

+30
-28
lines changed

3 files changed

+30
-28
lines changed

src/app/components/BarGraphComparison.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ const BarGraphComparison = props => {
300300
<MenuItem>No snapshots available</MenuItem>
301301
) : (
302302
finalList.map((elem, index) => (
303-
<MenuItem value={index}>{elem}</MenuItem>
303+
<MenuItem value={elem}>{elem}</MenuItem>
304304
// <MenuItem value="test">{}</MenuItem>
305305
)))
306306
}

src/app/components/BarGraphComparisonActions.tsx

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,12 @@ const tooltipStyles = {
7070
const BarGraphComparisonActions = props => {
7171
const [{ tabs, currentTab }, dispatch] = useStoreContext();
7272
const {
73-
width, height, data, comparison, setSeries, series, setAction
73+
width, height, data, comparison, setSeries, series, setAction, action
7474
} = props;
7575
// const [series, setSeries] = React.useState(0);
7676
const [snapshots, setSnapshots] = React.useState(0);
7777
const [open, setOpen] = React.useState(false);
7878
const [picOpen, setPicOpen] = React.useState(false);
79-
const [maxRender, setMaxRender] = React.useState(data.maxTotalRender);
8079

8180
const currentIndex = tabs[currentTab].sliderIndex;
8281

@@ -124,8 +123,8 @@ const BarGraphComparisonActions = props => {
124123
};
125124

126125
// the domain array on rendering scale will set the coordinates for Y-aix points.
127-
const renderingScale = scaleBand<number>({
128-
domain: [0, Math.max(calculateMaxTotalRender(), data.maxTotalRender)],
126+
const renderingScale = scaleLinear<number>({
127+
domain: [0, calculateMaxTotalRender()],
129128
nice: true,
130129
});
131130
// the domain array will assign each key a different color to make rectangle boxes
@@ -266,14 +265,14 @@ const BarGraphComparisonActions = props => {
266265
open={picOpen}
267266
onClose={picHandleClose}
268267
onOpen={picHandleOpen}
269-
value={''} //snapshots
268+
value={action} //snapshots
270269
onChange={handleActionChange}
271270
>
272271
{!comparison[snapshots] ? (
273272
<MenuItem>No snapshots available</MenuItem>
274273
) : (
275274
finalList.map((elem, index) => (
276-
<MenuItem value={index}>{elem}</MenuItem>
275+
<MenuItem value={elem}>{elem}</MenuItem>
277276
// <MenuItem value="test">{}</MenuItem>
278277
)))
279278
}
@@ -312,13 +311,13 @@ const BarGraphComparisonActions = props => {
312311
yScale={renderingScale}
313312
color={colorScale}
314313
>
315-
{barStacks => barStacks.map(barStack => barStack.bars.map((bar, idx) => {
314+
{barStacks => barStacks.map(barStack => barStack.bars.map((bar) => {
316315
console.log('barstack', barStack)
317316
console.log('bar', bar)
318317
// Hides new components if components don't exist in previous snapshots.
319-
if (Number.isNaN(bar.bar[1]) || bar.height < 0) {
320-
bar.height = 0;
321-
}
318+
// if (Number.isNaN(bar.bar[1]) || bar.height < 0) {
319+
// bar.height = 0;
320+
// }
322321
return (
323322
<rect
324323
key={`bar-stack-${barStack.id}-${bar.id}`}

src/app/components/PerformanceVisx.tsx

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -181,24 +181,7 @@ const allStorage = () => {
181181
return values;
182182
};
183183

184-
const getActions = () => {
185-
let seriesArr = localStorage.getItem('project')
186-
seriesArr = seriesArr === null ? [] : JSON.parse(seriesArr);
187-
const actionsArr = [];
188184

189-
if (seriesArr.length) {
190-
for (let i = 0; i < seriesArr.length; i++) {
191-
for (const action of seriesArr[i].data.barStack) {
192-
if (action.name !== '') {
193-
action.seriesName = seriesArr[i].name;
194-
actionsArr.push(action);
195-
}
196-
}
197-
}
198-
}
199-
console.log('actionsArr', actionsArr)
200-
return actionsArr;
201-
}
202185

203186
// Gets snapshot Ids for the regular bar graph view.
204187
const getSnapshotIds = (obj, snapshotIds = []): string[] => {
@@ -240,6 +223,26 @@ const PerformanceVisx = (props: BarStackProps) => {
240223
const [ series, setSeries ] = useState(true);
241224
const [ action, setAction ] = useState(false);
242225

226+
const getActions = () => {
227+
let seriesArr = localStorage.getItem('project')
228+
seriesArr = seriesArr === null ? [] : JSON.parse(seriesArr);
229+
const actionsArr = [];
230+
231+
if (seriesArr.length) {
232+
for (let i = 0; i < seriesArr.length; i++) {
233+
for (const actionObj of seriesArr[i].data.barStack) {
234+
if (actionObj.name === action) {
235+
actionObj.seriesName = seriesArr[i].name;
236+
actionsArr.push(actionObj);
237+
}
238+
}
239+
}
240+
}
241+
console.log(action)
242+
console.log('actionsArr', actionsArr)
243+
return actionsArr;
244+
}
245+
243246
const renderComparisonBargraph = () => {
244247
if (hierarchy && series) return (
245248
<BarGraphComparison

0 commit comments

Comments
 (0)