@eui/tools 4.17.9 → 4.18.2

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/home/home.component.ts

@@ -0,0 +1,19 @@
+import { Component } from '@angular/core';
+import { UxAppShellService } from '@eui/core';
+
+@Component({
+    templateUrl: './home.component.html',
+})
+export class HomeComponent {
+    constructor(
+        private asService: UxAppShellService,
+    ) {
+    }
+
+    onUpdateAppName() {
+        this.asService.setState({
+            ...this.asService.state,
+            appName: 'Updated app name'
+        })
+    }
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/home/home.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../../shared/shared.module';
+
+import { HomeRoutingModule } from './home-routing.module';
+
+import { HomeComponent } from './home.component';
+
+@NgModule({
+    imports: [
+        SharedModule,
+        HomeRoutingModule,
+    ],
+    declarations: [
+        HomeComponent,
+    ],
+})
+export class Module {}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module1/components/page1/page1.component.html

@@ -0,0 +1,7 @@
+<div id="page-title">
+    <h2>Module1 - Page 1</h2>
+</div>
+
+<ux-panel label="Panel">
+    Panel content
+</ux-panel>

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module1/components/page1/page1.component.ts

@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+    templateUrl: './page1.component.html'
+})
+export class Page1Component {
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module1/components/page2/page2.component.html

@@ -0,0 +1,7 @@
+<div id="page-title">
+    <h2>Module 1 - page 2</h2>
+</div>
+
+<ux-panel label="Panel">
+    Panel content
+</ux-panel>

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module1/components/page2/page2.component.ts

@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+    templateUrl: './page2.component.html'
+})
+export class Page2Component {
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module1/module1-routing.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { Page1Component } from './components/page1/page1.component';
+import { Page2Component } from './components/page2/page2.component';
+import { Module1Component } from './module1.component';
+
+const routes: Routes = [
+    { path: '', component: Module1Component },
+    { path: 'page1', component: Page1Component },
+    { path: 'page2', component: Page2Component },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes)
+    ],
+})
+export class Module1RoutingModule {}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module1/module1.component.html

@@ -0,0 +1,7 @@
+<eui-page>
+    <eui-page-header label="Module 1"></eui-page-header>
+
+    <eui-page-content>
+
+    </eui-page-content>
+</eui-page>

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module1/module1.component.ts

@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+    templateUrl: './module1.component.html',
+})
+export class Module1Component {
+
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module1/module1.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { Module1RoutingModule } from './module1-routing.module';
+import { Module1Component } from './module1.component';
+import { Page1Component } from './components/page1/page1.component';
+import { Page2Component } from './components/page2/page2.component';
+
+import { SharedModule } from '../../shared/shared.module';
+
+@NgModule({
+    imports: [
+        SharedModule,
+        Module1RoutingModule,
+    ],
+    declarations: [
+        Module1Component,
+        Page1Component,
+        Page2Component,
+    ],
+})
+export class Module {
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module2/module2-routing.module.ts

@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { Module2Component } from './module2.component';
+
+const routes: Routes = [
+    { path: '', component: Module2Component },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild([
+            { path: '', component: Module2Component }
+        ])
+    ],
+})
+export class Module2RoutingModule {}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module2/module2.component.html

@@ -0,0 +1,8 @@
+<eui-page>
+    <eui-page-header label="Module 2"></eui-page-header>
+
+    <eui-page-content>
+        
+
+    </eui-page-content>
+</eui-page>

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module2/module2.component.ts

@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+    templateUrl: './module2.component.html'
+})
+export class Module2Component {
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module2/module2.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Module2RoutingModule } from './module2-routing.module';
+import { Module2Component } from './module2.component';
+
+import { SharedModule } from '../../shared/shared.module';
+
+@NgModule({
+    imports: [
+        SharedModule,
+        Module2RoutingModule,
+    ],
+    declarations: [
+        Module2Component,
+    ],
+})
+export class Module {
+}

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

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { UxAllModule } from '@eui/components';
+import { EuiAllModule } from '@eui/components-next';
+
+@NgModule({
+    imports: [
+        UxAllModule,
+        EuiAllModule,
+        TranslateModule,
+    ],
+    declarations: [
+    ],
+    exports: [
+        UxAllModule,
+        EuiAllModule,
+        TranslateModule,
+    ]
+})
+export class SharedModule {}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/shared/testing/router.mock.ts

