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

Small fixes to the data extension interface

Browse Source 
- removed mention to a missing .less file
- fixed the position of the Reset button in the preview dialog
- fixed the error for empty property selections
This commit is contained in:
Antonin Delpeuch 2017-08-13 11:42:41 +01:00
parent 1fec3df0cb
commit 4033465cb4
3 changed files with 21 additions and 26 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"

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

@ -107,16 +107,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,19 +173,25 @@ ExtendReconciledDataPreviewDialog.prototype._update = function() {
columnName: this._column.name columnName: this._column.name
}; };
$.post( if(this._extension.properties.length == 0) {
"command/core/preview-extend-data?" + $.param(params), // if the column selection is empty, reset the view
{ this._elmts.previewContainer.empty();
rowIndices: JSON.stringify(this._rowIndices), } else {
extension: JSON.stringify(this._extension) // otherwise, refresh the preview
}, $.post(
function(data) { "command/core/preview-extend-data?" + $.param(params),
self._renderPreview(data); {
}, rowIndices: JSON.stringify(this._rowIndices),
"json" extension: JSON.stringify(this._extension)
).fail(function(data) { },
console.log(data); function(data) {
}); self._renderPreview(data);
},
"json"
).fail(function(data) {
console.log(data);
});
}
}; };
ExtendReconciledDataPreviewDialog.prototype._addProperty = function(p) { ExtendReconciledDataPreviewDialog.prototype._addProperty = function(p) {

4
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>
@ -23,4 +23,4 @@
<button class="button" bind="okButton">&nbsp;&nbsp;OK&nbsp;&nbsp;</button> <button class="button" bind="okButton">&nbsp;&nbsp;OK&nbsp;&nbsp;</button>
<button class="button" bind="cancelButton">Cancel</button> <button class="button" bind="cancelButton">Cancel</button>
</div> </div>
</div> </div>