@lingk/sync 0.0.46 → 0.0.47

package/build/main.js

@@ -45,7 +45,7 @@ module.exports =
 /* 0 */
 /***/ function(module, exports, __webpack_require__) {
 
-	module.exports = __webpack_require__(61);
+	module.exports = __webpack_require__(62);
 
 
 /***/ },
@@ -391,7 +391,9 @@ module.exports =
 	    value: function removeResourceGroup(i) {
 	      this.props.removeGroup(i);
 	      var isFirst = i === 0;
-	      this.go(!isFirst, isFirst ? 0 : i - 1);
+	      if (i === this.state.resourceGroupIndex) {
+	        this.go(!isFirst, isFirst ? 0 : i - 1);
+	      }
 	    }
 	  }, {
 	    key: "addDefaultResourceGroup",
@@ -530,7 +532,9 @@ module.exports =
 	              _react2.default.createElement(
 	                "span",
 	                null,
-	                "Destination Object"
+	                "Destination: ",
+	                step.destinationProvider,
+	                " Object"
 	              ),
 	              _react2.default.createElement(
 	                Tooltip,
@@ -587,7 +591,7 @@ module.exports =
 	            "div",
 	            { style: { position: 'absolute', right: 0, top: -2, zIndex: 99 } },
 	            _react2.default.createElement(Select, { label: "+", type: "brand", style: { height: 40 }, menuAlign: "right", extraClass: true,
-	              onSelect: this.addDefaultResourceGroup, values: destinationSchema, title: "Add New",
+	              onSelect: this.addDefaultResourceGroup, values: destinationSchema, title: "Add Destination",
 	              minWidth: 260
 	            })
 	          ) : null
@@ -1065,7 +1069,6 @@ module.exports =
 	    return api.get(tenantId + '/' + appId + '/' + urlSuffix, {
 	      endpoint: AGENT_API_URL
 	    }).then(function (res) {
-	      console.log(res);
 	      dispatch({
 	        type: types.SET_WIZARD_METADATA,
 	        data: { res: res, mode: mode, providerType: providerType }
@@ -2075,7 +2078,12 @@ module.exports =
 	var providerTypes = exports.providerTypes = {
 	  Salesforce: {
 	    credentials: [{ name: 'Username' }, { name: 'Password' }, { name: 'API Key' }],
-	    metadataEndpoint: 'salesforceschema'
+	    metadataEndpoint: 'salesforceschema',
+	    customStep: {
+	      type: 'default',
+	      title: 'Choose Default Dataset',
+	      options: ['standard', 'heda']
+	    }
 	  },
 	  API: {
 	    credentials: [{ name: 'Consumer Key' }, { name: 'Secret' }]
@@ -2395,6 +2403,169 @@ module.exports =
 	
 	var _reduxForm = __webpack_require__(3);
 	
+	var _navButtons = __webpack_require__(4);
+	
+	var _navButtons2 = _interopRequireDefault(_navButtons);
+	
+	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); } }
+	
+	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+	
+	function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+	
+	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 DefaultDatasetStep = function (_Component) {
+	  _inherits(DefaultDatasetStep, _Component);
+	
+	  function DefaultDatasetStep() {
+	    _classCallCheck(this, DefaultDatasetStep);
+	
+	    var _this = _possibleConstructorReturn(this, (DefaultDatasetStep.__proto__ || Object.getPrototypeOf(DefaultDatasetStep)).call(this));
+	
+	    _this.defaultResourceMapping = [{
+	      name: 'Contact',
+	      resources: [{
+	        name: 'Applicant',
+	        externalKey: null,
+	        provider: 'Banner'
+	      }]
+	    }];
+	    _this.loadDefault = _this.loadDefault.bind(_this);
+	    _this.select = _this.select.bind(_this);
+	    return _this;
+	  }
+	
+	  _createClass(DefaultDatasetStep, [{
+	    key: 'componentDidMount',
+	    value: function componentDidMount() {
+	      var _props = this.props,
+	          change = _props.change,
+	          formValues = _props.formValues;
+	
+	      if (formValues['defaultDataset']) {
+	        change('defaultDataset', formValues['defaultDataset']);
+	      }
+	    }
+	  }, {
+	    key: 'options',
+	    value: function options(ops) {
+	      var defaultDatasetTitles = {
+	        'standard': 'Standard Salesforce Dataset',
+	        'heda': 'Salesforce HEDA Dataset'
+	      };
+	      var obj = {};
+	      ops.forEach(function (o) {
+	        obj[o] = defaultDatasetTitles[o];
+	      });
+	      return obj;
+	    }
+	  }, {
+	    key: 'select',
+	    value: function select(v) {
+	      this.loadDefault();
+	    }
+	  }, {
+	    key: 'loadDefault',
+	    value: function loadDefault() {
+	      //default bundle map
+	      var change = this.props.change;
+	
+	      var defaults = [].concat(_toConsumableArray(this.defaultResourceMapping));
+	      change('resourceGroups', defaults);
+	    }
+	  }, {
+	    key: 'autoMap',
+	    value: function autoMap() {
+	      // this function needs to dig deeper and check every field against every mapping
+	      var _props2 = this.props,
+	          formValues = _props2.formValues,
+	          change = _props2.change,
+	          step = _props2.step;
+	
+	      var sourceSchema = formValues['sourceSchema'] || {};
+	      var obj = {};
+	      for (var key in step.autoMapData) {
+	        if (sourceSchema && sourceSchema[key.split('.')[0]]) {
+	          obj[key] = step.autoMapData[key];
+	        }
+	      }
+	      change('mappings', obj);
+	    }
+	  }, {
+	    key: 'render',
+	    value: function render() {
+	      var _props3 = this.props,
+	          inputs = _props3.inputs,
+	          handleSubmit = _props3.handleSubmit,
+	          nav = _props3.nav,
+	          step = _props3.step,
+	          reset = _props3.reset,
+	          formValues = _props3.formValues;
+	
+	
+	      return _react2.default.createElement(
+	        'form',
+	        { onSubmit: handleSubmit, onKeyPress: function onKeyPress(e) {
+	            return e.charCode === 13 ? e.preventDefault() : null;
+	          } },
+	        _react2.default.createElement(
+	          'div',
+	          { style: { fontSize: 20 } },
+	          'Choose Default Dataset'
+	        ),
+	        _react2.default.createElement('br', null),
+	        _react2.default.createElement(
+	          'p',
+	          null,
+	          'Choose a default datasets as the starting point for your integration.'
+	        ),
+	        _react2.default.createElement('br', null),
+	        _react2.default.createElement(
+	          'div',
+	          { style: { marginLeft: 16 } },
+	          _react2.default.createElement(_reduxForm.Field, { component: inputs.rfRadioGroup, name: 'defaultDataset', label: 'Default Dataset',
+	            options: this.options(step.options), onClickOption: this.select })
+	        ),
+	        _react2.default.createElement('br', null),
+	        _react2.default.createElement(_navButtons2.default, { nextDisabled: !formValues['defaultDataset'], handleSubmit: handleSubmit,
+	          nav: nav, reset: reset, inputs: inputs }),
+	        _react2.default.createElement('br', null),
+	        _react2.default.createElement('br', null)
+	      );
+	    }
+	  }]);
+	
+	  return DefaultDatasetStep;
+	}(_react.Component);
+	
+	exports.default = (0, _reduxForm.reduxForm)({
+	  form: 'wizard',
+	  destroyOnUnmount: false,
+	  forceUnregisterOnUnmount: true,
+	  touchOnBlur: false
+	})(DefaultDatasetStep);
+
+/***/ },
+/* 48 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	
+	Object.defineProperty(exports, "__esModule", {
+	  value: true
+	});
+	
+	var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+	
+	var _react = __webpack_require__(1);
+	
+	var _react2 = _interopRequireDefault(_react);
+	
+	var _reduxForm = __webpack_require__(3);
+	
 	var _validate = __webpack_require__(5);
 	
 	var _validate2 = _interopRequireDefault(_validate);
@@ -2465,6 +2636,12 @@ module.exports =
 	          'Save and Deploy Integration'
 	        ),
 	        _react2.default.createElement('br', null),
+	        _react2.default.createElement(
+	          'p',
+	          null,
+	          'Run the integration once or schedule the integration based on a time schedule.'
+	        ),
+	        _react2.default.createElement('br', null),
 	        _react2.default.createElement(
 	          'div',
 	          { style: { marginLeft: 16 } },
@@ -2515,7 +2692,7 @@ module.exports =
 	})(DeployStep);
 
 /***/ },
-/* 48 */
+/* 49 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -2627,7 +2804,6 @@ module.exports =
 	
 	      var Button = inputs.Button;
 	      var Spinner = inputs.Spinner;
-	      var Tooltip = inputs.Tooltip;
 	      return _react2.default.createElement(
 	        'form',
 	        { onKeyPress: function onKeyPress(e) {
@@ -2641,19 +2817,14 @@ module.exports =
 	          step.provider,
 	          ' Environment'
 	        ),
+	        _react2.default.createElement('br', null),
+	        _react2.default.createElement('br', null),
 	        _react2.default.createElement(
-	          Tooltip,
-	          { nubbin: 'left-top', wrapStyle: { bottom: 2 }, popStyle: { width: 148 } },
-	          _react2.default.createElement(
-	            'p',
-	            null,
-	            'Enter the root URL for your ',
-	            step.provider,
-	            ' Adapter'
-	          )
+	          'p',
+	          null,
+	          'After configuring the Lingk Adapter, enter the API base URL below to test connectivity and preview Lingk Adapter API resources for Banner.'
 	        ),
 	        _react2.default.createElement('br', null),
-	        _react2.default.createElement('br', null),
 	        _react2.default.createElement(
 	          'div',
 	          { style: { marginLeft: 16 } },
@@ -2663,7 +2834,7 @@ module.exports =
 	            _react2.default.createElement(
 	              'div',
 	              { style: { display: 'inline-block' } },
-	              _react2.default.createElement(_reduxForm.Field, { name: step.mode + 'Endpoint', type: 'text', component: inputs.rfInput, label: step.provider + ' Endpoint' })
+	              _react2.default.createElement(_reduxForm.Field, { name: step.mode + 'Endpoint', type: 'text', component: inputs.rfInput, label: 'Lingk Adapter Endpoint' })
 	            ),
 	            !step.credentials ? _react2.default.createElement(
 	              Button,
@@ -2753,7 +2924,7 @@ module.exports =
 	})(EnvironmentStep);
 
 /***/ },
-/* 49 */
+/* 50 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -2854,7 +3025,7 @@ module.exports =
 	})(FilterStep);
 
 /***/ },
