@kineticdata/react 5.1.0-rc.1 → 5.1.1

package/lib/components/core/i18n/I18n.js

@@ -99,24 +99,24 @@ export var I18n = /*#__PURE__*/function (_React$Component) {
           }, _this3.props.children);
         } // Otherwise wrap children in a new instance of I18nProvider with the new context
         else if (_this3.state.context) {
-            return /*#__PURE__*/React.createElement(I18nContext.Provider, {
-              value: {
-                context: _this3.state.context,
-                locale: locale,
-                translations: translations,
-                loadTranslations: loadTranslations
-              }
-            }, /*#__PURE__*/React.createElement(I18nTranslate, {
+          return /*#__PURE__*/React.createElement(I18nContext.Provider, {
+            value: {
               context: _this3.state.context,
               locale: locale,
               translations: translations,
-              loadTranslations: loadTranslations,
-              "public": _this3.props["public"]
-            }, _this3.props.children));
-          } // Otherwise return children
-          else {
-              return _this3.props.children;
+              loadTranslations: loadTranslations
             }
+          }, /*#__PURE__*/React.createElement(I18nTranslate, {
+            context: _this3.state.context,
+            locale: locale,
+            translations: translations,
+            loadTranslations: loadTranslations,
+            "public": _this3.props["public"]
+          }, _this3.props.children));
+        } // Otherwise return children
+        else {
+          return _this3.props.children;
+        }
       }) : null;
     }
   }]);

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

@@ -1,7 +1,7 @@
 import { generateForm } from '../../form/Form';
 import { fetchSecurityPolicyDefinition, createSecurityPolicyDefinition, updateSecurityPolicyDefinition, fetchSpace, fetchKapp, fetchProfile } from '../../../apis';
 import { buildBindings } from '../../../helpers';
-export var SPACE_SECURITY_DEFINITION_TYPES = ['Space', 'Team', 'User'];
+export var SPACE_SECURITY_DEFINITION_TYPES = ['Space', 'File Resource', 'Team', 'User'];
 export var KAPP_SECURITY_DEFINITION_TYPES = ['Kapp', 'Form', 'Submission'];
 var SPACE_INCLUDES = 'datastoreFormAttributeDefinitions,spaceAttributeDefinitions,teamAttributeDefinitions,userAttributeDefinitions,userProfileAttributeDefinitions';
 var KAPP_INCLUDES = 'formAttributeDefinitions,kappAttributeDefinitions,fields';

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

@@ -1,6 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { get, Map } from 'immutable';
+import { fromJS, get, Map } from 'immutable';
 import t from 'prop-types';
 import { generateForm } from '../../form/Form';
 import { updateSpace, fetchSpace, fetchAttributeDefinitions, fetchLocales, fetchTimezones, fetchSecurityPolicyDefinitions } from '../../../apis';
