From 932974591911693de8c41fac227feb2b7c8686a4 Mon Sep 17 00:00:00 2001
From: Hager Eldakroury <hagerdakroury@gmail.com>
Date: Tue, 24 Aug 2021 18:56:53 +0200
Subject: [PATCH 1/6] feat: Make version dropdown menu dynamic

---
 index.html                  | 19 +----------
 js/index.js                 | 18 +++++-----
 js/tree-edam-stand-alone.js | 15 +--------
 js/versionsMap.js           | 65 +++++++++++++++++++++++++++++++++++++
 4 files changed, 77 insertions(+), 40 deletions(-)
 create mode 100644 js/versionsMap.js

diff --git a/index.html b/index.html
index c41196c..7f303ba 100644
--- a/index.html
+++ b/index.html
@@ -42,24 +42,7 @@ <h1 id="pageTitle">EDAM ontology</h1>
                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                          <span class="selection version-title" style="padding-right:4px">1.25 (stable)</span><span class="caret"></span>
                     </button>
-                    <ul class="dropdown-menu" role="menu">
-                    <li> 
-                        <a class="branch" onclick="browser.current_branch('edam','stable')"  >1.25 (stable)</a>
-                    </li>
-                    <li>
-                        <a class="branch" onclick="browser.current_branch('edam','1.24')" >1.24</a>
-                    </li>
-                    <li>
-                        <a class="branch" onclick="browser.current_branch('edam','1.23')">1.23</a>
-                    </li>
-                    <li role="separator" class="divider"></li>
-                    <li>
-                        <a class="branch" onclick="browser.current_branch('edam','latest')">latest (unstable)</a>
-                    </li>
-                    <li>
-                        <a class="branch" onclick="triggerVersion()">Custom Version</a>
-                    </li>    
-
+                    <ul class="dropdown-menu" id= "version-menu" role="menu">
                     </ul>
                 </div>
                 <div class="btn-group branch-group">
diff --git a/js/index.js b/js/index.js
index 8c84c3d..71c8dfa 100644
--- a/js/index.js
+++ b/js/index.js
@@ -18,6 +18,7 @@ import 'regenerator-runtime/runtime';
 import * as d3 from 'd3';
 
 import {interactive_tree} from "./tree-reusable-d3.js"
+import {popoulateVersions,versionsDropdown} from "./versionsMap.js"
 
 import gtag, { install } from 'ga-gtag';
 
@@ -145,11 +146,13 @@ window.onload =  function (){
             });
         }
     });
+    popoulateVersions();
 
-    window.triggerVersion = function (){
+}
+    const triggerVersion = function (){
         $("#versionModal").modal('show');
     }
