@eui/cli 15.4.1 → 15.4.2

package/lib/skeletons/_angular/base/proxy-mock.conf.json

@@ -1,6 +1,6 @@
-{
-    "/api": {
-        "target": "http://127.0.0.1:3000",
-        "secure": false
-    }
-}
+{
+    "/api": {
+        "target": "http://127.0.0.1:3000",
+        "secure": false
+    }
+}

package/lib/skeletons/_angular/base/proxy.conf.json

@@ -1,6 +1,6 @@
-{
-    "/api": {
-        "target": "http://localhost:7001",
-        "secure": false
-    }
-}
+{
+    "/api": {
+        "target": "http://localhost:7001",
+        "secure": false
+    }
+}

package/lib/skeletons/_angular/base/src/.eslintrc.json

@@ -1,118 +1,118 @@
-{
-    "root": true,
-    "ignorePatterns": [
-        "**/node_modules/**",
-        "**/dist/**",
-        "**/coverage/**",
-        "**/e2e/**",
-        "**/test/**"
-    ],
-    "overrides": [
-        {
-            "files": [
-                "*.ts"
-            ],
-            "parserOptions": {
-                "project": [
-                    "tsconfig.json",
-                    "e2e/tsconfig.json"
-                ],
-                "createDefaultProgram": true
-            },
-            "extends": [
-                "plugin:@angular-eslint/ng-cli-compat",
-                "plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
-                "plugin:@angular-eslint/template/process-inline-templates"
-            ],
-            "rules": {
-                "@angular-eslint/component-selector": [
-                    "error",
-                    {
-                        "type": "element",
-                        "prefix": ["app", "app"],
-                        "style": "kebab-case"
-                    }
-                ],
-                "@angular-eslint/directive-selector": [
-                    "error",
-                    {
-                        "type": "attribute",
-                        "prefix": ["app", "eui"],
-                        "style": "camelCase"
-                    }
-                ],
-                "@typescript-eslint/ban-ts-comment": "off",
-                "@typescript-eslint/ban-types": "error",
-                "@typescript-eslint/consistent-type-definitions": "off",
-                "@typescript-eslint/dot-notation": "off",
-                "@typescript-eslint/explicit-member-accessibility": [
-                    "off",
-                    {
-                        "accessibility": "explicit"
-                    }
-                ],
-                "@typescript-eslint/no-require-imports": "error",
-                "@typescript-eslint/no-unused-vars": "off",
-                "@typescript-eslint/no-var-requires": "error",
-                "@typescript-eslint/require-await": "error",
-                "brace-style": [
-                    "error",
-                    "1tbs"
-                ],
-                "id-blacklist": "off",
-                "id-match": "off",
-                "no-duplicate-case": "error",
-                "no-duplicate-imports": "off",
-                "no-invalid-this": "error",
-                "no-multiple-empty-lines": [
-                    "error",
-                    {
-                        "max": 1
-                    }
-                ],
-                "no-new-func": "error",
-                "no-redeclare": "off",
-                "@typescript-eslint/no-redeclare": [
-                    "error"
-                ],
-                "no-template-curly-in-string": "error",
-                "no-underscore-dangle": "off",
-                "@typescript-eslint/naming-convention": [
-                    "error",
-                    {
-                        "selector": "enum",
-                        "format": [
-                            "PascalCase",
-                            "UPPER_CASE"
-                        ]
-                    }
-                ],
-                "@typescript-eslint/member-ordering": [
-                    "error",
-                    {
-                        "default": [
-                            "public-static-field",
-                            "public-instance-field",
-                            "private-static-field",
-                            "private-instance-field",
-                            "public-constructor",
-                            "private-constructor",
-                            "public-instance-method",
-                            "protected-instance-method",
-                            "private-instance-method"
-                        ]
-                    }
-                ]
-            }
-        },
-        {
-            "files": [
-                "*.html"
-            ],
-            "extends": [
-                "plugin:@angular-eslint/template/recommended"
-            ],
-            "rules": {}
-        }
-    ]
-}
+{
+    "root": true,
+    "ignorePatterns": [
+        "**/node_modules/**",
+        "**/dist/**",
+        "**/coverage/**",
+        "**/e2e/**",
+        "**/test/**"
+    ],
+    "overrides": [
+        {
+            "files": [
+                "*.ts"
+            ],
+            "parserOptions": {
+                "project": [
+                    "tsconfig.json",
+                    "e2e/tsconfig.json"
+                ],
+                "createDefaultProgram": true
+            },
+            "extends": [
+                "plugin:@angular-eslint/ng-cli-compat",
+                "plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
+                "plugin:@angular-eslint/template/process-inline-templates"
+            ],
+            "rules": {
+                "@angular-eslint/component-selector": [
+                    "error",
+                    {
+                        "type": "element",
+                        "prefix": ["app", "app"],
+                        "style": "kebab-case"
+                    }
+                ],
+                "@angular-eslint/directive-selector": [
+                    "error",
+                    {
+                        "type": "attribute",
+                        "prefix": ["app", "eui"],
+                        "style": "camelCase"
+                    }
+                ],
+                "@typescript-eslint/ban-ts-comment": "off",
+                "@typescript-eslint/ban-types": "error",
+                "@typescript-eslint/consistent-type-definitions": "off",
+                "@typescript-eslint/dot-notation": "off",
+                "@typescript-eslint/explicit-member-accessibility": [
+                    "off",
+                    {
+                        "accessibility": "explicit"
+                    }
+                ],
+                "@typescript-eslint/no-require-imports": "error",
+                "@typescript-eslint/no-unused-vars": "off",
+                "@typescript-eslint/no-var-requires": "error",
+                "@typescript-eslint/require-await": "error",
+                "brace-style": [
+                    "error",
+                    "1tbs"
+                ],
+                "id-blacklist": "off",
+                "id-match": "off",
+                "no-duplicate-case": "error",
+                "no-duplicate-imports": "off",
+                "no-invalid-this": "error",
+                "no-multiple-empty-lines": [
+                    "error",
+                    {
+                        "max": 1
+                    }
+                ],
+                "no-new-func": "error",
+                "no-redeclare": "off",
+                "@typescript-eslint/no-redeclare": [
+                    "error"
+                ],
+                "no-template-curly-in-string": "error",
+                "no-underscore-dangle": "off",
+                "@typescript-eslint/naming-convention": [
+                    "error",
+                    {
+                        "selector": "enum",
+                        "format": [
+                            "PascalCase",
+                            "UPPER_CASE"
+                        ]
+                    }
+                ],
+                "@typescript-eslint/member-ordering": [
+                    "error",
+                    {
+                        "default": [
+                            "public-static-field",
+                            "public-instance-field",
+                            "private-static-field",
+                            "private-instance-field",
+                            "public-constructor",
+                            "private-constructor",
+                            "public-instance-method",
+                            "protected-instance-method",
+                            "private-instance-method"
+                        ]
+                    }
+                ]
+            }
+        },
+        {
+            "files": [
+                "*.html"
+            ],
+            "extends": [
+                "plugin:@angular-eslint/template/recommended"
+            ],
+            "rules": {}
+        }
+    ]
+}

