Fixes for SNAP-3147 :

core/src/main/resources/org/apache/spark/ui/static/snappydata/snappy-commons.js

@@ -109,6 +109,80 @@ function convertSizeToHumanReadable(value){
   return convertedValue;
 }
 
+/*
+ * Utility function to format given long date value to human readable string representation.
+ *
+ * Eg. NOV 26, 2019 18:45:30
+ */
+function formatDate(dateMS) {
+  var months = ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN' , 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC'];
+  var dt = new Date(dateMS);
+
+  var dd = dt.getDate();
+  if ( dd < 10 ) { dd = '0' + dd; }
+
+  var hh = dt.getHours();
+  if ( hh < 10 ) { hh = '0' + hh; }
+
+  var mm = dt.getMinutes();
+  if ( mm < 10 ) { mm = '0' + mm; }
+
+  var ss = dt.getSeconds();
+  if ( ss < 10 ) { ss = '0' + ss; }
+
+  var dateStr = months[dt.getMonth()] + ' ' + dd + ', ' + dt.getFullYear()
+              + ' ' + hh + ':' + mm + ':' + ss;
+  return dateStr;
+
+}
+
+/*
+ * Utility function to calculate duration from given long date value and convert that duration
+ * to human readable string representation.
+ *
+ * Eg. 2 Days 10 Hrs 12 Mins 25 Secs
+ */
+function getDurationInReadableForm(startDateTimeMS) {
+
+  var start_date = new Date(startDateTimeMS);
+  var now_date = new Date();
+
+  var seconds = Math.floor((now_date - start_date) / 1000);
+  var minutes = Math.floor(seconds / 60);
+  var hours = Math.floor(minutes / 60);
+  var days = Math.floor(hours / 24);
+
+  hours = hours - (days * 24);
+  minutes = minutes - (days * 24 * 60) - (hours * 60);
+  seconds = seconds - (days * 24 * 60 * 60) - (hours * 60 * 60) - (minutes * 60);
+
+  var durationStr = "";
+  if (days > 0) {
+    if (days < 2) {
+      durationStr += days + ' Day ';
+    } else {
+      durationStr += days + ' Days ';
+    }
+  }
+  if (hours > 0) {
+    if (hours < 2) {
+      durationStr += hours + ' Hr ';
+    } else {
+      durationStr += hours + ' Hrs ';
+    }
+  }
+  if (minutes > 0) {
+    if (minutes > 0 && minutes < 2) {
+      durationStr += minutes + ' Min ';
+    } else {
+      durationStr += minutes + ' Mins ';
+    }
+  }
+  durationStr += seconds + ' Secs';
+
+  return durationStr;
+}
+
 /*
  * An event handler function to handle error events occurred in AJAX request.
  *

core/src/main/resources/org/apache/spark/ui/static/snappydata/snappy-dashboard.js

@@ -1,73 +1,21 @@
 
 var isGoogleChartLoaded = false;
 var isAutoUpdateTurnedON = true;
+var isClusterStartDateInvalid = true;
 var isMemberCellExpanded = {};
 var isMemberRowExpanded = {};
 
-function setClusterStartDate() {
-  var months = ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN' , 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC'];
-
-  var clusterStartTime = $("#hiddenData").data("clusterstarttime");
-  var dt = new Date(clusterStartTime);
-
-  var dd = dt.getDate();
-  if ( dd < 10 ) { dd = '0' + dd; }
-
-  var hh = dt.getHours();
-  if ( hh < 10 ) { hh = '0' + hh; }
-
-  var mm = dt.getMinutes();
-  if ( mm < 10 ) { mm = '0' + mm; }
-
-  var ss = dt.getSeconds();
-  if ( ss < 10 ) { ss = '0' + ss; }
-
-  var displayDateStr = months[dt.getMonth()] + ' ' + dd + ', ' + dt.getFullYear()
-                     + ' ' + hh + ':' + mm + ':' + ss;
+function setClusterStartDate(startDateTime) {
+  if(!isClusterStartDateInvalid) {
+    return;
+  }
 
-  $("#clusterStartDate").html(displayDateStr);
-  updateClusterUptime();
+  $("#clusterStartDate").html(formatDate(startDateTime));
+  isClusterStartDateInvalid = false;
 }
 
-function updateClusterUptime() {
-  var clusterStartTime = $("#hiddenData").data("clusterstarttime");
-  var start_date = new Date(clusterStartTime);
-  var now_date = new Date();
-
-  var seconds = Math.floor((now_date - start_date) / 1000);
-  var minutes = Math.floor(seconds / 60);
-  var hours = Math.floor(minutes / 60);
-  var days = Math.floor(hours / 24);
-
-  hours = hours - (days * 24);
-  minutes = minutes - (days * 24 * 60) - (hours * 60);
-  seconds = seconds - (days * 24 * 60 * 60) - (hours * 60 * 60) - (minutes * 60);
-
-  var displayDateStr = "";
-  if (days > 0) {
-    if (days < 2) {
-      displayDateStr += days + ' Day ';
-    } else {
-      displayDateStr += days + ' Days ';
-    }
-  }
-  if (hours > 0) {
-    if (hours < 2) {
-      displayDateStr += hours + ' Hr ';
-    } else {
-      displayDateStr += hours + ' Hrs ';
-    }
-  }
-  if (minutes > 0) {
-    if (minutes > 0 && minutes < 2) {
-      displayDateStr += minutes + ' Min ';
-    } else {
-      displayDateStr += minutes + ' Mins ';
-    }
-  }
-  displayDateStr += seconds + ' Secs';
-
-  $("#clusterUptime").html(displayDateStr);
+function updateClusterUptime(startDateTime) {
+  $("#clusterUptime").html(getDurationInReadableForm(startDateTime));
 }
 
 function updateCoreDetails(coresInfo) {
@@ -798,10 +746,14 @@ function loadClusterInfo() {
       }
 
       updateCoreDetails(clusterInfo.coresInfo);
-      updateClusterUptime();
+      setClusterStartDate(clusterInfo.startDateTime);
+      updateClusterUptime(clusterInfo.startDateTime);
 
     },
-    error: ajaxRequestErrorHandler
+    error: function (jqXHR, status, error) {
+      isClusterStartDateInvalid = true;
+      ajaxRequestErrorHandler(jqXHR, status, error);
+    }
    });
 }
 
@@ -825,8 +777,6 @@ $(document).ready(function() {
       cache : false
     });
 
-  setClusterStartDate();
-
   $("#myonoffswitch").on( 'change', toggleAutoUpdateSwitch );
 
   // Members Grid Data Table