RX5 => RX6

src/Squidex/app-config/webpack.run.base.js

@@ -17,15 +17,6 @@ module.exports = webpackMerge(commonConfig, {
     },
 
     plugins: [
-        /**
-         * Shares common code between the pages.
-         *
-         * See: https://webpack.js.org/plugins/commons-chunk-plugin/
-         */
-        new webpack.optimize.CommonsChunkPlugin({
-            name: ['app', 'shims']
-        }),
-
         /**
          * Simplifies creation of HTML files to serve your webpack bundles.
          * This is especially useful for webpack bundles that include a hash in the filename

src/Squidex/app/features/administration/guards/unset-user.guard.spec.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Observable } from 'rxjs';
+import { of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
 
 import { UsersState } from './../state/users.state';
@@ -22,7 +22,7 @@ describe('UnsetUserGuard', () => {
 
     it('should unset user', () => {
         usersState.setup(x => x.select(null))
-            .returns(() => Observable.of(null));
+            .returns(() => of(null));
 
         let result: boolean;
 

src/Squidex/app/features/administration/guards/unset-user.guard.ts

@@ -8,6 +8,7 @@
 import { Injectable } from '@angular/core';
 import { CanActivate } from '@angular/router';
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { UsersState } from './../state/users.state';
 
@@ -19,6 +20,6 @@ export class UnsetUserGuard implements CanActivate {
     }
 
     public canActivate(): Observable<boolean> {
-        return this.usersState.select(null).map(u => u === null);
+        return this.usersState.select(null).pipe(map(u => u === null));
     }
 }

src/Squidex/app/features/administration/guards/user-must-exist.guard.spec.ts

@@ -6,7 +6,7 @@
  */
 
 import { Router } from '@angular/router';
-import { Observable } from 'rxjs';
+import { of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
 
 import { UserDto } from './../services/users.service';
@@ -32,7 +32,7 @@ describe('UserMustExistGuard', () => {
 
     it('should load user and return true when found', () => {
         usersState.setup(x => x.select('123'))
-            .returns(() => Observable.of(<UserDto>{}));
+            .returns(() => of(<UserDto>{}));
 
         let result: boolean;
 
@@ -47,7 +47,7 @@ describe('UserMustExistGuard', () => {
 
     it('should load user and return false when not found', () => {
         usersState.setup(x => x.select('123'))
-            .returns(() => Observable.of(null));
+            .returns(() => of(null));
 
         let result: boolean;
 

src/Squidex/app/features/administration/guards/user-must-exist.guard.ts

@@ -8,6 +8,7 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router';
 import { Observable } from 'rxjs';
+import { map, tap } from 'rxjs/operators';
 
 import { allParams } from '@app/framework';
 
@@ -25,13 +26,13 @@ export class UserMustExistGuard implements CanActivate {
         const userId = allParams(route)['userId'];
 
         const result =
-            this.usersState.select(userId)
-                .do(dto => {
+            this.usersState.select(userId).pipe(
+                tap(dto => {
                     if (!dto) {
                         this.router.navigate(['/404']);
                     }
-                })
-                .map(u => u !== null);
+                }),
+                map(u => u !== null));
 
         return result;
     }

src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts

@@ -6,7 +6,8 @@
  */
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { Observable, Subscription } from 'rxjs';
+import { Subscription, timer } from 'rxjs';
+import { onErrorResumeNext, switchMap } from 'rxjs/operators';
 
 import { ModalView } from '@app/shared';
 
@@ -34,28 +35,28 @@ export class EventConsumersPageComponent implements OnDestroy, OnInit {
     }
 
     public ngOnInit() {
-        this.eventConsumersState.load(false, true).onErrorResumeNext().subscribe();
+        this.eventConsumersState.load(false, true).pipe(onErrorResumeNext()).subscribe();
 
         this.timerSubscription =
-            Observable.timer(2000, 2000)
-                .switchMap(x => this.eventConsumersState.load(true, true).onErrorResumeNext())
+            timer(2000, 2000).pipe(
+                    switchMap(x => this.eventConsumersState.load(true, true)), onErrorResumeNext())
                 .subscribe();
     }
 
     public reload() {
-        this.eventConsumersState.load(true, false).onErrorResumeNext().subscribe();
+        this.eventConsumersState.load(true, false).pipe(onErrorResumeNext()).subscribe();
     }
 
     public start(es: EventConsumerDto) {
-        this.eventConsumersState.start(es).onErrorResumeNext().subscribe();
+        this.eventConsumersState.start(es).pipe(onErrorResumeNext()).subscribe();
     }
 
     public stop(es: EventConsumerDto) {
-        this.eventConsumersState.stop(es).onErrorResumeNext().subscribe();
+        this.eventConsumersState.stop(es).pipe(onErrorResumeNext()).subscribe();
     }
 
     public reset(es: EventConsumerDto) {
-        this.eventConsumersState.reset(es).onErrorResumeNext().subscribe();
+        this.eventConsumersState.reset(es).pipe(onErrorResumeNext()).subscribe();
     }
 
     public trackByEventConsumer(index: number, es: EventConsumerDto) {

src/Squidex/app/features/administration/pages/users/users-page.component.ts

@@ -7,6 +7,7 @@
 
 import { Component, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import { UserDto } from './../../services/users.service';
 import { UsersState } from './../../state/users.state';
@@ -25,31 +26,31 @@ export class UsersPageComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.usersState.load().onErrorResumeNext().subscribe();
+        this.usersState.load().pipe(onErrorResumeNext()).subscribe();
     }
 
     public reload() {
-        this.usersState.load(true).onErrorResumeNext().subscribe();
+        this.usersState.load(true).pipe(onErrorResumeNext()).subscribe();
     }
 
     public search() {
-        this.usersState.search(this.usersFilter.value).onErrorResumeNext().subscribe();
+        this.usersState.search(this.usersFilter.value).pipe(onErrorResumeNext()).subscribe();
     }
 
     public goPrev() {
-        this.usersState.goPrev().onErrorResumeNext().subscribe();
+        this.usersState.goPrev().pipe(onErrorResumeNext()).subscribe();
     }
 
     public goNext() {
-        this.usersState.goNext().onErrorResumeNext().subscribe();
+        this.usersState.goNext().pipe(onErrorResumeNext()).subscribe();
     }
 
     public lock(user: UserDto) {
-        this.usersState.lock(user).onErrorResumeNext().subscribe();
+        this.usersState.lock(user).pipe(onErrorResumeNext()).subscribe();
     }
 
     public unlock(user: UserDto) {
-        this.usersState.unlock(user).onErrorResumeNext().subscribe();
+        this.usersState.unlock(user).pipe(onErrorResumeNext()).subscribe();
     }
 
     public trackByUser(index: number, userInfo: { user: UserDto }) {

src/Squidex/app/features/administration/services/event-consumers.service.spec.ts

@@ -32,7 +32,7 @@ describe('EventConsumersService', () => {
     it('should make get request to get event consumers',
         inject([EventConsumersService, HttpTestingController], (eventConsumersService: EventConsumersService, httpMock: HttpTestingController) => {
 
-        let eventConsumers: EventConsumerDto[] | null = null;
+        let eventConsumers: EventConsumerDto[];
 
         eventConsumersService.getEventConsumers().subscribe(result => {
             eventConsumers = result;
@@ -60,10 +60,11 @@ describe('EventConsumersService', () => {
             }
         ]);
 
-        expect(eventConsumers).toEqual([
-            new EventConsumerDto('event-consumer1', true, true, 'an error 1', '13'),
-            new EventConsumerDto('event-consumer2', true, true, 'an error 2', '29')
-        ]);
+        expect(eventConsumers!).toEqual(
+            [
+                new EventConsumerDto('event-consumer1', true, true, 'an error 1', '13'),
+                new EventConsumerDto('event-consumer2', true, true, 'an error 2', '29')
+            ]);
     }));
 
     it('should make put request to start event consumer',

src/Squidex/app/features/administration/services/event-consumers.service.ts

@@ -8,13 +8,13 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-
-import '@app/framework/angular/http/http-extensions';
+import { map } from 'rxjs/operators';
 
 import {
     ApiUrlConfig,
     HTTP,
-    Model
+    Model,
+    pretifyError
 } from '@app/shared';
 
 export class EventConsumerDto extends Model {
@@ -44,8 +44,8 @@ export class EventConsumersService {
     public getEventConsumers(): Observable<EventConsumerDto[]> {
         const url = this.apiUrl.buildUrl('/api/event-consumers');
 
-        return HTTP.getVersioned<any>(this.http, url)
-                .map(response => {
+        return HTTP.getVersioned<any>(this.http, url).pipe(
+                map(response => {
                     const body = response.payload.body;
 
                     const items: any[] = body;
@@ -58,28 +58,28 @@ export class EventConsumersService {
                             item.error,
                             item.position);
                     });
-                })
-                .pretifyError('Failed to load event consumers. Please reload.');
+                }),
+                pretifyError('Failed to load event consumers. Please reload.'));
     }
 
     public putStart(name: string): Observable<any> {
         const url = this.apiUrl.buildUrl(`api/event-consumers/${name}/start`);
 
-        return HTTP.putVersioned(this.http, url, {})
-                .pretifyError('Failed to start event consumer. Please reload.');
+        return HTTP.putVersioned(this.http, url, {}).pipe(
+                pretifyError('Failed to start event consumer. Please reload.'));
     }
 
     public putStop(name: string): Observable<any> {
         const url = this.apiUrl.buildUrl(`api/event-consumers/${name}/stop`);
 
-        return HTTP.putVersioned(this.http, url, {})
-                .pretifyError('Failed to stop event consumer. Please reload.');
+        return HTTP.putVersioned(this.http, url, {}).pipe(
+                pretifyError('Failed to stop event consumer. Please reload.'));
     }
 
     public putReset(name: string): Observable<any> {
         const url = this.apiUrl.buildUrl(`api/event-consumers/${name}/reset`);
 
-        return HTTP.putVersioned(this.http, url, {})
-                .pretifyError('Failed to reset event consumer. Please reload.');
+        return HTTP.putVersioned(this.http, url, {}).pipe(
+                pretifyError('Failed to reset event consumer. Please reload.'));
     }
 }

src/Squidex/app/features/administration/services/users.service.spec.ts

@@ -38,7 +38,7 @@ describe('UsersService', () => {
     it('should make get request to get many users',
         inject([UsersService, HttpTestingController], (userManagementService: UsersService, httpMock: HttpTestingController) => {
 
-        let users: UsersDto | null = null;
+        let users: UsersDto;
 
         userManagementService.getUsers(20, 30).subscribe(result => {
             users = result;
@@ -67,7 +67,7 @@ describe('UsersService', () => {
             ]
         });
 
-        expect(users).toEqual(
+        expect(users!).toEqual(
             new UsersDto(100, [
                 new UserDto('123', 'mail1@domain.com', 'User1', true),
                 new UserDto('456', 'mail2@domain.com', 'User2', true)
@@ -77,7 +77,7 @@ describe('UsersService', () => {
     it('should make get request with query to get many users',
         inject([UsersService, HttpTestingController], (userManagementService: UsersService, httpMock: HttpTestingController) => {
 
-        let users: UsersDto | null = null;
+        let users: UsersDto;
 
         userManagementService.getUsers(20, 30, 'my-query').subscribe(result => {
             users = result;
@@ -106,7 +106,7 @@ describe('UsersService', () => {
             ]
         });
 
-        expect(users).toEqual(
+        expect(users!).toEqual(
             new UsersDto(100, [
                 new UserDto('123', 'mail1@domain.com', 'User1', true),
                 new UserDto('456', 'mail2@domain.com', 'User2', true)
@@ -116,7 +116,7 @@ describe('UsersService', () => {
     it('should make get request to get single user',
         inject([UsersService, HttpTestingController], (userManagementService: UsersService, httpMock: HttpTestingController) => {
 
-        let user: UserDto | null = null;
+        let user: UserDto;
 
         userManagementService.getUser('123').subscribe(result => {
             user = result;
@@ -135,7 +135,7 @@ describe('UsersService', () => {
             isLocked: true
         });
 
-        expect(user).toEqual(new UserDto('123', 'mail1@domain.com', 'User1', true));
+        expect(user!).toEqual(new UserDto('123', 'mail1@domain.com', 'User1', true));
     }));
 
     it('should make post request to create user',
@@ -143,7 +143,7 @@ describe('UsersService', () => {
 
         const dto = new CreateUserDto('mail@squidex.io', 'Squidex User', 'password');
 
-        let user: UserDto | null = null;
+        let user: UserDto;
 
         userManagementService.postUser(dto).subscribe(result => {
             user = result;
@@ -156,7 +156,7 @@ describe('UsersService', () => {
 
         req.flush({ id: '123', pictureUrl: 'path/to/image1' });
 
-        expect(user).toEqual(new UserDto('123', dto.email, dto.displayName, false));
+        expect(user!).toEqual(new UserDto('123', dto.email, dto.displayName, false));
     }));
 
     it('should make put request to update user',

src/Squidex/app/features/administration/services/users.service.ts

@@ -8,13 +8,13 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-
-import '@app/framework/angular/http/http-extensions';
+import { map } from 'rxjs/operators';
 
 import {
     ApiUrlConfig,
     HTTP,
-    Model
+    Model,
+    pretifyError
 } from '@app/shared';
 
 export class UsersDto extends Model {
@@ -74,8 +74,8 @@ export class UsersService {
     public getUsers(take: number, skip: number, query?: string): Observable<UsersDto> {
         const url = this.apiUrl.buildUrl(`api/user-management?take=${take}&skip=${skip}&query=${query || ''}`);
 
-        return HTTP.getVersioned<any>(this.http, url)
-                .map(response => {
+        return HTTP.getVersioned<any>(this.http, url).pipe(
+                map(response => {
                     const body = response.payload.body;
 
                     const items: any[] = body.items;
@@ -89,15 +89,15 @@ export class UsersService {
                     });
 
                     return new UsersDto(body.total, users);
-                })
-                .pretifyError('Failed to load users. Please reload.');
+                }),
+                pretifyError('Failed to load users. Please reload.'));
     }
 
     public getUser(id: string): Observable<UserDto> {
         const url = this.apiUrl.buildUrl(`api/user-management/${id}`);
 
-        return HTTP.getVersioned<any>(this.http, url)
-                .map(response => {
+        return HTTP.getVersioned<any>(this.http, url).pipe(
+                map(response => {
                     const body = response.payload.body;
 
                     return new UserDto(
@@ -105,15 +105,15 @@ export class UsersService {
                         body.email,
                         body.displayName,
                         body.isLocked);
-                })
-                .pretifyError('Failed to load user. Please reload.');
+                }),
+                pretifyError('Failed to load user. Please reload.'));
     }
 
     public postUser(dto: CreateUserDto): Observable<UserDto> {
         const url = this.apiUrl.buildUrl('api/user-management');
 
-        return HTTP.postVersioned<any>(this.http, url, dto)
-                .map(response => {
+        return HTTP.postVersioned<any>(this.http, url, dto).pipe(
+                map(response => {
                     const body = response.payload.body;
 
                     return new UserDto(
@@ -121,28 +121,28 @@ export class UsersService {
                         dto.email,
                         dto.displayName,
                         false);
-                })
-                .pretifyError('Failed to create user. Please reload.');
+                }),
+                pretifyError('Failed to create user. Please reload.'));
     }
 
     public putUser(id: string, dto: UpdateUserDto): Observable<any> {
         const url = this.apiUrl.buildUrl(`api/user-management/${id}`);
 
-        return HTTP.putVersioned(this.http, url, dto)
-                .pretifyError('Failed to update user. Please reload.');
+        return HTTP.putVersioned(this.http, url, dto).pipe(
+                pretifyError('Failed to update user. Please reload.'));
     }
 
     public lockUser(id: string): Observable<any> {
         const url = this.apiUrl.buildUrl(`api/user-management/${id}/lock`);
 
-        return HTTP.putVersioned(this.http, url, {})
-                .pretifyError('Failed to load users. Please retry.');
+        return HTTP.putVersioned(this.http, url, {}).pipe(
+                pretifyError('Failed to load users. Please retry.'));
     }
 
     public unlockUser(id: string): Observable<any> {
         const url = this.apiUrl.buildUrl(`api/user-management/${id}/unlock`);
 
-        return HTTP.putVersioned(this.http, url, {})
-                .pretifyError('Failed to load users. Please retry.');
+        return HTTP.putVersioned(this.http, url, {}).pipe(
+                pretifyError('Failed to load users. Please retry.'));
     }
 }

src/Squidex/app/features/administration/state/event-consumers.state.spec.ts

@@ -5,7 +5,8 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Observable } from 'rxjs';
+import { of, throwError } from 'rxjs';
+import { onErrorResumeNext } from 'rxjs/operators';
 import { IMock, It, Mock, Times } from 'typemoq';
 
 import { DialogService } from '@app/shared';
@@ -29,7 +30,7 @@ describe('EventConsumersState', () => {
         eventConsumersService = Mock.ofType<EventConsumersService>();
 
         eventConsumersService.setup(x => x.getEventConsumers())
-            .returns(() => Observable.of(oldConsumers));
+            .returns(() => of(oldConsumers));
 
         eventConsumersState = new EventConsumersState(dialogs.object, eventConsumersService.object);
         eventConsumersState.load().subscribe();
@@ -50,25 +51,25 @@ describe('EventConsumersState', () => {
 
     it('should show notification on load error when silent is true', () => {
         eventConsumersService.setup(x => x.getEventConsumers())
-            .returns(() => Observable.throw({}));
+            .returns(() => throwError({}));
 
-        eventConsumersState.load(true, true).onErrorResumeNext().subscribe();
+        eventConsumersState.load(true, true).pipe(onErrorResumeNext()).subscribe();
 
         dialogs.verify(x => x.notifyError(It.isAny()), Times.once());
     });
 
     it('should not show notification on load error when flag is false', () => {
         eventConsumersService.setup(x => x.getEventConsumers())
-            .returns(() => Observable.throw({}));
+            .returns(() => throwError({}));
 
-        eventConsumersState.load().onErrorResumeNext().subscribe();
+        eventConsumersState.load().pipe(onErrorResumeNext()).subscribe();
 
         dialogs.verify(x => x.notifyError(It.isAny()), Times.never());
     });
 
     it('should unmark as stopped when started', () => {
         eventConsumersService.setup(x => x.putStart(oldConsumers[1].name))
-            .returns(() => Observable.of({}));
+            .returns(() => of({}));
 
         eventConsumersState.start(oldConsumers[1]).subscribe();
 
@@ -79,7 +80,7 @@ describe('EventConsumersState', () => {
 
     it('should mark as stopped when stopped', () => {
         eventConsumersService.setup(x => x.putStop(oldConsumers[0].name))
-            .returns(() => Observable.of({}));
+            .returns(() => of({}));
 
         eventConsumersState.stop(oldConsumers[0]).subscribe();
 
@@ -90,7 +91,7 @@ describe('EventConsumersState', () => {
 
     it('should mark as resetting when reset', () => {
         eventConsumersService.setup(x => x.putReset(oldConsumers[0].name))
-            .returns(() => Observable.of({}));
+            .returns(() => of({}));
 
         eventConsumersState.reset(oldConsumers[0]).subscribe();
 

src/Squidex/app/features/administration/state/event-consumers.state.ts

@@ -6,13 +6,13 @@
  */
 
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-
-import '@app/framework/utils/rxjs-extensions';
+import { Observable, throwError } from 'rxjs';
+import { catchError, distinctUntilChanged, map, tap } from 'rxjs/operators';
 
 import {
     DialogService,
     ImmutableArray,
+    notify,
     State
 } from '@app/shared';
 
@@ -27,12 +27,12 @@ interface Snapshot {
 @Injectable()
 export class EventConsumersState extends State<Snapshot> {
     public eventConsumers =
-        this.changes.map(x => x.eventConsumers)
-            .distinctUntilChanged();
+        this.changes.pipe(map(x => x.eventConsumers),
+            distinctUntilChanged());
 
     public isLoaded =
-        this.changes.map(x => !!x.isLoaded)
-            .distinctUntilChanged();
+        this.changes.pipe(map(x => !!x.isLoaded),
+            distinctUntilChanged());
 
     constructor(
         private readonly dialogs: DialogService,
@@ -46,8 +46,8 @@ export class EventConsumersState extends State<Snapshot> {
             this.resetState();
         }
 
-        return this.eventConsumersService.getEventConsumers()
-            .do(dtos => {
+        return this.eventConsumersService.getEventConsumers().pipe(
+            tap(dtos => {
                 if (isReload && !silent) {
                     this.dialogs.notifyInfo('Event Consumers reloaded.');
                 }
@@ -57,38 +57,38 @@ export class EventConsumersState extends State<Snapshot> {
 
                     return { ...s, eventConsumers, isLoaded: true };
                 });
-            })
-            .catch(error => {
+            }),
+            catchError(error => {
                 if (silent) {
                     this.dialogs.notifyError(error);
                 }
 
-                return Observable.throw(error);
-            });
+                return throwError(error);
+            }));
     }
 
     public start(eventConsumer: EventConsumerDto): Observable<any> {
-        return this.eventConsumersService.putStart(eventConsumer.name)
-            .do(() => {
+        return this.eventConsumersService.putStart(eventConsumer.name).pipe(
+            tap(() => {
                 this.replaceEventConsumer(setStopped(eventConsumer, false));
-            })
-            .notify(this.dialogs);
+            }),
+            notify(this.dialogs));
     }
 
     public stop(eventConsumer: EventConsumerDto): Observable<any> {
-        return this.eventConsumersService.putStop(eventConsumer.name)
-            .do(() => {
+        return this.eventConsumersService.putStop(eventConsumer.name).pipe(
+            tap(() => {
                 this.replaceEventConsumer(setStopped(eventConsumer, true));
-            })
-            .notify(this.dialogs);
+            }),
+            notify(this.dialogs));
     }
 
     public reset(eventConsumer: EventConsumerDto): Observable<any> {
-        return this.eventConsumersService.putReset(eventConsumer.name)
-            .do(() => {
+        return this.eventConsumersService.putReset(eventConsumer.name).pipe(
+            tap(() => {
                 this.replaceEventConsumer(reset(eventConsumer));
-            })
-            .notify(this.dialogs);
+            }),
+            notify(this.dialogs));
     }
 
     private replaceEventConsumer(eventConsumer: EventConsumerDto) {

src/Squidex/app/features/administration/state/users.state.spec.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Observable } from 'rxjs';
+import { of, throwError } from 'rxjs';
 import { IMock, It, Mock, Times } from 'typemoq';
 
 import { AuthService, DialogService } from '@app/shared';
@@ -44,7 +44,7 @@ describe('UsersState', () => {
         usersService = Mock.ofType<UsersService>();
 
         usersService.setup(x => x.getUsers(10, 0, undefined))
-            .returns(() => Observable.of(new UsersDto(200, oldUsers)));
+            .returns(() => of(new UsersDto(200, oldUsers)));
 
         usersState = new UsersState(authService.object, dialogs.object, usersService.object);
         usersState.load().subscribe();
@@ -76,7 +76,7 @@ describe('UsersState', () => {
         ];
 
         usersService.setup(x => x.getUsers(10, 0, undefined))
-            .returns(() => Observable.of(new UsersDto(200, newUsers)));
+            .returns(() => of(new UsersDto(200, newUsers)));
 
         usersState.load().subscribe();
 
@@ -98,7 +98,7 @@ describe('UsersState', () => {
 
     it('should return user on select and load when not loaded', () => {
         usersService.setup(x => x.getUser('id3'))
-            .returns(() => Observable.of(newUser));
+            .returns(() => of(newUser));
 
         let selectedUser: UserDto;
 
@@ -127,7 +127,7 @@ describe('UsersState', () => {
 
     it('should return null on select when user is not found', () => {
         usersService.setup(x => x.getUser('unknown'))
-            .returns(() => Observable.throw({}));
+            .returns(() => throwError({}));
 
         let selectedUser: UserDto;
 
@@ -141,7 +141,7 @@ describe('UsersState', () => {
 
     it('should mark as locked when locked', () => {
         usersService.setup(x => x.lockUser('id1'))
-            .returns(() => Observable.of({}));
+            .returns(() => of({}));
 
         usersState.select('id1').subscribe();
         usersState.lock(oldUsers[0]).subscribe();
@@ -149,12 +149,12 @@ describe('UsersState', () => {
         const user_1 = usersState.snapshot.users.at(0);
 
         expect(user_1.user.isLocked).toBeTruthy();
-        expect(user_1).toBe(usersState.snapshot.selectedUser);
+        expect(user_1).toBe(usersState.snapshot.selectedUser!);
     });
 
     it('should unmark as locked when unlocked', () => {
         usersService.setup(x => x.unlockUser('id2'))
-            .returns(() => Observable.of({}));
+            .returns(() => of({}));
 
         usersState.select('id2').subscribe();
         usersState.unlock(oldUsers[1]).subscribe();
@@ -162,14 +162,14 @@ describe('UsersState', () => {
         const user_1 = usersState.snapshot.users.at(1);
 
         expect(user_1.user.isLocked).toBeFalsy();
-        expect(user_1).toBe(usersState.snapshot.selectedUser);
+        expect(user_1).toBe(usersState.snapshot.selectedUser!);
     });
 
     it('should update user properties when updated', () => {
         const request = new UpdateUserDto('new@mail.com', 'New');
 
         usersService.setup(x => x.putUser('id1', request))
-            .returns(() => Observable.of({}));
+            .returns(() => of({}));
 
         usersState.select('id1').subscribe();
         usersState.update(oldUsers[0], request).subscribe();
@@ -178,14 +178,14 @@ describe('UsersState', () => {
 
         expect(user_1.user.email).toEqual('new@mail.com');
         expect(user_1.user.displayName).toEqual('New');
-        expect(user_1).toBe(usersState.snapshot.selectedUser);
+        expect(user_1).toBe(usersState.snapshot.selectedUser!);
     });
 
     it('should add user to snapshot when created', () => {
         const request = new CreateUserDto(newUser.email, newUser.displayName, 'password');
 
         usersService.setup(x => x.postUser(request))
-            .returns(() => Observable.of(newUser));
+            .returns(() => of(newUser));
 
         usersState.create(request).subscribe();
 
@@ -199,7 +199,7 @@ describe('UsersState', () => {
 
     it('should load next page and prev page when paging', () => {
         usersService.setup(x => x.getUsers(10, 10, undefined))
-            .returns(() => Observable.of(new UsersDto(200, [])));
+            .returns(() => of(new UsersDto(200, [])));
 
         usersState.goNext().subscribe();
         usersState.goPrev().subscribe();
@@ -210,7 +210,7 @@ describe('UsersState', () => {
 
     it('should load with query when searching', () => {
         usersService.setup(x => x.getUsers(10, 0, 'my-query'))
-            .returns(() => Observable.of(new UsersDto(0, [])));
+            .returns(() => of(new UsersDto(0, [])));
 
         usersState.search('my-query').subscribe();
 

src/Squidex/app/features/administration/state/users.state.ts

@@ -7,7 +7,8 @@
 
 import { Injectable } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
+import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators';
 
 import '@app/framework/utils/rxjs-extensions';
 
@@ -16,6 +17,7 @@ import {
     DialogService,
     Form,
     ImmutableArray,
+    notify,
     Pager,
     State,
     ValidatorsEx
@@ -89,20 +91,20 @@ interface Snapshot {
 @Injectable()
 export class UsersState extends State<Snapshot> {
     public users =
-        this.changes.map(x => x.users)
-            .distinctUntilChanged();
+        this.changes.pipe(map(x => x.users),
+            distinctUntilChanged());
 
     public usersPager =
-        this.changes.map(x => x.usersPager)
-            .distinctUntilChanged();
+        this.changes.pipe(map(x => x.usersPager),
+            distinctUntilChanged());
 
     public selectedUser =
-        this.changes.map(x => x.selectedUser)
-            .distinctUntilChanged();
+        this.changes.pipe(map(x => x.selectedUser),
+            distinctUntilChanged());
 
     public isLoaded =
-        this.changes.map(x => !!x.isLoaded)
-            .distinctUntilChanged();
+        this.changes.pipe(map(x => !!x.isLoaded),
+            distinctUntilChanged());
 
     constructor(
         private readonly authState: AuthService,
@@ -113,24 +115,24 @@ export class UsersState extends State<Snapshot> {
     }
 
     public select(id: string | null): Observable<UserDto | null> {
-        return this.loadUser(id)
-            .do(selectedUser => {
+        return this.loadUser(id).pipe(
+            tap(selectedUser => {
                 this.next(s => ({ ...s, selectedUser }));
-            })
-            .map(x => x && x.user);
+            }),
+            map(x => x && x.user));
     }
 
     private loadUser(id: string | null) {
         return !id ?
-            Observable.of(null) :
-            Observable.of(this.snapshot.users.find(x => x.user.id === id))
-                .switchMap(user => {
+            of(null) :
+            of(this.snapshot.users.find(x => x.user.id === id)).pipe(
+                switchMap(user => {
                     if (!user) {
-                        return this.usersService.getUser(id).map(x => this.createUser(x)).catch(() => Observable.of(null));
+                        return this.usersService.getUser(id).pipe(map(x => this.createUser(x)), catchError(() => of(null)));
                     } else {
-                        return Observable.of(user);
+                        return of(user);
                     }
-                });
+                }));
     }
 
     public load(isReload = false): Observable<any> {
@@ -145,8 +147,8 @@ export class UsersState extends State<Snapshot> {
         return this.usersService.getUsers(
                 this.snapshot.usersPager.pageSize,
                 this.snapshot.usersPager.skip,
-                this.snapshot.usersQuery)
-            .do(dtos => {
+                this.snapshot.usersQuery).pipe(
+            tap(dtos => {
                 if (isReload) {
                     this.dialogs.notifyInfo('Users reloaded.');
                 }
@@ -163,43 +165,43 @@ export class UsersState extends State<Snapshot> {
 
                     return { ...s, users, usersPager, selectedUser, isLoaded: true };
                 });
-            })
-            .notify(this.dialogs);
+            }),
+            notify(this.dialogs));
     }
 
     public create(request: CreateUserDto): Observable<UserDto> {
-        return this.usersService.postUser(request)
-            .do(dto => {
+        return this.usersService.postUser(request).pipe(
+            tap(dto => {
                 this.next(s => {
                     const users = s.users.pushFront(this.createUser(dto));
                     const usersPager = s.usersPager.incrementCount();
 
                     return { ...s, users, usersPager };
                 });
-            });
+            }));
     }
 
     public update(user: UserDto, request: UpdateUserDto): Observable<any> {
-        return this.usersService.putUser(user.id, request)
-            .do(() => {
+        return this.usersService.putUser(user.id, request).pipe(
+            tap(() => {
                 this.replaceUser(update(user, request));
-            });
+            }));
     }
 
     public lock(user: UserDto): Observable<any> {
-        return this.usersService.lockUser(user.id)
-            .do(() => {
+        return this.usersService.lockUser(user.id).pipe(
+            tap(() => {
                 this.replaceUser(setLocked(user, true));
-            })
-            .notify(this.dialogs);
+            }),
+            notify(this.dialogs));
     }
 
     public unlock(user: UserDto): Observable<any> {
-        return this.usersService.unlockUser(user.id)
-            .do(() => {
+        return this.usersService.unlockUser(user.id).pipe(
+            tap(() => {
                 this.replaceUser(setLocked(user, false));
-            })
-            .notify(this.dialogs);
+            }),
+            notify(this.dialogs));
     }
 
     public search(query: string): Observable<any> {

src/Squidex/app/features/api/pages/graphql/graphql-page.component.ts

@@ -6,7 +6,8 @@
  */
 
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
-import { Observable } from 'rxjs';
+import { of } from 'rxjs';
+import { catchError } from 'rxjs/operators';
 
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
@@ -42,7 +43,7 @@ export class GraphQLPageComponent implements OnInit {
     }
 
     private request(params: any) {
-        return this.graphQlService.query(this.appsState.appName, params).catch(response => Observable.of(response.error)).toPromise();
+        return this.graphQlService.query(this.appsState.appName, params).pipe(catchError(response => of(response.error))).toPromise();
     }
 }
 

src/Squidex/app/features/apps/pages/apps-page.component.ts

@@ -6,6 +6,7 @@
  */
 
 import { Component, OnInit } from '@angular/core';
+import { take } from 'rxjs/operators';
 
 import {
     AppsState,
@@ -33,7 +34,8 @@ export class AppsPageComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.appsState.apps.take(1)
+        this.appsState.apps.pipe(
+                take(1))
             .subscribe(apps => {
                 if (this.onboardingService.shouldShow('dialog') && apps.length === 0) {
                     this.onboardingService.disable('dialog');

src/Squidex/app/features/assets/pages/assets-page.component.ts

@@ -9,6 +9,7 @@
 
 import { Component, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import { AppsState, AssetsState } from '@app/shared';
 
@@ -27,23 +28,23 @@ export class AssetsPageComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.assetsState.load().onErrorResumeNext().subscribe();
+        this.assetsState.load().pipe(onErrorResumeNext()).subscribe();
     }
 
     public reload() {
-        this.assetsState.load(true).onErrorResumeNext().subscribe();
+        this.assetsState.load(true).pipe(onErrorResumeNext()).subscribe();
     }
 
     public search() {
-        this.assetsState.search(this.assetsFilter.value).onErrorResumeNext().subscribe();
+        this.assetsState.search(this.assetsFilter.value).pipe(onErrorResumeNext()).subscribe();
     }
 
     public goNext() {
-        this.assetsState.goNext().onErrorResumeNext().subscribe();
+        this.assetsState.goNext().pipe(onErrorResumeNext()).subscribe();
     }
 
     public goPrev() {
-        this.assetsState.goPrev().onErrorResumeNext().subscribe();
+        this.assetsState.goPrev().pipe(onErrorResumeNext()).subscribe();
     }
 }
 

src/Squidex/app/features/content/pages/content/content-history.component.ts

@@ -7,7 +7,8 @@
 
 import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
+import { Observable, timer } from 'rxjs';
+import { delay, merge, switchMap } from 'rxjs/operators';
 
 import {
     allParams,
@@ -48,8 +49,10 @@ export class ContentHistoryComponent {
     }
 
     public events: Observable<HistoryEventDto[]> =
-        Observable.timer(0, 10000).merge(this.messageBus.of(HistoryChannelUpdated).delay(1000))
-            .switchMap(app => this.historyService.getHistory(this.appsState.appName, this.channel));
+        timer(0, 10000).pipe(
+            merge(this.messageBus.of(HistoryChannelUpdated)
+                .pipe(delay(1000))),
+            switchMap(app => this.historyService.getHistory(this.appsState.appName, this.channel)));
 
     constructor(
         private readonly appsState: AppsState,

src/Squidex/app/features/content/pages/content/content-page.component.ts

@@ -7,7 +7,8 @@
 
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { Observable, Subscription } from 'rxjs';
+import { Observable, of, Subscription } from 'rxjs';
+import { filter, map, onErrorResumeNext, switchMap } from 'rxjs/operators';
 
 import { ContentVersionSelected } from './../messages';
 
@@ -87,7 +88,7 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy,
                 });
 
         this.selectedSchemaSubscription =
-            this.schemasState.selectedSchema.filter(s => !!s).map(s => s!)
+            this.schemasState.selectedSchema.pipe(filter(s => !!s), map(s => s!))
                 .subscribe(schema => {
                     this.schema = schema;
 
@@ -95,7 +96,7 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy,
                 });
 
         this.contentSubscription =
-            this.contentsState.selectedContent.filter(c => !!c).map(c => c!)
+            this.contentsState.selectedContent.pipe(filter(c => !!c), map(c => c!))
                 .subscribe(content => {
                     this.content = content;
 
@@ -111,7 +112,7 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy,
 
     public canDeactivate(): Observable<boolean> {
         if (!this.contentForm.form.dirty || !this.content) {
-            return Observable.of(true);
+            return of(true);
         } else {
             return this.dialogs.confirmUnsavedChanges();
         }
@@ -175,7 +176,7 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy,
     }
 
     public discardChanges() {
-        this.contentsState.discardChanges(this.content).onErrorResumeNext().subscribe();
+        this.contentsState.discardChanges(this.content).pipe(onErrorResumeNext()).subscribe();
     }
 
     public publish() {
@@ -195,21 +196,21 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy,
     }
 
     public delete() {
-        this.contentsState.deleteMany([this.content]).onErrorResumeNext()
+        this.contentsState.deleteMany([this.content]).pipe(onErrorResumeNext())
             .subscribe(() => {
                 this.back();
             });
     }
 
     public publishChanges() {
-        this.dueTimeSelector.selectDueTime('Publish')
-            .switchMap(d => this.contentsState.publishChanges(this.content, d)).onErrorResumeNext()
+        this.dueTimeSelector.selectDueTime('Publish').pipe(
+                switchMap(d => this.contentsState.publishChanges(this.content, d)), onErrorResumeNext())
             .subscribe();
     }
 
     private changeContentItems(action: string, status: string) {
-        this.dueTimeSelector.selectDueTime(action)
-            .switchMap(d => this.contentsState.changeStatus(this.content, action, status, d)).onErrorResumeNext()
+        this.dueTimeSelector.selectDueTime(action).pipe(
+                switchMap(d => this.contentsState.changeStatus(this.content, action, status, d)), onErrorResumeNext())
             .subscribe();
     }
 

src/Squidex/app/features/content/pages/contents/contents-page.component.ts

@@ -7,6 +7,7 @@
 
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { Subscription } from 'rxjs';
+import { onErrorResumeNext, switchMap, tap } from 'rxjs/operators';
 
 import {
     AppLanguageDto,
@@ -72,7 +73,7 @@ export class ContentsPageComponent implements OnDestroy, OnInit {
 
                     this.schema = schema!;
 
-                    this.contentsState.init().onErrorResumeNext().subscribe();
+                    this.contentsState.init().pipe(onErrorResumeNext()).subscribe();
                 });
 
         this.contentsSubscription =
@@ -90,15 +91,15 @@ export class ContentsPageComponent implements OnDestroy, OnInit {
     }
 
     public reload() {
-        this.contentsState.load(true).onErrorResumeNext().subscribe();
+        this.contentsState.load(true).pipe(onErrorResumeNext()).subscribe();
     }
 
     public deleteSelected() {
-        this.contentsState.deleteMany(this.select()).onErrorResumeNext().subscribe();
+        this.contentsState.deleteMany(this.select()).pipe(onErrorResumeNext()).subscribe();
     }
 
     public delete(content: ContentDto) {
-        this.contentsState.deleteMany([content]).onErrorResumeNext().subscribe();
+        this.contentsState.deleteMany([content]).pipe(onErrorResumeNext()).subscribe();
     }
 
     public publish(content: ContentDto) {
@@ -138,36 +139,37 @@ export class ContentsPageComponent implements OnDestroy, OnInit {
             return;
         }
 
-        this.dueTimeSelector.selectDueTime(action)
-            .do(() => {
-                this.resetSelection();
-            })
-            .switchMap(d => this.contentsState.changeManyStatus(contents, action, d)).onErrorResumeNext()
+        this.dueTimeSelector.selectDueTime(action).pipe(
+                tap(() => {
+                    this.resetSelection();
+                }),
+                switchMap(d => this.contentsState.changeManyStatus(contents, action, d)),
+                onErrorResumeNext())
             .subscribe();
     }
 
     public goArchive(isArchive: boolean) {
         this.resetSelection();
 
-        this.contentsState.goArchive(isArchive).onErrorResumeNext().subscribe();
+        this.contentsState.goArchive(isArchive).pipe(onErrorResumeNext()).subscribe();
     }
 
     public goPrev() {
         this.resetSelection();
 
-        this.contentsState.goPrev().onErrorResumeNext().subscribe();
+        this.contentsState.goPrev().pipe(onErrorResumeNext()).subscribe();
     }
 
     public goNext() {
         this.resetSelection();
 
-        this.contentsState.goNext().onErrorResumeNext().subscribe();
+        this.contentsState.goNext().pipe(onErrorResumeNext()).subscribe();
     }
 
     public search(query: string) {
         this.resetSelection();
 
-        this.contentsState.search(query).onErrorResumeNext().subscribe();
+        this.contentsState.search(query).pipe(onErrorResumeNext()).subscribe();
     }
 
     public isItemSelected(content: ContentDto): boolean {

src/Squidex/app/features/content/pages/schemas/schemas-page.component.ts

@@ -7,6 +7,7 @@
 
 import { Component, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import { AppsState, SchemasState } from '@app/shared';
 
@@ -25,7 +26,7 @@ export class SchemasPageComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.schemasState.load().onErrorResumeNext().subscribe();
+        this.schemasState.load().pipe(onErrorResumeNext()).subscribe();
     }
 
     public trackByCategory(index: number, category: string) {

src/Squidex/app/features/content/shared/contents-selector.component.ts

@@ -6,6 +6,7 @@
  */
 
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import {
     ContentDto,
@@ -51,23 +52,23 @@ export class ContentsSelectorComponent implements OnInit {
     public ngOnInit() {
         this.contentsState.schema = this.schema;
 
-        this.contentsState.load().onErrorResumeNext().subscribe();
+        this.contentsState.load().pipe(onErrorResumeNext()).subscribe();
     }
 
     public reload() {
-        this.contentsState.load(true).onErrorResumeNext().subscribe();
+        this.contentsState.load(true).pipe(onErrorResumeNext()).subscribe();
     }
 
     public search(query: string) {
-        this.contentsState.search(query).onErrorResumeNext().subscribe();
+        this.contentsState.search(query).pipe(onErrorResumeNext()).subscribe();
     }
 
     public goNext() {
-        this.contentsState.goNext().onErrorResumeNext().subscribe();
+        this.contentsState.goNext().pipe(onErrorResumeNext()).subscribe();
     }
 
     public goPrev() {
-        this.contentsState.goPrev().onErrorResumeNext().subscribe();
+        this.contentsState.goPrev().pipe(onErrorResumeNext()).subscribe();
     }
 
     public isItemSelected(content: ContentDto) {

src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts

@@ -7,6 +7,7 @@
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { Subscription } from 'rxjs';
+import { filter, map, switchMap } from 'rxjs/operators';
 
 import {
     AppDto,
@@ -39,7 +40,7 @@ export class DashboardPageComponent implements OnDestroy, OnInit {
     public chartCallsCount: any;
     public chartCallsPerformance: any;
 
-    public app = this.appsState.selectedApp.filter(x => !!x).map(x => <AppDto>x);
+    public app = this.appsState.selectedApp.pipe(filter(x => !!x), map(x => <AppDto>x));
 
     public chartOptions = {
         responsive: true,
@@ -86,31 +87,31 @@ export class DashboardPageComponent implements OnDestroy, OnInit {
 
     public ngOnInit() {
         this.subscriptions.push(
-            this.app
-                .switchMap(app => this.usagesService.getTodayStorage(app.name))
+            this.app.pipe(
+                    switchMap(app => this.usagesService.getTodayStorage(app.name)))
                 .subscribe(dto => {
                     this.assetsCurrent = dto.size;
                     this.assetsMax = dto.maxAllowed;
                 }));
 
         this.subscriptions.push(
-            this.app
-                .switchMap(app => this.usagesService.getMonthCalls(app.name))
+            this.app.pipe(
+                    switchMap(app => this.usagesService.getMonthCalls(app.name)))
                 .subscribe(dto => {
                     this.callsCurrent = dto.count;
                     this.callsMax = dto.maxAllowed;
                 }));
 
         this.subscriptions.push(
-            this.app
-                .switchMap(app => this.historyService.getHistory(app.name, ''))
+            this.app.pipe(
+                    switchMap(app => this.historyService.getHistory(app.name, '')))
                 .subscribe(dto => {
                     this.history = dto;
                 }));
 
         this.subscriptions.push(
-            this.app
-                .switchMap(app => this.usagesService.getStorageUsages(app.name, DateTime.today().addDays(-20), DateTime.today()))
+            this.app.pipe(
+                    switchMap(app => this.usagesService.getStorageUsages(app.name, DateTime.today().addDays(-20), DateTime.today())))
                 .subscribe(dtos => {
                     this.chartStorageCount = {
                         labels: createLabels(dtos),
@@ -144,8 +145,8 @@ export class DashboardPageComponent implements OnDestroy, OnInit {
                 }));
 
         this.subscriptions.push(
-            this.app
-                .switchMap(app => this.usagesService.getCallsUsages(app.name, DateTime.today().addDays(-20), DateTime.today()))
+            this.app.pipe(
+                    switchMap(app => this.usagesService.getCallsUsages(app.name, DateTime.today().addDays(-20), DateTime.today())))
                 .subscribe(dtos => {
                     this.chartCallsCount = {
                         labels: createLabels(dtos),

src/Squidex/app/features/rules/pages/events/rule-events-page.component.ts

@@ -6,6 +6,7 @@
  */
 
 import { Component, OnInit } from '@angular/core';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import {
     AppsState,
@@ -28,23 +29,23 @@ export class RuleEventsPageComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.ruleEventsState.load().onErrorResumeNext().subscribe();
+        this.ruleEventsState.load().pipe(onErrorResumeNext()).subscribe();
     }
 
     public reload() {
-        this.ruleEventsState.load(true).onErrorResumeNext().subscribe();
+        this.ruleEventsState.load(true).pipe(onErrorResumeNext()).subscribe();
     }
 
     public goNext() {
-        this.ruleEventsState.goNext().onErrorResumeNext().subscribe();
+        this.ruleEventsState.goNext().pipe(onErrorResumeNext()).subscribe();
     }
 
     public goPrev() {
-        this.ruleEventsState.goPrev().onErrorResumeNext().subscribe();
+        this.ruleEventsState.goPrev().pipe(onErrorResumeNext()).subscribe();
     }
 
     public enqueue(event: RuleEventDto) {
-        this.ruleEventsState.enqueue(event).onErrorResumeNext().subscribe();
+        this.ruleEventsState.enqueue(event).pipe(onErrorResumeNext()).subscribe();
     }
 
     public selectEvent(id: string) {

src/Squidex/app/features/rules/pages/rules/rules-page.component.ts

@@ -6,6 +6,7 @@
  */
 
 import { Component, OnInit } from '@angular/core';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import {
     AppsState,
@@ -39,24 +40,24 @@ export class RulesPageComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.schemasState.load().onErrorResumeNext().subscribe();
+        this.schemasState.load().pipe(onErrorResumeNext()).subscribe();
 
-        this.rulesState.load().onErrorResumeNext().subscribe();
+        this.rulesState.load().pipe(onErrorResumeNext()).subscribe();
     }
 
     public reload() {
-        this.rulesState.load(true).onErrorResumeNext().subscribe();
+        this.rulesState.load(true).pipe(onErrorResumeNext()).subscribe();
     }
 
     public delete(rule: RuleDto) {
-        this.rulesState.delete(rule).onErrorResumeNext().subscribe();
+        this.rulesState.delete(rule).pipe(onErrorResumeNext()).subscribe();
     }
 
     public toggle(rule: RuleDto) {
         if (rule.isEnabled) {
-            this.rulesState.disable(rule).onErrorResumeNext().subscribe();
+            this.rulesState.disable(rule).pipe(onErrorResumeNext()).subscribe();
         } else {
-            this.rulesState.enable(rule).onErrorResumeNext().subscribe();
+            this.rulesState.enable(rule).pipe(onErrorResumeNext()).subscribe();
         }
     }
 

src/Squidex/app/features/schemas/pages/schema/field.component.ts

@@ -7,6 +7,7 @@
 
 import { Component, Input, OnInit } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import {
     AppPatternDto,
@@ -84,23 +85,23 @@ export class FieldComponent implements OnInit {
     }
 
     public deleteField() {
-        this.schemasState.deleteField(this.schema, this.field).onErrorResumeNext().subscribe();
+        this.schemasState.deleteField(this.schema, this.field).pipe(onErrorResumeNext()).subscribe();
     }
 
     public enableField() {
-        this.schemasState.enableField(this.schema, this.field).onErrorResumeNext().subscribe();
+        this.schemasState.enableField(this.schema, this.field).pipe(onErrorResumeNext()).subscribe();
     }
 
     public disableField() {
-        this.schemasState.disableField(this.schema, this.field).onErrorResumeNext().subscribe();
+        this.schemasState.disableField(this.schema, this.field).pipe(onErrorResumeNext()).subscribe();
     }
 
     public showField() {
-        this.schemasState.showField(this.schema, this.field).onErrorResumeNext().subscribe();
+        this.schemasState.showField(this.schema, this.field).pipe(onErrorResumeNext()).subscribe();
     }
 
     public hideField() {
-        this.schemasState.hideField(this.schema, this.field).onErrorResumeNext().subscribe();
+        this.schemasState.hideField(this.schema, this.field).pipe(onErrorResumeNext()).subscribe();
     }
 
     public sortFields(fields: NestedFieldDto[]) {
@@ -108,7 +109,7 @@ export class FieldComponent implements OnInit {
     }
 
     public lockField() {
-        this.schemasState.lockField(this.schema, this.field).onErrorResumeNext().subscribe();
+        this.schemasState.lockField(this.schema, this.field).pipe(onErrorResumeNext()).subscribe();
     }
 
     public trackByField(index: number, field: NestedFieldDto) {

src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts

@@ -8,6 +8,7 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Subscription } from 'rxjs';
+import { filter, map, onErrorResumeNext } from 'rxjs/operators';
 
 import {
     AppsState,
@@ -65,10 +66,10 @@ export class SchemaPageComponent implements OnDestroy, OnInit {
     }
 
     public ngOnInit() {
-        this.patternsState.load().onErrorResumeNext().subscribe();
+        this.patternsState.load().pipe(onErrorResumeNext()).subscribe();
 
         this.selectedSchemaSubscription =
-            this.schemasState.selectedSchema.filter(s => !!s).map(s => s!)
+            this.schemasState.selectedSchema.pipe(filter(s => !!s), map(s => s!))
                 .subscribe(schema => {
                     this.schema = schema;
 

src/Squidex/app/features/schemas/pages/schema/types/boolean-validation.component.ts

@@ -8,6 +8,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
 
 import { BooleanFieldPropertiesDto, FieldDto } from '@app/shared';
 
@@ -36,8 +37,7 @@ export class BooleanValidationComponent implements OnInit {
             new FormControl(this.properties.inlineEditable));
 
         this.showDefaultValue =
-            this.editForm.controls['isRequired'].valueChanges
-                .startWith(this.properties.isRequired)
-                .map(x => !x);
+            this.editForm.controls['isRequired'].valueChanges.pipe(
+                startWith(this.properties.isRequired), map(x => !x));
     }
 }

src/Squidex/app/features/schemas/pages/schema/types/date-time-validation.component.ts

@@ -8,6 +8,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
 
 import { DateTimeFieldPropertiesDto, FieldDto, ValidatorsEx } from '@app/shared';
 
@@ -51,13 +52,11 @@ export class DateTimeValidationComponent implements OnInit {
             ]));
 
         this.showDefaultValues =
-            this.editForm.controls['isRequired'].valueChanges
-                .startWith(this.properties.isRequired)
-                .map(x => !x);
+            this.editForm.controls['isRequired'].valueChanges.pipe(
+                startWith(this.properties.isRequired), map(x => !x));
 
         this.showDefaultValue =
-            this.editForm.controls['calculatedDefaultValue'].valueChanges
-                .startWith(this.properties.calculatedDefaultValue)
-                .map(x => !x);
+            this.editForm.controls['calculatedDefaultValue'].valueChanges.pipe(
+                startWith(this.properties.calculatedDefaultValue), map(x => !x));
     }
 }

src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.ts

@@ -8,6 +8,7 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { Observable, Subscription } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
 
 import { FieldDto, FloatConverter, NumberFieldPropertiesDto } from '@app/shared';
 
@@ -52,14 +53,12 @@ export class NumberUIComponent implements OnDestroy, OnInit {
             new FormControl(this.properties.inlineEditable));
 
         this.hideAllowedValues =
-            this.editForm.controls['editor'].valueChanges
-                .startWith(this.properties.editor)
-                .map(x => !(x && (x === 'Radio' || x === 'Dropdown')));
+            this.editForm.controls['editor'].valueChanges.pipe(
+                startWith(this.properties.editor), map(x => !(x && (x === 'Radio' || x === 'Dropdown'))));
 
         this.hideInlineEditable =
-            this.editForm.controls['editor'].valueChanges
-                .startWith(this.properties.editor)
-                .map(x => !(x && (x === 'Input' || x === 'Dropdown')));
+            this.editForm.controls['editor'].valueChanges.pipe(
+                startWith(this.properties.editor), map(x => !(x && (x === 'Input' || x === 'Dropdown'))));
 
         this.hideAllowedValuesSubscription =
             this.hideAllowedValues.subscribe(isSelection => {

src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.ts

@@ -8,6 +8,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
 
 import { FieldDto, NumberFieldPropertiesDto } from '@app/shared';
 
@@ -39,8 +40,7 @@ export class NumberValidationComponent implements OnInit {
             new FormControl(this.properties.defaultValue));
 
         this.showDefaultValue =
-            this.editForm.controls['isRequired'].valueChanges
-                .startWith(this.properties.isRequired)
-                .map(x => !x);
+            this.editForm.controls['isRequired'].valueChanges.pipe(
+                startWith(this.properties.isRequired), map(x => !x));
     }
 }

src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.ts

@@ -8,6 +8,7 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { Observable, Subscription } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
 
 import { FieldDto, StringFieldPropertiesDto } from '@app/shared';
 
@@ -50,14 +51,12 @@ export class StringUIComponent implements OnDestroy, OnInit {
             new FormControl(this.properties.inlineEditable));
 
         this.hideAllowedValues =
-            this.editForm.controls['editor'].valueChanges
-                .startWith(this.properties.editor)
-                .map(x => !(x && (x === 'Radio' || x === 'Dropdown')));
+            this.editForm.controls['editor'].valueChanges.pipe(
+                startWith(this.properties.editor), map(x => !(x && (x === 'Radio' || x === 'Dropdown'))));
 
         this.hideInlineEditable =
-            this.editForm.controls['editor'].valueChanges
-                .startWith(this.properties.editor)
-                .map(x => !(x && (x === 'Input' || x === 'Dropdown' || x === 'Slug')));
+            this.editForm.controls['editor'].valueChanges.pipe(
+                startWith(this.properties.editor), map(x => !(x && (x === 'Input' || x === 'Dropdown' || x === 'Slug'))));
 
         this.hideAllowedValuesSubscription =
             this.hideAllowedValues.subscribe(isSelection => {

src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts

@@ -8,6 +8,7 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { Observable, Subscription } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
 
 import {
     AppPatternDto,
@@ -65,14 +66,12 @@ export class StringValidationComponent implements OnDestroy, OnInit {
             new FormControl(this.properties.defaultValue));
 
         this.showDefaultValue =
-            this.editForm.controls['isRequired'].valueChanges
-                .startWith(this.properties.isRequired)
-                .map(x => !x);
+            this.editForm.controls['isRequired'].valueChanges.pipe(
+                startWith(this.properties.isRequired), map(x => !x));
 
         this.showPatternSuggestions =
-            this.editForm.controls['pattern'].valueChanges
-                .startWith('')
-                .map(x => !x || x.trim().length === 0);
+            this.editForm.controls['pattern'].valueChanges.pipe(
+                startWith(''), map(x => !x || x.trim().length === 0));
 
         this.showPatternMessage =
             this.editForm.controls['pattern'].value && this.editForm.controls['pattern'].value.trim().length > 0;

src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts

@@ -9,6 +9,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { FormBuilder, FormControl } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Subscription } from 'rxjs';
+import { map, onErrorResumeNext } from 'rxjs/operators';
 
 import {
     AppsState,
@@ -59,14 +60,14 @@ export class SchemasPageComponent implements OnDestroy, OnInit {
                     this.addSchemaDialog.show();
                 });
 
-        this.route.params.map(q => q['showDialog'])
+        this.route.params.pipe(map(q => q['showDialog']))
             .subscribe(showDialog => {
                 if (showDialog) {
                     this.addSchemaDialog.show();
                 }
             });
 
-        this.schemasState.load().onErrorResumeNext().subscribe();
+        this.schemasState.load().pipe(onErrorResumeNext()).subscribe();
     }
 
     public removeCategory(name: string) {

src/Squidex/app/features/settings/pages/backups/backups-page.component.ts

@@ -6,7 +6,8 @@
  */
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { Observable, Subscription } from 'rxjs';
+import { Subscription, timer } from 'rxjs';
+import { onErrorResumeNext, switchMap } from 'rxjs/operators';
 
 import {
     AppsState,
@@ -33,24 +34,24 @@ export class BackupsPageComponent implements OnInit, OnDestroy {
     }
 
     public ngOnInit() {
-        this.backupsState.load(false, true).onErrorResumeNext().subscribe();
+        this.backupsState.load(false, true).pipe(onErrorResumeNext()).subscribe();
 
         this.timerSubscription =
-            Observable.timer(3000, 3000)
-                .switchMap(t => this.backupsState.load(true, true).onErrorResumeNext())
+            timer(3000, 3000).pipe(
+                    switchMap(t => this.backupsState.load(true, true)), onErrorResumeNext())
                 .subscribe();
     }
 
     public reload() {
-        this.backupsState.load(true, false).onErrorResumeNext().subscribe();
+        this.backupsState.load(true, false).pipe(onErrorResumeNext()).subscribe();
     }
 
     public start() {
-        this.backupsState.start().onErrorResumeNext().subscribe();
+        this.backupsState.start().pipe(onErrorResumeNext()).subscribe();
     }
 
     public delete(backup: BackupDto) {
-        this.backupsState.delete(backup).onErrorResumeNext().subscribe();
+        this.backupsState.delete(backup).pipe(onErrorResumeNext()).subscribe();
     }
 
     public trackByBackup(index: number, item: BackupDto) {

src/Squidex/app/features/settings/pages/clients/client.component.ts

@@ -7,6 +7,7 @@
 
 import { Component, Input, OnChanges } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import {
     AccessTokenDto,
@@ -54,11 +55,11 @@ export class ClientComponent implements OnChanges {
     }
 
     public revoke() {
-        this.clientsState.revoke(this.client).onErrorResumeNext().subscribe();
+        this.clientsState.revoke(this.client).pipe(onErrorResumeNext()).subscribe();
     }
 
     public update(permission: string) {
-        this.clientsState.update(this.client, new UpdateAppClientDto(undefined, permission)).onErrorResumeNext().subscribe();
+        this.clientsState.update(this.client, new UpdateAppClientDto(undefined, permission)).pipe(onErrorResumeNext()).subscribe();
     }
 
     public toggleRename() {

src/Squidex/app/features/settings/pages/clients/clients-page.component.ts

@@ -7,6 +7,7 @@
 
 import { Component, OnInit } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import {
     AppClientDto,
@@ -32,11 +33,11 @@ export class ClientsPageComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.clientsState.load().onErrorResumeNext().subscribe();
+        this.clientsState.load().pipe(onErrorResumeNext()).subscribe();
     }
 
     public reload() {
-        this.clientsState.load(true).onErrorResumeNext().subscribe();
+        this.clientsState.load(true).pipe(onErrorResumeNext()).subscribe();
     }
 
     public attachClient() {
@@ -45,7 +46,7 @@ export class ClientsPageComponent implements OnInit {
         if (value) {
             const requestDto = new CreateAppClientDto(value.name);
 
-            this.clientsState.attach(requestDto).onErrorResumeNext()
+            this.clientsState.attach(requestDto).pipe(onErrorResumeNext())
                 .subscribe(() => {
                     this.addClientForm.submitCompleted();
                 }, error => {

src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts

@@ -8,6 +8,7 @@
 import { Component, Injectable, OnInit } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 import { Observable } from 'rxjs';
+import { filter, onErrorResumeNext, withLatestFrom } from 'rxjs/operators';
 
 import {
     AppContributorDto,
@@ -29,8 +30,8 @@ export class UsersDataSource implements AutocompleteSource {
     }
 
     public find(query: string): Observable<any[]> {
-        return this.usersService.getUsers(query)
-            .withLatestFrom(this.contributorsState.contributors.filter(x => !!x), (users, contributors) => {
+        return this.usersService.getUsers(query).pipe(
+            withLatestFrom(this.contributorsState.contributors.pipe(filter(x => !!x)), (users, contributors) => {
                 const results: any[] = [];
 
                 for (let user of users) {
@@ -39,7 +40,7 @@ export class UsersDataSource implements AutocompleteSource {
                     }
                 }
                 return results;
-            });
+            }));
     }
 }
 
@@ -65,19 +66,19 @@ export class ContributorsPageComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.contributorsState.load().onErrorResumeNext().subscribe();
+        this.contributorsState.load().pipe(onErrorResumeNext()).subscribe();
     }
 
     public reload() {
-        this.contributorsState.load(true).onErrorResumeNext().subscribe();
+        this.contributorsState.load(true).pipe(onErrorResumeNext()).subscribe();
     }
 
     public remove(contributor: AppContributorDto) {
-        this.contributorsState.revoke(contributor).onErrorResumeNext().subscribe();
+        this.contributorsState.revoke(contributor).pipe(onErrorResumeNext()).subscribe();
     }
 
     public changePermission(contributor: AppContributorDto, permission: string) {
-        this.contributorsState.assign(new AppContributorDto(contributor.contributorId, permission)).onErrorResumeNext().subscribe();
+        this.contributorsState.assign(new AppContributorDto(contributor.contributorId, permission)).pipe(onErrorResumeNext()).subscribe();
     }
 
     public assignContributor() {

src/Squidex/app/features/settings/pages/languages/language.component.ts

@@ -7,6 +7,7 @@
 
 import { Component, Input, OnChanges } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import {
     AppLanguageDto,
@@ -56,7 +57,7 @@ export class LanguageComponent implements OnChanges {
     }
 
     public remove() {
-        this.languagesState.remove(this.language).onErrorResumeNext().subscribe();
+        this.languagesState.remove(this.language).pipe(onErrorResumeNext()).subscribe();
     }
 
     public save() {

src/Squidex/app/features/settings/pages/languages/languages-page.component.ts

@@ -8,6 +8,7 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 import { Subscription } from 'rxjs';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import {
     AddLanguageForm,
@@ -46,11 +47,11 @@ export class LanguagesPageComponent implements OnDestroy, OnInit {
                     }
                 });
 
-        this.languagesState.load().onErrorResumeNext().subscribe();
+        this.languagesState.load().pipe(onErrorResumeNext()).subscribe();
     }
 
     public reload() {
-        this.languagesState.load(true).onErrorResumeNext().subscribe();
+        this.languagesState.load(true).pipe(onErrorResumeNext()).subscribe();
     }
 
     public addLanguage() {

src/Squidex/app/features/settings/pages/patterns/pattern.component.ts

@@ -7,6 +7,7 @@
 
 import { Component, Input, OnInit } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import {
     AppPatternDto,
@@ -40,7 +41,7 @@ export class PatternComponent implements OnInit {
     }
 
     public delete() {
-        this.patternsState.delete(this.pattern).onErrorResumeNext().subscribe();
+        this.patternsState.delete(this.pattern).pipe(onErrorResumeNext()).subscribe();
     }
 
     public save() {

src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts

@@ -6,6 +6,7 @@
  */
 
 import { Component, OnInit } from '@angular/core';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import {
     AppPatternDto,
@@ -26,11 +27,11 @@ export class PatternsPageComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.patternsState.load().onErrorResumeNext().subscribe();
+        this.patternsState.load().pipe(onErrorResumeNext()).subscribe();
     }
 
     public reload() {
-        this.patternsState.load(true).onErrorResumeNext().subscribe();
+        this.patternsState.load(true).pipe(onErrorResumeNext()).subscribe();
     }
 
     public trackByPattern(index: number, pattern: AppPatternDto) {

src/Squidex/app/features/settings/pages/plans/plans-page.component.ts

@@ -7,6 +7,7 @@
 
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import {
     ApiUrlConfig,
@@ -38,15 +39,15 @@ export class PlansPageComponent implements OnInit {
             this.overridePlanId = params['planId'];
         }).unsubscribe();
 
-        this.plansState.load(false, this.overridePlanId).onErrorResumeNext().subscribe();
+        this.plansState.load(false, this.overridePlanId).pipe(onErrorResumeNext()).subscribe();
     }
 
     public reload() {
-        this.plansState.load(true, this.overridePlanId).onErrorResumeNext().subscribe();
+        this.plansState.load(true, this.overridePlanId).pipe(onErrorResumeNext()).subscribe();
     }
 
     public change(planId: string) {
-        this.plansState.change(planId).onErrorResumeNext().subscribe();
+        this.plansState.change(planId).pipe(onErrorResumeNext()).subscribe();
     }
 
     public trackByPlan(index: number, planInfo: { plan: PlanDto }) {

src/Squidex/app/framework/angular/animations.ts

@@ -7,14 +7,14 @@
 
 import {
     animate,
-    AnimationEntryMetadata,
+    AnimationTriggerMetadata,
     state,
     style,
     transition,
     trigger
-} from '@angular/core';
+} from '@angular/animations';
 
-export function buildSlideRightAnimation(name = 'slideRight', timing = '150ms'): AnimationEntryMetadata {
+export function buildSlideRightAnimation(name = 'slideRight', timing = '150ms'): AnimationTriggerMetadata {
     return trigger(
         name, [
             transition(':enter', [
@@ -37,7 +37,7 @@ export function buildSlideRightAnimation(name = 'slideRight', timing = '150ms'):
     );
 }
 
-export function buildSlideAnimation(name = 'slide', timing = '400ms'): AnimationEntryMetadata {
+export function buildSlideAnimation(name = 'slide', timing = '400ms'): AnimationTriggerMetadata {
     return trigger(
         name, [
             transition(':enter', [
@@ -60,7 +60,7 @@ export function buildSlideAnimation(name = 'slide', timing = '400ms'): Animation
     );
 }
 
-export function buildFadeAnimation(name = 'fade', timing = '150ms'): AnimationEntryMetadata {
+export function buildFadeAnimation(name = 'fade', timing = '150ms'): AnimationTriggerMetadata {
     return trigger(
         name, [
             transition(':enter', [
@@ -83,7 +83,7 @@ export function buildFadeAnimation(name = 'fade', timing = '150ms'): AnimationEn
     );
 }
 
-export function buildHeightAnimation(name = 'height', timing = '200ms'): AnimationEntryMetadata {
+export function buildHeightAnimation(name = 'height', timing = '200ms'): AnimationTriggerMetadata {
     return trigger(
         name, [
             transition(':enter', [

src/Squidex/app/framework/angular/forms/autocomplete.component.ts

@@ -7,7 +7,8 @@
 
 import { Component, ContentChild, forwardRef, Input, OnDestroy, OnInit, TemplateRef } from '@angular/core';
 import { ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { Observable, Subscription } from 'rxjs';
+import { Observable, of, Subscription } from 'rxjs';
+import { catchError, debounceTime, distinctUntilChanged, filter, map, switchMap, tap } from 'rxjs/operators';
 
 export interface AutocompleteSource {
     find(query: string): Observable<any[]>;
@@ -60,21 +61,22 @@ export class AutocompleteComponent implements ControlValueAccessor, OnDestroy, O
 
     public ngOnInit() {
         this.subscription =
-            this.queryInput.valueChanges
-                .do(query => {
-                    this.callChange(query);
-                })
-                .map(query => <string>query)
-                .map(query => query ? query.trim() : query)
-                .do(query => {
-                    if (!query) {
-                        this.reset();
-                    }
-                })
-                .distinctUntilChanged()
-                .debounceTime(200)
-                .filter(query => !!query && !!this.source)
-                .switchMap(query => this.source.find(query)).catch(error => Observable.of([]))
+            this.queryInput.valueChanges.pipe(
+                    tap(query => {
+                        this.callChange(query);
+                    }),
+                    map(query => <string>query),
+                    map(query => query ? query.trim() : query),
+                    tap(query => {
+                        if (!query) {
+                            this.reset();
+                        }
+                    }),
+                    distinctUntilChanged(),
+                    debounceTime(200),
+                    filter(query => !!query && !!this.source),
+                    switchMap(query => this.source.find(query)),
+                    catchError(error => of([])))
                 .subscribe(items => {
                     this.reset();
                     this.items = items || [];

src/Squidex/app/framework/angular/forms/control-errors.component.ts

@@ -7,7 +7,7 @@
 
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Host, Input, OnChanges, OnDestroy, Optional } from '@angular/core';
 import { AbstractControl, FormGroupDirective } from '@angular/forms';
-import { Observable, Subscription } from 'rxjs';
+import { merge, Subscription } from 'rxjs';
 
 import { fadeAnimation, Types } from '@app/framework/internal';
 
@@ -93,7 +93,7 @@ export class ControlErrorsComponent implements OnChanges, OnDestroy {
 
             if (control) {
                 this.controlSubscription =
-                    Observable.merge(control.valueChanges, control.statusChanges)
+                    merge(control.valueChanges, control.statusChanges)
                         .subscribe(() => {
                             this.createMessages();
                         });

src/Squidex/app/framework/angular/forms/jscript-editor.component.ts

@@ -8,6 +8,7 @@
 import { AfterViewInit, Component, ElementRef, forwardRef, ViewChild } from '@angular/core';
 import { ControlValueAccessor,  NG_VALUE_ACCESSOR } from '@angular/forms';
 import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
 
 import { ResourceLoaderService, Types } from '@app/framework/internal';
 
@@ -64,7 +65,8 @@ export class JscriptEditorComponent implements ControlValueAccessor, AfterViewIn
     }
 
     public ngAfterViewInit() {
-        this.valueChanged.debounceTime(500)
+        this.valueChanged.pipe(
+                debounceTime(500))
             .subscribe(() => {
                 this.changeValue();
             });

src/Squidex/app/framework/angular/forms/json-editor.component.ts

@@ -8,6 +8,7 @@
 import { AfterViewInit, Component, ElementRef, forwardRef, ViewChild } from '@angular/core';
 import { ControlValueAccessor,  NG_VALUE_ACCESSOR } from '@angular/forms';
 import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
 
 import { ResourceLoaderService } from '@app/framework/internal';
 
@@ -71,7 +72,8 @@ export class JsonEditorComponent implements ControlValueAccessor, AfterViewInit
     }
 
     public ngAfterViewInit() {
-        this.valueChanged.debounceTime(500)
+        this.valueChanged.pipe(
+                debounceTime(500))
             .subscribe(() => {
                 this.changeValue();
             });

src/Squidex/app/framework/angular/http/http-extensions-impl.ts

@@ -1,85 +0,0 @@
-/*
- * Squidex Headless CMS
- *
- * @license
- * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
- */
-
-import { HttpClient, HttpErrorResponse, HttpHeaders, HttpResponse } from '@angular/common/http';
-import { Observable } from 'rxjs';
-
-import { ErrorDto } from './../../utils/error';
-import { Types} from './../../utils/types';
-import { Version, Versioned } from './../../utils/version';
-
-export module HTTP {
-    export function getVersioned<T>(http: HttpClient, url: string, version?: Version): Observable<Versioned<HttpResponse<T>>> {
-        const headers = createHeaders(version);
-
-        return handleVersion(http.get<T>(url, { observe: 'response', headers }), version);
-    }
-
-    export function postVersioned<T>(http: HttpClient, url: string, body: any, version?: Version): Observable<Versioned<HttpResponse<T>>> {
-        const headers = createHeaders(version);
-
-        return handleVersion(http.post<T>(url, body, { observe: 'response', headers }), version);
-    }
-
-    export function putVersioned<T>(http: HttpClient, url: string, body: any, version?: Version): Observable<Versioned<HttpResponse<T>>> {
-        const headers = createHeaders(version);
-
-        return handleVersion(http.put<T>(url, body, { observe: 'response', headers }), version);
-    }
-
-    export function patchVersioned<T>(http: HttpClient, url: string, body: any, version?: Version): Observable<Versioned<HttpResponse<T>>> {
-        const headers = createHeaders(version);
-
-        return handleVersion(http.request<T>('PATCH', url, { body, observe: 'response', headers }), version);
-    }
-
-    export function deleteVersioned<T>(http: HttpClient, url: string, version?: Version): Observable<Versioned<HttpResponse<T>>> {
-        const headers = createHeaders(version);
-
-        return handleVersion(http.delete<T>(url, { observe: 'response', headers }), version);
-    }
-
-    function createHeaders(version?: Version): HttpHeaders {
-        if (version && version.value && version.value.length > 0) {
-            return new HttpHeaders().set('If-Match', version.value);
-        } else {
-            return new HttpHeaders();
-        }
-    }
-
-    function handleVersion<T>(httpRequest: Observable<HttpResponse<T>>, version?: Version): Observable<Versioned<HttpResponse<T>>> {
-        return httpRequest.map((response: HttpResponse<T>) => {
-            const etag = response.headers.get('etag') || '';
-
-            return new Versioned(new Version(etag), response);
-        });
-    }
-}
-
-export function pretifyError(message: string): Observable<any> {
-    return this.catch((response: HttpErrorResponse) => {
-        let result: ErrorDto | null = null;
-
-        if (!Types.is(response.error, Error)) {
-            try {
-                const errorDto = Types.isObject(response.error) ? response.error : JSON.parse(response.error);
-
-                if (response.status === 412) {
-                    result = new ErrorDto(response.status, 'Failed to make the update. Another user has made a change. Please reload.');
-                } else if (response.status !== 500) {
-                    result = new ErrorDto(response.status, errorDto.message, errorDto.details);
-                }
-            } catch (e) {
-                result = new ErrorDto(500, 'Failed to make the request.');
-            }
-        }
-
-        result = result || new ErrorDto(500, message);
-
-        return Observable.throw(result);
-    });
-}

src/Squidex/app/framework/angular/http/http-extensions.ts

@@ -5,16 +5,81 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Observable } from 'rxjs/Observable';
+import { HttpClient, HttpErrorResponse, HttpHeaders, HttpResponse } from '@angular/common/http';
+import { Observable, throwError } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
 
-import { pretifyError } from './http-extensions-impl';
+import { ErrorDto } from './../../utils/error';
+import { Types} from './../../utils/types';
+import { Version, Versioned } from './../../utils/version';
 
-/* tslint:disable:no-shadowed-variable */
+export module HTTP {
+    export function getVersioned<T>(http: HttpClient, url: string, version?: Version): Observable<Versioned<HttpResponse<T>>> {
+        const headers = createHeaders(version);
 
-declare module 'rxjs/Observable' {
-    interface Observable<T> {
-        pretifyError(message: string): Observable<any>;
+        return handleVersion(http.get<T>(url, { observe: 'response', headers }), version);
+    }
+
+    export function postVersioned<T>(http: HttpClient, url: string, body: any, version?: Version): Observable<Versioned<HttpResponse<T>>> {
+        const headers = createHeaders(version);
+
+        return handleVersion(http.post<T>(url, body, { observe: 'response', headers }), version);
+    }
+
+    export function putVersioned<T>(http: HttpClient, url: string, body: any, version?: Version): Observable<Versioned<HttpResponse<T>>> {
+        const headers = createHeaders(version);
+
+        return handleVersion(http.put<T>(url, body, { observe: 'response', headers }), version);
+    }
+
+    export function patchVersioned<T>(http: HttpClient, url: string, body: any, version?: Version): Observable<Versioned<HttpResponse<T>>> {
+        const headers = createHeaders(version);
+
+        return handleVersion(http.request<T>('PATCH', url, { body, observe: 'response', headers }), version);
+    }
+
+    export function deleteVersioned<T>(http: HttpClient, url: string, version?: Version): Observable<Versioned<HttpResponse<T>>> {
+        const headers = createHeaders(version);
+
+        return handleVersion(http.delete<T>(url, { observe: 'response', headers }), version);
+    }
+
+    function createHeaders(version?: Version): HttpHeaders {
+        if (version && version.value && version.value.length > 0) {
+            return new HttpHeaders().set('If-Match', version.value);
+        } else {
+            return new HttpHeaders();
+        }
+    }
+
+    function handleVersion<T>(httpRequest: Observable<HttpResponse<T>>, version?: Version): Observable<Versioned<HttpResponse<T>>> {
+        return httpRequest.pipe(map((response: HttpResponse<T>) => {
+            const etag = response.headers.get('etag') || '';
+
+            return new Versioned(new Version(etag), response);
+        }));
     }
 }
 
-Observable.prototype['pretifyError'] = pretifyError;
+export const pretifyError = (message: string) => <T>(source: Observable<T>) =>
+    source.pipe(catchError((response: HttpErrorResponse) => {
+        let result: ErrorDto | null = null;
+
+        if (!Types.is(response.error, Error)) {
+            try {
+                const errorDto = Types.isObject(response.error) ? response.error : JSON.parse(response.error);
+
+                if (response.status === 412) {
+                    result = new ErrorDto(response.status, 'Failed to make the update. Another user has made a change. Please reload.');
+                } else if (response.status !== 500) {
+                    result = new ErrorDto(response.status, errorDto.message, errorDto.details);
+                }
+            } catch (e) {
+                result = new ErrorDto(500, 'Failed to make the request.');
+            }
+        }
+
+        result = result || new ErrorDto(500, message);
+
+        return throwError(result);
+    }));

src/Squidex/app/framework/angular/routers/can-deactivate.guard.spec.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Observable } from 'rxjs';
+import { of } from 'rxjs';
 
 import { CanDeactivateGuard } from './can-deactivate.guard';
 
@@ -17,7 +17,7 @@ describe('CanDeactivateGuard', () => {
             canDeactivate: () => {
                 called = true;
 
-                return Observable.of(true);
+                return of(true);
             }
         };
 

src/Squidex/app/framework/declarations.ts

@@ -27,7 +27,7 @@ export * from './angular/forms/toggle.component';
 export * from './angular/forms/transform-input.directive';
 export * from './angular/forms/validators';
 
-export * from './angular/http/http-extensions-impl';
+export * from './angular/http/http-extensions';
 
 export * from './angular/modals/dialog-renderer.component';
 export * from './angular/modals/modal-dialog.component';

src/Squidex/app/framework/internal.ts

@@ -27,6 +27,7 @@ export * from './utils/lazy';
 export * from './utils/math-helper';
 export * from './utils/modal-view';
 export * from './utils/pager';
+export * from './utils/rxjs-extensions';
 export * from './utils/string-helper';
 export * from './utils/types';
 export * from './utils/version';

src/Squidex/app/framework/services/analytics.service.ts

@@ -7,6 +7,7 @@
 
 import { Injectable } from '@angular/core';
 import { NavigationEnd, Router } from '@angular/router';
+import { filter } from 'rxjs/operators';
 
 import { AnalyticsIdConfig } from '../configurations';
 import { Types } from './../utils/types';
@@ -32,7 +33,8 @@ export class AnalyticsService {
         if (analyticsId && router && resourceLoader && window.location.hostname !== 'localhost') {
             this.gtag('config', analyticsId.value, { anonymize_ip: true });
 
-            router.events.filter(e => Types.is(e, NavigationEnd))
+            router.events.pipe(
+                    filter(e => Types.is(e, NavigationEnd)))
                 .subscribe(() => {
                     this.gtag('config', analyticsId.value, { page_path: window.location.pathname, anonymize_ip: true });
                 });

src/Squidex/app/framework/services/dialog.service.spec.ts

@@ -70,7 +70,7 @@ describe('DialogService', () => {
         const dialogService = new DialogService();
         const notification = Notification.error('Message');
 
-        let publishedNotification: Notification | null = null;
+        let publishedNotification: Notification;
 
         dialogService.notifications.subscribe(result => {
             publishedNotification = result;
@@ -78,13 +78,13 @@ describe('DialogService', () => {
 
         dialogService.notify(notification);
 
-        expect(publishedNotification).toBe(notification);
+        expect(publishedNotification!).toBe(notification);
     });
 
     it('should publish dialog request', () => {
         const dialogService = new DialogService();
 
-        let pushedDialog: DialogRequest | null = null;
+        let pushedDialog: DialogRequest;
 
         dialogService.dialogs.subscribe(result => {
             pushedDialog = result;
@@ -92,6 +92,6 @@ describe('DialogService', () => {
 
         dialogService.confirm('MyTitle', 'MyText');
 
-        expect(pushedDialog).toEqual(new DialogRequest('MyTitle', 'MyText'));
+        expect(pushedDialog!).toEqual(new DialogRequest('MyTitle', 'MyText'));
     });
 });

src/Squidex/app/framework/services/message-bus.service.ts

@@ -7,6 +7,7 @@
 
 import { Injectable } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
 
 interface Message {
     channel: string;
@@ -30,6 +31,6 @@ export class MessageBus {
     public of<T>(messageType: { new(...args: any[]): T }): Observable<T> {
         const channel = (<any>messageType).name;
 
-        return this.message$.filter(m => m.channel === channel).map(m => m.data);
+        return this.message$.pipe(filter(m => m.channel === channel), map(m => m.data));
     }
 }

src/Squidex/app/framework/state.ts

@@ -7,6 +7,7 @@
 
 import { AbstractControl } from '@angular/forms';
 import { BehaviorSubject, Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { ErrorDto, Types } from '@app/framework/internal';
 import { fullValue} from './angular/forms/forms-helper';
@@ -21,10 +22,10 @@ export class Form<T extends AbstractControl> {
     private readonly state = new State<FormState>({ submitted: false });
 
     public submitted =
-        this.state.changes.map(s => s.submitted);
+        this.state.changes.pipe(map(s => s.submitted));
 
     public error =
-        this.state.changes.map(s => s.error);
+        this.state.changes.pipe(map(s => s.error));
 
     constructor(
         public readonly form: T

src/Squidex/app/framework/utils/date-helper.spec.ts

@@ -11,7 +11,7 @@ import { DateHelper } from './date-helper';
 
 describe('DateHelper', () => {
     it('should call config method of moment object', () => {
-        let called: string | null = null;
+        let called: string;
 
         DateHelper.setMoment({
             locale: (l: string) => { called = l; }
@@ -19,7 +19,7 @@ describe('DateHelper', () => {
 
         DateHelper.locale('en');
 
-        expect(called).toBe('en');
+        expect(called!).toBe('en');
     });
 
     it('should use global moment if not configured', () => {

src/Squidex/app/framework/utils/immutable-array.spec.ts

@@ -20,9 +20,9 @@ describe('ImmutableArray', () => {
         const array_c = ImmutableArray.of([]);
         const array_d = ImmutableArray.empty();
 
-        expect(array_b).toBe(array_a);
-        expect(array_c).toBe(array_a);
-        expect(array_d).toBe(array_a);
+        expect(array_b).toBe(<any>array_a);
+        expect(array_c).toBe(<any>array_a);
+        expect(array_d).toBe(<any>array_a);
     });
 
     it('should create non empty instance', () => {

src/Squidex/app/framework/utils/modal-view.spec.ts

@@ -67,13 +67,13 @@ describe('ModalView', () => {
     });
 
     function checkValue(dialog: ModalView, expected: boolean) {
-        let result: boolean | null = null;
+        let result: boolean;
 
         dialog.isOpen.subscribe(value => {
             result = value;
         }).unsubscribe();
 
-        expect(result).toBe(expected);
+        expect(result!).toBe(expected);
     }
 });
 

src/Squidex/app/framework/utils/pager.spec.ts

@@ -11,7 +11,7 @@ describe('Pager', () => {
     it('should init with default values', () => {
         const pager_1 = new Pager(0);
 
-        expect(Object.assign({}, pager_1)).toEqual({
+        expect(Object.assign({}, pager_1)).toEqual(<any>{
             page: 0,
             pageSize: 10,
             itemFirst: 0,
@@ -26,7 +26,7 @@ describe('Pager', () => {
     it('should init with page size and page', () => {
         const pager_1 = new Pager(23, 2, 10);
 
-        expect(Object.assign({}, pager_1)).toEqual({
+        expect(Object.assign({}, pager_1)).toEqual(<any>{
             page: 2,
             pageSize: 10,
             itemFirst: 21,
@@ -42,7 +42,7 @@ describe('Pager', () => {
         const pager_1 = new Pager(23, 2, 10);
         const pager_2 = pager_1.reset();
 
-        expect(Object.assign({}, pager_2)).toEqual({
+        expect(Object.assign({}, pager_2)).toEqual(<any>{
             page: 0,
             pageSize: 10,
             itemFirst: 0,
@@ -65,7 +65,7 @@ describe('Pager', () => {
         const pager_1 = new Pager(23, 0, 10);
         const pager_2 = pager_1.goNext();
 
-        expect(Object.assign({}, pager_2)).toEqual({
+        expect(Object.assign({}, pager_2)).toEqual(<any>{
             page: 1,
             pageSize: 10,
             itemFirst: 11,
@@ -88,7 +88,7 @@ describe('Pager', () => {
         const pager_1 = new Pager(23, 2, 10);
         const pager_2 = pager_1.goPrev();
 
-        expect(Object.assign({}, pager_2)).toEqual({
+        expect(Object.assign({}, pager_2)).toEqual(<any>{
             page: 1,
             pageSize: 10,
             itemFirst: 11,
@@ -104,7 +104,7 @@ describe('Pager', () => {
         const pager_1 = new Pager(23, 2, 10);
         const pager_2 = pager_1.setCount(30);
 
-        expect(Object.assign({}, pager_2)).toEqual({
+        expect(Object.assign({}, pager_2)).toEqual(<any>{
             page: 2,
             pageSize: 10,
             itemFirst: 21,
@@ -120,7 +120,7 @@ describe('Pager', () => {
         const pager_1 = new Pager(23, 1, 10);
         const pager_2 = pager_1.incrementCount().incrementCount();
 
-        expect(Object.assign({}, pager_2)).toEqual({
+        expect(Object.assign({}, pager_2)).toEqual(<any>{
             page: 1,
             pageSize: 10,
             itemFirst: 11,
@@ -136,7 +136,7 @@ describe('Pager', () => {
         const pager_1 = new Pager(23, 2, 10);
         const pager_2 = pager_1.incrementCount();
 
-        expect(Object.assign({}, pager_2)).toEqual({
+        expect(Object.assign({}, pager_2)).toEqual(<any>{
             page: 2,
             pageSize: 10,
             itemFirst: 21,
@@ -152,7 +152,7 @@ describe('Pager', () => {
         const pager_1 = new Pager(23, 1, 10);
         const pager_2 = pager_1.decrementCount().decrementCount();
 
-        expect(Object.assign({}, pager_2)).toEqual({
+        expect(Object.assign({}, pager_2)).toEqual(<any>{
             page: 1,
             pageSize: 10,
             itemFirst: 11,
@@ -168,7 +168,7 @@ describe('Pager', () => {
         const pager_1 = new Pager(23, 2, 10);
         const pager_2 = pager_1.decrementCount();
 
-        expect(Object.assign({}, pager_2)).toEqual({
+        expect(Object.assign({}, pager_2)).toEqual(<any>{
             page: 2,
             pageSize: 10,
             itemFirst: 21,
@@ -184,7 +184,7 @@ describe('Pager', () => {
         const pager_1 = new Pager(21, 2, 10);
         const pager_2 = pager_1.decrementCount();
 
-        expect(Object.assign({}, pager_2)).toEqual({
+        expect(Object.assign({}, pager_2)).toEqual(<any>{
             page: 1,
             pageSize: 10,
             itemFirst: 11,

src/Squidex/app/framework/utils/rxjs-extensions-impl.ts

@@ -1,22 +0,0 @@
-/*
- * Squidex Headless CMS
- *
- * @license
- * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
- */
-
-import { Observable } from 'rxjs';
-
-import { DialogService } from './../services/dialog.service';
-
-export function nextBy<T>(updater: (value: T) => T): void {
-    return this.next(updater(this.value));
-}
-
-export function notify(dialogs: DialogService) {
-    return this.catch((error: any) => {
-        dialogs.notifyError(error);
-
-        return Observable.throw(error);
-    });
-}

src/Squidex/app/framework/utils/rxjs-extensions.ts

@@ -5,27 +5,18 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { Observable } from 'rxjs/Observable';
+import { BehaviorSubject, Observable, throwError } from 'rxjs';
+import { catchError } from 'rxjs/operators';
 
 import { DialogService } from './../services/dialog.service';
 
-import { nextBy, notify } from './rxjs-extensions-impl';
-
 /* tslint:disable:no-shadowed-variable */
 
-declare module 'rxjs/BehaviorSubject' {
-    interface Observable<T> {
-        notify(dialogs: DialogService): Observable<T>;
-    }
-}
-
-BehaviorSubject.prototype['nextBy'] = nextBy;
+export const notify = (dialogs: DialogService) => <T>(source: Observable<T>) =>
+    source.pipe(catchError(error => {
+        dialogs.notifyError(error);
 
-declare module 'rxjs/Observable' {
-    interface Observable<T> {
-        notify(dialogs: DialogService): Observable<T>;
-    }
-}
+        return throwError(error);
+    }));
 
-Observable.prototype['notify'] = notify;
+export const nextBy = <T>(subject: BehaviorSubject<T>, updater: (value: T) => T) => subject.next(updater(this.value));

src/Squidex/app/framework/utils/types.spec.ts

@@ -10,7 +10,7 @@ import { Types } from './types';
 describe('Types', () => {
     it('should calculate hash string', () => {
         expect(Types.hash(null)).toBe('null');
-        expect(Types.hash(undefined)).toBe(undefined);
+        expect(Types.hash(undefined)).toBeUndefined();
 
         expect(Types.hash(new RegExp('.*'))).toEqual('{}');
     });

src/Squidex/app/shared/components/assets-list.component.ts

@@ -8,6 +8,7 @@
 // tslint:disable:prefer-for-of
 
 import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import {
     AssetDto,
@@ -42,19 +43,19 @@ export class AssetsListComponent {
     }
 
     public search() {
-        this.state.load().onErrorResumeNext().subscribe();
+        this.state.load().pipe(onErrorResumeNext()).subscribe();
     }
 
     public delete(asset: AssetDto) {
-        this.state.delete(asset).onErrorResumeNext().subscribe();
+        this.state.delete(asset).pipe(onErrorResumeNext()).subscribe();
     }
 
     public goNext() {
-        this.state.goNext().onErrorResumeNext().subscribe();
+        this.state.goNext().pipe(onErrorResumeNext()).subscribe();
     }
 
     public goPrev() {
-        this.state.goPrev().onErrorResumeNext().subscribe();
+        this.state.goPrev().pipe(onErrorResumeNext()).subscribe();
     }
 
     public trackByAsset(index: number, asset: AssetDto) {

src/Squidex/app/shared/components/assets-selector.component.ts

@@ -9,6 +9,7 @@
 
 import { Component, EventEmitter, OnInit, Output } from '@angular/core';
 import { FormControl } from '@angular/forms';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import {
     AssetDto,
@@ -39,17 +40,17 @@ export class AssetsSelectorComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.state.load().onErrorResumeNext().subscribe();
+        this.state.load().pipe(onErrorResumeNext()).subscribe();
 
         this.assetsFilter.setValue(this.state.snapshot.assetsQuery);
     }
 
     public reload() {
-        this.state.load(true).onErrorResumeNext().subscribe();
+        this.state.load(true).pipe(onErrorResumeNext()).subscribe();
     }
 
     public search() {
-        this.state.search(this.assetsFilter.value).onErrorResumeNext().subscribe();
+        this.state.search(this.assetsFilter.value).pipe(onErrorResumeNext()).subscribe();
     }
 
     public complete() {

src/Squidex/app/shared/components/history.component.ts

@@ -7,7 +7,8 @@
 
 import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
+import { Observable, timer } from 'rxjs';
+import { delay, merge, switchMap } from 'rxjs/operators';
 
 import {
     allParams,
@@ -27,8 +28,9 @@ export class HistoryComponent {
     private readonly channel = this.calculateChannel();
 
     public events: Observable<HistoryEventDto[]> =
-        Observable.timer(0, 10000).merge(this.messageBus.of(HistoryChannelUpdated).delay(1000))
-            .switchMap(app => this.historyService.getHistory(this.appsState.appName, this.channel));
+        timer(0, 10000).pipe(
+                merge(this.messageBus.of(HistoryChannelUpdated).pipe(delay(1000))),
+            switchMap(app => this.historyService.getHistory(this.appsState.appName, this.channel)));
 
     constructor(
         private readonly appsState: AppsState,

src/Squidex/app/shared/components/pipes.ts

@@ -6,7 +6,8 @@
  */
 
 import { ChangeDetectorRef, OnDestroy, Pipe, PipeTransform } from '@angular/core';
-import { Observable, Subscription } from 'rxjs';
+import { Observable, of, Subscription } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import {
     ApiUrlConfig,
@@ -61,7 +62,7 @@ export class UserNamePipe extends UserAsyncPipe implements PipeTransform {
     }
 
     public transform(userId: string, placeholder = 'Me'): string | null {
-        return super.transformInternal(userId, users => users.getUser(userId, placeholder).map(u => u.displayName));
+        return super.transformInternal(userId, users => users.getUser(userId, placeholder).pipe(map(u => u.displayName)));
     }
 }
 
@@ -79,12 +80,12 @@ export class UserNameRefPipe extends UserAsyncPipe implements PipeTransform {
             const parts = userId.split(':');
 
             if (parts[0] === 'subject') {
-                return users.getUser(parts[1], placeholder).map(u => u.displayName);
+                return users.getUser(parts[1], placeholder).pipe(map(u => u.displayName));
             } else {
                 if (parts[1].endsWith('client')) {
-                    return Observable.of(parts[1]);
+                    return of(parts[1]);
                 } else {
-                    return Observable.of(`${parts[1]}-client`);
+                    return of(`${parts[1]}-client`);
                 }
             }
         });
@@ -133,7 +134,7 @@ export class UserPicturePipe extends UserAsyncPipe implements PipeTransform {
     }
 
     public transform(userId: string): string | null {
-        return super.transformInternal(userId, users => users.getUser(userId).map(u => this.apiUrl.buildUrl(`api/users/${u.id}/picture`)));
+        return super.transformInternal(userId, users => users.getUser(userId).pipe(map(u => this.apiUrl.buildUrl(`api/users/${u.id}/picture`))));
     }
 }
 
@@ -153,9 +154,9 @@ export class UserPictureRefPipe extends UserAsyncPipe implements PipeTransform {
             const parts = userId.split(':');
 
             if (parts[0] === 'subject') {
-                return users.getUser(parts[1]).map(u => this.apiUrl.buildUrl(`api/users/${u.id}/picture`));
+                return users.getUser(parts[1]).pipe(map(u => this.apiUrl.buildUrl(`api/users/${u.id}/picture`)));
             } else {
-                return Observable.of('/images/client.png');
+                return of('/images/client.png');
             }
         });
     }

src/Squidex/app/shared/components/schema-category.component.ts

@@ -6,6 +6,7 @@
  */
 
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
+import { onErrorResumeNext } from 'rxjs/operators';
 
 import {
     fadeAnimation,
@@ -90,7 +91,7 @@ export class SchemaCategoryComponent implements OnInit, OnChanges {
     }
 
     public changeCategory(schema: SchemaDto) {
-        this.schemasState.changeCategory(schema, this.name).onErrorResumeNext().subscribe();
+        this.schemasState.changeCategory(schema, this.name).pipe(onErrorResumeNext()).subscribe();
     }
 
     public trackBySchema(index: number, schema: SchemaDto) {

src/Squidex/app/shared/guards/app-must-exist.guard.spec.ts

@@ -6,7 +6,7 @@
  */
 
 import { Router } from '@angular/router';
-import { Observable } from 'rxjs';
+import { of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
 
 import { AppsState } from '@app/shared';
@@ -34,7 +34,7 @@ describe('AppMustExistGuard', () => {
 
     it('should navigate to 404 page if app is not found', () => {
         appsState.setup(x => x.select('my-app'))
-            .returns(() => Observable.of(null));
+            .returns(() => of(null));
 
         let result: boolean;
 
@@ -49,7 +49,7 @@ describe('AppMustExistGuard', () => {
 
     it('should return true if app is found', () => {
         appsState.setup(x => x.select('my-app'))
-            .returns(() => Observable.of(<any>{}));
+            .returns(() => of(<any>{}));
 
         let result: boolean;
 

src/Squidex/app/shared/guards/app-must-exist.guard.ts

@@ -8,6 +8,7 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router';
 import { Observable } from 'rxjs';
+import { map, tap } from 'rxjs/operators';
 
 import { AppsState } from './../state/apps.state';
 
@@ -23,12 +24,13 @@ export class AppMustExistGuard implements CanActivate {
         const appName = route.params['appName'];
 
         const result =
-            this.appsState.select(appName)
-                .do(dto => {
+            this.appsState.select(appName).pipe(
+                tap(dto => {
                     if (!dto) {
                         this.router.navigate(['/404']);
                     }
-                }).map(a => !!a);
+                }),
+                map(a => !!a));
 
         return result;
     }

src/Squidex/app/shared/guards/content-must-exist.guard.spec.ts

@@ -6,7 +6,7 @@
  */
 
 import { Router } from '@angular/router';
-import { Observable } from 'rxjs';
+import { of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
 
 import { ContentDto } from './../services/contents.service';
@@ -32,7 +32,7 @@ describe('ContentMustExistGuard', () => {
 
     it('should load content and return true when found', () => {
         contentsState.setup(x => x.select('123'))
-            .returns(() => Observable.of(<ContentDto>{}));
+            .returns(() => of(<ContentDto>{}));
 
         let result: boolean;
 
@@ -47,7 +47,7 @@ describe('ContentMustExistGuard', () => {
 
     it('should load content and return false when not found', () => {
         contentsState.setup(x => x.select('123'))
-            .returns(() => Observable.of(null));
+            .returns(() => of(null));
 
         let result: boolean;
 

src/Squidex/app/shared/guards/content-must-exist.guard.ts

@@ -8,6 +8,7 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router';
 import { Observable } from 'rxjs';
+import { map, tap } from 'rxjs/operators';
 
 import { allParams } from '@app/framework';
 
@@ -25,13 +26,13 @@ export class ContentMustExistGuard implements CanActivate {
         const contentId = allParams(route)['contentId'];
 
         const result =
-            this.contentsState.select(contentId)
-                .do(dto => {
+            this.contentsState.select(contentId).pipe(
+                tap(dto => {
                     if (!dto) {
                         this.router.navigate(['/404']);
                     }
-                })
-                .map(u => u !== null);
+                }),
+                map(u => u !== null));
 
         return result;
     }

src/Squidex/app/shared/guards/load-apps.guard.spec.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Observable } from 'rxjs';
+import { of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
 
 import { AppsState } from '@app/shared';
@@ -23,7 +23,7 @@ describe('LoadAppsGuard', () => {
 
     it('should load apps', () => {
         appsState.setup(x => x.load())
-            .returns(() => Observable.of(null));
+            .returns(() => of(null));
 
         let result = false;
 

src/Squidex/app/shared/guards/load-apps.guard.ts

@@ -8,6 +8,7 @@
 import { Injectable } from '@angular/core';
 import { CanActivate } from '@angular/router';
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { AppsState } from './../state/apps.state';
 
@@ -19,6 +20,6 @@ export class LoadAppsGuard implements CanActivate {
     }
 
     public canActivate(): Observable<boolean> {
-        return this.appsState.load().map(a => true);
+        return this.appsState.load().pipe(map(a => true));
     }
 }

src/Squidex/app/shared/guards/load-languages.guard.spec.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Observable } from 'rxjs';
+import { of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
 
 import { LanguagesState } from '@app/shared';
@@ -23,7 +23,7 @@ describe('LoadLanguagesGuard', () => {
 
     it('should load languages', () => {
         languagesState.setup(x => x.load())
-            .returns(() => Observable.of(null));
+            .returns(() => of(null));
 
         let result = false;
 

src/Squidex/app/shared/guards/load-languages.guard.ts

@@ -8,6 +8,7 @@
 import { Injectable } from '@angular/core';
 import { CanActivate } from '@angular/router';
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { LanguagesState } from './../state/languages.state';
 
@@ -19,6 +20,6 @@ export class LoadLanguagesGuard implements CanActivate {
     }
 
     public canActivate(): Observable<boolean> {
-        return this.languagesState.load().map(a => true);
+        return this.languagesState.load().pipe(map(a => true));
     }
 }

src/Squidex/app/shared/guards/must-be-authenticated.guard.spec.ts

@@ -6,7 +6,7 @@
  */
 
 import { Router } from '@angular/router';
-import { Observable } from 'rxjs';
+import { of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
 
 import { AuthService } from '@app/shared';
@@ -28,7 +28,7 @@ describe('MustBeAuthenticatedGuard', () => {
 
     it('should navigate to default page if not authenticated', () => {
         authService.setup(x => x.userChanges)
-            .returns(() => Observable.of(null));
+            .returns(() => of(null));
 
         let result: boolean;
 
@@ -43,7 +43,7 @@ describe('MustBeAuthenticatedGuard', () => {
 
     it('should return true if authenticated', () => {
         authService.setup(x => x.userChanges)
-            .returns(() => Observable.of(<any>{}));
+            .returns(() => of(<any>{}));
 
         let result: boolean;
 

src/Squidex/app/shared/guards/must-be-authenticated.guard.ts

@@ -8,6 +8,7 @@
 import { Injectable } from '@angular/core';
 import { CanActivate, Router } from '@angular/router';
 import { Observable } from 'rxjs';
+import { map, take, tap } from 'rxjs/operators';
 
 import { AuthService } from './../services/auth.service';
 
@@ -20,12 +21,13 @@ export class MustBeAuthenticatedGuard implements CanActivate {
     }
 
     public canActivate(): Observable<boolean> {
-        return this.authService.userChanges.take(1)
-            .do(user => {
+        return this.authService.userChanges.pipe(
+            take(1),
+            tap(user => {
                 if (!user) {
                     this.router.navigate(['']);
                 }
-            })
-            .map(user => !!user);
+            }),
+            map(user => !!user));
     }
 }

src/Squidex/app/shared/guards/must-be-not-authenticated.guard.spec.ts

@@ -6,7 +6,7 @@
  */
 
 import { Router } from '@angular/router';
-import { Observable } from 'rxjs';
+import { of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
 
 import { AuthService } from '@app/shared';
@@ -28,7 +28,7 @@ describe('MustNotBeAuthenticatedGuard', () => {
 
     it('should navigate to app page if authenticated', () => {
         authService.setup(x => x.userChanges)
-            .returns(() => Observable.of(<any>{}));
+            .returns(() => of(<any>{}));
 
         let result: boolean;
 
@@ -43,7 +43,7 @@ describe('MustNotBeAuthenticatedGuard', () => {
 
     it('should return true if not authenticated', () => {
         authService.setup(x => x.userChanges)
-            .returns(() => Observable.of(null));
+            .returns(() => of(null));
 
         let result: boolean;
 

src/Squidex/app/shared/guards/must-be-not-authenticated.guard.ts

@@ -8,6 +8,7 @@
 import { Injectable } from '@angular/core';
 import { CanActivate, Router } from '@angular/router';
 import { Observable } from 'rxjs';
+import { map, take, tap } from 'rxjs/operators';
 
 import { AuthService } from './../services/auth.service';
 
@@ -20,12 +21,13 @@ export class MustBeNotAuthenticatedGuard implements CanActivate {
     }
 
     public canActivate(): Observable<boolean> {
-        return this.authService.userChanges.take(1)
-            .do(user => {
+        return this.authService.userChanges.pipe(
+            take(1),
+            tap(user => {
                 if (user) {
                     this.router.navigate(['app']);
                 }
-            })
-            .map(user => !user);
+            }),
+            map(user => !user));
     }
 }

src/Squidex/app/shared/guards/schema-must-exist-published.guard.spec.ts

@@ -6,7 +6,7 @@
  */
 
 import { Router } from '@angular/router';
-import { Observable } from 'rxjs';
+import { of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
 
 import { SchemaDetailsDto } from './../services/schemas.service';
@@ -32,7 +32,7 @@ describe('SchemaMustExistPublishedGuard', () => {
 
     it('should load schema and return true when found', () => {
         schemasState.setup(x => x.select('123'))
-            .returns(() => Observable.of(<SchemaDetailsDto>{ isPublished: true }));
+            .returns(() => of(<SchemaDetailsDto>{ isPublished: true }));
 
         let result: boolean;
 
@@ -47,7 +47,7 @@ describe('SchemaMustExistPublishedGuard', () => {
 
     it('should load schema and return false when not found', () => {
         schemasState.setup(x => x.select('123'))
-        .returns(() => Observable.of(<SchemaDetailsDto>{ isPublished: false }));
+        .returns(() => of(<SchemaDetailsDto>{ isPublished: false }));
 
         let result: boolean;
 
@@ -62,7 +62,7 @@ describe('SchemaMustExistPublishedGuard', () => {
 
     it('should load schema and return false when not found', () => {
         schemasState.setup(x => x.select('123'))
-            .returns(() => Observable.of(null));
+            .returns(() => of(null));
 
         let result: boolean;
 

src/Squidex/app/shared/guards/schema-must-exist-published.guard.ts

@@ -8,6 +8,7 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router';
 import { Observable } from 'rxjs';
+import { map, tap } from 'rxjs/operators';
 
 import { allParams } from '@app/framework';
 
@@ -25,13 +26,13 @@ export class SchemaMustExistPublishedGuard implements CanActivate {
         const schemaName = allParams(route)['schemaName'];
 
         const result =
-            this.schemasState.select(schemaName)
-                .do(dto => {
+            this.schemasState.select(schemaName).pipe(
+                tap(dto => {
                     if (!dto || !dto.isPublished) {
                         this.router.navigate(['/404']);
                     }
-                })
-                .map(s => s !== null && s.isPublished);
+                }),
+                map(s => s !== null && s.isPublished));
 
         return result;
     }

src/Squidex/app/shared/guards/schema-must-exist.guard.spec.ts

@@ -6,7 +6,7 @@
  */
 
 import { Router } from '@angular/router';
-import { Observable } from 'rxjs';
+import { of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
 
 import { SchemaDetailsDto } from './../services/schemas.service';
@@ -32,7 +32,7 @@ describe('SchemaMustExistGuard', () => {
 
     it('should load schema and return true when found', () => {
         schemasState.setup(x => x.select('123'))
-            .returns(() => Observable.of(<SchemaDetailsDto>{}));
+            .returns(() => of(<SchemaDetailsDto>{}));
 
         let result: boolean;
 
@@ -47,7 +47,7 @@ describe('SchemaMustExistGuard', () => {
 
     it('should load schema and return false when not found', () => {
         schemasState.setup(x => x.select('123'))
-            .returns(() => Observable.of(null));
+            .returns(() => of(null));
 
         let result: boolean;
 

src/Squidex/app/shared/guards/schema-must-exist.guard.ts

@@ -8,6 +8,7 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router';
 import { Observable } from 'rxjs';
+import { map, tap } from 'rxjs/operators';
 
 import { allParams } from '@app/framework';
 
@@ -25,13 +26,13 @@ export class SchemaMustExistGuard implements CanActivate {
         const schemaName = allParams(route)['schemaName'];
 
         const result =
-            this.schemasState.select(schemaName)
-                .do(dto => {
+            this.schemasState.select(schemaName).pipe(
+                tap(dto => {
                     if (!dto) {
                         this.router.navigate(['/404']);
                     }
-                })
-                .map(s => s !== null);
+                }),
+                map(s => s !== null));
 
         return result;
     }

src/Squidex/app/shared/guards/unset-app.guard.spec.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Observable } from 'rxjs';
+import { of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
 
 import { AppsState } from '@app/shared';
@@ -23,7 +23,7 @@ describe('UnsetAppGuard', () => {
 
     it('should unselect app', () => {
         appsState.setup(x => x.select(null))
-            .returns(() => Observable.of(null));
+            .returns(() => of(null));
 
         let result = false;
 

src/Squidex/app/shared/guards/unset-app.guard.ts

@@ -8,6 +8,7 @@
 import { Injectable } from '@angular/core';
 import { CanActivate } from '@angular/router';
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { AppsState } from './../state/apps.state';
 
@@ -19,6 +20,6 @@ export class UnsetAppGuard implements CanActivate {
     }
 
     public canActivate(): Observable<boolean> {
-        return this.appsState.select(null).map(a => a === null);
+        return this.appsState.select(null).pipe(map(a => a === null));
     }
 }

src/Squidex/app/shared/guards/unset-content.guard.spec.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Observable } from 'rxjs';
+import { of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
 
 import { ContentsState } from './../state/contents.state';
@@ -22,7 +22,7 @@ describe('UnsetContentGuard', () => {
 
     it('should unset content', () => {
         contentsState.setup(x => x.select(null))
-            .returns(() => Observable.of(null));
+            .returns(() => of(null));
 
         let result: boolean;
 

src/Squidex/app/shared/guards/unset-content.guard.ts

@@ -8,6 +8,7 @@
 import { Injectable } from '@angular/core';
 import { CanActivate } from '@angular/router';
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { ContentsState } from './../state/contents.state';
 
@@ -19,6 +20,6 @@ export class UnsetContentGuard implements CanActivate {
     }
 
     public canActivate(): Observable<boolean> {
-        return this.usersState.select(null).map(u => u === null);
+        return this.usersState.select(null).pipe(map(u => u === null));
     }
 }

src/Squidex/app/shared/interceptors/auth.interceptor.spec.ts

@@ -8,7 +8,8 @@
 import { HTTP_INTERCEPTORS, HttpClient, HttpHeaders } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { inject, TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs';
+import { of } from 'rxjs';
+import { onErrorResumeNext } from 'rxjs/operators';
 import { IMock, Mock, Times } from 'typemoq';
 
 import {
@@ -46,7 +47,7 @@ describe('AuthInterceptor', () => {
     it('should append headers to request',
         inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => {
 
-        authService.setup(x => x.userChanges).returns(() => Observable.of(<any>{ authToken: 'letmein' }));
+        authService.setup(x => x.userChanges).returns(() => of(<any>{ authToken: 'letmein' }));
 
         http.get('http://service/p/apps').subscribe();
 
@@ -61,7 +62,7 @@ describe('AuthInterceptor', () => {
     it('should not append headers for no auth headers',
         inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => {
 
-        authService.setup(x => x.userChanges).returns(() => Observable.of(<any>{ authToken: 'letmein' }));
+        authService.setup(x => x.userChanges).returns(() => of(<any>{ authToken: 'letmein' }));
 
         http.get('http://service/p/apps', { headers: new HttpHeaders().set('NoAuth', '') }).subscribe();
 
@@ -76,7 +77,7 @@ describe('AuthInterceptor', () => {
     it('should not append headers for other requests',
         inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => {
 
-        authService.setup(x => x.userChanges).returns(() => Observable.of(<any>{ authToken: 'letmein' }));
+        authService.setup(x => x.userChanges).returns(() => of(<any>{ authToken: 'letmein' }));
 
         http.get('http://cloud/p/apps').subscribe();
 
@@ -91,10 +92,10 @@ describe('AuthInterceptor', () => {
     it(`should logout for 401 status code`,
         inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => {
 
-        authService.setup(x => x.userChanges).returns(() => Observable.of(<any>{ authToken: 'letmein' }));
-        authService.setup(x => x.loginSilent()).returns(() => Observable.of(<any>{ authToken: 'letmereallyin' }));
+        authService.setup(x => x.userChanges).returns(() => of(<any>{ authToken: 'letmein' }));
+        authService.setup(x => x.loginSilent()).returns(() => of(<any>{ authToken: 'letmereallyin' }));
 
-        http.get('http://service/p/apps').onErrorResumeNext().subscribe();
+        http.get('http://service/p/apps').pipe(onErrorResumeNext()).subscribe();
 
         httpMock.expectOne('http://service/p/apps').error(<any>{}, { status: 401 });
         httpMock.expectOne('http://service/p/apps').error(<any>{}, { status: 401 });
@@ -106,9 +107,9 @@ describe('AuthInterceptor', () => {
         it(`should logout for ${statusCode} status code`,
             inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => {
 
-            authService.setup(x => x.userChanges).returns(() => Observable.of(<any>{ authToken: 'letmein' }));
+            authService.setup(x => x.userChanges).returns(() => of(<any>{ authToken: 'letmein' }));
 
-            http.get('http://service/p/apps').onErrorResumeNext().subscribe();
+            http.get('http://service/p/apps').pipe(onErrorResumeNext()).subscribe();
 
             const req = httpMock.expectOne('http://service/p/apps');
 
@@ -122,9 +123,9 @@ describe('AuthInterceptor', () => {
         it(`should not logout for ${statusCode} status code`,
             inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => {
 
-            authService.setup(x => x.userChanges).returns(() => Observable.of(<any>{ authToken: 'letmein' }));
+            authService.setup(x => x.userChanges).returns(() => of(<any>{ authToken: 'letmein' }));
 
-            http.get('http://service/p/apps').onErrorResumeNext().subscribe();
+            http.get('http://service/p/apps').pipe(onErrorResumeNext()).subscribe();
 
             const req = httpMock.expectOne('http://service/p/apps');
 

src/Squidex/app/shared/interceptors/auth.interceptor.ts

@@ -7,7 +7,8 @@
 
 import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
 import { Injectable} from '@angular/core';
-import { Observable } from 'rxjs';
+import { empty, Observable, throwError } from 'rxjs';
+import { catchError, switchMap, take } from 'rxjs/operators';
 
 import { ApiUrlConfig } from '@app/framework';
 
@@ -25,9 +26,11 @@ export class AuthInterceptor implements HttpInterceptor {
 
     public intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
         if (req.url.indexOf(this.baseUrl) === 0 && !req.headers.has('NoAuth')) {
-            return this.authService.userChanges.take(1).switchMap(user => {
-                return this.makeRequest(req, next, user, true);
-            });
+            return this.authService.userChanges.pipe(
+                take(1),
+                switchMap(user => {
+                    return this.makeRequest(req, next, user, true);
+                }));
         } else {
             return next.handle(req);
         }
@@ -43,22 +46,23 @@ export class AuthInterceptor implements HttpInterceptor {
                 .set('Pragma', 'no-cache')
         });
 
-        return next.handle(authReq)
-            .catch((error: HttpErrorResponse) => {
+        return next.handle(authReq).pipe(
+            catchError((error: HttpErrorResponse) => {
                 if (error.status === 401 && renew) {
-                    return this.authService.loginSilent()
-                        .catch(_ => {
+                    return this.authService.loginSilent().pipe(
+                        catchError(_ => {
                             this.authService.logoutRedirect();
 
-                            return Observable.empty<Profile>();
-                        })
-                        .switchMap(u => this.makeRequest(req, next, u));
+                            return empty();
+                        }),
+                        switchMap(u => this.makeRequest(req, next, u)));
                 } else if (error.status === 401 || error.status === 403) {
                     this.authService.logoutRedirect();
 
-                    return Observable.empty<HttpEvent<any>>();
+                    return empty();
                 }
-                return Observable.throw(error);
-            });
+
+                return throwError(error);
+            }));
     }
 }

src/Squidex/app/shared/services/app-clients.service.spec.ts

@@ -43,7 +43,7 @@ describe('AppClientsService', () => {
     it('should make get request to get app clients',
         inject([AppClientsService, HttpTestingController], (appClientsService: AppClientsService, httpMock: HttpTestingController) => {
 
-        let clients: AppClientsDto | null = null;
+        let clients: AppClientsDto;
 
         appClientsService.getClients('my-app').subscribe(result => {
             clients = result;
@@ -73,7 +73,7 @@ describe('AppClientsService', () => {
             }
         });
 
-        expect(clients).toEqual(
+        expect(clients!).toEqual(
             new AppClientsDto([
                 new AppClientDto('client1', 'Client 1', 'secret1', 'Editor'),
                 new AppClientDto('client2', 'Client 2', 'secret2', 'Developer')
@@ -85,7 +85,7 @@ describe('AppClientsService', () => {
 
         const dto = new CreateAppClientDto('client1');
 
-        let client: AppClientDto | null = null;
+        let client: AppClientDto;
 
         appClientsService.postClient('my-app', dto, version).subscribe(result => {
             client = result.payload;
@@ -98,8 +98,7 @@ describe('AppClientsService', () => {
 
         req.flush({ id: 'client1', name: 'Client 1', secret: 'secret1', permission: 'Developer' });
 
-        expect(client).toEqual(
-            new AppClientDto('client1', 'Client 1', 'secret1', 'Developer'));
+        expect(client!).toEqual(new AppClientDto('client1', 'Client 1', 'secret1', 'Developer'));
     }));
 
     it('should make put request to rename client',
@@ -133,7 +132,7 @@ describe('AppClientsService', () => {
     it('should make form request to create token',
         inject([AppClientsService, HttpTestingController], (appClientsService: AppClientsService, httpMock: HttpTestingController) => {
 
-        let accessTokenDto: AccessTokenDto | null = null;
+        let accessTokenDto: AccessTokenDto;
 
         appClientsService.createToken('my-app', new AppClientDto('myClientId', 'myClient', 'mySecret', 'Editor')).subscribe(result => {
             accessTokenDto = result;
@@ -148,7 +147,6 @@ describe('AppClientsService', () => {
 
         req.flush({ access_token: 'token1', token_type: 'type1' });
 
-        expect(accessTokenDto).toEqual(
-            new AccessTokenDto('token1', 'type1'));
+        expect(accessTokenDto!).toEqual(new AccessTokenDto('token1', 'type1'));
     }));
 });

src/Squidex/app/shared/services/app-clients.service.ts

@@ -8,14 +8,14 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-
-import '@app/framework/angular/http/http-extensions';
+import { map, tap } from 'rxjs/operators';
 
 import {
     AnalyticsService,
     ApiUrlConfig,
     HTTP,
     Model,
+    pretifyError,
     Version,
     Versioned
 } from '@app/framework';
@@ -83,8 +83,8 @@ export class AppClientsService {
     public getClients(appName: string): Observable<AppClientsDto> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/clients`);
 
-        return HTTP.getVersioned<any>(this.http, url)
-                .map(response => {
+        return HTTP.getVersioned<any>(this.http, url).pipe(
+                map(response => {
                     const body = response.payload.body;
 
                     const items: any[] = body;
@@ -98,15 +98,15 @@ export class AppClientsService {
                     });
 
                     return new AppClientsDto(clients, response.version);
-                })
-                .pretifyError('Failed to load clients. Please reload.');
+                }),
+                pretifyError('Failed to load clients. Please reload.'));
     }
 
     public postClient(appName: string, dto: CreateAppClientDto, version: Version): Observable<Versioned<AppClientDto>> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/clients`);
 
-        return HTTP.postVersioned<any>(this.http, url, dto, version)
-                .map(response => {
+        return HTTP.postVersioned<any>(this.http, url, dto, version).pipe(
+                map(response => {
                     const body = response.payload.body;
 
                     const client = new AppClientDto(
@@ -116,31 +116,31 @@ export class AppClientsService {
                         body.permission);
 
                     return new Versioned(response.version, client);
-                })
-                .do(() => {
+                }),
+                tap(() => {
                     this.analytics.trackEvent('Client', 'Created', appName);
-                })
-                .pretifyError('Failed to add client. Please reload.');
+                }),
+                pretifyError('Failed to add client. Please reload.'));
     }
 
     public putClient(appName: string, id: string, dto: UpdateAppClientDto, version: Version): Observable<Versioned<any>> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/clients/${id}`);
 
-        return HTTP.putVersioned(this.http, url, dto, version)
-                .do(() => {
+        return HTTP.putVersioned(this.http, url, dto, version).pipe(
+                tap(() => {
                     this.analytics.trackEvent('Client', 'Updated', appName);
-                })
-                .pretifyError('Failed to revoke client. Please reload.');
+                }),
+                pretifyError('Failed to revoke client. Please reload.'));
     }
 
     public deleteClient(appName: string, id: string, version: Version): Observable<Versioned<any>> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/clients/${id}`);
 
-        return HTTP.deleteVersioned(this.http, url, version)
-                .do(() => {
+        return HTTP.deleteVersioned(this.http, url, version).pipe(
+                tap(() => {
                     this.analytics.trackEvent('Client', 'Deleted', appName);
-                })
-                .pretifyError('Failed to revoke client. Please reload.');
+                }),
+                pretifyError('Failed to revoke client. Please reload.'));
     }
 
     public createToken(appName: string, client: AppClientDto): Observable<AccessTokenDto> {
@@ -154,10 +154,10 @@ export class AppClientsService {
 
         const url = this.apiUrl.buildUrl('identity-server/connect/token');
 
-        return this.http.post(url, body, options)
-                .map((response: any) => {
+        return this.http.post(url, body, options).pipe(
+                map((response: any) => {
                     return new AccessTokenDto(response.access_token, response.token_type);
-                })
-                .pretifyError('Failed to create token. Please retry.');
+                }),
+                pretifyError('Failed to create token. Please retry.'));
     }
 }

src/Squidex/app/shared/services/app-contributors.service.spec.ts

@@ -41,7 +41,7 @@ describe('AppContributorsService', () => {
     it('should make get request to get app contributors',
         inject([AppContributorsService, HttpTestingController], (appContributorsService: AppContributorsService, httpMock: HttpTestingController) => {
 
-        let contributors: AppContributorsDto | null = null;
+        let contributors: AppContributorsDto;
 
         appContributorsService.getContributors('my-app').subscribe(result => {
             contributors = result;
@@ -70,7 +70,7 @@ describe('AppContributorsService', () => {
             }
         });
 
-        expect(contributors).toEqual(
+        expect(contributors!).toEqual(
             new AppContributorsDto([
                 new AppContributorDto('123', 'Owner'),
                 new AppContributorDto('456', 'Owner')
@@ -82,7 +82,7 @@ describe('AppContributorsService', () => {
 
         const dto = new AppContributorDto('123', 'Owner');
 
-        let contributorAssignedDto: ContributorAssignedDto | null = null;
+        let contributorAssignedDto: ContributorAssignedDto;
 
         appContributorsService.postContributor('my-app', dto, version).subscribe(result => {
             contributorAssignedDto = result.payload;

src/Squidex/app/shared/services/app-contributors.service.ts

@@ -8,14 +8,14 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-
-import '@app/framework/angular/http/http-extensions';
+import { map, tap } from 'rxjs/operators';
 
 import {
     AnalyticsService,
     ApiUrlConfig,
     HTTP,
     Model,
+    pretifyError,
     Version,
     Versioned
 } from '@app/framework';
@@ -66,8 +66,8 @@ export class AppContributorsService {
     public getContributors(appName: string): Observable<AppContributorsDto> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/contributors`);
 
-        return HTTP.getVersioned<any>(this.http, url)
-                .map(response => {
+        return HTTP.getVersioned<any>(this.http, url).pipe(
+                map(response => {
                     const body = response.payload.body;
 
                     const items: any[] = body.contributors;
@@ -79,34 +79,34 @@ export class AppContributorsService {
                                 item.permission);
                         }),
                         body.maxContributors, response.version);
-                })
-                .pretifyError('Failed to load contributors. Please reload.');
+                }),
+                pretifyError('Failed to load contributors. Please reload.'));
     }
 
     public postContributor(appName: string, dto: AppContributorDto, version: Version): Observable<Versioned<ContributorAssignedDto>> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/contributors`);
 
-        return HTTP.postVersioned(this.http, url, dto, version)
-                .map(response => {
+        return HTTP.postVersioned(this.http, url, dto, version).pipe(
+                map(response => {
                     const body: any = response.payload.body;
 
                     const result = new ContributorAssignedDto(body.contributorId);
 
                     return new Versioned(response.version, result);
-                })
-                .do(() => {
+                }),
+                tap(() => {
                     this.analytics.trackEvent('Contributor', 'Configured', appName);
-                })
-                .pretifyError('Failed to add contributors. Please reload.');
+                }),
+                pretifyError('Failed to add contributors. Please reload.'));
     }
 
     public deleteContributor(appName: string, contributorId: string, version: Version): Observable<Versioned<any>> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/contributors/${contributorId}`);
 
-        return HTTP.deleteVersioned(this.http, url, version)
-                .do(() => {
+        return HTTP.deleteVersioned(this.http, url, version).pipe(
+                tap(() => {
                     this.analytics.trackEvent('Contributor', 'Deleted', appName);
-                })
-                .pretifyError('Failed to delete contributors. Please reload.');
+                }),
+                pretifyError('Failed to delete contributors. Please reload.'));
     }
 }

src/Squidex/app/shared/services/app-languages.service.spec.ts

@@ -42,7 +42,7 @@ describe('AppLanguagesService', () => {
     it('should make get request to get app languages',
         inject([AppLanguagesService, HttpTestingController], (appLanguagesService: AppLanguagesService, httpMock: HttpTestingController) => {
 
-        let languages: AppLanguagesDto | null = null;
+        let languages: AppLanguagesDto;
 
         appLanguagesService.getLanguages('my-app').subscribe(result => {
             languages = result;
@@ -73,7 +73,7 @@ describe('AppLanguagesService', () => {
             }
         });
 
-        expect(languages).toEqual(
+        expect(languages!).toEqual(
             new AppLanguagesDto([
                 new AppLanguageDto('en', 'English', true, true,  ['de', 'en']),
                 new AppLanguageDto('it', 'Italian', false, false, [])
@@ -85,7 +85,7 @@ describe('AppLanguagesService', () => {
 
         const dto = new AddAppLanguageDto('de');
 
-        let language: AppLanguageDto | null = null;
+        let language: AppLanguageDto;
 
         appLanguagesService.postLanguage('my-app', dto, version).subscribe(result => {
             language = result.payload;
@@ -98,8 +98,7 @@ describe('AppLanguagesService', () => {
 
         req.flush({ iso2Code: 'de', englishName: 'German' });
 
-        expect(language).toEqual(
-            new AppLanguageDto('de', 'German', false, false, []));
+        expect(language!).toEqual(new AppLanguageDto('de', 'German', false, false, []));
     }));
 
     it('should make put request to make master language',

src/Squidex/app/shared/services/app-languages.service.ts

@@ -8,14 +8,14 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-
-import '@app/framework/angular/http/http-extensions';
+import { map, tap } from 'rxjs/operators';
 
 import {
     AnalyticsService,
     ApiUrlConfig,
     HTTP,
     Model,
+    pretifyError,
     Version,
     Versioned
 } from '@app/framework';
@@ -77,8 +77,8 @@ export class AppLanguagesService {
     public getLanguages(appName: string): Observable<AppLanguagesDto> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/languages`);
 
-        return HTTP.getVersioned<any>(this.http, url)
-                .map(response => {
+        return HTTP.getVersioned<any>(this.http, url).pipe(
+                map(response => {
                     const body = response.payload.body;
 
                     const items: any[] = body;
@@ -93,15 +93,15 @@ export class AppLanguagesService {
                     });
 
                     return new AppLanguagesDto(languages, response.version);
-                })
-                .pretifyError('Failed to load languages. Please reload.');
+                }),
+                pretifyError('Failed to load languages. Please reload.'));
     }
 
     public postLanguage(appName: string, dto: AddAppLanguageDto, version: Version): Observable<Versioned<AppLanguageDto>> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/languages`);
 
-        return HTTP.postVersioned<any>(this.http, url, dto, version)
-                .map(response => {
+        return HTTP.postVersioned<any>(this.http, url, dto, version).pipe(
+                map(response => {
                     const body = response.payload.body;
 
                     const language = new AppLanguageDto(
@@ -112,30 +112,30 @@ export class AppLanguagesService {
                         body.fallback || []);
 
                     return new Versioned(response.version, language);
-                })
-                .do(() => {
+                }),
+                tap(() => {
                     this.analytics.trackEvent('Language', 'Added', appName);
-                })
-                .pretifyError('Failed to add language. Please reload.');
+                }),
+                pretifyError('Failed to add language. Please reload.'));
     }
 
     public putLanguage(appName: string, languageCode: string, dto: UpdateAppLanguageDto, version: Version): Observable<Versioned<any>> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/languages/${languageCode}`);
 
-        return HTTP.putVersioned(this.http, url, dto, version)
-                .do(() => {
+        return HTTP.putVersioned(this.http, url, dto, version).pipe(
+                tap(() => {
                     this.analytics.trackEvent('Language', 'Updated', appName);
-                })
-                .pretifyError('Failed to change language. Please reload.');
+                }),
+                pretifyError('Failed to change language. Please reload.'));
     }
 
     public deleteLanguage(appName: string, languageCode: string, version: Version): Observable<Versioned<any>> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/languages/${languageCode}`);
 
-        return HTTP.deleteVersioned(this.http, url, version)
-                .do(() => {
+        return HTTP.deleteVersioned(this.http, url, version).pipe(
+                tap(() => {
                     this.analytics.trackEvent('Language', 'Deleted', appName);
-                })
-                .pretifyError('Failed to add language. Please reload.');
+                }),
+                pretifyError('Failed to add language. Please reload.'));
     }
 }

src/Squidex/app/shared/services/app-patterns.service.spec.ts

@@ -39,7 +39,7 @@ describe('AppPatternsService', () => {
     it('should make get request to get patterns',
         inject([AppPatternsService, HttpTestingController], (patternService: AppPatternsService, httpMock: HttpTestingController) => {
 
-        let patterns: AppPatternsDto | null = null;
+        let patterns: AppPatternsDto;
 
         patternService.getPatterns('my-app').subscribe(result => {
             patterns = result;
@@ -68,7 +68,7 @@ describe('AppPatternsService', () => {
             }
         });
 
-        expect(patterns).toEqual(
+        expect(patterns!).toEqual(
             new AppPatternsDto([
                 new AppPatternDto('1', 'Number', '[0-9]', 'Message1'),
                 new AppPatternDto('2', 'Numbers', '[0-9]*', 'Message2')
@@ -80,7 +80,7 @@ describe('AppPatternsService', () => {
 
         const dto = new EditAppPatternDto('Number', '[0-9]', 'Message1');
 
-        let pattern: AppPatternDto | null = null;
+        let pattern: AppPatternDto;
 
         patternService.postPattern('my-app', dto, version).subscribe(result => {
             pattern = result.payload;
@@ -98,7 +98,7 @@ describe('AppPatternsService', () => {
             message: 'Message1'
         });
 
-        expect(pattern).toEqual(new AppPatternDto('1', 'Number', '[0-9]', 'Message1'));
+        expect(pattern!).toEqual(new AppPatternDto('1', 'Number', '[0-9]', 'Message1'));
     }));
 
     it('should make put request to update pattern',

src/Squidex/app/shared/services/app-patterns.service.ts

@@ -8,13 +8,13 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-
-import '@app/framework/angular/http/http-extensions';
+import { map } from 'rxjs/operators';
 
 import {
     ApiUrlConfig,
     HTTP,
     Model,
+    pretifyError,
     Version,
     Versioned
 } from '@app/framework';
@@ -68,8 +68,8 @@ export class AppPatternsService {
     public getPatterns(appName: string): Observable<AppPatternsDto> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/patterns`);
 
-        return HTTP.getVersioned<any>(this.http, url)
-            .map(response => {
+        return HTTP.getVersioned<any>(this.http, url).pipe(
+            map(response => {
                 const body = response.payload.body;
 
                 const items: any[] = body;
@@ -83,15 +83,15 @@ export class AppPatternsService {
                             item.message);
                     }),
                     response.version);
-            })
-            .pretifyError('Failed to add pattern. Please reload.');
+            }),
+            pretifyError('Failed to add pattern. Please reload.'));
     }
 
     public postPattern(appName: string, dto: EditAppPatternDto, version: Version): Observable<Versioned<AppPatternDto>> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/patterns`);
 
-        return HTTP.postVersioned<any>(this.http, url, dto, version)
-            .map(response => {
+        return HTTP.postVersioned<any>(this.http, url, dto, version).pipe(
+            map(response => {
                 const body = response.payload.body;
 
                 const pattern = new AppPatternDto(
@@ -101,21 +101,21 @@ export class AppPatternsService {
                     body.message);
 
                 return new Versioned(response.version, pattern);
-            })
-            .pretifyError('Failed to add pattern. Please reload.');
+            }),
+            pretifyError('Failed to add pattern. Please reload.'));
     }
 
     public putPattern(appName: string, id: string, dto: EditAppPatternDto, version: Version): Observable<Versioned<any>> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/patterns/${id}`);
 
-        return HTTP.putVersioned(this.http, url, dto, version)
-            .pretifyError('Failed to update pattern. Please reload.');
+        return HTTP.putVersioned(this.http, url, dto, version).pipe(
+            pretifyError('Failed to update pattern. Please reload.'));
     }
 
     public deletePattern(appName: string, id: string, version: Version): Observable<Versioned<any>> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/patterns/${id}`);
 
-        return HTTP.deleteVersioned(this.http, url, version)
-            .pretifyError('Failed to remove pattern. Please reload.');
+        return HTTP.deleteVersioned(this.http, url, version).pipe(
+            pretifyError('Failed to remove pattern. Please reload.'));
     }
 }