fix: layers would be duplicated when doing some changes on them

* bugfix/AB#69091_DB-layers-edition-still-broken fix: add missing FormWrapperModule to the add-aggregation-modal for layers fix: add default case when aggregation list of selected resource does not contain any item

* bugfix/AB#69091_DB-layers-edition-still-broken refactor: change conditions style in order to be more readable and easy to debug for developers fix: delete addLayer method on onAddLayer event in Layer class as that method only triggers when the layer is already added fix: remaining listeners for each Layer instance trigger on switching between layers instance. Added method removeAllListeners to Layer class in order to clean up all listeners once we remove the related Layer class instance fix: main duplication layer issue by always triggering layer editor form change updates once all related layers changes of the map are finished

* bugfix/AB#69091_DB-layers-edition-still-broken refactor: improve service dependency instantiation for Layer class using the Injector from map component in order to simplify and have access to all the needed dependencies from one single property fix: add renderer to Layer class in order to handle all DOM event listeners easily

* bugfix/AB#69091_DB-layers-edition-still-broken refactor: delete some map listeners added from Layer class on layer removal fix: duplication of layers while loading layer changes if any map event is triggered by disabling them meanwhile layer data is setting up

* bugfix/AB#69091_DB-layers-edition-still-broken fix: add recursive listener removal for children layers in the removeAllListeners method feat: move map layers set in map component's drawMap method in order to be callable from outside the component without any further config change in the map instance feat: update layers property as public in order to keep layers data sync in editor layer modal component, as the layer is created from a definition, therefor layers property in the map needs to be updated from outside the component itself to keep all listeners removal sync on switching from editor component to settings component etc. fix: add missing teardown logic for mapEvent subscription in map-settings to avoid memory leaks. fix: correct await on layer update for all layers(including grouplayers with async methods to load sublayers) fix: update layers list with edited layers(name could be changed and it was not reflected in map-layers list)

---------

Co-authored-by: Antoine Hurard <[email protected]>

Author: unai-reliefapp

libs/safe/src/lib/components/aggregation/add-aggregation-modal/add-aggregation-modal.component.ts

@@ -14,6 +14,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import {
   DialogModule,
+  FormWrapperModule,
   GraphQLSelectComponent,
   GraphQLSelectModule,
 } from '@oort-front/ui';
@@ -43,6 +44,7 @@ interface DialogData {
     GraphQLSelectModule,
     ReactiveFormsModule,
     ButtonModule,
+    FormWrapperModule,
   ],
   selector: 'safe-add-aggregation-modal',
   templateUrl: './add-aggregation-modal.component.html',

libs/safe/src/lib/components/editor-control/editor-control.component.ts

@@ -141,8 +141,11 @@ export class SafeEditorControlComponent
   /** Sets whether the field is disabled */
   set disabled(value: boolean) {
     const isDisabled = coerceBooleanProperty(value);
-    if (isDisabled) this.ngControl.control?.disable();
-    else this.ngControl.control?.enable();
+    if (isDisabled) {
+      this.ngControl.control?.disable();
+    } else {
+      this.ngControl.control?.enable();
+    }
     this.stateChanges.next();
   }
 
@@ -235,15 +238,19 @@ export class SafeEditorControlComponent
     const controlElement = this.elementRef.nativeElement.querySelector(
       '.safe-editor-control'
     );
-    if (!controlElement) return;
+    if (!controlElement) {
+      return;
+    }
     controlElement.setAttribute('aria-describedby', ids.join(' '));
   }
 
   /**
    * Handles mouse click on container
    */
   onContainerClick() {
-    if (this.editor) this.editor.editor.focus();
+    if (this.editor) {
+      this.editor.editor.focus();
+    }
   }
 
   /**

libs/safe/src/lib/components/ui/core-grid/map-modal/map-modal.component.ts

@@ -42,7 +42,9 @@ export class MapModalComponent implements AfterViewInit {
 
   ngAfterViewInit(): void {
     const mapComponent = this.mapComponent;
-    if (!mapComponent) return;
+    if (!mapComponent) {
+      return;
+    }
     this.mapLayersService
       .createLayerFromDefinition(
         {
@@ -54,8 +56,7 @@ export class MapModalComponent implements AfterViewInit {
           createdAt: new Date(),
           updatedAt: new Date(),
         },
-        mapComponent.mapPopupService,
-        mapComponent.mapLayersService
+        mapComponent.injector
       )
       .then((layer) => {
         mapComponent.addLayer(layer);