@kineticdata/react 5.0.16 → 5.1.0

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

@@ -3,6 +3,8 @@ import { List } from 'immutable';
 import { generateForm } from '../../form/Form';
 import { NodeMessage } from './models';
 import { buildBindings } from './helpers';
+import { fetchForm } from '../../../apis';
+import { checkOmittedParameters, generateTaskDefinition } from './TaskDefinitionConfigForm';
 
 var dataSources = function dataSources(_ref) {
   var tasks = _ref.tasks,
@@ -18,6 +20,33 @@ var dataSources = function dataSources(_ref) {
         return node.parameters;
       },
       params: [node]
+    },
+    form: {
+      fn: function fn(node) {
+        return fetchForm({
+          kappSlug: node.parameters.find(function (parameter) {
+            return parameter.id === 'kappSlug';
+          }).value,
+          formSlug: node.parameters.find(function (parameter) {
+            return parameter.id === 'formSlug';
+          }).value,
+          include: 'fields,kapp'
+        }).then(function (data) {
+          return data.form;
+        });
+      },
+      params: generateTaskDefinition(tasks.get(node.definitionId)) ? [node] : null
+    },
+    task: {
+      fn: function fn(node, form) {
+        return form ? generateTaskDefinition(tasks.get(node.definitionId))({
+          form: form.toJS()
+        }) : tasks.get(node.definitionId);
+      },
+      params: function params(_ref2) {
+        var form = _ref2.form;
+        return generateTaskDefinition(tasks.get(node.definitionId)) ? form ? [node, form] : null : [node, null];
+      }
     }
   };
 };