-/* 50 */
+/* 51 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -2879,7 +3050,7 @@ module.exports =
 	
 	var _navButtons2 = _interopRequireDefault(_navButtons);
 	
-	var _mapAccordion = __webpack_require__(56);
+	var _mapAccordion = __webpack_require__(57);
 	
 	var _mapAccordion2 = _interopRequireDefault(_mapAccordion);
 	
@@ -2891,11 +3062,11 @@ module.exports =
 	
 	var _groupNav2 = _interopRequireDefault(_groupNav);
 	
-	var _transformModal = __webpack_require__(59);
+	var _transformModal = __webpack_require__(60);
 	
 	var _transformModal2 = _interopRequireDefault(_transformModal);
 	
-	var _mapTableRows = __webpack_require__(57);
+	var _mapTableRows = __webpack_require__(58);
 	
 	var Rows = _interopRequireWildcard(_mapTableRows);
 	
@@ -2922,11 +3093,8 @@ module.exports =
 	    _this.state = {
 	      showModal: false,
 	      selectedTransform: null,
-	      selectedTransformIndex: null,
-	      selectedTransformResourceIndex: null
+	      selectedTransformResourceGroupIndex: null
 	    };
-	    _this.clearAllMappings = _this.clearAllMappings.bind(_this);
-	    _this.autoMap = _this.autoMap.bind(_this);
 	    _this.clearOneMapping = _this.clearOneMapping.bind(_this);
 	    _this.update = _this.update.bind(_this);
 	    _this.hideModal = _this.hideModal.bind(_this);
@@ -2962,52 +3130,30 @@ module.exports =
 	    }
 	  }, {
 	    key: 'selectMapping',
-	    value: function selectMapping(rscIndex, m, i) {
+	    value: function selectMapping(rscGroupIndex, m) {
 	      this.setState({
 	        showModal: true,
 	        selectedTransform: m,
-	        selectedTransformIndex: i,
-	        selectedTransformResourceIndex: rscIndex
+	        selectedTransformResourceGroupIndex: rscGroupIndex
 	      });
 	    }
-	  }, {
-	    key: 'autoMap',
-	    value: function autoMap() {
-	      // this function needs to dig deeper and check every field against every mapping
-	      var _props2 = this.props,
-	          formValues = _props2.formValues,
-	          change = _props2.change,
-	          step = _props2.step;
 	
-	      var sourceSchema = formValues['sourceSchema'] || {};
-	      var obj = {};
-	      for (var key in step.autoMapData) {
-	        if (sourceSchema && sourceSchema[key.split('.')[0]]) {
-	          obj[key] = step.autoMapData[key];
-	        }
-	      }
-	      change('mappings', obj);
-	    }
-	  }, {
-	    key: 'clearAllMappings',
-	    value: function clearAllMappings() {
-	      var _props3 = this.props,
-	          change = _props3.change,
-	          formValues = _props3.formValues;
+	    /*clearAllMappings(){
+	      const { change, formValues } = this.props
+	      const resourceGroups = [ ...formValues['resourceGroups'] ] || null
+	      resourceGroups.forEach((group)=>{
+	        delete group.mappings
+	      })
+	      change('resourceGroups', resourceGroups)
+	      this.forceUpdate()
+	    }*/
 	
