@lingk/sync 2.3.4 → 2.3.6

package/build/main.js

@@ -7632,6 +7632,7 @@ module.exports =
 	    };
 	
 	    _this.onDrop = function (fs) {
+	      _this.setState({ fileLoading: true });
 	      var meta = [].concat(_toConsumableArray(_this.state.meta));
 	      var counter = 0;
 	      var fileContents = [].concat(_toConsumableArray(_this.state.fileContents));
@@ -7667,7 +7668,7 @@ module.exports =
 	                  sheetCounter += 1;
 	                  counter += 1;
 	                  if (counter >= fs.length && sheetCounter === sheetNames.length) {
-	                    _this.setState({ meta: meta });
+	                    _this.setState({ meta: meta, fileLoading: false });
 	                    _this.props.onDrop();
 	                  }
 	                });
@@ -7677,7 +7678,7 @@ module.exports =
 	                meta = meta.concat(Object.assign({}, csvMeta, { fileType: extension }));
 	                counter += 1;
 	                if (counter === fs.length) {
-	                  _this.setState({ meta: meta });
+	                  _this.setState({ meta: meta, fileLoading: false });
 	                  _this.props.onDrop();
 	                }
 	              });
@@ -7691,7 +7692,7 @@ module.exports =
 	                meta = meta.concat(Object.assign({}, fileMeta, { fileType: extension }));
 	                counter += 1;
 	                if (counter === fs.length) {
-	                  _this.setState({ meta: meta });
+	                  _this.setState({ meta: meta, fileLoading: false });
 	                  // this.props.onDrop();
 	                }
 	              }
@@ -7704,9 +7705,14 @@ module.exports =
 	              meta = meta.concat(Object.assign({}, csvMeta, { fileType: extension }));
 	              counter += 1;
 	              if (counter === fs.length) {
-	                _this.setState({ meta: meta });
+	                _this.setState({ meta: meta, fileLoading: false });
 	                _this.props.onDrop();
 	              }
+	            } else {
+	              _this.setState({ dropError: "File type not accepted.", fileLoading: false });
+	              setTimeout(function () {
+	                _this.setState({ dropError: null });
+	              }, 3500);
 	            }
 	
 	            // ADD TO CONTENTS, TO UPLOAD
@@ -7723,7 +7729,7 @@ module.exports =
 	            reader.readAsText(file);
 	          }
 	        } else {
-	          _this.setState({ dropError: "File type not accepted." });
+	          _this.setState({ dropError: "File type not accepted.", fileLoading: false });
 	          setTimeout(function () {
 	            _this.setState({ dropError: null });
 	          }, 3500);
@@ -7746,6 +7752,8 @@ module.exports =
 	      _this.setState({ uploading: true });
 	      setCsvFields(_this.state.meta, _this.state.fileContents, providerType).then(function () {
 	        _this.setState({ meta: [], fileContents: [], uploading: false });
+	        // update file list
+	        _this.handlePageChange(_this.state.activePage);
 	      });
 	    };
 	
@@ -7761,7 +7769,11 @@ module.exports =
 	    _this.actuallyDeleteFile = function () {
 	      var fileName = _this.state.deleteModalOpenFile;
 	      _this.setState({ deleteModalOpenFile: null, isDeletingFile: fileName });
-	      _this.props.deleteFlatFile(fileName);
+	      _this.props.deleteFlatFile(fileName).then(function (data) {
+	        // update file list
+	        _this.setState({ isDeletingFile: null });
+	        _this.handlePageChange(_this.state.activePage);
+	      });
 	    };
 	
 	    _this.closeDeleteModal = function () {
@@ -7780,7 +7792,8 @@ module.exports =
 	      fileSchemaCount: 0,
 	      activePage: 1,
 	      filesPerPage: 20,
-	      fileSchema: []
+	      fileSchema: [],
+	      fileLoading: false
 	    };
 	    return _this;
 	  }
@@ -7803,7 +7816,8 @@ module.exports =
 	          dropError = _state.dropError,
 	          sortFileTableBy = _state.sortFileTableBy,
 	          isDeletingFile = _state.isDeletingFile,
-	          deleteModalOpenFile = _state.deleteModalOpenFile;
+	          deleteModalOpenFile = _state.deleteModalOpenFile,
+	          fileLoading = _state.fileLoading;
 	      var inputs = this.props.inputs;
 	
 	      var Button = inputs.Button;
