@lingk/sync 0.1.67 → 0.1.69

package/build/main.js

@@ -277,10 +277,12 @@ module.exports =
 	
 	        var SM = sourceMetadata;
 	        var DM = destinationMetadata;
+	        var SP = step.sourceProvider;
 	        var DP = step.destinationProvider;
 	        if (isReverse) {
 	          SM = destinationMetadata;
 	          DM = sourceMetadata;
+	          SP = step.destinationProvider;
 	          DP = step.sourceProvider;
 	        }
 	        var resourceGroups = [];
@@ -314,16 +316,18 @@ module.exports =
 	                });
 	                if (sourceKeyResourceObj) {
 	                  var sourceKeyResourceProvider = sourceKeyResourceObj.provider.replace('Reader', '').toLowerCase();
-	                  var primaryDataSourceMetadata = sourceKeyResourceProvider === DP.toLowerCase() ? DM : SM;
+	                  var primaryDataSourceMetadata = sourceKeyResourceProvider === DP.toLowerCase() ? DM : sourceKeyResourceProvider === SP.toLowerCase() ? SM : null;
 	
-	                  var sourceKeyResource = primaryDataSourceMetadata.find(function (r) {
-	                    return r.type === bundle.sourceKeysObjects[i];
-	                  });
-	                  if (sourceKeyResource) {
-	                    sourceKeysObjects.push(sourceKeyResource.name);
-	                    var deNestedProp = deNest(sk, bundle.sourceKeysParents && JSON.parse(bundle.sourceKeysParents[i]), sourceKeyResource);
-	                    sourceKeys.push(deNestedProp.property);
-	                    sourceKeysParents.push(deNestedProp.parentsArray);
+	                  if (primaryDataSourceMetadata) {
+	                    var sourceKeyResource = primaryDataSourceMetadata.find(function (r) {
+	                      return r.type === bundle.sourceKeysObjects[i];
+	                    });
+	                    if (sourceKeyResource) {
+	                      sourceKeysObjects.push(sourceKeyResource.name);
+	                      var deNestedProp = deNest(sk, bundle.sourceKeysParents && JSON.parse(bundle.sourceKeysParents[i]), sourceKeyResource);
+	                      sourceKeys.push(deNestedProp.property);
+	                      sourceKeysParents.push(deNestedProp.parentsArray);
+	                    }
 	                  }
 	                }
 	              });
@@ -333,46 +337,56 @@ module.exports =
 	
 	                //get resource and joinKey for bundleResource (check both metadatas)
 	                var resourceProvider = rsc.provider.replace('Reader', '').toLowerCase();
-	                var dataSourceMetadata = resourceProvider === DP.toLowerCase() ? DM : SM;
-	                var rscResource = dataSourceMetadata.find(function (r) {
-	                  return r.name === rsc.resourceLabel;
-	                });
+	                var dataSourceMetadata = resourceProvider === DP.toLowerCase() ? DM : resourceProvider === SP.toLowerCase() ? SM : null;
 	
+	                var rscResource = null;
 	                var deNestedJoinKey = {};
 	                var joinKeyResourceName = null;
-	                if (rsc.joinKeyName) {
-	                  // joinKeyName coming from parameter from another resource
-	                  deNestedJoinKey = { property: rsc.joinKeyName };
-	                  joinKeyResourceName = rsc.joinKeyResource;
-	
-	                  // joinKeyName coming from field on this resource
-	                  if (rsc.resourceLabel === rsc.joinKeyResource) {
-	                    var joinKeyResource = dataSourceMetadata.find(function (r) {
-	                      return r.type === rsc.joinKeyResource;
-	                    });
-	                    deNestedJoinKey = deNest(rsc.joinKeyName, rsc.joinKeyParents, joinKeyResource);
-	                    joinKeyResourceName = joinKeyResource.name;
+	                if (dataSourceMetadata) {
+	                  rscResource = dataSourceMetadata.find(function (r) {
+	                    return r.name === rsc.resourceLabel;
+	                  });
+	
+	                  if (rsc.joinKeyName) {
+	                    // joinKeyName coming from parameter from another resource
+	                    deNestedJoinKey = { property: rsc.joinKeyName };
+	                    joinKeyResourceName = rsc.joinKeyResource;
+	
+	                    // joinKeyName coming from field on this resource
+	                    if (rsc.resourceLabel === rsc.joinKeyResource) {
+	                      var joinKeyResource = dataSourceMetadata.find(function (r) {
+	                        return r.type === rsc.joinKeyResource;
+	                      });
+	                      if (joinKeyResource) {
+	                        deNestedJoinKey = deNest(rsc.joinKeyName, rsc.joinKeyParents, joinKeyResource);
+	                        joinKeyResourceName = joinKeyResource.name;
+	                      }
+	                    }
 	                  }
-	                }
+	                } // end if dataSourceMetadata
 	
 	                //get resource and primaryKey for first resource in bundle (check both metadatas)
 	                var primaryResourceProvider = bundle.resources[0].provider.replace('Reader', '').toLowerCase();
-	                var primaryDataSourceMetadata = primaryResourceProvider === DP.toLowerCase() ? DM : SM;
+	                var primaryDataSourceMetadata = primaryResourceProvider === DP.toLowerCase() ? DM : primaryResourceProvider === SP.toLowerCase() ? SM : null;
 	
 	                var deNestedPrimaryKey = {};
 	                var primaryKeyResourceName = null;
-	                if (rsc.primaryKeyName) {
-	                  //primaryKeyName coming from parameter (another resource)
-	                  deNestedPrimaryKey = { property: rsc.primaryKeyName };
-	                  primaryKeyResourceName = rsc.primaryKeyResource;
-	
-	                  // primaryKeyName coming from field on this resource
-	                  if (bundle.resources[0].resourceLabel === rsc.primaryKeyResource) {
-	                    var rscPrimaryResource = primaryDataSourceMetadata.find(function (r) {
-	                      return r.type === rsc.primaryKeyResource;
-	                    });
-	                    deNestedPrimaryKey = deNest(rsc.primaryKeyName, rsc.primaryKeyParents, rscPrimaryResource);
-	                    primaryKeyResourceName = rscPrimaryResource.name;
+	                if (primaryDataSourceMetadata) {
+	                  if (rsc.primaryKeyName) {
+	                    //primaryKeyName coming from parameter (another resource)
+	                    deNestedPrimaryKey = { property: rsc.primaryKeyName };
+	                    primaryKeyResourceName = rsc.primaryKeyResource;
+	
+	                    // primaryKeyName coming from field on this resource
+	                    if (bundle.resources[0].resourceLabel === rsc.primaryKeyResource) {
+	                      var rscPrimaryResource = primaryDataSourceMetadata.find(function (r) {
+	                        return r.type === rsc.primaryKeyResource;
+	                      });
+	                      if (rscPrimaryResource) {
+	                        deNestedPrimaryKey = deNest(rsc.primaryKeyName, rsc.primaryKeyParents, rscPrimaryResource);
+	                        primaryKeyResourceName = rscPrimaryResource.name;
+	                      }
+	                    }
 	                  }
 	                }
 	
@@ -427,18 +441,20 @@ module.exports =
 	                      var concatRsc = wizard.savedBundles.bundles[m.bundleIndex].resources.find(function (r) {
 	                        return r.resourceLabel === transConcatResourceName;
 	                      });
-	                      var concatRscProvider = concatRsc.provider.replace('Reader', '');
-	                      var concatRscMetadata = concatRscProvider.toLowerCase() === DP.toLowerCase() ? DM : SM;
-	                      var transConcatResource = concatRscMetadata.find(function (r) {
-	                        return r.type === concatRsc.resourceName;
-	                      });
-	                      var concatLabels = deNest(field, nestedFields, transConcatResource);
-	                      var result = transConcatResource.name + '->';
-	                      concatLabels.parentsArray.forEach(function (p) {
-	                        return result += p + '.';
-	                      });
-	                      result += concatLabels.property;
-	                      transformations = [{ type: 'concat', args: [trans.args[0], result] }];
+	                      var concatRscProvider = concatRsc.provider.replace('Reader', '').toLowerCase();
+	                      var concatRscMetadata = concatRscProvider === DP.toLowerCase() ? DM : concatRscProvider === SP.toLowerCase() ? SM : null;
+	                      if (concatRscMetadata) {
+	                        var transConcatResource = concatRscMetadata.find(function (r) {
+	                          return r.type === concatRsc.resourceName;
+	                        });
+	                        var concatLabels = deNest(field, nestedFields, transConcatResource);
+	                        var result = transConcatResource.name + '->';
+	                        concatLabels.parentsArray.forEach(function (p) {
+	                          return result += p + '.';
+	                        });
+	                        result += concatLabels.property;
+	                        transformations = [{ type: 'concat', args: [trans.args[0], result] }];
+	                      }
 	                    })();
 	                  } else {
 	                    transformations = m.transformations;
@@ -463,7 +479,7 @@ module.exports =
 	                customExternalKeys: bundle.customExternalKeys || false
 	              }, bundle.customExternalKeys === true && { sourceKeys: sourceKeys, sourceKeysObjects: sourceKeysObjects, sourceKeysParents: sourceKeysParents, destinationKeys: destinationKeys }, bundle.customExternalKeys === false && { lingkSourceKey: sourceKeys[0], lingkSourceKeyObject: sourceKeysObjects[0],
 	                lingkSourceKeyParents: sourceKeysParents[0] }, {
-	                provider: bundle.provider.charAt(0).toUpperCase() + bundle.provider.slice(1)
+	                provider: bundle.provider
 	              }, bundle.recordTypeId && { recordTypeId: bundle.recordTypeId }, {
 	                deleteEnabled: bundle.deleteEnabled || false
 	              })); // end push each bundle (contains resources AND mappings)
