Merge branch '1349-gpml-names' into 'devel_15.0.x'

Resolve "Correct encoding of Chebi and Entrez data sources in GPML converter"

See merge request !1232

CHANGELOG

@@ -10,6 +10,10 @@ minerva (15.0.3) stable; urgency=medium
     CellDesigner (#1281)
   * Bug fix: concurrency issue that could happen rarely on first search of the
     map and put the project into "unsearchable" state is fixed (#1333)
+  * Bug fix: when edit project buton was clicked on project that was removed in
+    another tab there was an error thrown (#1343) 
+  * Bug fix: chebi and entrez annotations were incorrectly exported to GPML
+    (#1349)
 
  -- Piotr Gawron <piotr.gawron@uni.lu>  Wed, 8 Jul 2020 16:00:00 +0200
 

frontend-js/src/main/js/gui/admin/MapsAdminPanel.js

@@ -529,9 +529,13 @@ MapsAdminPanel.prototype.showEditDialog = function (id) {
   var self = this;
   GuiConnector.showProcessing();
   return self.getServerConnector().getProject(id).then(function (project) {
-    return self.getDialog(project);
-  }).then(function (dialog) {
-    dialog.open();
+    if (project === null) {
+      GuiConnector.warn("Project \"" + id + "\" does not exist");
+    } else {
+      return self.getDialog(project).then(function (dialog) {
+        dialog.open();
+      });
+    }
   }).finally(function () {
     GuiConnector.hideProcessing();
   });

pathvisio/src/main/java/lcsb/mapviewer/wikipathway/model/ReferenceMapping.java

@@ -21,7 +21,7 @@ public enum ReferenceMapping {
   /**
    * {@link MiriamType#CHEBI}.
    */
-  CHEBI("Chebi", MiriamType.CHEBI),
+  CHEBI("ChEBI", MiriamType.CHEBI),
 
   /**
    * {@link MiriamType#CHEMBL_COMPOUND}.
@@ -57,16 +57,13 @@ public enum ReferenceMapping {
   /**
    * {@link MiriamType#ENTREZ}.
    */
+  ENTREZ_GENE("Entrez Gene", MiriamType.ENTREZ),
   ENTREZ("Entrez", MiriamType.ENTREZ),
+  GEN_BANK("GenBank", MiriamType.ENTREZ),
 
-  ENTREZ_GENE("Entrez Gene", MiriamType.ENTREZ),
   
   FLYBASE("FlyBase", MiriamType.FLYBASE),
 
-  /**
-   * Alternative name for {@link MiriamType#ENTREZ}.
-   */
-  GEN_BANK("GenBank", MiriamType.ENTREZ),
 
   GENE_DB("GeneDB", MiriamType.GENE_DB),