Skip to content

Update MemoryRowGroup to use useState hook instead of being a class #3

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

Closed
mfitton wants to merge 3 commits into from
Closed

Update MemoryRowGroup to use useState hook instead of being a class #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e66b08
Update MemoryRowGroup to use useState hook instead of being a class
May 27, 2020
760b732
lint
May 27, 2020
4e01096
remove file added by mistake
May 27, 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
169 changes: 74 additions & 95 deletions python/ray/dashboard/client/src/pages/dashboard/memory/MemoryRowGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import AddIcon from "@material-ui/icons/Add";
import RemoveIcon from "@material-ui/icons/Remove";
import classNames from "classnames";
import React from "react";
import React, { useState } from "react";
import {
MemoryTableResponse,
MemoryTableEntry,
Expand Down Expand Up @@ -46,103 +46,82 @@ type Props = {
initialExpanded: boolean;
};

type State = {
expanded: boolean;
};

class MemoryRowGroup extends React.Component<
Props & WithStyles<typeof styles>,
State
> {
state: State = {
expanded: this.props.initialExpanded,
};

toggleExpand = () => {
this.setState((state) => ({
expanded: !state.expanded,
}));
};
const MemoryRowGroup = (props: Props & WithStyles<typeof styles>) => {
const { classes, groupKey, memoryTableGroups } = props;
const [expanded, setExpanded] = useState(props.initialExpanded);
const toggleExpanded = () => setExpanded(!expanded);

render() {
const { classes, groupKey, memoryTableGroups } = this.props;
const { expanded } = this.state;
const features = [
"node_ip_address",
"pid",
"type",
"object_id",
"object_size",
"reference_type",
"call_site",
];

const features = [
"node_ip_address",
"pid",
"type",
"object_id",
"object_size",
"reference_type",
"call_site",
];
const memoryTableGroup = memoryTableGroups[groupKey];
const entries: Array<MemoryTableEntry> = memoryTableGroup["entries"];
const summary: MemoryTableSummary = memoryTableGroup["summary"];

const memoryTableGroup = memoryTableGroups[groupKey];
const entries: Array<MemoryTableEntry> = memoryTableGroup["entries"];
const summary: MemoryTableSummary = memoryTableGroup["summary"];

return (
<React.Fragment>
<TableRow hover>
<TableCell
className={classNames(classes.cell, classes.expandCollapseCell)}
onClick={this.toggleExpand}
>
{!expanded ? (
<AddIcon className={classes.expandCollapseIcon} />
) : (
<RemoveIcon className={classes.expandCollapseIcon} />
)}
return (
<React.Fragment>
<TableRow hover>
<TableCell
className={classNames(classes.cell, classes.expandCollapseCell)}
onClick={toggleExpanded}
>
{!expanded ? (
<AddIcon className={classes.expandCollapseIcon} />
) : (
<RemoveIcon className={classes.expandCollapseIcon} />
)}
</TableCell>
{features.map((feature, index) => (
<TableCell className={classes.cell} key={index}>
{// TODO(sang): For now, it is always grouped by node_ip_address.
feature === "node_ip_address" ? groupKey : ""}
</TableCell>
{features.map((feature, index) => (
<TableCell className={classes.cell} key={index}>
{// TODO(sang): For now, it is always grouped by node_ip_address.
feature === "node_ip_address" ? groupKey : ""}
</TableCell>
))}
</TableRow>
{expanded && (
<React.Fragment>
<MemorySummary
initialExpanded={false}
memoryTableSummary={summary}
/>
{entries.map((memory_table_entry, index) => {
const object_size =
memory_table_entry.object_size === -1
? "?"
: memory_table_entry.object_size + " B";
return (
<TableRow hover key={index}>
<TableCell className={classes.cell} />
<TableCell className={classes.cell}>
{memory_table_entry.node_ip_address}
</TableCell>
<TableCell className={classes.cell}>
{memory_table_entry.pid}
</TableCell>
<TableCell className={classes.cell}>
{memory_table_entry.type}
</TableCell>
<TableCell className={classes.cell}>
{memory_table_entry.object_id}
</TableCell>
<TableCell className={classes.cell}>{object_size}</TableCell>
<TableCell className={classes.cell}>
{memory_table_entry.reference_type}
</TableCell>
<TableCell className={classes.cell}>
{memory_table_entry.call_site}
</TableCell>
</TableRow>
);
})}
</React.Fragment>
)}
</React.Fragment>
);
}
}
))}
</TableRow>
{expanded && (
<React.Fragment>
<MemorySummary initialExpanded={false} memoryTableSummary={summary} />
{entries.map((memory_table_entry, index) => {
const object_size =
memory_table_entry.object_size === -1
? "?"
: memory_table_entry.object_size + " B";
return (
<TableRow hover key={index}>
<TableCell className={classes.cell} />
<TableCell className={classes.cell}>
{memory_table_entry.node_ip_address}
</TableCell>
<TableCell className={classes.cell}>
{memory_table_entry.pid}
</TableCell>
<TableCell className={classes.cell}>
{memory_table_entry.type}
</TableCell>
<TableCell className={classes.cell}>
{memory_table_entry.object_id}
</TableCell>
<TableCell className={classes.cell}>{object_size}</TableCell>
<TableCell className={classes.cell}>
{memory_table_entry.reference_type}
</TableCell>
<TableCell className={classes.cell}>
{memory_table_entry.call_site}
</TableCell>
</TableRow>
);
})}
</React.Fragment>
)}
</React.Fragment>
);
};

export default withStyles(styles)(MemoryRowGroup);