-	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups'])) || null;
-	      resourceGroups.forEach(function (group) {
-	        delete group.mappings;
-	      });
-	      change('resourceGroups', resourceGroups);
-	      this.forceUpdate();
-	    }
 	  }, {
 	    key: 'clearOneMapping',
 	    value: function clearOneMapping(groupIndex, mapp) {
-	      var _props4 = this.props,
-	          change = _props4.change,
-	          formValues = _props4.formValues;
+	      var _props2 = this.props,
+	          change = _props2.change,
+	          formValues = _props2.formValues;
 	
 	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups'])) || null;
 	      resourceGroups[groupIndex].mappings = resourceGroups[groupIndex].mappings.filter(function (m) {
@@ -3030,24 +3176,23 @@ module.exports =
 	  }, {
 	    key: 'render',
 	    value: function render() {
-	      var _props5 = this.props,
-	          inputs = _props5.inputs,
-	          handleSubmit = _props5.handleSubmit,
-	          nav = _props5.nav,
-	          formValues = _props5.formValues,
-	          change = _props5.change,
-	          step = _props5.step,
-	          reset = _props5.reset,
-	          wizard = _props5.wizard;
+	      var _props3 = this.props,
+	          inputs = _props3.inputs,
+	          handleSubmit = _props3.handleSubmit,
+	          nav = _props3.nav,
+	          formValues = _props3.formValues,
+	          change = _props3.change,
+	          step = _props3.step,
+	          reset = _props3.reset,
+	          wizard = _props3.wizard;
 	
-	      var Button = inputs.Button;
 	      var MapTable = inputs.MapTable;
 	      var Tooltip = inputs.Tooltip;
 	      var sourceSchema = wizard['sourceMetadata'] ? wizard['sourceMetadata'] : null;
 	
 	      var destinationSchema = wizard['destinationMetadata'] ? wizard['destinationMetadata'] : null;
 	
-	      var resourceGroups = formValues['resourceGroups'].filter(function (g) {
+	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups'])).filter(function (g) {
 	        return g.resources && g.resources.length > 0;
 	      });
 	
@@ -3064,29 +3209,14 @@ module.exports =
 	          ' Fields to ',
 	          step.destinationProvider
 	        ),
-	        _react2.default.createElement(
-	          Tooltip,
-	          { nubbin: 'left-top', wrapStyle: { bottom: 3 }, popStyle: { width: 225 } },
-	          _react2.default.createElement(
-	            'p',
-	            null,
-	            'First choose a Source field to map, then click on a Destination field. You can also click \'Combine\' to map multiple source fields to one destination.'
-	          )
-	        ),
 	        _react2.default.createElement('br', null),
 	        _react2.default.createElement('br', null),
-	        step.autoMapData ? _react2.default.createElement(
-	          Button,
-	          { type: 'brand', onClick: this.autoMap, style: { marginRight: 5 } },
-	          'Automap'
-	        ) : null,
 	        _react2.default.createElement(
-	          Button,
-	          { type: 'brand', onClick: this.clearAllMappings },
-	          'Clear All Mappings'
+	          'p',
+	          null,
+	          'Map data elements from data sources to Salesforce object fields one dataset at a time.'
 	        ),
 	        _react2.default.createElement('br', null),
-	        _react2.default.createElement('br', null),
 	        _react2.default.createElement(
 	          'div',
 	          null,
@@ -3098,7 +3228,7 @@ module.exports =
 	              { resourceGroups: resourceGroups, customizable: false, isBundleStep: false, inputs: inputs,
 	                style: { position: 'relative', width: 640, height: 69, zIndex: 9000 }, step: step },
 	              _react2.default.createElement(_mapAccordion2.default, { sourceSchema: sourceSchema, destinationSchema: destinationSchema,
-	                formValues: formValues, change: change, update: this.update }),
+	                formValues: formValues, change: change, update: this.update, step: step }),
 	              _react2.default.createElement(
 	                MapTable,
 	                { clearOneMapping: this.clearOneMapping, selectMapping: this.selectMapping },
@@ -3115,8 +3245,8 @@ module.exports =
 	          'div',
 	          null,
 	          this.state.showModal && _react2.default.createElement(_transformModal2.default, { inputs: inputs, hideModal: this.hideModal, mapping: this.state.selectedTransform,
-	            opened: this.state.showModal, mappingIndex: this.state.selectedTransformIndex, change: change,
-	            resourceGroupIndex: this.state.selectedTransformResourceIndex, resourceGroups: resourceGroups })
+	            opened: this.state.showModal, change: change, resourceGroups: resourceGroups,
+	            resourceGroupIndex: this.state.selectedTransformResourceGroupIndex })
 	        ) : null,
 	        _react2.default.createElement('br', null),
 	        _react2.default.createElement(_navButtons2.default, { handleSubmit: handleSubmit, nav: nav, reset: reset, inputs: inputs,
@@ -3137,7 +3267,7 @@ module.exports =
 	})(MapStep);
 
 /***/ },
-/* 51 */
+/* 52 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -3253,7 +3383,7 @@ module.exports =
 	})(NameStep);
 
 /***/ },
-/* 52 */
+/* 53 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -3351,7 +3481,7 @@ module.exports =
 	})(PhaseStep);
 
 /***/ },
-/* 53 */
+/* 54 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -3486,7 +3616,7 @@ module.exports =
 	})(PreviewStep);
 
 /***/ },
