From a6eb277a27658cb9403d9d2b521eab0d3b2cae6b Mon Sep 17 00:00:00 2001
From: "Mohammad K. Zia" <mkzia@buffalo.edu>
Date: Tue, 9 Jul 2019 17:21:49 -0400
Subject: [PATCH 1/3] Add chart link button to metric explorer

---
 html/gui/css/viewer.css                       |   3 ++
 html/gui/images/chart_bar_link.png            | Bin 0 -> 880 bytes
 html/gui/js/PortalModule.js                   |  43 ++++++++++++++++--
 .../modules/metric_explorer/MetricExplorer.js |  23 +++++++++-
 4 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 html/gui/images/chart_bar_link.png

diff --git a/html/gui/css/viewer.css b/html/gui/css/viewer.css
index be672dfed0..ab092a7fd2 100644
--- a/html/gui/css/viewer.css
+++ b/html/gui/css/viewer.css
@@ -352,6 +352,9 @@ h3 {
 .blank {
     background-image: url(../images/s.gif) !important;
 }
+.chart_bar_link {
+    background-image: url(../images/chart_bar_link.png) !important;
+}
 .xd-toolbar {
 	background-color:#ffffff !important;
 	background-image: none !important;
diff --git a/html/gui/images/chart_bar_link.png b/html/gui/images/chart_bar_link.png
new file mode 100644
index 0000000000000000000000000000000000000000..9eb6b8eba59eb0fd64daa7323b20b36509cd8d22
GIT binary patch
literal 880
zcmV-$1CRWPP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#5=lfsRCwBKl3j>ZRTze!z4ku8^Gg?w
z5rh{>+KdiOnRU^O1YHEh2^5hu!zKs=Me!yo5C?@Wf}#j-A_{`Kh;kIdqA)MUIgLY1
zG;nkhrJw0I`<#8|j5Bl2*?(*G?PFR=YxC`owbr-Z?|t93tP3L#qAkO%VYEJ_qqty<
z!LlrDTa9N;^z2>!5)beCoQ|-GGWvGClL>7?TN5jdkx$2QVawjV(Dy4W+{;fNeOTzy
zO$K(Kp(j|zGXFG7hB~xwnhxK=(MsAU3=)u#`rBtA3P^=M{m-4IGg!fiBP{L!=xo7(
z(JAr*l8TiSfTcBdCWF$kM2HHSM*F^rqDT~)Q@7<xwMxav;hP}2z`@qCC@ho!AV6`f
z86A0)!-XMUlpJYYNE{God~Ep(BU?bS0<!<5i#U;LGf=6tWO2nL5%bo$rNkk$%p;>{
z;P6^>PNZuVgP7hZl!giYNVgZ$0$>~6R-DM{&7~w;MAB0#IA+eXYNc>OIsDF!Ly()J
zq3<C+`7L%BkXH&7$3jvdlubuAL!dIOlHyJCeVaj;T%)jL*|_{T`xVVAV_e_$3ZJYt
z@YjuS|5C`X98Sy}zJ7+@xhuS(9B!DDG0Myew@pssX6RJ$e%{aK^^bG#<!zJ~Ds8Qk
zQ&W67cbVM8$2_sIkEfm<W%<T3tBnQ|lf{AQ>FHS~(HGb?R?1KE%;9akesqjK=I6P)
zZw*RhuwgTq`fp79ki-;KcL8s)&WYnEn3<XBZ!-web%LOUyHFz*x<}SzdAC;MgOl&$
zRy<m*7FVxb<GXLZ=Hl96*12C$DwR<3)aCVvguF`_w+N$%OghbbWsO&<aBS>24WXM{
zWdh<=D?HNe;VO%!@3UC1<81upRn8s>F{;62@d7)yZ<nqWL?5Te#|Z<U?w%gHy1MBf
z7+`R4P}m0iSuRs?U7c9)(5<Jr`}r3>>+0;hFPqQPSXrT1ELP^{f8XO(tKQbFk9{h}
zt{)m2YO|@;YTl(wrF|Cv9S=z4{xwgoy7YJczrD+U2`~U2j*({s#YEEp0000<MNUMn
GLSTaZgr`#g

literal 0
HcmV?d00001

diff --git a/html/gui/js/PortalModule.js b/html/gui/js/PortalModule.js
index adc27dd0a5..e02e797a31 100644
--- a/html/gui/js/PortalModule.js
+++ b/html/gui/js/PortalModule.js
@@ -23,7 +23,8 @@ XDMoD.ToolbarItem = {
    DURATION_SELECTOR: 1,
    EXPORT_MENU: 2,
    PRINT_BUTTON: 3,
-   REPORT_CHECKBOX: 4
+   REPORT_CHECKBOX: 4,
+   CHART_LINK_BUTTON: 5
    
 };//XDMoD.ToolbarItem
 
@@ -57,7 +58,8 @@ XDMoD.PortalModule = Ext.extend(Ext.Panel,  {
       durationSelector: false,
       exportMenu: false,
       printButton: false,
-      reportCheckbox: false
+      reportCheckbox: false,
+      chartLinkButton: false
       
    },//toolbarItems
    
@@ -69,7 +71,8 @@ XDMoD.PortalModule = Ext.extend(Ext.Panel,  {
       XDMoD.ToolbarItem.DURATION_SELECTOR,
       XDMoD.ToolbarItem.EXPORT_MENU,
       XDMoD.ToolbarItem.PRINT_BUTTON,
-      XDMoD.ToolbarItem.REPORT_CHECKBOX
+      XDMoD.ToolbarItem.REPORT_CHECKBOX,
+      XDMoD.ToolbarItem.CHART_LINK_BUTTON
 
    ],   
 
@@ -190,6 +193,27 @@ XDMoD.PortalModule = Ext.extend(Ext.Panel,  {
       
       // ----------------------------------------
       
+      var createChartLinkButton = function () {
+         var chartLinkButton = new Ext.Button({
+
+             text: 'Link to Current Chart',
+             iconCls: 'chart_bar_link',
+             tooltip: 'Link to Current Chart',
+             scope: this,
+             handler: function () {
+                 self.fireEvent('chart_link_clicked');
+             } // handler
+
+         }); // chartLinkButton
+
+         self.getChartLinkButton = function () {
+             return chartLinkButton;
+         };
+
+         return chartLinkButton;
+     }; // createChartLinkButton
+
+     // ----------------------------------------
       var moduleConfig = {
       
          layout: 'border',
@@ -329,7 +353,18 @@ XDMoD.PortalModule = Ext.extend(Ext.Panel,  {
                   }
                   
                   break;
-                  
+
+               case XDMoD.ToolbarItem.CHART_LINK_BUTTON:
+
+                  if (self.toolbarItems.chartLinkButton === true) {
+                        if (moduleConfig.tbar.items.getCount() > 1 && employSeparator) {
+                           moduleConfig.tbar.addItem('-');
+                        }
+                        moduleConfig.tbar.addItem(createChartLinkButton(self.module_id));
+                  }
+
+                  break;
+
                default:
 
                   if (moduleConfig.tbar.items.getCount() > 1 && employSeparator)
diff --git a/html/gui/js/modules/metric_explorer/MetricExplorer.js b/html/gui/js/modules/metric_explorer/MetricExplorer.js
index d4ae35d26e..c240f03073 100644
--- a/html/gui/js/modules/metric_explorer/MetricExplorer.js
+++ b/html/gui/js/modules/metric_explorer/MetricExplorer.js
@@ -2007,7 +2007,8 @@ Ext.extend(XDMoD.Module.MetricExplorer, XDMoD.PortalModule, {
         durationSelector: true,
         exportMenu: true,
         printButton: true,
-        reportCheckbox: true
+        reportCheckbox: true,
+        chartLinkButton: true
 
     },
 
@@ -5494,6 +5495,8 @@ Ext.extend(XDMoD.Module.MetricExplorer, XDMoD.PortalModule, {
 
             self.getReportCheckbox().setDisabled(noData);
 
+            self.getChartLinkButton().setDisabled(noData);
+
             var reportGeneratorMeta = chartStore.getAt(0).get('reportGeneratorMeta');
 
             self.getReportCheckbox().storeChartArguments(reportGeneratorMeta.chart_args,
@@ -6236,6 +6239,20 @@ Ext.extend(XDMoD.Module.MetricExplorer, XDMoD.PortalModule, {
 
         // ---------------------------------------------------------
 
+        self.on('chart_link_clicked', function () {
+            var encodedData = window.btoa(JSON.stringify(this.getConfig()));
+            var link = window.location.protocol + '//' + window.location.host + '/#main_tab_panel:metric_explorer?config=' + encodedData;
+            var msg = 'Use the following link to share the current chart. <br> We recommend using Chrome or Firefox if the link does not work in Internet Explorer.<br> <b>' + link + '</b>';
+            Ext.Msg.show({
+                title: 'Link to Chart',
+                minWidth: 700,
+                msg: msg,
+                buttons: Ext.Msg.OK
+            });
+        }); // self.on('chart_link_clicked', ...
+
+        // ---------------------------------------------------------
+
         this.loadAll = function() {
             this.queries_store_loaded_handler = function() {
                 this.createQueryFunc.call(this, null, null, null, null, null, null, false);
@@ -6286,6 +6303,10 @@ Ext.extend(XDMoD.Module.MetricExplorer, XDMoD.PortalModule, {
     listeners: {
         activate: function( /*panel*/ ) {
             this.updateRawDataWindowVisibility();
+            if (location.hash.split('config=')[1]) {
+                var config = JSON.parse(window.atob(location.hash.split('config=')[1]));
+                XDMoD.Module.MetricExplorer.setConfig(config, config.title, false);
+            }
         }, // activate
 
         deactivate: function( /*panel*/ ) {

From 03f49149dba8d866bda3324165c63c06a66c0714 Mon Sep 17 00:00:00 2001
From: "Mohammad K. Zia" <mkzia@buffalo.edu>
Date: Fri, 12 Jul 2019 15:18:40 -0400
Subject: [PATCH 2/3] Update link message

---
 html/gui/js/modules/metric_explorer/MetricExplorer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/gui/js/modules/metric_explorer/MetricExplorer.js b/html/gui/js/modules/metric_explorer/MetricExplorer.js
index c240f03073..8f9db13fa2 100644
--- a/html/gui/js/modules/metric_explorer/MetricExplorer.js
+++ b/html/gui/js/modules/metric_explorer/MetricExplorer.js
@@ -6242,7 +6242,7 @@ Ext.extend(XDMoD.Module.MetricExplorer, XDMoD.PortalModule, {
         self.on('chart_link_clicked', function () {
             var encodedData = window.btoa(JSON.stringify(this.getConfig()));
             var link = window.location.protocol + '//' + window.location.host + '/#main_tab_panel:metric_explorer?config=' + encodedData;
-            var msg = 'Use the following link to share the current chart. <br> We recommend using Chrome or Firefox if the link does not work in Internet Explorer.<br> <b>' + link + '</b>';
+            var msg = 'Use the following link to share the current chart. Note that the link does no override the access controls. So if you send the link to someone who does not have access to the data, they will still not be able to see the data. <br> We recommend using Chrome or Firefox if the link does not work in Internet Explorer.<br><b>' + link + '</b>';
             Ext.Msg.show({
                 title: 'Link to Chart',
                 minWidth: 700,

From 4b4ae0a2084a279d1372eecaa3f800d01896b89c Mon Sep 17 00:00:00 2001
From: "Mohammad K. Zia" <mkzia@buffalo.edu>
Date: Fri, 12 Jul 2019 16:30:11 -0400
Subject: [PATCH 3/3] fix typo

---
 html/gui/js/modules/metric_explorer/MetricExplorer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/gui/js/modules/metric_explorer/MetricExplorer.js b/html/gui/js/modules/metric_explorer/MetricExplorer.js
index 8f9db13fa2..121669d8f7 100644
--- a/html/gui/js/modules/metric_explorer/MetricExplorer.js
+++ b/html/gui/js/modules/metric_explorer/MetricExplorer.js
@@ -6242,7 +6242,7 @@ Ext.extend(XDMoD.Module.MetricExplorer, XDMoD.PortalModule, {
         self.on('chart_link_clicked', function () {
             var encodedData = window.btoa(JSON.stringify(this.getConfig()));
             var link = window.location.protocol + '//' + window.location.host + '/#main_tab_panel:metric_explorer?config=' + encodedData;
-            var msg = 'Use the following link to share the current chart. Note that the link does no override the access controls. So if you send the link to someone who does not have access to the data, they will still not be able to see the data. <br> We recommend using Chrome or Firefox if the link does not work in Internet Explorer.<br><b>' + link + '</b>';
+            var msg = 'Use the following link to share the current chart. Note that the link does not override the access controls. So if you send the link to someone who does not have access to the data, they will still not be able to see the data. <br> We recommend using Chrome or Firefox if the link does not work in Internet Explorer.<br><b>' + link + '</b>';
             Ext.Msg.show({
                 title: 'Link to Chart',
                 minWidth: 700,