Merge pull request #288 from BIATeam/develop

v4.0.2 from develop

Author: JeremieFR

Angular/angular.json

@@ -118,6 +118,14 @@
                 }
               ]
             },
+            "rosa": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.rosa.ts"
+                }
+              ]
+            },
             "docker": {
               "fileReplacements": [
                 {

Angular/package-lock.json

@@ -17,6 +17,7 @@
     "build:prod": "ng build --configuration production --base-href /BIADemo/App/",
     "build:prod2": "ng build --configuration production --base-href /BIADemo2/App/ --output-path dist/BIADemo2",
     "build:ocp": "ng build --configuration production,ocp",
+    "build:rosa": "ng build --configuration production,rosa",
     "build:docker": "ng build --configuration docker",
     "deploy": "ng deploy --base-href=/BIADemo/",
     "styles-theme-dark": "dart compile-sass.dart ./src/assets/bia/primeng/bia/theme-dark.scss ./src/assets/bia/primeng/layout/styles/theme/theme-dark/theme-dark.css",
@@ -51,35 +52,35 @@
     "file-saver": "~2.0.5",
     "jwt-decode": "~4.0.0",
     "keycloak-angular": "~15.3.0",
-    "keycloak-js": "~21.1.2",
+    "keycloak-js": "~25.0.6",
     "ngx-logger": "~5.0.12",
     "papaparse": "~5.4.1",
     "primeflex": "~3.3.1",
     "primeicons": "~7.0.0",
     "primeng": "~17.18.15",
-    "rxjs": "~7.8.1",
+    "rxjs": "~7.8.2",
     "zone.js": "~0.14.10"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~17.3.11",
+    "@angular-devkit/build-angular": "^17.3.12",
     "@angular-eslint/builder": "~17.5.3",
     "@angular-eslint/eslint-plugin": "~17.5.3",
     "@angular-eslint/eslint-plugin-template": "~17.5.3",
     "@angular-eslint/schematics": "~17.5.3",
     "@angular-eslint/template-parser": "~17.5.3",
-    "@angular/cli": "~17.3.11",
+    "@angular/cli": "~17.3.12",
     "@angular/compiler-cli": "~17.3.12",
     "@angular/language-service": "~17.3.12",
     "@ngrx/store-devtools": "~17.2.0",
-    "@types/node": "~20.17.14",
+    "@types/node": "~20.17.23",
     "@types/papaparse": "~5.3.15",
     "@typescript-eslint/eslint-plugin": "~5.62.0",
     "@typescript-eslint/parser": "~5.62.0",
     "eslint": "~8.57.1",
     "eslint-config-prettier": "~9.1.0",
     "eslint-plugin-deprecation": "~3.0.0",
     "eslint-plugin-prettier": "~5.2.3",
-    "prettier": "~3.4.2",
+    "prettier": "~3.5.3",
     "prettier-eslint": "~16.3.0",
     "prettier-plugin-organize-imports": "~4.1.0",
     "ts-node": "~10.9.2",

Angular/package.json

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, HostListener, OnInit } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { PrimeNGConfig } from 'primeng/api';
 import { BiaInjectExternalService } from './core/bia-core/services/bia-inject-external.service';
@@ -37,5 +37,11 @@ export class AppComponent implements OnInit {
     this.translateService
       .get('primeng')
       .subscribe(res => this.primeNgConfig.setTranslation(res));
+    this.checkSmallScreen();
+  }
+
+  @HostListener('window:resize', ['$event'])
+  checkSmallScreen() {
+    this.layoutService.checkSmallScreen();
   }
 }

Angular/src/app/app.component.ts

@@ -1,11 +1,61 @@
 import { Injector } from '@angular/core';
-import { AbstractDasWithListAndItem } from './abstract-das-with-list-and-item.service';
+import { TableLazyLoadEvent } from 'primeng/table';
+import { Observable } from 'rxjs';
+import { DataResult } from 'src/app/shared/bia-shared/model/data-result';
+import {
+  DeleteParam,
+  DeletesParam,
+  GetListByPostParam,
+  GetListParam,
+  GetParam,
+  PostParam,
+  PutParam,
+  SaveParam,
+} from '../models/http-params';
+import { GenericDas } from './generic-das.service';
 
 export abstract class AbstractDas<
-  TOut,
+  TOutList,
+  TOut = TOutList,
   TIn = Pick<TOut, Exclude<keyof TOut, 'id'>>,
-> extends AbstractDasWithListAndItem<TOut, TOut, TIn> {
+> extends GenericDas {
   constructor(injector: Injector, endpoint: string) {
     super(injector, endpoint);
   }
+
+  getList(param?: GetListParam): Observable<TOutList[]> {
+    return this.getListItems<TOutList>(param);
+  }
+
+  getListByPost(param: GetListByPostParam): Observable<DataResult<TOutList[]>> {
+    return this.getListItemsByPost<TOutList>(param);
+  }
+
+  get(param?: GetParam): Observable<TOut> {
+    return this.getItem<TOut>(param);
+  }
+
+  save(param: SaveParam<TIn>) {
+    return this.saveItem<TIn, TOut>(param);
+  }
+
+  put(param: PutParam<TIn>) {
+    return this.putItem<TIn, TOut>(param);
+  }
+
+  post(param: PostParam<TIn>) {
+    return this.postItem<TIn, TOut>(param);
+  }
+
+  delete(param: DeleteParam) {
+    return this.deleteItem(param);
+  }
+
+  deletes(param: DeletesParam) {
+    return this.deleteItems(param);
+  }
+
+  getFile(event: TableLazyLoadEvent, endpoint = 'csv'): Observable<any> {
+    return this.getItemFile(event, endpoint);
+  }
 }

Angular/src/app/core/bia-core/services/abstract-das-with-list-and-item.service.ts

@@ -90,13 +90,18 @@ export class BiaTranslationService {
     .pipe(distinctUntilChanged())
     .pipe(skip(1));
 
+  protected currentCulture = 'None';
+  protected currentLanguage = 'None';
+
   constructor(
     protected translate: TranslateService,
     @Inject(LOCALE_ID) localeId: string,
     protected store: Store<AppState>,
     protected primeNgConfig: PrimeNGConfig,
     protected authService: AuthService
   ) {
+    // force language initialization to avoid double authentication.
+    this.loadAndChangeLanguage(getCurrentCulture(), false);
     this.currentCultureDateFormat$.subscribe(dateFormat => {
       Calendar.prototype.getDateFormat = () => dateFormat.primeDateFormat;
     });
@@ -110,12 +115,10 @@ export class BiaTranslationService {
     this.translate.setTranslation(data[TRANSLATION_LANG_KEY], data, true);
   }
 
-  protected currentCulture = 'None';
-  protected currentLanguage = 'None';
   // Because we add some translations (registerLocaleData), ngx-translate doesn't modules translations
   // So we need to call getTranslation manually
   // NOTE: Check if it's still usefull
-  loadAndChangeLanguage(culture: string, defaultLang?: string) {
+  loadAndChangeLanguage(culture: string, reLoginIfRequiered = true) {
     if (this.currentCulture !== culture) {
       const lang = culture.split('-')[0];
       this.currentCulture = culture;
@@ -126,26 +129,12 @@ export class BiaTranslationService {
           translationLoaders$.push(translateService.getTranslation(lang));
         }
       }
-      if (
-        defaultLang &&
-        defaultLang !== lang &&
-        !this.translationsLoaded[defaultLang]
-      ) {
-        for (const translateService2 of translateServices) {
-          translationLoaders$.push(
-            translateService2.getTranslation(defaultLang)
-          );
-        }
-      }
       let lang$: Observable<any> = of(undefined);
       if (translationLoaders$.length) {
-        lang$ = this.loadTranslations(translationLoaders$, lang, defaultLang);
+        lang$ = this.loadTranslations(translationLoaders$, lang);
       }
       lang$.subscribe(() => {
         this.translate.use(lang);
-        if (defaultLang) {
-          this.translate.setDefaultLang(defaultLang);
-        }
         try {
           localStorage.setItem(STORAGE_CULTURE_KEY, culture);
         } catch (err) {
@@ -158,7 +147,7 @@ export class BiaTranslationService {
         .subscribe(res => this.primeNgConfig.setTranslation(res));
       if (this.currentLanguage !== lang) {
         this.currentLanguage = lang;
-        this.authService.reLogin();
+        if (reLoginIfRequiered) this.authService.reLogin();
       }
     }
   }

Angular/src/app/core/bia-core/services/abstract-das.service.ts

@@ -41,6 +41,14 @@ export const INIT_STATE: State = maintenanceTeamsAdapter.getInitialState({
 
 export const maintenanceTeamReducers = createReducer<State>(
   INIT_STATE,
+  on(FeatureMaintenanceTeamsActions.clearAll, state => {
+    const stateUpdated = maintenanceTeamsAdapter.removeAll(state);
+    stateUpdated.totalCount = 0;
+    return stateUpdated;
+  }),
+  on(FeatureMaintenanceTeamsActions.clearCurrent, state => {
+    return { ...state, currentMaintenanceTeam: <MaintenanceTeam>{} };
+  }),
   on(FeatureMaintenanceTeamsActions.loadAllByPost, state => {
     return { ...state, loadingGetAll: true };
   }),

Angular/src/app/core/bia-core/services/bia-translation.service.ts

@@ -44,6 +44,17 @@ export const INIT_STATE: State =
 
 export const aircraftMaintenanceCompanyReducers = createReducer<State>(
   INIT_STATE,
+  on(FeatureAircraftMaintenanceCompaniesActions.clearAll, state => {
+    const stateUpdated = aircraftMaintenanceCompaniesAdapter.removeAll(state);
+    stateUpdated.totalCount = 0;
+    return stateUpdated;
+  }),
+  on(FeatureAircraftMaintenanceCompaniesActions.clearCurrent, state => {
+    return {
+      ...state,
+      currentAircraftMaintenanceCompany: <AircraftMaintenanceCompany>{},
+    };
+  }),
   on(FeatureAircraftMaintenanceCompaniesActions.loadAllByPost, state => {
     return { ...state, loadingGetAll: true };
   }),

Angular/src/app/features/aircraft-maintenance-companies/children/maintenance-teams/store/maintenance-teams-reducer.ts

@@ -41,6 +41,14 @@ export const INIT_STATE: State = airportsAdapter.getInitialState({
 
 export const airportReducers = createReducer<State>(
   INIT_STATE,
+  on(FeatureAirportsActions.clearAll, state => {
+    const stateUpdated = airportsAdapter.removeAll(state);
+    stateUpdated.totalCount = 0;
+    return stateUpdated;
+  }),
+  on(FeatureAirportsActions.clearCurrent, state => {
+    return { ...state, currentAirport: <Airport>{} };
+  }),
   on(FeatureAirportsActions.loadAllByPost, state => {
     return { ...state, loadingGetAll: true };
   }),