package/lib/skeletons/_angular/base/src/app/app-routing.module.ts

@@ -1,17 +1,17 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-
-const routes: Routes = [
-    { path: '', redirectTo: 'screen/home', pathMatch: 'full' },
-    { path: 'index.jsp', redirectTo: 'screen/home' },
-    { path: 'screen/home', loadChildren: () => import('./features/home/home.module').then(m => m.Module) },
-    { path: 'screen/module1', loadChildren: () => import('./features/module1/module1.module').then(m => m.Module) },
-    { path: 'screen/module2', loadChildren: () => import('./features/module2/module2.module').then(m => m.Module) },
-];
-
-@NgModule({
-    imports: [
-        RouterModule.forRoot(routes),
-    ],
-})
-export class AppRoutingModule {}
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+const routes: Routes = [
+    { path: '', redirectTo: 'screen/home', pathMatch: 'full' },
+    { path: 'index.jsp', redirectTo: 'screen/home' },
+    { path: 'screen/home', loadChildren: () => import('./features/home/home.module').then(m => m.Module) },
+    { path: 'screen/module1', loadChildren: () => import('./features/module1/module1.module').then(m => m.Module) },
+    { path: 'screen/module2', loadChildren: () => import('./features/module2/module2.module').then(m => m.Module) },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forRoot(routes),
+    ],
+})
+export class AppRoutingModule {}

package/lib/skeletons/_angular/base/src/app/app-starter.service.ts

