@eui/cli 18.0.0-next.4 → 18.0.0-next.41

package/.version.properties

@@ -1 +1 @@
-18.0.0-next.4
+18.0.0-next.41

package/bin/eui-cli.js

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 
-const tools = require('@eui/tools/scripts/utils/tools');
 const chalk = require('chalk');
+const tools = require('@eui/tools/scripts/utils/tools');
 const figlet = require('figlet');
 const path = require('path');
+const fs = require('fs');
 const generators = require('../lib/generators');
 const config = require('../lib/config');
 
@@ -31,8 +32,8 @@ if (args.targetPath) {
     targetPath = path.join(targetPath, 'packages');
   }
 
-  if (!tools.isDirExists(targetPath)) {
-    tools.mkdir(targetPath);
+  if (fs.readdirSync(targetPath).length < 1) {
+    fs.mkdirSync(targetPath);
   }
 
 // otherwise taking the default config targetPath defined

package/lib/install.js

@@ -5,7 +5,6 @@ const tools = require('@eui/tools/scripts/utils/tools');
 const utils = require('./utils');
 const chalk = require('chalk');
 
-
 module.exports.start = (options) => {
 
   if (!options.config.npmInstall) {

package/lib/skeletons/_angular/base/angular.json

@@ -39,13 +39,14 @@
                             },
                             {
                                 "glob": "**/*",
-                                "input": "node_modules/@eui/styles-base/src/assets/",
+                                "input": "node_modules/@eui/styles/dist/assets/",
                                 "output": "./assets"
                             }
                         ],
                         "styles": [
-                            "node_modules/@eui/styles/dist/styles/eui.css",
-                            "node_modules/@eui/styles/dist/styles/eui-utilities.css",
+                            "node_modules/@eui/styles/dist/eui.css",
+                            "node_modules/@eui/styles/dist/eui-utilities.css",
+                            "node_modules/@eui/styles/dist/eui-theme-eui-legacy.css",
                             "src/styles.scss"
                         ]
                     },
@@ -145,7 +146,7 @@
                             },
                             {
                                 "glob": "**/*",
-                                "input": "node_modules/@eui/styles-base/src/assets/",
+                                "input": "node_modules/@eui/styles/dist/assets/",
                                 "output": "./assets"
                             }
                         ]

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

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "18.0.0-next.4",
+    "version": "18.0.0-next.41",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -20,6 +20,6 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "18.0.0-next.4"
+        "@eui/deps-base": "18.0.0-next.41"
     }
 }

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

@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
-const routes: Routes = [
+export 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) },

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

@@ -0,0 +1,65 @@
+import {TestBed} from '@angular/core/testing';
+import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
+import {CONFIG_TOKEN, I18nService, UserService} from '@eui/core';
+import {EuiAppConfig} from '@eui/base';
+import {of} from 'rxjs';
+import {AppStarterService} from './app-starter.service';
+import SpyObj = jasmine.SpyObj;
+
+describe('AppStarterService', () => {
+    let service: AppStarterService;
+    let httpMock: HttpTestingController;
+    let userServiceMock: SpyObj<UserService>;
+    let i18nServiceMock: SpyObj<I18nService>;
+    let configMock: EuiAppConfig;
+
+    beforeEach(() => {
+        userServiceMock = jasmine.createSpyObj('UserService', ['init']);
+        i18nServiceMock = jasmine.createSpyObj('I18nService', ['init']);
+        configMock = {global: {}, modules: {core: {base: 'localhost:3000', userDetails: 'dummy'}}};
+
+        TestBed.configureTestingModule({
+            imports: [HttpClientTestingModule],
+            providers: [
+                AppStarterService,
+                {provide: UserService, useValue: userServiceMock},
+                {provide: I18nService, useValue: i18nServiceMock},
+                {provide: CONFIG_TOKEN, useValue: configMock},
+            ],
+        });
+
+        service = TestBed.inject(AppStarterService);
+        httpMock = TestBed.inject(HttpTestingController);
+    });
+
+    it('should be created', () => {
+        expect(service).toBeTruthy();
+    });
+
+    it('should call start method', () => {
+        userServiceMock.init.and.returnValue(of(null));
+        i18nServiceMock.init.and.returnValue(of(null));
+        service.start().subscribe(() => {
+            expect(userServiceMock.init).toHaveBeenCalled();
+            expect(i18nServiceMock.init).toHaveBeenCalled();
+        });
+    });
+
+    it('should call initUserService method', () => {
+        userServiceMock.init.and.returnValue(of(null));
+        service.initUserService().subscribe(() => {
+            expect(userServiceMock.init).toHaveBeenCalled();
+        });
+    });
+
+    it('should fetch user details', () => {
+        const dummyUserDetails = {userId: 'anonymous'};
+        service['fetchUserDetails']().subscribe(userDetails => {
+            expect(userDetails).toEqual(dummyUserDetails);
+        });
+
+        const req = httpMock.expectOne(`${configMock.modules.core.base}${configMock.modules.core.userDetails}`);
+        expect(req.request.method).toBe('GET');
+        req.flush(dummyUserDetails);
+    });
+});

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

