s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Property suggestion for data extension should try CORS first. 'suggest' key is optional in service manifest (#3710)

Browse Source 
Co-authored-by: Douglas Mennella <douglas.mennella@gmail.com>
Co-authored-by: Antonin Delpeuch <antonin@delpeuch.eu>
This commit is contained in:
gitonthescene 2021-03-12 19:47:22 +09:00 committed by GitHub
parent b455dc577a
commit 50a905e9da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js
View File

@ -100,34 +100,43 @@ ExtendReconciledDataPreviewDialog.getAllProperties = function(url, typeID, onDon
onDone([]); onDone([]);
} else { } else {
var done = false; var done = false;
$.getJSON( var onSuccess = function (data) {
url +"?type=" + typeID + "&callback=?",
null,
function(data) {
if (done) return; if (done) return;
done = true; done = true;
var allProperties = []; var allProperties = [];
for (var i = 0; i < data.properties.length; i++) { for (var i = 0; i < data.properties.length; i++) {
var property = data.properties[i]; var property = data.properties[i];
var property2 = { var property2 = {
id: property.id, id: property.id,
name: property.name name: property.name,
}; };
allProperties.push(property2); allProperties.push(property2);
} }
allProperties.sort(function(a, b) { return a.name.localeCompare(b.name); }); allProperties.sort(function (a, b) {
return a.name.localeCompare(b.name);
});
onDone(allProperties); onDone(allProperties);
} };
);
window.setTimeout(function() { $.ajax(url + "?type=" + typeID, {
dataType: "json",
success: onSuccess,
timeout: 7000,
error: function () {
$.ajax(url + "?type=" + typeID, {
dataType: "jsonp",
success: onSuccess,
timeout: 7000,
error: function () {
if (done) return; if (done) return;
done = true; done = true;
onDone([]); onDone([]);
}, 7000); // time to give up? }
});
},
});
} }
}; };
@ -158,7 +167,7 @@ ExtendReconciledDataPreviewDialog.prototype._show = function(properties) {
renderSuggestedProperty(properties[i]); renderSuggestedProperty(properties[i]);
} }
var suggestConfig = $.extend({}, this._serviceMetadata.suggest.property); var suggestConfig = $.extend({}, this._serviceMetadata.suggest && this._serviceMetadata.suggest.property);
suggestConfig.key = null; suggestConfig.key = null;
suggestConfig.query_param_name = "prefix"; suggestConfig.query_param_name = "prefix";