@lingk/sync 0.1.74 → 0.1.75

package/build/main.js

@@ -335,7 +335,7 @@ module.exports =
 	              });
 	
 	              var resources = [];
-	              bundle.resources && bundle.resources.forEach(function (rsc) {
+	              bundle.resources && bundle.resources.forEach(function (rsc, rscIndex) {
 	
 	                //get resource and joinKey for bundleResource (check both metadatas)
 	                var resourceProvider = rsc.provider.replace('Reader', '').toLowerCase();
@@ -398,7 +398,11 @@ module.exports =
 	                    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'
-	                  }, rscResource.parentRef && { parentRef: rscResource.parentRef }, rsc.parameterFilters && { parameterFilters: rsc.parameterFilters }));
+	                  }, rscResource.parentRef && { parentRef: rscResource.parentRef }, rsc.parameterFilters && { parameterFilters: rsc.parameterFilters }, {
+	                    level: rsc.level || (rscIndex === 0 ? 0 : 1)
+	                  }, primaryKeyResourceName && {
+	                    parentNameAndProvider: primaryKeyResourceName + '_' + resourceProvider
+	                  }));
 	                }
 	              }); // end bundle.resource.forEach
 	
@@ -2664,7 +2668,7 @@ module.exports =
 	
 	    // BUNDLES
 	    if (group.resources) {
-	      group.resources = group.resources.map(function (rsc) {
+	      group.resources = group.resources.map(function (rsc, rscIndex) {
 	        //get resource source (check both metadatas)
 	        var dataSourceMetadata = rsc.provider.toLowerCase() === targetProvider.toLowerCase() ? targetMetadata : sourceMetadata;
 	        var sourceResource = dataSourceMetadata.find(function (metaRsc) {
@@ -2715,7 +2719,10 @@ module.exports =
 	            joinType: rsc.joinType
 	          }, rsc.recordTypeId && { recordTypeId: rsc.recordTypeId }, rsc.parameterFilters && { parameterFilters: rsc.parameterFilters.filter(function (pf) {
 	              return pf.val;
-	            }) });
+	            }) }, {
+	            level: rsc.level || (rscIndex === 0 ? 0 : 1),
+	            parentNameAndProvider: primaryKeyResource + '_' + rsc.provider.toLowerCase()
+	          });
 	        } else return null;
 	      });
 	    }
@@ -5473,7 +5480,7 @@ module.exports =
 	  };
 	}
 	
