@kineticdata/react 6.0.4 → 6.1.0

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,14 +152,26 @@ 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;
-        return (0, _helpers.buildBindings)({
-          space: space,
-          kapp: kapp && kapp.set('kappAttributeDefinitions', attributeDefinitions),
-          scope: 'Submission'
+      options: function options(_ref6) {
+        var space = _ref6.space,
+          kapp = _ref6.kapp,
+          attributeDefinitions = _ref6.attributeDefinitions;
+        return (0, _helpers.buildCodeEditorBindings)({
+          space: {
+            attributeDefinitions: space === null || space === void 0 ? void 0 : space.get('spaceAttributeDefinitions')
+          },
+          kapp: {
+            attributeDefinitions: attributeDefinitions
+          },
+          form: {
+            attributeDefinitions: kapp === null || kapp === void 0 ? void 0 : kapp.get('formAttributeDefinitions')
+          },
+          submission: {
+            detailed: true
+          },
+          values: (kapp === null || kapp === void 0 ? void 0 : kapp.get('fields').size) > 0 && {
+            data: kapp.get('fields')
+          }
         });
       }
     }, {
@@ -184,38 +184,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 +214,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 +226,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 +234,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,22 +245,23 @@ 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) {
             return (0, _immutable.Map)({
               value: definition.get('name'),
-              label: definition.get('name')
+              label: definition.get('name'),
+              type: definition.get('type')
             });
           }) : [];
         },
@@ -286,12 +275,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 +295,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/kapp/KappTable.js