@@ -1,66 +1,66 @@
-import { Inject, Injectable } from '@angular/core';
-import {
-    CONFIG_TOKEN,
-    UserService,
-    EuiAppConfig,
-    UserDetails,
-    UserPreferences,
-    I18nService,
-} from '@eui/core';
-import { HttpClient } from '@angular/common/http';
-import { Observable, of, zip } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
-
-@Injectable({
-    providedIn: 'root',
-})
-export class AppStarterService {
-    defaultUserPreferences: UserPreferences;
-
-    constructor(
-        protected userService: UserService,
-        protected i18nService: I18nService,
-        @Inject(CONFIG_TOKEN) private config: EuiAppConfig,
-        protected http: HttpClient,
-    ) {
-    }
-
-    start(): Observable<any> {
-
-        return zip(
-            this.initUserService().pipe(
-                switchMap((userStatus) => {
-                    console.log(userStatus);
-                    return this.i18nService.init();
-                }),
-            ),
-        );
-    }
-
-    /**
-     * Fetches user details,
-     * create user: UserState object
-     * then initialise to the UserService on run time
-     */
-    initUserService(): Observable<any> {
-        return zip(
-            this.fetchUserDetails(),
-        ).pipe(
-            switchMap(([userDetails]) => this.userService.init(userDetails)));
-    }
-
-    /**
-     * Fetches user details
-     */
-    private fetchUserDetails(): Observable<UserDetails> {
-        // const url = this.config.modules.your_custom_module.your_custom_endpoint
-        const moduleCoreApi = this.config.modules.core;
-        const url = `${moduleCoreApi.base}${moduleCoreApi.userDetails}`;
-        const user = { userId: 'anonymous' };
-
-        if (!url) {
-            return of(user);
-        }
-        return this.http.get<UserDetails>(url);
-    }
-}
+import { Inject, Injectable } from '@angular/core';
+import {
+    CONFIG_TOKEN,
+    UserService,
+    EuiAppConfig,
+    UserDetails,
+    UserPreferences,
+    I18nService,
+} from '@eui/core';
+import { HttpClient } from '@angular/common/http';
+import { Observable, of, zip } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
+
+@Injectable({
+    providedIn: 'root',
+})
+export class AppStarterService {
+    defaultUserPreferences: UserPreferences;
+
+    constructor(
+        protected userService: UserService,
+        protected i18nService: I18nService,
+        @Inject(CONFIG_TOKEN) private config: EuiAppConfig,
+        protected http: HttpClient,
+    ) {
+    }
+
+    start(): Observable<any> {
+
+        return zip(
+            this.initUserService().pipe(
+                switchMap((userStatus) => {
+                    console.log(userStatus);
+                    return this.i18nService.init();
+                }),
+            ),
+        );
+    }
+
+    /**
+     * Fetches user details,
+     * create user: UserState object
+     * then initialise to the UserService on run time
+     */
+    initUserService(): Observable<any> {
+        return zip(
+            this.fetchUserDetails(),
+        ).pipe(
+            switchMap(([userDetails]) => this.userService.init(userDetails)));
+    }
+
+    /**
+     * Fetches user details
+     */
+    private fetchUserDetails(): Observable<UserDetails> {
+        // const url = this.config.modules.your_custom_module.your_custom_endpoint
+        const moduleCoreApi = this.config.modules.core;
+        const url = `${moduleCoreApi.base}${moduleCoreApi.userDetails}`;
+        const user = { userId: 'anonymous' };
+
+        if (!url) {
+            return of(user);
+        }
+        return this.http.get<UserDetails>(url);
+    }
+}

package/lib/skeletons/_angular/base/src/app/app.component.html

@@ -1,29 +1,29 @@
-<eui-app [userInfos]="userInfos?.fullName">
-    <eui-app-toolbar>
-        <eui-toolbar>
-            <eui-toolbar-logo></eui-toolbar-logo>
-            <eui-toolbar-app appName="appName"></eui-toolbar-app>
-            <eui-toolbar-environment>MOCK</eui-toolbar-environment>
-            <eui-toolbar-items euiPositionRight>
-                <eui-toolbar-item-user-profile>
-                    <eui-user-profile-menu>
-                        <eui-user-profile-menu-item>
-                            <eui-icon-svg icon="old-eui-person-thin"></eui-icon-svg> {{ 'eui.my-profile-informations' | translate }}
-                        </eui-user-profile-menu-item>
-                        <eui-user-profile-menu-item>
-                            <eui-icon-svg icon="old-eui-logout-thin"></eui-icon-svg> {{ 'eui.sign-out' | translate }}
-                        </eui-user-profile-menu-item>
-                    </eui-user-profile-menu>
-                </eui-toolbar-item-user-profile>
-                <eui-toolbar-item-notifications>
-                    <eui-notifications [count]="notificationItems?.length" [items]="notificationItems"></eui-notifications>
-                </eui-toolbar-item-notifications>
-            </eui-toolbar-items>
-        </eui-toolbar>
-    </eui-app-toolbar>
-    <eui-app-sidebar>
-        <eui-app-sidebar-body>
-            <eui-app-sidebar-menu [items]="sidebarItems"></eui-app-sidebar-menu>
-        </eui-app-sidebar-body>
-    </eui-app-sidebar>
-</eui-app>
+<eui-app [userInfos]="userInfos?.fullName">
+    <eui-app-toolbar>
+        <eui-toolbar>
+            <eui-toolbar-logo></eui-toolbar-logo>
+            <eui-toolbar-app appName="appName"></eui-toolbar-app>
+            <eui-toolbar-environment>MOCK</eui-toolbar-environment>
+            <eui-toolbar-items euiPositionRight>
+                <eui-toolbar-item-user-profile>
+                    <eui-user-profile-menu>
+                        <eui-user-profile-menu-item>
+                            <eui-icon-svg icon="old-eui-person-thin"></eui-icon-svg> {{ 'eui.my-profile-informations' | translate }}
+                        </eui-user-profile-menu-item>
+                        <eui-user-profile-menu-item>
+                            <eui-icon-svg icon="old-eui-logout-thin"></eui-icon-svg> {{ 'eui.sign-out' | translate }}
+                        </eui-user-profile-menu-item>
+                    </eui-user-profile-menu>
+                </eui-toolbar-item-user-profile>
+                <eui-toolbar-item-notifications>
+                    <eui-notifications [count]="notificationItems?.length" [items]="notificationItems"></eui-notifications>
+                </eui-toolbar-item-notifications>
+            </eui-toolbar-items>
+        </eui-toolbar>
+    </eui-app-toolbar>
+    <eui-app-sidebar>
+        <eui-app-sidebar-body>
+            <eui-app-sidebar-menu [items]="sidebarItems"></eui-app-sidebar-menu>
+        </eui-app-sidebar-body>
+    </eui-app-sidebar>
+</eui-app>

