@lingk/sync 0.1.62 → 0.1.64

package/build/main.js

@@ -243,7 +243,7 @@ module.exports =
 	
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 	
-	function loadData(step, wizard, change, formValues, actions) {
+	function loadData(step, wizard, change, formValues, actions, isReverse) {
 	
 	  var defaults = {
 	    sourceEndpoint: 'https://',
@@ -269,14 +269,24 @@ module.exports =
 	  }
 	
 	  if (!formValues['resourceGroups']) {
+	    var sourceMetadata = wizard.sourceMetadata,
+	        destinationMetadata = wizard.destinationMetadata;
 	
-	    if (wizard.savedBundles && wizard.savedBundles.bundles && wizard.sourceMetadata && wizard.destinationMetadata) {
+	    if (wizard.savedBundles && wizard.savedBundles.bundles && sourceMetadata && destinationMetadata) {
 	      (function () {
+	
+	        var SM = sourceMetadata;
+	        var DM = destinationMetadata;
+	        var DP = step.destinationProvider;
+	        if (isReverse) {
+	          SM = destinationMetadata;
+	          DM = sourceMetadata;
+	          DP = step.sourceProvider;
+	        }
 	        var resourceGroups = [];
 	        wizard.savedBundles.bundles.forEach(function (bundle, index) {
-	
 	          // get bundle resource
-	          var bundleResource = wizard.destinationMetadata.find(function (rsc) {
+	          var bundleResource = DM.find(function (rsc) {
 	            return rsc.name === bundle.resourceLabel;
 	          });
 	          if (bundleResource) {
@@ -304,7 +314,7 @@ module.exports =
 	                });
 	                if (sourceKeyResourceObj) {
 	                  var sourceKeyResourceProvider = sourceKeyResourceObj.provider.replace('Reader', '');
-	                  var primaryDataSourceMetadata = sourceKeyResourceProvider.toLowerCase() === step.destinationProvider.toLowerCase() ? wizard.destinationMetadata : wizard.sourceMetadata;
+	                  var primaryDataSourceMetadata = sourceKeyResourceProvider.toLowerCase() === DP.toLowerCase() ? DM : SM;
 	
 	                  var sourceKeyResource = primaryDataSourceMetadata.find(function (r) {
 	                    return r.type === bundle.sourceKeysObjects[i];
@@ -323,26 +333,54 @@ module.exports =
 	
 	                //get resource and joinKey for bundleResource (check both metadatas)
 	                var resourceProvider = rsc.provider.charAt(0).toUpperCase() + rsc.provider.slice(1).replace('Reader', '');
-	                var dataSourceMetadata = resourceProvider === step.destinationProvider ? wizard.destinationMetadata : wizard.sourceMetadata;
+	                var dataSourceMetadata = resourceProvider === DP ? DM : SM;
 	                var rscResource = dataSourceMetadata.find(function (r) {
 	                  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 primaryDataSourceMetadata = primaryResourceProvider === DP ? DM : SM;
+	
+	                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 }));
 	                }
@@ -352,7 +390,10 @@ module.exports =
 	              wizard.savedMapping && wizard.savedMapping.mappings && wizard.savedMapping.mappings.filter(function (map) {
 	                return map.bundleIndex === index;
 	              }).forEach(function (m) {
-	                var dataSourceMetadata = m.isDestinationResource ? wizard.destinationMetadata : wizard.sourceMetadata;
+	                var dataSourceMetadata = m.isDestinationResource ? DM : SM;
+	                if (isReverse) {
+	                  dataSourceMetadata = m.isDestinationResource ? SM : DM;
+	                }
 	
 	                var resourceFromBundle = bundle.resources.find(function (br) {
 	                  return br.resourceName === m.resourceFromName;
@@ -387,7 +428,7 @@ module.exports =
 	                        return r.resourceLabel === transConcatResourceName;
 	                      });
 	                      var concatRscProvider = concatRsc.provider.replace('Reader', '');
-	                      var concatRscMetadata = concatRscProvider.toLowerCase() === step.destinationProvider.toLowerCase() ? wizard.destinationMetadata : wizard.sourceMetadata;
+	                      var concatRscMetadata = concatRscProvider.toLowerCase() === DP.toLowerCase() ? DM : SM;
 	                      var transConcatResource = concatRscMetadata.find(function (r) {
 	                        return r.type === concatRsc.resourceName;
 	                      });
@@ -2410,20 +2451,36 @@ module.exports =
 	
 	If a new dropdown with fields is added to the UI, it must be added to this function as well
 	
+	sP = sourceProvider
+	tM = targetMetadata
 	**************************/
 	
-	function saveData(resourceGroups, targetProvider, sourceMetadata, destinationMetadata, sourceEndpoint) {
+	function saveData(resourceGroups, sP, tP, sM, tM, sourceEndpoint, isReverse) {
+	
+	  // switch providers and metadatas if the wizard is reverse
+	  var sourceProvider = sP;
+	  var targetProvider = tP;
+	  var sourceMetadata = sM;
+	  var targetMetadata = tM;
+	  if (isReverse) {
+	    // switch em!
+	    sourceProvider = tP;
+	    targetProvider = sP;
+	    sourceMetadata = tM;
+	    targetMetadata = sM;
+	  }
+	
 	  var bundles = resourceGroups || [];
 	  var mappings = [];
 	  var endpoints = {};
 	  bundles && bundles.forEach(function (group, index) {
 	    // first get target resource
-	    var destinationResource = destinationMetadata ? destinationMetadata.find(function (rsc) {
+	    var destinationResource = targetMetadata ? targetMetadata.find(function (rsc) {
 	      return rsc.name === group.name;
 	    }) : group;
 	    group.name = destinationResource.type;
 	    group.resourceLabel = destinationResource.name;
-	    group.provider = targetProvider.toLowerCase();
+	    group.provider = targetProvider;
 	    if (destinationResource.recordTypeId) {
 	      group.recordTypeId = destinationResource.recordTypeId;
 	    }
@@ -2460,7 +2517,7 @@ module.exports =
 	      var sourceKeyResourceProvider = group.resources.find(function (r) {
 	        return r.name === group.sourceKeysObjects[i];
 	      }).provider;
-	      var dataSourceMetadata = sourceKeyResourceProvider === targetProvider ? destinationMetadata : sourceMetadata;
+	      var dataSourceMetadata = sourceKeyResourceProvider === targetProvider ? targetMetadata : sourceMetadata;
 	      var sourceResource = dataSourceMetadata.find(function (metaRsc) {
 	        return metaRsc.name === group.sourceKeysObjects[i];
 	      });
@@ -2481,7 +2538,10 @@ module.exports =
 	    if (group.mappings) {
 	      group.mappings.forEach(function (singleMapping) {
 	        // get mapping source resource (check both metadatas)
-	        var dataSourceMetadata = singleMapping.dataSourceIsDestinationEntity ? destinationMetadata : sourceMetadata;
+	        var dataSourceMetadata = singleMapping.dataSourceIsDestinationEntity ? targetMetadata : sourceMetadata;
+	        if (isReverse) {
+	          dataSourceMetadata = singleMapping.dataSourceIsDestinationEntity ? sourceMetadata : targetMetadata;
+	        }
 	        var sourceResource = dataSourceMetadata.find(function (rsc) {
 	          return rsc.name === singleMapping.resourceFromName;
 	        });
@@ -2508,7 +2568,7 @@ module.exports =
 	                var transConcatSourceResourceProvider = group.resources.find(function (r) {
 	                  return r.name === s[0];
 	                }).provider;
-	                var transConcatSourceMetadata = transConcatSourceResourceProvider === targetProvider ? destinationMetadata : sourceMetadata;
+	                var transConcatSourceMetadata = transConcatSourceResourceProvider === targetProvider ? targetMetadata : sourceMetadata;
 	                var transConcatSourceResource = transConcatSourceMetadata.find(function (rsc) {
 	                  return rsc.name === s[0];
 	                });
@@ -2531,6 +2591,7 @@ module.exports =
 	
 	        if (sourceResource && nestedSourceProp.property && destinationResource && destinationProperty) {
 	          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 }, {
@@ -2553,10 +2614,18 @@ module.exports =
 	      group.resources = group.resources.map(function (rsc) {
 	
 	        //get resource source (check both metadatas)
-	        var dataSourceMetadata = rsc.provider === targetProvider ? destinationMetadata : sourceMetadata;
+	        var dataSourceMetadata = rsc.provider === targetProvider ? targetMetadata : sourceMetadata;
 	        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.type === rsc.joinKeyResource) {
+	          nestedJoinKey = findNestedProp(rsc.joinKeyName, rsc.joinKeyParents, sourceResource);
+	          joinKeyResource = sourceResource.type;
+	        }
 	
 	        //make endpoint
 	        var suffix = sourceResource.endpointSuffix;
@@ -2565,22 +2634,30 @@ module.exports =
 	        }
 	
 	        //get first resource in bundle (for primaryKeyName)
-	        var primaryDataSourceMetadata = group.resources[0].provider === targetProvider ? destinationMetadata : sourceMetadata;
+	        var primaryDataSourceMetadata = group.resources[0].provider === targetProvider ? targetMetadata : sourceMetadata;
 	        var primarySourceResource = primaryDataSourceMetadata.find(function (metaRsc) {
 	          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.type === 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
+	            resourceNameAndProvider: sourceResource.type + '_' + rsc.provider,
+	            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
@@ -5112,27 +5189,20 @@ module.exports =
 	        config = _getState4.config;
 	
 	    var externalIdlessObjects = [];
-	    bundles.forEach(function (b) {
-	      /*if(!b.customExternalKeys ||
-	        b.resources.find(r=>{
-	          return r.joinKeyName==='lingk__Lingk_External_Id__c' ||
-	          r.primaryKeyName==='lingk__Lingk_External_Id__c'
-	        }) || 
-	        mappings.find(m=>{
-	          console.log(m)
-	          return b.name===m.resourceToName && m.propertyToName==='lingk__Lingk_External_Id__c'
-	        }) ){*/
+	    // only run for Salesforce
+	    bundles && bundles.filter(function (b) {
+	      return b.provider === 'Salesforce';
+	    }).forEach(function (b) {
 	      var rsc = destinationMetadata.find(function (r) {
 	        return r.type === b.name;
 	      });
-	      var externalIdProp = rsc.properties && rsc.properties.find(function (p) {
+	      var externalIdProp = rsc && rsc.properties && rsc.properties.find(function (p) {
 	        return p.name === 'Lingk_External_Id__c';
 	      });
 	      // only add to the array if Lingk External Id does not already exist
 	      if (!externalIdProp || externalIdProp.fake === true) {
 	        externalIdlessObjects.push(b.name);
 	      }
-	      //}
 	    });
 	
 	    if (externalIdlessObjects.length > 0) {
@@ -5429,6 +5499,7 @@ module.exports =
 	}
 	
 	function callSaveTrigger(deployment, onFinish, generatedRecipe, pi) {
+	  console.log(deployment);
 	  var triggerData = {
 	    baseid: generatedRecipe.BaseId,
 	    isrecurring: true
@@ -5922,16 +5993,7 @@ module.exports =
 	      if (!(resourceGroups && resourceGroups.length > 0)) return _react2.default.createElement('div', null);
 	
 	      var isReverse = mode === 'reverse';
-	
-	      var normalGroup = resourceGroups.filter(function (g) {
-	        return step.destinationProvider === g.provider;
-	      });
-	      var reverseGroup = resourceGroups.filter(function (g) {
-	        return step.sourceProvider === g.provider;
-	      });
-	
-	      var groups = isReverse ? reverseGroup : normalGroup;
-	      var extraIndex = isReverse ? normalGroup.length : 0;
+	      var groups = resourceGroups;
 	
 	      if (!groups.length > 0) return _react2.default.createElement('div', null);
 	
@@ -6012,9 +6074,9 @@ module.exports =
 	              _react2.default.createElement(
 	                'div',
 	                { className: 'bundle-table-row', key: i,
-	                  style: { background: i + extraIndex === resourceGroupIndex ? '#f4f6f9' : 'white' },
+	                  style: { background: i === resourceGroupIndex ? '#f4f6f9' : 'white' },
 	                  onClick: function onClick() {
-	                    return clickTableRow(i + extraIndex);
+	                    return clickTableRow(i);
 	                  } },
 	                _react2.default.createElement(
 	                  'div',
@@ -6072,7 +6134,7 @@ module.exports =
 	                      'div',
 	                      { className: 'connect-resource-group', onClick: function onClick(e) {
 	                          e.stopPropagation();
-	                          openConnectionModal(group, i + extraIndex);
+	                          openConnectionModal(group, i);
 	                        }, style: { paddingTop: linked ? 5 : 6 } },
 	                      linked ? _react2.default.createElement(
 	                        'svg',
@@ -6092,7 +6154,7 @@ module.exports =
 	                      'div',
 	                      { className: 'remove-resource-group',
 	                        onClick: function onClick(e) {
-	                          return removeResourceGroup(e, i + extraIndex);
+	                          return removeResourceGroup(e, i);
 	                        } },
 	                      _react2.default.createElement(
 	                        'svg',
@@ -6337,7 +6399,7 @@ module.exports =
 	        { style: { padding: '1em' } },
 	        _react2.default.createElement(
 	          'p',
-	          null,
+	          { style: { hyphens: 'none' } },
 	          'Choose one or more Unique Keys from both the Data Source and the Data Target. These keys will be used to keep records synchronized.'
 	        ),
 	        _react2.default.createElement(
@@ -6765,7 +6827,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,
@@ -7731,6 +7793,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' } },
@@ -7792,20 +7884,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;
@@ -7815,20 +7922,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;
@@ -7838,17 +7931,12 @@ 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 isDestinationEntity = rsc.provider === step.destinationProvider;
-	                    var isSelected = selectedEntity.name === rsc.name && selectedEntity.isDestinationEntity === isDestinationEntity;
+	                    })*/
 	
 	                    var rscName = rsc.name;
 	                    if (isReverse) {
@@ -7897,9 +7985,7 @@ module.exports =
 	                              { style: { maxWidth: 260, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', display: 'inline-block' } },
 	                              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() {
@@ -7917,7 +8003,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);
 	                              } },
@@ -7978,7 +8064,7 @@ module.exports =
 	                                onClick: showOverflow,
 	                                type: 'neutral', inputs: inputs,
 	                                values: primaryRscVals,
-	                                sectionLabels: [group.resources[0].name],
+	                                sectionLabels: primaryRscSectionLabels,
 	                                fieldPropLabel: 'label',
 	                                selectedValues: [{
 	                                  label: rsc.primaryKeyName,
@@ -8014,7 +8100,7 @@ module.exports =
 	                                onClick: showOverflow,
 	                                type: 'neutral', inputs: inputs,
 	                                values: joinRscVals,
-	                                sectionLabels: [group.resources[i].name],
+	                                sectionLabels: joinRscSectionLabels,
 	                                fieldPropLabel: 'label',
 	                                selectedValues: [{
 	                                  label: rsc.joinKeyName,
@@ -9491,6 +9577,9 @@ module.exports =
 	            onClickOption: function onClickOption(v) {
 	              change('resourceGroups', []);
 	              change('scenario', null);
+	              if (_this2.props.nav.limitBackToCurrentPage) {
+	                _this2.props.nav.limitBackToCurrentPage();
+	              }
 	            },
 	            options: {
 	              'normal': 'Read Data from ' + step[step.mode + 'Provider'],
@@ -10781,8 +10870,9 @@ module.exports =
 	          formValues = _props.formValues,
 	          actions = _props.actions;
 	
+	      var isReverse = formValues.direction === 'reverse';
 	      if (!wizard.dataLoaded) {
-	        (0, _loadData2.default)(step, wizard, change, formValues, actions);
+	        (0, _loadData2.default)(step, wizard, change, formValues, actions, isReverse);
 	      }
 	    }
 	  }, {
@@ -10990,6 +11080,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();
@@ -11004,6 +11095,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();
@@ -11374,6 +11466,8 @@ module.exports =
 	          step = _props2.step,
 	          actions = _props2.actions,
 	          isReverse = _props2.isReverse;
+	      var sourceProvider = step.sourceProvider,
+	          destinationProvider = step.destinationProvider;
 	
 	      if (manageScenarios) {
 	        this.setState({ loading: true });
@@ -11389,7 +11483,7 @@ module.exports =
 	
 	        var clone = (0, _objectAssignDeep2.default)({}, { bundles: resourceGroups });
 	
-	        var _saveData = (0, _saveData3.default)(clone.bundles, step.destinationProvider, sourceMetadata, destinationMetadata, sourceEndpoint),
+	        var _saveData = (0, _saveData3.default)(clone.bundles, sourceProvider, destinationProvider, sourceMetadata, destinationMetadata, sourceEndpoint, isReverse),
 	            bundles = _saveData.bundles,
 	            mappings = _saveData.mappings;
 	
@@ -11834,6 +11928,7 @@ module.exports =
 	    _this.onSubmit = _this.onSubmit.bind(_this);
 	    _this.goToPage = _this.goToPage.bind(_this);
 	    _this.exitWithoutSaving = _this.exitWithoutSaving.bind(_this);
+	    _this.limitBackToCurrentPage = _this.limitBackToCurrentPage.bind(_this);
 	    _this.state = {
 	      currentPage: 1,
 	      highestPage: 1
@@ -11865,8 +11960,9 @@ module.exports =
 	      var formValues = Object.assign({}, values);
 	      //resources: Type is the real value, Name is the displayed value
 	      //properties: Name is the real value, Label is the displayed value
+	      var isReverse = formValues['direction'] === 'reverse';
 	
-	      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, isReverse),
 	          bundles = _saveData.bundles,
 	          mappings = _saveData.mappings,
 	          endpoints = _saveData.endpoints;
@@ -11937,6 +12033,11 @@ module.exports =
 	        this.props.exitWithoutSaving();
 	      }
 	    }
+	  }, {
+	    key: 'limitBackToCurrentPage',
+	    value: function limitBackToCurrentPage() {
+	      this.setState({ highestPage: this.state.currentPage });
+	    }
 	  }, {
 	    key: 'render',
 	    value: function render() {
@@ -11993,7 +12094,8 @@ module.exports =
 	                    last: page === steps.length,
 	                    previousPage: _this2.previousPage,
 	                    nextPage: _this2.nextPage,
-	                    exitWithoutSaving: _this2.exitWithoutSaving
+	                    exitWithoutSaving: _this2.exitWithoutSaving,
+	                    limitBackToCurrentPage: _this2.limitBackToCurrentPage
 	                  };
 	                  return _react2.default.createElement(
 	                    'div',