@lingk/sync 1.0.44 → 1.0.46

package/build/main.js

@@ -561,10 +561,13 @@ module.exports =
 	          inputs = _props.inputs,
 	          selectedValues = _props.selectedValues,
 	          sectionLabels = _props.sectionLabels,
-	          fieldPropLabel = _props.fieldPropLabel;
+	          sectionTypes = _props.sectionTypes,
+	          fieldPropLabel = _props.fieldPropLabel,
+	          fieldPropType = _props.fieldPropType,
+	          showApiNames = _props.showApiNames;
 	      var searchTerms = this.state.searchTerms;
 	
-	      var iterator = function (sectionValues, entity, sectionLabel, iteration, parents, newParent) {
+	      var iterator = function (sectionValues, entity, sectionLabel, iteration, parents, newParent, sectionType) {
 	        if (newParent) {
 	          parents = parents.concat(newParent);
 	        }
@@ -574,17 +577,19 @@ module.exports =
 	          title += pt;
 	          title += ': ';
 	        });
-	        title += entity[fieldPropLabel];
+	        // CHOOSE HERE TYPE OR LABEL
+	        title += entity[showApiNames && fieldPropType ? fieldPropType : fieldPropLabel];
 	
 	        var isExpanded = _nestExpand2.default.checkIfExpanded(entity[fieldPropLabel], parents, this.state.expanded);
 	        var isSelected = false;
 	        isSelected = selectedValues && selectedValues.length > 0 && selectedValues.some(function (rsc) {
 	          return rsc[fieldPropLabel] === entity[fieldPropLabel] && (!(parents && rsc.parents) || JSON.stringify(rsc.parents) === JSON.stringify(parents)) && (!rsc.section || sectionLabel === rsc.section);
 	        });
