Propagating back-end error message to front-end.

wso2-attic · Jun 12, 2015 · 0d7428d · 0d7428d
1 parent d1e8dfc
commit 0d7428d
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 61 deletions.
diff --git a/modules/jaggeryapps/ml/site/algorithm/algorithm.jag b/modules/jaggeryapps/ml/site/algorithm/algorithm.jag
@@ -188,7 +188,7 @@ $( document ).ready(function() {
  setResponseVariable = res;
  },
  error: function(res) {
- var errorText = 'Error occurred while retrieving previously set response variable. ' + res.status + ' ' + res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, notificationArea, 'warning');
  }
  });
@@ -208,7 +208,7 @@ $( document ).ready(function() {
  }
  },
  error: function(res) {
- var errorText = 'Error occurred while retrieving previously set algorithm name. ' + res.status + ' ' + res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, notificationArea, 'warning');
  }
  });
@@ -228,7 +228,7 @@ $( document ).ready(function() {
  }
  },
  error: function(res) {
- var errorText = 'Error occurred while retrieving previously set train data fraction. ' + res.status + ' ' + res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, notificationArea, 'warning');
  }
  });
@@ -293,7 +293,7 @@ $( document ).ready(function() {
  window.location.href = '../parameters/parameters.jag?analysisId='+analysisId+'&projectName='+projectName+'&analysisName='+analysisName+'&algorithmName='+algorithmName+'&algorithmType='+algorithmType+'&datasetId='+datasetId+'&fromAnalysis='+fromAnalysis;
  },
  error: function(res){
- var errorText = 'Error occurred while setting model configurations. ' + res.status + ' ' + res.statusText;
+ var errorText = res.responseText
  handleNotification(errorText, notificationArea, 'warning');
  }
  });
@@ -312,7 +312,7 @@ $( document ).ready(function() {
  window.location.href = '../project/projects.jag';
  },
  error: function(res){
- var errorText = 'Error occurred while cancelling analysis. ' + res.status + ' ' + res.statusText;
+ var errorText = res.responseText
  handleNotification(errorText, notificationArea, 'warning');
  }
  });
@@ -340,7 +340,7 @@ function loadDatasetFeatures(setResponseVariable) {
  }
  },
  error: function(res) {
- var errorText = 'Error occurred while retrieving dataset features. ' + res.status + ' ' + res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, notificationArea, 'warning');
  }
  });

diff --git a/modules/jaggeryapps/ml/site/analysis/analysis.jag b/modules/jaggeryapps/ml/site/analysis/analysis.jag
@@ -306,7 +306,7 @@
  }
  },
  error: function(res) {
- var errorText = 'Error occurred while retrieving analysis models. ' + res.status + ' ' + res.statusText;
+ var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -390,7 +390,7 @@
  handleNotification(successText, '#notification-area', 'success');
  },
  error : function(res){
-  var errorText = 'Error occurred while publishing model to registry. ' + res.status + ' ' + res.statusText;
+ var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  }); 
@@ -421,7 +421,7 @@
  algorithmName = res;
  },
  error : function(res){
-  var errorText = 'Error occurred while retrieving analysis name. ' + res.status + ' ' + res.statusText;
+ var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -438,7 +438,7 @@
  algorithmType = res;
  },
  error : function(res){
-  var errorText = 'Error occurred while retrieving algorithm type. ' + res.status + ' ' + res.statusText;
+ var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -464,7 +464,7 @@
  $('#accordion').pageMe({pagerSelector:'#pagination-list', childSelector:'.panel', showPrevNext:true, hidePageNumbers:false, perPage:panelsPerPage}); 
  },
  error : function(res){
-  var errorText = 'Error occurred while deleting model. ' + res.status + ' ' + res.statusText;
+ var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  }); 