@@ -597,7 +613,7 @@ module.exports =
 /***/ function(module, exports, __webpack_require__) {
 
 	var dP         = __webpack_require__(18)
-	  , createDesc = __webpack_require__(33);
+	  , createDesc = __webpack_require__(34);
 	module.exports = __webpack_require__(9) ? function(object, key, value){
 	  return dP.f(object, key, createDesc(1, value));
 	} : function(object, key, value){
@@ -679,7 +695,7 @@ module.exports =
 /***/ function(module, exports, __webpack_require__) {
 
 	// to indexed object, toObject with fallback for non-array-like ES3 strings
-	var IObject = __webpack_require__(30)
+	var IObject = __webpack_require__(31)
 	  , defined = __webpack_require__(16);
 	module.exports = function(it){
 	  return IObject(defined(it));
@@ -762,8 +778,8 @@ module.exports =
 /* 24 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var shared = __webpack_require__(34)('keys')
-	  , uid    = __webpack_require__(36);
+	var shared = __webpack_require__(35)('keys')
+	  , uid    = __webpack_require__(37);
 	module.exports = function(key){
 	  return shared[key] || (shared[key] = uid(key));
 	};
@@ -1337,6 +1353,105 @@ module.exports =
 
 	'use strict';
 	
+	exports.__esModule = true;
+	
+	var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+	
+	var _react = __webpack_require__(1);
+	
+	var _react2 = _interopRequireDefault(_react);
+	
+	var _propTypes = __webpack_require__(39);
+	
+	var _propTypes2 = _interopRequireDefault(_propTypes);
+	
+	var _TransitionGroup = __webpack_require__(202);
+	
+	var _TransitionGroup2 = _interopRequireDefault(_TransitionGroup);
+	
+	var _CSSTransitionGroupChild = __webpack_require__(201);
+	
+	var _CSSTransitionGroupChild2 = _interopRequireDefault(_CSSTransitionGroupChild);
+	
+	var _PropTypes = __webpack_require__(64);
+	
+	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+	
+	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; }
+	
+	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+	
+	var propTypes = {
+	  transitionName: _PropTypes.nameShape.isRequired,
+	
+	  transitionAppear: _propTypes2.default.bool,
+	  transitionEnter: _propTypes2.default.bool,
+	  transitionLeave: _propTypes2.default.bool,
+	  transitionAppearTimeout: (0, _PropTypes.transitionTimeout)('Appear'),
+	  transitionEnterTimeout: (0, _PropTypes.transitionTimeout)('Enter'),
+	  transitionLeaveTimeout: (0, _PropTypes.transitionTimeout)('Leave')
+	};
+	
+	var defaultProps = {
+	  transitionAppear: false,
+	  transitionEnter: true,
+	  transitionLeave: true
+	};
+	
+	var CSSTransitionGroup = function (_React$Component) {
+	  _inherits(CSSTransitionGroup, _React$Component);
+	
+	  function CSSTransitionGroup() {
+	    var _temp, _this, _ret;
+	
+	    _classCallCheck(this, CSSTransitionGroup);
+	
+	    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+	      args[_key] = arguments[_key];
+	    }
+	
+	    return _ret = (_temp = (_this = _possibleConstructorReturn(this, _React$Component.call.apply(_React$Component, [this].concat(args))), _this), _this._wrapChild = function (child) {
+	      return _react2.default.createElement(_CSSTransitionGroupChild2.default, {
+	        name: _this.props.transitionName,
+	        appear: _this.props.transitionAppear,
+	        enter: _this.props.transitionEnter,
+	        leave: _this.props.transitionLeave,
+	        appearTimeout: _this.props.transitionAppearTimeout,
+	        enterTimeout: _this.props.transitionEnterTimeout,
+	        leaveTimeout: _this.props.transitionLeaveTimeout
+	      }, child);
+	    }, _temp), _possibleConstructorReturn(_this, _ret);
+	  }
+	
+	  // We need to provide this childFactory so that
+	  // ReactCSSTransitionGroupChild can receive updates to name, enter, and
+	  // leave while it is leaving.
+	
+	
+	  CSSTransitionGroup.prototype.render = function render() {
+	    return _react2.default.createElement(_TransitionGroup2.default, _extends({}, this.props, { childFactory: this._wrapChild }));
+	  };
+	
+	  return CSSTransitionGroup;
+	}(_react2.default.Component);
+	
+	CSSTransitionGroup.displayName = 'CSSTransitionGroup';
+	
+	
+	CSSTransitionGroup.propTypes = propTypes;
+	CSSTransitionGroup.defaultProps = defaultProps;
+	
+	exports.default = CSSTransitionGroup;
+	module.exports = exports['default'];
+
+/***/ },
+/* 27 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	
 	Object.defineProperty(exports, "__esModule", {
 	  value: true
 	});
@@ -1457,7 +1572,7 @@ module.exports =
 	exports.default = SelectWrapper;
 
 /***/ },
-/* 27 */
+/* 28 */
 /***/ function(module, exports) {
 
 	var toString = {}.toString;
@@ -1467,7 +1582,7 @@ module.exports =
 	};
 
 /***/ },
-/* 28 */
+/* 29 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var isObject = __webpack_require__(14)
@@ -1479,7 +1594,7 @@ module.exports =
 	};
 
 /***/ },
-/* 29 */
+/* 30 */
 /***/ function(module, exports) {
 
 	// IE 8- don't enum bug keys
@@ -1488,30 +1603,30 @@ module.exports =
 	).split(',');
 
 /***/ },
-/* 30 */
+/* 31 */
 /***/ function(module, exports, __webpack_require__) {
 
 	// fallback for non-array-like ES3 and non-enumerable old V8 strings
-	var cof = __webpack_require__(27);
+	var cof = __webpack_require__(28);
 	module.exports = Object('z').propertyIsEnumerable(0) ? Object : function(it){
 	  return cof(it) == 'String' ? it.split('') : Object(it);
 	};
 
 /***/ },
-/* 31 */,
-/* 32 */
+/* 32 */,
+/* 33 */
 /***/ function(module, exports, __webpack_require__) {
 
 	// 19.1.2.14 / 15.2.3.14 Object.keys(O)
 	var $keys       = __webpack_require__(46)
-	  , enumBugKeys = __webpack_require__(29);
+	  , enumBugKeys = __webpack_require__(30);
 	
 	module.exports = Object.keys || function keys(O){
 	  return $keys(O, enumBugKeys);
 	};
 
 /***/ },
-/* 33 */
+/* 34 */
 /***/ function(module, exports) {
 
 	module.exports = function(bitmap, value){
@@ -1524,7 +1639,7 @@ module.exports =
 	};
 
 /***/ },
-/* 34 */
+/* 35 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var global = __webpack_require__(6)
@@ -1535,7 +1650,7 @@ module.exports =
 	};
 
 /***/ },
-/* 35 */
+/* 36 */
 /***/ function(module, exports, __webpack_require__) {
 
 	// 7.1.13 ToObject(argument)
@@ -1545,7 +1660,7 @@ module.exports =
 	};
 
 /***/ },
-/* 36 */
+/* 37 */
 /***/ function(module, exports) {
 
 	var id = 0
@@ -1555,7 +1670,7 @@ module.exports =
 	};
 
 /***/ },
