@lingk/sync 1.0.49 → 1.0.51

package/build/main.js

@@ -399,7 +399,7 @@ module.exports =
 /***/ function(module, exports, __webpack_require__) {
 
 	var dP         = __webpack_require__(18)
-	  , createDesc = __webpack_require__(35);
+	  , createDesc = __webpack_require__(34);
 	module.exports = __webpack_require__(10) ? function(object, key, value){
 	  return dP.f(object, key, createDesc(1, value));
 	} : function(object, key, value){
@@ -481,7 +481,7 @@ module.exports =
 /***/ function(module, exports, __webpack_require__) {
 
 	// to indexed object, toObject with fallback for non-array-like ES3 strings
-	var IObject = __webpack_require__(32)
+	var IObject = __webpack_require__(31)
 	  , defined = __webpack_require__(16);
 	module.exports = function(it){
 	  return IObject(defined(it));
@@ -754,8 +754,8 @@ module.exports =
 /* 25 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var shared = __webpack_require__(36)('keys')
-	  , uid    = __webpack_require__(38);
+	var shared = __webpack_require__(35)('keys')
+	  , uid    = __webpack_require__(37);
 	module.exports = function(key){
 	  return shared[key] || (shared[key] = uid(key));
 	};
@@ -1325,105 +1325,6 @@ module.exports =
 
 /***/ },
 /* 27 */
-/***/ 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__(40);
-	
-	var _propTypes2 = _interopRequireDefault(_propTypes);
-	
-	var _TransitionGroup = __webpack_require__(218);
-	
-	var _TransitionGroup2 = _interopRequireDefault(_TransitionGroup);
-	
-	var _CSSTransitionGroupChild = __webpack_require__(217);
-	
-	var _CSSTransitionGroupChild2 = _interopRequireDefault(_CSSTransitionGroupChild);
-	
-	var _PropTypes = __webpack_require__(78);
-	
-	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'];
-
-/***/ },
-/* 28 */
 /***/ function(module, exports) {
 
 	'use strict';
@@ -1483,18 +1384,22 @@ module.exports =
 	    } else {
 	      (function () {
 	        var destinationKeys = [];
+	        var destinationKeysParents = [];
 	        if (group.destinationKeys) {
-	          group.destinationKeys.forEach(function (dk) {
-	            if (destinationResource && destinationResource.properties && destinationResource.properties.find(function (prop) {
-	              return prop.label === dk;
-	            })) {
-	              destinationKeys.push(destinationResource.properties.find(function (prop) {
-	                return prop.label === dk;
-	              }).name);
-	            }
+	          group.destinationKeys.forEach(function (dk, i) {
+	            /*if(destinationResource && destinationResource.properties && 
+	              destinationResource.properties.find(prop => prop.label===dk)){
+	                destinationKeys.push(
+	                  destinationResource.properties.find(prop => prop.label===dk).name
+	                )
+	            }*/
+	            var nestedDestinationKey = findNestedProp(dk, group.destinationKeysParents && group.destinationKeysParents[i], destinationResource);
+	            destinationKeys.push(nestedDestinationKey.property);
+	            destinationKeysParents.push(JSON.stringify(nestedDestinationKey.parentsArray));
 	          });
 	        }
 	        group.destinationKeys = destinationKeys;
+	        group.destinationKeysParents = destinationKeysParents;
 	      })();
 	    }
 	
@@ -1512,7 +1417,6 @@ module.exports =
 	      });
 	
 	      if (sourceResource) {
-	
 	        var nestedSourceKey = findNestedProp(sk, group.sourceKeysParents && group.sourceKeysParents[i], sourceResource);
 	        sourceKeys.push(nestedSourceKey.property);
 	        sourceKeysParents.push(JSON.stringify(nestedSourceKey.parentsArray));
@@ -1534,13 +1438,11 @@ module.exports =
 	        var sourceResource = dataSourceMetadata.find(function (rsc) {
 	          return rsc.name === singleMapping.resourceFromName;
 	        });
-	
 	        // get mapping source property
 	        var nestedSourceProp = findNestedProp(singleMapping.propertyFromName, singleMapping.propertyFromParents, sourceResource);
+	
 	        //get mapping destination property
-	        var destinationProperty = destinationResource && destinationResource.properties && destinationResource.properties.find(function (prop) {
-	          return prop.label === singleMapping.propertyToName;
-	        });
+	        var nestedDestinationProp = findNestedProp(singleMapping.propertyToName, singleMapping.propertyToParents, destinationResource);
 	
 	        //dont save transformation that are just "none"
 	        if (singleMapping.transformations && singleMapping.transformations.length > 0) {
@@ -1578,7 +1480,7 @@ module.exports =
 	          });
 	        }
 	
-	        if (sourceResource && nestedSourceProp.property && destinationResource && destinationProperty) {
+	        if (sourceResource && nestedSourceProp.property && destinationResource && nestedDestinationProp.property) {
 	          mappings = mappings.concat(Object.assign({ // add to mappings obj
 	            resourceFromNameAndProvider: singleMapping.dataSourceIsDestinationEntity ? sourceResource.type + '_' + targetProvider.toLowerCase() : sourceResource.type + '_' + sourceProvider.toLowerCase(),
 	            resourceFromName: sourceResource.type,
@@ -1588,8 +1490,9 @@ module.exports =
 	          }, nestedSourceProp.parentsArray && nestedSourceProp.parentsArray.length > 0 && { propertyFromParents: nestedSourceProp.parentsArray }, {
 	            resourceToName: destinationResource.type,
 	            resourceToLabel: destinationResource.name,
-	            propertyToName: destinationProperty.name,
-	            propertyToLabel: destinationProperty.label,
+	            propertyToName: nestedDestinationProp.property,
+	            propertyToLabel: nestedDestinationProp.__property
+	          }, nestedDestinationProp.parentsArray && nestedDestinationProp.parentsArray.length > 0 && { propertyToParents: nestedDestinationProp.parentsArray }, {
 	            bundleIndex: index
 	          }, singleMapping.isExternalKeyMapping && { isExternalKeyMapping: true }, singleMapping.dataSourceIsDestinationEntity && { isDestinationResource: true }, singleMapping.isUnique && { isUnique: true }, singleMapping.transformations && singleMapping.transformations.length > 0 && !singleMapping.transformations.every(function (t) {
 	            return t.type === 'none';
@@ -1599,7 +1502,10 @@ module.exports =
 	      delete group.mappings; // remove the mapping obj from a resourceGroup
 	      if (group.lingkSourceKey) delete group.lingkSourceKey;
 	      if (group.lingkSourceKeyObject) delete group.lingkSourceKeyObject;
-	      if (group.lingkSourceKeyParents) delete group.lingkSourceKeyParents;
+	      if (group.lingkSourceKeyParents) {
+	        delete group.lingkSourceKeyParents;
+	        delete group.destinationKeysParents;
+	      }
 	    }
 	
 	    // BUNDLES
@@ -1712,11 +1618,16 @@ module.exports =
 	      }
 	    })();
 	  } else {
-	    var theProp = prop && rsc && rsc.properties && rsc.properties.find(function (p) {
-	      return p.label === prop;
-	    });
-	    property = theProp.name;
-	    __property = theProp.label;
+	    if (prop === 'Lingk External Id') {
+	      property = prop;
+	      __property = 'Lingk_External_Id__c';
+	    } else {
+	      var theProp = prop && rsc && rsc.properties && rsc.properties.find(function (p) {
+	        return p.label === prop;
+	      });
+	      property = theProp.name;
+	      __property = theProp.label;
+	    }
 	  }
 	  return { property: property, parentsArray: parentsArray, __property: __property };
 	}
@@ -1724,7 +1635,7 @@ module.exports =
 	exports.default = saveData;
 
 /***/ },
