@kineticdata/react 6.0.0 → 6.0.2

package/lib/components/system/spaces/SystemTenantForm.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SystemTenantForm = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
+var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _immutable = require("immutable");
 var _Form = require("../../form/Form");
 var _apis = require("../../../apis");
@@ -33,12 +35,24 @@ var dataSources = function dataSources(_ref) {
       transform: function transform(result) {
         return result.adapter;
       }
+    },
+    fileFields: {
+      fn: function fn() {
+        return {
+          mssql: ['sslrootcert', 'sslcert'],
+          oracle: ['serverCert', 'clientCert'],
+          postgres: ['sslrootcert', 'sslcert', 'sslkey']
+        };
+      },
+      params: []
     }
   };
 };
 var handleSubmit = function handleSubmit(_ref2) {
   var slug = _ref2.slug;
-  return function (values) {
+  return function (values, _ref3) {
+    var fileFields = _ref3.fileFields,
+      rawValues = _ref3.values;
     var authenticationSecret = values.get('authenticationSecret') ? {
       authenticationSecret: values.get('authenticationSecret')
     } : {};
@@ -48,49 +62,76 @@ var handleSubmit = function handleSubmit(_ref2) {
         replicas: parseInt(values.get('replicas'))
       }
     } : {};
-    var tenant = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, authenticationSecret), {}, {
+    var type = values.get('task_databaseAdapter_type');
+    var fileFieldsForType = fileFields.get(type);
+    // Only include values for file fields if the toggle field is true
+    var filterFn = function filterFn(value, key) {
+      return !fileFieldsForType.includes(key) || !!rawValues.get("".concat(type, "_change_").concat(key));
+    };
+    // Get adapter properties to save
+    var properties = (0, _helpers2.adapterProperties)(values, type, filterFn);
+    // If creating new, pass in file values from default adapter if not uploaded
+    if (!slug) {
+      properties = fileFieldsForType.reduce(function (props, field) {
+        if (typeof props[field] === 'undefined' && !!rawValues.getIn(["".concat(type, "_current_").concat(field), 'pem'])) {
+          return (0, _objectSpread3["default"])((0, _objectSpread3["default"])({}, props), {}, (0, _defineProperty2["default"])({}, field, new File([rawValues.getIn(["".concat(type, "_current_").concat(field), 'pem'])], "".concat(field, ".crt"), {
+            type: 'text/plain'
+          })));
+        }
+        return props;
+      }, properties);
+    }
+    var tenant = (0, _objectSpread3["default"])((0, _objectSpread3["default"])({}, authenticationSecret), {}, {
       space: {
         slug: values.get('slug'),
         name: values.get('name')
       },
-      task: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({
+      task: (0, _objectSpread3["default"])((0, _objectSpread3["default"])({
         autoCreateDatabase: values.get('task_autoCreateDatabase') ? 'true' : 'false'
       }, deployment), {}, {
         databaseAdapter: {
-          type: values.get('task_databaseAdapter_type'),
-          properties: (0, _helpers2.adapterProperties)(values, values.get('task_databaseAdapter_type'))
+          type: type,
+          properties: properties
         }
       }),
       users: values.get('users')
     });
+    var multipart = Object.entries(tenant.task.databaseAdapter.properties).some(function (_ref4) {
+      var _ref5 = (0, _slicedToArray2["default"])(_ref4, 2),
+        name = _ref5[0],
+        value = _ref5[1];
+      return value instanceof File;
+    });
     return slug ? (0, _apis.updateTenant)({
       slug: slug,
-      tenant: tenant
+      tenant: tenant,
+      multipart: multipart
     }).then((0, _Form2.handleFormErrors)('space', 'There was an error saving the Space.')) : (0, _apis.createTenant)({
-      tenant: tenant
+      tenant: tenant,
+      multipart: multipart
     }).then((0, _Form2.handleFormErrors)(null, 'There was an error saving the Space.'));
   };
 };
 var getSpaceValue = function getSpaceValue(tenant, key) {
   return tenant ? (0, _immutable.getIn)(tenant, ['space', key], '') : '';
 };
-var fields = function fields(_ref3) {
-  var slug = _ref3.slug;
-  return function (_ref4) {
-    var tenant = _ref4.tenant,
-      defaultTaskDbAdapter = _ref4.defaultTaskDbAdapter;
+var fields = function fields(_ref6) {
+  var slug = _ref6.slug;
+  return function (_ref7) {
+    var tenant = _ref7.tenant,
+      defaultTaskDbAdapter = _ref7.defaultTaskDbAdapter;
     return (tenant || !slug) && (defaultTaskDbAdapter || defaultTaskDbAdapter === null) && [
     // Top-level fields
     {
       name: 'authenticationSecret',
       label: 'Authentication Secret',
       type: 'password',
-      visible: function visible(_ref5) {
-        var values = _ref5.values;
+      visible: function visible(_ref8) {
+        var values = _ref8.values;
         return values.get('changeAuthenticationSecret');
       },
-      "transient": function transient(_ref6) {
-        var values = _ref6.values;
+      "transient": function transient(_ref9) {
+        var values = _ref9.values;
         return !values.get('changeAuthenticationSecret');
       },
       required: false
@@ -100,9 +141,9 @@ var fields = function fields(_ref3) {
       type: 'checkbox',
       "transient": true,
       initialValue: false,
-      onChange: function onChange(_ref7, _ref8) {
-        var values = _ref7.values;
-        var setValue = _ref8.setValue;
+      onChange: function onChange(_ref10, _ref11) {
+        var values = _ref10.values;
+        var setValue = _ref11.setValue;
         if (values.get('authenticationSecret') !== '') {
           setValue('authenticationSecret', '');
         }
@@ -114,9 +155,9 @@ var fields = function fields(_ref3) {
       label: 'Name',
       type: 'text',
       required: true,
-      onChange: function onChange(_ref9, _ref10) {
-        var values = _ref9.values;
-        var setValue = _ref10.setValue;
+      onChange: function onChange(_ref12, _ref13) {
+        var values = _ref12.values;
+        var setValue = _ref13.setValue;
         if (values.get('linked')) {
           setValue('slug', (0, _helpers.slugify)(values.get('name')), false);
         }
@@ -128,8 +169,8 @@ var fields = function fields(_ref3) {
       type: 'text',
       required: true,
       enabled: !slug,
-      onChange: function onChange(_bindings, _ref11) {
-        var setValue = _ref11.setValue;
+      onChange: function onChange(_bindings, _ref14) {
+        var setValue = _ref14.setValue;
         setValue('linked', false);
       },
       initialValue: getSpaceValue(tenant, 'slug')
@@ -149,7 +190,7 @@ var fields = function fields(_ref3) {
       label: 'Task Replica Count',
       type: 'text',
       required: !!slug,
-      initialValue: (0, _immutable.getIn)(tenant, ['task', 'deployment', 'replicas'], 1)
+      initialValue: (0, _immutable.getIn)(tenant, ['task', 'deployment', 'specReplicas'], 1)
       // pattern: /^\d+$/,
       // patternMessage:
       //   'You must provide a number of replicas desired.',
@@ -170,12 +211,12 @@ var fields = function fields(_ref3) {
       name: 'task_autoCreateDatabase',
       label: 'Auto-Create Database',
       type: 'checkbox',
-      visible: function visible(_ref12) {
-        var values = _ref12.values;
+      visible: function visible(_ref15) {
+        var values = _ref15.values;
         return values.get('task_databaseAdapter_type') === 'postgres';
       },
-      "transient": function transient(_ref13) {
-        var values = _ref13.values;
+      "transient": function transient(_ref16) {
+        var values = _ref16.values;
         return values.get('task_databaseAdapter_type') !== 'postgres';
       },
       initialValue: slug ? (0, _immutable.get)(tenant, ['task', 'autoCreateDatabase'], true) : true
@@ -222,8 +263,8 @@ var fields = function fields(_ref3) {
       required: true,
       enabled: true,
       visible: true,
-      constraint: function constraint(_ref14) {
-        var values = _ref14.values;
+      constraint: function constraint(_ref17) {
+        var values = _ref17.values;
         return values.get('passwordConfirmation') === values.get('password');
       },
       constraintMessage: 'Password Confirmation does not match'
@@ -233,8 +274,8 @@ var fields = function fields(_ref3) {
       type: null,
       visible: false,
       required: false,
-      serialize: function serialize(_ref15) {
-        var values = _ref15.values;
+      serialize: function serialize(_ref18) {
+        var values = _ref18.values;
         return [{
           username: values.get('username'),
           password: values.get('password'),
@@ -245,10 +286,9 @@ var fields = function fields(_ref3) {
     }]));
   };
 };
-var SystemTenantForm = (0, _Form.generateForm)({
+var SystemTenantForm = exports.SystemTenantForm = (0, _Form.generateForm)({
   formOptions: ['slug'],
   dataSources: dataSources,
   fields: fields,
   handleSubmit: handleSubmit
-});
-exports.SystemTenantForm = SystemTenantForm;
+});

package/lib/components/system/spaces/SystemTenantTable.js

@@ -216,10 +216,9 @@ var columns = [{
     return row.getIn(['space', 'trustedResourceDomains']);
   }
 }];
-var SystemTenantTable = (0, _Table.generateTable)({
+var SystemTenantTable = exports.SystemTenantTable = (0, _Table.generateTable)({
   columns: columns,
   filters: filters,
   dataSource: dataSource
 });
-exports.SystemTenantTable = SystemTenantTable;
 SystemTenantTable.displayName = 'SystemTenantTable';

package/lib/components/table/Table.js

@@ -5,16 +5,15 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.generateTable = exports.generateColumns = exports.extractColumnComponents = exports.buildTableHeaderRow = exports.buildTableHeaderCell = exports.buildTableHeader = exports.buildTableFooterRow = exports.buildTableFooterCells = exports.buildTableFooter = exports.buildTableBodyRows = exports.buildTableBodyCells = exports.buildTableBody = exports.buildTable = exports.Table = void 0;
+exports.sortColumns = exports.getToggleableColumns = exports.generateTable = exports.generateColumns = exports.extractColumnComponents = exports.buildTableHeaderRow = exports.buildTableHeaderCell = exports.buildTableHeader = exports.buildTableFooterRow = exports.buildTableFooterCells = exports.buildTableFooter = exports.buildTableBodyRows = exports.buildTableBodyCells = exports.buildTableBody = exports.buildTable = exports.Table = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inherits"));
 var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createSuper"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _react = _interopRequireWildcard(require("react"));
-var _recompose = require("recompose");
 var _immutable = require("immutable");
 var _ComponentConfigContext = require("../common/ComponentConfigContext");
 var _store = require("../../store");
@@ -46,7 +45,10 @@ var TableComponent = function TableComponent(props) {
       _filterFormKey = props.filterFormKey,
       count = props.count,
       extraData = props.extraData;
-    var table = buildTable(props);
+    var columnControl = buildColumnControl(props);
+    var table = buildTable((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, props), {}, {
+      columnControl: columnControl
+    }));
     var filter = components.FilterForm ? buildFilterForm(props) : buildFilterLayout(props);
     var pagination = buildPaginationControl(props);
     return children({
@@ -56,6 +58,7 @@ var TableComponent = function TableComponent(props) {
       filter: filter,
       appliedFilters: appliedFilters,
       pagination: pagination,
+      columnControl: columnControl,
       initializing: initializing,
       loading: loading,
       rows: rows,
@@ -283,7 +286,44 @@ var buildPaginationControl = function buildPaginationControl(props) {
     extraData: extraData
   });
 };
-var buildTable = function buildTable(props) {
+var getToggleableColumns = exports.getToggleableColumns = function getToggleableColumns(columns, columnSet, tableKey) {
+  return columns.reduce(function (list, column) {
+    var label = column.get('columnLabel') && column.get('columnLabel').trim() || column.get('title') && column.get('title').trim();
+    // Include all columns that have a columnLabel or title, and are toggleable
+    // or are in the initial columnSet
+    if (label && (column.get('toggleable') || columnSet.includes(column.get('value')))) {
+      return list.push((0, _immutable.Map)({
+        value: column.get('value'),
+        label: label,
+        checked: columnSet.includes(column.get('value')),
+        // Only enable the column toggle if it's toggleable, so that any
+        // non-toggleable columns that are in the initial column set will be
+        // shown but disabled in the control
+        enabled: !!column.get('toggleable'),
+        toggle: !!column.get('toggleable') ? onToggleColumn(tableKey, column.get('value')) : undefined
+      }));
+    }
+    return list;
+  }, (0, _immutable.List)());
+};
+var buildColumnControl = function buildColumnControl(props) {
+  var tableKey = props.tableKey,
+    columns = props.columns,
+    columnSet = props.columnSet,
+    components = props.components,
+    renderOptions = props.renderOptions,
+    tableOptions = props.tableOptions,
+    extraData = props.extraData;
+  var ColumnControl = components.ColumnControl;
+  return /*#__PURE__*/_react["default"].createElement(ColumnControl, {
+    tableKey: tableKey,
+    columns: getToggleableColumns(columns, columnSet, tableKey),
+    renderOptions: renderOptions,
+    tableOptions: tableOptions,
+    extraData: extraData
+  });
+};
+var buildTable = exports.buildTable = function buildTable(props) {
   var TableLayout = props.components.TableLayout;
   var header = buildTableHeader(props);
   var body = buildTableBody(props);
@@ -303,8 +343,7 @@ var buildTable = function buildTable(props) {
     extraData: props.extraData
   });
 };
-exports.buildTable = buildTable;
-var buildTableHeader = function buildTableHeader(props) {
+var buildTableHeader = exports.buildTableHeader = function buildTableHeader(props) {
   var Header = props.components.Header;
   var headerRow = buildTableHeaderRow(props);
   return props.omitHeader ? null : /*#__PURE__*/_react["default"].createElement(Header, {
@@ -315,8 +354,7 @@ var buildTableHeader = function buildTableHeader(props) {
     tableOptions: props.tableOptions
   });
 };
-exports.buildTableHeader = buildTableHeader;
-var buildTableHeaderRow = function buildTableHeaderRow(props) {
+var buildTableHeaderRow = exports.buildTableHeaderRow = function buildTableHeaderRow(props) {
   var components = props.components,
     rows = props.rows,
     columns = props.columns,
@@ -330,21 +368,22 @@ var buildTableHeaderRow = function buildTableHeaderRow(props) {
     tableOptions: props.tableOptions
   });
 };
-exports.buildTableHeaderRow = buildTableHeaderRow;
-var buildTableHeaderCell = function buildTableHeaderCell(props) {
+var buildTableHeaderCell = exports.buildTableHeaderCell = function buildTableHeaderCell(props) {
   return function (column, index) {
     var tableKey = props.tableKey,
       components = props.components,
       columnComponents = props.columnComponents,
       renderOptions = props.renderOptions,
       tableOptions = props.tableOptions,
-      appliedFilters = props.appliedFilters;
+      appliedFilters = props.appliedFilters,
+      columnControl = props.columnControl;
     var HeaderCell = columnComponents.getIn([column.get('value'), 'HeaderCell'], components.HeaderCell);
     var sorting = column === props.sortColumn && props.sortDirection;
     var sortable = props.sortable && column.get('sortable');
     return /*#__PURE__*/_react["default"].createElement(KeyWrapper, {
       key: "column-".concat(index)
     }, /*#__PURE__*/_react["default"].createElement(HeaderCell, {
+      columnControl: columnControl,
       onSortColumn: onSortColumn(tableKey, column),
       title: column.get('title'),
       renderOptions: renderOptions,
@@ -355,8 +394,7 @@ var buildTableHeaderCell = function buildTableHeaderCell(props) {
     }));
   };
 };
-exports.buildTableHeaderCell = buildTableHeaderCell;
-var buildTableBody = function buildTableBody(props) {
+var buildTableBody = exports.buildTableBody = function buildTableBody(props) {
   var Body = props.components.Body;
   var tableRows = buildTableBodyRows(props);
   return /*#__PURE__*/_react["default"].createElement(Body, {
@@ -369,8 +407,7 @@ var buildTableBody = function buildTableBody(props) {
     empty: props.rows.isEmpty()
   });
 };
-exports.buildTableBody = buildTableBody;
-var buildTableBodyRows = function buildTableBodyRows(props) {
+var buildTableBodyRows = exports.buildTableBodyRows = function buildTableBodyRows(props) {
   var components = props.components,
     rows = props.rows,
     columns = props.columns,
@@ -402,8 +439,7 @@ var buildTableBodyRows = function buildTableBodyRows(props) {
     error: props.error
   });
 };
-exports.buildTableBodyRows = buildTableBodyRows;
-var buildTableBodyCells = function buildTableBodyCells(props, row, rowIndex) {
+var buildTableBodyCells = exports.buildTableBodyCells = function buildTableBodyCells(props, row, rowIndex) {
   var tableKey = props.tableKey,
     components = props.components,
     rows = props.rows,
@@ -434,8 +470,7 @@ var buildTableBodyCells = function buildTableBodyCells(props, row, rowIndex) {
     }));
   });
 };
-exports.buildTableBodyCells = buildTableBodyCells;
-var buildTableFooter = function buildTableFooter(props) {
+var buildTableFooter = exports.buildTableFooter = function buildTableFooter(props) {
   var components = props.components,
     columnSet = props.columnSet,
     renderOptions = props.renderOptions,
@@ -452,8 +487,7 @@ var buildTableFooter = function buildTableFooter(props) {
     tableOptions: tableOptions
   }) : null;
 };
-exports.buildTableFooter = buildTableFooter;
-var buildTableFooterRow = function buildTableFooterRow(props) {
+var buildTableFooterRow = exports.buildTableFooterRow = function buildTableFooterRow(props) {
   var components = props.components,
     renderOptions = props.renderOptions,
     tableOptions = props.tableOptions;
@@ -465,8 +499,7 @@ var buildTableFooterRow = function buildTableFooterRow(props) {
     tableOptions: tableOptions
   });
 };
-exports.buildTableFooterRow = buildTableFooterRow;
-var buildTableFooterCells = function buildTableFooterCells(props) {
+var buildTableFooterCells = exports.buildTableFooterCells = function buildTableFooterCells(props) {
   var components = props.components,
     columns = props.columns,
     columnSet = props.columnSet,
@@ -484,7 +517,6 @@ var buildTableFooterCells = function buildTableFooterCells(props) {
     }));
   });
 };
-exports.buildTableFooterCells = buildTableFooterCells;
 var onNextPage = function onNextPage(tableKey) {
   return function () {
     return (0, _store.dispatch)('NEXT_PAGE', {
@@ -517,46 +549,93 @@ var onSortColumn = function onSortColumn(tableKey, column) {
     });
   };
 };
+var onToggleColumn = function onToggleColumn(tableKey, column) {
+  return function () {
+    return (0, _store.dispatch)('TOGGLE_COLUMN', {
+      tableKey: tableKey,
+      column: column
+    });
+  };
+};
 var mapStateToProps = function mapStateToProps() {
   return function (state, props) {
     return state.getIn(['tables', props.tableKey], (0, _immutable.Map)()).toObject();
   };
 };
-
-/**
- * @component
- */
-var TableImpl = (0, _recompose.compose)((0, _store.connect)(mapStateToProps), (0, _recompose.lifecycle)({
-  componentDidMount: function componentDidMount() {
-    if (this.props.mounted && !this.props.configured) {
-      (0, _Table.configureTable)(this.props);
+var TableImplComponent = /*#__PURE__*/function (_Component) {
+  (0, _inherits2["default"])(TableImplComponent, _Component);
+  var _super = (0, _createSuper2["default"])(TableImplComponent);
+  function TableImplComponent(props) {
+    (0, _classCallCheck2["default"])(this, TableImplComponent);
+    return _super.call(this, props);
+  }
+  (0, _createClass2["default"])(TableImplComponent, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      if (this.props.mounted && !this.props.configured) {
+        (0, _Table.configureTable)(this.props);
+      }
     }
-  },
-  componentDidUpdate: function componentDidUpdate() {
-    if (this.props.mounted && !this.props.configured) {
-      (0, _Table.configureTable)(this.props);
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate() {
+      if (this.props.mounted && !this.props.configured) {
+        (0, _Table.configureTable)(this.props);
+      }
     }
-  }
-}))(TableComponent);
-var generateColumns = function generateColumns(columns) {
+  }, {
+    key: "render",
+    value: function render() {
+      return /*#__PURE__*/_react["default"].createElement(TableComponent, this.props);
+    }
+  }]);
+  return TableImplComponent;
+}(_react.Component);
+var TableImpl = (0, _store.connect)(mapStateToProps)(TableImplComponent);
+var generateColumns = exports.generateColumns = function generateColumns(columns) {
   var addColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var alterColumns = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  return (0, _immutable.List)(addColumns).concat(columns).map(function (c) {
+  return (0, _immutable.List)(columns).concat(addColumns).map(function (c) {
     return (0, _immutable.Map)((0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, c), alterColumns[c.value]), {}, {
       value: c.value
     }));
   });
 };
-exports.generateColumns = generateColumns;
-var extractColumnComponents = function extractColumnComponents(columns) {
+var sortColumns = exports.sortColumns = function sortColumns(columns, columnSet) {
+  return columns
+  // First sort columns by the columnOrder value if provided
+  .sortBy(function (column) {
+    return column.get('columnOrder') === 'first' ? -1 : column.get('columnOrder') === 'last' ? 1 : 0;
+  })
+  // Next reduce the columns list into a list of groups, starting a new group
+  // each time we get to a column that's in the columnSet. This will result in
+  // each group having at most one columnSet column, and that column will be
+  // the first one in the group.
+  .reduce(function (list, column) {
+    return columnSet.includes(column.get('value')) ? list.push((0, _immutable.List)([column])) : list.update(-1, function (group) {
+      return group ? group.push(column) : (0, _immutable.List)([column]);
+    });
+  }, (0, _immutable.List)())
+  // Then sort the groups, taking the first column from each group, finding
+  // its index in the column set, and using that index as a sort value. Any
+  // groups without a columnSet column will be sorted to the end.
+  .sortBy(function (group) {
+    var columnSetIndex = columnSet.findIndex(function (c) {
+      return c === group.getIn([0, 'value']);
+    });
+    return columnSetIndex >= 0 ? columnSetIndex : columnSet.size + 1;
+  })
+  // Lastly flatten the groups back to a list of columns
+  .flatten(true);
+};
+var extractColumnComponents = exports.extractColumnComponents = function extractColumnComponents(columns) {
   return columns.filter(function (c) {
     return c.has('components');
   }).reduce(function (result, current) {
     return result.set(current.get('value'), current.get('components'));
   }, (0, _immutable.Map)());
 };
-exports.extractColumnComponents = extractColumnComponents;
-var generateTable = function generateTable(_ref4) {
+var generateTable = exports.generateTable = function generateTable(_ref4) {
   var _ref4$tableOptions = _ref4.tableOptions,
     tableOptions = _ref4$tableOptions === void 0 ? [] : _ref4$tableOptions,
     _ref4$filterDataSourc = _ref4.filterDataSources,
@@ -619,6 +698,7 @@ var generateTable = function generateTable(_ref4) {
       filterSet: props.filterSet,
       filterAutoFocus: props.filterAutoFocus,
       columnSet: props.columnSet,
+      columnSetOrder: props.columnSetOrder,
       pageSize: props.pageSize,
       defaultSortColumn: props.defaultSortColumn,
       defaultSortDirection: props.defaultSortDirection,
@@ -637,14 +717,13 @@ var generateTable = function generateTable(_ref4) {
     return /*#__PURE__*/_react["default"].createElement(Table, setProps, props.children);
   };
 };
-exports.generateTable = generateTable;
-var Table = /*#__PURE__*/function (_Component) {
-  (0, _inherits2["default"])(Table, _Component);
-  var _super = (0, _createSuper2["default"])(Table);
+var Table = exports.Table = /*#__PURE__*/function (_Component2) {
+  (0, _inherits2["default"])(Table, _Component2);
+  var _super2 = (0, _createSuper2["default"])(Table);
   function Table(props) {
     var _this;
     (0, _classCallCheck2["default"])(this, Table);
-    _this = _super.call(this, props);
+    _this = _super2.call(this, props);
     var components = props.components,
       tableKey = props.tableKey,
       config = (0, _objectWithoutProperties2["default"])(props, _excluded);
@@ -676,7 +755,7 @@ var Table = /*#__PURE__*/function (_Component) {
       var allColumns = columns.map(function (c) {
         return c.get('value');
       });
-      var columnSet = (0, _immutable.List)(this.props.columnSet ? typeof this.props.columnSet === 'function' ? this.props.columnSet(allColumns) : this.props.columnSet : allColumns).filter(function (c) {
+      var initialColumnSet = (0, _immutable.List)(this.props.columnSet ? typeof this.props.columnSet === 'function' ? this.props.columnSet(allColumns) : this.props.columnSet : allColumns).filter(function (c) {
         return columns.find(function (c2) {
           return c2.get('value') === c;
         });
@@ -686,8 +765,8 @@ var Table = /*#__PURE__*/function (_Component) {
         return /*#__PURE__*/_react["default"].createElement(TableImpl, Object.assign({}, _this2.props, {
           components: componentConfig.merge(_this2.props.components).toJS(),
           columnComponents: columnComponents,
-          columns: columns,
-          columnSet: columnSet,
+          columns: sortColumns(columns, initialColumnSet),
+          columnSet: initialColumnSet,
           tableKey: _this2.tableKey,
           auto: _this2.auto
         }), _this2.props.children);
@@ -696,7 +775,6 @@ var Table = /*#__PURE__*/function (_Component) {
   }]);
   return Table;
 }(_react.Component);
-exports.Table = Table;
 var defaultProps = {
   components: {},
   rows: (0, _immutable.List)([]),