@lingk/sync 1.0.72 → 1.0.74

package/build/main.js

@@ -17236,13 +17236,13 @@ module.exports =
 	  value: true
 	});
 	exports.callGetMetadata = callGetMetadata;
+	exports.tryCheckConnection = tryCheckConnection;
+	exports.callGetProviderMetadata = callGetProviderMetadata;
 	exports.setCsvFields = setCsvFields;
 	exports.removeFileResourceFromMetadata = removeFileResourceFromMetadata;
 	exports.clearCsvFields = clearCsvFields;
 	exports.uploadFilesToS3 = uploadFilesToS3;
 	exports.singleFileToS3 = singleFileToS3;
-	exports.tryCheckConnection = tryCheckConnection;
-	exports.callGetProviderMetadata = callGetProviderMetadata;
 	exports.getOauthUrl = getOauthUrl;
 	exports.generateNewAdapterSecret = generateNewAdapterSecret;
 	exports.createLingkExternalIds = createLingkExternalIds;
@@ -17310,9 +17310,7 @@ module.exports =
 	// isReload means that the "Check Connection" button was NOT clicked
 	function callGetMetadata(tenantId, appId, mode, providerType, providerConfig, endpoint, isFramework, creds, environment, isReload, fileSchemaGuid, extraQuery) {
 	  var metadata = null;
-	  var metadataEndpoint = providerConfig.metadataEndpoint,
-	      metadataApi = providerConfig.metadataApi,
-	      credentialType = providerConfig.credentialType;
+	  var credentialType = providerConfig.credentialType;
 	
 	  var isOauth = credentialType === 'SalesforceAuthCode';
 	  return function (dispatch) {
@@ -17328,11 +17326,12 @@ module.exports =
 	      if (fileSchemaGuid) {
 	        schemaGuid = fileSchemaGuid; // for SFTP guid is in wiz config
 	      }
-	      // let resFromCheckConnection = null
-	      // if(r && r.schema){ // currently only for SFTP check connection
-	      //   resFromCheckConnection = r.schema // skip callGetProviderMetadata network call
-	      // }
-	      return dispatch(callGetProviderMetadata(tenantId, appId, providerConfig, mode, providerType, endpoint, isOauth, environment.name, schemaGuid, creds, extraQuery));
+	      var resFromCheckConnection = null;
+	      if (r && r.schema) {
+	        // currently only for SFTP check connection
+	        resFromCheckConnection = r.schema; // skip callGetProviderMetadata network call
+	      }
+	      return dispatch(callGetProviderMetadata(tenantId, appId, providerConfig, mode, providerType, endpoint, isOauth, environment.name, schemaGuid, creds, extraQuery, resFromCheckConnection));
 	    }).then(function (m) {
 	      metadata = m;
 	      var isIntro = endpoint === '_blank';
@@ -17355,11 +17354,88 @@ module.exports =
 	  };
 	}
 	
