@lingk/sync 1.1.13 → 1.1.15

package/build/main.js

@@ -5545,7 +5545,7 @@ module.exports =
 	      f = Math.floor(Math.log(a) / Math.log(c));return parseFloat((a / Math.pow(c, f)).toFixed(d)) + " " + e[f];
 	}
 	
-	var extensionBlacklist = ['xls', 'xlsx', 'xml', 'zip', 'tar', 'gz'];
+	var extensionBlacklist = ['jsonl', 'xml', 'zip', 'tar', 'gz'];
 	
 	var FlatFile = function (_Component) {
 	  _inherits(FlatFile, _Component);
@@ -5637,30 +5637,34 @@ module.exports =
 	            var reader = new FileReader();
 	            reader.onload = function (e) {
 	
+	              // PARSE METADATA
 	              var data = e.target.result;
 	              var csv = null;
 	              if (isXLS) {
-	                var i;
-	
 	                (function () {
-	                  var binary = '';
-	                  var bytes = new Uint8Array(data);
-	                  for (i = 0; i < length; i++) {
+	                  var sheetCounter = 0;
+	                  var binary = data;
+	                  /*const bytes = new Uint8Array(data)
+	                  for (var i = 0; i < length; i++) {
 	                    binary += String.fromCharCode(bytes[i]);
-	                  }
+	                  }*/
 	                  var workbook = _xlsx2.default.read(binary, { type: 'binary' });
-	                  workbook.SheetNames.forEach(function (sn) {
-	                    if (sn !== 'Export Summary') {
-	                      csv = _xlsx2.default.utils.sheet_to_csv(workbook.Sheets[sn]);
-	                      _this.parseCSV(file, csv).then(function (xlsMeta) {
-	                        meta = meta.concat(xlsMeta);
-	                        counter += 1;
-	                        if (counter === fs.length) {
-	                          _this.setState({ meta: meta });
-	                          _this.props.onDrop();
-	                        }
-	                      });
-	                    }
+	                  var sheetNames = workbook.SheetNames.filter(function (sn) {
+	                    return sn !== 'Export Summary';
+	                  });
+	                  sheetNames.forEach(function (sn) {
+	                    csv = _xlsx2.default.utils.sheet_to_csv(workbook.Sheets[sn]);
+	                    _this.parseCSV(file, csv).then(function (xlsMeta) {
+	                      meta = meta.concat(Object.assign({}, xlsMeta, {
+	                        sheetName: sn
+	                      }));
+	                      sheetCounter += 1;
+	                      counter += 1;
+	                      if (counter >= fs.length && sheetCounter === sheetNames.length) {
+	                        _this.setState({ meta: meta });
+	                        _this.props.onDrop();
+	                      }
+	                    });
 	                  });
 	                })();
 	              } else if (extension === 'csv') {
@@ -5684,7 +5688,8 @@ module.exports =
 	                }
 	              }
 	
-	              fileContents = fileContents.concat(data);
+	              // ADD TO CONTENTS, TO UPLOAD
+	              fileContents = fileContents.concat(file);
 	              contentCounter += 1;
 	              if (contentCounter === fs.length) {
 	                _this.setState({ fileContents: fileContents });
@@ -5692,7 +5697,7 @@ module.exports =
 	            }; // end file reader on load callback
 	
 	            if (isXLS) {
-	              reader.readAsArrayBuffer(file); // read as binary string???
+	              reader.readAsBinaryString(file); // read as array buffer???
 	            } else {
 	              reader.readAsText(file);
 	            }
@@ -5720,7 +5725,6 @@ module.exports =
 	
 	      _this.setState({ uploading: true });
 	      setCsvFields(_this.state.meta, _this.state.fileContents, providerType).then(function () {
-	        console.log("SET META BACK");
 	        _this.setState({ meta: [], fileContents: [], uploading: false });
 	      });
 	    };
@@ -5734,8 +5738,8 @@ module.exports =
 	      meta: [],
 	      fileContents: [],
 	      uploading: false,
-	      dropError: null
-	    };
+	      dropError: null,
+	      sortFileTableBy: 'uploadedTime' };
 	    return _this;
 	  }
 	
@@ -5747,15 +5751,41 @@ module.exports =
 	      var _state = this.state,
 	          meta = _state.meta,
 	          uploading = _state.uploading,
-	          dropError = _state.dropError;
-	      var _props = this.props,
-	          fileSchema = _props.fileSchema,
-	          inputs = _props.inputs;
+	          dropError = _state.dropError,
+	          sortFileTableBy = _state.sortFileTableBy;
+	      var inputs = this.props.inputs;
 	
 	      var Button = inputs.Button;
 	      var Spinner = inputs.Spinner;
 	      var hasFile = meta && meta.length > 0;
 	
