Skip to content

Commit e6126cb

Browse files
author
Matthew Grill
committed
Fixes initial state setup. Adjusts naming of Table exports.
1 parent 406d2ab commit e6126cb

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

src/components/05_pages/Permissions/Permissions.js

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import makeCancelable from 'makecancelable';
33
import { Markup } from 'interweave';
44

55
import Loading from '../../Helpers/Loading';
6-
import { Table, TableBody, TableHeaderSimple } from '../../UI/Table';
6+
import { Table, TBody, THead } from '../../UI/Table';
77

88
const Permissions = class Permissions extends Component {
99
state = {
@@ -28,12 +28,8 @@ const Permissions = class Permissions extends Component {
2828
])
2929
.then(([permissions, { data: roles }]) =>
3030
this.setState({
31-
rawPermissions: Object.keys(permissions).map(
32-
key => permissions[key],
33-
),
34-
renderablePermissions: Object.keys(permissions).map(
35-
key => permissions[key],
36-
),
31+
rawPermissions: permissions,
32+
renderablePermissions: permissions,
3733
changedRoles: [],
3834
// Move admin roles to the right.
3935
roles: roles.sort((a, b) => {
@@ -136,15 +132,15 @@ const Permissions = class Permissions extends Component {
136132
onKeyDown={this.handleKeyPress}
137133
/>
138134
<Table zebra>
139-
<TableHeaderSimple
135+
<THead
140136
data={[
141137
'PERMISSION',
142138
...this.state.roles.map(({ attributes: { label } }) =>
143139
label.toUpperCase(),
144140
),
145141
]}
146142
/>
147-
<TableBody
143+
<TBody
148144
rows={this.createTableRows(
149145
this.groupPermissions(this.state.renderablePermissions),
150146
this.state.roles,

src/components/UI/table.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,4 @@ TBODY.propTypes = {
7070
).isRequired,
7171
};
7272

73-
export {
74-
TR as TableRow,
75-
TD as TableData,
76-
TABLE as Table,
77-
TBODY as TableBody,
78-
THEAD as TableHeaderSimple,
79-
};
73+
export { TR, TD, TABLE as Table, TBODY as TBody, THEAD as THead };

0 commit comments

Comments
 (0)