Merge branch 'main' into historical-provider-tests

NASA-AMMOS · Feb 28, 2024 · 373649d · 373649d
2 parents 9a15322 + 7c18eed
commit 373649d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openmct-mcws",
-  "version": "5.2.0-rc2",
+  "version": "5.2.0-1",
   "description": "Open MCT for MCWS",
   "devDependencies": {
     "@braintree/sanitize-url": "6.0.2",

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>gov.nasa.arc.wtd</groupId>
     <artifactId>openmct-client</artifactId>
     <name>Open MCT for MCWS Client</name>
-    <version>5.2.0-rc2</version>
+    <version>5.2.0</version>
     <packaging>war</packaging>
 
     <properties>

diff --git a/src/services/session/SessionService.js b/src/services/session/SessionService.js
@@ -142,10 +142,10 @@ class SessionService {
 
             if (model) {
                 this.notificationService.info('Connected to realtime from ' + model.topic);
-                console.log(`Connected to realtime from ${model.topic}. ${currentTime}`);
+                console.log(`Connected to realtime from ${model.topic}. ${currentTime} wall clock time.`);
             } else {
                 this.notificationService.info('Disconnected from realtime');
-                console.log(`Disconnected from realtime. ${currentTime}`);
+                console.log(`Disconnected from realtime. ${currentTime} wall clock time.`);
             }
         }
     };
@@ -178,13 +178,14 @@ class SessionService {
         this.camErrorDialogActive = true;
 
         const currentTime = new Date().toISOString();
+        const noActiveSessionMessage = `Poll for active session failed at ${currentTime} wall clock time. This may indicate a CAM timeout or session connection issue, which could result in data loss. Refresh if data does not appear to be flowing.`;
 
-        console.warn(`CAM login session timeout. ${currentTime}`);
+        console.warn(noActiveSessionMessage);
         console.warn(error);
 
         const dialog = this.openmct.overlays.dialog({
             iconClass: 'alert',
-            message: `Your CAM login session has timed out - please login again. ${currentTime}`,
+            message: noActiveSessionMessage,
             buttons: [
                 {
                     label: 'Cancel',
@@ -194,7 +195,7 @@ class SessionService {
                     }
                 },
                 {
-                    label: 'Login',
+                    label: 'Refresh',
                     emphasis: true,
                     callback() {
                         dialog.dismiss();