Merge pull request #95 from kylekim-oicr/master

Cascading pane main view config button

Author: culturedbarbarian

lib/CascadingPane/CascadingPaneMainView.js

@@ -209,10 +209,14 @@ var CascadingPaneMainView = function (_React$Component) {
                 dataWithClass = _state.dataWithClass;
 
 
-            var itemDisplayFormat = itemDisplay || [];
+            var mainViewItemFormat = [];
+
+            if (itemDisplay) {
+                mainViewItemFormat = mainViewItemFormat.concat(itemDisplay);
+            }
 
             if (itemConfig) {
-                itemDisplayFormat.push({
+                mainViewItemFormat.push({
                     name: 'actions',
                     className: 'td-actions',
                     display: function display(item) {
@@ -270,7 +274,7 @@ var CascadingPaneMainView = function (_React$Component) {
                                 searchTerm: visibilityFilter.category.searchTerm || '',
                                 filterList: getFilters(visibilityFilter.category),
                                 data: dataWithClass,
-                                itemFormat: itemDisplayFormat,
+                                itemFormat: mainViewItemFormat,
                                 onSelectionChange: this.onSelectionChange,
                                 onResultsNumUpdate: function onResultsNumUpdate(results) {
                                     return _this2.setState({ showing: results });

src/CascadingPane/CascadingPaneMainView.jsx

@@ -169,10 +169,14 @@ class CascadingPaneMainView extends React.Component {
         } = this.props;
         const { navSelect, fetchedNav, fetchedMainView, showing, dataWithClass } = this.state;
 
-        const itemDisplayFormat = itemDisplay || [];
+        let mainViewItemFormat = [];
+
+        if (itemDisplay) {
+            mainViewItemFormat = mainViewItemFormat.concat(itemDisplay);
+        }
 
         if (itemConfig) {
-            itemDisplayFormat.push({
+            mainViewItemFormat.push({
                 name: 'actions',
                 className: 'td-actions',
                 display: item =>
@@ -225,7 +229,7 @@ class CascadingPaneMainView extends React.Component {
                                     searchTerm={visibilityFilter.category.searchTerm || ''}
                                     filterList={getFilters(visibilityFilter.category)}
                                     data={dataWithClass}
-                                    itemFormat={itemDisplayFormat}
+                                    itemFormat={mainViewItemFormat}
                                     onSelectionChange={this.onSelectionChange}
                                     onResultsNumUpdate={results =>
                                         this.setState({ showing: results })