@lingk/sync 1.0.20 → 1.0.22

package/build/main.js

@@ -1450,7 +1450,9 @@ module.exports =
 	
 	  var bundles = resourceGroups || [];
 	  var mappings = [];
+	
 	  bundles && bundles.forEach(function (group, index) {
+	
 	    // first get target resource
 	    var destinationResource = targetMetadata ? targetMetadata.find(function (rsc) {
 	      return rsc.name === group.name;
@@ -1494,7 +1496,7 @@ module.exports =
 	      var sourceKeyResourceProvider = group.resources.find(function (r) {
 	        return r.name === group.sourceKeysObjects[i];
 	      }).provider;
-	      var dataSourceMetadata = sourceKeyResourceProvider === targetProvider ? targetMetadata : sourceMetadata;
+	      var dataSourceMetadata = sourceKeyResourceProvider.toLowerCase() === targetProvider.toLowerCase() ? targetMetadata : sourceMetadata;
 	      var sourceResource = dataSourceMetadata.find(function (metaRsc) {
 	        return metaRsc.name === group.sourceKeysObjects[i];
 	      });
@@ -1581,9 +1583,9 @@ module.exports =
 	        }
 	      });
 	      delete group.mappings; // remove the mapping obj from a resourceGroup
-	      if (group.lingkSourceKey) delete group.lingkSourceKey;
-	      if (group.lingkSourceKeyObject) delete group.lingkSourceKeyObject;
-	      if (group.lingkSourceKeyParents) delete group.lingkSourceKeyParents;
+	      //if (group.lingkSourceKey) delete group.lingkSourceKey
+	      //if (group.lingkSourceKeyObject) delete group.lingkSourceKeyObject
+	      //if (group.lingkSourceKeyParents) delete group.lingkSourceKeyParents
 	    }
 	
 	    // BUNDLES
@@ -1611,24 +1613,28 @@ module.exports =
 	        }*/
 	
 	        //get first resource in bundle (for primaryKeyName)
-	        var primaryDataSourceMetadata = group.resources[0].provider.toLowerCase() === targetProvider.toLowerCase() ? targetMetadata : sourceMetadata;
-	        var primarySourceResource = primaryDataSourceMetadata.find(function (metaRsc) {
-	          return metaRsc.name === group.resources[0].name;
-	        });
-	
-	        // 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 && primarySourceResource.name === rsc.primaryKeyResource) {
-	          nestedPrimaryKey = findNestedProp(rsc.primaryKeyName, rsc.primaryKeyParents, primarySourceResource);
-	          primaryKeyResource = primarySourceResource.type;
-	        }
-	
-	        var rscParentProvider = null;
+	        var nestedPrimaryKey = {};
+	        var primaryKeyResource = null;
+	        var primaryResourceProvider = null;
 	        if (rsc.parentNameAndProvider) {
-	          var provArray = rsc.parentNameAndProvider.split('_');
-	          rscParentProvider = provArray[provArray.length - 1];
+	          (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;
+	            });
+	
+	            // 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) {
+	              nestedPrimaryKey = findNestedProp(rsc.primaryKeyName, rsc.primaryKeyParents, primarySourceResource);
+	              primaryKeyResource = primarySourceResource.type;
+	            }
+	          })();
 	        }
 	
 	        if (sourceResource) {
@@ -1648,7 +1654,7 @@ module.exports =
 	              return pf.val;
 	            }) }, {
 	            level: rsc.level || (rscIndex === 0 ? 0 : 1)
-	          }, primaryKeyResource && rscParentProvider && { parentNameAndProvider: primaryKeyResource + '_' + rscParentProvider.toLowerCase() });
+	          }, primaryKeyResource && primaryResourceProvider && { parentNameAndProvider: primaryKeyResource + '_' + primaryResourceProvider.toLowerCase() });
 	        } else return null;
 	      });
 	    }
@@ -3255,8 +3261,10 @@ module.exports =
 	            }
 	          } // end if dataSourceMetadata
 	
-	          //get resource and primaryKey for first resource in bundle (check both metadatas)
-	          var primaryResourceProvider = bundle.resources[0].provider.replace('Reader', '').toLowerCase();
+	          //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 deNestedPrimaryKey = {};
@@ -3268,7 +3276,7 @@ module.exports =
 	              primaryKeyResourceName = rsc.primaryKeyResource;
 	
 	              // primaryKeyName coming from field on this resource
