@kineticdata/react 5.0.16 → 5.1.0

package/lib/components/system/SystemBackgroundTasksTable.js

@@ -0,0 +1,83 @@
+import { generateTable } from '../table/Table';
+import { fetchSystemBackgroundTasks } from '../../apis';
+import { defineFilter } from '../../helpers';
+import { List } from 'immutable';
+var clientSide = defineFilter(true).startsWith('id', 'id').startsWith('status', 'status').end();
+
+var dataSource = function dataSource(_ref) {
+  var spaceSlug = _ref.spaceSlug;
+  return {
+    fn: fetchSystemBackgroundTasks,
+    clientSide: clientSide,
+    params: function params() {
+      return [{
+        spaceSlug: spaceSlug
+      }];
+    },
+    transform: function transform(result) {
+      return {
+        data: result.backgroundTasks
+      };
+    }
+  };
+};
+
+var filters = function filters() {
+  return function () {
+    return [{
+      name: 'id',
+      label: 'ID',
+      type: 'text'
+    }, {
+      name: 'status',
+      label: 'Status',
+      type: 'text'
+    }];
+  };
+};
+
+var columns = [{
+  value: 'id',
+  title: 'ID',
+  sortable: false
+}, {
+  value: 'createdAt',
+  title: 'Created At',
+  valueTransform: function valueTransform(_value, row) {
+    var createdTransition = row.get('transitions', List()).find(function (t) {
+      return t.has('Created');
+    });
+    return createdTransition ? createdTransition.get('Created') : 'N/A';
+  },
+  sortable: true
+}, {
+  value: 'description',
+  title: 'Description',
+  sortable: false
+}, {
+  value: 'exception',
+  title: 'Exception',
+  sortable: false
+}, {
+  value: 'messages',
+  title: 'Messages',
+  sortable: false
+}, {
+  value: 'Result',
+  title: 'Result',
+  sortable: false
+}, {
+  value: 'status',
+  title: 'Status'
+}, {
+  value: 'transitions',
+  title: 'Transitions',
+  sortable: false
+}];
+export var SystemBackgroundTasksTable = generateTable({
+  tableOptions: ['spaceSlug'],
+  columns: columns,
+  filters: filters,
+  dataSource: dataSource
+});
+SystemBackgroundTasksTable.displayName = 'SystemBackgroundTasksTable';

package/lib/components/system/SystemSecurityForm.js

@@ -0,0 +1,69 @@
+import { List, fromJS, get } from 'immutable';
+import { generateForm } from '../form/Form';
+import { fetchSystemSecurity, updateSystemSecurity } from '../../apis';
+import { handleFormErrors } from '../form/Form.helpers';
+
+var handleSubmit = function handleSubmit() {
+  return function (values) {
+    return updateSystemSecurity({
+      systemSecurity: values.toJS()
+    }).then(handleFormErrors());
+  };
+};
+
+var dataSources = function dataSources() {
+  return {
+    systemSecurity: {
+      fn: fetchSystemSecurity,
+      params: [],
+      transform: function transform(result) {
+        return result.systemSecurity;
+      }
+    }
+  };
+};
+
+var fields = function fields() {
+  return function (_ref) {
+    var systemSecurity = _ref.systemSecurity;
+    return systemSecurity && [{
+      name: 'allowedSystemIps',
+      label: 'Allowed IPs',
+      type: 'select',
+      options: function options() {
+        return fromJS([{
+          name: 'description',
+          label: 'Description',
+          type: 'text'
+        }, {
+          name: 'value',
+          label: 'IP Range',
+          type: 'text'
+        }]);
+      },
+      visible: function visible(_ref2) {
+        var values = _ref2.values;
+        return values.get('allowedSystemIpsEnabled', false);
+      },
+      initialValue: get(systemSecurity, 'allowedSystemIps', List()),
+      serialize: function serialize(_ref3) {
+        var values = _ref3.values;
+        return values.get('allowedSystemIpsEnabled', false) ? values.get('allowedSystemIps') : [];
+      }
+    }, {
+      name: 'allowedSystemIpsEnabled',
+      label: 'Enabled Allowed IP Restrictions?',
+      type: 'checkbox',
+      initialValue: get(systemSecurity, 'allowedSystemIps', List()).size > 0,
+      "transient": true
+    }];
+  };
+};
+
+export var SystemSecurityForm = generateForm({
+  formOptions: [],
+  dataSources: dataSources,
+  fields: fields,
+  handleSubmit: handleSubmit
+});
+SystemSecurityForm.displayName = 'SystemSecurityForm';

