@kineticdata/react 6.0.4 → 6.1.0

package/lib/components/common/ToastContainer.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.showToast = exports.hideToast = exports.clearToasts = exports.ToastState = exports.ToastContainer = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _store = require("../../store");
@@ -51,22 +52,40 @@ var ToastState = exports.ToastState = (0, _immutable.Record)({
   }
 });
 
-// Adds toast to state and shows it after 100ms delay to trigger animation
-var showToast = exports.showToast = function showToast(toast) {
+/**
+ * @param {object} toast Options for the toast
+ * @param {'success'|'error'} [presetType] Preset for styles
+ */
+var showToast = exports.showToast = function showToast(toast, presetType) {
+  // If presetType is provided, add some default toast properties
+  if (presetType) return showToast((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, presetType === 'success' ? {
+    color: 'success',
+    icon: 'check-circle'
+  } : presetType === 'error' ? {
+    color: 'danger',
+    icon: 'alert-circle'
+  } : {}), toast));
   var toastKey = (0, _react2.generateKey)();
-  (0, _store.dispatch)('ADD_TOAST', {
+  var payload = {
     containerKey: toast.containerKey,
     toast: ToastState(toast).update(
     // Make sure duration is a number, or set to a default numeric value
     'duration', function (duration) {
-      return typeof duration === 'number' ? Math.max(duration, 4000) : toast.content ? 7000 : 4000;
+      return typeof duration === 'number' ? Math.max(duration, 4000) : toast.title && toast.content ? 7000 : 4000;
     }),
     toastKey: toastKey,
     show: false
-  });
+  };
+  // Use set timeout so that if we're redirecting and showing a toast, the
+  // toast is added second so that it's not immediately cleared by the redirect
   setTimeout(function () {
-    (0, _store.dispatch)('SHOW_TOAST', toastKey);
-  }, 100);
+    (0, _store.dispatch)('ADD_TOAST', payload);
+    // Use set timeout to delay showing the toast by 100ms so that it renders
+    // into the dom before being shown so it animates correctly
+    setTimeout(function () {
+      (0, _store.dispatch)('SHOW_TOAST', toastKey);
+    }, 100);
+  }, 0);
   return toastKey;
 };
 
@@ -103,13 +122,18 @@ var ToastWrapper = function ToastWrapper(_ref) {
   }), content);
 };
 var ToastContainerComponent = function ToastContainerComponent(_ref2) {
-  var components = _ref2.components,
+  var containerKey = _ref2.containerKey,
+    components = _ref2.components,
     toasts = _ref2.toasts,
     persistentToasts = _ref2.persistentToasts;
   (0, _react.useEffect)(function () {
     (0, _store.dispatch)('INIT_TOASTS');
-    return function () {};
-  }, []);
+    return function () {
+      if (containerKey) {
+        (0, _store.dispatch)('CLEAR_TOASTS', containerKey);
+      }
+    };
+  }, [containerKey]);
   return /*#__PURE__*/_react["default"].createElement(_ComponentConfigContext.ComponentConfigContext.Consumer, null, function (componentConfig) {
     var component = (0, _immutable.get)(components, 'Toast', componentConfig.get('Toast'));
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/common/Typeahead.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Typeahead = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/assertThisInitialized"));
@@ -64,6 +65,7 @@ var Typeahead = exports.Typeahead = /*#__PURE__*/function (_React$Component) {
           error = _ref2.error,
           nextPageToken = _ref2.nextPageToken;
         if (searchedValue === _this.state.searchValue) {
+          var _this$props$action;
           // when multiple mode is enabled we don't want to allow the same
           // suggestion to be selected twice, we compare existing selections to
           // suggestions using the getSuggestionValue function that returns a string
@@ -81,11 +83,17 @@ var Typeahead = exports.Typeahead = /*#__PURE__*/function (_React$Component) {
           filtered.filter(function (suggestion) {
             return _this.props.getSuggestionValue(suggestion) === _this.state.searchValue;
           }).length === 0 && (0, _immutable.fromJS)(_this.props.custom(_this.state.searchValue));
+
+          // If an action object was provided, create a suggestion that will be
+          // used to trigger this action
+          var actionSuggestion = typeof ((_this$props$action = _this.props.action) === null || _this$props$action === void 0 ? void 0 : _this$props$action.fn) === 'function' && (0, _immutable.fromJS)((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _this.props.action), {}, {
+            __isAction: true
+          }));
           _this.setState({
             result: {
               error: error,
               nextPageToken: nextPageToken,
-              suggestions: customSuggestion ? [].concat((0, _toConsumableArray2["default"])(filtered), [customSuggestion]) : filtered,
+              suggestions: [].concat((0, _toConsumableArray2["default"])(filtered), [customSuggestion, actionSuggestion]).filter(Boolean),
               customSuggestion: customSuggestion
             }
           });
@@ -109,7 +117,7 @@ var Typeahead = exports.Typeahead = /*#__PURE__*/function (_React$Component) {
           editing: true,
           searchValue: searchValue
         });
-      } else if (!_this.props.multiple) {
+      } else if (!_this.props.multiple && !!searchValue) {
         _this.setState({
           refocus: true
         });
@@ -145,7 +153,13 @@ var Typeahead = exports.Typeahead = /*#__PURE__*/function (_React$Component) {
           searchValue: ''
         } : initialState);
       }
-      _this.props.onChange(_this.props.multiple ? _this.props.value.push(suggestion) : suggestion);
+      // If this is an action suggestion, trigger the action and skip triggering
+      // the on change event
+      if (suggestion.get('__isAction')) {
+        suggestion.get('fn')();
+      } else {
+        _this.props.onChange(_this.props.multiple ? _this.props.value.push(suggestion) : suggestion);
+      }
     };
     _this.state = initialState;
     _this.autosuggest = /*#__PURE__*/(0, _react.createRef)();