@@ -12,7 +12,7 @@ var dataSources = function dataSources() {
     space: {
       fn: fetchSpace,
       params: [{
-        include: 'attributesMap,securityPolicies,details'
+        include: 'allowedIps,attributesMap,securityPolicies,details'
       }],
       transform: function transform(result) {
         return result.space;
@@ -117,22 +117,22 @@ var securityEndpoints = {
   defaultFormDisplay: {
     endpoint: 'Default Form Display',
     label: 'Default Form Display',
-    types: ['Space', 'Form']
+    types: ['Form']
   },
   defaultFormModification: {
     endpoint: 'Default Form Modification',
     label: 'Default Form Modification',
-    types: ['Space', 'Form']
+    types: ['Form']
   },
   defaultSubmissionAccess: {
     endpoint: 'Default Submission Access',
     label: 'Default Submission Access',
-    types: ['Space', 'Form', 'Submission']
+    types: ['Form', 'Submission']
   },
   defaultSubmissionModification: {
     endpoint: 'Default Submission Modification',
     label: 'Default Submission Modification',
-    types: ['Space', 'Form', 'Submission']
+    types: ['Form', 'Submission']
   }
 };
 
@@ -446,13 +446,42 @@ var fields = function fields() {
         });
       },
       initialValue: get(space, 'securityPolicies')
+    }, {
+      name: 'allowedIps',
+      label: 'Allowed IPs',
+      type: 'select',
+      options: function options() {
+        return fromJS([{
+          name: 'description',
+          label: 'Description',
+          type: 'text'
+        }, {
+          name: 'value',
+          label: 'IP Range',
+          type: 'text'
+        }]);
+      },
+      visible: function visible(_ref34) {
+        var values = _ref34.values;
+        return values.get('allowedIpsEnabled', false);
+      },
+      initialValue: get(space, 'allowedIps', []),
+      serialize: function serialize(_ref35) {
+        var values = _ref35.values;
+        return values.get('allowedIpsEnabled', false) ? values.get('allowedIps') : [];
+      }
+    }, {
+      name: 'allowedIpsEnabled',
+      label: 'Enabled Allowed IP Restrictions?',
+      type: 'checkbox',
+      initialValue: get(space, 'allowedIpsEnabled', false) || false
     }, {
       name: 'attributesMap',
       label: 'Attributes',
       type: 'attributes',
       required: false,
-      options: function options(_ref34) {
-        var attributeDefinitions = _ref34.attributeDefinitions;
+      options: function options(_ref36) {
+        var attributeDefinitions = _ref36.attributeDefinitions;
         return attributeDefinitions;
       },
       initialValue: get(space, 'attributesMap')

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

@@ -165,7 +165,7 @@ var orderVisibleFn = function orderVisibleFn(partIndex) {
   };
 };
 
-var availableOptions = function availableOptions(partType, partIndex) {
+export var availableOptions = function availableOptions(partType, partIndex) {
   return function (bindings) {
     var values = bindings.values,
         indexDefinitions = bindings.indexDefinitions;
@@ -354,7 +354,7 @@ export var filters = function filters() {
         label: 'DESC',
         value: 'DESC'
       }],
-      initialValue: 'ASC',
+      initialValue: 'DESC',
       required: true
     }], _toConsumableArray(Range(0, MAX_PART_LENGTH).flatMap(function (i) {
       return [{
@@ -369,15 +369,7 @@ export var filters = function filters() {
         options: availableOptions('orderBy', i),
         visible: orderVisibleFn(i)
       }];
-    }).toArray()), [// {
-    //   name: 'timeline',
-    //   transient: true,
-    //   type: 'select',
-    //   options: TIMELINES.map(t => Map({ label: t, value: t })),
-    //   visible: ({ values }) => values.get('timeline') !== '',
-    //   enabled: ({ values }) => !TIMELINES.includes(values.get('range-part')),
-    // },
-    {
+    }).toArray()), [{
       name: 'query',
       type: null,
       serialize: serializeQuery

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

@@ -16,6 +16,8 @@ var dataSource = function dataSource(_ref) {
       return searchSubmissions(options);
     },
     params: function params(paramData) {
+      var q = paramData.filters.getIn(['query', 'q']) || undefined;
+      var orderBy = paramData.filters.getIn(['query', 'orderBy']) || 'createdAt';
       return [{
         form: formSlug,
         kapp: kappSlug,
@@ -24,8 +26,8 @@ var dataSource = function dataSource(_ref) {
           include: Set([].concat(_toConsumableArray(typeof include === 'string' ? include.split(',') : Array.isArray(include) ? include : []), ['details'])).toJS(),
           // need to pass undefined instead of null so the `q` parameter is not
           // added to the query string with empty value
-          q: paramData.filters.getIn(['query', 'q']) || undefined,
-          orderBy: paramData.filters.getIn(['query', 'orderBy']) || paramData.filters.getIn(['query', 'q']) ? undefined : 'updatedAt'
+          q: q,
+          orderBy: orderBy
         }, generatePaginationParams(paramData)),
         count: count ? true : undefined
       }];

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

@@ -0,0 +1,124 @@
+import { List, getIn } from 'immutable';
+import { fetchSubmission, updateSubmission } from '../../../apis';
+import { generateForm } from '../../form/Form';
+import moment from 'moment';
+
+var dataSources = function dataSources(_ref) {
+  var submissionId = _ref.submissionId;
+  return {
+    submission: {
+      fn: fetchSubmission,
+      params: [{
+        id: submissionId,
+        include: 'details,values,form,form.fields,form.fields.details,form.pages'
+      }],
+      transform: function transform(result) {
+        return result.submission;
+      }
+    }
+  };
+};
+
+var handleSubmit = function handleSubmit(_ref2) {
+  var id = _ref2.submissionId;
+  return function (values) {
+    return updateSubmission({
+      id: id,
+      values: values.toJS()
+    }).then(function (_ref3) {
+      var submission = _ref3.submission,
+          error = _ref3.error;
+
+      if (error) {
+        throw error.statusCode === 400 && error.message || 'There was an error saving the submission';
+      }
+
+      return submission;
+    });
+  };
+};
+
+var traverseElement = function traverseElement(traverse, iteratee, acc) {
+  var element = traverse.get(0);
+  var elements = traverse.shift();
+  var childElements = element.get('elements', List());
+  var result = iteratee(element, acc); // If the current element has child elements make a recursive call.
+
+  if (childElements.size > 0) {
+    result = traverseElement(childElements, iteratee, result);
+  }
+
+  if (elements.size > 0) {
+    return traverseElement(elements, iteratee, result);
+  }
+
+  return result;
+};
+
+var convertRenderType = function convertRenderType(element) {
+  if (element.get('renderType') === 'dropdown') {
+    return element.get('choicesResourceName') ? 'text' : 'select';
+  } else if (element.get('renderType') === 'checkbox') {
+    return 'text-multi';
+  } else if (element.get('renderType') === 'attachment') {
+    return 'text';
+  }
+
+  return element.get('renderType');
+};
+
+var getInitialValue = function getInitialValue(submission, element, type) {
+  var name = element.get('name');
+  var isAttachment = element.get('renderType') === 'attachment';
+  var value = getIn(submission, ['values', name], element.get('renderType') === 'checkbox' ? List() : '') || '';
+  return isAttachment ? JSON.stringify(List.isList(value) ? value.toJS() : value) : type === 'datetime' ? moment(value).format('yyyy-MM-DDThh:mm') : type === 'date' ? moment(value).format('yyyy-MM-DD') : value;
+};
+
+var serializer = function serializer(element, type) {
+  return function (_ref4) {
+    var values = _ref4.values;
+    var name = element.get('name');
+    return type === 'datetime' ? moment(values.get(name)).format() : values.get(name);
+  };
+}; // If the element uses bridged options then the `choices` value represents the
+// label/value mapping from and not actual choices.
+
+
+var getChoices = function getChoices(element) {
+  return !!element.get('choicesResourceName') ? List() : element.get('choices');
+};
+
+var fields = function fields() {
+  return function (_ref5) {
+    var submission = _ref5.submission;
+
+    if (submission) {
+      var pages = submission.getIn(['form', 'pages'], List());
+      var values = traverseElement(pages, function (element, values) {
+        var name = element.get('name');
+        var type = convertRenderType(element);
+        var initialValue = getInitialValue(submission, element, type);
+        var isAttachment = element.get('renderType') === 'attachment';
+        return element.get('type') === 'field' ? values.push({
+          name: name,
+          label: name,
+          type: type,
+          options: getChoices(element, initialValue),
+          initialValue: initialValue,
+          enabled: !isAttachment,
+          "transient": isAttachment,
+          serialize: serializer(element, type)
+        }) : values;
+      }, List());
+      return values.toJS();
+    }
+  };
+};
+
+export var SubmissionForm = generateForm({
+  formOptions: ['submissionId'],
+  dataSources: dataSources,
+  fields: fields,
+  handleSubmit: handleSubmit
+});
+SubmissionForm.displayName = 'SubmissionForm';

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

@@ -67,13 +67,13 @@ export var availableParts = function availableParts(values, indexes, equalityFie
     var rangeRemaining = remainingParts.filter(function (index) {
       return index && index.size === 1;
     });
-    return rangeRemaining.concat(rangePart && rangeRemaining.size === 0 && values.get('orderby0-part') && values.get('orderby0-part') !== rangePart ? List() : timelinesAvailable);
+    return rangeRemaining.concat(rangePart && rangeRemaining.size === 0 && values.get('orderby0-part') && values.get('orderby0-part') !== rangePart ? List([]) : timelinesAvailable || List([]));
   } else if (partType === 'orderBy') {
     return (rangePart ? List([rangePart]) : remainingParts.filter(function (index) {
       return index && index.size > 0;
     }).map(function (index) {
       return index.first();
-    })).concat(TIMELINES.includes(rangePart) ? List([rangePart]) : timelinesAvailable).toSet().toList();
+    })).concat(TIMELINES.includes(rangePart) ? List([rangePart]) : anyAtLast ? fromJS(TIMELINES) : equalityFields.size === 0 ? fromJS(TIMELINES) : List()).toSet().toList();
   } else {
     return remainingParts.filterNot(function (index) {
       return !index || index.size === 0;

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

@@ -2,8 +2,8 @@ import { get, List, Map } from 'immutable';
 import { generateForm } from '../../form/Form';
 import { createUser, fetchAttributeDefinitions, fetchUser, updateUser, fetchLocales, fetchTimezones } from '../../../apis';
 import { handleFormErrors } from '../../form/Form.helpers';
-var USER_INCLUDES = 'attributesMap,authorization,memberships,profileAttributesMap';
-var EMAIL_REGEX = /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/;
+var USER_INCLUDES = 'details,attributesMap,authorization,memberships,profileAttributesMap';
+var EMAIL_REGEX = /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/i;
 
 var dataSources = function dataSources(_ref) {
   var username = _ref.username,