package/lib/components/system/helpers.js

@@ -145,6 +145,20 @@ export var MSSQL_FIELDS = function MSSQL_FIELDS(adapter, persistedObject, persis
     visible: trueIfAdapter,
     initialValue: initialValues('username', '')
   }].concat(_toConsumableArray(generatePasswordFields('mssql', persistedObject, adapter, defaultAdapter, 'Password', 'password')), [{
+    name: 'mssql_windowsauthenabled',
+    label: 'Use Windows Authentication (Kerberos)',
+    type: 'select',
+    required: false,
+    visible: trueIfAdapter,
+    options: [{
+      label: 'True',
+      value: 'true'
+    }, {
+      label: 'False',
+      value: 'false'
+    }],
+    initialValue: initialValues('windowsauthenabled', 'false')
+  }, {
     name: 'mssql_sslEnabled',
     label: 'Enable SSL',
     type: 'select',
@@ -180,9 +194,9 @@ 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', 'ssltruststorepw', function (values) {
+  }], _toConsumableArray(generatePasswordFields('mssql', persistedObject, adapter, defaultAdapter, 'Truststore Password', 'trustStorePassword', function (values) {
     return values.get('mssql_sslrootcert', '') !== '';
-  })), _toConsumableArray(generatePasswordFields('mssql', persistedObject, adapter, defaultAdapter, 'Keystore Password', 'sslkeystorepw', function (values) {
+  })), _toConsumableArray(generatePasswordFields('mssql', persistedObject, adapter, defaultAdapter, 'Keystore Password', 'keyStoreSecret', function (values) {
     return values.get('mssql_sslcert', '') !== '';
   })));
 };
@@ -278,9 +292,9 @@ 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) {
+  }], _toConsumableArray(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) {
+  })), _toConsumableArray(generatePasswordFields('oracle', persistedObject, adapter, defaultAdapter, 'Keystore Password', 'keyStorePassword', function (values) {
     return values.get('oracle_clientCert', '') !== '';
   })));
 };