-/* 54 */
+/* 55 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -3511,7 +3641,7 @@ module.exports =
 	
 	var _navButtons2 = _interopRequireDefault(_navButtons);
 	
-	var _schemaAccordion = __webpack_require__(58);
+	var _schemaAccordion = __webpack_require__(59);
 	
 	var _schemaAccordion2 = _interopRequireDefault(_schemaAccordion);
 	
@@ -3523,7 +3653,7 @@ module.exports =
 	
 	var _groupNav2 = _interopRequireDefault(_groupNav);
 	
-	var _bundleTableRows = __webpack_require__(55);
+	var _bundleTableRows = __webpack_require__(56);
 	
 	var Rows = _interopRequireWildcard(_bundleTableRows);
 	
@@ -3552,21 +3682,12 @@ module.exports =
 	    };
 	    _this.addCustomEntity = _this.addCustomEntity.bind(_this);
 	    _this.newEntityKeyPress = _this.newEntityKeyPress.bind(_this);
-	    _this.loadDefault = _this.loadDefault.bind(_this);
-	    _this.clearAllData = _this.clearAllData.bind(_this);
 	    _this.addDefaultEntity = _this.addDefaultEntity.bind(_this);
 	    _this.removeEntity = _this.removeEntity.bind(_this);
 	    _this.addGroup = _this.addGroup.bind(_this);
 	    _this.removeGroup = _this.removeGroup.bind(_this);
 	    _this.changeEntityOrder = _this.changeEntityOrder.bind(_this);
 	    _this.changeGroupOrder = _this.changeGroupOrder.bind(_this);
-	    _this.defaultResourceMapping = [{
-	      name: 'Contact',
-	      resources: [{
-	        name: 'Student',
-	        externalKey: null
-	      }]
-	    }];
 	    return _this;
 	  }
 	
@@ -3602,29 +3723,6 @@ module.exports =
 	      resourceGroups.splice(i, 1);
 	      change('resourceGroups', resourceGroups);
 	    }
-	  }, {
-	    key: 'loadDefault',
-	    value: function loadDefault() {
-	      //default bundle map
-	      var change = this.props.change;
-	      //change(`${step.mode}Schema`, wizard[`${step.mode}Metadata`] || step.defaultSchema)
-	      //const sourceSchema = wizard[`sourceMetadata`] || step.defaultSchema
-	
-	      var defaults = [].concat(_toConsumableArray(this.defaultResourceMapping));
-	      /*defaults.forEach((group)=>{
-	        Object.keys(group.resources).forEach((key)=>{
-	          group.resources[key].fields = sourceSchema[key] 
-	        })
-	      })*/
-	      change('resourceGroups', defaults);
-	    }
-	  }, {
-	    key: 'clearAllData',
-	    value: function clearAllData() {
-	      var change = this.props.change;
-	
-	      change('resourceGroups', null);
-	    }
 	  }, {
 	    key: 'addCustomEntity',
 	    value: function addCustomEntity() {
@@ -3648,7 +3746,7 @@ module.exports =
 	          formValues = _props4.formValues;
 	
 	
-	      var resourceGroups = formValues['resourceGroups'] || [];
+	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups'])) || [];
 	      resourceGroups.push({
 	        name: v,
 	        resources: null,
@@ -3659,7 +3757,7 @@ module.exports =
 	    }
 	  }, {
 	    key: 'addDefaultEntity',
-	    value: function addDefaultEntity(groupIndex, v, rscIndex) {
+	    value: function addDefaultEntity(groupIndex, v, rscIndex, section) {
 	      var _props5 = this.props,
 	          change = _props5.change,
 	          formValues = _props5.formValues;
@@ -3672,7 +3770,8 @@ module.exports =
 	      }
 	      group.resources.push({
 	        name: v,
-	        externalKey: null
+	        externalKey: null,
+	        provider: section
 	      });
 	      change('resourceGroups', resourceGroups);
 	      this.forceUpdate();
@@ -3735,9 +3834,7 @@ module.exports =
 	          reset = _props9.reset,
 	          wizard = _props9.wizard;
 	
-	      var resourceGroups = formValues['resourceGroups'] || null;
-	      var Button = inputs.Button;
-	      var Tooltip = inputs.Tooltip;
+	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups'])) || null;
 	      var BundleTable = inputs.BundleTable;
 	
 	      var sourceSchema = wizard['sourceMetadata'] ? wizard['sourceMetadata'] : null;
@@ -3754,38 +3851,14 @@ module.exports =
 	          { style: { fontSize: 20, display: 'inline-block' } },
 	          'Build Dataset'
 	        ),
-	        _react2.default.createElement(
-	          Tooltip,
-	          { nubbin: 'left-top', wrapStyle: { bottom: 3 }, popStyle: { width: 225 } },
-	          _react2.default.createElement(
-	            'p',
-	            null,
-	            'Group ',
-	            step.sourceProvider,
-	            ' objects together, and map them to ',
-	            step.destinationProvider,
-	            ' objects.'
-	          )
-	        ),
 	        _react2.default.createElement('br', null),
 	        _react2.default.createElement('br', null),
 	        _react2.default.createElement(
-	          'div',
+	          'p',
 	          null,
-	          _react2.default.createElement(
-	            Button,
-	            { type: 'brand', onClick: this.loadDefault },
-	            'Load Default Dataset'
-	          ),
-	          '\xA0\xA0',
-	          _react2.default.createElement(
-	            Button,
-	            { type: 'brand', onClick: this.clearAllData },
-	            'Clear Configuration'
-	          ),
-	          _react2.default.createElement('br', null),
-	          _react2.default.createElement('br', null)
+	          'Build datasets by mapping one or many data sources to a single Salesforce destination object.'
 	        ),
+	        _react2.default.createElement('br', null),
 	        resourceGroups && resourceGroups.length > 0 ? _react2.default.createElement(
 	          'div',
 	          null,
@@ -3796,7 +3869,7 @@ module.exports =
 	              destinationSchema: destinationSchema, changeGroupOrder: this.changeGroupOrder, step: step,
 	              inputs: inputs, customizable: step.customizable, addDefaultEntity: this.addDefaultEntity },
 	            _react2.default.createElement(_schemaAccordion2.default, { sourceSchema: sourceSchema, removeEntity: this.removeEntity,
-	              changeEntityOrder: this.changeEntityOrder, step: step }),
+	              changeEntityOrder: this.changeEntityOrder, step: step, destinationSchema: destinationSchema }),
 	            _react2.default.createElement(
 	              BundleTable,
 	              null,
@@ -3809,7 +3882,7 @@ module.exports =
 	        ) : null,
 	        _react2.default.createElement(_navButtons2.default, { handleSubmit: handleSubmit, nav: nav, reset: reset, inputs: inputs,
 	          nextDisabled: !(resourceGroups && resourceGroups.length > 0) || !resourceGroups.every(function (g) {
-	            return g.resources && g.resources.every(function (rsc) {
+	            return g.resources && g.resources.length < 2 || g.resources && g.resources.every(function (rsc) {
 	              return rsc.externalKey;
 	            });
 	          }) })
@@ -3829,7 +3902,7 @@ module.exports =
 	})(SchemaStep);
 
 /***/ },
