@lingk/sync 0.1.61 → 0.1.63

package/build/main.js

@@ -328,21 +328,49 @@ module.exports =
 	                  return r.name === rsc.resourceLabel;
 	                });
 	
-	                var deNestedJoinKey = deNest(rsc.joinKeyName, rsc.joinKeyParents, rscResource);
+	                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;
+	                  }
+	                }
 	
 	                //get resource and primaryKey for first resource in bundle (check both metadatas)
 	                var primaryResourceProvider = bundle.resources[0].provider.charAt(0).toUpperCase() + bundle.resources[0].provider.slice(1).replace('Reader', '');
 	                var primaryDataSourceMetadata = primaryResourceProvider === step.destinationProvider ? wizard.destinationMetadata : wizard.sourceMetadata;
-	                var rscPrimaryResource = primaryDataSourceMetadata.find(function (r) {
-	                  return r.type === bundle.resources[0].resourceName;
-	                });
-	                var deNestedPrimaryKey = deNest(rsc.primaryKeyName, rsc.primaryKeyParents, rscPrimaryResource);
+	
+	                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 (rscResource) {
 	                  resources.push(Object.assign({
 	                    name: rscResource.name,
 	                    provider: resourceProvider
-	                  }, deNestedJoinKey.property && { joinKeyName: deNestedJoinKey.property }, deNestedJoinKey.parentsArray && deNestedJoinKey.parentsArray.length > 0 && { joinKeyParents: deNestedJoinKey.parentsArray }, deNestedPrimaryKey.property && { primaryKeyName: deNestedPrimaryKey.property }, deNestedPrimaryKey.parentsArray && deNestedPrimaryKey.parentsArray.length > 0 && { primaryKeyParents: deNestedPrimaryKey.parentsArray }, {
+	                  }, deNestedJoinKey.property && { joinKeyName: deNestedJoinKey.property }, joinKeyResourceName && { joinKeyResource: joinKeyResourceName }, deNestedJoinKey.parentsArray && deNestedJoinKey.parentsArray.length > 0 && { joinKeyParents: deNestedJoinKey.parentsArray }, deNestedPrimaryKey.property && { primaryKeyName: deNestedPrimaryKey.property }, primaryKeyResourceName && { primaryKeyResource: primaryKeyResourceName }, deNestedPrimaryKey.parentsArray && deNestedPrimaryKey.parentsArray.length > 0 && { primaryKeyParents: deNestedPrimaryKey.parentsArray }, {
 	                    joinType: rsc.joinType || 'LEFT JOIN'
 	                  }, rscResource.parentRef && { parentRef: rscResource.parentRef }, rsc.parameterFilters && { parameterFilters: rsc.parameterFilters }));
 	                }
@@ -2052,31 +2080,13 @@ module.exports =
 	  }, {
 	    key: 'addDefaultResourceGroup',
 	    value: function addDefaultResourceGroup(v, selectIdx, newGroup) {
-	      var section = newGroup.section;
 	      var _props = this.props,
 	          addGroup = _props.addGroup,
-	          resourceGroups = _props.resourceGroups,
-	          step = _props.step;
+	          resourceGroups = _props.resourceGroups;
 	      var resourceGroupIndex = this.state.resourceGroupIndex;
 	
-	      console.log("crrentIndex:", resourceGroupIndex);
-	      var isReverse = section === step.sourceProvider;
-	      console.log("isReverse: ", isReverse);
-	      var firstReverseIndex = 0;
-	      for (var i = 0; i < resourceGroups.length; i++) {
-	        firstReverseIndex = i;
-	        if (resourceGroups[i] && resourceGroups[i].provider === step.sourceProvider) break;
-	      }
-	      console.log("firstReverseIndex:", firstReverseIndex);
-	      var finalIndex = resourceGroupIndex + 1;
-	      console.log("finalIndex: ", finalIndex);
-	      if (!isReverse) {
-	        if (resourceGroupIndex > firstReverseIndex) finalIndex = firstReverseIndex - 1;
-	      } else {
-	        if (resourceGroupIndex < firstReverseIndex) finalIndex = resourceGroups.length;
-	      }
-	      console.log("final finalIndex: ", finalIndex);
 	
+	      var finalIndex = resourceGroupIndex + 1;
 	      if (!(resourceGroups && resourceGroups.length === 0)) {
 	        this.go(false, finalIndex);
 	      }
@@ -2095,13 +2105,23 @@ module.exports =
 	    value: function addDefaultEntity(v, rscIndex, entity, groupIndex) {
 	      var _this3 = this;
 	
-	      var resourceGroups = this.props.resourceGroups;
+	      var _props2 = this.props,
+	          resourceGroups = _props2.resourceGroups,
+	          step = _props2.step;
 	
 	      var group = resourceGroups[this.state.resourceGroupIndex];
-	      if (group && group.resources && group.resources.length > 0) {
+	
+	      var entityExists = group && group.resources && group.resources.find(function (r) {
+	        return r.name === v && r.provider === entity.section;
+	      });
+	
+	      if (group && group.resources && group.resources.length > 0 && !entityExists) {
 	        setTimeout(function () {
 	          var sel = [].concat(_toConsumableArray(_this3.state.selectedEntities));
-	          sel[_this3.state.resourceGroupIndex] = { name: v };
+	          sel[_this3.state.resourceGroupIndex] = {
+	            name: v,
+	            isDestinationEntity: entity.section === step.destinationProvider
+	          };
 	          _this3.setState({ selectedEntities: sel });
 	        }, 40);
 	      }
@@ -2160,15 +2180,15 @@ module.exports =
 	    value: function render() {
 	      var _this4 = this;
 	
-	      var _props2 = this.props,
-	          resourceGroups = _props2.resourceGroups,
-	          style = _props2.style,
-	          isBundleStep = _props2.isBundleStep,
-	          destinationSchema = _props2.destinationSchema,
-	          inputs = _props2.inputs,
-	          step = _props2.step,
-	          sourceSchema = _props2.sourceSchema,
-	          direction = _props2.direction;
+	      var _props3 = this.props,
+	          resourceGroups = _props3.resourceGroups,
+	          style = _props3.style,
+	          isBundleStep = _props3.isBundleStep,
+	          destinationSchema = _props3.destinationSchema,
+	          inputs = _props3.inputs,
+	          step = _props3.step,
+	          sourceSchema = _props3.sourceSchema,
+	          direction = _props3.direction;
 	      var _state = this.state,
 	          resourceGroupIndex = _state.resourceGroupIndex,
 	          paneToggle = _state.paneToggle,
@@ -2183,9 +2203,9 @@ module.exports =
 	        return r.method !== 'POST' && r.method !== 'PUT';
 	      });
 	
-	      var bothMetadatas = direction === 'reverse' ? [filteredSourceSchema, destinationSchema] : [destinationSchema, filteredSourceSchema];
+	      var newTargetObjectMetadata = direction === 'reverse' ? [filteredSourceSchema] : [destinationSchema];
 	
-	      var bothSectionLabels = direction === 'reverse' ? [step.sourceProvider, step.destinationProvider] : [step.destinationProvider, step.sourceProvider];
+	      var newTargetSectionLabels = direction === 'reverse' ? [step.sourceProvider] : [step.destinationProvider];
 	
 	      var propsForChild = {
 	        resourceGroups: resourceGroups, leftClicked: leftClicked, inputs: inputs, step: step,
@@ -2240,9 +2260,9 @@ module.exports =
 	          _react2.default.createElement(_selectWrapper2.default, { label: "Add Data Target", type: 'brand',
 	            style: { height: 40, width: 160 }, minWidth: 260, fieldPropLabel: 'name',
 	            onSelect: this.addDefaultResourceGroup,
-	            values: bothMetadatas,
+	            values: newTargetObjectMetadata,
 	            title: 'Available Target Objects', inputs: inputs, sectionLabelSuffix: 'Objects',
-	            sectionLabels: bothSectionLabels
+	            sectionLabels: newTargetSectionLabels
 	          })
 	        ) : null,
 	        _react2.default.createElement('br', null),
@@ -2315,7 +2335,7 @@ module.exports =
 	                  return _react2.default.createElement(
 	                    'div',
 	                    { className: 'schema-group-name', key: i },
-	                    g.provider === step.sourceProvider ? g.name + ' (' + step.sourceProvider + ')' : g.name
+	                    g.name
 	                  );
 	                })
 	              )