-/* 29 */
+/* 28 */
 /***/ function(module, exports) {
 
 	var toString = {}.toString;
@@ -1734,7 +1645,7 @@ module.exports =
 	};
 
 /***/ },
-/* 30 */
+/* 29 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var isObject = __webpack_require__(14)
@@ -1746,7 +1657,7 @@ module.exports =
 	};
 
 /***/ },
-/* 31 */
+/* 30 */
 /***/ function(module, exports) {
 
 	// IE 8- don't enum bug keys
@@ -1755,30 +1666,30 @@ module.exports =
 	).split(',');
 
 /***/ },
-/* 32 */
+/* 31 */
 /***/ function(module, exports, __webpack_require__) {
 
 	// fallback for non-array-like ES3 and non-enumerable old V8 strings
-	var cof = __webpack_require__(29);
+	var cof = __webpack_require__(28);
 	module.exports = Object('z').propertyIsEnumerable(0) ? Object : function(it){
 	  return cof(it) == 'String' ? it.split('') : Object(it);
 	};
 
 /***/ },
-/* 33 */,
-/* 34 */
+/* 32 */,
+/* 33 */
 /***/ function(module, exports, __webpack_require__) {
 
 	// 19.1.2.14 / 15.2.3.14 Object.keys(O)
 	var $keys       = __webpack_require__(56)
-	  , enumBugKeys = __webpack_require__(31);
+	  , enumBugKeys = __webpack_require__(30);
 	
 	module.exports = Object.keys || function keys(O){
 	  return $keys(O, enumBugKeys);
 	};
 
 /***/ },
