@lingk/sync 0.1.51 → 0.1.53

package/build/main.js

@@ -4932,7 +4932,10 @@ module.exports =
 	Object.defineProperty(exports, "__esModule", {
 	  value: true
 	});
+	exports.getMetadataFromEnvStep = getMetadataFromEnvStep;
 	exports.callCheckConnection = callCheckConnection;
+	exports.callCheckConnectionForProvider = callCheckConnectionForProvider;
+	exports.callGetProviderMetadata = callGetProviderMetadata;
 	exports.getOauthUrl = getOauthUrl;
 	exports.createLingkExternalIds = createLingkExternalIds;
 	exports.callTest = callTest;
@@ -4961,7 +4964,6 @@ module.exports =
 	exports.postCredentials = postCredentials;
 	exports.callGetCredentials = callGetCredentials;
 	exports.tryGetCredentials = tryGetCredentials;
-	exports.callGetProviderMetadata = callGetProviderMetadata;
 	exports.callGetTrigger = callGetTrigger;
 	exports.setWizardLoaded = setWizardLoaded;
 	exports.setWizardDataLoaded = setWizardDataLoaded;
@@ -4981,27 +4983,90 @@ 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; } }
 	
-	function callCheckConnection(tenantId, appId, url, mode, providerType) {
+	// runs when "checkconnection" is click in environment step
+	function getMetadataFromEnvStep(tenantId, appId, mode, providerType, urlSuffix, apiUrl, endpoint, creds) {
+	  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,
 	      mode: mode
 	    });
+	    return dispatch(callCheckConnectionForProvider(tenantId, appId, url, mode, providerType, creds)).then(function (res) {
+	      dispatch({
+	        type: types.FINISH_ENV_CHECK,
+	        data: { res: res, mode: mode, code: '200 OK', providerType: providerType }
+	      });
+	    }).catch(function (err) {
+	      dispatch({
+	        type: types.FINISH_ENV_CHECK,
+	        data: { res: null, mode: mode, code: '404 Error', providerType: providerType }
+	      });
+	    });
+	  };
+	}
 	
+	function callCheckConnectionForProvider(tenantId, appId, url, mode, providerType, creds) {
+	  return function (dispatch, getState, api) {
 	    var _getState = getState(),
 	        config = _getState.config;
 	
-	    return api.get(tenantId + '/' + appId + '/testconnection?url=' + url, {
-	      endpoint: config.TRANS_API_URL
+	    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, {
+	        endpoint: config.TRANS_API_URL
+	      });
+	    }
+	  };
+	}
+	
+	function callGetProviderMetadata(tenantId, appId, urlSuffix, apiUrl, mode, providerType) {
+	  return function (dispatch, getState, api) {
+	    dispatch({
+	      type: types.START_ENV_CHECK,
+	      mode: mode
+	    });
+	
+	    var _getState2 = getState(),
+	        config = _getState2.config;
+	
+	    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', providerType: providerType }
+	        data: { res: null, mode: mode, code: '404 Error' }
 	      });
 	    });
 	  };
@@ -5015,8 +5080,8 @@ module.exports =
 	      mode: mode
 	    });
 	