-/* 55 */
+/* 56 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -3891,8 +3964,8 @@ module.exports =
 	    _react2.default.createElement(
 	      'div',
 	      { style: { display: 'inline-block', marginLeft: 10, marginTop: 1 } },
-	      _react2.default.createElement(_reduxForm.Field, { component: inputs.rfPicklist, type: 'input', defaultLabel: 'Choose Key',
-	        name: 'resourceGroups.' + i + '.auxillary', selectedValue: group.auxillary,
+	      _react2.default.createElement(_reduxForm.Field, { component: inputs.rfPicklist, type: 'input', defaultLabel: 'Choose Unique Key',
+	        name: 'resourceGroups.' + i + '.destinationKey', selectedValue: group.destinationKey,
 	        values: destinationSchema && destinationSchema.find(function (defaultRsc) {
 	          return defaultRsc.name === group.name;
 	        }) && destinationSchema.find(function (defaultRsc) {
@@ -3909,8 +3982,9 @@ module.exports =
 	
 	  return _react2.default.createElement(
 	    'div',
-	    { className: 'remove-resource-group', onClick: function onClick() {
-	        return removeResourceGroup(i);
+	    { className: 'remove-resource-group', onClick: function onClick(e) {
+	        e.stopPropagation();
+	        removeResourceGroup(i);
 	      } },
 	    _react2.default.createElement(
 	      'svg',
@@ -3921,7 +3995,7 @@ module.exports =
 	};
 
 /***/ },
-/* 56 */
+/* 57 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -4008,16 +4082,16 @@ module.exports =
 	      var selectedEntity = selectedEntities[resourceGroupIndex];
 	      if (this.state.selectedField) {
 	        var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
-	        var rsc = resourceGroups[resourceGroupIndex];
-	        rsc.mappings = rsc.mappings && rsc.mappings.filter(function (m) {
+	        var rscGroup = resourceGroups[resourceGroupIndex];
+	        rscGroup.mappings = rscGroup.mappings && rscGroup.mappings.filter(function (m) {
 	          return m.propertyToName !== field;
 	        }) || [];
-	        rsc.mappings.push({
+	        rscGroup.mappings.push({
 	          resourceFromName: selectedEntity,
 	          resourceToName: group,
 	          propertyFromName: this.state.selectedField,
 	          propertyToName: field,
-	          transformType: 'none'
+	          transformations: [{ type: 'none' }]
 	        });
 	        change('resourceGroups', resourceGroups);
 	        this.setState({ selectedField: null });
@@ -4037,7 +4111,8 @@ module.exports =
 	          leftClicked = _props2.leftClicked,
 	          sourceSchema = _props2.sourceSchema,
 	          destinationSchema = _props2.destinationSchema,
-	          toggle = _props2.toggle;
+	          toggle = _props2.toggle,
+	          step = _props2.step;
 	      var selectedField = this.state.selectedField;
 	
 	
@@ -4067,7 +4142,7 @@ module.exports =
 	            _react2.default.createElement(
 	              'div',
 	              { style: { marginLeft: 12, marginTop: 3 }, className: 'labelz' },
-	              'Source Objects'
+	              'Data Sources'
 	            ),
 	            bit.map(function (x, ii) {
 	              return _react2.default.createElement(
@@ -4084,6 +4159,7 @@ module.exports =
 	                      }, className: 'scrolly',
 	                      style: { background: 'white', height: 261, width: 350, padding: '6px 12px' } },
 	                    group.resources && group.resources.map(function (rsc, i) {
+	                      var schema = rsc.provider === step.destinationProvider ? destinationSchema : sourceSchema;
 	                      return _react2.default.createElement(
 	                        'div',
 	                        { key: i, className: 'accordion-panel', style: { overflow: 'hidden', width: 323 } },
@@ -4096,22 +4172,34 @@ module.exports =
 	                              _this2.pickEntity(rsc.name);
 	                            }
 	                          },
-	                          rsc.name
+	                          _react2.default.createElement(
+	                            'span',
+	                            null,
+	                            rsc.name
+	                          ),
+	                          _react2.default.createElement(
+	                            'svg',
+	                            { xmlns: 'http://www.w3.org/2000/svg', fill: '#FFFFFF', width: '18', height: '18', viewBox: '0 0 18 18',
+	                              style: { float: 'right',
+	                                transform: selectedEntity === rsc.name ? 'rotate(180deg)' : 'rotate(0deg)'
+	                              } },
+	                            _react2.default.createElement('path', { d: 'M5 8l4 4 4-4z' })
+	                          )
 	                        ),
 	                        _react2.default.createElement(
 	                          'div',
 	                          { className: 'accordion-panel-collapse',
 	                            style: {
-	                              height: selectedEntity === rsc.name ? sourceSchema.filter(function (r) {
+	                              height: schema && selectedEntity === rsc.name ? schema.filter(function (r) {
 	                                return r.name === rsc.name;
 	                              })[0].properties.length * 18 + 19 : 0,
 	                              padding: '0 6px'
 	                            }
 	                          },
 	                          _react2.default.createElement('div', { style: { height: 9 } }),
-	                          sourceSchema.filter(function (r) {
+	                          schema && schema.find(function (r) {
 	                            return r.name === rsc.name;
-	                          })[0].properties.map(function (field, ii) {
+	                          }).properties.map(function (field, ii) {
 	                            var style = {
 	                              paddingLeft: 5,
 	                              background: selectedField && selectedField === field.label ? '#dfe0e0' : 'initial',
@@ -4159,7 +4247,7 @@ module.exports =
 	                  _react2.default.createElement(
 	                    'div',
 	                    { className: 'scrolly', style: { height: 256, padding: '8px 12px' } },
-	                    destinationSchema.find(function (r) {
+	                    destinationSchema && destinationSchema.find(function (r) {
 	                      return r.name === group.name;
 	                    }).properties.map(function (field, i) {
 	                      return _react2.default.createElement(
@@ -4190,7 +4278,7 @@ module.exports =
 	exports.default = MapAccordion;
 
 /***/ },