-};
+    window.triggerVersion=triggerVersion;
 
 const configGtag = function(){
     install('UA-115521967-1');    
@@ -158,18 +161,17 @@ const configGtag = function(){
     gtag('js', new Date());
 
     gtag('config', 'UA-115521967-1');
-
+    
 };
 
 const updateVersion=function(version){
-    const versionDict={"custom":4,"latest":3,"stable":0,"1.24":1,"1.23":2};
     let index;
     if(customRe.test(version))
-        index=versionDict["custom"];
+        index=versionsDropdown.indexOf("custom");
     else if (version=="undefined")
-        index=versionDict["stable"];
+        index=versionsDropdown.indexOf("stable")
     else 
-        index=versionDict[version]
+        index=versionsDropdown.indexOf(version)
     var text = $(".version-group .dropdown-menu li a")[index]?.innerText
     $('.version-title').html(text)
 }
@@ -186,4 +188,4 @@ const updateBranch=function(branch){
     $('.branch-title').html(text)
 }
 
-export {updateBranch,updateVersion}
\ No newline at end of file
+export {updateBranch,updateVersion,triggerVersion}
\ No newline at end of file
diff --git a/js/tree-edam-stand-alone.js b/js/tree-edam-stand-alone.js
index a822de8..2299c4f 100644
--- a/js/tree-edam-stand-alone.js
+++ b/js/tree-edam-stand-alone.js
@@ -6,6 +6,7 @@ import {biosphere_api} from "./biosphere.api.js"
 import {bioweb_api} from "./bioweb.api.js"
 import {tess_api} from "./tess.api.js"
 import {updateVersion,updateBranch} from "./index.js"
+import {getTreeURL} from "./versionsMap.js"
 
 var customRe = new RegExp("^(http|https)://", "i");
 
@@ -122,20 +123,6 @@ function interactive_edam_browser(){
         setCookie("custom_url",versionURL);
        }
 
-    function getTreeURL(version){
-        switch(version){
-            case 'latest':
-                return "https://raw.githubusercontent.com/edamontology/edamontology/main/EDAM_dev.owl";
-            case 'custom':
-                return getCookie("custom_url","");
-            case 'stable':
-                return "https://raw.githubusercontent.com/edamontology/edamontology/main/releases/EDAM_1.25.owl";
-            default:
-                return "https://raw.githubusercontent.com/edamontology/edamontology/main/releases/EDAM_"+version+".owl";
-        }
-    }
-
-
 
     function selectCustom(){
         let branch="custom";
diff --git a/js/versionsMap.js b/js/versionsMap.js
new file mode 100644
index 0000000..0a8b296
--- /dev/null
+++ b/js/versionsMap.js
@@ -0,0 +1,65 @@
+import {getCookie} from "./utils.js"
+import {triggerVersion} from "./index.js"
+
+
+//map of al available versions in the drodown menu,to add a version:
+// 1. add all the needed info to this map where with the version as key:
+    //label: displayed label in the drpdown menu.
+    //url: url where the raw owl file is located, if missing, it will loaded from the baseUrl.
+// 2. add the version to the versionsDropdown in the preferred order to display.
+const versionsMap = {
+    "stable":{label:"1.25 (stable)","url":"https://raw.githubusercontent.com/edamontology/edamontology/main/releases/EDAM_1.25.owl"},
+    "1.24":{label:"1.24"},
+    "1.23":{label:"1.23"},
+    "latest":{label:"latest (unstable)","url":"https://raw.githubusercontent.com/edamontology/edamontology/main/EDAM_dev.owl"},
+    "custom":{label:"Custom Version"}
+};
+
+//order of displayed versions in the dropdown menu
+const versionsDropdown = ["stable","1.24","1.23","latest","custom"]
+
+const baseURL="https://raw.githubusercontent.com/edamontology/edamontology/main/releases/";
+
+
+/**
+ * 
+ * @param {string} version name of the version as key in the versionsMap.
+ * @returns url as retrieved from the map, fallback to the baseURL or custome url.
+ */
+function getTreeURL(version){
+    switch(version){
+        case 'custom':
+            return getCookie("custom_url","");
+        default: 
+            if ("url" in versionsMap[version])
+                return versionsMap[version]["url"];
+            return baseURL+"EDAM_"+version+".owl";
+    }
+}
+
+/**
+ * populate the versionsMap data dynamically in the dropdown menu.
+ */
+function popoulateVersions(){
+    var versionMenu = document.getElementById("version-menu");
+    versionsDropdown.map((val)=>{         
+        var li = document.createElement('li');
+        var a = document.createElement('a');
+        a.classList.add("branch")
+        a.innerText=versionsMap[val]["label"];
+        li.appendChild(a);
+        if(val =="custom")
+        a.addEventListener('click', function(){
+            triggerVersion();
+        });
+        
+        else 
+        a.addEventListener('click', function(){
+            browser.current_branch('edam',val);
+        });
+        versionMenu.appendChild(li);
+    });
+}
+
+
+export {getTreeURL,versionsDropdown,popoulateVersions}
\ No newline at end of file

From fd5d5085d3d5486198339fabaff7beb0bb8e54ed Mon Sep 17 00:00:00 2001
From: Hager Eldakroury <hagerdakroury@gmail.com>
Date: Tue, 24 Aug 2021 19:14:22 +0200
Subject: [PATCH 2/6] docs: Add warning about changing stable

---
 js/versionsMap.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/versionsMap.js b/js/versionsMap.js
index 0a8b296..0f4afab 100644
--- a/js/versionsMap.js
+++ b/js/versionsMap.js
@@ -7,6 +7,7 @@ import {triggerVersion} from "./index.js"
     //label: displayed label in the drpdown menu.
     //url: url where the raw owl file is located, if missing, it will loaded from the baseUrl.
 // 2. add the version to the versionsDropdown in the preferred order to display.
+// Changing existing names of keys WILL break things. Like the name "stable". Please change values(label, url) only or add new values/keys.
 const versionsMap = {
     "stable":{label:"1.25 (stable)","url":"https://raw.githubusercontent.com/edamontology/edamontology/main/releases/EDAM_1.25.owl"},
     "1.24":{label:"1.24"},

From 18acbebec7e44084d4a6f0d4249e3d662df7558d Mon Sep 17 00:00:00 2001
From: Hager Eldakroury <hagerdakroury@gmail.com>
Date: Tue, 24 Aug 2021 19:25:16 +0200
Subject: [PATCH 3/6] fix: Make properties format consistent

---
 js/versionsMap.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/versionsMap.js b/js/versionsMap.js
index 0f4afab..2e7a041 100644
--- a/js/versionsMap.js
+++ b/js/versionsMap.js
@@ -9,10 +9,10 @@ import {triggerVersion} from "./index.js"
 // 2. add the version to the versionsDropdown in the preferred order to display.
 // Changing existing names of keys WILL break things. Like the name "stable". Please change values(label, url) only or add new values/keys.
 const versionsMap = {
-    "stable":{label:"1.25 (stable)","url":"https://raw.githubusercontent.com/edamontology/edamontology/main/releases/EDAM_1.25.owl"},
+    "stable":{label:"1.25 (stable)",url:"https://raw.githubusercontent.com/edamontology/edamontology/main/releases/EDAM_1.25.owl"},
     "1.24":{label:"1.24"},
     "1.23":{label:"1.23"},
-    "latest":{label:"latest (unstable)","url":"https://raw.githubusercontent.com/edamontology/edamontology/main/EDAM_dev.owl"},
+    "latest":{label:"latest (unstable)",url:"https://raw.githubusercontent.com/edamontology/edamontology/main/EDAM_dev.owl"},
     "custom":{label:"Custom Version"}
 };
 

From 63b6a59eb229d94b8392e2be5fb0c7f73bc8c6f4 Mon Sep 17 00:00:00 2001
From: Hager Eldakroury <hagerdakroury@gmail.com>
Date: Mon, 13 Sep 2021 11:11:05 +0200
Subject: [PATCH 4/6] fix: Fix typo

---
 js/index.js       | 4 ++--
 js/versionsMap.js | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/js/index.js b/js/index.js
index 71c8dfa..c1a8f11 100644
--- a/js/index.js
+++ b/js/index.js
@@ -18,7 +18,7 @@ import 'regenerator-runtime/runtime';
 import * as d3 from 'd3';
 
 import {interactive_tree} from "./tree-reusable-d3.js"
-import {popoulateVersions,versionsDropdown} from "./versionsMap.js"
+import {populateVersions,versionsDropdown} from "./versionsMap.js"
 
 import gtag, { install } from 'ga-gtag';
 
@@ -146,7 +146,7 @@ window.onload =  function (){
             });
         }
     });
