summaryrefslogtreecommitdiffstats
path: root/sdnr/wt/odlux/framework/src/services
diff options
context:
space:
mode:
authorAijana Schumann <aijana.schumann@highstreet-technologies.com>2020-02-12 09:08:39 +0100
committerAijana Schumann <aijana.schumann@highstreet-technologies.com>2020-02-12 09:08:39 +0100
commitd0fc4329aa47fa3fdcc3a9f3af31e977ad21b979 (patch)
treee3083ab63c06a3bd228f4264e8c21ffdbdb205d7 /sdnr/wt/odlux/framework/src/services
parent06fb529a84d4e7d70b3aca68c33b2980049d5973 (diff)
Update odlux
Fix scrolling and resizing bug in all tables, update the ui, minior bugfixes Issue-ID: SDNC-1067 Signed-off-by: Aijana Schumann <aijana.schumann@highstreet-technologies.com> Change-Id: I6322d5f612dcbc0c044b4b67ef3c73d6d2c90949
Diffstat (limited to 'sdnr/wt/odlux/framework/src/services')
-rw-r--r--sdnr/wt/odlux/framework/src/services/forceLogoutService.ts9
-rw-r--r--sdnr/wt/odlux/framework/src/services/notificationService.ts11
2 files changed, 14 insertions, 6 deletions
diff --git a/sdnr/wt/odlux/framework/src/services/forceLogoutService.ts b/sdnr/wt/odlux/framework/src/services/forceLogoutService.ts
index ce4faab6b..0c7c38dff 100644
--- a/sdnr/wt/odlux/framework/src/services/forceLogoutService.ts
+++ b/sdnr/wt/odlux/framework/src/services/forceLogoutService.ts
@@ -27,11 +27,16 @@ let tickTimer = 15;
export const startForceLogoutService = (store: ApplicationStore) => {
applicationStore = store;
- createForceLogoutInterval();
+ if (process.env.NODE_ENV === "development") {
+ console.warn("logout timer not started in development mode");
+ } else {
+ createForceLogoutInterval();
+ }
+
};
const createForceLogoutInterval = () => {
- console.log("logout timer running...")
+ console.log("logout timer running...");
return setInterval(function () {
if (applicationStore && applicationStore.state.framework.authenticationState.user) {
diff --git a/sdnr/wt/odlux/framework/src/services/notificationService.ts b/sdnr/wt/odlux/framework/src/services/notificationService.ts
index 85d3f716b..c90da0946 100644
--- a/sdnr/wt/odlux/framework/src/services/notificationService.ts
+++ b/sdnr/wt/odlux/framework/src/services/notificationService.ts
@@ -179,10 +179,13 @@ export const startWebsocketSession = () => {
}
export const endWebsocketSession = () => {
- socketReady.then(websocket => {
- websocket.close();
- userLoggedOut = true;
- })
+ if (socketReady) {
+ socketReady.then(websocket => {
+ websocket.close();
+ userLoggedOut = true;
+ });
+ }
+
}