@lingk/sync 0.0.84 → 0.0.86

package/build/main.js

@@ -4529,11 +4529,7 @@ module.exports =
 	
 	          // get bundle resource
 	          var bundleResource = wizard.destinationMetadata.find(function (rsc) {
-	            if (bundle.recordTypeId) {
-	              return rsc.type === bundle.name && rsc.recordTypeId === bundle.recordTypeId;
-	            } else {
-	              return rsc.type === bundle.name;
-	            }
+	            return rsc.name === bundle.resourceLabel;
 	          });
 	          if (bundleResource) {
 	            (function () {
@@ -4582,11 +4578,7 @@ module.exports =
 	                var resourceProvider = rsc.provider.charAt(0).toUpperCase() + rsc.provider.slice(1).replace('Reader', '');
 	                var dataSourceMetadata = resourceProvider === step.destinationProvider ? wizard.destinationMetadata : wizard.sourceMetadata;
 	                var rscResource = dataSourceMetadata.find(function (r) {
-	                  if (rsc.recordTypeId) {
-	                    return r.type === rsc.resourceName && r.recordTypeId === rsc.recordTypeId;
-	                  } else {
-	                    return r.type === rsc.resourceName;
-	                  }
+	                  return r.name === rsc.resourceLabel;
 	                });
 	                var rscJoinKey = null;
 	                if (rscResource) {
@@ -4624,16 +4616,12 @@ module.exports =
 	              }).forEach(function (m) {
 	                var dataSourceMetadata = m.isDestinationResource ? wizard.destinationMetadata : wizard.sourceMetadata;
 	
-	                var resourceRecordTypeIdFromBundle = bundle.resources.find(function (br) {
+	                var resourceFromBundle = bundle.resources.find(function (br) {
 	                  return br.resourceName === m.resourceFromName;
-	                }).recordTypeId;
+	                });
 	
 	                var sourceResource = dataSourceMetadata.find(function (rsc) {
-	                  if (resourceRecordTypeIdFromBundle) {
-	                    return rsc.type === m.resourceFromName && rsc.recordTypeId === resourceRecordTypeIdFromBundle;
-	                  } else {
-	                    return rsc.type === m.resourceFromName;
-	                  }
+	                  return rsc.name === resourceFromBundle.resourceLabel;
 	                });
 	
 	                var sourceProperty = null;
@@ -4643,24 +4631,15 @@ module.exports =
 	                  });
 	                }
 	
-	                var destinationResource = wizard.destinationMetadata.find(function (rsc) {
-	                  if (bundle.recordTypeId) {
-	                    return rsc.type === m.resourceToName && rsc.recordTypeId === bundle.recordTypeId;
-	                  } else {
-	                    return rsc.type === m.resourceToName;
-	                  }
+	                var destinationProperty = bundleResource.properties.find(function (prop) {
+	                  return prop.name === m.propertyToName;
 	                });
-	                var destinationProperty = null;
-	                if (destinationResource) {
-	                  destinationProperty = destinationResource.properties.find(function (prop) {
-	                    return prop.name === m.propertyToName;
-	                  });
-	                }
-	                if (sourceResource && sourceProperty && destinationResource && destinationProperty) {
+	
+	                if (sourceResource && sourceProperty && destinationProperty) {
 	                  mappings.push(Object.assign({
 	                    resourceFromName: sourceResource.name,
 	                    propertyFromName: sourceProperty.label,
-	                    resourceToName: destinationResource.name,
+	                    resourceToName: bundleResource.name,
 	                    propertyToName: destinationProperty.label,
 	                    transformations: m.transformations && m.transformations.length > 0 ? m.transformations : [{ type: 'none' }]
 	                  }, m.isDestinationResource && { dataSourceIsDestinationEntity: true }, m.isExternalKeyMapping && { isExternalKeyMapping: true }));
@@ -21569,7 +21548,6 @@ module.exports =
 	            }
 	
 	            var groupsBeforeThis = resourceGroups.slice(0, i);
-	
 	            var groupBeforeThisIndex = 0;
 	            groupsBeforeThis.forEach(function (g, idx) {
 	              if (group.resources.find(function (r) {
@@ -21580,18 +21558,26 @@ module.exports =
 	            });
 	
 	            var groupsAfterThis = resourceGroups.slice(i + 1);
-	
 	            var groupsAfterThisContainThisResource = groupsAfterThis.find(function (g) {
 	              return g.resources.find(function (r) {
 	                return r.name === group.name;
 	              }) ? true : false;
 	            });
 	
+	            var groupAfterThisIndex = 0;
+	            groupsAfterThis.forEach(function (g, idx) {
+	              if (g.resources.find(function (r) {
+	                return r.name === group.name;
+	              })) {
+	                groupAfterThisIndex = idx;
+	              }
+	            });
+	
 	            return _react2.default.createElement(
 	              _reactDraggable2.default,
 	              { axis: 'y', key: i, handle: '.dragon',
 	                bounds: { top: groupsBeforeThis.length * -49 + groupBeforeThisIndex * 49,
-	                  bottom: groupsAfterThis.length * 49 },
+	                  bottom: groupAfterThisIndex * 49 },
 	                position: { x: 0, y: _this3.state.yPositions[i] },
 	                onStart: function onStart(e, v) {
 	                  return _this3.handleDragStart(e, v, i);
@@ -23544,6 +23530,7 @@ module.exports =
 	          return rsc.name === group.name;
 	        }) : group;
 	        group.name = destinationResource.type;
+	        group.resourceLabel = destinationResource.name;
 	        group.provider = _this2.props.providers['destination'].toLowerCase();
 	        if (destinationResource.recordTypeId) {
 	          group.recordTypeId = destinationResource.recordTypeId;
@@ -23665,6 +23652,7 @@ module.exports =
 	            if (sourceResource) {
 	              return Object.assign({
 	                resourceName: sourceResource.type,
+	                resourceLabel: sourceResource.name,
 	                joinKeyName: rsc.joinKeyName && sourceResource && sourceResource.properties && sourceResource.properties.find(function (prop) {
 	                  return prop.label === rsc.joinKeyName;
 	                }) && sourceResource.properties.find(function (prop) {