-	              if (bundle.resources[0].resourceLabel === rsc.primaryKeyResource) {
+	              if (primaryResourceName === rsc.primaryKeyResource) {
 	                var rscPrimaryResource = primaryDataSourceMetadata.find(function (r) {
 	                  return r.type === rsc.primaryKeyResource;
 	                });
@@ -3279,10 +3287,34 @@ module.exports =
 	              }
 	            }
 	          }
+	          /*const primaryResourceProvider = bundle.resources[0].provider
+	            .replace('Reader','').toLowerCase()
+	          const primaryDataSourceMetadata = primaryResourceProvider === DP.toLowerCase() ? DM : primaryResourceProvider === SP.toLowerCase() ? SM : null
+	           let deNestedPrimaryKey = {}
+	          let primaryKeyResourceName = null
+	          if(primaryDataSourceMetadata){
+	            if(rsc.primaryKeyName){
+	              //primaryKeyName coming from parameter (another resource)
+	              deNestedPrimaryKey = {property: rsc.primaryKeyName}
+	              primaryKeyResourceName = rsc.primaryKeyResource
+	               // primaryKeyName coming from field on this resource
+	              if(bundle.resources[0].resourceLabel===rsc.primaryKeyResource){
+	                const rscPrimaryResource = primaryDataSourceMetadata
+	                  .find(r => r.type===rsc.primaryKeyResource)
+	                if(rscPrimaryResource){
+	                  deNestedPrimaryKey = deNest(
+	                    rsc.primaryKeyName, rsc.primaryKeyParents, rscPrimaryResource 
+	                  )
+	                  primaryKeyResourceName = rscPrimaryResource.name
+	                }
+	              }
+	            }
+	          }*/
 	
 	          if (rscResource) {
 	            resources.push(Object.assign({
 	              name: rscResource.name,
+	              type: rscResource.type,
 	              provider: resourceProvider
 	            }, 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'
@@ -23273,9 +23305,10 @@ module.exports =
 	            sourceSchema: sourceSchema, destinationSchema: destinationSchema })
 	        ) : null,
 	        _react2.default.createElement('br', null),