-	function callGenerateRecipe(tenantId, appId, typeId, typeGuid, title, piGuid, mappingGuid, sourceMetadata, destinationMetadata, isManagedPackage, onGenerationError) {
+	function callGenerateRecipe(tenantId, appId, typeId, typeGuid, title, piGuid, mappingGuid, sourceMetadata, destinationMetadata, isManagedPackage, onGenerationError, envName) {
 	  return function (dispatch, getState, api) {
 	    var _getState13 = getState(),
 	        config = _getState13.config;
@@ -5487,7 +5494,8 @@ module.exports =
 	        "schemaMappingGuid": mappingGuid,
 	        "sourceSchema": sourceMetadata,
 	        "destinationSchema": destinationMetadata,
-	        "isManagedPackage": isManagedPackage
+	        "isManagedPackage": isManagedPackage,
+	        "environment": envName
 	      }
 	    }).then(function (res) {
 	      return res;
@@ -5512,7 +5520,7 @@ module.exports =
 	      }
 	    }).then(function (pi) {
 	      if (map.mappings && map.mappings.length > 0 && deployment) {
-	        dispatch(callGenerateRecipe(tenantId, appId, typeId, typeGuid, title, pi.productizedIntegrationGuid, map.schemaMappingGuid, sourceMetadata, destinationMetadata, isManagedPackage, onGenerationError)).then(function (generatedRecipe) {
+	        dispatch(callGenerateRecipe(tenantId, appId, typeId, typeGuid, title, pi.productizedIntegrationGuid, map.schemaMappingGuid, sourceMetadata, destinationMetadata, isManagedPackage, onGenerationError, envName)).then(function (generatedRecipe) {
 	          onGenerate();
 	          if (deployment) {
 	            if (deployment.type === 'once') {
@@ -5747,7 +5755,7 @@ module.exports =
 	function tryGetCredentials(tenantId, appId, credentialType, credsConfig, envName) {
 	  return function (dispatch, getState, api) {
 	    var isOauth = credsConfig && credsConfig.length === 1 && credsConfig[0] === 'Oauth';
-	    if (!isOauth) {
+	    if (!isOauth && envName) {
 	      return dispatch(getCredentialForEnvironment(tenantId, appId, credentialType, envName));
 	    } else return Promise.resolve(null);
 	  };
@@ -5762,7 +5770,7 @@ module.exports =
 	        metadataApi = wiz.metadataApi;
 	
 	    var isOauth = credentials && credentials[0] === 'Oauth';
-	    if (savedEndpoint && savedEndpoint.length > 8 || isOauth) {
+	    if (envName && (isOauth || savedEndpoint && savedEndpoint.length > 8)) {
 	      var isReload = true;
 	      var environment = { name: envName };
 	      return dispatch(callGetMetadata(tenantId, appId, mode, type, metadataEndpoint, metadataApi, savedEndpoint, credentials, null, actualCreds, environment, isReload));
@@ -5838,8 +5846,8 @@ module.exports =
 	        type: types.SET_WIZARD_ENVIRONMENTS,
 	        data: data.map(function (e) {
 	          return {
-	            environmentId: e.Id,
-	            name: e.Name
+	            environmentId: e.id,
+	            name: e.name
 	          };
 	        })
 	      });
@@ -8290,9 +8298,12 @@ module.exports =
 	      if (this.finalDelta) {
 	        this.props.changeEntityOrder(this.props.resourceGroupIndex, i, i + this.finalDelta);
 	      }
-	      this.setState({ yPositions: this.elementReorders.map(function () {
+	      this.setState({
+	        yPositions: this.elementReorders.map(function () {
 	          return 0;
-	        }) });
+	        }),
+	        currentlyBeingDragged: null
+	      });
 	      this.props.unPick();
 	      e.stopPropagation();
 	    }
@@ -8317,7 +8328,8 @@ module.exports =
 	          overflowHidden = _props3.overflowHidden,
 	          showOverflow = _props3.showOverflow,
 	          step = _props3.step,
-	          isReverse = _props3.isReverse;
+	          isReverse = _props3.isReverse,
+	          changeEntityLevel = _props3.changeEntityLevel;
 	      var parameterModalResourceIndex = this.state.parameterModalResourceIndex;
 	
 	
@@ -8346,37 +8358,6 @@ module.exports =
 	        })
 	      })*/
 	
-	      var primaryRscVals = null;
-	      var primaryRscSectionLabels = null;
-	
-	      if (group && group.resources && group.resources[0]) {
-	        var primaryResourceSchema = group.resources[0].provider.toLowerCase() === step.destinationProvider.toLowerCase() ? 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' } },
@@ -8416,7 +8397,7 @@ module.exports =
 	              background: 'white', width: 720, minHeight: 245,
 	              overflow: overflowHidden ? 'hidden' : 'visible',
 	              border: '1px solid rgb(204, 205, 207)', position: 'relative',
-	              height: groupResourcesLength * 58 + 84 + 78
+	              height: groupResourcesLength * 60 + 84 + 78
 	            } },
 	          _react2.default.createElement(
 	            'div',
@@ -8438,6 +8419,45 @@ module.exports =
 	                  { style: { position: 'relative' } },
 	                  group && group.resources && group.resources.map(function (rsc, i) {
 	
+	                    /* PARENT RESOURCE (to join against)*/
+	                    var primaryResource = null;
+	                    var primaryRscVals = null;
+	                    var primaryRscSectionLabels = null;
+	
+	                    if (rsc.parentNameAndProvider) {
+	                      primaryResource = group.resources.find(function (gr) {
+	                        return rsc.parentNameAndProvider.toLowerCase() === (gr.name + '_' + gr.provider).toLowerCase();
+	                      });
+	
+	                      var primaryResourceSchema = primaryResource.provider.toLowerCase() === step.destinationProvider.toLowerCase() ? destinationSchema : sourceSchema;
+	
+	                      primaryRscVals = primaryResourceSchema && primaryResourceSchema.find(function (defaultRsc) {
+	                        return defaultRsc.name === primaryResource.name;
+	                      }) && [primaryResourceSchema.find(function (defaultRsc) {
+	                        return defaultRsc.name === primaryResource.name;
+	                      }).properties.filter(function (f) {
+	                        return !f.fake;
+	                      })];
+	
+	                      var primaryHasParameters = primaryResource.parentRef && primaryResource.parentRef.length > 0 && primaryResource.parentRef.some(function (pr) {
+	                        return pr.foreignKeyFields && pr.foreignKeyFields.length > 0;
+	                      });
+	
+	                      primaryRscSectionLabels = [primaryResource.name];
+	
+	                      if (primaryHasParameters) {
+	                        primaryResource.parentRef.forEach(function (pr) {
+	                          var params = [];
+	                          primaryRscSectionLabels.push(pr.ref.split('/')[2]);
+	                          pr.foreignKeyFields.forEach(function (fkf) {
+	                            params.push({ label: fkf });
+	                          });
+	                          primaryRscVals.push(params);
+	                        });
+	                      }
+	                    }
+	
+	                    /* THIS RESOURCE*/
 	                    var isDestinationEntity = rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase();
 	                    var isSelected = selectedEntity.name === rsc.name && selectedEntity.isDestinationEntity === isDestinationEntity;
 	
@@ -8445,6 +8465,10 @@ module.exports =
 	                      return pr.foreignKeyFields && pr.foreignKeyFields.length > 0;
 	                    });
 	
+	                    var hasChildren = group && group.resources && group.resources.find(function (r) {
+	                      return r.primaryKeyResource === rsc.name;
+	                    }) ? true : false;
+	
 	                    var rscSchema = isDestinationEntity ? destinationSchema : sourceSchema;
 	                    var joinRscVals = rscSchema && rscSchema.find(function (defaultRsc) {
 	                      return defaultRsc.name === rsc.name;
@@ -8485,13 +8509,6 @@ module.exports =
 	                      joinKeyLabel += rsc.joinKeyName;
 	                    }
 	
-	                    /*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.toLowerCase() === step.sourceProvider.toLowerCase()) {
@@ -8503,195 +8520,225 @@ module.exports =
 	                      }
 	                    }
 	
+	                    var canMoveLeft = false;
+	                    var canMoveRight = false;
+	                    if (i > 1) {
+	                      var beforeResourceLevel = group.resources[i - 1].level;
+	                      if (rsc.level > 1 && rsc.level <= beforeResourceLevel + 1) {
+	                        canMoveLeft = true;
+	                      }
+	                      if (rsc.level <= beforeResourceLevel) {
+	                        canMoveRight = true;
+	                      }
+	                    }
+	
 	                    return _react2.default.createElement(
 	                      _reactDraggable2.default,
 	                      { axis: 'y', bounds: 'parent', key: i, handle: '.drag-handle',
 	                        position: { x: 0, y: _this3.state.yPositions[i] },
 	                        onStart: function onStart(e, v) {
 	                          return _this3.handleDragStart(e, v, i);
-	                        }, onDrag: _this3.handleDrag, onStop: _this3.handleDragEnd },
+	                        },
+	                        onDrag: _this3.handleDrag, onStop: _this3.handleDragEnd,
+	                        disabled: hasChildren },
 	                      _react2.default.createElement(
 	                        'div',
-	                        { className: 'schema-panel', style: { zIndex: _this3.state.zIndexes[i] }, onClick: function onClick() {
-	                            return _this3.raiseUp(i);
-	                          } },
+	                        { style: { position: 'relative', zIndex: 5999 } },
+	                        _react2.default.createElement(LevelArrows, { hasChildren: hasChildren,
+	                          onChange: function onChange(c) {
+	                            return changeEntityLevel(resourceGroupIndex, i, rsc.level + c);
+	                          },
+	                          canMoveRight: canMoveRight, canMoveLeft: canMoveLeft
+	                        }),
 	                        _react2.default.createElement(
 	                          'div',
-	                          { className: 'schema-panel-header' },
+	                          { className: 'schema-panel',
+	                            style: { zIndex: _this3.state.zIndexes[i], marginLeft: rsc.level * 18 },
+	                            onClick: function onClick() {
+	                              return _this3.raiseUp(i);
+	                            } },
 	                          _react2.default.createElement(
 	                            'div',
-	                            { style: { display: 'inline-block', verticalAlign: 'top', margin: '4px 4px 0px 0px', cursor: 'pointer' }, onClick: function onClick(e) {
-	                                return e.stopPropagation();
-	                              },
-	                              className: 'drag-handle' },
+	                            { className: 'schema-panel-header', style: {
+	                                background: 'rgb(50,' + (120 + rsc.level * 15) + ',' + (180 + rsc.level * 30) + ')'
+	                              } },
 	                            _react2.default.createElement(
-	                              'svg',
-	                              { width: '24', height: '24', viewBox: '0 0 24 24' },
-	                              _react2.default.createElement('path', { fill: '#FFFFFF', d: 'M9,3H11V5H9V3M13,3H15V5H13V3M9,7H11V9H9V7M13,7H15V9H13V7M9,11H11V13H9V11M13,11H15V13H13V11M9,15H11V17H9V15M13,15H15V17H13V15M9,19H11V21H9V19M13,19H15V21H13V19Z' })
-	                            )
-	                          ),
-	                          _react2.default.createElement(
-	                            'div',
-	                            { style: { padding: '7px 0px 0px 5px', fontSize: '14px',
-	                                display: 'inline-block' } },
+	                              'div',
+	                              { style: { display: 'inline-block', verticalAlign: 'top', margin: '4px 4px 0px 0px', cursor: hasChildren ? 'auto' : 'pointer' },
+	                                onClick: function onClick(e) {
+	                                  return e.stopPropagation();
+	                                },
+	                                className: 'drag-handle' },
+	                              _react2.default.createElement(
+	                                'svg',
+	                                { width: '24', height: '24', viewBox: '0 0 24 24',
+	                                  fill: hasChildren ? '#AAAAAA' : '#FFFFFF' },
+	                                _react2.default.createElement('path', { d: 'M9,3H11V5H9V3M13,3H15V5H13V3M9,7H11V9H9V7M13,7H15V9H13V7M9,11H11V13H9V11M13,11H15V13H13V11M9,15H11V17H9V15M13,15H15V17H13V15M9,19H11V21H9V19M13,19H15V21H13V19Z' })
+	                              )
+	                            ),
 	                            _react2.default.createElement(
-	                              'span',
-	                              { style: { maxWidth: 260, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', display: 'inline-block' } },
-	                              rscName
+	                              'div',
+	                              { style: { padding: '7px 0px 0px 5px', fontSize: '14px',
+	                                  display: 'inline-block' } },
+	                              _react2.default.createElement(
+	                                'span',
+	                                { style: { maxWidth: 260, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', display: 'inline-block' } },
+	                                rscName
+	                              ),
+	                              hasParameters && _react2.default.createElement(
+	                                'div',
+	                                { className: 'accordion-panel-parameters',
+	                                  onClick: function onClick() {
+	                                    return _this3.setState({
+	                                      parameterModalResourceIndex: i
+	                                    });
+	                                  } },
+	                                _react2.default.createElement(
+	                                  'svg',
+	                                  { fill: '#FFFFFF', height: '28', viewBox: '0 0 24 24', width: '28' },
+	                                  _react2.default.createElement('path', { d: 'M0 0h24v24H0z', fill: 'none' }),
+	                                  _react2.default.createElement('path', { d: 'M12 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm7-7H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-1.75 9c0 .23-.02.46-.05.68l1.48 1.16c.13.11.17.3.08.45l-1.4 2.42c-.09.15-.27.21-.43.15l-1.74-.7c-.36.28-.76.51-1.18.69l-.26 1.85c-.03.17-.18.3-.35.3h-2.8c-.17 0-.32-.13-.35-.29l-.26-1.85c-.43-.18-.82-.41-1.18-.69l-1.74.7c-.16.06-.34 0-.43-.15l-1.4-2.42c-.09-.15-.05-.34.08-.45l1.48-1.16c-.03-.23-.05-.46-.05-.69 0-.23.02-.46.05-.68l-1.48-1.16c-.13-.11-.17-.3-.08-.45l1.4-2.42c.09-.15.27-.21.43-.15l1.74.7c.36-.28.76-.51 1.18-.69l.26-1.85c.03-.17.18-.3.35-.3h2.8c.17 0 .32.13.35.29l.26 1.85c.43.18.82.41 1.18.69l1.74-.7c.16-.06.34 0 .43.15l1.4 2.42c.09.15.05.34-.08.45l-1.48 1.16c.03.23.05.46.05.69z' })
+	                                )
+	                              )
 	                            ),
-	                            hasParameters && _react2.default.createElement(
+	                            _react2.default.createElement(
 	                              'div',
-	                              { className: 'accordion-panel-parameters',
-	                                onClick: function onClick() {
-	                                  return _this3.setState({
-	                                    parameterModalResourceIndex: i
-	                                  });
+	                              { className: 'accordion-panel-close',
+	                                onClick: function onClick(e) {
+	                                  return didRemoveEntity(e, resourceGroupIndex, rsc.name, i);
 	                                } },
 	                              _react2.default.createElement(
 	                                'svg',
-	                                { fill: '#FFFFFF', height: '28', viewBox: '0 0 24 24', width: '28' },
-	                                _react2.default.createElement('path', { d: 'M0 0h24v24H0z', fill: 'none' }),
-	                                _react2.default.createElement('path', { d: 'M12 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm7-7H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-1.75 9c0 .23-.02.46-.05.68l1.48 1.16c.13.11.17.3.08.45l-1.4 2.42c-.09.15-.27.21-.43.15l-1.74-.7c-.36.28-.76.51-1.18.69l-.26 1.85c-.03.17-.18.3-.35.3h-2.8c-.17 0-.32-.13-.35-.29l-.26-1.85c-.43-.18-.82-.41-1.18-.69l-1.74.7c-.16.06-.34 0-.43-.15l-1.4-2.42c-.09-.15-.05-.34.08-.45l1.48-1.16c-.03-.23-.05-.46-.05-.69 0-.23.02-.46.05-.68l-1.48-1.16c-.13-.11-.17-.3-.08-.45l1.4-2.42c.09-.15.27-.21.43-.15l1.74.7c.36-.28.76-.51 1.18-.69l.26-1.85c.03-.17.18-.3.35-.3h2.8c.17 0 .32.13.35.29l.26 1.85c.43.18.82.41 1.18.69l1.74-.7c.16-.06.34 0 .43.15l1.4 2.42c.09.15.05.34-.08.45l-1.48 1.16c.03.23.05.46.05.69z' })
+	                                { style: { width: 18, height: 18 }, viewBox: '0 0 60 60' },
+	                                _react2.default.createElement('path', { style: { strokeWidth: 5, strokeLinecap: 'round' },
+	                                  d: 'M 15.674663,15.572746 L 44.587629,44.485711 M 45.118838,15.420972 L 15.522889,45.016920' })
 	                              )
-	                            )
-	                          ),
-	                          _react2.default.createElement(
-	                            'div',
-	                            { className: 'accordion-panel-close',
-	                              onClick: function onClick(e) {
-	                                return didRemoveEntity(e, resourceGroupIndex, rsc.name, i);
-	                              } },
+	                            ),
 	                            _react2.default.createElement(
-	                              'svg',
-	                              { style: { width: 18, height: 18 }, viewBox: '0 0 60 60' },
-	                              _react2.default.createElement('path', { style: { strokeWidth: 5, strokeLinecap: 'round' },
-	                                d: 'M 15.674663,15.572746 L 44.587629,44.485711 M 45.118838,15.420972 L 15.522889,45.016920' })
+	                              'div',
+	                              { style: { verticalAlign: 'top', float: 'right', marginRight: 8 } },
+	                              i !== 0 ? _react2.default.createElement(
+	                                Button,
+	                                { 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.toLowerCase() === step.destinationProvider.toLowerCase()
+	                                    });
+	                                  } },
+	                                joinKeyLabel && primaryKeyLabel ? primaryKeyLabel + ' = ' + joinKeyLabel : 'Configure Join'
+	                              ) : null
 	                            )
 	                          ),
 	                          _react2.default.createElement(
-	                            'div',
-	                            { style: { verticalAlign: 'top', float: 'right', marginRight: 8 } },
-	                            i !== 0 ? _react2.default.createElement(
-	                              Button,
-	                              { 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.toLowerCase() === step.destinationProvider.toLowerCase()
-	                                  });
-	                                } },
-	                              joinKeyLabel && primaryKeyLabel ? primaryKeyLabel + ' = ' + joinKeyLabel : 'Configure Join'
-	                            ) : null
-	                          )
-	                        ),
-	                        _react2.default.createElement(
-	                          _CSSTransitionGroup2.default,
-	                          { transitionName: 'panel-collapse', transitionEnterTimeout: 250, transitionLeaveTimeout: 250 },
-	                          isSelected ? _react2.default.createElement(
-	                            'div',
-	                            { className: 'schema-accordion-collapse' },
-	                            _react2.default.createElement(
+	                            _CSSTransitionGroup2.default,
+	                            { transitionName: 'panel-collapse', transitionEnterTimeout: 250, transitionLeaveTimeout: 250 },
+	                            isSelected ? _react2.default.createElement(
 	                              'div',
-	                              { style: { display: 'inline-block', width: '33%', marginTop: 6, verticalAlign: 'top', position: 'relative' } },
+	                              { className: 'schema-accordion-collapse' },
 	                              _react2.default.createElement(
 	                                'div',
-	                                { className: 'labelz', style: { marginBottom: 6 } },
-	                                'Primary Object Join Key'
-	                              ),
-	                              _react2.default.createElement(
-	                                Tooltip,
-	                                { nubbin: 'left-top', popStyle: { width: 180, left: -5 },
-	                                  wrapStyle: { left: 148, top: 2, zIndex: 6003 } },
+	                                { style: { display: 'inline-block', width: '33%', marginTop: 6, verticalAlign: 'top', position: 'relative' } },
 	                                _react2.default.createElement(
-	                                  'p',
-	                                  null,
-	                                  'Choose a Join Key for the Primary object in this group (',
-	                                  group.resources[0].name,
-	                                  ')'
-	                                )
+	                                  'div',
+	                                  { className: 'labelz', style: { marginBottom: 6 } },
+	                                  'Primary Object Join Key'
+	                                ),
+	                                _react2.default.createElement(
+	                                  Tooltip,
+	                                  { nubbin: 'left-top', popStyle: { width: 180, left: -5 },
+	                                    wrapStyle: { left: 148, top: 2, zIndex: 6003 } },
+	                                  _react2.default.createElement(
+	                                    'p',
+	                                    null,
+	                                    'Choose a Join Key for the Primary object in this group (',
+	                                    primaryResource && primaryResource.name,
+	                                    ')'
+	                                  )
+	                                ),
+	                                _react2.default.createElement(_selectWrapper2.default, { label: primaryKeyLabel || 'Primary Join Key',
+	                                  onSelect: function onSelect(v, idx, field) {
+	                                    selectPrimaryKey(v, field, resourceGroupIndex, i);
+	                                  },
+	                                  onClick: showOverflow,
+	                                  type: 'neutral', inputs: inputs,
+	                                  values: primaryRscVals,
+	                                  sectionLabels: primaryRscSectionLabels,
+	                                  fieldPropLabel: 'label',
+	                                  selectedValues: [{
+	                                    label: rsc.primaryKeyName,
+	                                    parents: rsc.primaryKeyParents
+	                                  }],
+	                                  sectionLabelSuffix: 'Fields'
+	                                })
 	                              ),
-	                              _react2.default.createElement(_selectWrapper2.default, { label: primaryKeyLabel || 'Primary Join Key',
-	                                onSelect: function onSelect(v, idx, field) {
-	                                  selectPrimaryKey(v, field, resourceGroupIndex, i);
-	                                },
-	                                onClick: showOverflow,
-	                                type: 'neutral', inputs: inputs,
-	                                values: primaryRscVals,
-	                                sectionLabels: primaryRscSectionLabels,
-	                                fieldPropLabel: 'label',
-	                                selectedValues: [{
-	                                  label: rsc.primaryKeyName,
-	                                  parents: rsc.primaryKeyParents
-	                                }],
-	                                sectionLabelSuffix: 'Fields'
-	                              })
-	                            ),
-	                            _react2.default.createElement(
-	                              'div',
-	                              { style: { display: 'inline-block', width: '33%', marginTop: 6, verticalAlign: 'top', position: 'relative' } },
 	                              _react2.default.createElement(
 	                                'div',
-	                                { className: 'labelz', style: { marginBottom: 6 } },
-	                                'Join Key'
-	                              ),
-	                              _react2.default.createElement(
-	                                Tooltip,
-	                                { nubbin: 'left-top', popStyle: { width: 170, left: -5 },
-	                                  wrapStyle: { left: 50, top: 2, zIndex: 6002 } },
+	                                { style: { display: 'inline-block', width: '33%', marginTop: 6, verticalAlign: 'top', position: 'relative' } },
 	                                _react2.default.createElement(
-	                                  'p',
-	                                  null,
-	                                  'Choose a Join Key for this object (',
-	                                  rsc.name,
-	                                  '), whose value should match the Primary Object Join Key.'
-	                                )
+	                                  'div',
+	                                  { className: 'labelz', style: { marginBottom: 6 } },
+	                                  'Join Key'
+	                                ),
+	                                _react2.default.createElement(
+	                                  Tooltip,
+	                                  { nubbin: 'left-top', popStyle: { width: 170, left: -5 },
+	                                    wrapStyle: { left: 50, top: 2, zIndex: 6002 } },
+	                                  _react2.default.createElement(
+	                                    'p',
+	                                    null,
+	                                    'Choose a Join Key for this object (',
+	                                    rsc.name,
+	                                    '), whose value should match the Primary Object Join Key.'
+	                                  )
+	                                ),
+	                                _react2.default.createElement(_selectWrapper2.default, { label: joinKeyLabel || 'Join Key',
+	                                  onSelect: function onSelect(v, idx, field) {
+	                                    selectJoinKey(v, field, resourceGroupIndex, i);
+	                                  },
+	                                  onClick: showOverflow,
+	                                  type: 'neutral', inputs: inputs,
+	                                  values: joinRscVals,
+	                                  sectionLabels: joinRscSectionLabels,
+	                                  fieldPropLabel: 'label',
+	                                  selectedValues: [{
+	                                    label: rsc.joinKeyName,
+	                                    parents: rsc.joinKeyParents
+	                                  }],
+	                                  sectionLabelSuffix: 'Fields'
+	                                })
 	                              ),
-	                              _react2.default.createElement(_selectWrapper2.default, { label: joinKeyLabel || 'Join Key',
-	                                onSelect: function onSelect(v, idx, field) {
-	                                  selectJoinKey(v, field, resourceGroupIndex, i);
-	                                },
-	                                onClick: showOverflow,
-	                                type: 'neutral', inputs: inputs,
-	                                values: joinRscVals,
-	                                sectionLabels: joinRscSectionLabels,
-	                                fieldPropLabel: 'label',
-	                                selectedValues: [{
-	                                  label: rsc.joinKeyName,
-	                                  parents: rsc.joinKeyParents
-	                                }],
-	                                sectionLabelSuffix: 'Fields'
-	                              })
-	                            ),
-	                            _react2.default.createElement(
-	                              'div',
-	                              { style: { display: 'inline-block', width: '33%', marginTop: 6, position: 'relative', verticalAlign: 'top' } },
 	                              _react2.default.createElement(
-	                                Tooltip,
-	                                { nubbin: 'right-top', popStyle: { width: 300, right: 46 },
-	                                  wrapStyle: { left: 60, top: 2, zIndex: 6003 } },
+	                                'div',
+	                                { style: { display: 'inline-block', width: '33%', marginTop: 6, position: 'relative', verticalAlign: 'top' } },
 	                                _react2.default.createElement(
-	                                  'p',
-	                                  null,
-	                                  'All: ',
-	                                  rsc.name + ' records may or may not have a related ' + group.resources[0].name + ' record'
+	                                  Tooltip,
+	                                  { nubbin: 'right-top', popStyle: { width: 300, right: 46 },
+	                                    wrapStyle: { left: 60, top: 2, zIndex: 6003 } },
+	                                  _react2.default.createElement(
+	                                    'p',
+	                                    null,
+	                                    'All: ',
+	                                    rsc.name + ' records may or may not have a related ' + (primaryResource && primaryResource.name) + ' record'
+	                                  ),
+	                                  _react2.default.createElement(
+	                                    'p',
+	                                    { style: { marginTop: 6 } },
+	                                    'Matching: ',
+	                                    'Each ' + rsc.name + ' must have at least one related ' + (primaryResource && primaryResource.name) + ' record'
+	                                  )
 	                                ),
-	                                _react2.default.createElement(
-	                                  'p',
-	                                  { style: { marginTop: 6 } },
-	                                  'Matching: ',
-	                                  'Each ' + rsc.name + ' must have at least one related ' + group.resources[0].name + ' record'
-	                                )
-	                              ),
-	                              _react2.default.createElement(_reduxForm.Field, { name: 'resourceGroups.' + resourceGroupIndex + '.resources.' + i + '.joinType',
-	                                component: inputs.rfRadioGroup, label: 'Join Type',
-	                                onClickOption: function onClickOption() {}, options: {
-	                                  'LEFT JOIN': 'All records',
-	                                  'INNER JOIN': 'Matching records'
-	                                } }),
-	                              _react2.default.createElement(_joinVenn2.default, { joinType: rsc.joinType })
-	                            )
-	                          ) : null
+	                                _react2.default.createElement(_reduxForm.Field, { name: 'resourceGroups.' + resourceGroupIndex + '.resources.' + i + '.joinType',
+	                                  component: inputs.rfRadioGroup, label: 'Join Type',
+	                                  onClickOption: function onClickOption() {}, options: {
+	                                    'LEFT JOIN': 'All records',
+	                                    'INNER JOIN': 'Matching records'
+	                                  } }),
+	                                _react2.default.createElement(_joinVenn2.default, { joinType: rsc.joinType })
+	                              )
+	                            ) : null
+	                          )
 	                        )
 	                      )
 	                    );
@@ -8699,7 +8746,7 @@ module.exports =
 	                ),
 	                resourceGroups && resourceGroups.length > 0 ? _react2.default.createElement(
 	                  'div',
-	                  { style: { display: 'inline-block', marginLeft: 11 } },
+	                  { style: { display: 'inline-block', marginLeft: 17 } },
 	                  _react2.default.createElement(_selectWrapper2.default, { label: 'Add Data Source', style: { height: 40 }, onClick: showOverflow,
 	                    onSelect: function onSelect(v, i, entity) {
 	                      return addDefaultEntity(v, i, entity, resourceGroupIndex);
@@ -8789,6 +8836,41 @@ module.exports =
 	}(_react2.default.Component);
 	
 	exports.default = SchemaAccordion;
+	
+	
+	var LevelArrows = function LevelArrows(_ref2) {
+	  var onChange = _ref2.onChange,
+	      canMoveLeft = _ref2.canMoveLeft,
+	      canMoveRight = _ref2.canMoveRight,
+	      hasChildren = _ref2.hasChildren;
+	  return _react2.default.createElement(
+	    'div',
+	    {
+	      style: { position: 'absolute', zIndex: 7, height: 60, left: -5, paddingTop: 14 } },
+	    _react2.default.createElement(
+	      'div',
+	      { className: 'schema-panel-resource-arrow' },
+	      canMoveLeft && !hasChildren && _react2.default.createElement(
+	        'svg',
+	        { height: '18', viewBox: '0 0 24 24', width: '18',
+	          onClick: function onClick() {
+	            return onChange(-1);
+	          } },
+	        _react2.default.createElement('path', { d: 'M0 0h24v24H0z', fill: 'none' }),
+	        _react2.default.createElement('path', { d: 'M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z' })
+	      ),
+	      canMoveRight && !hasChildren && _react2.default.createElement(
+	        'svg',
+	        { height: '18', viewBox: '0 0 24 24', width: '18',
+	          onClick: function onClick() {
+	            return onChange(1);
+	          } },
+	        _react2.default.createElement('path', { d: 'M0 0h24v24H0z', fill: 'none' }),
+	        _react2.default.createElement('path', { d: 'M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z' })
+	      )
+	    )
+	  );
+	};
 
 /***/ },
 /* 110 */
@@ -10119,6 +10201,7 @@ module.exports =
 	              Button,
 	              {
 	                type: 'brand',
+	                size: 'small',
 	                onClick: function onClick() {
 	                  return _this5.createEnvironment(newEnvName);
 	                },
@@ -12013,11 +12096,12 @@ module.exports =
 	    _this.removeEntity = _this.removeEntity.bind(_this);
 	    _this.addGroup = _this.addGroup.bind(_this);
 	    _this.removeGroup = _this.removeGroup.bind(_this);
+	    _this.changeEntityLevel = _this.changeEntityLevel.bind(_this);
 	    _this.changeEntityOrder = _this.changeEntityOrder.bind(_this);
 	    _this.changeGroupOrder = _this.changeGroupOrder.bind(_this);
 	    _this.openConnectionModal = _this.openConnectionModal.bind(_this);
 	    _this.hideModal = _this.hideModal.bind(_this);
-	    _this.refreshAllPrimaryKeyNames = _this.refreshAllPrimaryKeyNames.bind(_this);
+	    _this.refreshAllPrimaryKeys = _this.refreshAllPrimaryKeys.bind(_this);
 	    _this.selectPrimaryKey = _this.selectPrimaryKey.bind(_this);
 	    _this.selectJoinKey = _this.selectJoinKey.bind(_this);
 	    return _this;
@@ -12123,9 +12207,11 @@ module.exports =
 	      });
 	      if (entityExists) return;
 	
+	      var level = 1;
 	      if (!group.resources || group.resources && group.resources.length === 0) {
 	        group.resources = [];
 	        this.openConnectionModal(group, groupIndex);
+	        level = 0;
 	      }
 	      // ADD PARENTS AS WELL ?
 	      /*if(parentRef && parentRef.length>0){
@@ -12144,10 +12230,11 @@ module.exports =
 	        name: v,
 	        __name: entity.type,
 	        provider: entity.section,
-	        joinType: 'LEFT JOIN'
+	        joinType: 'LEFT JOIN',
+	        level: level
 	      }, entity.parentRef && { parentRef: entity.parentRef }, entity.recordTypeId && { recordTypeId: entity.rtid }));
 	      change('resourceGroups', resourceGroups);
-	      this.forceUpdate();
+	      this.assignAllParents(groupIndex);
 	    }
 	  }, {
 	    key: 'newEntityKeyPress',
@@ -12190,36 +12277,92 @@ module.exports =
 	      group.mappings = mapz;
 	      group.resources.splice(rscIndex, 1);
 	      change('resourceGroups', resourceGroups);
-	      this.forceUpdate();
+	      this.assignAllParents(groupIndex);
 	    }
 	  }, {
-	    key: 'changeEntityOrder',
-	    value: function changeEntityOrder(groupIndex, iStart, iEnd) {
+	    key: 'changeEntityLevel',
+	    value: function changeEntityLevel(groupIndex, entityIndex, newLevel) {
 	      var _props7 = this.props,
 	          change = _props7.change,
 	          formValues = _props7.formValues;
 	
 	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
 	      var resources = resourceGroups[groupIndex].resources;
-	      resources.splice(iEnd, 0, resources.splice(iStart, 1)[0]);
-	      if (iEnd === 0 || iStart === 0) {
-	        this.refreshAllPrimaryKeyNames(groupIndex);
-	      }
+	      var rsc = resources[entityIndex];
+	      rsc.level = newLevel;
 	      change('resourceGroups', resourceGroups);
-	      this.forceUpdate();
+	      this.assignAllParents(groupIndex);
 	    }
 	  }, {
-	    key: 'refreshAllPrimaryKeyNames',
-	    value: function refreshAllPrimaryKeyNames(groupIndex) {
+	    key: 'changeEntityOrder',
+	    value: function changeEntityOrder(groupIndex, iStart, iEnd) {
 	      var _props8 = this.props,
 	          change = _props8.change,
 	          formValues = _props8.formValues;
 	
+	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
+	      var resources = resourceGroups[groupIndex].resources;
+	
+	      resources.splice(iEnd, 0, resources.splice(iStart, 1)[0]);
+	      if (iEnd === 0) {
+	        resources[0].level = 0;
+	        resources[0].primaryKeyResource = null;
+	        resources[0].parentNameAndProvider = null;
+	        resources[0].primaryKeyName = null;
+	        resources[0].primaryKeyParents = null;
+	        resources[1].level = 1;
+	      }
+	      if (iStart === 0) {
+	        // right now cant drag if 0
+	      }
+	      change('resourceGroups', resourceGroups);
+	      this.assignAllParents(groupIndex);
+	    }
+	  }, {
+	    key: 'assignAllParents',
+	    value: function assignAllParents(groupIndex) {
+	      var _props9 = this.props,
+	          change = _props9.change,
+	          formValues = _props9.formValues;
+	
+	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
+	      var resources = resourceGroups[groupIndex].resources;
+	
+	      resources.forEach(function (eachR, eachI) {
+	        var newParent = '';
+	        var newParentProvider = '';
+	        for (var i = eachI - 1; i >= 0; i--) {
+	          if (resources[i].level < eachR.level) {
+	            newParent = resources[i].name;
+	            newParentProvider = resources[i].provider;
+	            eachR.level = resources[i].level + 1;
+	            break;
+	          }
+	        }
+	        if (newParent && newParentProvider && (newParent + '_' + newParentProvider).toLowerCase() !== (eachR.parentNameAndProvider && eachR.parentNameAndProvider.toLowerCase())) {
+	          eachR.primaryKeyResource = newParent;
+	          eachR.parentNameAndProvider = newParent + '_' + newParentProvider;
+	          eachR.primaryKeyName = null;
+	          eachR.primaryKeyParents = null;
+	        }
+	      });
+	      change('resourceGroups', resourceGroups);
+	      this.forceUpdate();
+	    }
+	  }, {
+	    key: 'refreshAllPrimaryKeys',
+	    value: function refreshAllPrimaryKeys(groupIndex) {
+	      var _props10 = this.props,
+	          change = _props10.change,
+	          formValues = _props10.formValues;
+	
 	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
 	      var group = resourceGroups[groupIndex];
 	      group.sourceKey = null;
-	      group.resources.forEach(function (g) {
-	        g.primaryKeyName = null;
+	      group.resources.forEach(function (r) {
+	        r.primaryKeyName = null;
+	        r.primaryKeyResource = null;
+	        r.primaryKeyParents = null;
 	      });
 	      change('resourceGroups', resourceGroups);
 	      //this.openConnectionModal(group, groupIndex)
@@ -12227,9 +12370,9 @@ module.exports =
 	  }, {
 	    key: 'changeGroupOrder',
 	    value: function changeGroupOrder(iStart, iEnd) {
-	      var _props9 = this.props,
-	          change = _props9.change,
-	          formValues = _props9.formValues;
+	      var _props11 = this.props,
+	          change = _props11.change,
+	          formValues = _props11.formValues;
 	
 	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
 	      resourceGroups.splice(iEnd, 0, resourceGroups.splice(iStart, 1)[0]);
@@ -12238,9 +12381,9 @@ module.exports =
 	  }, {
 	    key: 'selectPrimaryKey',
 	    value: function selectPrimaryKey(v, field, rgi, i) {
-	      var _props10 = this.props,
-	          change = _props10.change,
-	          formValues = _props10.formValues;
+	      var _props12 = this.props,
+	          change = _props12.change,
+	          formValues = _props12.formValues;
 	
 	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
 	      var rsc = resourceGroups[rgi].resources[i];
@@ -12254,9 +12397,9 @@ module.exports =
 	  }, {
 	    key: 'selectJoinKey',
 	    value: function selectJoinKey(v, field, rgi, i) {
-	      var _props11 = this.props,
-	          change = _props11.change,
-	          formValues = _props11.formValues;
+	      var _props13 = this.props,
+	          change = _props13.change,
+	          formValues = _props13.formValues;
 	
 	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
 	      var rsc = resourceGroups[rgi].resources[i];
@@ -12272,15 +12415,15 @@ module.exports =
 	    value: function render() {
 	      var _this2 = this;
 	
-	      var _props12 = this.props,
-	          inputs = _props12.inputs,
-	          handleSubmit = _props12.handleSubmit,
-	          nav = _props12.nav,
-	          formValues = _props12.formValues,
-	          step = _props12.step,
-	          reset = _props12.reset,
-	          wizard = _props12.wizard,
-	          change = _props12.change;
+	      var _props14 = this.props,
+	          inputs = _props14.inputs,
+	          handleSubmit = _props14.handleSubmit,
+	          nav = _props14.nav,
+	          formValues = _props14.formValues,
+	          step = _props14.step,
+	          reset = _props14.reset,
+	          wizard = _props14.wizard,
+	          change = _props14.change;
 	
 	      if (!formValues['resourceGroups']) return _react2.default.createElement('div', null);
 	
@@ -12345,7 +12488,8 @@ module.exports =
 	              changeEntityOrder: this.changeEntityOrder, step: step,
 	              destinationSchema: destinationSchema, isReverse: isReverse,
 	              selectPrimaryKey: this.selectPrimaryKey,
-	              selectJoinKey: this.selectJoinKey, change: change }),
+	              selectJoinKey: this.selectJoinKey, change: change,
+	              changeEntityLevel: this.changeEntityLevel }),
 	            _react2.default.createElement(_bundleTable2.default, { openConnectionModal: this.openConnectionModal, mode: formValues.direction })
 	          ),
 	          _react2.default.createElement('br', null)