-/* 35 */
+/* 34 */
 /***/ function(module, exports) {
 
 	module.exports = function(bitmap, value){
@@ -1791,7 +1702,7 @@ module.exports =
 	};
 
 /***/ },
-/* 36 */
+/* 35 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var global = __webpack_require__(7)
@@ -1802,7 +1713,7 @@ module.exports =
 	};
 
 /***/ },
-/* 37 */
+/* 36 */
 /***/ function(module, exports, __webpack_require__) {
 
 	// 7.1.13 ToObject(argument)
@@ -1812,7 +1723,7 @@ module.exports =
 	};
 
 /***/ },
-/* 38 */
+/* 37 */
 /***/ function(module, exports) {
 
 	var id = 0
@@ -1822,7 +1733,7 @@ module.exports =
 	};
 
 /***/ },
-/* 39 */
+/* 38 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
@@ -1876,7 +1787,7 @@ module.exports =
 
 
 /***/ },
-/* 40 */
+/* 39 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/**
@@ -1911,6 +1822,105 @@ module.exports =
 	}
 
 
+/***/ },
+/* 40 */
+/***/ 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__(39);
+	
+	var _propTypes2 = _interopRequireDefault(_propTypes);
+	
+	var _TransitionGroup = __webpack_require__(218);
+	
+	var _TransitionGroup2 = _interopRequireDefault(_TransitionGroup);
+	
+	var _CSSTransitionGroupChild = __webpack_require__(217);
+	
+	var _CSSTransitionGroupChild2 = _interopRequireDefault(_CSSTransitionGroupChild);
+	
+	var _PropTypes = __webpack_require__(78);
+	
+	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'];
+
 /***/ },
 /* 41 */
 /***/ function(module, exports) {
@@ -3276,19 +3286,25 @@ module.exports =
 	
 	        //get bundle destinationKeys
 	        var destinationKeys = [];
-	        bundle.destinationKeys.forEach(function (dk) {
-	          var bundleDestinationProperty = bundleResource.properties.find(function (prop) {
-	            return prop.name === dk;
-	          });
-	          if (bundleDestinationProperty) {
-	            destinationKeys.push(bundleDestinationProperty.label);
+	        var __destinationKeys = [];
+	        var destinationKeysParents = [];
+	        bundle.destinationKeys.forEach(function (dk, i) {
+	          if (bundle.customExternalKeys) {
+	            var deNestedProp = deNest(dk, bundle.sourceKeysParents && JSON.parse(bundle.destinationKeysParents[i]), bundleResource);
+	            destinationKeys.push(deNestedProp.property);
+	            __destinationKeys.push(deNestedProp.__property);
+	            destinationKeysParents.push(deNestedProp.parentsArray);
 	          } else {
 	            destinationKeys.push('Lingk External Id');
+	            __destinationKeys.push('Lingk_External_Id__c');
 	          }
 	        });
 	
+	        //get bundle sourceKeys
 	        var sourceKeys = [];
+	        var __sourceKeys = [];
 	        var sourceKeysObjects = [];
+	        var __sourceKeysObjects = [];
 	        var sourceKeysParents = [];
 	        bundle.sourceKeys.forEach(function (sk, i) {
 	          var sourceKeyResourceObj = bundle.resources.find(function (r) {
@@ -3304,8 +3320,10 @@ module.exports =
 	              });
 	              if (sourceKeyResource) {
 	                sourceKeysObjects.push(sourceKeyResource.name);
+	                __sourceKeysObjects.push(sourceKeyResource.type);
 	                var deNestedProp = deNest(sk, bundle.sourceKeysParents && JSON.parse(bundle.sourceKeysParents[i]), sourceKeyResource);
 	                sourceKeys.push(deNestedProp.property);
+	                __sourceKeys.push(deNestedProp.__property);
 	                sourceKeysParents.push(deNestedProp.parentsArray);
 	              }
 	            }
@@ -3384,29 +3402,6 @@ module.exports =
 	              })();
 	            }
 	          }
-	          /*const primaryResourceProvider = bundle.resources[0].provider
-	            .replace('Reader','').toLowerCase()
-	          const primaryDataSourceMetadata = primaryResourceProvider === DP.toLowerCase() ? DM : primaryResourceProvider === SP.toLowerCase() ? SM : null
-	           let deNestedPrimaryKey = {}
-	          let primaryKeyResourceName = null
-	          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){
-	                const rscPrimaryResource = primaryDataSourceMetadata
-	                  .find(r => r.type===rsc.primaryKeyResource)
-	                if(rscPrimaryResource){
-	                  deNestedPrimaryKey = deNest(
-	                    rsc.primaryKeyName, rsc.primaryKeyParents, rscPrimaryResource 
-	                  )
-	                  primaryKeyResourceName = rscPrimaryResource.name
-	                }
-	              }
-	            }
-	          }*/
 	
 	          if (rscResource) {
 	            resources.push(Object.assign({
@@ -3431,24 +3426,17 @@ module.exports =
 	            dataSourceMetadata = m.isDestinationResource ? SM : DM;
 	          }
 	
+	          // source key / parents
 	          var resourceFromBundle = bundle.resources.find(function (br) {
 	            return br.resourceName === m.resourceFromName;
 	          });
 	          var sourceResource = resourceFromBundle && dataSourceMetadata.find(function (rsc) {
 	            return rsc.name === resourceFromBundle.resourceLabel;
 	          });
-	          var deNestedProp = deNest(m.propertyFromName, m.propertyFromParents, sourceResource);
-	
-	          var sourceProperty = null;
-	          if (sourceResource) {
-	            sourceProperty = sourceResource.properties.find(function (prop) {
-	              return prop.name === m.propertyFromName;
-	            });
-	          }
+	          var deNestedSourceProp = deNest(m.propertyFromName, m.propertyFromParents, sourceResource);
 	
-	          var destinationProperty = bundleResource.properties.find(function (prop) {
-	            return prop.name === m.propertyToName;
-	          });
+	          // destintation key / parents
+	          var deNestedDestProp = deNest(m.propertyToName, m.propertyToParents, bundleResource);
 	
 	          var transformations = [{ type: 'none' }];
 	          if (m.transformations && m.transformations.length > 0) {
@@ -3483,18 +3471,18 @@ module.exports =
 	            }
 	          }
 	
-	          if (sourceResource && sourceProperty && destinationProperty) {
+	          if (sourceResource && deNestedSourceProp.property && deNestedDestProp.property) {
 	            mappings.push(Object.assign({
 	              resourceFromName: sourceResource.name,
 	              __resourceFromName: sourceResource.type,
-	              propertyFromName: deNestedProp.property,
-	              __propertyFromName: deNestedProp.__property
-	            }, deNestedProp.parentsArray && deNestedProp.parentsArray.length > 0 && { propertyFromParents: deNestedProp.parentsArray }, {
+	              propertyFromName: deNestedSourceProp.property,
+	              __propertyFromName: deNestedSourceProp.__property
+	            }, deNestedSourceProp.parentsArray && deNestedSourceProp.parentsArray.length > 0 && { propertyFromParents: deNestedSourceProp.parentsArray }, {
 	              resourceToName: bundleResource.name,
 	              __resourceToName: bundleResource.type,
-	              propertyToName: destinationProperty.label,
-	              __propertyToName: destinationProperty.name
-	            }, m.isDestinationResource && { dataSourceIsDestinationEntity: true }, m.isExternalKeyMapping && { isExternalKeyMapping: true }, m.isUnique && { isUnique: true }, {
+	              propertyToName: deNestedDestProp.property,
+	              __propertyToName: deNestedDestProp.__property
+	            }, deNestedDestProp.parentsArray && deNestedDestProp.parentsArray.length > 0 && { propertyToParents: deNestedDestProp.parentsArray }, m.isDestinationResource && { dataSourceIsDestinationEntity: true }, m.isExternalKeyMapping && { isExternalKeyMapping: true }, m.isUnique && { isUnique: true }, {
 	              transformations: transformations
 	            }));
 	          }
@@ -3504,8 +3492,18 @@ module.exports =
 	          __name: bundleResource.type,
 	          resources: resources, mappings: mappings,
 	          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] }, {
+	        }, bundle.customExternalKeys === true && {
+	          sourceKeys: sourceKeys, __sourceKeys: __sourceKeys,
+	          sourceKeysObjects: sourceKeysObjects, __sourceKeysObjects: __sourceKeysObjects,
+	          sourceKeysParents: sourceKeysParents,
+	          destinationKeys: destinationKeys, __destinationKeys: __destinationKeys,
+	          destinationKeysParents: destinationKeysParents
+	        }, bundle.customExternalKeys === false && {
+	          lingkSourceKey: sourceKeys[0], __lingkSourceKey: __sourceKeys[0],
+	          lingkSourceKeyObject: sourceKeysObjects[0],
+	          __lingkSourceKeyObject: __sourceKeysObjects[0],
+	          lingkSourceKeyParents: sourceKeysParents[0]
+	        }, {
 	          provider: bundle.provider,
 	          //...bundle.recordTypeId && {recordTypeId: bundle.recordTypeId},
 	          deleteEnabled: bundle.deleteEnabled || false,
@@ -3655,7 +3653,7 @@ module.exports =
 /***/ function(module, exports, __webpack_require__) {
 
 	module.exports = !__webpack_require__(10) && !__webpack_require__(12)(function(){
-	  return Object.defineProperty(__webpack_require__(30)('div'), 'a', {get: function(){ return 7; }}).a != 7;
+	  return Object.defineProperty(__webpack_require__(29)('div'), 'a', {get: function(){ return 7; }}).a != 7;
 	});
 
 /***/ },
@@ -16661,7 +16659,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _propTypes = __webpack_require__(40);
+	var _propTypes = __webpack_require__(39);
 	
 	var _propTypes2 = _interopRequireDefault(_propTypes);
 	
@@ -18725,7 +18723,8 @@ module.exports =
 	            __resourceToName: group.__name,
 	            propertyToName: group.destinationKeys[i],
 	            __propertyToName: group.__destinationKeys[i],
-	            propertyFromParents: group.sourceKeysParents[i]
+	            propertyFromParents: group.sourceKeysParents[i],
+	            propertyToParents: group.destinationKeysParents[i]
 	          }, rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase() && { dataSourceIsDestinationEntity: true });
 	          group.mappings = group.mappings || [];
 	          group.mappings.push(map);
@@ -18949,7 +18948,14 @@ module.exports =
 	              sourceLabel = group.__sourceKeys[i];
 	            }
 	