diff --git a/modules/jaggeryapps/ml/site/analysis/view-model.jag b/modules/jaggeryapps/ml/site/analysis/view-model.jag
@@ -264,7 +264,7 @@ $( document ).ready(function() {
  numericalFeatureNames = res;
  },
  error : function(res){
- var errorText = 'Error occurred while retrieving numerical feature names. ' + res.status + ' ' + res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -282,7 +282,7 @@ $( document ).ready(function() {
  responseVariable = res;
  },
  error : function(res){
- var errorText = 'Error occurred while retrieving response variable. ' + res.status + ' ' + res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -404,7 +404,7 @@ $( document ).ready(function() {
  }
  },
  error: function(res){
- var errorText = 'Error occurred while retrieving model summary. ' + res.status + ' ' + res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });

diff --git a/modules/jaggeryapps/ml/site/data/createdataset.jag b/modules/jaggeryapps/ml/site/data/createdataset.jag
@@ -253,7 +253,7 @@ $( document ).ready(function() {
  window.location = baseUrl + '/ml/site/data/datasets.jag'; 
  },
  error : function(res){
- var errorText = 'Error occurred while creating dataset. ' + res.status + ' ' + res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  } 
  });

diff --git a/modules/jaggeryapps/ml/site/data/createversion.jag b/modules/jaggeryapps/ml/site/data/createversion.jag
@@ -278,7 +278,7 @@ $( document ).ready(function() {
  window.location = baseUrl + '/ml/site/data/datasets.jag'; 
  },
  error : function(res){
- var errorText = 'Error occurred while creating dataset version. ' + res.status + ' ' + res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  } 
  });

diff --git a/modules/jaggeryapps/ml/site/data/datasets.jag b/modules/jaggeryapps/ml/site/data/datasets.jag
@@ -351,7 +351,7 @@ function loadDatasets() {
  }
  },
  error : function(res){
-  var errorText = 'Error occurred while retrieving datasets. ' + res.status + ' ' + res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  }); 
@@ -370,7 +370,7 @@ function deleteDataset(datasetId) {
  loadDatasets();
  },
  error : function(res){
-  var errorText = 'Error occurred while deleting dataset. ' + res.status + ' ' + res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  }); 
@@ -390,7 +390,7 @@ function deleteDatasetVersion(versionId) {
  loadDatasets();
  },
  error : function(res){
-  var errorText = 'Error occurred while deleting dataset version. ' + res.status + ' ' + res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });

