Added some simple testing for what is possible.

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

__snapshots__/compas-session.md

@@ -0,0 +1,66 @@
+# `compas-session`
+
+## `Dialog when almost expired`
+
+####   `looks like the latest snapshot`
+
+```html
+<mwc-dialog
+  heading="[compas.session.headingExpiring]"
+  id="compasSessionExpiringDialog"
+  scrimclickaction=""
+>
+  <div>
+    [compas.session.explainExpiring]
+  </div>
+  <mwc-button
+    dialogaction="close"
+    slot="primaryAction"
+  >
+    [compas.session.continue]
+  </mwc-button>
+</mwc-dialog>
+
+```
+
+## `Dialog when expired without document`
+
+####   `looks like the latest snapshot`
+
+```html
+<mwc-dialog
+  "=""
+  escapekeyaction=""
+  heading="[compas.session.headingExpired]"
+  id="compasSessionExpiredDialog"
+  scrimclickaction=""
+>
+  <div>
+    [compas.session.explainExpiredWithoutProject]
+  </div>
+</mwc-dialog>
+
+```
+
+## `Dialog when expired with document`
+
+####   `looks like the latest snapshot`
+
+```html
+<mwc-dialog
+  "=""
+  escapekeyaction=""
+  heading="[compas.session.headingExpired]"
+  id="compasSessionExpiredDialog"
+  scrimclickaction=""
+>
+  <div>
+    [compas.session.explainExpiredWithProject]
+  </div>
+  <mwc-button slot="primaryAction">
+    [compas.session.saveProject]
+  </mwc-button>
+</mwc-dialog>
+
+```
+

__snapshots__/open-scd.md

@@ -1203,6 +1203,10 @@
     Save
   </mwc-button>
 </mwc-dialog>
+<compas-session-expiring-dialog>
+</compas-session-expiring-dialog>
+<compas-session-expired-dialog>
+</compas-session-expired-dialog>
 
 ```
 

src/compas/CompasSession.ts

@@ -4,7 +4,8 @@ import {Dialog} from "@material/mwc-dialog";
 
 import {saveDocumentToFile} from "../file.js";
 import {getOpenScdElement} from "./foundation.js";
-import {CompasUserInfoService} from "../compas-services/CompasUserInfoService";
+
+import {CompasUserInfoService} from "../compas-services/CompasUserInfoService.js";
 
 @customElement('compas-session-expiring-dialog')
 export class CompasSessionExpiringDialogElement extends LitElement {
@@ -151,19 +152,17 @@ export function renderCompasSessionDialogs(doc: Document | null, docName: string
 }
 
 let pingTimer: NodeJS.Timeout | null = null;
-let pingScheduled = false;
 
 async function executeKeepAlivePing() {
   await CompasUserInfoService().ping()
-    .finally(() => pingScheduled = false)
+    .finally(() => pingTimer = null)
 }
 
 function schedulePing() {
-  if (!pingTimer || !pingScheduled) {
+  if (!pingTimer) {
     // Every minute we will send a Ping to the CoMPAS Services while the user is still active.
     // This to keep the connection alive so long the user is working.
     pingTimer = setTimeout(executeKeepAlivePing, (60 * 1000));
-    pingScheduled = true;
   }
 }
 
@@ -177,7 +176,7 @@ function showExpiredSessionMessage() {
   unregisterEvents();
 }
 
-function resetTimer() {
+export function resetTimer() {
   CompasSessionExpiringDialogElement.getElement().resetTimer();
   CompasSessionExpiredDialogElement.getElement().resetTimer();
   schedulePing();
@@ -191,7 +190,6 @@ function unregisterEvents() {
 function registerEvents() {
   window.addEventListener('click', resetTimer);
   window.addEventListener('keydown', resetTimer);
-  resetTimer();
 }
 
 export function setSessionTimeouts(sessionWarning: number, sessionExpires: number): void {
@@ -201,5 +199,6 @@ export function setSessionTimeouts(sessionWarning: number, sessionExpires: numbe
   CompasSessionExpiringDialogElement.getElement().expiringSessionWarning = expiringSessionWarning;
   CompasSessionExpiringDialogElement.getElement().expiredSessionMessage = expiredSessionMessage;
   CompasSessionExpiredDialogElement.getElement().expiredSessionMessage = expiredSessionMessage;
+  resetTimer();
   registerEvents();
 }

test/unit/compas/CompasSession.test.ts

@@ -0,0 +1,62 @@
+import {expect, fixture, html} from "@open-wc/testing";
+
+import {
+  CompasSessionExpiredDialogElement,
+  CompasSessionExpiringDialogElement,
+  resetTimer,
+  setSessionTimeouts
+} from "../../../src/compas/CompasSession.js";
+
+import "../../../src/compas/CompasSession.js";
+
+describe('compas-session', () => {
+  describe('Dialog when almost expired', () => {
+    let element: CompasSessionExpiringDialogElement;
+
+    beforeEach(async () => {
+      element = await fixture(
+        html`
+          <compas-session-expiring-dialog></compas-session-expiring-dialog>`
+      );
+    });
+
+    it('looks like the latest snapshot', () => {
+      expect(element).shadowDom
+        .to.equalSnapshot();
+    });
+  });
+
+  describe('Dialog when expired without document', () => {
+    let element: CompasSessionExpiredDialogElement;
+
+    beforeEach(async () => {
+      element = await fixture(
+        html`
+          <compas-session-expired-dialog></compas-session-expired-dialog>`
+      );
+    });
+
+    it('looks like the latest snapshot', () => {
+      expect(element).shadowDom
+        .to.equalSnapshot();
+    });
+  });
+
+  describe('Dialog when expired with document', () => {
+    const docName = 'station123.scd';
+    const doc = new Document();
+    let element: CompasSessionExpiredDialogElement;
+
+    beforeEach(async () => {
+      element = await fixture(
+        html`
+          <compas-session-expired-dialog .doc="${doc}" .docName="${docName}"></compas-session-expired-dialog>`
+      );
+    });
+
+    it('looks like the latest snapshot', () => {
+      expect(element).shadowDom
+        .to.equalSnapshot();
+    });
+  });
+});