Skip to content

Commit d4ffcf2

Browse files
kmiyauchikmiyauchi
authored
Merge pull request #101 from webdev-dev/master
 Make CascadingPane use new FilteredTable
2 parents 390ac18 + 37a6422 commit d4ffcf2

10 files changed

Lines changed: 156 additions & 76 deletions

File tree

‎lib/CascadingPane/CascadingPaneMainView.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var _LoadingComponent = require('../LoadingComponent/LoadingComponent');
2424

2525
var _LoadingComponent2 = _interopRequireDefault(_LoadingComponent);
2626

27-
var _FilteredTable = require('../FilteredTable/FilteredTable');
27+
var _FilteredTable = require('../FilteredTable/2/FilteredTable');
2828

2929
var _FilteredTable2 = _interopRequireDefault(_FilteredTable);
3030

@@ -228,14 +228,20 @@ var CascadingPaneMainView = function (_React$Component) {
228228
if (!navSelect) {
229229
return _react2.default.createElement(
230230
'div',
231-
{ className: (0, _classnames2.default)(className, 'cascading-pane-mainview'), key: key },
231+
{
232+
className: (0, _classnames2.default)(className, 'cascading-pane-mainview'),
233+
key: key
234+
},
232235
noneSelectedDisplay
233236
);
234237
}
235238

236239
return _react2.default.createElement(
237240
'div',
238-
{ className: (0, _classnames2.default)(className, 'cascading-pane-mainview'), key: key },
241+
{
242+
className: (0, _classnames2.default)(className, 'cascading-pane-mainview'),
243+
key: key
244+
},
239245
_react2.default.createElement(
240246
_LoadingComponent2.default,
241247
navFetch,

‎lib/CascadingPane/CascadingPaneNav.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var _LoadingComponent = require('../LoadingComponent/LoadingComponent');
2424

2525
var _LoadingComponent2 = _interopRequireDefault(_LoadingComponent);
2626

27-
var _FilteredTable = require('../FilteredTable/FilteredTable');
27+
var _FilteredTable = require('../FilteredTable/2/FilteredTable');
2828

2929
var _FilteredTable2 = _interopRequireDefault(_FilteredTable);
3030

@@ -185,7 +185,10 @@ var CascadingPaneNav = function (_React$Component) {
185185
name: 'Visibility',
186186
className: 'nav-group-visibility',
187187
display: function display(item) {
188-
return item[isHiddenField] ? _react2.default.createElement(_reactBootstrap.Glyphicon, { glyph: 'eye-close', title: 'Only visible to CUD administrators' }) : '';
188+
return item[isHiddenField] ? _react2.default.createElement(_reactBootstrap.Glyphicon, {
189+
glyph: 'eye-close',
190+
title: 'Only visible to CUD administrators'
191+
}) : '';
189192
}
190193
});
191194
}
@@ -204,7 +207,10 @@ var CascadingPaneNav = function (_React$Component) {
204207

205208
return _react2.default.createElement(
206209
'div',
207-
{ className: (0, _classnames2.default)(className, 'cascading-pane-nav'), key: key },
210+
{
211+
className: (0, _classnames2.default)(className, 'cascading-pane-nav'),
212+
key: key
213+
},
208214
headerDisplay,
209215
_react2.default.createElement(
210216
_LoadingComponent2.default,

‎lib/FilteredTable/1/FilteredTable.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var _TableBody = require('./TableBody');
1818

1919
var _TableBody2 = _interopRequireDefault(_TableBody);
2020

21-
var _searchUtil = require('../util/searchUtil');
21+
var _searchUtil = require('../../util/searchUtil');
2222

2323
var _searchUtil2 = _interopRequireDefault(_searchUtil);
2424

‎lib/FilteredTable/2/FilteredTable.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var _TableBody = require('./TableBody');
1818

1919
var _TableBody2 = _interopRequireDefault(_TableBody);
2020

21-
var _searchUtil = require('../util/searchUtil');
21+
var _searchUtil = require('../../util/searchUtil');
2222

2323
var _searchUtil2 = _interopRequireDefault(_searchUtil);
2424

‎lib/FormFields/renderFilterTable.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var _propTypes2 = _interopRequireDefault(_propTypes);
1616

1717
var _index = require('../index');
1818

19-
var _FilteredTable = require('../FilteredTable/FilteredTable');
19+
var _FilteredTable = require('../FilteredTable/1/FilteredTable');
2020

2121
var _FilteredTable2 = _interopRequireDefault(_FilteredTable);
2222

‎src/CascadingPane/CascadingPaneMainView.jsx‎

Lines changed: 54 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
44
import classNames from 'classnames';
55

66
import LoadingComponent from '../LoadingComponent/LoadingComponent';
7-
import FilteredTable from '../FilteredTable/FilteredTable';
7+
import FilteredTable from '../FilteredTable/2/FilteredTable';
88

99
class CascadingPaneMainView extends React.Component {
1010
constructor(props) {
@@ -19,10 +19,14 @@ class CascadingPaneMainView extends React.Component {
1919
filtered: [],
2020
showing: 0,
2121
dataWithClass: props.mainData
22-
? props.mainData.map((item) => {
22+
? props.mainData.map(item => {
2323
const newItem = JSON.parse(JSON.stringify(item));
24-
newItem.className = `member-item-${item[props.itemIdField]} ${
25-
item[props.itemIdField] === props.cascSelect ? 'active' : ''
24+
newItem.className = `member-item-${
25+
item[props.itemIdField]
26+
} ${
27+
item[props.itemIdField] === props.cascSelect
28+
? 'active'
29+
: ''
2630
}`;
2731
return newItem;
2832
})
@@ -68,10 +72,15 @@ class CascadingPaneMainView extends React.Component {
6872
if (!nextProps.cascSelect || cascSelect !== nextProps.cascSelect) {
6973
newState.curSelect = nextProps.cascSelect || '';
7074
newState.dataWithClass = nextProps.mainData
71-
? nextProps.mainData.map((item) => {
75+
? nextProps.mainData.map(item => {
7276
const newItem = JSON.parse(JSON.stringify(item));
73-
newItem.className = `member-item-${item[nextProps.itemIdField]} ${
74-
item[nextProps.itemIdField] === nextProps.cascSelect ? 'active' : ''
77+
newItem.className = `member-item-${
78+
item[nextProps.itemIdField]
79+
} ${
80+
item[nextProps.itemIdField] ===
81+
nextProps.cascSelect
82+
? 'active'
83+
: ''
7584
}`;
7685
return newItem;
7786
})
@@ -80,21 +89,29 @@ class CascadingPaneMainView extends React.Component {
8089
} else if (nextProps.cascSelect) {
8190
newState.curSelect = nextProps.cascSelect;
8291
newState.dataWithClass = nextProps.mainData
83-
? nextProps.mainData.map((item) => {
92+
? nextProps.mainData.map(item => {
8493
const newItem = JSON.parse(JSON.stringify(item));
85-
newItem.className = `member-item-${item[nextProps.itemIdField]} ${
86-
item[nextProps.itemIdField] === nextProps.cascSelect ? 'active' : ''
94+
newItem.className = `member-item-${
95+
item[nextProps.itemIdField]
96+
} ${
97+
item[nextProps.itemIdField] === nextProps.cascSelect
98+
? 'active'
99+
: ''
87100
}`;
88101
return newItem;
89102
})
90103
: [];
91104
}
92105
if (JSON.stringify(mainData) !== nextProps.mainData) {
93106
newState.dataWithClass = nextProps.mainData
94-
? nextProps.mainData.map((item) => {
107+
? nextProps.mainData.map(item => {
95108
const newItem = JSON.parse(JSON.stringify(item));
96-
newItem.className = `member-item-${item[nextProps.itemIdField]} ${
97-
item[nextProps.itemIdField] === nextProps.cascSelect ? 'active' : ''
109+
newItem.className = `member-item-${
110+
item[nextProps.itemIdField]
111+
} ${
112+
item[nextProps.itemIdField] === nextProps.cascSelect
113+
? 'active'
114+
: ''
98115
}`;
99116
return newItem;
100117
})
@@ -115,7 +132,9 @@ class CascadingPaneMainView extends React.Component {
115132
curSelect !== prevState.curSelect ||
116133
JSON.stringify(mainData) !== JSON.stringify(prevProps.mainData)
117134
) {
118-
const memberSelected = mainData.filter(item => item[itemIdField] === curSelect);
135+
const memberSelected = mainData.filter(
136+
item => item[itemIdField] === curSelect,
137+
);
119138
updateMemberSelect(memberSelected[0]);
120139
}
121140
}
@@ -138,7 +157,9 @@ class CascadingPaneMainView extends React.Component {
138157
`cascSelect=${item[itemIdField]}`,
139158
);
140159
} else {
141-
window.location.href = `${window.location.href}&cascSelect=${item[itemIdField]}`;
160+
window.location.href = `${window.location.href}&cascSelect=${
161+
item[itemIdField]
162+
}`;
142163
}
143164
}
144165
}
@@ -197,14 +218,20 @@ class CascadingPaneMainView extends React.Component {
197218

198219
if (!navSelect) {
199220
return (
200-
<div className={classNames(className, 'cascading-pane-mainview')} key={key}>
221+
<div
222+
className={classNames(className, 'cascading-pane-mainview')}
223+
key={key}
224+
>
201225
{noneSelectedDisplay}
202226
</div>
203227
);
204228
}
205229

206230
return (
207-
<div className={classNames(className, 'cascading-pane-mainview')} key={key}>
231+
<div
232+
className={classNames(className, 'cascading-pane-mainview')}
233+
key={key}
234+
>
208235
<LoadingComponent {...navFetch}>
209236
<LoadingComponent {...mainViewFetch}>
210237
<div className="cascading-pane-mainview-summary">
@@ -232,16 +259,23 @@ class CascadingPaneMainView extends React.Component {
232259
{fetchedMainView && (
233260
<FilteredTable
234261
className={tableClassName}
235-
searchTerm={visibilityFilter.category.searchTerm || ''}
236-
filterList={getFilters(visibilityFilter.category)}
262+
searchTerm={
263+
visibilityFilter.category.searchTerm ||
264+
''
265+
}
266+
filterList={getFilters(
267+
visibilityFilter.category,
268+
)}
237269
data={dataWithClass}
238270
itemFormat={mainViewItemFormat}
239271
onSelectionChange={this.onSelectionChange}
240272
onResultsNumUpdate={results =>
241273
this.setState({ showing: results })
242274
}
243275
rowClickable
244-
onRowClick={item => this.onHandleClick(item)}
276+
onRowClick={item =>
277+
this.onHandleClick(item)
278+
}
245279
selectable
246280
simpleSearch
247281
wholeWord

0 commit comments

Comments
 (0)