Merge pull request #247 from guusdk/245_admin-console-javacript-message-archive

fixes for Javascript on the admin console (#245 & #246)

Author: akrherz

changelog.html

@@ -44,6 +44,12 @@ <h1>
 Monitoring Plugin Changelog
 </h1>
 
+<p><b>2.4.1</b> -- December 6, 2022</p>
+<ul>
+    <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/246'>Issue #246</a>] - Fixes: Clicking graph no longer opens bigger graph on admin console</li>
+    <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/245'>Issue #245</a>] - Fixes: Message history display in admin console remains empty</li>
+</ul>
+
 <p><b>2.4.0</b> -- November 22, 2022</p>
 <ul>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/232'>Issue #232</a>] - Fix SQL issue when retrieving archived messages from MSSQL</li>

plugin.xml

@@ -6,7 +6,7 @@
     <description>Monitors conversations and statistics of the server.</description>
     <author>Ignite Realtime</author>
     <version>${project.version}</version>
-    <date>2022-11-22</date>
+    <date>2022-12-06</date>
     <minServerVersion>4.7.0</minServerVersion>
     <minJavaVersion>1.8</minJavaVersion>
     <databaseKey>monitoring</databaseKey>

pom.xml

@@ -8,7 +8,7 @@
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>monitoring</artifactId>
-    <version>2.4.1-SNAPSHOT</version>
+    <version>2.4.2-SNAPSHOT</version>
     <name>Monitoring Plugin</name>
     <description>Monitors conversations and statistics of the server.</description>
 

src/web/archive-search.jsp

@@ -377,7 +377,7 @@
         let xhr = new XMLHttpRequest();
         xhr.onload = function () {
             if (xhr.readyState === 4 && xhr.status === 200) {
-                showConv(JSON.parse(xmlHttp.responseText));
+                showConv(JSON.parse(xhr.responseText));
             }
         };
         xhr.open("GET", '/plugins/monitoring/api/conversations/' +conv);
@@ -407,13 +407,13 @@
     }
 
     function showOccupants(conversationID, start) {
-        var xmlHttp = new XMLHttpRequest();
-        xmlHttp.onreadystatechange = function() {
-            if (xmlHttp.readyState === 4 && xmlHttp.status === 200)
-                showOcc(xmlHttp.responseText);
+        var xhr = new XMLHttpRequest();
+        xhr.onreadystatechange = function() {
+            if (xhr.readyState === 4 && xhr.status === 200)
+                showOcc(xhr.responseText);
         }
-        xmlHttp.open("GET", 'archive-conversation-participants.jsp?conversationID=' + conversationID + '&start=' + start, true);
-        xmlHttp.send(null);
+        xhr.open("GET", 'archive-conversation-participants.jsp?conversationID=' + conversationID + '&start=' + start, true);
+        xhr.send(null);
     }
 
     function showOcc(result) {

src/web/stats-dashboard.jsp

@@ -182,15 +182,13 @@ function updateTable(id, data) {
 }
 
 function updateGraph(graphid, graphkey) {
-    const d = new Date();
-    const t = d.getTime();
-    document.getElementById(graphid).src = 'graph?' + graphkey + '&t=' + t + "&timeperiod=" + currentTimePeriod + "&format=png";
+    document.getElementById(graphid).src = 'graph?' + graphkey + "&timeperiod=" + currentTimePeriod + "&format=png";
 
     statParam = graphkey.split('&');
     statName = statParam[0].split('=');
     if (isSnapshotDetailVisible && currentSnapshot === statName[1]) {
         viewElement = document.getElementById('snapshot-detail-image');
-        viewElement.src = 'graph?stat=' + statName[1] + '&t=' + t + '&timeperiod=' + currentTimePeriod + '&width=700&height=250&format=png'
+        viewElement.src = 'graph?stat=' + statName[1] + '&timeperiod=' + currentTimePeriod + '&width=700&height=250&format=png'
     }
 }
 
@@ -278,7 +276,7 @@ let currentSnapshot = '';
 
 function displaySnapshotDetail(snapshot) {
     if (!isSnapshotDetailVisible) {
-        document.getElementById('snapshot-detail-image').src = 'graph?stat=' + snapshot + '&t=' + t + '&timeperiod=' + currentTimePeriod + '&width=700&height=250&format=png';
+        document.getElementById('snapshot-detail-image').src = 'graph?stat=' + snapshot + '&timeperiod=' + currentTimePeriod + '&width=700&height=250&format=png';
         document.getElementById('snapshot-detail').style.display = 'block';
         isSnapshotDetailVisible = true;
         toggleSnapshotSelected(snapshot);
@@ -293,7 +291,7 @@ function displaySnapshotDetail(snapshot) {
                 viewElement.src = i.src;
                 document.getElementById('snapshot-detail-image').style.display = 'block';
             }
-            i.src = 'graph?stat=' + snapshot + '&t=' + new Date().getTime() + '&timeperiod=' + currentTimePeriod + '&width=700&height=250&format=png';
+            i.src = 'graph?stat=' + snapshot + '&timeperiod=' + currentTimePeriod + '&width=700&height=250&format=png';
             toggleSnapshotSelected(snapshot);
             currentSnapshot = snapshot;
         } else {