@lingk/sync 0.0.54 → 0.0.55

package/build/main.js

@@ -4553,12 +4553,10 @@ module.exports =
 	          return sourceKeyProperty.label;
 	        });
 	
-	        return {
+	        return Object.assign({
 	          name: bundleResource.name,
-	          sourceKeys: sourceKeys,
-	          sourceKeysObjects: sourceKeysObjects,
-	          destinationKeys: destinationKeys,
-	          customExternalKeys: bundle.customExternalKeys,
+	          customExternalKeys: bundle.customExternalKeys
+	        }, bundle.customExternalKeys === true && { sourceKeys: sourceKeys, sourceKeysObjects: sourceKeysObjects, destinationKeys: destinationKeys }, bundle.customExternalKeys === false && { lingkSourceKey: sourceKeys[0], lingkSourceKeyObject: sourceKeysObjects[0] }, {
 	          provider: bundle.provider.charAt(0).toUpperCase() + bundle.provider.slice(1),
 	          resources: bundle.resources && bundle.resources.map(function (rsc) {
 	
@@ -4613,7 +4611,7 @@ module.exports =
 	              transformations: m.transformations && m.transformations.length > 0 ? m.transformations : [{ type: 'none' }]
 	            }, m.isDestinationResource && { dataSourceIsDestinationEntity: true }, m.isExternalKeyMapping && { isExternalKeyMapping: true });
 	          })
-	        };
+	        });
 	      });
 	      change('resourceGroups', formValues['resourceGroups'] || resourceGroups);
 	    }
@@ -18628,16 +18626,29 @@ module.exports =
 	    _this.defaultResourceMapping = [{
 	      name: 'Contact',
 	      provider: 'Salesforce',
+	      lingkSourceKey: 'ExternalId',
+	      lingkSourceKeyObject: 'Applicants',
 	      resources: [{
-	        name: 'Applicant',
+	        name: 'Applicants',
 	        joinKeyName: '',
 	        primaryKeyName: '',
 	        provider: 'Banner'
-	      }, {
-	        name: 'Student Telephone',
-	        joinKeyName: 'StudentExternalId',
-	        primaryKeyName: 'ExternalId',
+	      }]
+	    }, {
+	      name: 'Admissions Application',
+	      provider: 'Salesforce',
+	      lingkSourceKey: 'StudentExternalId',
+	      lingkSourceKeyObject: 'Student Applications',
+	      resources: [{
+	        name: 'Student Applications',
+	        joinKeyName: '',
+	        primaryKeyName: '',
 	        provider: 'Banner'
+	      }, {
+	        name: 'Contact',
+	        joinKeyName: 'externalId',
+	        primaryKeyName: 'StudentExternalId',
+	        provider: 'Salesforce'
 	      }]
 	    }];
 	    _this.loadDefault = _this.loadDefault.bind(_this);
