From 213cabce7a65ac0cdf89d1578f442b304e5a97e1 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan.percic.ext@knecon.com>
Date: Mon, 17 Jun 2024 19:15:43 +0300
Subject: [PATCH] ng 18

---
 src/lib/error/server-error-interceptor.ts      | 10 +---------
 src/lib/services/composite-route.guard.ts      | 17 +++++++++--------
 src/lib/translations/iqser-translate.module.ts | 12 +++---------
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/src/lib/error/server-error-interceptor.ts b/src/lib/error/server-error-interceptor.ts
index 565d5cf..813331b 100644
--- a/src/lib/error/server-error-interceptor.ts
+++ b/src/lib/error/server-error-interceptor.ts
@@ -1,12 +1,4 @@
-import {
-    HttpErrorResponse,
-    HttpEvent,
-    HttpHandler,
-    HttpInterceptor,
-    HttpRequest,
-    HttpResponse,
-    HttpStatusCode,
-} from '@angular/common/http';
+import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse, HttpStatusCode } from '@angular/common/http';
 import { Inject, Injectable, Optional } from '@angular/core';
 import { finalize, MonoTypeOperatorFunction, Observable, retry, throwError, timer } from 'rxjs';
 import { catchError, tap } from 'rxjs/operators';
diff --git a/src/lib/services/composite-route.guard.ts b/src/lib/services/composite-route.guard.ts
index 2204906..d27db8a 100644
--- a/src/lib/services/composite-route.guard.ts
+++ b/src/lib/services/composite-route.guard.ts
@@ -1,9 +1,9 @@
-import { ActivatedRouteSnapshot, CanActivate, CanActivateFn, RouterStateSnapshot, UrlTree } from '@angular/router';
 import { inject, Injectable, InjectionToken, Injector, runInInjectionContext } from '@angular/core';
-import { concatMap, firstValueFrom, from, last, of, takeWhile } from 'rxjs';
+import { ActivatedRouteSnapshot, CanActivate, CanActivateFn, GuardResult, RouterStateSnapshot, UrlTree } from '@angular/router';
+import { concatMap, firstValueFrom, from, last, Observable, of, takeWhile } from 'rxjs';
+import { tap } from 'rxjs/operators';
 import { LoadingService } from '../loading';
 import { SkeletonService } from './skeleton.service';
-import { tap } from 'rxjs/operators';
 
 @Injectable({
     providedIn: 'root',
@@ -23,12 +23,13 @@ export class CompositeRouteGuard implements CanActivate {
         if (routeGuards) {
             for (let i = 0; i < routeGuards.length; i++) {
                 const routeGuard = this._injector.get<CanActivate>(routeGuards[i]);
-                let canActivateResult = routeGuard.canActivate(route, state);
-                if (canActivateResult instanceof Promise) {
-                    canActivateResult = from(canActivateResult);
+                const canActivate = routeGuard.canActivate(route, state);
+                let canActivateResult: Observable<GuardResult> = of(true);
+                if (canActivate instanceof Promise) {
+                    canActivateResult = from(canActivate);
                 }
-                if (typeof canActivateResult === 'boolean' || canActivateResult instanceof UrlTree) {
-                    canActivateResult = of(canActivateResult);
+                if (typeof canActivate === 'boolean' || canActivate instanceof UrlTree) {
+                    canActivateResult = of(canActivate);
                 }
 
                 const result = await firstValueFrom(canActivateResult);
diff --git a/src/lib/translations/iqser-translate.module.ts b/src/lib/translations/iqser-translate.module.ts
index 2023cde..5cc74f1 100644
--- a/src/lib/translations/iqser-translate.module.ts
+++ b/src/lib/translations/iqser-translate.module.ts
@@ -4,14 +4,11 @@ import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-comp
 import { pruningTranslationLoaderFactory } from './http-loader-factory';
 import { IqserTranslateModuleOptions } from './iqser-translate-module-options';
 import { IqserTranslateParser } from './iqser-translate-parser.service';
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 const translateLoaderToken = new InjectionToken('translateLoader');
 
-@NgModule({
-    imports: [
-        HttpClientModule,
-        TranslateModule.forRoot({
+@NgModule({ exports: [TranslateModule], imports: [TranslateModule.forRoot({
             loader: {
                 provide: TranslateLoader,
                 useExisting: translateLoaderToken,
@@ -24,10 +21,7 @@ const translateLoaderToken = new InjectionToken('translateLoader');
                 provide: TranslateParser,
                 useClass: IqserTranslateParser,
             },
-        }),
-    ],
-    exports: [TranslateModule],
-})
+        })], providers: [provideHttpClient(withInterceptorsFromDi())] })
 export class IqserTranslateModule {
     constructor() {
         const translateLoader = inject<TranslateLoader>(translateLoaderToken, { optional: true });