-	            var destinationLabel = group.destinationKeys && group.destinationKeys[i];
+	            var destinationLabel = '';
+	            group.destinationKeysParents && group.destinationKeysParents[i] && group.destinationKeysParents[i].forEach(function (dkp) {
+	              destinationLabel += dkp;
+	              destinationLabel += ': ';
+	            });
+	            if (group.destinationKeys && group.destinationKeys[i]) {
+	              destinationLabel += group.destinationKeys && group.destinationKeys[i];
+	            }
 	            if (showApiNames && group.__destinationKeys && group.__destinationKeys[i]) {
 	              destinationLabel = group.__destinationKeys[i];
 	            }
@@ -19142,7 +19148,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _CSSTransitionGroup = __webpack_require__(27);
+	var _CSSTransitionGroup = __webpack_require__(40);
 	
 	var _CSSTransitionGroup2 = _interopRequireDefault(_CSSTransitionGroup);
 	
@@ -19175,7 +19181,8 @@ module.exports =
 	      customFieldValue: '',
 	      addNewButtonText: 'Add New',
 	      setDuplicateRules: false,
-	      expanded: {}
+	      sourceExpanded: {},
+	      destinationExpanded: {}
 	    };
 	    _this.onSelectDestinationField = _this.onSelectDestinationField.bind(_this);
 	    _this.customize = _this.customize.bind(_this);
