@lingk/sync 0.0.57 → 0.0.59

package/build/main.js

@@ -4599,7 +4599,9 @@ module.exports =
 	                  resources.push(Object.assign({
 	                    name: rscResource.name,
 	                    provider: resourceProvider
-	                  }, rscPrimaryKey && { primaryKeyName: rscPrimaryKey.label }, rscJoinKey && { joinKeyName: rscJoinKey.label }));
+	                  }, rscPrimaryKey && { primaryKeyName: rscPrimaryKey.label }, rscJoinKey && { joinKeyName: rscJoinKey.label }, {
+	                    joinType: rsc.joinType || 'LEFT JOIN'
+	                  }));
 	                }
 	              }); // end bundle.resource.forEach
 	
@@ -5478,21 +5480,23 @@ module.exports =
 	  }, {
 	    key: 'removeResourceGroup',
 	    value: function removeResourceGroup(i) {
-	      this.props.removeGroup(i);
 	      var isFirst = i === 0;
 	      if (i === this.state.resourceGroupIndex) {
 	        this.go(!isFirst, isFirst ? 0 : i - 1);
 	      }
+	      if (this.state.resourceGroupIndex === this.props.resourceGroups.length - 1) {
+	        this.go(true, this.state.resourceGroupIndex - 1);
+	      }
+	      this.props.removeGroup(i);
 	    }
 	  }, {
 	    key: 'addDefaultResourceGroup',
 	    value: function addDefaultResourceGroup(v, i, id) {
-	      var _props = this.props,
-	          resourceGroups = _props.resourceGroups,
-	          addGroup = _props.addGroup;
+	      var addGroup = this.props.addGroup;
+	      var resourceGroupIndex = this.state.resourceGroupIndex;
 	
-	      this.go(false, resourceGroups.length);
-	      addGroup(v, id);
+	      this.go(false, resourceGroupIndex + 1);
+	      addGroup(v, resourceGroupIndex, id);
 	    }
 	  }, {
 	    key: 'pickEntity',
@@ -5546,14 +5550,14 @@ module.exports =
 	    value: function render() {
 	      var _this3 = this;
 	
-	      var _props2 = this.props,
-	          resourceGroups = _props2.resourceGroups,
-	          style = _props2.style,
-	          isBundleStep = _props2.isBundleStep,
-	          addDefaultEntity = _props2.addDefaultEntity,
-	          destinationSchema = _props2.destinationSchema,
-	          inputs = _props2.inputs,
-	          step = _props2.step;
+	      var _props = this.props,
+	          resourceGroups = _props.resourceGroups,
+	          style = _props.style,
+	          isBundleStep = _props.isBundleStep,
+	          addDefaultEntity = _props.addDefaultEntity,
+	          destinationSchema = _props.destinationSchema,
+	          inputs = _props.inputs,
+	          step = _props.step;
 	      var _state = this.state,
 	          resourceGroupIndex = _state.resourceGroupIndex,
 	          paneToggle = _state.paneToggle,
@@ -18678,6 +18682,28 @@ module.exports =
 	        joinKeyName: '',
 	        primaryKeyName: '',
 	        provider: 'Banner'
+	      }],
+	      mappings: [{
+	        isExternalKeyMapping: true,
+	        propertyFromName: "ExternalId",
+	        propertyToName: "Lingk External Id",
+	        resourceFromName: "Applicants",
+	        resourceToName: "Contact"
+	      }, {
+	        propertyFromName: "FirstName",
+	        propertyToName: "Fist Name",
+	        resourceFromName: "Applicants",
+	        resourceToName: "Contact"
+	      }, {
+	        propertyFromName: "LastName",
+	        propertyToName: "Last Name",
+	        resourceFromName: "Applicants",
+	        resourceToName: "Contact"
+	      }, {
+	        propertyFromName: "Gender",
+	        propertyToName: "Gender",
+	        resourceFromName: "Applicants",
+	        resourceToName: "Contact"
 	      }]
 	    }, {
 	      name: 'Admissions Application',
@@ -18693,7 +18719,25 @@ module.exports =
 	        name: 'Contact',
 	        joinKeyName: 'Lingk External Id',
 	        primaryKeyName: 'StudentExternalId',
-	        provider: 'Salesforce'
+	        provider: 'Salesforce',
+	        joinType: 'LEFT JOIN'
+	      }],
+	      mappings: [{
+	        isExternalKeyMapping: true,
+	        propertyFromName: "ApplicationNumber",
+	        propertyToName: "Lingk External Id",
+	        resourceFromName: "Student Applications",
+	        resourceToName: "Admissions Application"
+	      }, {
+	        propertyFromName: "ApplicationStatus",
+	        propertyToName: "Status",
+	        resourceFromName: "Student Applications",
+	        resourceToName: "Admissions Application"
+	      }, {
+	        propertyFromName: "Contact ID",
+	        propertyToName: "Contact",
+	        resourceFromName: "Contact",
+	        resourceToName: "Admissions Application"
 	      }]
 	    }];
 	    _this.loadDefault = _this.loadDefault.bind(_this);
