@lingk/sync 0.0.52 → 0.0.53

package/build/main.js

@@ -4386,13 +4386,13 @@ module.exports =
 	module.exports = require("react");
 
 /***/ },
-/* 3 */
+/* 3 */,
+/* 4 */
 /***/ function(module, exports) {
 
 	module.exports = require("redux-form");
 
 /***/ },
-/* 4 */,
 /* 5 */
 /***/ function(module, exports, __webpack_require__) {
 
@@ -4447,7 +4447,8 @@ module.exports =
 	            return props.reset();
 	          }, 100);
 	        },
-	        style: { float: 'right', marginRight: 14 }
+	        style: { float: 'right', marginRight: 14 },
+	        disabled: props.finishDisabled
 	      },
 	      props.nav.last ? 'Finish' : 'Save And Exit'
 	    )
@@ -4521,28 +4522,43 @@ module.exports =
 	    if (wizard.savedBundles && wizard.savedBundles.bundles) {
 	      var resourceGroups = wizard.savedBundles.bundles.map(function (bundle, index) {
 	
-	        //get bundle resource and destinationKey
+	        console.log(bundle);
+	
+	        // get bundle resource
 	        var bundleResource = wizard.destinationMetadata.find(function (rsc) {
 	          return rsc.type === bundle.name;
 	        });
-	        var bundleProperty = bundleResource.properties.find(function (prop) {
-	          return prop.name === bundle.destinationKey;
+	        //get bundle destinationKeys
+	        var destinationKeys = bundle.destinationKeys.map(function (dk) {
+	          var bundleProperty = bundleResource.properties.find(function (prop) {
+	            return prop.name === dk;
+	          });
+	          return bundleProperty && bundleProperty.label || 'externalId';
 	        });
 	
-	        //get resource and sourceKey from first rsc in bundle (check both metadatas)
-	        var primaryResourceProvider = bundle.resources[0].provider.charAt(0).toUpperCase() + bundle.resources[0].provider.slice(1).replace('Reader', '');
-	        var primaryDataSourceMetadata = primaryResourceProvider === step.destinationProvider ? wizard.destinationMetadata : wizard.sourceMetadata;
-	        var sourceKeyResource = primaryDataSourceMetadata.find(function (r) {
-	          return r.type === bundle.resources[0].resourceName;
-	        });
-	        var sourceKeyProperty = sourceKeyResource.properties.find(function (prop) {
-	          return prop.name === bundle.sourceKey;
+	        var sourceKeysObjects = [];
+	        var sourceKeys = bundle.sourceKeys.map(function (sk, i) {
+	          var sourceKeyResourceObj = bundle.resources.find(function (r) {
+	            return r.resourceName === bundle.sourceKeysObjects[i];
+	          });
+	          var sourceKeyResourceProvider = sourceKeyResourceObj.provider.slice(1).replace('Reader', '');
+	          var primaryDataSourceMetadata = sourceKeyResourceProvider === step.destinationProvider ? wizard.destinationMetadata : wizard.sourceMetadata;
+	          var sourceKeyResource = primaryDataSourceMetadata.find(function (r) {
+	            return r.type === bundle.sourceKeysObjects[i];
+	          });
+	          sourceKeysObjects.push(sourceKeyResource.name);
+	          var sourceKeyProperty = sourceKeyResource.properties.find(function (prop) {
+	            return prop.name === sk;
+	          });
+	          return sourceKeyProperty.label;
 	        });
 	
 	        return {
 	          name: bundleResource.name,
-	          sourceKey: sourceKeyProperty.label,
-	          destinationKey: bundleProperty.label,
+	          sourceKeys: sourceKeys,
+	          sourceKeysObjects: sourceKeysObjects,
+	          destinationKeys: destinationKeys,
+	          customExternalKeys: bundle.customExternalKeys,
 	          provider: bundle.provider.charAt(0).toUpperCase() + bundle.provider.slice(1),
 	          resources: bundle.resources && bundle.resources.map(function (rsc) {
 	
@@ -4556,7 +4572,9 @@ module.exports =
 	              return prop.name === rsc.joinKeyName;
 	            });
 	
-	            //get resource and primaryKey for first resource in bundle (check both metadatas, already have correct one)
+	            //get resource and primaryKey for first resource in bundle (check both metadatas)
+	            var primaryResourceProvider = bundle.resources[0].provider.charAt(0).toUpperCase() + bundle.resources[0].provider.slice(1).replace('Reader', '');
+	            var primaryDataSourceMetadata = primaryResourceProvider === step.destinationProvider ? wizard.destinationMetadata : wizard.sourceMetadata;
 	            var rscPrimaryResource = primaryDataSourceMetadata.find(function (r) {
 	              return r.type === bundle.resources[0].resourceName;
 	            });
@@ -4593,7 +4611,7 @@ module.exports =
 	              resourceToName: destinationResource.name,
 	              propertyToName: destinationProperty.label,
 	              transformations: m.transformations && m.transformations.length > 0 ? m.transformations : [{ type: 'none' }]
-	            }, m.isDestinationResource && { dataSourceIsDestinationEntity: true });
+	            }, m.isDestinationResource && { dataSourceIsDestinationEntity: true }, m.isExternalKeyMapping && { isExternalKeyMapping: true });
 	          })
 	        };
 	      });
@@ -5636,9 +5654,9 @@ module.exports =
 	          isBundleStep ? _react2.default.createElement(
 	            'div',
 	            { style: { position: 'absolute', right: 0, top: -2, zIndex: 99 } },
-	            _react2.default.createElement(Select, { label: 'Target', type: 'brand', style: { height: 40 }, menuAlign: 'right',
-	              onSelect: this.addDefaultResourceGroup, values: destinationSchema, title: 'Add Sync Operation',
-	              minWidth: 260
+	            _react2.default.createElement(Select, { label: '' + step.destinationProvider, type: 'brand', style: { height: 40 }, menuAlign: 'right',
+	              onSelect: this.addDefaultResourceGroup, values: destinationSchema, title: 'Add Target Object',
+	              minWidth: 260, fieldPropLabel: 'name'
 	            })
 	          ) : null
 	        ),
@@ -16976,7 +16994,7 @@ module.exports =
 	  };
 	}
 	
-	function callGenerateRecipe(tenantId, appId, typeGuid, title, piGuid, mappingGuidDeleteThis) {
+	function callGenerateRecipe(tenantId, appId, typeGuid, title, piGuid, mappingGuid, destinationMetadata) {
 	  return function (dispatch, getState, api) {
 	    var _getState6 = getState(),
 	        config = _getState6.config;
@@ -16989,7 +17007,8 @@ module.exports =
 	        "integrationTypeId": 2, // 1 = Lingk, 2 = Salesforce
 	        "name": title,
 	        "integrationTypeGuid": typeGuid,
-	        "schemaMappingGuid": mappingGuidDeleteThis
+	        "schemaMappingGuid": mappingGuid,
+	        "destinationMetadata": destinationMetadata
 	      }
 	    }).then(function (res) {
 	      return res;
@@ -16997,16 +17016,17 @@ module.exports =
 	  };
 	}
 	
