Improve error-handling for geospatial previewer (#141)

* Improve error-handling for geospatial previewer

* Update CHANGELOG

* Squelch debug output from fetching metadata

* Fixed typo

* Removed unnecessary javascript console.log for metadata.

Co-authored-by: Luigi Marini <[email protected]>
Co-authored-by: Luigi Marini <[email protected]>

Author: bodom0015

CHANGELOG.md

@@ -4,12 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+
 ## Unreleased
 
 ### Added
 - Added support for Amplitude clickstream tracking. See Admin -> Customize to configure Amplitude apikey.
 - Ability to submit multiple selected files within a dataset to an extractor.
 
+### Fixed
+- GeospatialViewer preview tab should no longer show if it does not contain any rendered data.
+
 ## 1.12.2 - 2020-11-19
 
 ### Changed

app/views/file.scala.html

@@ -185,7 +185,7 @@
 										aria-haspopup="true" aria-expanded="true">
 											<span class="glyphicon glyphicon-hdd"></span> <span class="caret"></span>
 										</button>
-										<ul class="dropdown-menu" arialanelledby="dropdown_space_list">
+										<ul class="dropdown-menu" aria-labelledby="dropdown_space_list">
 										@spaces.map{ s =>
 											<li><a href="@routes.Spaces.getSpace(s.id)" title="s.name"><span class="glyphicon glyphicon-hdd"></span> @Html(ellipsize(s.name, 18))</a></li>
 										}

app/views/metadatald/addMetadata.scala.html

@@ -434,14 +434,6 @@ <h5 class="pull-left">Add metadata</h5>
                 var field_id = context.val();
                 var field_type = context.data("type");
                 var space_id = context.attr("space_id");
-                console.log('Metadata field (' + field_label + '):', {
-                    'Context': context,
-                    'Label: ': field_label,
-                    'Field Description: ': field_description,
-                    'Field ID: ': field_id,
-                    'Field Type: ': field_type,
-                    'Space ID: ': space_id
-                });
                 // Create the template and HTML content.
                 var template_map =
                         {"string": "add_metadata_string",

public/javascripts/previewers/geospatial/geospatial.js

@@ -6,6 +6,11 @@
 
 	console.log("geospatial data previewer for " + initialID);
 
+	var hideTab = function() {
+		var tabHeader = $(`a[href^="${initialTab}"]`);
+		tabHeader.hide();
+	};
+
 	var defaultOpacity = 0.8;
 	// retrieve the metadata
 	var metadataApiUrl = jsRoutes.api.Files.getTechnicalMetadataJSON(initialID).url;
@@ -18,14 +23,10 @@
 	request
 			.done(function(data) {
 
-				// if there are no tehcnical metadata or no wms metadata
+				// if there are no technical metadata or no wms metadata
 				// then return
-				if (data == null)
-					return;
-				if (data == undefined)
-					return;
-				if (data.length == 0)
-					return;
+				if (data == null || data == undefined || data.length == 0)
+					return hideTab();
 
                 // search the metadata index which contains geospatial metadata
                 var geoMetadataIndex = -1;
@@ -41,7 +42,7 @@
 
                 // if it couldn't find the index, return
                 if (geoMetadataIndex == -1)
-                    return;
+                    return hideTab();
 
 				console.log("Updating tab " + initialTab);
 
@@ -60,7 +61,7 @@
 									// add layer opacity control
 									$(initialTab).append(
 											"<div id='layer-opacity-control'><label>Layer Opacity: </label><input id='opacity' type='range' min='0' max='1' value='"+defaultOpacity+"' step='0.01' style='width:200px;' /></div>");
-									
+
 									// drawing the map
 									console.log("ol3js loaded");
 
@@ -111,7 +112,7 @@
 										wmsLayer.setOpacity($(this).val());
 									});
 
-									
+
 									// create map object
 									var map = new ol.Map({
 										target : 'map'
@@ -135,16 +136,18 @@
 
 									// zoom into the layer extent
 									map.setView(view);
-									
+
 									// fix for MMDB-1617
 									// force to redraw the map
-									// TODO the dom selector needs to select the current selector instead of this selection 
+									// TODO the dom selector needs to select the current selector instead of this selection
 									$('a[data-toggle="tab"]').on(
 											'shown.bs.tab', function(e) {
 												map.updateSize()
 									});
 								});
 
+			}).fail(function() {
+				hideTab();
 			});
 
 }(jQuery, Configuration));