1 files changed, 5 insertions, 6 deletions

diff --git a/client/src/app/core/routing/preload-selected-modules-list.ts b/client/src/app/core/routing/preload-selected-modules-list.ts
index 8a458ec3e..3bca60317 100644
--- a/client/src/app/core/routing/preload-selected-modules-list.ts
+++ b/client/src/app/core/routing/preload-selected-modules-list.ts
@@ -1,14 +1,13 @@
-import { Route, PreloadingStrategy } from '@angular/router'
-import { Observable } from 'rxjs/Observable'
-import 'rxjs/add/observable/timer'
-import 'rxjs/add/operator/switchMap'
+import { Observable, timer as observableTimer, of as ofObservable } from 'rxjs'
+import { switchMap } from 'rxjs/operators'
+import { PreloadingStrategy, Route } from '@angular/router'
 
 export class PreloadSelectedModulesList implements PreloadingStrategy {
   preload (route: Route, load: Function): Observable<any> {
-    if (!route.data || !route.data.preload) return Observable.of(null)
+    if (!route.data || !route.data.preload) return ofObservable(null)
 
     if (typeof route.data.preload === 'number') {
-      return Observable.timer(route.data.preload).switchMap(() => load())
+      return observableTimer(route.data.preload).pipe(switchMap(() => load()))
     }
 
     return load()