-/* 57 */
+/* 58 */
 /***/ function(module, exports, __webpack_require__) {
 
 	"use strict";
@@ -4280,6 +4368,7 @@ module.exports =
 	
 	var MapTableTransformRow = exports.MapTableTransformRow = function MapTableTransformRow(props) {
 	  var group = props.group,
+	      i = props.i,
 	      selectMapping = props.selectMapping;
 	
 	  var icons = {
@@ -4353,7 +4442,7 @@ module.exports =
 	          return _react2.default.createElement(
 	            "div",
 	            { key: iv, className: "map-table-transform-icon", onClick: function onClick() {
-	                return selectMapping(iii, m, iv);
+	                return selectMapping(i, m);
 	              } },
 	            m.transformations && m.transformations[0] && icons[m.transformations[0].type] || icons['none']
 	          );
@@ -4372,7 +4461,7 @@ module.exports =
 	};
 
 /***/ },
-/* 58 */
+/* 59 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -4391,7 +4480,7 @@ module.exports =
 	
 	var _reactAddonsCssTransitionGroup2 = _interopRequireDefault(_reactAddonsCssTransitionGroup);
 	
-	var _reactDraggable = __webpack_require__(65);
+	var _reactDraggable = __webpack_require__(66);
 	
 	var _reactDraggable2 = _interopRequireDefault(_reactDraggable);
 	
@@ -4532,6 +4621,7 @@ module.exports =
 	          toggle = _props3.toggle,
 	          leftClicked = _props3.leftClicked,
 	          sourceSchema = _props3.sourceSchema,
+	          destinationSchema = _props3.destinationSchema,
 	          overflowHidden = _props3.overflowHidden,
 	          showOverflow = _props3.showOverflow,
 	          step = _props3.step;
@@ -4541,7 +4631,13 @@ module.exports =
 	      var group = resourceGroups[resourceGroupIndex];
 	      var bit = [true, false];
 	      var direction = leftClicked ? 'right' : 'left';
-	      var groupResourcesLength = group.resources ? group.resources.length : 0;
+	      var groupResourcesLength = group && group.resources ? group.resources.length : 0;
+	
+	      var filteredDestinationSchema = destinationSchema.filter(function (rsc) {
+	        return resourceGroups.find(function (g) {
+	          return g.name === rsc.name && group.name !== rsc.name;
+	        }) ? true : false;
+	      });
 	
 	      return _react2.default.createElement(
 	        'div',
@@ -4570,7 +4666,7 @@ module.exports =
 	          _react2.default.createElement(
 	            'div',
 	            { style: { marginLeft: 12, marginTop: 3 }, className: 'labelz' },
-	            'Source Objects'
+	            'Data Sources'
 	          ),
 	          bit.map(function (x, ii) {
 	            return _react2.default.createElement(
@@ -4585,7 +4681,7 @@ module.exports =
 	                _react2.default.createElement(
 	                  'div',
 	                  { style: { position: 'relative' } },
-	                  group.resources && group.resources.map(function (rsc, i) {
+	                  group && group.resources && group.resources.map(function (rsc, i) {
 	                    return _react2.default.createElement(
 	                      _reactDraggable2.default,
 	                      { axis: 'y', bounds: 'parent', key: i, handle: '.drag-handle', position: { x: 0, y: _this3.state.yPositions[i] },
@@ -4603,14 +4699,14 @@ module.exports =
 	                            className: 'drag-handle' },
 	                          _react2.default.createElement(
 	                            'svg',
-	                            { xmlns: 'http://www.w3.org/2000/svg', fill: '#FFFFFF', width: '24', height: '24', viewBox: '0 0 18 18' },
-	                            _react2.default.createElement('path', { d: 'M9 4.12l2.38 2.38 1.06-1.06L9 2 5.56 5.44 6.62 6.5 9 4.12zm0 9.76L6.62 11.5l-1.06 1.06L9 16l3.44-3.44-1.06-1.06L9 13.88z' })
+	                            { 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', overflow: 'hidden', display: 'inline-block', width: 209, textOverflow: 'ellipsis', whiteSpace: 'nowrap' } },
-	                          rsc.name
+	                          rsc.provider === step.destinationProvider ? rsc.name + (' (' + step.destinationProvider + ')') : rsc.name
 	                        ),
 	                        _react2.default.createElement(
 	                          'div',
@@ -4627,15 +4723,20 @@ module.exports =
 	                        _react2.default.createElement(
 	                          'div',
 	                          { style: { verticalAlign: 'top', float: 'right', marginRight: 8 } },
-	                          _react2.default.createElement(_reduxForm.Field, { component: inputs.rfSelect, type: 'input', menuAlign: 'right', defaultLabel: 'Choose Group Key',
-	                            selectedValue: group.resources[i].externalKey, onClick: showOverflow, colorType: 'brand',
-	                            values: sourceSchema && sourceSchema.find(function (defaultRsc) {
+	                          group.resources.length > 1 ? _react2.default.createElement(_reduxForm.Field, { component: inputs.rfSelect, type: 'input', menuAlign: 'right',
+	                            defaultLabel: 'Configure Relationship', colorType: 'brand',
+	                            selectedValue: group.resources[i].externalKey, onClick: showOverflow,
+	                            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) {
 	                              return defaultRsc.name === rsc.name;
 	                            }).properties,
 	                            name: 'resourceGroups.' + resourceGroupIndex + '.resources.' + i + '.externalKey'
-	                          })
+	                          }) : null
 	                        )
 	                      )
 	                    );
@@ -4644,11 +4745,12 @@ module.exports =
 	                resourceGroups && resourceGroups.length > 0 ? _react2.default.createElement(
 	                  'div',
 	                  { style: { display: 'inline-block' } },
-	                  _react2.default.createElement(Select, { label: 'Add New Source', style: { height: 40 }, onClick: showOverflow,
-	                    onSelect: function onSelect(v, i) {
-	                      return addDefaultEntity(resourceGroupIndex, v, i);
-	                    }, values: sourceSchema, type: 'neutral',
-	                    selectedValues: resourceGroups && resourceGroups[resourceGroupIndex] && resourceGroups[resourceGroupIndex].resources
+	                  _react2.default.createElement(Select, { label: 'Add Data Source', style: { height: 40 }, onClick: showOverflow,
+	                    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]
 	                  })
 	                ) : null
 	              ) : null
@@ -4665,7 +4767,7 @@ module.exports =
 	exports.default = SchemaAccordion;
 
 /***/ },