@@ -240,6 +254,7 @@ function renderSuggestionsContainer(_ref5) {
   var containerProps = _ref5.containerProps,
     children = _ref5.children;
   var _this$props2 = this.props,
+    action = _this$props2.action,
     _this$props2$componen = _this$props2.components,
     _this$props2$componen2 = _this$props2$componen.Status,
     Status = _this$props2$componen2 === void 0 ? StatusDefault : _this$props2$componen2,
@@ -258,11 +273,14 @@ function renderSuggestionsContainer(_ref5) {
     setSearchField: setSearchField,
     error: state.result && state.result.error,
     value: state.searchValue,
-    empty: state.result && state.result.suggestions.length === 0,
+    empty: state.result && !state.result.suggestions.some(function (suggestion) {
+      return !suggestion.get('__isAction');
+    }),
     more: state.result && !!state.result.nextPageToken,
     "short": minSearchLength && state.searchValue.length < minSearchLength,
     pending: !state.result,
-    custom: !!custom
+    custom: !!custom,
+    action: !!action
   })), children);
 }
 
@@ -270,24 +288,38 @@ function renderSuggestionsContainer(_ref5) {
 function renderSuggestion(suggestion, _ref6) {
   var isHighlighted = _ref6.isHighlighted;
   var _this$props3 = this.props,
-    _this$props3$componen = _this$props3.components.Suggestion,
-    Suggestion = _this$props3$componen === void 0 ? SuggestionDefault : _this$props3$componen,
+    _this$props3$componen = _this$props3.components,
+    _this$props3$componen2 = _this$props3$componen.Suggestion,
+    Suggestion = _this$props3$componen2 === void 0 ? SuggestionDefault : _this$props3$componen2,
+    _this$props3$componen3 = _this$props3$componen.SuggestionAction,
+    SuggestionAction = _this$props3$componen3 === void 0 ? SuggestionDefault : _this$props3$componen3,
     getSuggestionValue = _this$props3.getSuggestionValue;
   var custom = this.state.result && this.state.result.customSuggestion === suggestion;
-  return /*#__PURE__*/_react["default"].createElement(Suggestion, {
+  var action = !!suggestion.get('__isAction');
+  return !action ? /*#__PURE__*/_react["default"].createElement(Suggestion, {
     active: isHighlighted,
     custom: custom,
     suggestion: suggestion,
     suggestionValue: getSuggestionValue(suggestion)
-  });
+  }) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("hr", null), /*#__PURE__*/_react["default"].createElement(SuggestionAction, {
+    active: isHighlighted,
+    custom: custom,
+    suggestion: suggestion,
+    suggestionValue: suggestion.get('label')
+  }));
 }
 
 // https://github.com/moroshko/react-autosuggest#renderinputcomponent-optional
 function renderInputComponent(inputProps) {
-  var _this$props$component2 = this.props.components.Input,
-    Input = _this$props$component2 === void 0 ? TypeaheadInputDefault : _this$props$component2;
+  var _this$props4 = this.props,
+    _this$props4$componen = _this$props4.components.Input,
+    Input = _this$props4$componen === void 0 ? TypeaheadInputDefault : _this$props4$componen,
+    invalid = _this$props4.invalid,
+    minSearchLength = _this$props4.minSearchLength;
   return /*#__PURE__*/_react["default"].createElement(Input, {
-    inputProps: inputProps
+    inputProps: inputProps,
+    invalid: invalid,
+    minSearchLength: minSearchLength
   });
 }
 
