Upgrade packages to current Angular 13 level

- upgrade angular-oauth2-oidc (12.1.0 -> 13.0.1)
- upgrade ngx-translate (13.0.0 -> 14.0.0)
- upgrade rxjs (6.6.7 -> 7.4.0)
- remove ng-bootstrap
- bump version to 0.1.1

Issue-ID: PORTALNG-120
Change-Id: I0672a7e794e965677ef5d818163ec080734e11e0
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

2 files changed, 15 insertions, 13 deletions

diff --git a/src/app/services/tileservice/tiles.service.ts b/src/app/services/tileservice/tiles.service.ts
index 167e42a..acdce5b 100644
--- a/src/app/services/tileservice/tiles.service.ts
+++ b/src/app/services/tileservice/tiles.service.ts
@@ -19,7 +19,7 @@
 
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
+import { firstValueFrom, Observable } from 'rxjs';
 import { environment } from 'src/environments/environment';
 import { Tile, TilesListResponse } from '../../model/tile';
 import { map } from 'rxjs/operators';
@@ -50,8 +50,8 @@ export class TilesService {
    * GET tile by id
    * @param id to get specific tile
    */
-  getTileById(id: number): Promise<Tile> {
-    return this.httpClient.get<Tile>(urlTileApi + '/' + id).toPromise();
+  getTileById(id: number): Promise<Tile | undefined> {
+    return firstValueFrom(this.httpClient.get<Tile>(urlTileApi + '/' + id));
   }
 
   /**
@@ -59,11 +59,11 @@ export class TilesService {
    * @param tile
    * @returns the new saved tile
    */
-  saveTiles(tile: Tile): Promise<Tile> {
+  saveTiles(tile: Tile): Promise<Tile | undefined> {
     const options = {
       headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
     };
-    return this.httpClient.post<Tile>(urlTileApi, tile, options).toPromise();
+    return firstValueFrom(this.httpClient.post<Tile>(urlTileApi, tile, options));
   }
 
   /**
@@ -71,11 +71,11 @@ export class TilesService {
    * @returns the updated hero
    * @param tile
    */
-  updateTiles(tile: Tile): Promise<Tile> {
+  updateTiles(tile: Tile): Promise<Tile | undefined> {
     const options = {
       headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
     };
-    return this.httpClient.put<Tile>(urlTileApi + '/' + tile.id, tile, options).toPromise();
+    return firstValueFrom(this.httpClient.put<Tile>(urlTileApi + '/' + tile.id, tile, options));
   }
 
   /**
diff --git a/src/app/services/user-settings.service.ts b/src/app/services/user-settings.service.ts
index cbaa992..2f7e578 100644
--- a/src/app/services/user-settings.service.ts
+++ b/src/app/services/user-settings.service.ts
@@ -49,14 +49,14 @@ export class UserSettingsService {
   }
 
   selectDashboard = () =>
-    this.getPreferences$().pipe(selectDistinctState<UserPreferencesModel, DashboardModel>(STATE_KEYS.DASHBOARD));
+    this.getPreferences$().pipe(selectDistinctState<UserPreferencesModel, DashboardModel>(STATE_KEYS.DASHBOARD as keyof UserPreferencesModel));
   selectDashboardApps = () =>
-    this.selectDashboard().pipe(selectDistinctState<DashboardModel, DashboardAppsModel>(STATE_KEYS.APPS));
+    this.selectDashboard().pipe(selectDistinctState<DashboardModel, DashboardAppsModel>(STATE_KEYS.APPS as keyof DashboardModel));
   selectDashboardAvailableTiles = () =>
-    this.selectDashboardApps().pipe(selectDistinctState<DashboardAppsModel, DashboardTileSettings[]>(STATE_KEYS.TILES));
+    this.selectDashboardApps().pipe(selectDistinctState<DashboardAppsModel, DashboardTileSettings[]>(STATE_KEYS.TILES as keyof DashboardAppsModel));
   selectLastUserAction = () =>
     this.selectDashboardApps().pipe(
-      selectDistinctState<DashboardAppsModel, LastUserActionSettings>(STATE_KEYS.USER_ACTIONS),
+      selectDistinctState<DashboardAppsModel, LastUserActionSettings>(STATE_KEYS.USER_ACTIONS as keyof DashboardAppsModel),
     );
 
   getPreferences(): void {
@@ -106,6 +106,8 @@ export class UserSettingsService {
   }
 }
 
-export function selectDistinctState<T, I>(key: string): UnaryFunction<Observable<T>, Observable<I>> {
-  return pipe(pluck<T, I>(key), distinctUntilChanged<I>());
+export function selectDistinctState<T, I>(key: keyof T): UnaryFunction<Observable<T>, Observable<I>> {
+  // return pipe(map(x => x[key] as I), distinctUntilChanged<I>());
+  return pipe(pluck(key), map(value => value as unknown as I), distinctUntilChanged());
+  // return pipe(pluck<T, I>(key), distinctUntilChanged<I>());
 }