@kineticdata/react 5.1.0-rc.2 → 5.1.0

package/lib/components/task/runs/CreateManualTriggerForm.js

@@ -1,30 +1,21 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { createTaskTrigger, fetchTree } from '../../../apis';
+import { createTaskTrigger } from '../../../apis';
 import { generateForm } from '../../form/Form';
+import { serializeNodeId } from '../builder/models';
 
 var dataSources = function dataSources(_ref) {
-  var sourceName = _ref.sourceName,
-      sourceGroup = _ref.sourceGroup,
-      name = _ref.name,
-      workflowType = _ref.workflowType;
+  var tree = _ref.tree;
   return {
     nodes: {
-      fn: fetchTree,
-      params: name && [{
-        type: workflowType || 'Tree',
-        sourceName: sourceName,
-        sourceGroup: sourceGroup,
-        name: name,
-        include: 'treeJson'
-      }],
-      transform: function transform(result) {
-        return result.tree && result.tree.treeJson ? result.tree.treeJson.nodes.map(function (node) {
+      fn: function fn() {
+        return tree.nodes.map(function (node) {
           return {
-            label: "".concat(node.name, " (").concat(node.id, ")"),
-            value: node.id
+            label: "".concat(node.name, " (").concat(serializeNodeId(node), ")"),
+            value: serializeNodeId(node)
           };
-        }) : [];
-      }
+        }).valueSeq().toArray();
+      },
+      params: []
     }
   };
 };
@@ -47,10 +38,10 @@ var handleSubmit = function handleSubmit(formOptions) {
   };
 };
 