@@ -20335,8 +20346,6 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reduxForm = __webpack_require__(4);
-	
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 	
 	var BundleTableSourceRow = exports.BundleTableSourceRow = function BundleTableSourceRow(props) {
@@ -20457,22 +20466,33 @@ module.exports =
 	    group.mappings = group.mappings && group.mappings.filter(function (m) {
 	      return !m.isExternalKeyMapping;
 	    });
-	    group.sourceKeys && group.sourceKeys.forEach(function (sk, i) {
-	      if (group.customExternalKeys && sk && group.destinationKeys && group.destinationKeys[i] || !group.customExternalKeys && sk) {
+	    if (group.customExternalKeys) {
+	      group.sourceKeys && group.sourceKeys.forEach(function (sk, i) {
+	        if (sk && group.destinationKeys && group.destinationKeys[i]) {
+	          var map = {
+	            isExternalKeyMapping: true,
+	            resourceFromName: group.sourceKeysObjects[i],
+	            propertyFromName: sk,
+	            resourceToName: group.name,
+	            propertyToName: group.destinationKeys[i]
+	          };
+	          group.mappings = group.mappings || [];
+	          group.mappings.push(map);
+	        }
+	      });
+	    } else {
+	      if (group.lingkSourceKey) {
 	        var map = {
 	          isExternalKeyMapping: true,
-	          resourceFromName: group.sourceKeysObjects[i],
-	          propertyFromName: sk,
+	          resourceFromName: group.lingkSourceKeyObject,
+	          propertyFromName: group.lingkSourceKey,
 	          resourceToName: group.name,
-	          propertyToName: group.customExternalKeys ? group.destinationKeys[i] : 'externalId'
+	          propertyToName: 'externalId'
 	        };
-	        if (group.mappings) {
-	          group.mappings.push(map);
-	        } else {
-	          group.mappings = [map];
-	        }
+	        group.mappings = group.mappings || [];
+	        group.mappings.push(map);
 	      }
-	    });
+	    }
 	    change('resourceGroups', rgs);
 	    hideModal();
 	  };
@@ -20506,8 +20526,8 @@ module.exports =
 	  var selectSourceKeyForLingk = function selectSourceKeyForLingk(key, section) {
 	    var rgs = [].concat(_toConsumableArray(resourceGroups));
 	    var group = rgs[bundleIndex];
-	    group.sourceKeys = [key];
-	    group.sourceKeysObjects = [section];
+	    group.lingkSourceKey = key;
+	    group.lingkSourceKeyObject = section;
 	    change('resourceGroups', rgs);
 	    props.update();
 	  };
@@ -20555,6 +20575,7 @@ module.exports =
 	  });
 	
 	  var sourceKeys = resourceGroups[bundleIndex].sourceKeys || [''];
+	  var destinationKeys = resourceGroups[bundleIndex].destinationKeys || [''];
 	
 	  return _react2.default.createElement(
 	    Modal,
@@ -20653,7 +20674,9 @@ module.exports =
 	                    return defaultRsc.name === bundle.name;
 	                  }) && destinationSchema.find(function (defaultRsc) {
 	                    return defaultRsc.name === bundle.name;
-	                  }).properties],
+	                  }).properties.filter(function (p) {
+	                    return !p.readOnly;
+	                  })],
 	                  sectionLabels: [bundle.name], sectionLabelSuffix: 'Fields', fieldPropLabel: 'label',
 	                  selectedValues: resourceGroups[bundleIndex].destinationKeys && resourceGroups[bundleIndex].destinationKeys.map(function (ks) {
 	                    return { label: ks };
@@ -20675,7 +20698,11 @@ module.exports =
 	              )
 	            );
 	          }),
