@kineticdata/react 6.0.5 → 6.1.1

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/field_definition/FieldDefinitionForm.js

@@ -112,9 +112,9 @@ var fields = function fields(_ref6) {
   };
 };
 
-/**
- * @component
- * A form for creating and updating Field Definitions within the Kinetic Platform
+/**
+ * @component
+ * A form for creating and updating Field Definitions within the Kinetic Platform
  */
 var FieldDefinitionForm = exports.FieldDefinitionForm = (0, _Form.generateForm)({
   formOptions: ['kappSlug', 'name'],

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)({

package/lib/components/core/form/FormForm.js

@@ -12,9 +12,9 @@ var _Form = require("../../form/Form");
 var _apis = require("../../../apis");
 var _helpers = require("../../../helpers");
 var FORM_STATUSES = ['New', 'Active', 'Inactive', 'Delete'];
-var FORM_INCLUDES = 'details,attributesMap,securityPolicies,backgroundJobs,fields,categorizations';
+var FORM_INCLUDES = 'details,attributesMap,securityPolicies,backgroundJobs,fields,categorizations,categorizations.category,categorizations.category.attributes[Parent]';
 var KAPP_INCLUDES = 'fields,formTypes,formAttributeDefinitions,kappAttributeDefinitions,securityPolicies';
-var SPACE_INCLUDES = 'spaceAttributeDefinitions,formAttributeDefinitions,securityPolicies';
+var SPACE_INCLUDES = 'spaceAttributeDefinitions,securityPolicies';
 var dataSources = function dataSources(_ref) {
   var formSlug = _ref.formSlug,
     kappSlug = _ref.kappSlug;
@@ -102,7 +102,8 @@ var handleSubmit = function handleSubmit(_ref2) {
 var buildLabel = function buildLabel(_ref4) {
   var name = _ref4.name,
     category = _ref4.category,
-    categories = _ref4.categories;
+    categories = _ref4.categories,
+    loading = _ref4.loading;
   var match = null;
   if (category.get('attributes').size) {
     category.get('attributes').map(function (c) {
@@ -113,8 +114,9 @@ var buildLabel = function buildLabel(_ref4) {
         name = match ? buildLabel({
           name: "".concat(match.get('name'), "::").concat(name),
           category: match,
-          categories: categories
-        }) : "(Missing Category ".concat(c.getIn(['values', 0]), ")::").concat(name);
+          categories: categories,
+          loading: loading
+        }) : loading ? "".concat(c.getIn(['values', 0]), "::").concat(name) : "(Missing Category ".concat(c.getIn(['values', 0]), ")::").concat(name);
       }
       return name;
     });
@@ -125,22 +127,22 @@ var securityEndpoints = {
   formDisplay: {
     endpoint: 'Display',
     label: 'Form Display',
-    types: ['Space', 'Kapp', 'Form']
+    types: ['Kapp', 'Form']
   },
   formModification: {
     endpoint: 'Modification',
     label: 'Form Modification',
-    types: ['Space', 'Kapp', 'Form']
+    types: ['Kapp', 'Form']
   },
   submissionAccess: {
     endpoint: 'Submission Access',
     label: 'Submission Access',
-    types: ['Space', 'Kapp', 'Form', 'Submission']
+    types: ['Kapp', 'Form', 'Submission']
   },
   submissionModification: {
     endpoint: 'Submission Modification',
     label: 'Submission Modification',
-    types: ['Space', 'Kapp', 'Form', 'Submission']
+    types: ['Kapp', 'Form', 'Submission']
   }
 };
 var fields = function fields(_ref5) {
@@ -221,12 +223,24 @@ var fields = function fields(_ref5) {
       options: function options(_ref10) {
         var space = _ref10.space,
           kapp = _ref10.kapp,
-          form = _ref10.form;
-        return (0, _helpers.buildBindings)({
-          space: space,
-          kapp: kapp,
-          form: form,
-          scope: kappSlug ? 'Submission' : 'Submission'
+          form = _ref10.form,
+          attributeDefinitions = _ref10.attributeDefinitions;
+        return (0, _helpers.buildCodeEditorBindings)({
+          space: {
+            attributeDefinitions: space === null || space === void 0 ? void 0 : space.get('spaceAttributeDefinitions')
+          },
+          kapp: {
+            attributeDefinitions: kapp === null || kapp === void 0 ? void 0 : kapp.get('kappAttributeDefinitions')
+          },
+          form: {
+            attributeDefinitions: attributeDefinitions
+          },
+          submission: {
+            detailed: true
+          },
+          values: (form === null || form === void 0 ? void 0 : form.get('fields').size) > 0 && {
+            data: form.get('fields')
+          }
         });
       }
     }, !!kappSlug && {
@@ -259,7 +273,8 @@ var fields = function fields(_ref5) {
           }).map(function (definition) {
             return (0, _immutable.Map)({
               value: definition.get('name'),
-              label: definition.get('name')
+              label: definition.get('name'),
+              type: definition.get('type')
             });
           }) : [];
         },
@@ -304,13 +319,21 @@ var fields = function fields(_ref5) {
       label: 'Categories',
       type: 'select-multi',
       options: function options(_ref19) {
-        var categories = _ref19.categories;
-        return categories ? categories.map(function (category) {
+        var categories = _ref19.categories,
+          form = _ref19.form;
+        // Until categories are fetched, use the data from the form's
+        // categories to build options to minimize the flash of the slug values
+        // changing to the names
+        var categoriesList = categories || (form === null || form === void 0 ? void 0 : form.get('categorizations').map(function (c) {
+          return c.get('category');
+        }));
+        return categoriesList ? categoriesList.map(function (category) {
           return (0, _immutable.Map)({
             label: buildLabel({
               name: category.get('name'),
               category: category,
-              categories: categories
+              categories: categoriesList,
+              loading: !categories
             }),
             value: category.get('slug')
           });

package/lib/components/core/form/FormTable.js

@@ -110,9 +110,20 @@ var columns = [{
   title: 'Slug',
   sortable: true,
   toggleable: true
+}, {
+  value: 'type',
+  title: 'Type',
+  sortable: true,
+  type: 'text',
+  toggleable: true
+}, {
+  value: 'status',
+  title: 'Status',
+  sortable: true,
+  toggleable: true
 }, {
   value: 'createdAt',
-  title: 'Created',
+  title: 'Created At',
   sortable: true,
   toggleable: true
 }, {
@@ -121,7 +132,7 @@ var columns = [{
   toggleable: true
 }, {
   value: 'updatedAt',
-  title: 'Updated',
+  title: 'Updated At',
   sortable: true,
   toggleable: true
 }, {
@@ -133,18 +144,6 @@ var columns = [{
   value: 'notes',
   title: 'Notes',
   toggleable: true
-}, {
-  value: 'status',
-  title: 'Status',
-  sortable: true,
-  toggleable: true
-}, {
-  value: 'type',
-  title: 'Type',
-  sortable: true,
-  filter: 'startsWith',
-  type: 'text',
-  toggleable: true
 }, {
   value: 'submissionLabelExpression',
   title: 'Submission Label',

package/lib/components/core/form_type/FormTypeForm.js

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

package/lib/components/core/i18n/Moment.js

@@ -171,6 +171,7 @@ Moment.formats = {
   dateShort: 'll',
   dateWithDayShort: 'ddd, ll',
   dateTime: 'LLL',
+  dateTimeWithSeconds: 'LL LTS',
   dateTimeNumeric: 'L LT',
   dateTimeShort: 'lll',
   dateTimeWithDay: 'LLLL',

package/lib/components/core/integration/IntegrationForm.js

@@ -0,0 +1,232 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.IntegrationForm = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
+var _Form = require("../../form/Form");
+var _apis = require("../../../apis");
+var _immutable = require("immutable");
+var _integrationTypes = _interopRequireWildcard(require("../../integrator/integrationTypes"));
+var dataSources = function dataSources(_ref) {
+  var kappSlug = _ref.kappSlug,
+    name = _ref.name;
+  return {
+    integration: {
+      fn: _apis.fetchIntegration,
+      params: name && [{
+        kappSlug: kappSlug,
+        name: name,
+        include: 'securityPolicies'
+      }],
+      transform: function transform(result) {
+        return result.integration;
+      },
+      errorTransform: function errorTransform(result) {
+        return result.error;
+      }
+    },
+    connections: {
+      fn: _apis.fetchConnections,
+      params: [],
+      transform: function transform(result) {
+        return result.connections;
+      }
+    },
+    operations: {
+      fn: _apis.fetchOperations,
+      params: function params(_ref2) {
+        var values = _ref2.values,
+          integration = _ref2.integration;
+        var connectionId = (values === null || values === void 0 ? void 0 : values.get('connectionId')) || (integration === null || integration === void 0 ? void 0 : integration.get('connectionId'));
+        return connectionId && [{
+          connectionId: connectionId
+        }];
+      },
+      transform: function transform(result) {
+        return result.operations;
+      }
+    },
+    parameters: {
+      fn: function fn(options) {
+        return !!options.operationId ? (0, _apis.inspectOperation)(options) : Promise.resolve({});
+      },
+      params: function params(_ref3) {
+        var values = _ref3.values;
+        return [{
+          operationId: values === null || values === void 0 ? void 0 : values.get('operationId')
+        }];
+      }
+    },
+    securityPolicyDefinitions: {
+      fn: _apis.fetchSecurityPolicyDefinitions,
+      params: kappSlug && [{
+        kappSlug: kappSlug
+      }],
+      transform: function transform(result) {
+        return result.securityPolicyDefinitions;
+      }
+    }
+  };
+};
+var handleSubmit = function handleSubmit(_ref4) {
+  var kappSlug = _ref4.kappSlug,
+    name = _ref4.name;
+  return function (values) {
+    return (name ? _apis.updateIntegration : _apis.createIntegration)({
+      integration: values.toJS(),
+      kappSlug: kappSlug,
+      name: name
+    }).then(function (_ref5) {
+      var integration = _ref5.integration,
+        error = _ref5.error;
+      if (error) {
+        throw error.statusCode === 400 && error.message || 'There was an error saving the integration';
+      }
+      return integration;
+    });
+  };
+};
+var securityEndpoints = {
+  execution: {
+    endpoint: 'Execution',
+    label: 'Execution Security Policy',
+    types: ['Kapp']
+  }
+};
+var fields = function fields(_ref6) {
+  var name = _ref6.name;
+  return function (_ref7) {
+    var integration = _ref7.integration,
+      connections = _ref7.connections,
+      operations = _ref7.operations;
+    return (!name || integration) && connections && (!(integration !== null && integration !== void 0 && integration.get('connectionId')) || operations) && [{
+      name: 'name',
+      label: 'Name',
+      type: 'text',
+      pattern: /^[a-z\d-]+[a-z\d\s-]*$/i,
+      patternMessage: 'Name can only contain alpha-numeric characters, spaces, and hyphens, and cannot start with spaces.',
+      required: true,
+      initialValue: integration ? integration.get('name') : ''
+    }, {
+      name: 'connectionId',
+      label: 'Connection',
+      type: 'select',
+      required: true,
+      initialValue: integration ? integration.get('connectionId') : '',
+      options: function options(_ref8) {
+        var connections = _ref8.connections;
+        return connections.map(function (conn) {
+          var _getConnectionMetadat;
+          return (0, _immutable.Map)({
+            value: conn.get('id'),
+            label: conn.get('name'),
+            type: _integrationTypes["default"].getLabel(conn.get('type')),
+            detail: (_getConnectionMetadat = (0, _integrationTypes.getConnectionMetadata)(conn)) === null || _getConnectionMetadat === void 0 ? void 0 : _getConnectionMetadat.optionDetail
+          });
+        });
+      },
+      onChange: function onChange(bindings, _ref9) {
+        var setValue = _ref9.setValue;
+        setValue('operationId', '');
+        setValue('inputMappings', {});
+      }
+    }, {
+      name: 'operationId',
+      label: 'Operation',
+      type: 'select',
+      required: true,
+      initialValue: integration ? integration.get('operationId') : '',
+      options: function options(_ref10) {
+        var operations = _ref10.operations,
+          values = _ref10.values;
+        return (operations || (0, _immutable.List)()
+        // Make sure we only show correct operations while waiting on data to
+        // be fetched
+        ).filter(function (op) {
+          return op.get('connectionId') === values.get('connectionId');
+        }).map(function (op) {
+          var _getOperationMetadata;
+          return (0, _immutable.Map)({
+            value: op.get('id'),
+            label: op.get('name'),
+            detail: (_getOperationMetadata = (0, _integrationTypes.getOperationMetadata)(op)) === null || _getOperationMetadata === void 0 ? void 0 : _getOperationMetadata.optionDetail
+          });
+        });
+      },
+      enabled: function enabled(_ref11) {
+        var values = _ref11.values;
+        return !!values.get('connectionId');
+      },
+      placeholder: function placeholder(_ref12) {
+        var values = _ref12.values;
+        return !values.get('connectionId') ? 'Select a connection' : undefined;
+      }
+    }, {
+      name: 'inputMappings',
+      label: 'Parameter Mappings',
+      type: 'map',
+      initialValue: integration ? integration.get('inputMappings') : {},
+      enabled: function enabled(_ref13) {
+        var values = _ref13.values;
+        return !!values.get('operationId');
+      }
+    }].concat((0, _toConsumableArray2["default"])(Object.entries(securityEndpoints).map(function (_ref14) {
+      var _ref15 = (0, _slicedToArray2["default"])(_ref14, 2),
+        endpointFieldName = _ref15[0],
+        endpoint = _ref15[1];
+      return {
+        name: endpointFieldName,
+        label: endpoint.label,
+        type: 'select',
+        options: function options(_ref16) {
+          var securityPolicyDefinitions = _ref16.securityPolicyDefinitions;
+          return securityPolicyDefinitions ? securityPolicyDefinitions.filter(function (definition) {
+            return endpoint.types.includes(definition.get('type'));
+          }).map(function (definition) {
+            return (0, _immutable.Map)({
+              value: definition.get('name'),
+              label: definition.get('name'),
+              type: definition.get('type')
+            });
+          }) : [];
+        },
+        initialValue: integration ? integration.get('securityPolicies').find(function (pol) {
+          return pol.get('endpoint') === endpoint.endpoint;
+        }, null, (0, _immutable.Map)({})).get('name', '') : '',
+        "transient": true
+      };
+    })), [{
+      name: 'securityPolicies',
+      label: 'Security Policies',
+      type: null,
+      visible: false,
+      serialize: function serialize(_ref17) {
+        var values = _ref17.values;
+        return Object.entries(securityEndpoints).map(function (_ref18) {
+          var _ref19 = (0, _slicedToArray2["default"])(_ref18, 2),
+            endpointFieldName = _ref19[0],
+            policy = _ref19[1];
+          return {
+            endpoint: policy.endpoint,
+            name: values.get(endpointFieldName)
+          };
+        }).filter(function (endpoint) {
+          return endpoint.name !== '';
+        });
+      },
+      initialValue: integration ? integration.get('securityPolicies') : []
+    }]);
+  };
+};
+var IntegrationForm = exports.IntegrationForm = (0, _Form.generateForm)({
+  formOptions: ['kappSlug', 'name'],
+  dataSources: dataSources,
+  fields: fields,
+  handleSubmit: handleSubmit
+});
+IntegrationForm.displayName = 'IntegrationForm';