diff --git a/modules/jaggeryapps/ml/site/data/explore.jag b/modules/jaggeryapps/ml/site/data/explore.jag
@@ -453,7 +453,7 @@ $( document ).ready(function() {
  categoricalFeatureNames = res;
  },
  error : function(res) {
-  var errorText = 'Error occurred while retrieving categorical feature names. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  }); 
@@ -469,7 +469,7 @@ $( document ).ready(function() {
  numericalFeatureNames = res;
  },
  error : function(res) {
-  var errorText = 'Error occurred while retrieving numerical feature names. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -620,7 +620,7 @@ function drawPlotsAjax() {
  $("#scatterPlotTitle").html(numFeatureIndependent + " vs. " + numFeatureDependent); 
  },
  error : function(res){
-  var errorText = 'Error occurred while retrieving scatter plot data. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -645,7 +645,7 @@ function drawPlotsAjax() {
  drawHistogram(jsonObj, "#histogramIndependent");
  },
  error : function(res){
-  var errorText = 'Error occurred while retrieving summary data for independent variable. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -670,7 +670,7 @@ function drawPlotsAjax() {
  drawHistogram(jsonObj, "#histogramDependent");
  },
  error : function(res){
-  var errorText = 'Error occurred while retrieving summary data for dependent variable. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -767,7 +767,7 @@ function drawParallelSets() {
  vis.datum(res).call(chart);
  },
  error : function(res){
-   var errorText = 'Error occurred while retrieving data for parallel sets. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -964,7 +964,7 @@ function drawTrellisChart() {
  // array for parsets dimensions with categorical feature names
  },
  error : function(res){
-  var errorText = 'Error occurred while retrieving data for trellis chart. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });

diff --git a/modules/jaggeryapps/ml/site/explore/explore.jag b/modules/jaggeryapps/ml/site/explore/explore.jag
@@ -453,7 +453,7 @@ $( document ).ready(function() {
  projectId = res['id'];
  },
  error: function(res){
-  var errorText = 'Error occurred while retrieving project info. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -473,7 +473,7 @@ $( document ).ready(function() {
  userName = res['userName']; 
  },
  error: function(res){
-  var errorText = 'Error occurred while retrieving analysis info. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -490,7 +490,7 @@ $( document ).ready(function() {
  categoricalFeatureNames = res;
  },
  error : function(res){
-  var errorText = 'Error occurred while retrieving categorical feature names. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  }); 
@@ -506,7 +506,7 @@ $( document ).ready(function() {
  numericalFeatureNames = res;
  },
  error : function(res){
-  var errorText = 'Error occurred while retrieving numerical feature names. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -571,7 +571,7 @@ $( document ).ready(function() {
  window.location.href = '../project/projects.jag';
  },
  error: function(res){
-   var errorText = 'Error occurred while cancelling analysis. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -689,7 +689,7 @@ function drawPlotsAjax() {
  $("#scatterPlotTitle").html(numFeatureIndependent + " vs. " + numFeatureDependent); 
  },
  error : function(res){
-  var errorText = 'Error occurred while retrieving scatter plot data. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -714,7 +714,7 @@ function drawPlotsAjax() {
  drawHistogram(jsonObj, "#histogramIndependent");
  },
  error : function(res){
-  var errorText = 'Error occurred while retrieving summary data for independent variable. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -739,7 +739,7 @@ function drawPlotsAjax() {
  drawHistogram(jsonObj, "#histogramDependent");
  },
  error : function(res){
-  var errorText = 'Error occurred while retrieving summary data for dependent variable. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -836,7 +836,7 @@ function drawParallelSets() {
  vis.datum(res).call(chart);
  },
  error : function(res){
-   var errorText = 'Error occurred while retrieving data for parallel sets. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -1033,7 +1033,7 @@ function drawTrellisChart() {
  // array for parsets dimensions with categorical feature names
  },
  error : function(res){
-  var errorText = 'Error occurred while retrieving data for trellis chart. '+res.status+' '+res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });

diff --git a/modules/jaggeryapps/ml/site/model/model.jag b/modules/jaggeryapps/ml/site/model/model.jag
@@ -171,7 +171,7 @@ $( document ).ready(function() {
  modelName = res['name'];
  },
  error: function(res){
- var errorText = 'Error occurred while creating model. ' + res.status + ' ' + res.statusText;
+ var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -190,7 +190,7 @@ $( document ).ready(function() {
  modelId = res['id'];
  },
  error: function(res){
- var errorText = 'Error occurred while retrieving model info. ' + res.status + ' ' + res.statusText;
+ var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -207,7 +207,7 @@ $( document ).ready(function() {
  window.location.href = '../analysis/analysis.jag?analysisId='+analysisId+'&analysisName='+analysisName+'&projectName='+projectName+'&datasetId='+datasetId;
  },
  error: function(res){
- var errorText = 'Error occurred while submitting model build job. ' + res.status + ' ' + res.statusText;
+ var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -232,7 +232,7 @@ $( document ).ready(function() {
  window.location.href = '../project/projects.jag';
  },
  error: function(res){
-  var errorText = 'Error occurred while cancelling analysis. ' + res.status + ' ' + res.statusText;
+ var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning');
  }
  });
@@ -257,7 +257,7 @@ function loadDatasetVersions() {
  });
  },
  error: function(res) { //TODO: display error
- var errorText = 'Error occurred while retrieving dataset versions. ' + res.status + ' ' + res.statusText;
+  var errorText = res.responseText
  handleNotification(errorText, '#notification-area', 'warning'); 
  }
  });