@lingk/sync 0.1.36 → 0.1.38

package/build/main.js

@@ -217,7 +217,7 @@ module.exports =
 /***/ function(module, exports, __webpack_require__) {
 
 	// Thank's IE8 for his funny defineProperty
-	module.exports = !__webpack_require__(11)(function(){
+	module.exports = !__webpack_require__(12)(function(){
 	  return Object.defineProperty({}, 'a', {get: function(){ return 7; }}).a != 7;
 	});
 
@@ -229,39 +229,6 @@ module.exports =
 
 /***/ },
 /* 11 */
-/***/ function(module, exports) {
-
-	module.exports = function(exec){
-	  try {
-	    return !!exec();
-	  } catch(e){
-	    return true;
-	  }
-	};
-
-/***/ },
-/* 12 */
-/***/ function(module, exports, __webpack_require__) {
-
-	var dP         = __webpack_require__(18)
-	  , createDesc = __webpack_require__(33);
-	module.exports = __webpack_require__(9) ? function(object, key, value){
-	  return dP.f(object, key, createDesc(1, value));
-	} : function(object, key, value){
-	  object[key] = value;
-	  return object;
-	};
-
-/***/ },
-/* 13 */
-/***/ function(module, exports) {
-
-	module.exports = function(it){
-	  return typeof it === 'object' ? it !== null : typeof it === 'function';
-	};
-
-/***/ },
-/* 14 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -549,11 +516,44 @@ module.exports =
 	
 	exports.default = loadData;
 
+/***/ },
+/* 12 */
+/***/ function(module, exports) {
+
+	module.exports = function(exec){
+	  try {
+	    return !!exec();
+	  } catch(e){
+	    return true;
+	  }
+	};
+
+/***/ },
+/* 13 */
+/***/ function(module, exports, __webpack_require__) {
+
+	var dP         = __webpack_require__(18)
+	  , createDesc = __webpack_require__(33);
+	module.exports = __webpack_require__(9) ? function(object, key, value){
+	  return dP.f(object, key, createDesc(1, value));
+	} : function(object, key, value){
+	  object[key] = value;
+	  return object;
+	};
+
+/***/ },
+/* 14 */
+/***/ function(module, exports) {
+
+	module.exports = function(it){
+	  return typeof it === 'object' ? it !== null : typeof it === 'function';
+	};
+
 /***/ },
 /* 15 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var isObject = __webpack_require__(13);
+	var isObject = __webpack_require__(14);
 	module.exports = function(it){
 	  if(!isObject(it))throw TypeError(it + ' is not an object!');
 	  return it;
@@ -583,8 +583,8 @@ module.exports =
 /***/ function(module, exports, __webpack_require__) {
 
 	var anObject       = __webpack_require__(15)
-	  , IE8_DOM_DEFINE = __webpack_require__(44)
-	  , toPrimitive    = __webpack_require__(48)
+	  , IE8_DOM_DEFINE = __webpack_require__(45)
+	  , toPrimitive    = __webpack_require__(49)
 	  , dP             = Object.defineProperty;
 	
 	exports.f = __webpack_require__(9) ? Object.defineProperty : function defineProperty(O, P, Attributes){
@@ -634,8 +634,8 @@ module.exports =
 
 	var global    = __webpack_require__(6)
 	  , core      = __webpack_require__(8)
-	  , ctx       = __webpack_require__(43)
-	  , hide      = __webpack_require__(12)
+	  , ctx       = __webpack_require__(44)
+	  , hide      = __webpack_require__(13)
 	  , PROTOTYPE = 'prototype';
 	
 	var $export = function(type, name, source){
@@ -1409,7 +1409,7 @@ module.exports =
 /* 28 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var isObject = __webpack_require__(13)
+	var isObject = __webpack_require__(14)
 	  , document = __webpack_require__(6).document
 	  // in old IE typeof document.createElement is 'object'
 	  , is = isObject(document) && isObject(document.createElement);
@@ -1442,7 +1442,7 @@ module.exports =
 /***/ function(module, exports, __webpack_require__) {
 
 	// 19.1.2.14 / 15.2.3.14 Object.keys(O)
-	var $keys       = __webpack_require__(45)
+	var $keys       = __webpack_require__(46)
 	  , enumBugKeys = __webpack_require__(29);
 	
 	module.exports = Object.keys || function keys(O){
@@ -1585,6 +1585,105 @@ 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__(200);
+	
+	var _TransitionGroup2 = _interopRequireDefault(_TransitionGroup);
+	
+	var _CSSTransitionGroupChild = __webpack_require__(199);
+	
+	var _CSSTransitionGroupChild2 = _interopRequireDefault(_CSSTransitionGroupChild);
+	
+	var _PropTypes = __webpack_require__(63);
+	
+	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) {
 
 	'use strict';
@@ -1610,7 +1709,7 @@ module.exports =
 	var SET_WIZARD_SAVED_CREDENTIALS = exports.SET_WIZARD_SAVED_CREDENTIALS = 'SET_WIZARD_SAVED_CREDENTIALS';
 
 /***/ },
-/* 40 */
+/* 41 */
 /***/ function(module, exports, __webpack_require__) {
 
 	"use strict";
@@ -1638,7 +1737,7 @@ module.exports =
 	};
 
 /***/ },
-/* 41 */
+/* 42 */
 /***/ function(module, exports) {
 
 	module.exports = function(it){
@@ -1647,14 +1746,14 @@ module.exports =
 	};
 
 /***/ },
-/* 42 */
+/* 43 */
 /***/ function(module, exports, __webpack_require__) {
 
 	// false -> Array#indexOf
 	// true  -> Array#includes
 	var toIObject = __webpack_require__(20)
-	  , toLength  = __webpack_require__(47)
-	  , toIndex   = __webpack_require__(46);
+	  , toLength  = __webpack_require__(48)
+	  , toIndex   = __webpack_require__(47);
 	module.exports = function(IS_INCLUDES){
 	  return function($this, el, fromIndex){
 	    var O      = toIObject($this)
@@ -1673,11 +1772,11 @@ module.exports =
 	};
 
 /***/ },
-/* 43 */
+/* 44 */
 /***/ function(module, exports, __webpack_require__) {
 
 	// optional / simple context binding
-	var aFunction = __webpack_require__(41);
+	var aFunction = __webpack_require__(42);
 	module.exports = function(fn, that, length){
 	  aFunction(fn);
 	  if(that === undefined)return fn;
@@ -1698,20 +1797,20 @@ module.exports =
 	};
 
 /***/ },
-/* 44 */
+/* 45 */
 /***/ function(module, exports, __webpack_require__) {
 
-	module.exports = !__webpack_require__(9) && !__webpack_require__(11)(function(){
+	module.exports = !__webpack_require__(9) && !__webpack_require__(12)(function(){
 	  return Object.defineProperty(__webpack_require__(28)('div'), 'a', {get: function(){ return 7; }}).a != 7;
 	});
 
 /***/ },
-/* 45 */
+/* 46 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var has          = __webpack_require__(17)
 	  , toIObject    = __webpack_require__(20)
-	  , arrayIndexOf = __webpack_require__(42)(false)
+	  , arrayIndexOf = __webpack_require__(43)(false)
 	  , IE_PROTO     = __webpack_require__(24)('IE_PROTO');
 	
 	module.exports = function(object, names){
@@ -1728,7 +1827,7 @@ module.exports =
 	};
 
 /***/ },
-/* 46 */
+/* 47 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var toInteger = __webpack_require__(19)
@@ -1740,7 +1839,7 @@ module.exports =
 	};
 
 /***/ },
-/* 47 */
+/* 48 */
 /***/ function(module, exports, __webpack_require__) {
 
 	// 7.1.15 ToLength
@@ -1751,11 +1850,11 @@ module.exports =
 	};
 
 /***/ },
-/* 48 */
+/* 49 */
 /***/ function(module, exports, __webpack_require__) {
 
 	// 7.1.1 ToPrimitive(input [, PreferredType])
-	var isObject = __webpack_require__(13);
+	var isObject = __webpack_require__(14);
 	// instead of the ES6 spec version, we didn't implement @@toPrimitive case
 	// and the second argument - flag - preferred type is a string
 	module.exports = function(it, S){
@@ -1767,105 +1866,6 @@ module.exports =
 	  throw TypeError("Can't convert object to primitive value");
 	};
 
-/***/ },
-/* 49 */
-/***/ 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__(200);
-	
-	var _TransitionGroup2 = _interopRequireDefault(_TransitionGroup);
-	
-	var _CSSTransitionGroupChild = __webpack_require__(199);
-	
-	var _CSSTransitionGroupChild2 = _interopRequireDefault(_CSSTransitionGroupChild);
-	
-	var _PropTypes = __webpack_require__(63);
-	
-	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'];
-
 /***/ },
 /* 50 */
 /***/ function(module, exports, __webpack_require__) {
@@ -2068,7 +2068,7 @@ module.exports =
 	    }
 	  }, {
 	    key: 'addDefaultEntity',
-	    value: function addDefaultEntity(groupIndex, v, rscIndex, section, rtid, parentRefList) {
+	    value: function addDefaultEntity(groupIndex, v, rscIndex, section, rtid, parentRef) {
 	      var _this3 = this;
 	
 	      var resourceGroups = this.props.resourceGroups;
@@ -2082,7 +2082,7 @@ module.exports =
 	        }, 40);
 	      }
 	
-	      this.props.addDefaultEntity(groupIndex, v, rscIndex, section, rtid, parentRefList);
+	      this.props.addDefaultEntity(groupIndex, v, rscIndex, section, rtid, parentRef);
 	    }
 	  }, {
 	    key: 'unPick',
@@ -4963,7 +4963,7 @@ module.exports =
 	exports.setWizardDataLoaded = setWizardDataLoaded;
 	exports.clearWizardFormData = clearWizardFormData;
 	
-	var _types = __webpack_require__(39);
+	var _types = __webpack_require__(40);
 	
 	var types = _interopRequireWildcard(_types);
 	
@@ -5591,8 +5591,13 @@ module.exports =
 	  };
 	}
 	
