Skip to content

fix(Table) clean up 'Expand collapse all' demo #8988

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 4 commits into from
May 23, 2023
Merged

fix(Table) clean up 'Expand collapse all' demo #8988

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb58c1d
fix(Table) clean up 'Expand collapse all' demo
dominik-petrik Apr 21, 2023
f5a9ebb
update allExpanded on single row toggle
dominik-petrik Apr 27, 2023
deddb1d
address outstanding comments
nicolethoen May 16, 2023
b582ffb
refactor collapse/expand all using effect
gitdallas May 18, 2023
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
194 changes: 88 additions & 106 deletions packages/react-table/src/docs/demos/table-demos/ExpandCollapseAll.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,17 @@
import React from 'react';
import { Card, Label, PageSection } from '@patternfly/react-core';
import { expandable } from '@patternfly/react-table';
import { Table, TableHeader, TableBody } from '@patternfly/react-table/deprecated';
import { Card, Label, PageSection, TextVariants, Text, TextContent } from '@patternfly/react-core';
import { Table, Thead, Tbody, Tr, Th, Td, ExpandableRowContent } from '@patternfly/react-table';
import DashboardWrapper from '@patternfly/react-core/src/demos/examples/DashboardWrapper';
import { TextVariants } from '@patternfly/react-core';

const expandableColumns = [
{
title: 'Servers',
cellFormatters: [expandable]
},
'Threads',
'Applications',
'Workspaces',
'Status'
];
const expandableColumns = ['Servers', 'Threads', 'Applications', 'Workspaces', 'Status'];

const serverData = [
{
name: 'US-Node 1',
threads: 18,
applications: 42,
workspaces: 7,
status: { title: <Label color="orange">Stopped</Label> },
status: { title: <Label color="green">Running</Label> },
details: (
<TextContent>
<Text component={TextVariants.p}>
Expand Down Expand Up @@ -121,101 +110,94 @@ const serverData = [

const initialExpandedServerNames = ['US-Node 2']; // Default to expanded

class ExpandCollapseAllTableDemo extends React.Component {
constructor(props) {
super(props);
this.state = {
isChecked: false,
selectedRows: 0,
expandedRows: 0,
expandCollapseToggle: 'expand',
collapseAllAriaLabel: 'Expand all',
expandedServerNames: initialExpandedServerNames
};
}

setServerExpanded = (server, isExpanding) => {
this.setState(() => {
const otherExpandedServerNames = this.state.expandedServerNames.filter(r => r !== server.name);
return {
expandedServerNames: isExpanding ? [...otherExpandedServerNames, server.name] : otherExpandedServerNames
};
});
};

render() {
const { collapseAllAriaLabel } = this.state;
const ExpandCollapseAllTableDemo = () => {
const [areAllExpanded, setAreAllExpanded] = React.useState(false);
const [collapseAllAriaLabel, setCollapseAllAriaLabel] = React.useState('Expand all');
const [expandedServerNames, setExpandedServerNames] = React.useState(initialExpandedServerNames);

const isServerExpanded = server => this.state.expandedServerNames.includes(server.name);
// We want to be able to reference the original data object based on row index. But because an expanded
// row takes up two row indexes, servers[rowIndex] will not be accurate like it would in a normal table.
// One solution to this is to create an array of data objects indexed by the displayed row index.
const serversByRowIndex = [];
React.useEffect(() => {
const allExpanded = expandedServerNames.length === serverData.length;
setAreAllExpanded(allExpanded);
setCollapseAllAriaLabel(allExpanded ? 'Collapse all' : 'Expand all');
}, [expandedServerNames]);

const rows = [];
serverData.forEach(server => {
rows.push({
...{ isOpen: isServerExpanded(server) },
cells: [server.name, server.threads, server.applications, server.workspaces, server.status]
});
serversByRowIndex.push(server);
if (server.details) {
const cells = [];

cells.push({
title: server.details
});
const setServerExpanded = (server, isExpanding) => {
const otherExpandedServerNames = expandedServerNames.filter((r) => r !== server.name);
Copy link
Contributor

@gitdallas gitdallas Apr 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should have a setAreAllExpanded here (or in an effect that looks at expandedServerNames) as toggling a single thing could affect that

setExpandedServerNames(isExpanding ? [...otherExpandedServerNames, server.name] : otherExpandedServerNames);
};

rows.push({
parent: rows.length - 1,
cells
});
serversByRowIndex.push(null);
}
});
const isServerExpanded = (server) => {
return expandedServerNames.includes(server.name);
};

const onCollapse = (_e, rowIndex, isOpen) => {
const collapseAll = rowIndex === undefined;
// We want to be able to reference the original data object based on row index. But because an expanded
// row takes up two row indexes, servers[rowIndex] will not be accurate like it would in a normal table.
// One solution to this is to create an array of data objects indexed by the displayed row index.

if (collapseAll) {
this.setState(() => {
return {
expandedServerNames: isOpen ? [...serverData.map((server) => server.name)] : []
};
});
const onCollapseAll = (_event, _rowIndex, isOpen) => {
setExpandedServerNames(isOpen ? [...serverData.map((server) => server.name)] : []);
};

}
else if (serversByRowIndex[rowIndex]) {
this.setServerExpanded(serversByRowIndex[rowIndex], isOpen);
}
}
return (
<React.Fragment>
<DashboardWrapper hasPageTemplateTitle>
<PageSection
padding={{
default: 'noPadding',
xl: 'padding'
}}
>
<Card component="div">
<Table aria-label="Collapsible table">
<Thead>
<Tr>
<Th
expand={{
areAllExpanded: !areAllExpanded,
collapseAllAriaLabel: collapseAllAriaLabel,
onToggle: onCollapseAll
}}
></Th>
{expandableColumns.map((column) => (
<Th key={column}>{column}</Th>
))}
</Tr>
</Thead>

return (
<React.Fragment>
<DashboardWrapper hasPageTemplateTitle>
<PageSection
padding={{
default: 'noPadding',
xl: 'padding'
}}
>
<Card component="div">
<Table
aria-label="Collapsible table"
onCollapse={onCollapse}
rows={rows}
cells={expandableColumns}
canCollapseAll={true}
collapseAllAriaLabel={collapseAllAriaLabel}
expandId="expand-collapse-all-demo"
>
<TableHeader />
<TableBody />
</Table>
</Card>
</PageSection>
</DashboardWrapper>
</React.Fragment>
);
}
}
{serverData.map((server, serverIndex) => (
<Tbody key={server.name} isExpanded={isServerExpanded(server)}>
<Tr>
<Td
expand={
server.details
? {
rowIndex: serverIndex,
isExpanded: isServerExpanded(server),
onToggle: () => setServerExpanded(server, !isServerExpanded(server))
}
: undefined
}
>
<ExpandableRowContent>{server.details}</ExpandableRowContent>
</Td>
<Td>{server?.name}</Td>
<Td>{server?.threads}</Td>
<Td>{server?.applications}</Td>
<Td>{server?.workspaces}</Td>
<Td>{server?.status?.title}</Td>
</Tr>
<Tr isExpanded={isServerExpanded(server)}>
<Td></Td>
<Td colSpan={expandableColumns.length}>
<ExpandableRowContent>{server?.details}</ExpandableRowContent>
</Td>
</Tr>
</Tbody>
))}
</Table>
</Card>
</PageSection>
</DashboardWrapper>
</React.Fragment>
);
};