@@ -2,11 +2,13 @@ import { Inject, Injectable } from '@angular/core';
 import {
     CONFIG_TOKEN,
     UserService,
+    I18nService,
+} from '@eui/core';
+import {
     EuiAppConfig,
     UserDetails,
     UserPreferences,
-    I18nService,
-} from '@eui/core';
+} from '@eui/base';
 import { HttpClient } from '@angular/common/http';
 import { Observable, of, zip } from 'rxjs';
 import { switchMap } from 'rxjs/operators';

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

@@ -0,0 +1,78 @@
+import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {RouterModule} from '@angular/router';
+import {DebugElement, Predicate} from '@angular/core';
+import {By} from '@angular/platform-browser';
+import {AppComponent} from './app.component';
+import {EuiAppModule} from '@eui/components/layout';
+import {HttpClientTestingModule} from '@angular/common/http/testing';
+import {CoreModule} from "./core/core.module";
+import {routes} from "./app-routing.module";
+
+describe('AppComponent', () => {
+    let component: AppComponent;
+    let fixture: ComponentFixture<AppComponent>;
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            imports: [
+                RouterModule.forRoot(routes),
+                CoreModule,
+                EuiAppModule,
+                HttpClientTestingModule,
+            ],
+            declarations: [AppComponent],
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(AppComponent);
+        component = fixture.componentInstance;
+    });
+
+    it('should create the app', () => {
+        expect(component).toBeTruthy();
+    });
+
+    it('should have correct sidebarItems', () => {
+        expect(component.sidebarItems).toEqual([
+            {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'},
+        ]);
+    });
+
+    it('should have correct notificationItems', () => {
+        expect(component.notificationItems).toEqual([
+            {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'},
+        ]);
+    });
+
+    it('should render correct number of eui-app-sidebar-menu items', () => {
+        fixture.detectChanges();
+        const compiled = fixture.debugElement;
+        expect(compiled.queryAll(By.css('eui-menu-item')).length).toEqual(component.sidebarItems.length);
+    });
+
+    it('should render correct number of eui-notifications on icon badge', () => {
+        fixture.detectChanges();
+        const compiled = fixture.debugElement;
+        const predicate = By.css('eui-notifications > eui-icon-svg-button > button > eui-icon-svg > eui-badge');
+        expect(compiled.queryAll(predicate)[0].nativeNode.innerText).toEqual(component.notificationItems.length.toString());
+    });
+
+    it('should render correct number of eui-notifications on list', () => {
+        fixture.detectChanges();
+        const compiled = fixture.debugElement;
+        const notificationButton: Predicate<DebugElement> = By.css('eui-notifications > eui-icon-svg-button > button');
+        compiled.query(notificationButton).nativeElement.click();
+        fixture.detectChanges();
+        expect(compiled.queryAll(By.css('eui-notification-item')).length)
+            .toEqual(component.notificationItems.length);
+    });
+});

package/lib/skeletons/_angular/base/src/app/app.module.spec.ts

@@ -0,0 +1,31 @@
+import {TestBed} from '@angular/core/testing';
+import {AppModule} from './app.module';
+import {AppStarterService} from './app-starter.service';
+import {of} from 'rxjs';
+
+describe('AppModule', () => {
+    let appStarterService: AppStarterService;
+
+    beforeAll(() => {
+        TestBed.resetTestingModule()
+    });
+
+    beforeEach(async () => {
+        const appStarterServiceMock = {
+            start: jasmine.createSpy('start').and.returnValue(of(null)),
+        };
+        await TestBed.configureTestingModule({
+            imports: [AppModule],
+            providers: [
+                {provide: AppStarterService, useValue: appStarterServiceMock},
+            ],
+        }).compileComponents();
+
+        appStarterService = TestBed.inject(AppStarterService);
+    });
+
+    it('should call start method of AppStarterService', () => {
+        expect(appStarterService.start).toHaveBeenCalled();
+    });
+
+});

