@kineticdata/react 6.0.4 → 6.0.5

package/CHANGELOG.md

@@ -4,6 +4,14 @@ When upgrading `@kineticdata/react` to a newer version, remember that all `@kine
 
 Remember to always run `yarn install` after upgrading any dependency versions.
 
+## 6.0.4 (January 22, 2024)
+
+- Fixed bug with SAML logout options
+
+## 6.0.3 (December 11, 2023)
+
+_No relevant changes._
+
 ## 6.0.2 (November 6, 2023)
 
 - Removed XSRF header setting from Request Interceptor

package/lib/components/core/kapp/KappForm.js

@@ -11,7 +11,7 @@ var _immutable = require("immutable");
 var _Form = require("../../form/Form");
 var _apis = require("../../../apis");
 var _helpers = require("../../../helpers");
-var DISPLAY_TYPES = ['Display Page', 'Redirect'];
+var DISPLAY_TYPES = ['Redirect'];
 var SPACE_INCLUDES = 'details,spaceAttributeDefinitions';
 var KAPP_INCLUDES = 'attributesMap,securityPolicies,details,fields.details,formAttributeDefinitions';
 var dataSources = function dataSources(_ref) {
@@ -124,37 +124,25 @@ var fields = function fields(_ref4) {
       label: 'After Logout Path',
       type: 'text',
       initialValue: (0, _immutable.get)(kapp, 'afterLogoutPath'),
-      visible: function visible(_ref6) {
-        var space = _ref6.space;
-        return (0, _immutable.get)(space, 'displayType') !== 'Single Page App';
-      }
+      visible: false
     }, {
       name: 'bundlePath',
       label: 'Bundle Path',
       type: 'text',
       initialValue: (0, _immutable.get)(kapp, 'bundlePath'),
-      visible: function visible(_ref7) {
-        var space = _ref7.space;
-        return (0, _immutable.get)(space, 'displayType') !== 'Single Page App';
-      }
+      visible: false
     }, {
       name: 'defaultFormConfirmationPage',
       label: 'Form Confirmation Page',
       type: 'text',
       initialValue: (0, _immutable.get)(kapp, 'defaultFormConfirmationPage'),
-      visible: function visible(_ref8) {
-        var space = _ref8.space;
-        return (0, _immutable.get)(space, 'displayType') !== 'Single Page App';
-      }
+      visible: false
     }, {
       name: 'defaultFormDisplayPage',
       label: 'Form Display Page',
       type: 'text',
       initialValue: (0, _immutable.get)(kapp, 'defaultFormDisplayPage'),
-      visible: function visible(_ref9) {
-        var space = _ref9.space;
-        return (0, _immutable.get)(space, 'displayType') !== 'Single Page App';
-      }
+      visible: false
     }, {
       name: 'defaultSubmissionLabelExpression',
       label: 'Submission Label',
@@ -164,10 +152,10 @@ var fields = function fields(_ref4) {
       helpText:
       // eslint-disable-next-line no-template-curly-in-string
       "Default label for form submissions. Click the </> button to see available values derived from each submission. Example: ${form('name')}",
-      options: function options(_ref10) {
-        var space = _ref10.space,
-          kapp = _ref10.kapp,
-          attributeDefinitions = _ref10.attributeDefinitions;
+      options: function options(_ref6) {
+        var space = _ref6.space,
+          kapp = _ref6.kapp,
+          attributeDefinitions = _ref6.attributeDefinitions;
         return (0, _helpers.buildBindings)({
           space: space,
           kapp: kapp && kapp.set('kappAttributeDefinitions', attributeDefinitions),
@@ -184,38 +172,29 @@ var fields = function fields(_ref4) {
           label: displayType
         };
       }),
-      enabled: function enabled(_ref11) {
-        var space = _ref11.space;
-        return (0, _immutable.get)(space, 'displayType') !== 'Single Page App';
-      },
-      initialValue: (0, _immutable.get)(kapp, 'displayType') || 'Display Page',
+      visible: false,
+      initialValue: (0, _immutable.get)(kapp, 'displayType'),
       helpText: 'Determines how the application works. Set in Space Settings.'
     }, {
       name: 'displayValue',
-      label: function label(_ref12) {
-        var values = _ref12.values;
-        return values.get('displayType') === 'Redirect' ? 'Redirect URL' : 'Kapp Display Page';
+      label: function label(_ref7) {
+        var values = _ref7.values;
+        return values.get('displayType') === 'Redirect' ? 'Redirect URL' : 'Display Value';
       },
       type: 'text',
       initialValue: (0, _immutable.get)(kapp, 'displayValue'),
-      required: function required(_ref13) {
-        var values = _ref13.values;
+      required: function required(_ref8) {
+        var values = _ref8.values;
         return values.get('displayType') === 'Redirect';
       },
       requiredMessage: "This field is required, when display type is 'Redirect'",
-      visible: function visible(_ref14) {
-        var space = _ref14.space;
-        return (0, _immutable.get)(space, 'displayType') !== 'Single Page App';
-      }
+      visible: false
     }, {
       name: 'loginPage',
       label: 'Login Page',
       type: 'text',
       initialValue: (0, _immutable.get)(kapp, 'loginPage'),
-      visible: function visible(_ref15) {
-        var space = _ref15.space;
-        return (0, _immutable.get)(space, 'displayType') !== 'Single Page App';
-      }
+      visible: false
     }, {
       name: 'name',
       label: 'Kapp Name',
@@ -223,9 +202,9 @@ var fields = function fields(_ref4) {
       required: true,
       initialValue: (0, _immutable.get)(kapp, 'name'),
       helpText: 'User friendly name for the Kapp, used throughout the system.',
-      onChange: function onChange(_ref16, _ref17) {
-        var values = _ref16.values;
-        var setValue = _ref17.setValue;
+      onChange: function onChange(_ref9, _ref10) {
+        var values = _ref9.values;
+        var setValue = _ref10.setValue;
         if (values.get('linked')) {
           setValue('slug', (0, _helpers.slugify)(values.get('name')), false);
         }
@@ -235,10 +214,7 @@ var fields = function fields(_ref4) {
       label: 'Reset Password Page',
       type: 'text',
       initialValue: (0, _immutable.get)(kapp, 'resetPasswordPage'),
-      visible: function visible(_ref18) {
-        var space = _ref18.space;
-        return (0, _immutable.get)(space, 'displayType') !== 'Single Page App';
-      }
+      visible: false
     }, {
       name: 'slug',
       label: 'Slug',
@@ -246,8 +222,8 @@ var fields = function fields(_ref4) {
       required: true,
       initialValue: (0, _immutable.get)(kapp, 'slug'),
       helpText: 'Unique name used in the Kapp path.',
-      onChange: function onChange(_bindings, _ref19) {
-        var setValue = _ref19.setValue;
+      onChange: function onChange(_bindings, _ref11) {
+        var setValue = _ref11.setValue;
         setValue('linked', false);
       }
     }, {
@@ -257,16 +233,16 @@ var fields = function fields(_ref4) {
       "transient": true,
       initialValue: kapp ? false : true,
       visible: false
-    }].concat((0, _toConsumableArray2["default"])(kappSlug ? Object.entries(securityEndpoints).map(function (_ref20) {
-      var _ref21 = (0, _slicedToArray2["default"])(_ref20, 2),
-        endpointFieldName = _ref21[0],
-        endpoint = _ref21[1];
+    }].concat((0, _toConsumableArray2["default"])(kappSlug ? Object.entries(securityEndpoints).map(function (_ref12) {
+      var _ref13 = (0, _slicedToArray2["default"])(_ref12, 2),
+        endpointFieldName = _ref13[0],
+        endpoint = _ref13[1];
       return {
         name: endpointFieldName,
         label: endpoint.label,
         type: 'select',
-        options: function options(_ref22) {
-          var securityPolicyDefinitions = _ref22.securityPolicyDefinitions;
+        options: function options(_ref14) {
+          var securityPolicyDefinitions = _ref14.securityPolicyDefinitions;
           return securityPolicyDefinitions ? securityPolicyDefinitions.filter(function (definition) {
             return endpoint.types.includes(definition.get('type'));
           }).map(function (definition) {
@@ -286,12 +262,12 @@ var fields = function fields(_ref4) {
       label: 'Security Policies',
       type: null,
       visible: false,
-      serialize: function serialize(_ref23) {
-        var values = _ref23.values;
-        return Object.entries(securityEndpoints).map(function (_ref24) {
-          var _ref25 = (0, _slicedToArray2["default"])(_ref24, 2),
-            endpointFieldName = _ref25[0],
-            policy = _ref25[1];
+      serialize: function serialize(_ref15) {
+        var values = _ref15.values;
+        return Object.entries(securityEndpoints).map(function (_ref16) {
+          var _ref17 = (0, _slicedToArray2["default"])(_ref16, 2),
+            endpointFieldName = _ref17[0],
+            policy = _ref17[1];
           return {
             endpoint: policy.endpoint,
             name: values.get(endpointFieldName)
@@ -306,8 +282,8 @@ var fields = function fields(_ref4) {
       label: 'Attributes',
       type: 'attributes',
       required: false,
-      options: function options(_ref26) {
-        var attributeDefinitions = _ref26.attributeDefinitions;
+      options: function options(_ref18) {
+        var attributeDefinitions = _ref18.attributeDefinitions;
         return attributeDefinitions;
       },
       initialValue: (0, _immutable.get)(kapp, 'attributesMap')

package/lib/components/core/space/SpaceForm.js

@@ -12,7 +12,13 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Form = require("../../form/Form");
 var _apis = require("../../../apis");
 var _helpers = require("../../../helpers");
-var DISPLAY_TYPES = ['Display Page', 'Redirect', 'Single Page App'];
+var DISPLAY_TYPES = ['Custom', 'Hosted', 'Platform', 'Redirect'];
+var getInitialDisplayType = function getInitialDisplayType(value) {
+  if (value === 'Single Page App') {
+    return 'Custom';
+  }
+  return value || 'Platform';
+};
 var dataSources = function dataSources() {
   return {
     space: {
@@ -148,45 +154,33 @@ var fields = function fields() {
         var space = _ref3.space;
         return "/".concat((0, _immutable.get)(space, 'slug'));
       },
-      visible: function visible(_ref4) {
-        var values = _ref4.values;
-        return (0, _immutable.get)(values, 'displayType') !== 'Single Page App';
-      }
+      visible: false
     }, {
       name: 'bundlePath',
       label: 'Bundle Path',
       type: 'text',
       initialValue: (0, _immutable.get)(space, 'bundlePath'),
-      required: function required(_ref5) {
-        var values = _ref5.values;
-        return (0, _immutable.get)(values, 'sharedBundleBase') !== '' && (0, _immutable.get)(values, 'displayType') === 'Display Page';
-      }
+      visible: false
     }, {
       name: 'defaultFormConfirmationPage',
       label: 'Default Form Confirmation Page',
       type: 'text',
       initialValue: (0, _immutable.get)(space, 'defaultFormConfirmationPage'),
       placeholder: 'confirmation.jsp',
-      visible: function visible(_ref6) {
-        var values = _ref6.values;
-        return (0, _immutable.get)(values, 'displayType') !== 'Single Page App';
-      }
+      visible: false
     }, {
       name: 'defaultFormDisplayPage',
       label: 'Default Form Display Page',
       type: 'text',
       initialValue: (0, _immutable.get)(space, 'defaultFormDisplayPage'),
       placeholder: 'form.jsp',
-      visible: function visible(_ref7) {
-        var values = _ref7.values;
-        return (0, _immutable.get)(values, 'displayType') !== 'Single Page App';
-      }
+      visible: false
     }, {
       name: 'defaultLocale',
       label: 'Default Locale',
       type: 'text',
-      options: function options(_ref8) {
-        var locales = _ref8.locales;
+      options: function options(_ref4) {
+        var locales = _ref4.locales;
         return locales.map(function (locale) {
           return (0, _immutable.Map)({
             value: locale.get('code'),
@@ -199,8 +193,8 @@ var fields = function fields() {
       name: 'defaultTimezone',
       label: 'Default Timezone',
       type: 'text',
-      options: function options(_ref9) {
-        var timezones = _ref9.timezones;
+      options: function options(_ref5) {
+        var timezones = _ref5.timezones;
         return timezones.map(function (timezone) {
           return (0, _immutable.Map)({
             value: timezone.get('id'),
@@ -220,20 +214,16 @@ var fields = function fields() {
         };
       }),
       required: true,
-      initialValue: (0, _immutable.get)(space, 'displayType') || 'Display Page',
-      helpText: 'Determines how the application works. For kinops, Single Page App is used.'
+      initialValue: getInitialDisplayType((0, _immutable.get)(space, 'displayType')),
+      helpText: 'Display Types indicate how the Platform should render your bundle.'
     }, {
       name: 'displayValueJSP',
-      label: 'Space Display Page',
+      label: '',
       type: 'text',
       "transient": true,
       placeholder: 'space.jsp',
-      visible: function visible(_ref10) {
-        var values = _ref10.values;
-        return (0, _immutable.get)(values, 'displayType') === 'Display Page';
-      },
-      required: function required(_ref11) {
-        var values = _ref11.values;
+      visible: function visible(_ref6) {
+        var values = _ref6.values;
         return (0, _immutable.get)(values, 'displayType') === 'Display Page';
       },
       initialValue: (0, _immutable.get)(space, 'displayType') === 'Display Page' ? (0, _immutable.get)(space, 'displayValue') : ''
@@ -242,12 +232,12 @@ var fields = function fields() {
       label: 'Redirect URL',
       type: 'text',
       "transient": true,
-      visible: function visible(_ref12) {
-        var values = _ref12.values;
+      visible: function visible(_ref7) {
+        var values = _ref7.values;
         return (0, _immutable.get)(values, 'displayType') === 'Redirect';
       },
-      required: function required(_ref13) {
-        var values = _ref13.values;
+      required: function required(_ref8) {
+        var values = _ref8.values;
         return (0, _immutable.get)(values, 'displayType') === 'Redirect';
       },
       requiredMessage: "This field is required, when display type is 'Redirect'",
@@ -257,30 +247,50 @@ var fields = function fields() {
       label: 'Location',
       type: 'text',
       "transient": true,
-      visible: function visible(_ref14) {
-        var values = _ref14.values;
-        return (0, _immutable.get)(values, 'displayType') === 'Single Page App';
+      visible: function visible(_ref9) {
+        var values = _ref9.values;
+        return (0, _immutable.get)(values, 'displayType') === 'Custom';
       },
-      required: function required(_ref15) {
-        var values = _ref15.values;
-        return (0, _immutable.get)(values, 'displayType') === 'Single Page App';
+      required: function required(_ref10) {
+        var values = _ref10.values;
+        return (0, _immutable.get)(values, 'displayType') === 'Custom';
       },
-      initialValue: (0, _immutable.get)(space, 'displayType') === 'Single Page App' ? ((0, _immutable.get)(space, 'displayValue') || '').replace('spa.jsp', '').replace('?location=', '') : '',
-      helpText: 'See explanation below for external and embedded asset modes.'
+      initialValue: (0, _immutable.get)(space, 'displayType') === 'Single Page App' || (0, _immutable.get)(space, 'displayType') === 'Custom' ? ((0, _immutable.get)(space, 'displayValue') || '').replace('spa.jsp', '').replace('?location=', '') : '',
+      helpText: 'Enter the full URL to where your bundle is stored. This must include the index.html in the path.'
+    }, {
+      name: 'displayValueHost',
+      label: 'Bundle Slug',
+      type: 'text',
+      "transient": true,
+      visible: function visible(_ref11) {
+        var values = _ref11.values;
+        return (0, _immutable.get)(values, 'displayType') === 'Hosted';
+      },
+      required: function required(_ref12) {
+        var values = _ref12.values;
+        return (0, _immutable.get)(values, 'displayType') === 'Hosted';
+      },
+      initialValue: (0, _immutable.get)(space, 'displayType') === 'Hosted' ? (0, _immutable.get)(space, 'displayValue') : '',
+      helpText: 'Enter the full "slug" which corresponds to the directory your hosted bundle is stored in.'
     }, {
       name: 'displayValue',
-      label: 'Dispaly Value',
+      label: 'Display Value',
       type: 'text',
       visible: false,
       initialValue: (0, _immutable.get)(space, 'displayValue'),
-      serialize: function serialize(_ref16) {
-        var values = _ref16.values;
+      serialize: function serialize(_ref13) {
+        var values = _ref13.values;
         var displayType = values.get('displayType');
         var displayValueSPA = values.get('displayValueSPA');
+        var displayValueHost = values.get('displayValueHost');
         var displayValueJSP = values.get('displayValueJSP');
         var displayValueRedirect = values.get('displayValueRedirect');
-        if (displayType === 'Single Page App') {
+        if ((0, _immutable.get)(values, 'displayType') === 'Custom') {
           return displayValueSPA && displayValueSPA.endsWith('index.html') ? displayValueSPA : "spa.jsp".concat(displayValueSPA && '?location=' + displayValueSPA);
+        } else if ((0, _immutable.get)(values, 'displayType') === 'Hosted') {
+          return displayValueHost;
+        } else if ((0, _immutable.get)(values, 'displayType') === 'Platform') {
+          return '';
         } else {
           return displayType === 'Redirect' ? displayValueRedirect : displayValueJSP;
         }
@@ -291,19 +301,16 @@ var fields = function fields() {
       type: 'text',
       initialValue: (0, _immutable.get)(space, 'loginPage'),
       placeholder: 'login.jsp',
-      visible: function visible(_ref17) {
-        var values = _ref17.values;
-        return (0, _immutable.get)(values, 'displayType') !== 'Single Page App';
-      }
+      visible: false
     }, {
       name: 'name',
       label: 'Space Name',
       type: 'text',
       required: true,
       initialValue: (0, _immutable.get)(space, 'name'),
-      onChange: function onChange(_ref18, _ref19) {
-        var values = _ref18.values;
-        var setValue = _ref19.setValue;
+      onChange: function onChange(_ref14, _ref15) {
+        var values = _ref14.values;
+        var setValue = _ref15.setValue;
         if (values.get('linked')) {
           setValue('slug', (0, _helpers.slugify)(values.get('name')), false);
         }
@@ -315,20 +322,17 @@ var fields = function fields() {
       type: 'text',
       initialValue: (0, _immutable.get)(space, 'resetPasswordPage'),
       placeholder: 'resetPassword.jsp',
-      visible: function visible(_ref20) {
-        var values = _ref20.values;
-        return (0, _immutable.get)(values, 'displayType') !== 'Single Page App';
-      }
+      visible: false
     }, {
       name: 'oauthSigningKey',
       label: 'OAuth Signing Key',
       type: 'password',
-      visible: function visible(_ref21) {
-        var values = _ref21.values;
+      visible: function visible(_ref16) {
+        var values = _ref16.values;
         return values.get('changeOAuthSigningKey');
       },
-      "transient": function transient(_ref22) {
-        var values = _ref22.values;
+      "transient": function transient(_ref17) {
+        var values = _ref17.values;
         return !values.get('changeOAuthSigningKey');
       }
     }, {
@@ -337,14 +341,14 @@ var fields = function fields() {
       type: 'checkbox',
       "transient": true,
       // in "new" mode we do not show this toggle field and default it to true
-      visible: function visible(_ref23) {
-        var space = _ref23.space;
+      visible: function visible(_ref18) {
+        var space = _ref18.space;
         return !!space;
       },
       initialValue: !space,
-      onChange: function onChange(_ref24, _ref25) {
-        var values = _ref24.values;
-        var setValue = _ref25.setValue;
+      onChange: function onChange(_ref19, _ref20) {
+        var values = _ref19.values;
+        var setValue = _ref20.setValue;
         if (values.get('oauthSigningKey') !== '') {
           setValue('oauthSigningKey', '');
         }
@@ -355,8 +359,8 @@ var fields = function fields() {
       type: 'text',
       initialValue: (0, _immutable.get)(space, 'sessionInactiveLimitInSeconds'),
       helpText: 'Users will be logged out automatically if inactive for this amount of time.',
-      serialize: function serialize(_ref26) {
-        var values = _ref26.values;
+      serialize: function serialize(_ref21) {
+        var values = _ref21.values;
         return parseInt(values.get('sessionInactiveLimitInSeconds'));
       }
     }, {
@@ -364,15 +368,16 @@ var fields = function fields() {
       label: 'Shared Bundle Base',
       type: 'text',
       initialValue: (0, _immutable.get)(space, 'sharedBundleBase'),
-      helpText: 'Directory used as path prefix for bundles.'
+      helpText: 'Directory used as path prefix for bundles.',
+      visible: false
     }, {
       name: 'slug',
       label: 'Slug',
       type: 'text',
       required: true,
       initialValue: (0, _immutable.get)(space, 'slug'),
-      onChange: function onChange(_bindings, _ref27) {
-        var setValue = _ref27.setValue;
+      onChange: function onChange(_bindings, _ref22) {
+        var setValue = _ref22.setValue;
         setValue('linked', false);
       },
       helpText: 'Unique name used in the space path.'
@@ -393,16 +398,16 @@ var fields = function fields() {
       label: 'Trusted Resource Domains',
       type: 'text-multi',
       initialValue: (0, _immutable.get)(space, 'trustedResourceDomains')
-    }].concat((0, _toConsumableArray2["default"])(Object.entries(securityEndpoints).map(function (_ref28) {
-      var _ref29 = (0, _slicedToArray2["default"])(_ref28, 2),
-        endpointFieldName = _ref29[0],
-        endpoint = _ref29[1];
+    }].concat((0, _toConsumableArray2["default"])(Object.entries(securityEndpoints).map(function (_ref23) {
+      var _ref24 = (0, _slicedToArray2["default"])(_ref23, 2),
+        endpointFieldName = _ref24[0],
+        endpoint = _ref24[1];
       return {
         name: endpointFieldName,
         label: endpoint.label,
         type: 'select',
-        options: function options(_ref30) {
-          var securityPolicyDefinitions = _ref30.securityPolicyDefinitions;
+        options: function options(_ref25) {
+          var securityPolicyDefinitions = _ref25.securityPolicyDefinitions;
           return securityPolicyDefinitions.filter(function (definition) {
             return endpoint.types.includes(definition.get('type'));
           }).map(function (definition) {
@@ -422,12 +427,12 @@ var fields = function fields() {
       label: 'Security Policies',
       type: null,
       visible: false,
-      serialize: function serialize(_ref31) {
-        var values = _ref31.values;
-        return Object.entries(securityEndpoints).map(function (_ref32) {
-          var _ref33 = (0, _slicedToArray2["default"])(_ref32, 2),
-            endpointFieldName = _ref33[0],
-            policy = _ref33[1];
+      serialize: function serialize(_ref26) {
+        var values = _ref26.values;
+        return Object.entries(securityEndpoints).map(function (_ref27) {
+          var _ref28 = (0, _slicedToArray2["default"])(_ref27, 2),
+            endpointFieldName = _ref28[0],
+            policy = _ref28[1];
           return {
             endpoint: policy.endpoint,
             name: values.get(endpointFieldName)
@@ -452,13 +457,13 @@ var fields = function fields() {
           type: 'text'
         }]);
       },
-      visible: function visible(_ref34) {
-        var values = _ref34.values;
+      visible: function visible(_ref29) {
+        var values = _ref29.values;
         return values.get('allowedIpsEnabled', false);
       },
       initialValue: (0, _immutable.get)(space, 'allowedIps', []),
-      serialize: function serialize(_ref35) {
-        var values = _ref35.values;
+      serialize: function serialize(_ref30) {
+        var values = _ref30.values;
         return values.get('allowedIpsEnabled', false) ? values.get('allowedIps') : [];
       }
     }, {
@@ -471,8 +476,8 @@ var fields = function fields() {
       label: 'Attributes',
       type: 'attributes',
       required: false,
-      options: function options(_ref36) {
-        var attributeDefinitions = _ref36.attributeDefinitions;
+      options: function options(_ref31) {
+        var attributeDefinitions = _ref31.attributeDefinitions;
         return attributeDefinitions;
       },
       initialValue: (0, _immutable.get)(space, 'attributesMap')

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

@@ -235,14 +235,16 @@ var TreeBuilderComponent = exports.TreeBuilderComponent = /*#__PURE__*/function
       // placeholder then we will call configureTreeBuilder with the component's
       // props at that time
       if (this.props.treeBuilderState === null) {
-        (0, _builder.configureTreeBuilder)((0, _lodashEs.pick)(this.props, ['treeKey', 'sourceName', 'sourceGroup', 'name', 'platformSourceName']));
+        (0, _builder.configureTreeBuilder)((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, this.props.configParams), {}, {
+          treeKey: this.props.treeKey
+        }));
       }
     }
   }, {
     key: "checkHighlight",
     value: function checkHighlight() {
       var prevProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      if (this.props.treeBuilderState && !this.props.treeBuilderState.loading) {
+      if (this.props.treeBuilderState && !this.props.treeBuilderState.loading && this.props.tree) {
         // one the first "real" render of the tree builder check for the highlight
         // node and focus if one is specified
         if ((!prevProps.treeBuilderState || prevProps.treeBuilderState.loading) && this.props.highlight) {
@@ -269,13 +271,15 @@ var TreeBuilderComponent = exports.TreeBuilderComponent = /*#__PURE__*/function
         highlightType = _ref4[0],
         highlightId = _ref4[1];
       if (treeBuilderState) {
-        var lastSave = treeBuilderState.lastSave,
+        var error = treeBuilderState.error,
+          lastSave = treeBuilderState.lastSave,
           lastWebApi = treeBuilderState.lastWebApi,
           redoStack = treeBuilderState.redoStack,
           saving = treeBuilderState.saving,
           tasks = treeBuilderState.tasks,
           tree = treeBuilderState.tree,
           kappSlug = treeBuilderState.kappSlug,
+          formSlug = treeBuilderState.formSlug,
           undoStack = treeBuilderState.undoStack,
           webApi = treeBuilderState.webApi;
         return this.props.children({
@@ -351,6 +355,7 @@ var TreeBuilderComponent = exports.TreeBuilderComponent = /*#__PURE__*/function
             }
           },
           dirty: this.isDirty(treeBuilderState),
+          error: error,
           lastTree: lastSave,
           lastWebApi: lastWebApi,
           name: tree ? tree.name : null,
@@ -359,6 +364,7 @@ var TreeBuilderComponent = exports.TreeBuilderComponent = /*#__PURE__*/function
           tasks: tasks,
           tree: tree,
           kappSlug: kappSlug,
+          formSlug: formSlug,
           treeBuilder: tree && /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, /*#__PURE__*/_react["default"].createElement(_SvgCanvas.SvgCanvas, {
             ref: this.canvasRef
           }, tree.connectors.map(function (connector) {

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

@@ -43,88 +43,132 @@ var remember = function remember(state, treeKey) {
 (0, _store.regSaga)((0, _effects.takeEvery)('TREE_CONFIGURE', function (_ref) {
   var payload = _ref.payload;
   return /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee() {
-    var _getPlatformItemSlugs, name, sourceGroup, sourceName, treeKey, webApiProps, _yield$all, _yield$all2, tree, categories, webApi, platformItem, result, _yield$call, workflow;
+    var name, sourceGroup, sourceName, treeKey, platformSourceName, webApiProps, workflowProps, _yield$all, _yield$all2, _yield$all2$, tree, treeError, _yield$all2$2, workflow, workflowError, categories, _yield$all2$3, webApi, webApiError, workflowObject, workflowObjectError, _yield$call, platformItem, platformItemError, _yield$call2, linkedWorkflow, linkedError, treeObject, loadError;
     return (0, _regeneratorRuntime2["default"])().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.prev = 0;
-          name = payload.name, sourceGroup = payload.sourceGroup, sourceName = payload.sourceName, treeKey = payload.treeKey;
+          name = payload.name, sourceGroup = payload.sourceGroup, sourceName = payload.sourceName, treeKey = payload.treeKey, platformSourceName = payload.platformSourceName;
           webApiProps = getWebApiProps(payload);
-          _context.next = 5;
-          return (0, _effects.all)([(0, _effects.call)(_apis.fetchTree, {
+          workflowProps = getWorkflowProps(payload);
+          _context.next = 6;
+          return (0, _effects.all)([
+          // Fetch the tree if not a linked workflow
+          !workflowProps ? (0, _effects.call)(_apis.fetchTree, {
             name: name,
             sourceGroup: sourceGroup,
             sourceName: sourceName,
             include: 'bindings,categories,details,treeJson,inputs,outputs'
-          }), (0, _effects.call)(_apis.fetchTaskCategories, {
+          }) : {},
+          // Fetch the workflow if it is a linked workflow
+          workflowProps ? (0, _effects.call)(_apis.fetchWorkflow, (0, _objectSpread2["default"])({}, workflowProps)) : {},
+          // Fetch task categories
+          (0, _effects.call)(_apis.fetchTaskCategories, {
             include: 'handlers.results,handlers.parameters,trees.parameters,trees.inputs,trees.outputs'
-          }), webApiProps ? (0, _effects.call)(_apis.fetchWebApi, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, webApiProps), {}, {
+          }),
+          // Fetch the webAPI if applicable
+          webApiProps ? (0, _effects.call)(_apis.fetchWebApi, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, webApiProps), {}, {
             include: 'details,securityPolicies'
           })) : {}]);
-        case 5:
+        case 6:
           _yield$all = _context.sent;
-          _yield$all2 = (0, _slicedToArray2["default"])(_yield$all, 3);
-          tree = _yield$all2[0].tree;
-          categories = _yield$all2[1].categories;
-          webApi = _yield$all2[2].webApi;
-          platformItem = null;
-          if (!tree.event) {
-            _context.next = 21;
+          _yield$all2 = (0, _slicedToArray2["default"])(_yield$all, 4);
+          _yield$all2$ = _yield$all2[0];
+          tree = _yield$all2$.tree;
+          treeError = _yield$all2$.error;
+          _yield$all2$2 = _yield$all2[1];
+          workflow = _yield$all2$2.workflow;
+          workflowError = _yield$all2$2.error;
+          categories = _yield$all2[2].categories;
+          _yield$all2$3 = _yield$all2[3];
+          webApi = _yield$all2$3.webApi;
+          webApiError = _yield$all2$3.error;
+          workflowObject = workflow;
+          workflowObjectError = workflowError; // If a tree was fetched and the tree has platform item data, fetch the
+          // platform item and then retrieve the workflow
+          if (!(tree && tree.platformItemId && tree.platformItemType)) {
+            _context.next = 37;
             break;
           }
-          _context.next = 14;
+          _context.next = 23;
           return (0, _effects.call)(_apis.fetchPlatformItem, {
             type: tree.platformItemType,
             id: tree.platformItemId
           });
-        case 14:
-          result = _context.sent;
-          platformItem = result.platformItem;
-          _context.next = 18;
+        case 23:
+          _yield$call = _context.sent;
+          platformItem = _yield$call.platformItem;
+          platformItemError = _yield$call.error;
+          if (!platformItem) {
+            _context.next = 36;
+            break;
+          }
+          _context.next = 29;
           return (0, _effects.call)(_apis.fetchWorkflow, (0, _objectSpread2["default"])({
             workflowId: sourceGroup
           }, getPlatformItemSlugs(platformItem)));
-        case 18:
-          _yield$call = _context.sent;
-          workflow = _yield$call.workflow;
-          // Add workflow filter from core to the tree to be used in the Settings > WorkflowForm
-          tree['filter'] = workflow ? workflow.filter : '';
-        case 21:
-          _context.next = 23;
+        case 29:
+          _yield$call2 = _context.sent;
+          linkedWorkflow = _yield$call2.workflow;
+          linkedError = _yield$call2.error;
+          workflowObject = linkedWorkflow;
+          workflowObjectError = linkedError;
+          _context.next = 37;
+          break;
+        case 36:
+          // If platform item was not retrieved, show an error because we don't
+          // want to render a workflow using a tree route
+          workflowObjectError = platformItemError || 'Failed to load linked workflow.';
+        case 37:
+          // If workflow, set sourceName to platformSourceName since the value is
+          // needed when creating new runs
+          treeObject = workflowObject ? (0, _objectSpread2["default"])({
+            sourceName: platformSourceName
+          }, workflowObject) : tree;
+          loadError = workflowObjectError || treeError || webApiError;
+          _context.next = 41;
           return (0, _effects.put)((0, _store.action)('TREE_LOADED', {
             categories: categories,
-            kappSlug: webApiProps && webApiProps.kappSlug || ((_getPlatformItemSlugs = getPlatformItemSlugs(platformItem)) === null || _getPlatformItemSlugs === void 0 ? void 0 : _getPlatformItemSlugs.kappSlug),
-            platformItem: platformItem,
+            kappSlug: (webApiProps === null || webApiProps === void 0 ? void 0 : webApiProps.kappSlug) || (workflowProps === null || workflowProps === void 0 ? void 0 : workflowProps.kappSlug),
+            formSlug: workflowProps === null || workflowProps === void 0 ? void 0 : workflowProps.formSlug,
             treeKey: treeKey,
-            tree: (0, _models.deserializeTree)(tree),
-            webApi: webApiProps && (0, _models.deserializeWebApi)(webApi, webApiProps.kappSlug)
+            tree:
+            // Don't set the tree if it's for a webApi but the webApi errors
+            treeObject && (!webApiProps || webApi) ? (0, _models.deserializeTree)(treeObject) : null,
+            webApi: webApi ? (0, _models.deserializeWebApi)(webApi, webApiProps.kappSlug) : null,
+            error: loadError ? loadError.message || loadError : null
           }));
-        case 23:
-          _context.next = 28;
+        case 41:
+          _context.next = 46;
           break;
-        case 25:
-          _context.prev = 25;
+        case 43:
+          _context.prev = 43;
           _context.t0 = _context["catch"](0);
           console.error('Caught error loading tree', _context.t0);
-        case 28:
+        case 46:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 25]]);
+    }, _callee, null, [[0, 43]]);
   })();
 }));
 var getPlatformItemSlugs = function getPlatformItemSlugs(platformItem) {
-  return platformItem !== null && platformItem !== void 0 && platformItem.kapp ? {
-    formSlug: platformItem.slug,
-    kappSlug: platformItem.kapp.slug
-  } : platformItem !== null && platformItem !== void 0 && platformItem.space ? {
-    kappSlug: platformItem.slug
-  } : {};
+  return (
+    // If platform item has a kapp property, then it's a form object
+    platformItem !== null && platformItem !== void 0 && platformItem.kapp ? {
+      formSlug: platformItem.slug,
+      kappSlug: platformItem.kapp.slug
+    } :
+    // If platform item has a space property, than it's a kapp object
+    platformItem !== null && platformItem !== void 0 && platformItem.space ? {
+      kappSlug: platformItem.slug
+    } : {}
+  );
 };
 (0, _store.regSaga)((0, _effects.takeEvery)('TREE_SAVE', function (_ref2) {
   var payload = _ref2.payload;
   return /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee2() {
-    var newName, onError, onSave, overwrite, treeKey, _yield$select, kappSlug, lastSave, lastWebApi, platformItem, tree, webApi, name, sourceGroup, sourceName, _yield, error1, newTree, newWorkflow, _yield2, error2, error;
+    var newName, onError, onSave, overwrite, treeKey, _yield$select, kappSlug, formSlug, lastSave, lastWebApi, tree, webApi, name, sourceGroup, sourceName, _yield, error1, newTree, newWorkflow, _yield2, error2, error;
     return (0, _regeneratorRuntime2["default"])().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -139,9 +183,9 @@ var getPlatformItemSlugs = function getPlatformItemSlugs(platformItem) {
         case 4:
           _yield$select = _context2.sent;
           kappSlug = _yield$select.kappSlug;
+          formSlug = _yield$select.formSlug;
           lastSave = _yield$select.lastSave;
           lastWebApi = _yield$select.lastWebApi;
-          platformItem = _yield$select.platformItem;
           tree = _yield$select.tree;
           webApi = _yield$select.webApi;
           name = lastSave.name, sourceGroup = lastSave.sourceGroup, sourceName = lastSave.sourceName; // if a newName was passed we will be creating a new tree with the builder
@@ -149,18 +193,22 @@ var getPlatformItemSlugs = function getPlatformItemSlugs(platformItem) {
           // additionally, if the tree is a linked workflow then we call a core
           // endpoint to create the workflow
           _context2.next = 14;
-          return newName ? tree.event ? (0, _effects.call)(_apis.createWorkflow, (0, _objectSpread2["default"])({
+          return newName ? tree.event ? (0, _effects.call)(_apis.createWorkflow, {
             workflow: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, (0, _models.serializeTree)(tree)), {}, {
               name: newName
-            })
-          }, getPlatformItemSlugs(platformItem))) : (0, _effects.call)(_apis.createTree, {
+            }),
+            kappSlug: kappSlug,
+            formSlug: formSlug
+          }) : (0, _effects.call)(_apis.createTree, {
             tree: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, (0, _models.serializeTree)(tree, true)), {}, {
               name: newName
             })
-          }) : tree.event ? (0, _effects.call)(_apis.updateWorkflow, (0, _objectSpread2["default"])({
+          }) : tree.event ? (0, _effects.call)(_apis.updateWorkflow, {
             workflowId: sourceGroup,
-            workflow: (0, _models.serializeTree)(tree, overwrite)
-          }, getPlatformItemSlugs(platformItem))) : (0, _effects.call)(_apis.updateTree, {
+            workflow: (0, _models.serializeTree)(tree, overwrite),
+            kappSlug: kappSlug,
+            formSlug: formSlug
+          }) : (0, _effects.call)(_apis.updateTree, {
             name: name,
             sourceGroup: sourceGroup,
             sourceName: sourceName,
@@ -191,7 +239,11 @@ var getPlatformItemSlugs = function getPlatformItemSlugs(platformItem) {
             treeKey: treeKey,
             tree: newTree || newWorkflow,
             webApi: webApi,
-            onSave: onSave
+            onSave: onSave,
+            scope: {
+              kappSlug: kappSlug,
+              formSlug: formSlug
+            }
           }));
         case 25:
           _context2.next = 30;
@@ -240,7 +292,8 @@ var getPlatformItemSlugs = function getPlatformItemSlugs(platformItem) {
   var _ref4$payload = _ref4.payload,
     onSave = _ref4$payload.onSave,
     previousTree = _ref4$payload.previousTree,
-    treeKey = _ref4$payload.treeKey;
+    treeKey = _ref4$payload.treeKey,
+    scope = _ref4$payload.scope;
   return /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee4() {
     var tree;
     return (0, _regeneratorRuntime2["default"])().wrap(function _callee4$(_context4) {
@@ -258,7 +311,7 @@ var getPlatformItemSlugs = function getPlatformItemSlugs(platformItem) {
         case 4:
           tree = _context4.sent;
           _context4.next = 7;
-          return (0, _effects.call)(onSave, tree, previousTree);
+          return (0, _effects.call)(onSave, tree, previousTree, scope);
         case 7:
           _context4.next = 12;
           break;
@@ -293,19 +346,20 @@ var getPlatformItemSlugs = function getPlatformItemSlugs(platformItem) {
     var _ref8$payload = _ref8.payload,
       categories = _ref8$payload.categories,
       kappSlug = _ref8$payload.kappSlug,
-      platformItem = _ref8$payload.platformItem,
+      formSlug = _ref8$payload.formSlug,
       treeKey = _ref8$payload.treeKey,
       tree = _ref8$payload.tree,
-      webApi = _ref8$payload.webApi;
+      webApi = _ref8$payload.webApi,
+      error = _ref8$payload.error;
     return state.mergeIn(['trees', treeKey], {
       kappSlug: kappSlug,
+      formSlug: formSlug,
       lastSave: tree,
       lastWebApi: webApi,
       loading: false,
-      platformItem: platformItem,
       tasks: (0, _immutable.List)(categories).map(function (category) {
         return category.name === 'System Controls' ? (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, category), {}, {
-          handlers: [].concat((0, _toConsumableArray2["default"])(category.handlers), [(0, _helpers.treeReturnTask)(tree)])
+          handlers: [].concat((0, _toConsumableArray2["default"])(category.handlers), [tree ? (0, _helpers.treeReturnTask)(tree) : null]).filter(Boolean)
         }) : category;
       }).flatMap(function (category) {
         return [].concat((0, _toConsumableArray2["default"])(category.handlers), (0, _toConsumableArray2["default"])(category.trees));
@@ -315,7 +369,8 @@ var getPlatformItemSlugs = function getPlatformItemSlugs(platformItem) {
         return reduction.set(task.definitionId, task);
       }, (0, _immutable.OrderedMap)()),
       tree: tree,
-      webApi: webApi
+      webApi: webApi,
+      error: error
     });
   },
   TREE_SAVE: function TREE_SAVE(state, _ref9) {
@@ -530,4 +585,18 @@ var getWebApiProps = function getWebApiProps(_ref25) {
     };
   }
   return null;
+};
+var getWorkflowProps = function getWorkflowProps(_ref26) {
+  var type = _ref26.type,
+    sourceGroup = _ref26.sourceGroup,
+    kappSlug = _ref26.kappSlug,
+    formSlug = _ref26.formSlug;
+  if (type === 'workflow') {
+    return {
+      workflowId: sourceGroup,
+      kappSlug: kappSlug,
+      formSlug: formSlug
+    };
+  }
+  return null;
 };

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

@@ -28,7 +28,7 @@ var WebApi = exports.WebApi = (0, _immutable.Record)({
   updatedBy: null
 });
 var Tree = exports.Tree = (0, _immutable.Record)({
-  bindings: (0, _immutable.OrderedMap)(),
+  bindings: {},
   categories: (0, _immutable.List)(),
   connectors: (0, _immutable.OrderedMap)(),
   definitionId: null,
@@ -90,11 +90,11 @@ var Connector = exports.Connector = (0, _immutable.Record)({
 var TreeBuilderState = exports.TreeBuilderState = (0, _immutable.Record)({
   categories: (0, _immutable.OrderedMap)(),
   error: null,
+  formSlug: null,
   kappSlug: null,
   lastSave: null,
   lastWebApi: null,
   loading: true,
-  platformItem: null,
   redoStack: (0, _immutable.List)(),
   saving: false,
   tasks: (0, _immutable.OrderedMap)(),
@@ -182,6 +182,7 @@ var deserializeTree = exports.deserializeTree = function deserializeTree(_ref4)
     event = _ref4.event,
     filter = _ref4.filter,
     guid = _ref4.guid,
+    id = _ref4.id,
     inputs = _ref4.inputs,
     name = _ref4.name,
     notes = _ref4.notes,
@@ -206,7 +207,7 @@ var deserializeTree = exports.deserializeTree = function deserializeTree(_ref4)
     definitionId: definitionId,
     event: event,
     filter: filter,
-    guid: guid,
+    guid: guid || id,
     inputs: (0, _immutable.List)(inputs).map(_immutable.Map),
     name: name,
     notes: notes,

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

@@ -148,7 +148,7 @@ var fields = function fields(_ref5) {
       label: 'Filter',
       type: 'code',
       language: 'js',
-      initialValue: workflow ? workflow.get('filter') : '',
+      initialValue: workflow && workflow.get('filter') || '',
       required: false,
       // use event to show filter on linked workflows
       visible: workflow && !!workflow.get('event'),
@@ -157,7 +157,8 @@ var fields = function fields(_ref5) {
           kapp = _ref9.kapp,
           values = _ref9.values;
         var type = ['File Resource', 'Kapp', 'Form', 'Submission', 'Team', 'User'].find(function (scope) {
-          return values.get('event').includes(scope);
+          var _values$get;
+          return (_values$get = values.get('event')) === null || _values$get === void 0 ? void 0 : _values$get.includes(scope);
         });
         return (0, _helpers.buildBindings)({
           space: space,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kineticdata/react",
-  "version": "6.0.4",
+  "version": "6.0.5",
   "description": "A React library for the Kinetic Platform",
   "main": "lib/index.js",
   "files": [
@@ -19,7 +19,7 @@
     "prepublishOnly": "yarn build"
   },
   "dependencies": {
-    "axios": "^1.6.0",
+    "axios": "^1.6.7",
     "classnames": "^2.2.6",
     "deepequal": "^0.0.1",
     "draft-js": "^0.11.7",
@@ -77,5 +77,5 @@
     "classNameTemplate": "{classname}",
     "titleTemplate": "{title}"
   },
-  "gitHead": "cd94ee7c16756e39778c7c80ed1d47fd63fdee4c"
+  "gitHead": "46bbd148a831a29c1a81ec3a081b3e60cdccb03e"
 }