-var fields = function fields(_ref3) {
-  var name = _ref3.name;
-  return function () {
-    return name && [{
+var fields = function fields() {
+  return function (_ref3) {
+    var nodes = _ref3.nodes;
+    return nodes && [{
       name: 'nodeId',
       label: 'Node Id',
       type: 'select',
@@ -85,7 +76,7 @@ var fields = function fields(_ref3) {
 };
 
 export var CreateManualTriggerForm = generateForm({
-  formOptions: ['sourceName', 'sourceGroup', 'name', 'workflowType', 'runId'],
+  formOptions: ['runId', 'tree'],
   dataSources: dataSources,
   fields: fields,
   handleSubmit: handleSubmit

package/lib/components/task/workflows/WorkflowForm.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { fetchTree, fetchSources, fetchSource, updateTree, createTree, fetchTaskCategories } from '../../../apis';
+import { fetchSources, fetchSource, updateTree, createTree, fetchTaskCategories } from '../../../apis';
 import { Form } from '../../form/Form';
 import { get, List, Map } from 'immutable'; // bulids a definition id based on a name (similar to slugify)
 
@@ -10,29 +10,12 @@ var buildDefinitionId = function buildDefinitionId(text) {
   .replace(/[^A-Za-z0-9_]+/g, '');
 };
 
-var dataSources = function dataSources(_ref) {
-  var workflowType = _ref.workflowType,
-      sourceName = _ref.sourceName,
-      sourceGroup = _ref.sourceGroup,
-      name = _ref.name;
+var dataSources = function dataSources() {
   return {
-    workflow: {
-      fn: fetchTree,
-      params: name && [{
-        type: workflowType || 'Tree',
-        sourceName: sourceName,
-        sourceGroup: sourceGroup,
-        name: name,
-        include: 'details,inputs,outputs,categories'
-      }],
-      transform: function transform(result) {
-        return result.tree;
-      }
-    },
     selectedSource: {
       fn: fetchSource,
-      params: function params(_ref2) {
-        var values = _ref2.values;
+      params: function params(_ref) {
+        var values = _ref.values;
         return values && values.get('sourceName') && [{
           sourceName: values.get('sourceName'),
           include: 'predefinedSourceGroups,predefinedTreeNames'
@@ -64,44 +47,41 @@ var dataSources = function dataSources(_ref) {
   };
 };
 
-var handleSubmit = function handleSubmit(_ref3) {
-  var sourceName = _ref3.sourceName,
-      sourceGroup = _ref3.sourceGroup,
-      name = _ref3.name;
+var handleSubmit = function handleSubmit(_ref2) {
+  var workflow = _ref2.workflow;
   return function (values) {
-    return (name ? updateTree({
-      sourceName: sourceName,
-      sourceGroup: sourceGroup,
-      name: name,
-      tree: values.toJS()
-    }) : createTree({
-      tree: values.toJS()
-    })).then(function (_ref4) {
-      var tree = _ref4.tree,
-          error = _ref4.error;
+    if (!workflow) {
+      return createTree({
+        tree: values.toJS()
+      }).then(function (_ref3) {
+        var tree = _ref3.tree,
+            error = _ref3.error;
 
-      if (error) {
-        throw error.statusCode === 400 && error.message || 'There was an error saving the workflow';
-      } else {
-        return tree;
-      }
-    });
+        if (error) {
+          throw error.statusCode === 400 && error.message || 'There was an error saving the workflow';
+        } else {
+          return tree;
+        }
+      });
+    } else {
+      return values.toObject();
+    }
   };
 };
 
-var fields = function fields(_ref5) {
-  var name = _ref5.name,
-      workflowType = _ref5.workflowType;
-  return function (_ref6) {
-    var workflow = _ref6.workflow,
-        categories = _ref6.categories;
+var fields = function fields(_ref4) {
+  var name = _ref4.name,
+      workflow = _ref4.workflow,
+      workflowType = _ref4.workflowType;
+  return function (_ref5) {
+    var categories = _ref5.categories;
     return (!name || workflow) && categories && [{
       name: 'sourceName',
       label: 'Source',
       type: 'select',
       required: true,
-      options: function options(_ref7) {
-        var sources = _ref7.sources;
+      options: function options(_ref6) {
+        var sources = _ref6.sources;
         return sources;
       },
       initialValue: workflow ? workflow.get('sourceName') : workflowType === 'routines' ? '-' : '',
@@ -111,8 +91,8 @@ var fields = function fields(_ref5) {
       label: 'Source Group',
       type: 'text',
       required: true,
-      options: function options(_ref8) {
-        var selectedSource = _ref8.selectedSource;
+      options: function options(_ref7) {
+        var selectedSource = _ref7.selectedSource;
         return selectedSource ? selectedSource.get('predefinedSourceGroups').map(function (g) {
           return Map({
             label: g,
@@ -127,8 +107,8 @@ var fields = function fields(_ref5) {
       label: 'Name',
       type: 'text',
       required: true,
-      options: function options(_ref9) {
-        var selectedSource = _ref9.selectedSource;
+      options: function options(_ref8) {
+        var selectedSource = _ref8.selectedSource;
         return selectedSource ? selectedSource.get('predefinedTreeNames').map(function (n) {
           return Map({
             label: n,
@@ -136,9 +116,9 @@ var fields = function fields(_ref5) {
           });
         }) : List();
       },
-      onChange: function onChange(_ref10, _ref11) {
-        var values = _ref10.values;
-        var setValue = _ref11.setValue;
+      onChange: function onChange(_ref9, _ref10) {
+        var values = _ref9.values;
+        var setValue = _ref10.setValue;
 
         if (values.has('definitionId') && values.get('linked')) {
           setValue('definitionId', buildDefinitionId(values.get('name')), false);
@@ -151,23 +131,23 @@ var fields = function fields(_ref5) {
       label: 'Linked',
       type: 'checkbox',
       "transient": true,
-      initialValue: !name,
+      initialValue: !name && !workflow,
       visible: false
     }, workflowType !== 'trees' && {
       name: 'definitionId',
       label: 'Definition ID',
       type: 'text',
-      enabled: name ? false : true,
+      enabled: !name && !workflow,
       required: true,
-      onChange: function onChange(_bindings, _ref12) {
-        var setValue = _ref12.setValue;
+      onChange: function onChange(_bindings, _ref11) {
+        var setValue = _ref11.setValue;
         setValue('linked', false);
       },
       initialValue: get(workflow, 'definitionId', '') || '',
       helpText: 'Definition ID is generated by the system and used for API requests',
-      serialize: function serialize(_ref13) {
-        var values = _ref13.values;
-        return name ? values.get('definitionId') : "routine_".concat(values.get('definitionId'));
+      serialize: function serialize(_ref12) {
+        var values = _ref12.values;
+        return name || workflow ? values.get('definitionId') : "routine_".concat(values.get('definitionId'));
       }
     }, {
       name: 'notes',
@@ -202,9 +182,7 @@ var fields = function fields(_ref5) {
       name: 'categories',
       label: 'Categories',
       type: 'select-multi',
-      initialValue: get(workflow, 'categories', List()).map(function (c) {
-        return c.get('name');
-      }),
+      initialValue: get(workflow, 'categories', List()),
       options: categories.sortBy(function (c) {
         return c.get('name');
       }).map(function (c) {
@@ -218,6 +196,10 @@ var fields = function fields(_ref5) {
       label: 'Inputs',
       type: 'table',
       options: [{
+        name: 'drag',
+        label: null,
+        type: 'drag'
+      }, {
         name: 'name',
         label: 'Name',
         type: 'text'
@@ -234,12 +216,16 @@ var fields = function fields(_ref5) {
         label: 'Required',
         type: 'checkbox'
       }],
-      initialValue: get(workflow, 'inputs', [])
+      initialValue: get(workflow, 'inputs', List())
     }, workflowType !== 'trees' && {
       name: 'outputs',
       label: 'Outputs',
       type: 'table',
       options: [{
+        name: 'drag',
+        label: null,
+        type: 'drag'
+      }, {
         name: 'name',
         label: 'Name',
         type: 'text'
@@ -248,24 +234,22 @@ var fields = function fields(_ref5) {
         label: 'Description',
         type: 'text'
       }],
-      initialValue: get(workflow, 'outputs', [])
+      initialValue: get(workflow, 'outputs', List())
     }];
   };
 };
 
-export var WorkflowForm = function WorkflowForm(_ref14) {
-  var addFields = _ref14.addFields,
-      alterFields = _ref14.alterFields,
-      fieldSet = _ref14.fieldSet,
-      formKey = _ref14.formKey,
-      components = _ref14.components,
-      onSave = _ref14.onSave,
-      onError = _ref14.onError,
-      children = _ref14.children,
-      workflowType = _ref14.workflowType,
-      sourceName = _ref14.sourceName,
-      sourceGroup = _ref14.sourceGroup,
-      name = _ref14.name;
+export var WorkflowForm = function WorkflowForm(_ref13) {
+  var addFields = _ref13.addFields,
+      alterFields = _ref13.alterFields,
+      fieldSet = _ref13.fieldSet,
+      formKey = _ref13.formKey,
+      components = _ref13.components,
+      onSave = _ref13.onSave,
+      onError = _ref13.onError,
+      children = _ref13.children,
+      workflow = _ref13.workflow,
+      workflowType = _ref13.workflowType;
   return /*#__PURE__*/React.createElement(Form, {
     addFields: addFields,
     alterFields: alterFields,
@@ -278,10 +262,8 @@ export var WorkflowForm = function WorkflowForm(_ref14) {
     dataSources: dataSources,
     fields: fields,
     formOptions: {
-      workflowType: workflowType,
-      sourceName: sourceName,
-      sourceGroup: sourceGroup,
-      name: name
+      workflow: workflow,
+      workflowType: workflowType
     }
   }, children);
 };

package/lib/index.js

@@ -43,6 +43,7 @@ export var KineticLib = function KineticLib(props) {
     value: DefaultFieldConfig.merge(DefaultTableConfig).merge(remove(props.components || {}, 'fields')).merge(props.components && props.components.fields)
   }, typeof props.children === 'function' ? /*#__PURE__*/React.createElement(AuthenticationContainer, {
     noSocket: props.noSocket,
+    skipInit: props.skipInit,
     system: props.system
   }, props.children) : props.children))));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kineticdata/react",
-  "version": "5.1.0-rc.2",
+  "version": "5.1.0",
   "description": "A React library for the Kinetic Platform",
   "main": "lib/index.js",
   "main:src": "src/index.js",
@@ -92,5 +92,5 @@
   "eslintConfig": {
     "extends": "react-app"
   },
-  "gitHead": "bc59f190ed46903da59e9b36191946a654e2b37c"
+  "gitHead": "5040d157c5e19e593fc9f9ca36407058a8d927c5"
 }