@kineticdata/react 6.1.0 → 6.1.1

package/lib/components/integrator/connection/config_fields/sql.js

@@ -0,0 +1,123 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.serializeSQLConnectionConfigFields = exports.generateSQLConnectionConfigFields = void 0;
+var _immutable = require("immutable");
+var _integrationTypes = _interopRequireDefault(require("../../integrationTypes"));
+var serializeSQLConnectionConfigFields = exports.serializeSQLConnectionConfigFields = function serializeSQLConnectionConfigFields(configFields) {
+  return function (_ref) {
+    var values = _ref.values;
+    return configFields.reduce(function (serialization, _ref2) {
+      var name = _ref2.name,
+        type = _ref2.type,
+        visible = _ref2.visible,
+        _transient = _ref2["transient"];
+      if (
+      // Field must not be transient
+      !_transient && (
+      // Field must be visible
+      typeof visible === 'function' ? visible({
+        values: values
+      }) : typeof visible === 'undefined' || !!visible)) {
+        // Set password fields to null if their toggle field is
+        // false, which means the password wasn't changed
+        if (type === 'password' && !values.get("".concat(name, ".toggle"))) {
+          return serialization.setIn(name.split('.'), null);
+        }
+
+        // Set the following fields to null if they don't have a value
+        if (['caCert'].includes(name) && !values.get(name)) {
+          return serialization.setIn(name.split('.'), null);
+        }
+
+        // Set the value into the correct structure
+        return serialization.setIn(name.split('.'), values.get(name));
+      }
+      return serialization;
+    }, (0, _immutable.Map)());
+  };
+};
+var generateSQLConnectionConfigFields = exports.generateSQLConnectionConfigFields = function generateSQLConnectionConfigFields(config, type, options) {
+  return [{
+    name: 'configType',
+    label: 'Type',
+    type: 'select',
+    options: _integrationTypes["default"],
+    initialValue: type,
+    required: true,
+    enabled: false
+  }, {
+    name: 'host',
+    label: 'Host',
+    type: 'text',
+    initialValue: (0, _immutable.get)(config, 'host'),
+    required: true
+  }, {
+    name: 'port',
+    label: 'Port',
+    type: 'text',
+    initialValue: String((0, _immutable.get)(config, 'port') || ''),
+    required: true,
+    pattern: /^\d*$/,
+    patternMessage: 'Port must be numeric'
+  }, {
+    name: 'database',
+    label: 'Database',
+    type: 'text',
+    initialValue: (0, _immutable.get)(config, 'database'),
+    required: true
+  }, {
+    name: 'poolSize',
+    label: 'Connection Pool',
+    type: 'number',
+    initialValue: (0, _immutable.get)(config, 'poolSize') || 5,
+    required: true,
+    constraint: function constraint(_ref3) {
+      var values = _ref3.values;
+      return typeof values.get('poolSize') === 'number' && values.get('poolSize') > 0;
+    },
+    constraintMessage: 'Connection Pool must be numeric and must be greater than 0'
+  }, {
+    name: 'username',
+    label: 'Username',
+    type: 'text',
+    initialValue: (0, _immutable.get)(config, 'username'),
+    required: true
+  }, {
+    name: 'password.toggle',
+    "transient": true,
+    label: 'Modify Password',
+    type: 'toggle',
+    initialValue: !config || !!options.isClone || !!options.isNewImport,
+    // Show if we're editing a connection
+    visible: function visible(_ref4) {
+      var connection = _ref4.connection;
+      return !!connection && !options.isClone;
+    }
+  }, {
+    name: 'password',
+    label: 'Password',
+    type: 'password',
+    initialValue: '',
+    // Enable if we're creating a new connection or the change toggle is true
+    enabled: function enabled(_ref5) {
+      var values = _ref5.values,
+        connection = _ref5.connection;
+      return !connection || options.isClone || !!values.get('password.toggle');
+    },
+    // Show the placeholder if there is a connection
+    placeholder: function placeholder(_ref6) {
+      var values = _ref6.values,
+        connection = _ref6.connection;
+      return !!connection && !options.isClone && !values.get('password.toggle') ? "\u2022\u2022\u2022\u2022\u2022\u2022\u2022" : undefined;
+    }
+  }, {
+    name: 'caCert',
+    label: 'Trusted CA Certificate',
+    type: 'text',
+    initialValue: (0, _immutable.get)(config, 'caCert') || ''
+  }];
+};

