@kineticdata/react 5.1.2 → 6.0.1

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;

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

@@ -1,18 +1,26 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { get, getIn } from 'immutable';
-import { generateForm } from '../../form/Form';
-import { createTenant, fetchSystemDefaultTaskDbAdapter, fetchTenant, updateTenant } from '../../../apis';
-import { slugify } from '../../../helpers';
-import { VALIDATE_DB_ADAPTERS, ORACLE_FIELDS, MSSQL_FIELDS, POSTGRES_FIELDS, adapterProperties } from '../helpers';
-import { handleFormErrors } from '../../form/Form.helpers';
-var TENANT_INCLUDES = 'details';
+"use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SystemTenantForm = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
+var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
+var _immutable = require("immutable");
+var _Form = require("../../form/Form");
+var _apis = require("../../../apis");
+var _helpers = require("../../../helpers");
+var _helpers2 = require("../helpers");
+var _Form2 = require("../../form/Form.helpers");
+var TENANT_INCLUDES = 'details';
 var dataSources = function dataSources(_ref) {
   var slug = _ref.slug;
   return {
     tenant: {
-      fn: fetchTenant,
+      fn: _apis.fetchTenant,
       params: slug && [{
         slug: slug,
         include: TENANT_INCLUDES
@@ -22,18 +30,29 @@ var dataSources = function dataSources(_ref) {
       }
     },
     defaultTaskDbAdapter: {
-      fn: fetchSystemDefaultTaskDbAdapter,
+      fn: _apis.fetchSystemDefaultTaskDbAdapter,
       params: [],
       transform: function transform(result) {
         return result.adapter;
       }
+    },
+    fileFields: {
+      fn: function fn() {
+        return {
+          mssql: ['sslrootcert', 'sslcert'],
+          oracle: ['serverCert', 'clientCert'],
+          postgres: ['sslrootcert', 'sslcert', 'sslkey']
+        };
+      },
+      params: []
     }
   };
 };
-
 var handleSubmit = function handleSubmit(_ref2) {
   var slug = _ref2.slug;
-  return function (values) {
+  return function (values, _ref3) {
+    var fileFields = _ref3.fileFields,
+      rawValues = _ref3.values;
     var authenticationSecret = values.get('authenticationSecret') ? {
       authenticationSecret: values.get('authenticationSecret')
     } : {};
@@ -43,52 +62,76 @@ var handleSubmit = function handleSubmit(_ref2) {
         replicas: parseInt(values.get('replicas'))
       }
     } : {};
-
-    var tenant = _objectSpread(_objectSpread({}, authenticationSecret), {}, {
+    var type = values.get('task_databaseAdapter_type');
+    var fileFieldsForType = fileFields.get(type);
+    // Only include values for file fields if the toggle field is true
+    var filterFn = function filterFn(value, key) {
+      return !fileFieldsForType.includes(key) || !!rawValues.get("".concat(type, "_change_").concat(key));
+    };
+    // Get adapter properties to save
+    var properties = (0, _helpers2.adapterProperties)(values, type, filterFn);
+    // If creating new, pass in file values from default adapter if not uploaded
+    if (!slug) {
+      properties = fileFieldsForType.reduce(function (props, field) {
+        if (typeof props[field] === 'undefined' && !!rawValues.getIn(["".concat(type, "_current_").concat(field), 'pem'])) {
+          return (0, _objectSpread3["default"])((0, _objectSpread3["default"])({}, props), {}, (0, _defineProperty2["default"])({}, field, new File([rawValues.getIn(["".concat(type, "_current_").concat(field), 'pem'])], "".concat(field, ".crt"), {
+            type: 'text/plain'
+          })));
+        }
+        return props;
+      }, properties);
+    }
+    var tenant = (0, _objectSpread3["default"])((0, _objectSpread3["default"])({}, authenticationSecret), {}, {
       space: {
         slug: values.get('slug'),
         name: values.get('name')
       },
-      task: _objectSpread(_objectSpread({
+      task: (0, _objectSpread3["default"])((0, _objectSpread3["default"])({
         autoCreateDatabase: values.get('task_autoCreateDatabase') ? 'true' : 'false'
       }, deployment), {}, {
         databaseAdapter: {
-          type: values.get('task_databaseAdapter_type'),
-          properties: adapterProperties(values, values.get('task_databaseAdapter_type'))
+          type: type,
+          properties: properties
         }
       }),
       users: values.get('users')
     });
-
-    return slug ? updateTenant({
+    var multipart = Object.entries(tenant.task.databaseAdapter.properties).some(function (_ref4) {
+      var _ref5 = (0, _slicedToArray2["default"])(_ref4, 2),
+        name = _ref5[0],
+        value = _ref5[1];
+      return value instanceof File;
+    });
+    return slug ? (0, _apis.updateTenant)({
       slug: slug,
-      tenant: tenant
-    }).then(handleFormErrors('space', 'There was an error saving the Space.')) : createTenant({
-      tenant: tenant
-    }).then(handleFormErrors(null, 'There was an error saving the Space.'));
+      tenant: tenant,
+      multipart: multipart
+    }).then((0, _Form2.handleFormErrors)('space', 'There was an error saving the Space.')) : (0, _apis.createTenant)({
+      tenant: tenant,
+      multipart: multipart
+    }).then((0, _Form2.handleFormErrors)(null, 'There was an error saving the Space.'));
   };
 };
-
 var getSpaceValue = function getSpaceValue(tenant, key) {
-  return tenant ? getIn(tenant, ['space', key], '') : '';
+  return tenant ? (0, _immutable.getIn)(tenant, ['space', key], '') : '';
 };
-
-var fields = function fields(_ref3) {
-  var slug = _ref3.slug;
-  return function (_ref4) {
-    var tenant = _ref4.tenant,
-        defaultTaskDbAdapter = _ref4.defaultTaskDbAdapter;
-    return (tenant || !slug) && (defaultTaskDbAdapter || defaultTaskDbAdapter === null) && [// Top-level fields
+var fields = function fields(_ref6) {
+  var slug = _ref6.slug;
+  return function (_ref7) {
+    var tenant = _ref7.tenant,
+      defaultTaskDbAdapter = _ref7.defaultTaskDbAdapter;
+    return (tenant || !slug) && (defaultTaskDbAdapter || defaultTaskDbAdapter === null) && [
+    // Top-level fields
     {
       name: 'authenticationSecret',
       label: 'Authentication Secret',
       type: 'password',
-      visible: function visible(_ref5) {
-        var values = _ref5.values;
+      visible: function visible(_ref8) {
+        var values = _ref8.values;
         return values.get('changeAuthenticationSecret');
       },
-      "transient": function transient(_ref6) {
-        var values = _ref6.values;
+      "transient": function transient(_ref9) {
+        var values = _ref9.values;
         return !values.get('changeAuthenticationSecret');
       },
       required: false
@@ -98,26 +141,25 @@ var fields = function fields(_ref3) {
       type: 'checkbox',
       "transient": true,
       initialValue: false,
-      onChange: function onChange(_ref7, _ref8) {
-        var values = _ref7.values;
-        var setValue = _ref8.setValue;
-
+      onChange: function onChange(_ref10, _ref11) {
+        var values = _ref10.values;
+        var setValue = _ref11.setValue;
         if (values.get('authenticationSecret') !== '') {
           setValue('authenticationSecret', '');
         }
       }
-    }, // Start - Space Fields
+    },
+    // Start - Space Fields
     {
       name: 'name',
       label: 'Name',
       type: 'text',
       required: true,
-      onChange: function onChange(_ref9, _ref10) {
-        var values = _ref9.values;
-        var setValue = _ref10.setValue;
-
+      onChange: function onChange(_ref12, _ref13) {
+        var values = _ref12.values;
+        var setValue = _ref13.setValue;
         if (values.get('linked')) {
-          setValue('slug', slugify(values.get('name')), false);
+          setValue('slug', (0, _helpers.slugify)(values.get('name')), false);
         }
       },
       initialValue: getSpaceValue(tenant, 'name')
@@ -127,8 +169,8 @@ var fields = function fields(_ref3) {
       type: 'text',
       required: true,
       enabled: !slug,
-      onChange: function onChange(_bindings, _ref11) {
-        var setValue = _ref11.setValue;
+      onChange: function onChange(_bindings, _ref14) {
+        var setValue = _ref14.setValue;
         setValue('linked', false);
       },
       initialValue: getSpaceValue(tenant, 'slug')
@@ -139,44 +181,46 @@ var fields = function fields(_ref3) {
       "transient": true,
       initialValue: !tenant,
       visible: false
-    }, // End - Space Fields
+    },
+    // End - Space Fields
+
     // Start - Task fields
     {
       name: 'replicas',
       label: 'Task Replica Count',
       type: 'text',
       required: !!slug,
-      initialValue: getIn(tenant, ['task', 'deployment', 'replicas'], 1) // pattern: /^\d+$/,
+      initialValue: (0, _immutable.getIn)(tenant, ['task', 'deployment', 'specReplicas'], 1)
+      // pattern: /^\d+$/,
       // patternMessage:
       //   'You must provide a number of replicas desired.',
-
     }, {
       name: 'image',
       label: 'Task Image',
       type: 'text',
       required: !!slug,
-      initialValue: getIn(tenant, ['task', 'deployment', 'image'])
+      initialValue: (0, _immutable.getIn)(tenant, ['task', 'deployment', 'image'])
     }, {
       name: 'task_databaseAdapter_type',
       label: 'Task Adapter',
       required: true,
       type: 'select',
-      options: VALIDATE_DB_ADAPTERS,
-      initialValue: getIn(tenant, ['task', 'databaseAdapter', 'type'], get(defaultTaskDbAdapter, 'type', ''))
+      options: _helpers2.VALIDATE_DB_ADAPTERS,
+      initialValue: (0, _immutable.getIn)(tenant, ['task', 'databaseAdapter', 'type'], (0, _immutable.get)(defaultTaskDbAdapter, 'type', ''))
     }, {
       name: 'task_autoCreateDatabase',
       label: 'Auto-Create Database',
       type: 'checkbox',
-      visible: function visible(_ref12) {
-        var values = _ref12.values;
+      visible: function visible(_ref15) {
+        var values = _ref15.values;
         return values.get('task_databaseAdapter_type') === 'postgres';
       },
-      "transient": function transient(_ref13) {
-        var values = _ref13.values;
+      "transient": function transient(_ref16) {
+        var values = _ref16.values;
         return values.get('task_databaseAdapter_type') !== 'postgres';
       },
-      initialValue: slug ? get(tenant, ['task', 'autoCreateDatabase'], true) : true
-    }].concat(_toConsumableArray(MSSQL_FIELDS('task_databaseAdapter_type', tenant, ['task', 'databaseAdapter'], defaultTaskDbAdapter)), _toConsumableArray(ORACLE_FIELDS('task_databaseAdapter_type', tenant, ['task', 'databaseAdapter'], defaultTaskDbAdapter)), _toConsumableArray(POSTGRES_FIELDS('task_databaseAdapter_type', tenant, ['task', 'databaseAdapter'], defaultTaskDbAdapter)), _toConsumableArray(slug ? [] : [{
+      initialValue: slug ? (0, _immutable.get)(tenant, ['task', 'autoCreateDatabase'], true) : true
+    }].concat((0, _toConsumableArray2["default"])((0, _helpers2.MSSQL_FIELDS)('task_databaseAdapter_type', tenant, ['task', 'databaseAdapter'], defaultTaskDbAdapter)), (0, _toConsumableArray2["default"])((0, _helpers2.ORACLE_FIELDS)('task_databaseAdapter_type', tenant, ['task', 'databaseAdapter'], defaultTaskDbAdapter)), (0, _toConsumableArray2["default"])((0, _helpers2.POSTGRES_FIELDS)('task_databaseAdapter_type', tenant, ['task', 'databaseAdapter'], defaultTaskDbAdapter)), (0, _toConsumableArray2["default"])(slug ? [] : [{
       name: 'username',
       label: 'Username',
       type: 'text',
@@ -219,8 +263,8 @@ var fields = function fields(_ref3) {
       required: true,
       enabled: true,
       visible: true,
-      constraint: function constraint(_ref14) {
-        var values = _ref14.values;
+      constraint: function constraint(_ref17) {
+        var values = _ref17.values;
         return values.get('passwordConfirmation') === values.get('password');
       },
       constraintMessage: 'Password Confirmation does not match'
@@ -230,8 +274,8 @@ var fields = function fields(_ref3) {
       type: null,
       visible: false,
       required: false,
-      serialize: function serialize(_ref15) {
-        var values = _ref15.values;
+      serialize: function serialize(_ref18) {
+        var values = _ref18.values;
         return [{
           username: values.get('username'),
           password: values.get('password'),
@@ -242,10 +286,10 @@ var fields = function fields(_ref3) {
     }]));
   };
 };
-
-export var SystemTenantForm = generateForm({
+var SystemTenantForm = (0, _Form.generateForm)({
   formOptions: ['slug'],
   dataSources: dataSources,
   fields: fields,
   handleSubmit: handleSubmit
-});
+});
+exports.SystemTenantForm = SystemTenantForm;

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

@@ -1,11 +1,16 @@
-import { generateTable } from '../../table/Table';
-import { fetchTenants } from '../../../apis';
-import { defineFilter } from '../../../helpers';
-var clientSide = defineFilter(true).startsWith('slug', 'slug').startsWith('space.name', 'space.name').end();
+"use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SystemTenantTable = void 0;
+var _Table = require("../../table/Table");
+var _apis = require("../../../apis");
+var _helpers = require("../../../helpers");
+var clientSide = (0, _helpers.defineFilter)(true).startsWith('slug', 'slug').startsWith('space.name', 'space.name').end();
 var dataSource = function dataSource() {
   return {
-    fn: fetchTenants,
+    fn: _apis.fetchTenants,
     clientSide: clientSide,
     params: function params() {
       return [];
@@ -18,7 +23,6 @@ var dataSource = function dataSource() {
     }
   };
 };
-
 var filters = function filters() {
   return function () {
     return [{
@@ -32,7 +36,6 @@ var filters = function filters() {
     }];
   };
 };
-
 var columns = [{
   value: 'slug',
   title: 'Slug',
@@ -213,9 +216,10 @@ var columns = [{
     return row.getIn(['space', 'trustedResourceDomains']);
   }
 }];
-export var SystemTenantTable = generateTable({
+var SystemTenantTable = (0, _Table.generateTable)({
   columns: columns,
   filters: filters,
   dataSource: dataSource
 });
+exports.SystemTenantTable = SystemTenantTable;
 SystemTenantTable.displayName = 'SystemTenantTable';