@kineticdata/react 6.0.4 → 6.1.0

package/lib/components/system/helpers.js

@@ -51,7 +51,8 @@ var generateInitialValues = exports.generateInitialValues = function generateIni
 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 buildFieldName = arguments.length > 6 ? arguments[6] : undefined;
+  var additionalValidation = arguments.length > 7 ? arguments[7] : undefined;
   var required = function required(_ref) {
     var values = _ref.values;
     var currentAdapterName = values.get(currentAdapter);
@@ -70,7 +71,7 @@ var generatePasswordFields = function generatePasswordFields(adapterName, persis
     }
     return false;
   };
-  var name = "".concat(adapterName, "_").concat(fieldName);
+  var name = typeof buildFieldName === 'function' ? buildFieldName(fieldName) : "".concat(adapterName, "_").concat(fieldName);
   return [{
     name: name,
     label: label,
@@ -101,48 +102,51 @@ var generatePasswordFields = function generatePasswordFields(adapterName, persis
   }];
 };
 var MSSQL_FIELDS = exports.MSSQL_FIELDS = function MSSQL_FIELDS(adapter, persistedObject, persistedPath, defaultAdapter) {
+  var buildName = function buildName(property) {
+    return "".concat(persistedPath[0] ? persistedPath[0] + '_' : '', "mssql_").concat(property);
+  };
   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',
+    name: buildName('host'),
     label: 'Host',
     type: 'text',
     required: trueIfAdapter,
     visible: trueIfAdapter,
     initialValue: initialValues('host', '127.0.0.1')
   }, {
-    name: 'mssql_port',
+    name: buildName('port'),
     label: 'Port',
     type: 'text',
     required: trueIfAdapter,
     visible: trueIfAdapter,
     initialValue: initialValues('port', '1433')
   }, {
-    name: 'mssql_database',
+    name: buildName('database'),
     label: 'Database',
     type: 'text',
     required: trueIfAdapter,
     visible: trueIfAdapter,
     initialValue: initialValues('database', '')
   }, {
-    name: 'mssql_instance',
+    name: buildName('instance'),
     label: 'Instance',
     type: 'text',
     required: false,
     visible: trueIfAdapter,
     initialValue: initialValues('instance', '')
   }, {
-    name: 'mssql_username',
+    name: buildName('username'),
     label: 'Username',
     type: 'text',
     required: false,
     visible: trueIfAdapter,
     initialValue: initialValues('username', '')
-  }].concat((0, _toConsumableArray2["default"])(generatePasswordFields('mssql', persistedObject, adapter, defaultAdapter, 'Password', 'password')), [{
-    name: 'mssql_windowsauthenabled',
+  }].concat((0, _toConsumableArray2["default"])(generatePasswordFields('mssql', persistedObject, adapter, defaultAdapter, 'Password', 'password', buildName)), [{
+    name: buildName('windowsauthenabled'),
     label: 'Use Windows Authentication (Kerberos)',
     type: 'select',
     required: false,
@@ -156,7 +160,7 @@ var MSSQL_FIELDS = exports.MSSQL_FIELDS = function MSSQL_FIELDS(adapter, persist
     }],
     initialValue: initialValues('windowsauthenabled', 'false')
   }, {
-    name: 'mssql_sslEnabled',
+    name: buildName('sslEnabled'),
     label: 'Enable SSL',
     type: 'select',
     required: false,
@@ -170,38 +174,38 @@ var MSSQL_FIELDS = exports.MSSQL_FIELDS = function MSSQL_FIELDS(adapter, persist
     }],
     initialValue: initialValues('sslEnabled', 'false')
   }, {
-    name: 'mssql_sslProtocol',
+    name: buildName('sslProtocol'),
     helpText: 'Protocol to use with SSL encryption',
     label: 'SSL Protocol',
     type: 'text',
     required: function required(_ref7) {
       var values = _ref7.values;
-      return values.get('mssql_sslEnabled') === 'true';
+      return values.get(buildName('sslEnabled')) === 'true';
     },
     visible: trueIfAdapter,
     initialValue: initialValues('sslProtocol', 'TLSv1.2')
   }, {
-    name: 'mssql_current_sslrootcert',
+    name: buildName('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';
+      return !values.get(buildName('change_sslrootcert')) && values.get(buildName('sslEnabled')) === 'true';
     },
     visible: trueIfAdapter,
     initialValue: initialValues('sslrootcert', {})
   }, {
-    name: 'mssql_sslrootcert',
+    name: buildName('sslrootcert'),
     label: 'Root Certificate',
     type: 'file',
     required: function required(_ref9) {
       var values = _ref9.values;
-      return !!values.get('mssql_change_sslrootcert') && values.get('mssql_sslEnabled') === 'true';
+      return !!values.get(buildName('change_sslrootcert')) && values.get(buildName('sslEnabled')) === 'true';
     },
     visible: trueIfAdapter
   }, {
-    name: 'mssql_change_sslrootcert',
+    name: buildName('change_sslrootcert'),
     label: 'Change Root Certificate',
     type: 'toggle',
     "transient": true,
@@ -209,12 +213,12 @@ var MSSQL_FIELDS = exports.MSSQL_FIELDS = function MSSQL_FIELDS(adapter, persist
     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)());
+      if (!_immutable.List.isList(values.get(buildName('sslrootcert'))) || values.get(buildName('sslrootcert')).size > 0) {
+        setValue(buildName('sslrootcert'), (0, _immutable.List)());
       }
     }
   }, {
-    name: 'mssql_current_sslcert',
+    name: buildName('current_sslcert'),
     label: 'Client Certificate',
     type: 'certificate',
     "transient": true,
@@ -222,13 +226,13 @@ var MSSQL_FIELDS = exports.MSSQL_FIELDS = function MSSQL_FIELDS(adapter, persist
     visible: trueIfAdapter,
     initialValue: initialValues('sslcert', '')
   }, {
-    name: 'mssql_sslcert',
+    name: buildName('sslcert'),
     label: 'Client Certificate',
     type: 'file',
     required: false,
     visible: trueIfAdapter
   }, {
-    name: 'mssql_change_sslcert',
+    name: buildName('change_sslcert'),
     label: 'Change Client Certificate',
     type: 'toggle',
     "transient": true,
@@ -236,52 +240,55 @@ var MSSQL_FIELDS = exports.MSSQL_FIELDS = function MSSQL_FIELDS(adapter, persist
     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)());
+      if (!_immutable.List.isList(values.get(buildName('sslcert'))) || values.get(buildName('sslcert')).size > 0) {
+        setValue(buildName('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) {
-    return values.get('mssql_sslcert', '') !== '';
+  }], (0, _toConsumableArray2["default"])(generatePasswordFields('mssql', persistedObject, adapter, defaultAdapter, 'Truststore Password', 'trustStorePassword', buildName, function (values) {
+    return values.get(buildName('sslrootcert'), '') !== '';
+  })), (0, _toConsumableArray2["default"])(generatePasswordFields('mssql', persistedObject, adapter, defaultAdapter, 'Keystore Password', 'keyStoreSecret', buildName, function (values) {
+    return values.get(buildName('sslcert'), '') !== '';
   })));
 };
 var ORACLE_FIELDS = exports.ORACLE_FIELDS = function ORACLE_FIELDS(adapter, persistedObject, persistedPath, defaultAdapter) {
+  var buildName = function buildName(property) {
+    return "".concat(persistedPath[0] ? persistedPath[0] + '_' : '', "oracle_").concat(property);
+  };
   var initialValues = generateInitialValues(persistedObject, persistedPath, defaultAdapter, 'oracle');
   var trueIfAdapter = function trueIfAdapter(_ref14) {
     var values = _ref14.values;
     return values.get(adapter) === 'oracle';
   };
   return [{
-    name: 'oracle_host',
+    name: buildName('host'),
     label: 'Host',
     type: 'text',
     required: trueIfAdapter,
     visible: trueIfAdapter,
     initialValue: initialValues('host', '127.0.0.1')
   }, {
-    name: 'oracle_port',
+    name: buildName('port'),
     label: 'Port',
     type: 'text',
     required: trueIfAdapter,
     visible: trueIfAdapter,
     initialValue: initialValues('port', '1521')
   }, {
-    name: 'oracle_service',
+    name: buildName('service'),
     label: 'Service Name',
     type: 'text',
     required: trueIfAdapter,
     visible: trueIfAdapter,
     initialValue: initialValues('service', 'ORCLCDB')
   }, {
-    name: 'oracle_username',
+    name: buildName('username'),
     label: 'Username',
     type: 'text',
     required: false,
     initialValue: initialValues('username', ''),
     visible: trueIfAdapter
-  }].concat((0, _toConsumableArray2["default"])(generatePasswordFields('oracle', persistedObject, adapter, defaultAdapter)), [{
-    name: 'oracle_sslEnabled',
+  }].concat((0, _toConsumableArray2["default"])(generatePasswordFields('oracle', persistedObject, adapter, defaultAdapter, undefined, undefined, buildName)), [{
+    name: buildName('sslEnabled'),
     label: 'Enable SSL',
     type: 'select',
     required: false,
@@ -295,22 +302,22 @@ var ORACLE_FIELDS = exports.ORACLE_FIELDS = function ORACLE_FIELDS(adapter, pers
     }],
     initialValue: initialValues('sslEnabled', 'false')
   }, {
-    name: 'oracle_sslVersion',
+    name: buildName('sslVersion'),
     label: 'TLS Version',
     type: 'text',
     required: function required(_ref15) {
       var values = _ref15.values;
-      return values.get('oracle_sslEnabled') === 'true';
+      return values.get(buildName('sslEnabled')) === 'true';
     },
     visible: trueIfAdapter,
     initialValue: initialValues('sslVersion', '1.2')
   }, {
-    name: 'oracle_sslServerDnMatch',
+    name: buildName('sslServerDnMatch'),
     label: 'Server DN Match',
     type: 'select',
     required: function required(_ref16) {
       var values = _ref16.values;
-      return values.get('oracle_sslEnabled') === 'true';
+      return values.get(buildName('sslEnabled')) === 'true';
     },
     visible: trueIfAdapter,
     options: [{
@@ -322,34 +329,34 @@ var ORACLE_FIELDS = exports.ORACLE_FIELDS = function ORACLE_FIELDS(adapter, pers
     }],
     initialValue: initialValues('sslServerDnMatch', 'false')
   }, {
-    name: 'oracle_ciphersuites',
+    name: buildName('ciphersuites'),
     label: 'Cipher Suites',
     type: 'text',
     required: false,
     visible: trueIfAdapter,
     initialValue: initialValues('ciphersuites', '')
   }, {
-    name: 'oracle_current_serverCert',
+    name: buildName('current_serverCert'),
     label: 'Server Certificate',
     type: 'certificate',
     "transient": true,
     required: function required(_ref17) {
       var values = _ref17.values;
-      return !values.get('oracle_change_serverCert') && values.get('oracle_sslEnabled') === 'true';
+      return !values.get(buildName('change_serverCert')) && values.get(buildName('sslEnabled')) === 'true';
     },
     visible: trueIfAdapter,
     initialValue: initialValues('serverCert', '')
   }, {
-    name: 'oracle_serverCert',
+    name: buildName('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';
+      return !!values.get(buildName('change_serverCert')) && values.get(buildName('sslEnabled')) === 'true';
     },
     visible: trueIfAdapter
   }, {
-    name: 'oracle_change_serverCert',
+    name: buildName('change_serverCert'),
     label: 'Change Server Certificate',
     type: 'toggle',
     "transient": true,
@@ -357,12 +364,12 @@ var ORACLE_FIELDS = exports.ORACLE_FIELDS = function ORACLE_FIELDS(adapter, pers
     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)());
+      if (!_immutable.List.isList(values.get(buildName('serverCert'))) || values.get(buildName('serverCert')).size > 0) {
+        setValue(buildName('serverCert'), (0, _immutable.List)());
       }
     }
   }, {
-    name: 'oracle_current_clientCert',
+    name: buildName('current_clientCert'),
     label: 'Client Certificate',
     type: 'certificate',
     "transient": true,
@@ -370,13 +377,13 @@ var ORACLE_FIELDS = exports.ORACLE_FIELDS = function ORACLE_FIELDS(adapter, pers
     visible: trueIfAdapter,
     initialValue: initialValues('clientCert', '')
   }, {
-    name: 'oracle_clientCert',
+    name: buildName('clientCert'),
     label: 'Client Certificate',
     type: 'file',
     required: false,
     visible: trueIfAdapter
   }, {
-    name: 'oracle_change_clientCert',
+    name: buildName('change_clientCert'),
     label: 'Change Client Certificate',
     type: 'toggle',
     "transient": true,
@@ -384,52 +391,83 @@ var ORACLE_FIELDS = exports.ORACLE_FIELDS = function ORACLE_FIELDS(adapter, pers
     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)());
+      if (!_immutable.List.isList(values.get(buildName('clientCert'))) || values.get(buildName('clientCert')).size > 0) {
+        setValue(buildName('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) {
-    return values.get('oracle_clientCert', '') !== '';
+  }], (0, _toConsumableArray2["default"])(generatePasswordFields('oracle', persistedObject, adapter, defaultAdapter, 'Truststore Password', 'trustStorePassword', buildName, function (values) {
+    return values.get(buildName('serverCert'), '') !== '';
+  })), (0, _toConsumableArray2["default"])(generatePasswordFields('oracle', persistedObject, adapter, defaultAdapter, 'Keystore Password', 'keyStorePassword', buildName, function (values) {
+    return values.get(buildName('clientCert'), '') !== '';
   })));
 };
 var POSTGRES_FIELDS = exports.POSTGRES_FIELDS = function POSTGRES_FIELDS(adapter, persistedObject, persistedPath, defaultAdapter) {
+  var buildName = function buildName(property) {
+    return "".concat(persistedPath[0] ? persistedPath[0] + '_' : '', "postgres_").concat(property);
+  };
   var trueIfAdapter = function trueIfAdapter(_ref23) {
     var values = _ref23.values;
     return values.get(adapter) === 'postgres';
   };
   var initialValues = generateInitialValues(persistedObject, persistedPath, defaultAdapter, 'postgres');
+  var isIntegrator = persistedPath[0] === 'integrator';
+  // Make sure the ssl mode options and value are valid for the component type
+  var sslModeOptions = isIntegrator ? [{
+    label: 'Verify None',
+    value: 'verify-none'
+  }, {
+    label: 'Verify Peer',
+    value: 'verify-peer'
+  }] : [{
+    label: 'Disable',
+    value: 'disable'
+  }, {
+    label: 'Allow',
+    value: 'allow'
+  }, {
+    label: 'Prefer',
+    value: 'prefer'
+  }, {
+    label: 'Verify CA',
+    value: 'verify-ca'
+  }, {
+    label: 'Verify Full',
+    value: 'verify-full'
+  }];
+  var sslModeInitialValueRaw = initialValues('sslmode');
+  var sslModeInitialValue = !!sslModeOptions.find(function (o) {
+    return o.value === sslModeInitialValueRaw;
+  }) ? sslModeInitialValueRaw : isIntegrator ? 'verify-peer' : 'disable';
   return [{
-    name: 'postgres_host',
+    name: buildName('host'),
     label: 'Host',
     type: 'text',
     required: trueIfAdapter,
     visible: trueIfAdapter,
     initialValue: initialValues('host', '127.0.0.1')
   }, {
-    name: 'postgres_port',
+    name: buildName('port'),
     label: 'Port',
     type: 'text',
     required: trueIfAdapter,
     visible: trueIfAdapter,
     initialValue: initialValues('port', '5432')
   }, {
-    name: 'postgres_database',
+    name: buildName('database'),
     label: 'Database',
     type: 'text',
     required: trueIfAdapter,
     visible: trueIfAdapter,
     initialValue: initialValues('database', 'postgres')
   }, {
-    name: 'postgres_username',
+    name: buildName('username'),
     label: 'Username',
     type: 'text',
     required: false,
     visible: trueIfAdapter,
     initialValue: initialValues('username', '')
-  }].concat((0, _toConsumableArray2["default"])(generatePasswordFields('postgres', persistedObject, adapter, defaultAdapter)), [{
-    name: 'postgres_sslEnabled',
+  }].concat((0, _toConsumableArray2["default"])(generatePasswordFields('postgres', persistedObject, adapter, defaultAdapter, undefined, undefined, buildName)), [{
+    name: buildName('sslEnabled'),
     label: 'Enable SSL',
     type: 'select',
     required: false,
@@ -443,55 +481,40 @@ var POSTGRES_FIELDS = exports.POSTGRES_FIELDS = function POSTGRES_FIELDS(adapter
     }],
     initialValue: initialValues('sslEnabled', 'false')
   }, {
-    name: 'postgres_sslmode',
+    name: buildName('sslmode'),
     label: 'SSL Mode',
     type: 'select',
     required: function required(_ref24) {
       var values = _ref24.values;
-      return values.get('postgres_sslEnabled') === 'true';
+      return values.get(buildName('sslEnabled')) === 'true';
     },
     visible: trueIfAdapter,
-    options: [{
-      label: 'Disable',
-      value: 'disable'
-    }, {
-      label: 'Allow',
-      value: 'allow'
-    }, {
-      label: 'Prefer',
-      value: 'prefer'
-    }, {
-      label: 'Verify CA',
-      value: 'verify-ca'
-    }, {
-      label: 'Verify Full',
-      value: 'verify-full'
-    }],
-    initialValue: initialValues('sslmode', 'disable')
+    options: sslModeOptions,
+    initialValue: sslModeInitialValue
   }, {
-    name: 'postgres_current_sslrootcert',
+    name: buildName('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';
+      return !values.get(buildName('change_sslrootcert')) && values.get(buildName('sslEnabled')) === 'true' && values.get(buildName('sslmode')) !== 'disable';
     },
     visible: trueIfAdapter,
     initialValue: initialValues('sslrootcert', {})
   }, {
-    name: 'postgres_sslrootcert',
+    name: buildName('sslrootcert'),
     helpText: 'x509 certificate (PEM format) used for server authentication',
     label: 'Root Certificate',
     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';
+      return !!values.get(buildName('change_sslrootcert')) && values.get(buildName('sslEnabled')) === 'true' && values.get(buildName('sslmode')) !== 'disable';
     },
     visible: trueIfAdapter
   }, {
-    name: 'postgres_change_sslrootcert',
+    name: buildName('change_sslrootcert'),
     label: 'Change Root Certificate',
     type: 'toggle',
     "transient": true,
@@ -499,12 +522,12 @@ var POSTGRES_FIELDS = exports.POSTGRES_FIELDS = function POSTGRES_FIELDS(adapter
     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)());
+      if (!_immutable.List.isList(values.get(buildName('sslrootcert'))) || values.get(buildName('sslrootcert')).size > 0) {
+        setValue(buildName('sslrootcert'), (0, _immutable.List)());
       }
     }
   }, {
-    name: 'postgres_current_sslcert',
+    name: buildName('current_sslcert'),
     label: 'Client Certificate',
     type: 'certificate',
     "transient": true,
@@ -512,13 +535,13 @@ var POSTGRES_FIELDS = exports.POSTGRES_FIELDS = function POSTGRES_FIELDS(adapter
     visible: trueIfAdapter,
     initialValue: initialValues('sslcert', '')
   }, {
-    name: 'postgres_sslcert',
+    name: buildName('sslcert'),
     label: 'Client Certificate',
     type: 'file',
     required: false,
     visible: trueIfAdapter
   }, {
-    name: 'postgres_change_sslcert',
+    name: buildName('change_sslcert'),
     label: 'Change Client Certificate',
     type: 'toggle',
     "transient": true,
@@ -526,12 +549,12 @@ var POSTGRES_FIELDS = exports.POSTGRES_FIELDS = function POSTGRES_FIELDS(adapter
     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)());
+      if (!_immutable.List.isList(values.get(buildName('sslcert'))) || values.get(buildName('sslcert')).size > 0) {
+        setValue(buildName('sslcert'), (0, _immutable.List)());
       }
     }
   }, {
-    name: 'postgres_current_sslkey',
+    name: buildName('current_sslkey'),
     label: 'Client Key',
     type: 'secret',
     "transient": true,
@@ -539,13 +562,13 @@ var POSTGRES_FIELDS = exports.POSTGRES_FIELDS = function POSTGRES_FIELDS(adapter
     visible: false,
     initialValue: ''
   }, {
-    name: 'postgres_sslkey',
+    name: buildName('sslkey'),
     label: 'Client Key',
     type: 'file',
     required: false,
     visible: trueIfAdapter
   }, {
-    name: 'postgres_change_sslkey',
+    name: buildName('change_sslkey'),
     label: 'Change Private Key',
     type: 'toggle',
     "transient": true,
@@ -553,17 +576,17 @@ var POSTGRES_FIELDS = exports.POSTGRES_FIELDS = function POSTGRES_FIELDS(adapter
     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)());
+      if (!_immutable.List.isList(values.get(buildName('sslkey'))) || values.get(buildName('sslkey')).size > 0) {
+        setValue(buildName('sslkey'), (0, _immutable.List)());
       }
     }
   }]);
 };