@@ -19267,7 +19274,7 @@ module.exports =
 	    }
 	  }, {
 	    key: 'onSelectDestinationField',
-	    value: function onSelectDestinationField(group, field, format) {
+	    value: function onSelectDestinationField(group, field, parents) {
 	      //group.name, field.label, field.format
 	      var _props2 = this.props,
 	          change = _props2.change,
@@ -19294,8 +19301,8 @@ module.exports =
 	
 	        //cant map multiple to same destination field
 	        rscGroup.mappings = rscGroup.mappings && rscGroup.mappings.filter(function (m) {
-	          return m.propertyToName !== field.label;
-	        }) || [];
+	          return !(m.propertyToName === field.label && JSON.stringify(m.propertyToParents) === JSON.stringify(parents));
+	        });
 	        rscGroup.mappings.push({
 	          resourceFromName: selectedEntity.name,
 	          __resourceFromName: selectedEntity.__name,
@@ -19306,6 +19313,7 @@ module.exports =
 	          propertyFromParents: this.state.selectedField.parents,
 	          propertyToName: field.label,
 	          __propertyToName: field.name,
+	          propertyToParents: parents,
 	          transformations: [{ type: transform }],
 	          dataSourceIsDestinationEntity: selectedEntity.isDestinationEntity
 	        });
@@ -19343,20 +19351,13 @@ module.exports =
 	      var bit = [true, false];
 	      var direction = leftClicked ? 'right' : 'left';
 	
-	      var mappings = {};
-	      var filteredMappings = {};
-	      group && group.mappings && group.mappings.forEach(function (m, i) {
-	        mappings[m.propertyToName] = {
-	          propFrom: m.propertyFromName,
-	          unique: m.isUnique || false,
-	          index: i
-	        };
-	        if (m.resourceFromName === selectedEntity.name) {
-	          filteredMappings[m.propertyToName] = {
-	            propFrom: m.propertyFromName,
-	            parentsFrom: m.propertyFromParents || []
-	          };
-	        }
+	      var mappings = group && group.mappings.map(function (m, i) {
+	        return Object.assign({}, m, { index: i });
+	      });
+	      var filteredMappings = group && group.mappings.filter(function (m) {
+	        return m.resourceFromName === selectedEntity.name;
+	      }).map(function (m) {
+	        return m;
 	      });
 	
 	      var smallButtonStyle = {
@@ -19464,8 +19465,8 @@ module.exports =
 	                            return _react2.default.createElement(_nestedField2.default, { key: ii, field: field,
 	                              selectedField: selectedField,
 	                              filteredMappings: filteredMappings, parents: [],
-	                              onExpand: function onExpand(expanded) {
-	                                return _this4.setState({ expanded: expanded });
+	                              onExpand: function onExpand(ex) {
+	                                return _this4.setState({ sourceExpanded: ex });
 	                              },
 	                              click: function click(field, parents) {
 	                                return _this4.setState({
@@ -19475,7 +19476,7 @@ module.exports =
 	                                    parents: parents
 	                                  }
 	                                });
-	                              }, expanded: _this4.state.expanded,
+	                              }, expanded: _this4.state.sourceExpanded,
 	                              showApiNames: showApiNames
 	                            });
 	                          }),
@@ -19545,37 +19546,34 @@ module.exports =
 	                    }).properties.filter(function (p) {
 	                      return !p.readOnly;
 	                    }).map(function (field, i) {
-	                      var isMapped = mappings && Object.keys(mappings).includes(field.label);
-	                      var title = showApiNames ? field.name : field.label;
-	                      return _react2.default.createElement(
-	                        'div',
-	                        { key: i,
-	                          className: selectedField && selectedField.label ? "wizard-map-field" : '',
-	                          style: { paddingLeft: 5, width: 335,
-	                            fontWeight: isMapped ? 'bold' : 'normal',
-	                            color: isMapped ? '#16325c' : selectedField && selectedField.label ? 'black' : 'grey'
-	                          }, onClick: function onClick() {
-	                            return _this4.onSelectDestinationField(group, field);
-	                          } },
-	                        title,
-	                        ' ',
-	                        field.required ? '*' : ''
-	                      );
+	                      return _react2.default.createElement(_nestedField2.default, { key: i, field: field,
+	                        selectedField: selectedField,
+	                        filteredMappings: mappings, parents: [],
+	                        onExpand: function onExpand(ex) {
+	                          return _this4.setState({ destinationExpanded: ex });
+	                        },
+	                        click: function click(f, p) {
+	                          return _this4.onSelectDestinationField(group, f, p);
+	                        },
+	                        expanded: _this4.state.destinationExpanded,
+	                        showApiNames: showApiNames,
+	                        isDestination: true
+	                      });
 	                    }),