-	function postCredentials(tenantId, appId, providerType, url, credentials) {
+	function postCredentials(tenantId, appId, providerType, url, credentials, mode) {
 	  return function (dispatch, getState, api) {
+	    dispatch({
+	      type: types.START_ENV_CHECK,
+	      mode: mode
+	    });
+	
 	    var _getState21 = getState(),
 	        config = _getState21.config;
 	
@@ -6004,37 +6009,28 @@ module.exports =
 	              }
 	            }
 	
-	            var groupsBeforeThis = groups.slice(0, i);
-	            var groupBeforeThisIndex = 0;
-	            groupsBeforeThis.forEach(function (g, idx) {
-	              if (group.resources && group.resources.find(function (r) {
-	                return r.name === g.name;
-	              })) {
-	                groupBeforeThisIndex = idx + 1;
+	            /*const groupsBeforeThis = groups.slice(0,i)
+	            let groupBeforeThisIndex = 0
+	            groupsBeforeThis.forEach((g,idx)=>{
+	              if(group.resources && group.resources.find(r=>r.name===g.name)){
+	                groupBeforeThisIndex = idx + 1
 	              }
-	            });
-	
-	            var groupsAfterThis = groups.slice(i + 1);
-	            var groupsAfterThisContainThisResource = groupsAfterThis && groupsAfterThis.find(function (g) {
-	              return g.resources && g.resources.find(function (r) {
-	                return r.name === group.name;
-	              }) ? true : false;
-	            });
-	
-	            var groupAfterThisIndex = 0;
-	            groupsAfterThis.forEach(function (g, idx) {
-	              if (g.resources && g.resources.find(function (r) {
-	                return r.name === group.name;
-	              })) {
-	                groupAfterThisIndex = idx;
+	            })
+	             const groupsAfterThis = groups.slice(i+1)
+	            const groupsAfterThisContainThisResource = groupsAfterThis && groupsAfterThis.find(g=>{
+	              return g.resources && g.resources.find(r=>r.name===group.name) ? true : false
+	            })
+	             let groupAfterThisIndex = 0
+	            groupsAfterThis.forEach((g,idx)=>{
+	              if(g.resources && g.resources.find(r=>r.name===group.name)){
+	                groupAfterThisIndex = idx
 	              }
-	            });
+	            })*/
 	
 	            return _react2.default.createElement(
 	              _reactDraggable2.default,
 	              { axis: 'y', key: i, handle: '.dragon',
-	                bounds: { top: groupsBeforeThis.length * -49 + groupBeforeThisIndex * 49,
-	                  bottom: groupAfterThisIndex * 49 },
+	                bounds: 'parent',
 	                position: { x: 0, y: _this3.state.yPositions[i] },
 	                onStart: function onStart(e, v) {
 	                  return _this3.handleDragStart(e, v, i);
@@ -6110,9 +6106,9 @@ module.exports =
 	                    { style: { display: 'inline-block', verticalAlign: 'top', width: 'calc(50% - 120px)' } },
 	                    _react2.default.createElement(
 	                      'div',
-	                      { className: 'remove-resource-group' + (groupsAfterThisContainThisResource ? '-disabled' : ''),
+	                      { className: 'remove-resource-group',
 	                        onClick: function onClick(e) {
-	                          if (!groupsAfterThisContainThisResource) removeResourceGroup(e, i + extraIndex);
+	                          return removeResourceGroup(e, i + extraIndex);
 	                        } },
 	                      _react2.default.createElement(
 	                        'svg',
@@ -6572,7 +6568,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _CSSTransitionGroup = __webpack_require__(49);
+	var _CSSTransitionGroup = __webpack_require__(39);
 	
 	var _CSSTransitionGroup2 = _interopRequireDefault(_CSSTransitionGroup);
 	
@@ -6711,7 +6707,7 @@ module.exports =
 	
 	        //cant overwrite externalKey mapping
 	        if (rscGroup.mappings && rscGroup.mappings.find(function (m) {
-	          return m.propertyToName === field && m.isExternalKeyMapping;
+	          return m && m.propertyToName === field && m.isExternalKeyMapping;
 	        })) return;
 	
 	        var transform = 'none';
@@ -7248,7 +7244,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _CSSTransitionGroup = __webpack_require__(49);
+	var _CSSTransitionGroup = __webpack_require__(39);
 	
 	var _CSSTransitionGroup2 = _interopRequireDefault(_CSSTransitionGroup);
 	
@@ -7424,17 +7420,18 @@ module.exports =
 	
 	      var selectedEntity = selectedEntities[resourceGroupIndex] || { name: '' };
 	
-	      var filteredDestinationSchema = destinationSchema.filter(function (rsc) {
-	        return resourceGroups.find(function (g, i) {
-	          return i < resourceGroupIndex && g.name === rsc.name && group && group.name !== rsc.name ? true : false;
-	        });
-	      });
-	
-	      var filteredSourceSchema = sourceSchema.filter(function (rsc) {
-	        return resourceGroups.find(function (g, i) {
-	          return i < resourceGroupIndex && g.name === rsc.name && group && group.name !== rsc.name ? true : false;
-	        });
-	      });
+	      /*const filteredDestinationSchema = destinationSchema.filter(rsc=>{
+	        return resourceGroups.find((g,i) => {
+	          return (i<resourceGroupIndex && 
+	          g.name===rsc.name && group && group.name!==rsc.name) ? true : false
+	        })
+	      })
+	       const filteredSourceSchema = sourceSchema.filter(rsc=>{
+	        return resourceGroups.find((g,i) => {
+	          return (i<resourceGroupIndex && 
+	          g.name===rsc.name && group && group.name!==rsc.name) ? true : false
+	        })
+	      })*/
 	
 	      return _react2.default.createElement(
 	        'div',
@@ -7537,7 +7534,7 @@ module.exports =
 	
 	                    var isDependency = false;
 	                    group.resources && group.resources.forEach(function (gr) {
-	                      if (gr.parentRefList && gr.parentRefList.find(function (pr) {
+	                      if (gr.parentRef && gr.parentRef.find(function (pr) {
 	                        return pr === rsc.name;
 	                      })) {
 	                        isDependency = true;
@@ -7720,12 +7717,12 @@ module.exports =
 	                  'div',
 	                  { style: { display: 'inline-block', marginLeft: 11 } },
 	                  _react2.default.createElement(_selectWrapper2.default, { label: 'Add Data Source', style: { height: 40 }, onClick: showOverflow,
-	                    onSelect: function onSelect(v, i, rtid, section, parents, parentRefList) {
-	                      addDefaultEntity(resourceGroupIndex, v, i, section, rtid, parentRefList);
+	                    onSelect: function onSelect(v, i, rtid, section, parents, parentRef) {
+	                      addDefaultEntity(resourceGroupIndex, v, i, section, rtid, parentRef);
 	                    }, type: 'neutral', inputs: inputs
 	                    //selectedValues={resourceGroups && resourceGroups[resourceGroupIndex] && 
 	                    //resourceGroups[resourceGroupIndex].resources} 
-	                    , values: !isReverse ? [sourceSchema, filteredDestinationSchema] : [destinationSchema, filteredSourceSchema],
+	                    , values: !isReverse ? [sourceSchema, destinationSchema] : [destinationSchema, sourceSchema],
 	                    sectionLabels: !isReverse ? [step.sourceProvider, step.destinationProvider] : [step.destinationProvider, step.sourceProvider],
 	                    sectionLabelSuffix: 'Objects', fieldPropLabel: 'name'
 	                  })
@@ -8531,7 +8528,7 @@ module.exports =
 	
 	var _navButtons2 = _interopRequireDefault(_navButtons);
 	
-	var _loadData = __webpack_require__(14);
+	var _loadData = __webpack_require__(11);
 	
 	var _loadData2 = _interopRequireDefault(_loadData);
 	
@@ -8779,7 +8776,7 @@ module.exports =
 	
 	var _navButtons2 = _interopRequireDefault(_navButtons);
 	
-	var _loadData = __webpack_require__(14);
+	var _loadData = __webpack_require__(11);
 	
 	var _loadData2 = _interopRequireDefault(_loadData);
 	
@@ -8897,7 +8894,7 @@ module.exports =
 	        }
 	      })*/
 	      if (credentials) {
-	        actions.postCredentials(tenantId, accountId, step.providerType, endpoint, credentials).then(function () {
+	        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);
 	        });
 	      } else {
@@ -9143,7 +9140,7 @@ module.exports =
 	            }).map(function (rsc, i) {
 	              return _react2.default.createElement(
 	                'li',
-	                { key: i, style: { paddingLeft: rsc.parentRefList ? rsc.parentRefList.length * 12 + 10 : 10 } },
+	                { key: i, style: { paddingLeft: rsc.parentRef ? rsc.parentRef.length * 12 + 10 : 10 } },
 	                _react2.default.createElement(
 	                  'a',
 	                  { onClick: function onClick() {
@@ -9235,6 +9232,14 @@ module.exports =
 	
 	var _navButtons2 = _interopRequireDefault(_navButtons);
 	
+	var _loadData = __webpack_require__(11);
+	
+	var _loadData2 = _interopRequireDefault(_loadData);
+	
+	var _CSSTransitionGroup = __webpack_require__(39);
+	
+	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"); } }
@@ -9247,19 +9252,41 @@ module.exports =
 	  _inherits(FilterStep, _Component);
 	
 	  function FilterStep() {
+	    var _ref;
+	
+	    var _temp, _this, _ret;
+	
 	    _classCallCheck(this, FilterStep);
 	
-	    return _possibleConstructorReturn(this, (FilterStep.__proto__ || Object.getPrototypeOf(FilterStep)).apply(this, arguments));
+	    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+	      args[_key] = arguments[_key];
+	    }
+	
+	    return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref = FilterStep.__proto__ || Object.getPrototypeOf(FilterStep)).call.apply(_ref, [this].concat(args))), _this), _this.onClickOption = function (o) {
+	      console.log(o);
+	    }, _temp), _possibleConstructorReturn(_this, _ret);
 	  }
 	
 	  _createClass(FilterStep, [{
 	    key: 'componentDidMount',
+	
+	
+	    /*componentDidMount() {
+	      const { change, formValues } = this.props
+	      change('filter', formValues.filter || 'all')
+	    }*/
+	
 	    value: function componentDidMount() {
 	      var _props = this.props,
+	          step = _props.step,
+	          wizard = _props.wizard,
 	          change = _props.change,
-	          formValues = _props.formValues;
+	          formValues = _props.formValues,
+	          actions = _props.actions;
 	
-	      change('filter', formValues.filter || 'all');
+	      if (!wizard.dataLoaded) {
+	        (0, _loadData2.default)(step, wizard, change, formValues, actions);
+	      }
 	    }
 	  }, {
 	    key: 'render',
@@ -9269,7 +9296,8 @@ module.exports =
 	          handleSubmit = _props2.handleSubmit,
 	          nav = _props2.nav,
 	          step = _props2.step,
-	          reset = _props2.reset;
+	          reset = _props2.reset,
+	          wizard = _props2.wizard;
 	
 	      return _react2.default.createElement(
 	        'form',
@@ -9286,10 +9314,21 @@ module.exports =
 	        _react2.default.createElement('br', null),
 	        _react2.default.createElement(
 	          'div',
-	          { style: { marginLeft: 16 } },
-	          _react2.default.createElement(_reduxForm.Field, { name: 'filter', component: inputs.rfRadioGroup, label: 'Data Filter Type',
-	            options: { all: 'All Data', changed: 'Changed Data Since Last Run' }
-	          })
+	          null,
+	          _react2.default.createElement(
+	            'div',
+	            { className: 'labelz', style: { fontSize: '14px', marginBottom: 5 } },
+	            'Top Level Resources: (click to add filter)'
+	          ),
+	          _react2.default.createElement(
+	            'ul',
+	            { style: { marginLeft: 8 } },
+	            wizard['sourceMetadata'].filter(function (m) {
+	              return m.method !== 'POST' && !m.parentRef;
+	            }).map(function (rsc, i) {
+	              return _react2.default.createElement(FilterStepResource, { key: i, rsc: rsc, inputs: inputs });
+	            })
+	          )
 	        ),
 	        _react2.default.createElement('br', null),
 	        _react2.default.createElement(_navButtons2.default, { handleSubmit: handleSubmit, nav: nav, reset: reset, inputs: inputs }),
@@ -9302,6 +9341,88 @@ module.exports =
 	  return FilterStep;
 	}(_react.Component);
 	
+	var FilterStepResource = function (_Component2) {
+	  _inherits(FilterStepResource, _Component2);
+	
+	  function FilterStepResource() {
+	    _classCallCheck(this, FilterStepResource);
+	
+	    var _this2 = _possibleConstructorReturn(this, (FilterStepResource.__proto__ || Object.getPrototypeOf(FilterStepResource)).call(this));
+	
+	    _this2.state = {
+	      opened: false,
+	      key: '',
+	      value: ''
+	    };
+	    return _this2;
+	  }
+	
+	  _createClass(FilterStepResource, [{
+	    key: 'render',
+	    value: function render() {
+	      var _this3 = this;
+	
+	      var _props3 = this.props,
+	          rsc = _props3.rsc,
+	          inputs = _props3.inputs;
+	      var _state = this.state,
+	          opened = _state.opened,
+	          key = _state.key,
+	          value = _state.value;
+	
+	      var Input = inputs.Input;
+	
+	      return _react2.default.createElement(
+	        'li',
+	        { style: { marginBottom: 6 } },
+	        _react2.default.createElement(
+	          'div',
+	          { onClick: function onClick() {
+	              return _this3.setState({ opened: !opened });
+	            },
+	            className: 'filter-step-resource',
+	            style: {
+	              borderBottomLeftRadius: opened ? 0 : 5,
+	              borderBottomRightRadius: opened ? 0 : 5
+	            } },
+	          rsc.name
+	        ),
+	        _react2.default.createElement('br', null),
+	        _react2.default.createElement(
+	          _CSSTransitionGroup2.default,
+	          { transitionName: 'filter-step-panel',
+	            transitionEnterTimeout: 250, transitionLeaveTimeout: 250 },
+	          opened && _react2.default.createElement(
+	            'div',
+	            { className: 'filter-step-panel' },
+	            _react2.default.createElement(
+	              'div',
+	              { className: 'filter-step-panel-contents' },
+	              _react2.default.createElement(Input, { style: { width: 132, display: 'inline-block' },
+	                onChange: function onChange(e, v) {
+	                  return _this3.setState({ key: v });
+	                },
+	                value: key, placeholder: 'Filter Field' }),
+	              _react2.default.createElement(
+	                'span',
+	                null,
+	                '\xA0\xA0=\xA0\xA0'
+	              ),
+	              _react2.default.createElement(Input, { style: { width: 132, display: 'inline-block' },
+	                onChange: function onChange(e, v) {
+	                  return _this3.setState({ value: v });
+	                },
+	                value: value, placeholder: 'Filter Value' })
+	            )
+	          )
+	        )
+	      );
+	    }
+	  }]);
+	
+	  return FilterStepResource;
+	}(_react.Component);
+	
 	exports.default = (0, _reduxForm.reduxForm)({
 	  form: 'wizard',
 	  destroyOnUnmount: false,
@@ -9336,7 +9457,7 @@ module.exports =
 	
 	var _navButtons2 = _interopRequireDefault(_navButtons);
 	
-	var _loadData = __webpack_require__(14);
+	var _loadData = __webpack_require__(11);
 	
 	var _loadData2 = _interopRequireDefault(_loadData);
 	
@@ -9625,7 +9746,7 @@ module.exports =
 	
 	var _navButtons2 = _interopRequireDefault(_navButtons);
 	
-	var _loadData = __webpack_require__(14);
+	var _loadData = __webpack_require__(11);
 	
 	var _loadData2 = _interopRequireDefault(_loadData);
 	
@@ -9980,7 +10101,7 @@ module.exports =
 	
 	var _navButtons2 = _interopRequireDefault(_navButtons);
 	
-	var _loadData = __webpack_require__(14);
+	var _loadData = __webpack_require__(11);
 	
 	var _loadData2 = _interopRequireDefault(_loadData);
 	
@@ -10220,7 +10341,7 @@ module.exports =
 	
 	var _navButtons2 = _interopRequireDefault(_navButtons);
 	
-	var _loadData = __webpack_require__(14);
+	var _loadData = __webpack_require__(11);
 	
 	var _loadData2 = _interopRequireDefault(_loadData);
 	
@@ -10364,7 +10485,7 @@ module.exports =
 	    }
 	  }, {
 	    key: 'addDefaultEntity',
-	    value: function addDefaultEntity(groupIndex, v, rscIndex, section, rtid, parentRefList) {
+	    value: function addDefaultEntity(groupIndex, v, rscIndex, section, rtid, parentRef) {
 	      var _props5 = this.props,
 	          change = _props5.change,
 	          formValues = _props5.formValues;
@@ -10381,28 +10502,24 @@ module.exports =
 	        group.resources = [];
 	        this.openConnectionModal(group, groupIndex);
 	      }
-	
-	      if (parentRefList && parentRefList.length > 0) {
-	        parentRefList.forEach(function (pr, i) {
-	          if (!group.resources.find(function (r) {
-	            return r.name === pr;
-	          })) {
+	      // ADD PARENTS AS WELL
+	      /*if(parentRef && parentRef.length>0){
+	        parentRef.forEach((pr,i)=>{
+	          if(!(group.resources.find(r=>r.name===pr))){
 	            group.resources.push({
 	              name: pr,
 	              provider: section,
 	              joinType: 'LEFT JOIN',
-	              parentRefList: parentRefList.filter(function (p, idx) {
-	                return idx < i;
-	              })
-	            });
+	              parentRef: parentRef.filter((p,idx)=>idx<i)
+	            })
 	          }
-	        });
-	      }
+	        })
+	      }*/
 	      group.resources.push(Object.assign({
 	        name: v,
 	        provider: section,
 	        joinType: 'LEFT JOIN'
-	      }, parentRefList && { parentRefList: parentRefList }, rtid && { recordTypeId: rtid }));
+	      }, parentRef && { parentRef: parentRef }, rtid && { recordTypeId: rtid }));
 	      change('resourceGroups', resourceGroups);
 	      this.forceUpdate();
 	    }
@@ -10706,7 +10823,7 @@ module.exports =
 	
 	var _nestExpand2 = _interopRequireDefault(_nestExpand);
 	
-	var _CSSTransitionGroup = __webpack_require__(49);
+	var _CSSTransitionGroup = __webpack_require__(39);
 	
 	var _CSSTransitionGroup2 = _interopRequireDefault(_CSSTransitionGroup);
 	
@@ -11646,6 +11763,9 @@ module.exports =
 	      type: 'environment',
 	      title: 'Destination Environment',
 	      mode: 'destination'
+	    }, {
+	      type: 'filter',
+	      title: 'Source Filter'
 	    }, {
 	      type: 'scenario',
 	      title: 'Data Scenario'
@@ -11653,9 +11773,6 @@ module.exports =
 	      type: 'schema',
 	      title: 'Object Mapping',
 	      mode: 'source'
-	    }, {
-	      type: 'filter',
-	      title: 'Source Filter'
 	    }, {
 	      type: 'map',
 	      title: 'Field Mapping'
@@ -11689,6 +11806,10 @@ module.exports =
 	          step.scenarioOrder = wizard.scenarioIds;
 	          step.magicNumber = '2147483647';
 	          stepList.push(step);
+	        } else if (step.type === 'filter') {
+	          if (wizard.source.hasFilterStep) {
+	            stepList.push(step);
+	          }
 	        } else if (step.type === 'environment') {
 	          step.typeGuid = wizard.typeGuid;
 	          if (step.mode === 'source' && !wizard.source.skipEnvStep) {
@@ -11855,7 +11976,7 @@ module.exports =
 	  , $assign  = Object.assign;
 	
 	// should work with symbols and should have deterministic property order (V8 bug)
-	module.exports = !$assign || __webpack_require__(11)(function(){
+	module.exports = !$assign || __webpack_require__(12)(function(){
 	  var A = {}
 	    , B = {}
 	    , S = Symbol()
@@ -15272,7 +15393,7 @@ module.exports =
 	  value: true
 	});
 	
-	var _extends2 = __webpack_require__(40);
+	var _extends2 = __webpack_require__(41);
 	
 	var _extends3 = _interopRequireDefault(_extends2);
 	
@@ -15560,7 +15681,7 @@ module.exports =
 	  value: true
 	});
 	
-	var _extends2 = __webpack_require__(40);
+	var _extends2 = __webpack_require__(41);
 	
 	var _extends3 = _interopRequireDefault(_extends2);
 	
@@ -16067,7 +16188,7 @@ module.exports =
 	  value: true
 	});
 	
-	var _extends2 = __webpack_require__(40);
+	var _extends2 = __webpack_require__(41);
 	
 	var _extends3 = _interopRequireDefault(_extends2);