@kineticdata/react 6.1.1 → 7.0.0-rc1

package/lib/components/core/oauth_client/OAuthClientForm.js

@@ -8,12 +8,17 @@ var _immutable = require("immutable");
 var _Form = require("../../form/Form");
 var _apis = require("../../../apis");
 var dataSources = function dataSources(_ref) {
-  var clientId = _ref.clientId;
+  var clientId = _ref.clientId,
+    username = _ref.username,
+    me = _ref.me;
   return {
     client: {
       fn: _apis.fetchOAuthClient,
       params: clientId && [{
-        clientId: clientId
+        clientId: clientId,
+        username: username,
+        me: me,
+        include: 'details'
       }],
       transform: function transform(result) {
         return result.client;
@@ -22,11 +27,21 @@ var dataSources = function dataSources(_ref) {
   };
 };
 var handleSubmit = function handleSubmit(_ref2) {
-  var clientId = _ref2.clientId;
+  var clientId = _ref2.clientId,
+    username = _ref2.username,
+    me = _ref2.me;
   return function (values) {
+    var clientData = values.toJS();
+    // The UserField typeahead stores the full user object; extract the
+    // username string before sending to the API.
+    if (clientData.serviceUsername && typeof clientData.serviceUsername === 'object') {
+      clientData.serviceUsername = clientData.serviceUsername.username || '';
+    }
     return (clientId ? _apis.updateOAuthClient : _apis.createOAuthClient)({
       clientId: clientId,
-      client: values.toJS()
+      username: username,
+      me: me,
+      client: clientData
     }).then(function (_ref3) {
       var client = _ref3.client,
         error = _ref3.error;
@@ -37,10 +52,37 @@ var handleSubmit = function handleSubmit(_ref2) {
     });
   };
 };
-var fields = function fields(_ref4) {
-  var clientId = _ref4.clientId;
-  return function (_ref5) {
-    var client = _ref5.client;
+var isUserScoped = function isUserScoped(_ref4) {
+  var username = _ref4.username,
+    me = _ref4.me;
+  return !!username || !!me;
+};
+var UserScopedClientIdField = function UserScopedClientIdField(props) {
+  return props.visible && /*#__PURE__*/React.createElement("div", {
+    className: "mb-3"
+  }, /*#__PURE__*/React.createElement("label", {
+    className: "form-label"
+  }, props.label), props.value ? /*#__PURE__*/React.createElement("div", {
+    className: "form-control-plaintext"
+  }, props.value) : /*#__PURE__*/React.createElement("div", {
+    className: "form-text text-muted"
+  }, "A Client ID will be generated automatically when this client is saved."));
+};
+var UserScopedClientSecretField = function UserScopedClientSecretField(props) {
+  return props.visible && /*#__PURE__*/React.createElement("div", {
+    className: "mb-3"
+  }, /*#__PURE__*/React.createElement("label", {
+    className: "form-label"
+  }, props.label), /*#__PURE__*/React.createElement("div", {
+    className: "form-text text-muted"
+  }, "A Client Secret will be generated automatically when this client is saved."));
+};
+var fields = function fields(_ref5) {
+  var clientId = _ref5.clientId,
+    username = _ref5.username,
+    me = _ref5.me;
+  return function (_ref6) {
+    var client = _ref6.client;
     return (!clientId || client) && [{
       name: 'name',
       label: 'Name',
@@ -57,52 +99,228 @@ var fields = function fields(_ref4) {
       name: 'clientId',
       label: 'Client ID',
       type: 'text',
-      required: true,
+      required: !isUserScoped({
+        username: username,
+        me: me
+      }),
+      enabled: !isUserScoped({
+        username: username,
+        me: me
+      }),
+      "transient": isUserScoped({
+        username: username,
+        me: me
+      }),
       initialValue: (0, _immutable.get)(client, 'clientId') || '',
-      helpText: 'A unique identifier for this client'
+      component: isUserScoped({
+        username: username,
+        me: me
+      }) ? UserScopedClientIdField : undefined,
+      helpText: !isUserScoped({
+        username: username,
+        me: me
+      }) ? 'A unique identifier for this client' : undefined,
+      pattern: !isUserScoped({
+        username: username,
+        me: me
+      }) ? /^[a-zA-Z0-9-]+$/ : undefined,
+      patternMessage: 'Client ID may only contain letters, numbers, or hyphens.',
+      constraint: function constraint(_ref7) {
+        var values = _ref7.values;
+        return !['system', 'system-dev'].includes(values.get('clientId'));
+      },
+      constraintMessage: 'Client ID may not be set to a reserved value.'
     }, {
       name: 'clientSecret',
       label: 'Client Secret',
       type: 'password',
-      visible: function visible(_ref6) {
-        var values = _ref6.values;
+      // User-scoped create: show informational text
+      // User-scoped edit: hidden (replaced by external reset button)
+      // Non-user-scoped: standard secret field toggled by changeClientSecret
+      visible: isUserScoped({
+        username: username,
+        me: me
+      }) ? !clientId : function (_ref8) {
+        var values = _ref8.values;
         return values.get('changeClientSecret');
       },
-      required: function required(_ref7) {
-        var values = _ref7.values;
+      required: isUserScoped({
+        username: username,
+        me: me
+      }) ? false : function (_ref9) {
+        var values = _ref9.values;
         return values.get('changeClientSecret');
       },
-      "transient": function transient(_ref8) {
-        var values = _ref8.values;
+      "transient": isUserScoped({
+        username: username,
+        me: me
+      }) ? true : function (_ref10) {
+        var values = _ref10.values;
         return !values.get('changeClientSecret');
-      }
+      },
+      component: isUserScoped({
+        username: username,
+        me: me
+      }) && !clientId ? UserScopedClientSecretField : undefined
     }, {
       name: 'changeClientSecret',
       label: 'Change Client Secret',
       type: 'checkbox',
       "transient": true,
-      // in "new" mode we do not show this toggle field and default it to true
-      visible: !!clientId,
-      initialValue: !clientId,
-      onChange: function onChange(_ref9, _ref10) {
-        var values = _ref9.values;
-        var setValue = _ref10.setValue;
+      // User-scoped: always hidden (create uses auto-gen, edit uses reset)
+      // Non-user-scoped edit: visible toggle
+      // Non-user-scoped create: hidden, defaults to true
+      visible: isUserScoped({
+        username: username,
+        me: me
+      }) ? false : !!clientId,
+      initialValue: isUserScoped({
+        username: username,
+        me: me
+      }) ? false : !clientId,
+      onChange: function onChange(_ref11, _ref12) {
+        var values = _ref11.values;
+        var setValue = _ref12.setValue;
         if (values.get('clientSecret') !== '') {
           setValue('clientSecret', '');
         }
       }
     }, {
-      name: 'redirectUri',
-      label: 'Redirect URI',
+      name: 'clientType',
+      label: 'Client Type',
+      type: 'select',
+      required: true,
+      initialValue: (0, _immutable.get)(client, 'clientType') || '',
+      options: [{
+        label: 'Confidential',
+        value: 'confidential'
+      }, {
+        label: 'Public',
+        value: 'public'
+      }],
+      helpText: 'Determines authentication methods, grant types, and proof key requirements'
+    }, {
+      name: 'serviceUsername',
+      label: 'Service User',
       type: 'text',
+      required: false,
+      visible: !isUserScoped({
+        username: username,
+        me: me
+      }),
+      initialValue: (0, _immutable.get)(client, 'serviceUsername') ? (0, _immutable.Map)({
+        username: (0, _immutable.get)(client, 'serviceUsername')
+      }) : '',
+      helpText: 'Optional user whose identity this client acts on behalf of'
+    }, {
+      name: 'redirectUris',
+      label: 'Redirect URIs',
+      type: 'text-multi',
       required: true,
-      initialValue: (0, _immutable.get)(client, 'redirectUri') || '',
-      helpText: 'Identifier or location of OAuth callback'
+      initialValue: (0, _immutable.get)(client, 'redirectUris') || [],
+      helpText: 'Allowed redirect URIs for this client'
+    }, {
+      name: 'scopes',
+      label: 'Scopes',
+      type: 'checkbox-multi',
+      initialValue: (0, _immutable.get)(client, 'scopes') || [],
+      options: [{
+        label: 'Full',
+        value: 'full'
+      }, {
+        label: 'Read',
+        value: 'read'
+      }, {
+        label: 'Write',
+        value: 'write'
+      }, {
+        label: 'Admin',
+        value: 'admin'
+      }, {
+        label: 'Submissions',
+        value: 'submissions'
+      }, {
+        label: 'Submissions: Read',
+        value: 'submissions:read'
+      }],
+      helpText: 'OAuth scopes this client can request'
+    }, {
+      name: 'requireConsent',
+      label: 'Require Consent',
+      type: 'checkbox',
+      initialValue: (0, _immutable.get)(client, 'requireConsent') || false,
+      helpText: 'Require user consent before granting access to this client'
+    }, {
+      name: 'logoUri',
+      label: 'Logo URI',
+      type: 'text',
+      required: false,
+      initialValue: (0, _immutable.get)(client, 'logoUri') || '',
+      helpText: 'URL to client logo displayed on consent screen'
+    }, {
+      name: 'clientAuthenticationMethods',
+      label: 'Client Authentication Methods',
+      type: 'checkbox-multi',
+      initialValue: (0, _immutable.get)(client, 'clientAuthenticationMethods') || [],
+      options: [{
+        label: 'Client Secret Basic',
+        value: 'client_secret_basic'
+      }, {
+        label: 'Client Secret Post',
+        value: 'client_secret_post'
+      }, {
+        label: 'None',
+        value: 'none'
+      }]
+    }, {
+      name: 'authorizationGrantTypes',
+      label: 'Authorization Grant Types',
+      type: 'checkbox-multi',
+      initialValue: (0, _immutable.get)(client, 'authorizationGrantTypes') || [],
+      options: [{
+        label: 'Authorization Code',
+        value: 'authorization_code'
+      }, {
+        label: 'Client Credentials',
+        value: 'client_credentials'
+      }]
+    }, {
+      name: 'requireProofKey',
+      label: 'Require Proof Key',
+      type: 'checkbox',
+      initialValue: (0, _immutable.get)(client, 'requireProofKey') || false
+    }, {
+      name: 'enabled',
+      label: 'Enabled',
+      type: 'checkbox',
+      initialValue: (0, _immutable.get)(client, 'enabled') !== false,
+      helpText: 'Whether this client is currently enabled'
+    }, {
+      name: 'dynamicallyRegistered',
+      label: 'Dynamically Registered',
+      type: 'checkbox',
+      "transient": true,
+      enabled: false,
+      initialValue: (0, _immutable.get)(client, 'dynamicallyRegistered') || false
+    }, {
+      name: 'lastUsedAt',
+      label: 'Last Used',
+      type: 'text',
+      "transient": true,
+      enabled: false,
+      initialValue: (0, _immutable.get)(client, 'lastUsedAt') || ''
+    }, {
+      name: 'expiresAt',
+      label: 'Expires',
+      type: 'text',
+      "transient": true,
+      enabled: false,
+      initialValue: (0, _immutable.get)(client, 'expiresAt') || ''
     }];
   };
 };
 var OAuthClientForm = exports.OAuthClientForm = (0, _Form.generateForm)({
-  formOptions: ['clientId'],
+  formOptions: ['clientId', 'username', 'me'],
   dataSources: dataSources,
   fields: fields,
   handleSubmit: handleSubmit

package/lib/components/core/oauth_client/OAuthClientTable.js

@@ -1,23 +1,43 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.OAuthClientTable = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
+var _react = _interopRequireDefault(require("react"));
 var _Table = require("../../table/Table");
 var _apis = require("../../../apis");
 var _helpers = require("../../../helpers");
-var clientSide = (0, _helpers.defineFilter)(true).startsWith('name', 'name').end();
+var BooleanYesNoCell = function BooleanYesNoCell(_ref) {
+  var value = _ref.value;
+  return /*#__PURE__*/_react["default"].createElement("td", null, value ? 'Yes' : 'No');
+};
+var clientSide = (0, _helpers.defineFilter)(true).startsWith('name', 'name').equals('dynamicallyRegistered', 'dynamicallyRegistered').equals('enabled', 'enabled').end();
 var dataSource = function dataSource() {
+  var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    username = _ref2.username,
+    me = _ref2.me;
   return {
     fn: _apis.fetchOAuthClients,
     clientSide: clientSide,
     params: function params() {
-      return [];
+      return username || me ? [{
+        username: username,
+        me: me,
+        include: 'details'
+      }] : [{
+        include: 'details'
+      }];
     },
     transform: function transform(result) {
       return {
-        data: result.oauthClients
+        data: result.oauthClients.map(function (client) {
+          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, client), {}, {
+            dynamicallyRegistered: !!client.dynamicallyRegistered
+          });
+        })
       };
     }
   };
@@ -28,6 +48,28 @@ var filters = function filters() {
       name: 'name',
       label: 'Name',
       type: 'text'
+    }, {
+      name: 'dynamicallyRegistered',
+      label: 'Dynamically Registered',
+      type: 'select',
+      options: [{
+        label: 'Yes',
+        value: 'true'
+      }, {
+        label: 'No',
+        value: 'false'
+      }]
+    }, {
+      name: 'enabled',
+      label: 'Enabled',
+      type: 'select',
+      options: [{
+        label: 'Yes',
+        value: 'true'
+      }, {
+        label: 'No',
+        value: 'false'
+      }]
     }];
   };
 };
@@ -35,20 +77,47 @@ var columns = [{
   value: 'clientId',
   title: 'Client ID',
   sortable: true
+}, {
+  value: 'name',
+  title: 'Name',
+  sortable: true
 }, {
   value: 'description',
   title: 'Description',
   sortable: false
 }, {
-  value: 'name',
-  title: 'Name',
+  value: 'clientType',
+  title: 'Client Type',
   sortable: true
 }, {
-  value: 'redirectUri',
-  title: 'Redirect URI',
-  sortable: true
+  value: 'dynamicallyRegistered',
+  title: 'DCR',
+  sortable: true,
+  toggleable: true,
+  components: {
+    BodyCell: BooleanYesNoCell
+  }
+}, {
+  value: 'enabled',
+  title: 'Enabled',
+  sortable: true,
+  toggleable: true,
+  components: {
+    BodyCell: BooleanYesNoCell
+  }
+}, {
+  value: 'lastUsedAt',
+  title: 'Last Used',
+  sortable: true,
+  toggleable: true
+}, {
+  value: 'expiresAt',
+  title: 'Expires',
+  sortable: true,
+  toggleable: true
 }];
 var OAuthClientTable = exports.OAuthClientTable = (0, _Table.generateTable)({
+  tableOptions: ['username', 'me'],
   columns: columns,
   filters: filters,
   dataSource: dataSource

package/lib/components/index.js

@@ -171,6 +171,18 @@ Object.defineProperty(exports, "CreateManualTriggerForm", {
     return _CreateManualTriggerForm.CreateManualTriggerForm;
   }
 });
+Object.defineProperty(exports, "CustomIndexForm", {
+  enumerable: true,
+  get: function get() {
+    return _CustomIndexForm.CustomIndexForm;
+  }
+});
+Object.defineProperty(exports, "CustomIndexTable", {
+  enumerable: true,
+  get: function get() {
+    return _CustomIndexTable.CustomIndexTable;
+  }
+});
 Object.defineProperty(exports, "DatastoreSubmissionTable", {
   enumerable: true,
   get: function get() {
@@ -1111,6 +1123,8 @@ var _I18n = require("./core/i18n/I18n");
 var _Moment = require("./core/i18n/Moment");
 var _I18nProvider = require("./core/i18n/I18nProvider");
 var _CoreForm = require("./core/core_form/CoreForm");
+var _CustomIndexForm = require("./core/custom_index/CustomIndexForm");
+var _CustomIndexTable = require("./core/custom_index/CustomIndexTable");
 var _IndexDefinitionForm = require("./core/index_definition/IndexDefinitionForm");
 var _IndexDefinitionTable = require("./core/index_definition/IndexDefinitionTable");
 var _IndexJobTable = require("./core/index_job/IndexJobTable");

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

@@ -110,7 +110,7 @@ var generateHttpOperationConfigFields = exports.generateHttpOperationConfigField
     // { label: 'Multipart', value: 'multipart_form' },
     ],
 
-    initialValue: (0, _immutable.getIn)(config, ['body', 'bodyType']) || 'www_form_urlencoded'
+    initialValue: (0, _immutable.getIn)(config, ['body', 'bodyType']) || 'raw'
   }, {
     name: 'body.form',
     label: 'Form Body',

package/lib/components/task/builder/helpers.js

@@ -174,6 +174,7 @@ var buildBindings = exports.buildBindings = function buildBindings(_ref6) {
     connections = _ref6.connections,
     node = _ref6.node;
   var Results = tree.nodes.reduce(function (results, node) {
+    if (!node.name) return results;
     var isIntegration = node.definitionId.startsWith("".concat(_constants.ADVANCED_HANDLER_NAME_INTEGRATION, "_v"));
     if (isIntegration) {
       var _node$parameters$find, _node$parameters$find2;
@@ -184,13 +185,13 @@ var buildBindings = exports.buildBindings = function buildBindings(_ref6) {
       })) === null || _node$parameters$find2 === void 0 ? void 0 : _node$parameters$find2.value, 'outputs']);
       if (outputs) {
         return results.set(node.name, outputs.reduce(function (res, _, name) {
-          return res.set(name, "@results['".concat(node.name, "']['").concat(name, "']"));
+          return res.set(name, "<%= @results['".concat(node.name, "']['").concat(name, "'] %>"));
         }, (0, _immutable.Map)()));
       }
     }
     var task = tasks.get(node.definitionId);
     return results.set(node.name, (task && (task.results || task.outputs) || []).reduce(function (res, output) {
-      return res.set(output.name, "@results['".concat(node.name, "']['").concat(output.name, "']"));
+      return res.set(output.name, "<%= @results['".concat(node.name, "']['").concat(output.name, "'] %>"));
     }, (0, _immutable.Map)()));
   }, (0, _immutable.Map)()).filter(function (results) {
     return !results.isEmpty();

package/lib/helpers/index.js

@@ -17,10 +17,11 @@ var _exportNames = {
   handleFormErrors: true,
   INDEX_STATIC_PARTS: true,
   TIMELINES: true,
+  CUSTOM_INDEX_PROPERTIES: true,
   MAX_PART_LENGTH: true,
   usePrevious: true
 };
-exports.splitTeamName = exports.slugify = exports.partitionListBy = exports.handleFormErrors = exports.generateKey = exports.bundle = exports.buildDefinitionId = exports.buildCodeEditorBindings = exports.buildAgentPath = exports.TIMELINES = exports.MAX_PART_LENGTH = exports.K = exports.INDEX_STATIC_PARTS = void 0;
+exports.splitTeamName = exports.slugify = exports.partitionListBy = exports.handleFormErrors = exports.generateKey = exports.bundle = exports.buildDefinitionId = exports.buildCodeEditorBindings = exports.buildAgentPath = exports.TIMELINES = exports.MAX_PART_LENGTH = exports.K = exports.INDEX_STATIC_PARTS = exports.CUSTOM_INDEX_PROPERTIES = void 0;
 exports.usePrevious = usePrevious;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toArray"));
@@ -419,6 +420,10 @@ var handleFormErrors = exports.handleFormErrors = function handleFormErrors(key)
 };
 var INDEX_STATIC_PARTS = exports.INDEX_STATIC_PARTS = ['closedBy', 'coreState', 'createdBy', 'handle', 'submittedBy', 'type', 'updatedBy'].sort();
 var TIMELINES = exports.TIMELINES = ['createdAt', 'updatedAt', 'submittedAt', 'closedAt'].sort();
+
+// Postgres custom-index property allowlist. Snake-case, server-canonical.
+// Disjoint from INDEX_STATIC_PARTS (Cassandra-era, camelCase).
+var CUSTOM_INDEX_PROPERTIES = exports.CUSTOM_INDEX_PROPERTIES = ['closed_at', 'core_state', 'created_at', 'label', 'submitted_at', 'submitted_by', 'updated_at'];
 var MAX_PART_LENGTH = exports.MAX_PART_LENGTH = 10;
 function usePrevious(value) {
   // The ref object is a generic container whose current property is mutable ...

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kineticdata/react",
-  "version": "6.1.1",
+  "version": "7.0.0-rc1",
   "description": "A React library for the Kinetic Platform",
   "main": "lib/index.js",
   "files": [
@@ -19,21 +19,21 @@
     "prepublishOnly": "yarn build"
   },
   "dependencies": {
-    "axios": "1.8.3",
+    "axios": "^1.15.2",
     "classnames": "^2.2.6",
     "deepequal": "^0.0.1",
     "draft-js": "^0.11.7",
     "history": "^4.9.0",
-    "immutable": "4.0.0-rc.9",
+    "immutable": "4.3.8",
     "kld-intersections": "^0.7.0",
-    "lodash-es": "^4.17.21",
+    "lodash-es": "^4.18.1",
     "lodash.isplainobject": "^4.0.6",
     "lodash.isstring": "^4.0.1",
     "modularscale-sass": "^3.0.8",
     "moment": "^2.29.4",
     "prismjs": "1.30.0",
     "prop-types": "^15.8.1",
-    "qs": "^6.11.0",
+    "qs": "^6.14.2",
     "react-autosuggest": "^9.4.3",
     "react-beautiful-dnd": "^11.0.5",
     "react-popper": "^1.3.4",