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

Merge branch 'extend-data-fixes'

Browse Source 
Conflicts:
	main/webapp/modules/core/langs/translation-en.json
This commit is contained in:
Antonin Delpeuch 2017-08-13 20:17:18 +01:00
commit 18b1942169
4 changed files with 106 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/webapp/modules/core/MOD-INF/controller.js
View File

@ -370,7 +370,6 @@ function init() {
"styles/index/default-importing-sources.less", "styles/index/default-importing-sources.less",
"styles/views/data-table-view.less", // for the preview table's styles "styles/views/data-table-view.less", // for the preview table's styles
"styles/views/extend-data-preview-dialog.less",
"styles/index/fixed-width-parser-ui.less", "styles/index/fixed-width-parser-ui.less",
"styles/index/xml-parser-ui.less", "styles/index/xml-parser-ui.less",
"styles/index/json-parser-ui.less" "styles/index/json-parser-ui.less"

2
main/webapp/modules/core/langs/translation-en.json
View File

@ -510,6 +510,8 @@
"remove-prop": "remove", "remove-prop": "remove",
"configure-prop": "configure", "configure-prop": "configure",
"no-settings": "No settings are available for this property.", "no-settings": "No settings are available for this property.",
"extend-not-reconciled": "This operation is only available on reconciled columns.",
"extend-not-supported": "This reconciliation service does not support data extension. Try removing the service and adding it again. If the problem persists, contact the service provider.",
"add-col-fetch": "Add column by fetching URLs based on column", "add-col-fetch": "Add column by fetching URLs based on column",
"throttle-delay": "Throttle delay", "throttle-delay": "Throttle delay",
"milli": "milliseconds", "milli": "milliseconds",

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

@ -62,19 +62,19 @@ function ExtendReconciledDataPreviewDialog(column, columnIndex, rowIndices, onDo
DialogSystem.dismissUntil(self._level - 1); DialogSystem.dismissUntil(self._level - 1);
}); });
var dismissBusy = DialogSystem.showBusy();
var type = (column.reconConfig) && (column.reconConfig.type) ? column.reconConfig.type.id : ""; var type = (column.reconConfig) && (column.reconConfig.type) ? column.reconConfig.type.id : "";
this._proposePropertiesUrl = null; this._proposePropertiesUrl = null;
this._fetchColumnUrl = null; this._fetchColumnUrl = null;
this._serviceMetadata = null; this._serviceMetadata = null;
var extend = null;
if ("reconConfig" in column) { if ("reconConfig" in column) {
var service = column.reconConfig.service; var service = column.reconConfig.service;
this._service = service; this._service = service;
var serviceMetadata = ReconciliationManager.getServiceFromUrl(service); var serviceMetadata = ReconciliationManager.getServiceFromUrl(service);
this._serviceMetadata = serviceMetadata; this._serviceMetadata = serviceMetadata;
if ("extend" in serviceMetadata) { if ("extend" in serviceMetadata) {
var extend = serviceMetadata.extend; extend = serviceMetadata.extend;
if ("propose_properties" in extend) { if ("propose_properties" in extend) {
var endpoint = extend.propose_properties; var endpoint = extend.propose_properties;
this._proposePropertiesUrl = endpoint.service_url + endpoint.service_path; this._proposePropertiesUrl = endpoint.service_url + endpoint.service_path;
@ -82,11 +82,18 @@ function ExtendReconciledDataPreviewDialog(column, columnIndex, rowIndices, onDo
} }
} }
if (this._serviceMetadata === null) {
alert($.i18n._('core-views')["extend-not-reconciled"]);
} else if(extend === null) {
alert($.i18n._('core-views')["extend-not-supported"]);
} else {
var dismissBusy = DialogSystem.showBusy();
ExtendReconciledDataPreviewDialog.getAllProperties(this._proposePropertiesUrl, type, function(properties) { ExtendReconciledDataPreviewDialog.getAllProperties(this._proposePropertiesUrl, type, function(properties) {
dismissBusy(); dismissBusy();
self._show(properties); self._show(properties);
}); });
} }
}
ExtendReconciledDataPreviewDialog.getAllProperties = function(url, typeID, onDone) { ExtendReconciledDataPreviewDialog.getAllProperties = function(url, typeID, onDone) {
if(url == null) { if(url == null) {
@ -107,16 +114,6 @@ ExtendReconciledDataPreviewDialog.getAllProperties = function(url, typeID, onDon
id: property.id, id: property.id,
name: property.name name: property.name
}; };
/*if ("id2" in property) {
property2.expected = property.schema2;
property2.properties = [{
id: property.id2,
name: property.name2,
expected: property.expects
}];
} else {
property2.expected = property.expects;
} */
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); });
@ -183,6 +180,11 @@ ExtendReconciledDataPreviewDialog.prototype._update = function() {
columnName: this._column.name columnName: this._column.name
}; };
if(this._extension.properties.length === 0) {
// if the column selection is empty, reset the view
this._elmts.previewContainer.empty();
} else {
// otherwise, refresh the preview
$.post( $.post(
"command/core/preview-extend-data?" + $.param(params), "command/core/preview-extend-data?" + $.param(params),
{ {
@ -194,8 +196,9 @@ ExtendReconciledDataPreviewDialog.prototype._update = function() {
}, },
"json" "json"
).fail(function(data) { ).fail(function(data) {
console.log(data); alert($.i18n._("core-views")["internal-err"]);
}); });
}
}; };
ExtendReconciledDataPreviewDialog.prototype._addProperty = function(p) { ExtendReconciledDataPreviewDialog.prototype._addProperty = function(p) {
@ -296,7 +299,7 @@ ExtendReconciledDataPreviewDialog.prototype._renderPreview = function(data) {
ExtendReconciledDataPreviewDialog.prototype._removeProperty = function(id) { ExtendReconciledDataPreviewDialog.prototype._removeProperty = function(id) {
for(var i = this._extension.properties.length - 1; i >= 0; i--) { for(var i = this._extension.properties.length - 1; i >= 0; i--) {
var property = this._extension.properties[i]; var property = this._extension.properties[i];
if (property.id == id) { if (property.id === id) {
this._extension.properties.splice(i, 1); this._extension.properties.splice(i, 1);
} }
} }
@ -306,7 +309,7 @@ ExtendReconciledDataPreviewDialog.prototype._removeProperty = function(id) {
ExtendReconciledDataPreviewDialog.prototype._findProperty = function(id) { ExtendReconciledDataPreviewDialog.prototype._findProperty = function(id) {
var properties = this._extension.properties; var properties = this._extension.properties;
for(var i = properties.length - 1; i >= 0; i--) { for(var i = properties.length - 1; i >= 0; i--) {
if (properties[i].id == id) { if (properties[i].id === id) {
return properties[i]; return properties[i];
} }
} }
@ -336,7 +339,7 @@ ExtendReconciledDataPreviewDialog.prototype._constrainProperty = function(id) {
} }
var tr = $('<tr></tr>'); var tr = $('<tr></tr>');
var td = $('<td></td>').attr('title', field.help_text).appendTo(tr); var td = $('<td></td>').attr('title', field.help_text).appendTo(tr);
if (field.type == 'select') { if (field.type === 'select') {
var fieldLabel = $('<span></span>').text(field.label+':').appendTo(td); var fieldLabel = $('<span></span>').text(field.label+':').appendTo(td);
td.append($('<br/>')); td.append($('<br/>'));
for(var j = 0; j < field.choices.length; j++) { for(var j = 0; j < field.choices.length; j++) {
@ -347,21 +350,21 @@ ExtendReconciledDataPreviewDialog.prototype._constrainProperty = function(id) {
'value', choice.value).attr( 'value', choice.value).attr(
'name', field.name).appendTo(labelElem); 'name', field.name).appendTo(labelElem);
if (choice.value == currentValue) { if (choice.value === currentValue) {
inputElem.attr('checked', 'checked'); inputElem.attr('checked', 'checked');
} }
labelElem.append(' '+choice.name); labelElem.append(' '+choice.name);
td.append('<br/>'); td.append('<br/>');
} }
td.append(fieldHTML); td.append(fieldHTML);
} else if (field.type == 'checkbox') { } else if (field.type === 'checkbox') {
var label = $('<label></label>').attr('for', field.name).appendTo(td); var label = $('<label></label>').attr('for', field.name).appendTo(td);
var input = $('<input type="checkbox" />').attr('name', field.name).appendTo(label); var input = $('<input type="checkbox" />').attr('name', field.name).appendTo(label);
if (currentValue == 'on') { if (currentValue === 'on') {
input.attr('checked','checked'); input.attr('checked','checked');
} }
label.append(' '+field.label); label.append(' '+field.label);
} else if (field.type == 'number' || field.type == 'text') { } else if (field.type === 'number' || field.type == 'text') {
var label = $('<label></label>').attr('for', field.name).appendTo(td); var label = $('<label></label>').attr('for', field.name).appendTo(td);
label.append(field.label+': '); label.append(field.label+': ');
var input = $('<input />').attr( var input = $('<input />').attr(
@ -375,7 +378,7 @@ ExtendReconciledDataPreviewDialog.prototype._constrainProperty = function(id) {
} }
} }
if (table.children().length == 0) { if (table.children().length === 0) {
var tr = $('<tr></tr>').appendTo(table); var tr = $('<tr></tr>').appendTo(table);
$('<td></td>').text($.i18n._('core-views')['no-settings']).appendTo(tr); $('<td></td>').text($.i18n._('core-views')['no-settings']).appendTo(tr);
} }
@ -413,7 +416,7 @@ ExtendReconciledDataPreviewDialog.prototype._constrainProperty = function(id) {
self._update(); self._update();
} catch (e) { } catch (e) {
//console.log(e); alert($.i18n._("core-views")["internal-err"]);
} }
}); });

2
main/webapp/modules/core/scripts/views/data-table/extend-data-preview-dialog.html
View File

@ -5,7 +5,7 @@
<tr> <tr>
<td width="300" height="1">Add Property</td> <td width="300" height="1">Add Property</td>
<td height="1">Preview</td> <td height="1">Preview</td>
<td height="1" width="1%"><button class="button" bind="resetButton">Reset</button></td> <td height="1" style="text-align: right"><button class="button" bind="resetButton">Reset</button></td>
</tr> </tr>
<tr> <tr>
<td style="vertical-align: top;" height="1"><div class="input-container"><input bind="addPropertyInput" /></div></td> <td style="vertical-align: top;" height="1"><div class="input-container"><input bind="addPropertyInput" /></div></td>