@eui/tools 5.3.7 → 5.3.10

package/.version.properties

@@ -1 +1 @@
-5.3.7
+5.3.10

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## 5.3.10 (2022-06-10)
+
+##### Chores
+
+* **other:**
+  * code cleanup MWP-8326 [MWP-8326](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8326)  ([32e3f665](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/32e3f665a91f188e4a7fadfedd9aeec220a657e0))
+
+* * *
+* * *
+## 5.3.9 (2022-06-10)
+
+##### Chores
+
+* **other:**
+  * adapted app release taking care of support/develop merge - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([900f3723](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/900f3723d75b83e03fd5c80f6c9bb17602e9c8c2))
+
+* * *
+* * *
+## 5.3.8 (2022-06-09)
+
+##### Chores
+
+* **other:**
+  * zipkin cleanup MWP-8326 [MWP-8326](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8326)  ([88fd83eb](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/88fd83ebd2cccfb13da4f2f2b73d72ea747fd925))
+  * code cleanup MWP-8326 [MWP-8326](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8326)  ([350c18d6](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/350c18d67bbcfb4c443ab53a6ea6e2b24afef256))
+
+* * *
+* * *
 ## 5.3.7 (2022-06-02)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "5.3.7",
+    "version": "5.3.10",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/app/module.component.ts

@@ -3,8 +3,8 @@ import { Router } from '@angular/router';
 
 import { take } from 'rxjs/operators';
 
-import { CONFIG_TOKEN, I18nService, UserService } from '@eui/core';
-import { ELEMENT_ROUTER_TOKEN, IRouterService, initialization } from '@csdr/integration';
+import { CONFIG_TOKEN } from '@eui/core';
+import { ELEMENT_ROUTER_TOKEN, IRouterService, ElementSetupService } from '@csdr/integration/element';
 
 import { appConfig } from '../config/index';
 
