Skip to content

Commit fac8ce9

Browse files
author
Dennis Labordus
committed
Refactoring foundation functions, more stable.
Signed-off-by: Dennis Labordus <[email protected]>
1 parent 8d05bf9 commit fac8ce9

File tree

1 file changed

+14
-22
lines changed

1 file changed

+14
-22
lines changed

src/compas/CompasSession.ts

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,9 @@ export class CompasSessionExpiringDialogElement extends LitElement {
2121

2222
private expiringSessionWarningTimer: NodeJS.Timeout | null = null;
2323

24-
static getElement(): CompasSessionExpiringDialogElement | null {
25-
const openScd = getOpenScdElement();
26-
if (openScd !== null) {
27-
return (<CompasSessionExpiringDialogElement>openScd
28-
.shadowRoot!.querySelector('compas-session-expiring-dialog'));
29-
}
30-
return null;
24+
static getElement(): CompasSessionExpiringDialogElement {
25+
return (<CompasSessionExpiringDialogElement>getOpenScdElement()!
26+
.shadowRoot!.querySelector('compas-session-expiring-dialog'));
3127
}
3228

3329
resetTimer(): void {
@@ -88,13 +84,9 @@ export class CompasSessionExpiredDialogElement extends LitElement {
8884

8985
private expiredSessionMessageTimer: NodeJS.Timeout | null = null;
9086

91-
static getElement(): CompasSessionExpiredDialogElement | null {
92-
const openScd = getOpenScdElement();
93-
if (openScd !== null) {
94-
return (<CompasSessionExpiredDialogElement>openScd
95-
.shadowRoot!.querySelector('compas-session-expired-dialog'));
96-
}
97-
return null;
87+
static getElement(): CompasSessionExpiredDialogElement {
88+
return (<CompasSessionExpiredDialogElement>getOpenScdElement()!
89+
.shadowRoot!.querySelector('compas-session-expired-dialog'));
9890
}
9991

10092
resetTimer(): void {
@@ -181,18 +173,18 @@ function schedulePing() {
181173
}
182174

183175
function showExpiringSessionWarning() {
184-
CompasSessionExpiringDialogElement.getElement()!.show();
176+
CompasSessionExpiringDialogElement.getElement().show();
185177
}
186178

187179
function showExpiredSessionMessage() {
188-
CompasSessionExpiringDialogElement.getElement()!.close();
189-
CompasSessionExpiredDialogElement.getElement()!.show();
180+
CompasSessionExpiringDialogElement.getElement().close();
181+
CompasSessionExpiredDialogElement.getElement().show();
190182
unregisterEvents();
191183
}
192184

193185
export function resetTimer(): void {
194-
CompasSessionExpiringDialogElement.getElement()!.resetTimer();
195-
CompasSessionExpiredDialogElement.getElement()!.resetTimer();
186+
CompasSessionExpiringDialogElement.getElement().resetTimer();
187+
CompasSessionExpiredDialogElement.getElement().resetTimer();
196188
schedulePing();
197189
}
198190

@@ -210,9 +202,9 @@ export function setSessionTimeouts(sessionWarning: number, sessionExpires: numbe
210202
const expiringSessionWarning = sessionWarning * 60 * 1000;
211203
const expiredSessionMessage = sessionExpires * 60 * 1000;
212204

213-
CompasSessionExpiringDialogElement.getElement()!.expiringSessionWarning = expiringSessionWarning;
214-
CompasSessionExpiringDialogElement.getElement()!.expiredSessionMessage = expiredSessionMessage;
215-
CompasSessionExpiredDialogElement.getElement()!.expiredSessionMessage = expiredSessionMessage;
205+
CompasSessionExpiringDialogElement.getElement().expiringSessionWarning = expiringSessionWarning;
206+
CompasSessionExpiringDialogElement.getElement().expiredSessionMessage = expiredSessionMessage;
207+
CompasSessionExpiredDialogElement.getElement().expiredSessionMessage = expiredSessionMessage;
216208
resetTimer();
217209
registerEvents();
218210
}

0 commit comments

Comments
 (0)