@@ -7862,7 +7876,7 @@ module.exports =
 	            )
 	          )
 	        ),
-	        _react2.default.createElement(
+	        !fileLoading ? _react2.default.createElement(
 	          "div",
 	          {
 	            style: {
@@ -7942,6 +7956,16 @@ module.exports =
 	              })
 	            )
 	          )
+	        ) : _react2.default.createElement(
+	          "div",
+	          {
+	            style: {
+	              marginLeft: 50,
+	              display: "inline-block"
+	            }
+	          },
+	          _react2.default.createElement(Spinner, null),
+	          " Processing...."
 	        ),
 	        this.props.fileSchemaCount ? fileSchema && fileSchema.length > 0 && _react2.default.createElement(
 	          "div",
@@ -8435,9 +8459,21 @@ module.exports =
 	    var _this = _possibleConstructorReturn(this, (EnvSection.__proto__ || Object.getPrototypeOf(EnvSection)).call(this));
 	
 	    _this.onDefaultConnectionChange = function () {
-	      _this.setState({
-	        defaultConnection: !_this.state.defaultConnection
-	      });
+	      var defaultConnection = _this.state.defaultConnection;
+	      var _this$props = _this.props,
+	          config = _this$props.config,
+	          multipleConnectors = _this$props.multipleConnectors;
+	
+	      var providerType = config && config.type;
+	      if (defaultConnection && (multipleConnectors.includes(config.label) || multipleConnectors.includes(providerType) || multipleConnectors.includes(config.credentialType))) {
+	        _this.setState({
+	          warningMessage: config && config.label
+	        });
+	      } else {
+	        _this.setState({
+	          defaultConnection: !defaultConnection
+	        });
+	      }
 	    };
 	
 	    _this.onAPIAccessChange = function () {
@@ -8447,9 +8483,9 @@ module.exports =
 	    };
 	
 	    _this.credKeyPress = function (e) {
-	      var _this$props = _this.props,
-	          checking = _this$props.checking,
-	          check = _this$props.check;
+	      var _this$props2 = _this.props,
+	          checking = _this$props2.checking,
+	          check = _this$props2.check;
 	
 	      if (e.key === "Enter" && checking !== true) {
 	        check(_this.state.actualCreds || {});
@@ -8623,7 +8659,6 @@ module.exports =
 	        var formCreds = creds;
 	        return !Object.keys(formCreds).includes(c.split(" ").join(""));
 	      });
-	
 	      var AmazonRDSdbs = [{
 	        name: "PostgreSQL",
 	        satisfiesSearch: true,
@@ -8916,13 +8951,36 @@ module.exports =
 	          null,
 	          this.props.children
 	        ),
-	        _react2.default.createElement("br", null),
+	        this.state.warningMessage && _react2.default.createElement(
+	          "div",
+	          { style: { marginTop: 10, maxWidth: 450 } },
+	          _react2.default.createElement(
+	            _reactBootstrap.Alert,
+	            { bsStyle: "danger", style: { textAlign: "left" } },
+	            _react2.default.createElement(
+	              "strong",
+	              null,
+	              "You can not uncheck this default connection!"
+	            ),
+	            _react2.default.createElement("br", null),
+	            "There are multiple connections configured for ",
+	            _react2.default.createElement(
+	              "strong",
+	              null,
+	              this.state.warningMessage
+	            ),
+	            " connector in this environment.",
+	            _react2.default.createElement("br", null),
+	            "Please select different connection as a default connection."
+	          )
+	        ),
 	        config.type != "LocalFile" && _react2.default.createElement(APIAcessHandle, {
 	          APIAccess: this.state.APIAccess,
 	          onChangeHandle: this.onAPIAccessChange,
 	          defaultConnection: this.state.defaultConnection,
 	          onDefaultConnectionChange: this.onDefaultConnectionChange,
-	          disableMarkConnection: wizard.disableMarkConnection
+	          disableMarkConnection: wizard.disableMarkConnection,
+	          misconfiguredConnectors: this.props.misconfiguredConnectors
 	        })
 	      );
 	    }
@@ -9001,7 +9059,7 @@ module.exports =
 	
 	  return _react2.default.createElement(
 	    "div",
-	    null,
+	    { style: { marginTop: 10 } },
 	    _react2.default.createElement(
 	      _reactBootstrap.Checkbox,
 	      {