@lingk/sync 0.1.53 → 0.1.55

package/build/main.js

@@ -1317,9 +1317,6 @@ module.exports =
 	  }
 	
 	  _createClass(SelectWrapper, [{
-	    key: 'componentDidMount',
-	    value: function componentDidMount() {}
-	  }, {
 	    key: 'expand',
 	    value: function expand(v, parents) {
 	      this.setState({ expanded: _nestExpand2.default.expand(v, parents, this.state.expanded) });
@@ -1701,16 +1698,15 @@ module.exports =
 	var SET_WIZARD_TRIGGER = exports.SET_WIZARD_TRIGGER = 'SET_WIZARD_TRIGGER';
 	var SET_WIZARD_LOADED = exports.SET_WIZARD_LOADED = 'SET_WIZARD_LOADED';
 	var SET_WIZARD_DATA_LOADED = exports.SET_WIZARD_DATA_LOADED = 'SET_WIZARD_DATA_LOADED';
-	var START_ENV_CHECK = exports.START_ENV_CHECK = 'START_ENV_CHECK';
-	var FINISH_ENV_CHECK = exports.FINISH_ENV_CHECK = 'FINISH_ENV_CHECK';
-	var START_PREVIEW = exports.START_PREVIEW = 'START_PREVIEW';
-	var FINISH_PREVIEW = exports.FINISH_PREVIEW = 'FINISH_PREVIEW';
-	var START_GET_SCENARIO = exports.START_GET_SCENARIO = 'START_GET_SCENARIO';
-	var FINISH_GET_SCENARIO = exports.FINISH_GET_SCENARIO = 'FINISH_GET_SCENARIO';
-	var CLEAR_WIZARD = exports.CLEAR_WIZARD = 'CLEAR_WIZARD';
-	var SET_OAUTH_URL = exports.SET_OAUTH_URL = 'SET_OAUTH_URL';
-	var GETTING_OAUTH_URL = exports.GETTING_OAUTH_URL = 'GETTING_OAUTH_URL';
+	var START_WIZARD_ENV_CHECK = exports.START_WIZARD_ENV_CHECK = 'START_WIZARD_ENV_CHECK';
+	var FINISH_WIZARD_ENV_CHECK = exports.FINISH_WIZARD_ENV_CHECK = 'FINISH_WIZARD_ENV_CHECK';
+	var START_WIZARD_GET_SCENARIO = exports.START_WIZARD_GET_SCENARIO = 'START_WIZARD_GET_SCENARIO';
+	var FINISH_WIZARD_GET_SCENARIO = exports.FINISH_WIZARD_GET_SCENARIO = 'FINISH_WIZARD_GET_SCENARIO';
+	var SET_WIZARD_OAUTH_URL = exports.SET_WIZARD_OAUTH_URL = 'SET_WIZARD_OAUTH_URL';
+	var GETTING_WIZARD_OAUTH_URL = exports.GETTING_WIZARD_OAUTH_URL = 'GETTING_WIZARD_OAUTH_URL';
 	var SET_WIZARD_SAVED_CREDENTIALS = exports.SET_WIZARD_SAVED_CREDENTIALS = 'SET_WIZARD_SAVED_CREDENTIALS';
+	
+	var CLEAR_WIZARD = exports.CLEAR_WIZARD = 'CLEAR_WIZARD';
 
 /***/ },
 /* 41 */
@@ -2036,7 +2032,8 @@ module.exports =
 	    }
 	  }, {
 	    key: 'addDefaultResourceGroup',
-	    value: function addDefaultResourceGroup(v, selectIdx, id, section) {
+	    value: function addDefaultResourceGroup(v, selectIdx, newGroup) {
+	      var section = newGroup.section;
 	      var _props = this.props,
 	          addGroup = _props.addGroup,
 	          resourceGroups = _props.resourceGroups,
@@ -2060,7 +2057,7 @@ module.exports =
 	      if (!(resourceGroups && resourceGroups.length === 0)) {
 	        this.go(false, finalIndex);
 	      }
-	      addGroup(v, finalIndex, id, section);
+	      addGroup(v, finalIndex, newGroup);
 	    }
 	  }, {
 	    key: 'pickEntity',
@@ -2072,7 +2069,7 @@ module.exports =
 	    }
 	  }, {
 	    key: 'addDefaultEntity',
-	    value: function addDefaultEntity(groupIndex, v, rscIndex, section, rtid, parentRef) {
+	    value: function addDefaultEntity(v, rscIndex, entity, groupIndex) {
 	      var _this3 = this;
 	
 	      var resourceGroups = this.props.resourceGroups;
@@ -2086,7 +2083,7 @@ module.exports =
 	        }, 40);
 	      }
 	
-	      this.props.addDefaultEntity(groupIndex, v, rscIndex, section, rtid, parentRef);
+	      this.props.addDefaultEntity(v, rscIndex, entity, groupIndex);
 	    }
 	  }, {
 	    key: 'unPick',
@@ -2384,7 +2381,7 @@ module.exports =
 	  value: true
 	});
 	
-	function saveData(resourceGroups, providers, sourceMetadata, destinationMetadata, sourceEndpoint) {
+	function saveData(resourceGroups, targetProvider, sourceMetadata, destinationMetadata, sourceEndpoint) {
 	  var bundles = resourceGroups || [];
 	  var mappings = [];
 	  var endpoints = {};
@@ -2395,7 +2392,7 @@ module.exports =
 	    }) : group;
 	    group.name = destinationResource.type;
 	    group.resourceLabel = destinationResource.name;
-	    group.provider = providers['destination'].toLowerCase();
+	    group.provider = targetProvider.toLowerCase();
 	    if (destinationResource.recordTypeId) {
 	      group.recordTypeId = destinationResource.recordTypeId;
 	    }
@@ -2432,7 +2429,7 @@ module.exports =
 	      var sourceKeyResourceProvider = group.resources.find(function (r) {
 	        return r.name === group.sourceKeysObjects[i];
 	      }).provider;
-	      var dataSourceMetadata = sourceKeyResourceProvider === providers['destination'] ? destinationMetadata : sourceMetadata;
+	      var dataSourceMetadata = sourceKeyResourceProvider === targetProvider ? destinationMetadata : sourceMetadata;
 	      var sourceResource = dataSourceMetadata.find(function (metaRsc) {
 	        return metaRsc.name === group.sourceKeysObjects[i];
 	      });
@@ -2480,7 +2477,7 @@ module.exports =
 	                var transConcatSourceResourceProvider = group.resources.find(function (r) {
 	                  return r.name === s[0];
 	                }).provider;
