@kineticdata/react 6.0.0 → 6.0.1

package/lib/components/system/helpers.js

@@ -36,7 +36,7 @@ var generateInitialValues = function generateInitialValues(persistedObject, pers
         var property = properties.find(function (p) {
           return p.get('name') === key;
         });
-        return property ? property.get('value') : defaultObjectValue;
+        return property ? property.get('certificate') || property.get('value') : defaultObjectValue;
       } else {
         return (0, _immutable.get)(properties, key, defaultObjectValue);
       }
@@ -44,7 +44,7 @@ var generateInitialValues = function generateInitialValues(persistedObject, pers
       var adapterProperty = (0, _immutable.get)(defaultObject, 'properties', (0, _immutable.List)()).find(function (property) {
         return property.get('name') === key;
       });
-      return (0, _immutable.get)(adapterProperty, 'value', defaultObjectValue);
+      return (0, _immutable.get)(adapterProperty, 'certificate', (0, _immutable.get)(adapterProperty, 'value', defaultObjectValue));
     }
     return initialValue;
   };
@@ -76,7 +76,7 @@ var generatePasswordFields = function generatePasswordFields(adapterName, persis
   return [{
     name: name,
     label: label,
-    type: 'password',
+    type: 'secret',
     "transient": function transient(_ref2) {
       var values = _ref2.values;
       return persistedObject ? !values.get("".concat(name, "Change")) : values.get(name) === '';
@@ -89,7 +89,7 @@ var generatePasswordFields = function generatePasswordFields(adapterName, persis
   }, {
     name: "".concat(name, "Change"),
     label: "Change ".concat(label),
-    type: 'checkbox',
+    type: 'toggle',
     visible: !!persistedObject,
     initialValue: !persistedObject,
     "transient": true,
@@ -173,26 +173,75 @@ var MSSQL_FIELDS = function MSSQL_FIELDS(adapter, persistedObject, persistedPath
     initialValue: initialValues('sslEnabled', 'false')
   }, {
     name: 'mssql_sslProtocol',
-    description: 'Protocol to use with SSL encryption',
+    helpText: 'Protocol to use with SSL encryption',
     label: 'SSL Protocol',
     type: 'text',
-    required: false,
+    required: function required(_ref7) {
+      var values = _ref7.values;
+      return values.get('mssql_sslEnabled') === 'true';
+    },
     visible: trueIfAdapter,
     initialValue: initialValues('sslProtocol', 'TLSv1.2')
+  }, {
+    name: 'mssql_current_sslrootcert',
+    label: 'Root Certificate',
+    type: 'certificate',
+    "transient": true,
+    required: function required(_ref8) {
+      var values = _ref8.values;
+      return !values.get('mssql_change_sslrootcert') && values.get('mssql_sslEnabled') === 'true';
+    },
+    visible: trueIfAdapter,
+    initialValue: initialValues('sslrootcert', {})
   }, {
     name: 'mssql_sslrootcert',
     label: 'Root Certificate',
-    type: 'text-area',
+    type: 'file',
+    required: function required(_ref9) {
+      var values = _ref9.values;
+      return !!values.get('mssql_change_sslrootcert') && values.get('mssql_sslEnabled') === 'true';
+    },
+    visible: trueIfAdapter
+  }, {
+    name: 'mssql_change_sslrootcert',
+    label: 'Change Root Certificate',
+    type: 'toggle',
+    "transient": true,
+    initialValue: false,
+    onChange: function onChange(_ref10, _ref11) {
+      var values = _ref10.values;
+      var setValue = _ref11.setValue;
+      if (!_immutable.List.isList(values.get('mssql_sslrootcert')) || values.get('mssql_sslrootcert').size > 0) {
+        setValue('mssql_sslrootcert', (0, _immutable.List)());
+      }
+    }
+  }, {
+    name: 'mssql_current_sslcert',
+    label: 'Client Certificate',
+    type: 'certificate',
+    "transient": true,
     required: false,
     visible: trueIfAdapter,
-    initialValue: initialValues('sslrootcert', '')
+    initialValue: initialValues('sslcert', '')
   }, {
     name: 'mssql_sslcert',
     label: 'Client Certificate',
-    type: 'text-area',
+    type: 'file',
     required: false,
-    visible: trueIfAdapter,
-    initialValue: initialValues('sslcert', '')
+    visible: trueIfAdapter
+  }, {
+    name: 'mssql_change_sslcert',
+    label: 'Change Client Certificate',
+    type: 'toggle',
+    "transient": true,
+    initialValue: false,
+    onChange: function onChange(_ref12, _ref13) {
+      var values = _ref12.values;
+      var setValue = _ref13.setValue;
+      if (!_immutable.List.isList(values.get('mssql_sslcert')) || values.get('mssql_sslcert').size > 0) {
+        setValue('mssql_sslcert', (0, _immutable.List)());
+      }
+    }
   }], (0, _toConsumableArray2["default"])(generatePasswordFields('mssql', persistedObject, adapter, defaultAdapter, 'Truststore Password', 'trustStorePassword', function (values) {
     return values.get('mssql_sslrootcert', '') !== '';
   })), (0, _toConsumableArray2["default"])(generatePasswordFields('mssql', persistedObject, adapter, defaultAdapter, 'Keystore Password', 'keyStoreSecret', function (values) {
@@ -202,8 +251,8 @@ var MSSQL_FIELDS = function MSSQL_FIELDS(adapter, persistedObject, persistedPath
 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;
+  var trueIfAdapter = function trueIfAdapter(_ref14) {
+    var values = _ref14.values;
     return values.get(adapter) === 'oracle';
   };
   return [{
@@ -252,14 +301,20 @@ var ORACLE_FIELDS = function ORACLE_FIELDS(adapter, persistedObject, persistedPa
     name: 'oracle_sslVersion',
     label: 'TLS Version',
     type: 'text',
-    required: false,
+    required: function required(_ref15) {
+      var values = _ref15.values;
+      return values.get('oracle_sslEnabled') === 'true';
+    },
     visible: trueIfAdapter,
     initialValue: initialValues('sslVersion', '1.2')
   }, {
     name: 'oracle_sslServerDnMatch',
     label: 'Server DN Match',
     type: 'select',
-    required: false,
+    required: function required(_ref16) {
+      var values = _ref16.values;
+      return values.get('oracle_sslEnabled') === 'true';
+    },
     visible: trueIfAdapter,
     options: [{
       label: 'True',
@@ -277,19 +332,65 @@ var ORACLE_FIELDS = function ORACLE_FIELDS(adapter, persistedObject, persistedPa
     visible: trueIfAdapter,
     initialValue: initialValues('ciphersuites', '')
   }, {
-    name: 'oracle_serverCert',
+    name: 'oracle_current_serverCert',
     label: 'Server Certificate',
-    type: 'text-area',
-    required: false,
+    type: 'certificate',
+    "transient": true,
+    required: function required(_ref17) {
+      var values = _ref17.values;
+      return !values.get('oracle_change_serverCert') && values.get('oracle_sslEnabled') === 'true';
+    },
     visible: trueIfAdapter,
     initialValue: initialValues('serverCert', '')
   }, {
-    name: 'oracle_clientCert',
+    name: 'oracle_serverCert',
+    label: 'Server Certificate',
+    type: 'file',
+    required: function required(_ref18) {
+      var values = _ref18.values;
+      return !!values.get('oracle_change_serverCert') && values.get('oracle_sslEnabled') === 'true';
+    },
+    visible: trueIfAdapter
+  }, {
+    name: 'oracle_change_serverCert',
+    label: 'Change Server Certificate',
+    type: 'toggle',
+    "transient": true,
+    initialValue: false,
+    onChange: function onChange(_ref19, _ref20) {
+      var values = _ref19.values;
+      var setValue = _ref20.setValue;
+      if (!_immutable.List.isList(values.get('oracle_serverCert')) || values.get('oracle_serverCert').size > 0) {
+        setValue('oracle_serverCert', (0, _immutable.List)());
+      }
+    }
+  }, {
+    name: 'oracle_current_clientCert',
     label: 'Client Certificate',
-    type: 'text-area',
+    type: 'certificate',
+    "transient": true,
     required: false,
     visible: trueIfAdapter,
     initialValue: initialValues('clientCert', '')
+  }, {
+    name: 'oracle_clientCert',
+    label: 'Client Certificate',
+    type: 'file',
+    required: false,
+    visible: trueIfAdapter
+  }, {
+    name: 'oracle_change_clientCert',
+    label: 'Change Client Certificate',
+    type: 'toggle',
+    "transient": true,
+    initialValue: false,
+    onChange: function onChange(_ref21, _ref22) {
+      var values = _ref21.values;
+      var setValue = _ref22.setValue;
+      if (!_immutable.List.isList(values.get('oracle_clientCert')) || values.get('oracle_clientCert').size > 0) {
+        setValue('oracle_clientCert', (0, _immutable.List)());
+      }
+    }
   }], (0, _toConsumableArray2["default"])(generatePasswordFields('oracle', persistedObject, adapter, defaultAdapter, 'Truststore Password', 'trustStorePassword', function (values) {
     return values.get('oracle_serverCert', '') !== '';
   })), (0, _toConsumableArray2["default"])(generatePasswordFields('oracle', persistedObject, adapter, defaultAdapter, 'Keystore Password', 'keyStorePassword', function (values) {
@@ -298,8 +399,8 @@ var ORACLE_FIELDS = function ORACLE_FIELDS(adapter, persistedObject, persistedPa
 };
 exports.ORACLE_FIELDS = ORACLE_FIELDS;
 var POSTGRES_FIELDS = function POSTGRES_FIELDS(adapter, persistedObject, persistedPath, defaultAdapter) {
-  var trueIfAdapter = function trueIfAdapter(_ref8) {
-    var values = _ref8.values;
+  var trueIfAdapter = function trueIfAdapter(_ref23) {
+    var values = _ref23.values;
     return values.get(adapter) === 'postgres';
   };
   var initialValues = generateInitialValues(persistedObject, persistedPath, defaultAdapter, 'postgres');
@@ -349,7 +450,10 @@ var POSTGRES_FIELDS = function POSTGRES_FIELDS(adapter, persistedObject, persist
     name: 'postgres_sslmode',
     label: 'SSL Mode',
     type: 'select',
-    required: false,
+    required: function required(_ref24) {
+      var values = _ref24.values;
+      return values.get('postgres_sslEnabled') === 'true';
+    },
     visible: trueIfAdapter,
     options: [{
       label: 'Disable',
@@ -368,32 +472,102 @@ var POSTGRES_FIELDS = function POSTGRES_FIELDS(adapter, persistedObject, persist
       value: 'verify-full'
     }],
     initialValue: initialValues('sslmode', 'disable')
+  }, {
+    name: 'postgres_current_sslrootcert',
+    helpText: 'x509 certificate (PEM format) used for server authentication',
+    label: 'Root Certificate',
+    type: 'certificate',
+    "transient": true,
+    required: function required(_ref25) {
+      var values = _ref25.values;
+      return !values.get('postgres_change_sslrootcert') && values.get('postgres_sslEnabled') === 'true' && values.get('postgres_sslmode') !== 'disable';
+    },
+    visible: trueIfAdapter,
+    initialValue: initialValues('sslrootcert', {})
   }, {
     name: 'postgres_sslrootcert',
-    description: 'x509 certificate (PEM format) used for server authentication',
+    helpText: 'x509 certificate (PEM format) used for server authentication',
     label: 'Root Certificate',
-    type: 'text-area',
+    type: 'file',
+    required: function required(_ref26) {
+      var values = _ref26.values;
+      return !!values.get('postgres_change_sslrootcert') && values.get('postgres_sslEnabled') === 'true' && values.get('postgres_sslmode') !== 'disable';
+    },
+    visible: trueIfAdapter
+  }, {
+    name: 'postgres_change_sslrootcert',
+    label: 'Change Root Certificate',
+    type: 'toggle',
+    "transient": true,
+    initialValue: false,
+    onChange: function onChange(_ref27, _ref28) {
+      var values = _ref27.values;
+      var setValue = _ref28.setValue;
+      if (!_immutable.List.isList(values.get('postgres_sslrootcert')) || values.get('postgres_sslrootcert').size > 0) {
+        setValue('postgres_sslrootcert', (0, _immutable.List)());
+      }
+    }
+  }, {
+    name: 'postgres_current_sslcert',
+    label: 'Client Certificate',
+    type: 'certificate',
+    "transient": true,
     required: false,
     visible: trueIfAdapter,
-    initialValue: initialValues('sslrootcert', '')
+    initialValue: initialValues('sslcert', '')
   }, {
     name: 'postgres_sslcert',
     label: 'Client Certificate',
-    type: 'text-area',
+    type: 'file',
     required: false,
-    visible: trueIfAdapter,
-    initialValue: initialValues('sslcert', '')
+    visible: trueIfAdapter
+  }, {
+    name: 'postgres_change_sslcert',
+    label: 'Change Client Certificate',
+    type: 'toggle',
+    "transient": true,
+    initialValue: false,
+    onChange: function onChange(_ref29, _ref30) {
+      var values = _ref29.values;
+      var setValue = _ref30.setValue;
+      if (!_immutable.List.isList(values.get('postgres_sslcert')) || values.get('postgres_sslcert').size > 0) {
+        setValue('postgres_sslcert', (0, _immutable.List)());
+      }
+    }
+  }, {
+    name: 'postgres_current_sslkey',
+    label: 'Client Key',
+    type: 'secret',
+    "transient": true,
+    required: false,
+    visible: false,
+    initialValue: ''
   }, {
     name: 'postgres_sslkey',
     label: 'Client Key',
-    type: 'text-area',
+    type: 'file',
     required: false,
-    visible: trueIfAdapter,
-    initialValue: initialValues('sslkey', '')
+    visible: trueIfAdapter
+  }, {
+    name: 'postgres_change_sslkey',
+    label: 'Change Private Key',
+    type: 'toggle',
+    "transient": true,
+    initialValue: false,
+    onChange: function onChange(_ref31, _ref32) {
+      var values = _ref31.values;
+      var setValue = _ref32.setValue;
+      if (!_immutable.List.isList(values.get('postgres_sslkey')) || values.get('postgres_sslkey').size > 0) {
+        setValue('postgres_sslkey', (0, _immutable.List)());
+      }
+    }
   }]);
 };
 exports.POSTGRES_FIELDS = POSTGRES_FIELDS;
 var adapterProperties = function adapterProperties(values, adapter) {
+  var filterFn = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function (o) {
+    return o;
+  };
   var adapterPrefix = "".concat(adapter, "_");
   return values
   // Remove the other adapters properties.
@@ -403,7 +577,14 @@ var adapterProperties = function adapterProperties(values, adapter) {
   // Remove the adapter prefix from the property names.
   .mapKeys(function (key) {
     return key.replace(adapterPrefix, '');
-  }).toObject();
+  })
+  // Map values that are Lists to their first entry (used for File fields)
+  .map(function (value) {
+    return _immutable.List.isList(value) ? value.get(0) || '' : value;
+  })
+  // Call the provided filter function in case we need to filter out values,
+  // such as for hidden file fields
+  .filter(filterFn).toObject();
 };
 exports.adapterProperties = adapterProperties;
 var propertiesFromAdapters = function propertiesFromAdapters() {
@@ -448,26 +629,26 @@ var getPropertyValue = function getPropertyValue(property, adapter, adapterType)
     return propertyValue;
   }
 };
-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;
+var adapterPropertiesFields = function adapterPropertiesFields(_ref33) {
+  var adapterProperties = _ref33.adapterProperties,
+    defaultAdapter = _ref33.defaultAdapter,
+    _ref33$prefix = _ref33.prefix,
+    prefix = _ref33$prefix === void 0 ? '' : _ref33$prefix,
+    _ref33$adapterType = _ref33.adapterType,
+    adapterType = _ref33$adapterType === void 0 ? 'type' : _ref33$adapterType;
   return adapterProperties.map(function (property) {
     return {
       name: formPropertyName(prefix, 'properties', property.get('type'), property.get('name')),
       label: property.get('label') || property.get('name'),
-      visible: function visible(_ref10) {
-        var values = _ref10.values;
+      visible: function visible(_ref34) {
+        var values = _ref34.values;
         return values.get(formPropertyName(prefix, adapterType)) === property.get('type');
       },
       type: property.get('sensitive') ? 'password' : property.has('options') ? 'select' : 'text',
-      placeholder: property.get('sensitive') && defaultAdapter.get('adapterClass') === property.get('type') ? '•••••••' : undefined,
+      placeholder: property.get('sensitive') && defaultAdapter && defaultAdapter.get('adapterClass') === property.get('type') ? '•••••••' : undefined,
       helpText: property.get('description'),
-      required: function required(_ref11) {
-        var values = _ref11.values;
+      required: function required(_ref35) {
+        var values = _ref35.values;
         return values.get(formPropertyName(prefix, adapterType)) === property.get('type') && property.get('required', false);
       },
       options: property.get('options', undefined),

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

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SystemTenantForm = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
+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");
@@ -33,12 +35,24 @@ var dataSources = function dataSources(_ref) {
       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')
     } : {};
@@ -48,49 +62,76 @@ var handleSubmit = function handleSubmit(_ref2) {
         replicas: parseInt(values.get('replicas'))
       }
     } : {};
-    var tenant = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, 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: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({
+      task: (0, _objectSpread3["default"])((0, _objectSpread3["default"])({
         autoCreateDatabase: values.get('task_autoCreateDatabase') ? 'true' : 'false'
       }, deployment), {}, {
         databaseAdapter: {
-          type: values.get('task_databaseAdapter_type'),
-          properties: (0, _helpers2.adapterProperties)(values, values.get('task_databaseAdapter_type'))
+          type: type,
+          properties: properties
         }
       }),
       users: values.get('users')
     });
+    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
+      tenant: tenant,
+      multipart: multipart
     }).then((0, _Form2.handleFormErrors)('space', 'There was an error saving the Space.')) : (0, _apis.createTenant)({
-      tenant: tenant
+      tenant: tenant,
+      multipart: multipart
     }).then((0, _Form2.handleFormErrors)(null, 'There was an error saving the Space.'));
   };
 };
 var getSpaceValue = function getSpaceValue(tenant, 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;
+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
@@ -100,9 +141,9 @@ 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', '');
         }
@@ -114,9 +155,9 @@ var fields = function fields(_ref3) {
       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', (0, _helpers.slugify)(values.get('name')), false);
         }
@@ -128,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')
@@ -149,7 +190,7 @@ var fields = function fields(_ref3) {
       label: 'Task Replica Count',
       type: 'text',
       required: !!slug,
-      initialValue: (0, _immutable.getIn)(tenant, ['task', 'deployment', 'replicas'], 1)
+      initialValue: (0, _immutable.getIn)(tenant, ['task', 'deployment', 'specReplicas'], 1)
       // pattern: /^\d+$/,
       // patternMessage:
       //   'You must provide a number of replicas desired.',
@@ -170,12 +211,12 @@ var fields = function fields(_ref3) {
       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 ? (0, _immutable.get)(tenant, ['task', 'autoCreateDatabase'], true) : true
@@ -222,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'
@@ -233,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'),