Fix regression with Open Reference in interactive plot

Benjamin Renard
1 parent 6f1f2556
Showing 2 changed files with 34 additions and 22 deletions Show diff stats
js/app/views/PlotComponents/PlotContextManager.js
js/app/views/PlotTabResultUI.js
@@ -82,16 +82,22 @@ Ext.define(&#39;amdaPlotComp.PlotContextManager&#39;, {
                     var intToPush = {
                         'id': id,
                         'start': interval.start,
-                        'stop': interval.stop
+                        'stop': interval.stop,
+                        'links': []
                     };
-                    if ((columnToShow != '') && (columnName != '') && interval.hasOwnProperty('params')) {
-                        Ext.Object.each(interval.params, function (param_id, param_value) {
-                            if (param_id == columnToShow) {
+                    
+                    Ext.Object.each(interval.params, function (param_id, param_value) {
+                        if (interval.hasOwnProperty('params')) {
+                            if ((columnToShow != '') && (columnName != '') && (param_id == columnToShow)) {
                                 intToPush['info'] = columnName + ': ' + param_value;
-                                return;
                             }
-                        });
-                    }
+                            if (param_value.toLowerCase().startsWith("http://") || param_value.toLowerCase().startsWith("https://")) {
+                                if (intToPush['links'].indexOf(param_value) < 0) {
+                                    intToPush['links'].push(param_value);
+                                }
+                            }
+                        }
+                    });
                     intervalsOver[parameter.ttorcat.name].push(intToPush);
@@ -502,21 +502,9 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 				if (timeAxisContext) {
                     var intervals = amdaPlotComp.PlotContextManager.getIntervalsOverMouse(me.crtContext, panel, crtTimestamp);
-					if (Object.keys(intervals).length > 0) {
-                        var links = [];
-                        Ext.Object.each(intervals, function (ttorcatname, intervals) {
-                            Ext.each(intervals, function (interval) {
-                                if (interval.params) {
-                                    Ext.Object.each(interval.params, function (paramKey, paramValue) {
-                                        if (paramValue.toLowerCase().startsWith("http://") || paramValue.toLowerCase().startsWith("https://")) {
-                                            if (links.indexOf(paramValue) < 0) {
-                                                links.push(paramValue);
-                                            }
-                                        }
-                                    });
-                                }
-                            });
-                        });
+
+                    if (Object.keys(intervals).length > 0) {
+                        var links = me.getIntervalsLinks(intervals);
                         if (links.length > 0) {
 							var menu = Ext.create('Ext.menu.Menu', { plain: true });
                             Ext.each(links, function (link) {
@@ -586,6 +574,24 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 		return intervalText;
     },
+    getIntervalsLinks: function(intervals) {
+        var links = [];
+        Ext.Object.each(intervals, function (ttorcatname, intervals) {
+            Ext.each(intervals, function (interval) {
+                if (interval.hasOwnProperty('links') && interval.links.length > 0) {
+                    Ext.each(interval.links, function (link) {
+                        if (link.toLowerCase().startsWith("http://") || link.toLowerCase().startsWith("https://")) {
+                            if (links.indexOf(link) < 0) {
+                                links.push(link);
+                            }
+                        }
+                    });
+                }
+            });
+        });
+        return links;
+    },
+
 	updateTimeTableInfo: function () {
 		if (!this.navToolBar)
 			return;