Merge remote-tracking branch 'origin/next' into interactive-selection…

…-widget
infra-geo-ouverte · May 14, 2024 · 6a4957b · 6a4957b
2 parents 2feed60 + 9354bd3
commit 6a4957b
Show file tree

Hide file tree

Showing 132 changed files with 430 additions and 355 deletions.
diff --git a/angular.json b/angular.json
@@ -227,7 +227,7 @@
     },
     "auth": {
       "root": "packages/auth",
-      "sourceRoot": "packages/auth/src",
+      "sourceRoot": "packages/auth",
       "projectType": "library",
       "prefix": "igo",
       "schematics": {

diff --git a/packages/auth/form/src/auth-form/auth-form.component.ts b/packages/auth/form/src/auth-form/auth-form.component.ts
@@ -20,8 +20,8 @@ import {
   AuthMicrosoftb2cComponent
 } from '@igo2/auth/microsoft';
 import { ConfigService } from '@igo2/core/config';
+import { IgoLanguageModule } from '@igo2/core/language';
 
-import { TranslateModule } from '@ngx-translate/core';
 import { filter } from 'rxjs/operators';
 
 import { AuthFormOptions } from '../shared';
@@ -40,7 +40,7 @@ import { AuthFormOptions } from '../shared';
     AuthFacebookComponent,
     AuthInternComponent,
     MatButtonModule,
-    TranslateModule
+    IgoLanguageModule
   ]
 })
 export class AuthFormComponent implements OnInit {

diff --git a/packages/auth/internal/src/auth-intern/auth-intern.component.ts b/packages/auth/internal/src/auth-intern/auth-intern.component.ts
@@ -20,8 +20,7 @@ import { MatProgressSpinner } from '@angular/material/progress-spinner';
 
 import { AuthService } from '@igo2/auth';
 import { LanguageService } from '@igo2/core/language';
-
-import { TranslateModule } from '@ngx-translate/core';
+import { IgoLanguageModule } from '@igo2/core/language';
 
 @Component({
   selector: 'igo-auth-intern',
@@ -37,7 +36,7 @@ import { TranslateModule } from '@ngx-translate/core';
     MatButtonModule,
     MatProgressSpinner,
     NgIf,
-    TranslateModule
+    IgoLanguageModule
   ]
 })
 export class AuthInternComponent {

diff --git a/packages/auth/microsoft/src/auth-microsoft/auth-microsoft.component.ts b/packages/auth/microsoft/src/auth-microsoft/auth-microsoft.component.ts
@@ -11,6 +11,7 @@ import { MatButtonModule } from '@angular/material/button';
 import { AuthService } from '@igo2/auth';
 import { IconSvg, IgoIconComponent, MICROSOFT_ICON } from '@igo2/common';
 import { ConfigService } from '@igo2/core/config';
+import { IgoLanguageModule } from '@igo2/core/language';
 
 import {
   MSAL_GUARD_CONFIG,
@@ -25,7 +26,6 @@ import {
   PublicClientApplication,
   SilentRequest
 } from '@azure/msal-browser';
-import { TranslateModule } from '@ngx-translate/core';
 import { Subject } from 'rxjs';
 import { filter, takeUntil } from 'rxjs/operators';
 
@@ -40,7 +40,7 @@ import {
   styleUrls: ['./auth-microsoft.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [MatButtonModule, TranslateModule, IgoIconComponent]
+  imports: [MatButtonModule, IgoLanguageModule, IgoIconComponent]
 })
 export class AuthMicrosoftComponent {
   private options?: AuthMicrosoftOptions;

diff --git a/packages/auth/microsoft/src/auth-microsoftb2c/auth-microsoftb2c.component.ts b/packages/auth/microsoft/src/auth-microsoftb2c/auth-microsoftb2c.component.ts
@@ -11,6 +11,7 @@ import { MatButtonModule } from '@angular/material/button';
 import { AuthService } from '@igo2/auth';
 import { IconSvg, IgoIconComponent, MICROSOFT_ICON } from '@igo2/common';
 import { ConfigService } from '@igo2/core/config';
+import { IgoLanguageModule } from '@igo2/core/language';
 
 import { MSAL_GUARD_CONFIG } from '@azure/msal-angular';
 import {
@@ -21,7 +22,6 @@ import {
   PublicClientApplication,
   SilentRequest
 } from '@azure/msal-browser';
-import { TranslateModule } from '@ngx-translate/core';
 import { Subject } from 'rxjs';
 import { filter, takeUntil } from 'rxjs/operators';
 
@@ -38,7 +38,7 @@ import { MsalServiceb2c } from './auth-msalServiceb2c.service';
   styleUrls: ['./auth-microsoftb2c.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [MatButtonModule, TranslateModule, IgoIconComponent],
+  imports: [MatButtonModule, IgoLanguageModule, IgoIconComponent],
   providers: [MsalServiceb2c]
 })
 export class AuthMicrosoftb2cComponent {

diff --git a/packages/auth/monitoring/src/auth-monitoring/auth-monitoring.service.spec.ts b/packages/auth/monitoring/src/auth-monitoring/auth-monitoring.service.spec.ts
@@ -4,7 +4,7 @@ import { TestBed } from '@angular/core/testing';
 import { AuthService } from '@igo2/auth';
 import { IgoAuthFormModule } from '@igo2/auth/form';
 import { ConfigService } from '@igo2/core/config';
-import { provideMockRootTranslation } from '@igo2/core/language';
+import { provideMockTranslation } from '@igo2/core/language';
 import { MessageService } from '@igo2/core/message';
 import {
   AnyMonitoringOptions,
@@ -20,13 +20,9 @@ const initialize = (
   options: AnyMonitoringOptions = MOCK_MONITORING_OPTIONS
 ) => {
   TestBed.configureTestingModule({
-    imports: [
-      HttpClientModule,
-      provideMockRootTranslation(),
-      IgoAuthFormModule,
-      ToastrModule
-    ],
+    imports: [HttpClientModule, IgoAuthFormModule, ToastrModule],
     providers: [
+      provideMockTranslation(),
       { provide: MONITORING_OPTIONS, useValue: options },
       ToastrService,
       MessageService

diff --git a/packages/auth/src/lib/shared/auth.service.spec.ts b/packages/auth/src/lib/shared/auth.service.spec.ts
@@ -1,24 +1,16 @@
 import { HttpClientModule } from '@angular/common/http';
 import { TestBed, inject } from '@angular/core/testing';
 
-import {
-  IgoLanguageModule,
-  provideMockRootTranslation
-} from '@igo2/core/language';
+import { provideMockTranslation } from '@igo2/core/language';
 import { IgoMessageModule } from '@igo2/core/message';
 
 import { AuthService } from './auth.service';
 
 describe('AuthService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [
-        HttpClientModule,
-        provideMockRootTranslation(),
-        IgoLanguageModule,
-        IgoMessageModule
-      ],
-      providers: [AuthService]
+      imports: [HttpClientModule, IgoMessageModule],
+      providers: [AuthService, provideMockTranslation()]
     });
   });
 

diff --git a/packages/common/src/lib/action/actionbar/actionbar-item.component.ts b/packages/common/src/lib/action/actionbar/actionbar-item.component.ts
@@ -14,7 +14,8 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
 import { MatTooltipModule } from '@angular/material/tooltip';
 
-import { TranslateModule } from '@ngx-translate/core';
+import { IgoLanguageModule } from '@igo2/core/language';
+
 import { BehaviorSubject, Subscription, isObservable } from 'rxjs';
 
 import { IgoIconComponent } from '../../icons';
@@ -38,7 +39,7 @@ import { Action } from '../shared/action.interfaces';
     MatIconModule,
     MatCheckboxModule,
     AsyncPipe,
-    TranslateModule,
+    IgoLanguageModule,
     IgoIconComponent
   ]
 })

diff --git a/packages/common/src/lib/action/actionbar/actionbar.component.ts b/packages/common/src/lib/action/actionbar/actionbar.component.ts
@@ -22,9 +22,9 @@ import {
 } from '@angular/material/menu';
 import { MatTooltipModule } from '@angular/material/tooltip';
 
+import { IgoLanguageModule } from '@igo2/core/language';
 import { Media, MediaService } from '@igo2/core/media';
 
-import { TranslateModule } from '@ngx-translate/core';
 import { BehaviorSubject } from 'rxjs';
 
 import { EntityStoreWatcher } from '../../entity';
@@ -54,7 +54,7 @@ import { ActionbarItemComponent } from './actionbar-item.component';
     MatMenuModule,
     MatCardModule,
     AsyncPipe,
-    TranslateModule
+    IgoLanguageModule
   ]
 })
 export class ActionbarComponent implements OnDestroy, OnChanges {

diff --git a/packages/common/src/lib/color-picker-form-field/color-picker-form-field.component.ts b/packages/common/src/lib/color-picker-form-field/color-picker-form-field.component.ts
@@ -11,7 +11,8 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 
-import { TranslateModule } from '@ngx-translate/core';
+import { IgoLanguageModule } from '@igo2/core/language';
+
 import { ColorEvent } from 'ngx-color';
 import { ColorChromeModule } from 'ngx-color/chrome';
 import tinycolor, { ColorInput } from 'tinycolor2';
@@ -37,7 +38,7 @@ type ColorFormat = 'hex' | 'rgba' | 'hsla';
     CdkConnectedOverlay,
     ColorChromeModule,
     MatButtonModule,
-    TranslateModule
+    IgoLanguageModule
   ]
 })
 export class ColorPickerFormFieldComponent implements ControlValueAccessor {

diff --git a/packages/common/src/lib/confirm-dialog/confirm-dialog.component.ts b/packages/common/src/lib/confirm-dialog/confirm-dialog.component.ts
@@ -7,7 +7,7 @@ import {
   MatDialogTitle
 } from '@angular/material/dialog';
 
-import { TranslateModule } from '@ngx-translate/core';
+import { IgoLanguageModule } from '@igo2/core/language';
 
 @Component({
   selector: 'igo-confirm-dialog',
@@ -19,7 +19,7 @@ import { TranslateModule } from '@ngx-translate/core';
     MatDialogContent,
     MatDialogActions,
     MatButtonModule,
-    TranslateModule
+    IgoLanguageModule
   ]
 })
 export class ConfirmDialogComponent {

diff --git a/packages/common/src/lib/entity/entity-table/entity-table.component.ts b/packages/common/src/lib/entity/entity-table/entity-table.component.ts
@@ -48,9 +48,9 @@ import { MatSortModule } from '@angular/material/sort';
 import { MatTableDataSource, MatTableModule } from '@angular/material/table';
 import { MatTooltipModule } from '@angular/material/tooltip';
 
+import { IgoLanguageModule } from '@igo2/core/language';
 import { StringUtils } from '@igo2/utils';
 
-import { TranslateModule } from '@ngx-translate/core';
 import { default as moment } from 'moment';
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { debounceTime, map } from 'rxjs/operators';
@@ -125,7 +125,7 @@ interface RowData {
     SanitizeHtmlPipe,
     SecureImagePipe,
     StopPropagationDirective,
-    TranslateModule
+    IgoLanguageModule
   ]
 })
 export class EntityTableComponent implements OnInit, OnChanges, OnDestroy {

diff --git a/packages/common/src/lib/form-dialog/form-dialog.component.ts b/packages/common/src/lib/form-dialog/form-dialog.component.ts
@@ -9,8 +9,8 @@ import {
 } from '@angular/material/dialog';
 
 import { LanguageService } from '@igo2/core/language';
+import { IgoLanguageModule } from '@igo2/core/language';
 
-import { TranslateModule } from '@ngx-translate/core';
 import { BehaviorSubject } from 'rxjs';
 
 import { CustomHtmlComponent } from '../custom-html/custom-html.component';
@@ -42,7 +42,7 @@ import { FormDialogData } from './form-dialog.interface';
     MatButtonModule,
     CustomHtmlComponent,
     AsyncPipe,
-    TranslateModule
+    IgoLanguageModule
   ]
 })
 export class FormDialogComponent {

diff --git a/packages/common/src/lib/form/form-field/form-field-select.component.ts b/packages/common/src/lib/form/form-field/form-field-select.component.ts
@@ -12,7 +12,8 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSelectModule } from '@angular/material/select';
 
