@kineticdata/react 6.0.4 → 6.1.0

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

@@ -67,11 +67,39 @@ var handleSubmit = function handleSubmit(_ref2) {
     });
   };
 };
-var fields = function fields(_ref4) {
-  var kappSlug = _ref4.kappSlug,
-    name = _ref4.name;
-  return function (_ref5) {
-    var webhook = _ref5.webhook;
+var generateCodeBindings = function generateCodeBindings(_ref4) {
+  var space = _ref4.space,
+    kapp = _ref4.kapp,
+    values = _ref4.values;
+  return (0, _helpers.buildCodeEditorBindings)({
+    space: {
+      attributeDefinitions: space === null || space === void 0 ? void 0 : space.get('spaceAttributeDefinitions')
+    },
+    user: values.get('type') === 'User' && {
+      attributeDefinitions: space === null || space === void 0 ? void 0 : space.get('userAttributeDefinitions'),
+      profileAttributeDefinitions: space === null || space === void 0 ? void 0 : space.get('userProfileAttributeDefinitions')
+    },
+    team: values.get('type') === 'Team' && {
+      attributeDefinitions: space === null || space === void 0 ? void 0 : space.get('teamAttributeDefinitions')
+    },
+    kapp: ['Form', 'Submission'].includes(values.get('type')) && {
+      attributeDefinitions: kapp === null || kapp === void 0 ? void 0 : kapp.get('kappAttributeDefinitions')
+    },
+    form: ['Form', 'Submission'].includes(values.get('type')) && {
+      attributeDefinitions: kapp === null || kapp === void 0 ? void 0 : kapp.get('formAttributeDefinitions')
+    },
+    submission: values.get('type') === 'Submission' && {
+      detailed: true
+    },
+    values: values.get('type') === 'Submission' && (kapp === null || kapp === void 0 ? void 0 : kapp.get('fields').size) > 0 && {
+      data: kapp.get('fields')
+    }
+  });
+};
+var fields = function fields(_ref5) {
+  var name = _ref5.name;
+  return function (_ref6) {
+    var webhook = _ref6.webhook;
     return (!name || webhook) && [{
       name: 'name',
       label: 'Name',
@@ -86,8 +114,8 @@ var fields = function fields(_ref4) {
       required: true,
       initialValue: webhook ? webhook.get('type') : '',
       helpText: 'Where the webhook is triggered from.',
-      options: function options(_ref6) {
-        var events = _ref6.events;
+      options: function options(_ref7) {
+        var events = _ref7.events;
         return events ? events.keySeq().sort().map(function (type) {
           return (0, _immutable.Map)({
             label: type,
@@ -95,8 +123,8 @@ var fields = function fields(_ref4) {
           });
         }) : (0, _immutable.List)();
       },
-      onChange: function onChange(bindings, _ref7) {
-        var setValue = _ref7.setValue;
+      onChange: function onChange(bindings, _ref8) {
+        var setValue = _ref8.setValue;
         setValue('event', '');
       }
     }, {
@@ -106,9 +134,9 @@ var fields = function fields(_ref4) {
       required: true,
       initialValue: webhook ? webhook.get('event') : '',
       helpText: 'The event triggering the webhook.',
-      options: function options(_ref8) {
-        var values = _ref8.values,
-          events = _ref8.events;
+      options: function options(_ref9) {
+        var values = _ref9.values,
+          events = _ref9.events;
         return values && events ? events.get(values.get('type'), (0, _immutable.List)()).map(function (event) {
           return (0, _immutable.Map)({
             label: event,
@@ -120,19 +148,10 @@ var fields = function fields(_ref4) {
       name: 'filter',
       label: 'Filter',
       type: 'code',
-      language: 'js',
+      language: 'js-expression',
       initialValue: webhook ? webhook.get('filter') : '',
       helpText: 'Optional parameters limiting the events than can trigger a webhook. Click the </> button to see available insert values.',
-      options: function options(_ref9) {
-        var space = _ref9.space,
-          kapp = _ref9.kapp,
-          values = _ref9.values;
-        return (0, _helpers.buildBindings)({
-          space: space,
-          kapp: kapp,
-          scope: values.get('type')
-        });
-      }
+      options: generateCodeBindings
     }, {
       name: 'url',
       label: 'URL',
@@ -141,16 +160,7 @@ var fields = function fields(_ref4) {
       required: true,
       initialValue: webhook ? webhook.get('url') : '',
       helpText: 'Location of the platform workflow or external system to pass information to. Click the </> button to see available insert values.',
-      options: function options(_ref10) {
-        var space = _ref10.space,
-          kapp = _ref10.kapp,
-          values = _ref10.values;
-        return (0, _helpers.buildBindings)({
-          space: space,
-          kapp: kapp,
-          scope: values.get('type')
-        });
-      }
+      options: generateCodeBindings
     }];
   };
 };

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

@@ -87,12 +87,13 @@ var filters = function filters() {
   };
 };
 var columns = [{
-  value: 'createdAt',
-  title: 'Created',
-  toggleable: true
+  value: 'name',
+  title: 'Name',
+  toggleable: false,
+  columnOrder: 'first'
 }, {
-  value: 'createdBy',
-  title: 'Created By',
+  value: 'type',
+  title: 'Type',
   toggleable: true
 }, {
   value: 'event',
@@ -103,26 +104,25 @@ var columns = [{
   title: 'Filter',
   toggleable: true
 }, {
-  value: 'name',
-  title: 'Name',
-  toggleable: false,
-  columnOrder: 'first'
+  value: 'url',
+  title: 'URL',
+  toggleable: true
 }, {
-  value: 'type',
-  title: 'Type',
+  value: 'createdAt',
+  title: 'Created At',
+  toggleable: true
+}, {
+  value: 'createdBy',
+  title: 'Created By',
   toggleable: true
 }, {
   value: 'updatedAt',
-  title: 'Updated',
+  title: 'Updated At',
   toggleable: true
 }, {
   value: 'updatedBy',
   title: 'Updated By',
   toggleable: true
-}, {
-  value: 'url',
-  title: 'URL',
-  toggleable: true
 }];
 var WebhookTable = exports.WebhookTable = (0, _Table.generateTable)({
   tableOptions: ['scope', 'kappSlug'],

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

@@ -7,10 +7,16 @@ exports.WebhookJobTable = void 0;
 var _apis = require("../../../apis");
 var _Table = require("../../table/Table");
 var _immutable = require("immutable");
+var WORKFLOW_JOB_STATUSES = [{
+  label: 'Failed',
+  value: 'failed'
+}, {
+  label: 'Pending',
+  value: 'queued'
+}];
 var dataSource = function dataSource(_ref) {
   var scope = _ref.scope,
-    kappSlug = _ref.kappSlug,
-    status = _ref.status;
+    kappSlug = _ref.kappSlug;
   return {
     fn: _apis.fetchWebhookJobs,
     params: function params(paramData) {
@@ -18,7 +24,7 @@ var dataSource = function dataSource(_ref) {
         include: 'details',
         scope: scope,
         kappSlug: kappSlug,
-        status: status,
+        status: paramData.filters.get('status') || 'all',
         limit: paramData.pageSize,
         pageToken: paramData.nextPageToken,
         webhook: paramData.filters.get('name') || undefined // required by the API, can't pass empty webhook= param
@@ -66,12 +72,17 @@ var filters = function filters() {
           });
         }) : (0, _immutable.List)();
       }
+    }, {
+      name: 'status',
+      label: 'Status',
+      type: 'select',
+      options: WORKFLOW_JOB_STATUSES
     }];
   };
 };
 var columns = [{
   value: 'createdAt',
-  title: 'Created',
+  title: 'Created At',
   toggleable: true
 }, {
   value: 'createdBy',
@@ -132,7 +143,7 @@ var columns = [{
   toggleable: true
 }, {
   value: 'updatedAt',
-  title: 'Updated',
+  title: 'Updated At',
   toggleable: true
 }, {
   value: 'updatedBy',
@@ -148,7 +159,7 @@ var columns = [{
   toggleable: true
 }];
 var WebhookJobTable = exports.WebhookJobTable = (0, _Table.generateTable)({
-  tableOptions: ['scope', 'kappSlug', 'status'],
+  tableOptions: ['scope', 'kappSlug'],
   columns: columns,
   filters: filters,
   filterDataSources: filterDataSources,

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

@@ -64,7 +64,8 @@ var initializeValue = exports.initializeValue = function initializeValue(type) {
 };
 var createField = exports.createField = function createField(formKey) {
   return function (_ref2) {
-    var constraint = _ref2.constraint,
+    var bindings = _ref2.bindings,
+      constraint = _ref2.constraint,
       constraintMessage = _ref2.constraintMessage,
       enabled = _ref2.enabled,
       form = _ref2.form,
@@ -93,8 +94,10 @@ var createField = exports.createField = function createField(formKey) {
       renderAttributes: (0, _immutable.fromJS)(renderAttributes),
       value: initializeValue(type, initialValue),
       // Options supporting conditional expressions,
+      bindings: typeof bindings === 'function' ? (0, _immutable.Map)() : (0, _immutable.fromJS)(bindings),
       enabled: typeof enabled === 'function' ? false : enabled,
       label: typeof label === 'function' ? '' : label,
+      language: typeof language === 'function' ? 'text' : language,
       options: typeof options === 'function' ? (0, _immutable.List)() : (0, _immutable.fromJS)(options),
       placeholder: typeof placeholder === 'function' ? '' : placeholder,
       required: typeof required === 'function' ? false : required,
@@ -102,8 +105,10 @@ var createField = exports.createField = function createField(formKey) {
       "transient": typeof _transient === 'function' ? false : _transient,
       visible: typeof visible === 'function' ? false : visible,
       functions: (0, _immutable.Map)({
+        bindings: typeof bindings === 'function' ? bindings : null,
         enabled: typeof enabled === 'function' ? enabled : null,
         label: typeof label === 'function' ? label : null,
+        language: typeof language === 'function' ? language : null,
         options: typeof options === 'function' ? options : null,
         placeholder: typeof placeholder === 'function' ? placeholder : null,
         required: typeof required === 'function' ? required : null,
@@ -132,7 +137,6 @@ var createField = exports.createField = function createField(formKey) {
       constraintMessage: constraintMessage,
       form: form,
       helpText: helpText,
-      language: language,
       name: name,
       onChange: onChange,
       pattern: pattern,
@@ -147,11 +151,12 @@ var createDataSource = exports.createDataSource = function createDataSource(_ref
   var _DataSource;
   var fn = _ref3.fn,
     params = _ref3.params,
-    transform = _ref3.transform;
+    transform = _ref3.transform,
+    errorTransform = _ref3.errorTransform;
   var paramProp = typeof params === 'function' ? 'paramsFn' : 'params';
   return (0, _Form.DataSource)((_DataSource = {
     fn: fn
-  }, (0, _defineProperty2["default"])(_DataSource, paramProp, params), (0, _defineProperty2["default"])(_DataSource, "transform", transform), _DataSource));
+  }, (0, _defineProperty2["default"])(_DataSource, paramProp, params), (0, _defineProperty2["default"])(_DataSource, "transform", transform), (0, _defineProperty2["default"])(_DataSource, "errorTransform", errorTransform), _DataSource));
 };
 var createFormState = exports.createFormState = function createFormState(_ref4) {
   var addDataSources = _ref4.addDataSources,
@@ -309,6 +314,7 @@ var getComponentName = exports.getComponentName = function getComponentName(fiel
 };
 var getFieldComponentProps = exports.getFieldComponentProps = function getFieldComponentProps(field, readOnly) {
   return {
+    bindings: field.bindings,
     dirty: field.dirty,
     enabled: readOnly ? false : field.enabled,
     errors: field.errors,