@kineticdata/react 6.0.4 → 6.1.0

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: {
@@ -110,26 +116,6 @@ var securityEndpoints = {
     endpoint: 'User Modification',
     label: 'User Modification',
     types: ['Space', 'User']
-  },
-  defaultFormDisplay: {
-    endpoint: 'Default Form Display',
-    label: 'Default Form Display',
-    types: ['Form']
-  },
-  defaultFormModification: {
-    endpoint: 'Default Form Modification',
-    label: 'Default Form Modification',
-    types: ['Form']
-  },
-  defaultSubmissionAccess: {
-    endpoint: 'Default Submission Access',
-    label: 'Default Submission Access',
-    types: ['Form', 'Submission']
-  },
-  defaultSubmissionModification: {
-    endpoint: 'Default Submission Modification',
-    label: 'Default Submission Modification',
-    types: ['Form', 'Submission']
   }
 };
 var fields = function fields() {
@@ -148,45 +134,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 +173,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 +194,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 +212,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 +227,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(_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, '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(_ref15) {
-        var values = _ref15.values;
-        return (0, _immutable.get)(values, 'displayType') === 'Single Page App';
+      required: function required(_ref12) {
+        var values = _ref12.values;
+        return (0, _immutable.get)(values, 'displayType') === 'Hosted';
       },
-      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') === '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 +281,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 +302,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 +321,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 +339,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 +348,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,22 +378,23 @@ 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) {
             return (0, _immutable.Map)({
               value: definition.get('name'),
-              label: definition.get('name')
+              label: definition.get('name'),
+              type: definition.get('type')
             });
           });
         },
