Proper logging support #109

informatics-isi-edu · Jun 8, 2021 · 58b8e61 · 58b8e61
1 parent b381cb4
commit 58b8e61
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/boolean-search/booleansearch.app.js b/boolean-search/booleansearch.app.js
@@ -78,23 +78,25 @@ var setSourceForFilter;
         })
         .value('headerInfo', {
             pid: "",
-            cid: ""
+            cid: "",
+            wid: ""
         })
-        .factory('filterOptions', ['$http', '$window', 'ERMrest', 'headInjector', 'MathUtils', 'UriUtils', 'headerInfo', function ($http, $window, ERMrest, headInjector, MathUtils, UriUtils, headerInfo) {
+        .factory('filterOptions', ['$http', '$window', 'ERMrest', 'headInjector', 'MathUtils', 'UriUtils', 'headerInfo','ConfigUtils', function ($http, $window, ERMrest, headInjector, MathUtils, UriUtils, headerInfo,ConfigUtils) {
             var baseUrl = $window.location.origin;
             var specExprUrl = baseUrl + "/ermrest/catalog/2/attributegroup/Gene_Expression:Specimen_Expression";
             var devStageUrl = baseUrl + "/ermrest/catalog/2/attribute/Vocabulary:Developmental_Stage";
             var sourceUrl = baseUrl + "/ermrest/catalog/2/entity/Vocabulary:Anatomy";
 
             // Configuring ERMrestjs service object and http module
-            var contextHeaderParams = { "cid": "boolean-search" };
+            console.log(ConfigUtils.getContextHeaderParams())
+            var contextHeaderParams = ConfigUtils.getContextHeaderParams();
             var server = ERMrest.ermrestFactory.getServer(baseUrl + "/ermrest", contextHeaderParams);
-            headerInfo.pid = MathUtils.uuid();
-            headerInfo.cid = "boolean-search";
-            headInjector.setWindowName();
+            headerInfo.pid = contextHeaderParams.pid;
+            headerInfo.cid = contextHeaderParams.cid;
+            headerInfo.wid = contextHeaderParams.wid;
             var getHeader = function () {
                 return {
-                    wid: $window.name,
+                    wid: headerInfo.wid,
                     cid: headerInfo.cid,
                     pid: headerInfo.pid,
                     action: "facet"

diff --git a/heatmap/heatmap.js b/heatmap/heatmap.js
@@ -150,6 +150,8 @@ heatmapApp.controller('HeatmapController', function HeatmapController($scope, $h
 			}]
 		};
 		var url = window.origin + "/chaise/recordset/" + ERMrest.createPath("2", "Gene_Expression", "Array_Data", facet);
+		console.log(url)
+		console.log(url + "?pcid=" + headerInfo.cid + "&ppid=" + headerInfo.pid)
 		window.location = url + "?pcid=" + headerInfo.cid + "&ppid=" + headerInfo.pid;
 	}
 });

diff --git a/lineplot/lineplot.app.js b/lineplot/lineplot.app.js
@@ -37,7 +37,8 @@
             }])
             .factory('LineplotUtils', ['AlertsService', 'ConfigUtils', 'dataFormats', 'Session', 'UriUtils', '$rootScope', function (AlertsService, ConfigUtils, dataFormats, Session, UriUtils, $rootScope) {
               var ermrestServiceUrl = ConfigUtils.getConfigJSON().ermrestLocation;
-              var contextHeaderParams = {"cid": "line-plot"};
+              console.log(ConfigUtils.getContextHeaderParams())
+              var contextHeaderParams = ConfigUtils.getContextHeaderParams();
               var server = ERMrest.ermrestFactory.getServer(ermrestServiceUrl, contextHeaderParams);
 
                 return {

diff --git a/plot/plot.app.js b/plot/plot.app.js
@@ -51,9 +51,8 @@
             })
             .factory('PlotUtils', ['AlertsService', 'ConfigUtils', 'dataFormats', 'dataParams', 'Errors', 'ErrorService', 'Session', 'UriUtils', '$q', '$rootScope', '$window', function (AlertsService, ConfigUtils, dataFormats, dataParams, Errors, ErrorService,  Session, UriUtils, $q, $rootScope, $window) {
                 var ermrestServiceUrl = ConfigUtils.getConfigJSON().ermrestLocation;
-                var contextHeaderParams = {"cid": "2d-plot"};
-                var server = ERMrest.ermrestFactory.getServer(ermrestServiceUrl, contextHeaderParams);
-
+                console.log(ConfigUtils.getContextHeaderParams())
+                var server = ERMrest.ermrestFactory.getServer(ermrestServiceUrl, ConfigUtils.getContextHeaderParams());
                 function getType(type) {
                   switch (type) {
                     case "line":

diff --git a/treeview/js/main.js b/treeview/js/main.js
@@ -13,7 +13,6 @@
             }
             return s4() + s4() + s4() + s4() + s4() + s4();
         }
-
         function getHeader(action, schemaTable, params) {
             return ERMrest._certifyContextHeader({
                 wid: window.name,
@@ -558,6 +557,8 @@
                 function getTreeData(queryConfig) {
                     var treeHeaders = {};
                     treeHeaders[ERMrest.contextHeaderName] = getHeader("main", queryConfig.tree_schema_table);
+                    console.log(urlParamNames)
+                    console.log(treeHeaders[ERMrest.contextHeaderName])
                     $.ajax({
                         headers: treeHeaders,
                         dataType: "json",
@@ -918,10 +919,14 @@
                     // assuming Parent_App is booleanSearch
                     s["onClick"] = nodeClickCallback(node);
                 } else {
+                    var context=JSON.parse(getHeader())
                     // TODO: this function should be exposed as public in ermrestJS
+                    console.log(ERMrest._fixedEncodeURIComponent(node.dbxref))
                     templateParams.$node_id = ERMrest._fixedEncodeURIComponent(node.dbxref);
-                    var l = "'" + ERMrest._renderHandlebarsTemplate(treeviewConfig.tree.click_event_callback, templateParams) + "','_blank'";
-                    s["onClick"] = "window.open(" + l + ");";
+                    var l = "'" + ERMrest._renderHandlebarsTemplate(treeviewConfig.tree.click_event_callback, templateParams);
+                    url=l+"?pcid=" + context.cid + "&ppid=" + context.pid+ "','_blank'";
+                    console.log(url)
+                    s["onClick"] = "window.open(" + url + ");";
                 }
                 // properties stored under "original" property on jstree_node object
                 var newNode = {