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

Catch and display errors on compute-facet

Browse Source
This commit is contained in:
Owen Stephens 2017-10-27 10:59:03 +01:00
parent 178e4e5bca
commit e4bdca9c95
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
main/webapp/modules/core/scripts/project/browsing-engine.js
View File

@ -101,6 +101,7 @@ BrowsingEngine.prototype._initializeUI = function() {
'<p>'+$.i18n._('core-project')["not-sure"]+'<br /><a href="https://github.com/OpenRefine/OpenRefine/wiki/Screencasts" target="_blank"><b>'+$.i18n._('core-project')["watch-cast"]+'</b></a></p>' +
'</div>' +
'<div class="browsing-panel-header" bind="header">' +
'<div class="browsing-panel-errors" bind="errors"></div>' +
'<div class="browsing-panel-indicator" bind="indicator">' +
'<img src="images/small-spinner.gif" /> '+$.i18n._('core-project')["refreshing-facet"]+'' +
'</div>' +
@ -240,19 +241,31 @@ BrowsingEngine.prototype.update = function(onDone) {
this._elmts.header.show();
this._elmts.controls.css("visibility", "hidden");
this._elmts.indicator.css("visibility", "visible");
this._elmts.indicator.css("display", "block");
$.post(
"command/core/compute-facets?" + $.param({ project: theProject.id }),
{ engine: JSON.stringify(this.getJSON(true)) },
function(data) {
if(data.code === 'error') {
var clearErr = $('#err-text').remove();
var err = $('<div id="err-text">')
.text(data.message)
.appendTo(self._elmts.errors);
self._elmts.errors.css("display", "block");
if (onDone) {
onDone();
}
return;
}
var facetData = data.facets;
for (var i = 0; i < facetData.length; i++) {
self._facets[i].facet.updateState(facetData[i]);
}
self._elmts.indicator.css("visibility", "hidden");
self._elmts.indicator.css("display", "none");
self._elmts.errors.css("display", "none");
if (self._facets.length > 0) {
self._elmts.header.show();
self._elmts.controls.css("visibility", "visible");

18
main/webapp/modules/core/styles/project/sidebar.less
View File

@ -38,9 +38,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
display: none;
}
.browsing-panel-errors {
display: none;
position: relative;
height: auto;
margin: 5px;
text-align: center;
background: #fff0f4;
color: #c51244;
padding: 4px 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border: 1px solid #ccc;
}
.browsing-panel-indicator {
visibility: hidden;
position: absolute;
display: none;
position: relative;
width: 50%;
margin: 5px;
top: 0em;