@wolkabout/commons 0.0.10 → 0.0.12

package/fesm2022/wolkabout-commons.mjs

@@ -66,7 +66,7 @@ import * as i32 from '@angular/cdk/drag-drop';
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injectable, Injector, runInInjectionContext, DOCUMENT, Inject, Input, Directive, forwardRef, HostListener, TemplateRef, PLATFORM_ID, Pipe, ViewChild, ContentChild, Optional, Self, Component, input, computed, untracked, signal, viewChild, afterNextRender, effect, output, afterRenderEffect, contentChild } from '@angular/core';
-import { BehaviorSubject, catchError, of, switchMap, EMPTY, tap, filter, map, combineLatestWith, forkJoin, from, distinctUntilChanged, shareReplay, merge, Subject, takeUntil, combineLatest, take, first } from 'rxjs';
+import { BehaviorSubject, catchError, of, switchMap, EMPTY, tap, filter, map, combineLatestWith, from, mergeMap, distinctUntilChanged, shareReplay, merge, Subject, takeUntil, combineLatest, take, first } from 'rxjs';
 import { jwtDecode } from 'jwt-decode';
 import { loadRemoteModule } from '@angular-architects/native-federation';
 import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
@@ -428,11 +428,10 @@ class FeatureRegistry {
     registerFeature(feature) {
         runInInjectionContext(this.injector, () => feature.init?.());
         this._features$.next([...this._features$.value, feature].sort((a, b) => a.order - b.order));
+        console.info('Loaded feature: ', feature.name);
     }
     loadExternalFeatures(features) {
-        forkJoin(features.map(externalFeature => from(loadRemoteModule(externalFeature.remote, externalFeature.feature)).pipe(map(module => module.default), catchError(() => of(null))))).pipe(map(list => list.filter((x) => x !== null))).subscribe((externalFeatures) => {
-            externalFeatures.forEach(feature => this.registerFeature(feature));
-        });
+        from(features).pipe(mergeMap(externalFeature => from(loadRemoteModule(externalFeature.remote, externalFeature.feature)).pipe(map(module => module.default), catchError(() => of(null)))), filter((x) => x !== null)).subscribe(feature => this.registerFeature(feature));
     }
     get features$() {
         return this._features$.asObservable();