diff --git a/frontend-js/src/main/js/map/window/AliasInfoWindow.js b/frontend-js/src/main/js/map/window/AliasInfoWindow.js index 1236a48328841c2ba8494dd54a132b4b09e404aa..f2e038314feea78db84aea9ade1701049603ea4b 100644 --- a/frontend-js/src/main/js/map/window/AliasInfoWindow.js +++ b/frontend-js/src/main/js/map/window/AliasInfoWindow.js @@ -270,7 +270,7 @@ AliasInfoWindow.prototype.createGenomicDiv = function() { return Promise.each( self.layoutAliases, function(data) { - if (data !== null && data.getType() === LayoutAlias.GENETIC_VARIANT) { + if (data !== null && data !== undefined && data.getType() === LayoutAlias.GENETIC_VARIANT) { geneticInformation = true; return Promise.each(data.getGeneVariants(), function(variant) { return self.getCustomMap().getReferenceGenome(variant.getReferenceGenomeType(), @@ -318,7 +318,7 @@ AliasInfoWindow.prototype.createGenomicDiv = function() { } return Promise.each(self.layoutAliases, function(data, i) { globalGeneVariants[i] = []; - if (data !== null && data.getType() === LayoutAlias.GENETIC_VARIANT) { + if (data !== null && data !== undefined && data.getType() === LayoutAlias.GENETIC_VARIANT) { var geneVariants = data.getGeneVariants(); for (var j = 0; j < geneVariants.length; j++) { var variant = geneVariants[j]; diff --git a/frontend-js/src/test/js/map/window/AliasInfoWindow-test.js b/frontend-js/src/test/js/map/window/AliasInfoWindow-test.js index aaa64afa129b881f6b3a001f02abb3cfb0823721..dfd2fcbd9804a1bd180434cfc08d7a8e2a92081f 100644 --- a/frontend-js/src/test/js/map/window/AliasInfoWindow-test.js +++ b/frontend-js/src/test/js/map/window/AliasInfoWindow-test.js @@ -164,6 +164,32 @@ describe('AliasInfoWindow', function() { }); + it("createGeneticsDiv with no genetic data", function() { + var map; + + var win; + var aliasId = 329173; + + return ServerConnector.getProject().then(function(project) { + map = helper.createCustomMap(project); + var overlay = new LayoutData(18077, "xxx"); + return overlay.init(); + }).then(function() { + return map.getModel().getAliasById(aliasId); + }).then(function(alias) { + win = new AliasInfoWindow(alias, map); + return win.init(); + }).then(function() { + win.layoutAliases = [ undefined ]; + return win.createGenomicDiv(); + }).then(function(div) { + assert.ok(div); + assert.ok(div.innerHTML.indexOf("No reference genome data available on minerva platform") === -1); + win.destroy(); + }); + + }); + it("createGeneticsDivForUnknownOrganism", function() { var map; var overlay;