-	        //console.log(entity.name)
+	
 	        sectionValues.push(Object.assign({}, entity, {
 	          title: title,
 	          section: sectionLabel,
+	          __section: sectionType,
 	          iteration: iteration,
 	          parents: parents,
 	          isExpanded: isExpanded,
@@ -593,7 +598,7 @@ module.exports =
 	
 	        if (entity.object && isExpanded) {
 	          entity.object.properties.forEach(function (p) {
-	            iterator(sectionValues, p, sectionLabel, iteration + 1, parents, entity[fieldPropLabel]);
+	            iterator(sectionValues, p, sectionLabel, iteration + 1, parents, entity[fieldPropLabel], sectionType);
 	          });
 	        }
 	        return sectionValues;
@@ -606,14 +611,19 @@ module.exports =
 	        sectionLabels.forEach(function (s, i) {
 	          if (values && values[i] && values[i].length > 0) {
 	            (function () {
-	              v = v.concat(sectionLabels[i]);
+	              // ADD TITLE OF SECTION HERE
+	              v = v.concat(showApiNames && sectionTypes ? sectionTypes[i] : sectionLabels[i]);
 	              var sectionValues = [];
 	              values[i].forEach(function (entity) {
-	                iterator(sectionValues, entity, sectionLabels[i], 0, []);
+	                var sectionType = sectionTypes && sectionTypes[i];
+	                iterator(sectionValues, entity, sectionLabels[i], 0, [], null, sectionType);
 	              });
 	              //search
 	              sectionValues.forEach(function (sv, ii) {
-	                var satisfiesSearch = searchTerms && searchTerms[sectionLabels[i]] ? sv[fieldPropLabel].toLowerCase().indexOf(searchTerms[sectionLabels[i]].toLowerCase()) > -1 : true;
+	                var satisfiesSearch = true; // default show everything
+	                if (searchTerms && searchTerms[sectionLabels[i]]) {
+	                  satisfiesSearch = sv[showApiNames ? fieldPropType : fieldPropLabel].toLowerCase().indexOf(searchTerms[sectionLabels[i]].toLowerCase()) > -1;
+	                }
 	                sv.satisfiesSearch = satisfiesSearch;
 	                //satisfy parents
 	                if (searchTerms && satisfiesSearch) {
@@ -1570,12 +1580,16 @@ module.exports =
 	
 	        if (sourceResource && nestedSourceProp.property && destinationResource && destinationProperty) {
 	          mappings = mappings.concat(Object.assign({ // add to mappings obj
-	            resourceFromLabel: singleMapping.dataSourceIsDestinationEntity ? sourceResource.type + '_' + targetProvider.toLowerCase() : sourceResource.type + '_' + sourceProvider.toLowerCase(),
+	            resourceFromNameAndProvider: singleMapping.dataSourceIsDestinationEntity ? sourceResource.type + '_' + targetProvider.toLowerCase() : sourceResource.type + '_' + sourceProvider.toLowerCase(),
 	            resourceFromName: sourceResource.type,
-	            propertyFromName: nestedSourceProp.property
+	            resourceFromLabel: sourceResource.name,
+	            propertyFromName: nestedSourceProp.property,
+	            propertyFromLabel: nestedSourceProp.__property
 	          }, nestedSourceProp.parentsArray && nestedSourceProp.parentsArray.length > 0 && { propertyFromParents: nestedSourceProp.parentsArray }, {
 	            resourceToName: destinationResource.type,
+	            resourceToLabel: destinationResource.name,
 	            propertyToName: destinationProperty.name,
+	            propertyToLabel: destinationProperty.label,
 	            bundleIndex: index
 	          }, singleMapping.isExternalKeyMapping && { isExternalKeyMapping: true }, singleMapping.dataSourceIsDestinationEntity && { isDestinationResource: true }, singleMapping.isUnique && { isUnique: true }, singleMapping.transformations && singleMapping.transformations.length > 0 && !singleMapping.transformations.every(function (t) {
 	            return t.type === 'none';
@@ -1583,9 +1597,9 @@ module.exports =
 	        }
 	      });
 	      delete group.mappings; // remove the mapping obj from a resourceGroup
-	      //if (group.lingkSourceKey) delete group.lingkSourceKey
-	      //if (group.lingkSourceKeyObject) delete group.lingkSourceKeyObject
-	      //if (group.lingkSourceKeyParents) delete group.lingkSourceKeyParents
+	      if (group.lingkSourceKey) delete group.lingkSourceKey;
+	      if (group.lingkSourceKeyObject) delete group.lingkSourceKeyObject;
+	      if (group.lingkSourceKeyParents) delete group.lingkSourceKeyParents;
 	    }
 	
 	    // BUNDLES
@@ -1656,6 +1670,8 @@ module.exports =
 	              return pf.val;
 	            }) : [],
 	            level: rsc.level || (rscIndex === 0 ? 0 : 1),
+	            // THIS ONE IS ACTUALLY PARENT LABEL AND PROVIDER!
+	            // So we know what Account to join to (if they have the same Name)
 	            parentNameAndProvider: primaryKeyResourceLabel && primaryResourceProvider ? primaryKeyResourceLabel + '_' + primaryResourceProvider.toLowerCase() : ''
 	          };
 	        } else return null;
@@ -1667,6 +1683,7 @@ module.exports =
 	
 	function findNestedProp(prop, parents, rsc) {
 	  var property = '';
+	  var __property = '';
 	  var parentsArray = [];
 	  if (parents && parents.length > 0) {
 	    (function () {
@@ -1687,19 +1704,21 @@ module.exports =
 	      if (nestedRsc.properties && nestedRsc.properties.find(function (p) {
 	        return p.label === prop;
 	      })) {
-	        property = nestedRsc.properties.find(function (p) {
+	        var theProp = nestedRsc.properties.find(function (p) {
 	          return p.label === prop;
-	        }).name;
+	        });
+	        property = theProp.name;
+	        __property = theProp.label;
 	      }
 	    })();
 	  } else {
-	    property = prop && rsc && rsc.properties && rsc.properties.find(function (p) {
-	      return p.label === prop;
-	    }) && rsc.properties.find(function (p) {
+	    var theProp = prop && rsc && rsc.properties && rsc.properties.find(function (p) {
 	      return p.label === prop;
-	    }).name;
+	    });
+	    property = theProp.name;
+	    __property = theProp.label;
 	  }
-	  return { property: property, parentsArray: parentsArray };
+	  return { property: property, parentsArray: parentsArray, __property: __property };
 	}
 	
 	exports.default = saveData;
@@ -3303,6 +3322,7 @@ module.exports =
 	          var rscResource = null;
 	          var deNestedJoinKey = {};
 	          var joinKeyResourceName = null;
+	          var __joinKeyResourceName = null;
 	          if (dataSourceMetadata) {
 	            rscResource = dataSourceMetadata.find(function (r) {
 	              return r.name === rsc.resourceLabel;
@@ -3312,6 +3332,7 @@ module.exports =
 	              // joinKeyName coming from parameter from another resource
 	              deNestedJoinKey = { property: rsc.joinKeyName };
 	              joinKeyResourceName = rsc.joinKeyResource;
+	              __joinKeyResourceName = rsc.joinKeyResource;
 	
 	              // joinKeyName coming from field on this resource
 	              if (rsc.resourceName === rsc.joinKeyResource) {
@@ -3321,6 +3342,7 @@ module.exports =
 	                if (joinKeyResource) {
 	                  deNestedJoinKey = deNest(rsc.joinKeyName, rsc.joinKeyParents, joinKeyResource);
 	                  joinKeyResourceName = joinKeyResource.name;
+	                  __joinKeyResourceName = joinKeyResource.type;
 	                }
 	              }
 	            }
@@ -3334,14 +3356,17 @@ module.exports =
 	
 	          var deNestedPrimaryKey = {};
 	          var primaryKeyResourceName = null;
+	          var __primaryKeyResourceName = null;
 	          if (primaryDataSourceMetadata) {
 	            if (rsc.primaryKeyName) {
 	              (function () {
 	                //primaryKeyName coming from parameter (another resource)
 	                deNestedPrimaryKey = { property: rsc.primaryKeyName };
 	                primaryKeyResourceName = rsc.primaryKeyResource;
+	                __primaryKeyResourceName = rsc.primaryKeyResource;
 	
 	                // primaryKeyName coming from resource IN THIS BUNDLE
+	                // FIND ITS BY THE LABEL, NOT THE NAME!!! THIS IS HOW IT IS SAVED.
 	                var primaryKeyResourceResource = bundle.resources.find(function (r) {
 	                  return primaryResourceName === r.resourceLabel;
 	                });
@@ -3353,6 +3378,7 @@ module.exports =
 	                  if (rscPrimaryResource) {
 	                    deNestedPrimaryKey = deNest(rsc.primaryKeyName, rsc.primaryKeyParents, rscPrimaryResource);
 	                    primaryKeyResourceName = rscPrimaryResource.name;
+	                    __primaryKeyResourceName = rscPrimaryResource.type;
 	                  }
 	                }
 	              })();
@@ -3385,8 +3411,9 @@ module.exports =
 	          if (rscResource) {
 	            resources.push(Object.assign({
 	              name: rscResource.name,
+	              __name: rscResource.type,
 	              provider: resourceProvider
-	            }, deNestedJoinKey.property && { joinKeyName: deNestedJoinKey.property }, joinKeyResourceName && { joinKeyResource: joinKeyResourceName }, deNestedJoinKey.parentsArray && deNestedJoinKey.parentsArray.length > 0 && { joinKeyParents: deNestedJoinKey.parentsArray }, deNestedPrimaryKey.property && { primaryKeyName: deNestedPrimaryKey.property }, primaryKeyResourceName && { primaryKeyResource: primaryKeyResourceName }, deNestedPrimaryKey.parentsArray && deNestedPrimaryKey.parentsArray.length > 0 && { primaryKeyParents: deNestedPrimaryKey.parentsArray }, {
+	            }, deNestedJoinKey.property && { joinKeyName: deNestedJoinKey.property }, deNestedJoinKey.__property && { __joinKeyName: deNestedJoinKey.__property }, joinKeyResourceName && { joinKeyResource: joinKeyResourceName }, __joinKeyResourceName && { __joinKeyResource: __joinKeyResourceName }, deNestedJoinKey.parentsArray && deNestedJoinKey.parentsArray.length > 0 && { joinKeyParents: deNestedJoinKey.parentsArray }, deNestedPrimaryKey.property && { primaryKeyName: deNestedPrimaryKey.property }, deNestedPrimaryKey.__property && { __primaryKeyName: deNestedPrimaryKey.__property }, primaryKeyResourceName && { primaryKeyResource: primaryKeyResourceName }, __primaryKeyResourceName && { __primaryKeyResource: __primaryKeyResourceName }, deNestedPrimaryKey.parentsArray && deNestedPrimaryKey.parentsArray.length > 0 && { primaryKeyParents: deNestedPrimaryKey.parentsArray }, {
 	              joinType: rsc.joinType || 'LEFT JOIN'
 	            }, rscResource.parentRef && { parentRef: rscResource.parentRef }, rsc.parameterFilters && { parameterFilters: rsc.parameterFilters }, {
 	              level: rsc.level || (rscIndex === 0 ? 0 : 1)
@@ -3459,10 +3486,14 @@ module.exports =
 	          if (sourceResource && sourceProperty && destinationProperty) {
 	            mappings.push(Object.assign({
 	              resourceFromName: sourceResource.name,
-	              propertyFromName: deNestedProp.property
+	              __resourceFromName: sourceResource.type,
+	              propertyFromName: deNestedProp.property,
+	              __propertyFromName: deNestedProp.__property
 	            }, deNestedProp.parentsArray && deNestedProp.parentsArray.length > 0 && { propertyFromParents: deNestedProp.parentsArray }, {
 	              resourceToName: bundleResource.name,
-	              propertyToName: destinationProperty.label
+	              __resourceToName: bundleResource.type,
+	              propertyToName: destinationProperty.label,
+	              __propertyToName: destinationProperty.name
 	            }, m.isDestinationResource && { dataSourceIsDestinationEntity: true }, m.isExternalKeyMapping && { isExternalKeyMapping: true }, m.isUnique && { isUnique: true }, {
 	              transformations: transformations
 	            }));
@@ -3470,6 +3501,7 @@ module.exports =
 	        }); // end wizard.savedMappings.forEach
 	        resourceGroups.push(Object.assign({
 	          name: bundleResource.name,
+	          __name: bundleResource.type,
 	          resources: resources, mappings: mappings,
 	          customExternalKeys: bundle.customExternalKeys || false
 	        }, bundle.customExternalKeys === true && { sourceKeys: sourceKeys, sourceKeysObjects: sourceKeysObjects, sourceKeysParents: sourceKeysParents, destinationKeys: destinationKeys }, bundle.customExternalKeys === false && { lingkSourceKey: sourceKeys[0], lingkSourceKeyObject: sourceKeysObjects[0],
@@ -3488,6 +3520,7 @@ module.exports =
 	
 	function deNest(prop, parents, rsc) {
 	  var property = '';
+	  var __property = '';
 	  var parentsArray = [];
 	  if (rsc) {
 	    if (parents && parents.length > 0) {
@@ -3507,6 +3540,7 @@ module.exports =
 	        });
 	        if (sourceKeyProperty) {
 	          property = sourceKeyProperty.label;
+	          __property = sourceKeyProperty.name;
 	        }
 	      })();
 	    } else {
@@ -3515,11 +3549,15 @@ module.exports =
 	      });
 	      if (sourceKeyProperty) {
 	        property = sourceKeyProperty.label;
+	        __property = sourceKeyProperty.name;
 	      }
 	    }
 	  }
-	  if (prop === 'Lingk_External_Id__c') property = 'Lingk External Id';
-	  return { property: property, parentsArray: parentsArray };
+	  if (prop === 'Lingk_External_Id__c') {
+	    property = 'Lingk External Id';
+	    __property = prop;
+	  }
+	  return { property: property, parentsArray: parentsArray, __property: __property };
 	}
 	
 	exports.default = loadData;
@@ -14501,7 +14539,9 @@ module.exports =
 	          inputs = _props3.inputs,
 	          step = _props3.step,
 	          sourceSchema = _props3.sourceSchema,
-	          direction = _props3.direction;
+	          direction = _props3.direction,
+	          showApiNames = _props3.showApiNames,
+	          toggleShowApiNames = _props3.toggleShowApiNames;
 	      var _state = this.state,
 	          resourceGroupIndex = _state.resourceGroupIndex,
 	          paneToggle = _state.paneToggle,
@@ -14571,7 +14611,8 @@ module.exports =
 	          'div',
 	          { style: { zIndex: 99 } },
 	          _react2.default.createElement(_selectWrapper2.default, { label: "Add Data Target", type: 'brand',
-	            style: { height: 40, width: 160 }, minWidth: 260, fieldPropLabel: 'name',
+	            style: { height: 40, width: 160 }, minWidth: 260,
+	            fieldPropLabel: 'name', fieldPropType: 'type', showApiNames: showApiNames,
 	            onSelect: this.addDefaultResourceGroup,
 	            values: newTargetObjectMetadata,
 	            title: 'Available Target Objects', inputs: inputs, sectionLabelSuffix: 'Objects',
@@ -14605,6 +14646,21 @@ module.exports =
 	              'Top One'
 	            )
 	          ) : null,
+	          resourceGroups && resourceGroups.length > 0 && _react2.default.createElement(
+	            'div',
+	            {
+	              style: { position: 'absolute', right: style.width - 717, top: 0, zIndex: 999, width: 100 } },
+	            _react2.default.createElement(
+	              'div',
+	              { className: 'labelz' },
+	              'Labels:'
+	            ),
+	            _react2.default.createElement(
+	              'div',
+	              { className: 'show-label-or-api-names', onClick: toggleShowApiNames },
+	              showApiNames ? 'System Names' : 'Friendly Names'
+	            )
+	          ),
 	          resourceGroups && resourceGroups.length > 0 && _react2.default.createElement(
 	            'div',
 	            null,
@@ -14648,7 +14704,7 @@ module.exports =
 	                  return _react2.default.createElement(
 	                    'div',
 	                    { className: 'schema-group-name', key: i },
-	                    g.name
+	                    showApiNames && g.__name ? g.__name : g.name
 	                  );
 	                })
 	              )
@@ -18461,13 +18517,16 @@ module.exports =
 	            })*/
 	
 	            var groupName = group.name;
+	            if (_this3.props.showApiNames && group.__name) {
+	              groupName = group.__name;
+	            }
 	            if (isReverse) {
 	              if (group.provider.toLowerCase() === step.destinationProvider.toLowerCase()) {
-	                groupName = group.name + ' (' + step.destinationProvider + ')';
+	                groupName = groupName + ' (' + step.destinationProvider + ')';
 	              }
 	            } else {
 	              if (group.provider.toLowerCase() === step.sourceProvider.toLowerCase()) {
-	                groupName = group.name + ' (' + step.sourceProvider + ')';
+	                groupName = groupName + ' (' + step.sourceProvider + ')';
 	              }
 	            }
 	
@@ -18508,13 +18567,16 @@ module.exports =
 	                          textOverflow: 'ellipsis', maxWidth: 'calc(100% - 32px)', whiteSpace: 'nowrap' } },
 	                      group.resources && group.resources.map(function (rsc, ii) {
 	                        var rscName = rsc.name;
+	                        if (_this3.props.showApiNames && rsc.__name) {
+	                          rscName = rsc.__name;
+	                        }
 	                        if (isReverse) {
 	                          if (rsc.provider.toLowerCase() === step.sourceProvider.toLowerCase()) {
-	                            rscName = rsc.name + ' (' + step.sourceProvider + ')';
+	                            rscName = rscName + ' (' + step.sourceProvider + ')';
 	                          }
 	                        } else {
 	                          if (rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase()) {
-	                            rscName = rsc.name + ' (' + step.destinationProvider + ')';
+	                            rscName = rscName + ' (' + step.destinationProvider + ')';
 	                          }
 	                        }
 	                        return _react2.default.createElement(
@@ -18630,7 +18692,8 @@ module.exports =
 	      sourceSchema = props.sourceSchema,
 	      destinationSchema = props.destinationSchema,
 	      change = props.change,
-	      direction = props.direction;
+	      direction = props.direction,
+	      showApiNames = props.showApiNames;
 	
 	  var Modal = inputs.Modal;
 	  var Button = inputs.Button;
@@ -18651,9 +18714,13 @@ module.exports =
 	          var map = Object.assign({
 	            isExternalKeyMapping: true,
 	            resourceFromName: group.sourceKeysObjects[i],
+	            __resourceFromName: group.__sourceKeysObjects[i],
 	            propertyFromName: sk,
+	            __propertyFromName: group.__sourceKeys[i],
 	            resourceToName: group.name,
+	            __resourceToName: group.__name,
 	            propertyToName: group.destinationKeys[i],
+	            __propertyToName: group.__destinationKeys[i],
 	            propertyFromParents: group.sourceKeysParents[i]
 	          }, rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase() && { dataSourceIsDestinationEntity: true });
 	          group.mappings = group.mappings || [];
@@ -18668,10 +18735,14 @@ module.exports =
 	        var map = Object.assign({
 	          isExternalKeyMapping: true,
 	          resourceFromName: group.lingkSourceKeyObject,
+	          __resourceFromName: group.__lingkSourceKeyObject,
 	          propertyFromParents: group.lingkSourceKeyParents,
 	          propertyFromName: group.lingkSourceKey,
+	          __propertyFromName: group.__lingkSourceKey,
 	          resourceToName: group.name,
-	          propertyToName: 'Lingk External Id'
+	          __resourceToName: group.__name,
+	          propertyToName: 'Lingk External Id',
+	          __propertyToName: 'Lingk_External_Id__c'
 	        }, rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase() && { dataSourceIsDestinationEntity: true });
 	        group.mappings = group.mappings || [];
 	        group.mappings.push(map);
@@ -18712,8 +18783,10 @@ module.exports =
 	  var selectSourceKeyForLingk = function selectSourceKeyForLingk(key, i, field) {
 	    var rgs = [].concat(_toConsumableArray(resourceGroups));
 	    var group = rgs[bundleIndex];
-	    group.lingkSourceKey = key;
+	    group.lingkSourceKey = field.label;
+	    group.__lingkSourceKey = field.name;
 	    group.lingkSourceKeyObject = field.section;
+	    group.__lingkSourceKeyObject = field.__section;
 	    group.lingkSourceKeyParents = field.parents;
 	    change('resourceGroups', rgs);
 	    props.update();
@@ -18724,13 +18797,17 @@ module.exports =
 	    var group = rgs[bundleIndex];
 	    if (i === 0) {
 	      // create array
-	      group.sourceKeys = [key];
+	      group.sourceKeys = [field.label];
+	      group.__sourceKeys = [field.name];
 	      group.sourceKeysObjects = [field.section];
+	      group.__sourceKeysObjects = [field.__section];
 	      group.sourceKeysParents = [field.parents];
 	    } else {
 	      // add to array
-	      group.sourceKeys[i] = key;
+	      group.sourceKeys[i] = field.label;
+	      group.__sourceKeys[i] = field.name;
 	      group.sourceKeysObjects[i] = field.section;
+	      group.__sourceKeysObjects[i] = field.__section;
 	      group.sourceKeysParents[i] = field.parents;
 	    }
 	    change('resourceGroups', rgs);
@@ -18741,10 +18818,12 @@ module.exports =
 	    var rgs = [].concat(_toConsumableArray(resourceGroups));
 	    var group = rgs[bundleIndex];
 	    if (i === 0) {
-	      group.destinationKeys = [key];
+	      group.destinationKeys = [field.label];
+	      group.__destinationKeys = [field.name];
 	      group.destinationKeysParents = [field.parents];
 	    } else {
-	      group.destinationKeys[i] = key;
+	      group.destinationKeys[i] = field.label;
+	      group.__destinationKeys[i] = field.name;
 	      group.destinationKeysParents[i] = field.parents;
 	    }
 	    change('resourceGroups', rgs);
@@ -18755,9 +18834,11 @@ module.exports =
 	  var group = rgs[bundleIndex];
 	
 	  var sectionLabels = [];
+	  var sectionTypes = [];
 	  var sectionProviders = [];
 	  var vals = bundle.resources.map(function (br, i) {
 	    sectionLabels.push(br.name);
+	    sectionTypes.push(br.__name);
 	    sectionProviders.push(br.provider);
 	    return bundle.resources[i].provider.toLowerCase() === step.destinationProvider.toLowerCase() ? destinationSchema && destinationSchema.find(function (defaultRsc) {
 	      return defaultRsc.name === bundle.resources[i].name;
@@ -18860,6 +18941,15 @@ module.exports =
 	              sourceLabel += sk;
 	            }
 	
+	            if (showApiNames && group.__sourceKeys && group.__sourceKeys[i]) {
+	              sourceLabel = group.__sourceKeys[i];
+	            }
+	
+	            var destinationLabel = group.destinationKeys && group.destinationKeys[i];
+	            if (showApiNames && group.__destinationKeys && group.__destinationKeys[i]) {
+	              destinationLabel = group.__destinationKeys[i];
+	            }
+	
 	            return _react2.default.createElement(
 	              'div',
 	              { className: 'external-keys-row', key: i },
@@ -18870,15 +18960,16 @@ module.exports =
 	                  onSelect: function onSelect(v, iii, field) {
 	                    return selectCustomSourceKey(v, i, field);
 	                  },
-	                  inputs: inputs,
-	                  type: 'brand', fieldPropLabel: 'label',
-	                  values: vals, sectionLabels: sectionLabels,
+	                  inputs: inputs, values: vals, type: 'brand',
+	                  fieldPropLabel: 'label', fieldPropType: 'name',
+	                  sectionLabels: sectionLabels, sectionTypes: sectionTypes,
 	                  selectedValues: group.sourceKeys && [{
 	                    label: group.sourceKeys && group.sourceKeys[i],
 	                    parents: group.sourceKeysParents && group.sourceKeysParents[i],
 	                    section: group.sourceKeysObjects && group.sourceKeysObjects[i]
 	                  }],
-	                  sectionLabelSuffix: 'Fields'
+	                  sectionLabelSuffix: 'Fields',
+	                  showApiNames: showApiNames
 	                })
 	              ),
 	              _react2.default.createElement(
@@ -18889,18 +18980,19 @@ module.exports =
 	              _react2.default.createElement(
 	                'div',
 	                { className: 'external-keys-column' },
-	                _react2.default.createElement(_selectWrapper2.default, { label: group.destinationKeys && group.destinationKeys[i] || 'Choose Key',
+	                _react2.default.createElement(_selectWrapper2.default, { label: destinationLabel || 'Choose Key',
 	                  onSelect: function onSelect(v, iii, field) {
 	                    return selectCustomDestinationKey(v, i, field);
 	                  },
-	                  type: 'brand', inputs: inputs,
-	                  values: destinationVals,
-	                  sectionLabels: [bundle.name], fieldPropLabel: 'label',
+	                  type: 'brand', inputs: inputs, values: destinationVals,
+	                  sectionLabels: [bundle.name], sectionTypes: [bundle.__name],
+	                  fieldPropLabel: 'label', fieldPropType: 'name',
 	                  selectedValues: group.destinationKeys && [{
 	                    label: group.destinationKeys && group.destinationKeys[i],
 	                    parents: group.destinationKeysParents && group.destinationKeysParents[i]
 	                  }],
-	                  sectionLabelSuffix: 'Fields'
+	                  sectionLabelSuffix: 'Fields',
+	                  showApiNames: showApiNames
 	                })
 	              ),
 	              i !== 0 && _react2.default.createElement(
@@ -18947,6 +19039,10 @@ module.exports =
 	            sourceLabel += group.lingkSourceKey;
 	          }
 	
+	          if (showApiNames && group.__lingkSourceKey) {
+	            sourceLabel = group.__lingkSourceKey;
+	          }
+	
 	          return _react2.default.createElement(
 	            'div',
 	            { key: 'one' },
@@ -18993,15 +19089,16 @@ module.exports =
 	                  onSelect: function onSelect(v, i, field) {
 	                    return selectSourceKeyForLingk(v, i, field);
 	                  },
-	                  type: 'brand', inputs: inputs,
-	                  values: vals, sectionLabels: sectionLabels,
-	                  fieldPropLabel: 'label',
+	                  type: 'brand', inputs: inputs, values: vals,
+	                  sectionLabels: sectionLabels, sectionTypes: sectionTypes,
+	                  fieldPropLabel: 'label', fieldPropType: 'name',
 	                  selectedValues: [{
 	                    label: group.lingkSourceKey,
 	                    parents: group.lingkSourceKeyParents,
 	                    section: group.lingkSourceKeyObject
 	                  }],
-	                  sectionLabelSuffix: 'Fields'
+	                  sectionLabelSuffix: 'Fields',
+	                  showApiNames: showApiNames
 	                })
 	              ),
 	              _react2.default.createElement(
@@ -19012,7 +19109,7 @@ module.exports =
 	              _react2.default.createElement(
 	                'div',
 	                { className: 'external-keys-column' },
-	                'Lingk External ID'
+	                showApiNames ? 'Lingk_External_Id__c' : 'Lingk External ID'
 	              )
 	            )
 	          );
@@ -19071,7 +19168,6 @@ module.exports =
 	
 	    _this.state = {
 	      selectedField: null,
-	      selectedFieldParents: null,
 	      customFieldValue: '',
 	      addNewButtonText: 'Add New',
 	      setDuplicateRules: false,
@@ -19168,6 +19264,7 @@ module.exports =
 	  }, {
 	    key: 'onSelectDestinationField',
 	    value: function onSelectDestinationField(group, field, format) {
+	      //group.name, field.label, field.format
 	      var _props2 = this.props,
 	          change = _props2.change,
 	          formValues = _props2.formValues,
@@ -19175,36 +19272,41 @@ module.exports =
 	          resourceGroupIndex = _props2.resourceGroupIndex;
 	
 	      var selectedEntity = selectedEntities[resourceGroupIndex];
-	      if (this.state.selectedField) {
+	      if (this.state.selectedField && this.state.selectedField.label) {
 	        var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
 	        var rscGroup = resourceGroups[resourceGroupIndex];
 	
 	        //cant overwrite externalKey mapping
 	        if (rscGroup.mappings && rscGroup.mappings.find(function (m) {
-	          return m && m.propertyToName === field && m.isExternalKeyMapping;
+	          return m && m.propertyToName === field.label && m.isExternalKeyMapping;
 	        })) return;
 	
 	        var transform = 'none';
-	        if (format) {
-	          if (format === 'date-time') {
+	        if (field.format) {
+	          if (field.format === 'date-time') {
 	            transform = 'date';
 	          }
 	        }
+	
 	        //cant map multiple to same destination field
 	        rscGroup.mappings = rscGroup.mappings && rscGroup.mappings.filter(function (m) {
-	          return m.propertyToName !== field;
+	          return m.propertyToName !== field.label;
 	        }) || [];
 	        rscGroup.mappings.push({
 	          resourceFromName: selectedEntity.name,
-	          resourceToName: group,
-	          propertyFromName: this.state.selectedField,
-	          propertyFromParents: this.state.selectedFieldParents,
-	          propertyToName: field,
+	          __resourceFromName: selectedEntity.__name,
+	          resourceToName: group.name,
+	          __resourceToName: group.__name,
+	          propertyFromName: this.state.selectedField.label,
+	          __propertyFromName: this.state.selectedField.name,
+	          propertyFromParents: this.state.selectedField.parents,
+	          propertyToName: field.label,
+	          __propertyToName: field.name,
 	          transformations: [{ type: transform }],
 	          dataSourceIsDestinationEntity: selectedEntity.isDestinationEntity
 	        });
 	        change('resourceGroups', resourceGroups);
-	        this.setState({ selectedField: null, selectedFieldParents: null });
+	        this.setState({ selectedField: {} });
 	        this.props.update();
 	        this.props.disableMultiple();
 	      }
@@ -19225,10 +19327,9 @@ module.exports =
 	          toggle = _props3.toggle,
 	          step = _props3.step,
 	          customizingGroup = _props3.customizingGroup,
-	          inputs = _props3.inputs;
-	      var _state = this.state,
-	          selectedField = _state.selectedField,
-	          selectedFieldParents = _state.selectedFieldParents;
+	          inputs = _props3.inputs,
+	          showApiNames = _props3.showApiNames;
+	      var selectedField = this.state.selectedField;
 	
 	      var Button = inputs.Button;
 	      var Input = inputs.Input;
@@ -19297,13 +19398,16 @@ module.exports =
 	                      var isSelected = selectedEntity.name === rsc.name && selectedEntity.isDestinationEntity === isDestinationEntity;
 	
 	                      var rscName = rsc.name;
+	                      if (showApiNames && rsc.__name) {
+	                        rscName = rsc.__name;
+	                      }
 	                      if (isReverse) {
 	                        if (rsc.provider.toLowerCase() === step.sourceProvider.toLowerCase()) {
-	                          rscName = rsc.name + ' (' + step.sourceProvider + ')';
+	                          rscName = rscName + ' (' + step.sourceProvider + ')';
 	                        }
 	                      } else {
 	                        if (rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase()) {
-	                          rscName = rsc.name + ' (' + step.destinationProvider + ')';
+	                          rscName = rscName + ' (' + step.destinationProvider + ')';
 	                        }
 	                      }
 	
@@ -19318,9 +19422,10 @@ module.exports =
 	                              _this4.scrollToTop(_this4['scroller-' + ii], 18, i * 43 + 6);
 	                              _this4.props.pickEntity({
 	                                name: rsc.name,
+	                                __name: rsc.__name,
 	                                isDestinationEntity: rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase()
 	                              });
-	                              _this4.setState({ selectedField: null, selectedFieldParents: null });
+	                              _this4.setState({ selectedField: {} });
 	                            }
 	                          },
 	                          _react2.default.createElement(
@@ -19354,16 +19459,21 @@ module.exports =
 	                          }).map(function (field, ii) {
 	                            return _react2.default.createElement(_nestedField2.default, { key: ii, field: field,
 	                              selectedField: selectedField,
-	                              selectedFieldParents: selectedFieldParents,
 	                              filteredMappings: filteredMappings, parents: [],
 	                              onExpand: function onExpand(expanded) {
 	                                return _this4.setState({ expanded: expanded });
 	                              },
-	                              click: function click(v, parents) {
+	                              click: function click(field, parents) {
 	                                return _this4.setState({
-	                                  selectedField: v, selectedFieldParents: parents
+	                                  selectedField: {
+	                                    label: field.label,
+	                                    name: field.name,
+	                                    parents: parents
+	                                  }
 	                                });
-	                              }, expanded: _this4.state.expanded });
+	                              }, expanded: _this4.state.expanded,
+	                              showApiNames: showApiNames
+	                            });
 	                          }),
 	                          _react2.default.createElement('div', { style: { height: 9 } })
 	                        )
@@ -19432,17 +19542,18 @@ module.exports =
 	                      return !p.readOnly;
 	                    }).map(function (field, i) {
 	                      var isMapped = mappings && Object.keys(mappings).includes(field.label);
+	                      var title = showApiNames ? field.name : field.label;
 	                      return _react2.default.createElement(
 	                        'div',
 	                        { key: i,
-	                          className: selectedField ? "wizard-map-field" : '',
+	                          className: selectedField && selectedField.label ? "wizard-map-field" : '',
 	                          style: { paddingLeft: 5, width: 335,
 	                            fontWeight: isMapped ? 'bold' : 'normal',
-	                            color: isMapped ? '#16325c' : selectedField ? 'black' : 'grey'
+	                            color: isMapped ? '#16325c' : selectedField && selectedField.label ? 'black' : 'grey'
 	                          }, onClick: function onClick() {
-	                            return _this4.onSelectDestinationField(group.name, field.label, field.format);
+	                            return _this4.onSelectDestinationField(group, field);
 	                          } },
-	                        field.label,
+	                        title,
 	                        ' ',
 	                        field.required ? '*' : ''
 	                      );
@@ -19499,7 +19610,8 @@ module.exports =
 	var MapTableSourceRow = exports.MapTableSourceRow = function MapTableSourceRow(props) {
 	  var group = props.group,
 	      step = props.step,
-	      isReverse = props.isReverse;
+	      isReverse = props.isReverse,
+	      showApiNames = props.showApiNames;
 	
 	  return _react2.default.createElement(
 	    'div',
@@ -19515,13 +19627,16 @@ module.exports =
 	      var fieldNum = mapz ? mapz.length : 0;
 	
 	      var rscName = rsc.name;
+	      if (showApiNames && rsc.__name) {
+	        rscName = rsc.__name;
+	      }
 	      if (isReverse) {
 	        if (rsc.provider.toLowerCase() === step.sourceProvider.toLowerCase()) {
-	          rscName = rsc.name + ' (' + step.sourceProvider + ')';
+	          rscName = rscName + ' (' + step.sourceProvider + ')';
 	        }
 	      } else {
 	        if (rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase()) {
-	          rscName = rsc.name + ' (' + step.destinationProvider + ')';
+	          rscName = rscName + ' (' + step.destinationProvider + ')';
 	        }
 	      }
 	
@@ -19545,7 +19660,8 @@ module.exports =
 	var MapTableMappingRow = exports.MapTableMappingRow = function MapTableMappingRow(props) {
 	  var group = props.group,
 	      i = props.i,
-	      clearMapping = props.clearMapping;
+	      clearMapping = props.clearMapping,
+	      showApiNames = props.showApiNames;
 	
 	  return _react2.default.createElement(
 	    'div',
@@ -19571,6 +19687,14 @@ module.exports =
 	            });
 	          }
 	          fromString += m.propertyFromName;
+	          if (showApiNames && m.__propertyFromName) {
+	            fromString = m.__propertyFromName;
+	          }
+	
+	          var toStr = m.propertyToName;
+	          if (showApiNames && m.__propertyToName) {
+	            toStr = m.__propertyToName;
+	          }
 	          return _react2.default.createElement(
 	            'div',
 	            { key: iv, style: { height: 19, minWidth: 220, whiteSpace: 'nowrap' } },
@@ -19585,7 +19709,7 @@ module.exports =
 	            _react2.default.createElement(
 	              'div',
 	              { className: 'mapping-entry' },
-	              fromString + ' \u2192 ' + m.propertyToName
+	              fromString + ' \u2192 ' + toStr
 	            )
 	          );
 	        })
@@ -19597,7 +19721,8 @@ module.exports =
 	var MapTableTransformRow = exports.MapTableTransformRow = function MapTableTransformRow(props) {
 	  var group = props.group,
 	      i = props.i,
-	      selectMapping = props.selectMapping;
+	      selectMapping = props.selectMapping,
+	      showApiNames = props.showApiNames;
 	
 	  var icons = {
 	    none: _react2.default.createElement(
@@ -19716,17 +19841,21 @@ module.exports =
 	var MapTableDestinationRow = exports.MapTableDestinationRow = function MapTableDestinationRow(_ref) {
 	  var group = _ref.group,
 	      step = _ref.step,
-	      isReverse = _ref.isReverse;
+	      isReverse = _ref.isReverse,
+	      showApiNames = _ref.showApiNames;
 	
 	
 	  var groupName = group.name;
+	  if (showApiNames && group.__name) {
+	    groupName = group.__name;
+	  }
 	  if (isReverse) {
 	    if (group.provider.toLowerCase() === step.destinationProvider.toLowerCase()) {
-	      groupName = group.name + ' (' + step.destinationProvider + ')';
+	      groupName = groupName + ' (' + step.destinationProvider + ')';
 	    }
 	  } else {
 	    if (group.provider.toLowerCase() === step.sourceProvider.toLowerCase()) {
-	      groupName = group.name + ' (' + step.sourceProvider + ')';
+	      groupName = groupName + ' (' + step.sourceProvider + ')';
 	    }
 	  }
 	
@@ -20168,7 +20297,8 @@ module.exports =
 	          showOverflow = _props3.showOverflow,
 	          step = _props3.step,
 	          isReverse = _props3.isReverse,
-	          changeEntityLevel = _props3.changeEntityLevel;
+	          changeEntityLevel = _props3.changeEntityLevel,
+	          showApiNames = _props3.showApiNames;
 	      var parameterModalResourceIndex = this.state.parameterModalResourceIndex;
 	
 	
@@ -20267,6 +20397,7 @@ module.exports =
 	                    var primaryResource = null;
 	                    var primaryRscVals = null;
 	                    var primaryRscSectionLabels = null;
+	                    var primaryRscSectionTypes = null;
 	
 	                    if (rsc.parentNameAndProvider) {
 	                      primaryResource = group.resources.find(function (gr) {
@@ -20288,6 +20419,7 @@ module.exports =
 	                        });
 	
 	                        primaryRscSectionLabels = [primaryResource.name];
+	                        primaryRscSectionTypes = [primaryResource.__name];
 	
 	                        if (primaryHasParameters) {
 	                          primaryResource.parentRef.forEach(function (pr) {
@@ -20324,6 +20456,7 @@ module.exports =
 	                    })];
 	
 	                    var joinRscSectionLabels = [rsc.name];
+	                    var joinRscSectionTypes = [rsc.__name];
 	
 	                    if (hasParameters) {
 	                      rsc.parentRef.forEach(function (pr) {
@@ -20344,6 +20477,9 @@ module.exports =
 	                    if (rsc.primaryKeyName) {
 	                      primaryKeyLabel += rsc.primaryKeyName;
 	                    }
+	                    if (showApiNames && rsc.__primaryKeyName) {
+	                      primaryKeyLabel = rsc.__primaryKeyName;
+	                    }
 	
 	                    var joinKeyLabel = '';
 	                    rsc.joinKeyParents && rsc.joinKeyParents.forEach(function (skp) {
@@ -20353,15 +20489,21 @@ module.exports =
 	                    if (rsc.joinKeyName) {
 	                      joinKeyLabel += rsc.joinKeyName;
 	                    }
+	                    if (showApiNames && rsc.__joinKeyName) {
+	                      joinKeyLabel = rsc.__joinKeyName;
+	                    }
 	
 	                    var rscName = rsc.name;
+	                    if (showApiNames && rsc.__name) {
+	                      rscName = rsc.__name;
+	                    }
 	                    if (isReverse) {
 	                      if (rsc.provider.toLowerCase() === step.sourceProvider.toLowerCase()) {
-	                        rscName = rsc.name + ' (' + step.sourceProvider + ')';
+	                        rscName = rscName + ' (' + step.sourceProvider + ')';
 	                      }
 	                    } else {
 	                      if (rsc.provider.toLowerCase() === step.destinationProvider.toLowerCase()) {
-	                        rscName = rsc.name + ' (' + step.destinationProvider + ')';
+	                        rscName = rscName + ' (' + step.destinationProvider + ')';
 	                      }
 	                    }
 	
@@ -20513,13 +20655,16 @@ module.exports =
 	                                  type: 'neutral', inputs: inputs,
 	                                  values: primaryRscVals,
 	                                  sectionLabels: primaryRscSectionLabels,
+	                                  sectionTypes: primaryRscSectionTypes,
 	                                  fieldPropLabel: 'label',
+	                                  fieldPropType: 'name',
 	                                  selectedValues: [{
 	                                    label: rsc.primaryKeyName,
 	                                    parents: rsc.primaryKeyParents,
 	                                    section: rsc.primaryKeyResource
 	                                  }],
-	                                  sectionLabelSuffix: 'Fields'
+	                                  sectionLabelSuffix: 'Fields',
+	                                  showApiNames: showApiNames
 	                                })
 	                              ),
 	                              _react2.default.createElement(
@@ -20550,12 +20695,15 @@ module.exports =
 	                                  type: 'neutral', inputs: inputs,
 	                                  values: joinRscVals,
 	                                  sectionLabels: joinRscSectionLabels,
+	                                  sectionTypes: joinRscSectionTypes,
 	                                  fieldPropLabel: 'label',
+	                                  fieldPropType: 'name',
 	                                  selectedValues: [{
 	                                    label: rsc.joinKeyName,
 	                                    parents: rsc.joinKeyParents
 	                                  }],
-	                                  sectionLabelSuffix: 'Fields'
+	                                  sectionLabelSuffix: 'Fields',
+	                                  showApiNames: showApiNames
 	                                })
 	                              ),
 	                              _react2.default.createElement(
@@ -20606,7 +20754,8 @@ module.exports =
 	                    //resourceGroups[resourceGroupIndex].resources} 
 	                    , values: !isReverse ? [sourceSchema, destinationSchema] : [destinationSchema, sourceSchema],
 	                    sectionLabels: !isReverse ? [step.sourceProvider, step.destinationProvider] : [step.destinationProvider, step.sourceProvider],
-	                    sectionLabelSuffix: 'Objects', fieldPropLabel: 'name'
+	                    sectionLabelSuffix: 'Objects', fieldPropLabel: 'name', fieldPropType: 'type',
+	                    showApiNames: showApiNames
 	                  })
 	                ) : null
 	              ) : null
@@ -20774,7 +20923,7 @@ module.exports =
 	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               Modal that opens when a transformation icon is clicked in the Field Mapping table
 	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               transformations are an array on the mapping object
-	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               each transformation also has an array of args
+	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               each transformation also has an array of arguments (args)
 	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 	                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               **************************/
 	
@@ -20951,7 +21100,8 @@ module.exports =
 	          resourceGroupIndex = _props8.resourceGroupIndex,
 	          sourceSchema = _props8.sourceSchema,
 	          destinationSchema = _props8.destinationSchema,
-	          step = _props8.step;
+	          step = _props8.step,
+	          showApiNames = _props8.showApiNames;
 	
 	      var Modal = inputs.Modal;
 	      var Input = inputs.Input;
@@ -20985,6 +21135,7 @@ module.exports =
 	      }
 	
 	      var sectionLabels = [];
+	      var sectionTypes = [];
 	      var sectionProviders = [];
 	      var vals = [];
 	      if (transformSelected === 'concat') {
@@ -20993,6 +21144,7 @@ module.exports =
 	        }
 	        vals = group.resources.map(function (br, i) {
 	          sectionLabels.push(br.name);
+	          sectionTypes.push(br.__name);
 	          sectionProviders.push(br.provider);
 	          return group.resources[i].provider.toLowerCase() === step.destinationProvider.toLowerCase() ? destinationSchema && destinationSchema.find(function (defaultRsc) {
 	            return defaultRsc.name === group.resources[i].name;
@@ -21027,6 +21179,11 @@ module.exports =
 	        };
 	      }
 	
+	      var rscFrom = showApiNames ? mapping.__resourceFromName : mapping.resourceFromName;
+	      var propFrom = showApiNames ? mapping.__propertyFromName : propertyFromLabel;
+	      var rscTo = showApiNames ? mapping.__resourceToName : mapping.resourceToName;
+	      var propTo = showApiNames ? mapping.__propertyToName : mapping.propertyToName;
+	
 	      return _react2.default.createElement(
 	        Modal,
 	        { opened: opened, hideModal: hideModal, submitModal: hideModal, title: 'Transform Data' },
@@ -21039,25 +21196,25 @@ module.exports =
 	            _react2.default.createElement(
 	              'strong',
 	              null,
-	              mapping.resourceFromName
+	              rscFrom
 	            ),
 	            ': ',
 	            _react2.default.createElement(
 	              'span',
 	              null,
-	              propertyFromLabel
+	              propFrom
 	            ),
 	            '\xA0\xA0\u2192\xA0\xA0',
 	            _react2.default.createElement(
 	              'strong',
 	              null,
-	              mapping.resourceToName
+	              rscTo
 	            ),
 	            ': ',
 	            _react2.default.createElement(
 	              'span',
 	              null,
-	              mapping.propertyToName
+	              propTo
 	            )
 	          ),
 	          _react2.default.createElement('br', null),
@@ -21192,11 +21349,11 @@ module.exports =
 	                  onSelect: function onSelect(v, iii, field) {
 	                    return _this3.changeConcatField(v, field, mappingIndex);
 	                  },
-	                  inputs: inputs,
-	                  type: 'brand', fieldPropLabel: 'label',
-	                  values: vals, sectionLabels: sectionLabels,
+	                  inputs: inputs, type: 'brand', values: vals,
+	                  fieldPropLabel: 'label', fieldPropType: 'name',
+	                  sectionLabels: sectionLabels, sectionTypes: sectionTypes,
 	                  selectedValues: label && [{ label: label, parents: parents, section: section }],
-	                  sectionLabelSuffix: 'Fields'
+	                  sectionLabelSuffix: 'Fields', showApiNames: showApiNames
 	                });
 	              }),
 	              _react2.default.createElement('br', null),
@@ -21242,7 +21399,7 @@ module.exports =
 	var ConcatExampleResult = function ConcatExampleResult(props) {
 	  var delimiter = props.transformArgs[0];
 	  var concatFields = '';
-	  concatFields += delimiter;
+	  concatFields += delimiter || '';
 	  props.transformArgs.filter(function (arg, i) {
 	    return i !== 0;
 	  }).forEach(function (ta) {
@@ -21689,7 +21846,6 @@ module.exports =
 	
 	      change(mode + 'Credentials', credentials);
 	      this.setState(_defineProperty({}, mode + 'EnvChecking', true));
-	      console.log(config);
 	      actions.callGetMetadata(tenantId, accountId, mode, step[mode + 'Provider'], config, endpoint || '_blank', step.isFramework, credentials, env, isReload).then(function (metadata) {
 	        _this2.setState(_defineProperty({}, mode + 'EnvChecking', false));
 	        // set meta for File Schema step if needed
@@ -23351,7 +23507,9 @@ module.exports =
 	          step = _props3.step,
 	          reset = _props3.reset,
 	          wizard = _props3.wizard,
-	          actions = _props3.actions;
+	          actions = _props3.actions,
+	          showApiNames = _props3.showApiNames,
+	          toggleShowApiNames = _props3.toggleShowApiNames;
 	
 	      var MapTable = inputs.MapTable;
 	      var Button = inputs.Button;
@@ -23401,14 +23559,15 @@ module.exports =
 	            _react2.default.createElement(
 	              _groupNav2.default,
 	              { resourceGroups: resourceGroups, isBundleStep: false, inputs: inputs,
-	                style: { position: 'relative', width: 640, height: 69, zIndex: 9000 }, step: step },
+	                style: { position: 'relative', width: 640, height: 69, zIndex: 9000 }, step: step,
+	                showApiNames: showApiNames, toggleShowApiNames: toggleShowApiNames },
 	              _react2.default.createElement(_mapAccordion2.default, { sourceSchema: sourceSchema, destinationSchema: destinationSchema,
 	                formValues: formValues, change: change, update: this.update, step: step,
-	                actions: actions, isReverse: isReverse }),
+	                actions: actions, isReverse: isReverse, showApiNames: showApiNames }),
 	              _react2.default.createElement(
 	                MapTable,
 	                { clearOneMapping: this.clearOneMapping,
-	                  selectMapping: this.selectMapping,
+	                  selectMapping: this.selectMapping, showApiNames: showApiNames,
 	                  mode: formValues.direction, step: step },
 	                _react2.default.createElement(Rows.MapTableSourceRow, null),
 	                _react2.default.createElement(Rows.MapTableMappingRow, null),
@@ -23426,7 +23585,9 @@ module.exports =
 	            mapping: this.state.selectedTransform, opened: this.state.showModal,
 	            change: change, resourceGroups: resourceGroups, step: step,
 	            resourceGroupIndex: this.state.selectedTransformResourceGroupIndex,
-	            sourceSchema: sourceSchema, destinationSchema: destinationSchema })
+	            sourceSchema: sourceSchema, destinationSchema: destinationSchema,
+	            showApiNames: showApiNames
+	          })
 	        ) : null,
 	        _react2.default.createElement('br', null),
 	        (step.isFramework || step.isOrgAdmin) && _react2.default.createElement(
@@ -24617,7 +24778,9 @@ module.exports =
 	          step = _props14.step,
 	          reset = _props14.reset,
 	          wizard = _props14.wizard,
-	          change = _props14.change;
+	          change = _props14.change,
+	          showApiNames = _props14.showApiNames,
+	          toggleShowApiNames = _props14.toggleShowApiNames;
 	
 	
 	      var resourceGroups = [];
@@ -24681,16 +24844,20 @@ module.exports =
 	              changeGroupOrder: this.changeGroupOrder, step: step,
 	              inputs: inputs, addDefaultEntity: this.addDefaultEntity,
 	              didRemoveEntity: this.removeEntity,
-	              sourceSchema: sourceSchema,
-	              direction: formValues.direction },
+	              sourceSchema: sourceSchema, showApiNames: showApiNames,
+	              direction: formValues.direction,
+	              toggleShowApiNames: toggleShowApiNames },
 	            _react2.default.createElement(_schemaAccordion2.default, {
 	              sourceSchema: sourceSchema, destinationSchema: destinationSchema,
 	              changeEntityOrder: this.changeEntityOrder,
-	              isReverse: isReverse, step: step,
+	              isReverse: isReverse, step: step, showApiNames: showApiNames,
 	              selectPrimaryKey: this.selectPrimaryKey,
 	              selectJoinKey: this.selectJoinKey, change: change,
 	              changeEntityLevel: this.changeEntityLevel }),
-	            _react2.default.createElement(_bundleTable2.default, { openConnectionModal: this.openConnectionModal, mode: formValues.direction })
+	            _react2.default.createElement(_bundleTable2.default, { openConnectionModal: this.openConnectionModal,
+	              mode: formValues.direction,
+	              showApiNames: showApiNames
+	            })
 	          ),
 	          _react2.default.createElement('br', null)
 	        ),
@@ -24704,7 +24871,8 @@ module.exports =
 	            sourceSchema: sourceSchema, destinationSchema: destinationSchema,
 	            update: function update() {
 	              return _this3.forceUpdate();
-	            }, direction: formValues.direction
+	            }, direction: formValues.direction,
+	            showApiNames: showApiNames
 	          })
 	        ),
 	        _react2.default.createElement('br', null),