@@ -56,8 +56,7 @@ export class ModuleComponent implements OnInit {
     constructor(private router: Router,
                 @Inject(ELEMENT_ROUTER_TOKEN) private routerService: IRouterService,
                 @Inject(CONFIG_TOKEN) public config: any,
-                private i18nService: I18nService,
-                private userService: UserService) {
+                private elementSetupService: ElementSetupService) {
     }
 
     public ngOnInit() {
@@ -68,7 +67,7 @@ export class ModuleComponent implements OnInit {
     private loadData() {
         this.setStatus(ElementStatus.Loading);
         try {
-            initialization(this.i18nService, this.userService)
+            this.elementSetupService.init()
                 .pipe(take(1))
                 .subscribe((loadStatus: { success: boolean, error?: string }) => {
                     if (!loadStatus.success) {

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/app/module.ts

@@ -1,9 +1,7 @@
-import { DOCUMENT } from '@angular/common';
-import { NgModule, Injector, NgZone, PLATFORM_ID } from '@angular/core';
+import { NgModule, Injector } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { Router } from '@angular/router';
-import { HttpClient, HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HttpClientModule } from '@angular/common/http';
 import { createCustomElement } from '@angular/elements';
 
 import { StoreModule } from '@ngrx/store';
@@ -11,34 +9,21 @@ import { EffectsModule } from '@ngrx/effects';
 import { StoreRouterConnectingModule } from '@ngrx/router-store';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { TranslateModule } from '@ngx-translate/core';
 
 import {
-    CachePreventionInterceptor,
-    CONFIG_TOKEN,
     CoreModule,
-    CorsSecurityInterceptor,
-    CsrfPreventionInterceptor,
     EUI_CONFIG_TOKEN,
-    EuLoginSessionTimeoutHandlingInterceptor,
-    GLOBAL_CONFIG_TOKEN,
-    I18nService,
-    LogService,
-    OpenIdConnectInterceptor,
-    StorageService,
-    StoreService,
     translateConfig,
-    UserService,
-    UxAppShellService,
 } from '@eui/core';
 import {
     EuiBlockContentComponentModule,
     EuiButtonModule,
     EuiLabelModule,
 } from '@eui/components-next';
-import { LanguageInterceptor, PushNotificationsService, BreadcrumbsService } from '@csdr/core';
-// TODO[REMOTE-SETUP] uncomment if zipkin is used
-// import { TRACE_LOCAL_SERVICE_NAME, ZipkinHttpInterceptor, ZipkinTraceManager } from '@csdr/zipkin-tracing';
+import {
+    CsdrCoreModule,
+} from '@csdr/core';
 
 import { TOKEN, reducerProvider, metaReducers } from './reducers/index';
 import { CustomSerializer } from './reducers/custom-route-serializer';
@@ -48,27 +33,13 @@ import { appConfig } from '../config';
 
 import { Module as RootPackageCommonModule } from '@module.scope@/@module.name@';
 import {
-    ELEMENT_ROUTER_TOKEN,
-    I18N_SERVICE_HOST_TOKEN,
-    I18nServiceMapping,
-    NG_ZONE_HOST_TOKEN,
-    PUSH_NOTIFICATION_SERVICE_HOST_TOKEN,
-    PushNotificationServiceMapping,
-    USER_SERVICE_HOST_TOKEN,
-    UserServiceMapping,
-    UX_APP_SHELL_SERVICE_HOST_TOKEN,
-    UX_SERVICE_HOST_TOKEN,
-    UxAppShellServiceMapping,
-} from '@csdr/integration';
+    DEFAULT_MAPPED_PROVIDERS,
+} from '@csdr/integration/element';
 import { RoutingModule } from './routing.module';
 
 import { FallbackComponent } from './fallback.component';
 import { ModuleComponent } from './module.component';
 
-export function openidConnectInterceptorFactory(config) {
-    return new OpenIdConnectInterceptor();
-}
-
 @NgModule({
     imports: [
         BrowserModule,
@@ -81,6 +52,7 @@ export function openidConnectInterceptorFactory(config) {
         TranslateModule.forRoot(translateConfig),
 
         CoreModule.forRoot(),
+        CsdrCoreModule.forRoot(),
 
         EuiBlockContentComponentModule,
         EuiButtonModule,
@@ -103,102 +75,8 @@ export function openidConnectInterceptorFactory(config) {
             provide: EUI_CONFIG_TOKEN,
             useValue: { appConfig: { ...appConfig, ...environment }, environment },
         },
-        // TODO[REMOTE-SETUP] uncomment if LanguageInterceptor is used
-        // {
-        //     provide: HTTP_INTERCEPTORS,
-        //     useClass: LanguageInterceptor,
-        //     deps: [CONFIG_TOKEN, StorageService],
-        //     multi: true,
-        // },
-        {
-            provide: HTTP_INTERCEPTORS,
-            useClass: CorsSecurityInterceptor,
-            multi: true,
-        },
-        {
-            provide: HTTP_INTERCEPTORS,
-            useClass: EuLoginSessionTimeoutHandlingInterceptor,
-            multi: true,
-        },
-        {
-            provide: HTTP_INTERCEPTORS,
-            useClass: CsrfPreventionInterceptor,
-            multi: true,
-        },
-        {
-            provide: HTTP_INTERCEPTORS,
-            useClass: CachePreventionInterceptor,
-            multi: true,
-        },
-        {
-            provide: HTTP_INTERCEPTORS,
-            useFactory: openidConnectInterceptorFactory,
-            deps: [CONFIG_TOKEN],
-            multi: true,
-        },
-        // TODO[REMOTE-SETUP] uncomment if zipkin is used
-        // {
-        //     provide: HTTP_INTERCEPTORS,
-        //     useClass: ZipkinHttpInterceptor,
-        //     deps: [TRACE_LOCAL_SERVICE_NAME, ZipkinTraceManager],
-        //     multi: true,
-        // },
-
-        // used in the el-mappers
-        { provide: I18N_SERVICE_HOST_TOKEN, useFactory: () => window['PROVIDERS']['I18nService'] },
-        { provide: PUSH_NOTIFICATION_SERVICE_HOST_TOKEN, useFactory: () => window['PROVIDERS']['PushNotificationsService'] },
-        { provide: USER_SERVICE_HOST_TOKEN, useFactory: () => window['PROVIDERS']['UserService'] },
-        { provide: UX_SERVICE_HOST_TOKEN, useFactory: () => window['PROVIDERS']['UxService'] },
-        { provide: UX_APP_SHELL_SERVICE_HOST_TOKEN, useFactory: () => window['PROVIDERS']['UxAppShellService'] },
-        { provide: NG_ZONE_HOST_TOKEN, useFactory: () => window['PROVIDERS']['ngZone'] },
-        // TODO[REMOTE-SETUP] uncomment if LanguageInterceptor or StorageService is used
-        // { provide: StorageService, useFactory: () => window['PROVIDERS']['StorageService'] },
 
-        {
-            provide: I18nService,
-            useFactory: (
-                config: any,
-                translateService: TranslateService,
-                logService: LogService,
-                store: StoreService,
-                document: Document,
-                hostI18nService: any) => new I18nServiceMapping(
-                config, translateService, logService, store, document, hostI18nService),
-            deps: [GLOBAL_CONFIG_TOKEN, TranslateService, LogService, StoreService, DOCUMENT, I18N_SERVICE_HOST_TOKEN],
-        },
-        {
-            provide: PushNotificationsService,
-            useFactory: (
-                zone: NgZone,
-                hostPushNotificationService: any) => new PushNotificationServiceMapping(zone, hostPushNotificationService),
-            deps: [NgZone, PUSH_NOTIFICATION_SERVICE_HOST_TOKEN],
-        },
-        {
-            provide: UserService,
-            useFactory: (storeService: StoreService, hostUserService: any) => new UserServiceMapping(storeService, hostUserService),
-            deps: [StoreService, USER_SERVICE_HOST_TOKEN],
-        },
-        {
-            provide: UxAppShellService,
-            useFactory: (
-                config: any,
-                http: HttpClient,
-                platformId: any,
-                router: Router,
-                storeService: StoreService,
-                iI18nService: I18nService,
-                hostUxService: any,
-                hostUxAppShellService: any,
-                hostNgZone) => new UxAppShellServiceMapping(
-                config, http, platformId, router, storeService, iI18nService, hostUxService, hostUxAppShellService, hostNgZone),
-            deps: [CONFIG_TOKEN, HttpClient, PLATFORM_ID, Router, StoreService, I18nService,
-                UX_SERVICE_HOST_TOKEN, UX_APP_SHELL_SERVICE_HOST_TOKEN, NG_ZONE_HOST_TOKEN],
-        },
-        { provide: BreadcrumbsService, useFactory: () => window['PROVIDERS']['BreadcrumbsService'], deps: [] },
-        { provide: ELEMENT_ROUTER_TOKEN, useFactory: () => window['PROVIDERS']['ELEMENT_ROUTER_TOKEN'], deps: [] },
-        // TODO[REMOTE-SETUP] uncomment if zipkin is used
-        // { provide: TRACE_LOCAL_SERVICE_NAME, useFactory: () => window['PROVIDERS']['TRACE_LOCAL_SERVICE_NAME'], deps: [] },
-        // { provide: ZipkinTraceManager, useFactory: () => window['PROVIDERS']['ZipkinTraceManager'], deps: [] },
+        ...DEFAULT_MAPPED_PROVIDERS,
     ],
 })
 export class AppModule {

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/app/routing.module.ts

@@ -3,7 +3,7 @@ import { RouterModule, Routes, Router, NavigationStart } from '@angular/router';
 import { Subscription } from 'rxjs';
 import { filter, distinctUntilChanged } from 'rxjs/operators';
 
-import { CCRoute, ELEMENT_ROUTER_TOKEN, IRouterService } from '@csdr/integration';
+import { CCRoute, ELEMENT_ROUTER_TOKEN, IRouterService } from '@csdr/integration/element';
 
 import { routes } from '@module.scope@/@module.name@';
 import { appConfig } from '../config/index';

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/environments/environment.ts

@@ -1,15 +1,3 @@
-// This file can be replaced during build by using the `fileReplacements` array.
-// `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`.
-// The list of file replacements can be found in `angular.json`.
-
 export const environment = {
     production: false,
 };
-
-/*
- * In development mode, to ignore zone related error stack frames such as
- * `zone.run`, `zoneDelegate.invokeTask` for easier debugging, you can
- * import the following file, but please comment it out in production mode
- * because it will have performance impact when throw error
- */
-// import 'zone.js/dist/zone-error';  // Included with Angular CLI.

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/test.ts.TO_REPLACE

@@ -4,7 +4,7 @@ import 'zone.js/dist/zone-testing';
 import { getTestBed } from '@angular/core/testing';
 import {
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
+  platformBrowserDynamicTesting,
 } from '@angular/platform-browser-dynamic/testing';
 
 declare const require: any;
@@ -12,7 +12,7 @@ declare const require: any;
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(),
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/webpack.extra.js

@@ -4,4 +4,7 @@ module.exports = {
   plugins: [
     new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
   ],
+  output: {
+    jsonpFunction: '@module.scope-name@-v10',
+  },
 }

package/scripts/csdr/release/app/release-app.js

@@ -348,6 +348,11 @@ module.exports.run = () => {
             return utils.git.mergeMasterToDevelop(project, project.folder);
           }
         }
+
+        if (isSupportBranch && project.build && project.build.supportSnapshotBranch) {
+          utils.tools.logInfo('Branch is support / supportSnapshotBranch config detected');
+          return utils.git.mergeSupportToSupportDevelop(project, project.folder, branch, project.build.supportSnapshotBranch);
+        }
       }
     })