@lingk/sync 1.0.68 → 1.0.70

package/build/main.js

@@ -1527,10 +1527,15 @@ module.exports =
 	        // 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 && sourceResource.name === rsc.joinKeyResource) {
-	          nestedJoinKey = findNestedProp(rsc.joinKeyName, rsc.joinKeyParents, sourceResource);
-	          joinKeyResource = sourceResource.type;
+	        var joinKeyIsParameter = false;
+	        if (sourceResource && 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;
+	          } else {
+	            joinKeyIsParameter = true;
+	          }
 	        }
 	
 	        //make endpoint
@@ -1544,27 +1549,27 @@ module.exports =
 	        var nestedPrimaryKey = {};
 	        var primaryKeyResource = null;
 	        var primaryResourceProvider = null;
-	        var primaryKeyResourceLabel = null;
+	        var primaryKeyIsParameter = false;
 	        if (rsc.parentNameAndProvider) {
-	          (function () {
-	            var primaryResourceProviderLast_Index = rsc.parentNameAndProvider.lastIndexOf('_');
-	            primaryResourceProvider = rsc.parentNameAndProvider.substr(primaryResourceProviderLast_Index + 1, rsc.parentNameAndProvider.length);
-	            var primaryResourceName = rsc.parentNameAndProvider.substr(0, primaryResourceProviderLast_Index);
-	            var primaryDataSourceMetadata = primaryResourceProvider.toLowerCase() === targetProvider.toLowerCase() ? targetMetadata : sourceMetadata;
-	            var primarySourceResource = primaryDataSourceMetadata.find(function (metaRsc) {
-	              return metaRsc.name === primaryResourceName;
-	            });
+	          var primaryResourceProviderLast_Index = rsc.parentNameAndProvider.lastIndexOf('_');
+	          primaryResourceProvider = rsc.parentNameAndProvider.substr(primaryResourceProviderLast_Index + 1, rsc.parentNameAndProvider.length);
+	          var primaryResourceName = rsc.parentNameAndProvider.substr(0, primaryResourceProviderLast_Index);
+	          var primaryDataSourceMetadata = primaryResourceProvider.toLowerCase() === targetProvider.toLowerCase() ? targetMetadata : sourceMetadata;
+	          var primarySourceResource = primaryDataSourceMetadata.find(function (metaRsc) {
+	            return metaRsc.name === rsc.primaryKeyResource;
+	          });
 	
-	            // via parameter, dont change because its already "type"
-	            nestedPrimaryKey = { property: rsc.primaryKeyName };
-	            primaryKeyResource = rsc.primaryKeyResource;
-	            // is from a same resource (not via parameters)
-	            if (primarySourceResource && primarySourceResource.name === rsc.primaryKeyResource) {
+	          if (primarySourceResource) {
+	            if (primaryResourceName === rsc.primaryKeyResource) {
 	              nestedPrimaryKey = findNestedProp(rsc.primaryKeyName, rsc.primaryKeyParents, primarySourceResource);
 	              primaryKeyResource = primarySourceResource.type;
-	              primaryKeyResourceLabel = primarySourceResource.name;
+	            } else {
+	              // is from a different resource (parameter)
+	              primaryKeyIsParameter = true;
+	              nestedPrimaryKey = { property: rsc.primaryKeyName };
+	              primaryKeyResource = rsc.primaryKeyResource;
 	            }
-	          })();
+	          }
 	        }
 	
 	        if (sourceResource) {
@@ -1575,9 +1580,11 @@ module.exports =
 	            joinKeyName: nestedJoinKey.property,
 	            joinKeyResource: joinKeyResource,
 	            joinKeyParents: nestedJoinKey.parentsArray && nestedJoinKey.parentsArray.length > 0 ? nestedJoinKey.parentsArray : [],
+	            joinKeyIsParameter: joinKeyIsParameter,
 	            primaryKeyName: nestedPrimaryKey.property,
 	            primaryKeyResource: primaryKeyResource,
 	            primaryKeyParents: nestedPrimaryKey.parentsArray && nestedPrimaryKey.parentsArray.length > 0 ? nestedPrimaryKey.parentsArray : [],
+	            primaryKeyIsParameter: primaryKeyIsParameter,
 	            provider: rsc.provider.toLowerCase() + 'Reader',
 	            joinType: rsc.joinType,
 	            parameterFilters: rsc.parameterFilters ? rsc.parameterFilters.filter(function (pf) {
@@ -1586,7 +1593,7 @@ module.exports =
 	            level: rsc.level || (rscIndex === 0 ? 0 : 1),
 	            // THIS ONE IS ACTUALLY PARENT LABEL AND PROVIDER!
 	            // So we know what Account to join to (if they have the same Name)
-	            parentNameAndProvider: primaryKeyResourceLabel && primaryResourceProvider ? primaryKeyResourceLabel + '_' + primaryResourceProvider.toLowerCase() : ''
+	            parentNameAndProvider: rsc.parentNameAndProvider
 	          };
 	        } else return null;
 	      });