@@ -24803,17 +24971,17 @@ module.exports =
 	var SourceField = function SourceField(props) {
 	  var field = props.field,
 	      selectedField = props.selectedField,
-	      selectedFieldParents = props.selectedFieldParents,
 	      filteredMappings = props.filteredMappings,
 	      click = props.click,
 	      onExpand = props.onExpand,
 	      expanded = props.expanded,
-	      parents = props.parents;
+	      parents = props.parents,
+	      showApiNames = props.showApiNames;
 	
 	  var isMapped = filteredMappings && Object.values(filteredMappings).find(function (fm) {
 	    return fm.propFrom === field.label && JSON.stringify(fm.parentsFrom) === JSON.stringify(parents);
 	  }) ? true : false;
-	  var isSelected = selectedField && selectedField === field.label && JSON.stringify(selectedFieldParents) === JSON.stringify(parents);
+	  var isSelected = selectedField && selectedField.label && selectedField.label === field.label && JSON.stringify(selectedField.parents) === JSON.stringify(parents);
 	  var style = {
 	    paddingLeft: 5,
 	    background: isSelected ? '#dfe0e0' : 'initial',
@@ -24833,6 +25001,9 @@ module.exports =
 	  if (field.label) {
 	    title += field.label;
 	  }
+	  if (showApiNames) {
+	    title = field.name;
+	  }
 	  var isExpanded = false;
 	  if (field.object) {
 	    isExpanded = _nestExpand2.default.checkIfExpanded(field.label, parents, expanded);
@@ -24847,7 +25018,7 @@ module.exports =
 	          fontWeight: 'bold' } : style,
 	        onClick: function onClick() {
 	          if (!field.object) {
-	            click(field.label, parents);
+	            click(field, parents);
 	          } else {
 	            onExpand(_nestExpand2.default.expand(field.label, parents, expanded));
 	          }
@@ -24876,9 +25047,9 @@ module.exports =
 	          { className: 'fields-expander' },
 	          field.object && field.object.properties.map(function (nestedField, i) {
 	            return _react2.default.createElement(SourceField, { key: i, field: nestedField, selectedField: selectedField,
-	              selectedFieldParents: selectedFieldParents,
 	              filteredMappings: filteredMappings, parents: parents.concat(field.label),
-	              click: click, onExpand: onExpand, expanded: expanded });
+	              click: click, onExpand: onExpand, expanded: expanded
+	            });
 	          })
 	        ) : null
 	      )