-/* 59 */
+/* 60 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -4744,7 +4846,6 @@ module.exports =
 	          opened = _props2.opened,
 	          mapping = _props2.mapping,
 	          hideModal = _props2.hideModal,
-	          mappingIndex = _props2.mappingIndex,
 	          resourceGroups = _props2.resourceGroups,
 	          resourceGroupIndex = _props2.resourceGroupIndex;
 	
@@ -4753,7 +4854,18 @@ module.exports =
 	
 	      var groups = [].concat(_toConsumableArray(resourceGroups));
 	      var group = groups[resourceGroupIndex];
-	      var transformSelected = group.mappings && group.mappings[mappingIndex] && group.mappings[mappingIndex].transformations && group.mappings[mappingIndex].transformations[0].type || 'none';
+	
+	      var transformation = mapping.transformations && mapping.transformations[0];
+	
+	      var mappingIndex = 0;
+	      group && group.mappings.forEach(function (m, i) {
+	        if (mapping.propertyToName === m.propertyToName) {
+	          mappingIndex = i;
+	        }
+	      });
+	
+	      var transformSelected = transformation && transformation.type || 'none';
+	      var transformArgs = transformation && transformation.args || [];
 	
 	      return _react2.default.createElement(
 	        MapModal,
@@ -4803,7 +4915,8 @@ module.exports =
 	                { style: { marginBottom: 8 } },
 	                'Limit final field length:'
 	              ),
-	              _react2.default.createElement(Input, { style: { width: 132 }, label: 'Character Count', onChange: this.changeTrimCount })
+	              _react2.default.createElement(Input, { style: { width: 132 }, label: 'Character Count', onChange: this.changeTrimCount,
+	                defaultValue: transformArgs[1] || '' })
 	            ),
 	            transformSelected === 'date' && _react2.default.createElement(
 	              'div',
@@ -4854,7 +4967,7 @@ module.exports =
 	exports.default = TransformModal;
 
 /***/ },