-var adapterProperties = exports.adapterProperties = function adapterProperties(values, adapter) {
-  var filterFn = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function (o) {
+var adapterProperties = exports.adapterProperties = function adapterProperties(values, prefix, adapter) {
+  var filterFn = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : function (o) {
     return o;
   };
-  var adapterPrefix = "".concat(adapter, "_");
+  var adapterPrefix = prefix ? "".concat(prefix, "_").concat(adapter, "_") : "".concat(adapter, "_");
   return values
   // Remove the other adapters properties.
   .filter(function (_v, key) {

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

@@ -48,49 +48,21 @@ var fields = function fields() {
       required: false,
       enabled: false,
       initialValue: (0, _immutable.get)(space, 'slug', '') || ''
-    }, {
-      name: 'sharedBundle',
-      label: 'Use Shared Bundle base directory?',
-      type: 'checkbox',
-      "transient": true,
-      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', '');
-        }
-      }
     }, {
       name: 'sharedBundleBase',
       label: 'Shared Bundle Base Directory',
       type: 'text',
       initialValue: (0, _immutable.get)(space, 'sharedBundleBase') || '',
       helpText: 'Directory used as path prefix for bundles.',
-      visible: function visible(_ref6) {
-        var values = _ref6.values;
-        return values.get('sharedBundle');
-      },
-      required: function required(_ref7) {
-        var values = _ref7.values;
-        return values.get('sharedBundle');
-      }
+      visible: false,
+      required: false
     }, {
       name: 'bundlePath',
       label: 'Bundle Path',
       type: 'text',
       initialValue: (0, _immutable.get)(space, 'bundlePath') || '',
-      visible: function visible(_ref8) {
-        var values = _ref8.values;
-        return (0, _immutable.get)(values, 'sharedBundle');
-      },
-      required: function required(_ref9) {
-        var values = _ref9.values;
-        return (0, _immutable.get)(values, 'sharedBundle');
-      }
+      visible: false,
+      required: false
     }, {
       name: 'allowedIps',
       label: 'Allowed IPs',
@@ -106,18 +78,18 @@ var fields = function fields() {
           type: 'text'
         }]);
       },
-      visible: function visible(_ref10) {
-        var values = _ref10.values;
+      visible: function visible(_ref4) {
+        var values = _ref4.values;
         return values.get('allowedIpsEnabled', false);
       },
       initialValue: (0, _immutable.get)(space, 'allowedIps', []),
-      serialize: function serialize(_ref11) {
-        var values = _ref11.values;
+      serialize: function serialize(_ref5) {
+        var values = _ref5.values;
         return values.get('allowedIpsEnabled', false) ? values.get('allowedIps') : [];
       }
     }, {
       name: 'allowedIpsEnabled',
-      label: 'Enabled Allowed IP Restrictions?',
+      label: 'Allowed IP Restrictions',
       type: 'checkbox',
       initialValue: (0, _immutable.get)(space, 'allowedIpsEnabled', false) || false
     }];