@lingk/sync 1.1.0 → 1.1.2

package/build/main.js

@@ -17343,7 +17343,8 @@ module.exports =
 	// isReload means that the "Check Connection" button was NOT clicked
 	function callGetMetadata(tenantId, appId, mode, providerType, providerConfig, endpoint, isFramework, creds, environment, isReload, fileSchemaGuid, extraQuery) {
 	  var metadata = null;
-	  var credentialType = providerConfig.credentialType;
+	  var credentialType = providerConfig.credentialType,
+	      metadataApi = providerConfig.metadataApi;
 	
 	  var isOauth = credentialType === 'SalesforceAuthCode';
 	  return function (dispatch) {
@@ -17376,8 +17377,14 @@ module.exports =
 	        data: { metadata: metadata, mode: mode, code: '200 OK', providerType: providerType }
 	      });
 	      return metadata;
-	    }).catch(function (err) {
-	      console.log(err);
+	    }).catch(function (error) {
+	      var err = null;
+	      if (error.response && error.response.data) {
+	        err = error.response.data;
+	      }
+	      if (metadataApi === 'TEST_CONN_API_URL') {
+	        err = error.response.data.error;
+	      }
 	      dispatch({
 	        type: types.FINISH_WIZARD_ENV_CHECK,
 	        data: { res: null, mode: mode, code: '404 Error', providerType: providerType, err: err }
@@ -26306,6 +26313,8 @@ module.exports =
 	
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 	
+	function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
+	
 	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 	
 	function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
@@ -26320,7 +26329,7 @@ module.exports =
 	
 	    var _this = _possibleConstructorReturn(this, (LingkSync.__proto__ || Object.getPrototypeOf(LingkSync)).call(this));
 	
-	    _this.makeSteps = function (scenarios) {
+	    _this.makeSteps = function () {
 	      var wizard = _this.props.wizardConfig;
 	      var stepList = [];
 	      for (var i = 0; i < _this.allSteps.length; i++) {
@@ -26340,41 +26349,41 @@ module.exports =
 	          stepList.push(step);
 	        } else if (step.type === 'file' && wizard.source.type === 'SFTP') {
 	          stepList.push(step);
-	        } else if (step.type === 'scenario' && scenarios.length > 0) {
-	          step.options = scenarios;
-	          step.magicNumber = '2147483647';
-	          stepList.push(step);
-	        } else if (step.type === 'environment') {
-	          step.typeGuid = wizard.typeGuid;
-	          if (step.mode === 'source' && !wizard.source.skipEnvStep) {
-	            step.title = wizard.source.type + ' Environment';
-	            step.message = wizard.source.message;
-	            step.credentials = wizard.source.credentials || null;
-	            step.metadataEndpoint = wizard.source.metadataEndpoint;
-	            step.metadataApi = wizard.source.metadataApi;
-	            step.previewToken = _this.props.previewToken;
-	            step.bidirectional = wizard.source.bidirectional;
+	        } /*else if(step.type==='scenario'){
+	          step.options = []
+	          step.magicNumber = '2147483647'
+	          stepList.push(step)
+	          } */else if (step.type === 'environment') {
+	            step.typeGuid = wizard.typeGuid;
+	            if (step.mode === 'source' && !wizard.source.skipEnvStep) {
+	              step.title = wizard.source.type + ' Environment';
+	              step.message = wizard.source.message;
+	              step.credentials = wizard.source.credentials || null;
+	              step.metadataEndpoint = wizard.source.metadataEndpoint;
+	              step.metadataApi = wizard.source.metadataApi;
+	              step.previewToken = _this.props.previewToken;
+	              step.bidirectional = wizard.source.bidirectional;
+	              stepList.push(step);
+	            } else if (step.mode === 'destination' && !wizard.destination.skipEnvStep) {
+	              step.title = wizard.destination.type + ' Environment';
+	              step.message = wizard.destination.message;
+	              step.credentials = wizard.destination.credentials || null;
+	              step.metadataEndpoint = wizard.destination.metadataEndpoint;
+	              step.metadataApi = wizard.destination.metadataApi;
+	              step.previewToken = _this.props.previewToken;
+	              step.bidirectional = wizard.destination.bidirectional;
+	              stepList.push(step);
+	            }
+	          } else if (step.type === 'schema') {
+	            stepList.push(step);
+	          } else if (step.type === 'map') {
+	            step.customizable = wizard.destination.customizable;
+	            step.typeGuid = wizard.typeGuid;
 	            stepList.push(step);
-	          } else if (step.mode === 'destination' && !wizard.destination.skipEnvStep) {
-	            step.title = wizard.destination.type + ' Environment';
-	            step.message = wizard.destination.message;
-	            step.credentials = wizard.destination.credentials || null;
-	            step.metadataEndpoint = wizard.destination.metadataEndpoint;
-	            step.metadataApi = wizard.destination.metadataApi;
-	            step.previewToken = _this.props.previewToken;
-	            step.bidirectional = wizard.destination.bidirectional;
+	          } else if (step.type === 'deploy') {
+	            step.options = ['once', 'daily', 'repeating'];
 	            stepList.push(step);
 	          }
-	        } else if (step.type === 'schema') {
-	          stepList.push(step);
-	        } else if (step.type === 'map') {
-	          step.customizable = wizard.destination.customizable;
-	          step.typeGuid = wizard.typeGuid;
-	          stepList.push(step);
-	        } else if (step.type === 'deploy') {
-	          step.options = ['once', 'daily', 'repeating'];
-	          stepList.push(step);
-	        }
 	      }
 	      _this.setState({
 	        steps: stepList
@@ -26435,8 +26444,27 @@ module.exports =
 	          actions = _props.actions,
 	          wizardConfig = _props.wizardConfig;
 	
-	      actions.callGetScenarioList(tenantId, accountId, wizardConfig.typeGuid).then(function (r) {
-	        return _this2.makeSteps(r);
+	      this.makeSteps();
+	      actions.callGetScenarioList(tenantId, accountId, wizardConfig.typeGuid).then(function (scenarios) {
+	        var steps = [].concat(_toConsumableArray(_this2.state.steps));
+	        var beforeScenarioIndex = void 0;
+	        steps.forEach(function (step, i) {
+	          if (step.type === 'env') {
+	            beforeScenarioIndex = i;
+	          }
+	          if (step.type === 'file') {
+	            beforeScenarioIndex = i;
+	          }
+	        });
+	        if (scenarios.length > 0) {
+	          steps.splice(beforeScenarioIndex + 1, 0, {
+	            type: 'scenario',
+	            title: 'Data Scenario',
+	            magicNumber: '2147483647',
+	            options: scenarios
+	          });
+	        }
+	        _this2.setState({ steps: steps });
 	      });
 	    }
 	  }, {