-	                    _this4.state.setDuplicateRules && mappings && Object.keys(mappings).map(function (mk, ii) {
+	                    _this4.state.setDuplicateRules && mappings && mappings.map(function (m, ii) {
 	                      return _react2.default.createElement(
 	                        'div',
 	                        { key: ii,
 	                          style: { padding: '0 0 5px 5px', width: 335, fontWeight: 'bold', color: '#16325c' } },
-	                        mk,
+	                        m.propertyToName,
 	                        _react2.default.createElement(
 	                          'div',
 	                          { style: { paddingLeft: 12 } },
 	                          _react2.default.createElement(_reduxForm.Field, { style: { height: 19, margin: 0, color: 'grey' },
 	                            label: 'Unique Field',
 	                            component: inputs.rfCheckbox,
-	                            checked: mappings[mk].unique,
-	                            name: 'resourceGroups.' + resourceGroupIndex + '.mappings.' + mappings[mk].index + '.isUnique' })
+	                            checked: m.isUnique,
+	                            name: 'resourceGroups.' + resourceGroupIndex + '.mappings.' + m.index + '.isUnique' })
 	                        )
 	                      );
 	                    })
@@ -19695,7 +19693,14 @@ module.exports =
 	            fromString = m.__propertyFromName;
 	          }
 	
