@eui/tools 4.17.6 → 4.17.10

package/.version.properties

@@ -1 +1 @@
-4.17.6
+4.17.10

package/CHANGELOG.md

@@ -1,3 +1,40 @@
+## 4.17.10 (2021-12-07)
+
+##### Chores
+
+* **other:**
+  * adapted externals injection for extra route remapping for rfs swap on TRN/PROD - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([da46c778](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/da46c778d9be029c888541fe943d0883657c9fac))
+  * translations management MWP-7583 [MWP-7583](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7583)  ([e1b07c0b](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/e1b07c0bc37957990be5df7c25fa7ffaa98f23cd))
+
+* * *
+* * *
+## 4.17.9 (2021-12-06)
+
+##### Chores
+
+* **other:**
+  * disable style lint for v13 apps - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([9f925fdd](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/9f925fdd3ae8e401045fe8979545dbfdb66181a2))
+
+* * *
+* * *
+## 4.17.8 (2021-12-02)
+
+##### Chores
+
+* **other:**
+  * added back yarn.lock removal on sync - add devops-metadata sync feature to prevent new package overlap and merge issues - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([f115a19f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f115a19f31b3d473576a122405d45e0c4f83bc83))
+
+* * *
+* * *
+## 4.17.7 (2021-12-02)
+
+##### Chores
+
+* **other:**
+  * updated handlebars to 4.7.7 in v13 resolutions - enabled back UI auditing - fixed teams display on init - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([bd101f2d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/bd101f2d6466308c21bd4bdc57a504a5cdc810a6))
+
+* * *
+* * *
 ## 4.17.6 (2021-11-30)
 
 ##### Bug Fixes

package/package.json

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

package/sandbox.js

@@ -15,6 +15,7 @@ const compositeUtils = require('./scripts/csdr/install/composite-utils');
 const installUtils = require('./scripts/csdr/install/install-utils');
 const notificationUtils = require('./scripts/utils/notification/notification-utils');
 
+
 // console.log(configUtils.packages.getPackages());
 // console.log(configUtils.packages.getPackage('eui-tools'));
 