-/* 37 */
+/* 38 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
@@ -1609,7 +1724,7 @@ module.exports =
 
 
 /***/ },
-/* 38 */
+/* 39 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/**
@@ -1644,105 +1759,6 @@ module.exports =
 	}
 
 
-/***/ },
-/* 39 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-	
-	exports.__esModule = true;
-	
-	var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-	
-	var _react = __webpack_require__(1);
-	
-	var _react2 = _interopRequireDefault(_react);
-	
-	var _propTypes = __webpack_require__(38);
-	
-	var _propTypes2 = _interopRequireDefault(_propTypes);
-	
-	var _TransitionGroup = __webpack_require__(202);
-	
-	var _TransitionGroup2 = _interopRequireDefault(_TransitionGroup);
-	
-	var _CSSTransitionGroupChild = __webpack_require__(201);
-	
-	var _CSSTransitionGroupChild2 = _interopRequireDefault(_CSSTransitionGroupChild);
-	
-	var _PropTypes = __webpack_require__(64);
-	
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-	
-	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; }
-	
-	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-	
-	var propTypes = {
-	  transitionName: _PropTypes.nameShape.isRequired,
-	
-	  transitionAppear: _propTypes2.default.bool,
-	  transitionEnter: _propTypes2.default.bool,
-	  transitionLeave: _propTypes2.default.bool,
-	  transitionAppearTimeout: (0, _PropTypes.transitionTimeout)('Appear'),
-	  transitionEnterTimeout: (0, _PropTypes.transitionTimeout)('Enter'),
-	  transitionLeaveTimeout: (0, _PropTypes.transitionTimeout)('Leave')
-	};
-	
-	var defaultProps = {
-	  transitionAppear: false,
-	  transitionEnter: true,
-	  transitionLeave: true
-	};
-	
-	var CSSTransitionGroup = function (_React$Component) {
-	  _inherits(CSSTransitionGroup, _React$Component);
-	
-	  function CSSTransitionGroup() {
-	    var _temp, _this, _ret;
-	
-	    _classCallCheck(this, CSSTransitionGroup);
-	
-	    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-	      args[_key] = arguments[_key];
-	    }
-	
-	    return _ret = (_temp = (_this = _possibleConstructorReturn(this, _React$Component.call.apply(_React$Component, [this].concat(args))), _this), _this._wrapChild = function (child) {
-	      return _react2.default.createElement(_CSSTransitionGroupChild2.default, {
-	        name: _this.props.transitionName,
-	        appear: _this.props.transitionAppear,
-	        enter: _this.props.transitionEnter,
-	        leave: _this.props.transitionLeave,
-	        appearTimeout: _this.props.transitionAppearTimeout,
-	        enterTimeout: _this.props.transitionEnterTimeout,
-	        leaveTimeout: _this.props.transitionLeaveTimeout
-	      }, child);
-	    }, _temp), _possibleConstructorReturn(_this, _ret);
-	  }
-	
-	  // We need to provide this childFactory so that
-	  // ReactCSSTransitionGroupChild can receive updates to name, enter, and
-	  // leave while it is leaving.
-	
-	
-	  CSSTransitionGroup.prototype.render = function render() {
-	    return _react2.default.createElement(_TransitionGroup2.default, _extends({}, this.props, { childFactory: this._wrapChild }));
-	  };
-	
-	  return CSSTransitionGroup;
-	}(_react2.default.Component);
-	
-	CSSTransitionGroup.displayName = 'CSSTransitionGroup';
-	
-	
-	CSSTransitionGroup.propTypes = propTypes;
-	CSSTransitionGroup.defaultProps = defaultProps;
-	
-	exports.default = CSSTransitionGroup;
-	module.exports = exports['default'];
-
 /***/ },
 /* 40 */
 /***/ function(module, exports) {
@@ -1861,7 +1877,7 @@ module.exports =
 /***/ function(module, exports, __webpack_require__) {
 
 	module.exports = !__webpack_require__(9) && !__webpack_require__(12)(function(){
-	  return Object.defineProperty(__webpack_require__(28)('div'), 'a', {get: function(){ return 7; }}).a != 7;
+	  return Object.defineProperty(__webpack_require__(29)('div'), 'a', {get: function(){ return 7; }}).a != 7;
 	});
 
 /***/ },
@@ -1942,7 +1958,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _selectWrapper = __webpack_require__(26);
+	var _selectWrapper = __webpack_require__(27);
 	
 	var _selectWrapper2 = _interopRequireDefault(_selectWrapper);
 	
@@ -2125,7 +2141,7 @@ module.exports =
 	      var group = resourceGroups[this.state.resourceGroupIndex];
 	
 	      var entityExists = group && group.resources && group.resources.find(function (r) {
-	        return r.name === v && r.provider === entity.section;
+	        return r.name === v && r.provider.toLowerCase() === entity.section.toLowerCase();
 	      });
 	
 	      if (group && group.resources && group.resources.length > 0 && !entityExists) {
@@ -2255,14 +2271,14 @@ module.exports =
 	
 	      var firstReverseIndex = null;
 	      for (var i = 0; i < resourceGroups.length; i++) {
-	        if (resourceGroups[i].provider === step.sourceProvider) {
+	        if (resourceGroups[i].provider.toLowerCase() === step.sourceProvider.toLowerCase()) {
 	          firstReverseIndex = i;
 	          break;
 	        }
 	      }
 	
 	      var group = resourceGroups[resourceGroupIndex];
-	      var isReverse = group && group.provider === step.sourceProvider;
+	      var isReverse = group && group.provider.toLowerCase() === step.sourceProvider.toLowerCase();
 	
 	      return _react2.default.createElement(
 	        'div',
@@ -2583,7 +2599,7 @@ module.exports =
 	                var transConcatSourceResourceProvider = group.resources.find(function (r) {
 	                  return r.name === s[0];
 	                }).provider;
-	                var transConcatSourceMetadata = transConcatSourceResourceProvider === targetProvider ? targetMetadata : sourceMetadata;
+	                var transConcatSourceMetadata = transConcatSourceResourceProvider.toLowerCase() === targetProvider.toLowerCase() ? targetMetadata : sourceMetadata;
 	                var transConcatSourceResource = transConcatSourceMetadata.find(function (rsc) {
 	                  return rsc.name === s[0];
 	                });
@@ -2627,9 +2643,8 @@ module.exports =
 	    // BUNDLES
 	    if (group.resources) {
 	      group.resources = group.resources.map(function (rsc) {
-	
 	        //get resource source (check both metadatas)
-	        var dataSourceMetadata = rsc.provider === targetProvider ? targetMetadata : sourceMetadata;
+	        var dataSourceMetadata = rsc.provider.toLowerCase() === targetProvider.toLowerCase() ? targetMetadata : sourceMetadata;
 	        var sourceResource = dataSourceMetadata.find(function (metaRsc) {
 	          return metaRsc.name === rsc.name;
 	        });
@@ -2637,7 +2652,7 @@ module.exports =
 	        var nestedJoinKey = { property: rsc.joinKeyName };
 	        var joinKeyResource = rsc.joinKeyResource;
 	        // is from a same resource (not via parameters)
-	        if (sourceResource && sourceResource.type === rsc.joinKeyResource) {
+	        if (sourceResource && sourceResource.name === rsc.joinKeyResource) {
 	          nestedJoinKey = findNestedProp(rsc.joinKeyName, rsc.joinKeyParents, sourceResource);
 	          joinKeyResource = sourceResource.type;
 	        }
@@ -2649,7 +2664,7 @@ module.exports =
 	        }
 	
 	        //get first resource in bundle (for primaryKeyName)
-	        var primaryDataSourceMetadata = group.resources[0].provider === targetProvider ? targetMetadata : sourceMetadata;
+	        var primaryDataSourceMetadata = group.resources[0].provider.toLowerCase() === targetProvider.toLowerCase() ? targetMetadata : sourceMetadata;
 	        var primarySourceResource = primaryDataSourceMetadata.find(function (metaRsc) {
 	          return metaRsc.name === group.resources[0].name;
 	        });
@@ -2658,7 +2673,7 @@ module.exports =
 	        var nestedPrimaryKey = { property: rsc.primaryKeyName };
 	        var primaryKeyResource = rsc.primaryKeyResource;
 	        // is from a same resource (not via parameters)
-	        if (primarySourceResource && primarySourceResource.type === rsc.primaryKeyResource) {
+	        if (primarySourceResource && primarySourceResource.name === rsc.primaryKeyResource) {
 	          nestedPrimaryKey = findNestedProp(rsc.primaryKeyName, rsc.primaryKeyParents, primarySourceResource);
 	          primaryKeyResource = primarySourceResource.type;
 	        }
@@ -4579,7 +4594,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _propTypes = __webpack_require__(38);
+	var _propTypes = __webpack_require__(39);
 	
 	var _propTypes2 = _interopRequireDefault(_propTypes);
 	
@@ -6079,11 +6094,11 @@ module.exports =
 	
 	            var groupName = group.name;
 	            if (isReverse) {
-	              if (group.provider === step.destinationProvider) {
+	              if (group.provider.toLowerCase() === step.destinationProvider.toLowerCase()) {
 	                groupName = group.name + ' (' + step.destinationProvider + ')';
 	              }
 	            } else {
-	              if (group.provider === step.sourceProvider) {
+	              if (group.provider.toLowerCase() === step.sourceProvider.toLowerCase()) {
 	                groupName = group.name + ' (' + step.sourceProvider + ')';
 	              }
 	            }
@@ -6126,11 +6141,11 @@ module.exports =
 	                      group.resources && group.resources.map(function (rsc, ii) {
 	                        var rscName = rsc.name;
 	                        if (isReverse) {
-	                          if (rsc.provider === step.sourceProvider) {
+	                          if (rsc.provider.toLowerCase() === step.sourceProvider.toLowerCase()) {
 	                            rscName = rsc.name + ' (' + step.sourceProvider + ')';
 	                          }
 	                        } else {
-	                          if (rsc.provider === step.destinationProvider) {
+	                          if (rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase()) {
 	                            rscName = rsc.name + ' (' + step.destinationProvider + ')';
 	                          }
 	                        }
@@ -6221,7 +6236,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _selectWrapper = __webpack_require__(26);
+	var _selectWrapper = __webpack_require__(27);
 	
 	var _selectWrapper2 = _interopRequireDefault(_selectWrapper);
 	
@@ -6271,7 +6286,7 @@ module.exports =
 	            resourceToName: group.name,
 	            propertyToName: group.destinationKeys[i],
 	            propertyFromParents: group.sourceKeysParents[i]
-	          }, rsc.provider === step.destinationProvider && { dataSourceIsDestinationEntity: true });
+	          }, rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase() && { dataSourceIsDestinationEntity: true });
 	          group.mappings = group.mappings || [];
 	          group.mappings.push(map);
 	        }
@@ -6288,7 +6303,7 @@ module.exports =
 	          propertyFromName: group.lingkSourceKey,
 	          resourceToName: group.name,
 	          propertyToName: 'Lingk External Id'
-	        }, rsc.provider === step.destinationProvider && { dataSourceIsDestinationEntity: true });
+	        }, rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase() && { dataSourceIsDestinationEntity: true });
 	        group.mappings = group.mappings || [];
 	        group.mappings.push(map);
 	      }
@@ -6375,7 +6390,7 @@ module.exports =
 	  var vals = bundle.resources.map(function (br, i) {
 	    sectionLabels.push(br.name);
 	    sectionProviders.push(br.provider);
-	    return bundle.resources[i].provider === step.destinationProvider ? destinationSchema && destinationSchema.find(function (defaultRsc) {
+	    return bundle.resources[i].provider.toLowerCase() === step.destinationProvider.toLowerCase() ? destinationSchema && destinationSchema.find(function (defaultRsc) {
 	      return defaultRsc.name === bundle.resources[i].name;
 	    }) && destinationSchema.find(function (defaultRsc) {
 	      return defaultRsc.name === bundle.resources[i].name;
@@ -6457,7 +6472,7 @@ module.exports =
 	          ),
 	          sourceKeys.map(function (sk, i) {
 	
-	            var targetSchema = bundle.provider === step.sourceProvider ? sourceSchema : destinationSchema;
+	            var targetSchema = bundle.provider.toLowerCase() === step.sourceProvider.toLowerCase() ? sourceSchema : destinationSchema;
 	
 	            var destinationVals = [targetSchema && targetSchema.find(function (defaultRsc) {
 	              return defaultRsc.name === bundle.name;
@@ -6656,7 +6671,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _CSSTransitionGroup = __webpack_require__(39);
+	var _CSSTransitionGroup = __webpack_require__(26);
 	
 	var _CSSTransitionGroup2 = _interopRequireDefault(_CSSTransitionGroup);
 	
@@ -6906,17 +6921,17 @@ module.exports =
 	                      }, className: 'scrolly',
 	                      style: { background: 'white', height: 261, width: 358, padding: '6px 12px' } },
 	                    group.resources && group.resources.map(function (rsc, i) {
-	                      var schema = rsc.provider === step.destinationProvider ? destinationSchema : sourceSchema;
-	                      var isDestinationEntity = rsc.provider === step.destinationProvider;
+	                      var schema = rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase() ? destinationSchema : sourceSchema;
+	                      var isDestinationEntity = rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase();
 	                      var isSelected = selectedEntity.name === rsc.name && selectedEntity.isDestinationEntity === isDestinationEntity;
 	
 	                      var rscName = rsc.name;
 	                      if (isReverse) {
-	                        if (rsc.provider === step.sourceProvider) {
+	                        if (rsc.provider.toLowerCase() === step.sourceProvider.toLowerCase()) {
 	                          rscName = rsc.name + ' (' + step.sourceProvider + ')';
 	                        }
 	                      } else {
-	                        if (rsc.provider === step.destinationProvider) {
+	                        if (rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase()) {
 	                          rscName = rsc.name + ' (' + step.destinationProvider + ')';
 	                        }
 	                      }
@@ -6932,7 +6947,7 @@ module.exports =
 	                              _this4.scrollToTop(_this4['scroller-' + ii], 18, i * 43 + 6);
 	                              _this4.props.pickEntity({
 	                                name: rsc.name,
-	                                isDestinationEntity: rsc.provider === step.destinationProvider
+	                                isDestinationEntity: rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase()
 	                              });
 	                              _this4.setState({ selectedField: null, selectedFieldParents: null });
 	                            }
@@ -7022,7 +7037,7 @@ module.exports =
 	              )
 	            ),
 	            bit.map(function (x, i) {
-	              var targetSchema = group.provider === step.sourceProvider ? sourceSchema : destinationSchema;
+	              var targetSchema = group.provider.toLowerCase() === step.sourceProvider.toLowerCase() ? sourceSchema : destinationSchema;
 	              return _react2.default.createElement(
 	                _CSSTransitionGroup2.default,
 	                { transitionName: 'fade-' + direction,
@@ -7142,11 +7157,11 @@ module.exports =
 	
 	      var rscName = rsc.name;
 	      if (isReverse) {
-	        if (rsc.provider === step.sourceProvider) {
+	        if (rsc.provider.toLowerCase() === step.sourceProvider.toLowerCase()) {
 	          rscName = rsc.name + ' (' + step.sourceProvider + ')';
 	        }
 	      } else {
-	        if (rsc.provider === step.destinationProvider) {
+	        if (rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase()) {
 	          rscName = rsc.name + ' (' + step.destinationProvider + ')';
 	        }
 	      }
@@ -7347,11 +7362,11 @@ module.exports =
 	
 	  var groupName = group.name;
 	  if (isReverse) {
-	    if (group.provider === step.destinationProvider) {
+	    if (group.provider.toLowerCase() === step.destinationProvider.toLowerCase()) {
 	      groupName = group.name + ' (' + step.destinationProvider + ')';
 	    }
 	  } else {
-	    if (group.provider === step.sourceProvider) {
+	    if (group.provider.toLowerCase() === step.sourceProvider.toLowerCase()) {
 	      groupName = group.name + ' (' + step.sourceProvider + ')';
 	    }
 	  }
@@ -7615,7 +7630,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _CSSTransitionGroup = __webpack_require__(39);
+	var _CSSTransitionGroup = __webpack_require__(26);
 	
 	var _CSSTransitionGroup2 = _interopRequireDefault(_CSSTransitionGroup);
 	
@@ -7629,7 +7644,7 @@ module.exports =
 	
 	var _joinVenn2 = _interopRequireDefault(_joinVenn);
 	
-	var _selectWrapper = __webpack_require__(26);
+	var _selectWrapper = __webpack_require__(27);
 	
 	var _selectWrapper2 = _interopRequireDefault(_selectWrapper);
 	
@@ -7824,7 +7839,7 @@ module.exports =
 	      var primaryRscSectionLabels = null;
 	
 	      if (group && group.resources && group.resources[0]) {
-	        var primaryResourceSchema = group.resources[0].provider === step.destinationProvider ? destinationSchema : sourceSchema;
+	        var primaryResourceSchema = group.resources[0].provider.toLowerCase() === step.destinationProvider.toLowerCase() ? destinationSchema : sourceSchema;
 	        primaryRscVals = primaryResourceSchema && primaryResourceSchema.find(function (defaultRsc) {
 	          return defaultRsc.name === group.resources[0].name;
 	        }) && [primaryResourceSchema.find(function (defaultRsc) {
@@ -7912,7 +7927,7 @@ module.exports =
 	                  { style: { position: 'relative' } },
 	                  group && group.resources && group.resources.map(function (rsc, i) {
 	
-	                    var isDestinationEntity = rsc.provider === step.destinationProvider;
+	                    var isDestinationEntity = rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase();
 	                    var isSelected = selectedEntity.name === rsc.name && selectedEntity.isDestinationEntity === isDestinationEntity;
 	
 	                    var hasParameters = rsc.parentRef && rsc.parentRef.length > 0 && rsc.parentRef.some(function (pr) {
@@ -7968,11 +7983,11 @@ module.exports =
 	
 	                    var rscName = rsc.name;
 	                    if (isReverse) {
-	                      if (rsc.provider === step.sourceProvider) {
+	                      if (rsc.provider.toLowerCase() === step.sourceProvider.toLowerCase()) {
 	                        rscName = rsc.name + ' (' + step.sourceProvider + ')';
 	                      }
 	                    } else {
-	                      if (rsc.provider === step.destinationProvider) {
+	                      if (rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase()) {
 	                        rscName = rsc.name + ' (' + step.destinationProvider + ')';
 	                      }
 	                    }
@@ -8052,7 +8067,7 @@ module.exports =
 	                                onClick: function onClick() {
 	                                  _this3.props.pickEntity({
 	                                    name: rsc.name,
-	                                    isDestinationEntity: rsc.provider === step.destinationProvider
+	                                    isDestinationEntity: rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase()
 	                                  });
 	                                } },
 	                              joinKeyLabel && primaryKeyLabel ? primaryKeyLabel + ' = ' + joinKeyLabel : 'Configure Join'
@@ -8282,7 +8297,7 @@ module.exports =
 	
 	var _reduxForm = __webpack_require__(2);
 	
-	var _selectWrapper = __webpack_require__(26);
+	var _selectWrapper = __webpack_require__(27);
 	
 	var _selectWrapper2 = _interopRequireDefault(_selectWrapper);
 	
@@ -8518,7 +8533,7 @@ module.exports =
 	        vals = group.resources.map(function (br, i) {
 	          sectionLabels.push(br.name);
 	          sectionProviders.push(br.provider);
-	          return group.resources[i].provider === step.destinationProvider ? destinationSchema && destinationSchema.find(function (defaultRsc) {
+	          return group.resources[i].provider.toLowerCase() === step.destinationProvider.toLowerCase() ? destinationSchema && destinationSchema.find(function (defaultRsc) {
 	            return defaultRsc.name === group.resources[i].name;
 	          }) && destinationSchema.find(function (defaultRsc) {
 	            return defaultRsc.name === group.resources[i].name;
@@ -9264,6 +9279,10 @@ module.exports =
 	
 	var _previewTabContent = __webpack_require__(52);
 	
+	var _CSSTransitionGroup = __webpack_require__(26);
+	
+	var _CSSTransitionGroup2 = _interopRequireDefault(_CSSTransitionGroup);
+	
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 	
 	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -9272,23 +9291,6 @@ module.exports =
 	
 	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 	
-	var renderError = function renderError(_ref) {
-	  var _ref$meta = _ref.meta,
-	      touched = _ref$meta.touched,
-	      error = _ref$meta.error;
-	  return touched && error ? _react2.default.createElement(
-	    'div',
-	    null,
-	    _react2.default.createElement(
-	      'span',
-	      null,
-	      error
-	    ),
-	    _react2.default.createElement('br', null),
-	    _react2.default.createElement('br', null)
-	  ) : false;
-	};
-	
 	var EnvStep = function (_Component) {
 	  _inherits(EnvStep, _Component);
 	
@@ -9297,14 +9299,20 @@ module.exports =
 	
 	    var _this = _possibleConstructorReturn(this, (EnvStep.__proto__ || Object.getPrototypeOf(EnvStep)).call(this));
 	
+	    _this.state = {
+	      showCreds: null
+	    };
+	    _this.check = _this.check.bind(_this);
 	    _this.seeFields = _this.seeFields.bind(_this);
 	    _this.startOauth = _this.startOauth.bind(_this);
+	    _this.getOauthUrl = _this.getOauthUrl.bind(_this);
+	    _this.clickDirection = _this.clickDirection.bind(_this);
 	    return _this;
 	  }
 	
 	  _createClass(EnvStep, [{
 	    key: 'seeFields',
-	    value: function seeFields(target) {
+	    value: function seeFields(target, mode) {
 	      var _props = this.props,
 	          tenantId = _props.tenantId,
 	          accountId = _props.accountId,
@@ -9312,7 +9320,7 @@ module.exports =
 	          step = _props.step,
 	          configUrls = _props.configUrls;
 	
-	      var endpoint = formValues[step.mode + 'Endpoint'];
+	      var endpoint = formValues[mode + 'Endpoint'];
 	      var x = window.open();
 	      x.document.open('', '_blank');
 	      x.document.write((0, _previewTabContent.makeContent)(configUrls.TRANS_API_URL, tenantId, accountId, endpoint, target.endpointSuffix, target.name, step.previewToken));
@@ -9336,7 +9344,7 @@ module.exports =
 	    }
 	  }, {
 	    key: 'check',
-	    value: function check() {
+	    value: function check(mode) {
 	      var _props3 = this.props,
 	          actions = _props3.actions,
 	          tenantId = _props3.tenantId,
@@ -9345,20 +9353,21 @@ module.exports =
 	          step = _props3.step,
 	          change = _props3.change;
 	
-	      var endpoint = formValues[step.mode + 'Endpoint'];
-	      var credentials = formValues[step.mode + 'Credentials'];
+	      var config = step[mode + 'Config'];
+	      var endpoint = formValues[mode + 'Endpoint'];
+	      var credentials = formValues[mode + 'Credentials'];
 	      //remove trailing slash if exists
 	      if (endpoint && endpoint[endpoint.length - 1] === '/' && endpoint.length > 8) {
 	        endpoint = endpoint.slice(0, -1);
-	        change(step.mode + 'Endpoint', endpoint);
+	        change(mode + 'Endpoint', endpoint);
 	      }
 	
 	      if (credentials) {
-	        actions.postCredentials(tenantId, accountId, step[step.mode + 'Provider'], endpoint, credentials, step.mode).then(function () {
-	          actions.callGetMetadata(tenantId, accountId, step.mode, step[step.mode + 'Provider'], step.metadataEndpoint, step.metadataApi, endpoint || '_blank', step.credentials, step.isFramework, credentials);
+	        actions.postCredentials(tenantId, accountId, step[mode + 'Provider'], endpoint, credentials, mode).then(function () {
+	          actions.callGetMetadata(tenantId, accountId, mode, step[mode + 'Provider'], config.metadataEndpoint, config.metadataApi, endpoint || '_blank', config.credentials, config.isFramework, credentials);
 	        });
 	      } else {
-	        actions.callGetMetadata(tenantId, accountId, step.mode, step[step.mode + 'Provider'], step.metadataEndpoint, step.metadataApi, endpoint || '_blank', step.credentials, step.isFramework);
+	        actions.callGetMetadata(tenantId, accountId, mode, step[mode + 'Provider'], config.metadataEndpoint, config.metadataApi, endpoint || '_blank', config.credentials, config.isFramework, null);
 	      }
 	    }
 	  }, {
@@ -9371,47 +9380,45 @@ module.exports =
 	      var popup = window.open(this.props.wizard.oauthUrl, 'Oauth', 'width=' + width + ',height=' + height + ',top=' + top + ',left=' + left);
 	      popup.focus();
 	    }
-	
-	    // turns camel-case cred names into human-readable
-	
-	  }, {
-	    key: 'unCamelize',
-	    value: function unCamelize(text) {
-	      return text.replace(/([A-Z])/g, ' $1').replace(/^./, function (str) {
-	        return str.toUpperCase();
-	      });
-	    }
 	  }, {
-	    key: 'render',
-	    value: function render() {
-	      var _this2 = this;
-	
+	    key: 'getOauthUrl',
+	    value: function getOauthUrl(type, mode) {
 	      var _props4 = this.props,
-	          inputs = _props4.inputs,
-	          step = _props4.step,
-	          handleSubmit = _props4.handleSubmit,
-	          nav = _props4.nav,
-	          reset = _props4.reset,
-	          wizard = _props4.wizard,
-	          formValues = _props4.formValues,
 	          actions = _props4.actions,
 	          tenantId = _props4.tenantId,
 	          accountId = _props4.accountId,
-	          change = _props4.change;
-	
-	      var Button = inputs.Button;
-	      var Spinner = inputs.Spinner;
-	
-	      var envCheckResult = wizard[step.mode + 'CheckResult'];
+	          step = _props4.step;
 	
-	      var POSTS = wizard[step.mode + 'Metadata'] && wizard[step.mode + 'Metadata'].filter(function (m) {
-	        return m.method === 'POST' || m.method === 'PUT';
-	      });
+	      actions.getOauthUrl(tenantId, accountId, step.typeGuid, type, mode);
+	    }
+	  }, {
+	    key: 'clickDirection',
+	    value: function clickDirection() {
+	      var _props5 = this.props,
+	          change = _props5.change,
+	          nav = _props5.nav;
 	
-	      var hasEndpoint = formValues[step.mode + 'Endpoint'] && formValues[step.mode + 'Endpoint'].length > 8;
+	      change('resourceGroups', []);
+	      change('scenario', null);
+	      if (nav.limitBackToCurrentPage) {
+	        nav.limitBackToCurrentPage();
+	      }
+	    }
+	  }, {
+	    key: 'render',
+	    value: function render() {
+	      var _this2 = this;
 	
-	      var isOauth = step.credentials && step.credentials.length === 1 && step.credentials[0] === 'Oauth';
+	      var _props6 = this.props,
+	          inputs = _props6.inputs,
+	          step = _props6.step,
+	          handleSubmit = _props6.handleSubmit,
+	          nav = _props6.nav,
+	          reset = _props6.reset,
+	          wizard = _props6.wizard,
+	          formValues = _props6.formValues;
 	
+	      var modes = ['source', 'destination'];
 	      return _react2.default.createElement(
 	        'form',
 	        { onKeyPress: function onKeyPress(e) {
@@ -9420,214 +9427,280 @@ module.exports =
 	        _react2.default.createElement(
 	          'div',
 	          { style: { fontSize: 20, display: 'inline-block' } },
-	          'Define ',
-	          step[step.mode + 'Provider'],
-	          ' Environment'
+	          'Connect to Data Environments'
 	        ),
 	        _react2.default.createElement('br', null),
 	        _react2.default.createElement('br', null),
-	        step.message && _react2.default.createElement(
-	          'p',
-	          null,
-	          step.message
-	        ),
-	        _react2.default.createElement('br', null),
-	        isOauth ? _react2.default.createElement(Oauth, { step: step, wizard: wizard, onCheck: this.check, onStart: this.startOauth,
-	          onSandbox: function onSandbox() {
-	            return actions.getOauthUrl(tenantId, accountId, step.typeGuid, 'sandbox', step.mode);
-	          },
-	          onProd: function onProd() {
-	            return actions.getOauthUrl(tenantId, accountId, step.typeGuid, 'production', step.mode);
-	          } }) : _react2.default.createElement(
-	          'div',
-	          null,
-	          _react2.default.createElement(
+	        modes.map(function (m) {
+	          return _react2.default.createElement(
 	            'div',
-	            { style: { marginLeft: 16 } },
+	            null,
 	            _react2.default.createElement(
 	              'div',
-	              null,
-	              _react2.default.createElement(
-	                'div',
-	                { style: { display: 'inline-block', width: 300 } },
-	                _react2.default.createElement(_reduxForm.Field, { name: step.mode + 'Endpoint', type: 'text', component: inputs.rfInput, label: 'Data Source Endpoint' })
-	              ),
-	              !step.credentials ? _react2.default.createElement(
-	                Button,
-	                {
-	                  icon: 'sync',
-	                  iconAlign: 'left',
-	                  onClick: function onClick() {
-	                    return _this2.check();
-	                  },
-	                  style: { marginLeft: 8, marginBottom: 2, height: 30, lineHeight: '10px' },
-	                  disabled: !hasEndpoint },
-	                'Test Connection'
-	              ) : null,
-	              _react2.default.createElement(
+	              { onClick: function onClick() {
+	                  return _this2.setState({ showSourceCreds: !_this2.state.showSourceCreds });
+	                } },
+	              'PeopleSoft'
+	            ),
+	            _react2.default.createElement(
+	              _CSSTransitionGroup2.default,
+	              { transitionName: 'env-creds',
+	                transitionEnterTimeout: 250, transitionLeaveTimeout: 250 },
+	              _this2.state.showSourceCreds && _react2.default.createElement(
 	                'div',
-	                { style: { display: 'inline-block', marginLeft: 12 } },
-	                wizard.envChecking && _react2.default.createElement(Spinner, null),
-	                envCheckResult && _react2.default.createElement(
-	                  'span',
-	                  null,
-	                  envCheckResult
-	                )
+	                { className: 'env-creds' },
+	                _react2.default.createElement(EnvSection, { config: step[m + 'Config'], mode: m, key: m,
+	                  wizard: wizard, getOauthUrl: _this2.getOauthUrl, formValues: formValues,
+	                  clickDirection: _this2.clickDirection, inputs: inputs, step: step,
+	                  seeFields: _this2.seeFields, check: _this2.check, startOauth: _this2.startOauth })
 	              )
 	            )
+	          );
+	        }),
+	        _react2.default.createElement(_navButtons2.default, { nextDisabled: !wizard['sourceMetadata'] || !wizard['destinationMetadata'],
+	          handleSubmit: handleSubmit, nav: nav, reset: reset, inputs: inputs }),
+	        _react2.default.createElement('br', null),
+	        _react2.default.createElement('br', null)
+	      );
+	    }
+	  }]);
+	
+	  return EnvStep;
+	}(_react.Component);
+	
+	var EnvSection = function EnvSection(props) {
+	  var formValues = props.formValues,
+	      inputs = props.inputs,
+	      mode = props.mode,
+	      wizard = props.wizard,
+	      step = props.step,
+	      clickDirection = props.clickDirection,
+	      getOauthUrl = props.getOauthUrl,
+	      config = props.config,
+	      seeFields = props.seeFields,
+	      check = props.check,
+	      startOauth = props.startOauth;
+	
+	
+	  if (config.skipEnvStep) return _react2.default.createElement('div', null);
+	
+	  var Button = inputs.Button;
+	  var Spinner = inputs.Spinner;
+	
+	  var envCheckResult = wizard[mode + 'CheckResult'];
+	
+	  var POSTS = wizard[mode + 'Metadata'] && wizard[mode + 'Metadata'].filter(function (m) {
+	    return m.method === 'POST' || m.method === 'PUT';
+	  });
+	
+	  var hasEndpoint = formValues[mode + 'Endpoint'] && formValues[mode + 'Endpoint'].length > 8;
+	
+	  var isOauth = config.credentials && config.credentials.length === 1 && config.credentials[0] === 'Oauth';
+	
+	  // turns camel-case cred names into human-readable
+	  var unCamelize = function unCamelize(text) {
+	    return text.replace(/([A-Z])/g, ' $1').replace(/^./, function (str) {
+	      return str.toUpperCase();
+	    });
+	  };
+	
+	  return _react2.default.createElement(
+	    'div',
+	    null,
+	    config.message && _react2.default.createElement(
+	      'p',
+	      null,
+	      config.message
+	    ),
+	    _react2.default.createElement('br', null),
+	    isOauth ? _react2.default.createElement(Oauth, { step: step, wizard: wizard, onCheck: check, onStart: startOauth,
+	      onSandbox: function onSandbox() {
+	        return getOauthUrl('sandbox', mode);
+	      }, onProd: function onProd() {
+	        return getOauthUrl('production', mode);
+	      },
+	      mode: mode, inputs: inputs }) : _react2.default.createElement(
+	      'div',
+	      null,
+	      _react2.default.createElement(
+	        'div',
+	        { style: { marginLeft: 16 } },
+	        _react2.default.createElement(
+	          'div',
+	          null,
+	          _react2.default.createElement(
+	            'div',
+	            { style: { display: 'inline-block', width: 300 } },
+	            _react2.default.createElement(_reduxForm.Field, { name: mode + 'Endpoint', type: 'text', component: inputs.rfInput, label: 'Data Source Endpoint' })
 	          ),
-	          step.credentials && _react2.default.createElement(
+	          !config.credentials ? _react2.default.createElement(
+	            Button,
+	            {
+	              icon: 'sync',
+	              iconAlign: 'left',
+	              onClick: function onClick() {
+	                return check(mode);
+	              },
+	              style: { marginLeft: 8, marginBottom: 2, height: 30, lineHeight: '10px' },
+	              disabled: !hasEndpoint },
+	            'Test Connection'
+	          ) : null,
+	          _react2.default.createElement(
 	            'div',
-	            { style: { marginLeft: 16 } },
-	            _react2.default.createElement('br', null),
-	            _react2.default.createElement(
-	              'label',
+	            { style: { display: 'inline-block', marginLeft: 12 } },
+	            wizard.envChecking && _react2.default.createElement(Spinner, null),
+	            envCheckResult && _react2.default.createElement(
+	              'span',
 	              null,
-	              step[step.mode + 'Provider'],
-	              ' Credentials'
-	            ),
-	            _react2.default.createElement('br', null),
-	            _react2.default.createElement(
-	              'div',
-	              { style: { display: 'inline-block', marginLeft: 16 } },
-	              step.credentials.map(function (cred, index) {
-	                return _react2.default.createElement(
-	                  'div',
-	                  { key: index, style: { marginTop: 8 } },
-	                  _react2.default.createElement(_reduxForm.Field, { name: step.mode + 'Credentials.' + cred,
-	                    label: step[step.mode + 'Provider'] + ' ' + _this2.unCamelize(cred), type: 'text',
-	                    component: inputs.rfInput })
-	                );
-	              })
-	            ),
-	            _react2.default.createElement(
-	              Button,
-	              {
-	                icon: 'sync',
-	                iconAlign: 'left',
-	                onClick: function onClick() {
-	                  return _this2.check();
-	                },
-	                type: 'neutral',
-	                style: { marginLeft: 8, marginBottom: 2, height: 30, lineHeight: '10px' },
-	                disabled: step.credentials.some(function (c) {
-	                  var formCreds = formValues[step.mode + 'Credentials'];
-	                  return !(formCreds && Object.keys(formCreds).includes(c.split(' ').join('')));
-	                }) || !hasEndpoint },
-	              'Test Connection'
+	              envCheckResult
 	            )
 	          )
+	        )
+	      ),
+	      config.credentials && _react2.default.createElement(
+	        'div',
+	        { style: { marginLeft: 16 } },
+	        _react2.default.createElement('br', null),
+	        _react2.default.createElement(
+	          'label',
+	          null,
+	          step[mode + 'Provider'],
+	          ' Credentials'
 	        ),
-	        wizard[step.mode + 'Metadata'] && step.mode === 'source' && step.bidirectional && _react2.default.createElement(
+	        _react2.default.createElement('br', null),
+	        _react2.default.createElement(
 	          'div',
-	          null,
-	          _react2.default.createElement('br', null),
-	          _react2.default.createElement(_reduxForm.Field, { name: 'direction', component: inputs.rfRadioGroup,
-	            label: 'Integration Direction',
-	            onClickOption: function onClickOption(v) {
-	              change('resourceGroups', []);
-	              change('scenario', null);
-	              if (_this2.props.nav.limitBackToCurrentPage) {
-	                _this2.props.nav.limitBackToCurrentPage();
-	              }
-	            },
-	            options: {
-	              'normal': 'Read Data from ' + step[step.mode + 'Provider'],
-	              'reverse': 'Write Data to ' + step[step.mode + 'Provider']
-	            }
+	          { style: { display: 'inline-block', marginLeft: 16 } },
+	          config.credentials.map(function (cred, index) {
+	            return _react2.default.createElement(
+	              'div',
+	              { key: index, style: { marginTop: 8 } },
+	              _react2.default.createElement(_reduxForm.Field, { name: mode + 'Credentials.' + cred,
+	                label: step[mode + 'Provider'] + ' ' + unCamelize(cred), type: 'text',
+	                component: inputs.rfInput })
+	            );
 	          })
 	        ),
-	        wizard[step.mode + 'Metadata'] && formValues.direction === 'normal' ? _react2.default.createElement(
+	        _react2.default.createElement(
+	          Button,
+	          {
+	            icon: 'sync',
+	            iconAlign: 'left',
+	            onClick: function onClick() {
+	              return check(mode);
+	            },
+	            type: 'neutral',
+	            style: { marginLeft: 8, marginBottom: 2, height: 30, lineHeight: '10px' },
+	            disabled: config.credentials.some(function (c) {
+	              var formCreds = formValues[mode + 'Credentials'];
+	              return !(formCreds && Object.keys(formCreds).includes(c.split(' ').join('')));
+	            }) || !hasEndpoint },
+	          'Test Connection'
+	        )
+	      )
+	    ),
+	    wizard[mode + 'Metadata'] && mode === 'source' && config.bidirectional && _react2.default.createElement(
+	      'div',
+	      null,
+	      _react2.default.createElement('br', null),
+	      _react2.default.createElement(_reduxForm.Field, { name: 'direction', component: inputs.rfRadioGroup,
+	        label: 'Integration Direction',
+	        onClickOption: clickDirection,
+	        options: {
+	          'normal': 'Read Data from ' + step[mode + 'Provider'],
+	          'reverse': 'Write Data to ' + step[mode + 'Provider']
+	        }
+	      })
+	    ),
+	    false && _react2.default.createElement(
+	      'div',
+	      null,
+	      wizard[mode + 'Metadata'] && formValues.direction === 'normal' ? _react2.default.createElement(
+	        'div',
+	        null,
+	        _react2.default.createElement('br', null),
+	        _react2.default.createElement(
+	          'span',
+	          { className: 'labelz' },
+	          'Available ',
+	          step[mode + 'Provider'],
+	          ' Data Objects',
+	          config.metadataEndpoint === 'testconnection' && _react2.default.createElement(
+	            'span',
+	            null,
+	            '\xA0(click to preview data):'
+	          )
+	        ),
+	        _react2.default.createElement(
+	          'ul',
+	          { style: { listStyle: 'none', paddingLeft: 5 } },
+	          wizard[mode + 'Metadata'].filter(function (m) {
+	            return m.method !== 'POST';
+	          }).map(function (rsc, i) {
+	            return _react2.default.createElement(
+	              'li',
+	              { key: i, style: { paddingLeft: rsc.parentRef ? rsc.parentRef.length * 12 + 10 : 10 } },
+	              config.metadataEndpoint === 'testconnection' ? _react2.default.createElement(
+	                'a',
+	                { onClick: function onClick() {
+	                    return seeFields(rsc, mode);
+	                  },
+	                  style: { textDecoration: 'none', cursor: 'pointer' } },
+	                rsc.name
+	              ) : _react2.default.createElement(
+	                'div',
+	                null,
+	                rsc.name
+	              )
+	            );
+	          })
+	        )
+	      ) : null,
+	      _react2.default.createElement('br', null),
+	      wizard[mode + 'Metadata'] && mode === 'source' && POSTS && POSTS.length > 0 && _react2.default.createElement(
+	        'div',
+	        null,
+	        formValues.direction === 'reverse' && _react2.default.createElement(
 	          'div',
 	          null,
-	          _react2.default.createElement('br', null),
 	          _react2.default.createElement(
 	            'span',
 	            { className: 'labelz' },
 	            'Available ',
-	            step[step.mode + 'Provider'],
-	            ' Data Objects',
-	            step.metadataEndpoint === 'testconnection' && _react2.default.createElement(
-	              'span',
-	              null,
-	              '\xA0(click to preview data):'
-	            )
+	            step[mode + 'Provider'],
+	            ' Data Target Objects:'
 	          ),
 	          _react2.default.createElement(
 	            'ul',
 	            { style: { listStyle: 'none', paddingLeft: 5 } },
-	            wizard[step.mode + 'Metadata'].filter(function (m) {
-	              return m.method !== 'POST';
-	            }).map(function (rsc, i) {
+	            POSTS.map(function (rsc, i) {
 	              return _react2.default.createElement(
 	                'li',
 	                { key: i, style: { paddingLeft: rsc.parentRef ? rsc.parentRef.length * 12 + 10 : 10 } },
-	                step.metadataEndpoint === 'testconnection' ? _react2.default.createElement(
+	                _react2.default.createElement(
 	                  'a',
-	                  { onClick: function onClick() {
-	                      return _this2.seeFields(rsc);
-	                    }, style: { textDecoration: 'none', cursor: 'pointer' } },
-	                  rsc.name
-	                ) : _react2.default.createElement(
-	                  'div',
-	                  null,
+	                  { style: { textDecoration: 'none', cursor: 'default' } },
 	                  rsc.name
 	                )
 	              );
 	            })
 	          )
-	        ) : null,
-	        _react2.default.createElement('br', null),
-	        wizard[step.mode + 'Metadata'] && step.mode === 'source' && POSTS && POSTS.length > 0 && _react2.default.createElement(
-	          'div',
-	          null,
-	          formValues.direction === 'reverse' && _react2.default.createElement(
-	            'div',
-	            null,
-	            _react2.default.createElement(
-	              'span',
-	              { className: 'labelz' },
-	              'Available ',
-	              step[step.mode + 'Provider'],
-	              ' Data Target Objects:'
-	            ),
-	            _react2.default.createElement(
-	              'ul',
-	              { style: { listStyle: 'none', paddingLeft: 5 } },
-	              POSTS.map(function (rsc, i) {
-	                return _react2.default.createElement(
-	                  'li',
-	                  { key: i, style: { paddingLeft: rsc.parentRef ? rsc.parentRef.length * 12 + 10 : 10 } },
-	                  _react2.default.createElement(
-	                    'a',
-	                    { style: { textDecoration: 'none', cursor: 'default' } },
-	                    rsc.name
-	                  )
-	                );
-	              })
-	            )
-	          )
-	        ),
-	        _react2.default.createElement('br', null),
-	        _react2.default.createElement(_reduxForm.Field, { name: step.mode + 'Environment', component: renderError }),
-	        _react2.default.createElement(_navButtons2.default, { nextDisabled: !wizard[step.mode + 'Metadata'], handleSubmit: handleSubmit, nav: nav, reset: reset, inputs: inputs }),
-	        _react2.default.createElement('br', null),
-	        _react2.default.createElement('br', null)
-	      );
-	    }
-	  }]);
-	
-	  return EnvStep;
-	}(_react.Component);
+	        )
+	      )
+	    ),
+	    _react2.default.createElement('br', null)
+	  );
+	};
 	
-	var Oauth = function Oauth(_ref2) {
-	  var step = _ref2.step,
-	      wizard = _ref2.wizard,
-	      onSandbox = _ref2.onSandbox,
-	      onProd = _ref2.onProd,
-	      onStart = _ref2.onStart,
-	      onCheck = _ref2.onCheck,
-	      inputs = _ref2.inputs;
+	var Oauth = function Oauth(_ref) {
+	  var step = _ref.step,
+	      wizard = _ref.wizard,
+	      onSandbox = _ref.onSandbox,
+	      onProd = _ref.onProd,
+	      onStart = _ref.onStart,
+	      onCheck = _ref.onCheck,
+	      inputs = _ref.inputs,
+	      mode = _ref.mode;
 	  return _react2.default.createElement(
 	    'div',
 	    null,
@@ -9669,7 +9742,7 @@ module.exports =
 	            )
 	          ),
 	          ' to authorize your ',
-	          step[step.mode + 'Provider'],
+	          step[mode + 'Provider'],
 	          ' Org.'
 	        ),
 	        _react2.default.createElement('br', null),
@@ -9681,7 +9754,7 @@ module.exports =
 	            'span',
 	            null,
 	            'After you have completed the ',
-	            step[step.mode + 'Provider'],
+	            step[mode + 'Provider'],
 	            ' authorization process: '
 	          ),
 	          _react2.default.createElement(
@@ -9689,7 +9762,9 @@ module.exports =
 	            {
 	              icon: 'sync',
 	              iconAlign: 'left',
-	              onClick: onCheck,
+	              onClick: function onClick() {
+	                return onCheck(mode);
+	              },
 	              style: { marginLeft: 8, marginBottom: 2, height: 30, lineHeight: '10px' } },
 	            'Test Connection'
 	          ),
@@ -9697,10 +9772,10 @@ module.exports =
 	            'div',
 	            { style: { display: 'inline-block', marginLeft: 12 } },
 	            wizard.envChecking && _react2.default.createElement(inputs.Spinner, null),
-	            wizard[step.mode + 'CheckResult'] && _react2.default.createElement(
+	            wizard[mode + 'CheckResult'] && _react2.default.createElement(
 	              'span',
 	              null,
-	              wizard[step.mode + 'CheckResult']
+	              wizard[mode + 'CheckResult']
 	            )
 	          )
 	        )
@@ -10081,7 +10156,7 @@ module.exports =
 	            )
 	          )
 	        ),
-	        wizard[step.mode + 'Metadata'] && step.mode === 'source' && step.bidirectional && _react2.default.createElement(
+	        wizard[step.mode + 'Metadata'] && step.mode === 'source' && step.bidirectional && POSTS && POSTS.length > 0 && _react2.default.createElement(
 	          'div',
 	          null,
 	          _react2.default.createElement('br', null),
@@ -10221,7 +10296,7 @@ module.exports =
 	
 	var _loadData2 = _interopRequireDefault(_loadData);
 	
-	var _CSSTransitionGroup = __webpack_require__(39);
+	var _CSSTransitionGroup = __webpack_require__(26);
 	
 	var _CSSTransitionGroup2 = _interopRequireDefault(_CSSTransitionGroup);
 	
@@ -11469,7 +11544,7 @@ module.exports =
 	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
 	      var group = resourceGroups[groupIndex];
 	      var entityExists = group && group.resources && group.resources.find(function (r) {
-	        return r.name === v && r.provider === entity.section;
+	        return r.name === v && r.provider.toLowerCase() === entity.section.toLowerCase();
 	      });
 	      if (entityExists) return;
 	
@@ -11801,7 +11876,7 @@ module.exports =
 	
 	var _nestExpand2 = _interopRequireDefault(_nestExpand);
 	
-	var _CSSTransitionGroup = __webpack_require__(39);
+	var _CSSTransitionGroup = __webpack_require__(26);
 	
 	var _CSSTransitionGroup2 = _interopRequireDefault(_CSSTransitionGroup);
 	
@@ -12712,8 +12787,7 @@ module.exports =
 	    var _this = _possibleConstructorReturn(this, (LingkSync.__proto__ || Object.getPrototypeOf(LingkSync)).call(this));
 	
 	    _this.state = {
-	      steps: null,
-	      providers: {}
+	      steps: null
 	    };
 	    //-----------------------------
 	    //  3 Types:
@@ -12778,6 +12852,10 @@ module.exports =
 	          step.name = wizard.title;
 	          stepList.push(step);
 	        } else if (step.type === 'env') {
+	          step.sourceConfig = wizard.source;
+	          step.destinationConfig = wizard.destination;
+	          step.previewToken = this.props.previewToken;
+	          step.typeGuid = wizard.typeGuid;
 	          stepList.push(step);
 	        } else if (step.type === 'scenario') {
 	          step.options = wizard.scenarios;
@@ -12927,11 +13005,11 @@ module.exports =
 
 	'use strict';
 	// 19.1.2.1 Object.assign(target, source, ...)
-	var getKeys  = __webpack_require__(32)
+	var getKeys  = __webpack_require__(33)
 	  , gOPS     = __webpack_require__(145)
 	  , pIE      = __webpack_require__(147)
-	  , toObject = __webpack_require__(35)
-	  , IObject  = __webpack_require__(30)
+	  , toObject = __webpack_require__(36)
+	  , IObject  = __webpack_require__(31)
 	  , $assign  = Object.assign;
 	
 	// should work with symbols and should have deterministic property order (V8 bug)
@@ -15649,7 +15727,7 @@ module.exports =
 	
 	var _moment2 = _interopRequireDefault(_moment);
 	
-	var _classnames = __webpack_require__(37);
+	var _classnames = __webpack_require__(38);
 	
 	var _classnames2 = _interopRequireDefault(_classnames);
 	
@@ -15835,7 +15913,7 @@ module.exports =
 	
 	var _reactDom2 = _interopRequireDefault(_reactDom);
 	
-	var _classnames3 = __webpack_require__(37);
+	var _classnames3 = __webpack_require__(38);
 	
 	var _classnames4 = _interopRequireDefault(_classnames3);
 	
@@ -17334,7 +17412,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _propTypes = __webpack_require__(38);
+	var _propTypes = __webpack_require__(39);
 	
 	var _propTypes2 = _interopRequireDefault(_propTypes);
 	
@@ -17558,7 +17636,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _propTypes = __webpack_require__(38);
+	var _propTypes = __webpack_require__(39);
 	
 	var _propTypes2 = _interopRequireDefault(_propTypes);