@@ -2420,7 +2440,7 @@ module.exports =
 	
 	**************************/
 	
-	function saveData(resourceGroups, targetProvider, sourceMetadata, destinationMetadata, sourceEndpoint) {
+	function saveData(resourceGroups, sourceProvider, targetProvider, sourceMetadata, destinationMetadata, sourceEndpoint) {
 	  var bundles = resourceGroups || [];
 	  var mappings = [];
 	  var endpoints = {};
@@ -2437,7 +2457,7 @@ module.exports =
 	    }
 	
 	    // destination Keys (for de-duplication in the Connect modal)
-	    if (!group.customExternalKeys) {
+	    if (!group.customExternalKeys && group.lingkSourceKey) {
 	      group.sourceKeys = [group.lingkSourceKey];
 	      group.sourceKeysObjects = [group.lingkSourceKeyObject];
 	      group.sourceKeysParents = [group.lingkSourceKeyParents];
@@ -2538,7 +2558,9 @@ module.exports =
 	        }
 	
 	        if (sourceResource && nestedSourceProp.property && destinationResource && destinationProperty) {
+	          console.log(sourceResource);
 	          mappings = mappings.concat(Object.assign({ // add to mappings obj
+	            resourceFromLabel: singleMapping.dataSourceIsDestinationEntity ? sourceResource.type + '_' + targetProvider : sourceResource.type + '_' + sourceProvider,
 	            resourceFromName: sourceResource.type,
 	            propertyFromName: nestedSourceProp.property
 	          }, nestedSourceProp.parentsArray && nestedSourceProp.parentsArray.length > 0 && { propertyFromParents: nestedSourceProp.parentsArray }, {
@@ -2565,6 +2587,14 @@ module.exports =
 	        var sourceResource = dataSourceMetadata.find(function (metaRsc) {
 	          return metaRsc.name === rsc.name;
 	        });
+	        // via parameter, dont change because its already "type"
+	        var nestedJoinKey = { property: rsc.joinKeyName };
+	        var joinKeyResource = rsc.joinKeyResource;
+	        // is from a same resource (not via parameters)
+	        if (sourceResource.name === rsc.joinKeyResource) {
+	          nestedJoinKey = findNestedProp(rsc.joinKeyName, rsc.joinKeyParents, sourceResource);
+	          joinKeyResource = sourceResource.type;
+	        }
 	
 	        //make endpoint
 	        var suffix = sourceResource.endpointSuffix;
@@ -2578,17 +2608,24 @@ module.exports =
 	          return metaRsc.name === group.resources[0].name;
 	        });
 	
-	        var nestedPrimaryKey = findNestedProp(rsc.primaryKeyName, rsc.primaryKeyParents, primarySourceResource);
-	
-	        var nestedJoinKey = findNestedProp(rsc.joinKeyName, rsc.joinKeyParents, sourceResource);
+	        // via parameter, dont change because its already "type"
+	        var nestedPrimaryKey = { property: rsc.primaryKeyName };
+	        var primaryKeyResource = rsc.primaryKeyResource;
+	        // is from a same resource (not via parameters)
+	        if (primarySourceResource.name === rsc.primaryKeyResource) {
+	          nestedPrimaryKey = findNestedProp(rsc.primaryKeyName, rsc.primaryKeyParents, primarySourceResource);
+	          primaryKeyResource = primarySourceResource.type;
+	        }
 	
 	        if (sourceResource) {
 	          return Object.assign({
 	            resourceName: sourceResource.type,
 	            resourceLabel: sourceResource.name,
-	            joinKeyName: nestedJoinKey.property
+	            joinKeyName: nestedJoinKey.property,
+	            joinKeyResource: joinKeyResource
 	          }, nestedJoinKey.parentsArray && nestedJoinKey.parentsArray.length > 0 && { joinKeyParents: nestedJoinKey.parentsArray }, {
-	            primaryKeyName: nestedPrimaryKey.property
+	            primaryKeyName: nestedPrimaryKey.property,
+	            primaryKeyResource: primaryKeyResource
 	          }, nestedPrimaryKey.parentsArray && nestedPrimaryKey.parentsArray.length > 0 && { primaryKeyParents: nestedPrimaryKey.parentsArray }, {
 	            provider: rsc.provider.toLowerCase() + 'Reader',
 	            joinType: rsc.joinType
@@ -5978,16 +6015,7 @@ module.exports =
 	          { className: 'bundle-table-body' },
 	          groups && groups.map(function (group, i) {
 	
-	            var linked = false;
-	            if (group.customExternalKeys) {
-	              if (group.sourceKeys && group.sourceKeys.length > 0 && group.destinationKeys && group.destinationKeys.length > 0) {
-	                linked = true;
-	              }
-	            } else {
-	              if (group.lingkSourceKey) {
-	                linked = true;
-	              }
-	            }
+	            var linked = group.lingkSourceKey || group.sourceKeys && group.sourceKeys.length > 0 && group.destinationKeys && group.destinationKeys.length > 0;
 	
 	            /*const groupsBeforeThis = groups.slice(0,i)
 	            let groupBeforeThisIndex = 0
@@ -6007,6 +6035,17 @@ module.exports =
 	              }
 	            })*/
 	
+	            var groupName = group.name;
+	            if (isReverse) {
+	              if (group.provider === step.destinationProvider) {
+	                groupName = group.name + ' (' + step.destinationProvider + ')';
+	              }
+	            } else {
+	              if (group.provider === step.sourceProvider) {
+	                groupName = group.name + ' (' + step.sourceProvider + ')';
+	              }
+	            }
+	
 	            return _react2.default.createElement(
 	              _reactDraggable2.default,
 	              { axis: 'y', key: i, handle: '.dragon',
@@ -6043,6 +6082,16 @@ module.exports =
 	                      { style: { paddingTop: 3, display: 'inline-block', overflow: 'hidden',
 	                          textOverflow: 'ellipsis', maxWidth: 'calc(100% - 32px)', whiteSpace: 'nowrap' } },
 	                      group.resources && group.resources.map(function (rsc, ii) {
+	                        var rscName = rsc.name;
+	                        if (isReverse) {
+	                          if (rsc.provider === step.sourceProvider) {
+	                            rscName = rsc.name + ' (' + step.sourceProvider + ')';
+	                          }
+	                        } else {
+	                          if (rsc.provider === step.destinationProvider) {
+	                            rscName = rsc.name + ' (' + step.destinationProvider + ')';
+	                          }
+	                        }
 	                        return _react2.default.createElement(
 	                          'span',
 	                          { key: ii },
@@ -6054,7 +6103,7 @@ module.exports =
 	                          _react2.default.createElement(
 	                            'span',
 	                            { style: { fontWeight: ii === 0 ? 'bold' : 'normal', whiteSpace: 'nowrap', color: ii === 0 || rsc.primaryKeyName && rsc.joinKeyName ? '#16325c' : '#c23934' } },
-	                            rsc.provider === step.destinationProvider ? rsc.name + ' (' + step.destinationProvider + ')' : rsc.name,
+	                            rscName,
 	                            '\xA0'
 	                          )
 	                        );
@@ -6099,7 +6148,7 @@ module.exports =
 	                    _react2.default.createElement(
 	                      'strong',
 	                      { style: { whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', display: 'block', paddingTop: 8 } },
-	                      group.provider === step.sourceProvider ? group.name + ' (' + step.sourceProvider + ')' : group.name
+	                      groupName
 	                    )
 	                  )
 	                )
@@ -6166,6 +6215,7 @@ module.exports =
 	    group.mappings = group.mappings && group.mappings.filter(function (m) {
 	      return !m.isExternalKeyMapping;
 	    });
+	
 	    if (group.customExternalKeys) {
 	      group.sourceKeys && group.sourceKeys.forEach(function (sk, i) {
 	        if (sk && group.destinationKeys && group.destinationKeys[i]) {
@@ -6739,6 +6789,7 @@ module.exports =
 	          resourceGroups = _props3.resourceGroups,
 	          resourceGroupIndex = _props3.resourceGroupIndex,
 	          leftClicked = _props3.leftClicked,
+	          isReverse = _props3.isReverse,
 	          sourceSchema = _props3.sourceSchema,
 	          destinationSchema = _props3.destinationSchema,
 	          toggle = _props3.toggle,
@@ -6759,7 +6810,7 @@ module.exports =
 	
 	      var mappings = {};
 	      var filteredMappings = {};
-	      group.mappings && group.mappings.forEach(function (m, i) {
+	      group && group.mappings && group.mappings.forEach(function (m, i) {
 	        mappings[m.propertyToName] = {
 	          propFrom: m.propertyFromName,
 	          unique: m.isUnique || false,
@@ -6812,6 +6863,20 @@ module.exports =
 	                      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 isSelected = selectedEntity.name === rsc.name && selectedEntity.isDestinationEntity === isDestinationEntity;
+	
+	                      var rscName = rsc.name;
+	                      if (isReverse) {
+	                        if (rsc.provider === step.sourceProvider) {
+	                          rscName = rsc.name + ' (' + step.sourceProvider + ')';
+	                        }
+	                      } else {
+	                        if (rsc.provider === step.destinationProvider) {
+	                          rscName = rsc.name + ' (' + step.destinationProvider + ')';
+	                        }
+	                      }
+	
 	                      return _react2.default.createElement(
 	                        'div',
 	                        { key: i, className: 'accordion-panel', style: { overflow: 'hidden', width: 336 } },
@@ -6821,20 +6886,23 @@ module.exports =
 	                            style: { height: 35 },
 	                            onClick: function onClick() {
 	                              _this4.scrollToTop(_this4['scroller-' + ii], 18, i * 43 + 6);
-	                              _this4.props.pickEntity({ name: rsc.name, isDestinationEntity: rsc.provider === step.destinationProvider });
+	                              _this4.props.pickEntity({
+	                                name: rsc.name,
+	                                isDestinationEntity: rsc.provider === step.destinationProvider
+	                              });
 	                              _this4.setState({ selectedField: null, selectedFieldParents: null });
 	                            }
 	                          },
 	                          _react2.default.createElement(
 	                            'span',
 	                            { className: 'accordion-panel-header-title' },
-	                            rsc.provider === step.destinationProvider ? rsc.name + (' (' + step.destinationProvider + ')') : rsc.name
+	                            rscName
 	                          ),
 	                          _react2.default.createElement(
 	                            'svg',
 	                            { xmlns: 'http://www.w3.org/2000/svg', fill: '#FFFFFF', width: '18', height: '18', viewBox: '0 0 18 18',
 	                              style: { float: 'right',
-	                                transform: selectedEntity.name === rsc.name ? 'rotate(180deg)' : 'rotate(0deg)'
+	                                transform: isSelected ? 'rotate(180deg)' : 'rotate(0deg)'
 	                              } },
 	                            _react2.default.createElement('path', { d: 'M5 8l4 4 4-4z' })
 	                          )
@@ -6844,7 +6912,7 @@ module.exports =
 	                          { className: 'accordion-panel-collapse',
 	                            style: {
 	                              //height:schema && selectedEntity.name===rsc.name ? schema.find(r=>r.name===rsc.name).properties.length * 18 + 19 : 0,
-	                              maxHeight: schema && selectedEntity.name === rsc.name ? 20000 : 0,
+	                              maxHeight: schema && isSelected ? 20000 : 0,
 	                              padding: '0 6px'
 	                            }
 	                          },
@@ -7012,7 +7080,8 @@ module.exports =
 	
 	var MapTableSourceRow = exports.MapTableSourceRow = function MapTableSourceRow(props) {
 	  var group = props.group,
-	      step = props.step;
+	      step = props.step,
+	      isReverse = props.isReverse;
 	
 	  return _react2.default.createElement(
 	    'div',
@@ -7026,6 +7095,18 @@ module.exports =
 	        if (a.isExternalKeyMapping) return -1;else return 1;
 	      });
 	      var fieldNum = mapz ? mapz.length : 0;
+	
+	      var rscName = rsc.name;
+	      if (isReverse) {
+	        if (rsc.provider === step.sourceProvider) {
+	          rscName = rsc.name + ' (' + step.sourceProvider + ')';
+	        }
+	      } else {
+	        if (rsc.provider === step.destinationProvider) {
+	          rscName = rsc.name + ' (' + step.destinationProvider + ')';
+	        }
+	      }
+	
 	      return _react2.default.createElement(
 	        'div',
 	        { key: ii, style: {
@@ -7036,7 +7117,7 @@ module.exports =
 	        _react2.default.createElement(
 	          'strong',
 	          null,
-	          rsc.provider === step.destinationProvider ? rsc.name + ' (' + step.destinationProvider + ')' : rsc.name
+	          rscName
 	        )
 	      );
 	    })
@@ -7216,11 +7297,25 @@ module.exports =
 	
 	var MapTableDestinationRow = exports.MapTableDestinationRow = function MapTableDestinationRow(_ref) {
 	  var group = _ref.group,
-	      step = _ref.step;
+	      step = _ref.step,
+	      isReverse = _ref.isReverse;
+	
+	
+	  var groupName = group.name;
+	  if (isReverse) {
+	    if (group.provider === step.destinationProvider) {
+	      groupName = group.name + ' (' + step.destinationProvider + ')';
+	    }
+	  } else {
+	    if (group.provider === step.sourceProvider) {
+	      groupName = group.name + ' (' + step.sourceProvider + ')';
+	    }
+	  }
+	
 	  return _react2.default.createElement(
 	    'strong',
 	    { style: { fontSize: 16, whiteSpace: 'wrap' } },
-	    group.provider === step.sourceProvider ? group.name + ' (' + step.sourceProvider + ')' : group.name
+	    groupName
 	  );
 	};
 
@@ -7651,7 +7746,8 @@ module.exports =
 	          destinationSchema = _props3.destinationSchema,
 	          overflowHidden = _props3.overflowHidden,
 	          showOverflow = _props3.showOverflow,
-	          step = _props3.step;
+	          step = _props3.step,
+	          isReverse = _props3.isReverse;
 	      var parameterModalResourceIndex = this.state.parameterModalResourceIndex;
 	
 	
@@ -7659,7 +7755,8 @@ module.exports =
 	      var Button = inputs.Button;
 	      var Radio = inputs.Radio;
 	      var group = resourceGroups[resourceGroupIndex];
-	      var isReverse = group && group.provider === step.sourceProvider;
+	      //const isReverse = group && group.provider === step.sourceProvider
+	
 	      var bit = [true, false];
 	      var direction = leftClicked ? 'right' : 'left';
 	      var groupResourcesLength = group && group.resources ? group.resources.length : 0;
@@ -7679,6 +7776,36 @@ module.exports =
 	        })
 	      })*/
 	
+	      var primaryRscVals = null;
+	      var primaryRscSectionLabels = null;
+	      if (group && group.resources) {
+	        var primaryResourceSchema = group.resources[0].provider === step.destinationProvider ? destinationSchema : sourceSchema;
+	        primaryRscVals = primaryResourceSchema && primaryResourceSchema.find(function (defaultRsc) {
+	          return defaultRsc.name === group.resources[0].name;
+	        }) && [primaryResourceSchema.find(function (defaultRsc) {
+	          return defaultRsc.name === group.resources[0].name;
+	        }).properties.filter(function (f) {
+	          return !f.fake;
+	        })];
+	
+	        var primaryHasParameters = group.resources[0].parentRef && group.resources[0].parentRef.length > 0 && group.resources[0].parentRef.some(function (pr) {
+	          return pr.foreignKeyFields && pr.foreignKeyFields.length > 0;
+	        });
+	
+	        primaryRscSectionLabels = [group.resources[0].name];
+	
+	        if (primaryHasParameters) {
+	          group.resources[0].parentRef.forEach(function (pr) {
+	            var params = [];
+	            primaryRscSectionLabels.push(pr.ref.split('/')[2]);
+	            pr.foreignKeyFields.forEach(function (fkf) {
+	              params.push({ label: fkf });
+	            });
+	            primaryRscVals.push(params);
+	          });
+	        }
+	      }
+	
 	      return _react2.default.createElement(
 	        'div',
 	        { style: { position: 'relative' } },
@@ -7740,20 +7867,35 @@ module.exports =
 	                  { style: { position: 'relative' } },
 	                  group && group.resources && group.resources.map(function (rsc, i) {
 	
-	                    var primaryRscVals = group.resources[0].provider === step.destinationProvider ? destinationSchema && destinationSchema.find(function (defaultRsc) {
-	                      return defaultRsc.name === group.resources[0].name;
-	                    }) && [destinationSchema.find(function (defaultRsc) {
-	                      return defaultRsc.name === group.resources[0].name;
-	                    }).properties.filter(function (f) {
-	                      return !f.fake;
-	                    })] : sourceSchema && sourceSchema.find(function (defaultRsc) {
-	                      return defaultRsc.name === group.resources[0].name;
-	                    }) && [sourceSchema.find(function (defaultRsc) {
-	                      return defaultRsc.name === group.resources[0].name;
+	                    var isDestinationEntity = rsc.provider === step.destinationProvider;
+	                    var isSelected = selectedEntity.name === rsc.name && selectedEntity.isDestinationEntity === isDestinationEntity;
+	
+	                    var hasParameters = rsc.parentRef && rsc.parentRef.length > 0 && rsc.parentRef.some(function (pr) {
+	                      return pr.foreignKeyFields && pr.foreignKeyFields.length > 0;
+	                    });
+	
+	                    var rscSchema = isDestinationEntity ? destinationSchema : sourceSchema;
+	                    var joinRscVals = rscSchema && rscSchema.find(function (defaultRsc) {
+	                      return defaultRsc.name === rsc.name;
+	                    }) && [rscSchema.find(function (defaultRsc) {
+	                      return defaultRsc.name === rsc.name;
 	                    }).properties.filter(function (f) {
 	                      return !f.fake;
 	                    })];
 	
+	                    var joinRscSectionLabels = [rsc.name];
+	
+	                    if (hasParameters) {
+	                      rsc.parentRef.forEach(function (pr) {
+	                        var params = [];
+	                        joinRscSectionLabels.push(pr.ref.split('/')[2]);
+	                        pr.foreignKeyFields.forEach(function (fkf) {
+	                          params.push({ label: fkf });
+	                        });
+	                        joinRscVals.push(params);
+	                      });
+	                    }
+	
 	                    var primaryKeyLabel = '';
 	                    rsc.primaryKeyParents && rsc.primaryKeyParents.forEach(function (skp) {
 	                      primaryKeyLabel += skp;
@@ -7763,20 +7905,6 @@ module.exports =
 	                      primaryKeyLabel += rsc.primaryKeyName;
 	                    }
 	
-	                    var joinRscVals = rsc.provider === step.destinationProvider ? destinationSchema && destinationSchema.find(function (defaultRsc) {
-	                      return defaultRsc.name === rsc.name;
-	                    }) && [destinationSchema.find(function (defaultRsc) {
-	                      return defaultRsc.name === rsc.name;
-	                    }).properties.filter(function (f) {
-	                      return !f.fake;
-	                    })] : sourceSchema && sourceSchema.find(function (defaultRsc) {
-	                      return defaultRsc.name === rsc.name;
-	                    }) && [sourceSchema.find(function (defaultRsc) {
-	                      return defaultRsc.name === rsc.name;
-	                    }).properties.filter(function (f) {
-	                      return !f.fake;
-	                    })];
-	
 	                    var joinKeyLabel = '';
 	                    rsc.joinKeyParents && rsc.joinKeyParents.forEach(function (skp) {
 	                      joinKeyLabel += skp;
@@ -7786,14 +7914,23 @@ module.exports =
 	                      joinKeyLabel += rsc.joinKeyName;
 	                    }
 	
-	                    var isDependency = false;
-	                    group.resources && group.resources.forEach(function (gr) {
-	                      if (gr.parentRef && gr.parentRef.find(function (pr) {
-	                        return pr === rsc.name;
-	                      })) {
-	                        isDependency = true;
+	                    /*let isDependency = false
+	                    group.resources && group.resources.forEach(gr=>{
+	                      if(gr.parentRef && gr.parentRef.find(pr=>pr===rsc.name)){
+	                        isDependency=true
 	                      }
-	                    });
+	                    })*/
+	
+	                    var rscName = rsc.name;
+	                    if (isReverse) {
+	                      if (rsc.provider === step.sourceProvider) {
+	                        rscName = rsc.name + ' (' + step.sourceProvider + ')';
+	                      }
+	                    } else {
+	                      if (rsc.provider === step.destinationProvider) {
+	                        rscName = rsc.name + ' (' + step.destinationProvider + ')';
+	                      }
+	                    }
 	
 	                    return _react2.default.createElement(
 	                      _reactDraggable2.default,
@@ -7829,11 +7966,9 @@ module.exports =
 	                            _react2.default.createElement(
 	                              'span',
 	                              { style: { maxWidth: 260, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', display: 'inline-block' } },
-	                              rsc.provider === step.destinationProvider ? rsc.name + ' (' + step.destinationProvider + ')' : rsc.name
+	                              rscName
 	                            ),
-	                            rsc.parentRef && rsc.parentRef.length > 0 && rsc.parentRef.some(function (pr) {
-	                              return pr.foreignKeyFields && pr.foreignKeyFields.length > 0;
-	                            }) && _react2.default.createElement(
+	                            hasParameters && _react2.default.createElement(
 	                              'div',
 	                              { className: 'accordion-panel-parameters',
 	                                onClick: function onClick() {
@@ -7851,7 +7986,7 @@ module.exports =
 	                          ),
 	                          _react2.default.createElement(
 	                            'div',
-	                            { className: isDependency ? 'accordion-panel-close-disabled' : 'accordion-panel-close',
+	                            { className: 'accordion-panel-close',
 	                              onClick: function onClick(e) {
 	                                return didRemoveEntity(e, resourceGroupIndex, rsc.name, i);
 	                              } },
@@ -7867,11 +8002,13 @@ module.exports =
 	                            { style: { verticalAlign: 'top', float: 'right', marginRight: 8 } },
 	                            i !== 0 ? _react2.default.createElement(
 	                              Button,
-	                              { type: 'brand', icon: selectedEntity.name === rsc.name ? 'chevronup' : 'chevrondown',
+	                              { type: 'brand', icon: isSelected ? 'chevronup' : 'chevrondown',
 	                                iconAlign: 'right', className: rsc.joinKeyName && rsc.primaryKeyName ? 'join-ok' : '',
 	                                onClick: function onClick() {
-	                                  _this3.props.pickEntity({ name: rsc.name,
-	                                    isDestinationEntity: rsc.provider === step.destinationProvider });
+	                                  _this3.props.pickEntity({
+	                                    name: rsc.name,
+	                                    isDestinationEntity: rsc.provider === step.destinationProvider
+	                                  });
 	                                } },
 	                              joinKeyLabel && primaryKeyLabel ? primaryKeyLabel + ' = ' + joinKeyLabel : 'Configure Join'
 	                            ) : null
@@ -7880,7 +8017,7 @@ module.exports =
 	                        _react2.default.createElement(
 	                          _CSSTransitionGroup2.default,
 	                          { transitionName: 'panel-collapse', transitionEnterTimeout: 250, transitionLeaveTimeout: 250 },
-	                          selectedEntity.name === rsc.name ? _react2.default.createElement(
+	                          isSelected ? _react2.default.createElement(
 	                            'div',
 	                            { className: 'schema-accordion-collapse' },
 	                            _react2.default.createElement(
@@ -7910,7 +8047,7 @@ module.exports =
 	                                onClick: showOverflow,
 	                                type: 'neutral', inputs: inputs,
 	                                values: primaryRscVals,
-	                                sectionLabels: [group.resources[0].name],
+	                                sectionLabels: primaryRscSectionLabels,
 	                                fieldPropLabel: 'label',
 	                                selectedValues: [{
 	                                  label: rsc.primaryKeyName,
@@ -7946,7 +8083,7 @@ module.exports =
 	                                onClick: showOverflow,
 	                                type: 'neutral', inputs: inputs,
 	                                values: joinRscVals,
-	                                sectionLabels: [group.resources[i].name],
+	                                sectionLabels: joinRscSectionLabels,
 	                                fieldPropLabel: 'label',
 	                                selectedValues: [{
 	                                  label: rsc.joinKeyName,
@@ -9214,7 +9351,8 @@ module.exports =
 	          formValues = _props4.formValues,
 	          actions = _props4.actions,
 	          tenantId = _props4.tenantId,
-	          accountId = _props4.accountId;
+	          accountId = _props4.accountId,
+	          change = _props4.change;
 	
 	      var Button = inputs.Button;
 	      var Spinner = inputs.Spinner;
@@ -9419,7 +9557,10 @@ module.exports =
 	          _react2.default.createElement('br', null),
 	          _react2.default.createElement(_reduxForm.Field, { name: 'direction', component: inputs.rfRadioGroup,
 	            label: 'Integration Direction',
-	            onClickOption: function onClickOption(v) {},
+	            onClickOption: function onClickOption(v) {
+	              change('resourceGroups', []);
+	              change('scenario', null);
+	            },
 	            options: {
 	              'normal': 'Read Data from ' + step[step.mode + 'Provider'],
 	              'reverse': 'Write Data to ' + step[step.mode + 'Provider']
@@ -9922,6 +10063,8 @@ module.exports =
 	        return g.resources && g.resources.length > 0;
 	      });
 	
+	      var isReverse = formValues.direction === 'reverse';
+	
 	      return _react2.default.createElement(
 	        'form',
 	        { onKeyPress: function onKeyPress(e) {
@@ -9930,10 +10073,7 @@ module.exports =
 	        _react2.default.createElement(
 	          'div',
 	          { style: { fontSize: 20, display: 'inline-block' } },
-	          'Map ',
-	          step.sourceProvider,
-	          ' Fields to ',
-	          step.destinationProvider
+	          isReverse ? 'Map ' + step.destinationProvider + ' Fields to ' + step.sourceProvider : 'Map ' + step.sourceProvider + ' Fields to ' + step.destinationProvider
 	        ),
 	        _react2.default.createElement('br', null),
 	        _react2.default.createElement('br', null),
@@ -9941,7 +10081,11 @@ module.exports =
 	          'p',
 	          null,
 	          'Map data elements from data sources to ',
-	          step.destinationProvider,
+	          _react2.default.createElement(
+	            'span',
+	            null,
+	            isReverse ? step.sourceProvider : step.destinationProvider
+	          ),
 	          ' object fields one dataset at a time.'
 	        ),
 	        _react2.default.createElement('br', null),
@@ -9956,20 +10100,12 @@ module.exports =
 	              { resourceGroups: resourceGroups, isBundleStep: false, inputs: inputs,
 	                style: { position: 'relative', width: 640, height: 69, zIndex: 9000 }, step: step },
 	              _react2.default.createElement(_mapAccordion2.default, { sourceSchema: sourceSchema, destinationSchema: destinationSchema,
-	                formValues: formValues, change: change, update: this.update, step: step, actions: actions }),
+	                formValues: formValues, change: change, update: this.update, step: step,
+	                actions: actions, isReverse: isReverse }),
 	              _react2.default.createElement(
 	                MapTable,
 	                { clearOneMapping: this.clearOneMapping, selectMapping: this.selectMapping,
-	                  mode: 'normal', step: step },
-	                _react2.default.createElement(Rows.MapTableSourceRow, null),
-	                _react2.default.createElement(Rows.MapTableMappingRow, null),
-	                _react2.default.createElement(Rows.MapTableTransformRow, null),
-	                _react2.default.createElement(Rows.MapTableDestinationRow, null)
-	              ),
-	              _react2.default.createElement(
-	                MapTable,
-	                { clearOneMapping: this.clearOneMapping, selectMapping: this.selectMapping,
-	                  mode: 'reverse', step: step },
+	                  mode: formValues.direction, step: step },
 	                _react2.default.createElement(Rows.MapTableSourceRow, null),
 	                _react2.default.createElement(Rows.MapTableMappingRow, null),
 	                _react2.default.createElement(Rows.MapTableTransformRow, null),
@@ -10012,7 +10148,9 @@ module.exports =
 	            destinationMetadata: destinationSchema,
 	            sourceEndpoint: formValues.sourceEndpoint,
 	            accountId: this.props.accountId,
-	            tenantId: this.props.tenantId, actions: this.props.actions })
+	            tenantId: this.props.tenantId, actions: this.props.actions,
+	            isReverse: isReverse
+	          })
 	        ),
 	        _react2.default.createElement(_navButtons2.default, { handleSubmit: handleSubmit, nav: nav, reset: reset, inputs: inputs,
 	          nextDisabled: !(resourceGroups && resourceGroups.length > 0) })
@@ -10069,23 +10207,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 NameStep = function (_Component) {
 	  _inherits(NameStep, _Component);
 	
@@ -10137,7 +10258,6 @@ module.exports =
 	            label: 'Integration Name' })
 	        ),
 	        _react2.default.createElement('br', null),
-	        _react2.default.createElement(_reduxForm.Field, { name: 'customer', component: renderError }),
 	        _react2.default.createElement('br', null),
 	        _react2.default.createElement(_navButtons2.default, { nextDisabled: !formValues['title'], handleSubmit: handleSubmit, reset: reset, nav: nav, inputs: inputs }),
 	        _react2.default.createElement('br', null),
@@ -10547,11 +10667,19 @@ module.exports =
 	      var Radio = inputs.Radio;
 	      var scenario = formValues['scenario'];
 	      var Modal = inputs.Modal;
+	
+	      var isReverse = formValues.direction === 'reverse';
+	      var opts = isReverse ? step.options.filter(function (o) {
+	        return o.isReverse;
+	      }) : step.options.filter(function (o) {
+	        return !o.isReverse;
+	      });
+	
 	      var options = [{
 	        id: '0',
 	        title: 'Start From Scratch',
 	        label: 'Get started without any automatic mappings.'
-	      }].concat(step.options);
+	      }].concat(opts);
 	      var scenarioOrder = step.scenarioOrder || [];
 	
 	      return _react2.default.createElement(
@@ -10578,7 +10706,7 @@ module.exports =
 	            var o = options.find(function (opt) {
 	              return String(opt.id) === s;
 	            });
-	            return _react2.default.createElement(
+	            return o && _react2.default.createElement(
 	              'div',
 	              { key: i },
 	              _react2.default.createElement(Radio, { onChange: function onChange() {
@@ -10599,7 +10727,7 @@ module.exports =
 	          })
 	        ),
 	        _react2.default.createElement('br', null),
-	        _react2.default.createElement(_navButtons2.default, { nextDisabled: this.state.currentlyLoadingScenario || !(wizard.savedConfiguration && wizard.savedConfiguration.scenario) && !wizard.gotScenario ? true : false, handleSubmit: handleSubmit,
+	        _react2.default.createElement(_navButtons2.default, { nextDisabled: !scenario || this.state.currentlyLoadingScenario || !(wizard.savedConfiguration && wizard.savedConfiguration.scenario) && !wizard.gotScenario ? true : false, handleSubmit: handleSubmit,
 	          nav: nav, reset: reset, inputs: inputs }),
 	        _react2.default.createElement('br', null),
 	        _react2.default.createElement('br', null),
@@ -10789,7 +10917,9 @@ module.exports =
 	        name: v,
 	        resources: null,
 	        recordTypeId: newGroup.recordTypeId,
-	        provider: newGroup.section
+	        provider: newGroup.section,
+	        // only Salesforce has ability to add "Lingk External Id"
+	        customExternalKeys: newGroup.section !== 'Salesforce'
 	      });
 	
 	      change('resourceGroups', resourceGroups);
@@ -10801,11 +10931,10 @@ module.exports =
 	          change = _props5.change,
 	          formValues = _props5.formValues;
 	
-	
 	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
 	      var group = resourceGroups[groupIndex];
 	      var entityExists = group && group.resources && group.resources.find(function (r) {
-	        return r.name === v;
+	        return r.name === v && r.provider === entity.section;
 	      });
 	      if (entityExists) return;
 	
@@ -10852,19 +10981,17 @@ module.exports =
 	
 	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
 	      var group = resourceGroups[groupIndex];
-	      if (group.customExternalKeys) {
-	        if (group.sourceKeysObjects.find(function (sko) {
-	          return sko === entity;
-	        })) {
-	          var deleteIndex = group.sourceKeysObjects.indexOf(entity);
-	          group.sourceKeys.splice(deleteIndex, 1);
-	          group.sourceKeysObjects.splice(deleteIndex, 1);
-	        }
-	      } else {
-	        if (entity === group.lingkSourceKeyObject) {
-	          group.lingkSourceKey = null;
-	          group.lingkSourceKeyObject = null;
-	        }
+	      // remove join keys pointing to deleted entity
+	      if (group.sourceKeysObjects && group.sourceKeysObjects.find(function (sko) {
+	        return sko === entity;
+	      })) {
+	        var deleteIndex = group.sourceKeysObjects.indexOf(entity);
+	        group.sourceKeys.splice(deleteIndex, 1);
+	        group.sourceKeysObjects.splice(deleteIndex, 1);
+	      }
+	      if (group.lingkSourceKeyObject && entity === group.lingkSourceKeyObject) {
+	        group.lingkSourceKey = null;
+	        group.lingkSourceKeyObject = null;
 	      }
 	      var mapz = group.mappings;
 	      if (group.mappings) {
@@ -10932,6 +11059,7 @@ module.exports =
 	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
 	      var rsc = resourceGroups[rgi].resources[i];
 	      rsc.primaryKeyName = v;
+	      rsc.primaryKeyResource = field.section;
 	      rsc.primaryKeyParents = field.parents;
 	      change('resourceGroups', resourceGroups);
 	      this.forceUpdate();
@@ -10946,6 +11074,7 @@ module.exports =
 	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
 	      var rsc = resourceGroups[rgi].resources[i];
 	      rsc.joinKeyName = v;
+	      rsc.joinKeyResource = field.section;
 	      rsc.joinKeyParents = field.parents;
 	      change('resourceGroups', resourceGroups);
 	      this.forceUpdate();
@@ -10975,12 +11104,8 @@ module.exports =
 	
 	      var enabled = resourceGroups && resourceGroups.length > 0 && resourceGroups.every(function (g) {
 	        var isConnected = false;
-	        if (g.customExternalKeys) {
-	          if (g.sourceKeys && g.sourceKeys.length > 0 && g.destinationKeys && g.destinationKeys.length > 0) {
-	            isConnected = true;
-	          }
-	        } else {
-	          if (g.lingkSourceKey) isConnected = true;
+	        if (g.lingkSourceKey || g.sourceKeys && g.sourceKeys.length > 0 && g.destinationKeys && g.destinationKeys.length > 0) {
+	          isConnected = true;
 	        }
 	        var areJoined = g.resources && g.resources.every(function (r, i) {
 	          return i === 0 || r.joinKeyName && r.primaryKeyName;
@@ -10988,6 +11113,8 @@ module.exports =
 	        return isConnected && areJoined;
 	      });
 	
+	      var isReverse = formValues.direction === 'reverse';
+	
 	      return _react2.default.createElement(
 	        'form',
 	        { onKeyPress: function onKeyPress(e) {
@@ -10996,10 +11123,7 @@ module.exports =
 	        _react2.default.createElement(
 	          'div',
 	          { style: { fontSize: 20, display: 'inline-block' } },
-	          'Map ',
-	          step.sourceProvider,
-	          ' Objects to ',
-	          step.destinationProvider
+	          isReverse ? 'Map ' + step.destinationProvider + ' Objects to ' + step.sourceProvider : 'Map ' + step.sourceProvider + ' Objects to ' + step.destinationProvider
 	        ),
 	        _react2.default.createElement('br', null),
 	        _react2.default.createElement('br', null),
@@ -11007,7 +11131,11 @@ module.exports =
 	          'p',
 	          null,
 	          'Map one or many data sources to a single ',
-	          step.destinationProvider,
+	          _react2.default.createElement(
+	            'span',
+	            null,
+	            isReverse ? step.sourceProvider : step.destinationProvider
+	          ),
 	          ' target object.'
 	        ),
 	        _react2.default.createElement('br', null),
@@ -11027,7 +11155,7 @@ module.exports =
 	              direction: formValues.direction },
 	            _react2.default.createElement(_schemaAccordion2.default, { sourceSchema: sourceSchema,
 	              changeEntityOrder: this.changeEntityOrder, step: step,
-	              destinationSchema: destinationSchema,
+	              destinationSchema: destinationSchema, isReverse: isReverse,
 	              selectPrimaryKey: this.selectPrimaryKey,
 	              selectJoinKey: this.selectJoinKey, change: change }),
 	            _react2.default.createElement(_bundleTable2.default, { openConnectionModal: this.openConnectionModal, mode: formValues.direction })
@@ -11276,8 +11404,7 @@ module.exports =
 	      description: '',
 	      loading: false,
 	      manageScenarios: false,
-	      scenarioOrder: [],
-	      Scenarios: null
+	      scenarioOrder: []
 	    };
 	    _this.submitModal = _this.submitModal.bind(_this);
 	    _this.deleteScenario = _this.deleteScenario.bind(_this);
@@ -11316,12 +11443,12 @@ module.exports =
 	          tenantId = _props2.tenantId,
 	          accountId = _props2.accountId,
 	          step = _props2.step,
-	          actions = _props2.actions;
+	          actions = _props2.actions,
+	          isReverse = _props2.isReverse;
 	
 	      if (manageScenarios) {
 	        this.setState({ loading: true });
 	        actions.callUpdateScenarioList(tenantId, accountId, step.typeGuid, scenarioOrder).then(function (r) {
-	          console.log(r);
 	          _this3.setState({ loading: false });
 	        });
 	      } else {
@@ -11337,11 +11464,11 @@ module.exports =
 	            bundles = _saveData.bundles,
 	            mappings = _saveData.mappings;
 	
-	        var data = { bundles: bundles, mappings: mappings, title: title, label: description, typeGuid: step.typeGuid };
+	        var data = { bundles: bundles, mappings: mappings, title: title, label: description, typeGuid: step.typeGuid, isReverse: isReverse };
+	
 	        actions.callCreateScenario(tenantId, accountId, data).then(function () {
 	          _this3.setState({ loading: true });
 	          actions.callGetScenarioList(tenantId, accountId, step.typeGuid).then(function (r) {
-	            console.log(r);
 	            _this3.setState({ loading: false });
 	          });
 	        });
@@ -11810,7 +11937,7 @@ module.exports =
 	      //resources: Type is the real value, Name is the displayed value
 	      //properties: Name is the real value, Label is the displayed value
 	
-	      var _saveData = (0, _saveData3.default)(formValues['resourceGroups'], this.props.wizardConfig.destination.type, this.props.wizard.sourceMetadata, this.props.wizard.destinationMetadata, formValues.sourceEndpoint),
+	      var _saveData = (0, _saveData3.default)(formValues['resourceGroups'], this.props.wizardConfig.source.type, this.props.wizardConfig.destination.type, this.props.wizard.sourceMetadata, this.props.wizard.destinationMetadata, formValues.sourceEndpoint),
 	          bundles = _saveData.bundles,
 	          mappings = _saveData.mappings,
 	          endpoints = _saveData.endpoints;
@@ -11977,7 +12104,6 @@ module.exports =
 	  var destinationEndpoint = selector(state, 'destinationEndpoint');
 	  var destinationCredentials = selector(state, 'destinationCredentials');
 	  var deployment = selector(state, 'deployment');
-	  var mappings = selector(state, 'mappings');
 	  var resourceGroups = selector(state, 'resourceGroups');
 	  var scenario = selector(state, 'scenario');
 	  var direction = selector(state, 'direction');
@@ -11989,7 +12115,6 @@ module.exports =
 	      destinationEndpoint: destinationEndpoint,
 	      destinationCredentials: destinationCredentials,
 	      deployment: deployment,
-	      mappings: mappings,
 	      resourceGroups: resourceGroups,
 	      scenario: scenario,
 	      direction: direction