@@ -422,12 +408,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,18 +438,18 @@ 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') : [];
       }
     }, {
       name: 'allowedIpsEnabled',
-      label: 'Enabled Allowed IP Restrictions?',
+      label: 'Allowed IP Restrictions',
       type: 'checkbox',
       initialValue: (0, _immutable.get)(space, 'allowedIpsEnabled', false) || false
     }, {
@@ -471,8 +457,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/core/submission/DatastoreSubmissionTable.js

@@ -51,7 +51,7 @@ var columns = [{
   sortable: true
 }, {
   value: 'closedBy',
-  title: 'closedBy',
+  title: 'Closed By',
   sortable: false
 }, {
   value: 'coreState',
@@ -59,7 +59,7 @@ var columns = [{
   sortable: false
 }, {
   value: 'createdAt',
-  title: 'Created',
+  title: 'Created At',
   sortable: true
 }, {
   value: 'createdBy',
@@ -75,7 +75,7 @@ var columns = [{
   sortable: false
 }, {
   value: 'id',
-  title: 'Id',
+  title: 'ID',
   sortable: false
 }, {
   value: 'label',
@@ -107,7 +107,7 @@ var columns = [{
   sortable: false
 }, {
   value: 'updatedAt',
-  title: 'Updated',
+  title: 'Updated At',
   sortable: false
 }, {
   value: 'updatedBy',

package/lib/components/core/submission/FormSubmissionTable.js

@@ -43,8 +43,8 @@ var dataSource = function dataSource(_ref) {
 };
 var columns = [{
   value: 'closedAt',
-  title: 'Closed',
-  sortable: true,
+  title: 'Closed At',
+  sortable: false,
   toggleable: true
 }, {
   value: 'closedBy',
@@ -58,8 +58,8 @@ var columns = [{
   toggleable: true
 }, {
   value: 'createdAt',
-  title: 'Created',
-  sortable: true,
+  title: 'Created At',
+  sortable: false,
   toggleable: true
 }, {
   value: 'createdBy',
@@ -79,7 +79,7 @@ var columns = [{
   columnOrder: 'first'
 }, {
   value: 'id',
-  title: 'Id',
+  title: 'ID',
   sortable: false,
   toggleable: true
 }, {
@@ -105,7 +105,7 @@ var columns = [{
 }, {
   value: 'submittedAt',
   title: 'Submitted At',
-  sortable: true,
+  sortable: false,
   toggleable: true
 }, {
   value: 'submittedBy',
@@ -119,7 +119,7 @@ var columns = [{
   toggleable: true
 }, {
   value: 'updatedAt',
-  title: 'Updated',
+  title: 'Updated At',
   sortable: false,
   toggleable: true
 }, {
@@ -127,6 +127,11 @@ var columns = [{
   title: 'Updated By',
   sortable: false,
   toggleable: true
+}, {
+  value: 'sortDate',
+  title: 'Sort Date',
+  sortable: false,
+  toggleable: true
 }];
 var FormSubmissionTable = exports.FormSubmissionTable = (0, _Table.generateTable)({
   tableOptions: ['kappSlug', 'formSlug', 'include', 'count'],

package/lib/components/core/submission/KappSubmissionTable.js

@@ -170,7 +170,7 @@ var filters = function filters(_ref6) {
 };
 var columns = [{
   value: 'closedAt',
-  title: 'Closed',
+  title: 'Closed At',
   sortable: true,
   toggleable: true
 }, {
@@ -185,7 +185,7 @@ var columns = [{
   toggleable: true
 }, {
   value: 'createdAt',
-  title: 'Created',
+  title: 'Created At',
   sortable: true,
   toggleable: true
 }, {
@@ -206,7 +206,7 @@ var columns = [{
   columnOrder: 'first'
 }, {
   value: 'id',
-  title: 'Id',
+  title: 'ID',
   sortable: false,
   toggleable: true
 }, {
@@ -246,7 +246,7 @@ var columns = [{
   toggleable: true
 }, {
   value: 'updatedAt',
-  title: 'Updated',
+  title: 'Updated At',
   sortable: true,
   toggleable: true
 }, {

package/lib/components/core/submission/SubmissionForm.js

@@ -123,7 +123,9 @@ var convertRenderType = function convertRenderType(element) {
 };
 var getInitialValue = function getInitialValue(submission, element, type) {
   var fieldKey = element.get('key');
-  var value = (0, _immutable.getIn)(submission, ['valuesRaw', fieldKey, 'value'], ['checkbox', 'attachment'].includes(element.get('renderType')) ? (0, _immutable.List)() : '') || '';
+
+  // If value doesn't exist, set a default value based on the renderType
+  var value = ['checkbox', 'attachment'].includes(element.get('renderType')) ? (0, _immutable.getIn)(submission, ['valuesRaw', fieldKey, 'value']) || (0, _immutable.List)() : (0, _immutable.getIn)(submission, ['valuesRaw', fieldKey, 'value']) || '';
 
   // To update a submission with existing submissions we need to grab the
   // documentId and insert that into the attachment value normally returned with

package/lib/components/core/team/TeamTable.js

@@ -44,23 +44,33 @@ var columns = [{
   toggleable: false,
   columnOrder: 'first'
 }, {
-  value: 'updatedAt',
-  title: 'Updated',
+  value: 'slug',
+  title: 'Slug',
+  sortable: true,
+  toggleable: true
+}, {
+  value: 'description',
+  title: 'Description',
   sortable: true,
   toggleable: true
 }, {
   value: 'createdAt',
-  title: 'Created',
+  title: 'Created At',
   sortable: true,
   toggleable: true
 }, {
-  value: 'description',
-  title: 'Description',
+  value: 'createdBy',
+  title: 'Created By',
   sortable: true,
   toggleable: true
 }, {
-  value: 'slug',
-  title: 'Slug',
+  value: 'updatedAt',
+  title: 'Updated At',
+  sortable: true,
+  toggleable: true
+}, {
+  value: 'updatedBy',
+  title: 'Updated By',
   sortable: true,
   toggleable: true
 }];

package/lib/components/core/user/UserTable.js

@@ -90,9 +90,25 @@ var columns = [{
   title: 'Display Name',
   sortable: true,
   toggleable: true
+}, {
+  value: 'enabled',
+  title: 'Enabled?',
+  sortable: false,
+  toggleable: true,
+  components: {
+    BodyCell: BooleanYesNoCell
+  }
+}, {
+  value: 'spaceAdmin',
+  title: 'Space Admin?',
+  sortable: false,
+  toggleable: true,
+  components: {
+    BodyCell: BooleanYesNoCell
+  }
 }, {
   value: 'createdAt',
-  title: 'Created',
+  title: 'Created At',
   sortable: true,
   toggleable: true
 }, {
@@ -102,7 +118,7 @@ var columns = [{
   toggleable: true
 }, {
   value: 'updatedAt',
-  title: 'Updated',
+  title: 'Updated At',
   sortable: true,
   toggleable: true
 }, {
@@ -110,22 +126,6 @@ var columns = [{
   title: 'Updated By',
   sortable: true,
   toggleable: true
-}, {
-  value: 'enabled',
-  title: 'Enabled?',
-  sortable: false,
-  toggleable: true,
-  components: {
-    BodyCell: BooleanYesNoCell
-  }
-}, {
-  value: 'spaceAdmin',
-  title: 'Space Admin?',
-  sortable: false,
-  toggleable: true,
-  components: {
-    BodyCell: BooleanYesNoCell
-  }
 }];
 var UserTable = exports.UserTable = (0, _Table.generateTable)({
   tableOptions: ['system', 'spaceSlug'],

package/lib/components/core/webapi/WebApiForm.js

@@ -178,7 +178,9 @@ var fields = function fields(_ref7) {
       label: 'Slug',
       type: 'text',
       required: true,
-      initialValue: (0, _immutable.get)(webApi, 'slug') || ''
+      initialValue: (0, _immutable.get)(webApi, 'slug') || '',
+      pattern: /^[a-z\d-]*$/,
+      patternMessage: 'Slug may only contain lowercase letters, numbers, or hyphens.'
     }, {
       name: 'method',
       label: 'Method',
@@ -206,7 +208,8 @@ var fields = function fields(_ref7) {
           }).map(function (definition) {
             return (0, _immutable.Map)({
               value: definition.get('name'),
-              label: definition.get('name')
+              label: definition.get('name'),
+              type: definition.get('type')
             });
           }) : [];
         },

package/lib/components/core/webapi/WebApiTable.js

@@ -61,7 +61,7 @@ var columns = [{
   toggleable: true
 }, {
   value: 'createdAt',
-  title: 'Created',
+  title: 'Created At',
   sortable: true,
   toggleable: true
 }, {
@@ -70,7 +70,7 @@ var columns = [{
   toggleable: true
 }, {
   value: 'updatedAt',
-  title: 'Updated',
+  title: 'Updated At',
   sortable: true,
   toggleable: true
 }, {