@@ -296,16 +328,18 @@ function renderInputComponent(inputProps) {
 function renderSelections() {
   var edit = this.edit,
     focusRef = this.focusRef,
-    _this$props4 = this.props,
-    _this$props4$componen = _this$props4.components.Selection,
-    Selection = _this$props4$componen === void 0 ? SelectionDefault : _this$props4$componen,
-    disabled = _this$props4.disabled,
-    getSuggestionValue = _this$props4.getSuggestionValue,
-    multiple = _this$props4.multiple,
-    value = _this$props4.value,
-    placeholder = _this$props4.placeholder,
-    id = _this$props4.id,
-    form = _this$props4.form,
+    _this$props5 = this.props,
+    _this$props5$componen = _this$props5.components.Selection,
+    Selection = _this$props5$componen === void 0 ? SelectionDefault : _this$props5$componen,
+    disabled = _this$props5.disabled,
+    getSuggestionValue = _this$props5.getSuggestionValue,
+    multiple = _this$props5.multiple,
+    value = _this$props5.value,
+    placeholder = _this$props5.placeholder,
+    id = _this$props5.id,
+    form = _this$props5.form,
+    invalid = _this$props5.invalid,
+    minSearchLength = _this$props5.minSearchLength,
     remove = this.remove;
   return (multiple ? value : _immutable.List.of(value)).map(function (selection, i) {
     var suggestionValue = getSuggestionValue(selection);
@@ -319,7 +353,9 @@ function renderSelections() {
       suggestionValue: suggestionValue,
       placeholder: !multiple ? placeholder : null,
       id: !multiple ? id : null,
-      form: form
+      invalid: invalid,
+      form: form,
+      minSearchLength: minSearchLength
     });
   });
 }

package/lib/components/common/UserSelect.js

@@ -112,6 +112,7 @@ var UserSelect = exports.UserSelect = function UserSelect(props) {
     onBlur: props.onBlur,
     placeholder: props.placeholder,
     id: props.id,
-    form: props.form
+    form: props.form,
+    invalid: props.invalid
   });
 };

package/lib/components/common/authentication/RequestInterceptor.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
-var tokenEndpointPattern = /\/app\/(loghub|system-coordinator)\/(refresh|components|api\/v\d)/;
+var tokenEndpointPattern = /\/app\/(loghub|system-coordinator|integrator)\/(refresh|components|api)/;
 var RequestInterceptor = exports["default"] = /*#__PURE__*/function () {
   function RequestInterceptor(store) {
     (0, _classCallCheck2["default"])(this, RequestInterceptor);

package/lib/components/core/attribute_definition/AttributeDefinitionForm.js

@@ -23,6 +23,9 @@ var dataSources = function dataSources(_ref) {
       }],
       transform: function transform(result) {
         return result.attributeDefinition;
+      },
+      errorTransform: function errorTransform(result) {
+        return result.error;
       }
     }
   };

package/lib/components/core/bridge_model/BridgeModelTable.js