@@ -3381,13 +3388,15 @@ module.exports =
 	            });
 	
 	            if (rsc.joinKeyName) {
-	              // joinKeyName coming from parameter from another resource
-	              deNestedJoinKey = { property: rsc.joinKeyName };
-	              joinKeyResourceName = rsc.joinKeyResource;
-	              __joinKeyResourceName = rsc.joinKeyResource;
 	
-	              // joinKeyName coming from field on this resource
-	              if (rsc.resourceName === rsc.joinKeyResource) {
+	              if (rsc.joinKeyIsParameter) {
+	                // joinKeyName coming from parameter from another resource
+	                deNestedJoinKey = { property: rsc.joinKeyName };
+	                joinKeyResourceName = rsc.joinKeyResource;
+	                __joinKeyResourceName = rsc.joinKeyResource;
+	              } else {
+	                // joinKeyName coming from field on this resource
+	                //if(rsc.resourceName===rsc.joinKeyResource){
 	                var joinKeyResource = dataSourceMetadata.find(function (r) {
 	                  return r.type === rsc.resourceName && r.name === rsc.resourceLabel;
 	                });
@@ -3396,6 +3405,7 @@ module.exports =
 	                  joinKeyResourceName = joinKeyResource.name;
 	                  __joinKeyResourceName = joinKeyResource.type;
 	                }
+	                //}
 	              }
 	            }
 	          } // end if dataSourceMetadata
@@ -3403,37 +3413,38 @@ module.exports =
 	          //get resource and primaryKey for parent resource for join
 	          var primaryResourceProviderLast_Index = rsc.parentNameAndProvider.lastIndexOf('_');
 	          var primaryResourceProvider = rsc.parentNameAndProvider.substr(primaryResourceProviderLast_Index + 1, rsc.parentNameAndProvider.length);
-	          var primaryResourceName = rsc.parentNameAndProvider.substr(0, primaryResourceProviderLast_Index);
-	          var primaryDataSourceMetadata = primaryResourceProvider === DP.toLowerCase() ? DM : primaryResourceProvider === SP.toLowerCase() ? SM : null;
+	          var primaryDataSourceMetadata = primaryResourceProvider.toLowerCase() === DP.toLowerCase() ? DM : primaryResourceProvider.toLowerCase() === SP.toLowerCase() ? SM : null;
 	
 	          var deNestedPrimaryKey = {};
 	          var primaryKeyResourceName = null;
 	          var __primaryKeyResourceName = null;
 	          if (primaryDataSourceMetadata) {
 	            if (rsc.primaryKeyName) {
-	              (function () {
+	
+	              if (rsc.primaryKeyIsParameter) {
 	                //primaryKeyName coming from parameter (another resource)
 	                deNestedPrimaryKey = { property: rsc.primaryKeyName };
 	                primaryKeyResourceName = rsc.primaryKeyResource;
 	                __primaryKeyResourceName = rsc.primaryKeyResource;
-	
-	                // primaryKeyName coming from resource IN THIS BUNDLE
-	                // FIND ITS BY THE LABEL, NOT THE NAME!!! THIS IS HOW IT IS SAVED.
-	                var primaryKeyResourceResource = bundle.resources.find(function (r) {
-	                  return primaryResourceName === r.resourceLabel;
-	                });
-	                if (primaryKeyResourceResource) {
-	                  //if(primaryResourceName===rsc.primaryKeyResource){
-	                  var rscPrimaryResource = primaryDataSourceMetadata.find(function (r) {
-	                    return r.name === primaryKeyResourceResource.resourceLabel;
+	              } else {
+	                (function () {
+	                  // primaryKeyName coming from resource IN THIS BUNDLE
+	                  var primaryKeyResourceResource = bundle.resources.find(function (r) {
+	                    return rsc.primaryKeyResource === r.resourceName;
 	                  });
-	                  if (rscPrimaryResource) {
-	                    deNestedPrimaryKey = deNest(rsc.primaryKeyName, rsc.primaryKeyParents, rscPrimaryResource);
-	                    primaryKeyResourceName = rscPrimaryResource.name;
-	                    __primaryKeyResourceName = rscPrimaryResource.type;
+	                  if (primaryKeyResourceResource) {
+	                    //if(primaryResourceName===rsc.primaryKeyResource){
+	                    var rscPrimaryResource = primaryDataSourceMetadata.find(function (r) {
+	                      return r.name === primaryKeyResourceResource.resourceLabel;
+	                    });
+	                    if (rscPrimaryResource) {
+	                      deNestedPrimaryKey = deNest(rsc.primaryKeyName, rsc.primaryKeyParents, rscPrimaryResource);
+	                      primaryKeyResourceName = rscPrimaryResource.name;
+	                      __primaryKeyResourceName = rscPrimaryResource.type;
+	                    }
 	                  }
-	                }
-	              })();
+	                })();
+	              }
 	            }
 	          }
 	
@@ -3445,8 +3456,9 @@ module.exports =
 	            }, deNestedJoinKey.property && { joinKeyName: deNestedJoinKey.property }, deNestedJoinKey.__property && { __joinKeyName: deNestedJoinKey.__property }, joinKeyResourceName && { joinKeyResource: joinKeyResourceName }, __joinKeyResourceName && { __joinKeyResource: __joinKeyResourceName }, deNestedJoinKey.parentsArray && deNestedJoinKey.parentsArray.length > 0 && { joinKeyParents: deNestedJoinKey.parentsArray }, deNestedPrimaryKey.property && { primaryKeyName: deNestedPrimaryKey.property }, deNestedPrimaryKey.__property && { __primaryKeyName: deNestedPrimaryKey.__property }, primaryKeyResourceName && { primaryKeyResource: primaryKeyResourceName }, __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 }, {
-	              level: rsc.level || (rscIndex === 0 ? 0 : 1)
-	            }, primaryResourceName && primaryResourceProvider && { parentNameAndProvider: primaryResourceName + '_' + primaryResourceProvider.toLowerCase() }));
+	              level: rsc.level || (rscIndex === 0 ? 0 : 1),
+	              parentNameAndProvider: rsc.parentNameAndProvider
+	            }));
 	            //console.log(resources[resources.length-1])
 	          }
 	        }); // end bundle.resource.forEach