-import { TranslateModule } from '@ngx-translate/core';
+import { IgoLanguageModule } from '@igo2/core/language';
+
 import { BehaviorSubject } from 'rxjs';
 
 import { IgoFormFieldComponent } from '../shared/form-field-component';
@@ -41,7 +42,7 @@ import {
     NgIf,
     MatIconModule,
     AsyncPipe,
-    TranslateModule
+    IgoLanguageModule
   ]
 })
 export class FormFieldSelectComponent implements OnInit {

diff --git a/packages/common/src/lib/form/form-field/form-field-text.component.ts b/packages/common/src/lib/form/form-field/form-field-text.component.ts
@@ -13,7 +13,8 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
 
-import { TranslateModule } from '@ngx-translate/core';
+import { IgoLanguageModule } from '@igo2/core/language';
+
 import { BehaviorSubject } from 'rxjs';
 
 import { IgoFormFieldComponent } from '../shared/form-field-component';
@@ -40,7 +41,7 @@ import {
     MatIconModule,
     MatButtonModule,
     AsyncPipe,
-    TranslateModule
+    IgoLanguageModule
   ]
 })
 export class FormFieldTextComponent implements OnInit {

diff --git a/packages/common/src/lib/form/form-field/form-field-textarea.component.ts b/packages/common/src/lib/form/form-field/form-field-textarea.component.ts
@@ -11,7 +11,8 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
 
-import { TranslateModule } from '@ngx-translate/core';
+import { IgoLanguageModule } from '@igo2/core/language';
+
 import { BehaviorSubject } from 'rxjs';
 
 import { IgoFormFieldComponent } from '../shared/form-field-component';
@@ -37,7 +38,7 @@ import {
     NgIf,
     MatIconModule,
     AsyncPipe,
-    TranslateModule
+    IgoLanguageModule
   ]
 })
 export class FormFieldTextareaComponent implements OnInit {

diff --git a/packages/common/src/lib/form/form-group/form-group.component.ts b/packages/common/src/lib/form/form-group/form-group.component.ts
@@ -3,7 +3,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
 import { MatFormFieldModule } from '@angular/material/form-field';
 
-import { TranslateModule } from '@ngx-translate/core';
+import { IgoLanguageModule } from '@igo2/core/language';
 
 import { FormFieldComponent } from '../form-field/form-field.component';
 import { FormField, FormFieldGroup } from '../shared/form.interfaces';
@@ -26,7 +26,7 @@ import { getControlErrorMessage } from '../shared/form.utils';
     NgClass,
     FormFieldComponent,
     MatFormFieldModule,
-    TranslateModule
+    IgoLanguageModule
   ]
 })
 export class FormGroupComponent {

diff --git a/packages/common/src/lib/home-button/home-button.component.ts b/packages/common/src/lib/home-button/home-button.component.ts
@@ -3,14 +3,14 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
 import { MatTooltipModule } from '@angular/material/tooltip';
 
-import { TranslateModule } from '@ngx-translate/core';
+import { IgoLanguageModule } from '@igo2/core/language';
 
 @Component({
   selector: 'igo-home-button',
   templateUrl: './home-button.component.html',
   styleUrls: ['./home-button.component.scss'],
   standalone: true,
-  imports: [MatButtonModule, MatTooltipModule, MatIconModule, TranslateModule]
+  imports: [MatButtonModule, MatTooltipModule, MatIconModule, IgoLanguageModule]
 })
 export class HomeButtonComponent {
   @Output() unselectButton = new EventEmitter<any>();

diff --git a/packages/common/src/lib/icons/icon/icon.component.ts b/packages/common/src/lib/icons/icon/icon.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input } from '@angular/core';
-import { MatIconModule, MatIconRegistry } from '@angular/material/icon';
-import { DomSanitizer } from '@angular/platform-browser';
+import { MatIconModule } from '@angular/material/icon';
 
 import { IconSvg } from '../shared';
+import { IconService } from '../shared/icon.service';
 
 @Component({
   selector: 'igo-icon',
@@ -24,16 +24,10 @@ export class IgoIconComponent {
   }
   private _icon: string | IconSvg;
 
-  constructor(
-    private iconRegistry: MatIconRegistry,
-    private sanitizer: DomSanitizer
-  ) {}
+  constructor(private iconService: IconService) {}
 
   registerSvg(icon: IconSvg): void {
-    this.iconRegistry.addSvgIconLiteral(
-      icon.name,
-      this.sanitizer.bypassSecurityTrustHtml(icon.svg)
-    );
+    this.iconService.registerSvg(icon);
   }
 
   isSvg(icon: string | IconSvg): icon is IconSvg {