@kineticdata/react 5.1.0-rc.1 → 5.1.1

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

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import { List, OrderedMap, Record } from 'immutable';
+import { List, Map, OrderedMap, Record } from 'immutable';
 /*******************************************************************************
  * Immutable records                                                           *
  ******************************************************************************/
@@ -9,17 +9,34 @@ export var Point = Record({
   x: 0,
   y: 0
 }, 'Point');
+export var WebApi = Record({
+  createdAt: null,
+  createdBy: null,
+  method: null,
+  securityPolicies: null,
+  slug: null,
+  kappSlug: null,
+  updatedAt: null,
+  updatedBy: null
+});
 export var Tree = Record({
   bindings: OrderedMap(),
+  categories: List(),
   connectors: OrderedMap(),
+  definitionId: null,
+  inputs: null,
   name: '',
   nextNodeId: 0,
   nextConnectorId: 0,
   nodes: OrderedMap(),
+  notes: '',
+  outputs: null,
+  ownerEmail: '',
   schemaVersion: '',
   sourceGroup: '',
   sourceName: '',
-  taskDefinition: null,
+  status: '',
+  type: '',
   versionId: '0'
 });
 export var Node = Record({
@@ -60,13 +77,16 @@ export var Connector = Record({
 export var TreeBuilderState = Record({
   categories: OrderedMap(),
   error: null,
+  kappSlug: null,
   lastSave: null,
+  lastWebApi: null,
   loading: true,
   redoStack: List(),
   saving: false,
   tasks: OrderedMap(),
-  tree: Tree(),
-  undoStack: List()
+  tree: null,
+  undoStack: List(),
+  webApi: null
 });
 export var NodeResultDependency = Record({
   // where the dependency was found, one of:
@@ -89,10 +109,9 @@ var deserializeNodeId = function deserializeNodeId(id) {
   return match ? parseInt(match[1]) : 0;
 };
 
-var serializeNodeId = function serializeNodeId(node) {
+export var serializeNodeId = function serializeNodeId(node) {
   return node.id === 0 ? 'start' : "".concat(node.definitionId, "_").concat(node.id);
 };
-
 export var deserializeNode = function deserializeNode(_ref) {
   var id = _ref.id,
       messages = _ref.messages,
@@ -145,17 +164,33 @@ export var serializeConnector = function serializeConnector(nodes) {
 };
 export var deserializeTree = function deserializeTree(_ref4) {
   var bindings = _ref4.bindings,
+      categories = _ref4.categories,
+      definitionId = _ref4.definitionId,
+      inputs = _ref4.inputs,
       name = _ref4.name,
+      notes = _ref4.notes,
+      outputs = _ref4.outputs,
+      ownerEmail = _ref4.ownerEmail,
       sourceGroup = _ref4.sourceGroup,
       sourceName = _ref4.sourceName,
+      status = _ref4.status,
       treeJson = _ref4.treeJson,
+      type = _ref4.type,
       versionId = _ref4.versionId;
   return Tree({
     bindings: bindings,
+    categories: List(categories).map(function (c) {
+      return c.name;
+    }),
     connectors: OrderedMap(treeJson.connectors.map(deserializeConnector).map(function (c) {
       return [c.id, c];
     })),
+    definitionId: definitionId,
+    inputs: List(inputs).map(Map),
     name: name,
+    notes: notes,
+    outputs: List(outputs).map(Map),
+    ownerEmail: ownerEmail,
     nextNodeId: treeJson.lastId + 1,
     nextConnectorId: treeJson.connectors.length,
     nodes: OrderedMap(treeJson.nodes.map(deserializeNode).map(function (n) {
@@ -164,27 +199,64 @@ export var deserializeTree = function deserializeTree(_ref4) {
     schemaVersion: treeJson.schemaVersion,
     sourceGroup: sourceGroup,
     sourceName: sourceName,
-    taskDefinition: treeJson.taskDefinition,
+    status: status,
+    type: type,
     versionId: versionId
   });
 };
 export var serializeTree = function serializeTree(_ref5) {
   var connectors = _ref5.connectors,
+      categories = _ref5.categories,
+      definitionId = _ref5.definitionId,
+      inputs = _ref5.inputs,
+      name = _ref5.name,
       nextNodeId = _ref5.nextNodeId,
       nodes = _ref5.nodes,
+      notes = _ref5.notes,
+      outputs = _ref5.outputs,
+      ownerEmail = _ref5.ownerEmail,
       schemaVersion = _ref5.schemaVersion,
-      taskDefinition = _ref5.taskDefinition,
+      sourceGroup = _ref5.sourceGroup,
+      sourceName = _ref5.sourceName,
+      status = _ref5.status,
       versionId = _ref5.versionId;
   var overwrite = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   return {
-    treeJson: _objectSpread({
+    categories: categories,
+    definitionId: definitionId,
+    inputs: inputs,
+    name: name,
+    notes: notes,
+    outputs: outputs,
+    ownerEmail: ownerEmail,
+    sourceGroup: sourceGroup,
+    sourceName: sourceName,
+    status: status,
+    treeJson: {
       connectors: connectors.toList().map(serializeConnector(nodes)).toJS(),
       lastId: nextNodeId - 1,
       nodes: nodes.toList().map(serializeNode).toJS(),
       schemaVersion: schemaVersion
-    }, taskDefinition ? {
-      taskDefinition: taskDefinition
-    } : {}),
+    },
     versionId: overwrite ? null : versionId
   };
+};
+export var deserializeWebApi = function deserializeWebApi(_ref6, kappSlug) {
+  var createdAt = _ref6.createdAt,
+      createdBy = _ref6.createdBy,
+      method = _ref6.method,
+      securityPolicies = _ref6.securityPolicies,
+      slug = _ref6.slug,
+      updatedAt = _ref6.updatedAt,
+      updatedBy = _ref6.updatedBy;
+  return WebApi({
+    createdAt: createdAt,
+    createdBy: createdBy,
+    method: method,
+    securityPolicies: List(securityPolicies).map(Map),
+    slug: slug,
+    kappSlug: kappSlug,
+    updatedAt: updatedAt,
+    updatedBy: updatedBy
+  });
 };

package/lib/components/task/errors/RunErrorTable.js

@@ -24,7 +24,7 @@ var dataSource = function dataSource(_ref) {
         relatedItem1Type: paramData.filters.get('relatedItem1Type'),
         relatedItem2Id: paramData.filters.get('relatedItem2Id'),
         relatedItem2Type: paramData.filters.get('relatedItem2Type'),
-        include: 'details,run,messages,messages.details',
+        include: 'details,run,run.details,messages,messages.details',
         limit: paramData.pageSize,
         offset: paramData.nextPageToken,
         timeline: paramData.sortColumn,

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/runs/RunTable.js

@@ -1,4 +1,4 @@
-import { fetchSources, fetchTaskRuns } from '../../../apis/task';
+import { fetchSources, fetchTaskRuns } from '../../../apis';
 import { generateTable } from '../../table/Table';
 import { get, getIn, Map } from 'immutable';
 var ORDER_BY = Map({
@@ -20,7 +20,8 @@ var dataSource = function dataSource(_ref) {
       treeName = _ref.treeName,
       treeType = _ref.treeType,
       sourceId = _ref.sourceId,
-      id = _ref.id;
+      id = _ref.id,
+      count = _ref.count;
   return {
     fn: fetchTaskRuns,
     params: function params(paramData) {
@@ -41,6 +42,7 @@ var dataSource = function dataSource(_ref) {
         include: 'details',
         limit: paramData.pageSize,
         offset: paramData.nextPageToken,
+        count: count ? undefined : false,
         orderBy: ORDER_BY.get(paramData.sortColumn, paramData.sortColumn),
         direction: paramData.sortColumn ? paramData.sortDirection : undefined
       }];
@@ -181,7 +183,7 @@ var columns = [{
   sortable: false
 }];
 export var RunTable = generateTable({
-  tableOptions: ['sourceName', 'sourceGroup', 'treeName', 'sourceId'],
+  tableOptions: ['sourceName', 'sourceGroup', 'treeName', 'sourceId', 'count'],
   columns: columns,
   filters: filters,
   dataSource: dataSource,

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/helpers/index.js

@@ -69,6 +69,7 @@ export var buildDefinitionId = function buildDefinitionId(text) {
   .replace(/\s+/g, '_') // Remove unwanted chars
   .replace(/[^A-Za-z0-9_]+/g, '');
 };
+var FILE_STATIC_BINDINGS = [['Folder', 'folder'], ['Name', 'name'], ['Path', 'path']];
 var SUBMISSION_STATIC_BINDINGS = [['Anonymous', 'anonymous'], ['Closed At', 'closedAt'], ['Closed By', 'closedBy'], ['Core State', 'coreState'], ['Created At', 'createdAt'], ['Created By', 'createdBy'], ['Current Page', 'currentPage'], ['Id', 'id'], ['Session Token', 'sessionToken'], ['Submitted At', 'submittedAt'], ['Submitted By', 'submittedBy'], ['Type', 'type'], ['Updated At', 'updatedAt'], ['Updated By', 'updatedBy']];
 var TEAM_STATIC_BINDINGS = [['Name', 'name'], ['Slug', 'slug']];
 var USER_STATIC_BINDINGS = [['Display Name', 'displayName'], ['Email', 'email'], ['Invited By', 'invitedBy'], ['Space Admin', 'spaceAdmin'], ['Username', 'username']];
@@ -93,7 +94,7 @@ var bindifyProfile = function bindifyProfile(fnName, staticMap, attributes, prof
     });
   });
   var combinedMap = OrderedMap(staticMap).merge(attributesMap).merge(profileAttributesMap);
-  return combinedMap.map(function (value, label) {
+  return combinedMap.map(function (value) {
     return Map({
       value: Map.isMap(value) ? value.get('value') : "".concat(fnName, "('").concat(value, "')"),
       tags: []
@@ -125,6 +126,8 @@ export var buildBindings = function buildBindings(_ref) {
       profile = _ref.profile;
   return OrderedMap([['Identity', Map({
     children: profile && bindifyProfile('identity', IDENTITY_STATIC_BINDINGS, get(profile, 'attributesMap'), get(profile, 'profileAttributesMap'))
+  })], ['File Resource', Map({
+    children: ['File Resource'].includes(scope) && bindify('file', FILE_STATIC_BINDINGS)
   })], ['Form', Map({
     children: ['Datastore Form', 'Datastore Submission', 'Form', 'Submission'].includes(scope) && bindify('form', FORM_STATIC_BINDINGS, scope.startsWith('Datastore') ? get(space, 'datastoreFormAttributeDefinitions') : get(kapp, 'formAttributeDefinitions'))
   })], ['Kapp', Map({

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.1",
+  "version": "5.1.1",
   "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": "92a87ff8137e16cc0d5c4d2050bde8176d74c431"
+  "gitHead": "d53f237edee36bdd6ed9ce00734dbdf045ea3f5b"
 }

package/proxyhelper.js

@@ -69,18 +69,31 @@ module.exports = (
   ws: true,
   xfwd: true,
   onProxyReq: (proxyRequest, originalRequest) => {
-    if (process.env.PROXY_DEBUGGING)
-      (proxyLogger || defaultProxyLogger)({
-        proxyRequest,
-        originalRequest,
-      });
-
     // Browsers may send Origin headers even with same-origin
     // requests. To prevent CORS issues, we have to change
     // the Origin to match the target URL.
     if (proxyRequest.getHeader('origin')) {
       proxyRequest.setHeader('origin', target);
     }
+
+    if (
+      process.env.REACT_APP_PROXY_SUBDOMAIN &&
+      (!proxyRequest.path.endsWith('pack') ||
+        !proxyRequest.path.endsWith('favicon.ico'))
+    ) {
+      proxyRequest.setHeader(
+        'X-Kinetic-Subdomain',
+        process.env.REACT_APP_PROXY_SUBDOMAIN,
+      );
+      proxyRequest.path =
+        '/' + process.env.REACT_APP_PROXY_SUBDOMAIN + proxyRequest.path;
+    }
+
+    if (process.env.PROXY_DEBUGGING)
+      (proxyLogger || defaultProxyLogger)({
+        proxyRequest,
+        originalRequest,
+      });
   },
   onProxyRes: (proxyResponse, originalRequest) => {
     if (process.env.PROXY_DEBUGGING)