-/* 60 */
+/* 61 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -4879,35 +4992,35 @@ module.exports =
 	
 	var _accountStep2 = _interopRequireDefault(_accountStep);
 	
-	var _phaseStep = __webpack_require__(52);
+	var _phaseStep = __webpack_require__(53);
 	
 	var _phaseStep2 = _interopRequireDefault(_phaseStep);
 	
-	var _environmentStep = __webpack_require__(48);
+	var _environmentStep = __webpack_require__(49);
 	
 	var _environmentStep2 = _interopRequireDefault(_environmentStep);
 	
-	var _schemaStep = __webpack_require__(54);
+	var _schemaStep = __webpack_require__(55);
 	
 	var _schemaStep2 = _interopRequireDefault(_schemaStep);
 	
-	var _filterStep = __webpack_require__(49);
+	var _filterStep = __webpack_require__(50);
 	
 	var _filterStep2 = _interopRequireDefault(_filterStep);
 	
-	var _mapStep = __webpack_require__(50);
+	var _mapStep = __webpack_require__(51);
 	
 	var _mapStep2 = _interopRequireDefault(_mapStep);
 	
-	var _previewStep = __webpack_require__(53);
+	var _previewStep = __webpack_require__(54);
 	
 	var _previewStep2 = _interopRequireDefault(_previewStep);
 	
-	var _deployStep = __webpack_require__(47);
+	var _deployStep = __webpack_require__(48);
 	
 	var _deployStep2 = _interopRequireDefault(_deployStep);
 	
-	var _nameStep = __webpack_require__(51);
+	var _nameStep = __webpack_require__(52);
 	
 	var _nameStep2 = _interopRequireDefault(_nameStep);
 	
@@ -4915,8 +5028,14 @@ module.exports =
 	
 	var _adapterStep2 = _interopRequireDefault(_adapterStep);
 	
+	var _defaultDatasetStep = __webpack_require__(47);
+	
+	var _defaultDatasetStep2 = _interopRequireDefault(_defaultDatasetStep);
+	
 	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); } }
+	
 	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 	
 	function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
@@ -4962,24 +5081,23 @@ module.exports =
 	      preview: _previewStep2.default,
 	      deploy: _deployStep2.default,
 	      adapter: _adapterStep2.default,
-	      name: _nameStep2.default
+	      name: _nameStep2.default,
+	      'default': _defaultDatasetStep2.default
 	    };
 	    return _this;
 	  }
+	  /*camelize(str) {
+	    return str.replace(/(?:^\w|[A-Z]|\b\w)/g, function(letter, index) {
+	      return index === 0 ? letter.toLowerCase() : letter.toUpperCase(); //toUpperCase
+	    }).replace(/\s+/g, '');
+	  }*/
+	
 	
 	  _createClass(WizardForm, [{
-	    key: 'camelize',
-	    value: function camelize(str) {
-	      return str.replace(/(?:^\w|[A-Z]|\b\w)/g, function (letter, index) {
-	        return index === 0 ? letter.toLowerCase() : letter.toUpperCase(); //toUpperCase
-	      }).replace(/\s+/g, '');
-	    }
-	  }, {
 	    key: 'onSubmit',
 	    value: function onSubmit(values) {
 	      var _this2 = this;
 	
-	      console.log('WIZARD OUTPUT: ', values);
 	      var formValues = Object.assign({}, values);
 	      var endpoints = {};
 	      //----------------------------------
@@ -4991,7 +5109,7 @@ module.exports =
 	
 	      /* instead of finding the values from metadata, keep metadata types/names in the RF state */
 	
-	      var bundles = formValues.resourceGroups || [];
+	      var bundles = [].concat(_toConsumableArray(formValues['resourceGroups'])) || [];
 	      var mappings = [];
 	      bundles.forEach(function (group, index) {
 	        var destinationResource = _this2.props.wizard.destinationMetadata ? _this2.props.wizard.destinationMetadata.find(function (rsc) {
@@ -5004,13 +5122,20 @@ module.exports =
 	            var sourceResource = _this2.props.wizard.sourceMetadata.find(function (rsc) {
 	              return rsc.name === singleMapping.resourceFromName;
 	            });
-	            endpoints['apiEndpoint_' + sourceResource.name] = formValues.sourceEndpoint + '/api/' + sourceResource.endpointSuffix.toLowerCase();
+	            endpoints['apiEndpoint_' + sourceResource.name] = formValues.sourceEndpoint + '/api/' + sourceResource.endpointSuffix.toLowerCase().split(' ').join('');
 	            var sourceProperty = sourceResource && sourceResource.properties && sourceResource.properties.find(function (prop) {
 	              return prop.label === singleMapping.propertyFromName;
 	            });
 	            var destinationProperty = destinationResource && destinationResource.properties && destinationResource.properties.find(function (prop) {
 	              return prop.label === singleMapping.propertyToName;
 	            });
+	            if (singleMapping.transformations && singleMapping.transformations.length > 0) {
+	              singleMapping.transformations.forEach(function (trans, index) {
+	                if (trans.type === 'none') {
+	                  singleMapping.transformations.splice(index, 1);
+	                }
+	              });
+	            }
 	            if (sourceResource && sourceProperty && destinationResource && destinationProperty) {
 	              mappings = mappings.concat(Object.assign({ // add to mappings obj
 	                resourceFromName: sourceResource.type,
@@ -5029,13 +5154,15 @@ module.exports =
 	            var sourceResource = _this2.props.wizard.sourceMetadata.find(function (metaRsc) {
 	              return metaRsc.name === rsc.name;
 	            });
-	            var sourceProperty = sourceResource && sourceResource.properties && sourceResource.properties.find(function (prop) {
-	              return prop.label === rsc.externalKey;
-	            });
-	            if (sourceProperty) {
+	            if (sourceResource) {
 	              return {
 	                resourceName: sourceResource.type,
-	                primaryKeyName: sourceProperty.name
+	                primaryKeyName: rsc.externalKey && sourceResource && sourceResource.properties && sourceResource.properties.find(function (prop) {
+	                  return prop.label === rsc.externalKey;
+	                }) && sourceResource.properties.find(function (prop) {
+	                  return prop.label === rsc.externalKey;
+	                }).name || '',
+	                provider: rsc.provider.toLowerCase() + 'Reader'
 	              };
 	            } else return null;
 	          });
@@ -5084,18 +5211,16 @@ module.exports =
 	  }, {
 	    key: 'nextPage',
 	    value: function nextPage() {
-	      var wizard = this.props.wizard;
-	
-	      var savedPage = wizard.savedConfiguration && parseInt(wizard.savedConfiguration.currentPage, 10);
+	      //const { wizard } = this.props
+	      //const savedPage = (wizard.savedConfiguration && parseInt(wizard.savedConfiguration.currentPage, 10))
 	      this.setState({ currentPage: this.state.currentPage ? this.state.currentPage + 1 : 2 });
 	      //savedPage ? savedPage + 1 : 2 })
 	    }
 	  }, {
 	    key: 'previousPage',
 	    value: function previousPage() {
-	      var wizard = this.props.wizard;
-	
-	      var savedPage = wizard.savedConfiguration && parseInt(wizard.savedConfiguration.currentPage, 10);
+	      //const { wizard } = this.props
+	      //const savedPage = (wizard.savedConfiguration && parseInt(wizard.savedConfiguration.currentPage, 10))
 	      this.setState({ currentPage: this.state.currentPage ? this.state.currentPage - 1 : 1 }); //: savedPage - 1 })
 	    }
 	  }, {
@@ -5193,6 +5318,7 @@ module.exports =
 	  var deployment = selector(state, 'deployment');
 	  var mappings = selector(state, 'mappings');
 	  var resourceGroups = selector(state, 'resourceGroups');
+	  var defaultDataset = selector(state, 'defaultDataset');
 	  return Object.assign({}, state, {
 	    formValues: {
 	      title: title,
@@ -5202,7 +5328,8 @@ module.exports =
 	      filter: filter,
 	      deployment: deployment,
 	      mappings: mappings,
-	      resourceGroups: resourceGroups
+	      resourceGroups: resourceGroups,
+	      defaultDataset: defaultDataset
 	    }
 	  });
 	})(WizardForm);
@@ -5210,7 +5337,7 @@ module.exports =
 	exports.default = WizardForm;
 
 /***/ },
-/* 61 */
+/* 62 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -5225,7 +5352,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _redux = __webpack_require__(67);
+	var _redux = __webpack_require__(68);
 	
 	var _reactRedux = __webpack_require__(11);
 	
@@ -5233,9 +5360,9 @@ module.exports =
 	
 	var wizardActions = _interopRequireWildcard(_wizard);
 	
-	__webpack_require__(62);
+	__webpack_require__(63);
 	
-	var _wizardForm = __webpack_require__(60);
+	var _wizardForm = __webpack_require__(61);
 	
 	var _wizardForm2 = _interopRequireDefault(_wizardForm);
 	
@@ -5273,7 +5400,8 @@ module.exports =
 	    type: 'Salesforce',
 	    name: 'Salesforce',
 	    env: false,
-	    customizable: false // if destination schema is not customizable, disclude the entire step
+	    customizable: false, // if destination schema is not customizable, disclude the entire step
+	    customStep: 'default'
 	  },
 	  deployment: ['once', 'scheduled'],
 	  autoMapData: example.wizards[1].autoMapData,
@@ -5327,11 +5455,15 @@ module.exports =
 	      type: 'phase',
 	      title: 'Implementation Phase'
 	    }, {
-	      type: 'custom'
+	      type: 'custom',
+	      mode: 'source'
 	    }, {
 	      type: 'environment',
 	      title: 'Source Environment',
 	      mode: 'source'
+	    }, {
+	      type: 'custom',
+	      mode: 'destination'
 	    }, {
 	      type: 'schema',
 	      title: 'Build Dataset',
@@ -5346,10 +5478,12 @@ module.exports =
 	    }, {
 	      type: 'map',
 	      title: 'Field Mapping'
-	    }, {
+	    },
+	    /*{
 	      type: 'preview',
-	      title: 'Data Preview'
-	    }, {
+	      title: 'Data Preview',
+	    },*/
+	    {
 	      type: 'deploy',
 	      title: 'Deploy'
 	    }];
@@ -5370,10 +5504,11 @@ module.exports =
 	        } else if (step.type === 'phase' && wizard.phaseStep) {
 	          stepList.push(step);
 	        } else if (step.type === 'custom') {
-	          var customStep = providerData.providerTypes[wizard.source.type].customStep;
-	          if (customStep && wizard.source.customStep) {
+	          var customStep = providerData.providerTypes[wizard.destination.type].customStep;
+	          if (customStep && wizard[step.mode].customStep) {
 	            step.type = customStep.type;
 	            step.title = customStep.title;
+	            step.options = customStep.options;
 	            stepList.push(step);
 	          }
 	        } else if (step.type === 'environment') {
@@ -5470,20 +5605,20 @@ module.exports =
 	exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(LingkSync);
 
 /***/ },
-/* 62 */
+/* 63 */
 /***/ function(module, exports) {
 
 	// removed by extract-text-webpack-plugin
 
 /***/ },
-/* 63 */,
 /* 64 */,
-/* 65 */
+/* 65 */,
+/* 66 */
 /***/ function(module, exports, __webpack_require__) {
 
 	(function webpackUniversalModuleDefinition(root, factory) {
 		if(true)
-			module.exports = factory(__webpack_require__(1), __webpack_require__(66));
+			module.exports = factory(__webpack_require__(1), __webpack_require__(67));
 		else if(typeof define === 'function' && define.amd)
 			define(["react", "react-dom"], factory);
 		else if(typeof exports === 'object')
@@ -7090,13 +7225,13 @@ module.exports =
 	//# sourceMappingURL=react-draggable.js.map
 
 /***/ },
-/* 66 */
+/* 67 */
 /***/ function(module, exports) {
 
 	module.exports = require("react-dom");
 
 /***/ },
-/* 67 */
+/* 68 */
 /***/ function(module, exports) {
 
 	module.exports = require("redux");