-	    var _getState2 = getState(),
-	        config = _getState2.config;
+	    var _getState3 = getState(),
+	        config = _getState3.config;
 	
 	    return api.get(tenantId + '/' + appId + '/oauthurl/' + typeGuid + '/' + orgType, {
 	      endpoint: config.SF_AGENT_API_URL
@@ -5033,8 +5098,8 @@ module.exports =
 	
 	function createLingkExternalIds(tenantId, appId, bundles, mappings, destinationMetadata) {
 	  return function (dispatch, getState, api) {
-	    var _getState3 = getState(),
-	        config = _getState3.config;
+	    var _getState4 = getState(),
+	        config = _getState4.config;
 	
 	    var externalIdlessObjects = [];
 	    bundles.forEach(function (b) {
@@ -5092,8 +5157,8 @@ module.exports =
 	
 	function callAddCustomField(tenantId, appId, objectType, fieldName, completedCallback) {
 	  return function (dispatch, getState, api) {
-	    var _getState4 = getState(),
-	        config = _getState4.config;
+	    var _getState5 = getState(),
+	        config = _getState5.config;
 	
 	    return api.post(tenantId + '/' + appId + '/salesforceschema/field', {
 	      endpoint: config.SF_AGENT_API_URL,
@@ -5149,8 +5214,8 @@ module.exports =
 	      type: types.START_PREVIEW
 	    });
 	
-	    var _getState5 = getState(),
-	        config = _getState5.config;
+	    var _getState6 = getState(),
+	        config = _getState6.config;
 	
 	    return api.get(tenantId + '/' + appId + '/previewintegration?url=' + url, {
 	      endpoint: config.TRANS_API_URL
@@ -5165,8 +5230,8 @@ module.exports =
 	
 	function callGetScenarioList(tenantId, appId, typeGuid) {
 	  return function (dispatch, getState, api) {
-	    var _getState6 = getState(),
-	        config = _getState6.config;
+	    var _getState7 = getState(),
+	        config = _getState7.config;
 	
 	    return api.get(tenantId + '/' + appId + '/scenarios/' + typeGuid, {
 	      endpoint: config.TRANS_API_URL
@@ -5176,8 +5241,8 @@ module.exports =
 	
 	function callCreateScenario(tenantId, appId, data) {
 	  return function (dispatch, getState, api) {
-	    var _getState7 = getState(),
-	        config = _getState7.config;
+	    var _getState8 = getState(),
+	        config = _getState8.config;
 	
 	    return api.post(tenantId + '/' + appId + '/scenario', {
 	      endpoint: config.TRANS_API_URL,
@@ -5188,8 +5253,8 @@ module.exports =
 	
 	function callUpdateScenarioList(tenantId, appId, typeGuid, scenarioIds) {
 	  return function (dispatch, getState, api) {
-	    var _getState8 = getState(),
-	        config = _getState8.config;
+	    var _getState9 = getState(),
+	        config = _getState9.config;
 	
 	    return api.post(tenantId + '/' + appId + '/scenarios/' + typeGuid, {
 	      endpoint: config.TRANS_API_URL,
@@ -5202,8 +5267,8 @@ module.exports =
 	
 	function callPostBundles(tenantId, appId, bundles) {
 	  return function (dispatch, getState, api) {
-	    var _getState9 = getState(),
-	        config = _getState9.config;
+	    var _getState10 = getState(),
+	        config = _getState10.config;
 	
 	    var data = { bundles: bundles };
 	    return api.post(tenantId + '/' + appId + '/bundle', {
@@ -5217,8 +5282,8 @@ module.exports =
 	
 	function callPostMapping(tenantId, appId, mappings) {
 	  return function (dispatch, getState, api) {
-	    var _getState10 = getState(),
-	        config = _getState10.config;
+	    var _getState11 = getState(),
+	        config = _getState11.config;
 	
 	    var data = { mappings: mappings };
 	    return api.post(tenantId + '/' + appId + '/schemamappings', {
@@ -5232,8 +5297,8 @@ module.exports =
 	
 	function callPostProductizedIntegration(tenantId, appId, schemaMappingGuid, bundlePackGuid, configuration, title, typeGuid) {
 	  return function (dispatch, getState, api) {
-	    var _getState11 = getState(),
-	        config = _getState11.config;
+	    var _getState12 = getState(),
+	        config = _getState12.config;
 	
 	    var data = {
 	      schemaMappingGuid: schemaMappingGuid,
@@ -5253,8 +5318,8 @@ module.exports =
 	
 	function callUpdateProductizedIntegration(tenantId, appId, schemaMappingGuid, bundlePackGuid, configuration, title, typeGuid, piGuid) {
 	  return function (dispatch, getState, api) {
-	    var _getState12 = getState(),
-	        config = _getState12.config;
+	    var _getState13 = getState(),
+	        config = _getState13.config;
 	
 	    var data = {
 	      schemaMappingGuid: schemaMappingGuid,
@@ -5274,8 +5339,8 @@ module.exports =
 	
 	function callGenerateRecipe(tenantId, appId, typeId, typeGuid, title, piGuid, mappingGuid, sourceMetadata, destinationMetadata, isManagedPackage) {
 	  return function (dispatch, getState, api) {
-	    var _getState13 = getState(),
-	        config = _getState13.config;
+	    var _getState14 = getState(),
+	        config = _getState14.config;
 	
 	    return api.post(tenantId + '/' + appId + '/productizedintegrations/' + piGuid + '/generate', {
 	      endpoint: config.TRANS_API_URL,
@@ -5331,8 +5396,8 @@ module.exports =
 	
 	function callExecuteTransformer(transId) {
 	  return function (dispatch, getState, api) {
-	    var _getState14 = getState(),
-	        config = _getState14.config;
+	    var _getState15 = getState(),
+	        config = _getState15.config;
 	
 	    var query = '';
 	    var d = new Date();
@@ -5356,8 +5421,8 @@ module.exports =
 	
 	function callLookupLogData(externalExecutionId, index, onFinish, generatedRecipe, pi) {
 	  return function (dispatch, getState, api) {
-	    var _getState15 = getState(),
-	        config = _getState15.config;
+	    var _getState16 = getState(),
+	        config = _getState16.config;
 	
 	    return api.get('logs/transformers/externalExecutionId/' + externalExecutionId, {
 	      endpoint: config.TRANS_API_URL
@@ -5400,8 +5465,8 @@ module.exports =
 	    };
 	  }
 	  return function (dispatch, getState, api) {
-	    var _getState16 = getState(),
-	        config = _getState16.config;
+	    var _getState17 = getState(),
+	        config = _getState17.config;
 	
 	    return api.post('createtrigger', {
 	      endpoint: config.TRANS_API_URL,
@@ -5414,8 +5479,8 @@ module.exports =
 	
 	function callDeployTrigger(generatedRecipe, pi, onFinish) {
 	  return function (dispatch, getState, api) {
-	    var _getState17 = getState(),
-	        config = _getState17.config;
+	    var _getState18 = getState(),
+	        config = _getState18.config;
 	
 	    return api.put('transformer/deploy/' + generatedRecipe.Id, {
 	      endpoint: config.TRANS_API_URL,
@@ -5459,8 +5524,8 @@ module.exports =
 	
 	  if (piGuid && piGuid !== '_') {
 	    return function (dispatch, getState, api) {
-	      var _getState18 = getState(),
-	          config = _getState18.config;
+	      var _getState19 = getState(),
+	          config = _getState19.config;
 	
 	      return api.get(tenantId + '/' + accountId + '/productizedintegration/' + piGuid, {
 	        endpoint: config.TRANS_API_URL
@@ -5479,68 +5544,17 @@ module.exports =
 	          type: types.SET_WIZARD_SAVED_CONFIGURATION,
 	          data: config
 	        });
-	        return Promise.all([dispatch(tryGetMetadata(tenantId, accountId, 'source', providers.source, source, sourceApi, savedSourceEndpoint, false, skipSourceEnv)), dispatch(tryGetMetadata(tenantId, accountId, 'destination', providers.destination, destination, destinationApi, savedDestinationEndpoint, false, 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(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))]);
 	      });
 	    };
 	  } else return function (dispatch) {
 	    // FIRST TIME!
-	    return Promise.all([dispatch(tryGetMetadata(tenantId, accountId, 'source', providers.source, source, sourceApi, null, false, skipSourceEnv)), dispatch(tryGetMetadata(tenantId, accountId, 'destination', providers.destination, destination, destinationApi, null, false, skipDestinationEnv))]);
+	    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))]);
 	  };
 	}
 	
-	/*export function callGetPiConfig(tenantId, accountId, piGuid, providers, metadataEndpoints) {
-	  // a wizard config already exists
-	  const { source, sourceApi, destination, destinationApi } = metadataEndpoints
-	  const {skipSourceEnv, skipDestinationEnv} = providers
-	
-	  if(piGuid && piGuid!=='_'){
-	    return (dispatch, getState, api) => {
-	      const { config } = getState()
-	      return api.get(`${tenantId}/${accountId}/productizedintegrations`, {
-	        endpoint: config.TRANS_API_URL,
-	      })
-	      .then((data) => {
-	        const PI = data.find(pi=>pi.ProductizedIntegrationGuid===piGuid)
-	        const config = {}
-	        var savedSourceEndpoint = null
-	        var savedDestinationEndpoint = null
-	        PI.Configuration.forEach((c) => {
-	          config[c.Key] = c.Value
-	          if(c.Key==='sourceEndpoint'){
-	            savedSourceEndpoint = c.Value
-	          }
-	          if(c.Key==='destinationEndpoint'){
-	            savedDestinationEndpoint = c.Value
-	          }
-	        })
-	        config['title'] = PI.Name
-	        dispatch({
-	          type: types.SET_WIZARD_SAVED_CONFIGURATION,
-	          data: config
-	        })
-	        return Promise.all([
-	          dispatch(tryGetMetadata(tenantId, accountId, 'source', providers.source, 
-	            source, sourceApi, savedSourceEndpoint, false, skipSourceEnv)),
-	          dispatch(tryGetMetadata(tenantId, accountId, 'destination', providers.destination,
-	            destination, destinationApi, savedDestinationEndpoint, false, skipDestinationEnv)),
-	          dispatch(callGetMapping(tenantId, accountId, PI.SchemaMappingGuid)),
-	          dispatch(callGetBundles(tenantId, accountId, PI.BundlePackGuid)),
-	          dispatch(callGetCredentials(tenantId, accountId, providers)),
-	          dispatch(callGetTrigger(PI.TransformerBaseId)),        
-	        ])
-	      })
-	    }
-	  } else return (dispatch) => { // FIRST TIME!
-	    return Promise.all([
-	      dispatch(tryGetMetadata(tenantId, accountId, 'source', providers.source, 
-	        source, sourceApi, null, false, skipSourceEnv)),
-	      dispatch(tryGetMetadata(tenantId, accountId, 'destination', providers.destination,
-	        destination, destinationApi, null, false, skipDestinationEnv)),
-	    ])
-	  }
-	}*/
-	
-	function tryGetMetadata(tenantId, appId, mode, providerType, urlSuffix, apiUrl, savedEndpoint, isFromEnvStep, skipEnvStep) {
+	// 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);
@@ -5549,7 +5563,7 @@ module.exports =
 	    return function (dispatch) {
 	      return dispatch(callGetProviderMetadata(tenantId, appId, urlSuffix, apiUrl, mode, providerType));
 	    };
-	  } else if (savedEndpoint && savedEndpoint !== 'https://' && savedEndpoint !== 'http://') {
+	  } else if (savedEndpoint && savedEndpoint !== 'https://' && savedEndpoint !== 'http://' && savedEndpoint !== '_blank') {
 	    return function (dispatch) {
 	      return dispatch(callCheckConnection(tenantId, appId, savedEndpoint, mode, providerType));
 	    };
@@ -5561,8 +5575,8 @@ module.exports =
 	function callGetBundles(tenantId, accountId, bundlePackGuid) {
 	  if (bundlePackGuid) {
 	    return function (dispatch, getState, api) {
-	      var _getState19 = getState(),
-	          config = _getState19.config;
+	      var _getState20 = getState(),
+	          config = _getState20.config;
 	
 	      return api.get(tenantId + '/' + accountId + '/bundle/' + bundlePackGuid, {
 	        endpoint: config.TRANS_API_URL
@@ -5581,8 +5595,8 @@ module.exports =
 	function callGetMapping(tenantId, accountId, mappingGuid) {
 	  if (mappingGuid) {
 	    return function (dispatch, getState, api) {
-	      var _getState20 = getState(),
-	          config = _getState20.config;
+	      var _getState21 = getState(),
+	          config = _getState21.config;
 	
 	      return api.get(tenantId + '/' + accountId + '/schemamappings/' + mappingGuid, {
 	        endpoint: config.TRANS_API_URL
@@ -5605,18 +5619,25 @@ module.exports =
 	      mode: mode
 	    });
 	
-	    var _getState21 = getState(),
-	        config = _getState21.config;
+	    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: {
-	          rootUrl: url,
-	          key: credentials.ClientKey || credentials.ClientID,
-	          secret: credentials.ClientSecret
-	        }
+	        credentialsJson: credentialsJson
 	      }
 	    });
 	  };
@@ -5638,8 +5659,8 @@ module.exports =
 	
 	function tryGetCredentials(tenantId, appId, credentialType, creds) {
 	  return function (dispatch, getState, api) {
-	    var _getState22 = getState(),
-	        config = _getState22.config;
+	    var _getState23 = getState(),
+	        config = _getState23.config;
 	
 	    if (creds && creds.length > 0 && creds[0] !== 'Oauth') {
 	      return api.get(tenantId + '/' + appId + '/credentials/' + credentialType, {
@@ -5651,34 +5672,6 @@ module.exports =
 	  };
 	}
 	
-	function callGetProviderMetadata(tenantId, appId, urlSuffix, apiUrl, mode, providerType) {
-	  return function (dispatch, getState, api) {
-	    dispatch({
-	      type: types.START_ENV_CHECK,
-	      mode: mode
-	    });
-	
-	    var _getState23 = getState(),
-	        config = _getState23.config;
-	
-	    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' }
-	      });
-	    });
-	  };
-	}
-	
 	function callGetTrigger(transBaseId) {
 	  return function (dispatch, getState, api) {
 	    var _getState24 = getState(),
@@ -6305,11 +6298,15 @@ module.exports =
 	      return defaultRsc.name === bundle.resources[i].name;
 	    }) && destinationSchema.find(function (defaultRsc) {
 	      return defaultRsc.name === bundle.resources[i].name;
-	    }).properties : sourceSchema && sourceSchema.find(function (defaultRsc) {
+	    }).properties.filter(function (f) {
+	      return !f.fake;
+	    }) : sourceSchema && sourceSchema.find(function (defaultRsc) {
 	      return defaultRsc.name === bundle.resources[i].name;
 	    }) && sourceSchema.find(function (defaultRsc) {
 	      return defaultRsc.name === bundle.resources[i].name;
-	    }).properties;
+	    }).properties.filter(function (f) {
+	      return !f.fake;
+	    });
 	  });
 	
 	  var sourceKeys = group.sourceKeys && group.sourceKeys.length > 0 ? group.sourceKeys : [''];
@@ -6864,7 +6861,9 @@ module.exports =
 	                          _react2.default.createElement('div', { style: { height: 9 } }),
 	                          schema && schema.find(function (r) {
 	                            return r.name === rsc.name;
-	                          }).properties.map(function (field, ii) {
+	                          }).properties.filter(function (f) {
+	                            return !f.fake;
+	                          }).map(function (field, ii) {
 	                            return _react2.default.createElement(_nestedField2.default, { key: ii, field: field,
 	                              selectedField: selectedField,
 	                              selectedFieldParents: selectedFieldParents,
@@ -7505,11 +7504,15 @@ module.exports =
 	                      return defaultRsc.name === group.resources[0].name;
 	                    }) && [destinationSchema.find(function (defaultRsc) {
 	                      return defaultRsc.name === group.resources[0].name;
-	                    }).properties] : sourceSchema && sourceSchema.find(function (defaultRsc) {
+	                    }).properties.filter(function (f) {
+	                      return !f.fake;
+	                    })] : sourceSchema && sourceSchema.find(function (defaultRsc) {
 	                      return defaultRsc.name === group.resources[0].name;
 	                    }) && [sourceSchema.find(function (defaultRsc) {
 	                      return defaultRsc.name === group.resources[0].name;
-	                    }).properties];
+	                    }).properties.filter(function (f) {
+	                      return !f.fake;
+	                    })];
 	
 	                    var primaryKeyLabel = '';
 	                    rsc.primaryKeyParents && rsc.primaryKeyParents.forEach(function (skp) {
@@ -7524,11 +7527,15 @@ module.exports =
 	                      return defaultRsc.name === rsc.name;
 	                    }) && [destinationSchema.find(function (defaultRsc) {
 	                      return defaultRsc.name === rsc.name;
-	                    }).properties] : sourceSchema && sourceSchema.find(function (defaultRsc) {
+	                    }).properties.filter(function (f) {
+	                      return !f.fake;
+	                    })] : sourceSchema && sourceSchema.find(function (defaultRsc) {
 	                      return defaultRsc.name === rsc.name;
 	                    }) && [sourceSchema.find(function (defaultRsc) {
 	                      return defaultRsc.name === rsc.name;
-	                    }).properties];
+	                    }).properties.filter(function (f) {
+	                      return !f.fake;
+	                    })];
 	
 	                    var joinKeyLabel = '';
 	                    rsc.joinKeyParents && rsc.joinKeyParents.forEach(function (skp) {
@@ -8051,11 +8058,15 @@ module.exports =
 	            return defaultRsc.name === group.resources[i].name;
 	          }) && destinationSchema.find(function (defaultRsc) {
 	            return defaultRsc.name === group.resources[i].name;
-	          }).properties : sourceSchema && sourceSchema.find(function (defaultRsc) {
+	          }).properties.filter(function (f) {
+	            return !f.fake;
+	          }) : sourceSchema && sourceSchema.find(function (defaultRsc) {
 	            return defaultRsc.name === group.resources[i].name;
 	          }) && sourceSchema.find(function (defaultRsc) {
 	            return defaultRsc.name === group.resources[i].name;
-	          }).properties;
+	          }).properties.filter(function (f) {
+	            return !f.fake;
+	          });
 	        });
 	      }
 	
@@ -8891,21 +8902,13 @@ module.exports =
 	        endpoint = endpoint.slice(0, -1);
 	        change(step.mode + 'Endpoint', endpoint);
 	      }
-	      //(tenantId, appId, mode, providerType, urlSuffix, apiUrl, savedEndpoint, isEnvStep)
-	      /*actions.tryGetMetadata(
-	        tenantId, accountId, step.mode, step.providerType, 
-	        step.metadataEndpoint, step.metadataApi, endpoint || '_blank', true
-	      ).then(j=>{
-	        if(j && credentials){
-	          actions.postCredentials(tenantId, accountId, step.providerType, endpoint, credentials)
-	        }
-	      })*/
+	
 	      if (credentials) {
 	        actions.postCredentials(tenantId, accountId, step.providerType, endpoint, credentials, step.mode).then(function () {
-	          actions.tryGetMetadata(tenantId, accountId, step.mode, step.providerType, step.metadataEndpoint, step.metadataApi, endpoint || '_blank', true);
+	          actions.getMetadataFromEnvStep(tenantId, accountId, step.mode, step.providerType, step.metadataEndpoint, step.metadataApi, endpoint || '_blank', credentials);
 	        });
 	      } else {
-	        actions.tryGetMetadata(tenantId, accountId, step.mode, step.providerType, step.metadataEndpoint, step.metadataApi, endpoint || '_blank', true);
+	        actions.getMetadataFromEnvStep(tenantId, accountId, step.mode, step.providerType, step.metadataEndpoint, step.metadataApi, endpoint || '_blank', credentials);
 	      }
 	    }
 	  }, {
@@ -9141,7 +9144,7 @@ module.exports =
 	          ),
 	          _react2.default.createElement(
 	            'ul',
-	            null,
+	            { style: { listStyle: 'none', paddingLeft: 5 } },
 	            wizard[step.mode + 'Metadata'].filter(function (m) {
 	              return m.method !== 'POST';
 	            }).map(function (rsc, i) {
@@ -11034,20 +11037,18 @@ module.exports =
 	            mappings = _saveData.mappings;
 	
 	        var data = { bundles: bundles, mappings: mappings, title: title, label: description, typeGuid: step.typeGuid };
-	        /*actions.callCreateScenario(tenantId, accountId, data)
-	        .then(()=>{
-	          this.setState({loading:true})
-	          actions.callGetScenarioList(tenantId, accountId, step.typeGuid)
-	          .then(r=>{
-	            console.log(r)
-	            this.setState({loading:false})
-	          })
-	        })*/
-	        var dataStr = "data:text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(data));
+	        actions.callCreateScenario(tenantId, accountId, data).then(function () {
+	          _this3.setState({ loading: true });
+	          actions.callGetScenarioList(tenantId, accountId, step.typeGuid).then(function (r) {
+	            console.log(r);
+	            _this3.setState({ loading: false });
+	          });
+	        });
+	        /*var dataStr = "data:text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(data));
 	        var dlAnchor = this.downloadAnchor;
 	        dlAnchor.setAttribute("href", dataStr);
 	        dlAnchor.setAttribute("download", "scenario.json");
-	        dlAnchor.click();
+	        dlAnchor.click();*/
 	      }
 	    }
 	  }, {