Merge branch '917-overlay-type' into 'devel_13.2.x'

Resolve "MINERVANET - Error Report 106"

See merge request minerva/core!921

CHANGELOG

 minerva (13.2.0) stable; urgency=medium
-  * Bug fix:search by drugs didn't check synonyms in chembl database 
+  * Bug fix: search by drugs didn't check synonyms in chembl database 
+  * Bug fix: verification of overlay type added (#917) 
 
  -- Piotr Gawron <piotr.gawron@uni.lu>  Wed, 21 Aug 2019 17:00:00 +0200
 

frontend-js/src/main/js/gui/AddOverlayDialog.js

@@ -163,6 +163,9 @@ AddOverlayDialog.prototype.processFile = function (file) {
             descriptionInput.value = overlay.getDescription();
           }
           if (overlay.getType() !== undefined) {
+            if ($("option[value='" + overlay.getType() + "']", typeSelect).length === 0) {
+              GuiConnector.warn("Invalid type: " + overlay.getType());
+            }
             typeSelect.val(overlay.getType());
           }
           if (overlayParser.containsMixedNewLineCharacters(evt.target.result)) {

service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java

@@ -104,7 +104,14 @@ public class ColorSchemaReader {
         return readGenericColorSchema(colorInputStream);
       }
     } else {
-      ColorSchemaType type = ColorSchemaType.valueOf(params.get(ZipEntryFileFactory.LAYOUT_HEADER_PARAM_TYPE));
+      ColorSchemaType type = null;
+      try {
+        type = ColorSchemaType.valueOf(params.get(ZipEntryFileFactory.LAYOUT_HEADER_PARAM_TYPE));
+      } catch (IllegalArgumentException e) {
+        String options = StringUtils.join(ColorSchemaType.values(), ", ");
+        throw new InvalidColorSchemaException("Invalid overlay type: "
+            + params.get(ZipEntryFileFactory.LAYOUT_HEADER_PARAM_TYPE) + ". Allowed options: " + options);
+      }
       if (type == null) {
         logger.warn("Unknown type of layout file: " + params.get(ZipEntryFileFactory.LAYOUT_HEADER_PARAM_TYPE));
         return readGenericColorSchema(colorInputStream);

service/src/test/java/lcsb/mapviewer/services/utils/ColorSchemaReaderTest.java

@@ -480,5 +480,14 @@ public class ColorSchemaReaderTest extends ServiceTestFunctions {
     }
   }
 
+  @Test(expected = InvalidColorSchemaException.class)
+  public void testReadColorSchemaWithInvalidType() throws Exception {
+    FileInputStream fis = new FileInputStream("testFiles/coloring/invalidType.txt");
+    FileInputStream fis2 = new FileInputStream("testFiles/coloring/invalidType.txt");
+    ColorSchemaReader reader = new ColorSchemaReader();
+    reader.readColorSchema(fis, TextFileUtils.getHeaderParametersFromFile(fis2));
+
+  }
+  
 
 }

service/testFiles/coloring/invalidType.txt

+#TYPE=gen
+value	identifier	Chebi
+-0,943978048	HGNC:11138	
+-0,941309505		CHEBI:15377
+1		CHEBI:15376