@kineticdata/react 6.0.0 → 6.0.2

package/lib/components/core/webhook/WebhookTable.js

@@ -88,38 +88,47 @@ var filters = function filters() {
 };
 var columns = [{
   value: 'createdAt',
-  title: 'Created'
+  title: 'Created',
+  toggleable: true
 }, {
   value: 'createdBy',
-  title: 'Created By'
+  title: 'Created By',
+  toggleable: true
 }, {
   value: 'event',
-  title: 'Event'
+  title: 'Event',
+  toggleable: true
 }, {
   value: 'filter',
-  title: 'Filter'
+  title: 'Filter',
+  toggleable: true
 }, {
   value: 'name',
-  title: 'Name'
+  title: 'Name',
+  toggleable: false,
+  columnOrder: 'first'
 }, {
   value: 'type',
-  title: 'Type'
+  title: 'Type',
+  toggleable: true
 }, {
   value: 'updatedAt',
-  title: 'Updated'
+  title: 'Updated',
+  toggleable: true
 }, {
   value: 'updatedBy',
-  title: 'Updated By'
+  title: 'Updated By',
+  toggleable: true
 }, {
   value: 'url',
-  title: 'URL'
+  title: 'URL',
+  toggleable: true
 }];
-var WebhookTable = (0, _Table.generateTable)({
+var WebhookTable = exports.WebhookTable = (0, _Table.generateTable)({
   tableOptions: ['scope', 'kappSlug'],
   columns: columns,
   filters: filters,
   filterDataSources: filterDataSources,
   dataSource: dataSource
 });
-exports.WebhookTable = WebhookTable;
 WebhookTable.displayName = 'WebhookTable';

package/lib/components/core/webhook_job/WebhookJobTable.js

@@ -71,63 +71,83 @@ var filters = function filters() {
 };
 var columns = [{
   value: 'createdAt',
-  title: 'Created'
+  title: 'Created',
+  toggleable: true
 }, {
   value: 'createdBy',
-  title: 'Created By'
+  title: 'Created By',
+  toggleable: true
 }, {
   value: 'event',
-  title: 'Event'
+  title: 'Event',
+  toggleable: true
 }, {
   value: 'id',
-  title: 'ID'
+  title: 'ID',
+  toggleable: true
 }, {
   value: 'name',
-  title: 'Name'
+  title: 'Name',
+  toggleable: true
 }, {
   value: 'parentId',
-  title: 'Parent ID'
+  title: 'Parent ID',
+  toggleable: true
 }, {
   value: 'requestContent',
-  title: 'Request Content'
+  title: 'Request Content',
+  toggleable: true
 }, {
   value: 'responseContent',
-  title: 'Response Content'
+  title: 'Response Content',
+  toggleable: true
 }, {
   value: 'retryCount',
-  title: 'Retry Count'
+  title: 'Retry Count',
+  toggleable: true
 }, {
   value: 'scheduledAt',
-  title: 'Scheduled At'
+  title: 'Scheduled At',
+  toggleable: false,
+  columnOrder: 'first'
 }, {
   value: 'scopeId',
-  title: 'Scope ID'
+  title: 'Scope ID',
+  toggleable: true
 }, {
   value: 'scopeType',
-  title: 'Scope Type'
+  title: 'Scope Type',
+  toggleable: true
 }, {
   value: 'status',
-  title: 'Status'
+  title: 'Status',
+  toggleable: true
 }, {
   value: 'summary',
-  title: 'Summary'
+  title: 'Summary',
+  toggleable: true
 }, {
   value: 'type',
-  title: 'Type'
+  title: 'Type',
+  toggleable: true
 }, {
   value: 'updatedAt',
-  title: 'Updated'
+  title: 'Updated',
+  toggleable: true
 }, {
   value: 'updatedBy',
-  title: 'Updated By'
+  title: 'Updated By',
+  toggleable: true
 }, {
   value: 'url',
-  title: 'URL'
+  title: 'URL',
+  toggleable: true
 }, {
   value: 'webhookId',
-  title: 'Webhook ID'
+  title: 'Webhook ID',
+  toggleable: true
 }];
-var WebhookJobTable = (0, _Table.generateTable)({
+var WebhookJobTable = exports.WebhookJobTable = (0, _Table.generateTable)({
   tableOptions: ['scope', 'kappSlug', 'status'],
   columns: columns,
   filters: filters,
@@ -135,5 +155,4 @@ var WebhookJobTable = (0, _Table.generateTable)({
   dataSource: dataSource,
   sortable: false
 });
-exports.WebhookJobTable = WebhookJobTable;
 WebhookJobTable.displayName = 'WebhookJobTable';

package/lib/components/form/Form.helpers.js

@@ -19,7 +19,7 @@ var sameName = function sameName(field1) {
     return field1.name === field2.name;
   };
 };
-var handleFormErrors = function handleFormErrors(key, message) {
+var handleFormErrors = exports.handleFormErrors = function handleFormErrors(key, message) {
   return function (results) {
     var error = results.error;
     if (error) {
@@ -28,8 +28,7 @@ var handleFormErrors = function handleFormErrors(key, message) {
     return key ? results[key] : results;
   };
 };
-exports.handleFormErrors = handleFormErrors;
-var resolveFieldConfig = function resolveFieldConfig(formOptions, bindings, fieldsFn) {
+var resolveFieldConfig = exports.resolveFieldConfig = function resolveFieldConfig(formOptions, bindings, fieldsFn) {
   var addFieldsParam = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
   var alterFieldsParam = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
   var fields = fieldsFn(formOptions)(bindings);
@@ -57,15 +56,13 @@ var resolveFieldConfig = function resolveFieldConfig(formOptions, bindings, fiel
     }));
   }
 };
-exports.resolveFieldConfig = resolveFieldConfig;
-var initializeValue = function initializeValue(type) {
+var initializeValue = exports.initializeValue = function initializeValue(type) {
   var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _Form.FIELD_DEFAULT_VALUES.get(type, '');
   return type === 'map' ? (0, _immutable.OrderedMap)(value).map(function (value) {
     return (0, _immutable.fromJS)(value);
   }) : (0, _immutable.fromJS)(value);
 };
-exports.initializeValue = initializeValue;
-var createField = function createField(formKey) {
+var createField = exports.createField = function createField(formKey) {
   return function (_ref2) {
     var constraint = _ref2.constraint,
       constraintMessage = _ref2.constraintMessage,
@@ -146,8 +143,7 @@ var createField = function createField(formKey) {
     });
   };
 };
-exports.createField = createField;
-var createDataSource = function createDataSource(_ref3) {
+var createDataSource = exports.createDataSource = function createDataSource(_ref3) {
   var _DataSource;
   var fn = _ref3.fn,
     params = _ref3.params,
@@ -157,8 +153,7 @@ var createDataSource = function createDataSource(_ref3) {
     fn: fn
   }, (0, _defineProperty2["default"])(_DataSource, paramProp, params), (0, _defineProperty2["default"])(_DataSource, "transform", transform), _DataSource));
 };
-exports.createDataSource = createDataSource;
-var createFormState = function createFormState(_ref4) {
+var createFormState = exports.createFormState = function createFormState(_ref4) {
   var addDataSources = _ref4.addDataSources,
     addFields = _ref4.addFields,
     alterFields = _ref4.alterFields,
@@ -183,77 +178,136 @@ var createFormState = function createFormState(_ref4) {
     onSubmit: onSubmit && onSubmit(formOptions)
   });
 };
-exports.createFormState = createFormState;
-var buildPropertyFields = function buildPropertyFields(_ref5) {
+var buildPropertyFields = exports.buildPropertyFields = function buildPropertyFields(_ref5) {
   var isNew = _ref5.isNew,
     properties = _ref5.properties,
     getName = _ref5.getName,
+    getLabel = _ref5.getLabel,
     getOptions = _ref5.getOptions,
     getRequired = _ref5.getRequired,
     getSensitive = _ref5.getSensitive,
+    getCertificate = _ref5.getCertificate,
+    getHelpText = _ref5.getHelpText,
     getValue = _ref5.getValue;
   return {
     propertiesFields: properties.flatMap(function (property) {
       var name = getName(property);
+      var label = (0, _lodashEs.isFunction)(getLabel) && getLabel(property) || name;
       var options = (0, _lodashEs.isFunction)(getOptions) && getOptions(property);
       var required = (0, _lodashEs.isFunction)(getRequired) && getRequired(property);
       var sensitive = (0, _lodashEs.isFunction)(getSensitive) && getSensitive(property);
+      var certificate = (0, _lodashEs.isFunction)(getCertificate) && getCertificate(property);
+      var helpText = (0, _lodashEs.isFunction)(getHelpText) && getHelpText(property);
       var value = getValue(property);
-      return !sensitive || isNew ? [{
+      return !!certificate ? [{
         name: "property_".concat(name),
-        label: name,
+        label: label,
+        type: 'certificate',
+        required: required,
+        "transient": true,
+        options: options,
+        helpText: helpText,
+        initialValue: certificate,
+        visible: function visible(_ref6) {
+          var values = _ref6.values;
+          return !values.get("changeProperty_".concat(name));
+        }
+      }, {
+        name: "property_new_".concat(name),
+        label: label,
+        type: 'file',
+        required: required,
+        "transient": true,
+        helpText: helpText,
+        visible: function visible(_ref7) {
+          var values = _ref7.values;
+          return values.get("changeProperty_".concat(name));
+        }
+      }, {
+        name: "changeProperty_".concat(name),
+        label: "Change ".concat(label),
+        type: 'toggle',
+        "transient": true,
+        initialValue: false,
+        onChange: function onChange(_ref8, _ref9) {
+          var values = _ref8.values;
+          var setValue = _ref9.setValue;
+          if (!_immutable.List.isList(values.get("property_new_".concat(name))) || values.get("property_new_".concat(name)).size > 0) {
+            setValue("property_new_".concat(name), (0, _immutable.List)());
+          }
+        }
+      }] : !sensitive || isNew ? [{
+        name: "property_".concat(name),
+        label: label,
         type: sensitive ? 'password' : options ? 'select' : 'text',
         required: required,
         "transient": true,
         options: options,
+        helpText: helpText,
         initialValue: value
       }] : [{
         name: "property_".concat(name),
-        label: name,
-        type: 'password',
-        required: required ? function (_ref6) {
-          var values = _ref6.values;
+        label: label,
+        type: 'secret',
+        required: required ? function (_ref10) {
+          var values = _ref10.values;
           return values.get("changeProperty_".concat(name));
         } : false,
         "transient": true,
+        helpText: helpText,
         initialValue: '',
-        visible: function visible(_ref7) {
-          var values = _ref7.values;
+        visible: function visible(_ref11) {
+          var values = _ref11.values;
           return values.get("changeProperty_".concat(name));
         }
       }, {
         name: "changeProperty_".concat(name),
-        label: "Change ".concat(name),
-        type: 'checkbox',
+        label: "Change ".concat(label),
+        type: 'toggle',
         "transient": true,
         initialValue: false,
-        onChange: function onChange(_ref8, _ref9) {
-          var values = _ref8.values;
-          var setValue = _ref9.setValue;
+        onChange: function onChange(_ref12, _ref13) {
+          var values = _ref12.values;
+          var setValue = _ref13.setValue;
           if (values.get("property_".concat(name)) !== '') {
             setValue("property_".concat(name), '');
           }
         }
       }];
     }).toArray(),
-    propertiesSerialize: function propertiesSerialize(_ref10) {
-      var values = _ref10.values;
-      return properties.filter(function (prop) {
-        return isNew || !(0, _lodashEs.isFunction)(getSensitive) || !getSensitive(prop) || values.get("changeProperty_".concat(getName(prop)));
-      }).map(getName).reduce(function (reduction, propName) {
-        return reduction.set(propName, values.get("property_".concat(propName)));
+    propertiesSerialize: function propertiesSerialize(_ref14) {
+      var values = _ref14.values;
+      return properties.reduce(function (reduction, property) {
+        var name = getName(property);
+        var sensitive = (0, _lodashEs.isFunction)(getSensitive) && getSensitive(property);
+        var certificate = (0, _lodashEs.isFunction)(getCertificate) && getCertificate(property);
+        if (certificate) {
+          // If certificate field, serialize value if the corresponding
+          // changeProperty field has a value. Set to the new uploaded file, or
+          // an empty string if no file uploaded.
+          if (values.get("changeProperty_".concat(name))) {
+            return reduction.set(name, values.getIn(["property_new_".concat(name), 0]) || '');
+          }
+        } else if (sensitive) {
+          // If sensitive field, serialize value if the corresponding
+          // changeProperty field has a value. Set to the new provided value.
+          if (isNew || values.get("changeProperty_".concat(name))) {
+            return reduction.set(name, values.get("property_".concat(name)));
+          }
+        } else {
+          return reduction.set(name, values.get("property_".concat(name)));
+        }
+        return reduction;
       }, (0, _immutable.Map)()).toObject();
     }
   };
 };
-exports.buildPropertyFields = buildPropertyFields;
-var getComponentName = function getComponentName(field) {
+var getComponentName = exports.getComponentName = function getComponentName(field) {
   return field.type ? field.type.split('-').map(function (word) {
     return "".concat(word.charAt(0).toUpperCase()).concat(word.substring(1));
   }).join('') + 'Field' : null;
 };
-exports.getComponentName = getComponentName;
-var getFieldComponentProps = function getFieldComponentProps(field, readOnly) {
+var getFieldComponentProps = exports.getFieldComponentProps = function getFieldComponentProps(field, readOnly) {
   return {
     dirty: field.dirty,
     enabled: readOnly ? false : field.enabled,
@@ -277,5 +331,4 @@ var getFieldComponentProps = function getFieldComponentProps(field, readOnly) {
     value: field.value,
     visible: field.visible
   };
-};
-exports.getFieldComponentProps = getFieldComponentProps;
+};