@lingk/sync 0.0.88 → 0.0.90

package/build/main.js

@@ -5475,6 +5475,7 @@ module.exports =
 	  }, {
 	    key: 'showOverflow',
 	    value: function showOverflow() {
+	      console.log('showOverflow');
 	      this.setState({ overflowHidden: false });
 	    }
 	  }, {
@@ -18962,6 +18963,11 @@ module.exports =
 	
 	function callGetPiConfig(tenantId, accountId, piGuid, providers, metadataEndpoints) {
 	  // a wizard config already exists
+	  var source = metadataEndpoints.source,
+	      sourceApi = metadataEndpoints.sourceApi,
+	      destination = metadataEndpoints.destination,
+	      destinationApi = metadataEndpoints.destinationApi;
+	
 	  if (piGuid) {
 	    return function (dispatch, getState, api) {
 	      var _getState13 = getState(),
@@ -18991,12 +18997,12 @@ module.exports =
 	          type: types.SET_WIZARD_SAVED_CONFIGURATION,
 	          data: config
 	        });
-	        return Promise.all([dispatch(tryGetMetadata(tenantId, accountId, 'source', providers.source, metadataEndpoints.source, savedSourceEndpoint)), dispatch(tryGetMetadata(tenantId, accountId, 'destination', providers.destination, metadataEndpoints.destination, savedDestinationEndpoint)), dispatch(callGetMapping(tenantId, accountId, PI.SchemaMappingGuid)), dispatch(callGetBundles(tenantId, accountId, PI.BundlePackGuid)), dispatch(callGetTrigger(PI.TransformerBaseId))]);
+	        return Promise.all([dispatch(tryGetMetadata(tenantId, accountId, 'source', providers.source, source, sourceApi, savedSourceEndpoint)), dispatch(tryGetMetadata(tenantId, accountId, 'destination', providers.destination, destination, destinationApi, savedDestinationEndpoint)), dispatch(callGetMapping(tenantId, accountId, PI.SchemaMappingGuid)), dispatch(callGetBundles(tenantId, accountId, PI.BundlePackGuid)), dispatch(callGetTrigger(PI.TransformerBaseId))]);
 	      });
 	    };
 	  } else return function (dispatch) {
 	    // FIRST TIME!
-	    return Promise.all([dispatch(tryGetMetadata(tenantId, accountId, 'source', providers.source, metadataEndpoints.source, null)), dispatch(tryGetMetadata(tenantId, accountId, 'destination', providers.destination, metadataEndpoints.destination, null))]);
+	    return Promise.all([dispatch(tryGetMetadata(tenantId, accountId, 'source', providers.source, source, sourceApi, null)), dispatch(tryGetMetadata(tenantId, accountId, 'destination', providers.destination, destination, destinationApi, null))]);
 	  };
 	}
 	
@@ -19044,10 +19050,10 @@ module.exports =
 	  };
 	}
 	