-	          var toStr = m.propertyToName;
+	          var toStr = '';
+	          if (m.propertyToParents && m.propertyToParents.length > 0) {
+	            m.propertyToParents.forEach(function (p) {
+	              toStr += p;
+	              toStr += ': ';
+	            });
+	          }
+	          toStr += m.propertyToName;
 	          if (showApiNames && m.__propertyToName) {
 	            toStr = m.__propertyToName;
 	          }
@@ -19725,8 +19730,7 @@ module.exports =
 	var MapTableTransformRow = exports.MapTableTransformRow = function MapTableTransformRow(props) {
 	  var group = props.group,
 	      i = props.i,
-	      selectMapping = props.selectMapping,
-	      showApiNames = props.showApiNames;
+	      selectMapping = props.selectMapping;
 	
 	  var icons = {
 	    none: _react2.default.createElement(
@@ -20122,7 +20126,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _CSSTransitionGroup = __webpack_require__(27);
+	var _CSSTransitionGroup = __webpack_require__(40);
 	
 	var _CSSTransitionGroup2 = _interopRequireDefault(_CSSTransitionGroup);
 	
@@ -21706,7 +21710,7 @@ module.exports =
 	
 	var _previewTabContent = __webpack_require__(67);
 	
-	var _CSSTransitionGroup = __webpack_require__(27);
+	var _CSSTransitionGroup = __webpack_require__(40);
 	
 	var _CSSTransitionGroup2 = _interopRequireDefault(_CSSTransitionGroup);
 	
@@ -23147,7 +23151,7 @@ module.exports =
 	
 	var _initialize2 = _interopRequireDefault(_initialize);
 	
-	var _CSSTransitionGroup = __webpack_require__(27);
+	var _CSSTransitionGroup = __webpack_require__(40);
 	
 	var _CSSTransitionGroup2 = _interopRequireDefault(_CSSTransitionGroup);
 	
@@ -24966,13 +24970,9 @@ module.exports =
 	
 	var _nestExpand2 = _interopRequireDefault(_nestExpand);
 	
-	var _CSSTransitionGroup = __webpack_require__(27);
-	
-	var _CSSTransitionGroup2 = _interopRequireDefault(_CSSTransitionGroup);
-	
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 	
-	var SourceField = function SourceField(props) {
+	var NestedField = function NestedField(props) {
 	  var field = props.field,
 	      selectedField = props.selectedField,
 	      filteredMappings = props.filteredMappings,
@@ -24980,11 +24980,19 @@ module.exports =
 	      onExpand = props.onExpand,
 	      expanded = props.expanded,
 	      parents = props.parents,
-	      showApiNames = props.showApiNames;
-	
-	  var isMapped = filteredMappings && Object.values(filteredMappings).find(function (fm) {
-	    return fm.propFrom === field.label && JSON.stringify(fm.parentsFrom) === JSON.stringify(parents);
-	  }) ? true : false;
+	      showApiNames = props.showApiNames,
+	      isDestination = props.isDestination;
+	
+	  var isMapped = false;
+	  if (isDestination) {
+	    isMapped = filteredMappings && filteredMappings.find(function (m) {
+	      return m.propertyToName === field.label && JSON.stringify(m.propertyToParents) === JSON.stringify(parents);
+	    }) ? true : false;
+	  } else {
+	    isMapped = filteredMappings && filteredMappings.find(function (fm) {
+	      return fm.propertyFromName === field.label && JSON.stringify(fm.propertyFromParents) === JSON.stringify(parents);
+	    }) ? true : false;
+	  }
 	  var isSelected = selectedField && selectedField.label && selectedField.label === field.label && JSON.stringify(selectedField.parents) === JSON.stringify(parents);
 	  var style = {
 	    paddingLeft: 5,
@@ -25042,26 +25050,22 @@ module.exports =
 	    _react2.default.createElement(
 	      'div',
 	      { style: { paddingLeft: 18 } },
-	      _react2.default.createElement(
-	        _CSSTransitionGroup2.default,
-	        { transitionName: 'expander',
-	          transitionEnterTimeout: 250, transitionLeaveTimeout: 250 },
-	        isExpanded ? _react2.default.createElement(
-	          'div',
-	          { className: 'fields-expander' },
-	          field.object && field.object.properties.map(function (nestedField, i) {
-	            return _react2.default.createElement(SourceField, { key: i, field: nestedField, selectedField: selectedField,
-	              filteredMappings: filteredMappings, parents: parents.concat(field.label),
-	              click: click, onExpand: onExpand, expanded: expanded
-	            });
-	          })
-	        ) : null
-	      )
+	      isExpanded ? _react2.default.createElement(
+	        'div',
+	        { className: 'fields-expander' },
+	        field.object && field.object.properties.map(function (nestedField, i) {
+	          return _react2.default.createElement(NestedField, { key: i, field: nestedField, selectedField: selectedField,
+	            filteredMappings: filteredMappings, parents: parents.concat(field.label),
+	            click: click, onExpand: onExpand, expanded: expanded, showApiNames: showApiNames,
+	            isDestination: isDestination
+	          });
+	        })
+	      ) : null
 	    )
 	  );
 	};
 	
-	exports.default = SourceField;
+	exports.default = NestedField;
 
 /***/ },
 /* 139 */
@@ -25079,7 +25083,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _saveData3 = __webpack_require__(28);
+	var _saveData3 = __webpack_require__(27);
 	
 	var _saveData4 = _interopRequireDefault(_saveData3);
 	
@@ -25602,7 +25606,7 @@ module.exports =
 	
 	var _fileProcessing2 = _interopRequireDefault(_fileProcessing);
 	
-	var _saveData2 = __webpack_require__(28);
+	var _saveData2 = __webpack_require__(27);
 	
 	var _saveData3 = _interopRequireDefault(_saveData2);
 	
@@ -26173,11 +26177,11 @@ module.exports =
 
 	'use strict';
 	// 19.1.2.1 Object.assign(target, source, ...)
-	var getKeys  = __webpack_require__(34)
+	var getKeys  = __webpack_require__(33)
 	  , gOPS     = __webpack_require__(161)
 	  , pIE      = __webpack_require__(163)
-	  , toObject = __webpack_require__(37)
-	  , IObject  = __webpack_require__(32)
+	  , toObject = __webpack_require__(36)
+	  , IObject  = __webpack_require__(31)
 	  , $assign  = Object.assign;
 	
 	// should work with symbols and should have deterministic property order (V8 bug)
@@ -28891,7 +28895,7 @@ module.exports =
 	
 	var _moment2 = _interopRequireDefault(_moment);
 	
-	var _classnames = __webpack_require__(39);
+	var _classnames = __webpack_require__(38);
 	
 	var _classnames2 = _interopRequireDefault(_classnames);
 	
@@ -29077,7 +29081,7 @@ module.exports =
 	
 	var _reactDom2 = _interopRequireDefault(_reactDom);
 	
-	var _classnames3 = __webpack_require__(39);
+	var _classnames3 = __webpack_require__(38);
 	
 	var _classnames4 = _interopRequireDefault(_classnames3);
 	
@@ -30576,7 +30580,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _propTypes = __webpack_require__(40);
+	var _propTypes = __webpack_require__(39);
 	
 	var _propTypes2 = _interopRequireDefault(_propTypes);
 	
@@ -30800,7 +30804,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _propTypes = __webpack_require__(40);
+	var _propTypes = __webpack_require__(39);
 	
 	var _propTypes2 = _interopRequireDefault(_propTypes);