-	        (step.isFramework || step.isOrgAdmin) && _react2.default.createElement(
+	        step.isFramework && _react2.default.createElement(
 	          'div',
 	          null,
+	          ' ',
 	          _react2.default.createElement(
 	            Button,
 	            { type: 'brand',
@@ -24245,13 +24278,12 @@ module.exports =
 	        var newParentProvider = '';
 	        for (var i = eachI - 1; i >= 0; i--) {
 	          if (resources[i].level < eachR.level) {
-	            newParent = resources[i].name;
+	            newParent = resources[i].type;
 	            newParentProvider = resources[i].provider;
 	            eachR.level = resources[i].level + 1;
 	            break;
 	          }
 	        }
-	        //console.log(`${newParent}_${newParentProvider}`.toLowerCase())
 	        if (newParent && newParentProvider && (newParent + '_' + newParentProvider).toLowerCase() !== (eachR.parentNameAndProvider && eachR.parentNameAndProvider.toLowerCase())) {
 	          eachR.primaryKeyResource = newParent;
 	          eachR.parentNameAndProvider = newParent + '_' + newParentProvider;
@@ -24263,7 +24295,6 @@ module.exports =
 	        }
 	      });
 	      change('resourceGroups', resourceGroups);
-	      //this.forceUpdate()
 	    }
 	  }, {
 	    key: 'refreshAllPrimaryKeys',
@@ -24625,9 +24656,9 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _saveData2 = __webpack_require__(28);
+	var _saveData3 = __webpack_require__(28);
 	
-	var _saveData3 = _interopRequireDefault(_saveData2);
+	var _saveData4 = _interopRequireDefault(_saveData3);
 	
 	var _objectAssignDeep = __webpack_require__(139);
 	
@@ -24651,6 +24682,35 @@ module.exports =
 	
 	    var _this = _possibleConstructorReturn(this, (TransformModal.__proto__ || Object.getPrototypeOf(TransformModal)).call(this));
 	
+	    _this.downloadJson = function () {
+	      var _this$state = _this.state,
+	          title = _this$state.title,
+	          description = _this$state.description;
+	      var _this$props = _this.props,
+	          step = _this$props.step,
+	          resourceGroups = _this$props.resourceGroups,
+	          sourceMetadata = _this$props.sourceMetadata,
+	          destinationMetadata = _this$props.destinationMetadata,
+	          isReverse = _this$props.isReverse;
+	      var sourceProvider = step.sourceProvider,
+	          destinationProvider = step.destinationProvider;
+	
+	      var clone = (0, _objectAssignDeep2.default)({}, { bundles: resourceGroups });
+	
+	      var _saveData = (0, _saveData4.default)(clone.bundles, sourceProvider, destinationProvider, sourceMetadata, destinationMetadata, isReverse),
+	          bundles = _saveData.bundles,
+	          mappings = _saveData.mappings;
+	
+	      var data = { bundles: bundles, mappings: mappings, title: title, label: description,
+	        typeGuid: step.typeGuid, isReverse: isReverse, isGlobal: step.isFramework
+	      };
+	      var dataStr = "data:text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(data));
+	      var dlAnchor = _this.downloadAnchor;
+	      dlAnchor.setAttribute("href", dataStr);
+	      dlAnchor.setAttribute("download", "scenario.json");
+	      dlAnchor.click();
+	    };
+	
 	    _this.state = {
 	      title: '',
 	      description: '',
@@ -24712,6 +24772,7 @@ module.exports =
 	          });
 	        });
 	      } else {
+	        // CREATE NEW
 	        this.setState({ loading: true });
 	        var _props3 = this.props,
 	            resourceGroups = _props3.resourceGroups,
@@ -24720,9 +24781,9 @@ module.exports =
 	
 	        var clone = (0, _objectAssignDeep2.default)({}, { bundles: resourceGroups });
 	
-	        var _saveData = (0, _saveData3.default)(clone.bundles, sourceProvider, destinationProvider, sourceMetadata, destinationMetadata, isReverse),
-	            bundles = _saveData.bundles,
-	            mappings = _saveData.mappings;
+	        var _saveData2 = (0, _saveData4.default)(clone.bundles, sourceProvider, destinationProvider, sourceMetadata, destinationMetadata, isReverse),
+	            bundles = _saveData2.bundles,
+	            mappings = _saveData2.mappings;
 	
 	        var data = { bundles: bundles, mappings: mappings, title: title, label: description, typeGuid: step.typeGuid, isReverse: isReverse, isGlobal: step.isFramework };
 	
@@ -24733,11 +24794,7 @@ module.exports =
 	            _this3.props.done({ wiz: it, scenarios: r });
 	          });
 	        });
-	        /*var dataStr = "data:text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(data));
-	        var dlAnchor = this.downloadAnchor;
-	        dlAnchor.setAttribute("href", dataStr);
-	        dlAnchor.setAttribute("download", "scenario.json");
-	        dlAnchor.click();*/
+	        /**/
 	      }
 	    }
 	  }, {
@@ -24840,10 +24897,20 @@ module.exports =
 	                  },
 	                  value: title, label: 'Scenario Title' }),
 	                _react2.default.createElement('br', null),
+	                _react2.default.createElement('br', null),
 	                _react2.default.createElement(Textarea, { onChange: function onChange(e) {
 	                    return _this4.setState({ description: e.target.value });
 	                  },
-	                  value: description, label: 'Scenario Description' })
+	                  value: description, label: 'Scenario Description' }),
+	                _react2.default.createElement(
+	                  'div',
+	                  { style: { marginTop: 16 } },
+	                  _react2.default.createElement(
+	                    'a',
+	                    { onClick: this.downloadJson },
+	                    'Download JSON'
+	                  )
+	                )
 	              )
 	            ),
 	            manageScenarios && _react2.default.createElement(
@@ -24893,7 +24960,7 @@ module.exports =
 	            ),
 	            _react2.default.createElement('a', { ref: function ref(_ref) {
 	                return _this4.downloadAnchor = _ref;
-	              }, style: { visibility: 'hidden' } })
+	              } })
 	          )
 	        )
 	      );