diff --git a/main/webapp/modules/core/MOD-INF/controller.js b/main/webapp/modules/core/MOD-INF/controller.js index 4489d0c97..0a42b2c33 100644 --- a/main/webapp/modules/core/MOD-INF/controller.js +++ b/main/webapp/modules/core/MOD-INF/controller.js @@ -370,7 +370,6 @@ function init() { "styles/index/default-importing-sources.less", "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/xml-parser-ui.less", "styles/index/json-parser-ui.less" diff --git a/main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js b/main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js index bdb5d5fdc..89d906f23 100644 --- a/main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js +++ b/main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js @@ -107,16 +107,6 @@ ExtendReconciledDataPreviewDialog.getAllProperties = function(url, typeID, onDon id: property.id, 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.sort(function(a, b) { return a.name.localeCompare(b.name); }); @@ -183,19 +173,25 @@ ExtendReconciledDataPreviewDialog.prototype._update = function() { columnName: this._column.name }; - $.post( - "command/core/preview-extend-data?" + $.param(params), - { - rowIndices: JSON.stringify(this._rowIndices), - extension: JSON.stringify(this._extension) - }, - function(data) { - self._renderPreview(data); - }, - "json" - ).fail(function(data) { - console.log(data); - }); + 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( + "command/core/preview-extend-data?" + $.param(params), + { + rowIndices: JSON.stringify(this._rowIndices), + extension: JSON.stringify(this._extension) + }, + function(data) { + self._renderPreview(data); + }, + "json" + ).fail(function(data) { + console.log(data); + }); + } }; ExtendReconciledDataPreviewDialog.prototype._addProperty = function(p) { diff --git a/main/webapp/modules/core/scripts/views/data-table/extend-data-preview-dialog.html b/main/webapp/modules/core/scripts/views/data-table/extend-data-preview-dialog.html index f92e09fb9..0f16248fb 100644 --- a/main/webapp/modules/core/scripts/views/data-table/extend-data-preview-dialog.html +++ b/main/webapp/modules/core/scripts/views/data-table/extend-data-preview-dialog.html @@ -5,7 +5,7 @@ Add Property Preview - +
@@ -23,4 +23,4 @@ - \ No newline at end of file +