package/lib/skeletons/_angular/base/src/app/core/core.module.ts

@@ -32,6 +32,7 @@ import { SharedModule } from '@shared/shared.module';
         EffectsModule.forRoot([...CoreModuleEffects]),
         TranslateModule.forRoot(translateConfig),
         StoreModule.forRoot(REDUCER_TOKEN, { metaReducers }),
+        StoreModule.forRoot(REDUCER_TOKEN, { metaReducers }),
         !environment.production ? StoreDevtoolsModule.instrument({ maxAge: 50 }) : [],
     ],
     declarations: [

package/lib/skeletons/_angular/base/src/app/core/reducers/index.ts

@@ -1,7 +1,8 @@
 import { InjectionToken } from '@angular/core';
 import { MetaReducer } from '@ngrx/store';
 import { storeFreeze } from 'ngrx-store-freeze';
-import { reducers as coreReducers, CoreState, getAppState, localStorageSync } from '@eui/core';
+import { reducers as coreReducers, localStorageSync } from '@eui/core';
+import { CoreState, getAppState } from '@eui/base';
 
 import { environment } from '../../../environments/environment';
 

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

@@ -1,5 +1,6 @@
 import { Component, Inject } from '@angular/core';
-import { CONFIG_TOKEN, EuiAppConfig } from '@eui/core';
+import { CONFIG_TOKEN } from '@eui/core';
+import { EuiAppConfig } from '@eui/base';
 
 @Component({
     templateUrl: './home.component.html',

package/lib/skeletons/_angular/base/src/config/global.ts

@@ -1,4 +1,4 @@
-import { GlobalConfig } from '@eui/core';
+import { GlobalConfig } from '@eui/base';
 
 export const GLOBAL: GlobalConfig = {
     appTitle: 'CSDR-app',

package/lib/skeletons/_angular/base/src/config/index.ts

@@ -1,4 +1,4 @@
-import { EuiAppConfig } from '@eui/core';
+import { EuiAppConfig } from '@eui/base';
 import { GLOBAL } from './global';
 import { MODULES } from './modules';
 

package/lib/skeletons/_angular/base/src/config/modules.ts

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

package/lib/skeletons/_angular/base/src/environments/environment.prod.ts

@@ -1,4 +1,4 @@
-import { EuiEnvConfig } from '@eui/core';
+import { EuiEnvConfig } from '@eui/base';
 
 export const environment: EuiEnvConfig = {
     production: true,

package/lib/skeletons/_angular/base/src/environments/environment.ts

@@ -1,4 +1,4 @@
-import { EuiEnvConfig } from '@eui/core';
+import { EuiEnvConfig } from '@eui/base';
 
 export const environment: EuiEnvConfig = {
     production: false,

package/lib/skeletons/_angular/base/src/index.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html>
+<html class="eui-t-eui-legacy">
 
 <head>
   <meta charset="utf-8">

package/lib/skeletons/_angular/base-mobile/angular.json

@@ -46,7 +46,7 @@
                             },
                             {
                                 "glob": "**/*",
-                                "input": "node_modules/@eui/styles-base/dist/assets/images",
+                                "input": "node_modules/@eui/styles/dist/assets/images",
                                 "output": "./assets/images"
                             },
                             {

package/lib/skeletons/_angular/base-mobile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "18.0.0-next.4",
+    "version": "18.0.0-next.41",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -20,8 +20,8 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "16.2.16-snapshot-1711635173997",
-        "@eui/mobile-core": "16.9.0-snapshot-1711463915848",
-        "@eui/mobile-styles": "16.9.0-snapshot-1711463915848"
+        "@eui/deps-base": "16.2.17-snapshot-1712283114368",
+        "@eui/mobile-core": "16.10.0",
+        "@eui/mobile-styles": "16.10.0"
     }
 }

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

@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { StoreModule } from '@ngrx/store';
-import { EffectsModule } from '@ngrx/effects';
+// import { EffectsModule } from '@ngrx/effects';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 
 import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
@@ -15,7 +15,7 @@ import {
     EuLoginSessionTimeoutHandlingInterceptor,
     CoreModule as EuiCoreModule,
     translateConfig,
-    CoreModuleEffects,
+    // CoreModuleEffects,
     EUI_CONFIG_TOKEN,
 } from '@eui/core';
 
@@ -31,9 +31,10 @@ import { SharedModule } from '@shared/shared.module';
         HttpClientModule,
         SharedModule,
         EuiCoreModule.forRoot(),
-        EffectsModule.forRoot([...CoreModuleEffects]),
+        // EffectsModule.forRoot([...CoreModuleEffects]),
         TranslateModule.forRoot(translateConfig),
-        StoreModule.forRoot(REDUCER_TOKEN, { metaReducers }),
+        StoreModule.forRoot(),
+        // StoreModule.forRoot(REDUCER_TOKEN, { metaReducers }),
         !environment.production ? StoreDevtoolsModule.instrument({ maxAge: 50 }) : [],
         IonicModule.forRoot({mode: 'md'}),
     ],

package/lib/skeletons/_angular/base-mobile/src/app/core/reducers/index.ts

@@ -1,7 +1,8 @@
 import { InjectionToken } from '@angular/core';
 import { MetaReducer } from '@ngrx/store';
 import { storeFreeze } from 'ngrx-store-freeze';
-import { reducers as coreReducers, CoreState, getAppState, localStorageSync } from '@eui/core';
+import { reducers as coreReducers, localStorageSync } from '@eui/core';
+import { CoreState, getAppState } from '@eui/base';
 
 import { environment } from '../../../environments/environment';
 

package/lib/skeletons/_angular/options/ecl-ec/angular.json

@@ -39,12 +39,12 @@
                             },
                             {
                                 "glob": "**/*",
-                                "input": "node_modules/@eui/styles-base/src/assets/ecl",
+                                "input": "node_modules/@eui/styles/dist/assets/ecl",
                                 "output": "./assets/images/ecl"
                             },
                             {
                                 "glob": "**/*",
-                                "input": "node_modules/@eui/styles-base/src/assets",
+                                "input": "node_modules/@eui/styles/dist/assets",
                                 "output": "./assets"
                             },
                             {
@@ -159,12 +159,12 @@
                             },
                             {
                                 "glob": "**/*",
-                                "input": "node_modules/@eui/styles-base/dist/assets/ecl",
+                                "input": "node_modules/@eui/styles/dist/assets/ecl",
                                 "output": "./assets/images/ecl"
                             },
                             {
                                 "glob": "**/*",
-                                "input": "node_modules/@eui/styles-base/dist/assets",
+                                "input": "node_modules/@eui/styles/dist/assets",
                                 "output": "./assets"
                             },
                             {

package/lib/skeletons/_angular/options/ecl-eu/angular.json

@@ -39,12 +39,12 @@
                             },
                             {
                                 "glob": "**/*",
-                                "input": "node_modules/@eui/styles-base/src/assets/ecl",
+                                "input": "node_modules/@eui/styles/dist/assets/ecl",
                                 "output": "./assets/images/ecl"
                             },
                             {
                                 "glob": "**/*",
-                                "input": "node_modules/@eui/styles-base/src/assets",
+                                "input": "node_modules/@eui/styles/dist/assets",
                                 "output": "./assets"
                             },
                             {
@@ -159,12 +159,12 @@
                             },
                             {
                                 "glob": "**/*",
-                                "input": "node_modules/@eui/styles-base/dist/assets/ecl",
+                                "input": "node_modules/@eui/styles/dist/assets/ecl",
                                 "output": "./assets/images/ecl"
                             },
                             {
                                 "glob": "**/*",
-                                "input": "node_modules/@eui/styles-base/dist/assets",
+                                "input": "node_modules/@eui/styles/dist/assets",
                                 "output": "./assets"
                             },
                             {

package/lib/skeletons/web-symfony/myapp-web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "18.0.0-next.4",
+    "version": "18.0.0-next.41",
     "license": "EUPL-1.1",
     "description": "eUI JEE Symfony app scripts",
     "scripts": {
@@ -18,6 +18,6 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "18.0.0-next.4"
+        "@eui/deps-base": "18.0.0-next.41"
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/cli",
-    "version": "18.0.0-next.4",
+    "version": "18.0.0-next.41",
     "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI CLI app generator",
@@ -13,7 +13,7 @@
         "url": "https://citnet.tech.ec.europa.eu/CITnet/stash/projects/CSDR/repos/eui"
     },
     "dependencies": {
-        "@eui/tools": "6.16.6"
+        "@eui/tools": "6.16.13"
     },
     "peerDependencies": {
         "@eui/tools": "^6.0.0",