-	function submitWizardData(tenantId, appId, bundles, mappings, configuration, title, deployment, typeGuid, onGenerate, onFinish) {
+	function submitWizardData(tenantId, appId, bundles, mappings, configuration, title, deployment, typeGuid, onGenerate, onFinish, destinationMetadata) {
 	  return function (dispatch) {
 	    dispatch(callPostBundles(tenantId, appId, bundles)).then(function (bundlePack) {
 	      dispatch(callPostMapping(tenantId, appId, mappings)).then(function (map) {
 	        dispatch(callPostProductizedIntegration(tenantId, appId, map.schemaMappingGuid, bundlePack.bundlePackGuid, configuration, title, typeGuid)).then(function (pi) {
 	          if (map.mappings && map.mappings.length > 0 && deployment) {
-	            dispatch(callGenerateRecipe(tenantId, appId, typeGuid, title, pi.productizedIntegrationGuid, map.schemaMappingGuid)).then(function (generatedRecipe) {
+	            dispatch(callGenerateRecipe(tenantId, appId, typeGuid, title, pi.productizedIntegrationGuid, map.schemaMappingGuid, destinationMetadata)).then(function (generatedRecipe) {
 	              onGenerate();
 	              if (deployment) {
 	                if (deployment.type === 'once') {
+	                  dispatch(callDeployTrigger(generatedRecipe, pi.productizedIntegrationGuid, map.schemaMappingGuid)); //deploy anyway, so user can schedule later
 	                  dispatch(callExecuteTransformer(generatedRecipe.Id)).then(function (response) {
 	                    dispatch(callLookupLogData(response.externalExecutionId, 0, onFinish, generatedRecipe, pi.productizedIntegrationGuid, map.schemaMappingGuid));
 	                  });
@@ -17119,11 +17139,13 @@ module.exports =
 	
 	    var TRANS_API_URL = config.TRANS_API_URL;
 	
-	    return api.put('transformer/deploy/' + generatedRecipe.BaseId, {
+	    return api.put('transformer/deploy/' + generatedRecipe.Id, {
 	      endpoint: TRANS_API_URL,
 	      data: { deployed: true }
 	    }).then(function () {
-	      onFinish(generatedRecipe, piGuid, mapGuid);
+	      if (onFinish) {
+	        onFinish(generatedRecipe, piGuid, mapGuid);
+	      }
 	    });
 	  };
 	}
@@ -17156,10 +17178,13 @@ module.exports =
 	      return api.get(tenantId + '/productizedintegrations', {
 	        endpoint: TRANS_API_URL
 	      }).then(function (data) {
+	        var PI = data.find(function (pi) {
+	          return pi.ProductizedIntegrationGuid === piGuid;
+	        });
 	        var config = {};
 	        var savedSourceEndpoint = null;
 	        var savedDestinationEndpoint = null;
-	        data[0].Configuration.forEach(function (c) {
+	        PI.Configuration.forEach(function (c) {
 	          config[c.Key] = c.Value;
 	          if (c.Key === 'sourceEndpoint') {
 	            savedSourceEndpoint = c.Value;
@@ -17172,7 +17197,7 @@ 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, data[0].SchemaMappingGuid)), dispatch(callGetBundles(tenantId, accountId, data[0].BundlePackGuid)), dispatch(callGetTrigger(data[0].TransformerBaseId))]);
+	        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))]);
 	      });
 	    };
 	  } else return function (dispatch) {
@@ -18285,7 +18310,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reduxForm = __webpack_require__(3);
+	var _reduxForm = __webpack_require__(4);
 	
 	var _validate = __webpack_require__(6);
 	
@@ -18369,7 +18394,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reduxForm = __webpack_require__(3);
+	var _reduxForm = __webpack_require__(4);
 	
 	var _validate = __webpack_require__(6);
 	
@@ -18572,7 +18597,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reduxForm = __webpack_require__(3);
+	var _reduxForm = __webpack_require__(4);
 	
 	var _navButtons = __webpack_require__(5);
 	
@@ -18753,7 +18778,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reduxForm = __webpack_require__(3);
+	var _reduxForm = __webpack_require__(4);
 	
 	var _validate = __webpack_require__(6);
 	
@@ -18861,7 +18886,26 @@ module.exports =
 				    nav = _props3.nav,
 				    reset = _props3.reset,
 				    step = _props3.step,
-				    formValues = _props3.formValues;
+				    formValues = _props3.formValues,
+				    change = _props3.change;
+	
+	
+				var disable = true;
+				if (step.options && formValues.deployment) {
+					if (formValues.deployment.type === 'daily') {
+						if (formValues.deployment.dailySchedule) {
+							disable = false;
+						}
+					} else if (formValues.deployment.type === 'repeating') {
+						var f = parseInt(formValues.deployment.frequency, 10);
+						var u = formValues.deployment.frequencyUnit;
+						if (u && f && (u === 'Minutes' && f > 14 && f <= 60 || u === 'Hours' && f > 0 && f <= 24)) {
+							disable = false;
+						}
+					} else if (formValues.deployment.type === 'once') {
+						disable = false;
+					}
+				}
 	
 				return _react2.default.createElement(
 					'form',
@@ -18922,7 +18966,11 @@ module.exports =
 							_react2.default.createElement(
 								'div',
 								{ style: { width: 100, display: 'inline-block', verticalAlign: 'top' } },
-								_react2.default.createElement(_reduxForm.Field, { name: 'deployment.frequency', type: 'number', component: inputs.rfInput, label: 'Frequency' })
+								_react2.default.createElement(inputs.Input, { type: 'number', value: formValues.deployment.frequency,
+									onChange: function onChange(e) {
+										return change('deployment.frequency', e.target.value);
+									}, label: 'Frequency'
+								})
 							),
 							_react2.default.createElement(
 								'div',
@@ -18935,7 +18983,7 @@ module.exports =
 						) : null
 					),
 					_react2.default.createElement('br', null),
-					_react2.default.createElement(_navButtons2.default, { handleSubmit: handleSubmit, nav: nav, reset: reset, inputs: inputs }),
+					_react2.default.createElement(_navButtons2.default, { finishDisabled: disable, handleSubmit: handleSubmit, nav: nav, reset: reset, inputs: inputs }),
 					_react2.default.createElement('br', null),
 					_react2.default.createElement('br', null)
 				);
@@ -18971,7 +19019,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reduxForm = __webpack_require__(3);
+	var _reduxForm = __webpack_require__(4);
 	
 	var _validate = __webpack_require__(6);
 	
@@ -19248,7 +19296,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reduxForm = __webpack_require__(3);
+	var _reduxForm = __webpack_require__(4);
 	
 	var _validate = __webpack_require__(6);
 	
@@ -19349,7 +19397,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reduxForm = __webpack_require__(3);
+	var _reduxForm = __webpack_require__(4);
 	
 	var _validate = __webpack_require__(6);
 	
@@ -19592,7 +19640,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reduxForm = __webpack_require__(3);
+	var _reduxForm = __webpack_require__(4);
 	
 	var _validate = __webpack_require__(6);
 	
@@ -19708,7 +19756,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reduxForm = __webpack_require__(3);
+	var _reduxForm = __webpack_require__(4);
 	
 	var _validate = __webpack_require__(6);
 	
@@ -19806,7 +19854,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reduxForm = __webpack_require__(3);
+	var _reduxForm = __webpack_require__(4);
 	
 	var _validate = __webpack_require__(6);
 	
@@ -19941,7 +19989,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reduxForm = __webpack_require__(3);
+	var _reduxForm = __webpack_require__(4);
 	
 	var _validate = __webpack_require__(6);
 	
@@ -20182,6 +20230,8 @@ module.exports =
 	  }, {
 	    key: 'render',
 	    value: function render() {
+	      var _this2 = this;
+	
 	      var _props10 = this.props,
 	          inputs = _props10.inputs,
 	          handleSubmit = _props10.handleSubmit,
@@ -20207,14 +20257,19 @@ module.exports =
 	        _react2.default.createElement(
 	          'div',
 	          { style: { fontSize: 20, display: 'inline-block' } },
-	          'Build Sync Operations'
+	          'Map ',
+	          step.sourceProvider,
+	          ' Objects to ',
+	          step.destinationProvider
 	        ),
 	        _react2.default.createElement('br', null),
 	        _react2.default.createElement('br', null),
 	        _react2.default.createElement(
 	          'p',
 	          null,
-	          'Build Sync Operations by mapping one or many data sources to a single Salesforce target object.'
+	          'Map one or many data sources to a single ',
+	          step.destinationProvider,
+	          ' target object.'
 	        ),
 	        _react2.default.createElement('br', null),
 	        resourceGroups && resourceGroups.length > 0 ? _react2.default.createElement(
@@ -20241,7 +20296,10 @@ module.exports =
 	        ) : null,
 	        resourceGroups && resourceGroups.length > 0 && this.state.showModal && _react2.default.createElement(_connectModal2.default, { inputs: inputs, hideModal: this.hideModal, bundle: this.state.selectedBundle,
 	          opened: this.state.showModal, change: change, resourceGroups: resourceGroups, step: step,
-	          bundleIndex: this.state.selectedBundleIndex, sourceSchema: sourceSchema, destinationSchema: destinationSchema
+	          bundleIndex: this.state.selectedBundleIndex, sourceSchema: sourceSchema, destinationSchema: destinationSchema,
+	          update: function update() {
+	            return _this2.forceUpdate();
+	          }
 	        }),
 	        _react2.default.createElement('br', null),
 	        _react2.default.createElement(_navButtons2.default, { handleSubmit: handleSubmit, nav: nav, reset: reset, inputs: inputs,
@@ -20279,7 +20337,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reduxForm = __webpack_require__(3);
+	var _reduxForm = __webpack_require__(4);
 	
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 	
@@ -20375,10 +20433,10 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reduxForm = __webpack_require__(3);
-	
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 	
+	function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
+	
 	var ConnectModal = function ConnectModal(props) {
 	  var inputs = props.inputs,
 	      opened = props.opened,
@@ -20388,71 +20446,292 @@ module.exports =
 	      hideModal = props.hideModal,
 	      step = props.step,
 	      sourceSchema = props.sourceSchema,
-	      destinationSchema = props.destinationSchema;
+	      destinationSchema = props.destinationSchema,
+	      change = props.change;
 	
 	  var Modal = inputs.Modal;
+	  var Select = inputs.Select;
+	  var Button = inputs.Button;
+	
+	  var closeModal = function closeModal() {
+	    var rgs = [].concat(_toConsumableArray(resourceGroups));
+	    var group = rgs[bundleIndex];
+	    group.mappings = group.mappings.filter(function (m) {
+	      return !m.isExternalKeyMapping;
+	    });
+	    group.sourceKeys.forEach(function (sk, i) {
+	      group.mappings.push({
+	        isExternalKeyMapping: true,
+	        resourceFromName: group.sourceKeysObjects[i],
+	        propertyFromName: sk,
+	        resourceToName: group.name,
+	        propertyToName: group.customExternalKeys ? group.destinationKeys[i] : 'externalId'
+	      });
+	    });
+	    change('resourceGroups', rgs);
+	    hideModal();
+	  };
+	
+	  var clickTab = function clickTab(bool) {
+	    var rgs = [].concat(_toConsumableArray(resourceGroups));
+	    var group = rgs[bundleIndex];
+	    group.customExternalKeys = bool;
+	    change('resourceGroups', rgs);
+	    props.update();
+	  };
+	
+	  var addRow = function addRow() {
+	    var rgs = [].concat(_toConsumableArray(resourceGroups));
+	    var group = rgs[bundleIndex];
+	    group.sourceKeys.push('');
+	    group.destinationKeys.push('');
+	    change('resourceGroups', rgs);
+	    props.update();
+	  };
+	
+	  var deleteRow = function deleteRow(i) {
+	    var rgs = [].concat(_toConsumableArray(resourceGroups));
+	    var group = rgs[bundleIndex];
+	    group.sourceKeys.splice(i, 1);
+	    group.destinationKeys.splice(i, 1);
+	    change('resourceGroups', rgs);
+	    props.update();
+	  };
+	
+	  var selectSourceKeyForLingk = function selectSourceKeyForLingk(key, section) {
+	    var rgs = [].concat(_toConsumableArray(resourceGroups));
+	    var group = rgs[bundleIndex];
+	    group.sourceKeys = [key];
+	    group.sourceKeysObjects = [section];
+	    change('resourceGroups', rgs);
+	    props.update();
+	  };
+	
+	  var selectCustomSourceKey = function selectCustomSourceKey(key, section, i) {
+	    var rgs = [].concat(_toConsumableArray(resourceGroups));
+	    var group = rgs[bundleIndex];
+	    group.sourceKeys[i] = key;
+	    group.sourceKeysObjects[i] = section;
+	    change('resourceGroups', rgs);
+	    props.update();
+	  };
+	
+	  var selectCustomDestinationKey = function selectCustomDestinationKey(key, i) {
+	    var rgs = [].concat(_toConsumableArray(resourceGroups));
+	    var group = rgs[bundleIndex];
+	    group.destinationKeys[i] = key;
+	    change('resourceGroups', rgs);
+	    props.update();
+	  };
+	
+	  var sectionLabels = [];
+	  var sectionProviders = [];
+	  var vals = bundle.resources.map(function (br, i) {
+	    sectionLabels.push(br.name);
+	    sectionProviders.push(br.provider);
+	    return bundle.resources[i].provider === step.destinationProvider ? destinationSchema && destinationSchema.find(function (defaultRsc) {
+	      return defaultRsc.name === bundle.resources[i].name;
+	    }) && destinationSchema.find(function (defaultRsc) {
+	      return defaultRsc.name === bundle.resources[i].name;
+	    }).properties : sourceSchema && sourceSchema.find(function (defaultRsc) {
+	      return defaultRsc.name === bundle.resources[i].name;
+	    }) && sourceSchema.find(function (defaultRsc) {
+	      return defaultRsc.name === bundle.resources[i].name;
+	    }).properties;
+	  });
 	
 	  return _react2.default.createElement(
 	    Modal,
-	    { opened: opened, hideModal: hideModal, title: 'Connect Source to Target' },
+	    { opened: opened, hideModal: closeModal, title: 'Connect Source to Target' },
 	    _react2.default.createElement(
 	      'div',
 	      null,
-	      _react2.default.createElement(
-	        'p',
-	        null,
-	        'Choose a Unique Key from both the Data Source and the Data Target.'
-	      ),
-	      _react2.default.createElement(
-	        'p',
-	        null,
-	        'The chosen Source Key will be saved into ',
-	        step.destinationProvider,
-	        ' to prevent duplicate records.'
-	      ),
-	      _react2.default.createElement('br', null),
 	      _react2.default.createElement(
 	        'div',
-	        { style: { display: 'inline-block', width: '50%' } },
+	        { className: 'connect-modal-tabs' },
 	        _react2.default.createElement(
 	          'div',
-	          { className: 'labelz' },
-	          'Data Source Unique Key'
+	          { onClick: function onClick() {
+	              return clickTab(false);
+	            },
+	            className: 'connect-modal-tab' + (!resourceGroups[bundleIndex].customExternalKeys ? ' connect-modal-tab-selected' : '') },
+	          'Use Lingk Unique ID',
+	          _react2.default.createElement('div', { className: 'connect-modal-tab-bar' })
 	        ),
-	        _react2.default.createElement(_reduxForm.Field, { component: inputs.rfSelect, type: 'input', colorType: 'brand',
-	          defaultLabel: bundle.resources[0].provider === step.destinationProvider ? 'Choose Key From ' + bundle.resources[0].name + ' (' + step.destinationProvider + ')' : 'Choose Key From ' + bundle.resources[0].name, buttonLabel: 'Choose Key',
-	          name: 'resourceGroups.' + bundleIndex + '.sourceKey', selectedValue: resourceGroups[bundleIndex].sourceKey,
-	          values: bundle.resources[0].provider === step.destinationProvider ? destinationSchema && destinationSchema.find(function (defaultRsc) {
-	            return defaultRsc.name === bundle.resources[0].name;
-	          }) && destinationSchema.find(function (defaultRsc) {
-	            return defaultRsc.name === bundle.resources[0].name;
-	          }).properties : sourceSchema && sourceSchema.find(function (defaultRsc) {
-	            return defaultRsc.name === bundle.resources[0].name;
-	          }) && sourceSchema.find(function (defaultRsc) {
-	            return defaultRsc.name === bundle.resources[0].name;
-	          }).properties
-	        })
+	        _react2.default.createElement(
+	          'div',
+	          { onClick: function onClick() {
+	              return clickTab(true);
+	            },
+	            className: 'connect-modal-tab' + (resourceGroups[bundleIndex].customExternalKeys ? ' connect-modal-tab-selected' : '') },
+	          'Use Custom Unique IDs',
+	          _react2.default.createElement('div', { className: 'connect-modal-tab-bar' })
+	        )
 	      ),
-	      _react2.default.createElement(
+	      resourceGroups[bundleIndex].customExternalKeys ? _react2.default.createElement(
+	        'div',
+	        { style: { padding: '1em' } },
+	        _react2.default.createElement(
+	          'p',
+	          null,
+	          'Choose one or more Unique Keys from both the Data Source and the Data Target. These keys will be used to keep records synchronized.'
+	        ),
+	        _react2.default.createElement(
+	          'div',
+	          null,
+	          _react2.default.createElement(
+	            'div',
+	            { className: 'external-keys-row' },
+	            _react2.default.createElement(
+	              'div',
+	              { className: 'external-keys-column' },
+	              _react2.default.createElement(
+	                'div',
+	                { className: 'labelz' },
+	                'Data Source Unique Key'
+	              )
+	            ),
+	            _react2.default.createElement('div', { style: { width: '6%', height: 1, display: 'inline-block' } }),
+	            _react2.default.createElement(
+	              'div',
+	              { className: 'external-keys-column' },
+	              _react2.default.createElement(
+	                'div',
+	                { className: 'labelz' },
+	                'Data Target Unique Key'
+	              )
+	            )
+	          ),
+	          resourceGroups[bundleIndex].sourceKeys && resourceGroups[bundleIndex].sourceKeys.map(function (sk, i) {
+	            return _react2.default.createElement(
+	              'div',
+	              { className: 'external-keys-row', key: i },
+	              _react2.default.createElement(
+	                '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);
+	                  },
+	                  type: 'brand', fieldPropLabel: 'label',
+	                  values: vals, sectionLabels: sectionLabels, sectionLabelSuffix: 'Fields',
+	                  selectedValues: resourceGroups[bundleIndex].sourceKeys && resourceGroups[bundleIndex].sourceKeys.map(function (ks) {
+	                    return { label: ks };
+	                  })
+	                })
+	              ),
+	              _react2.default.createElement(
+	                'div',
+	                { style: { width: '6%', textAlign: 'center', display: 'inline-block' } },
+	                '\u2192'
+	              ),
+	              _react2.default.createElement(
+	                'div',
+	                { 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);
+	                  }, type: 'brand',
+	                  values: [destinationSchema && destinationSchema.find(function (defaultRsc) {
+	                    return defaultRsc.name === bundle.name;
+	                  }) && destinationSchema.find(function (defaultRsc) {
+	                    return defaultRsc.name === bundle.name;
+	                  }).properties],
+	                  sectionLabels: [bundle.name], sectionLabelSuffix: 'Fields', fieldPropLabel: 'label',
+	                  selectedValues: resourceGroups[bundleIndex].destinationKeys && resourceGroups[bundleIndex].destinationKeys.map(function (ks) {
+	                    return { label: ks };
+	                  })
+	                })
+	              ),
+	              i !== 0 && _react2.default.createElement(
+	                'div',
+	                { className: 'delete-external-key-row', onClick: function onClick() {
+	                    return deleteRow(i);
+	                  } },
+	                _react2.default.createElement(
+	                  'svg',
+	                  { xmlns: 'http://www.w3.org/2000/svg', className: 'delete-external-key-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' })
+	                )
+	              )
+	            );
+	          }),
+	          resourceGroups[bundleIndex].sourceKeys && resourceGroups[bundleIndex].sourceKeys.length < 5 && _react2.default.createElement(
+	            'div',
+	            { style: { paddingTop: 10, width: '47%', textAlign: 'center' } },
+	            _react2.default.createElement(
+	              Button,
+	              { type: 'neutral', onClick: addRow },
+	              'Add More Keys'
+	            )
+	          )
+	        )
+	      ) : _react2.default.createElement(
 	        'div',
-	        { style: { display: 'inline-block', width: '50%' } },
+	        { style: { padding: '1em' } },
+	        _react2.default.createElement(
+	          'p',
+	          null,
+	          'Choose a Unique Key from a data source object. A corresponding unique external id field will be created in the ',
+	          step.destinationProvider,
+	          ' ',
+	          bundle.name,
+	          ' object to keep records synchronized.'
+	        ),
 	        _react2.default.createElement(
 	          'div',
-	          { className: 'labelz' },
-	          'Data Target Unique Key'
+	          { className: 'external-keys-row' },
+	          _react2.default.createElement(
+	            'div',
+	            { className: 'external-keys-column' },
+	            _react2.default.createElement(
+	              'div',
+	              { className: 'labelz' },
+	              'Data Source Unique Key'
+	            )
+	          ),
+	          _react2.default.createElement('div', { style: { width: '6%', height: 1, display: 'inline-block' } }),
+	          _react2.default.createElement(
+	            'div',
+	            { className: 'external-keys-column' },
+	            _react2.default.createElement(
+	              'div',
+	              { className: 'labelz' },
+	              'Data Target Unique Key'
+	            )
+	          )
 	        ),
-	        _react2.default.createElement(_reduxForm.Field, { component: inputs.rfSelect, type: 'input', colorType: 'brand',
-	          defaultLabel: 'Choose Key From ' + bundle.name, buttonLabel: 'Choose Key',
-	          name: 'resourceGroups.' + bundleIndex + '.destinationKey',
-	          selectedValue: resourceGroups[bundleIndex].destinationKey,
-	          values: destinationSchema && destinationSchema.find(function (defaultRsc) {
-	            return defaultRsc.name === bundle.name;
-	          }) && destinationSchema.find(function (defaultRsc) {
-	            return defaultRsc.name === bundle.name;
-	          }).properties
-	        })
+	        _react2.default.createElement(
+	          'div',
+	          { className: 'external-keys-row' },
+	          _react2.default.createElement(
+	            'div',
+	            { className: 'external-keys-column' },
+	            _react2.default.createElement(Select, { label: resourceGroups[bundleIndex].sourceKeys && resourceGroups[bundleIndex].sourceKeys[0] || 'Choose Key', menuItemStyle: { height: 20, padding: '1px 8px' },
+	              onSelect: function onSelect(v, i, rtid, section) {
+	                return selectSourceKeyForLingk(v, section);
+	              }, type: 'brand',
+	              values: vals, sectionLabels: sectionLabels, sectionLabelSuffix: 'Fields', fieldPropLabel: 'label',
+	              selectedValues: resourceGroups[bundleIndex].sourceKeys && resourceGroups[bundleIndex].sourceKeys.map(function (ks) {
+	                return { label: ks };
+	              })
+	            })
+	          ),
+	          _react2.default.createElement(
+	            'div',
+	            { style: { width: '6%', textAlign: 'center', display: 'inline-block' } },
+	            '\u2192'
+	          ),
+	          _react2.default.createElement(
+	            'div',
+	            { className: 'external-keys-column' },
+	            'Lingk External ID'
+	          )
+	        )
 	      ),
-	      _react2.default.createElement('br', null),
 	      _react2.default.createElement('br', null)
 	    )
 	  );
@@ -20538,6 +20817,11 @@ module.exports =
 	        var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
 	        var rscGroup = resourceGroups[resourceGroupIndex];
 	
+	        //cant overwrite externalKey mapping
+	        if (rscGroup.mappings && rscGroup.mappings.find(function (m) {
+	          return m.propertyToName === field && m.isExternalKeyMapping;
+	        })) return;
+	
 	        //cant map multiple to same destination field
 	        rscGroup.mappings = rscGroup.mappings && rscGroup.mappings.filter(function (m) {
 	          return m.propertyToName !== field;
@@ -20657,7 +20941,11 @@ module.exports =
 	                          _react2.default.createElement('div', { style: { height: 9 } }),
 	                          schema && schema.find(function (r) {
 	                            return r.name === rsc.name;
-	                          }).properties.map(function (field, ii) {
+	                          }).properties.sort(function (a, b) {
+	                            if (a.label < b.label) return -1;
+	                            if (a.label > b.label) return 1;
+	                            return 0;
+	                          }).map(function (field, ii) {
 	                            var style = {
 	                              paddingLeft: 5,
 	                              background: selectedField && selectedField === field.label ? '#dfe0e0' : 'initial',
@@ -20707,7 +20995,11 @@ module.exports =
 	                    { className: 'scrolly', style: { height: 256, padding: '8px 12px' } },
 	                    destinationSchema && destinationSchema.find(function (r) {
 	                      return r.name === group.name;
-	                    }).properties.map(function (field, i) {
+	                    }).properties.sort(function (a, b) {
+	                      if (a.label < b.label) return -1;
+	                      if (a.label > b.label) return 1;
+	                      return 0;
+	                    }).map(function (field, i) {
 	                      return _react2.default.createElement(
 	                        'div',
 	                        { key: i, className: selectedField ? "wizard-map-field" : '', style: {
@@ -20739,7 +21031,7 @@ module.exports =
 /* 192 */
 /***/ function(module, exports, __webpack_require__) {
 
-	"use strict";
+	'use strict';
 	
 	Object.defineProperty(exports, "__esModule", {
 	  value: true
@@ -20756,24 +21048,26 @@ module.exports =
 	  var group = props.group;
 	
 	  return _react2.default.createElement(
-	    "div",
+	    'div',
 	    { style: {
 	        minHeight: group.resources.length * 19
 	      } },
 	    group.resources && group.resources.map(function (rsc, ii) {
 	      var mapz = group.mappings && group.mappings.filter(function (m) {
 	        return m.resourceFromName === rsc.name;
+	      }).sort(function (a) {
+	        if (a.isExternalKeyMapping) return -1;else return 1;
 	      });
 	      var fieldNum = mapz ? mapz.length : 0;
 	      return _react2.default.createElement(
-	        "div",
+	        'div',
 	        { key: ii, style: {
 	            marginTop: ii !== 0 ? 10 : 0,
 	            height: fieldNum * 19,
 	            minHeight: 18
 	          } },
 	        _react2.default.createElement(
-	          "strong",
+	          'strong',
 	          null,
 	          rsc.name
 	        )
@@ -20788,34 +21082,36 @@ module.exports =
 	      clearOneMapping = props.clearOneMapping;
 	
 	  return _react2.default.createElement(
-	    "div",
+	    'div',
 	    null,
 	    group.resources && group.resources.map(function (rsc, iii) {
 	      var mapz = group.mappings && group.mappings.filter(function (m) {
 	        return m.resourceFromName === rsc.name;
+	      }).sort(function (a) {
+	        if (a.isExternalKeyMapping) return -1;else return 1;
 	      });
 	      return _react2.default.createElement(
-	        "div",
+	        'div',
 	        { key: iii, style: {
 	            marginTop: iii !== 0 ? 10 : 0,
 	            minHeight: 18
 	          } },
 	        mapz && mapz.map(function (m, iv) {
 	          return _react2.default.createElement(
-	            "div",
+	            'div',
 	            { key: iv, style: { height: 19 } },
-	            _react2.default.createElement(
-	              "div",
-	              { className: "x-clear-mapping",
+	            !m.isExternalKeyMapping ? _react2.default.createElement(
+	              'div',
+	              { className: 'x-clear-mapping',
 	                onClick: function onClick() {
 	                  clearOneMapping(i, m);
 	                } },
-	              "x"
-	            ),
+	              'x'
+	            ) : _react2.default.createElement('div', { style: { width: 30, display: 'inline-block' } }),
 	            _react2.default.createElement(
-	              "div",
-	              { className: "mapping-entry" },
-	              m.propertyFromName + " \u2192 " + m.propertyToName
+	              'div',
+	              { className: 'mapping-entry' },
+	              m.propertyFromName + ' \u2192 ' + m.propertyToName
 	            )
 	          );
 	        })
@@ -20831,79 +21127,85 @@ module.exports =
 	
 	  var icons = {
 	    none: _react2.default.createElement(
-	      "svg",
-	      { fill: "#CCCCCC", height: "19", viewBox: "0 0 24 24", width: "24", xmlns: "http://www.w3.org/2000/svg" },
-	      _react2.default.createElement("path", { d: "M12 8V4l8 8-8 8v-4H4V8z" }),
-	      _react2.default.createElement("path", { d: "M0 0h24v24H0z", fill: "none" })
+	      'svg',
+	      { fill: '#CCCCCC', height: '19', viewBox: '0 0 24 24', width: '24', xmlns: 'http://www.w3.org/2000/svg' },
+	      _react2.default.createElement('path', { d: 'M12 8V4l8 8-8 8v-4H4V8z' }),
+	      _react2.default.createElement('path', { d: 'M0 0h24v24H0z', fill: 'none' })
 	    ),
 	    trim: _react2.default.createElement(
-	      "svg",
-	      { fill: "#000000", height: "16", viewBox: "0 0 24 24", width: "24", xmlns: "http://www.w3.org/2000/svg" },
-	      _react2.default.createElement("path", { d: "M0 0h24v24H0z", fill: "none" }),
-	      _react2.default.createElement("circle", { cx: "6", cy: "18", fill: "none", r: "2" }),
-	      _react2.default.createElement("circle", { cx: "12", cy: "12", fill: "none", r: ".5" }),
-	      _react2.default.createElement("circle", { cx: "6", cy: "6", fill: "none", r: "2" }),
-	      _react2.default.createElement("path", { d: "M9.64 7.64c.23-.5.36-1.05.36-1.64 0-2.21-1.79-4-4-4S2 3.79 2 6s1.79 4 4 4c.59 0 1.14-.13 1.64-.36L10 12l-2.36 2.36C7.14 14.13 6.59 14 6 14c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4c0-.59-.13-1.14-.36-1.64L12 14l7 7h3v-1L9.64 7.64zM6 8c-1.1 0-2-.89-2-2s.9-2 2-2 2 .89 2 2-.9 2-2 2zm0 12c-1.1 0-2-.89-2-2s.9-2 2-2 2 .89 2 2-.9 2-2 2zm6-7.5c-.28 0-.5-.22-.5-.5s.22-.5.5-.5.5.22.5.5-.22.5-.5.5zM19 3l-6 6 2 2 7-7V3z" })
+	      'svg',
+	      { fill: '#000000', height: '16', viewBox: '0 0 24 24', width: '24', xmlns: 'http://www.w3.org/2000/svg' },
+	      _react2.default.createElement('path', { d: 'M0 0h24v24H0z', fill: 'none' }),
+	      _react2.default.createElement('circle', { cx: '6', cy: '18', fill: 'none', r: '2' }),
+	      _react2.default.createElement('circle', { cx: '12', cy: '12', fill: 'none', r: '.5' }),
+	      _react2.default.createElement('circle', { cx: '6', cy: '6', fill: 'none', r: '2' }),
+	      _react2.default.createElement('path', { d: 'M9.64 7.64c.23-.5.36-1.05.36-1.64 0-2.21-1.79-4-4-4S2 3.79 2 6s1.79 4 4 4c.59 0 1.14-.13 1.64-.36L10 12l-2.36 2.36C7.14 14.13 6.59 14 6 14c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4c0-.59-.13-1.14-.36-1.64L12 14l7 7h3v-1L9.64 7.64zM6 8c-1.1 0-2-.89-2-2s.9-2 2-2 2 .89 2 2-.9 2-2 2zm0 12c-1.1 0-2-.89-2-2s.9-2 2-2 2 .89 2 2-.9 2-2 2zm6-7.5c-.28 0-.5-.22-.5-.5s.22-.5.5-.5.5.22.5.5-.22.5-.5.5zM19 3l-6 6 2 2 7-7V3z' })
 	    ),
 	    split: _react2.default.createElement(
-	      "svg",
-	      { fill: "#000000", height: "19", viewBox: "0 0 24 24", width: "24", xmlns: "http://www.w3.org/2000/svg" },
-	      _react2.default.createElement("path", { d: "M0 0h24v24H0z", fill: "none" }),
-	      _react2.default.createElement("path", { d: "M14 4l2.29 2.29-2.88 2.88 1.42 1.42 2.88-2.88L20 10V4zm-4 0H4v6l2.29-2.29 4.71 4.7V20h2v-8.41l-5.29-5.3z" })
+	      'svg',
+	      { fill: '#000000', height: '19', viewBox: '0 0 24 24', width: '24', xmlns: 'http://www.w3.org/2000/svg' },
+	      _react2.default.createElement('path', { d: 'M0 0h24v24H0z', fill: 'none' }),
+	      _react2.default.createElement('path', { d: 'M14 4l2.29 2.29-2.88 2.88 1.42 1.42 2.88-2.88L20 10V4zm-4 0H4v6l2.29-2.29 4.71 4.7V20h2v-8.41l-5.29-5.3z' })
 	    ),
 	    merge: _react2.default.createElement(
-	      "svg",
-	      { fill: "#000000", height: "19", viewBox: "0 0 24 24", width: "24", xmlns: "http://www.w3.org/2000/svg" },
-	      _react2.default.createElement("path", { d: "M0 0h24v24H0z", fill: "none" }),
-	      _react2.default.createElement("path", { d: "M17 20.41L18.41 19 15 15.59 13.59 17 17 20.41zM7.5 8H11v5.59L5.59 19 7 20.41l6-6V8h3.5L12 3.5 7.5 8z" })
+	      'svg',
+	      { fill: '#000000', height: '19', viewBox: '0 0 24 24', width: '24', xmlns: 'http://www.w3.org/2000/svg' },
+	      _react2.default.createElement('path', { d: 'M0 0h24v24H0z', fill: 'none' }),
+	      _react2.default.createElement('path', { d: 'M17 20.41L18.41 19 15 15.59 13.59 17 17 20.41zM7.5 8H11v5.59L5.59 19 7 20.41l6-6V8h3.5L12 3.5 7.5 8z' })
 	    ),
 	    date: _react2.default.createElement(
-	      "svg",
-	      { fill: "#000000", height: "18", viewBox: "0 0 24 24", width: "24", xmlns: "http://www.w3.org/2000/svg" },
-	      _react2.default.createElement("path", { d: "M17 12h-5v5h5v-5zM16 1v2H8V1H6v2H5c-1.11 0-1.99.9-1.99 2L3 19c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2h-1V1h-2zm3 18H5V8h14v11z" }),
-	      _react2.default.createElement("path", { d: "M0 0h24v24H0z", fill: "none" })
+	      'svg',
+	      { fill: '#000000', height: '18', viewBox: '0 0 24 24', width: '24', xmlns: 'http://www.w3.org/2000/svg' },
+	      _react2.default.createElement('path', { d: 'M17 12h-5v5h5v-5zM16 1v2H8V1H6v2H5c-1.11 0-1.99.9-1.99 2L3 19c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2h-1V1h-2zm3 18H5V8h14v11z' }),
+	      _react2.default.createElement('path', { d: 'M0 0h24v24H0z', fill: 'none' })
 	    ),
 	    sigma: _react2.default.createElement(
-	      "svg",
-	      { fill: "#000000", height: "19", viewBox: "0 0 24 24", width: "24", xmlns: "http://www.w3.org/2000/svg" },
-	      _react2.default.createElement("path", { d: "M0 0h24v24H0z", fill: "none" }),
-	      _react2.default.createElement("path", { d: "M18 4H6v2l6.5 6L6 18v2h12v-3h-7l5-5-5-5h7z" })
+	      'svg',
+	      { fill: '#000000', height: '19', viewBox: '0 0 24 24', width: '24', xmlns: 'http://www.w3.org/2000/svg' },
+	      _react2.default.createElement('path', { d: 'M0 0h24v24H0z', fill: 'none' }),
+	      _react2.default.createElement('path', { d: 'M18 4H6v2l6.5 6L6 18v2h12v-3h-7l5-5-5-5h7z' })
 	    ),
 	    link: _react2.default.createElement(
-	      "svg",
-	      { fill: "#000000", height: "19", viewBox: "0 0 24 24", width: "24", xmlns: "http://www.w3.org/2000/svg" },
-	      _react2.default.createElement("path", { d: "M0 0h24v24H0z", fill: "none" }),
-	      _react2.default.createElement("path", { d: "M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z" })
+	      'svg',
+	      { fill: '#000000', height: '19', viewBox: '0 0 24 24', width: '24', xmlns: 'http://www.w3.org/2000/svg' },
+	      _react2.default.createElement('path', { d: 'M0 0h24v24H0z', fill: 'none' }),
+	      _react2.default.createElement('path', { d: 'M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z' })
 	    ),
 	    swap: _react2.default.createElement(
-	      "svg",
-	      { fill: "#000000", height: "19", viewBox: "0 0 24 24", width: "24", xmlns: "http://www.w3.org/2000/svg" },
-	      _react2.default.createElement("path", { d: "M16 17.01V10h-2v7.01h-3L15 21l4-3.99h-3zM9 3L5 6.99h3V14h2V6.99h3L9 3z" }),
-	      _react2.default.createElement("path", { d: "M0 0h24v24H0z", fill: "none" })
+	      'svg',
+	      { fill: '#000000', height: '19', viewBox: '0 0 24 24', width: '24', xmlns: 'http://www.w3.org/2000/svg' },
+	      _react2.default.createElement('path', { d: 'M16 17.01V10h-2v7.01h-3L15 21l4-3.99h-3zM9 3L5 6.99h3V14h2V6.99h3L9 3z' }),
+	      _react2.default.createElement('path', { d: 'M0 0h24v24H0z', fill: 'none' })
 	    )
 	  };
 	
 	  return _react2.default.createElement(
-	    "div",
+	    'div',
 	    null,
 	    group.resources && group.resources.map(function (rsc, iii) {
 	      var mapz = group.mappings && group.mappings.filter(function (m) {
 	        return m.resourceFromName === rsc.name;
+	      }).sort(function (a) {
+	        if (a.isExternalKeyMapping) return -1;else return 1;
 	      });
 	      return _react2.default.createElement(
-	        "div",
+	        'div',
 	        { key: iii, style: {
 	            marginTop: iii !== 0 ? 10 : 0,
 	            minHeight: 18
 	          } },
 	        mapz && mapz.map(function (m, iv) {
-	          return _react2.default.createElement(
-	            "div",
-	            { key: iv, className: "map-table-transform-icon", onClick: function onClick() {
-	                return selectMapping(i, m);
-	              } },
-	            m.transformations && m.transformations[0] && icons[m.transformations[0].type] || icons['none']
-	          );
+	          if (!m.isExternalKeyMapping) {
+	            return _react2.default.createElement(
+	              'div',
+	              { key: iv, className: 'map-table-transform-icon', onClick: function onClick() {
+	                  return selectMapping(i, m);
+	                } },
+	              m.transformations && m.transformations[0] && icons[m.transformations[0].type] || icons['none']
+	            );
+	          } else {
+	            return _react2.default.createElement('div', { key: iv, style: { height: 19, width: 24 } });
+	          }
 	        })
 	      );
 	    })
@@ -20912,7 +21214,7 @@ module.exports =
 	
 	var MapTableDestinationRow = exports.MapTableDestinationRow = function MapTableDestinationRow(props) {
 	  return _react2.default.createElement(
-	    "strong",
+	    'strong',
 	    { style: { fontSize: 16, whiteSpace: 'wrap' } },
 	    props.group.name
 	  );
@@ -20953,7 +21255,7 @@ module.exports =
 	
 	var _reactDraggable2 = _interopRequireDefault(_reactDraggable);
 	
-	var _reduxForm = __webpack_require__(3);
+	var _reduxForm = __webpack_require__(4);
 	
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 	
@@ -21323,8 +21625,10 @@ module.exports =
 	                    onSelect: function onSelect(v, i, rtid, section) {
 	                      return addDefaultEntity(resourceGroupIndex, v, i, section);
 	                    }, type: 'neutral',
-	                    selectedValues: resourceGroups && resourceGroups[resourceGroupIndex] && resourceGroups[resourceGroupIndex].resources, values: [sourceSchema, filteredDestinationSchema],
-	                    sectionLabels: [step.sourceProvider, step.destinationProvider]
+	                    selectedValues: resourceGroups && resourceGroups[resourceGroupIndex] && resourceGroups[resourceGroupIndex].resources,
+	                    values: [sourceSchema, filteredDestinationSchema],
+	                    sectionLabels: [step.sourceProvider, step.destinationProvider],
+	                    sectionLabelSuffix: 'Objects', fieldPropLabel: 'name'
 	                  })
 	                ) : null
 	              ) : null
@@ -21356,7 +21660,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reduxForm = __webpack_require__(3);
+	var _reduxForm = __webpack_require__(4);
 	
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 	
@@ -21445,7 +21749,7 @@ module.exports =
 	        { opened: opened, hideModal: hideModal, title: 'Transform Data' },
 	        _react2.default.createElement(
 	          'div',
-	          null,
+	          { style: { padding: '1em' } },
 	          _react2.default.createElement(
 	            'div',
 	            null,
@@ -21560,7 +21864,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reduxForm = __webpack_require__(3);
+	var _reduxForm = __webpack_require__(4);
 	
 	var _reactRedux = __webpack_require__(141);
 	
@@ -21685,23 +21989,37 @@ module.exports =
 	      var mappings = [];
 	      bundles.forEach(function (group, index) {
 	
-	        // get resource + name + destinationKey
+	        // get resource + name + destinationKeys
 	        var destinationResource = _this2.props.wizard.destinationMetadata ? _this2.props.wizard.destinationMetadata.find(function (rsc) {
 	          return rsc.name === group.name;
 	        }) : group;
 	        group.name = destinationResource.type;
-	        group.destinationKey = destinationResource && destinationResource.properties && destinationResource.properties.find(function (prop) {
-	          return prop.label === group.destinationKey;
-	        }).name;
-	
-	        // get sourceKey (check both metadatas)
-	        var dataSourceMetadata = group.resources[0].provider === _this2.props.providers['destination'] ? _this2.props.wizard.destinationMetadata : _this2.props.wizard.sourceMetadata;
-	        var sourceResource = dataSourceMetadata.find(function (metaRsc) {
-	          return metaRsc.name === group.resources[0].name;
+	        if (group.destinationKeys) {
+	          group.destinationKeys = group.destinationKeys.map(function (dk) {
+	            return destinationResource && destinationResource.properties && destinationResource.properties.find(function (prop) {
+	              return prop.label === dk;
+	            }).name || "lingk__externalId__c";
+	          });
+	        } else {
+	          group.destinationKeys = ["lingk__externalId__c"];
+	        }
+	
+	        // get resource + name + sourceKeys
+	        var sourceKeysObjects = [];
+	        group.sourceKeys = group.sourceKeys.map(function (sk, i) {
+	          var sourceKeyResourceProvider = group.resources.find(function (r) {
+	            return r.name === group.sourceKeysObjects[i];
+	          }).provider;
+	          var dataSourceMetadata = sourceKeyResourceProvider === _this2.props.providers['destination'] ? _this2.props.wizard.destinationMetadata : _this2.props.wizard.sourceMetadata;
+	          var sourceResource = dataSourceMetadata.find(function (metaRsc) {
+	            return metaRsc.name === group.sourceKeysObjects[i];
+	          });
+	          sourceKeysObjects.push(sourceResource.type);
+	          return sourceResource && sourceResource.properties && sourceResource.properties.find(function (prop) {
+	            return prop.label === sk;
+	          }).name;
 	        });
-	        group.sourceKey = sourceResource && sourceResource.properties && sourceResource.properties.find(function (prop) {
-	          return prop.label === group.sourceKey;
-	        }).name;
+	        group.sourceKeysObjects = sourceKeysObjects;
 	
 	        if (group.mappings) {
 	          group.mappings.forEach(function (singleMapping) {
@@ -21740,7 +22058,7 @@ module.exports =
 	                resourceToName: destinationResource.type,
 	                propertyToName: destinationProperty.name,
 	                bundleIndex: index
-	              }, singleMapping.dataSourceIsDestinationEntity && { isDestinationResource: true }, singleMapping.transformations && singleMapping.transformations.length > 0 && !singleMapping.transformations.every(function (t) {
+	              }, singleMapping.isExternalKeyMapping && { isExternalKeyMapping: true }, singleMapping.dataSourceIsDestinationEntity && { isDestinationResource: true }, singleMapping.transformations && singleMapping.transformations.length > 0 && !singleMapping.transformations.every(function (t) {
 	                return t.type === 'none';
 	              }) && { transformations: singleMapping.transformations }));
 	            }
@@ -21808,7 +22126,7 @@ module.exports =
 	          tenantId = _props2.tenantId;
 	
 	      if (true) {
-	        actions.submitWizardData(tenantId, accountId, bundles, mappings, configuration, formValues.title || 'Banner for Salesforce', formValues.deployment || null, typeGuid, onGenerate, onFinish);
+	        actions.submitWizardData(tenantId, accountId, bundles, mappings, configuration, formValues.title || 'Banner for Salesforce', formValues.deployment || null, typeGuid, onGenerate, onFinish, this.props.wizard.destinationMetadata || []);
 	        onSubmit({ complete: formValues.hasOwnProperty('deployment') });
 	      }
 	      actions.setWizardLoaded(false); // so wizard reloads config on 'restart'
@@ -22075,7 +22393,7 @@ module.exports =
 	      mode: 'destination'
 	    }, {
 	      type: 'schema',
-	      title: 'Build Sync Operations',
+	      title: 'Object Mapping',
 	      mode: 'source'
 	    }, {
 	      type: 'filter',