@@ -120,10 +121,10 @@ const notificationUtils = require('./scripts/utils/notification/notification-uti
 //     return initUtils.meta.init();
 //   })
 
-return Promise.resolve()
-  .then(() => {
-    return metadataUtils.stats.run();
-  })
+// return Promise.resolve()
+//   .then(() => {
+//     return metadataUtils.stats.run();
+//   })
 
 // return Promise.resolve()
 //   .then(() => {
@@ -630,3 +631,10 @@ return Promise.resolve()
 //     tools.logBanner('this is the content of the banner');
 //   })
 
+return Promise.resolve()
+  .then(() => {
+    const prjName = 'my-workplace';
+    const prj = configUtils.projects.getCsdrProject(prjName);
+
+    return injectionUtils.externals.remapRoutesByEnvConfig(prj, 'TRN', true);
+  })

package/scripts/csdr/audit/audit-utils.js

@@ -50,7 +50,7 @@ module.exports.audit = (pkg) => {
     .then(() => {
       return Promise.resolve()
         .then(() => {
-          return execa.shellSync('yarn audit --level moderate', { cwd: process.cwd(), stdio: 'inherit' });
+          return execa.shellSync('yarn audit --level high', { cwd: process.cwd(), stdio: 'inherit' });
         })
         .catch((e) => {}) // it can fail
     })
@@ -61,7 +61,7 @@ module.exports.audit = (pkg) => {
         .then(() => {
           const auditFile = path.join(process.cwd(), 'audit.json');
           tools.logInfo(`Creating audit file`)
-          return execa.shellSync(`yarn audit --level moderate --json > ${auditFile}`, { cwd: process.cwd(), stdio: 'inherit' });
+          return execa.shellSync(`yarn audit --level high --json > ${auditFile}`, { cwd: process.cwd(), stdio: 'inherit' });
         })
         .then(() => {
           tools.logSuccess();

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/init/prompt.js

@@ -17,7 +17,9 @@ module.exports.start = () => {
         type: "list",
         name: "project",
         message: "Which app / project do you work on?",
-        choices: csdrProjects.map(p => ({ name: p.name, value: p.name }))
+        choices: csdrProjects.filter((p) => {
+          return p.initListVisible === true;
+        }).map(p => ({ name: p.name, value: p.name }))
       });
 
       const answersTeam = await inquirer.prompt({

package/scripts/csdr/init/resources/13.x/resolutions.json

@@ -1,6 +1,6 @@
 {
     "lodash": ">=4.17.21",
-    "handlebars": ">=4.5.3",
+    "handlebars": ">=4.7.7",
     "mem": ">=4.3.0 <=8.1.1",
     "https-proxy-agent": ">=2.2.3",
     "minimatch": ">=3.0.4",

package/scripts/csdr/metadata/package.js

@@ -596,3 +596,99 @@ module.exports.isPackageLocked = (pkg) => {
 
   return false;
 }
+
+
+
+module.exports.syncDevopsMetadata = () => {
+  return Promise.resolve()
+    .then(() => {
+      const pkgsObject = configUtils.packages.getCsdrPackages();
+      const pkgs = Object.keys(pkgsObject);
+
+      const metadataFile = path.join(process.cwd(), 'packages', 'devops-metadata', '.devops-metadata.json');
+      const metadata = require(metadataFile);
+
+      let packages = metadata.packages;
+      let packagesLatestTag = metadata.packagesLatestTag;
+      let packagesNextTag = metadata.packagesNextTag;
+      let packagesPrevTag = metadata.packagesPrevTag;
+      let packagesPrevSnapshotsTag = metadata.packagesPrevSnapshotsTag;
+
+      const getMissingPackages = (inArray) => {
+        let outArray = [];
+
+        pkgs.forEach((p) => {
+          const pkgIdx = inArray.findIndex(item => item.name === p);
+          if (pkgIdx === -1) {
+            outArray.push(p);
+          }
+        });
+
+        return outArray;
+      }
+
+      const addPackages = (inArray, pkgsToAdd) => {
+        const outArray = inArray;
+        pkgsToAdd.forEach((p) => {
+          outArray.push({
+            name: p,
+            version: null,
+            date: require('moment')(new Date()).format("YYYYMMDD-HH:mm"),
+            status: 'INITIALIZED',
+            npmPkg: null
+          });
+        })
+
+        return outArray;
+      }
+
+      console.log('processing packages');
+      let packagesToAdd = [] = getMissingPackages(packages);
+      let packagesLatestTagToAdd = [] = getMissingPackages(packagesLatestTag);
+      let packagesNextTagToAdd = [] = getMissingPackages(packagesNextTag);
+      let packagesPrevTagToAdd = [] = getMissingPackages(packagesPrevTag);
+      let packagesPrevSnapshotsTagToAdd = [] = getMissingPackages(packagesPrevSnapshotsTag);
+
+      console.log(packagesToAdd.length);
+      console.log(packagesLatestTagToAdd.length);
+      console.log(packagesNextTagToAdd.length);
+      console.log(packagesPrevTagToAdd.length);
+      console.log(packagesPrevSnapshotsTagToAdd.length);
+
+      console.log(`packages before : ${packages.length}`);
+      packages = addPackages(packages, packagesToAdd);
+      console.log(`packages after : ${packages.length}`);
+
+      console.log(`packages before : ${packagesLatestTag.length}`);
+      packagesLatestTag = addPackages(packagesLatestTag, packagesLatestTagToAdd);
+      console.log(`packages after : ${packagesLatestTag.length}`);
+
+      console.log(`packages before : ${packagesNextTag.length}`);
+      packagesNextTag = addPackages(packagesNextTag, packagesNextTagToAdd);
+      console.log(`packages after : ${packagesNextTag.length}`);
+
+      console.log(`packages before : ${packagesPrevTag.length}`);
+      packagesPrevTag = addPackages(packagesPrevTag, packagesPrevTagToAdd);
+      console.log(`packages after : ${packagesPrevTag.length}`);
+
+      console.log(`packages before : ${packagesPrevSnapshotsTag.length}`);
+      packagesPrevSnapshotsTag = addPackages(packagesPrevSnapshotsTag, packagesPrevSnapshotsTagToAdd);
+      console.log(`packages after : ${packagesPrevSnapshotsTag.length}`);
+
+      metadata.packages = packages;
+      metadata.packagesLatestTag = packagesLatestTag;
+      metadata.packagesPrevTag = packagesPrevTag;
+      metadata.packagesNextTag = packagesNextTag;
+      metadata.packagesPrevSnapshotsTag = packagesPrevSnapshotsTag;
+
+      if (!dryRun) {
+        tools.writeJsonFileSync(metadataFile, metadata);
+      } else {
+        tools.logInfo(`Write metadata on ${metadataFile}`);
+      }
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}

package/scripts/csdr/release/package/ui.js

@@ -32,9 +32,9 @@ module.exports.install = (pkg, isMaster) => {
 
 
   // AUDIT DEPENDENCIES
-  // .then(() => {
-  //   return auditUtils.audit(pkg);
-  // })
+  .then(() => {
+    return auditUtils.audit(pkg);
+  })
 
 
   .catch((e) => {

package/scripts/csdr/sync/sync-utils.js

@@ -16,10 +16,10 @@ module.exports.sync = () => {
     tools.logInfo('Resetting package.json');
     return tools.copy(path.join(process.cwd(), '.csdr', 'package.json.reset'), path.join(process.cwd(), 'package.json'));
   })
-  // .then(() => {
-  //   tools.logInfo('Removing yarn.lock');
-  //   return tools.remove(path.join(process.cwd(), 'yarn.lock'));
-  // })
+  .then(() => {
+    tools.logInfo('Removing yarn.lock');
+    return tools.remove(path.join(process.cwd(), 'yarn.lock'));
+  })
   .then(() => {
     tools.logSuccess();
   })

package/scripts/utils/build/app/build-app-utils.js

@@ -88,10 +88,11 @@ module.exports.angular = (envTarget, isSnapshot, version) => {
       if (!skipLint) {
         tools.logSuccess();
       }
-      if (!skipLint) {
-        tools.logInfo(`Styles Linting application...`);
-        return tools.runScript(`stylelint **/*.scss`, currentProject.paths.angularPath);
-      }
+      // temporary disable for v13 apps
+      // if (!skipLint) {
+      //   tools.logInfo(`Styles Linting application...`);
+      //   return tools.runScript(`stylelint **/*.scss`, currentProject.paths.angularPath);
+      // }
     })
 
 

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(() => {