@@ -19645,7 +19657,6 @@ module.exports =
 	                      return !p.readOnly;
 	                    }).map(function (field, i) {
 	                      return _react2.default.createElement(_nestedField2.default, { key: i, field: field,
-	                        selectedField: selectedField,
 	                        filteredMappings: mappings, parents: [],
 	                        onExpand: function onExpand(ex) {
 	                          return _this4.setState({ destinationExpanded: ex });
@@ -24779,6 +24790,28 @@ module.exports =
 	      change('resourceGroups', resourceGroups);
 	      this.assignAllParents(groupIndex);
 	    }
+	
+	    /*addIntelligentMapping = () => {
+	      // only do for different providers
+	      // lowercase, remove spaces, compare labels only
+	      const group = {}
+	      const i=0; const sk=0; const rsc=0; const step=0;
+	      const map = {
+	        isExternalKeyMapping:true,
+	        resourceFromName:group.sourceKeysObjects[i],
+	        __resourceFromName:group.__sourceKeysObjects[i],
+	        propertyFromName:sk,
+	        __propertyFromName:group.__sourceKeys[i],
+	        resourceToName:group.name,
+	        __resourceToName:group.__name,
+	        propertyToName:group.destinationKeys[i],
+	        __propertyToName:group.__destinationKeys[i],
+	        propertyFromParents:group.sourceKeysParents[i],
+	        propertyToParents:group.destinationKeysParents[i],
+	        ...rsc.provider.toLowerCase()===step.destinationProvider.toLowerCase() && {dataSourceIsDestinationEntity: true}
+	      }
+	    }*/
+	
 	  }, {
 	    key: 'newEntityKeyPress',
 	    value: function newEntityKeyPress(e) {
@@ -25240,9 +25273,13 @@ module.exports =
 	        'div',
 	        { className: 'fields-expander' },
 	        field.object && field.object.properties.map(function (nestedField, i) {
-	          return _react2.default.createElement(NestedField, { key: i, field: nestedField, selectedField: selectedField,
-	            filteredMappings: filteredMappings, parents: parents.concat(field.label),
-	            click: click, onExpand: onExpand, expanded: expanded, showApiNames: showApiNames,
+	          return _react2.default.createElement(NestedField, { key: i, field: nestedField,
+	            selectedField: selectedField,
+	            filteredMappings: filteredMappings,
+	            parents: parents.concat(field.label),
+	            click: click, onExpand: onExpand,
+	            expanded: expanded,
+	            showApiNames: showApiNames,
 	            isDestination: isDestination
 	          });
 	        })