Skip to content

Commit 57efe94

Browse files
authored
Merge pull request code-dot-org#10300 from code-dot-org/upgrade-reactabular
Upgraded reactabular to v2.0.3
2 parents d52857e + f3ff333 commit 57efe94

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

apps/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
"react-storybook-addon-add-stories-group": "0.1.0",
144144
"react-virtualized": "^7.19.4",
145145
"react-virtualized-select": "^1.3.0",
146-
"reactabular": "^1.0.0",
146+
"reactabular": "^2.0.3",
147147
"redux": "^3.3.1",
148148
"redux-logger": "^2.6.1",
149149
"redux-thunk": "^2.0.1",

apps/src/netsim/NetSimLogBrowserTable.jsx

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,87 +88,94 @@ const NetSimLogBrowserTable = React.createClass({
8888
let columns = [];
8989

9090
columns.push({
91+
property: 'timestamp',
9192
header: {
9293
label: 'Time',
9394
transforms: [sortable],
9495
props: {style: style.nowrap}
9596
},
9697
cell: {
97-
property: 'timestamp',
9898
format: timeFormatter,
9999
props: {style: style.nowrapTd}
100100
}
101101
});
102102

103103
if (this.props.teacherView) {
104104
columns.push({
105+
property: 'sent-by',
105106
header: {
106107
label: 'Sent By',
107108
transforms: [sortable],
108109
props: {style: style.nowrap}
109110
},
110-
cell: {property: 'sent-by', props: {style: style.nowrapTd}}
111+
cell: {props: {style: style.nowrapTd}}
111112
});
112113
}
113114

114115
columns.push({
116+
property: 'logged-by',
115117
header: {
116118
label: 'Logged By',
117119
transforms: [sortable],
118120
props: {style: style.nowrap}
119121
},
120-
cell: {property: 'logged-by', props: {style: style.nowrapTd}}
122+
cell: {props: {style: style.nowrapTd}}
121123
});
122124

123125
columns.push({
126+
property: 'status',
124127
header: {
125128
label: 'Status',
126129
transforms: [sortable],
127130
props: {style: style.nowrap}
128131
},
129-
cell: {property: 'status', props: {style: style.nowrapTd}}
132+
cell: {props: {style: style.nowrapTd}}
130133
});
131134

132135
if (showFromAddress) {
133136
columns.push({
137+
property: 'from-address',
134138
header: {
135139
label: 'From',
136140
transforms: [sortable],
137141
props: {style: style.nowrap}
138142
},
139-
cell: {property: 'from-address', props: {style: style.nowrapTd}}
143+
cell: {props: {style: style.nowrapTd}}
140144
});
141145
}
142146

143147
if (showToAddress) {
144148
columns.push({
149+
property: 'to-address',
145150
header: {
146151
label: 'To',
147152
transforms: [sortable],
148153
props: {style: style.nowrap}
149154
},
150-
cell: {property: 'to-address', props: {style: style.nowrapTd}}
155+
cell: {props: {style: style.nowrapTd}}
151156
});
152157
}
153158

154159
if (showPacketInfo) {
155160
columns.push({
161+
property: 'packet-info',
156162
header: {
157163
label: 'Packet',
158164
transforms: [sortable],
159165
props: {style: style.nowrap}
160166
},
161-
cell: {property: 'packet-info', props: {style: style.nowrapTd}}
167+
cell: {props: {style: style.nowrapTd}}
162168
});
163169
}
164170

165171
columns.push({
172+
property: 'message',
166173
header: {
167174
label: 'Message',
168175
transforms: [sortable],
169176
props: {style: style.nowrap}
170177
},
171-
cell: {property: 'message', props: {style: style.prewrapTd}}
178+
cell: {props: {style: style.prewrapTd}}
172179
});
173180

174181
const {logRows} = this.props;

0 commit comments

Comments
 (0)