@@ -20174,14 +20218,14 @@ module.exports =
 	    }
 	  }, {
 	    key: 'addGroup',
-	    value: function addGroup(v, recordTypeId) {
+	    value: function addGroup(v, index, recordTypeId) {
 	      var _props4 = this.props,
 	          change = _props4.change,
 	          formValues = _props4.formValues;
 	
 	
 	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups'])) || [];
-	      resourceGroups.push({
+	      resourceGroups.splice(index + 1, 0, {
 	        name: v,
 	        resources: null,
 	        recordTypeId: recordTypeId
@@ -20200,12 +20244,17 @@ module.exports =
 	      var resourceGroups = [].concat(_toConsumableArray(formValues['resourceGroups']));
 	      var group = resourceGroups[groupIndex];
 	      if (!group.resources) {
-	        group.resources = [];
+	        group.resources = [{
+	          name: v,
+	          provider: section
+	        }];
+	      } else {
+	        group.resources.push({
+	          name: v,
+	          provider: section,
+	          joinType: 'LEFT OUTER'
+	        });
 	      }
-	      group.resources.push({
-	        name: v,
-	        provider: section
-	      });
 	      if (group.resources.length === 1) {
 	        this.openConnectionModal(group, groupIndex);
 	      }
@@ -20425,16 +20474,30 @@ module.exports =
 	      i = props.i,
 	      openConnectionModal = props.openConnectionModal;
 	
+	  var linked = false;
+	  if (group.customExternalKeys) {
+	    if (group.sourceKeys && group.sourceKeys.length > 0 && group.destinationKeys && group.destinationKeys.length > 0) {
+	      linked = true;
+	    }
+	  } else {
+	    if (group.lingkSourceKey) {
+	      linked = true;
+	    }
+	  }
 	  return _react2.default.createElement(
 	    'div',
 	    { className: 'connect-resource-group', onClick: function onClick(e) {
 	        e.stopPropagation();
 	        openConnectionModal(group, i);
-	      } },
-	    _react2.default.createElement(
+	      }, style: { paddingTop: linked ? 5 : 6 } },
+	    linked ? _react2.default.createElement(
 	      'svg',
-	      { fill: '#000000', height: '19', viewBox: '0 0 24 24', width: '24', xmlns: 'http://www.w3.org/2000/svg' },
+	      { fill: '#000000', width: '29', height: '24', viewBox: '0 0 24 24', xmlns: 'http://www.w3.org/2000/svg' },
 	      _react2.default.createElement('path', { d: 'M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z' })
+	    ) : _react2.default.createElement(
+	      'svg',
+	      { fill: '#AAAAAA', width: '24', height: '19', viewBox: '0 0 24 24', xmlns: 'http://www.w3.org/2000/svg' },
+	      _react2.default.createElement('path', { d: 'M2,5.27L3.28,4L20,20.72L18.73,22L14.73,18H13V16.27L9.73,13H8V11.27L5.5,8.76C4.5,9.5 3.9,10.68 3.9,12C3.9,14.26 5.74,16.1 8,16.1H11V18H8A6,6 0 0,1 2,12C2,10.16 2.83,8.5 4.14,7.41L2,5.27M16,6A6,6 0 0,1 22,12C22,14.21 20.8,16.15 19,17.19L17.6,15.77C19.07,15.15 20.1,13.7 20.1,12C20.1,9.73 18.26,7.9 16,7.9H13V6H16M8,6H11V7.9H9.72L7.82,6H8M16,11V13H14.82L12.82,11H16Z' })
 	    )
 	  );
 	};
@@ -20456,8 +20519,10 @@ module.exports =
 	
 	var BundleTableDeleteRow = exports.BundleTableDeleteRow = function BundleTableDeleteRow(props) {
 	  var removeResourceGroup = props.removeResourceGroup,
-	      i = props.i;
+	      i = props.i,
+	      resourceGroups = props.resourceGroups;
 	
+	  if (resourceGroups && resourceGroups.length < 2) return _react2.default.createElement('div', null);
 	  return _react2.default.createElement(
 	    'div',
 	    { className: 'remove-resource-group', onClick: function onClick(e) {
@@ -20698,9 +20763,7 @@ module.exports =
 	                  },
 	                  type: 'brand', fieldPropLabel: 'label',
 	                  values: vals, sectionLabels: sectionLabels, sectionLabelSuffix: 'Fields',
-	                  selectedValues: resourceGroups[bundleIndex].sourceKeys && resourceGroups[bundleIndex].sourceKeys.map(function (ks) {
-	                    return { label: ks };
-	                  })
+	                  selectedValues: resourceGroups[bundleIndex].sourceKeys && [{ label: resourceGroups[bundleIndex].sourceKeys[i] }]
 	                })
 	              ),
 	              _react2.default.createElement(
@@ -20724,9 +20787,7 @@ module.exports =
 	                    return !p.readOnly;
 	                  })],
 	                  sectionLabels: [bundle.name], sectionLabelSuffix: 'Fields', fieldPropLabel: 'label',
-	                  selectedValues: resourceGroups[bundleIndex].destinationKeys && resourceGroups[bundleIndex].destinationKeys.map(function (ks) {
-	                    return { label: ks };
-	                  })
+	                  selectedValues: resourceGroups[bundleIndex].destinationKeys && [{ label: resourceGroups[bundleIndex].destinationKeys[i] }]
 	                })
 	              ),
 	              i !== 0 && _react2.default.createElement(
@@ -21486,7 +21547,7 @@ module.exports =
 	
 	      var filteredDestinationSchema = destinationSchema.filter(function (rsc) {
 	        return resourceGroups.find(function (g) {
-	          return g.name === rsc.name && group.name !== rsc.name;
+	          return g.name === rsc.name && group && group.name !== rsc.name;
 	        }) ? true : false;
 	      });
 	
@@ -21681,8 +21742,8 @@ module.exports =
 	                              ),
 	                              _react2.default.createElement(_reduxForm.Field, { name: 'resourceGroups.' + resourceGroupIndex + '.resources.' + i + '.joinType',
 	                                component: inputs.rfRadioGroup, label: 'Join Type', onClickOption: function onClickOption() {}, options: {
-	                                  all: 'All records',
-	                                  matching: 'Matching records'
+	                                  'LEFT JOIN': 'All records',
+	                                  'INNER JOIN': 'Matching records'
 	                                } })
 	                            )
 	                          ) : null
@@ -22178,7 +22239,8 @@ module.exports =
 	                }) && primarySourceResource.properties.find(function (prop) {
 	                  return prop.label === rsc.primaryKeyName;
 	                }).name || '',
-	                provider: rsc.provider.toLowerCase() + 'Reader'
+	                provider: rsc.provider.toLowerCase() + 'Reader',
+	                joinType: rsc.joinType
 	              };
 	            } else return null;
 	          });