@kineticdata/react 5.1.2 → 6.0.1

package/lib/components/core/submission/KappSubmissionTable.js

@@ -1,39 +1,42 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { getIn, List, Map, Set } from 'immutable';
-import { generateTable } from '../../table/Table';
-import { fetchForm, fetchKapp, searchSubmissions, SubmissionSearch, VALID_KAPP_CORE_STATES } from '../../../apis';
+"use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.KappSubmissionTable = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
+var _immutable = require("immutable");
+var _Table = require("../../table/Table");
+var _apis = require("../../../apis");
 var applyMeta = function applyMeta(query, op, rvalue) {
   return rvalue ? query[op](rvalue) : query;
 };
-
 var applyOp = function applyOp(query, op, lvalue, rvalue) {
   return rvalue ? query[op](lvalue, rvalue) : query;
 };
-
 var submissionSearch = function submissionSearch(_ref, include) {
   var filters = _ref.filters,
-      pageSize = _ref.pageSize,
-      sortColumn = _ref.sortColumn,
-      sortDirection = _ref.sortDirection;
-  var query = new SubmissionSearch().includes(Set([].concat(_toConsumableArray(typeof include === 'string' ? include.split(',') : Array.isArray(include) ? include : []), ['details', 'form'])).toJS()).sortBy(sortColumn || 'createdAt').sortDirection(sortDirection.toLocaleUpperCase()).limit(pageSize);
+    pageSize = _ref.pageSize,
+    sortColumn = _ref.sortColumn,
+    sortDirection = _ref.sortDirection;
+  var query = new _apis.SubmissionSearch().includes((0, _immutable.Set)([].concat((0, _toConsumableArray2["default"])(typeof include === 'string' ? include.split(',') : Array.isArray(include) ? include : []), ['details', 'form'])).toJS()).sortBy(sortColumn || 'createdAt').sortDirection(sortDirection.toLocaleUpperCase()).limit(pageSize);
   applyMeta(query, 'coreState', filters.get('coreState'));
   applyMeta(query, 'startDate', filters.get('startDate') && new Date("".concat(filters.get('startDate'), "T00:00:00")));
   applyMeta(query, 'endDate', filters.get('endDate') && new Date("".concat(filters.get('endDate'), "T00:00:00")));
   applyOp(query, 'eq', 'handle', filters.get('handle'));
   applyOp(query, 'eq', 'submittedBy', filters.getIn(['submittedBy', 'username']));
-  filters.get('values', Map()).forEach(function (value, field) {
+  filters.get('values', (0, _immutable.Map)()).forEach(function (value, field) {
     return applyOp(query, 'eq', "values[".concat(field, "]"), value);
   });
   return query.build();
 };
-
 var dataSource = function dataSource(_ref2) {
   var formSlug = _ref2.formSlug,
-      kappSlug = _ref2.kappSlug,
-      include = _ref2.include;
+    kappSlug = _ref2.kappSlug,
+    include = _ref2.include;
   return {
-    fn: searchSubmissions,
+    fn: _apis.searchSubmissions,
     params: function params(paramData) {
       return [{
         kapp: kappSlug,
@@ -50,19 +53,17 @@ var dataSource = function dataSource(_ref2) {
     }
   };
 };
-
 var onValidateFilters = function onValidateFilters(filters) {
-  return filters.getIn(['values', 'value'], List()).reduce(function (valid, value) {
+  return filters.getIn(['values', 'value'], (0, _immutable.List)()).reduce(function (valid, value) {
     return valid && value.get('field') !== '' ? value.get('value') !== '' : valid;
   }, true);
 };
-
 var filterDataSources = function filterDataSources(_ref3) {
   var kappSlug = _ref3.kappSlug,
-      formSlug = _ref3.formSlug;
+    formSlug = _ref3.formSlug;
   return {
     kapp: {
-      fn: fetchKapp,
+      fn: _apis.fetchKapp,
       params: [{
         kappSlug: kappSlug,
         include: 'fields'
@@ -73,7 +74,7 @@ var filterDataSources = function filterDataSources(_ref3) {
     },
     form: {
       fn: function fn(formSlug) {
-        return formSlug ? fetchForm({
+        return formSlug ? (0, _apis.fetchForm)({
           kappSlug: kappSlug,
           formSlug: formSlug,
           include: 'fields'
@@ -81,7 +82,7 @@ var filterDataSources = function filterDataSources(_ref3) {
       },
       params: function params(_ref4) {
         var values = _ref4.values;
-        return [getIn(values, ['form', 'slug'], formSlug)];
+        return [(0, _immutable.getIn)(values, ['form', 'slug'], formSlug)];
       },
       transform: function transform(result) {
         return result && result.form;
@@ -93,7 +94,7 @@ var filterDataSources = function filterDataSources(_ref3) {
       },
       params: function params(_ref5) {
         var form = _ref5.form,
-            kapp = _ref5.kapp;
+          kapp = _ref5.kapp;
         return kapp && [form, kapp];
       },
       transform: function transform(result) {
@@ -107,7 +108,7 @@ var filterDataSources = function filterDataSources(_ref3) {
     },
     coreStateOptions: {
       fn: function fn() {
-        return VALID_KAPP_CORE_STATES;
+        return _apis.VALID_KAPP_CORE_STATES;
       },
       params: [],
       transform: function transform(coreStates) {
@@ -121,10 +122,9 @@ var filterDataSources = function filterDataSources(_ref3) {
     }
   };
 };
-
 var filters = function filters(_ref6) {
   var kappSlug = _ref6.kappSlug,
-      formSlug = _ref6.formSlug;
+    formSlug = _ref6.formSlug;
   return function (_ref7) {
     var coreStateOptions = _ref7.coreStateOptions;
     return coreStateOptions && [{
@@ -168,77 +168,94 @@ var filters = function filters(_ref6) {
     }];
   };
 };
-
 var columns = [{
   value: 'closedAt',
-  title: 'Closed At',
-  sortable: true
+  title: 'Closed',
+  sortable: true,
+  toggleable: true
 }, {
   value: 'closedBy',
-  title: 'closedBy',
-  sortable: false
+  title: 'Closed By',
+  sortable: false,
+  toggleable: true
 }, {
   value: 'coreState',
   title: 'Core State',
-  sortable: false
+  sortable: false,
+  toggleable: true
 }, {
   value: 'createdAt',
   title: 'Created',
-  sortable: true
+  sortable: true,
+  toggleable: true
 }, {
   value: 'createdBy',
   title: 'Created By',
-  sortable: false
+  sortable: false,
+  toggleable: true
 }, {
   value: 'currentPage',
   title: 'Current Page',
-  sortable: false
+  sortable: false,
+  toggleable: true
 }, {
   value: 'handle',
   title: 'Handle',
-  sortable: false
+  sortable: false,
+  toggleable: false,
+  columnOrder: 'first'
 }, {
   value: 'id',
   title: 'Id',
-  sortable: false
+  sortable: false,
+  toggleable: true
 }, {
   value: 'label',
   title: 'Label',
-  sortable: false
+  sortable: false,
+  toggleable: true
 }, {
   value: 'origin',
   title: 'Origin',
-  sortable: false
+  sortable: false,
+  toggleable: true
 }, {
   value: 'parent',
   title: 'Parent',
-  sortable: false
+  sortable: false,
+  toggleable: true
 }, {
   value: 'sessionToken',
   title: 'Session Token',
-  sortable: false
+  sortable: false,
+  toggleable: true
 }, {
   value: 'submittedAt',
   title: 'Submitted At',
-  sortable: true
+  sortable: true,
+  toggleable: true
 }, {
   value: 'submittedBy',
   title: 'Submitted By',
-  sortable: false
+  sortable: false,
+  toggleable: true
 }, {
   value: 'type',
   title: 'Type',
-  sortable: false
+  sortable: false,
+  toggleable: true
 }, {
   value: 'updatedAt',
   title: 'Updated',
-  sortable: true
+  sortable: true,
+  toggleable: true
 }, {
   value: 'updatedBy',
   title: 'Updated By',
-  sortable: false
+  sortable: false,
+  toggleable: true
 }];
-export var KappSubmissionTable = generateTable({
+var KappSubmissionTable = (0, _Table.generateTable)({
   tableOptions: ['kappSlug', 'formSlug', 'datastore', 'include'],
   columns: columns,
   dataSource: dataSource,
@@ -246,5 +263,7 @@ export var KappSubmissionTable = generateTable({
   filters: filters,
   onValidateFilters: onValidateFilters
 });
+exports.KappSubmissionTable = KappSubmissionTable;
 KappSubmissionTable.displayName = 'KappSubmissionTable';
-export default KappSubmissionTable;
+var _default = KappSubmissionTable;
+exports["default"] = _default;

package/lib/components/core/submission/SubmissionForm.js

@@ -1,124 +1,195 @@
-import { List, getIn } from 'immutable';
-import { fetchSubmission, updateSubmission } from '../../../apis';
-import { generateForm } from '../../form/Form';
-import moment from 'moment';
+"use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SubmissionForm = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
+var _immutable = require("immutable");
+var _apis = require("../../../apis");
+var _Form = require("../../form/Form");
+var _moment = _interopRequireDefault(require("moment"));
+var _lodashEs = require("lodash-es");
 var dataSources = function dataSources(_ref) {
-  var submissionId = _ref.submissionId;
+  var kappSlug = _ref.kappSlug,
+    formSlug = _ref.formSlug,
+    submissionId = _ref.submissionId;
   return {
     submission: {
-      fn: fetchSubmission,
-      params: [{
+      fn: _apis.fetchSubmission,
+      params: submissionId && [{
         id: submissionId,
-        include: 'details,values,form,form.fields,form.fields.details,form.pages'
+        include: 'details,values.raw,form,form.fields,form.fields.details,form.pages'
       }],
       transform: function transform(result) {
         return result.submission;
       }
+    },
+    form: {
+      fn: _apis.fetchForm,
+      params: kappSlug && formSlug && [{
+        kappSlug: kappSlug,
+        formSlug: formSlug,
+        include: 'pages'
+      }],
+      transform: function transform(result) {
+        return result.form;
+      }
+    },
+    pages: {
+      fn: function fn(form) {
+        return form.get('pages');
+      },
+      params: function params(_ref2) {
+        var form = _ref2.form,
+          submission = _ref2.submission;
+        return submission ? [submission.get('form')] : form ? [form] : null;
+      }
     }
   };
 };
-
-var handleSubmit = function handleSubmit(_ref2) {
-  var id = _ref2.submissionId;
+var handleSubmit = function handleSubmit(_ref3) {
+  var kappSlug = _ref3.kappSlug,
+    formSlug = _ref3.formSlug,
+    id = _ref3.submissionId;
   return function (values) {
-    return updateSubmission({
-      id: id,
-      values: values.toJS()
-    }).then(function (_ref3) {
-      var submission = _ref3.submission,
-          error = _ref3.error;
+    // Remove the new files to upload from the values.
+    var processedValues = values.map(function (value) {
+      return (0, _lodashEs.isArray)(value) || _immutable.List.isList(value) ? value.filter(function (entry) {
+        return !(entry instanceof File);
+      }) : value;
+    });
 
+    // Construct a list of files to upload by iterating through the values,
+    // flattening if the value is a List/Array and then filtering to only keep
+    // values that are instances of File, which represent new files to upload.
+    var files = values.entrySeq().flatMap(function (_ref4) {
+      var _ref5 = (0, _slicedToArray2["default"])(_ref4, 2),
+        field = _ref5[0],
+        vals = _ref5[1];
+      return (0, _lodashEs.isArray)(vals) || _immutable.List.isList(vals) ? (0, _immutable.List)(vals).filter(function (val) {
+        return val instanceof File;
+      }).map(function (file) {
+        return (0, _immutable.Map)({
+          field: field,
+          file: file
+        });
+      }) : [];
+    }).toList();
+    return (0, _apis.saveSubmissionMultipart)({
+      kappSlug: kappSlug,
+      formSlug: formSlug,
+      id: id,
+      values: processedValues,
+      files: files
+    }).then(function (_ref6) {
+      var submission = _ref6.submission,
+        error = _ref6.error;
       if (error) {
         throw error.statusCode === 400 && error.message || 'There was an error saving the submission';
       }
-
       return submission;
     });
   };
 };
-
 var traverseElement = function traverseElement(traverse, iteratee, acc) {
   var element = traverse.get(0);
   var elements = traverse.shift();
-  var childElements = element.get('elements', List());
-  var result = iteratee(element, acc); // If the current element has child elements make a recursive call.
-
+  var childElements = element.get('elements', (0, _immutable.List)());
+  var result = iteratee(element, acc);
+  // If the current element has child elements make a recursive call.
   if (childElements.size > 0) {
     result = traverseElement(childElements, iteratee, result);
   }
-
   if (elements.size > 0) {
     return traverseElement(elements, iteratee, result);
   }
-
   return result;
 };
-
 var convertRenderType = function convertRenderType(element) {
   if (element.get('renderType') === 'dropdown') {
     return element.get('choicesResourceName') ? 'text' : 'select';
   } else if (element.get('renderType') === 'checkbox') {
     return 'text-multi';
   } else if (element.get('renderType') === 'attachment') {
-    return 'text';
+    if (element.get('allowMultiple')) {
+      return 'file-multi';
+    } else {
+      return 'file';
+    }
   }
-
   return element.get('renderType');
 };
-
 var getInitialValue = function getInitialValue(submission, element, type) {
-  var name = element.get('name');
-  var isAttachment = element.get('renderType') === 'attachment';
-  var value = getIn(submission, ['values', name], element.get('renderType') === 'checkbox' ? List() : '') || '';
-  return isAttachment ? JSON.stringify(List.isList(value) ? value.toJS() : value) : type === 'datetime' ? moment(value).format('yyyy-MM-DDThh:mm') : type === 'date' ? moment(value).format('yyyy-MM-DD') : value;
+  var fieldKey = element.get('key');
+  var value = (0, _immutable.getIn)(submission, ['valuesRaw', fieldKey, 'value'], ['checkbox', 'attachment'].includes(element.get('renderType')) ? (0, _immutable.List)() : '') || '';
+
+  // To update a submission with existing submissions we need to grab the
+  // documentId and insert that into the attachment value normally returned with
+  // the submission.
+  if (element.get('renderType') === 'attachment') {
+    var rawValue = JSON.parse((0, _immutable.getIn)(submission, ['valuesRaw', fieldKey, 'rawValue'], null));
+    value = value.map(function (attachment, i) {
+      return attachment.set('documentId', (0, _immutable.getIn)(rawValue, [i, 'documentId'], null));
+    });
+  }
+  return type === 'datetime' && value ? (0, _moment["default"])(value).format('yyyy-MM-DDThh:mm') : type === 'date' && value ? (0, _moment["default"])(value).format('yyyy-MM-DD') : value;
 };
-
-var serializer = function serializer(element, type) {
-  return function (_ref4) {
-    var values = _ref4.values;
+var serializer = function serializer(element) {
+  return function (_ref7) {
+    var values = _ref7.values;
     var name = element.get('name');
-    return type === 'datetime' ? moment(values.get(name)).format() : values.get(name);
+    var type = element.get('renderType');
+    switch (type) {
+      case 'datetime':
+        return values.get(name) && (0, _moment["default"])(values.get(name)).format();
+      case 'attachment':
+        // When updating a submission with existing attachment values, there will
+        // be a link property returned from the API that has to be removed from
+        // the payload we are going to submit.
+        return values.get(name).map(function (attachment) {
+          return attachment instanceof File ? attachment : (0, _immutable.remove)(attachment, 'link');
+        });
+      default:
+        return values.get(name);
+    }
   };
-}; // If the element uses bridged options then the `choices` value represents the
-// label/value mapping from and not actual choices.
-
+};
 
+// If the element uses bridged options then the `choices` value represents the
+// label/value mapping from and not actual choices.
 var getChoices = function getChoices(element) {
-  return !!element.get('choicesResourceName') ? List() : element.get('choices');
+  return !!element.get('choicesResourceName') ? (0, _immutable.List)() : element.get('choices');
 };
-
 var fields = function fields() {
-  return function (_ref5) {
-    var submission = _ref5.submission;
-
-    if (submission) {
-      var pages = submission.getIn(['form', 'pages'], List());
+  return function (_ref8) {
+    var form = _ref8.form,
+      pages = _ref8.pages,
+      submission = _ref8.submission;
+    if (pages) {
       var values = traverseElement(pages, function (element, values) {
         var name = element.get('name');
         var type = convertRenderType(element);
-        var initialValue = getInitialValue(submission, element, type);
-        var isAttachment = element.get('renderType') === 'attachment';
+        var initialValue = getInitialValue(submission || {}, element, type);
         return element.get('type') === 'field' ? values.push({
           name: name,
           label: name,
           type: type,
           options: getChoices(element, initialValue),
           initialValue: initialValue,
-          enabled: !isAttachment,
-          "transient": isAttachment,
           serialize: serializer(element, type)
         }) : values;
-      }, List());
+      }, (0, _immutable.List)());
       return values.toJS();
     }
   };
 };
-
-export var SubmissionForm = generateForm({
-  formOptions: ['submissionId'],
+var SubmissionForm = (0, _Form.generateForm)({
+  formOptions: ['kappSlug', 'formSlug', 'submissionId'],
   dataSources: dataSources,
   fields: fields,
   handleSubmit: handleSubmit
 });
+exports.SubmissionForm = SubmissionForm;
 SubmissionForm.displayName = 'SubmissionForm';

package/lib/components/core/submission/SubmissionTable.js

@@ -1,23 +1,27 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _createSuper from "@babel/runtime/helpers/esm/createSuper";
-import React, { Component } from 'react';
-import FormSubmissionTable from './FormSubmissionTable';
-import DatastoreSubmissionTable from './DatastoreSubmissionTable';
-import KappSubmissionTable from './KappSubmissionTable';
-export var SubmissionTable = /*#__PURE__*/function (_Component) {
-  _inherits(SubmissionTable, _Component);
-
-  var _super = _createSuper(SubmissionTable);
+"use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SubmissionTable = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inherits"));
+var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createSuper"));
+var _react = _interopRequireWildcard(require("react"));
+var _FormSubmissionTable = _interopRequireDefault(require("./FormSubmissionTable"));
+var _DatastoreSubmissionTable = _interopRequireDefault(require("./DatastoreSubmissionTable"));
+var _KappSubmissionTable = _interopRequireDefault(require("./KappSubmissionTable"));
+var SubmissionTable = /*#__PURE__*/function (_Component) {
+  (0, _inherits2["default"])(SubmissionTable, _Component);
+  var _super = (0, _createSuper2["default"])(SubmissionTable);
   function SubmissionTable() {
-    _classCallCheck(this, SubmissionTable);
-
+    (0, _classCallCheck2["default"])(this, SubmissionTable);
     return _super.apply(this, arguments);
   }
-
-  _createClass(SubmissionTable, [{
+  (0, _createClass2["default"])(SubmissionTable, [{
     key: "componentDidMount",
     value: function componentDidMount() {
       if (this.props.mode === 'space') {
@@ -29,10 +33,10 @@ export var SubmissionTable = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var TableComponent = this.props.mode === 'form' ? FormSubmissionTable : this.props.mode === 'space' ? DatastoreSubmissionTable : this.props.mode === 'kapp' ? KappSubmissionTable : KappSubmissionTable;
-      return /*#__PURE__*/React.createElement(TableComponent, this.props, this.props.children);
+      var TableComponent = this.props.mode === 'form' ? _FormSubmissionTable["default"] : this.props.mode === 'space' ? _DatastoreSubmissionTable["default"] : this.props.mode === 'kapp' ? _KappSubmissionTable["default"] : _KappSubmissionTable["default"];
+      return /*#__PURE__*/_react["default"].createElement(TableComponent, this.props, this.props.children);
     }
   }]);
-
   return SubmissionTable;
-}(Component);
+}(_react.Component);
+exports.SubmissionTable = SubmissionTable;