-	                var transConcatSourceMetadata = transConcatSourceResourceProvider === providers['destination'] ? destinationMetadata : sourceMetadata;
+	                var transConcatSourceMetadata = transConcatSourceResourceProvider === targetProvider ? destinationMetadata : sourceMetadata;
 	                var transConcatSourceResource = transConcatSourceMetadata.find(function (rsc) {
 	                  return rsc.name === s[0];
 	                });
@@ -2525,7 +2522,7 @@ module.exports =
 	      group.resources = group.resources.map(function (rsc) {
 	
 	        //get resource source (check both metadatas)
-	        var dataSourceMetadata = rsc.provider === providers['destination'] ? destinationMetadata : sourceMetadata;
+	        var dataSourceMetadata = rsc.provider === targetProvider ? destinationMetadata : sourceMetadata;
 	        var sourceResource = dataSourceMetadata.find(function (metaRsc) {
 	          return metaRsc.name === rsc.name;
 	        });
@@ -2537,7 +2534,7 @@ module.exports =
 	        }
 	
 	        //get first resource in bundle (for primaryKeyName)
-	        var primaryDataSourceMetadata = group.resources[0].provider === providers['destination'] ? destinationMetadata : sourceMetadata;
+	        var primaryDataSourceMetadata = group.resources[0].provider === targetProvider ? destinationMetadata : sourceMetadata;
 	        var primarySourceResource = primaryDataSourceMetadata.find(function (metaRsc) {
 	          return metaRsc.name === group.resources[0].name;
 	        });
@@ -4932,17 +4929,14 @@ module.exports =
 	Object.defineProperty(exports, "__esModule", {
 	  value: true
 	});
-	exports.getMetadataFromEnvStep = getMetadataFromEnvStep;
-	exports.callCheckConnection = callCheckConnection;
-	exports.callCheckConnectionForProvider = callCheckConnectionForProvider;
+	exports.callGetMetadata = callGetMetadata;
+	exports.tryCheckConnection = tryCheckConnection;
 	exports.callGetProviderMetadata = callGetProviderMetadata;
 	exports.getOauthUrl = getOauthUrl;
 	exports.createLingkExternalIds = createLingkExternalIds;
-	exports.callTest = callTest;
 	exports.callAddCustomField = callAddCustomField;
 	exports.gotEmptyScenario = gotEmptyScenario;
 	exports.callGetScenario = callGetScenario;
-	exports.callPreviewIntegration = callPreviewIntegration;
 	exports.callGetScenarioList = callGetScenarioList;
 	exports.callCreateScenario = callCreateScenario;
 	exports.callUpdateScenarioList = callUpdateScenarioList;
@@ -4958,12 +4952,13 @@ module.exports =
 	exports.callDeployTrigger = callDeployTrigger;
 	exports.callInit = callInit;
 	exports.callGetPiConfig = callGetPiConfig;
+	exports.tryGetMetadataIntro = tryGetMetadataIntro;
+	exports.callGetCredentialsAndMetadatas = callGetCredentialsAndMetadatas;
+	exports.tryGetCredentials = tryGetCredentials;
 	exports.tryGetMetadata = tryGetMetadata;
 	exports.callGetBundles = callGetBundles;
 	exports.callGetMapping = callGetMapping;
 	exports.postCredentials = postCredentials;
-	exports.callGetCredentials = callGetCredentials;
-	exports.tryGetCredentials = tryGetCredentials;
 	exports.callGetTrigger = callGetTrigger;
 	exports.setWizardLoaded = setWizardLoaded;
 	exports.setWizardDataLoaded = setWizardDataLoaded;
@@ -4983,91 +4978,56 @@ module.exports =
 	
 	function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 	
-	// runs when "checkconnection" is click in environment step
-	function getMetadataFromEnvStep(tenantId, appId, mode, providerType, urlSuffix, apiUrl, endpoint, creds) {
+	// bug: when reloading a wizard that has no creds saved, the metadata will be called
+	// automatically, because it assumes it doesnt need creds.
+	// need to check "credentials" config object AND creds in tryCheckConnection
+	function callGetMetadata(tenantId, appId, mode, providerType, urlSuffix, apiUrl, endpoint, credsConfig) {
 	  return function (dispatch) {
-	    if (urlSuffix) {
-	      dispatch(callGetProviderMetadata(tenantId, appId, urlSuffix, apiUrl, mode, providerType));
-	    }
-	    if (endpoint && endpoint.length > 8 && creds) {
-	      //dont check if its just https://
-	      // creds is the actual value of credentials from environmentStep
-	      // for Salesforce (using Oauth) it will be undefined
-	      dispatch(callCheckConnection(tenantId, appId, endpoint, mode, providerType, creds));
-	    }
-	  };
-	}
-	
-	function callCheckConnection(tenantId, appId, url, mode, providerType, creds) {
-	  return function (dispatch, getState, api) {
 	    dispatch({
-	      type: types.START_ENV_CHECK,
+	      type: types.START_WIZARD_ENV_CHECK,
 	      mode: mode
 	    });
-	    return dispatch(callCheckConnectionForProvider(tenantId, appId, url, mode, providerType, creds)).then(function (res) {
+	    return dispatch(tryCheckConnection(tenantId, appId, providerType, credsConfig)).then(function (r) {
+	      return dispatch(callGetProviderMetadata(tenantId, appId, urlSuffix, apiUrl, mode, providerType, endpoint));
+	    }).then(function (res) {
 	      dispatch({
-	        type: types.FINISH_ENV_CHECK,
+	        type: types.FINISH_WIZARD_ENV_CHECK,
 	        data: { res: res, mode: mode, code: '200 OK', providerType: providerType }
 	      });
 	    }).catch(function (err) {
 	      dispatch({
-	        type: types.FINISH_ENV_CHECK,
+	        type: types.FINISH_WIZARD_ENV_CHECK,
 	        data: { res: null, mode: mode, code: '404 Error', providerType: providerType }
 	      });
 	    });
 	  };
 	}
 	
-	function callCheckConnectionForProvider(tenantId, appId, url, mode, providerType, creds) {
+	function tryCheckConnection(tenantId, appId, providerType, credsConfig) {
 	  return function (dispatch, getState, api) {
+	    var needsCredentials = credsConfig && credsConfig.length > 0 && credsConfig[0] !== 'Oauth';
+	
 	    var _getState = getState(),
 	        config = _getState.config;
 	
-	    if (providerType === 'Canvas' && creds && creds.Token) {
-	      // if creds exist, check connection
-	      return api.post(tenantId + '/' + appId + '/testconnection/canvas', {
-	        endpoint: config.TRANS_API_URL,
-	        data: {
-	          credentialType: providerType,
-	          credentialsJson: {
-	            rootUrl: url,
-	            accessToken: creds.Token
-	          }
-	        }
-	      });
-	    } else {
-	      // else just check for adapter connection
-	      return api.get(tenantId + '/' + appId + '/testconnection?url=' + url, {
+	    if (needsCredentials) {
+	      return api.post(tenantId + '/' + appId + '/testconnection/' + providerType.toLowerCase(), {
 	        endpoint: config.TRANS_API_URL
 	      });
-	    }
+	    } else return Promise.resolve(null);
 	  };
 	}
 	
-	function callGetProviderMetadata(tenantId, appId, urlSuffix, apiUrl, mode, providerType) {
+	function callGetProviderMetadata(tenantId, appId, urlSuffix, apiUrl, mode, providerType, endpoint) {
 	  return function (dispatch, getState, api) {
-	    dispatch({
-	      type: types.START_ENV_CHECK,
-	      mode: mode
-	    });
-	
 	    var _getState2 = getState(),
 	        config = _getState2.config;
 	
+	    if (urlSuffix === 'testconnection') {
+	      urlSuffix = 'testconnection?url=' + endpoint;
+	    }
 	    return api.get(tenantId + '/' + appId + '/' + urlSuffix, {
 	      endpoint: config[apiUrl]
-	    }).then(function (res) {
-	      dispatch({
-	        type: types.FINISH_ENV_CHECK,
-	        data: { res: res, mode: mode, code: '200 OK', providerType: providerType }
-	      });
-	      return true;
-	    }).catch(function (err) {
-	      console.log(err);
-	      dispatch({
-	        type: types.FINISH_ENV_CHECK,
-	        data: { res: null, mode: mode, code: '404 Error' }
-	      });
 	    });
 	  };
 	}
@@ -5075,7 +5035,7 @@ module.exports =
 	function getOauthUrl(tenantId, appId, typeGuid, orgType, mode) {
 	  return function (dispatch, getState, api) {
 	    dispatch({
-	      type: types.GETTING_OAUTH_URL,
+	      type: types.GETTING_WIZARD_OAUTH_URL,
 	      bool: true,
 	      mode: mode
 	    });
@@ -5087,7 +5047,7 @@ module.exports =
 	      endpoint: config.SF_AGENT_API_URL
 	    }).then(function (data) {
 	      dispatch({
-	        type: types.SET_OAUTH_URL,
+	        type: types.SET_WIZARD_OAUTH_URL,
 	        data: data.url
 	      });
 	    }).catch(function (err) {
@@ -5142,19 +5102,6 @@ module.exports =
 	  };
 	}
 	
-	function asyncFunction(v, callback) {
-	  setTimeout(function () {
-	    return callback(v * 2);
-	  }, 1000);
-	}
-	function callTest(v, completedCallback) {
-	  return new Promise(function (resolve) {
-	    return asyncFunction(v, function (r) {
-	      return resolve(r * 2);
-	    });
-	  });
-	}
-	
 	function callAddCustomField(tenantId, appId, objectType, fieldName, completedCallback) {
 	  return function (dispatch, getState, api) {
 	    var _getState5 = getState(),
@@ -5176,7 +5123,7 @@ module.exports =
 	function gotEmptyScenario() {
 	  return function (dispatch) {
 	    dispatch({
-	      type: types.FINISH_GET_SCENARIO
+	      type: types.FINISH_WIZARD_GET_SCENARIO
 	    });
 	    dispatch({
 	      type: types.SET_WIZARD_SAVED_BUNDLES,
@@ -5192,13 +5139,13 @@ module.exports =
 	function callGetScenario(magicNumber, bundleGuid, mappingGuid, completedCallback) {
 	  return function (dispatch, getState, api) {
 	    dispatch({
-	      type: types.START_GET_SCENARIO
+	      type: types.START_WIZARD_GET_SCENARIO
 	    });
 	    var tenantId = magicNumber;
 	    var accountId = magicNumber;
 	    return Promise.all([dispatch(callGetBundles(tenantId, accountId, bundleGuid)), dispatch(callGetMapping(tenantId, accountId, mappingGuid))]).then(function (res) {
 	      dispatch({
-	        type: types.FINISH_GET_SCENARIO
+	        type: types.FINISH_WIZARD_GET_SCENARIO
 	      });
 	      completedCallback();
 	    }).catch(function (err) {
@@ -5208,31 +5155,11 @@ module.exports =
 	  };
 	}
 	
-	function callPreviewIntegration(tenantId, appId, url) {
+	function callGetScenarioList(tenantId, appId, typeGuid) {
 	  return function (dispatch, getState, api) {
-	    dispatch({
-	      type: types.START_PREVIEW
-	    });
-	
 	    var _getState6 = getState(),
 	        config = _getState6.config;
 	
-	    return api.get(tenantId + '/' + appId + '/previewintegration?url=' + url, {
-	      endpoint: config.TRANS_API_URL
-	    }).then(function (res) {
-	      dispatch({
-	        type: types.FINISH_PREVIEW,
-	        data: res
-	      });
-	    });
-	  };
-	}
-	
-	function callGetScenarioList(tenantId, appId, typeGuid) {
-	  return function (dispatch, getState, api) {
-	    var _getState7 = getState(),
-	        config = _getState7.config;
-	
 	    return api.get(tenantId + '/' + appId + '/scenarios/' + typeGuid, {
 	      endpoint: config.TRANS_API_URL
 	    });
@@ -5241,8 +5168,8 @@ module.exports =
 	
 	function callCreateScenario(tenantId, appId, data) {
 	  return function (dispatch, getState, api) {
-	    var _getState8 = getState(),
-	        config = _getState8.config;
+	    var _getState7 = getState(),
+	        config = _getState7.config;
 	
 	    return api.post(tenantId + '/' + appId + '/scenario', {
 	      endpoint: config.TRANS_API_URL,
@@ -5253,8 +5180,8 @@ module.exports =
 	
 	function callUpdateScenarioList(tenantId, appId, typeGuid, scenarioIds) {
 	  return function (dispatch, getState, api) {
-	    var _getState9 = getState(),
-	        config = _getState9.config;
+	    var _getState8 = getState(),
+	        config = _getState8.config;
 	
 	    return api.post(tenantId + '/' + appId + '/scenarios/' + typeGuid, {
 	      endpoint: config.TRANS_API_URL,
@@ -5267,8 +5194,8 @@ module.exports =
 	
 	function callPostBundles(tenantId, appId, bundles) {
 	  return function (dispatch, getState, api) {
-	    var _getState10 = getState(),
-	        config = _getState10.config;
+	    var _getState9 = getState(),
+	        config = _getState9.config;
 	
 	    var data = { bundles: bundles };
 	    return api.post(tenantId + '/' + appId + '/bundle', {
@@ -5282,8 +5209,8 @@ module.exports =
 	
 	function callPostMapping(tenantId, appId, mappings) {
 	  return function (dispatch, getState, api) {
-	    var _getState11 = getState(),
-	        config = _getState11.config;
+	    var _getState10 = getState(),
+	        config = _getState10.config;
 	
 	    var data = { mappings: mappings };
 	    return api.post(tenantId + '/' + appId + '/schemamappings', {
@@ -5297,8 +5224,8 @@ module.exports =
 	
 	function callPostProductizedIntegration(tenantId, appId, schemaMappingGuid, bundlePackGuid, configuration, title, typeGuid) {
 	  return function (dispatch, getState, api) {
-	    var _getState12 = getState(),
-	        config = _getState12.config;
+	    var _getState11 = getState(),
+	        config = _getState11.config;
 	
 	    var data = {
 	      schemaMappingGuid: schemaMappingGuid,
@@ -5318,8 +5245,8 @@ module.exports =
 	
 	function callUpdateProductizedIntegration(tenantId, appId, schemaMappingGuid, bundlePackGuid, configuration, title, typeGuid, piGuid) {
 	  return function (dispatch, getState, api) {
-	    var _getState13 = getState(),
-	        config = _getState13.config;
+	    var _getState12 = getState(),
+	        config = _getState12.config;
 	
 	    var data = {
 	      schemaMappingGuid: schemaMappingGuid,
@@ -5339,8 +5266,8 @@ module.exports =
 	
 	function callGenerateRecipe(tenantId, appId, typeId, typeGuid, title, piGuid, mappingGuid, sourceMetadata, destinationMetadata, isManagedPackage) {
 	  return function (dispatch, getState, api) {
-	    var _getState14 = getState(),
-	        config = _getState14.config;
+	    var _getState13 = getState(),
+	        config = _getState13.config;
 	
 	    return api.post(tenantId + '/' + appId + '/productizedintegrations/' + piGuid + '/generate', {
 	      endpoint: config.TRANS_API_URL,
@@ -5396,8 +5323,8 @@ module.exports =
 	
 	function callExecuteTransformer(transId) {
 	  return function (dispatch, getState, api) {
-	    var _getState15 = getState(),
-	        config = _getState15.config;
+	    var _getState14 = getState(),
+	        config = _getState14.config;
 	
 	    var query = '';
 	    var d = new Date();
@@ -5421,8 +5348,8 @@ module.exports =
 	
 	function callLookupLogData(externalExecutionId, index, onFinish, generatedRecipe, pi) {
 	  return function (dispatch, getState, api) {
-	    var _getState16 = getState(),
-	        config = _getState16.config;
+	    var _getState15 = getState(),
+	        config = _getState15.config;
 	
 	    return api.get('logs/transformers/externalExecutionId/' + externalExecutionId, {
 	      endpoint: config.TRANS_API_URL
@@ -5465,8 +5392,8 @@ module.exports =
 	    };
 	  }
 	  return function (dispatch, getState, api) {
-	    var _getState17 = getState(),
-	        config = _getState17.config;
+	    var _getState16 = getState(),
+	        config = _getState16.config;
 	
 	    return api.post('createtrigger', {
 	      endpoint: config.TRANS_API_URL,
@@ -5479,8 +5406,8 @@ module.exports =
 	
 	function callDeployTrigger(generatedRecipe, pi, onFinish) {
 	  return function (dispatch, getState, api) {
-	    var _getState18 = getState(),
-	        config = _getState18.config;
+	    var _getState17 = getState(),
+	        config = _getState17.config;
 	
 	    return api.put('transformer/deploy/' + generatedRecipe.Id, {
 	      endpoint: config.TRANS_API_URL,
@@ -5512,20 +5439,15 @@ module.exports =
 	  };
 	}
 	
-	function callGetPiConfig(tenantId, accountId, piGuid, providers, metadataEndpoints) {
-	  // a wizard config already exists
-	  var source = metadataEndpoints.source,
-	      sourceApi = metadataEndpoints.sourceApi,
-	      destination = metadataEndpoints.destination,
-	      destinationApi = metadataEndpoints.destinationApi;
-	  var skipSourceEnv = providers.skipSourceEnv,
-	      skipDestinationEnv = providers.skipDestinationEnv;
+	function callGetPiConfig(tenantId, accountId, piGuid, wizardConfig) {
+	  var source = wizardConfig.source,
+	      destination = wizardConfig.destination;
 	
 	
 	  if (piGuid && piGuid !== '_') {
 	    return function (dispatch, getState, api) {
-	      var _getState19 = getState(),
-	          config = _getState19.config;
+	      var _getState18 = getState(),
+	          config = _getState18.config;
 	
 	      return api.get(tenantId + '/' + accountId + '/productizedintegration/' + piGuid, {
 	        endpoint: config.TRANS_API_URL
@@ -5544,34 +5466,72 @@ module.exports =
 	          type: types.SET_WIZARD_SAVED_CONFIGURATION,
 	          data: config
 	        });
-	        return Promise.all([dispatch(tryGetMetadata(tenantId, accountId, 'source', providers.source, source, sourceApi, savedSourceEndpoint, skipSourceEnv)), dispatch(tryGetMetadata(tenantId, accountId, 'destination', providers.destination, destination, destinationApi, savedDestinationEndpoint, skipDestinationEnv)), dispatch(callGetMapping(tenantId, accountId, pi.schemaMappingGuid)), dispatch(callGetBundles(tenantId, accountId, pi.bundlePackGuid)), dispatch(callGetCredentials(tenantId, accountId, providers)), dispatch(callGetTrigger(pi.transformerBaseId))]);
+	        return Promise.all([dispatch(callGetMapping(tenantId, accountId, pi.schemaMappingGuid)), dispatch(callGetBundles(tenantId, accountId, pi.bundlePackGuid)), dispatch(callGetCredentialsAndMetadatas(tenantId, accountId, wizardConfig, savedSourceEndpoint, savedDestinationEndpoint)), dispatch(callGetTrigger(pi.transformerBaseId))]);
 	      });
 	    };
 	  } else return function (dispatch) {
 	    // FIRST TIME!
-	    return Promise.all([dispatch(tryGetMetadata(tenantId, accountId, 'source', providers.source, source, sourceApi, null, skipSourceEnv)), dispatch(tryGetMetadata(tenantId, accountId, 'destination', providers.destination, destination, destinationApi, null, skipDestinationEnv))]);
+	    return Promise.all([dispatch(tryGetMetadataIntro(tenantId, accountId, 'source', source)), dispatch(tryGetMetadataIntro(tenantId, accountId, 'destination', destination))]);
 	  };
 	}
 	
-	// this function runs when wizard first loads
-	function tryGetMetadata(tenantId, appId, mode, providerType, urlSuffix, apiUrl, savedEndpoint, skipEnvStep) {
-	  // if its first time AND there is no env step, automatically pull metadata (SF app)
-	  if (!savedEndpoint && !skipEnvStep) return function () {
-	    return Promise.resolve(null);
-	  };
-	  if (urlSuffix) {
-	    return function (dispatch) {
-	      return dispatch(callGetProviderMetadata(tenantId, appId, urlSuffix, apiUrl, mode, providerType));
-	    };
-	  } else if (savedEndpoint && savedEndpoint !== 'https://' && savedEndpoint !== 'http://' && savedEndpoint !== '_blank') {
+	// this function runs when a NEW wizard first loads ONLY in Salesforce App (no env step)
+	function tryGetMetadataIntro(tenantId, appId, mode, config) {
+	  var type = config.type,
+	      metadataEndpoint = config.metadataEndpoint,
+	      metadataApi = config.metadataApi,
+	      skipEnvStep = config.skipEnvStep;
+	  // automatically pull metadata (SF app)
+	
+	  if (skipEnvStep) {
 	    return function (dispatch) {
-	      return dispatch(callCheckConnection(tenantId, appId, savedEndpoint, mode, providerType));
+	      return dispatch(callGetProviderMetadata(tenantId, appId, metadataEndpoint, metadataApi, mode, type));
 	    };
 	  } else return function () {
 	    return Promise.resolve(null);
 	  };
 	}
 	
+	function callGetCredentialsAndMetadatas(tenantId, appId, config, savedSourceEndpoint, savedDestinationEndpoint) {
+	  var source = config.source,
+	      destination = config.destination;
+	
+	  return function (dispatch, getState, api) {
+	    return Promise.all([dispatch(tryGetCredentials(tenantId, appId, source.type, source.credentials)), dispatch(tryGetCredentials(tenantId, appId, destination.type, destination.credentials))]).then(function (res) {
+	      dispatch({
+	        type: types.SET_WIZARD_SAVED_CREDENTIALS,
+	        data: {
+	          source: res[0] && res[0].credentialsJson,
+	          destination: res[1] && res[1].credentialsJson
+	        }
+	      });
+	      return Promise.all([dispatch(tryGetMetadata(tenantId, appId, 'source', source, savedSourceEndpoint, source.credentials)), dispatch(tryGetMetadata(tenantId, appId, 'destination', destination, savedDestinationEndpoint, destination.credentials))]);
+	    });
+	  };
+	}
+	
+	function tryGetCredentials(tenantId, appId, credentialType, credsConfig) {
+	  return function (dispatch, getState, api) {
+	    var _getState19 = getState(),
+	        config = _getState19.config;
+	
+	    if (credsConfig && credsConfig.length > 0 && credsConfig[0] !== 'Oauth') {
+	      return api.get(tenantId + '/' + appId + '/credentials/' + credentialType, {
+	        endpoint: config.TRANS_API_URL
+	      });
+	    } else return Promise.resolve(null);
+	  };
+	}
+	
+	function tryGetMetadata(tenantId, appId, mode, config, savedEndpoint, credsConfig) {
+	  return function (dispatch, getState, api) {
+	    // if skipEnvStep (as in SF App), auto pull SF metadata
+	    if (savedEndpoint && savedEndpoint.length > 8 || config.skipEnvStep) {
+	      return dispatch(callGetMetadata(tenantId, appId, mode, config.type, config.metadataEndpoint, config.metadataApi, savedEndpoint, credsConfig));
+	    } else return Promise.resolve(null);
+	  };
+	}
+	
 	function callGetBundles(tenantId, accountId, bundlePackGuid) {
 	  if (bundlePackGuid) {
 	    return function (dispatch, getState, api) {
@@ -5587,9 +5547,7 @@ module.exports =
 	        });
 	      });
 	    };
-	  } else return function () {
-	    return Promise.resolve(null);
-	  };
+	  } else return Promise.resolve(null);
 	}
 	
 	function callGetMapping(tenantId, accountId, mappingGuid) {
@@ -5607,75 +5565,51 @@ module.exports =
 	        });
 	      });
 	    };
-	  } else return function () {
-	    return Promise.resolve(null);
-	  };
+	  } else return Promise.resolve(null);
 	}
 	
 	function postCredentials(tenantId, appId, providerType, url, credentials, mode) {
 	  return function (dispatch, getState, api) {
 	    dispatch({
-	      type: types.START_ENV_CHECK,
+	      type: types.START_WIZARD_ENV_CHECK,
 	      mode: mode
 	    });
 	
 	    var _getState22 = getState(),
 	        config = _getState22.config;
 	
-	    var credentialsJson = {
-	      rootUrl: url,
-	      key: credentials.ClientKey || credentials.ClientID,
-	      secret: credentials.ClientSecret
-	    };
-	    if (providerType === 'Canvas') {
-	      credentialsJson = {
-	        rootUrl: url,
-	        accessToken: credentials.Token
-	      };
-	    }
 	    return api.post(tenantId + '/' + appId + '/credentials', {
 	      endpoint: config.TRANS_API_URL,
-	      data: {
-	        credentialType: providerType,
-	        credentialsJson: credentialsJson
-	      }
-	    });
-	  };
-	}
-	
-	function callGetCredentials(tenantId, appId, providers) {
-	  return function (dispatch, getState, api) {
-	    return Promise.all([dispatch(tryGetCredentials(tenantId, appId, providers.source, providers.sourceCredentials)), dispatch(tryGetCredentials(tenantId, appId, providers.destination, providers.destinationCredentials))]).then(function (res) {
-	      dispatch({
-	        type: types.SET_WIZARD_SAVED_CREDENTIALS,
-	        data: {
-	          source: res[0] && res[0].credentialsJson,
-	          destination: res[1] && res[1].credentialsJson
-	        }
-	      });
+	      data: makeCredsForProvider(credentials, providerType, url)
 	    });
 	  };
 	}
 	
-	function tryGetCredentials(tenantId, appId, credentialType, creds) {
-	  return function (dispatch, getState, api) {
-	    var _getState23 = getState(),
-	        config = _getState23.config;
-	
-	    if (creds && creds.length > 0 && creds[0] !== 'Oauth') {
-	      return api.get(tenantId + '/' + appId + '/credentials/' + credentialType, {
-	        endpoint: config.TRANS_API_URL
-	      });
-	    } else {
-	      return Promise.resolve(null);
+	function makeCredsForProvider(creds, providerType, url) {
+	  var data = {
+	    credentialType: providerType,
+	    credentialsJson: {
+	      rootUrl: url
 	    }
 	  };
+	  switch (providerType) {
+	    case 'Canvas':
+	      data.credentialsJson.accessToken = creds.Token;
+	      break;
+	    case 'Blackboard':
+	      data.credentialsJson.key = creds.ClientKey;
+	      data.credentialsJson.secret = creds.ClientSecret;
+	      break;
+	    default:
+	      break;
+	  }
+	  return data;
 	}
 	
 	function callGetTrigger(transBaseId) {
 	  return function (dispatch, getState, api) {
-	    var _getState24 = getState(),
-	        config = _getState24.config;
+	    var _getState23 = getState(),
+	        config = _getState23.config;
 	
 	    if (transBaseId) {
 	      return api.get('gettrigger/' + transBaseId, {
@@ -5686,9 +5620,7 @@ module.exports =
 	          data: data
 	        });
 	      });
-	    } else return function () {
-	      return Promise.resolve(null);
-	    };
+	    } else return Promise.resolve(null);
 	  };
 	}
 	
@@ -5990,7 +5922,7 @@ module.exports =
 	          _react2.default.createElement(
 	            'div',
 	            { style: { display: 'inline-block', width: 'calc(50% - 120px)' } },
-	            'Destination Objects'
+	            'Target Objects'
 	          )
 	        ),
 	        _react2.default.createElement(
@@ -6246,41 +6178,41 @@ module.exports =
 	    props.update();
 	  };
 	
-	  var selectSourceKeyForLingk = function selectSourceKeyForLingk(key, section, parents) {
+	  var selectSourceKeyForLingk = function selectSourceKeyForLingk(key, i, field) {
 	    var rgs = [].concat(_toConsumableArray(resourceGroups));
 	    var group = rgs[bundleIndex];
 	    group.lingkSourceKey = key;
-	    group.lingkSourceKeyObject = section;
-	    group.lingkSourceKeyParents = parents;
+	    group.lingkSourceKeyObject = field.section;
+	    group.lingkSourceKeyParents = field.parents;
 	    change('resourceGroups', rgs);
 	    props.update();
 	  };
 	
-	  var selectCustomSourceKey = function selectCustomSourceKey(key, section, i, parents) {
+	  var selectCustomSourceKey = function selectCustomSourceKey(key, i, field) {
 	    var rgs = [].concat(_toConsumableArray(resourceGroups));
 	    var group = rgs[bundleIndex];
 	    if (i === 0) {
 	      group.sourceKeys = [key];
-	      group.sourceKeysObjects = [section];
-	      group.sourceKeysParents = [parents];
+	      group.sourceKeysObjects = [field.section];
+	      group.sourceKeysParents = [field.parents];
 	    } else {
 	      group.sourceKeys[i] = key;
-	      group.sourceKeysObjects[i] = section;
-	      group.sourceKeysParents[i] = parents;
+	      group.sourceKeysObjects[i] = field.section;
+	      group.sourceKeysParents[i] = field.parents;
 	    }
 	    change('resourceGroups', rgs);
 	    props.update();
 	  };
 	
-	  var selectCustomDestinationKey = function selectCustomDestinationKey(key, i, parents) {
+	  var selectCustomDestinationKey = function selectCustomDestinationKey(key, i, field) {
 	    var rgs = [].concat(_toConsumableArray(resourceGroups));
 	    var group = rgs[bundleIndex];
 	    if (i === 0) {
 	      group.destinationKeys = [key];
-	      group.destinationKeysParents = [parents];
+	      group.destinationKeysParents = [field.parents];
 	    } else {
 	      group.destinationKeys[i] = key;
-	      group.destinationKeysParents[i] = parents;
+	      group.destinationKeysParents[i] = field.parents;
 	    }
 	    change('resourceGroups', rgs);
 	    props.update();
@@ -6402,9 +6334,10 @@ module.exports =
 	                'div',
 	                { className: 'external-keys-column' },
 	                _react2.default.createElement(_selectWrapper2.default, { label: sourceLabel || 'Choose Key',
-	                  onSelect: function onSelect(v, iii, rtid, section, parents) {
-	                    return selectCustomSourceKey(v, section, i, parents);
-	                  }, inputs: inputs,
+	                  onSelect: function onSelect(v, iii, field) {
+	                    return selectCustomSourceKey(v, i, field);
+	                  },
+	                  inputs: inputs,
 	                  type: 'brand', fieldPropLabel: 'label',
 	                  values: vals, sectionLabels: sectionLabels,
 	                  selectedValues: group.sourceKeys && [{
@@ -6424,9 +6357,10 @@ module.exports =
 	                'div',
 	                { className: 'external-keys-column' },
 	                _react2.default.createElement(_selectWrapper2.default, { label: group.destinationKeys && group.destinationKeys[i] || 'Choose Key',
-	                  onSelect: function onSelect(v, iii, rtid, section, parents) {
-	                    return selectCustomDestinationKey(v, i, parents);
-	                  }, type: 'brand', inputs: inputs,
+	                  onSelect: function onSelect(v, iii, field) {
+	                    return selectCustomDestinationKey(v, i, field);
+	                  },
+	                  type: 'brand', inputs: inputs,
 	                  values: destinationVals,
 	                  sectionLabels: [bundle.name], fieldPropLabel: 'label',
 	                  selectedValues: group.destinationKeys && [{
@@ -6522,9 +6456,10 @@ module.exports =
 	                { className: 'external-keys-column' },
 	                _react2.default.createElement(_selectWrapper2.default, { label: sourceLabel || 'Choose Key',
 	                  menuItemStyle: { height: 20, padding: '1px 8px' },
-	                  onSelect: function onSelect(v, i, rtid, section, parents) {
-	                    return selectSourceKeyForLingk(v, section, parents);
-	                  }, type: 'brand', inputs: inputs,
+	                  onSelect: function onSelect(v, i, field) {
+	                    return selectSourceKeyForLingk(v, i, field);
+	                  },
+	                  type: 'brand', inputs: inputs,
 	                  values: vals, sectionLabels: sectionLabels,
 	                  fieldPropLabel: 'label',
 	                  selectedValues: [{
@@ -7642,8 +7577,8 @@ module.exports =
 	                                )
 	                              ),
 	                              _react2.default.createElement(_selectWrapper2.default, { label: primaryKeyLabel || 'Primary Join Key',
-	                                onSelect: function onSelect(v, a, b, c, parents) {
-	                                  return selectPrimaryKey(v, parents, resourceGroupIndex, i);
+	                                onSelect: function onSelect(v, idx, field) {
+	                                  selectPrimaryKey(v, field, resourceGroupIndex, i);
 	                                },
 	                                onClick: showOverflow,
 	                                type: 'neutral', inputs: inputs,
@@ -7678,8 +7613,8 @@ module.exports =
 	                                )
 	                              ),
 	                              _react2.default.createElement(_selectWrapper2.default, { label: joinKeyLabel || 'Join Key',
-	                                onSelect: function onSelect(v, a, b, c, parents) {
-	                                  return selectJoinKey(v, parents, resourceGroupIndex, i);
+	                                onSelect: function onSelect(v, idx, field) {
+	                                  selectJoinKey(v, field, resourceGroupIndex, i);
 	                                },
 	                                onClick: showOverflow,
 	                                type: 'neutral', inputs: inputs,
@@ -7731,9 +7666,10 @@ module.exports =
 	                  'div',
 	                  { style: { display: 'inline-block', marginLeft: 11 } },
 	                  _react2.default.createElement(_selectWrapper2.default, { label: 'Add Data Source', style: { height: 40 }, onClick: showOverflow,
-	                    onSelect: function onSelect(v, i, rtid, section, parents, parentRef) {
-	                      addDefaultEntity(resourceGroupIndex, v, i, section, rtid, parentRef);
-	                    }, type: 'neutral', inputs: inputs
+	                    onSelect: function onSelect(v, i, entity) {
+	                      return addDefaultEntity(v, i, entity, resourceGroupIndex);
+	                    },
+	                    type: 'neutral', inputs: inputs
 	                    //selectedValues={resourceGroups && resourceGroups[resourceGroupIndex] && 
 	                    //resourceGroups[resourceGroupIndex].resources} 
 	                    , values: !isReverse ? [sourceSchema, destinationSchema] : [destinationSchema, sourceSchema],
@@ -7894,7 +7830,9 @@ module.exports =
 	    }
 	  }, {
 	    key: 'changeConcatField',
-	    value: function changeConcatField(field, resource, parents, mappingIndex) {
+	    value: function changeConcatField(v, field, mappingIndex) {
+	      var section = field.section,
+	          parents = field.parents;
 	      var _props2 = this.props,
 	          change = _props2.change,
 	          resourceGroups = _props2.resourceGroups,
@@ -7902,11 +7840,11 @@ module.exports =
 	
 	      var groups = [].concat(_toConsumableArray(resourceGroups));
 	      var trans = resourceGroups[resourceGroupIndex].mappings[mappingIndex].transformations[0];
-	      var s = resource + '->';
+	      var s = section + '->';
 	      parents && parents.forEach(function (p) {
 	        s += p + '.';
 	      });
-	      s += field;
+	      s += v;
 	      trans.args = trans.args || [];
 	      trans.args[1] = s;
 	      change('resourceGroups', groups);
@@ -8249,8 +8187,8 @@ module.exports =
 	                if (label) sourceLabel += label;
 	
 	                return _react2.default.createElement(_selectWrapper2.default, { key: ta, label: sourceLabel || 'Choose Field',
-	                  onSelect: function onSelect(v, iii, rtid, section, parents) {
-	                    return _this3.changeConcatField(v, section, parents, mappingIndex);
+	                  onSelect: function onSelect(v, iii, field) {
+	                    return _this3.changeConcatField(v, field, mappingIndex);
 	                  },
 	                  inputs: inputs,
 	                  type: 'brand', fieldPropLabel: 'label',
@@ -8905,10 +8843,10 @@ module.exports =
 	
 	      if (credentials) {
 	        actions.postCredentials(tenantId, accountId, step.providerType, endpoint, credentials, step.mode).then(function () {
-	          actions.getMetadataFromEnvStep(tenantId, accountId, step.mode, step.providerType, step.metadataEndpoint, step.metadataApi, endpoint || '_blank', credentials);
+	          actions.callGetMetadata(tenantId, accountId, step.mode, step.providerType, step.metadataEndpoint, step.metadataApi, endpoint || '_blank', step.credentials);
 	        });
 	      } else {
-	        actions.getMetadataFromEnvStep(tenantId, accountId, step.mode, step.providerType, step.metadataEndpoint, step.metadataApi, endpoint || '_blank', credentials);
+	        actions.callGetMetadata(tenantId, accountId, step.mode, step.providerType, step.metadataEndpoint, step.metadataApi, endpoint || '_blank', step.credentials);
 	      }
 	    }
 	  }, {
@@ -8947,6 +8885,8 @@ module.exports =
 	        return m.method === 'POST' || m.method === 'PUT';
 	      });
 	
+	      var hasEndpoint = formValues[step.mode + 'Endpoint'] && formValues[step.mode + 'Endpoint'].length > 8;
+	
 	      return _react2.default.createElement(
 	        'form',
 	        { onKeyPress: function onKeyPress(e) {
@@ -9074,7 +9014,8 @@ module.exports =
 	                  onClick: function onClick() {
 	                    return _this2.check();
 	                  },
-	                  style: { marginLeft: 8, marginBottom: 2, height: 30, lineHeight: '10px' } },
+	                  style: { marginLeft: 8, marginBottom: 2, height: 30, lineHeight: '10px' },
+	                  disabled: !hasEndpoint },
 	                'Test Connection'
 	              ) : null,
 	              _react2.default.createElement(
@@ -9126,7 +9067,7 @@ module.exports =
 	                disabled: step.credentials.some(function (c) {
 	                  var formCreds = formValues[step.mode + 'Credentials'];
 	                  return !(formCreds && Object.keys(formCreds).includes(c.split(' ').join('')));
-	                }) },
+	                }) || !hasEndpoint },
 	              'Test Connection'
 	            )
 	          )
@@ -10476,7 +10417,7 @@ module.exports =
 	    }
 	  }, {
 	    key: 'addGroup',
-	    value: function addGroup(v, index, recordTypeId, section) {
+	    value: function addGroup(v, index, newGroup) {
 	      var _props4 = this.props,
 	          change = _props4.change,
 	          formValues = _props4.formValues;
@@ -10487,15 +10428,15 @@ module.exports =
 	      resourceGroups.splice(index, 0, {
 	        name: v,
 	        resources: null,
-	        recordTypeId: recordTypeId,
-	        provider: section
+	        recordTypeId: newGroup.recordTypeId,
+	        provider: newGroup.section
 	      });
 	
 	      change('resourceGroups', resourceGroups);
 	    }
 	  }, {
 	    key: 'addDefaultEntity',
-	    value: function addDefaultEntity(groupIndex, v, rscIndex, section, rtid, parentRef) {
+	    value: function addDefaultEntity(v, rscIndex, entity, groupIndex) {
 	      var _props5 = this.props,
 	          change = _props5.change,
 	          formValues = _props5.formValues;
@@ -10512,7 +10453,7 @@ module.exports =
 	        group.resources = [];
 	        this.openConnectionModal(group, groupIndex);
 	      }
-	      // ADD PARENTS AS WELL
+	      // ADD PARENTS AS WELL ?
 	      /*if(parentRef && parentRef.length>0){
 	        parentRef.forEach((pr,i)=>{
 	          if(!(group.resources.find(r=>r.name===pr))){
@@ -10527,9 +10468,9 @@ module.exports =
 	      }*/
 	      group.resources.push(Object.assign({
 	        name: v,
-	        provider: section,
+	        provider: entity.section,
 	        joinType: 'LEFT JOIN'
-	      }, parentRef && { parentRef: parentRef }, rtid && { recordTypeId: rtid }));
+	      }, entity.parentRef && { parentRef: entity.parentRef }, entity.recordTypeId && { recordTypeId: entity.rtid }));
 	      change('resourceGroups', resourceGroups);
 	      this.forceUpdate();
 	    }
@@ -10623,7 +10564,8 @@ module.exports =
 	    }
 	  }, {
 	    key: 'selectPrimaryKey',
-	    value: function selectPrimaryKey(v, parents, rgi, i) {
+	    value: function selectPrimaryKey(v, field, rgi, i) {
+	      console.log(field.parents);
 	      var _props10 = this.props,
 	          change = _props10.change,
 	          formValues = _props10.formValues;
@@ -10631,13 +10573,13 @@ module.exports =
 	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
 	      var rsc = resourceGroups[rgi].resources[i];
 	      rsc.primaryKeyName = v;
-	      rsc.primaryKeyParents = parents;
+	      rsc.primaryKeyParents = field.parents;
 	      change('resourceGroups', resourceGroups);
 	      this.forceUpdate();
 	    }
 	  }, {
 	    key: 'selectJoinKey',
-	    value: function selectJoinKey(v, parents, rgi, i) {
+	    value: function selectJoinKey(v, field, rgi, i) {
 	      var _props11 = this.props,
 	          change = _props11.change,
 	          formValues = _props11.formValues;
@@ -10645,7 +10587,7 @@ module.exports =
 	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
 	      var rsc = resourceGroups[rgi].resources[i];
 	      rsc.joinKeyName = v;
-	      rsc.joinKeyParents = parents;
+	      rsc.joinKeyParents = field.parents;
 	      change('resourceGroups', resourceGroups);
 	      this.forceUpdate();
 	    }
@@ -10739,7 +10681,8 @@ module.exports =
 	          { className: 'connect-modal' },
 	          resourceGroups && resourceGroups.length > 0 && this.state.showModal && _react2.default.createElement(_connectModal2.default, { inputs: inputs, hideModal: this.hideModal,
 	            bundle: this.state.selectedBundle, opened: this.state.showModal, change: change,
-	            resourceGroups: resourceGroups, step: step, bundleIndex: this.state.selectedBundleIndex,
+	            resourceGroups: resourceGroups, step: step,
+	            bundleIndex: this.state.selectedBundleIndex,
 	            sourceSchema: sourceSchema, destinationSchema: destinationSchema,
 	            update: function update() {
 	              return _this2.forceUpdate();
@@ -11029,10 +10972,9 @@ module.exports =
 	            destinationMetadata = _props3.destinationMetadata,
 	            sourceEndpoint = _props3.sourceEndpoint;
 	
-	        var providers = { source: step.sourceProvider, destination: step.destinationProvider };
 	        var clone = (0, _objectAssignDeep2.default)({}, { bundles: resourceGroups });
 	
-	        var _saveData = (0, _saveData3.default)(clone.bundles, providers, sourceMetadata, destinationMetadata, sourceEndpoint),
+	        var _saveData = (0, _saveData3.default)(clone.bundles, step.destinationProvider, sourceMetadata, destinationMetadata, sourceEndpoint),
 	            bundles = _saveData.bundles,
 	            mappings = _saveData.mappings;
 	
@@ -11461,10 +11403,9 @@ module.exports =
 	          actions = _props.actions,
 	          tenantId = _props.tenantId,
 	          accountId = _props.accountId,
-	          metadataEndpoints = _props.metadataEndpoints,
-	          providers = _props.providers;
+	          wizardConfig = _props.wizardConfig;
 	
-	      actions.callInit(tenantId, accountId, piGuid, providers, metadataEndpoints);
+	      actions.callInit(tenantId, accountId, piGuid, wizardConfig);
 	    }
 	  }]);
 	
@@ -11510,7 +11451,7 @@ module.exports =
 	      //resources: Type is the real value, Name is the displayed value
 	      //properties: Name is the real value, Label is the displayed value
 	
-	      var _saveData = (0, _saveData3.default)(formValues['resourceGroups'], this.props.providers, this.props.wizard.sourceMetadata, this.props.wizard.destinationMetadata, formValues.sourceEndpoint),
+	      var _saveData = (0, _saveData3.default)(formValues['resourceGroups'], this.props.wizardConfig.destination.type, this.props.wizard.sourceMetadata, this.props.wizard.destinationMetadata, formValues.sourceEndpoint),
 	          bundles = _saveData.bundles,
 	          mappings = _saveData.mappings,
 	          endpoints = _saveData.endpoints;
@@ -11769,7 +11710,7 @@ module.exports =
 	      mode: 'source'
 	    }, {
 	      type: 'environment',
-	      title: 'Destination Environment',
+	      title: 'Target Environment',
 	      mode: 'destination'
 	    }, {
 	      type: 'filter',
@@ -11849,33 +11790,14 @@ module.exports =
 	          stepList.push(step);
 	        }
 	      }
-	      var providers = {
-	        source: wizard.source.type,
-	        destination: wizard.destination.type,
-	        sourceCredentials: wizard.source.credentials,
-	        destinationCredentials: wizard.destination.credentials,
-	        skipSourceEnv: wizard.source.skipEnvStep,
-	        skipDestinationEnv: wizard.destination.skipEnvStep
-	      };
-	      var metadataEndpoints = {
-	        source: wizard.source.metadataEndpoint || null,
-	        sourceApi: wizard.source.metadataApi || null,
-	        destination: wizard.destination.metadataEndpoint || null,
-	        destinationApi: wizard.destination.metadataApi || null
-	      };
 	      this.setState({
-	        steps: stepList,
-	        providers: providers,
-	        metadataEndpoints: metadataEndpoints
+	        steps: stepList
 	      });
 	    }
 	  }, {
 	    key: 'render',
 	    value: function render() {
-	      var _state = this.state,
-	          steps = _state.steps,
-	          providers = _state.providers,
-	          metadataEndpoints = _state.metadataEndpoints;
+	      var steps = this.state.steps;
 	
 	      if (!steps) return _react2.default.createElement('div', null);
 	      return _react2.default.createElement(
@@ -11886,9 +11808,7 @@ module.exports =
 	            height: '100%'
 	          } },
 	        _react2.default.createElement(_wizardForm2.default, Object.assign({
-	          steps: steps,
-	          providers: providers,
-	          metadataEndpoints: metadataEndpoints
+	          steps: steps
 	        }, this.props))
 	      );
 	    }