-	function tryGetMetadata(tenantId, appId, mode, providerType, urlSuffix, savedEndpoint) {
+	function tryGetMetadata(tenantId, appId, mode, providerType, urlSuffix, apiUrl, savedEndpoint) {
 	  if (urlSuffix) {
 	    return function (dispatch) {
-	      return dispatch(callGetProviderMetadata(tenantId, appId, urlSuffix, mode, providerType));
+	      return dispatch(callGetProviderMetadata(tenantId, appId, urlSuffix, apiUrl, mode, providerType));
 	    };
 	  } else if (savedEndpoint) {
 	    return function (dispatch) {
@@ -19058,15 +19064,13 @@ module.exports =
 	  };
 	}
 	
-	function callGetProviderMetadata(tenantId, appId, urlSuffix, mode, providerType) {
+	function callGetProviderMetadata(tenantId, appId, urlSuffix, apiUrl, mode, providerType) {
 	  return function (dispatch, getState, api) {
 	    var _getState16 = getState(),
 	        config = _getState16.config;
 	
-	    var AGENT_API_URL = config.AGENT_API_URL;
-	
 	    return api.get(tenantId + '/' + appId + '/' + urlSuffix, {
-	      endpoint: AGENT_API_URL
+	      endpoint: config[apiUrl]
 	    }).then(function (res) {
 	      dispatch({
 	        type: types.SET_WIZARD_METADATA,
@@ -21002,6 +21006,8 @@ module.exports =
 	    _this.openConnectionModal = _this.openConnectionModal.bind(_this);
 	    _this.hideModal = _this.hideModal.bind(_this);
 	    _this.refreshAllPrimaryKeyNames = _this.refreshAllPrimaryKeyNames.bind(_this);
+	    _this.selectPrimaryKey = _this.selectPrimaryKey.bind(_this);
+	    _this.selectJoinKey = _this.selectJoinKey.bind(_this);
 	    return _this;
 	  }
 	
@@ -21192,20 +21198,48 @@ module.exports =
 	      resourceGroups.splice(iEnd, 0, resourceGroups.splice(iStart, 1)[0]);
 	      change('resourceGroups', resourceGroups);
 	    }
+	  }, {
+	    key: 'selectPrimaryKey',
+	    value: function selectPrimaryKey(v, parents, rgi, i) {
+	      var _props10 = this.props,
+	          change = _props10.change,
+	          formValues = _props10.formValues;
+	
+	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
+	      var rsc = resourceGroups[rgi].resources[i];
+	      rsc.primaryKeyName = v;
+	      rsc.primaryKeyParents = parents;
+	      change('resourceGroups', resourceGroups);
+	      this.forceUpdate();
+	    }
+	  }, {
+	    key: 'selectJoinKey',
+	    value: function selectJoinKey(v, parents, rgi, i) {
+	      var _props11 = this.props,
+	          change = _props11.change,
+	          formValues = _props11.formValues;
+	
+	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
+	      var rsc = resourceGroups[rgi].resources[i];
+	      rsc.joinKeyName = v;
+	      rsc.joinKeyParents = parents;
+	      change('resourceGroups', resourceGroups);
+	      this.forceUpdate();
+	    }
 	  }, {
 	    key: 'render',
 	    value: function render() {
 	      var _this2 = this;
 	
-	      var _props10 = this.props,
-	          inputs = _props10.inputs,
-	          handleSubmit = _props10.handleSubmit,
-	          nav = _props10.nav,
-	          formValues = _props10.formValues,
-	          step = _props10.step,
-	          reset = _props10.reset,
-	          wizard = _props10.wizard,
-	          change = _props10.change;
+	      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;
 	
 	      if (!formValues['resourceGroups']) return _react2.default.createElement('div', null);
 	
@@ -21264,7 +21298,10 @@ module.exports =
 	              changeGroupOrder: this.changeGroupOrder, step: step,
 	              inputs: inputs, addDefaultEntity: this.addDefaultEntity },
 	            _react2.default.createElement(_schemaAccordion2.default, { sourceSchema: sourceSchema, removeEntity: this.removeEntity,
-	              changeEntityOrder: this.changeEntityOrder, step: step, destinationSchema: destinationSchema }),
+	              changeEntityOrder: this.changeEntityOrder, step: step,
+	              destinationSchema: destinationSchema,
+	              selectPrimaryKey: this.selectPrimaryKey,
+	              selectJoinKey: this.selectJoinKey }),
 	            _react2.default.createElement(_bundleTable2.default, { openConnectionModal: this.openConnectionModal })
 	          ),
 	          _react2.default.createElement('br', null)
@@ -21550,7 +21587,7 @@ module.exports =
 	            var groupsBeforeThis = resourceGroups.slice(0, i);
 	            var groupBeforeThisIndex = 0;
 	            groupsBeforeThis.forEach(function (g, idx) {
-	              if (group.resources.find(function (r) {
+	              if (group.resources && group.resources.find(function (r) {
 	                return r.name === g.name;
 	              })) {
 	                groupBeforeThisIndex = idx + 1;
@@ -21558,15 +21595,15 @@ module.exports =
 	            });
 	
 	            var groupsAfterThis = resourceGroups.slice(i + 1);
-	            var groupsAfterThisContainThisResource = groupsAfterThis.find(function (g) {
-	              return g.resources.find(function (r) {
+	            var groupsAfterThisContainThisResource = groupsAfterThis && groupsAfterThis.find(function (g) {
+	              return g.resources && 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) {
+	              if (g.resources && g.resources.find(function (r) {
 	                return r.name === group.name;
 	              })) {
 	                groupAfterThisIndex = idx;
@@ -21732,7 +21769,8 @@ module.exports =
 	            resourceFromName: group.sourceKeysObjects[i],
 	            propertyFromName: sk,
 	            resourceToName: group.name,
-	            propertyToName: group.destinationKeys[i]
+	            propertyToName: group.destinationKeys[i],
+	            propertyFromParents: group.sourceKeysParents[i]
 	          }, rsc.provider === step.destinationProvider && { dataSourceIsDestinationEntity: true });
 	          group.mappings = group.mappings || [];
 	          group.mappings.push(map);
@@ -21746,6 +21784,7 @@ module.exports =
 	        var map = Object.assign({
 	          isExternalKeyMapping: true,
 	          resourceFromName: group.lingkSourceKeyObject,
+	          propertyFromParents: group.lingkSourceKeyParents,
 	          propertyFromName: group.lingkSourceKey,
 	          resourceToName: group.name,
 	          propertyToName: 'Lingk External Id'
@@ -21786,36 +21825,41 @@ module.exports =
 	    props.update();
 	  };
 	
-	  var selectSourceKeyForLingk = function selectSourceKeyForLingk(key, section) {
+	  var selectSourceKeyForLingk = function selectSourceKeyForLingk(key, section, parents) {
 	    var rgs = [].concat(_toConsumableArray(resourceGroups));
 	    var group = rgs[bundleIndex];
 	    group.lingkSourceKey = key;
 	    group.lingkSourceKeyObject = section;
+	    group.lingkSourceKeyParents = parents;
 	    change('resourceGroups', rgs);
 	    props.update();
 	  };
 	
-	  var selectCustomSourceKey = function selectCustomSourceKey(key, section, i) {
+	  var selectCustomSourceKey = function selectCustomSourceKey(key, section, i, parents) {
 	    var rgs = [].concat(_toConsumableArray(resourceGroups));
 	    var group = rgs[bundleIndex];
 	    if (i === 0) {
 	      group.sourceKeys = [key];
 	      group.sourceKeysObjects = [section];
+	      group.sourceKeysParents = [parents];
 	    } else {
 	      group.sourceKeys[i] = key;
 	      group.sourceKeysObjects[i] = section;
+	      group.sourceKeysParents[i] = parents;
 	    }
 	    change('resourceGroups', rgs);
 	    props.update();
 	  };
 	
-	  var selectCustomDestinationKey = function selectCustomDestinationKey(key, i) {
+	  var selectCustomDestinationKey = function selectCustomDestinationKey(key, i, parents) {
 	    var rgs = [].concat(_toConsumableArray(resourceGroups));
 	    var group = rgs[bundleIndex];
 	    if (i === 0) {
 	      group.destinationKeys = [key];
+	      group.destinationKeysParents = [parents];
 	    } else {
 	      group.destinationKeys[i] = key;
+	      group.destinationKeysParents[i] = parents;
 	    }
 	    change('resourceGroups', rgs);
 	    props.update();
@@ -21910,8 +21954,8 @@ module.exports =
 	                'div',
 	                { className: 'external-keys-column' },
 	                _react2.default.createElement(Select, { label: sk || 'Choose Key', menuItemStyle: { height: 20, padding: '1px 8px' },
-	                  onSelect: function onSelect(v, iii, rtid, section) {
-	                    return selectCustomSourceKey(v, section, i);
+	                  onSelect: function onSelect(v, iii, rtid, section, parents) {
+	                    return selectCustomSourceKey(v, section, i, parents);
 	                  },
 	                  type: 'brand', fieldPropLabel: 'label',
 	                  values: vals, sectionLabels: sectionLabels, sectionLabelSuffix: 'Fields',
@@ -21928,8 +21972,8 @@ module.exports =
 	                { className: 'external-keys-column' },
 	                _react2.default.createElement(Select, { label: resourceGroups[bundleIndex].destinationKeys && resourceGroups[bundleIndex].destinationKeys[i] || 'Choose Key',
 	                  menuItemStyle: { height: 20, padding: '1px 8px' },
-	                  onSelect: function onSelect(v, iii, rtid, section) {
-	                    return selectCustomDestinationKey(v, i);
+	                  onSelect: function onSelect(v, iii, rtid, section, parents) {
+	                    return selectCustomDestinationKey(v, i, parents);
 	                  }, type: 'brand',
 	                  values: [destinationSchema && destinationSchema.find(function (defaultRsc) {
 	                    return defaultRsc.name === bundle.name;
@@ -22014,8 +22058,8 @@ module.exports =
 	            { className: 'external-keys-column' },
 	            _react2.default.createElement(Select, { label: resourceGroups[bundleIndex].lingkSourceKey || 'Choose Key',
 	              menuItemStyle: { height: 20, padding: '1px 8px' },
-	              onSelect: function onSelect(v, i, rtid, section) {
-	                return selectSourceKeyForLingk(v, section);
+	              onSelect: function onSelect(v, i, rtid, section, parents) {
+	                return selectSourceKeyForLingk(v, section, parents);
 	              }, type: 'brand',
 	              values: vals, sectionLabels: sectionLabels, sectionLabelSuffix: 'Fields', fieldPropLabel: 'label',
 	              selectedValues: [{ label: resourceGroups[bundleIndex].lingkSourceKey }]
@@ -22070,6 +22114,51 @@ module.exports =
 	
 	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 	
+	var SourceField = function SourceField(props) {
+	  var field = props.field,
+	      selectedField = props.selectedField,
+	      filteredMappings = props.filteredMappings,
+	      click = props.click,
+	      parents = props.parents;
+	
+	  var style = {
+	    paddingLeft: 5,
+	    background: selectedField && selectedField === field.label ? '#dfe0e0' : 'initial',
+	    fontWeight: selectedField === field.name || filteredMappings && Object.values(filteredMappings).includes(field.label) ? 'bold' : 'normal'
+	  };
+	  if (filteredMappings && Object.values(filteredMappings).includes(field)) {
+	    style['color'] = 'black';
+	  }
+	  return _react2.default.createElement(
+	    'div',
+	    null,
+	    _react2.default.createElement(
+	      'div',
+	      { className: field.object ? '' : 'wizard-map-field',
+	        style: field.object ? { paddingLeft: 5, textDecoration: 'underline', color: '#AAAAAA',
+	          fontWeight: 'bold' } : style,
+	        onClick: function onClick() {
+	          if (!field.object) {
+	            click(field.label, parents);
+	          }
+	        }
+	      },
+	      field.label
+	    ),
+	    _react2.default.createElement(
+	      'div',
+	      { style: { paddingLeft: 12 } },
+	      field.object && field.object.properties.map(function (nestedField, i) {
+	        var newParent = field.label;
+	        var parentsArray = parents.concat(newParent);
+	        return _react2.default.createElement(SourceField, { key: i, field: nestedField, selectedField: selectedField,
+	          filteredMappings: filteredMappings, parents: parentsArray,
+	          click: click });
+	      })
+	    )
+	  );
+	};
+	
 	var MapAccordion = function (_React$Component) {
 	  _inherits(MapAccordion, _React$Component);
 	
@@ -22080,6 +22169,7 @@ module.exports =
 	
 	    _this.state = {
 	      selectedField: null,
+	      selectedFieldParents: null,
 	      customFieldValue: '',
 	      addNewButtonText: 'Add New'
 	    };
@@ -22203,12 +22293,13 @@ module.exports =
 	          resourceFromName: selectedEntity.name,
 	          resourceToName: group,
 	          propertyFromName: this.state.selectedField,
+	          propertyFromParents: this.state.selectedFieldParents,
 	          propertyToName: field,
 	          transformations: [{ type: transform }],
 	          dataSourceIsDestinationEntity: selectedEntity.isDestinationEntity
 	        });
 	        change('resourceGroups', resourceGroups);
-	        this.setState({ selectedField: null });
+	        this.setState({ selectedField: null, selectedFieldParents: null });
 	        this.props.update();
 	        this.props.disableMultiple();
 	      }
@@ -22318,9 +22409,8 @@ module.exports =
 	                          'div',
 	                          { className: 'accordion-panel-collapse',
 	                            style: {
-	                              height: schema && selectedEntity.name === rsc.name ? schema.find(function (r) {
-	                                return r.name === rsc.name;
-	                              }).properties.length * 18 + 19 : 0,
+	                              //height:schema && selectedEntity.name===rsc.name ? schema.find(r=>r.name===rsc.name).properties.length * 18 + 19 : 0,
+	                              maxHeight: schema && selectedEntity.name === rsc.name ? 2000 : 0,
 	                              padding: '0 6px'
 	                            }
 	                          },
@@ -22328,23 +22418,13 @@ module.exports =
 	                          schema && schema.find(function (r) {
 	                            return r.name === rsc.name;
 	                          }).properties.map(function (field, ii) {
-	                            var style = {
-	                              paddingLeft: 5,
-	                              background: selectedField && selectedField === field.label ? '#dfe0e0' : 'initial',
-	                              fontWeight: selectedField === field.name || filteredMappings && Object.values(filteredMappings).includes(field.label) ? 'bold' : 'normal'
-	                            };
-	                            if (filteredMappings && Object.values(filteredMappings).includes(field)) {
-	                              style['color'] = 'black';
-	                            }
-	                            return _react2.default.createElement(
-	                              'div',
-	                              { key: ii, className: 'wizard-map-field',
-	                                style: style, onClick: function onClick() {
-	                                  return _this4.setState({ selectedField: field.label });
-	                                }
-	                              },
-	                              field.label
-	                            );
+	                            return _react2.default.createElement(SourceField, { key: ii, field: field, selectedField: selectedField,
+	                              filteredMappings: filteredMappings, parents: [],
+	                              click: function click(v, parents) {
+	                                return _this4.setState({
+	                                  selectedField: v, selectedFieldParents: parents
+	                                });
+	                              } });
 	                          }),
 	                          _react2.default.createElement('div', { style: { height: 9 } })
 	                        )
@@ -22508,6 +22588,14 @@ module.exports =
 	            minHeight: 18
 	          } },
 	        mapz && mapz.map(function (m, iv) {
+	          var fromString = '';
+	          if (m.propertyFromParents && m.propertyFromParents.length > 0) {
+	            m.propertyFromParents.forEach(function (p) {
+	              fromString += p;
+	              fromString += ': ';
+	            });
+	          }
+	          fromString += m.propertyFromName;
 	          return _react2.default.createElement(
 	            'div',
 	            { key: iv, style: { height: 19, minWidth: 220, whiteSpace: 'nowrap' } },
@@ -22522,7 +22610,7 @@ module.exports =
 	            _react2.default.createElement(
 	              'div',
 	              { className: 'mapping-entry' },
-	              m.propertyFromName + ' \u2192 ' + m.propertyToName
+	              fromString + ' \u2192 ' + m.propertyToName
 	            )
 	          );
 	        })
@@ -22825,6 +22913,8 @@ module.exports =
 	          addDefaultEntity = _props3.addDefaultEntity,
 	          resourceGroupIndex = _props3.resourceGroupIndex,
 	          selectedEntities = _props3.selectedEntities,
+	          selectPrimaryKey = _props3.selectPrimaryKey,
+	          selectJoinKey = _props3.selectJoinKey,
 	          toggle = _props3.toggle,
 	          leftClicked = _props3.leftClicked,
 	          sourceSchema = _props3.sourceSchema,
@@ -22855,7 +22945,7 @@ module.exports =
 	        _react2.default.createElement(
 	          Tooltip,
 	          { nubbin: 'left-top', popStyle: { width: 250 },
-	            wrapStyle: { position: 'absolute', left: 96, top: 6, zIndex: 6001 } },
+	            wrapStyle: { position: 'absolute', left: 106, top: 7, zIndex: 6001 } },
 	          _react2.default.createElement(
 	            'p',
 	            null,
@@ -22951,7 +23041,7 @@ module.exports =
 	                                  _this3.props.pickEntity({ name: rsc.name,
 	                                    isDestinationEntity: rsc.provider === step.destinationProvider });
 	                                } },
-	                              rsc.joinKeyName && rsc.primaryKeyName ? rsc.joinKeyName + ' = ' + rsc.primaryKeyName : 'Configure Join'
+	                              rsc.joinKeyName && rsc.primaryKeyName ? rsc.primaryKeyName + ' = ' + rsc.joinKeyName : 'Configure Join'
 	                            ) : null
 	                          )
 	                        ),
@@ -22972,7 +23062,7 @@ module.exports =
 	                              _react2.default.createElement(
 	                                Tooltip,
 	                                { nubbin: 'left-top', popStyle: { width: 180 },
-	                                  wrapStyle: { position: 'absolute', left: 140, top: 2, zIndex: 6003 } },
+	                                  wrapStyle: { position: 'absolute', left: 148, top: 2, zIndex: 6003 } },
 	                                _react2.default.createElement(
 	                                  'p',
 	                                  null,
@@ -22981,21 +23071,23 @@ module.exports =
 	                                  ')'
 	                                )
 	                              ),
-	                              _react2.default.createElement(_reduxForm.Field, { component: inputs.rfSelect, type: 'input',
-	                                defaultLabel: group.resources[0].name + ' Join Key', colorType: 'brand',
-	                                selectedValue: group.resources[i].primaryKeyName, onClick: function onClick() {
-	                                  showOverflow();
+	                              _react2.default.createElement(Select, { label: group.resources[i] && group.resources[i].primaryKeyName ? group.resources[i].primaryKeyName : 'Primary Join Key',
+	                                onSelect: function onSelect(v, a, b, c, parents) {
+	                                  return selectPrimaryKey(v, parents, resourceGroupIndex, i);
 	                                },
+	                                onClick: showOverflow,
+	                                type: 'neutral',
 	                                values: 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 : sourceSchema && sourceSchema.find(function (defaultRsc) {
 	                                  return defaultRsc.name === group.resources[0].name;
-	                                }) && sourceSchema.find(function (defaultRsc) {
+	                                }) && [sourceSchema.find(function (defaultRsc) {
 	                                  return defaultRsc.name === group.resources[0].name;
-	                                }).properties,
-	                                name: 'resourceGroups.' + resourceGroupIndex + '.resources.' + i + '.primaryKeyName'
+	                                }).properties],
+	                                sectionLabels: [group.resources[0].name],
+	                                fieldPropLabel: 'label'
 	                              })
 	                            ),
 	                            _react2.default.createElement(
@@ -23018,21 +23110,23 @@ module.exports =
 	                                  '), whose value should match the Primary Object Join Key.'
 	                                )
 	                              ),
-	                              _react2.default.createElement(_reduxForm.Field, { component: inputs.rfSelect, type: 'input',
-	                                defaultLabel: rsc.name + ' Join Key', colorType: 'brand',
-	                                selectedValue: group.resources[i].joinKeyName, onClick: function onClick() {
-	                                  showOverflow();
+	                              _react2.default.createElement(Select, { label: group.resources[i] && group.resources[i].joinKeyName ? group.resources[i].joinKeyName : 'Join Key',
+	                                onSelect: function onSelect(v, a, b, c, parents) {
+	                                  return selectJoinKey(v, parents, resourceGroupIndex, i);
 	                                },
+	                                onClick: showOverflow,
+	                                type: 'neutral',
 	                                values: rsc.provider === step.destinationProvider ? destinationSchema && destinationSchema.find(function (defaultRsc) {
 	                                  return defaultRsc.name === rsc.name;
 	                                }) && destinationSchema.find(function (defaultRsc) {
 	                                  return defaultRsc.name === rsc.name;
 	                                }).properties : sourceSchema && sourceSchema.find(function (defaultRsc) {
 	                                  return defaultRsc.name === rsc.name;
-	                                }) && sourceSchema.find(function (defaultRsc) {
+	                                }) && [sourceSchema.find(function (defaultRsc) {
 	                                  return defaultRsc.name === rsc.name;
-	                                }).properties,
-	                                name: 'resourceGroups.' + resourceGroupIndex + '.resources.' + i + '.joinKeyName'
+	                                }).properties],
+	                                sectionLabels: [group.resources[i].name],
+	                                fieldPropLabel: 'label'
 	                              })
 	                            ),
 	                            _react2.default.createElement(
@@ -23564,6 +23658,8 @@ module.exports =
 	      var mappings = [];
 	      bundles.forEach(function (group, index) {
 	
+	        console.log(group);
+	
 	        // first get target resource
 	        var destinationResource = _this2.props.wizard.destinationMetadata ? _this2.props.wizard.destinationMetadata.find(function (rsc) {
 	          return rsc.name === group.name;
@@ -23579,6 +23675,7 @@ module.exports =
 	        if (!group.customExternalKeys) {
 	          group.sourceKeys = [group.lingkSourceKey];
 	          group.sourceKeysObjects = [group.lingkSourceKeyObject];
+	          group.sourceKeysParents = [group.lingkSourceKeyParents];
 	          group.destinationKeys = ['lingk__Lingk_External_Id__c'];
 	        } else {
 	          (function () {
@@ -23601,6 +23698,7 @@ module.exports =
 	        // get resource + name of sourceKeys
 	        var sourceKeys = [];
 	        var sourceKeysObjects = [];
+	        var sourceKeysParents = [];
 	        group.sourceKeys && group.sourceKeys.forEach(function (sk, i) {
 	          var sourceKeyResourceProvider = group.resources.find(function (r) {
 	            return r.name === group.sourceKeysObjects[i];
@@ -23612,22 +23710,51 @@ module.exports =
 	
 	          if (sourceResource) {
 	            sourceKeysObjects.push(sourceResource.type);
-	            if (sourceResource.properties && sourceResource.properties.find(function (prop) {
-	              return prop.label === sk;
-	            })) {
-	              sourceKeys.push(sourceResource.properties.find(function (prop) {
+	            if (group.sourceKeysParents[i].length > 0) {
+	              (function () {
+	                // nested
+	                var nestedRsc = sourceResource;
+	                var tempParentsArray = [];
+	                group.sourceKeysParents[i].forEach(function (skp) {
+	                  if (nestedRsc.properties && nestedRsc.properties.find(function (prop) {
+	                    return prop.label === skp;
+	                  })) {
+	                    var skpProp = nestedRsc.properties.find(function (prop) {
+	                      return prop.label === skp;
+	                    });
+	                    tempParentsArray.push(skpProp.name);
+	                    nestedRsc = skpProp.object;
+	                  }
+	                });
+	                sourceKeysParents.push(JSON.stringify(tempParentsArray));
+	                if (nestedRsc.properties && nestedRsc.properties.find(function (prop) {
+	                  return prop.label === sk;
+	                })) {
+	                  sourceKeys.push(nestedRsc.properties.find(function (prop) {
+	                    return prop.label === sk;
+	                  }).name);
+	                }
+	              })();
+	            } else {
+	              // non-nested
+	              if (sourceResource.properties && sourceResource.properties.find(function (prop) {
 	                return prop.label === sk;
-	              }).name);
+	              })) {
+	                sourceKeys.push(sourceResource.properties.find(function (prop) {
+	                  return prop.label === sk;
+	                }).name);
+	              }
 	            }
 	          }
 	        });
 	        group.sourceKeys = sourceKeys;
 	        group.sourceKeysObjects = sourceKeysObjects;
+	        group.sourceKeysParents = sourceKeysParents;
 	
 	        // MAPPINGS
 	        if (group.mappings) {
 	          group.mappings.forEach(function (singleMapping) {
-	
+	            console.log(singleMapping);
 	            // get mapping source resource (check both metadatas)
 	            var dataSourceMetadata = singleMapping.dataSourceIsDestinationEntity ? _this2.props.wizard.destinationMetadata : _this2.props.wizard.sourceMetadata;
 	            var sourceResource = dataSourceMetadata.find(function (rsc) {
@@ -23668,6 +23795,7 @@ 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;
 	        }
 	
 	        // BUNDLES
@@ -23734,7 +23862,7 @@ module.exports =
 	          accountId = _props2.accountId,
 	          tenantId = _props2.tenantId;
 	
-	      if (true) {
+	      if (false) {
 	        actions.submitWizardData(tenantId, accountId, bundles, mappings, configuration, formValues.title || 'Banner for Salesforce', formValues.deployment || null, typeId, typeGuid, onGenerate, onFinish, this.props.wizard.destinationMetadata || []);
 	        onSubmit({ complete: formValues.hasOwnProperty('deployment') });
 	      }
@@ -23797,7 +23925,7 @@ module.exports =
 	          )
 	        );
 	      } else {
-	        var _ret2 = function () {
+	        var _ret3 = function () {
 	          var page = currentPage || 1; //(wizard.savedConfiguration && parseInt(wizard.savedConfiguration.currentPage, 10)) || 1
 	          return {
 	            v: _react2.default.createElement(
@@ -23843,7 +23971,7 @@ module.exports =
 	          };
 	        }();
 	
-	        if ((typeof _ret2 === 'undefined' ? 'undefined' : _typeof(_ret2)) === "object") return _ret2.v;
+	        if ((typeof _ret3 === 'undefined' ? 'undefined' : _typeof(_ret3)) === "object") return _ret3.v;
 	      }
 	    }
 	  }]);
@@ -24045,7 +24173,9 @@ module.exports =
 	      };
 	      var metadataEndpoints = {
 	        source: wizard.source.metadataEndpoint || null,
-	        destination: wizard.destination.metadataEndpoint || null
+	        sourceApi: wizard.source.metadataApi || null,
+	        destination: wizard.destination.metadataEndpoint || null,
+	        destinationApi: wizard.destination.metadataApi || null
 	      };
 	      this.setState({
 	        steps: stepList,