Table is now using dashboard to add Save As, Export and Generate func…

…tionalities to it #16
AdrianBZG · Aug 1, 2018 · 9545a46 · 9545a46
1 parent 154229b
commit 9545a46
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 18 deletions.
diff --git a/public/javascripts/common.min.js b/public/javascripts/common.min.js
diff --git a/public/javascripts/genes-view.min.js b/public/javascripts/genes-view.min.js
diff --git a/public/javascripts/proteins-view.min.js b/public/javascripts/proteins-view.min.js
diff --git a/public/stylesheets/hmb-style-main.css b/public/stylesheets/hmb-style-main.css
@@ -184,6 +184,22 @@ body.fixed-nav {
   display: none;
 }
 
+.im-join-manager-button .btn {
+  display: none;
+}
+
+.im-filter-dialogue-button .btn {
+  display: none;
+}
+
+.im-column-manager-button .btn {
+  display: none;
+}
+
+.im-history .btn {
+  display: none;
+}
+
 .smaller {
   font-size: 0.7rem;
 }

diff --git a/src/js/common.js b/src/js/common.js
@@ -306,6 +306,33 @@ function getParticipant2SymbolsInClass() {
     })
 }
 
+/**
+* Method that returns a valid session API key for the current mine
+*/
+function getSessionToken() {
+    var tokenUrl = escapeMineURL(window.mineUrl);
+    var tokenKey = "";
+
+    if(tokenUrl.slice(-1) == "/") {
+        tokenUrl += "session";
+    } else {
+        tokenUrl += "/session";
+    }
+
+    // Get token
+    $.ajax({
+        'url': tokenUrl,
+        data: {},
+        async: false,
+        error: function(xhr, status) {},
+        success: function(data) {
+            tokenKey = data.token;
+        }
+    });
+
+    return tokenKey;
+}
+
 /**
  * Method to get the different items inside a class (count per organism) in order to feed the sidebar
  * @param {array} constraints: the constraints for the endpoint call
@@ -1253,8 +1280,12 @@ function fillMineSelector() {
 
                     // Instantiate the im-table with all the data available in Gene from HumanMine
                     var selector = '#dataTable';
+
+                    $(selector).empty();
+
                     var service = {
-                        root: escapeMineURL(window.mineUrl)
+                        root: escapeMineURL(window.mineUrl),
+                        token: getSessionToken()
                     };
                     var query = {
                         select: ['*'],
@@ -1269,7 +1300,7 @@ function fillMineSelector() {
 
                     imtables.configure('TableResults.CacheFactor', 20);
 
-                    var imtable = imtables.loadTable(
+                    var imtable = imtables.loadDash(
                         selector, {
                             "start": 0,
                             "size": 25
@@ -1281,13 +1312,13 @@ function fillMineSelector() {
                         function(table) {
                             //console.log('Table loaded', table);
                             //this .on listener will do something when someone interacts with the table. 
-                            table.on("rendered", function(changeDetail) {
+                            table.children.table.on("rendered", function(changeDetail) {
                                 console.log("Rendered table");
                                 console.log(changeDetail);
                                 updateElements(table.history.currentQuery.constraints, "PieChart");
                             });
 
-                            window.imTable = table;
+                            window.imTable = table.children.table;
                         },
                         function(error) {
                             console.error('Could not load table', error);

diff --git a/src/js/genes-view.js b/src/js/genes-view.js
@@ -4,11 +4,13 @@ $(document).ready(function() {
     document.title = window.currentClassView + " in HumanMine";
     $("#proteinsButton").removeClass("btn-primary").addClass("btn-default");
     $("#genesButton").removeClass("btn-default").addClass("btn-primary");
+    var mineUrl = window.mineUrl.replace(/COLON/g, ":").replace(/SLASH/g, "/");
 
     // Instantiate the im-table with all the data available in Gene from HumanMine
     var selector = '#dataTable';
     var service = {
-        root: window.mineUrl.replace(/COLON/g, ":").replace(/SLASH/g, "/")
+        root: mineUrl,
+        token: getSessionToken()
     };
     var query = {
         select: ['*'],
@@ -24,7 +26,7 @@ $(document).ready(function() {
 
     imtables.configure('TableResults.CacheFactor', 20);
 
-    var imtable = imtables.loadTable(
+    var imtable = imtables.loadDash(
         selector, {
             "start": 0,
             "size": 25
@@ -34,15 +36,15 @@ $(document).ready(function() {
         }
     ).then(
         function(table) {
-            //console.log('Table loaded', table);
+            console.log('Table loaded', table.children.table);
             //this .on listener will do something when someone interacts with the table. 
-            table.on("rendered", function(changeDetail) {
+            table.children.table.on("rendered", function(changeDetail) {
                 console.log("Rendered table");
                 console.log(changeDetail);
                 updateElements(table.history.currentQuery.constraints, "PieChart");
             });
 
-            window.imTable = table;
+            window.imTable = table.children.table;
         },
         function(error) {
             console.error('Could not load table', error);

diff --git a/src/js/proteins-view.js b/src/js/proteins-view.js
@@ -4,11 +4,13 @@ $(document).ready(function() {
     document.title = window.currentClassView + " in HumanMine";
     $("#genesButton").removeClass("btn-primary").addClass("btn-default");
     $("#proteinsButton").removeClass("btn-default").addClass("btn-primary");
+    var mineUrl = window.mineUrl.replace(/COLON/g, ":").replace(/SLASH/g, "/");
 
     // Instantiate the im-table with all the data available in Protein from HumanMine
     var selector = '#dataTable';
     var service = {
-        root: window.mineUrl.replace(/COLON/g, ":").replace(/SLASH/g, "/")
+        root: mineUrl,
+        token: getSessionToken()        
     };
     var query = {
         select: ['*'],
@@ -23,7 +25,7 @@ $(document).ready(function() {
 
     imtables.configure('TableResults.CacheFactor', 20);
 
-    var imtable = imtables.loadTable(
+    var imtable = imtables.loadDash(
         selector, {
             "start": 0,
             "size": 25
@@ -33,13 +35,13 @@ $(document).ready(function() {
         }
     ).then(
         function(table) {
-            console.log('Table loaded', table);
+            console.log('Table loaded', table.children.table);
             //this .on listener will do something when someone interacts with the table. 
-            table.on("all", function(changeDetail) {
+            table.children.table.on("all", function(changeDetail) {
                 updateElements(table.history.currentQuery.constraints, "PieChart");
             });
 
-			window.imTable = table;
+			window.imTable = table.children.table;
         },
         function(error) {
             console.error('Could not load table', error);

diff --git a/src/scss/_global.scss b/src/scss/_global.scss
@@ -181,4 +181,12 @@ body.fixed-nav {
 	border-radius: 0px;
 }
 
-.im-empty-apology .alert .btn {display:none}
+.im-empty-apology .alert .btn {display:none}
+
+.im-join-manager-button .btn {display:none}
+
+.im-filter-dialogue-button .btn {display:none}
+
+.im-column-manager-button .btn {display:none}
+
+.im-history .btn {display:none}