@@ -382,14 +396,13 @@ export var POSTGRES_FIELDS = function POSTGRES_FIELDS(adapter, persistedObject,
 };
 export var adapterProperties = function adapterProperties(values, adapter) {
   var adapterPrefix = "".concat(adapter, "_");
-  var properties = 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.
   .mapKeys(function (key) {
     return key.replace(adapterPrefix, '');
   }).toObject();
-  return properties;
 };
 export var propertiesFromAdapters = function propertiesFromAdapters() {
   var taskDbAdapters = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : List();
@@ -450,6 +463,7 @@ export var adapterPropertiesFields = function adapterPropertiesFields(_ref9) {
         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,
       helpText: property.get('description'),
       required: function required(_ref11) {
         var values = _ref11.values;

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

@@ -1,5 +1,5 @@
 import { fetchSpace, updateSpace } from '../../../apis';
-import { get } from 'immutable';
+import { fromJS, get } from 'immutable';
 import { generateForm } from '../../form/Form';
 import { handleFormErrors } from '../../form/Form.helpers';
 
@@ -10,7 +10,7 @@ var dataSources = function dataSources(_ref) {
       fn: fetchSpace,
       params: slug && [{
         slug: slug,
-        include: 'details'
+        include: 'details,allowedIps'
       }],
       transform: function transform(result) {
         return result.space;
@@ -29,10 +29,9 @@ var handleSubmit = function handleSubmit(_ref2) {
   };
 };
 
-var fields = function fields(_ref3) {
-  var slug = _ref3.slug;
-  return function (_ref4) {
-    var space = _ref4.space;
+var fields = function fields() {
+  return function (_ref3) {
+    var space = _ref3.space;
     return space && [{
       name: 'name',
       label: 'Name',
@@ -52,9 +51,9 @@ var fields = function fields(_ref3) {
       type: 'checkbox',
       "transient": true,
       initialValue: (get(space, 'sharedBundleBase') || '') !== '',
-      onChange: function onChange(_ref5, _ref6) {
-        var values = _ref5.values;
-        var setValue = _ref6.setValue;
+      onChange: function onChange(_ref4, _ref5) {
+        var values = _ref4.values;
+        var setValue = _ref5.setValue;
 
         if (values.get('sharedBundleBase') !== '') {
           setValue('sharedBundleBase', '');
@@ -70,12 +69,12 @@ var fields = function fields(_ref3) {
       type: 'text',
       initialValue: get(space, 'sharedBundleBase') || '',
       helpText: 'Directory used as path prefix for bundles.',
-      visible: function visible(_ref7) {
-        var values = _ref7.values;
+      visible: function visible(_ref6) {
+        var values = _ref6.values;
         return values.get('sharedBundle');
       },
-      required: function required(_ref8) {
-        var values = _ref8.values;
+      required: function required(_ref7) {
+        var values = _ref7.values;
         return values.get('sharedBundle');
       }
     }, {
@@ -83,14 +82,43 @@ var fields = function fields(_ref3) {
       label: 'Bundle Path',
       type: 'text',
       initialValue: get(space, 'bundlePath') || '',
-      visible: function visible(_ref9) {
+      visible: function visible(_ref8) {
+        var values = _ref8.values;
+        return get(values, 'sharedBundle');
+      },
+      required: function required(_ref9) {
         var values = _ref9.values;
         return get(values, 'sharedBundle');
+      }
+    }, {
+      name: 'allowedIps',
+      label: 'Allowed IPs',
+      type: 'select',
+      options: function options() {
+        return fromJS([{
+          name: 'description',
+          label: 'Description',
+          type: 'text'
+        }, {
+          name: 'value',
+          label: 'IP Range',
+          type: 'text'
+        }]);
       },
-      required: function required(_ref10) {
+      visible: function visible(_ref10) {
         var values = _ref10.values;
-        return get(values, 'sharedBundle');
+        return values.get('allowedIpsEnabled', false);
+      },
+      initialValue: get(space, 'allowedIps', []),
+      serialize: function serialize(_ref11) {
+        var values = _ref11.values;
+        return values.get('allowedIpsEnabled', false) ? values.get('allowedIps') : [];
       }
+    }, {
+      name: 'allowedIpsEnabled',
+      label: 'Enabled Allowed IP Restrictions?',
+      type: 'checkbox',
+      initialValue: get(space, 'allowedIpsEnabled', false) || false
     }];
   };
 };

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

@@ -2,7 +2,7 @@ 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/system';
+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';
@@ -34,26 +34,32 @@ var dataSources = function dataSources(_ref) {
 var handleSubmit = function handleSubmit(_ref2) {
   var slug = _ref2.slug;
   return function (values) {
-    var tenant = {
+    var authenticationSecret = values.get('authenticationSecret') ? {
+      authenticationSecret: values.get('authenticationSecret')
+    } : {};
+    var deployment = slug ? {
+      deployment: {
+        image: values.get('image'),
+        replicas: parseInt(values.get('replicas'))
+      }
+    } : {};
+
+    var tenant = _objectSpread(_objectSpread({}, authenticationSecret), {}, {
       space: {
         slug: values.get('slug'),
         name: values.get('name')
       },
       task: _objectSpread(_objectSpread({
         autoCreateDatabase: values.get('task_autoCreateDatabase') ? 'true' : 'false'
-      }, slug ? {
-        deployment: {
-          image: values.get('image'),
-          replicas: parseInt(values.get('replicas'))
-        }
-      } : {}), {}, {
+      }, deployment), {}, {
         databaseAdapter: {
           type: values.get('task_databaseAdapter_type'),
           properties: adapterProperties(values, values.get('task_databaseAdapter_type'))
         }
       }),
       users: values.get('users')
-    };
+    });
+
     return slug ? updateTenant({
       slug: slug,
       tenant: tenant

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

@@ -1,5 +1,5 @@
 import { generateTable } from '../../table/Table';
-import { fetchTenants } from '../../../apis/system';
+import { fetchTenants } from '../../../apis';
 import { defineFilter } from '../../../helpers';
 var clientSide = defineFilter(true).startsWith('slug', 'slug').startsWith('space.name', 'space.name').end();
 
@@ -19,15 +19,20 @@ var dataSource = function dataSource() {
   };
 };
 
-var filters = [{
-  name: 'slug',
-  label: 'Slug',
-  type: 'text'
-}, {
-  name: 'space.name',
-  label: 'Name',
-  type: 'text'
-}];
+var filters = function filters() {
+  return function () {
+    return [{
+      name: 'slug',
+      label: 'Slug',
+      type: 'text'
+    }, {
+      name: 'space.name',
+      label: 'Name',
+      type: 'text'
+    }];
+  };
+};
+
 var columns = [{
   value: 'slug',
   title: 'Slug',
@@ -117,18 +122,18 @@ var columns = [{
     return row.getIn(['space', 'customTranslationContexts']);
   }
 }, {
-  value: 'space.defaultDatastoreFormConfirmationPage',
-  title: 'Default Datastore Form Confirmation Page',
+  value: 'space.defaultFormConfirmationPage',
+  title: 'Default Form Confirmation Page',
   sortable: false,
   valueTransform: function valueTransform(_value, row) {
-    return row.getIn(['space', 'defaultDatastoreFormConfirmationPage']);
+    return row.getIn(['space', 'defaultFormConfirmationPage']);
   }
 }, {
-  value: 'space.defaultDatastoreFormDisplayPage',
-  title: 'Default Datastore Form Display Page',
+  value: 'space.defaultFormDisplayPage',
+  title: 'Default Form Display Page',
   sortable: false,
   valueTransform: function valueTransform(_value, row) {
-    return row.getIn(['space', 'defaultDatastoreFormDisplayPage']);
+    return row.getIn(['space', 'defaultFormDisplayPage']);
   }
 }, {
   value: 'space.defaultLocale',

package/lib/components/table/Table.js

@@ -10,7 +10,7 @@ import { compose, lifecycle } from 'recompose';
 import { List, Map, mergeDeep } from 'immutable';
 import { ComponentConfigContext } from '../common/ComponentConfigContext';
 import { connect, dispatch } from '../../store';
-import { configureTable, mountTable, unmountTable, isClientSide, filterFormKey } from './Table.redux';
+import { configureTable, filterFormKey, isClientSide, mountTable, unmountTable } from './Table.redux';
 import { generateKey } from '../../helpers';
 import { generateForm } from '../form/Form';
 
@@ -37,7 +37,8 @@ var TableComponent = function TableComponent(props) {
         appliedFilters = props.appliedFilters,
         components = props.components,
         tableKey = props.tableKey,
-        _filterFormKey = props.filterFormKey;
+        _filterFormKey = props.filterFormKey,
+        count = props.count;
     var table = buildTable(props);
     var filter = components.FilterForm ? buildFilterForm(props) : buildFilterLayout(props);
     var pagination = buildPaginationControl(props);
@@ -51,6 +52,7 @@ var TableComponent = function TableComponent(props) {
       initializing: initializing,
       loading: loading,
       rows: rows,
+      count: count,
       error: error
     });
   }
@@ -261,8 +263,10 @@ var buildPaginationControl = function buildPaginationControl(props) {
       pageSize = props.pageSize,
       pageOffset = props.pageOffset,
       currentPageToken = props.currentPageToken,
+      count = props.count,
       components = props.components,
-      loading = props.loading;
+      loading = props.loading,
+      renderOptions = props.renderOptions;
   var PaginationControl = components.PaginationControl;
   var prevPage = hasPrevPage(data, dataSource, tableOptions, pageTokens, pageOffset) ? onPrevPage(tableKey) : null;
   var nextPage = hasNextPage(data, dataSource, tableOptions, pageOffset, pageSize, currentPageToken, rows) ? onNextPage(tableKey) : null;
@@ -276,9 +280,13 @@ var buildPaginationControl = function buildPaginationControl(props) {
     filterFormKey: filterFormKey,
     prevPage: prevPage,
     nextPage: nextPage,
+    gotoPage: onGotoPage(tableKey),
     loading: loading,
     startIndex: startIndex,
-    endIndex: endIndex
+    endIndex: endIndex,
+    count: count,
+    renderOptions: renderOptions,
+    tableOptions: tableOptions
   });
 };
 
@@ -332,7 +340,8 @@ export var buildTableHeaderCell = function buildTableHeaderCell(props) {
         components = props.components,
         columnComponents = props.columnComponents,
         renderOptions = props.renderOptions,
-        tableOptions = props.tableOptions;
+        tableOptions = props.tableOptions,
+        appliedFilters = props.appliedFilters;
     var HeaderCell = columnComponents.getIn([column.get('value'), 'HeaderCell'], components.HeaderCell);
     var sorting = column === props.sortColumn && props.sortDirection;
     var sortable = props.sortable && column.get('sortable');
@@ -344,7 +353,8 @@ export var buildTableHeaderCell = function buildTableHeaderCell(props) {
       renderOptions: renderOptions,
       sorting: sorting,
       sortable: sortable,
-      tableOptions: tableOptions
+      tableOptions: tableOptions,
+      filters: appliedFilters
     }));
   };
 };
@@ -371,7 +381,7 @@ export var buildTableBodyRows = function buildTableBodyRows(props) {
       tableOptions = props.tableOptions;
   var BodyRow = components.BodyRow;
   var EmptyBodyRow = components.EmptyBodyRow;
-  var tableRows = rows.size > 0 ? rows.map(function (row, index) {
+  return rows.size > 0 ? rows.map(function (row, index) {
     var cells = buildTableBodyCells(props, row, index);
     return /*#__PURE__*/React.createElement(KeyWrapper, {
       key: "row-".concat(index)
@@ -392,7 +402,6 @@ export var buildTableBodyRows = function buildTableBodyRows(props) {
     tableOptions: tableOptions,
     error: props.error
   });
-  return tableRows;
 };
 export var buildTableBodyCells = function buildTableBodyCells(props, row, rowIndex) {
   var tableKey = props.tableKey,
@@ -401,6 +410,7 @@ export var buildTableBodyCells = function buildTableBodyCells(props, row, rowInd
       columns = props.columns,
       columnSet = props.columnSet,
       columnComponents = props.columnComponents,
+      appliedFilters = props.appliedFilters,
       renderOptions = props.renderOptions,
       tableOptions = props.tableOptions;
   return fromColumnSet(columns, columnSet).map(function (column, index) {
@@ -416,6 +426,7 @@ export var buildTableBodyCells = function buildTableBodyCells(props, row, rowInd
       value: value,
       rows: rows,
       column: column,
+      filters: appliedFilters,
       renderOptions: renderOptions,
       tableOptions: tableOptions
     }));
@@ -485,6 +496,17 @@ var onPrevPage = function onPrevPage(tableKey) {
   };
 };
 
+var onGotoPage = function onGotoPage(tableKey) {
+  return function (pageNumber) {
+    return function () {
+      return dispatch('GOTO_PAGE', {
+        tableKey: tableKey,
+        pageNumber: pageNumber
+      });
+    };
+  };
+};
+
 var onSortColumn = function onSortColumn(tableKey, column) {
   return function () {
     return dispatch('SORT_COLUMN', {
@@ -494,7 +516,7 @@ var onSortColumn = function onSortColumn(tableKey, column) {
   };
 };
 
-var mapStateToProps = function mapStateToProps(state) {
+var mapStateToProps = function mapStateToProps() {
   return function (state, props) {
     return state.getIn(['tables', props.tableKey], Map()).toObject();
   };
@@ -563,6 +585,9 @@ export var generateTable = function generateTable(_ref4) {
               tableKey: tableKey,
               appliedFilters: values
             });
+            return {
+              values: values
+            };
           };
         }
       });
@@ -598,13 +623,15 @@ export var generateTable = function generateTable(_ref4) {
       defaultSortDirection: props.defaultSortDirection,
       omitHeader: props.omitHeader,
       includeFooter: props.includeFooter,
+      refreshInterval: props.refreshInterval,
       renderOptions: props.renderOptions,
       uncontrolled: props.uncontrolled,
       // For full client-side tables, with no datasource.
       data: props.data,
       filterForm: !!filters,
       initialFilterValues: props.initialFilterValues || {},
-      onSearch: props.onSearch
+      onSearch: props.onSearch,
+      onFetch: props.onFetch
     };
     return /*#__PURE__*/React.createElement(Table, setProps, props.children);
   };