package/lib/skeletons/_angular/base/src/app/app.component.ts

@@ -1,51 +1,51 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { Store } from '@ngrx/store';
-import {
-    getUserState,
-    UserState,
-} from '@eui/core';
-import { Observable, Subscription } from 'rxjs';
-
-@Component({
-    selector: 'app-root',
-    templateUrl: './app.component.html',
-})
-export class AppComponent implements OnInit, OnDestroy {
-    userInfos: UserState;
-    // Observe state changes
-    userState: Observable<UserState>;
-    // an array to keep all subscriptions and easily unsubscribe
-    subs: Subscription[] = [];
-
-    sidebarItems = [
-        { label: 'Home', url: 'screen/home' },
-        { label: 'Module 1', url: 'screen/module1', children: [
-            { label: 'page 1', url: 'screen/module1/page1' },
-            { label: 'page 2', url: 'screen/module1/page2' },
-        ] },
-        { label: 'Module 2', url: 'screen/module2' },
-    ];
-    notificationItems = [
-        { label: 'Title label 1', subLabel: 'Subtitle label' },
-        { label: 'Title label 2', subLabel: 'Subtitle label' },
-        { label: 'Title label 3', subLabel: 'Subtitle label' },
-        { label: 'Title label 4', subLabel: 'Subtitle label' },
-    ];
-
-    constructor(
-        private store: Store<any>,
-    ) {
-            this.userState = this.store.select(getUserState);
-            this.subs.push(this.userState.subscribe((user: UserState) => {
-                this.userInfos = { ...user };
-                console.log(user);
-            }));
-    }
-
-    ngOnInit() {
-    }
-
-    ngOnDestroy() {
-        this.subs.forEach((s: Subscription) => s.unsubscribe());
-    }
-}
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Store } from '@ngrx/store';
+import {
+    getUserState,
+    UserState,
+} from '@eui/core';
+import { Observable, Subscription } from 'rxjs';
+
+@Component({
+    selector: 'app-root',
+    templateUrl: './app.component.html',
+})
+export class AppComponent implements OnInit, OnDestroy {
+    userInfos: UserState;
+    // Observe state changes
+    userState: Observable<UserState>;
+    // an array to keep all subscriptions and easily unsubscribe
+    subs: Subscription[] = [];
+
+    sidebarItems = [
+        { label: 'Home', url: 'screen/home' },
+        { label: 'Module 1', url: 'screen/module1', children: [
+            { label: 'page 1', url: 'screen/module1/page1' },
+            { label: 'page 2', url: 'screen/module1/page2' },
+        ] },
+        { label: 'Module 2', url: 'screen/module2' },
+    ];
+    notificationItems = [
+        { label: 'Title label 1', subLabel: 'Subtitle label' },
+        { label: 'Title label 2', subLabel: 'Subtitle label' },
+        { label: 'Title label 3', subLabel: 'Subtitle label' },
+        { label: 'Title label 4', subLabel: 'Subtitle label' },
+    ];
+
+    constructor(
+        private store: Store<any>,
+    ) {
+            this.userState = this.store.select(getUserState);
+            this.subs.push(this.userState.subscribe((user: UserState) => {
+                this.userInfos = { ...user };
+                console.log(user);
+            }));
+    }
+
+    ngOnInit() {
+    }
+
+    ngOnDestroy() {
+        this.subs.forEach((s: Subscription) => s.unsubscribe());
+    }
+}