@kineticdata/react 5.1.2 → 6.0.0

package/lib/components/system/helpers.js

@@ -1,6 +1,13 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { get, getIn, List } from 'immutable';
-export var VALIDATE_DB_ADAPTERS = [{
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.propertiesFromValues = exports.propertiesFromAdapters = exports.generateInitialValues = exports.formPropertyName = exports.adapterPropertiesFields = exports.adapterProperties = exports.VALIDATE_DB_ADAPTERS = exports.POSTGRES_FIELDS = exports.ORACLE_FIELDS = exports.MSSQL_FIELDS = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
+var _immutable = require("immutable");
+var VALIDATE_DB_ADAPTERS = [{
   label: 'Microsoft SQL Server',
   value: 'mssql'
 }, {
@@ -10,66 +17,61 @@ export var VALIDATE_DB_ADAPTERS = [{
   label: 'PostgreSQL DB Server',
   value: 'postgres'
 }];
-
+exports.VALIDATE_DB_ADAPTERS = VALIDATE_DB_ADAPTERS;
 var getValueFromList = function getValueFromList(properties, key, initialValue) {
   var property = properties.find(function (p) {
     return p.get('name') === key;
   });
   return property ? property.get('value') : initialValue;
 };
-
-export var generateInitialValues = function generateInitialValues(persistedObject, persistedPath, defaultObject, adapter) {
+var generateInitialValues = function generateInitialValues(persistedObject, persistedPath, defaultObject, adapter) {
   return function (key) {
     var initialValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-    var sameAsTenant = getIn(persistedObject, persistedPath.concat(['type']), '') === adapter;
-    var defaultObjectValue = getValueFromList(get(defaultObject, 'properties', List()), key, initialValue);
-
+    var sameAsTenant = (0, _immutable.getIn)(persistedObject, persistedPath.concat(['type']), '') === adapter;
+    var defaultObjectValue = getValueFromList((0, _immutable.get)(defaultObject, 'properties', (0, _immutable.List)()), key, initialValue);
     if (sameAsTenant) {
       // Get the properties from the persisted object.
-      var properties = getIn(persistedObject, persistedPath.concat(['properties']), List());
-
-      if (List.isList(properties)) {
+      var properties = (0, _immutable.getIn)(persistedObject, persistedPath.concat(['properties']), (0, _immutable.List)());
+      if (_immutable.List.isList(properties)) {
         var property = properties.find(function (p) {
           return p.get('name') === key;
         });
         return property ? property.get('value') : defaultObjectValue;
       } else {
-        return get(properties, key, defaultObjectValue);
+        return (0, _immutable.get)(properties, key, defaultObjectValue);
       }
-    } else if (get(defaultObject, 'type') === adapter) {
-      var adapterProperty = get(defaultObject, 'properties', List()).find(function (property) {
+    } else if ((0, _immutable.get)(defaultObject, 'type') === adapter) {
+      var adapterProperty = (0, _immutable.get)(defaultObject, 'properties', (0, _immutable.List)()).find(function (property) {
         return property.get('name') === key;
       });
-      return get(adapterProperty, 'value', defaultObjectValue);
+      return (0, _immutable.get)(adapterProperty, 'value', defaultObjectValue);
     }
-
     return initialValue;
   };
 };
-
+exports.generateInitialValues = generateInitialValues;
 var generatePasswordFields = function generatePasswordFields(adapterName, persistedObject, currentAdapter, defaultAdapter) {
   var label = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'Password';
   var fieldName = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'password';
   var additionalValidation = arguments.length > 6 ? arguments[6] : undefined;
-
   var required = function required(_ref) {
     var values = _ref.values;
-    var currentAdapterName = values.get(currentAdapter); // If this adapter is the same as the currently chosen adapter.
+    var currentAdapterName = values.get(currentAdapter);
 
+    // If this adapter is the same as the currently chosen adapter.
     if (currentAdapterName === adapterName) {
       // And we are editing an existing adaptedr, it is required if changing.
       if (persistedObject) {
-        return values.get("".concat(adapterName, "_").concat(fieldName, "Change")); // Otherwise it's only required, when editing, if the adapter is different than the default.
+        return values.get("".concat(adapterName, "_").concat(fieldName, "Change"));
+        // Otherwise it's only required, when editing, if the adapter is different than the default.
       } else if (typeof additionalValidation === 'function') {
         return additionalValidation(values);
       } else {
-        return getIn(defaultAdapter, ['type'], '') !== adapterName;
+        return (0, _immutable.getIn)(defaultAdapter, ['type'], '') !== adapterName;
       }
     }
-
     return false;
   };
-
   var name = "".concat(adapterName, "_").concat(fieldName);
   return [{
     name: name,
@@ -94,20 +96,17 @@ var generatePasswordFields = function generatePasswordFields(adapterName, persis
     onChange: function onChange(_ref4, _ref5) {
       var values = _ref4.values;
       var setValue = _ref5.setValue;
-
       if (values.get("".concat(name)) !== '') {
         setValue("".concat(name), '');
       }
     }
   }];
 };
-
-export var MSSQL_FIELDS = function MSSQL_FIELDS(adapter, persistedObject, persistedPath, defaultAdapter) {
+var MSSQL_FIELDS = function MSSQL_FIELDS(adapter, persistedObject, persistedPath, defaultAdapter) {
   var trueIfAdapter = function trueIfAdapter(_ref6) {
     var values = _ref6.values;
     return values.get(adapter) === 'mssql';
   };
-
   var initialValues = generateInitialValues(persistedObject, persistedPath, defaultAdapter, 'mssql');
   return [{
     name: 'mssql_host',
@@ -144,7 +143,7 @@ export var MSSQL_FIELDS = function MSSQL_FIELDS(adapter, persistedObject, persis
     required: false,
     visible: trueIfAdapter,
     initialValue: initialValues('username', '')
-  }].concat(_toConsumableArray(generatePasswordFields('mssql', persistedObject, adapter, defaultAdapter, 'Password', 'password')), [{
+  }].concat((0, _toConsumableArray2["default"])(generatePasswordFields('mssql', persistedObject, adapter, defaultAdapter, 'Password', 'password')), [{
     name: 'mssql_windowsauthenabled',
     label: 'Use Windows Authentication (Kerberos)',
     type: 'select',
@@ -194,20 +193,19 @@ export var MSSQL_FIELDS = function MSSQL_FIELDS(adapter, persistedObject, persis
     required: false,
     visible: trueIfAdapter,
     initialValue: initialValues('sslcert', '')
-  }], _toConsumableArray(generatePasswordFields('mssql', persistedObject, adapter, defaultAdapter, 'Truststore Password', 'trustStorePassword', function (values) {
+  }], (0, _toConsumableArray2["default"])(generatePasswordFields('mssql', persistedObject, adapter, defaultAdapter, 'Truststore Password', 'trustStorePassword', function (values) {
     return values.get('mssql_sslrootcert', '') !== '';
-  })), _toConsumableArray(generatePasswordFields('mssql', persistedObject, adapter, defaultAdapter, 'Keystore Password', 'keyStoreSecret', function (values) {
+  })), (0, _toConsumableArray2["default"])(generatePasswordFields('mssql', persistedObject, adapter, defaultAdapter, 'Keystore Password', 'keyStoreSecret', function (values) {
     return values.get('mssql_sslcert', '') !== '';
   })));
 };
-export var ORACLE_FIELDS = function ORACLE_FIELDS(adapter, persistedObject, persistedPath, defaultAdapter) {
+exports.MSSQL_FIELDS = MSSQL_FIELDS;
+var ORACLE_FIELDS = function ORACLE_FIELDS(adapter, persistedObject, persistedPath, defaultAdapter) {
   var initialValues = generateInitialValues(persistedObject, persistedPath, defaultAdapter, 'oracle');
-
   var trueIfAdapter = function trueIfAdapter(_ref7) {
     var values = _ref7.values;
     return values.get(adapter) === 'oracle';
   };
-
   return [{
     name: 'oracle_host',
     label: 'Host',
@@ -236,7 +234,7 @@ export var ORACLE_FIELDS = function ORACLE_FIELDS(adapter, persistedObject, pers
     required: false,
     initialValue: initialValues('username', ''),
     visible: trueIfAdapter
-  }].concat(_toConsumableArray(generatePasswordFields('oracle', persistedObject, adapter, defaultAdapter)), [{
+  }].concat((0, _toConsumableArray2["default"])(generatePasswordFields('oracle', persistedObject, adapter, defaultAdapter)), [{
     name: 'oracle_sslEnabled',
     label: 'Enable SSL',
     type: 'select',
@@ -292,18 +290,18 @@ export var ORACLE_FIELDS = function ORACLE_FIELDS(adapter, persistedObject, pers
     required: false,
     visible: trueIfAdapter,
     initialValue: initialValues('clientCert', '')
-  }], _toConsumableArray(generatePasswordFields('oracle', persistedObject, adapter, defaultAdapter, 'Truststore Password', 'trustStorePassword', function (values) {
+  }], (0, _toConsumableArray2["default"])(generatePasswordFields('oracle', persistedObject, adapter, defaultAdapter, 'Truststore Password', 'trustStorePassword', function (values) {
     return values.get('oracle_serverCert', '') !== '';
-  })), _toConsumableArray(generatePasswordFields('oracle', persistedObject, adapter, defaultAdapter, 'Keystore Password', 'keyStorePassword', function (values) {
+  })), (0, _toConsumableArray2["default"])(generatePasswordFields('oracle', persistedObject, adapter, defaultAdapter, 'Keystore Password', 'keyStorePassword', function (values) {
     return values.get('oracle_clientCert', '') !== '';
   })));
 };
-export var POSTGRES_FIELDS = function POSTGRES_FIELDS(adapter, persistedObject, persistedPath, defaultAdapter) {
+exports.ORACLE_FIELDS = ORACLE_FIELDS;
+var POSTGRES_FIELDS = function POSTGRES_FIELDS(adapter, persistedObject, persistedPath, defaultAdapter) {
   var trueIfAdapter = function trueIfAdapter(_ref8) {
     var values = _ref8.values;
     return values.get(adapter) === 'postgres';
   };
-
   var initialValues = generateInitialValues(persistedObject, persistedPath, defaultAdapter, 'postgres');
   return [{
     name: 'postgres_host',
@@ -333,7 +331,7 @@ export var POSTGRES_FIELDS = function POSTGRES_FIELDS(adapter, persistedObject,
     required: false,
     visible: trueIfAdapter,
     initialValue: initialValues('username', '')
-  }].concat(_toConsumableArray(generatePasswordFields('postgres', persistedObject, adapter, defaultAdapter)), [{
+  }].concat((0, _toConsumableArray2["default"])(generatePasswordFields('postgres', persistedObject, adapter, defaultAdapter)), [{
     name: 'postgres_sslEnabled',
     label: 'Enable SSL',
     type: 'select',
@@ -394,26 +392,31 @@ export var POSTGRES_FIELDS = function POSTGRES_FIELDS(adapter, persistedObject,
     initialValue: initialValues('sslkey', '')
   }]);
 };
-export var adapterProperties = function adapterProperties(values, adapter) {
+exports.POSTGRES_FIELDS = POSTGRES_FIELDS;
+var adapterProperties = function adapterProperties(values, adapter) {
   var adapterPrefix = "".concat(adapter, "_");
-  return values // Remove the other adapters properties.
+  return values
+  // Remove the other adapters properties.
   .filter(function (_v, key) {
     return key.startsWith(adapterPrefix);
-  }) // Remove the adapter prefix from the property names.
+  })
+  // Remove the adapter prefix from the property names.
   .mapKeys(function (key) {
     return key.replace(adapterPrefix, '');
   }).toObject();
 };
-export var propertiesFromAdapters = function propertiesFromAdapters() {
-  var taskDbAdapters = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : List();
+exports.adapterProperties = adapterProperties;
+var propertiesFromAdapters = function propertiesFromAdapters() {
+  var taskDbAdapters = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : (0, _immutable.List)();
   var typeKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'type';
   return taskDbAdapters.flatMap(function (adapter) {
-    return adapter.get('properties', List()).map(function (property) {
+    return adapter.get('properties', (0, _immutable.List)()).map(function (property) {
       return property.set('type', adapter.get(typeKey));
     });
   });
 };
-export var propertiesFromValues = function propertiesFromValues(values) {
+exports.propertiesFromAdapters = propertiesFromAdapters;
+var propertiesFromValues = function propertiesFromValues(values) {
   var adapterType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'type';
   var prefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
   var adapterTypeName = formPropertyName(prefix, adapterType);
@@ -424,21 +427,20 @@ export var propertiesFromValues = function propertiesFromValues(values) {
     return name.replace("".concat(propertiesType, "_"), '');
   });
 };
-export var formPropertyName = function formPropertyName() {
+exports.propertiesFromValues = propertiesFromValues;
+var formPropertyName = function formPropertyName() {
   for (var _len = arguments.length, names = new Array(_len), _key = 0; _key < _len; _key++) {
     names[_key] = arguments[_key];
   }
-
   return names.filter(function (n) {
     return n !== '';
   }).join('_');
 };
-
+exports.formPropertyName = formPropertyName;
 var getPropertyValue = function getPropertyValue(property, adapter, adapterType) {
-  var defaultType = get(adapter, adapterType, null);
+  var defaultType = (0, _immutable.get)(adapter, adapterType, null);
   var type = property.get('type');
   var propertyValue = property.get('value', '') || '';
-
   if (defaultType && defaultType === type) {
     var defaultProperty = adapter.getIn(['properties', property.get('name')], null);
     return defaultProperty || propertyValue || '';
@@ -446,14 +448,13 @@ var getPropertyValue = function getPropertyValue(property, adapter, adapterType)
     return propertyValue;
   }
 };
-
-export var adapterPropertiesFields = function adapterPropertiesFields(_ref9) {
+var adapterPropertiesFields = function adapterPropertiesFields(_ref9) {
   var adapterProperties = _ref9.adapterProperties,
-      defaultAdapter = _ref9.defaultAdapter,
-      _ref9$prefix = _ref9.prefix,
-      prefix = _ref9$prefix === void 0 ? '' : _ref9$prefix,
-      _ref9$adapterType = _ref9.adapterType,
-      adapterType = _ref9$adapterType === void 0 ? 'type' : _ref9$adapterType;
+    defaultAdapter = _ref9.defaultAdapter,
+    _ref9$prefix = _ref9.prefix,
+    prefix = _ref9$prefix === void 0 ? '' : _ref9$prefix,
+    _ref9$adapterType = _ref9.adapterType,
+    adapterType = _ref9$adapterType === void 0 ? 'type' : _ref9$adapterType;
   return adapterProperties.map(function (property) {
     return {
       name: formPropertyName(prefix, 'properties', property.get('type'), property.get('name')),
@@ -473,4 +474,5 @@ export var adapterPropertiesFields = function adapterPropertiesFields(_ref9) {
       initialValue: getPropertyValue(property, defaultAdapter, adapterType)
     };
   });
-};
+};
+exports.adapterPropertiesFields = adapterPropertiesFields;

package/lib/components/system/helpers.test.js

@@ -1,7 +1,9 @@
-import { fromJS } from 'immutable';
-import { generateInitialValues } from './helpers';
+"use strict";
+
+var _immutable = require("immutable");
+var _helpers = require("./helpers");
 describe('#generateInitialValues', function () {
-  var defaultTaskAdapter = fromJS({
+  var defaultTaskAdapter = (0, _immutable.fromJS)({
     name: 'pg',
     type: 'postgres',
     properties: [{
@@ -12,7 +14,7 @@ describe('#generateInitialValues', function () {
       value: 'default-db-name'
     }]
   });
-  var tenantTaskAdapter = fromJS({
+  var tenantTaskAdapter = (0, _immutable.fromJS)({
     slug: 'acme',
     space: {},
     task: {
@@ -29,22 +31,24 @@ describe('#generateInitialValues', function () {
     test('happy path', function () {
       var persistedPath = [];
       var defaultAdapter = null;
-      var initialValues = generateInitialValues(defaultTaskAdapter, persistedPath, defaultAdapter, 'postgres'); // Expect the value from the persisted object.
-
-      expect(initialValues('host', 'default')).toBe('default-host-value'); // Expect the overall default value.
+      var initialValues = (0, _helpers.generateInitialValues)(defaultTaskAdapter, persistedPath, defaultAdapter, 'postgres');
 
+      // Expect the value from the persisted object.
+      expect(initialValues('host', 'default')).toBe('default-host-value');
+      // Expect the overall default value.
       expect(initialValues('port', '1234')).toBe('1234');
     });
   });
   describe('when used for tenant task adapter', function () {
     test('happy path', function () {
       var persistedPath = ['task', 'databaseAdapter'];
-      var initialValues = generateInitialValues(tenantTaskAdapter, persistedPath, defaultTaskAdapter, 'postgres'); // Expect the value from the persisted object.
-
-      expect(initialValues('host', 'default')).toBe('tenant-host-value'); // Expect the default task adapter's value.
-
-      expect(initialValues('database', 'invalid-db')).toBe('default-db-name'); // Expect the overall default value.
+      var initialValues = (0, _helpers.generateInitialValues)(tenantTaskAdapter, persistedPath, defaultTaskAdapter, 'postgres');
 
+      // Expect the value from the persisted object.
+      expect(initialValues('host', 'default')).toBe('tenant-host-value');
+      // Expect the default task adapter's value.
+      expect(initialValues('database', 'invalid-db')).toBe('default-db-name');
+      // Expect the overall default value.
       expect(initialValues('port', '1234')).toBe('1234');
     });
   });

package/lib/components/system/spaces/SystemSpaceForm.js

@@ -1,13 +1,18 @@
-import { fetchSpace, updateSpace } from '../../../apis';
-import { fromJS, get } from 'immutable';
-import { generateForm } from '../../form/Form';
-import { handleFormErrors } from '../../form/Form.helpers';
+"use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SystemSpaceForm = void 0;
+var _apis = require("../../../apis");
+var _immutable = require("immutable");
+var _Form = require("../../form/Form");
+var _Form2 = require("../../form/Form.helpers");
 var dataSources = function dataSources(_ref) {
   var slug = _ref.slug;
   return {
     space: {
-      fn: fetchSpace,
+      fn: _apis.fetchSpace,
       params: slug && [{
         slug: slug,
         include: 'details,allowedIps'
@@ -18,17 +23,15 @@ var dataSources = function dataSources(_ref) {
     }
   };
 };
-
 var handleSubmit = function handleSubmit(_ref2) {
   var slug = _ref2.slug;
   return function (values) {
-    return updateSpace({
+    return (0, _apis.updateSpace)({
       slug: slug,
       space: values
-    }).then(handleFormErrors('space', 'There was an error saving the Space.'));
+    }).then((0, _Form2.handleFormErrors)('space', 'There was an error saving the Space.'));
   };
 };
-
 var fields = function fields() {
   return function (_ref3) {
     var space = _ref3.space;
@@ -37,28 +40,26 @@ var fields = function fields() {
       label: 'Name',
       type: 'text',
       required: true,
-      initialValue: get(space, 'name', '') || ''
+      initialValue: (0, _immutable.get)(space, 'name', '') || ''
     }, {
       name: 'slug',
       label: 'Slug',
       type: 'text',
       required: false,
       enabled: false,
-      initialValue: get(space, 'slug', '') || ''
+      initialValue: (0, _immutable.get)(space, 'slug', '') || ''
     }, {
       name: 'sharedBundle',
       label: 'Use Shared Bundle base directory?',
       type: 'checkbox',
       "transient": true,
-      initialValue: (get(space, 'sharedBundleBase') || '') !== '',
+      initialValue: ((0, _immutable.get)(space, 'sharedBundleBase') || '') !== '',
       onChange: function onChange(_ref4, _ref5) {
         var values = _ref4.values;
         var setValue = _ref5.setValue;
-
         if (values.get('sharedBundleBase') !== '') {
           setValue('sharedBundleBase', '');
         }
-
         if (values.get('bundlePath') !== '') {
           setValue('bundlePath', '');
         }
@@ -67,7 +68,7 @@ var fields = function fields() {
       name: 'sharedBundleBase',
       label: 'Shared Bundle Base Directory',
       type: 'text',
-      initialValue: get(space, 'sharedBundleBase') || '',
+      initialValue: (0, _immutable.get)(space, 'sharedBundleBase') || '',
       helpText: 'Directory used as path prefix for bundles.',
       visible: function visible(_ref6) {
         var values = _ref6.values;
@@ -81,21 +82,21 @@ var fields = function fields() {
       name: 'bundlePath',
       label: 'Bundle Path',
       type: 'text',
-      initialValue: get(space, 'bundlePath') || '',
+      initialValue: (0, _immutable.get)(space, 'bundlePath') || '',
       visible: function visible(_ref8) {
         var values = _ref8.values;
-        return get(values, 'sharedBundle');
+        return (0, _immutable.get)(values, 'sharedBundle');
       },
       required: function required(_ref9) {
         var values = _ref9.values;
-        return get(values, 'sharedBundle');
+        return (0, _immutable.get)(values, 'sharedBundle');
       }
     }, {
       name: 'allowedIps',
       label: 'Allowed IPs',
       type: 'select',
       options: function options() {
-        return fromJS([{
+        return (0, _immutable.fromJS)([{
           name: 'description',
           label: 'Description',
           type: 'text'
@@ -109,7 +110,7 @@ var fields = function fields() {
         var values = _ref10.values;
         return values.get('allowedIpsEnabled', false);
       },
-      initialValue: get(space, 'allowedIps', []),
+      initialValue: (0, _immutable.get)(space, 'allowedIps', []),
       serialize: function serialize(_ref11) {
         var values = _ref11.values;
         return values.get('allowedIpsEnabled', false) ? values.get('allowedIps') : [];
@@ -118,14 +119,14 @@ var fields = function fields() {
       name: 'allowedIpsEnabled',
       label: 'Enabled Allowed IP Restrictions?',
       type: 'checkbox',
-      initialValue: get(space, 'allowedIpsEnabled', false) || false
+      initialValue: (0, _immutable.get)(space, 'allowedIpsEnabled', false) || false
     }];
   };
 };
-
-export var SystemSpaceForm = generateForm({
+var SystemSpaceForm = (0, _Form.generateForm)({
   formOptions: ['slug'],
   dataSources: dataSources,
   fields: fields,
   handleSubmit: handleSubmit
-});
+});
+exports.SystemSpaceForm = SystemSpaceForm;