@@ -34,26 +63,26 @@ var getOptions = function getOptions(menu) {
 };
 
 var checkDependsOn = function checkDependsOn(parameter) {
-  return !parameter.dependsOnId || function (_ref2) {
-    var values = _ref2.values;
+  return !parameter.dependsOnId || function (_ref3) {
+    var values = _ref3.values;
     return values.get("parameter_".concat(parameter.dependsOnId)) === parameter.dependsOnValue;
   };
 };
 
-var fields = function fields(_ref3) {
-  var tasks = _ref3.tasks,
-      tree = _ref3.tree,
-      node = _ref3.node;
-  return function (_ref4) {
-    var bindings = _ref4.bindings;
+var fields = function fields(_ref4) {
+  var tasks = _ref4.tasks,
+      tree = _ref4.tree,
+      node = _ref4.node;
+  return function (_ref5) {
+    var bindings = _ref5.bindings;
     return bindings && [{
       name: 'name',
       label: 'Name',
       type: 'text',
       initialValue: node.name,
       required: true,
-      constraint: function constraint(_ref5) {
-        var values = _ref5.values;
+      constraint: function constraint(_ref6) {
+        var values = _ref6.values;
         return tree.nodes.some(function (other) {
           return other.name === values.get('name') && other.id !== node.id;
         }) ? 'This name is already used by another node' : values.get('name').length > 128 ? 'Name cannot exceed 128 characters' : true;
@@ -98,14 +127,14 @@ var fields = function fields(_ref3) {
         initialValue: parameter.value,
         options: parameter.menu ? getOptions(parameter.menu) : bindings,
         "transient": true,
-        visible: checkDependsOn(parameter)
+        visible: checkDependsOn(parameter) && checkOmittedParameters(node, parameter)
       };
     })), [{
       name: 'parameters',
       type: null,
       visible: false,
-      serialize: function serialize(_ref6) {
-        var values = _ref6.values;
+      serialize: function serialize(_ref7) {
+        var values = _ref7.values;
         return node.parameters.map(function (parameter) {
           return parameter.set('value', values.get("parameter_".concat(parameter.id)));
         });
@@ -122,8 +151,8 @@ var fields = function fields(_ref3) {
       language: 'erb',
       options: bindings,
       "transient": true,
-      visible: function visible(_ref7) {
-        var values = _ref7.values;
+      visible: function visible(_ref8) {
+        var values = _ref8.values;
         return values.get('defers', false);
       }
     }, {
@@ -138,8 +167,8 @@ var fields = function fields(_ref3) {
       language: 'erb',
       options: bindings,
       "transient": true,
-      visible: function visible(_ref8) {
-        var values = _ref8.values;
+      visible: function visible(_ref9) {
+        var values = _ref9.values;
         return values.get('defers', false);
       }
     }, {
@@ -158,23 +187,26 @@ var fields = function fields(_ref3) {
       name: 'messages',
       type: null,
       visible: false,
-      serialize: function serialize(_ref9) {
-        var values = _ref9.values;
+      serialize: function serialize(_ref10) {
+        var values = _ref10.values;
         return List(values.get('defers') ? ['Create', 'Update', 'Complete'] : ['Complete']).map(function (type) {
           return NodeMessage({
             type: type,
             value: values.get("message_".concat(type))
           });
+        }) // Do not serialize empty messages.
+        .filter(function (message) {
+          return !!message.value;
         });
       }
     }]);
   };
 };
 
-var handleSubmit = function handleSubmit(_ref10) {
-  var node = _ref10.node;
+var handleSubmit = function handleSubmit(_ref11) {
+  var node = _ref11.node;
   return function (values) {
-    return values.toObject();
+    return node.merge(values);
   };
 };
 

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

@@ -2,6 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { generateForm } from '../../form/Form';
 import { buildBindings, normalizeParameter } from './helpers';
 import { NodeParameter } from './models';
+import { checkOmittedParameters } from './TaskDefinitionConfigForm';
 
 var getOptions = function getOptions(menu) {
   return menu.split(',').filter(function (value) {
@@ -54,7 +55,8 @@ var fields = function fields(_ref2) {
         initialValue: parameter.value,
         options: parameter.menu ? getOptions(parameter.menu) : bindings,
         "transient": true,
-        enabled: false
+        enabled: false,
+        visible: checkOmittedParameters(node, parameter)
       };
     })), _toConsumableArray(parameters.map(function (parameter) {
       var matchingParameter = node.parameters.find(function (oldParameter) {
@@ -68,7 +70,8 @@ var fields = function fields(_ref2) {
         helpText: parameter.description,
         initialValue: matchingParameter ? matchingParameter.value : parameter.defaultValue,
         options: parameter.menu ? getOptions(parameter.menu) : bindings,
-        "transient": true
+        "transient": true,
+        visible: checkOmittedParameters(node, parameter)
       };
     })), [{
       name: 'parameters',

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

@@ -245,11 +245,20 @@ export var SvgCanvas = /*#__PURE__*/function (_Component) {
           x = _this$viewport.x,
           y = _this$viewport.y;
 
-      if (!isIE11) {
-        var transition = duration ? "transition: transform ".concat(duration, "ms ").concat(ease) : '';
-        this.transformer.current.setAttribute('style', "transform: translate(".concat(x, "px, ").concat(y, "px) scale(").concat(scale, ");").concat(transition));
+      if (isIE11) {
+        // this.transformer.current.setAttribute(
+        //   'transform',
+        //   `translate(${x} ${y}) scale(${scale})`,
+        // );
+        this.transformer.current.transform = "translate(".concat(x, " ").concat(y, ") scale(").concat(scale, ")");
       } else {
-        this.transformer.current.setAttribute('transform', "translate(".concat(x, " ").concat(y, ") scale(").concat(scale, ")"));
+        var transition = duration ? "transform ".concat(duration, "ms ").concat(ease) : ''; // this.transformer.current.setAttribute(
+        //   'style',
+        //   `transform: translate(${x}px, ${y}px) scale(${scale});${transition}`,
+        // );
+
+        this.transformer.current.style.transform = "translate(".concat(x, "px, ").concat(y, "px) scale(").concat(scale, ")");
+        this.transformer.current.style.transition = transition;
       }
 
       if (this.viewport.scale < 0.26 && this.transformer.current.className.baseVal !== 'min-detail') {

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

@@ -0,0 +1,113 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { List, Map } from 'immutable';
+import { generateForm } from '../../form/Form';
+import { fetchForm, fetchKapps } from '../../../apis';
+export var checkOmittedParameters = function checkOmittedParameters(node, parameter) {
+  if (node.definitionId === 'system_submission_create_v1') {
+    return !['kappSlug', 'formSlug'].includes(parameter.id);
+  } else {
+    return true;
+  }
+};
+export var generateTaskDefinition = function generateTaskDefinition(taskDefinition) {
+  if (taskDefinition.definitionName === 'system_submission_create') {
+    return function (_ref) {
+      var form = _ref.form;
+      return _objectSpread(_objectSpread({}, taskDefinition), {}, {
+        parameters: [].concat(_toConsumableArray(taskDefinition.parameters.map(function (parameter) {
+          return parameter.id === 'kappSlug' ? _objectSpread(_objectSpread({}, parameter), {}, {
+            defaultValue: form.kapp.slug
+          }) : parameter.id === 'formSlug' ? _objectSpread(_objectSpread({}, parameter), {}, {
+            defaultValue: form.slug
+          }) : parameter;
+        })), _toConsumableArray(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 dataSources = function dataSources() {
+  return {
+    kapps: {
+      fn: fetchKapps,
+      params: [],
+      transform: function transform(data) {
+        return data.kapps;
+      }
+    }
+  };
+};
+
+var fields = function fields() {
+  return function () {
+    return [{
+      name: 'kappSlug',
+      label: 'Kapp',
+      type: 'select',
+      required: true,
+      options: function options(_ref2) {
+        var kapps = _ref2.kapps;
+        return kapps ? kapps.map(function (kapp) {
+          return Map({
+            value: kapp.get('slug'),
+            label: kapp.get('name')
+          });
+        }) : List();
+      },
+      onChange: function onChange(_ref3, actions) {
+        var values = _ref3.values;
+
+        if (!!values.get('form')) {
+          actions.setValue('form', null);
+        }
+      }
+    }, {
+      name: 'form',
+      label: 'Form',
+      type: 'form',
+      required: true,
+      enabled: function enabled(_ref4) {
+        var values = _ref4.values;
+        return values.get('kappSlug') !== '';
+      },
+      search: function search(_ref5) {
+        var values = _ref5.values;
+        return values.get('kappSlug') !== '' ? {
+          kappSlug: values.get('kappSlug')
+        } : {};
+      }
+    }];
+  };
+};
+
+var handleSubmit = function handleSubmit(_ref6) {
+  var taskDefinition = _ref6.taskDefinition;
+  return function (values) {
+    return fetchForm({
+      kappSlug: values.get('kappSlug'),
+      formSlug: values.getIn(['form', 'slug'], ''),
+      include: 'fields,kapp'
+    }).then(generateTaskDefinition(taskDefinition));
+  };
+};
+
+export var TaskDefinitionConfigForm = generateForm({
+  formOptions: ['taskDefinition'],
+  dataSources: dataSources,
+  fields: fields,
+  handleSubmit: handleSubmit
+});
+TaskDefinitionConfigForm.displayName = 'TaskDefinitionConfigForm';

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

@@ -155,7 +155,7 @@ export var TreeBuilderComponent = /*#__PURE__*/function (_Component) {
     };
 
     _this.isDirty = function (treeBuilderState) {
-      return treeBuilderState && !is(treeBuilderState.lastSave, treeBuilderState.tree);
+      return treeBuilderState && (!is(treeBuilderState.lastSave, treeBuilderState.tree) || !is(treeBuilderState.lastWebApi, treeBuilderState.webApi));
     };
 
     _this.state = {
@@ -202,7 +202,7 @@ export var TreeBuilderComponent = /*#__PURE__*/function (_Component) {
       // placeholder then we will call configureTreeBuilder with the component's
       // props at that time
       if (this.props.treeBuilderState === null) {
-        configureTreeBuilder(pick(this.props, ['treeKey', 'sourceName', 'sourceGroup', 'name']));
+        configureTreeBuilder(pick(this.props, ['treeKey', 'sourceName', 'sourceGroup', 'name', 'platformSourceName']));
       }
     }
   }, {
@@ -218,8 +218,8 @@ export var TreeBuilderComponent = /*#__PURE__*/function (_Component) {
         } // otherwise check for changes to the highlight prop and focus if it changes
         // and its a truthy value
         else if (this.props.highlight && !this.props.highlight.equals(prevProps.highlight)) {
-            this.panTo(this.props.highlight);
-          }
+          this.panTo(this.props.highlight);
+        }
       }
     }
   }, {
@@ -239,11 +239,14 @@ export var TreeBuilderComponent = /*#__PURE__*/function (_Component) {
           highlightId = _ref4[1];
 
       if (treeBuilderState) {
-        var redoStack = treeBuilderState.redoStack,
+        var lastSave = treeBuilderState.lastSave,
+            lastWebApi = treeBuilderState.lastWebApi,
+            redoStack = treeBuilderState.redoStack,
             saving = treeBuilderState.saving,
             tasks = treeBuilderState.tasks,
             tree = treeBuilderState.tree,
-            undoStack = treeBuilderState.undoStack;
+            undoStack = treeBuilderState.undoStack,
+            webApi = treeBuilderState.webApi;
         return this.props.children({
           actions: {
             deleteConnector: function deleteConnector(id) {
@@ -270,6 +273,18 @@ export var TreeBuilderComponent = /*#__PURE__*/function (_Component) {
                 dependencies: dependencies
               }));
             },
+            updateSettings: function updateSettings(values) {
+              return dispatch('TREE_UPDATE_SETTINGS', {
+                treeKey: treeKey,
+                values: values
+              });
+            },
+            updateWebApi: function updateWebApi(values) {
+              return dispatch('TREE_UPDATE_WEB_API', {
+                treeKey: treeKey,
+                values: values
+              });
+            },
             save: function save(_ref5) {
               var _ref5$overwrite = _ref5.overwrite,
                   overwrite = _ref5$overwrite === void 0 ? false : _ref5$overwrite,
@@ -305,12 +320,14 @@ export var TreeBuilderComponent = /*#__PURE__*/function (_Component) {
             }
           },
           dirty: this.isDirty(treeBuilderState),
-          name: tree.name,
+          lastTree: lastSave,
+          lastWebApi: lastWebApi,
+          name: tree ? tree.name : null,
           saving: saving,
           sidebarRef: this.sidebarRef,
           tasks: tasks,
           tree: tree,
-          treeBuilder: /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(SvgCanvas, {
+          treeBuilder: tree && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(SvgCanvas, {
             ref: this.canvasRef
           }, tree.connectors.map(function (connector) {
             return /*#__PURE__*/React.createElement(Connector, {
@@ -350,7 +367,8 @@ export var TreeBuilderComponent = /*#__PURE__*/function (_Component) {
               tasks: tasks,
               tree: tree
             });
-          }).toList()))
+          }).toList())),
+          webApi: webApi
         });
       }