Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Designate time in notifications as wall clock time #152

Merged
merged 4 commits into from
Feb 22, 2024
Merged

Designate time in notifications as wall clock time #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4977049
update version to post release 1
davetsay Feb 21, 2024
0e2bc90
designate time as wall clock time
davetsay Feb 21, 2024
e448d36
missed two instances
davetsay Feb 21, 2024
c8aab9b
update poll failure message
davetsay Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "openmct-mcws",
"version": "5.2.0",
"version": "5.2.0-1",
"description": "Open MCT for MCWS",
"devDependencies": {
"@braintree/sanitize-url": "6.0.2",
Expand Down
11 changes: 6 additions & 5 deletions src/services/session/SessionService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.`);
}
}
};
Expand Down Expand Up @@ -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',
Expand All @@ -194,7 +195,7 @@ class SessionService {
}
},
{
label: 'Login',
label: 'Refresh',
emphasis: true,
callback() {
dialog.dismiss();
Expand Down
Loading