package/lib/components/integrator/integrationTypes.js

@@ -8,10 +8,19 @@ var _immutable = require("immutable");
 var integrationTypes = exports.integrationTypes = [{
   label: 'HTTP',
   value: 'http'
-}
+},
 // { label: 'SMTP', value: 'smtp' },
-// { label: 'SQL', value: 'sql' },
-];
+{
+  label: 'PostgreSQL',
+  value: 'postgres',
+  group: 'sql',
+  groupLabel: 'SQL'
+}, {
+  label: 'SQL Server',
+  value: 'mssql',
+  group: 'sql',
+  groupLabel: 'SQL'
+}];
 
 // Helper function for getting the label for a given type value
 integrationTypes.getLabel = function (value) {
@@ -28,6 +37,7 @@ var getConnectionMetadata = exports.getConnectionMetadata = function getConnecti
       return {
         // Details content to render for each option in a list of connections
         optionDetail: (0, _immutable.getIn)(connection, ['config', 'baseUrl']),
+        optionDetailLabel: 'Base URL',
         // Documentation link
         docsLink: (0, _immutable.getIn)(connection, ['documentationLink']),
         // Properties to list in page/modal headings
@@ -38,7 +48,7 @@ var getConnectionMetadata = exports.getConnectionMetadata = function getConnecti
           label: 'Auth',
           value: {
             basic: 'Basic',
-            client_credentials: 'Client Credentials',
+            client_credentials: 'OAuth 2.0',
             http_bearer_token: 'HTTP Bearer Token',
             raw_bearer_token: 'Raw Bearer Token'
           }[(0, _immutable.getIn)(connection, ['config', 'auth', 'authType'])] || 'None'
@@ -47,7 +57,7 @@ var getConnectionMetadata = exports.getConnectionMetadata = function getConnecti
         }),
         // Table columns for the operations table of this type of connection.
         // Objects define columns to add, and strings define default columns to
-        // show. The order of the items is defines the order of the columns.
+        // show. The order of the items defines the order of the columns.
         operationColumns: [{
           value: 'method',
           title: 'Method',
@@ -57,6 +67,8 @@ var getConnectionMetadata = exports.getConnectionMetadata = function getConnecti
           toggleable: true
         }, 'name', 'updatedAt', 'actions']
       };
+    case 'postgres':
+    case 'mssql':
     default:
       return {
         headingData: [],
@@ -71,6 +83,8 @@ var getOperationMetadata = exports.getOperationMetadata = function getOperationM
       return {
         // Details content to render for each option in a list of operations
         optionDetail: (0, _immutable.getIn)(operation, ['config', 'method']),
+        optionDetailLabel: 'Method',
+        optionDetailComponent: HTTPMethod,
         // Documentation link
         docsLink: (0, _immutable.getIn)(operation, ['documentationLink']),
         // Properties to list in page/modal headings
@@ -84,6 +98,8 @@ var getOperationMetadata = exports.getOperationMetadata = function getOperationM
           return o.value;
         })
       };
+    case 'postgres':
+    case 'mssql':
     default:
       return {
         headingData: []
@@ -95,4 +111,10 @@ var HTTPMethodCell = function HTTPMethodCell(_ref) {
   return /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("span", {
     className: "badge badge-info"
   }, row.getIn(['config', 'method'])));
+};
+var HTTPMethod = function HTTPMethod(_ref2) {
+  var value = _ref2.value;
+  return /*#__PURE__*/React.createElement("span", {
+    className: "badge badge-info"
+  }, value);
 };

package/lib/components/integrator/operation/OperationForm.js