-	          sourceKeys && sourceKeys.length < 5 && _react2.default.createElement(
+	          sourceKeys && sourceKeys.length < 5 && sourceKeys.every(function (sk) {
+	            return sk;
+	          }) && destinationKeys.every(function (dk) {
+	            return dk;
+	          }) && _react2.default.createElement(
 	            'div',
 	            { style: { paddingTop: 10, width: '47%', textAlign: 'center' } },
 	            _react2.default.createElement(
@@ -20726,14 +20753,13 @@ module.exports =
 	          _react2.default.createElement(
 	            'div',
 	            { className: 'external-keys-column' },
-	            _react2.default.createElement(Select, { label: resourceGroups[bundleIndex].sourceKeys && resourceGroups[bundleIndex].sourceKeys[0] || 'Choose Key', menuItemStyle: { height: 20, padding: '1px 8px' },
+	            _react2.default.createElement(Select, { label: resourceGroups[bundleIndex].lingkSourceKey || 'Choose Key',
+	              menuItemStyle: { height: 20, padding: '1px 8px' },
 	              onSelect: function onSelect(v, i, rtid, section) {
 	                return selectSourceKeyForLingk(v, section);
 	              }, type: 'brand',
 	              values: vals, sectionLabels: sectionLabels, sectionLabelSuffix: 'Fields', fieldPropLabel: 'label',
-	              selectedValues: resourceGroups[bundleIndex].sourceKeys && resourceGroups[bundleIndex].sourceKeys.map(function (ks) {
-	                return { label: ks };
-	              })
+	              selectedValues: [{ label: resourceGroups[bundleIndex].lingkSourceKey }]
 	            })
 	          ),
 	          _react2.default.createElement(
@@ -20948,20 +20974,16 @@ module.exports =
 	                          'div',
 	                          { className: 'accordion-panel-collapse',
 	                            style: {
-	                              height: schema && selectedEntity.name === rsc.name ? schema.filter(function (r) {
+	                              height: schema && selectedEntity.name === rsc.name ? schema.find(function (r) {
 	                                return r.name === rsc.name;
-	                              })[0].properties.length * 18 + 19 : 0,
+	                              }).properties.length * 18 + 19 : 0,
 	                              padding: '0 6px'
 	                            }
 	                          },
 	                          _react2.default.createElement('div', { style: { height: 9 } }),
 	                          schema && schema.find(function (r) {
 	                            return r.name === rsc.name;
-	                          }).properties.sort(function (a, b) {
-	                            if (a.label < b.label) return -1;
-	                            if (a.label > b.label) return 1;
-	                            return 0;
-	                          }).map(function (field, ii) {
+	                          }).properties.map(function (field, ii) {
 	                            var style = {
 	                              paddingLeft: 5,
 	                              background: selectedField && selectedField === field.label ? '#dfe0e0' : 'initial',
@@ -21011,10 +21033,8 @@ module.exports =
 	                    { className: 'scrolly', style: { height: 256, padding: '8px 12px' } },
 	                    destinationSchema && destinationSchema.find(function (r) {
 	                      return r.name === group.name;
-	                    }).properties.sort(function (a, b) {
-	                      if (a.label < b.label) return -1;
-	                      if (a.label > b.label) return 1;
-	                      return 0;
+	                    }).properties.filter(function (p) {
+	                      return !p.readOnly;
 	                    }).map(function (field, i) {
 	                      return _react2.default.createElement(
 	                        'div',
@@ -21555,13 +21575,13 @@ module.exports =
 	                                _react2.default.createElement(
 	                                  'p',
 	                                  null,
-	                                  'Choose a Join Key for this resource, whose value should equal the Join Key of the Primary Object (',
+	                                  'Choose a Join Key for this resource, whose value should equal the Join Key for (',
 	                                  group.resources[0].name,
 	                                  ')'
 	                                )
 	                              ),
 	                              _react2.default.createElement(_reduxForm.Field, { component: inputs.rfSelect, type: 'input',
-	                                defaultLabel: 'Choose Join Key', colorType: 'brand',
+	                                defaultLabel: 'Choose ' + rsc.name + ' Join Key', colorType: 'brand',
 	                                selectedValue: group.resources[i].joinKeyName, onClick: function onClick() {
 	                                  showOverflow();
 	                                },
@@ -21586,7 +21606,7 @@ module.exports =
 	                                'Primary Object Join Key'
 	                              ),
 	                              _react2.default.createElement(_reduxForm.Field, { component: inputs.rfSelect, type: 'input',
-	                                defaultLabel: 'Choose Join Key from ' + group.resources[0].name, colorType: 'brand',
+	                                defaultLabel: 'Choose ' + group.resources[0].name + ' Join Key', colorType: 'brand',
 	                                selectedValue: group.resources[i].primaryKeyName, onClick: function onClick() {
 	                                  showOverflow();
 	                                },
@@ -22005,6 +22025,12 @@ module.exports =
 	      var mappings = [];
 	      bundles.forEach(function (group, index) {
 	
+	        if (!group.customExternalKeys) {
+	          group.sourceKeys = [group.lingkSourceKey];
+	          group.sourceKeysObjects = [group.lingkSourceKeyObject];
+	          group.destinationKeys = ['externalId'];
+	        }
+	
 	        // get resource + name + destinationKeys
 	        var destinationResource = _this2.props.wizard.destinationMetadata ? _this2.props.wizard.destinationMetadata.find(function (rsc) {
 	          return rsc.name === group.name;
@@ -22014,6 +22040,8 @@ module.exports =
 	          group.destinationKeys = group.destinationKeys.map(function (dk) {
 	            return destinationResource && destinationResource.properties && destinationResource.properties.find(function (prop) {
 	              return prop.label === dk;
+	            }) && destinationResource.properties.find(function (prop) {
+	              return prop.label === dk;
 	            }).name || "lingk__externalId__c";
 	          });
 	        } else {
@@ -22080,6 +22108,8 @@ 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.resources) {