@@ -56,6 +56,25 @@ var columns = [{
   title: 'Status',
   sortable: true,
   toggleable: true
+}, {
+  value: 'createdAt',
+  title: 'Created At',
+  sortable: true,
+  toggleable: true
+}, {
+  value: 'createdBy',
+  title: 'Created By',
+  toggleable: true
+}, {
+  value: 'updatedAt',
+  title: 'Updated At',
+  toggleable: true,
+  sortable: true
+}, {
+  value: 'updatedBy',
+  title: 'Updated By',
+  toggleable: true,
+  sortable: true
 }];
 var BridgeModelTable = exports.BridgeModelTable = (0, _Table.generateTable)({
   columns: columns,

package/lib/components/core/bridge_model_attribute/BridgeModelAttributeForm.js

@@ -87,15 +87,12 @@ var fields = function fields(_ref6) {
       language: 'js-template',
       required: true,
       initialValue: bridgeModelAttribute && bridgeModelAttribute.get('structureField') || '',
-      options: {
-        'Add Field': {
-          value: 'fields("NAME")',
-          selection: {
-            start: 8,
-            end: 12
-          }
-        }
-      }
+      options: [{
+        label: 'fields',
+        type: 'function',
+        quoteType: 'double',
+        detail: 'Add Field Mapping'
+      }]
     }];
   };
 };

package/lib/components/core/bridge_model_attribute/BridgeModelAttributeTable.js

@@ -71,9 +71,6 @@ var dataSource = function dataSource(_ref5) {
     transform: transform
   };
 };
-
-// const filters = () => () => [{ name: 'name', label: 'Name', type: 'text' }];
-
 var columns = [{
   value: 'name',
   title: 'Name',
@@ -85,7 +82,6 @@ var columns = [{
 }];
 var BridgeModelAttributeTable = exports.BridgeModelAttributeTable = (0, _Table.generateTable)({
   columns: columns,
-  // filters,
   dataSource: dataSource,
   tableOptions: ['modelName']
 });

package/lib/components/core/bridge_model_qualification/BridgeModelQualificationForm.js

@@ -122,18 +122,15 @@ var fields = function fields(_ref6) {
       name: 'query',
       label: 'Query',
       type: 'code',
-      language: 'js-template',
+      language: 'text',
       required: false,
       initialValue: bridgeModelQualificationMapping && bridgeModelQualificationMapping.get('query') || '',
-      options: {
-        'Add Parameter': {
-          value: 'parameters("NAME")',
-          selection: {
-            start: 12,
-            end: 16
-          }
-        }
-      }
+      options: [{
+        label: 'parameters',
+        type: 'function',
+        quoteType: 'double',
+        detail: 'Add Parameter'
+      }]
     }];
   };
 };

package/lib/components/core/bridge_model_qualification/BridgeModelQualificationTable.js

@@ -11,8 +11,6 @@ var _apis = require("../../../apis");
 var _helpers = require("../../../helpers");
 var clientSide = (0, _helpers.defineFilter)(true).startsWith('name', 'name').equals('resultType', 'resultType').end();
 
-// const resultTypes = ['Single', 'Multiple'];
-
 // Handles bridge model api response by checking for error and also returning
 // error if active mapping is not present. If valid returns object with the
 // attributes and their mappings.
@@ -73,31 +71,20 @@ var dataSource = function dataSource(_ref5) {
     transform: transform
   };
 };
-
-// const filters = () => () => [
-//   { name: 'name', label: 'Name', type: 'text' },
-//   {
-//     name: 'resultType',
-//     label: 'Result Type',
-//     type: 'select',
-//     options: resultTypes.map(el => ({ label: el, value: el })),
-//   },
-// ];
-
 var columns = [{
   value: 'name',
   title: 'Name',
   sortable: true
 }, {
   value: 'resultType',
-  title: 'Result Type'
+  title: 'Result Type',
+  sortable: true
 }, {
   value: 'query',
   title: 'Query'
 }];
 var BridgeModelQualificationTable = exports.BridgeModelQualificationTable = (0, _Table.generateTable)({
   columns: columns,
-  // filters,
   dataSource: dataSource,
   tableOptions: ['modelName']
 });

package/lib/components/core/category/CategoryForm.js