@@ -7,10 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.OperationForm = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _immutable = require("immutable");
 var _Form = require("../../form/Form");
 var _apis = require("../../../apis");
 var _http = require("./config_fields/http");
+var _sql = require("./config_fields/sql");
 var dataSources = function dataSources(_ref) {
   var id = _ref.id,
     connectionId = _ref.connectionId;
@@ -55,6 +57,21 @@ var handleSubmit = function handleSubmit(_ref2) {
     });
   };
 };
+var getFieldConfigByType = function getFieldConfigByType(type, operation) {
+  switch (type) {
+    case 'http':
+      var configFieldsHTTP = (0, _http.generateHttpOperationConfigFields)((0, _immutable.get)(operation, 'config'));
+      return [configFieldsHTTP, (0, _http.serializeHttpOperationConfigFields)(configFieldsHTTP)];
+    case 'postgres':
+      var configFieldsPostgres = (0, _sql.generatePostgresOperationConfigFields)((0, _immutable.get)(operation, 'config'));
+      return [configFieldsPostgres, (0, _sql.serializeSQLOperationConfigFields)(configFieldsPostgres)];
+    case 'mssql':
+      var configFieldsMSSQL = (0, _sql.generateMSSQLOperationConfigFields)((0, _immutable.get)(operation, 'config'));
+      return [configFieldsMSSQL, (0, _sql.serializeSQLOperationConfigFields)(configFieldsMSSQL)];
+    default:
+      return [[], undefined];
+  }
+};
 var fields = function fields(_ref4) {
   var id = _ref4.id,
     clone = _ref4.clone;
@@ -63,8 +80,11 @@ var fields = function fields(_ref4) {
       connection = _ref5.connection;
     if (connection && (!id || operation)) {
       // Set type from the operation if it exists, or from the connection
-      var typeValue = (0, _immutable.get)(connection, 'type');
-      var configFields = typeValue === 'http' ? (0, _http.generateHttpOperationConfigFields)((0, _immutable.get)(operation, 'config')) : [];
+      var typeValue = (0, _immutable.getIn)(connection, ['config', 'configType']);
+      var _getFieldConfigByType = getFieldConfigByType(typeValue, operation),
+        _getFieldConfigByType2 = (0, _slicedToArray2["default"])(_getFieldConfigByType, 2),
+        configFields = _getFieldConfigByType2[0],
+        configSerialize = _getFieldConfigByType2[1];
       return [{
         name: 'name',
         label: 'Operation Name',
@@ -74,7 +94,7 @@ var fields = function fields(_ref4) {
         placeholder: !clone ? 'Enter a name to find your operation easily' : "Clone of ".concat((0, _immutable.get)(operation, 'name'))
       }, {
         name: 'documentationLink',
-        label: 'Operation Documentation Link',
+        label: 'API Documentation Link',
         type: 'text',
         initialValue: (0, _immutable.get)(operation, 'documentationLink') || '',
         placeholder: 'Optional (but recommended)'
@@ -110,7 +130,7 @@ var fields = function fields(_ref4) {
         visible: false,
         initialValue: (0, _immutable.get)(operation, 'config'),
         // Serialize the transient config fields into a single config object
-        serialize: (0, _http.serializeHttpOperationConfigFields)(configFields)
+        serialize: configSerialize
       }].concat((0, _toConsumableArray2["default"])(configFields.map(function (field) {
         return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, field), {}, {
           "transient": true

package/lib/components/integrator/operation/OperationTable.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.OperationTable = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _apis = require("../../../apis");
 var _Table = require("../../table/Table");
 var _helpers = require("../../../helpers");
@@ -24,10 +22,10 @@ var dataSource = function dataSource(_ref) {
   return {
     fn: _apis.fetchOperations,
     clientSide: clientSide,
-    params: function params(paramData) {
-      return connectionId && [(0, _objectSpread2["default"])({
+    params: function params() {
+      return connectionId && [{
         connectionId: connectionId
-      }, paramData.filters.filter(Boolean).toJS())];
+      }];
     },
     transform: function transform(result) {
       return {

package/lib/components/integrator/operation/config_fields/http.js

@@ -127,10 +127,11 @@ var generateHttpOperationConfigFields = exports.generateHttpOperationConfigField
     label: 'Raw Body',
     type: 'code',
     language: function language(_ref4) {
+      var _values$get$find, _values$get$find$toLo;
       var values = _ref4.values;
-      return getLanguageFromContentType(values.get('headers').find(function (_, header) {
+      return getLanguageFromContentType((_values$get$find = values.get('headers').find(function (_, header) {
         return (header === null || header === void 0 ? void 0 : header.toLowerCase()) === 'content-type';
-      }));
+      })) === null || _values$get$find === void 0 ? void 0 : (_values$get$find$toLo = _values$get$find.toLowerCase) === null || _values$get$find$toLo === void 0 ? void 0 : _values$get$find$toLo.call(_values$get$find));
     },
     initialValue: (0, _immutable.getIn)(config, ['body', 'raw']),
     visible: function visible(_ref5) {

package/lib/components/integrator/operation/config_fields/sql.js

@@ -0,0 +1,81 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.serializeSQLOperationConfigFields = exports.generatePostgresOperationConfigFields = exports.generateMSSQLOperationConfigFields = void 0;
+var _immutable = require("immutable");
+var _integrationTypes = _interopRequireDefault(require("../../integrationTypes"));
+var serializeSQLOperationConfigFields = exports.serializeSQLOperationConfigFields = function serializeSQLOperationConfigFields(configFields) {
+  return function (_ref) {
+    var values = _ref.values;
+    return configFields.reduce(function (serialization, _ref2) {
+      var name = _ref2.name,
+        type = _ref2.type,
+        visible = _ref2.visible,
+        _transient = _ref2["transient"];
+      if (
+      // Field must not be transient
+      !_transient && (
+      // Field must be visible
+      typeof visible === 'function' ? visible({
+        values: values
+      }) : typeof visible === 'undefined' || !!visible)) {
+        // Set the value into the correct structure
+        return serialization.setIn(name.split('.'), values.get(name));
+      }
+      return serialization;
+    }, (0, _immutable.Map)());
+  };
+};
+var generatePostgresOperationConfigFields = exports.generatePostgresOperationConfigFields = function generatePostgresOperationConfigFields(config) {
+  return [{
+    name: 'configType',
+    label: 'Type',
+    type: 'select',
+    options: _integrationTypes["default"],
+    initialValue: 'postgres',
+    required: true,
+    enabled: false
+  }, {
+    name: 'statement',
+    label: 'Query',
+    type: 'code',
+    language: 'postgresql',
+    initialValue: (0, _immutable.get)(config, 'statement'),
+    required: true
+  }, {
+    name: 'parameters',
+    label: 'Query Parameters',
+    type: 'text-multi',
+    initialValue: (0, _immutable.get)(config, 'parameters'),
+    placeholder: 'Value',
+    helpText: /*#__PURE__*/React.createElement(React.Fragment, null, "Use the ", /*#__PURE__*/React.createElement("code", null, '{{parameter}}'), " format to create dynamic parameters.")
+  }];
+};
+var generateMSSQLOperationConfigFields = exports.generateMSSQLOperationConfigFields = function generateMSSQLOperationConfigFields(config) {
+  return [{
+    name: 'configType',
+    label: 'Type',
+    type: 'select',
+    options: _integrationTypes["default"],
+    initialValue: 'mssql',
+    required: true,
+    enabled: false
+  }, {
+    name: 'statement',
+    label: 'Query',
+    type: 'code',
+    language: 'mssql',
+    initialValue: (0, _immutable.get)(config, 'statement'),
+    required: true
+  }, {
+    name: 'parameters',
+    label: 'Query Parameters',
+    type: 'map',
+    initialValue: (0, _immutable.get)(config, 'parameters'),
+    placeholder: 'Key',
+    helpText: /*#__PURE__*/React.createElement(React.Fragment, null, "Use the ", /*#__PURE__*/React.createElement("code", null, '{{parameter}}'), " format to create dynamic parameters.")
+  }];
+};

package/lib/components/system/SystemUserForm.js

@@ -35,6 +35,8 @@ var fields = function fields() {
       label: 'Username',
       type: 'text',
       required: true,
+      pattern: /^[^/&?=:%]*$/,
+      patternMessage: 'The characters / & ? = : % are not allowed.',
       initialValue: (0, _immutable.get)(user, 'username') || ''
     }, {
       name: 'password',

package/lib/components/table/Table.js

@@ -20,6 +20,7 @@ var _store = require("../../store");
 var _Table = require("./Table.redux");
 var _helpers = require("../../helpers");
 var _Form = require("../form/Form");
+var _FormState = require("../form/FormState");
 var _excluded = ["components", "tableKey"];
 var fromColumnSet = function fromColumnSet(columns, columnSet) {
   return columnSet.map(function (cs) {
@@ -46,10 +47,19 @@ var TableComponent = function TableComponent(props) {
       count = props.count,
       extraData = props.extraData;
     var columnControl = buildColumnControl(props);
+    var filterControl = buildFilterControl(props);
     var table = buildTable((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, props), {}, {
       columnControl: columnControl
     }));
-    var filter = components.FilterForm ? buildFilterForm(props) : buildFilterLayout(props);
+    var filter = components.FilterForm ? buildFilterForm((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, props), {}, {
+      renderers: {
+        filterControl: function filterControl(args) {
+          return buildFilterControl((0, _objectSpread2["default"])({
+            args: args
+          }, props));
+        }
+      }
+    })) : buildFilterLayout(props);
     var pagination = buildPaginationControl(props);
     return children({
       tableKey: tableKey,
@@ -59,6 +69,7 @@ var TableComponent = function TableComponent(props) {
       appliedFilters: appliedFilters,
       pagination: pagination,
       columnControl: columnControl,
+      filterControl: filterControl,
       initializing: initializing,
       loading: loading,
       rows: rows,
@@ -143,6 +154,7 @@ var buildFilterForm = function buildFilterForm(props) {
     formKey: props.filterFormKey,
     tableKey: props.tableKey,
     components: components,
+    renderers: props.renderers,
     alterFields: props.alterFilters,
     fieldSet: props.filterSet,
     onSave: props.onSearch,
@@ -323,6 +335,41 @@ var buildColumnControl = function buildColumnControl(props) {
     extraData: extraData
   });
 };
+var buildFilterControl = function buildFilterControl(_ref4) {
+  var tableKey = _ref4.tableKey,
+    filterSet = _ref4.filterSet,
+    appliedFilters = _ref4.appliedFilters,
+    components = _ref4.components,
+    _ref4$args = _ref4.args,
+    args = _ref4$args === void 0 ? {} : _ref4$args;
+  var FilterControl = components.FilterControl;
+  return /*#__PURE__*/_react["default"].createElement(_FormState.FormState, {
+    formKey: (0, _Table.filterFormKey)(tableKey),
+    selector: function selector(formState) {
+      var _formState$fields, _formState$fields$map;
+      return {
+        filterFields: formState === null || formState === void 0 ? void 0 : (_formState$fields = formState.fields) === null || _formState$fields === void 0 ? void 0 : (_formState$fields$map = _formState$fields.map(function (field, name) {
+          return (0, _immutable.Map)({
+            name: name,
+            label: field.get('label'),
+            value: field.get('value'),
+            options: field.get('options'),
+            checked: filterSet === null || filterSet === void 0 ? void 0 : filterSet.includes(name),
+            toggle: onToggleFilter(tableKey, name)
+          });
+        })) === null || _formState$fields$map === void 0 ? void 0 : _formState$fields$map.toList()
+      };
+    }
+  }, function (_ref5) {
+    var _appliedFilters$filte;
+    var filterFields = _ref5.filterFields;
+    return /*#__PURE__*/_react["default"].createElement(FilterControl, Object.assign({}, args, {
+      tableKey: tableKey,
+      filterFields: filterFields,
+      filterCount: appliedFilters === null || appliedFilters === void 0 ? void 0 : (_appliedFilters$filte = appliedFilters.filter(Boolean)) === null || _appliedFilters$filte === void 0 ? void 0 : _appliedFilters$filte.size
+    }));
+  });
+};
 var buildTable = exports.buildTable = function buildTable(props) {
   var TableLayout = props.components.TableLayout;
   var header = buildTableHeader(props);
@@ -557,6 +604,17 @@ var onToggleColumn = function onToggleColumn(tableKey, column) {
     });
   };
 };
+var onToggleFilter = function onToggleFilter(tableKey) {
+  for (var _len = arguments.length, filters = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+    filters[_key - 1] = arguments[_key];
+  }
+  return function () {
+    return (0, _store.dispatch)('TOGGLE_FILTER', {
+      tableKey: tableKey,
+      filters: filters
+    });
+  };
+};
 var mapStateToProps = function mapStateToProps() {
   return function (state, props) {
     return state.getIn(['tables', props.tableKey], (0, _immutable.Map)()).toObject();
@@ -635,18 +693,18 @@ var extractColumnComponents = exports.extractColumnComponents = function extract
     return result.set(current.get('value'), current.get('components'));
   }, (0, _immutable.Map)());
 };
-var generateTable = exports.generateTable = function generateTable(_ref4) {
-  var _ref4$tableOptions = _ref4.tableOptions,
-    tableOptions = _ref4$tableOptions === void 0 ? [] : _ref4$tableOptions,
-    _ref4$filterDataSourc = _ref4.filterDataSources,
-    filterDataSources = _ref4$filterDataSourc === void 0 ? function () {
+var generateTable = exports.generateTable = function generateTable(_ref6) {
+  var _ref6$tableOptions = _ref6.tableOptions,
+    tableOptions = _ref6$tableOptions === void 0 ? [] : _ref6$tableOptions,
+    _ref6$filterDataSourc = _ref6.filterDataSources,
+    filterDataSources = _ref6$filterDataSourc === void 0 ? function () {
       return {};
-    } : _ref4$filterDataSourc,
-    filters = _ref4.filters,
-    columns = _ref4.columns,
-    dataSource = _ref4.dataSource,
-    sortable = _ref4.sortable,
-    onValidateFilters = _ref4.onValidateFilters;
+    } : _ref6$filterDataSourc,
+    filters = _ref6.filters,
+    columns = _ref6.columns,
+    dataSource = _ref6.dataSource,
+    sortable = _ref6.sortable,
+    onValidateFilters = _ref6.onValidateFilters;
   return function (props) {
     var tableOptionProps = tableOptions ? tableOptions.reduce(function (to, opt) {
       to[opt] = props[opt];
@@ -658,8 +716,8 @@ var generateTable = exports.generateTable = function generateTable(_ref4) {
         dataSources: filterDataSources,
         fields: filters,
         formOptions: ['tableKey'].concat((0, _toConsumableArray2["default"])(tableOptions)),
-        handleSubmit: function handleSubmit(_ref5) {
-          var tableKey = _ref5.tableKey;
+        handleSubmit: function handleSubmit(_ref7) {
+          var tableKey = _ref7.tableKey;
           return function (values) {
             (0, _store.dispatch)('APPLY_FILTER_FORM', {
               tableKey: tableKey,
@@ -712,7 +770,9 @@ var generateTable = exports.generateTable = function generateTable(_ref4) {
       filterForm: !!filters,
       initialFilterValues: props.initialFilterValues || {},
       onSearch: props.onSearch,
-      onFetch: props.onFetch
+      onFetch: props.onFetch,
+      onColumnSort: props.onColumnSort,
+      onColumnToggle: props.onColumnToggle
     };
     return /*#__PURE__*/_react["default"].createElement(Table, setProps, props.children);
   };