+	      var fileSchema = [];
+	      var fileSchemaNames = [];
+	      this.props.fileSchema && this.props.fileSchema.forEach(function (f) {
+	        if (!fileSchemaNames.includes(f.name)) {
+	          fileSchema.push(f);
+	          fileSchemaNames.push(f.name);
+	        }
+	      });
+	      if (fileSchema && fileSchema.length) {
+	        fileSchema = fileSchema.sort(function (a, b) {
+	          var term = sortFileTableBy;
+	          if (term === 'uploadedTime') {
+	            return a[term] < b[term];
+	          }
+	          return a[term] > b[term];
+	        });
+	      }
+	
+	      var droppedFiles = [];
+	      var droppedFileNames = [];
+	      meta && meta.forEach(function (f) {
+	        if (!droppedFileNames.includes(f.name)) {
+	          droppedFiles.push(f);
+	          droppedFileNames.push(f.name);
+	        }
+	      });
+	
 	      return _react2.default.createElement(
 	        'div',
 	        null,
@@ -5769,7 +5799,7 @@ module.exports =
 	            !dropError ? _react2.default.createElement(
 	              'p',
 	              null,
-	              'Drop one or more CSV files here, or click to select files to upload.'
+	              'Drop one or more files here, or click to select files to upload.'
 	            ) : _react2.default.createElement(
 	              'p',
 	              { style: { color: '#c9302c', fontWeight: 'bold' } },
@@ -5816,7 +5846,7 @@ module.exports =
 	            _react2.default.createElement(
 	              'ul',
 	              { style: { padding: 0 } },
-	              meta.map(function (f, i) {
+	              droppedFiles.map(function (f, i) {
 	                return _react2.default.createElement(
 	                  'li',
 	                  { key: i, style: { listStyle: 'none' } },
@@ -5848,7 +5878,7 @@ module.exports =
 	            ),
 	            _react2.default.createElement(
 	              _reactBootstrap.Table,
-	              { bordered: true, condensed: true },
+	              { bordered: true, condensed: true, className: 'file-manager-table' },
 	              _react2.default.createElement(
 	                'thead',
 	                null,
@@ -5857,18 +5887,24 @@ module.exports =
 	                  null,
 	                  _react2.default.createElement(
 	                    'th',
-	                    null,
+	                    { onClick: function onClick() {
+	                        return _this2.setState({ sortFileTableBy: 'name' });
+	                      } },
 	                    'Name'
 	                  ),
 	                  _react2.default.createElement(
 	                    'th',
-	                    null,
+	                    { onClick: function onClick() {
+	                        return _this2.setState({ sortFileTableBy: 'byteSize' });
+	                      } },
 	                    'Size'
 	                  ),
 	                  _react2.default.createElement(
 	                    'th',
-	                    null,
-	                    'Date Uploaded'
+	                    { onClick: function onClick() {
+	                        return _this2.setState({ sortFileTableBy: 'uploadedTime' });
+	                      } },
+	                    'Date uploaded'
 	                  )
 	                )
 	              ),
@@ -50733,7 +50769,6 @@ module.exports =
 	}
 	
 	function uploadFilesToS3(tenantKey, appKey, envId, metadata, d, contents) {
-	  console.log("UPLOAD", metadata, contents);
 	  var args = contents.map(function (fileContent, i) {
 	    return { tenantKey: tenantKey, appKey: appKey, envId: envId, fileContent: fileContent, d: d, fileName: metadata[i].name };
 	  });
@@ -50750,12 +50785,10 @@ module.exports =
 	      fileContent = _ref.fileContent,
 	      fileName = _ref.fileName;
 	
-	  console.log(fileName, d);
 	  /*if(!d.guids.files[fileName]){
 	    return () => Promise.resolve(null)
 	  }*/
 	  var p = JSON.parse(atob(d.policy));
-	  console.log(p);
 	  var pFind = function pFind(s) {
 	    return p.conditions.find(function (pf) {
 	      return Object.keys(pf).includes(s);
@@ -50780,7 +50813,6 @@ module.exports =
 	}
 	
 	function downloadFileFromAws(tenantId, appId, tenantKey, appKey, envId, file) {
-	  console.log(file);
 	  return function (dispatch, getState, api) {
 	    var _getState5 = getState(),
 	        config = _getState5.config;
@@ -55858,7 +55890,8 @@ module.exports =
 	              ) : _react2.default.createElement(
 	                'div',
 	                null,
-	                rsc.name
+	                rsc.name,
+	                rsc.sheetName ? ' (' + rsc.sheetName + ')' : ''
 	              )
 	            );
 	          })