@@ -54,8 +54,8 @@ var columns = [{
   sortable: true,
   toggleable: true
 }, {
-  value: 'CreatedAt',
-  title: 'Created',
+  value: 'createdAt',
+  title: 'Created At',
   sortable: true,
   toggleable: true
 }, {
@@ -64,7 +64,7 @@ var columns = [{
   toggleable: true
 }, {
   value: 'updatedAt',
-  title: 'Updated',
+  title: 'Updated At',
   sortable: true,
   toggleable: true
 }, {

package/lib/components/core/log/LogTable.js

@@ -63,7 +63,7 @@ var dataSource = function dataSource() {
     }
   };
 };
-var APP_COMPONENT_OPTIONS = ['agent', 'core', 'loghub', 'task'].map(function (component) {
+var APP_COMPONENT_OPTIONS = ['agent', 'core', 'integrator', 'loghub', 'task'].map(function (component) {
   return {
     label: component,
     value: component

package/lib/components/core/security_definition/SecurityDefinitionForm.js

@@ -8,9 +8,20 @@ var _Form = require("../../form/Form");
 var _apis = require("../../../apis");
 var _helpers = require("../../../helpers");
 var SPACE_SECURITY_DEFINITION_TYPES = exports.SPACE_SECURITY_DEFINITION_TYPES = ['Space', 'File Resource', 'Team', 'User'];
+var SPACE_SECURITY_DEFINITION_TYPES_MAP = {
+  Space: ['Space'],
+  'File Resource': ['Space', 'File Resource'],
+  Team: ['Space', 'Team'],
+  User: ['Space', 'User']
+};
 var KAPP_SECURITY_DEFINITION_TYPES = exports.KAPP_SECURITY_DEFINITION_TYPES = ['Kapp', 'Form', 'Submission'];
-var SPACE_INCLUDES = 'datastoreFormAttributeDefinitions,spaceAttributeDefinitions,teamAttributeDefinitions,userAttributeDefinitions,userProfileAttributeDefinitions';
-var KAPP_INCLUDES = 'formAttributeDefinitions,kappAttributeDefinitions,fields';
+var KAPP_SECURITY_DEFINITION_TYPES_MAP = {
+  Kapp: ['Kapp'],
+  Form: ['Kapp', 'Form'],
+  Submission: ['Kapp', 'Form', 'Submission']
+};
+var SPACE_INCLUDES = 'spaceAttributeDefinitions,teamAttributeDefinitions,userAttributeDefinitions,userProfileAttributeDefinitions';
+var KAPP_INCLUDES = 'formAttributeDefinitions,kappAttributeDefinitions,fields.details';
 var PROFILE_INCLUDES = 'attributesMap,profileAttributesMap';
 var dataSources = function dataSources(_ref) {
   var securityPolicyName = _ref.securityPolicyName,
@@ -43,6 +54,9 @@ var dataSources = function dataSources(_ref) {
       }],
       transform: function transform(result) {
         return result.securityPolicyDefinition;
+      },
+      errorTransform: function errorTransform(result) {
+        return result.error;
       }
     },
     profile: {
@@ -76,6 +90,7 @@ var handleSubmit = function handleSubmit(_ref2) {
 };
 var fields = function fields(_ref4) {
   var securityPolicyName = _ref4.securityPolicyName,
+    securityPolicyType = _ref4.securityPolicyType,
     kappSlug = _ref4.kappSlug;
   return function (_ref5) {
     var securityPolicy = _ref5.securityPolicy;
@@ -91,7 +106,7 @@ var fields = function fields(_ref4) {
       label: 'Type',
       type: 'select',
       required: true,
-      options: (kappSlug ? KAPP_SECURITY_DEFINITION_TYPES : SPACE_SECURITY_DEFINITION_TYPES).map(function (ele) {
+      options: (kappSlug ? securityPolicyType && KAPP_SECURITY_DEFINITION_TYPES.includes(securityPolicyType) ? KAPP_SECURITY_DEFINITION_TYPES_MAP[securityPolicyType] : KAPP_SECURITY_DEFINITION_TYPES : securityPolicyType && SPACE_SECURITY_DEFINITION_TYPES.includes(securityPolicyType) ? SPACE_SECURITY_DEFINITION_TYPES_MAP[securityPolicyType] : SPACE_SECURITY_DEFINITION_TYPES).map(function (ele) {
         return {
           value: ele,
           label: ele
@@ -110,18 +125,41 @@ var fields = function fields(_ref4) {
       name: 'rule',
       label: 'Rule',
       type: 'code',
-      language: 'js',
+      language: 'js-expression',
       required: true,
       options: function options(_ref6) {
         var space = _ref6.space,
           kapp = _ref6.kapp,
           values = _ref6.values,
           profile = _ref6.profile;
-        return (0, _helpers.buildBindings)({
-          space: space,
-          kapp: kapp,
-          scope: values.get('type'),
-          profile: profile
+        return (0, _helpers.buildCodeEditorBindings)({
+          identity: profile && {
+            attributeDefinitions: space === null || space === void 0 ? void 0 : space.get('userAttributeDefinitions'),
+            profileAttributeDefinitions: space === null || space === void 0 ? void 0 : space.get('userProfileAttributeDefinitions')
+          },
+          space: {
+            attributeDefinitions: space === null || space === void 0 ? void 0 : space.get('spaceAttributeDefinitions')
+          },
+          file: values.get('type') === 'File Resource' && {},
+          user: values.get('type') === 'User' && {
+            attributeDefinitions: space === null || space === void 0 ? void 0 : space.get('userAttributeDefinitions'),
+            profileAttributeDefinitions: space === null || space === void 0 ? void 0 : space.get('userProfileAttributeDefinitions')
+          },
+          team: values.get('type') === 'Team' && {
+            attributeDefinitions: space === null || space === void 0 ? void 0 : space.get('teamAttributeDefinitions')
+          },
+          kapp: ['Kapp', 'Form', 'Submission'].includes(values.get('type')) && {
+            attributeDefinitions: kapp === null || kapp === void 0 ? void 0 : kapp.get('kappAttributeDefinitions')
+          },
+          form: ['Form', 'Submission'].includes(values.get('type')) && {
+            attributeDefinitions: kapp === null || kapp === void 0 ? void 0 : kapp.get('formAttributeDefinitions')
+          },
+          submission: values.get('type') === 'Submission' && {
+            detailed: true
+          },
+          values: values.get('type') === 'Submission' && (kapp === null || kapp === void 0 ? void 0 : kapp.get('fields').size) > 0 && {
+            data: kapp.get('fields')
+          }
         });
       },
       initialValue: securityPolicy ? securityPolicy.get('rule') : '',
@@ -130,7 +168,7 @@ var fields = function fields(_ref4) {
   };
 };
 var SecurityDefinitionForm = exports.SecurityDefinitionForm = (0, _Form.generateForm)({
-  formOptions: ['kappSlug', 'securityPolicyName'],
+  formOptions: ['kappSlug', 'securityPolicyName', 'securityPolicyType'],
   dataSources: dataSources,
   fields: fields,
   handleSubmit: handleSubmit