handle schema error with field name

ibm-watson-data-lab · Jul 4, 2016 · 0afa586 · 0afa586
1 parent 9ffa9f3
commit 0afa586
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 18 deletions.
diff --git a/public/js/seams.js b/public/js/seams.js
@@ -43,20 +43,22 @@ seamsApp.controller('navController', ['$scope', '$route', '$routeParams',
 					var html = $scope.$root.renderSchema($scope.$root.schema);
 					$('#schemacontent').html(html);
 					var checked = 0;
-					$('.facet_checkbox', '#schemacontent').each(function() {
-						$(this).change(function() {
-							if($(this).is(":checked")) {
-								checked++;
-							}
-							else {
-								checked--;
-							}
-							$('#importbutton').attr('disabled',checked == 0);
-							$('#facetstatus').css('visibility', checked == 0 ? 'visible' : 'hidden');
+					if (!$scope.$root.schemaError) {
+						$('.facet_checkbox', '#schemacontent').each(function() {
+							$(this).change(function() {
+								if($(this).is(":checked")) {
+									checked++;
+								}
+								else {
+									checked--;
+								}
+								$('#importbutton').attr('disabled',checked == 0);
+								$('#facetstatus').css('visibility', checked == 0 ? 'visible' : 'hidden');
+							});
 						});
-					});
-					$('#importbutton').attr('disabled',checked == 0);
-					$('#facetstatus').css('visibility', checked == 0 ? 'visible' : 'hidden');
+					}
+					$('#importbutton').attr('disabled', checked == 0 || $scope.$root.schemaError);
+					$('#facetstatus').css('visibility', (checked == 0 || $scope.$root.schemaError) ? 'visible' : 'hidden');
 				}
 				break;
 			case 'search':
@@ -291,15 +293,23 @@ seamsApp.controller('seamsController', ['$scope', '$route', '$routeParams', '$lo
 	    // and whether its faceted or not, together with an example value from the
 		// uploaded file (x.data)
 	    $scope.$root.renderSchema = function(x) {
+		   $scope.$root.schemaError = false;
 		   var html = '<table class="table_basic">\n';
 		   html += '<input type="hidden" name="upload_id" id="upload_id" value="' + x.upload_id + '"/>\n';
 		   html += "<thead>\n";
 		   html += "  <th>name</th><th>type</th><th>facet</th><th>e.g</th>\n";
 		   html += "</thead>\n"
 		   for(var i in x.fields) {
-		     html += "<tr>";
 		     var f = x.fields[i];
-		     html += "<td>" + f.name + "</td>\n";
+		     if (!f.name) {
+					 $scope.$root.schemaError = true;
+					 html += "<tr class='error'>";
+		     }
+		     else {
+					 html += "<tr>";
+		     }
+		     html += '<td class="' + (f.name ? '' : 'error') + '">';
+		     html += (f.name || '&#10007; Missing field name') + '</td>\n';
 		     html += "<td>" + $scope.$root.typeWidget(f) + "</td>\n";
 		     html += "<td>" + $scope.$root.facetWidget(f) + "</td>\n";
 		     for(var j in x.data) {
@@ -330,7 +340,8 @@ seamsApp.controller('seamsController', ['$scope', '$route', '$routeParams', '$lo
 		$scope.$root.typeWidget = function(f) {
 		  var n = f.safename;
 		  var t = f.type;
-		  var html = '<select name="' + n + '" class="input_select" onchange="datatypechange(\'' + n +'\')" data-original-name="' + f.name + '">\n';
+		  var html = '<select name="' + n + '" class="input_select" onchange="datatypechange(\'' + n +'\')" data-original-name="' + f.name;
+		  html += ($scope.$root.schemaError) ? '" disabled="disabled">\n' : '">\n';
 		  var opts = { "string":"String", "number":"Number", "boolean":"Boolean", "arrayofstrings":"Array of Strings" };
 		  for(var i in opts) {
 		    html += '<option value="' + i + '"';
@@ -350,7 +361,7 @@ seamsApp.controller('seamsController', ['$scope', '$route', '$routeParams', '$lo
 		  var t = f.type;
 		  var v = f.facet.toString();
 		  var html = '<input class="input_checkbox facet_checkbox" type="checkbox" value="true" name="' + n + '" id="' + n + '"';
-		  if (t == "number" || t == "boolean") {
+		  if (t == "number" || t == "boolean" || $scope.$root.schemaError) {
 		    html += ' disabled="disabled"';
 		  }
 		  if (v == "true") {

diff --git a/public/seams.css b/public/seams.css
@@ -64,3 +64,23 @@
     right: 100px;
     white-space: nowrap;
 }
+
+td.error {
+    color: #ff0000;
+}
+
+.alert-container.error {
+    background: rgba(0, 0, 0, 0) repeating-linear-gradient(-55deg, #bb4444, #bb4444 1px, #bb1122 1px, #bb1122 3px) repeat scroll 0 0 !important;
+    border-left: 2px solid #ad1625;
+    color: #ffffff;
+}
+
+.type_copy.alert-container {
+    max-width: 100%;
+}
+
+.input_select:disabled,
+.input_select.disabled {
+    background-color: #92a4af;
+    border-color: #000000;
+}
diff --git a/views/templates/import.html b/views/templates/import.html
@@ -32,11 +32,17 @@ <h1 class="type_heading"><mark class="type_mark">Create the Search Index</mark><
   </div>
 
   <div ng-show="currentStatus == 'uploaded'">
+      <div  class="type_copy alert-container error"
+        ng-show="schemaError">
+          An error was detected with one or more fields. Verify the file and re-upload
+      </div>
 
       <div id="schemacontent" class="table_container"></div>
 
       <div class="button_group">
-        <div  class="type_copy" id="facetstatus">Select a field to facet before importing</div>
+        <div  class="type_copy" id="facetstatus">
+          {{ schemaError ? 'An error was detected with one or more fields. Verify the file and re-upload' : 'Select a field to facet before importing' }}
+        </div>
         <button id="backbutton" type="button" class="button_secondary" ng-click="goToNextPage('upload')">Back</button>
         <button id="importbutton" type="submit" class="button_primary" ng-click="importClicked()"> Import </button>
         <!-- <span class="glyphicon glyphicon-refresh glyphicon-spinner import-spinner"></span> -->