@@ -22,6 +22,9 @@ var dataSources = function dataSources(_ref) {
       }],
       transform: function transform(result) {
         return result.category;
+      },
+      errorTransform: function errorTransform(result) {
+        return result.error;
       }
     },
     attributeDefinitions: {
@@ -77,7 +80,7 @@ var fields = function fields(_ref4) {
       name: 'slug',
       label: 'Slug',
       type: 'text',
-      required: false,
+      required: true,
       initialValue: category ? category.get('slug') : '',
       onChange: function onChange(_bindings, _ref8) {
         var setValue = _ref8.setValue;

package/lib/components/core/category/CategoryTable.js

@@ -54,7 +54,7 @@ var columns = [{
   toggleable: true
 }, {
   value: 'createdAt',
-  title: 'Created',
+  title: 'Created At',
   sortable: true,
   toggleable: true
 }, {
@@ -64,7 +64,7 @@ var columns = [{
   toggleable: true
 }, {
   value: 'updatedAt',
-  title: 'Updated',
+  title: 'Updated At',
   sortable: true,
   toggleable: true
 }, {

package/lib/components/core/core_form/CoreForm.js

@@ -13,6 +13,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inhe
 var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createSuper"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _lodash = _interopRequireDefault(require("lodash.isplainobject"));
@@ -28,8 +29,14 @@ var _ComponentConfigContext = require("../../common/ComponentConfigContext");
 var _defaults = require("./defaults");
 var _excluded = ["init", "poller"],
   _excluded2 = ["components"];
-var submissionIncludes = 'values,form,form.fields,form.attributesMap,form.kapp,form.kapp.attributesMap,form.kapp.space,form.kapp.space.attributesMap';
-var formIncludes = 'fields,attributesMap,kapp,kapp.attributesMap,kapp.space,kapp.space.attributesMap';
+var submissionIncludes = function submissionIncludes() {
+  var addSubmissionIncludes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return ['values', 'form', 'form.fields', 'form.attributesMap', 'form.kapp', 'form.kapp.attributesMap', 'form.kapp.space', 'form.kapp.space.attributesMap'].concat((0, _toConsumableArray2["default"])(addSubmissionIncludes)).join(',');
+};
+var formIncludes = function formIncludes() {
+  var addFormIncludes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return ['fields', 'attributesMap', 'kapp', 'kapp.attributesMap', 'kapp.space', 'kapp.space.attributesMap'].concat((0, _toConsumableArray2["default"])(addFormIncludes)).join(',');
+};
 var getNumericAttributeValue = function getNumericAttributeValue(form, name) {
   var defaultValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
   var kapp = form ? form.kapp : null;
@@ -82,7 +89,7 @@ var lockSubmission = exports.lockSubmission = function lockSubmission(_ref) {
   return (0, _apis.fetchSubmission)({
     id: id,
     datastore: !!datastore,
-    include: submissionIncludes
+    include: submissionIncludes(options.addSubmissionIncludes)
   }).then(function (_ref2) {
     var _values;
     var submission = _ref2.submission,
@@ -109,7 +116,7 @@ var lockSubmission = exports.lockSubmission = function lockSubmission(_ref) {
     var lockTime = getNumericAttributeValue(submission.form, options.lockTimeAttribute || _defaults.LOCK_TIME_ATTRIBUTE, _defaults.LOCK_TIME_DEFAULT_VALUE);
     return (0, _apis.updateSubmission)({
       id: submission.id,
-      include: submissionIncludes,
+      include: submissionIncludes(options.addSubmissionIncludes),
       values: (_values = {}, (0, _defineProperty2["default"])(_values, options.lockedByField || _defaults.LOCKED_BY_FIELD, _helpers.bundle.identity()), (0, _defineProperty2["default"])(_values, options.lockedUntilField || _defaults.LOCKED_UNTIL_FIELD, new Date(new Date().getTime() + lockTime * 1000).toISOString()), _values)
     }).then(function (response) {
       return (0, _objectSpread2["default"])({
@@ -127,7 +134,7 @@ var unlockSubmission = exports.unlockSubmission = function unlockSubmission(_ref
   return (0, _apis.fetchSubmission)({
     id: id,
     datastore: !!datastore,
-    include: submissionIncludes
+    include: submissionIncludes(options.addSubmissionIncludes)
   }).then(function (_ref4) {
     var _values2;
     var submission = _ref4.submission,
@@ -160,7 +167,7 @@ var unlockSubmission = exports.unlockSubmission = function unlockSubmission(_ref
     }
     return (0, _apis.updateSubmission)({
       id: submission.id,
-      include: submissionIncludes,
+      include: submissionIncludes(options.addSubmissionIncludes),
       values: (_values2 = {}, (0, _defineProperty2["default"])(_values2, options.lockedByField || _defaults.LOCKED_BY_FIELD, ''), (0, _defineProperty2["default"])(_values2, options.lockedUntilField || _defaults.LOCKED_UNTIL_FIELD, ''), _values2)
     }).then(function (response) {
       return (0, _objectSpread2["default"])({
@@ -369,7 +376,7 @@ var CoreFormComponent = exports.CoreFormComponent = /*#__PURE__*/function (_Comp
       return this.props.submission ? (0, _apis.fetchSubmission)({
         id: this.props.submission,
         datastore: !!this.props.datastore,
-        include: submissionIncludes,
+        include: submissionIncludes(this.props.addSubmissionIncludes),
         "public": this.props["public"]
       }).then(function (_ref7) {
         var submission = _ref7.submission,
@@ -383,7 +390,7 @@ var CoreFormComponent = exports.CoreFormComponent = /*#__PURE__*/function (_Comp
         datastore: !!this.props.datastore,
         kappSlug: this.props.kapp,
         formSlug: this.props.form,
-        include: formIncludes,
+        include: formIncludes(this.props.addFormIncludes),
         "public": this.props["public"]
       }).then(function (_ref8) {
         var form = _ref8.form,
@@ -401,7 +408,7 @@ var CoreFormComponent = exports.CoreFormComponent = /*#__PURE__*/function (_Comp
       return this.props.submission ? (0, _apis.fetchSubmission)({
         id: this.props.submission,
         datastore: !!this.props.datastore,
-        include: submissionIncludes
+        include: submissionIncludes(this.props.addSubmissionIncludes)
       }).then(function (_ref9) {
         var submission = _ref9.submission,
           error = _ref9.error;
@@ -700,7 +707,8 @@ var CoreFormComponent = exports.CoreFormComponent = /*#__PURE__*/function (_Comp
         actions: actions,
         lockMessage: lockMessage,
         reviewPaginationControl: reviewPaginationControl,
-        lock: init ? lockProps : undefined
+        lock: init ? lockProps : undefined,
+        renderProps: this.props.renderProps
       }) : content;
     }
   }]);

package/lib/components/core/file_resource/FileResourceForm.js

@@ -139,7 +139,8 @@ var fields = function fields(_ref4) {
           }).map(function (definition) {
             return (0, _immutable.Map)({
               value: definition.get('name'),
-              label: definition.get('name')
+              label: definition.get('name'),
+              type: definition.get('type')
             });
           }) : [];
         },

package/lib/components/core/file_resource/FileResourceTable.js

@@ -40,29 +40,36 @@ var dataSource = function dataSource() {
 var columns = [{
   value: 'slug',
   title: 'Slug',
-  sortable: true
+  sortable: true,
+  toggleable: false
 }, {
   value: 'agentSlug',
   title: 'Agent Slug',
-  sortable: true
+  sortable: true,
+  toggleable: true
 }, {
   value: 'filestoreSlug',
-  title: 'File Store Slug',
-  sortable: true
+  title: 'Filestore Slug',
+  sortable: true,
+  toggleable: true
 }, {
   value: 'createdAt',
-  title: 'Created',
-  sortable: true
+  title: 'Created At',
+  sortable: true,
+  toggleable: true
 }, {
   value: 'createdBy',
-  title: 'Created By'
+  title: 'Created By',
+  toggleable: true
 }, {
   value: 'updatedAt',
   title: 'Updated At',
+  toggleable: true,
   sortable: true
 }, {
   value: 'updatedBy',
   title: 'Updated By',
+  toggleable: true,
   sortable: true
 }];
 var FileResourceTable = exports.FileResourceTable = (0, _Table.generateTable)({