@@ -25470,7 +25641,8 @@ module.exports =
 	    _this.limitBackToCurrentPage = _this.limitBackToCurrentPage.bind(_this);
 	    _this.state = {
 	      currentPage: 1,
-	      highestPage: 1
+	      highestPage: 1,
+	      showApiNames: false
 	    };
 	    _this.possibleSteps = {
 	      account: _accountStep2.default,
@@ -25595,7 +25767,9 @@ module.exports =
 	    value: function render() {
 	      var _this3 = this;
 	
-	      var currentPage = this.state.currentPage;
+	      var _state = this.state,
+	          currentPage = _state.currentPage,
+	          showApiNames = _state.showApiNames;
 	      var _props2 = this.props,
 	          steps = _props2.steps,
 	          actions = _props2.actions,
@@ -25671,7 +25845,11 @@ module.exports =
 	                      accountKey: accountKey,
 	                      configUrls: config,
 	                      isAdmin: isAdmin,
-	                      onUpdateScenarios: _this3.props.onUpdateScenarios
+	                      onUpdateScenarios: _this3.props.onUpdateScenarios,
+	                      showApiNames: showApiNames,
+	                      toggleShowApiNames: function toggleShowApiNames() {
+	                        return _this3.setState({ showApiNames: !showApiNames });
+	                      }
 	                    })
 	                  );
 	                })