@igo2/integration 20.1.0-next.16 → 20.1.0-next.18

package/fesm2022/igo2-integration.mjs

@@ -10,12 +10,12 @@ import * as i4 from '@angular/material/menu';
 import { MatMenuModule } from '@angular/material/menu';
 import * as i2 from '@angular/material/tooltip';
 import { MatTooltipModule } from '@angular/material/tooltip';
-import { AuthService } from '@igo2/auth';
+import { AuthService, UserService } from '@igo2/auth';
 import { CustomHtmlComponent, SanitizeHtmlPipe } from '@igo2/common/custom-html';
 import { ToolComponent, ToolService } from '@igo2/common/tool';
 import { ConfigService, version } from '@igo2/core/config';
 import { LanguageService, IgoLanguageModule } from '@igo2/core/language';
-import { of, BehaviorSubject, combineLatest, forkJoin, map as map$1, Subject, ReplaySubject, interval } from 'rxjs';
+import { of, BehaviorSubject, combineLatest, forkJoin, map as map$1, merge, Subject, ReplaySubject, interval } from 'rxjs';
 import * as i3$1 from '@ngx-translate/core';
 import { TranslateModule } from '@ngx-translate/core';
 import * as i3$2 from '@angular/common';
@@ -23,7 +23,7 @@ import { AsyncPipe, formatDate, CommonModule, DecimalPipe, NgTemplateOutlet } fr
 import { EntityStore, EntityStoreFilterCustomFuncStrategy, EntityStoreFilterSelectionStrategy, EntityTableComponent, getEntityTitle } from '@igo2/common/entity';
 import * as i1$1 from '@igo2/geo';
 import { MapService, ProjectionService, IgoMap, CatalogService, CatalogBrowserComponent, generateIdFromSourceOptions, isLayerItemOptions, CatalogItemType, CatalogLibraryComponent, StopsStore, StopsFeatureStore, RoutesFeatureStore, StepsFeatureStore, IgoDirectionsModule, FeatureStore, DrawComponent, isLayerItem, OgcFilterableItemComponent, TimeFilterItemComponent, OgcFilterableListComponent, OgcFilterableListBindingDirective, FeatureStoreSelectionStrategy, FeatureMotion, mapExtentStrategyActiveToolTip, noElementSelected, OgcFilterWidget, InteractiveSelectionFormWidget, WfsWorkspace, FeatureWorkspace, EditionWorkspace, SpatialFilterService, LayerService, SpatialFilterItemType, MeasureLengthUnit, SpatialFilterType, createOverlayMarkerStyle, featureToOl, moveToOlFeatures, RADIUS_NAME, SpatialFilterTypeComponent, SpatialFilterItemComponent, FeatureDetailsComponent, TimeFilterListComponent, TimeFilterListBindingDirective, isBaseLayer, ImportExportComponent, formatScale, zoneMtm, zoneUtm, computeProjectionsConstraints, SearchSourceService, LayerListControlsEnum, sourceCanSearch, LayerViewerComponent, ExportButtonComponent, OgcFilterButtonComponent, TimeFilterButtonComponent, TrackFeatureButtonComponent, MetadataButtonComponent, LayerLegendListComponent, LayerLegendListBindingDirective, roundCoordTo, featureFromOl, measureOlGeometryLength, FEATURE, VectorLayer, StyleModalLayerButtonComponent, MeasurerComponent, PrintComponent, SearchBarComponent, getCommonVectorStyle, computeOlFeaturesExtent, featuresAreOutOfView, featuresAreTooDeepInView, getCommonVectorSelectedStyle, SearchResultsComponent, SearchResultAddButtonComponent, isLayerGroup, PropertyTypeDetectorService, CapabilitiesService, GeoPropertiesStrategy } from '@igo2/geo';
-import { take, switchMap, concatAll, map, toArray, skipWhile, takeUntil, tap, debounceTime, skip } from 'rxjs/operators';
+import { take, switchMap, concatAll, map, toArray, skipWhile, distinctUntilChanged, takeUntil, tap, debounceTime, skip } from 'rxjs/operators';
 import { StorageService, StorageScope, StorageServiceEventEnum } from '@igo2/core/storage';
 import { ContextService, ContextEditComponent, ContextListComponent, ContextPermissionsComponent, ShareMapComponent, ContextImportExportComponent } from '@igo2/context';
 import { createExcelWorkBook, addExcelSheetToWorkBook, writeExcelFile, ObjectUtils, uuid, NumberUtils } from '@igo2/utils';
@@ -79,6 +79,9 @@ let AboutToolComponent = class AboutToolComponent {
     http = inject(HttpClient);
     cdRef = inject(ChangeDetectorRef);
     languageService = inject(LanguageService);
+    userService = inject(UserService, {
+        optional: true
+    });
     configOptions;
     get headerHtml() {
         return this._headerHtml;
@@ -105,7 +108,6 @@ let AboutToolComponent = class AboutToolComponent {
     effectiveVersion;
     _html = 'igo.integration.aboutTool.html';
     _headerHtml;
-    baseUrlProfil;
     baseUrlGuide;
     loading = false;
     constructor() {
@@ -114,24 +116,24 @@ let AboutToolComponent = class AboutToolComponent {
         const configVersion = this.configOptions.version;
         this.effectiveVersion =
             configVersion?.app || configVersion?.lib || version.lib;
-        this.baseUrlProfil = this.configOptions.storage?.url;
         this.baseUrlGuide =
             this.configOptions.depot?.url +
                 // todo validate this property
                 this.configOptions.depot?.guideUrl;
     }
     ngOnInit() {
-        if (this.auth.authenticated && this.configOptions.context?.url) {
-            this.http.get(this.baseUrlProfil).subscribe((profil) => {
-                const recast = profil;
-                this.trainingGuideURLs.set(recast.guides);
-                this.cdRef.detectChanges();
-            });
-        }
-        else if (this.auth.authenticated &&
-            !this.configOptions.context?.url &&
-            this.configOptions.depot?.trainingGuides) {
-            this.trainingGuideURLs.set(this.configOptions.depot?.trainingGuides);
+        if (this.auth.authenticated) {
+            if (this.configOptions.context?.url) {
+                this.userService?.getUser().subscribe((user) => {
+                    this.trainingGuideURLs.set(user['guides']);
+                });
+            }
+            else {
+                const trainingGuides = this.configOptions.depot?.trainingGuides;
+                if (trainingGuides) {
+                    this.trainingGuideURLs.set(trainingGuides);
+                }
+            }
         }
     }
     openGuide(guide) {
@@ -1868,13 +1870,9 @@ class WorkspaceState {
                 }
             });
         });
-        this.actionMaximize$$.push(this.featureActionsService.maximize$.subscribe((maximized) => {
-            this.setWorkspaceIsMaximized(maximized);
-        }));
-        this.actionMaximize$$.push(this.wfsActionsService.maximize$.subscribe((maximized) => {
-            this.setWorkspaceIsMaximized(maximized);
-        }));
-        this.actionMaximize$$.push(this.editionActionsService.maximize$.subscribe((maximized) => {
+        this.actionMaximize$$.push(merge(this.featureActionsService.maximize$, this.wfsActionsService.maximize$, this.editionActionsService.maximize$)
+            .pipe(distinctUntilChanged())
+            .subscribe((maximized) => {
             this.setWorkspaceIsMaximized(maximized);
         }));
         this.activeWorkspace$$ = this.workspace$.subscribe((workspace) => {