@kineticdata/react 5.1.2 → 6.0.1

package/lib/components/form/Form.helpers.js

@@ -1,51 +1,54 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { fromJS, List, Map, OrderedMap } from 'immutable';
-import { isFunction } from 'lodash-es';
-import { DataSource, Field, FIELD_DEFAULT_VALUES, FormState } from './Form.models';
-import { onBlur, onChange as onChangeHandler, onFocus } from './Form';
+"use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveFieldConfig = exports.initializeValue = exports.handleFormErrors = exports.getFieldComponentProps = exports.getComponentName = exports.createFormState = exports.createField = exports.createDataSource = exports.buildPropertyFields = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
+var _immutable = require("immutable");
+var _lodashEs = require("lodash-es");
+var _Form = require("./Form.models");
+var _Form2 = require("./Form");
+var _excluded = ["name", "type"];
 var sameName = function sameName(field1) {
   return function (field2) {
     return field1.name === field2.name;
   };
 };
-
-export var handleFormErrors = function handleFormErrors(key, message) {
+var handleFormErrors = function handleFormErrors(key, message) {
   return function (results) {
     var error = results.error;
-
     if (error) {
       throw error.statusCode === 400 && error.message || message || 'There was an error saving.';
     }
-
     return key ? results[key] : results;
   };
 };
-export var resolveFieldConfig = function resolveFieldConfig(formOptions, bindings, fieldsFn) {
+exports.handleFormErrors = handleFormErrors;
+var resolveFieldConfig = function resolveFieldConfig(formOptions, bindings, fieldsFn) {
   var addFieldsParam = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
   var alterFieldsParam = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
   var fields = fieldsFn(formOptions)(bindings);
   var addFields = typeof addFieldsParam === 'function' ? addFieldsParam(formOptions)(bindings) : addFieldsParam;
   var alterFields = typeof alterFieldsParam === 'function' ? alterFieldsParam(formOptions)(bindings) : alterFieldsParam;
-
   if (fields && addFields && alterFields) {
-    return OrderedMap([].concat(_toConsumableArray(fields), _toConsumableArray(addFields.filter(function (field) {
+    return (0, _immutable.OrderedMap)([].concat((0, _toConsumableArray2["default"])(fields), (0, _toConsumableArray2["default"])(addFields.filter(function (field) {
       return !fields.find(sameName(field));
     }).map(function (field) {
-      return _objectSpread(_objectSpread({}, field), {}, {
+      return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, field), {}, {
         "transient": true
       });
     }))).filter(function (field) {
       return !!field;
     }).map(function (_ref) {
       var name = _ref.name,
-          type = _ref.type,
-          fieldConfig = _objectWithoutProperties(_ref, ["name", "type"]);
-
-      return _objectSpread(_objectSpread(_objectSpread({}, fieldConfig), alterFields[name] || {}), {}, {
+        type = _ref.type,
+        fieldConfig = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
+      return (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, fieldConfig), alterFields[name] || {}), {}, {
         name: name,
         type: type
       });
@@ -54,51 +57,54 @@ export var resolveFieldConfig = function resolveFieldConfig(formOptions, binding
     }));
   }
 };
-export var initializeValue = function initializeValue(type) {
-  var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : FIELD_DEFAULT_VALUES.get(type, '');
-  return type === 'map' ? OrderedMap(value).map(function (value) {
-    return fromJS(value);
-  }) : fromJS(value);
+exports.resolveFieldConfig = resolveFieldConfig;
+var initializeValue = function initializeValue(type) {
+  var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _Form.FIELD_DEFAULT_VALUES.get(type, '');
+  return type === 'map' ? (0, _immutable.OrderedMap)(value).map(function (value) {
+    return (0, _immutable.fromJS)(value);
+  }) : (0, _immutable.fromJS)(value);
 };
-export var createField = function createField(formKey) {
+exports.initializeValue = initializeValue;
+var createField = function createField(formKey) {
   return function (_ref2) {
     var constraint = _ref2.constraint,
-        constraintMessage = _ref2.constraintMessage,
-        enabled = _ref2.enabled,
-        helpText = _ref2.helpText,
-        initialValue = _ref2.initialValue,
-        label = _ref2.label,
-        language = _ref2.language,
-        name = _ref2.name,
-        onChange = _ref2.onChange,
-        options = _ref2.options,
-        pattern = _ref2.pattern,
-        patternMessage = _ref2.patternMessage,
-        placeholder = _ref2.placeholder,
-        renderAttributes = _ref2.renderAttributes,
-        required = _ref2.required,
-        requiredMessage = _ref2.requiredMessage,
-        search = _ref2.search,
-        serialize = _ref2.serialize,
-        _transient = _ref2["transient"],
-        type = _ref2.type,
-        visible = _ref2.visible;
-    return Field({
+      constraintMessage = _ref2.constraintMessage,
+      enabled = _ref2.enabled,
+      form = _ref2.form,
+      helpText = _ref2.helpText,
+      initialValue = _ref2.initialValue,
+      label = _ref2.label,
+      language = _ref2.language,
+      name = _ref2.name,
+      onChange = _ref2.onChange,
+      options = _ref2.options,
+      pattern = _ref2.pattern,
+      patternMessage = _ref2.patternMessage,
+      placeholder = _ref2.placeholder,
+      renderAttributes = _ref2.renderAttributes,
+      required = _ref2.required,
+      requiredMessage = _ref2.requiredMessage,
+      search = _ref2.search,
+      serialize = _ref2.serialize,
+      _transient = _ref2["transient"],
+      type = _ref2.type,
+      visible = _ref2.visible;
+    return (0, _Form.Field)({
       // Derived options
       id: btoa("".concat(formKey, " ").concat(name)).replace(/=+$/, ''),
       initialValue: initializeValue(type, initialValue),
-      renderAttributes: fromJS(renderAttributes),
+      renderAttributes: (0, _immutable.fromJS)(renderAttributes),
       value: initializeValue(type, initialValue),
       // Options supporting conditional expressions,
       enabled: typeof enabled === 'function' ? false : enabled,
       label: typeof label === 'function' ? '' : label,
-      options: typeof options === 'function' ? List() : fromJS(options),
+      options: typeof options === 'function' ? (0, _immutable.List)() : (0, _immutable.fromJS)(options),
       placeholder: typeof placeholder === 'function' ? '' : placeholder,
       required: typeof required === 'function' ? false : required,
-      search: typeof search === 'function' ? Map() : fromJS(search),
+      search: typeof search === 'function' ? (0, _immutable.Map)() : (0, _immutable.fromJS)(search),
       "transient": typeof _transient === 'function' ? false : _transient,
       visible: typeof visible === 'function' ? false : visible,
-      functions: Map({
+      functions: (0, _immutable.Map)({
         enabled: typeof enabled === 'function' ? enabled : null,
         label: typeof label === 'function' ? label : null,
         options: typeof options === 'function' ? options : null,
@@ -109,17 +115,17 @@ export var createField = function createField(formKey) {
         visible: typeof visible === 'function' ? visible : null
       }),
       // Event handlers
-      eventHandlers: Map({
-        onBlur: onBlur({
+      eventHandlers: (0, _immutable.Map)({
+        onBlur: (0, _Form2.onBlur)({
           formKey: formKey,
           name: name
         }),
-        onChange: onChangeHandler({
+        onChange: (0, _Form2.onChange)({
           formKey: formKey,
           type: type,
           name: name
         }),
-        onFocus: onFocus({
+        onFocus: (0, _Form2.onFocus)({
           formKey: formKey,
           name: name
         })
@@ -127,6 +133,7 @@ export var createField = function createField(formKey) {
       // Pass-through options
       constraint: constraint,
       constraintMessage: constraintMessage,
+      form: form,
       helpText: helpText,
       language: language,
       name: name,
@@ -139,33 +146,34 @@ export var createField = function createField(formKey) {
     });
   };
 };
-export var createDataSource = function createDataSource(_ref3) {
+exports.createField = createField;
+var createDataSource = function createDataSource(_ref3) {
   var _DataSource;
-
   var fn = _ref3.fn,
-      params = _ref3.params,
-      transform = _ref3.transform;
+    params = _ref3.params,
+    transform = _ref3.transform;
   var paramProp = typeof params === 'function' ? 'paramsFn' : 'params';
-  return DataSource((_DataSource = {
+  return (0, _Form.DataSource)((_DataSource = {
     fn: fn
-  }, _defineProperty(_DataSource, paramProp, params), _defineProperty(_DataSource, "transform", transform), _DataSource));
+  }, (0, _defineProperty2["default"])(_DataSource, paramProp, params), (0, _defineProperty2["default"])(_DataSource, "transform", transform), _DataSource));
 };
-export var createFormState = function createFormState(_ref4) {
+exports.createDataSource = createDataSource;
+var createFormState = function createFormState(_ref4) {
   var addDataSources = _ref4.addDataSources,
-      addFields = _ref4.addFields,
-      alterFields = _ref4.alterFields,
-      dataSources = _ref4.dataSources,
-      fields = _ref4.fields,
-      formKey = _ref4.formKey,
-      formOptions = _ref4.formOptions,
-      onError = _ref4.onError,
-      onLoad = _ref4.onLoad,
-      onSave = _ref4.onSave,
-      onSubmit = _ref4.onSubmit;
-  return FormState({
+    addFields = _ref4.addFields,
+    alterFields = _ref4.alterFields,
+    dataSources = _ref4.dataSources,
+    fields = _ref4.fields,
+    formKey = _ref4.formKey,
+    formOptions = _ref4.formOptions,
+    onError = _ref4.onError,
+    onLoad = _ref4.onLoad,
+    onSave = _ref4.onSave,
+    onSubmit = _ref4.onSubmit;
+  return (0, _Form.FormState)({
     addFields: addFields,
     alterFields: alterFields,
-    dataSources: Map(addDataSources).merge(Map(dataSources(formOptions))).map(createDataSource),
+    dataSources: (0, _immutable.Map)(addDataSources).merge((0, _immutable.Map)(dataSources(formOptions))).map(createDataSource),
     fieldsFn: fields,
     formKey: formKey,
     formOptions: formOptions,
@@ -175,80 +183,145 @@ export var createFormState = function createFormState(_ref4) {
     onSubmit: onSubmit && onSubmit(formOptions)
   });
 };
-export var buildPropertyFields = function buildPropertyFields(_ref5) {
+exports.createFormState = createFormState;
+var buildPropertyFields = function buildPropertyFields(_ref5) {
   var isNew = _ref5.isNew,
-      properties = _ref5.properties,
-      getName = _ref5.getName,
-      getOptions = _ref5.getOptions,
-      getRequired = _ref5.getRequired,
-      getSensitive = _ref5.getSensitive,
-      getValue = _ref5.getValue;
+    properties = _ref5.properties,
+    getName = _ref5.getName,
+    getLabel = _ref5.getLabel,
+    getOptions = _ref5.getOptions,
+    getRequired = _ref5.getRequired,
+    getSensitive = _ref5.getSensitive,
+    getCertificate = _ref5.getCertificate,
+    getHelpText = _ref5.getHelpText,
+    getValue = _ref5.getValue;
   return {
     propertiesFields: properties.flatMap(function (property) {
       var name = getName(property);
-      var options = isFunction(getOptions) && getOptions(property);
-      var required = isFunction(getRequired) && getRequired(property);
-      var sensitive = isFunction(getSensitive) && getSensitive(property);
+      var label = (0, _lodashEs.isFunction)(getLabel) && getLabel(property) || name;
+      var options = (0, _lodashEs.isFunction)(getOptions) && getOptions(property);
+      var required = (0, _lodashEs.isFunction)(getRequired) && getRequired(property);
+      var sensitive = (0, _lodashEs.isFunction)(getSensitive) && getSensitive(property);
+      var certificate = (0, _lodashEs.isFunction)(getCertificate) && getCertificate(property);
+      var helpText = (0, _lodashEs.isFunction)(getHelpText) && getHelpText(property);
       var value = getValue(property);
-      return !sensitive || isNew ? [{
+      return !!certificate ? [{
         name: "property_".concat(name),
-        label: name,
+        label: label,
+        type: 'certificate',
+        required: required,
+        "transient": true,
+        options: options,
+        helpText: helpText,
+        initialValue: certificate,
+        visible: function visible(_ref6) {
+          var values = _ref6.values;
+          return !values.get("changeProperty_".concat(name));
+        }
+      }, {
+        name: "property_new_".concat(name),
+        label: label,
+        type: 'file',
+        required: required,
+        "transient": true,
+        helpText: helpText,
+        visible: function visible(_ref7) {
+          var values = _ref7.values;
+          return values.get("changeProperty_".concat(name));
+        }
+      }, {
+        name: "changeProperty_".concat(name),
+        label: "Change ".concat(label),
+        type: 'toggle',
+        "transient": true,
+        initialValue: false,
+        onChange: function onChange(_ref8, _ref9) {
+          var values = _ref8.values;
+          var setValue = _ref9.setValue;
+          if (!_immutable.List.isList(values.get("property_new_".concat(name))) || values.get("property_new_".concat(name)).size > 0) {
+            setValue("property_new_".concat(name), (0, _immutable.List)());
+          }
+        }
+      }] : !sensitive || isNew ? [{
+        name: "property_".concat(name),
+        label: label,
         type: sensitive ? 'password' : options ? 'select' : 'text',
         required: required,
         "transient": true,
         options: options,
+        helpText: helpText,
         initialValue: value
       }] : [{
         name: "property_".concat(name),
-        label: name,
-        type: 'password',
-        required: required ? function (_ref6) {
-          var values = _ref6.values;
+        label: label,
+        type: 'secret',
+        required: required ? function (_ref10) {
+          var values = _ref10.values;
           return values.get("changeProperty_".concat(name));
         } : false,
         "transient": true,
+        helpText: helpText,
         initialValue: '',
-        visible: function visible(_ref7) {
-          var values = _ref7.values;
+        visible: function visible(_ref11) {
+          var values = _ref11.values;
           return values.get("changeProperty_".concat(name));
         }
       }, {
         name: "changeProperty_".concat(name),
-        label: "Change ".concat(name),
-        type: 'checkbox',
+        label: "Change ".concat(label),
+        type: 'toggle',
         "transient": true,
         initialValue: false,
-        onChange: function onChange(_ref8, _ref9) {
-          var values = _ref8.values;
-          var setValue = _ref9.setValue;
-
+        onChange: function onChange(_ref12, _ref13) {
+          var values = _ref12.values;
+          var setValue = _ref13.setValue;
           if (values.get("property_".concat(name)) !== '') {
             setValue("property_".concat(name), '');
           }
         }
       }];
     }).toArray(),
-    propertiesSerialize: function propertiesSerialize(_ref10) {
-      var values = _ref10.values;
-      return properties.filter(function (prop) {
-        return isNew || !isFunction(getSensitive) || !getSensitive(prop) || values.get("changeProperty_".concat(getName(prop)));
-      }).map(getName).reduce(function (reduction, propName) {
-        return reduction.set(propName, values.get("property_".concat(propName)));
-      }, Map()).toObject();
+    propertiesSerialize: function propertiesSerialize(_ref14) {
+      var values = _ref14.values;
+      return properties.reduce(function (reduction, property) {
+        var name = getName(property);
+        var sensitive = (0, _lodashEs.isFunction)(getSensitive) && getSensitive(property);
+        var certificate = (0, _lodashEs.isFunction)(getCertificate) && getCertificate(property);
+        if (certificate) {
+          // If certificate field, serialize value if the corresponding
+          // changeProperty field has a value. Set to the new uploaded file, or
+          // an empty string if no file uploaded.
+          if (values.get("changeProperty_".concat(name))) {
+            return reduction.set(name, values.getIn(["property_new_".concat(name), 0]) || '');
+          }
+        } else if (sensitive) {
+          // If sensitive field, serialize value if the corresponding
+          // changeProperty field has a value. Set to the new provided value.
+          if (isNew || values.get("changeProperty_".concat(name))) {
+            return reduction.set(name, values.get("property_".concat(name)));
+          }
+        } else {
+          return reduction.set(name, values.get("property_".concat(name)));
+        }
+        return reduction;
+      }, (0, _immutable.Map)()).toObject();
     }
   };
 };
-export var getComponentName = function getComponentName(field) {
+exports.buildPropertyFields = buildPropertyFields;
+var getComponentName = function getComponentName(field) {
   return field.type ? field.type.split('-').map(function (word) {
     return "".concat(word.charAt(0).toUpperCase()).concat(word.substring(1));
   }).join('') + 'Field' : null;
 };
-export var getFieldComponentProps = function getFieldComponentProps(field, readOnly) {
+exports.getComponentName = getComponentName;
+var getFieldComponentProps = function getFieldComponentProps(field, readOnly) {
   return {
     dirty: field.dirty,
     enabled: readOnly ? false : field.enabled,
     errors: field.errors,
     focused: field.focused,
+    form: field.form,
     helpText: field.helpText,
     id: field.id,
     label: field.label,
@@ -266,4 +339,5 @@ export var getFieldComponentProps = function getFieldComponentProps(field, readO
     value: field.value,
     visible: field.visible
   };
-};
+};
+exports.getFieldComponentProps = getFieldComponentProps;