@@ -0,0 +1,18 @@
+import { NavigationEnd } from '@angular/router';
+import { Observable } from 'rxjs/Observable';
+
+export class RouterMock {
+    routerState = { root: '' };
+    public navigationEnd = new NavigationEnd(0, 'http://url1', 'http://url2');
+    public events = new Observable(observer => {
+        observer.next(this.navigationEnd);
+        observer.complete();
+    });
+
+    constructor() {}
+
+    createUrlTree() {}
+
+    serializeUrl() {}
+
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/assets/config/env-json-config.json

@@ -0,0 +1,8 @@
+{
+    "modules": {
+        "core": {
+            "base": "/api",
+            "userDetails": "/user-details"
+        }
+    }
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/assets/i18n/en.json

@@ -0,0 +1,7 @@
+{
+    "page.home.title": "Welcome to eUI!",
+    "app.search.button": "Search",
+    "eui.my-profile-informations": "My profile information",
+    "eui.you-are-logged-in-as": "You are logged in as",
+    "eui.sign-out": "Sign out"
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/assets/i18n/fr.json

@@ -0,0 +1,7 @@
+{
+    "page.home.title": "Bienvenue dans eUI!",
+    "app.search.button": "Chercher",
+    "eui.my-profile-informations": "My profile information FR",
+    "eui.you-are-logged-in-as": "You are logged in as FR",
+    "eui.sign-out": "Sign out FR"
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/config/global.ts

@@ -0,0 +1,20 @@
+import { GlobalConfig } from '@eui/core';
+
+export const GLOBAL: GlobalConfig = {
+    appTitle: 'CSDR-app',
+    i18n: {
+        i18nService: {
+            defaultLanguage: 'en',
+            languages: ['en', 'fr'],
+        },
+        i18nLoader: {
+            i18nFolders: ['i18n-eui', 'i18n'],
+        },
+    },
+    user: {
+        defaultUserPreferences: {
+            dashboard: { },
+            lang: 'en',
+        },
+    },
+};

package/scripts/csdr/cli/skeletons/app-eui10/src/config/index.ts

@@ -0,0 +1,8 @@
+import { EuiAppConfig } from '@eui/core';
+import { GLOBAL } from './global';
+import { MODULES } from './modules';
+
+export const appConfig: EuiAppConfig = {
+    global: GLOBAL,
+    modules: MODULES,
+};

package/scripts/csdr/cli/skeletons/app-eui10/src/config/modules.ts

@@ -0,0 +1,4 @@
+import { ModulesConfig } from '@eui/core';
+
+export const MODULES: ModulesConfig = {
+};

package/scripts/csdr/cli/skeletons/app-eui10/src/environments/environment.prod.ts

@@ -0,0 +1,9 @@
+import { EuiEnvConfig } from '@eui/core';
+
+export const environment: EuiEnvConfig = {
+    production: true,
+    enableDevToolRedux: false,
+    envDynamicConfig: {
+        uri: 'assets/config/env-json-config.json',
+    },
+};

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

@@ -0,0 +1,9 @@
+import { EuiEnvConfig } from '@eui/core';
+
+export const environment: EuiEnvConfig = {
+    production: false,
+    enableDevToolRedux: true,
+    envDynamicConfig: {
+        uri: 'assets/config/env-json-config.json',
+    },
+};

package/scripts/csdr/cli/skeletons/app-eui10/src/index.html

@@ -0,0 +1,21 @@
+<!doctype html>
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <title>@app.name@</title>
+  <base href="/">
+
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+</head>
+
+<body>
+  <app-root>
+    <div id="loader-wrapper">
+      <div id="loader"></div>
+    </div>
+  </app-root>
+</body>
+
+</html>

package/scripts/csdr/cli/skeletons/app-eui10/src/styles.scss

@@ -0,0 +1 @@
+/* You can add global styles to this file, and also import other style files */

package/scripts/csdr/cli/skeletons/app-eui10/tslint.json

@@ -0,0 +1,17 @@
+{
+    "extends": "../../tslint.json",
+    "rules": {
+        "directive-selector": [
+            true,
+            "attribute",
+            "app",
+            "camelCase"
+        ],
+        "component-selector": [
+            true,
+            "element",
+            "app",
+            "kebab-case"
+        ]
+    }
+}

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

@@ -1,9 +1,10 @@
 import { Component, OnInit, Inject } from '@angular/core';
 import { Router } from '@angular/router';
 
-import { ELEMENT_ROUTER_TOKEN, IRouterService } from '@csdr/integration';
+import { take } from 'rxjs/operators';
 
-import { CONFIG_TOKEN, I18nService, UxAppShellService } from '@eui/core';
+import { CONFIG_TOKEN, I18nService, UserService } from '@eui/core';
+import { ELEMENT_ROUTER_TOKEN, IRouterService, initialization } from '@csdr/integration';
 
 import { appConfig } from '../config/index';
 
@@ -15,9 +16,23 @@ enum ElementStatus {
 
 @Component({
     template: `
+        <eui-block-content *ngIf="moduleStatus === ElementStatus.Loading" [isBlocked]="true">
+            <div style="height: 100%"></div>
+        </eui-block-content>
         <ng-container *ngIf="moduleStatus === ElementStatus.Loaded">
             <router-outlet></router-outlet>
         </ng-container>
+        <ng-container *ngIf="moduleStatus === ElementStatus.Error">
+            <div class="error-container">
+                <div>
+                    <h1>Translations or user data for this module failed to load.</h1>
+                    <p>Do you want to try again?</p>
+                    <button euiButton euiPrimary (click)="loadData()">
+                        <span euiLabel>{{ 'global.RELOAD' | translate }}</span>
+                    </button>
+                </div>
+            </div>
+        </ng-container>
     `,
     styles: [`
         .error-container {
@@ -42,27 +57,31 @@ export class ModuleComponent implements OnInit {
                 @Inject(ELEMENT_ROUTER_TOKEN) private routerService: IRouterService,
                 @Inject(CONFIG_TOKEN) public config: any,
                 private i18nService: I18nService,
-                private uxAppShellService: UxAppShellService) {
-        console.log(this.uxAppShellService.isGrowlSticky);
+                private userService: UserService) {
     }
 
     public ngOnInit() {
         this.router.navigate([this.routerService.getUrl()], { replaceUrl: true });
-        this.loadTranslations();
+        this.loadData();
     }
 
-    private loadTranslations() {
+    private loadData() {
         this.setStatus(ElementStatus.Loading);
-        this.i18nService
-            .init({ activeLang: 'en' })
-            .subscribe(s => {
-                // TODO: timeout is needed for right
-                //  top select element items which
-                //  are not translated.
-                //
-                //  eUI init method needs to be checked
-                setTimeout(() => this.setStatus(ElementStatus.Loaded), 500);
-            });
+        try {
+            initialization(this.i18nService, this.userService)
+                .pipe(take(1))
+                .subscribe((loadStatus: { success: boolean, error?: string }) => {
+                    if (!loadStatus.success) {
+                        this.setStatus(ElementStatus.Error);
+                        console.error(`[ELEMENT: ${appConfig.global.elementName}] `, loadStatus.error);
+                    } else {
+                        this.setStatus(ElementStatus.Loaded);
+                    }
+                });
+        } catch (e) {
+            console.log(e);
+            this.setStatus(ElementStatus.Error);
+        }
     }
 
     private setStatus(status: ElementStatus) {

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

@@ -1,3 +1,4 @@
+import { DOCUMENT } from '@angular/common';
 import { NgModule, Injector, NgZone, PLATFORM_ID } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
@@ -11,7 +12,7 @@ import { EffectsModule } from '@ngrx/effects';
 import { StoreRouterConnectingModule } from '@ngrx/router-store';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
 
 import {
     CachePreventionInterceptor,
@@ -21,14 +22,22 @@ import {
     CsrfPreventionInterceptor,
     EUI_CONFIG_TOKEN,
     EuLoginSessionTimeoutHandlingInterceptor,
+    GLOBAL_CONFIG_TOKEN,
     I18nService,
+    LogService,
     OpenIdConnectInterceptor,
+    StorageService,
     StoreService,
     translateConfig,
     UserService,
     UxAppShellService,
 } from '@eui/core';
-import { PushNotificationsService } from '@csdr/core';
+import {
+    EuiBlockContentComponentModule,
+    EuiButtonModule,
+    EuiLabelModule,
+} from '@eui/components-next';
+import { LanguageInterceptor, PushNotificationsService } from '@csdr/core';
 // TODO[REMOTE-SETUP] uncomment if zipkin is used
 // import { TRACE_LOCAL_SERVICE_NAME, ZipkinHttpInterceptor, ZipkinTraceManager } from '@csdr/zipkin-tracing';
 
@@ -42,11 +51,14 @@ import { appConfig } from '../config';
 // import { TaskMgrCommonModule } from '@cc/task-manager';
 import {
     ELEMENT_ROUTER_TOKEN,
-    PushNotificationMapping,
+    I18N_SERVICE_HOST_TOKEN,
+    I18nServiceMapping,
+    PUSH_NOTIFICATION_SERVICE_HOST_TOKEN,
+    PushNotificationServiceMapping,
     USER_SERVICE_HOST_TOKEN,
-    UserMapping,
-    UX_SERVICE_HOST_TOKEN,
+    UserServiceMapping,
     UX_APP_SHELL_SERVICE_HOST_TOKEN,
+    UX_SERVICE_HOST_TOKEN,
     UxAppShellServiceMapping,
 } from '@csdr/integration';
 import { RoutingModule } from './routing.module';
@@ -70,6 +82,10 @@ export function openidConnectInterceptorFactory(config) {
 
         CoreModule.forRoot(),
 
+        EuiBlockContentComponentModule,
+        EuiButtonModule,
+        EuiLabelModule,
+
         // TODO[REMOTE-SETUP] adapt to wrapped package import
         // TaskMgrCommonModule,
         RoutingModule,
@@ -87,6 +103,13 @@ 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,
@@ -122,18 +145,36 @@ export function openidConnectInterceptorFactory(config) {
         // },
 
         // 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'] },
+        // 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) => new PushNotificationMapping(zone, window['PROVIDERS']['PushNotificationsService']),
-            deps: [NgZone],
+            useFactory: (
+                zone: NgZone,
+                hostPushNotificationService: any) => new PushNotificationServiceMapping(zone, hostPushNotificationService),
+            deps: [NgZone, PUSH_NOTIFICATION_SERVICE_HOST_TOKEN],
         },
         {
             provide: UserService,
-            useFactory: (storeService: StoreService, hostUserService: any) => new UserMapping(storeService, hostUserService),
+            useFactory: (storeService: StoreService, hostUserService: any) => new UserServiceMapping(storeService, hostUserService),
             deps: [StoreService, USER_SERVICE_HOST_TOKEN],
         },
         {
@@ -147,7 +188,7 @@ export function openidConnectInterceptorFactory(config) {
                 iI18nService: I18nService,
                 hostUxService: any,
                 hostUxAppShellService: any) => new UxAppShellServiceMapping(
-                    config, http, platformId, router, storeService, iI18nService, hostUxService, hostUxAppShellService),
+                config, http, platformId, router, storeService, iI18nService, hostUxService, hostUxAppShellService),
             deps: [CONFIG_TOKEN, HttpClient, PLATFORM_ID, Router, StoreService, I18nService,
                 UX_SERVICE_HOST_TOKEN, UX_APP_SHELL_SERVICE_HOST_TOKEN],
         },

package/scripts/csdr/metadata/package-history.js

@@ -128,7 +128,7 @@ const getDiffBetweenBuildVersions = (pkg, fromBuildMetadata, toBuildMetadata) =>
 
   if (!fromBuildMetadata) {
     tools.logWarning('No previous metadata found for package...skipping');
-    return {};
+    return null;
   }
 
   return Promise.resolve()

package/scripts/utils/build/package/styles.js

@@ -141,7 +141,7 @@ const compileSassFileDartSass = (folder, filename) => {
         fs.writeFileSync(finalDest, postcssResult.css);
 
         if (postcssResult.map) {
-          fs.writeFileSync(`${finalDest}.map`, postcssResult.map);
+          fs.writeFileSync(`${finalDest}.map`, postcssResult.map.toString());
         }
       });
     })

package/scripts/utils/pre-build/injection/externals.js

@@ -252,16 +252,35 @@ module.exports.remapRoutesByEnvConfig = (project, envTarget, build) => {
         return;
       }
 
-      // get routes file content and replace tokens
       let routesFileContent = tools.getFileContent(routesFilePath);
+
+      // get routes file content and replace tokens
       routesRemapping.forEach((route) => {
         tools.logInfo(`checking replacement for : ${JSON.stringify(route)}`);
         const tokenToSearch = `./features/${route.featureModule}-lib.module#Module`;
         if (routesFileContent.indexOf(tokenToSearch) > -1) {
-          tools.logInfo(`token ${tokenToSearch} found...replacing`);
+          tools.logInfo(`token ${tokenToSearch} found...replacing by ${route.routeModuleDef}`);
           routesFileContent = tools.replaceAll(routesFileContent, tokenToSearch, route.routeModuleDef);
         }
       })
+
+      // extra physical routes remapping
+      const extraRoutesRemapping = config.extraRoutesRemapping;
+      if (!extraRoutesRemapping) {
+        tools.logWarning('No extra routes remapping found in current config...skipping');
+
+      } else {
+        tools.logInfo('Extra routes remapping');
+        extraRoutesRemapping.forEach((route) => {
+          tools.logInfo(`checking replacement ${JSON.stringify(route)}`);
+          const tokenToSearch = route.currentRoute;
+          if (routesFileContent.indexOf(tokenToSearch) > -1) {
+            tools.logInfo(`token ${tokenToSearch} found...replacing by ${route.updatedRoute}`);
+            routesFileContent = tools.replaceAll(routesFileContent, tokenToSearch, route.updatedRoute);
+          }
+        })
+      }
+
       return tools.writeFileContent(routesFilePath, routesFileContent);
     })
     .then(() => {