fix(LayerContext): subscribe once with first operator (#1272)

* fix(LayerContext): subscribe once with first operator * fix(ObjectUtils): remove negative variant #1271
infra-geo-ouverte · Jun 14, 2023 · b83ec47 · b83ec47
1 parent bc40e5c
commit b83ec47
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/packages/context/src/lib/context-manager/shared/layer-context.directive.ts b/packages/context/src/lib/context-manager/shared/layer-context.directive.ts
@@ -1,7 +1,7 @@
 import { Directive, OnInit, OnDestroy, Optional, Input } from '@angular/core';
 
 import { Subscription, merge } from 'rxjs';
-import { buffer, debounceTime, filter } from 'rxjs/operators';
+import { buffer, debounceTime, filter, first } from 'rxjs/operators';
 
 import { RouteService, ConfigService } from '@igo2/core';
 import {
@@ -13,6 +13,7 @@ import {
   StyleService
 } from '@igo2/geo';
 import type { IgoMap } from '@igo2/geo';
+import { ObjectUtils } from '@igo2/utils';
 
 import { ContextService } from './context.service';
 import { DetailedContext } from './context.interface';
@@ -58,12 +59,11 @@ export class LayerContextDirective implements OnInit, OnDestroy {
       this.route.options.visibleOffLayersKey &&
       this.route.options.contextKey
     ) {
-      const queryParams$$ = this.route.queryParams.subscribe((params) => {
-        if (Object.keys(params).length > 0) {
-          this.queryParams = params;
-          queryParams$$.unsubscribe();
-        }
-      });
+      this.route.queryParams
+        .pipe(first(params => !ObjectUtils.isEmpty(params)))
+        .subscribe((params) => {
+            this.queryParams = params;
+        });
     }
   }
 

diff --git a/packages/utils/src/lib/object-utils.ts b/packages/utils/src/lib/object-utils.ts
@@ -281,4 +281,8 @@ export class ObjectUtils {
 
     return newObj;
   }
+
+  static isEmpty(obj: object): boolean {
+    return Object.keys(obj).length === 0;
+  }
 }