-	function setCsvFields(tenantId, appId, tenantKey, appKey, metadata, contents, mode, providerType, isSource, envId) {
-	  var d = null;
+	function tryCheckConnection(tenantId, appId, providerType, providerConfig, isFramework, creds, fileSchemaGuid) {
 	  return function (dispatch, getState, api) {
+	    var credentialType = providerConfig.credentialType;
+	
+	    var isOauth = credentialType === 'SalesforceAuthCode';
+	    var isAdapter = credentialType === 'LingkAdapter';
+	    //const isEthos = credentialType==='Ethos'
+	
 	    var _getState = getState(),
 	        config = _getState.config;
+	    // if demo creds are entered, skip this
+	    // ADD: OR IF adaptermetadata SKIP THIS
+	
+	
+	    if (!isOauth && !isAdapter && !isDemoCreds(creds, providerType) && !fileSchemaGuid) {
+	      return api.post(tenantId + '/' + appId + '/testconnection/' + providerType.toLowerCase(), {
+	        endpoint: config.TRANS_API_URL,
+	        data: {
+	          credentialType: credentialType,
+	          credentialsJson: creds,
+	          providerLabel: providerType
+	        }
+	      });
+	    } else return Promise.resolve(null);
+	  };
+	}
+	
+	function callGetProviderMetadata(tenantId, appId, providerConfig, mode, providerType, endpoint, isOauth, envName, schemaGuid, creds, extraQuery, resFromCheckConnection) {
+	  // urlSuffix for getMetadata. If checkConnection returns meta, skip this one
+	  var metadataEndpoint = providerConfig.metadataEndpoint,
+	      metadataApi = providerConfig.metadataApi,
+	      credentialType = providerConfig.credentialType;
+	
+	  if (!metadataEndpoint || resFromCheckConnection) {
+	    return function () {
+	      return Promise.resolve(resFromCheckConnection);
+	    };
+	  }
+	  return function (dispatch, getState, api) {
+	    var _getState2 = getState(),
+	        config = _getState2.config;
+	
+	    var isAdapter = false;
+	    if (metadataEndpoint === 'adaptermetadata') {
+	      metadataEndpoint = 'adaptermetadata?url=' + endpoint;
+	      isAdapter = true;
+	    }
+	    if (metadataEndpoint === 'fileschema') {
+	      metadataEndpoint = 'fileschema?schemaGuid=' + schemaGuid;
+	    }
+	    if (metadataEndpoint === 'schema/swagger/moodle' && creds.swaggerUrl) {
+	      metadataEndpoint = 'schema/swagger/moodle?swaggerUrl=' + creds.swaggerUrl;
+	    }
+	    if (metadataApi === 'TEST_CONN_API_URL') {
+	      return api.post(tenantId + '/' + appId + '/' + metadataEndpoint, {
+	        endpoint: config[metadataApi],
+	        data: {
+	          credentialType: credentialType,
+	          credentialsJson: creds,
+	          providerLabel: providerType
+	        }
+	      });
+	    } else {
+	      if (isOauth || isAdapter || providerType === 'Ethos') {
+	        // USE ONLY ENVS!!!
+	        return api.get(tenantId + '/' + appId + '/environments/' + envName + '/' + metadataEndpoint + (extraQuery || ''), {
+	          endpoint: config[metadataApi]
+	        });
+	      } else {
+	        return api.get(tenantId + '/' + appId + '/' + metadataEndpoint + (extraQuery || ''), {
+	          endpoint: config[metadataApi]
+	        });
+	      }
+	    }
+	  };
+	}
+	
+	function setCsvFields(tenantId, appId, tenantKey, appKey, metadata, contents, mode, providerType, isSource, envId) {
+	  var d = null;
+	  return function (dispatch, getState, api) {
+	    var _getState3 = getState(),
+	        config = _getState3.config;
 	
 	    return api.post(tenantId + '/' + appId + '/uploadpolicy', {
 	      endpoint: config.TRANS_API_URL,
@@ -17382,8 +17458,8 @@ module.exports =
 	
 	function removeFileResourceFromMetadata(mode, r, providerType) {
 	  return function (dispatch, getState, api) {
-	    var _getState2 = getState(),
-	        wizard = _getState2.wizard;
+	    var _getState4 = getState(),
+	        wizard = _getState4.wizard;
 	
 	    var metadata = [].concat(_toConsumableArray(wizard[mode + 'Metadata']));
 	    var i = metadata.findIndex(function (rsc) {
@@ -17470,83 +17546,6 @@ module.exports =
 	  } else return false;
 	}
 	
-	function tryCheckConnection(tenantId, appId, providerType, providerConfig, isFramework, creds, fileSchemaGuid) {
-	  return function (dispatch, getState, api) {
-	    var credentialType = providerConfig.credentialType;
-	
-	    var isOauth = credentialType === 'SalesforceAuthCode';
-	    var isAdapter = credentialType === 'LingkAdapter';
-	    //const isEthos = credentialType==='Ethos'
-	
-	    var _getState3 = getState(),
-	        config = _getState3.config;
-	    // if demo creds are entered, skip this
-	    // ADD: OR IF adaptermetadata SKIP THIS
-	
-	
-	    if (!isOauth && !isAdapter && !isDemoCreds(creds, providerType) && !fileSchemaGuid) {
-	      return api.post(tenantId + '/' + appId + '/testconnection/' + providerType.toLowerCase(), {
-	        endpoint: config.TRANS_API_URL,
-	        data: {
-	          credentialType: credentialType,
-	          credentialsJson: creds,
-	          providerLabel: providerType
-	        }
-	      });
-	    } else return Promise.resolve(null);
-	  };
-	}
-	
-	function callGetProviderMetadata(tenantId, appId, providerConfig, mode, providerType, endpoint, isOauth, envName, schemaGuid, creds, extraQuery) {
-	  // urlSuffix for getMetadata. If checkConnection returns meta, skip this one
-	  var metadataEndpoint = providerConfig.metadataEndpoint,
-	      metadataApi = providerConfig.metadataApi,
-	      credentialType = providerConfig.credentialType;
-	
-	  if (!metadataEndpoint) {
-	    return function () {
-	      return Promise.resolve(null);
-	    };
-	  }
-	  return function (dispatch, getState, api) {
-	    var _getState4 = getState(),
-	        config = _getState4.config;
-	
-	    var isAdapter = false;
-	    if (metadataEndpoint === 'adaptermetadata') {
-	      metadataEndpoint = 'adaptermetadata?url=' + endpoint;
-	      isAdapter = true;
-	    }
-	    if (metadataEndpoint === 'fileschema') {
-	      metadataEndpoint = 'fileschema?schemaGuid=' + schemaGuid;
-	    }
-	    if (metadataEndpoint === 'schema/swagger/moodle' && creds.swaggerUrl) {
-	      metadataEndpoint = 'schema/swagger/moodle?swaggerUrl=' + creds.swaggerUrl;
-	    }
-	    if (metadataApi === 'TEST_CONN_API_URL') {
-	      return api.post(tenantId + '/' + appId + '/' + metadataEndpoint, {
-	        endpoint: config[metadataApi],
-	        data: {
-	          credentialType: credentialType,
-	          credentialsJson: creds,
-	          providerLabel: providerType
-	        }
-	      });
-	    } else {
-	      if (isOauth || isAdapter || providerType === 'Ethos') {
-	        // USE ONLY ENVS!!!
-	        return api.get(tenantId + '/' + appId + '/environments/' + envName + '/' + metadataEndpoint + (extraQuery || ''), {
-	          endpoint: config[metadataApi]
-	        });
-	      } else {
-	        return api.get(tenantId + '/' + appId + '/' + metadataEndpoint + (extraQuery || ''), {
-	          endpoint: config[metadataApi]
-	        });
-	      }
-	    }
-	  };
-	}
-	
 	function getOauthUrl(tenantId, appId, typeGuid, orgType, mode, envName) {
 	  return function (dispatch, getState, api) {
 	    dispatch({
@@ -20903,21 +20902,21 @@ module.exports =
 	                                  _react2.default.createElement(
 	                                    'p',
 	                                    null,
-	                                    'All: ',
-	                                    rsc.name + ' records may or may not have a related ' + (primaryResource && primaryResource.name) + ' record'
+	                                    'Matching: ',
+	                                    'Each ' + rsc.name + ' must have at least one related ' + (primaryResource && primaryResource.name) + ' record'
 	                                  ),
 	                                  _react2.default.createElement(
 	                                    'p',
 	                                    { style: { marginTop: 6 } },
-	                                    'Matching: ',
-	                                    'Each ' + rsc.name + ' must have at least one related ' + (primaryResource && primaryResource.name) + ' record'
+	                                    'All: ',
+	                                    rsc.name + ' records may or may not have a related ' + (primaryResource && primaryResource.name) + ' record'
 	                                  )
 	                                ),
 	                                _react2.default.createElement(_reduxForm.Field, { name: 'resourceGroups.' + resourceGroupIndex + '.resources.' + i + '.joinType',
 	                                  component: inputs.rfRadioGroup, label: 'Join Type',
 	                                  onClickOption: function onClickOption() {}, options: {
-	                                    'LEFT JOIN': 'All records',
-	                                    'INNER JOIN': 'Matching records'
+	                                    'INNER JOIN': 'Matching records',
+	                                    'LEFT JOIN': 'All records'
 	                                  } }),
 	                                _react2.default.createElement(_joinVenn2.default, { joinType: rsc.joinType })
 	                              )
@@ -24848,7 +24847,7 @@ module.exports =
 	        name: v,
 	        __name: entity.type,
 	        provider: entity.section,
-	        joinType: 'LEFT JOIN',
+	        joinType: 'INNER JOIN',
 	        level: level
 	      }, entity.parentRef && { parentRef: entity.parentRef }, entity.recordTypeId && { recordTypeId: entity.rtid }));
 	      change('resourceGroups', resourceGroups);