-    popoulateVersions();
+    populateVersions();
 
 }
     const triggerVersion = function (){
diff --git a/js/versionsMap.js b/js/versionsMap.js
index 2e7a041..4099829 100644
--- a/js/versionsMap.js
+++ b/js/versionsMap.js
@@ -8,6 +8,7 @@ import {triggerVersion} from "./index.js"
     //url: url where the raw owl file is located, if missing, it will loaded from the baseUrl.
 // 2. add the version to the versionsDropdown in the preferred order to display.
 // Changing existing names of keys WILL break things. Like the name "stable". Please change values(label, url) only or add new values/keys.
+// Order of the map is not guranteed, hence the need for the versionsDropdown
 const versionsMap = {
     "stable":{label:"1.25 (stable)",url:"https://raw.githubusercontent.com/edamontology/edamontology/main/releases/EDAM_1.25.owl"},
     "1.24":{label:"1.24"},
@@ -41,7 +42,7 @@ function getTreeURL(version){
 /**
  * populate the versionsMap data dynamically in the dropdown menu.
  */
-function popoulateVersions(){
+function populateVersions(){
     var versionMenu = document.getElementById("version-menu");
     versionsDropdown.map((val)=>{         
         var li = document.createElement('li');
@@ -63,4 +64,4 @@ function popoulateVersions(){
 }
 
 
-export {getTreeURL,versionsDropdown,popoulateVersions}
\ No newline at end of file
+export {getTreeURL,versionsDropdown,populateVersions}
\ No newline at end of file

From 112788116423a3db189741e72f850d9133825a3b Mon Sep 17 00:00:00 2001
From: Hager Eldakroury <hagerdakroury@gmail.com>
Date: Mon, 13 Sep 2021 11:39:42 +0200
Subject: [PATCH 5/6] fix: Rename file

---
 js/index.js                                 | 2 +-
 js/{versionsMap.js => ontoBrowserConfig.js} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename js/{versionsMap.js => ontoBrowserConfig.js} (100%)

diff --git a/js/index.js b/js/index.js
index c1a8f11..49b3de9 100644
--- a/js/index.js
+++ b/js/index.js
@@ -18,7 +18,7 @@ import 'regenerator-runtime/runtime';
 import * as d3 from 'd3';
 
 import {interactive_tree} from "./tree-reusable-d3.js"
-import {populateVersions,versionsDropdown} from "./versionsMap.js"
+import {populateVersions,versionsDropdown} from "./ontoBrowserConfig.js"
 
 import gtag, { install } from 'ga-gtag';
 
diff --git a/js/versionsMap.js b/js/ontoBrowserConfig.js
similarity index 100%
rename from js/versionsMap.js
rename to js/ontoBrowserConfig.js

From c120d7355d55bc459d462fd9b8c3064c52eafcf8 Mon Sep 17 00:00:00 2001
From: Hager Eldakroury <hagerdakroury@gmail.com>
Date: Mon, 13 Sep 2021 11:40:59 +0200
Subject: [PATCH 6/6] fix: Fix import

---
 js/tree-edam-stand-alone.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/tree-edam-stand-alone.js b/js/tree-edam-stand-alone.js
index 2299c4f..b0e23be 100644
--- a/js/tree-edam-stand-alone.js
+++ b/js/tree-edam-stand-alone.js
@@ -6,7 +6,7 @@ import {biosphere_api} from "./biosphere.api.js"
 import {bioweb_api} from "./bioweb.api.js"
 import {tess_api} from "./tess.api.js"
 import {updateVersion,updateBranch} from "./index.js"
-import {getTreeURL} from "./versionsMap.js"
+import {getTreeURL} from "./ontoBrowserConfig.js"
 
 var customRe = new RegExp("^(http|https)://", "i");