@kineticdata/react 6.0.5 → 6.1.0

package/lib/components/task/builder/NodeForm.js

@@ -10,16 +10,23 @@ var _immutable = require("immutable");
 var _Form = require("../../form/Form");
 var _models = require("./models");
 var _helpers = require("./helpers");
+var _constants = require("./constants");
 var _apis = require("../../../apis");
-var _TaskDefinitionConfigForm = require("./TaskDefinitionConfigForm");
 var dataSources = function dataSources(_ref) {
+  var _tasks$get, _tasks$get2, _tasks$get3, _tasks$get4;
   var tasks = _ref.tasks,
     tree = _ref.tree,
-    node = _ref.node;
+    node = _ref.node,
+    connections = _ref.connections;
   return {
     bindings: {
       fn: _helpers.buildBindings,
-      params: [tree, tasks, node]
+      params: [{
+        tree: tree,
+        tasks: tasks,
+        node: node,
+        connections: connections
+      }]
     },
     parameters: {
       fn: function fn(node) {
@@ -30,28 +37,93 @@ var dataSources = function dataSources(_ref) {
     form: {
       fn: function fn(node) {
         return (0, _apis.fetchForm)({
-          kappSlug: node.parameters.find(function (parameter) {
-            return parameter.id === 'kappSlug';
+          kappSlug: node.parameters.find(function (p) {
+            return p.id === 'kappSlug';
           }).value,
-          formSlug: node.parameters.find(function (parameter) {
-            return parameter.id === 'formSlug';
+          formSlug: node.parameters.find(function (p) {
+            return p.id === 'formSlug';
           }).value,
           include: 'fields,kapp'
         }).then(function (data) {
           return data.form;
         });
       },
-      params: (0, _TaskDefinitionConfigForm.generateTaskDefinition)(tasks.get(node.definitionId)) ? [node] : null
+      params: ((_tasks$get = tasks.get(node.definitionId)) === null || _tasks$get === void 0 ? void 0 : _tasks$get.definitionName) === _constants.ADVANCED_HANDLER_NAME_SUBMISSION_CREATE ? [node] : null
+    },
+    connection: {
+      fn: function fn(node) {
+        var _node$parameters$find;
+        var id = (_node$parameters$find = node.parameters.find(function (p) {
+          return p.id === 'connection';
+        })) === null || _node$parameters$find === void 0 ? void 0 : _node$parameters$find.value;
+        return (connections === null || connections === void 0 ? void 0 : connections.get(id)) || (0, _apis.fetchConnection)({
+          id: id
+        }).then(function (data) {
+          return data.connection;
+        });
+      },
+      params: ((_tasks$get2 = tasks.get(node.definitionId)) === null || _tasks$get2 === void 0 ? void 0 : _tasks$get2.definitionName) === _constants.ADVANCED_HANDLER_NAME_INTEGRATION ? [node] : null
+    },
+    operation: {
+      fn: function fn(node) {
+        var _node$parameters$find2, _node$parameters$find3;
+        var connectionId = (_node$parameters$find2 = node.parameters.find(function (p) {
+          return p.id === 'connection';
+        })) === null || _node$parameters$find2 === void 0 ? void 0 : _node$parameters$find2.value;
+        var id = (_node$parameters$find3 = node.parameters.find(function (p) {
+          return p.id === 'operation';
+        })) === null || _node$parameters$find3 === void 0 ? void 0 : _node$parameters$find3.value;
+        return (connections === null || connections === void 0 ? void 0 : connections.getIn([connectionId, 'operations', id])) || (0, _apis.fetchOperation)({
+          connectionId: connectionId,
+          id: id
+        }).then(function (data) {
+          return data.operation;
+        });
+      },
+      params: ((_tasks$get3 = tasks.get(node.definitionId)) === null || _tasks$get3 === void 0 ? void 0 : _tasks$get3.definitionName) === _constants.ADVANCED_HANDLER_NAME_INTEGRATION ? [node] : null
+    },
+    detectedInputs: {
+      fn: function fn(node) {
+        var _node$parameters$find4;
+        return (0, _apis.inspectOperation)({
+          operationId: (_node$parameters$find4 = node.parameters.find(function (p) {
+            return p.id === 'operation';
+          })) === null || _node$parameters$find4 === void 0 ? void 0 : _node$parameters$find4.value
+        }).then(function (data) {
+          return data.detectedInputs;
+        });
+      },
+      params: ((_tasks$get4 = tasks.get(node.definitionId)) === null || _tasks$get4 === void 0 ? void 0 : _tasks$get4.definitionName) === _constants.ADVANCED_HANDLER_NAME_INTEGRATION ? [node] : null
     },
     task: {
-      fn: function fn(node, form) {
-        return form ? (0, _TaskDefinitionConfigForm.generateTaskDefinition)(tasks.get(node.definitionId))({
-          form: form.toJS()
-        }) : tasks.get(node.definitionId);
+      fn: function fn(task) {
+        return task;
       },
       params: function params(_ref2) {
-        var form = _ref2.form;
-        return (0, _TaskDefinitionConfigForm.generateTaskDefinition)(tasks.get(node.definitionId)) ? form ? [node, form] : null : [node, null];
+        var form = _ref2.form,
+          connection = _ref2.connection,
+          operation = _ref2.operation,
+          detectedInputs = _ref2.detectedInputs;
+        var task = tasks.get(node.definitionId);
+        if ((task === null || task === void 0 ? void 0 : task.definitionName) === _constants.ADVANCED_HANDLER_NAME_SUBMISSION_CREATE) {
+          if (form) {
+            return [(0, _helpers.generateSubmissionCreateTaskDefinition)(task, {
+              form: form.toJS()
+            })];
+          }
+          return null;
+        } else if ((task === null || task === void 0 ? void 0 : task.definitionName) === _constants.ADVANCED_HANDLER_NAME_INTEGRATION) {
+          if (connection && operation && detectedInputs) {
+            return [(0, _helpers.generateIntegrationTaskDefinition)(task, {
+              connection: connection.toJS(),
+              operation: operation.toJS(),
+              detectedInputs: detectedInputs.toJS()
+            })];
+          }
+          return null;
+        } else {
+          return [task];
+        }
       }
     }
   };
@@ -73,8 +145,7 @@ var checkDependsOn = function checkDependsOn(parameter) {
   };
 };
 var fields = function fields(_ref4) {
-  var tasks = _ref4.tasks,
-    tree = _ref4.tree,
+  var tree = _ref4.tree,
     node = _ref4.node;
   return function (_ref5) {
     var bindings = _ref5.bindings;
@@ -125,12 +196,12 @@ var fields = function fields(_ref4) {
         name: "parameter_".concat(parameter.id),
         label: parameter.label,
         type: parameter.menu ? 'select' : 'code',
-        language: parameter.menu ? null : 'erb',
+        language: parameter.menu ? null : 'ruby-template',
         helpText: parameter.description,
         initialValue: parameter.value,
         options: parameter.menu ? getOptions(parameter.menu) : bindings,
         "transient": true,
-        visible: checkDependsOn(parameter) && (0, _TaskDefinitionConfigForm.checkOmittedParameters)(node, parameter)
+        visible: checkDependsOn(parameter) && (0, _helpers.checkOmittedParametersForAdvancedHandlers)(node, parameter)
       };
     })), [{
       name: 'parameters',
@@ -151,7 +222,7 @@ var fields = function fields(_ref4) {
       }).map(function (message) {
         return message.value;
       }).first(''),
-      language: 'erb',
+      language: 'ruby-template',
       options: bindings,
       "transient": true,
       visible: function visible(_ref8) {
@@ -167,7 +238,7 @@ var fields = function fields(_ref4) {
       }).map(function (message) {
         return message.value;
       }).first(''),
-      language: 'erb',
+      language: 'ruby-template',
       options: bindings,
       "transient": true,
       visible: function visible(_ref9) {
@@ -183,7 +254,7 @@ var fields = function fields(_ref4) {
       }).map(function (message) {
         return message.value;
       }).first(''),
-      language: 'erb',
+      language: 'ruby-template',
       options: bindings,
       "transient": true
     }, {
@@ -213,7 +284,7 @@ var handleSubmit = function handleSubmit(_ref11) {
   };
 };
 var NodeForm = exports.NodeForm = (0, _Form.generateForm)({
-  formOptions: ['node', 'tasks', 'tree'],
+  formOptions: ['connections', 'node', 'tasks', 'tree'],
   dataSources: dataSources,
   fields: fields,
   handleSubmit: handleSubmit

package/lib/components/task/builder/NodeParametersForm.js

@@ -9,7 +9,6 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _Form = require("../../form/Form");
 var _helpers = require("./helpers");
 var _models = require("./models");
-var _TaskDefinitionConfigForm = require("./TaskDefinitionConfigForm");
 var getOptions = function getOptions(menu) {
   return menu.split(',').filter(function (value) {
     return !!value;
@@ -21,14 +20,20 @@ var getOptions = function getOptions(menu) {
   });
 };
 var dataSources = function dataSources(_ref) {
-  var task = _ref.task,
+  var connections = _ref.connections,
+    task = _ref.task,
     tasks = _ref.tasks,
     tree = _ref.tree,
     node = _ref.node;
   return {
     bindings: {
       fn: _helpers.buildBindings,
-      params: [tree, tasks, node]
+      params: [{
+        tree: tree,
+        tasks: tasks,
+        node: node,
+        connections: connections
+      }]
     },
     parameters: {
       fn: function fn() {
@@ -38,44 +43,52 @@ var dataSources = function dataSources(_ref) {
       transform: function transform(result) {
         return result.map(_helpers.normalizeParameter).map(_models.NodeParameter);
       }
+    },
+    oldParameters: {
+      fn: function fn() {
+        return node.parameters;
+      },
+      params: []
     }
   };
 };
 var fields = function fields(_ref2) {
   var node = _ref2.node,
-    task = _ref2.task,
-    tasks = _ref2.tasks,
-    tree = _ref2.tree;
+    task = _ref2.task;
   return function (_ref3) {
     var bindings = _ref3.bindings,
-      parameters = _ref3.parameters;
-    return bindings && parameters && [].concat((0, _toConsumableArray2["default"])(node.parameters.map(function (parameter) {
+      parameters = _ref3.parameters,
+      oldParameters = _ref3.oldParameters;
+    return bindings && parameters && oldParameters && [].concat((0, _toConsumableArray2["default"])(oldParameters.map(function (parameter) {
       return {
         name: "oldParameter_".concat(parameter.id),
         label: parameter.label,
         type: parameter.menu ? 'select' : 'code',
-        language: parameter.menu ? null : 'erb',
+        language: parameter.menu ? null : 'ruby-template',
         helpText: parameter.description,
         initialValue: parameter.value,
         options: parameter.menu ? getOptions(parameter.menu) : bindings,
         "transient": true,
         enabled: false,
-        visible: (0, _TaskDefinitionConfigForm.checkOmittedParameters)(node, parameter)
+        visible: (0, _helpers.checkOmittedParametersForAdvancedHandlers)(node, parameter)
       };
     })), (0, _toConsumableArray2["default"])(parameters.map(function (parameter) {
-      var matchingParameter = node.parameters.find(function (oldParameter) {
+      var matchingParameter = oldParameters.find(function (oldParameter) {
         return oldParameter.id === parameter.id;
       });
       return {
         name: "parameter_".concat(parameter.id),
         label: parameter.label,
         type: parameter.menu ? 'select' : 'code',
-        language: parameter.menu ? null : 'erb',
+        language: parameter.menu ? null : 'ruby-template',
         helpText: parameter.description,
-        initialValue: matchingParameter ? matchingParameter.value : parameter.defaultValue,
+        // If this parameter will be omitted, keep its value. Otherwise, set to
+        // the matchingParameter's value or the default
+        initialValue: !(0, _helpers.checkOmittedParametersForAdvancedHandlers)(task, parameter) ? parameter.value || parameter.defaultValue : matchingParameter ? matchingParameter.value : parameter.defaultValue,
         options: parameter.menu ? getOptions(parameter.menu) : bindings,
         "transient": true,
-        visible: (0, _TaskDefinitionConfigForm.checkOmittedParameters)(node, parameter)
+        // Use the task variable as the node since this is the new node
+        visible: (0, _helpers.checkOmittedParametersForAdvancedHandlers)(task, parameter)
       };
     })), [{
       name: 'parameters',
@@ -128,14 +141,13 @@ var fields = function fields(_ref2) {
     }]);
   };
 };
-var handleSubmit = function handleSubmit(_ref5) {
-  var node = _ref5.node;
+var handleSubmit = function handleSubmit() {
   return function (values) {
     return values;
   };
 };
 var NodeParametersForm = exports.NodeParametersForm = (0, _Form.generateForm)({
-  formOptions: ['node', 'task', 'tasks', 'tree'],
+  formOptions: ['connections', 'node', 'task', 'tasks', 'tree'],
   dataSources: dataSources,
   fields: fields,
   handleSubmit: handleSubmit

package/lib/components/task/builder/TaskDefinitionConfigForm.js

@@ -1,50 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.generateTaskDefinition = exports.checkOmittedParameters = exports.TaskDefinitionConfigForm = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
+exports.TaskDefinitionConfigForm = void 0;
 var _immutable = require("immutable");
 var _Form = require("../../form/Form");
 var _apis = require("../../../apis");
-var checkOmittedParameters = exports.checkOmittedParameters = function checkOmittedParameters(node, parameter) {
-  if (node.definitionId === 'system_submission_create_v1') {
-    return !['kappSlug', 'formSlug'].includes(parameter.id);
-  } else {
-    return true;
-  }
-};
-var generateTaskDefinition = exports.generateTaskDefinition = function generateTaskDefinition(taskDefinition) {
-  if (taskDefinition && taskDefinition.definitionName === 'system_submission_create') {
-    return function (_ref) {
-      var form = _ref.form;
-      return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, taskDefinition), {}, {
-        parameters: [].concat((0, _toConsumableArray2["default"])(taskDefinition.parameters.map(function (parameter) {
-          return parameter.id === 'kappSlug' ? (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, parameter), {}, {
-            defaultValue: form.kapp.slug
-          }) : parameter.id === 'formSlug' ? (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, parameter), {}, {
-            defaultValue: form.slug
-          }) : parameter;
-        })), (0, _toConsumableArray2["default"])(form.fields.map(function (field) {
-          return {
-            name: field.name,
-            defaultValue: '',
-            dependsOnId: null,
-            dependsOnValue: null,
-            description: '',
-            id: "values.".concat(field.name),
-            required: false
-          };
-        })))
-      });
-    };
-  } else {
-    return null;
-  }
-};
+var _helpers = require("./helpers");
 var dataSources = function dataSources() {
   return {
     kapps: {
@@ -63,8 +26,8 @@ var fields = function fields() {
       label: 'Kapp',
       type: 'select',
       required: true,
-      options: function options(_ref2) {
-        var kapps = _ref2.kapps;
+      options: function options(_ref) {
+        var kapps = _ref.kapps;
         return kapps ? kapps.map(function (kapp) {
           return (0, _immutable.Map)({
             value: kapp.get('slug'),
@@ -72,8 +35,8 @@ var fields = function fields() {
           });
         }) : (0, _immutable.List)();
       },
-      onChange: function onChange(_ref3, actions) {
-        var values = _ref3.values;
+      onChange: function onChange(_ref2, actions) {
+        var values = _ref2.values;
         if (!!values.get('form')) {
           actions.setValue('form', null);
         }
@@ -83,12 +46,12 @@ var fields = function fields() {
       label: 'Form',
       type: 'form',
       required: true,
-      enabled: function enabled(_ref4) {
-        var values = _ref4.values;
+      enabled: function enabled(_ref3) {
+        var values = _ref3.values;
         return values.get('kappSlug') !== '';
       },
-      search: function search(_ref5) {
-        var values = _ref5.values;
+      search: function search(_ref4) {
+        var values = _ref4.values;
         return values.get('kappSlug') !== '' ? {
           kappSlug: values.get('kappSlug')
         } : {};
@@ -96,14 +59,19 @@ var fields = function fields() {
     }];
   };
 };
-var handleSubmit = function handleSubmit(_ref6) {
-  var taskDefinition = _ref6.taskDefinition;
+var handleSubmit = function handleSubmit(_ref5) {
+  var taskDefinition = _ref5.taskDefinition;
   return function (values) {
     return (0, _apis.fetchForm)({
       kappSlug: values.get('kappSlug'),
       formSlug: values.getIn(['form', 'slug'], ''),
       include: 'fields,kapp'
-    }).then(generateTaskDefinition(taskDefinition));
+    }).then(function (_ref6) {
+      var form = _ref6.form;
+      return (0, _helpers.generateSubmissionCreateTaskDefinition)(taskDefinition, {
+        form: form
+      });
+    });
   };
 };
 var TaskDefinitionConfigForm = exports.TaskDefinitionConfigForm = (0, _Form.generateForm)({

package/lib/components/task/builder/TreeBuilder.js

@@ -146,7 +146,7 @@ var TreeBuilderComponent = exports.TreeBuilderComponent = /*#__PURE__*/function
     _this.confirmNewNode = function () {
       if ((0, _lodashEs.isFunction)(_this.props.onNew)) {
         setTimeout(function () {
-          _this.props.onNew((0, _helpers.addNewTask)(_this.props.treeKey, _this.props.treeBuilderState.tree, _this.state.newNodeParent, _this.newNode.current.position, function () {
+          _this.props.onNew((0, _helpers.addNewTask)(_this.props.treeKey, _this.props.treeBuilderState.tree, _this.props.treeBuilderState.connections, _this.state.newNodeParent, _this.newNode.current.position, function () {
             return _this.setState({
               newConnector: null,
               newNode: null
@@ -271,7 +271,8 @@ var TreeBuilderComponent = exports.TreeBuilderComponent = /*#__PURE__*/function
         highlightType = _ref4[0],
         highlightId = _ref4[1];
       if (treeBuilderState) {
-        var error = treeBuilderState.error,
+        var connections = treeBuilderState.connections,
+          error = treeBuilderState.error,
           lastSave = treeBuilderState.lastSave,
           lastWebApi = treeBuilderState.lastWebApi,
           redoStack = treeBuilderState.redoStack,
@@ -320,6 +321,17 @@ var TreeBuilderComponent = exports.TreeBuilderComponent = /*#__PURE__*/function
                 values: values
               });
             },
+            reloadConnections: function reloadConnections() {
+              return (0, _store.dispatch)('TREE_LOAD_CONNECTIONS', {
+                treeKey: treeKey
+              });
+            },
+            reloadOperations: function reloadOperations() {
+              var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+              return (0, _store.dispatch)('TREE_LOAD_OPERATIONS', (0, _objectSpread2["default"])({
+                treeKey: treeKey
+              }, options));
+            },
             save: function save(_ref5) {
               var _ref5$overwrite = _ref5.overwrite,
                 overwrite = _ref5$overwrite === void 0 ? false : _ref5$overwrite,
@@ -354,6 +366,7 @@ var TreeBuilderComponent = exports.TreeBuilderComponent = /*#__PURE__*/function
               return _this2.canvasRef.current.zoomOut();
             }
           },
+          connections: connections,
           dirty: this.isDirty(treeBuilderState),
           error: error,
           lastTree: lastSave,
@@ -401,6 +414,7 @@ var TreeBuilderComponent = exports.TreeBuilderComponent = /*#__PURE__*/function
                 return nodeId === node.id;
               }),
               onSelect: _this2.props.onSelectNode,
+              connections: connections,
               tasks: tasks,
               tree: tree
             });
@@ -408,6 +422,7 @@ var TreeBuilderComponent = exports.TreeBuilderComponent = /*#__PURE__*/function
             ref: this.newNode,
             treeKey: treeKey,
             node: this.state.newNode,
+            connections: connections,
             tasks: tasks,
             tree: tree
           }))),
@@ -426,4 +441,10 @@ var mapStateToProps = function mapStateToProps(state, props) {
     kappSlug: state.getIn(['trees', props.treeKey, 'kappSlug'])
   };
 };
-var TreeBuilder = exports.TreeBuilder = (0, _store.connect)(mapStateToProps)(TreeBuilderComponent);
+var TreeBuilder = exports.TreeBuilder = (0, _store.connect)(mapStateToProps)(TreeBuilderComponent);
+TreeBuilder.ADVANCED_HANDLERS = {
+  INTEGRATION_NAME: constants.ADVANCED_HANDLER_NAME_INTEGRATION,
+  generateIntegrationTaskDefinition: _helpers.generateIntegrationTaskDefinition,
+  SUBMISSION_CREATE_NAME: constants.ADVANCED_HANDLER_NAME_SUBMISSION_CREATE,
+  generateSubmissionCreateTaskDefinition: _helpers.generateSubmissionCreateTaskDefinition
+};